Index: tmp/org.txm.setups/logs64
===================================================================
--- tmp/org.txm.setups/logs64	(revision 2955)
+++ tmp/org.txm.setups/logs64	(revision 2956)
@@ -0,0 +1,2 @@
+Plugin not found, cannot call AccessControl::GrantOnFile
+Error in script "TXM_0.8.1_2020-11-02_Win64_installer/txm.nsi" on line 269 -- aborting creation process
Index: tmp/org.txm.setups/shared/win/txm.nsi
===================================================================
--- tmp/org.txm.setups/shared/win/txm.nsi	(revision 2955)
+++ tmp/org.txm.setups/shared/win/txm.nsi	(revision 2956)
@@ -1,3 +1,5 @@
+Unicode True
+
 !include MUI2.nsh
 
 !include nsDialogs.nsh
@@ -11,7 +13,6 @@
 ;!define Version ""
 !define Version "-TXMVERSION"
 
-
 OutFile "../TXM_TXMDATEVERSION_Win64_installer.exe"
 
 InstallDir "$PROGRAMFILES64\TXM${Version}"
Index: tmp/org.txm.setups/nsis/Examples/Library.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/Library.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/Library.nsi	(revision 2956)
@@ -16,7 +16,8 @@
 
 RequestExecutionLevel user
 
-!define TestDLL '"${NSISDIR}\Plugins\LangDLL.dll"'
+
+!define TestDLL '"${NSISDIR}\Plugins\${NSIS_CPU}-unicode\LangDLL.dll"'
 !define TestEXE '"${NSISDIR}\Contrib\UIs\default.exe"'
 
 Section
Index: tmp/org.txm.setups/nsis/Examples/install-per-user.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/install-per-user.nsi	(revision 0)
+++ tmp/org.txm.setups/nsis/Examples/install-per-user.nsi	(revision 2956)
@@ -0,0 +1,168 @@
+/*
+
+This example script installs a simple application for a single user.
+
+If multiple users on the same machine run this installer, each user
+will end up with a separate install that is not affected by
+update/removal operations performed by other users.
+
+Per-user installers should only write to HKCU and 
+folders inside the users profile.
+
+*/
+
+!define NAME "Per-User example"
+!define REGPATH_UNINSTSUBKEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}"
+Name "${NAME}"
+OutFile "Install ${NAME}.exe"
+Unicode True
+RequestExecutionLevel User ; We don't need UAC elevation
+InstallDir "" ; Don't set a default $InstDir so we can detect /D= and InstallDirRegKey
+InstallDirRegKey HKCU "${REGPATH_UNINSTSUBKEY}" "UninstallString"
+
+!include LogicLib.nsh
+!include WinCore.nsh
+!include Integration.nsh
+
+
+Page Directory
+Page InstFiles
+
+Uninstpage UninstConfirm
+Uninstpage InstFiles
+
+
+Function .onInit
+  SetShellVarContext Current
+
+  ${If} $InstDir == "" ; No /D= nor InstallDirRegKey?
+    GetKnownFolderPath $InstDir ${FOLDERID_UserProgramFiles} ; This folder only exists on Win7+
+    StrCmp $InstDir "" 0 +2 
+    StrCpy $InstDir "$LocalAppData\Programs" ; Fallback directory
+
+    StrCpy $InstDir "$InstDir\$(^Name)"
+  ${EndIf}
+FunctionEnd
+
+Function un.onInit
+  SetShellVarContext Current
+FunctionEnd
+
+Section "Program files (Required)"
+  SectionIn Ro
+
+  SetOutPath $InstDir
+  WriteUninstaller "$InstDir\Uninst.exe"
+  WriteRegStr HKCU "${REGPATH_UNINSTSUBKEY}" "DisplayName" "${NAME}"
+  WriteRegStr HKCU "${REGPATH_UNINSTSUBKEY}" "DisplayIcon" "$InstDir\MyApp.exe,0"
+  WriteRegStr HKCU "${REGPATH_UNINSTSUBKEY}" "UninstallString" '"$InstDir\Uninst.exe"'
+  WriteRegDWORD HKCU "${REGPATH_UNINSTSUBKEY}" "NoModify" 1
+  WriteRegDWORD HKCU "${REGPATH_UNINSTSUBKEY}" "NoRepair" 1
+
+  File "/oname=$InstDir\MyApp.exe" "${NSISDIR}\Bin\MakeLangId.exe" ; Pretend that we have a real application to install
+SectionEnd
+
+Section "Start Menu shortcut"
+  CreateShortcut /NoWorkingDir "$SMPrograms\${NAME}.lnk" "$InstDir\MyApp.exe"
+SectionEnd
+
+/*
+This Section registers a fictional .test-nullsoft file extension and the Nullsoft.Test ProgId. 
+Proprietary file types are encouraged (by Microsoft) to use long file extensions and ProgIds that include the company name.
+
+When registering with "Open With" your executable should ideally have a somewhat unique name, 
+otherwise there could be a naming collision with a different application (with the same name) installed on the same machine.
+
+REGISTER_DEFAULTPROGRAMS is not defined because proprietary file types do not typically use the Default Programs functionality. 
+If your application registers a standard file type such as .mp3 or .html or a protocol like HTTP it should register as a Default Program. 
+It should also register as a client (https://docs.microsoft.com/en-us/windows/win32/shell/reg-middleware-apps#common-registration-elements-for-all-client-types).
+*/
+!define ASSOC_EXT ".test-nullsoft"
+!define ASSOC_PROGID "Nullsoft.Test"
+!define ASSOC_VERB "MyApp"
+!define ASSOC_APPEXE "MyApp.exe"
+Section -ShellAssoc
+  # Register file type
+  WriteRegStr ShCtx "Software\Classes\${ASSOC_PROGID}\DefaultIcon" "" "$InstDir\${ASSOC_APPEXE},0"
+  ;WriteRegStr ShCtx "Software\Classes\${ASSOC_PROGID}\shell\${ASSOC_VERB}" "" "Nullsoft Test App" [Optional]
+  ;WriteRegStr ShCtx "Software\Classes\${ASSOC_PROGID}\shell\${ASSOC_VERB}" "MUIVerb" "@$InstDir\${ASSOC_APPEXE},-42" ; WinXP+ [Optional] Localizable verb display name
+  WriteRegStr ShCtx "Software\Classes\${ASSOC_PROGID}\shell\${ASSOC_VERB}\command" "" '"$InstDir\${ASSOC_APPEXE}" "%1"'
+  WriteRegStr ShCtx "Software\Classes\${ASSOC_EXT}" "" "${ASSOC_PROGID}"
+
+  # Register "Open With" [Optional]
+  WriteRegNone ShCtx "Software\Classes\${ASSOC_EXT}\OpenWithList" "${ASSOC_APPEXE}" ; Win2000+ [Optional]
+  ;WriteRegNone ShCtx "Software\Classes\${ASSOC_EXT}\OpenWithProgids" "${ASSOC_PROGID}" ; WinXP+ [Optional]
+  WriteRegStr ShCtx "Software\Classes\Applications\${ASSOC_APPEXE}\shell\open\command" "" '"$InstDir\${ASSOC_APPEXE}" "%1"'
+  WriteRegStr ShCtx "Software\Classes\Applications\${ASSOC_APPEXE}" "FriendlyAppName" "Nullsoft Test App" ; [Optional]
+  WriteRegStr ShCtx "Software\Classes\Applications\${ASSOC_APPEXE}" "ApplicationCompany" "Nullsoft" ; [Optional]
+  WriteRegNone ShCtx "Software\Classes\Applications\${ASSOC_APPEXE}\SupportedTypes" "${ASSOC_EXT}" ; [Optional] Only allow "Open With" with specific extension(s) on WinXP+
+
+  # Register "Default Programs" [Optional]
+  !ifdef REGISTER_DEFAULTPROGRAMS
+  WriteRegStr ShCtx "Software\Classes\Applications\${ASSOC_APPEXE}\Capabilities" "ApplicationDescription" "Shell association example test application"
+  WriteRegStr ShCtx "Software\Classes\Applications\${ASSOC_APPEXE}\Capabilities\FileAssociations" "${ASSOC_EXT}" "${ASSOC_PROGID}"
+  WriteRegStr ShCtx "Software\RegisteredApplications" "Nullsoft Test App" "Software\Classes\Applications\${ASSOC_APPEXE}\Capabilities"
+  !endif
+
+  ${NotifyShell_AssocChanged}
+SectionEnd
+
+
+Section -un.ShellAssoc
+  # Unregister file type
+  ClearErrors
+  DeleteRegKey ShCtx "Software\Classes\${ASSOC_PROGID}\shell\${ASSOC_VERB}"
+  DeleteRegKey /IfEmpty ShCtx "Software\Classes\${ASSOC_PROGID}\shell"
+  ${IfNot} ${Errors}
+    DeleteRegKey ShCtx "Software\Classes\${ASSOC_PROGID}\DefaultIcon"
+  ${EndIf}
+  ReadRegStr $0 ShCtx "Software\Classes\${ASSOC_EXT}" ""
+  DeleteRegKey /IfEmpty ShCtx "Software\Classes\${ASSOC_PROGID}"
+  ${IfNot} ${Errors}
+  ${AndIf} $0 == "${ASSOC_PROGID}"
+    DeleteRegValue ShCtx "Software\Classes\${ASSOC_EXT}" ""
+    DeleteRegKey /IfEmpty ShCtx "Software\Classes\${ASSOC_EXT}"
+  ${EndIf}
+
+  # Unregister "Open With"
+  DeleteRegKey ShCtx "Software\Classes\Applications\${ASSOC_APPEXE}"
+  DeleteRegValue ShCtx "Software\Classes\${ASSOC_EXT}\OpenWithList" "${ASSOC_APPEXE}"
+  DeleteRegKey /IfEmpty ShCtx "Software\Classes\${ASSOC_EXT}\OpenWithList"
+  DeleteRegValue ShCtx "Software\Classes\${ASSOC_EXT}\OpenWithProgids" "${ASSOC_PROGID}"
+  DeleteRegKey /IfEmpty ShCtx "Software\Classes\${ASSOC_EXT}\OpenWithProgids"
+  DeleteRegKey /IfEmpty  ShCtx "Software\Classes\${ASSOC_EXT}"
+
+  # Unregister "Default Programs"
+  !ifdef REGISTER_DEFAULTPROGRAMS
+  DeleteRegValue ShCtx "Software\RegisteredApplications" "Nullsoft Test App"
+  DeleteRegKey ShCtx "Software\Classes\Applications\${ASSOC_APPEXE}\Capabilities"
+  DeleteRegKey /IfEmpty ShCtx "Software\Classes\Applications\${ASSOC_APPEXE}"
+  !endif
+
+  # Attempt to clean up junk left behind by the Windows shell
+  DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Search\JumplistData" "$InstDir\${ASSOC_APPEXE}"
+  DeleteRegValue HKCU "Software\Classes\Local Settings\Software\Microsoft\Windows\Shell\MuiCache" "$InstDir\${ASSOC_APPEXE}.FriendlyAppName"
+  DeleteRegValue HKCU "Software\Classes\Local Settings\Software\Microsoft\Windows\Shell\MuiCache" "$InstDir\${ASSOC_APPEXE}.ApplicationCompany"
+  DeleteRegValue HKCU "Software\Microsoft\Windows\ShellNoRoam\MUICache" "$InstDir\${ASSOC_APPEXE}" ; WinXP
+  DeleteRegValue HKCU "Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Compatibility Assistant\Store" "$InstDir\${ASSOC_APPEXE}"
+  DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\ApplicationAssociationToasts" "${ASSOC_PROGID}_${ASSOC_EXT}"
+  DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\ApplicationAssociationToasts" "Applications\${ASSOC_APPEXE}_${ASSOC_EXT}"
+  DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\${ASSOC_EXT}\OpenWithProgids" "${ASSOC_PROGID}"
+  DeleteRegKey /IfEmpty HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\${ASSOC_EXT}\OpenWithProgids"
+  DeleteRegKey /IfEmpty HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\${ASSOC_EXT}\OpenWithList"
+  DeleteRegKey /IfEmpty HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\${ASSOC_EXT}"
+  ;DeleteRegKey HKCU "Software\Microsoft\Windows\Roaming\OpenWith\FileExts\${ASSOC_EXT}"
+  ;DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\RecentDocs\${ASSOC_EXT}"
+
+  ${NotifyShell_AssocChanged}
+SectionEnd
+
+Section -Uninstall
+  ${UnpinShortcut} "$SMPrograms\${NAME}.lnk"
+  Delete "$SMPrograms\${NAME}.lnk"
+
+  Delete "$InstDir\MyApp.exe"
+  Delete "$InstDir\Uninst.exe"
+  RMDir "$InstDir"
+  DeleteRegKey HKCU "${REGPATH_UNINSTSUBKEY}"
+SectionEnd
Index: tmp/org.txm.setups/nsis/Examples/languages.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/languages.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/languages.nsi	(revision 2956)
@@ -3,6 +3,8 @@
 ; This is an example of a multilingual installer
 ; The user can select the language on startup
 
+!pragma warning error all
+
 ;--------------------------------
 
 OutFile languages.exe
@@ -11,6 +13,7 @@
 
 RequestExecutionLevel user
 
+Unicode True
 ;--------------------------------
 
 Page license
@@ -21,6 +24,7 @@
 
 ; First is default
 LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
+LoadLanguageFile "${NSISDIR}\Contrib\Language files\Czech.nlf"
 LoadLanguageFile "${NSISDIR}\Contrib\Language files\Dutch.nlf"
 LoadLanguageFile "${NSISDIR}\Contrib\Language files\French.nlf"
 LoadLanguageFile "${NSISDIR}\Contrib\Language files\German.nlf"
@@ -35,6 +39,7 @@
 ; License data
 ; Not exactly translated, but it shows what's needed
 LicenseLangString myLicenseData ${LANG_ENGLISH} "bigtest.nsi"
+LicenseLangString myLicenseData ${LANG_CZECH} "WordFuncTest.nsi"
 LicenseLangString myLicenseData ${LANG_DUTCH} "waplugin.nsi"
 LicenseLangString myLicenseData ${LANG_FRENCH} "example1.nsi"
 LicenseLangString myLicenseData ${LANG_GERMAN} "example2.nsi"
@@ -50,6 +55,7 @@
 
 ; Set name using the normal interface (Name command)
 LangString Name ${LANG_ENGLISH} "English"
+LangString Name ${LANG_CZECH} "Czech"
 LangString Name ${LANG_DUTCH} "Dutch"
 LangString Name ${LANG_FRENCH} "French"
 LangString Name ${LANG_GERMAN} "German"
@@ -65,6 +71,7 @@
 
 ; Directly change the inner lang strings (Same as ComponentText)
 LangString ^ComponentsText ${LANG_ENGLISH} "English component page"
+LangString ^ComponentsText ${LANG_CZECH} "Czech component page"
 LangString ^ComponentsText ${LANG_DUTCH} "Dutch component page"
 LangString ^ComponentsText ${LANG_FRENCH} "French component page"
 LangString ^ComponentsText ${LANG_GERMAN} "German component page"
@@ -81,6 +88,7 @@
 
 ; A LangString for the section name
 LangString Sec1Name ${LANG_ENGLISH} "English section #1"
+LangString Sec1Name ${LANG_CZECH} "Czech section #1"
 LangString Sec1Name ${LANG_DUTCH} "Dutch section #1"
 LangString Sec1Name ${LANG_FRENCH} "French section #1"
 LangString Sec1Name ${LANG_GERMAN} "German section #1"
@@ -94,6 +102,7 @@
 
 ; A multilingual message
 LangString Message ${LANG_ENGLISH} "English message"
+LangString Message ${LANG_CZECH} "Czech message"
 LangString Message ${LANG_DUTCH} "Dutch message"
 LangString Message ${LANG_FRENCH} "French message"
 LangString Message ${LANG_GERMAN} "German message"
@@ -118,6 +127,8 @@
 Section "Section number two"
 	StrCmp $LANGUAGE ${LANG_ENGLISH} 0 +2
 		MessageBox MB_OK "Installing English stuff"
+	StrCmp $LANGUAGE ${LANG_CZECH} 0 +2
+		MessageBox MB_OK "Installing Czech stuff"
 	StrCmp $LANGUAGE ${LANG_DUTCH} 0 +2
 		MessageBox MB_OK "Installing Dutch stuff"
 	StrCmp $LANGUAGE ${LANG_FRENCH} 0 +2
@@ -149,6 +160,8 @@
 	Push ""
 	Push ${LANG_ENGLISH}
 	Push English
+	Push ${LANG_CZECH}
+	Push Czech
 	Push ${LANG_DUTCH}
 	Push Dutch
 	Push ${LANG_FRENCH}
Index: tmp/org.txm.setups/nsis/Examples/makensis.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/makensis.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/makensis.nsi	(revision 2956)
@@ -1,26 +1,41 @@
 ;NSIS Setup Script
 ;--------------------------------
 
-!ifndef VERSION
-  !define VERSION 'anonymous-build'
+!pragma warning error all
+!pragma warning warning 7010 ; File /NonFatal
+
+!ifdef VER_MAJOR & VER_MINOR
+  !define /ifndef VER_REVISION 0
+  !define /ifndef VER_BUILD 0
 !endif
 
+!define /ifndef VERSION 'anonymous-build'
+
 ;--------------------------------
 ;Configuration
 
-!ifdef OUTFILE
-  OutFile "${OUTFILE}"
+!if ${NSIS_PTR_SIZE} > 4
+  !define BITS 64
+  !define NAMESUFFIX " (64 bit)"
 !else
-  OutFile ..\nsis-${VERSION}-setup.exe
+  !define BITS 32
+  !define NAMESUFFIX ""
 !endif
 
+!ifndef OUTFILE
+  !define OUTFILE "..\nsis${BITS}-${VERSION}-setup.exe"
+  !searchreplace OUTFILE "${OUTFILE}" nsis32 nsis
+!endif
+
+OutFile "${OUTFILE}"
+Unicode true
 SetCompressor /SOLID lzma
 
 InstType "Full"
 InstType "Lite"
 InstType "Minimal"
 
-InstallDir $PROGRAMFILES\NSIS
+InstallDir $PROGRAMFILES${BITS}\NSIS
 InstallDirRegKey HKLM Software\NSIS ""
 
 RequestExecutionLevel admin
@@ -33,44 +48,37 @@
 !include "LogicLib.nsh"
 !include "Memento.nsh"
 !include "WordFunc.nsh"
+!include "Util.nsh"
+!include "Integration.nsh"
 
 ;--------------------------------
-;Functions
-
-!ifdef VER_MAJOR & VER_MINOR & VER_REVISION & VER_BUILD
-
-  !insertmacro VersionCompare
-
-!endif
-
-;--------------------------------
-;Definitions
-
-!define SHCNE_ASSOCCHANGED 0x8000000
-!define SHCNF_IDLIST 0
-
-;--------------------------------
 ;Configuration
 
 ;Names
 Name "NSIS"
-Caption "NSIS ${VERSION} Setup"
+Caption "NSIS ${VERSION}${NAMESUFFIX} Setup"
 
+!define REG_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\NSIS"
+
 ;Memento Settings
 !define MEMENTO_REGISTRY_ROOT HKLM
-!define MEMENTO_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\NSIS"
+!define MEMENTO_REGISTRY_KEY "${REG_UNINST_KEY}"
 
 ;Interface Settings
 !define MUI_ABORTWARNING
 
+!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\nsis3-install.ico"
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\nsis3-uninstall.ico"
+
 !define MUI_HEADERIMAGE
-!define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\nsis.bmp"
+!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\nsis3-branding.bmp"
+!define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\nsis3-branding.bmp"
 
 !define MUI_COMPONENTSPAGE_SMALLDESC
 
 ;Pages
 !define MUI_WELCOMEPAGE_TITLE "Welcome to the NSIS ${VERSION} Setup Wizard"
-!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of NSIS (Nullsoft Scriptable Install System) ${VERSION}, the next generation of the Windows installer and uninstaller system that doesn't suck and isn't huge.$\r$\n$\r$\nNSIS 2 includes a new Modern User Interface, LZMA compression, support for multiple languages and an easy plug-in system.$\r$\n$\r$\n$_CLICK"
+!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of NSIS (Nullsoft Scriptable Install System) ${VERSION}, the next generation of the Windows installer and uninstaller system that doesn't suck and isn't huge.$\r$\n$\r$\nNSIS includes a Modern User Interface, LZMA compression, support for multiple languages and an easy plug-in system.$\r$\n$\r$\n$_CLICK"
 
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_LICENSE "..\COPYING"
@@ -102,8 +110,36 @@
 !insertmacro MUI_LANGUAGE "English"
 
 ;--------------------------------
+;Version information
+
+!ifdef VER_MAJOR & VER_MINOR & VER_REVISION & VER_BUILD
+VIProductVersion ${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}.${VER_BUILD}
+VIAddVersionKey "FileVersion" "${VERSION}"
+VIAddVersionKey "FileDescription" "NSIS Setup"
+VIAddVersionKey "LegalCopyright" "http://nsis.sf.net/License"
+!endif
+
+;--------------------------------
 ;Installer Sections
 
+!macro InstallPlugin pi
+  !if ${BITS} >= 64
+    File "/oname=$InstDir\Plugins\amd64-unicode\${pi}.dll" ..\Plugins\amd64-unicode\${pi}.dll
+  !else
+    File "/oname=$InstDir\Plugins\x86-ansi\${pi}.dll" ..\Plugins\x86-ansi\${pi}.dll
+    File "/oname=$InstDir\Plugins\x86-unicode\${pi}.dll" ..\Plugins\x86-unicode\${pi}.dll
+  !endif
+!macroend
+
+!macro InstallStub stub
+  !if ${BITS} >= 64
+    File ..\Stubs\${stub}-amd64-unicode
+  !else
+    File ..\Stubs\${stub}-x86-ansi
+    File ..\Stubs\${stub}-x86-unicode
+  !endif
+!macroend
+
 ${MementoSection} "NSIS Core Files (required)" SecCore
 
   SetDetailsPrint textonly
@@ -114,29 +150,44 @@
   SetOutPath $INSTDIR
   RMDir /r $SMPROGRAMS\NSIS
 
+  IfFileExists $INSTDIR\nsisconf.nsi "" +2
+  Rename $INSTDIR\nsisconf.nsi $INSTDIR\nsisconf.nsh
+  SetOverwrite off
+  File ..\nsisconf.nsh
+
   SetOverwrite on
   File ..\makensis.exe
   File ..\makensisw.exe
   File ..\COPYING
   File ..\NSIS.chm
-  !searchparse /file "..\NSIS.chm" "ITSF" VALIDATE_CHM
+  !pragma verifychm "..\NSIS.chm"
+  !if /FileExists "..\NSIS.exe"
+    !if /FileExists "..\NSIS.exe.manifest"
+      File "..\NSIS.exe.manifest"
+    !endif
+  !else
+    !define NO_NSISMENU_HTML 1
+    !makensis '-v2 "NSISMenu.nsi" "-XOutFile ..\NSIS.exe"' = 0
+  !endif
   File ..\NSIS.exe
-  File /nonfatal ..\NSIS.exe.manifest
 
-  IfFileExists $INSTDIR\nsisconf.nsi "" +2
-  Rename $INSTDIR\nsisconf.nsi $INSTDIR\nsisconf.nsh
-  SetOverwrite off
-  File ..\nsisconf.nsh
-  SetOverwrite on
+  SetOutPath $INSTDIR\Bin
+  File ..\Bin\makensis.exe
+!ifdef USE_NEW_ZLIB
+  File ..\Bin\zlib.dll
+!else
+  File ..\Bin\zlib1.dll
+!endif
 
   SetOutPath $INSTDIR\Stubs
-  File ..\Stubs\bzip2
-  File ..\Stubs\bzip2_solid
-  File ..\Stubs\lzma
-  File ..\Stubs\lzma_solid
-  File ..\Stubs\zlib
-  File ..\Stubs\zlib_solid
   File ..\Stubs\uninst
+  !insertmacro InstallStub bzip2
+  !insertmacro InstallStub bzip2_solid
+  !insertmacro InstallStub lzma
+  !insertmacro InstallStub lzma_solid
+  !insertmacro InstallStub zlib
+  !insertmacro InstallStub zlib_solid
+  
 
   SetOutPath $INSTDIR\Include
   File ..\Include\WinMessages.nsh
@@ -157,6 +208,7 @@
   File ..\Include\MultiUser.nsh
   File ..\Include\VB6RunTime.nsh
   File ..\Include\Util.nsh
+  File ..\Include\Integration.nsh
   File ..\Include\WinCore.nsh
 
   SetOutPath $INSTDIR\Include\Win
@@ -164,6 +216,8 @@
   File ..\Include\Win\WinError.nsh
   File ..\Include\Win\WinNT.nsh
   File ..\Include\Win\WinUser.nsh
+  File ..\Include\Win\COM.nsh
+  File ..\Include\Win\Propkey.nsh
 
   SetOutPath $INSTDIR\Docs\StrFunc
   File ..\Docs\StrFunc\StrFunc.txt
@@ -174,12 +228,14 @@
   SetOutPath $INSTDIR\Docs\makensisw
   File ..\Docs\makensisw\*.txt
 
-  SetOutPath $INSTDIR\Menu
-  File ..\Menu\*.html
-  SetOutPath $INSTDIR\Menu\images
-  File ..\Menu\images\header.gif
-  File ..\Menu\images\line.gif
-  File ..\Menu\images\site.gif
+  !ifndef NO_NSISMENU_HTML
+    SetOutPath $INSTDIR\Menu
+    File ..\Menu\*.html
+    SetOutPath $INSTDIR\Menu\images
+    File ..\Menu\images\header.gif
+    File ..\Menu\images\line.gif
+    File ..\Menu\images\site.gif
+  !endif
 
   Delete $INSTDIR\makensis.htm
   Delete $INSTDIR\Docs\*.html
@@ -187,24 +243,36 @@
   RMDir $INSTDIR\Docs
 
   SetOutPath $INSTDIR\Bin
-  File ..\Bin\LibraryLocal.exe
-  File ..\Bin\RegTool.bin
+  !if ${BITS} >= 64
+    File /NonFatal  ..\Bin\RegTool-x86.bin
+    File            ..\Bin\RegTool-amd64.bin
+  !else
+    File            ..\Bin\RegTool-x86.bin
+    !if /FileExists ..\Bin\RegTool-amd64.bin ; It is unlikely that this exists, avoid the /NonFatal warning.
+      File          ..\Bin\RegTool-amd64.bin
+    !endif
+  !endif
 
-  SetOutPath $INSTDIR\Plugins
-  File ..\Plugins\TypeLib.dll
+  CreateDirectory $INSTDIR\Plugins\x86-ansi
+  CreateDirectory $INSTDIR\Plugins\x86-unicode
+  !if ${BITS} >= 64
+    CreateDirectory $INSTDIR\Plugins\amd64-unicode
+  !endif
+  !insertmacro InstallPlugin TypeLib
 
   ReadRegStr $R0 HKCR ".nsi" ""
   StrCmp $R0 "NSISFile" 0 +2
     DeleteRegKey HKCR "NSISFile"
 
   WriteRegStr HKCR ".nsi" "" "NSIS.Script"
+  WriteRegStr HKCR ".nsi" "PerceivedType" "text"
   WriteRegStr HKCR "NSIS.Script" "" "NSIS Script File"
   WriteRegStr HKCR "NSIS.Script\DefaultIcon" "" "$INSTDIR\makensisw.exe,1"
   ReadRegStr $R0 HKCR "NSIS.Script\shell\open\command" ""
-  StrCmp $R0 "" 0 no_nsiopen
+  ${If} $R0 == ""
     WriteRegStr HKCR "NSIS.Script\shell" "" "open"
     WriteRegStr HKCR "NSIS.Script\shell\open\command" "" 'notepad.exe "%1"'
-  no_nsiopen:
+  ${EndIf}
   WriteRegStr HKCR "NSIS.Script\shell\compile" "" "Compile NSIS Script"
   WriteRegStr HKCR "NSIS.Script\shell\compile\command" "" '"$INSTDIR\makensisw.exe" "%1"'
   WriteRegStr HKCR "NSIS.Script\shell\compile-compressor" "" "Compile NSIS Script (Choose Compressor)"
@@ -215,15 +283,16 @@
     DeleteRegKey HKCR "NSHFile"
 
   WriteRegStr HKCR ".nsh" "" "NSIS.Header"
+  WriteRegStr HKCR ".nsh" "PerceivedType" "text"
   WriteRegStr HKCR "NSIS.Header" "" "NSIS Header File"
-  WriteRegStr HKCR "NSIS.Header\DefaultIcon" "" "$INSTDIR\makensisw.exe,1"
+  WriteRegStr HKCR "NSIS.Header\DefaultIcon" "" "$INSTDIR\makensisw.exe,2"
   ReadRegStr $R0 HKCR "NSIS.Header\shell\open\command" ""
-  StrCmp $R0 "" 0 no_nshopen
+  ${If} $R0 == ""
     WriteRegStr HKCR "NSIS.Header\shell" "" "open"
     WriteRegStr HKCR "NSIS.Header\shell\open\command" "" 'notepad.exe "%1"'
-  no_nshopen:
+  ${EndIf}
 
-  System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
+  ${NotifyShell_AssocChanged}
 
 ${MementoSectionEnd}
 
@@ -238,7 +307,8 @@
   File ..\Examples\makensis.nsi
   File ..\Examples\example1.nsi
   File ..\Examples\example2.nsi
-  File ..\Examples\viewhtml.nsi
+  File ..\Examples\install-per-user.nsi
+  File ..\Examples\install-shared.nsi
   File ..\Examples\waplugin.nsi
   File ..\Examples\bigtest.nsi
   File ..\Examples\primes.nsi
@@ -248,7 +318,6 @@
   File ..\Examples\languages.nsi
   File ..\Examples\Library.nsi
   File ..\Examples\VersionInfo.nsi
-  File ..\Examples\UserVars.nsi
   File ..\Examples\LogicLib.nsi
   File ..\Examples\silent.nsi
   File ..\Examples\StrFunc.nsi
@@ -262,6 +331,8 @@
   File ..\Examples\WordFunc.ini
   File ..\Examples\WordFuncTest.nsi
   File ..\Examples\Memento.nsi
+  File ..\Examples\unicode.nsi
+  File ..\Examples\NSISMenu.nsi
 
   SetOutPath $INSTDIR\Examples\Plugin
   File ..\Examples\Plugin\exdll.c
@@ -276,8 +347,9 @@
 
   SetOutPath $INSTDIR\Examples\Plugin\nsis
   File ..\Examples\Plugin\nsis\pluginapi.h
-  File ..\Examples\Plugin\nsis\pluginapi.lib
+  File /nonfatal ..\Examples\Plugin\nsis\pluginapi*.lib
   File ..\Examples\Plugin\nsis\api.h
+  File ..\Examples\Plugin\nsis\nsis_tchar.h
 
 ${MementoSectionEnd}
 
@@ -299,10 +371,10 @@
   SectionIn 1 2
   SetOutPath $INSTDIR
 !ifndef NO_STARTMENUSHORTCUTS
-  CreateShortCut "$SMPROGRAMS\NSIS.lnk" "$INSTDIR\NSIS.exe"
+  CreateShortcut "$SMPROGRAMS\NSIS${NAMESUFFIX}.lnk" "$INSTDIR\NSIS.exe"
 !endif
 
-  CreateShortCut "$DESKTOP\NSIS.lnk" "$INSTDIR\NSIS.exe"
+  CreateShortcut "$DESKTOP\NSIS${NAMESUFFIX}.lnk" "$INSTDIR\NSIS.exe"
 
 ${MementoSectionEnd}
 
@@ -440,11 +512,10 @@
   SetOutPath $INSTDIR\Bin
   File ..\Bin\MakeLangID.exe
 
-  !insertmacro SectionFlagIsSet ${SecInterfacesModernUI} ${SF_SELECTED} mui nomui
-  mui:
+  ${If} ${SectionIsSelected} ${SecInterfacesModernUI}
     SetOutPath "$INSTDIR\Contrib\Language files"
     File "..\Contrib\Language files\*.nsh"
-  nomui:
+  ${EndIf}
 
 ${MementoSectionEnd}
 
@@ -479,8 +550,7 @@
 
   SectionIn 1
 
-  SetOutPath $INSTDIR\Plugins
-  File ..\Plugins\Banner.dll
+  !insertmacro InstallPlugin Banner
   SetOutPath $INSTDIR\Docs\Banner
   File ..\Docs\Banner\Readme.txt
   SetOutPath $INSTDIR\Examples\Banner
@@ -494,8 +564,7 @@
   SetDetailsPrint listonly
 
   SectionIn 1
-  SetOutPath $INSTDIR\Plugins
-  File ..\Plugins\LangDLL.dll
+  !insertmacro InstallPlugin LangDLL
 ${MementoSectionEnd}
 
 ${MementoSection} "nsExec" SecPluginsnsExec
@@ -506,8 +575,7 @@
 
   SectionIn 1
 
-  SetOutPath $INSTDIR\Plugins
-  File ..\Plugins\nsExec.dll
+  !insertmacro InstallPlugin nsExec
   SetOutPath $INSTDIR\Docs\nsExec
   File ..\Docs\nsExec\nsExec.txt
   SetOutPath $INSTDIR\Examples\nsExec
@@ -522,8 +590,7 @@
 
   SectionIn 1
 
-  SetOutPath $INSTDIR\Plugins
-  File ..\Plugins\splash.dll
+  !insertmacro InstallPlugin splash
   SetOutPath $INSTDIR\Docs\Splash
   File ..\Docs\Splash\splash.txt
   SetOutPath $INSTDIR\Examples\Splash
@@ -538,8 +605,7 @@
 
   SectionIn 1
 
-  SetOutPath $INSTDIR\Plugins
-  File ..\Plugins\advsplash.dll
+  !insertmacro InstallPlugin advsplash
   SetOutPath $INSTDIR\Docs\AdvSplash
   File ..\Docs\AdvSplash\advsplash.txt
   SetOutPath $INSTDIR\Examples\AdvSplash
@@ -554,8 +620,7 @@
 
   SectionIn 1
 
-  SetOutPath $INSTDIR\Plugins
-  File ..\Plugins\BgImage.dll
+  !insertmacro InstallPlugin BgImage
   SetOutPath $INSTDIR\Docs\BgImage
   File ..\Docs\BgImage\BgImage.txt
   SetOutPath $INSTDIR\Examples\BgImage
@@ -570,8 +635,7 @@
 
   SectionIn 1
 
-  SetOutPath $INSTDIR\Plugins
-  File ..\Plugins\InstallOptions.dll
+  !insertmacro InstallPlugin InstallOptions
   SetOutPath $INSTDIR\Docs\InstallOptions
   File ..\Docs\InstallOptions\Readme.html
   File ..\Docs\InstallOptions\Changelog.txt
@@ -594,8 +658,7 @@
 
   SectionIn 1
 
-  SetOutPath $INSTDIR\Plugins
-  File ..\Plugins\nsDialogs.dll
+  !insertmacro InstallPlugin nsDialogs
   SetOutPath $INSTDIR\Examples\nsDialogs
   File ..\Examples\nsDialogs\example.nsi
   File ..\Examples\nsDialogs\InstallOptions.nsi
@@ -615,8 +678,7 @@
 
   SectionIn 1
 
-  SetOutPath $INSTDIR\Plugins
-  File ..\Plugins\Math.dll
+  !insertmacro InstallPlugin Math
   SetOutPath $INSTDIR\Docs\Math
   File ..\Docs\Math\Math.txt
   SetOutPath $INSTDIR\Examples\Math
@@ -635,8 +697,7 @@
 
   SectionIn 1
 
-  SetOutPath $INSTDIR\Plugins
-  File ..\Plugins\nsisdl.dll
+  !insertmacro InstallPlugin nsisdl
   SetOutPath $INSTDIR\Docs\NSISdl
   File ..\Docs\NSISdl\ReadMe.txt
   File ..\Docs\NSISdl\License.txt
@@ -650,8 +711,7 @@
 
   SectionIn 1
 
-  SetOutPath $INSTDIR\Plugins
-  File ..\Plugins\System.dll
+  !insertmacro InstallPlugin System
   SetOutPath $INSTDIR\Docs\System
   File ..\Docs\System\System.html
   File ..\Docs\System\WhatsNew.txt
@@ -670,8 +730,7 @@
 
   SectionIn 1
 
-  SetOutPath $INSTDIR\Plugins
-  File ..\Plugins\StartMenu.dll
+  !insertmacro InstallPlugin StartMenu
   SetOutPath $INSTDIR\Docs\StartMenu
   File ..\Docs\StartMenu\Readme.txt
   SetOutPath $INSTDIR\Examples\StartMenu
@@ -686,8 +745,7 @@
 
   SectionIn 1
 
-  SetOutPath $INSTDIR\Plugins
-  File ..\Plugins\UserInfo.dll
+  !insertmacro InstallPlugin UserInfo
   SetOutPath $INSTDIR\Examples\UserInfo
   File ..\Examples\UserInfo\UserInfo.nsi
 ${MementoSectionEnd}
@@ -700,8 +758,7 @@
 
   SectionIn 1
 
-  SetOutPath $INSTDIR\Plugins
-  File ..\Plugins\Dialer.dll
+  !insertmacro InstallPlugin Dialer
   SetOutPath $INSTDIR\Docs\Dialer
   File ..\Docs\Dialer\Dialer.txt
 ${MementoSectionEnd}
@@ -714,8 +771,7 @@
 
   SectionIn 1
 
-  SetOutPath $INSTDIR\Plugins
-  File ..\Plugins\VPatch.dll
+  !insertmacro InstallPlugin VPatch
   SetOutPath $INSTDIR\Examples\VPatch
   File ..\Examples\VPatch\example.nsi
   File ..\Examples\VPatch\oldfile.txt
@@ -739,30 +795,19 @@
   ; * Always install the English language file
   ; * Always install default icons / bitmaps
 
-  !insertmacro SectionFlagIsSet ${SecInterfacesModernUI} ${SF_SELECTED} mui nomui
+  ${If} ${SectionIsSelected} ${SecInterfacesModernUI}
 
-    mui:
-
     SetDetailsPrint textonly
     DetailPrint "Configuring Modern UI..."
     SetDetailsPrint listonly
 
-    !insertmacro SectionFlagIsSet ${SecLangFiles} ${SF_SELECTED} langfiles nolangfiles
-
-      nolangfiles:
-
+    ${IfNot} ${SectionIsSelected} ${SecLangFiles}
       SetOutPath "$INSTDIR\Contrib\Language files"
       File "..\Contrib\Language files\English.nlf"
-      SetOutPath "$INSTDIR\Contrib\Language files"
       File "..\Contrib\Language files\English.nsh"
+    ${EndIf}
 
-    langfiles:
-
-    !insertmacro SectionFlagIsSet ${SecGraphics} ${SF_SELECTED} graphics nographics
-
-      nographics:
-
-      SetOutPath $INSTDIR\Contrib\Graphics
+    ${IfNot} ${SectionIsSelected} ${SecGraphics}
       SetOutPath $INSTDIR\Contrib\Graphics\Checks
       File "..\Contrib\Graphics\Checks\modern.bmp"
       SetOutPath $INSTDIR\Contrib\Graphics\Icons
@@ -772,11 +817,10 @@
       File "..\Contrib\Graphics\Header\nsis.bmp"
       SetOutPath $INSTDIR\Contrib\Graphics\Wizard
       File "..\Contrib\Graphics\Wizard\win.bmp"
+    ${EndIf}
 
-    graphics:
+  ${EndIf}
 
-  nomui:
-
   SetDetailsPrint textonly
   DetailPrint "Creating Registry Keys..."
   SetDetailsPrint listonly
@@ -791,19 +835,23 @@
   WriteRegDword HKLM "Software\NSIS" "VersionBuild" "${VER_BUILD}"
 !endif
 
-  WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\NSIS" "UninstallString" '"$INSTDIR\uninst-nsis.exe"'
-  WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\NSIS" "InstallLocation" "$INSTDIR"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\NSIS" "DisplayName" "Nullsoft Install System"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\NSIS" "DisplayIcon" "$INSTDIR\NSIS.exe,0"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\NSIS" "DisplayVersion" "${VERSION}"
+  WriteRegExpandStr HKLM "${REG_UNINST_KEY}" "UninstallString" '"$INSTDIR\uninst-nsis.exe"'
+  ;WriteRegStr HKLM "${REG_UNINST_KEY}" "QuietUninstallString" '"$INSTDIR\uninst-nsis.exe" /S' ; Ideally WACK would use this
+  WriteRegExpandStr HKLM "${REG_UNINST_KEY}" "InstallLocation" "$INSTDIR"
+  WriteRegStr HKLM "${REG_UNINST_KEY}" "DisplayName" "Nullsoft Install System${NAMESUFFIX}"
+  WriteRegStr HKLM "${REG_UNINST_KEY}" "DisplayIcon" "$INSTDIR\uninst-nsis.exe,0"
+  WriteRegStr HKLM "${REG_UNINST_KEY}" "DisplayVersion" "${VERSION}"
 !ifdef VER_MAJOR & VER_MINOR & VER_REVISION & VER_BUILD
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\NSIS" "VersionMajor" "${VER_MAJOR}"
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\NSIS" "VersionMinor" "${VER_MINOR}.${VER_REVISION}"
+  WriteRegDWORD HKLM "${REG_UNINST_KEY}" "VersionMajor" "${VER_MAJOR}" ; Required by WACK
+  WriteRegDWORD HKLM "${REG_UNINST_KEY}" "VersionMinor" "${VER_MINOR}" ; Required by WACK
 !endif
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\NSIS" "URLInfoAbout" "http://nsis.sourceforge.net/"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\NSIS" "HelpLink" "http://nsis.sourceforge.net/Support"
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\NSIS" "NoModify" "1"
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\NSIS" "NoRepair" "1"
+  WriteRegStr HKLM "${REG_UNINST_KEY}" "Publisher" "Nullsoft and Contributors" ; Required by WACK
+  WriteRegStr HKLM "${REG_UNINST_KEY}" "URLInfoAbout" "https://nsis.sourceforge.io/"
+  WriteRegStr HKLM "${REG_UNINST_KEY}" "HelpLink" "https://nsis.sourceforge.io/Support"
+  WriteRegDWORD HKLM "${REG_UNINST_KEY}" "NoModify" "1"
+  WriteRegDWORD HKLM "${REG_UNINST_KEY}" "NoRepair" "1"
+  ${MakeARPInstallDate} $1
+  WriteRegStr HKLM "${REG_UNINST_KEY}" "InstallDate" $1
 
   WriteUninstaller $INSTDIR\uninst-nsis.exe
 
@@ -862,15 +910,15 @@
 Function PageReinstall
 
   ReadRegStr $R0 HKLM "Software\NSIS" ""
+  ReadRegStr $R1 HKLM "${REG_UNINST_KEY}" "UninstallString"
+  ${IfThen} "$R0$R1" == "" ${|} Abort ${|}
 
-  ${If} $R0 == ""
-    Abort
-  ${EndIf}
-
+  StrCpy $R4 "older"
   ReadRegDWORD $R0 HKLM "Software\NSIS" "VersionMajor"
   ReadRegDWORD $R1 HKLM "Software\NSIS" "VersionMinor"
   ReadRegDWORD $R2 HKLM "Software\NSIS" "VersionRevision"
   ReadRegDWORD $R3 HKLM "Software\NSIS" "VersionBuild"
+  ${IfThen} $R0 = 0 ${|} StrCpy $R4 "unknown" ${|} ; Anonymous builds have no version number
   StrCpy $R0 $R0.$R1.$R2.$R3
 
   ${VersionCompare} ${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}.${VER_BUILD} $R0 $R0
@@ -881,7 +929,7 @@
     !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose the maintenance option to perform."
     StrCpy $R0 "2"
   ${ElseIf} $R0 == 1
-    StrCpy $R1 "An older version of NSIS is installed on your system. It's recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
+    StrCpy $R1 "An $R4 version of NSIS is installed on your system. It's recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
     StrCpy $R2 "Uninstall before installing"
     StrCpy $R3 "Do not uninstall"
     !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install NSIS."
@@ -940,34 +988,40 @@
 
   ${NSD_GetState} $R2 $R1
 
-  StrCmp $R0 "1" 0 +2
+  StrCmp $R0 "1" 0 +2 ; Existing install is not the same version?
     StrCmp $R1 "1" reinst_uninstall reinst_done
 
-  StrCmp $R0 "2" 0 +3
-    StrCmp $R1 "1" reinst_done reinst_uninstall
+  StrCmp $R1 "1" reinst_done ; Same version, skip to add/reinstall components?
 
   reinst_uninstall:
-  ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\NSIS" "UninstallString"
+  ReadRegStr $R1 HKLM "${REG_UNINST_KEY}" "UninstallString"
 
   ;Run uninstaller
-  HideWindow
+    HideWindow
 
     ClearErrors
-    ExecWait '$R1 _?=$INSTDIR'
+    ExecWait '$R1 _?=$INSTDIR' $0
 
-    IfErrors no_remove_uninstaller
-    IfFileExists "$INSTDIR\makensis.exe" no_remove_uninstaller
+    BringToFront
 
+    ${IfThen} ${Errors} ${|} StrCpy $0 2 ${|} ; ExecWait failed, set fake exit code
+
+    ${If} $0 <> 0
+    ${OrIf} ${FileExists} "$INSTDIR\Bin\makensis.exe"
+      ${If} $0 = 1 ; User aborted uninstaller?
+        StrCmp $R0 "2" 0 +2 ; Is the existing install the same version?
+          Quit ; ...yes, already installed, we are done
+        Abort
+      ${EndIf}
+      MessageBox MB_ICONEXCLAMATION "Unable to uninstall!"
+      Abort
+    ${Else}
+      StrCpy $0 $R1 1
+      ${IfThen} $0 == '"' ${|} StrCpy $R1 $R1 -1 1 ${|} ; Strip quotes from UninstallString
       Delete $R1
       RMDir $INSTDIR
+    ${EndIf}
 
-    no_remove_uninstaller:
-
-  StrCmp $R0 "2" 0 +2
-    Quit
-
-  BringToFront
-
   reinst_done:
 
 FunctionEnd
@@ -975,16 +1029,12 @@
 !endif # VER_MAJOR & VER_MINOR & VER_REVISION & VER_BUILD
 
 Function ShowReleaseNotes
-  ${If} ${FileExists} $WINDIR\hh.exe
-    StrCpy $0 $WINDIR\hh.exe
+  StrCpy $0 $WINDIR\hh.exe
+  ${IfNotThen} ${FileExists} $0 ${|} SearchPath $0 hh.exe ${|}
+  ${If} ${FileExists} $0
     Exec '"$0" mk:@MSITStore:$INSTDIR\NSIS.chm::/SectionF.1.html'
   ${Else}
-    SearchPath $0 hh.exe
-    ${If} ${FileExists} $0
-      Exec '"$0" mk:@MSITStore:$INSTDIR\NSIS.chm::/SectionF.1.html'
-    ${Else}
-      ExecShell "open" "http://nsis.sourceforge.net/Docs/AppendixF.html#F.1"
-    ${EndIf}
+    ExecShell "" "https://nsis.sourceforge.io/Docs/AppendixF.html#F.1"
   ${EndIf}
 FunctionEnd
 
@@ -997,7 +1047,7 @@
   DetailPrint "Uninstalling NSI Development Shell Extensions..."
   SetDetailsPrint listonly
 
-  IfFileExists $INSTDIR\makensis.exe nsis_installed
+  IfFileExists $INSTDIR\Bin\makensis.exe nsis_installed
     MessageBox MB_YESNO "It does not appear that NSIS is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?" IDYES nsis_installed
     Abort "Uninstall aborted by user"
   nsis_installed:
@@ -1006,31 +1056,32 @@
   DetailPrint "Deleting Registry Keys..."
   SetDetailsPrint listonly
 
-  ReadRegStr $R0 HKCR ".nsi" ""
-  StrCmp $R0 "NSIS.Script" 0 +2
-    DeleteRegKey HKCR ".nsi"
+  !macro AssocDeleteFileExtAndProgId _hkey _dotext _pid
+  ReadRegStr $R0 ${_hkey} "Software\Classes\${_dotext}" ""
+  StrCmp $R0 "${_pid}" 0 +2
+    DeleteRegKey ${_hkey} "Software\Classes\${_dotext}"
 
-  ReadRegStr $R0 HKCR ".nsh" ""
-  StrCmp $R0 "NSIS.Header" 0 +2
-    DeleteRegKey HKCR ".nsh"
+  DeleteRegKey ${_hkey} "Software\Classes\${_pid}"
+  !macroend
 
-  DeleteRegKey HKCR "NSIS.Script"
-  DeleteRegKey HKCR "NSIS.Header"
+  !insertmacro AssocDeleteFileExtAndProgId HKLM ".nsi" "NSIS.Script"
+  !insertmacro AssocDeleteFileExtAndProgId HKLM ".nsh" "NSIS.Header"
 
-  System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
+  ${NotifyShell_AssocChanged}
 
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\NSIS"
+  DeleteRegKey HKLM "${REG_UNINST_KEY}"
   DeleteRegKey HKLM "Software\NSIS"
 
   SetDetailsPrint textonly
   DetailPrint "Deleting Files..."
   SetDetailsPrint listonly
 
-  Delete $SMPROGRAMS\NSIS.lnk
-  Delete $DESKTOP\NSIS.lnk
+  Delete "$SMPROGRAMS\NSIS${NAMESUFFIX}.lnk"
+  Delete "$DESKTOP\NSIS${NAMESUFFIX}.lnk"
   Delete $INSTDIR\makensis.exe
   Delete $INSTDIR\makensisw.exe
   Delete $INSTDIR\NSIS.exe
+  Delete $INSTDIR\NSIS.exe.manifest
   Delete $INSTDIR\license.txt
   Delete $INSTDIR\COPYING
   Delete $INSTDIR\uninst-nsis.exe
Index: tmp/org.txm.setups/nsis/Examples/example1.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/example1.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/example1.nsi	(revision 2956)
@@ -4,6 +4,8 @@
 ; optional settings are left to their default settings. The installer simply 
 ; prompts the user asking them where to install, and drops a copy of example1.nsi
 ; there. 
+;
+; example2.nsi expands on this by adding a uninstaller and start menu shortcuts.
 
 ;--------------------------------
 
@@ -13,12 +15,15 @@
 ; The file to write
 OutFile "example1.exe"
 
+; Request application privileges for Windows Vista
+RequestExecutionLevel user
+
+; Build Unicode installer
+Unicode True
+
 ; The default installation directory
 InstallDir $DESKTOP\Example1
 
-; Request application privileges for Windows Vista
-RequestExecutionLevel user
-
 ;--------------------------------
 
 ; Pages
Index: tmp/org.txm.setups/nsis/Examples/example2.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/example2.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/example2.nsi	(revision 2956)
@@ -3,7 +3,10 @@
 ; This script is based on example1.nsi, but it remember the directory, 
 ; has uninstall support and (optionally) installs start menu shortcuts.
 ;
-; It will install example2.nsi into a directory that the user selects,
+; It will install example2.nsi into a directory that the user selects.
+;
+; See install-shared.nsi for a more robust way of checking for administrator rights.
+; See install-per-user.nsi for a file association example.
 
 ;--------------------------------
 
@@ -13,6 +16,12 @@
 ; The file to write
 OutFile "example2.exe"
 
+; Request application privileges for Windows Vista and higher
+RequestExecutionLevel admin
+
+; Build Unicode installer
+Unicode True
+
 ; The default installation directory
 InstallDir $PROGRAMFILES\Example2
 
@@ -20,9 +29,6 @@
 ; overwrite the old one automatically)
 InstallDirRegKey HKLM "Software\NSIS_Example2" "Install_Dir"
 
-; Request application privileges for Windows Vista
-RequestExecutionLevel admin
-
 ;--------------------------------
 
 ; Pages
@@ -55,7 +61,7 @@
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example2" "UninstallString" '"$INSTDIR\uninstall.exe"'
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example2" "NoModify" 1
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example2" "NoRepair" 1
-  WriteUninstaller "uninstall.exe"
+  WriteUninstaller "$INSTDIR\uninstall.exe"
   
 SectionEnd
 
@@ -63,9 +69,9 @@
 Section "Start Menu Shortcuts"
 
   CreateDirectory "$SMPROGRAMS\Example2"
-  CreateShortCut "$SMPROGRAMS\Example2\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-  CreateShortCut "$SMPROGRAMS\Example2\Example2 (MakeNSISW).lnk" "$INSTDIR\example2.nsi" "" "$INSTDIR\example2.nsi" 0
-  
+  CreateShortcut "$SMPROGRAMS\Example2\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+  CreateShortcut "$SMPROGRAMS\Example2\Example2 (MakeNSISW).lnk" "$INSTDIR\example2.nsi"
+
 SectionEnd
 
 ;--------------------------------
@@ -83,9 +89,9 @@
   Delete $INSTDIR\uninstall.exe
 
   ; Remove shortcuts, if any
-  Delete "$SMPROGRAMS\Example2\*.*"
+  Delete "$SMPROGRAMS\Example2\*.lnk"
 
-  ; Remove directories used
+  ; Remove directories
   RMDir "$SMPROGRAMS\Example2"
   RMDir "$INSTDIR"
 
Index: tmp/org.txm.setups/nsis/Examples/one-section.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/one-section.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/one-section.nsi	(revision 2956)
@@ -20,7 +20,8 @@
 
 ; Pages
 
-Page components
+Page Components
+Page InstFiles
 
 ;--------------------------------
 
@@ -69,11 +70,11 @@
     !insertmacro RadioButton ${g1o2}
     !insertmacro RadioButton ${g1o3}
   !insertmacro EndRadioButtons
-	
+
   !insertmacro StartRadioButtons $2
     !insertmacro RadioButton ${g2o1}
     !insertmacro RadioButton ${g2o2}
     !insertmacro RadioButton ${g2o3}
   !insertmacro EndRadioButtons
-	
+
 FunctionEnd
\ No newline at end of file
Index: tmp/org.txm.setups/nsis/Examples/gfx.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/gfx.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/gfx.nsi	(revision 2956)
@@ -29,7 +29,7 @@
 ; It is not enough to just add the placeholder, we must set the image too...
 ; We will later set the image in every pre-page function.
 ; We can also set just one persistent image in .onGUIInit
-AddBrandingImage left 100
+AddBrandingImage left 100u
 
 ; Sets the font of the installer
 SetFont "Comic Sans MS" 8
@@ -62,7 +62,7 @@
 	MessageBox MB_YESNO "We can change the branding image from within a section too!$\nDo you want me to change it?" IDNO done
 		!insertmacro BIMAGE "${NSISDIR}\Contrib\Graphics\Wizard\nsis.bmp" ""
 	done:
-	WriteUninstaller uninst.exe
+	WriteUninstaller $INSTDIR\uninst.exe
 SectionEnd
 
 ;--------------------------------
Index: tmp/org.txm.setups/nsis/Examples/StrFunc.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/StrFunc.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/StrFunc.nsi	(revision 2956)
@@ -32,6 +32,29 @@
 ${UnStrTrimNewLines}
 ${UnStrSort}
 
+
+Var SFPass
+Var SFTotl
+!macro EndStrFuncTestEx lbl name
+  IfErrors ${lbl}
+  DetailPrint "PASSED ${name} test"
+  IntOp $SFPass $SFPass + 1
+  IntOp $SFTotl $SFTotl + 1
+  Goto +3
+${lbl}:
+  DetailPrint "FAILED ${name} test"
+  IntOp $SFTotl $SFTotl + 1
+!macroend
+!macro EndStrFuncTest name
+  !insertmacro EndStrFuncTestEx "${name}error" "${name}"
+!macroend
+
+CompletedText "Passed $SFPass of $SFTotl tests"
+!macro CompletedAllTests
+  StrCmp $SFPass $SFTotl +2
+    SetErrorLevel 42
+!macroend
+
 !macro StackVerificationStart
   StrCpy $0 S0
   StrCpy $1 S1
@@ -103,16 +126,13 @@
   ${StrCase} $0 "what about taking a shower tomorrow? it's late to do so now! try to sleep now. Good Night!" "S"
   StrCmp $0 "What about taking a shower tomorrow? It's late to do so now! Try to sleep now. Good night!" 0 strcaseerror
   !insertmacro StackVerificationEnd
-  IfErrors strcaseerror
+  !insertmacro EndStrFuncTest StrCase
 
-  DetailPrint "PASSED StrCase test"
-  Goto +2
-strcaseerror:
-  DetailPrint "FAILED StrCase test"
-
   # Test clipboard function
   !insertmacro StackVerificationStart
+  !verbose push 4
   ${StrClb} $0 "StrFunc clipboard test" ">"
+  !verbose pop
   StrCmp $0 "" 0 strclberror
   ${StrClb} $0 "StrFunc clipboard test #2" "<>"
   StrCmp $0 "StrFunc clipboard test" 0 strclberror
@@ -121,13 +141,8 @@
   ${StrClb} $0 "" ""
   StrCmp $0 "" 0 strclberror
   !insertmacro StackVerificationEnd
-  IfErrors strclberror
+  !insertmacro EndStrFuncTest StrClb
 
-  DetailPrint "PASSED StrClb test"
-  Goto +2
-strclberror:
-  DetailPrint "FAILED StrClb test"
-
   # Test IO functions
   !insertmacro StackVerificationStart
   !macro testio str
@@ -144,13 +159,8 @@
   !insertmacro testio ""
   !insertmacro testio " "
   !insertmacro StackVerificationEnd
-  IfErrors ioerror
-
-  DetailPrint "PASSED StrNSISToIO/StrIOToNSIS test"
-  Goto +2
-ioerror:
-  DetailPrint "FAILED StrNSISToIO/StrIOToNSIS test"
-
+  !insertmacro EndStrFuncTestEx ioerror "StrNSISToIO/StrIOToNSIS"
+ 
   # Test string search functions
   !insertmacro StackVerificationStart
   ${StrLoc} $0 "This is just an example" "just" "<"
@@ -174,12 +184,7 @@
   ${StrLoc} $0 abc d <
   StrCmp $0 "" 0 strlocerror
   !insertmacro StackVerificationEnd
-  IfErrors strlocerror
-  
-  DetailPrint "PASSED StrLoc test"
-  Goto +2
-strlocerror:
-  DetailPrint "FAILED StrLoc test"
+  !insertmacro EndStrFuncTest StrLoc
 
   # Test string replacement
   !insertmacro StackVerificationStart
@@ -198,12 +203,7 @@
   ${StrRep} $0 "test" "" ""
   StrCmp $0 "test" 0 strreperror
   !insertmacro StackVerificationEnd
-  IfErrors strreperror
-  
-  DetailPrint "PASSED StrRep test"
-  Goto +2
-strreperror:
-  DetailPrint "FAILED StrRep test"
+  !insertmacro EndStrFuncTest StrRep
 
   # Test sorting
   !insertmacro StackVerificationStart
@@ -246,12 +246,7 @@
   ${StrSort} $0 "" " " "something" " " "1" "0" "1"
   StrCmp $0 "" 0 strsorterror
   !insertmacro StackVerificationEnd
-  IfErrors strsorterror
-  
-  DetailPrint "PASSED StrSort test"
-  Goto +2
-strsorterror:
-  DetailPrint "FAILED StrSort test"
+  !insertmacro EndStrFuncTest StrSort
 
   !insertmacro StackVerificationStart
   ${StrStr} $0 "abcefghijklmnopqrstuvwxyz" "g"
@@ -263,12 +258,7 @@
   ${StrStr} $0 "a" "abcefghijklmnopqrstuvwxyz"
   StrCmp $0 "" 0 strstrerror
   !insertmacro StackVerificationEnd
-  IfErrors strstrerror
-  
-  DetailPrint "PASSED StrStr test"
-  Goto +2
-strstrerror:
-  DetailPrint "FAILED StrStr test"
+  !insertmacro EndStrFuncTest StrStr
 
   !insertmacro StackVerificationStart
   ${StrStrAdv} $0 "abcabcabc" "a" ">" ">" "1" "0" "0"
@@ -312,12 +302,7 @@
   ${StrStrAdv} $0 "ABCabcabc" "abc" "<" ">" "0" "1" "1"
   StrCmp $0 "abc" 0 strstradverror
   !insertmacro StackVerificationEnd
-  IfErrors strstradverror
-  
-  DetailPrint "PASSED StrStrAdv test"
-  Goto +2
-strstradverror:
-  DetailPrint "FAILED StrStrAdv test"
+  !insertmacro EndStrFuncTest StrStrAdv
 
   # Test tokenizer
   !insertmacro StackVerificationStart
@@ -334,29 +319,20 @@
   ${StrTok} $0 "This is, or is not, just an example" " ," "0" "0"
   StrCmp $0 "This" 0 strtokerror
   !insertmacro StackVerificationEnd
-  IfErrors strtokerror
-  
-  DetailPrint "PASSED StrTok test"
-  Goto +2
-strtokerror:
-  DetailPrint "FAILED StrTok test"
+  !insertmacro EndStrFuncTest StrTok
 
   # Test trim new lines
   !insertmacro StackVerificationStart
   ${StrTrimNewLines} $0 "$\r$\ntest$\r$\ntest$\r$\n"
   StrCmp $0 "$\r$\ntest$\r$\ntest" 0 strtrimnewlineserror
   !insertmacro StackVerificationEnd
-  IfErrors strtrimnewlineserror
+  !insertmacro EndStrFuncTest StrTrimNewlines
 
-  DetailPrint "PASSED StrTrimNewLines test"
-  Goto +2
-strtrimnewlineserror:
-  DetailPrint "FAILED StrTrimNewLines test"
+  InitPluginsDir
+  WriteUninstaller $PluginsDir\UnStrFunc.exe
+  ExecWait '"$PluginsDir\UnStrFunc.exe" _?=$PluginsDir'
 
-  WriteUninstaller $EXEDIR\UnStrFunc.exe
-  
-  Exec $EXEDIR\UnStrFunc.exe
-
+  !insertmacro CompletedAllTests
 SectionEnd
 
 Section Uninstall
@@ -382,13 +358,8 @@
   ${UnStrCase} $0 "what about taking a shower tomorrow? it's late to do so now! try to sleep now. Good Night!" "S"
   StrCmp $0 "What about taking a shower tomorrow? It's late to do so now! Try to sleep now. Good night!" 0 strcaseerror
   !insertmacro StackVerificationEnd
-  IfErrors strcaseerror
+  !insertmacro EndStrFuncTest StrCase
 
-  DetailPrint "PASSED StrCase test"
-  Goto +2
-strcaseerror:
-  DetailPrint "FAILED StrCase test"
-
   # Test clipboard function
   !insertmacro StackVerificationStart
   ${UnStrClb} $0 "StrFunc clipboard test" ">"
@@ -400,13 +371,8 @@
   ${UnStrClb} $0 "" ""
   StrCmp $0 "" 0 strclberror
   !insertmacro StackVerificationEnd
-  IfErrors strclberror
+  !insertmacro EndStrFuncTest StrClb
 
-  DetailPrint "PASSED StrClb test"
-  Goto +2
-strclberror:
-  DetailPrint "FAILED StrClb test"
-
   # Test IO functions
   !insertmacro StackVerificationStart
   !macro untestio str
@@ -423,13 +389,8 @@
   !insertmacro untestio ""
   !insertmacro untestio " "
   !insertmacro StackVerificationEnd
-  IfErrors ioerror
+  !insertmacro EndStrFuncTestEx ioerror "StrNSISToIO/StrIOToNSIS"
 
-  DetailPrint "PASSED StrNSISToIO/StrIOToNSIS test"
-  Goto +2
-ioerror:
-  DetailPrint "FAILED StrNSISToIO/StrIOToNSIS test"
-
   # Test string search functions
   !insertmacro StackVerificationStart
   ${UnStrLoc} $0 "This is just an example" "just" "<"
@@ -453,13 +414,8 @@
   ${UnStrLoc} $0 abc d <
   StrCmp $0 "" 0 strlocerror
   !insertmacro StackVerificationEnd
-  IfErrors strlocerror
+  !insertmacro EndStrFuncTest StrLoc
 
-  DetailPrint "PASSED StrLoc test"
-  Goto +2
-strlocerror:
-  DetailPrint "FAILED StrLoc test"
-
   # Test string replacement
   !insertmacro StackVerificationStart
   ${UnStrRep} $0 "This is just an example" "an" "one"
@@ -477,13 +433,8 @@
   ${UnStrRep} $0 "test" "" ""
   StrCmp $0 "test" 0 strreperror
   !insertmacro StackVerificationEnd
-  IfErrors strreperror
+  !insertmacro EndStrFuncTest StrRep
 
-  DetailPrint "PASSED StrRep test"
-  Goto +2
-strreperror:
-  DetailPrint "FAILED StrRep test"
-
   # Test sorting
   !insertmacro StackVerificationStart
   ${UnStrSort} $0 "This is just an example" "" " just" "ple" "0" "0" "0"
@@ -525,13 +476,8 @@
   ${UnStrSort} $0 "" " " "something" " " "1" "0" "1"
   StrCmp $0 "" 0 strsorterror
   !insertmacro StackVerificationEnd
-  IfErrors strsorterror
+  !insertmacro EndStrFuncTest StrSort
 
-  DetailPrint "PASSED StrSort test"
-  Goto +2
-strsorterror:
-  DetailPrint "FAILED StrSort test"
-
   !insertmacro StackVerificationStart
   ${UnStrStr} $0 "abcefghijklmnopqrstuvwxyz" "g"
   StrCmp $0 "ghijklmnopqrstuvwxyz" 0 strstrerror
@@ -542,13 +488,8 @@
   ${UnStrStr} $0 "a" "abcefghijklmnopqrstuvwxyz"
   StrCmp $0 "" 0 strstrerror
   !insertmacro StackVerificationEnd
-  IfErrors strstrerror
+  !insertmacro EndStrFuncTest StrStr
 
-  DetailPrint "PASSED StrStr test"
-  Goto +2
-strstrerror:
-  DetailPrint "FAILED StrStr test"
-
   !insertmacro StackVerificationStart
   ${UnStrStrAdv} $0 "abcabcabc" "a" ">" ">" "1" "0" "0"
   StrCmp $0 "abcabcabc" 0 strstradverror
@@ -591,13 +532,8 @@
   ${UnStrStrAdv} $0 "ABCabcabc" "abc" "<" ">" "0" "1" "1"
   StrCmp $0 "abc" 0 strstradverror
   !insertmacro StackVerificationEnd
-  IfErrors strstradverror
+  !insertmacro EndStrFuncTest StrStrAdv
 
-  DetailPrint "PASSED StrStrAdv test"
-  Goto +2
-strstradverror:
-  DetailPrint "FAILED StrStrAdv test"
-
   # Test tokenizer
   !insertmacro StackVerificationStart
   ${UnStrTok} $0 "This is, or is not, just an example" " ," "4" "1"
@@ -613,23 +549,14 @@
   ${UnStrTok} $0 "This is, or is not, just an example" " ," "0" "0"
   StrCmp $0 "This" 0 strtokerror
   !insertmacro StackVerificationEnd
-  IfErrors strtokerror
+  !insertmacro EndStrFuncTest StrTok
 
-  DetailPrint "PASSED StrTok test"
-  Goto +2
-strtokerror:
-  DetailPrint "FAILED StrTok test"
-
   # Test trim new lines
   !insertmacro StackVerificationStart
   ${UnStrTrimNewLines} $0 "$\r$\ntest$\r$\ntest$\r$\n"
   StrCmp $0 "$\r$\ntest$\r$\ntest" 0 strtrimnewlineserror
   !insertmacro StackVerificationEnd
-  IfErrors strtrimnewlineserror
+  !insertmacro EndStrFuncTest StrTrimNewLines
 
-  DetailPrint "PASSED StrTrimNewLines test"
-  Goto +2
-strtrimnewlineserror:
-  DetailPrint "FAILED StrTrimNewLines test"
-
+  !insertmacro CompletedAllTests
 SectionEnd
Index: tmp/org.txm.setups/nsis/Examples/unicode.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/unicode.nsi	(revision 0)
+++ tmp/org.txm.setups/nsis/Examples/unicode.nsi	(revision 2956)
@@ -0,0 +1,48 @@
+ï»¿; Unicode is not enabled by default
+; Unicode installers will not be able to run on Windows 9x!
+Unicode true
+
+Name "Unicode Games"
+OutFile "unicode.exe"
+RequestExecutionLevel User
+ShowInstDetails show
+XPStyle on
+
+
+Section "Unicode in UI"
+
+	DetailPrint "Hello World!"
+	DetailPrint "×©×œ×•×� ×¢×•×œ×�!"
+	DetailPrint "Ù…Ø±Ø­Ø¨Ø§ Ø§Ù„Ø¹Ø§Ù„Ù…!"
+	DetailPrint "ã�“ã‚“ã�«ã�¡ã�¯ã€�ä¸–ç•Œï¼�"
+	DetailPrint "ä½ å¥½ä¸–ç•Œï¼�"
+	DetailPrint "Ð¿Ñ€Ð¸Ð²ÐµÑ‚ Ð¼Ð¸Ñ€!"
+	DetailPrint "ì•ˆë…•í•˜ì„¸ìš”!"
+
+	DetailPrint "${U+00A9}" # arbitrary unicode chars
+
+SectionEnd
+
+
+Section "Unicode in Files"
+
+	Var /Global Message
+
+	InitPluginsDir
+	FileOpen $0 "$PluginsDir\Test.txt" w
+	IfErrors done
+	FileWriteUTF16LE /BOM $0 "Hello World "
+	FileWriteWord $0 0xD83C # Manually write ${U+1F30D}
+	FileWriteWord $0 0xDF0D # as surrogate-pair
+	FileWriteUTF16LE $0 " and Sun ${U+2600}$\r$\n"
+	FileClose $0
+
+	FileOpen $0 "$PluginsDir\Test.txt" r
+	IfErrors done
+	FileReadUTF16LE $0 $Message
+	FileClose $0
+
+	DetailPrint "Message: $Message"
+	done:
+
+SectionEnd
Index: tmp/org.txm.setups/nsis/Examples/waplugin.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/waplugin.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/waplugin.nsi	(revision 2956)
@@ -60,7 +60,7 @@
 
   ; File to extract
   #File "C:\program files\winamp\plugins\vis_nsfs.dll"
-  File /oname=vis_nsfs.dll "${NSISDIR}\Plugins\TypeLib.dll" # dummy plug-in
+  File /oname=vis_nsfs.dll "${NSISDIR}\Plugins\x86-ansi\TypeLib.dll" # dummy plug-in
 
   ; prompt user, and if they select no, go to NoWinamp
   MessageBox MB_YESNO|MB_ICONQUESTION \
Index: tmp/org.txm.setups/nsis/Examples/System/System.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Examples/System/System.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/System/System.nsh	(revision 2956)
@@ -3,128 +3,129 @@
 ; (c) brainsucker, 2002
 ; (r) BSForce
 
-; Check for double includes
+!verbose push 3
 !ifndef System.NSH.Included
 !define System.NSH.Included
 
-!verbose 3
+!include WinCore.nsh
 
 ; ------------- Functions --------------
 
 ; LRESULT CALLBACK WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-!define sysWNDPROC "(i.s, i.s, i.s, i.s) iss"
+!define sysWNDPROC "(p.s, i.s, p.s, p.s) pss"
 
 ; LRESULT DefWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
-!define sysDefWindowProc "user32::DefWindowProcA(i, i, i, i) i"
+!define sysDefWindowProc "user32::DefWindowProc(p, i, p, p) p"
 
-!define sysMessageBox "user32::MessageBoxA(i, t, t, i) i"
+!define sysMessageBox "user32::MessageBox(p, t, t, i) i"
 
 !define sysMessageBeep "user32::MessageBeep(i) i"
 
-!define sysMessageBoxIndirect 'user32::MessageBoxIndirectA(i) i'
+!define sysMessageBoxIndirect 'user32::MessageBoxIndirect(p) i'
 
 ; HMODULE GetModuleHandle(LPCTSTR lpModuleName); 
-!define sysGetModuleHandle "kernel32::GetModuleHandleA(t) i"
+!define sysGetModuleHandle "kernel32::GetModuleHandle(t) i"
 
 ; HMODULE LoadLibrary(LPCTSTR lpFileName);
-!define sysLoadLibrary "kernel32::LoadLibraryA(t) i"
+!define sysLoadLibrary "kernel32::LoadLibrary(t) p"
 
 ; BOOL FreeLibrary(HMODULE hModule);
-!define sysFreeLibrary "kernel32::FreeLibrary(i) i"
+!define sysFreeLibrary "kernel32::FreeLibrary(p) i"
 
 ; HCURSOR LoadCursor(HINSTANCE hInstance, LPCTSTR lpCursorName);
-!define sysLoadCursor "user32::LoadCursorA(i, t) i"
+!define sysLoadCursor "user32::LoadCursor(p, t) p"
 
 ; ATOM RegisterClass(CONST WNDCLASS *lpWndClass);
-!define sysRegisterClass "user32::RegisterClassA(i) i"
+!define sysRegisterClass "user32::RegisterClass(p) i"
 
 ; HANDLE LoadImage(HINSTANCE hinst, LPCTSTR lpszName, UINT uType,
 ;       int cxDesired, int cyDesired, UINT fuLoad);
-!define sysLoadImage "user32::LoadImageA(i, t, i, i, i, i) i"
+!define sysLoadImage "user32::LoadImage(p, t, i, i, i, i) p"
 
 ; BOOL PlaySound(LPCSTR pszSound, HMODULE hmod, DWORD fdwSound);
-!define sysPlaySound "winmm.dll::PlaySoundA(t, i, i) i"
+!define sysPlaySound "winmm.dll::PlaySound(t, p, i) i"
 
 ; HWND CreateWindowEx(DWORD dwExStyle, LPCTSTR lpClassName, LPCTSTR lpWindowName,
 ;       DWORD dwStyle, int x, int y, int nWidth, int nHeight, HWND hWndParent,
 ;       HMENU hMenu, HINSTANCE hInstance, LPVOID lpParam);
-!define sysCreateWindowEx "user32::CreateWindowExA(i, t, t, i, i, i, i, i, i, i, i, i) i"
+!define sysCreateWindowEx "user32::CreateWindowEx(i, t, t, i, i, i, i, i, p, p, p, p) p"
 
 ; BOOL IsWindow(HWND hWnd);
-!define sysIsWindow "user32::IsWindow(i) i"
+!define sysIsWindow "user32::IsWindow(p) i"
 
 ; LONG SetWindowLong(HWND hWnd, int nIndex, LONG dwNewLong);
-!define sysSetWindowLong "user32::SetWindowLongA(i, i, i) i"
+!define sysSetWindowLong "user32::SetWindowLong(p, i, p) p"
 
 ; BOOL SetWindowPos(HWND hWnd, HWND hWndInsertAfter, int X, int Y, int cx, int cy, UINT uFlags);
-!define sysSetWindowPos "user32::SetWindowPos(i, i, i, i, i, i, i) i"
+!define sysSetWindowPos "user32::SetWindowPos(p, p, i, i, i, i, i) i"
 
 ; BOOL ShowWindow(HWND hWnd, int nCmdShow);
-!define sysShowWindow "user32::ShowWindow(i, i) i"
+!define sysShowWindow "user32::ShowWindow(p, i) i"
 
 ; BOOL DestroyWindow(HWND hWnd);
-!define sysDestroyWindow "user32::DestroyWindow(i) i"
+!define sysDestroyWindow "user32::DestroyWindow(p) i"
 
 ; BOOL GetClientRect(HWND hWnd, LPRECT lpRect);
-!define sysGetClientRect "user32::GetClientRect(i, i) i"
+!define sysGetClientRect "user32::GetClientRect(p, p) i"
 
 ; BOOL GetMessage(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax);
-!define sysGetMessage "user32::GetMessageA(i, i, i, i) i"
+!define sysGetMessage "user32::GetMessage(p, p, i, i) i"
 
 ; LRESULT DispatchMessage(CONST MSG *lpmsg);
-!define sysDispatchMessage "user32::DispatchMessageA(i) i"
+!define sysDispatchMessage "user32::DispatchMessage(p) p"
 
 ; BOOL DeleteObject(HGDIOBJ hObject);
-!define sysDeleteObject "gdi32::DeleteObject(i) i"
+!define sysDeleteObject "gdi32::DeleteObject(p) i"
 
 ; int GetObject(HGDIOBJ hgdiobj, int cbBuffer, LPVOID lpvObject);
-!define sysGetObject "gdi32::GetObjectA(i, i, i) i"
+!define sysGetObject "gdi32::GetObject(p, i, p) i"
 
 ; HGDIOBJ SelectObject(HDC hdc, HGDIOBJ hgdiobj);
-!define sysSelectObject "gdi32::SelectObject(i, i) i"
+!define sysSelectObject "gdi32::SelectObject(p, p) p"
 
 ; HDC CreateCompatibleDC(HDC hdc);
-!define sysCreateCompatibleDC "gdi32::CreateCompatibleDC(i) i"
+!define sysCreateCompatibleDC "gdi32::CreateCompatibleDC(p) p"
 
 ; BOOL DeleteDC(HDC hdc);
-!define sysDeleteDC "gdi32::DeleteDC(i) i"
+!define sysDeleteDC "gdi32::DeleteDC(p) i"
 
 ; BOOL BitBlt(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, 
 ;       HDC hdcSrc, int nXSrc, int nYSrc, DWORD dwRop);
-!define sysBitBlt "gdi32::BitBlt(i, i, i, i, i, i, i, i, i) i"
+!define sysBitBlt "gdi32::BitBlt(p, i, i, i, i, p, i, i, i) i"
 
 ; proposed by abgandar
 ; int AddFontResource(LPCTSTR lpszFilename);
-!define sysAddFontResource "gdi32::AddFontResourceA(t) i"
+!define sysAddFontResource "gdi32::AddFontResource(t) i"
 
 ; HDC BeginPaint(HWND hwnd, LPPAINTSTRUCT lpPaint);
-!define sysBeginPaint "user32::BeginPaint(i, i) i"
+!define sysBeginPaint "user32::BeginPaint(p, p) p"
 
 ; BOOL EndPaint(HWND hWnd, CONST PAINTSTRUCT *lpPaint);
-!define sysEndPaint "user32::EndPaint(i, i) i"
+!define sysEndPaint "user32::EndPaint(p, p) i"
 
 ; BOOL SystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni);
-!define sysSystemParametersInfo "user32::SystemParametersInfoA(i, i, i, i) i"
+!define sysSystemParametersInfo "user32::SystemParametersInfo(i, i, p, i) i"
 
 ; UINT_PTR SetTimer(HWND hWnd, UINT_PTR nIDEvent, UINT uElapse, TIMERPROC lpTimerFunc);
-!define sysSetTimer "user32::SetTimer(i, i, i, k) i"
+!define sysSetTimer "user32::SetTimer(p, p, i, k) i"
 
-!define sysGetLogicalDriveStrings 'kernel32::GetLogicalDriveStringsA(i, i) i'
+; DWORD GetLogicalDriveStrings(DWORD nBufferLength, LPTSTR LpBuffer);
+!define sysGetLogicalDriveStrings 'kernel32::GetLogicalDriveStrings(i, p) i'
 
-!define sysGetDiskFreeSpaceEx 'kernel32::GetDiskFreeSpaceExA(t, *l, *l, *l) i'
+!define sysGetDiskFreeSpaceEx 'kernel32::GetDiskFreeSpaceEx(t, *l, *l, *l) i'
 
 ; UINT GetDriveType(LPCTSTR lpRootPathName);
-!define sysGetDriveType 'kernel32::GetDriveTypeA(t) i'
+!define sysGetDriveType 'kernel32::GetDriveType(t) i'
 
 ; HANDLE FindFirstFile(LPCTSTR lpFileName,LPWIN32_FIND_DATA lpFindFileData);
-!define sysFindFirstFile 'kernel32::FindFirstFileA(t, i) i'
+!define sysFindFirstFile 'kernel32::FindFirstFile(t, p) p'
 
 ; BOOL FindClose(HANDLE hFindFile);
-!define sysFindClose 'kernel32::FindClose(i) i'
+!define sysFindClose 'kernel32::FindClose(p) i'
 
 ; BOOL FileTimeToSystemTime(CONST FILETIME *lpFileTime, 
 ; LPSYSTEMTIME lpSystemTime);
-!define sysFileTimeToSystemTime 'kernel32::FileTimeToSystemTime(*l, i) i'
+!define sysFileTimeToSystemTime 'kernel32::FileTimeToSystemTime(*l, p) i'
 
 ; BOOL FileTimeToLocalFileTime(
 ;       CONST FILETIME *lpFileTime, 
@@ -133,12 +134,12 @@
 
 ; BOOL SystemTimeToTzSpecificLocalTime(LPTIME_ZONE_INFORMATION lpTimeZone, 
 ; LPSYSTEMTIME lpUniversalTime, LPSYSTEMTIME lpLocalTime);
-!define sysSystemTimeToTzSpecificLocalTime 'kernel32::SystemTimeToTzSpecificLocalTime(i, i, i) i'
+!define sysSystemTimeToTzSpecificLocalTime 'kernel32::SystemTimeToTzSpecificLocalTime(p, p, p) i'
 
-!define syslstrlen 'kernel32::lstrlenA(t) i'
+!define syslstrlen 'kernel32::lstrlen(t) i'
 
 ; int wsprintf(LPTSTR lpOut, LPCTSTR lpFmt, ...);
-!define syswsprintf "user32::wsprintfA(t, t) i ? c" 
+!define syswsprintf "user32::wsprintf(t, t) i ? c" 
 
 ; ------------- Structures --------------
 
@@ -154,7 +155,7 @@
 ;               LPCTSTR    lpszMenuName; 
 ;               LPCTSTR    lpszClassName; 
 ; } WNDCLASS, *PWNDCLASS; 
-!define stWNDCLASS "(i, k, i, i, i, i, i, i, t, t) i"
+!define stWNDCLASS "(i, k, i, i, p, p, p, p, t, t) p"
 
 ; typedef struct tagMSG {
 ;   HWND   hwnd; 
@@ -164,7 +165,7 @@
 ;   DWORD  time; 
 ;   POINT  pt;  -> will be presented as two separate px and py
 ; } MSG, *PMSG;
-!define stMSG "(i, i, i, i, i, i, i) i"
+!define stMSG "(p, i, p, p, i, i, i) p"
 
 ; typedef struct tagBITMAP {
 ;   LONG   bmType; 
@@ -175,7 +176,7 @@
 ;   WORD   bmBitsPixel; 
 ;   LPVOID bmBits; 
 ; } BITMAP, *PBITMAP; 
-!define stBITMAP "(i, i, i, i, i, i, i) i"
+!define stBITMAP "(i, i, i, i, i, i, p) p"
 
 ; typedef struct _RECT { 
 ;   LONG left; 
@@ -183,7 +184,7 @@
 ;   LONG right; 
 ;   LONG bottom; 
 ; } RECT, *PRECT; 
-!define stRECT "(i, i, i, i) i"
+!define stRECT "(i, i, i, i) p"
 
 ; typedef struct tagPAINTSTRUCT { 
 ;   HDC  hdc; 
@@ -193,7 +194,7 @@
 ;   BOOL fIncUpdate; 
 ;   BYTE rgbReserved[32]; 
 ; } PAINTSTRUCT, *PPAINTSTRUCT; 
-!define stPAINTSTRUCT "(i, i, i, i, i, i, i, i, &v32) i"
+!define stPAINTSTRUCT "(p, i, i, i, i, i, i, i, &v32) p"
 
 ; typedef struct { 
 ;  UINT      cbSize; 
@@ -207,7 +208,7 @@
 ;  MSGBOXCALLBACK lpfnMsgBoxCallback; 
 ;  DWORD     dwLanguageId; 
 ; } MSGBOXPARAMS, *PMSGBOXPARAMS; 
-!define stMSGBOXPARAMS '(&l4, i, i, t, t, i, t, i, k, i) i'
+!define stMSGBOXPARAMS '(&l4, p, p, t, t, i, t, p, k, i) p'
 
 ; typedef struct _SYSTEMTIME { 
 ;    WORD wYear; 
@@ -219,10 +220,10 @@
 ;    WORD wSecond; 
 ;    WORD wMilliseconds; 
 ; } SYSTEMTIME, *PSYSTEMTIME; 
-!define stSYSTEMTIME '(&i2, &i2, &i2, &i2, &i2, &i2, &i2, &i2) i'
+!define stSYSTEMTIME '(&i2, &i2, &i2, &i2, &i2, &i2, &i2, &i2) p'
 
 ; Maximal windows path
-!define MAX_PATH          260
+!define /ifndef MAX_PATH 260
 
 ; typedef struct _WIN32_FIND_DATA {
 ;  DWORD    dwFileAttributes; 
@@ -236,53 +237,13 @@
 ;  TCHAR    cFileName[ MAX_PATH ]; 
 ;  TCHAR    cAlternateFileName[ 14 ]; 
 ; } WIN32_FIND_DATA, *PWIN32_FIND_DATA; 
-!define stWIN32_FIND_DATA '(i, l, l, l, i, i, i, i, &t${MAX_PATH}, &t14) i'
+!define stWIN32_FIND_DATA '(i, l, l, l, i, i, i, i, &t${MAX_PATH}, &t14) p'
 
 ; ------------- Constants --------------
 
 ; == Other ==
-!define INVALID_HANDLE_VALUE -1
+!define /ifndef INVALID_HANDLE_VALUE -1
 
-; == Cursors ==
-
-!define IDC_ARROW           32512
-!define IDC_IBEAM           32513
-!define IDC_WAIT            32514
-!define IDC_CROSS           32515
-!define IDC_UPARROW         32516
-!define IDC_SIZE            32640  
-!define IDC_ICON            32641  
-!define IDC_SIZENWSE        32642
-!define IDC_SIZENESW        32643
-!define IDC_SIZEWE          32644
-!define IDC_SIZENS          32645
-!define IDC_SIZEALL         32646
-!define IDC_NO              32648 
-!define IDC_HAND            32649
-!define IDC_APPSTARTING     32650 
-!define IDC_HELP            32651
-
-; == Images ==
-
-!define IMAGE_BITMAP        0
-!define IMAGE_ICON          1
-!define IMAGE_CURSOR        2
-!define IMAGE_ENHMETAFILE   3
-
-!define LR_DEFAULTCOLOR     0x0000
-!define LR_MONOCHROME       0x0001
-!define LR_COLOR            0x0002
-!define LR_COPYRETURNORG    0x0004
-!define LR_COPYDELETEORG    0x0008
-!define LR_LOADFROMFILE     0x0010
-!define LR_LOADTRANSPARENT  0x0020
-!define LR_DEFAULTSIZE      0x0040
-!define LR_VGACOLOR         0x0080
-!define LR_LOADMAP3DCOLORS  0x1000
-!define LR_CREATEDIBSECTION 0x2000
-!define LR_COPYFROMRESOURCE 0x4000
-!define LR_SHARED           0x8000
-
 ; == Sounds ==
 
 !define SND_SYNC            0x0000  
@@ -302,75 +263,65 @@
 
 ; == Windows ==
 
-!define WS_OVERLAPPED       0x00000000
-!define WS_POPUP            0x80000000
-!define WS_CHILD            0x40000000
-!define WS_MINIMIZE         0x20000000
-!define WS_VISIBLE          0x10000000
-!define WS_DISABLED         0x08000000
-!define WS_CLIPSIBLINGS     0x04000000
-!define WS_CLIPCHILDREN     0x02000000
-!define WS_MAXIMIZE         0x01000000
-!define WS_CAPTION          0x00C00000    
-!define WS_BORDER           0x00800000
-!define WS_DLGFRAME         0x00400000
-!define WS_VSCROLL          0x00200000
-!define WS_HSCROLL          0x00100000
-!define WS_SYSMENU          0x00080000
-!define WS_THICKFRAME       0x00040000
-!define WS_GROUP            0x00020000
-!define WS_TABSTOP          0x00010000
-!define WS_MINIMIZEBOX      0x00020000
-!define WS_MAXIMIZEBOX      0x00010000
-!define WS_TILED            ${WS_OVERLAPPED}
-!define WS_ICONIC           ${WS_MINIMIZE}
-!define WS_SIZEBOX          ${WS_THICKFRAME}
-!define WS_OVERLAPPEDWINDOW 0x00CF0000
-!define WS_TILEDWINDOW      ${WS_OVERLAPPEDWINDOW}
-!define WS_POPUPWINDOW      0x80880000
-!define WS_CHILDWINDOW      ${WS_CHILD}
-!define WS_EX_DLGMODALFRAME     0x00000001
-!define WS_EX_NOPARENTNOTIFY    0x00000004
-!define WS_EX_TOPMOST           0x00000008
-!define WS_EX_ACCEPTFILES       0x00000010
-!define WS_EX_TRANSPARENT       0x00000020
-!define WS_EX_MDICHILD          0x00000040
-!define WS_EX_TOOLWINDOW        0x00000080
-!define WS_EX_WINDOWEDGE        0x00000100
-!define WS_EX_CLIENTEDGE        0x00000200
-!define WS_EX_CONTEXTHELP       0x00000400
-!define WS_EX_RIGHT             0x00001000
-!define WS_EX_LEFT              0x00000000
-!define WS_EX_RTLREADING        0x00002000
-!define WS_EX_LTRREADING        0x00000000
-!define WS_EX_LEFTSCROLLBAR     0x00004000
-!define WS_EX_RIGHTSCROLLBAR    0x00000000
-!define WS_EX_CONTROLPARENT     0x00010000
-!define WS_EX_STATICEDGE        0x00020000
-!define WS_EX_APPWINDOW         0x00040000
-!define WS_EX_OVERLAPPEDWINDOW  0x00000300
-!define WS_EX_PALETTEWINDOW     0x00000188
-!define WS_EX_LAYERED           0x00080000
-!define WS_EX_NOINHERITLAYOUT   0x00100000 
-!define WS_EX_LAYOUTRTL         0x00400000 
-!define WS_EX_COMPOSITED        0x02000000
-!define WS_EX_NOACTIVATE        0x08000000
+!define /ifndef WS_OVERLAPPED       0x00000000
+!define /ifndef WS_POPUP            0x80000000
+!define /ifndef WS_CHILD            0x40000000
+!define /ifndef WS_MINIMIZE         0x20000000
+!define /ifndef WS_VISIBLE          0x10000000
+!define /ifndef WS_DISABLED         0x08000000
+!define /ifndef WS_CLIPSIBLINGS     0x04000000
+!define /ifndef WS_CLIPCHILDREN     0x02000000
+!define /ifndef WS_MAXIMIZE         0x01000000
+!define /ifndef WS_CAPTION          0x00C00000    
+!define /ifndef WS_BORDER           0x00800000
+!define /ifndef WS_DLGFRAME         0x00400000
+!define /ifndef WS_VSCROLL          0x00200000
+!define /ifndef WS_HSCROLL          0x00100000
+!define /ifndef WS_SYSMENU          0x00080000
+!define /ifndef WS_THICKFRAME       0x00040000
+!define /ifndef WS_GROUP            0x00020000
+!define /ifndef WS_TABSTOP          0x00010000
+!define /ifndef WS_MINIMIZEBOX      0x00020000
+!define /ifndef WS_MAXIMIZEBOX      0x00010000
+!define /ifndef WS_TILED            ${WS_OVERLAPPED}
+!define /ifndef WS_ICONIC           ${WS_MINIMIZE}
+!define /ifndef WS_SIZEBOX          ${WS_THICKFRAME}
+!define /ifndef WS_OVERLAPPEDWINDOW 0x00CF0000
+!define /ifndef WS_TILEDWINDOW      ${WS_OVERLAPPEDWINDOW}
+!define /ifndef WS_POPUPWINDOW      0x80880000
+!define /ifndef WS_CHILDWINDOW      ${WS_CHILD}
+!define /ifndef WS_EX_DLGMODALFRAME     0x00000001
+!define /ifndef WS_EX_NOPARENTNOTIFY    0x00000004
+!define /ifndef WS_EX_TOPMOST           0x00000008
+!define /ifndef WS_EX_ACCEPTFILES       0x00000010
+!define /ifndef WS_EX_TRANSPARENT       0x00000020
+!define /ifndef WS_EX_MDICHILD          0x00000040
+!define /ifndef WS_EX_TOOLWINDOW        0x00000080
+!define /ifndef WS_EX_WINDOWEDGE        0x00000100
+!define /ifndef WS_EX_CLIENTEDGE        0x00000200
+!define /ifndef WS_EX_CONTEXTHELP       0x00000400
+!define /ifndef WS_EX_RIGHT             0x00001000
+!define /ifndef WS_EX_LEFT              0x00000000
+!define /ifndef WS_EX_RTLREADING        0x00002000
+!define /ifndef WS_EX_LTRREADING        0x00000000
+!define /ifndef WS_EX_LEFTSCROLLBAR     0x00004000
+!define /ifndef WS_EX_RIGHTSCROLLBAR    0x00000000
+!define /ifndef WS_EX_CONTROLPARENT     0x00010000
+!define /ifndef WS_EX_STATICEDGE        0x00020000
+!define /ifndef WS_EX_APPWINDOW         0x00040000
+!define /ifndef WS_EX_OVERLAPPEDWINDOW  0x00000300
+!define /ifndef WS_EX_PALETTEWINDOW     0x00000188
+!define /ifndef WS_EX_LAYERED           0x00080000
+!define /ifndef WS_EX_NOINHERITLAYOUT   0x00100000 
+!define /ifndef WS_EX_LAYOUTRTL         0x00400000 
+!define /ifndef WS_EX_COMPOSITED        0x02000000
+!define /ifndef WS_EX_NOACTIVATE        0x08000000
 
 
 ; == System Parameters Info ==
 
 !define SPI_GETWORKAREA             0x0030
 
-; == Window Long Offsets ==
-
-!define GWL_WNDPROC         -4
-!define GWL_HINSTANCE       -6
-!define GWL_HWNDPARENT      -8
-!define GWL_STYLE           -16
-!define GWL_EXSTYLE         -20
-!define GWL_USERDATA        -21
-!define GWL_ID              -12
-
 ; == Window swap ==
 
 !define SWP_NOSIZE          0x0001
@@ -446,16 +397,7 @@
 !define MB_RIGHT                    0x00080000
 !define MB_RTLREADING               0x00100000
 
-; == Drive type constants ==
 
-!define DRIVE_UNKNOWN     0
-!define DRIVE_NO_ROOT_DIR 1
-!define DRIVE_REMOVABLE   2
-!define DRIVE_FIXED       3
-!define DRIVE_REMOTE      4
-!define DRIVE_CDROM       5
-!define DRIVE_RAMDISK     6
-
 ; == Callbacks ==
 
 !macro SINGLE_CALLBACK CHKN RES INDEX FUNC
@@ -467,6 +409,5 @@
 ExitCB_${CHKN}:
 !macroend
 
-!verbose 4
-
-!endif
\ No newline at end of file
+!endif
+!verbose pop
\ No newline at end of file
Index: tmp/org.txm.setups/nsis/Examples/System/System.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/System/System.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/System/System.nsi	(revision 2956)
@@ -5,6 +5,8 @@
 
 Name "System Plugin Example"
 OutFile "System.exe"
+RequestExecutionLevel User
+Unicode True
 
 !include "SysFunc.nsh"
 
@@ -32,7 +34,7 @@
      StrCpy $7 '               Disk,                Size,                Free,                Free for user:$\n$\n'
 
      ; Memory for paths   
-     System::Alloc 1024
+     System::StrAlloc 1024
      Pop $1
      ; Get drives   
      System::Call '${sysGetLogicalDriveStrings}(1024, r1)'
@@ -59,8 +61,9 @@
 
 enumnext:
      ; Next drive path       
+     IntOp $2 $2 * ${NSIS_CHAR_SIZE}
      IntOp $1 $1 + $2
-     IntOp $1 $1 + 1
+     IntOp $1 $1 + ${NSIS_CHAR_SIZE}
      goto enumok   
 enumex: ; End of drives or user cancel
      ; Free memory for paths   
@@ -72,7 +75,7 @@
      ; ----- Sample 3 ----- Direct proc defenition -----
 
      ; Direct specification demo
-     System::Call 'user32::MessageBoxA(i $HWNDPARENT, t "Just direct MessageBoxA specification demo ;)", t "System Example 3", i ${MB_OK}) i.s'
+     System::Call 'user32::MessageBox(p $HWNDPARENT, t "Just direct MessageBox specification demo ;)", t "System Example 3", i ${MB_OK}) i.s'
      Pop $0
 
      ; ----- Sample 4 ----- Int64, mixed definition demo -----
@@ -133,4 +136,26 @@
 
 SectionEnd 
 
+
+Section "Quoted path"
+
+  !define /IfNDef CSIDL_FONTS 0x14
+  StrCpy $9 "$PluginsDir\N(S # I)S" ; Directory with '(', ' ', '#' or ')' needs to be quoted
+  CreateDirectory "$9"
+  CopyFiles /Silent /FilesOnly "$sysdir\shfolder.dll" "$9\" ; This could fail on 95 & NT4?
+
+  System::Call '"$9\shfolder.dll"::SHGetFolderPathA(p $hWndParent, i ${CSIDL_FONTS}, p 0, i 0, m "?" r1) ?u'
+  DetailPrint Fonts=$1
+
+SectionEnd
+
+
+Section "Ordinal"
+
+  System::Call 'OLEAUT32::#2(w "OLE string")p.r0' ; SysAllocString
+  System::Call 'USER32::MessageBoxW(p $hWndParent, p r0, w "OLE:", i 0)'
+  System::Call 'OLEAUT32::#6(p r0)'
+
+SectionEnd
+
 ; eof
Index: tmp/org.txm.setups/nsis/Examples/System/Resource.dll
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.setups/nsis/Examples/System/SysFunc.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Examples/System/SysFunc.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/System/SysFunc.nsh	(revision 2956)
@@ -3,16 +3,14 @@
 ; (c) brainsucker, 2002
 ; (r) BSForce
 
-; Check for double includes
+
+!verbose push 3
 !ifndef SysFunc.NSH.Included
 !define SysFunc.NSH.Included
 
-!include "${NSISDIR}\Examples\System\System.nsh"
+!include "System.nsh"
+!include "WinMessages.nsh"
 
-!verbose 3      ; For WinMessages especially
-  !include "WinMessages.nsh"
-!verbose 4
-
 ; ================= GetInstallerExeName implementation =================
 
 ; Adopted Get Parameter function -> now it gets full installer.exe path
@@ -319,17 +317,17 @@
    System::Store "s r8r9"
 
    ; Get module instance
-   System::Call "${sysGetModuleHandle} (i) .r7"
+   System::Call "${sysGetModuleHandle} (p) .r7"
 
    ; Get arrow cursor
-   System::Call "${sysLoadCursor} (0, i ${IDC_ARROW}) .R9" 
+   System::Call "${sysLoadCursor} (0, p ${IDC_ARROW}) .R9" 
 
    ; Get callback
    System::Get "${sysWNDPROC}"
    Pop $3
 
    ; Create window class
-   System::Call "*${stWNDCLASS} (0,r3,0,0,r7,0,R9,0,i 0,'_sp') .R9"
+   System::Call "*${stWNDCLASS} (0,r3,0,0,r7,0,R9,0,p 0,'_sp') .R9"
 
    ; Register window class
    System::Call "${sysRegisterClass} (R9) .R9"
@@ -347,7 +345,7 @@
    !insertmacro SINGLE_CALLBACK 1 $5 1 _systemSplashWndCB
 
    ; Create MSG struct
-   System::Call "*${stMSG} (_) i.R9"
+   System::Call "*${stMSG} (_) p.R9"
 
    ; -------------------------
 repeat:
@@ -371,7 +369,7 @@
 
 finish:
    ; Stop the sound
-   System::Call "${sysPlaySound} (i 0, i 0, i 0)"
+   System::Call "${sysPlaySound} (p 0, p 0, i 0)"
 
    ; Delete bitmap object
    System::Call "${sysDeleteObject} (r6)"
@@ -393,6 +391,5 @@
    System::Store "P0 l"
 FunctionEnd
 
-!verbose 4
-
-!endif
\ No newline at end of file
+!endif
+!verbose pop
\ No newline at end of file
Index: tmp/org.txm.setups/nsis/Examples/NSISMenu.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/NSISMenu.nsi	(revision 0)
+++ tmp/org.txm.setups/nsis/Examples/NSISMenu.nsi	(revision 2956)
@@ -0,0 +1,351 @@
+OutFile "NSIS.exe"
+Name "NSIS Menu"
+Unicode True
+RequestExecutionLevel User
+XPStyle On
+ManifestDPIAware System
+SetCompressor LZMA
+ChangeUI IDD_INST "${NSISDIR}\Contrib\UIs\modern_headerbmp.exe"
+Icon "${NSISDIR}\Contrib\Graphics\Icons\nsis-menu.ico"
+BrandingText " "
+MiscButtonText " " " " " " " "
+InstallButtonText " "
+CompletedText " "
+LangString ^ClickInstall 0 " "
+Caption "$(^Name)"
+
+!macro UNPACKVERFIELD out in shr mask fmt
+!define /redef /math ${out} ${in} >>> ${shr}
+!define /redef /math ${out} ${${out}} & ${mask}
+!define /redef /intfmt ${out} "${fmt}" ${${out}}
+!macroend
+
+!ifndef VER_MAJOR & VER_MINOR
+!ifdef NSIS_PACKEDVERSION
+!insertmacro UNPACKVERFIELD VER_MAJOR ${NSIS_PACKEDVERSION} 24 0x0ff "%X"
+!insertmacro UNPACKVERFIELD VER_MINOR ${NSIS_PACKEDVERSION} 12 0xfff "%X"
+!insertmacro UNPACKVERFIELD VER_REVISION ${NSIS_PACKEDVERSION} 4 255 "%X"
+!insertmacro UNPACKVERFIELD VER_BUILD ${NSIS_PACKEDVERSION} 00 0x00f "%X"
+!endif
+!endif
+!ifdef VER_MAJOR & VER_MINOR
+!define /ifndef VER_REVISION 0
+!define /ifndef VER_BUILD 0
+!searchreplace VERSTR "${NSIS_VERSION}" "v" ""
+VIProductVersion ${VER_MAJOR}.${VER_MINOR}.${VER_REVISION}.${VER_BUILD}
+VIAddVersionKey "ProductName" "NSIS"
+VIAddVersionKey "ProductVersion" "${VERSTR}"
+VIAddVersionKey "FileVersion" "${VERSTR}"
+VIAddVersionKey "FileDescription" "NSIS Menu"
+VIAddVersionKey "LegalCopyright" "http://nsis.sf.net/License"
+!endif
+
+!include nsDialogs.nsh
+!include WinMessages.nsh
+!include LogicLib.nsh
+!define /IfNDef IDC_CHILDRECT 1018
+!define QUIT_ON_EXECUTE
+!define PR $ExeDir ; Local root path
+!define PD "Docs" ; Local with WWW fallback (located at the same relative path)
+!define WWW "http://nsis.sf.net"
+
+!define CB_HEADER '0x755585 0x222222'
+!define UY_HEADER 28
+!define CT_PAGE '0x000000 0xaaaaaa'
+!define CB_PAGE '0xffffff 0x111111'
+!define CT_SECTION '0x666666 0xeeeeee'
+!define CB_SECTION '${CB_PAGE}'
+!define UY_SECTION 11 ; Height of a section
+!define UY_SECTIONBPAD 2 ; Extra padding on the bottom of section headers
+!define UY_TXT 9 ; Height of a normal item
+!define UY_TXTBPAD 1 ; Extra padding on the bottom of normal items
+!define UX_COLPAD 7 ; Spacing between columns
+!define UY_ROW2 104 ; Absolute position of the 2nd row
+!define CT_LINK '0x0c6e97 0x0c6e97' ; SYSCLR:HOTLIGHT
+!define /Math UX_PAGE 00 + ${UX_COLPAD}
+!define /Math UY_PAGE ${UY_HEADER} + 20
+!define UX ${UX_PAGE}
+!define CB_FOOTERLINE '0xc4c4c4 0x333333'
+!define CT_FOOTER '0xbbbbbb 0x444444'
+
+Var UseLightTheme
+
+Function .onGUIInit
+ReadRegDWORD $UseLightTheme HKCU "Software\NSIS" "UseLightTheme"
+StrCmp $UseLightTheme "" 0 +2
+ReadRegDWORD $UseLightTheme HKCU "Software\Microsoft\Windows\CurrentVersion\Themes\Personalize" "AppsUseLightTheme"
+StrCmp $UseLightTheme "" 0 +2
+StrCpy $UseLightTheme 1 ; Default
+
+StrCmp $UseLightTheme "0" 0 +2
+System::Call 'USER32::SetProp(p$hWndParent,t"UseImmersiveDarkModeColors",i1)'
+FunctionEnd
+
+!define SetCtlColors "!insertmacro SetCtlColors "
+!macro SetCtlColors hWnd ctlig ctdar cblig cbdar
+StrCmp $UseLightTheme "0" 0 +3
+SetCtlColors ${hWnd} "${ctdar}" ${cbdar}
+Goto +2
+SetCtlColors ${hWnd} "${ctlig}" ${cblig}
+!macroend
+
+
+Function PageLeave
+System::Call 'USER32::GetFocus()p.r0'
+System::Call 'USER32::GetDlgCtrlID(pr0)i.r1'
+System::Call 'USER32::GetParent(pr0)p.r2'
+SendMessage $2 ${WM_COMMAND} $1 $0 ; Handle <ENTER> in dialog by pretending it was a click on the active control
+Abort
+FunctionEnd
+
+Function PageCreate
+GetDlgItem $0 $hWndParent 1
+ShowWindow $0 0
+GetDlgItem $0 $hWndParent 2
+ShowWindow $0 0
+
+System::Call 'USER32::GetClientRect(p$hWndParent,@r0)'
+System::Call '*$0(i,i,i.r3,i.r4)'
+GetDlgItem $0 $hWndParent ${IDC_CHILDRECT}
+System::Call 'USER32::MoveWindow(pr0,i0,i0,ir3,ir4,i0)'
+
+nsDialogs::Create ${IDC_CHILDRECT}
+Pop $R9
+${SetCtlColors} $R9 ${CT_PAGE} ${CB_PAGE}
+
+!macro StartColumn W
+!define /ReDef UY ${UY_PAGE}
+!define /ReDef UX_W ${W}
+!ifdef UX_INTERNAL_PREV_W
+!define /ReDef /Math UX ${UX} + ${UX_INTERNAL_PREV_W}
+!define /ReDef /Math UX ${UX} + ${UX_COLPAD}
+!define /ReDef UX_INTERNAL_PREV_W ${UX_W}
+!else
+!define /Math UX_INTERNAL_PREV_W 0 + ${UX_W}
+!endif
+!macroend
+!macro CreateHeader Txt W
+!define /ReDef /Math W ${W} + 4 ; Make it slightly wider
+${NSD_CreateLabel} ${UX}u ${UY}u ${W}u ${UY_SECTION}u "${Txt}"
+Pop $0
+${SetCtlColors} $0 ${CT_SECTION} transparent transparent
+SendMessage $0 ${WM_SETFONT} ${HF_HEADER} 1
+!define /ReDef /Math UY ${UY} + ${UY_SECTION}
+!define /ReDef /Math UY ${UY} + ${UY_SECTIONBPAD}
+!macroend
+!macro CreateControl Class Txt W H
+${NSD_Create${Class}} ${UX}u ${UY}u ${W}u ${H}u "${Txt}"
+!define /ReDef /Math UY ${UY} + ${H}
+!define /ReDef /Math UY ${UY} + ${UY_TXTBPAD}
+!macroend
+!macro CreateSimpleLinkHelper Txt Url W
+!insertmacro CreateControl Link "${Txt}|${Url}" ${W} ${UY_TXT}
+!macroend
+!macro CreateSimpleLink Txt Url W
+!insertmacro CreateSimpleLinkHelper "${Txt}" "${Url}" ${W}
+Call ConfigureLink
+!macroend
+
+
+; --- Header ---
+!define HF_HEADER $R8
+CreateFont ${HF_HEADER} "Arial" ${UY_SECTION} 700
+
+nsDialogs::CreateControl ${__NSD_Label_CLASS} ${__NSD_Label_STYLE} ${__NSD_Label_EXSTYLE} 33u 0 -33u ${UY_HEADER}u ""
+Pop $0
+${SetCtlColors} $0 0xffffff 0xffffff ${CB_HEADER}
+
+nsDialogs::CreateControl ${__NSD_Icon_CLASS} ${__NSD_Icon_STYLE}|${SS_CENTERIMAGE}|${SS_CENTER} ${__NSD_Icon_EXSTYLE} 0 0 33u ${UY_HEADER}u ""
+Pop $0
+${SetCtlColors} $0 "" "" ${CB_HEADER}
+${NSD_SetIconFromInstaller} $0 $1
+
+CreateFont $1 "Trebuchet MS" 17
+!searchreplace VERSTR "${NSIS_VERSION}" "v" ""
+nsDialogs::CreateControl ${__NSD_Label_CLASS} ${__NSD_Label_STYLE}|${SS_CENTERIMAGE}|${SS_ENDELLIPSIS} ${__NSD_Label_EXSTYLE} 34u 1u -34u ${UY_HEADER}u "nullsoft scriptable install system ${VERSTR}"
+Pop $0
+SetCtlColors $0 0x3A2A42 transparent
+SendMessage $0 ${WM_SETFONT} $1 1
+nsDialogs::CreateControl ${__NSD_Label_CLASS} ${__NSD_Label_STYLE}|${SS_CENTERIMAGE}|${SS_ENDELLIPSIS} ${__NSD_Label_EXSTYLE} 33u 0 -33u ${UY_HEADER}u "nullsoft scriptable install system ${VERSTR}"
+Pop $0
+SetCtlColors $0 0xffffff transparent
+SendMessage $0 ${WM_SETFONT} $1 1
+
+
+; --- Page ---
+!insertmacro StartColumn 90
+!insertmacro CreateHeader "Compiler" ${UX_W}
+!insertmacro CreateSimpleLink "Compile NSI scripts" "${PR}\MakeNSISW" ${UX_W}
+!insertmacro CreateSimpleLink "Installer based on .ZIP file" "${PR}\bin\Zip2Exe" ${UX_W}
+
+
+!define /ReDef UY ${UY_ROW2}
+!insertmacro CreateHeader "Developer Center" ${UX_W}
+!define /ReDef UY_MULTILINE 42
+!insertmacro CreateControl Label "Many more examples, tutorials, plug-ins and NSIS-releted software are available at the online Developer Center." ${UX_W} ${UY_MULTILINE}
+Pop $0
+${SetCtlColors} $0 ${CT_PAGE} ${CB_PAGE}
+
+
+!insertmacro StartColumn 80
+!insertmacro CreateHeader "Documentation" ${UX_W}
+!insertmacro CreateSimpleLink "NSIS Users Manual" "${PR}\NSIS.chm|${WWW}/Docs/" ${UX_W}
+!insertmacro CreateSimpleLink "Example scripts" "${PR}\Examples|${WWW}/Examples" ${UX_W}
+!insertmacro CreateSimpleLink "Modern UI 2" "${PD}\Modern UI 2\Readme.html" ${UX_W}
+
+
+!define /ReDef UY ${UY_ROW2}
+!insertmacro CreateHeader "Online Help" ${UX_W}
+!insertmacro CreateSimpleLink "Developer Center" "${WWW}/Developer_Center" ${UX_W}
+!insertmacro CreateSimpleLink "FAQ" "${WWW}/FAQ" ${UX_W}
+!insertmacro CreateSimpleLink "Forum" "http://forums.winamp.com/forumdisplay.php?forumid=65" ${UX_W}
+;"Project Tracker" "http://sourceforge.net/tracker/?group_id=22049"
+!insertmacro CreateSimpleLink "Bug Tracker" "http://sourceforge.net/tracker/?group_id=22049&atid=373085" ${UX_W}
+!insertmacro CreateSimpleLink "Stackoverflow" "http://stackoverflow.com/questions/tagged/nsis" ${UX_W}
+!insertmacro CreateSimpleLink "Slack collaboration hub" "${WWW}/r/Slack" ${UX_W}
+;insertmacro CreateSimpleLink "IRC channel" "irc://irc.landoleet.org/nsis" ${UX_W}
+;"Pastebin" "http://nsis.pastebin.com/index/1FtyKP89"
+;"Search" "http://www.google.com/cse/home?cx=005317984255499820329:c_glv1-6a6a"
+
+
+!insertmacro StartColumn 130
+!insertmacro CreateHeader "Plug-ins" ${UX_W}
+!macro CreatePluginLink Name Desc Url
+!define /ReDef SAVE_UY ${UY}
+!insertmacro CreateSimpleLinkHelper "${Name}" "${Url}" ${UX_W} ; AdjustLinkPair will configure this link
+!define /ReDef UY ${SAVE_UY}
+!insertmacro CreateControl Label "${Name} - ${Desc}" ${UX_W} ${UY_TXT}
+Call AdjustLinkPair
+!macroend
+!insertmacro CreatePluginLink "AdvSplash" "splash with fade in/out"     "${PD}\AdvSplash\advsplash.txt"
+!insertmacro CreatePluginLink "Banner"    "banner with custom text"     "${PD}\Banner\Readme.txt"
+!insertmacro CreatePluginLink "BgImage"   "background image"            "${PD}\BgImage\BgImage.txt"
+!insertmacro CreatePluginLink "Dialer"    "internet connection"         "${PD}\Dialer\Dialer.txt"
+!insertmacro CreatePluginLink "Math"      "math operations"             "${PD}\Math\Math.txt"
+!insertmacro CreatePluginLink "nsDialogs" "custom wizard pages"         "${PD}\nsDialogs\Readme.html"
+!insertmacro CreatePluginLink "nsExec"    "launch command line tools"   "${PD}\nsExec\nsExec.txt"
+!insertmacro CreatePluginLink "NSISdl"    "download files"              "${PD}\NSISdl\Readme.txt"
+!insertmacro CreatePluginLink "Splash"    "splash screen"               "${PD}\Splash\splash.txt"
+!insertmacro CreatePluginLink "StartMenu" "Start Menu folder selection" "${PD}\StartMenu\Readme.txt"
+!insertmacro CreatePluginLink "System"    "Windows API calls"           "${PD}\System\System.html"
+!insertmacro CreatePluginLink "VPatch"    "update existing files"       "${PD}\VPatch\Readme.html"
+
+
+; --- Footer ---
+${NSD_CreateLabel} 0 -22u 100% 1 ""
+Pop $0
+${SetCtlColors} $0 000000 000000 ${CB_FOOTERLINE}
+
+nsDialogs::CreateControl ${__NSD_Label_CLASS} ${__NSD_Label_STYLE}|${SS_CENTERIMAGE}|${SS_NOTIFY} ${__NSD_Label_EXSTYLE} -110u -20u 100% 20u "nsis.sourceforge.net"
+Pop $0
+${SetCtlColors} $0 ${CT_FOOTER} transparent transparent
+SendMessage $0 ${WM_SETFONT} ${HF_HEADER} 1
+nsDialogs::SetUserData $0 "https://nsis.sourceforge.io"
+${NSD_OnClick} $0 OnLinkClick
+
+nsDialogs::Show
+FunctionEnd
+
+Function OnLinkClick
+Pop $1 ; HWND
+nsDialogs::GetUserData $1
+Call SplitPipe
+Pop $0 ; First URL in UserData from SplitPipe
+StrCpy $3 ""
+StrCpy $1 $0 4 ; Copy length of ${PD}
+${IfThen} $1 == "${PD}" ${|} StrCpy $3 "${PR}\" ${|}
+!ifdef QUIT_ON_EXECUTE
+System::Call 'USER32::GetKeyState(i0x11)i.r9' ; VK_CONTROL
+!endif
+ClearErrors
+ExecShell "" "$3$0"
+Pop $1 ; ... the rest of SplitPipe ...
+${If} $1 != ""  ; ... might contain a fallback location
+	StrCpy $0 $1
+	StrCpy $3 ""
+${ElseIf} $3 != "" ; Local docs path failed, use WWW fallback
+	StrCpy $3 0
+	slashconvloop:
+		StrCpy $2 $0 1 $3
+		${If} $2 == "\"
+			StrCpy $2 $0 $3
+			IntOp $3 $3 + 1
+			StrCpy $0 $0 "" $3
+			StrCpy $0 "$2/$0"
+		${Else}
+			IntOp $3 $3 + 1
+		${EndIf}
+		StrCmp $2 "" 0 slashconvloop
+	StrCpy $3 "${WWW}/"
+${EndIf}
+${If} "$3$1" != ""
+${AndIf} ${Errors}
+	ExecShell "" "$3$0"
+${EndIf}
+${If} ${Errors}
+	!ifdef QUIT_ON_EXECUTE
+	StrCpy $9 0 ; Don't allow close
+	!endif
+	MessageBox MB_IconStop 'Error: Unable to open "$0"!'
+${EndIf}
+!ifdef QUIT_ON_EXECUTE
+${IfThen} $9 < 0 ${|} SendMessage $hWndParent ${WM_CLOSE} 0 0 ${|}
+!endif
+FunctionEnd
+
+Function ConfigureLink
+Pop $1 ; HWND
+${NSD_OnClick} $1 OnLinkClick
+${SetCtlColors} $1 ${CT_LINK} ${CB_PAGE}
+${NSD_GetText} $1 $4
+Push $4
+Call SplitPipe
+Pop $4
+Pop $2
+${NSD_SetText} $1 $4
+nsDialogs::SetUserData $1 $2
+System::Call 'USER32::GetDC(pr1)p.r3'
+SendMessage $1 ${WM_GETFONT} 0 0 $5
+System::Call 'GDI32::SelectObject(pr3,pr5)p.s'
+StrLen $5 $4
+System::Call 'GDI32::GetTextExtentPoint32(pr3,tr4,ir5,@r5)'
+System::Call '*$5(i.r6)'
+System::Call 'GDI32::SelectObject(pr3,ps)'
+System::Call 'USER32::ReleaseDC(pr1,pr3)'
+System::Call 'USER32::GetWindowRect(pr1,@r3)'
+System::Call '*$3(i,i.r5,i,i.r7)'
+IntOp $7 $7 - $5
+IntOp $6 $6 + 4 ; Padding for focus rect
+System::Call 'USER32::SetWindowPos(pr1,p,i,i,ir6,ir7,i0x16)'
+FunctionEnd
+
+Function AdjustLinkPair
+Pop $2 ; Label
+${SetCtlColors} $2 ${CT_PAGE} ${CB_PAGE}
+Call ConfigureLink
+FunctionEnd
+
+Function SplitPipe
+Exch $0
+Push $1
+Push $2
+StrCpy $2 0
+findSep:
+StrCpy $1 $0 1 $2
+IntOp $2 $2 + 1
+StrCmp $1 "" +2
+StrCmp $1 "|" "" findSep
+StrCpy $1 $0 "" $2
+IntOp $2 $2 - 1
+StrCpy $0 $0 $2
+Pop $2
+Exch $1
+Exch
+Exch $0
+FunctionEnd
+
+Section
+SectionEnd
+
+Page Custom PageCreate PageLeave
+!pragma warning disable 8000 ; Page instfiles not used
\ No newline at end of file
Index: tmp/org.txm.setups/nsis/Examples/BgImage/Example.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/BgImage/Example.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/BgImage/Example.nsi	(revision 2956)
@@ -3,6 +3,7 @@
 OutFile "BgImage Test.exe"
 
 XPStyle on
+RequestExecutionLevel user
 
 !define DEBUG
 !macro GetReturnValue
Index: tmp/org.txm.setups/nsis/Examples/Plugin/exdll-vs2008.sln
===================================================================
--- tmp/org.txm.setups/nsis/Examples/Plugin/exdll-vs2008.sln	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/Plugin/exdll-vs2008.sln	(revision 2956)
@@ -1,7 +1,7 @@
 ï»¿
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exdll", "exdll.vcproj", "{5E3E2AFD-1D6B-4997-A9B5-8ECBC8F6C31A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exdll", "exdll-vs2008.vcproj", "{5E3E2AFD-1D6B-4997-A9B5-8ECBC8F6C31A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
Index: tmp/org.txm.setups/nsis/Examples/Plugin/exdll_with_unit.dpr
===================================================================
--- tmp/org.txm.setups/nsis/Examples/Plugin/exdll_with_unit.dpr	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/Plugin/exdll_with_unit.dpr	(revision 2956)
@@ -9,12 +9,36 @@
   Tested in Delphi 7.0
 }
 
+// Example NSIS code
+{
+Section
+  exdll_with_unit::registerplugincallback
+
+  StrCpy $0 "Hello"
+  Push "World"
+  exdll_with_unit::pop_dlg_push
+  Pop $1
+  DetailPrint $$0=$0
+  DetailPrint $$1=$1
+
+  GetFunctionAddress $0 nsistest
+  Push $0
+  exdll_with_unit::callnsisfunc
+SectionEnd
+
+Function nsistest
+  DetailPrint "Hello from NSIS function"
+FunctionEnd
+}
+
+
 library exdll;
 
 uses
   nsis, windows;
 
-procedure ex_dll(const hwndParent: HWND; const string_size: integer; const variables: PChar; const stacktop: pointer); cdecl;
+
+procedure pop_dlg_push(const hwndParent: HWND; const string_size: integer; const variables: PChar; const stacktop: pointer); cdecl;
 begin
   // set up global variables
   Init(hwndParent, string_size, variables, stacktop);
@@ -25,7 +49,45 @@
   SetUserVariable(INST_0, 'This is user var $0');
 end;
 
-exports ex_dll;
 
+procedure callnsisfunc(const hwndParent: HWND; const string_size: integer; const variables: PChar; const stacktop: pointer; const extraparameters: pointer); cdecl;
+var
+  FuncAddr : String;
 begin
+  Init(hwndParent, string_size, variables, stacktop, extraparameters);
+
+  FuncAddr := PopString();
+  Call(FuncAddr);
+end;
+
+
+function mynsiscallback(const NSPIM: TNSPIM): Pointer; cdecl;
+begin
+  Result := nil;
+  if NSPIM = NSPIM_UNLOAD then
+    begin
+      NSISDialog(PChar('NSPIM_UNLOAD is the final callback, goodbye...'), PChar('mynsiscallback'), MB_OK);
+    end;
+end;
+
+
+procedure registerplugincallback(const hwndParent: HWND; const string_size: integer; const variables: PChar; const stacktop: pointer; const extraparameters: pointer); cdecl;
+var
+  ThisDllInstance : HMODULE;
+begin
+  Init(hwndParent, string_size, variables, stacktop, extraparameters);
+
+  if g_extraparameters <> nil then
+  begin
+    ThisDllInstance := hInstance;
+    TRegisterPluginCallback(g_extraparameters.RegisterPluginCallback)(ThisDllInstance, @mynsiscallback);
+  end;
+end;
+
+
+exports pop_dlg_push;
+exports callnsisfunc;
+exports registerplugincallback;
+
+begin
 end.
Index: tmp/org.txm.setups/nsis/Examples/Plugin/exdll.c
===================================================================
--- tmp/org.txm.setups/nsis/Examples/Plugin/exdll.c	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/Plugin/exdll.c	(revision 2956)
@@ -2,37 +2,41 @@
 #include <nsis/pluginapi.h> // nsis plugin
 
 HINSTANCE g_hInstance;
-
 HWND g_hwndParent;
 
+// To work with Unicode version of NSIS, please use TCHAR-type
+// functions for accessing the variables and the stack.
+
 void __declspec(dllexport) myFunction(HWND hwndParent, int string_size, 
-                                      char *variables, stack_t **stacktop,
-                                      extra_parameters *extra)
+                                      LPTSTR variables, stack_t **stacktop,
+                                      extra_parameters *extra, ...)
 {
-  g_hwndParent=hwndParent;
-
   EXDLL_INIT();
+  g_hwndParent = hwndParent;
 
 
   // note if you want parameters from the stack, pop them off in order.
-  // i.e. if you are called via exdll::myFunction file.dat poop.dat
+  // i.e. if you are called via exdll::myFunction file.dat read.txt
   // calling popstring() the first time would give you file.dat,
-  // and the second time would give you poop.dat. 
+  // and the second time would give you read.txt. 
   // you should empty the stack of your parameters, and ONLY your
   // parameters.
 
   // do your stuff here
   {
-    char buf[1024];
-    wsprintf(buf,"$0=%s\n",getuservariable(INST_0));
-    MessageBox(g_hwndParent,buf,0,MB_OK);
+    LPTSTR msgbuf = (LPTSTR) GlobalAlloc(GPTR, (3 + string_size + 1) * sizeof(*msgbuf));
+    if (msgbuf)
+    {
+      wsprintf(msgbuf, TEXT("$0=%s"), getuservariable(INST_0));
+      MessageBox(g_hwndParent, msgbuf, TEXT("Message from example plugin"), MB_OK);
+      GlobalFree(msgbuf);
+    }
   }
 }
 
 
-
 BOOL WINAPI DllMain(HINSTANCE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
 {
-  g_hInstance=hInst;
-	return TRUE;
+  g_hInstance = hInst;
+  return TRUE;
 }
Index: tmp/org.txm.setups/nsis/Examples/Plugin/exdll-vs2008.vcproj
===================================================================
--- tmp/org.txm.setups/nsis/Examples/Plugin/exdll-vs2008.vcproj	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/Plugin/exdll-vs2008.vcproj	(revision 2956)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="exdll"
 	ProjectGUID="{5E3E2AFD-1D6B-4997-A9B5-8ECBC8F6C31A}"
 	RootNamespace="exdll"
@@ -80,6 +80,7 @@
 				OutputFile=".\Release/exdll.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				GenerateManifest="false"
 				IgnoreAllDefaultLibraries="true"
 				IgnoreDefaultLibraryNames="libc.lib"
 				ProgramDatabaseFile=".\Release/exdll.pdb"
@@ -179,6 +180,7 @@
 				OutputFile=".\Debug/exdll.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
+				GenerateManifest="false"
 				IgnoreAllDefaultLibraries="true"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
Index: tmp/org.txm.setups/nsis/Examples/Plugin/nsis/api.h
===================================================================
--- tmp/org.txm.setups/nsis/Examples/Plugin/nsis/api.h	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/Plugin/nsis/api.h	(revision 2956)
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2015 Nullsoft and Contributors
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,8 +27,8 @@
 // NSIS Plug-In Callback Messages
 enum NSPIM 
 {
-	NSPIM_UNLOAD,    // This is the last message a plugin gets, do final cleanup
-	NSPIM_GUIUNLOAD, // Called after .onGUIEnd
+  NSPIM_UNLOAD,    // This is the last message a plugin gets, do final cleanup
+  NSPIM_GUIUNLOAD, // Called after .onGUIEnd
 };
 
 // Prototype for callbacks registered with extra_parameters->RegisterPluginCallback()
@@ -36,35 +36,37 @@
 // Should always be __cdecl for future expansion possibilities
 typedef UINT_PTR (*NSISPLUGINCALLBACK)(enum NSPIM);
 
-// extra_parameters data structures containing other interesting stuff
-// but the stack, variables and HWND passed on to plug-ins.
+// extra_parameters data structure containing other interesting stuff
+// besides the stack, variables and HWND passed on to plug-ins.
 typedef struct
 {
-  int autoclose;
-  int all_user_var;
-  int exec_error;
-  int abort;
-  int exec_reboot; // NSIS_SUPPORT_REBOOT
-  int reboot_called; // NSIS_SUPPORT_REBOOT
-  int XXX_cur_insttype; // depreacted
-  int plugin_api_version; // see NSISPIAPIVER_CURR
-                          // used to be XXX_insttype_changed
-  int silent; // NSIS_CONFIG_SILENT_SUPPORT
-  int instdir_error;
-  int rtl;
-  int errlvl;
-  int alter_reg_view;
-  int status_update;
+  int autoclose;          // SetAutoClose
+  int all_user_var;       // SetShellVarContext: User context = 0, Machine context = 1
+  int exec_error;         // IfErrors/ClearErrors/SetErrors
+  int abort;              // IfAbort
+  int exec_reboot;        // IfRebootFlag/SetRebootFlag (NSIS_SUPPORT_REBOOT)
+  int reboot_called;      // NSIS_SUPPORT_REBOOT
+  int XXX_cur_insttype;   // Deprecated
+  int plugin_api_version; // Plug-in ABI. See NSISPIAPIVER_CURR (Note: used to be XXX_insttype_changed)
+  int silent;             // IfSilent/SetSilent (NSIS_CONFIG_SILENT_SUPPORT)
+  int instdir_error;      // GetInstDirError
+  int rtl;                // IfRtlLanguage: 1 if $LANGUAGE is a RTL language
+  int errlvl;             // SetErrorLevel
+  int alter_reg_view;     // SetRegView: Default View = 0, Alternative View = (sizeof(void*) > 4 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY)
+  int status_update;      // SetDetailsPrint
 } exec_flags_t;
 
 #ifndef NSISCALL
 #  define NSISCALL __stdcall
 #endif
+#if !defined(_WIN32) && !defined(LPTSTR)
+#  define LPTSTR TCHAR*
+#endif
 
 typedef struct {
   exec_flags_t *exec_flags;
   int (NSISCALL *ExecuteCodeSegment)(int, HWND);
-  void (NSISCALL *validate_filename)(char *);
+  void (NSISCALL *validate_filename)(LPTSTR);
   int (NSISCALL *RegisterPluginCallback)(HMODULE, NSISPLUGINCALLBACK); // returns 0 on success, 1 if already registered and < 0 on errors
 } extra_parameters;
 
@@ -80,4 +82,4 @@
 // sent as wParam with WM_NOTIFY_OUTER_NEXT when user cancels - heed its warning
 #define NOTIFY_BYE_BYE 'x'
 
-#endif /* _PLUGIN_H_ */
+#endif /* _NSIS_EXEHEAD_API_H_ */
Index: tmp/org.txm.setups/nsis/Examples/Plugin/nsis/nsis_tchar.h
===================================================================
--- tmp/org.txm.setups/nsis/Examples/Plugin/nsis/nsis_tchar.h	(revision 0)
+++ tmp/org.txm.setups/nsis/Examples/Plugin/nsis/nsis_tchar.h	(revision 2956)
@@ -0,0 +1,229 @@
+/*
+ * nsis_tchar.h
+ * 
+ * This file is a part of NSIS.
+ * 
+ * Copyright (C) 1999-2020 Nullsoft and Contributors
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty.
+ *
+ * For Unicode support by Jim Park -- 08/30/2007
+ */
+
+// Jim Park: Only those we use are listed here.
+
+#pragma once
+
+#ifdef _UNICODE
+
+#ifndef _T
+#define __T(x)   L ## x
+#define _T(x)    __T(x)
+#define _TEXT(x) __T(x)
+#endif
+
+#ifndef _TCHAR_DEFINED
+#define _TCHAR_DEFINED
+#if !defined(_NATIVE_WCHAR_T_DEFINED) && !defined(_WCHAR_T_DEFINED)
+typedef unsigned short TCHAR;
+#else
+typedef wchar_t TCHAR;
+#endif
+#endif
+
+
+// program
+#define _tenviron   _wenviron
+#define __targv     __wargv
+
+// printfs
+#define _ftprintf   fwprintf
+#define _sntprintf  _snwprintf
+#if (defined(_MSC_VER) && (_MSC_VER<=1310||_MSC_FULL_VER<=140040310)) || defined(__MINGW32__)
+#	define _stprintf   swprintf
+#else
+#	define _stprintf   _swprintf
+#endif
+#define _tprintf    wprintf
+#define _vftprintf  vfwprintf
+#define _vsntprintf _vsnwprintf
+#if defined(_MSC_VER) && (_MSC_VER<=1310)
+#	define _vstprintf  vswprintf
+#else
+#	define _vstprintf  _vswprintf
+#endif
+
+// scanfs
+#define _tscanf     wscanf
+#define _stscanf    swscanf
+
+// string manipulations
+#define _tcscat     wcscat
+#define _tcschr     wcschr
+#define _tcsclen    wcslen
+#define _tcscpy     wcscpy
+#define _tcsdup     _wcsdup
+#define _tcslen     wcslen
+#define _tcsnccpy   wcsncpy
+#define _tcsncpy    wcsncpy
+#define _tcsrchr    wcsrchr
+#define _tcsstr     wcsstr
+#define _tcstok     wcstok
+
+// string comparisons
+#define _tcscmp     wcscmp
+#define _tcsicmp    _wcsicmp
+#define _tcsncicmp  _wcsnicmp
+#define _tcsncmp    wcsncmp
+#define _tcsnicmp   _wcsnicmp
+
+// upper / lower
+#define _tcslwr     _wcslwr
+#define _tcsupr     _wcsupr
+#define _totlower   towlower
+#define _totupper   towupper
+
+// conversions to numbers
+#define _tcstoi64   _wcstoi64
+#define _tcstol     wcstol
+#define _tcstoul    wcstoul
+#define _tstof      _wtof
+#define _tstoi      _wtoi
+#define _tstoi64    _wtoi64
+#define _ttoi       _wtoi
+#define _ttoi64     _wtoi64
+#define _ttol       _wtol
+
+// conversion from numbers to strings
+#define _itot       _itow
+#define _ltot       _ltow
+#define _i64tot     _i64tow
+#define _ui64tot    _ui64tow
+
+// file manipulations
+#define _tfopen     _wfopen
+#define _topen      _wopen
+#define _tremove    _wremove
+#define _tunlink    _wunlink
+
+// reading and writing to i/o
+#define _fgettc     fgetwc
+#define _fgetts     fgetws
+#define _fputts     fputws
+#define _gettchar   getwchar
+
+// directory
+#define _tchdir     _wchdir
+
+// environment
+#define _tgetenv    _wgetenv
+#define _tsystem    _wsystem
+
+// time
+#define _tcsftime   wcsftime
+
+#else // ANSI
+
+#ifndef _T
+#define _T(x)    x
+#define _TEXT(x) x
+#endif
+
+#ifndef _TCHAR_DEFINED
+#define _TCHAR_DEFINED
+typedef char TCHAR;
+#endif
+
+// program
+#define _tenviron   environ
+#define __targv     __argv
+
+// printfs
+#define _ftprintf   fprintf
+#define _sntprintf  _snprintf
+#define _stprintf   sprintf
+#define _tprintf    printf
+#define _vftprintf  vfprintf
+#define _vsntprintf _vsnprintf
+#define _vstprintf  vsprintf
+
+// scanfs
+#define _tscanf     scanf
+#define _stscanf    sscanf
+
+// string manipulations
+#define _tcscat     strcat
+#define _tcschr     strchr
+#define _tcsclen    strlen
+#define _tcscnlen   strnlen
+#define _tcscpy     strcpy
+#define _tcsdup     _strdup
+#define _tcslen     strlen
+#define _tcsnccpy   strncpy
+#define _tcsrchr    strrchr
+#define _tcsstr     strstr
+#define _tcstok     strtok
+
+// string comparisons
+#define _tcscmp     strcmp
+#define _tcsicmp    _stricmp
+#define _tcsncmp    strncmp
+#define _tcsncicmp  _strnicmp
+#define _tcsnicmp   _strnicmp
+
+// upper / lower
+#define _tcslwr     _strlwr
+#define _tcsupr     _strupr
+
+#define _totupper   toupper
+#define _totlower   tolower
+
+// conversions to numbers
+#define _tcstol     strtol
+#define _tcstoul    strtoul
+#define _tstof      atof
+#define _tstoi      atoi
+#define _tstoi64    _atoi64
+#define _tstoi64    _atoi64
+#define _ttoi       atoi
+#define _ttoi64     _atoi64
+#define _ttol       atol
+
+// conversion from numbers to strings
+#define _i64tot     _i64toa
+#define _itot       _itoa
+#define _ltot       _ltoa
+#define _ui64tot    _ui64toa
+
+// file manipulations
+#define _tfopen     fopen
+#define _topen      _open
+#define _tremove    remove
+#define _tunlink    _unlink
+
+// reading and writing to i/o
+#define _fgettc     fgetc
+#define _fgetts     fgets
+#define _fputts     fputs
+#define _gettchar   getchar
+
+// directory
+#define _tchdir     _chdir
+
+// environment
+#define _tgetenv    getenv
+#define _tsystem    system
+
+// time
+#define _tcsftime   strftime
+
+#endif
+
+// is functions (the same in Unicode / ANSI)
+#define _istgraph   isgraph
+#define _istascii   __isascii
+
+#define __TFILE__ _T(__FILE__)
+#define __TDATE__ _T(__DATE__)
+#define __TTIME__ _T(__TIME__)
Index: tmp/org.txm.setups/nsis/Examples/Plugin/nsis/pluginapi-x86-unicode.lib
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Examples/Plugin/nsis/pluginapi-x86-unicode.lib
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Examples/Plugin/nsis/pluginapi-x86-ansi.lib
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Examples/Plugin/nsis/pluginapi-x86-ansi.lib
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Examples/Plugin/nsis/pluginapi.h
===================================================================
--- tmp/org.txm.setups/nsis/Examples/Plugin/nsis/pluginapi.h	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/Plugin/nsis/pluginapi.h	(revision 2956)
@@ -6,9 +6,10 @@
 #endif
 
 #include "api.h"
+#include "nsis_tchar.h" // BUGBUG: Why cannot our plugins use the compilers tchar.h?
 
 #ifndef NSISCALL
-#  define NSISCALL __stdcall
+#  define NSISCALL WINAPI
 #endif
 
 #define EXDLL_INIT()           {  \
@@ -18,7 +19,11 @@
 
 typedef struct _stack_t {
   struct _stack_t *next;
-  char text[1]; // this should be the length of string_size
+#ifdef UNICODE
+  WCHAR text[1]; // this should be the length of g_stringsize when allocating
+#else
+  char text[1];
+#endif
 } stack_t;
 
 enum
@@ -53,20 +58,49 @@
 
 extern unsigned int g_stringsize;
 extern stack_t **g_stacktop;
-extern char *g_variables;
+extern LPTSTR g_variables;
 
-int NSISCALL popstring(char *str); // 0 on success, 1 on empty stack
-int NSISCALL popstringn(char *str, int maxlen); // with length limit, pass 0 for g_stringsize
-int NSISCALL popint(); // pops an integer
+void NSISCALL pushstring(LPCTSTR str);
+void NSISCALL pushintptr(INT_PTR value);
+#define pushint(v) pushintptr((INT_PTR)(v))
+int NSISCALL popstring(LPTSTR str); // 0 on success, 1 on empty stack
+int NSISCALL popstringn(LPTSTR str, int maxlen); // with length limit, pass 0 for g_stringsize
+INT_PTR NSISCALL popintptr();
+#define popint() ( (int) popintptr() )
 int NSISCALL popint_or(); // with support for or'ing (2|4|8)
-int NSISCALL myatoi(const char *s); // converts a string to an integer
-unsigned NSISCALL myatou(const char *s); // converts a string to an unsigned integer, decimal only
-int NSISCALL myatoi_or(const char *s); // with support for or'ing (2|4|8)
-void NSISCALL pushstring(const char *str);
-void NSISCALL pushint(int value);
-char * NSISCALL getuservariable(const int varnum);
-void NSISCALL setuservariable(const int varnum, const char *var);
+INT_PTR NSISCALL nsishelper_str_to_ptr(LPCTSTR s);
+#define myatoi(s) ( (int) nsishelper_str_to_ptr(s) ) // converts a string to an integer
+unsigned int NSISCALL myatou(LPCTSTR s); // converts a string to an unsigned integer, decimal only
+int NSISCALL myatoi_or(LPCTSTR s); // with support for or'ing (2|4|8)
+LPTSTR NSISCALL getuservariable(const int varnum);
+void NSISCALL setuservariable(const int varnum, LPCTSTR var);
 
+#ifdef UNICODE
+#define PopStringW(x) popstring(x)
+#define PushStringW(x) pushstring(x)
+#define SetUserVariableW(x,y) setuservariable(x,y)
+
+int  NSISCALL PopStringA(LPSTR ansiStr);
+void NSISCALL PushStringA(LPCSTR ansiStr);
+void NSISCALL GetUserVariableW(const int varnum, LPWSTR wideStr);
+void NSISCALL GetUserVariableA(const int varnum, LPSTR ansiStr);
+void NSISCALL SetUserVariableA(const int varnum, LPCSTR ansiStr);
+
+#else
+// ANSI defs
+
+#define PopStringA(x) popstring(x)
+#define PushStringA(x) pushstring(x)
+#define SetUserVariableA(x,y) setuservariable(x,y)
+
+int  NSISCALL PopStringW(LPWSTR wideStr);
+void NSISCALL PushStringW(LPWSTR wideStr);
+void NSISCALL GetUserVariableW(const int varnum, LPWSTR wideStr);
+void NSISCALL GetUserVariableA(const int varnum, LPSTR ansiStr);
+void NSISCALL SetUserVariableW(const int varnum, LPCWSTR wideStr);
+
+#endif
+
 #ifdef __cplusplus
 }
 #endif
Index: tmp/org.txm.setups/nsis/Examples/Plugin/exdll.dsp
===================================================================
--- tmp/org.txm.setups/nsis/Examples/Plugin/exdll.dsp	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/Plugin/exdll.dsp	(revision 2956)
@@ -52,8 +52,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib nsis\pluginapi.lib /nologo /entry:"DllMain" /dll /machine:I386 /nodefaultlib /out:"../../Plugins/exdll.dll" /opt:nowin98
+# ADD BASE LINK32 user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib /nologo /dll /machine:I386
+# ADD LINK32 user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib nsis\pluginapi.lib /nologo /entry:"DllMain" /dll /machine:I386 /nodefaultlib /out:"../../Plugins/exdll.dll" /opt:nowin98
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "exdll - Win32 Debug"
@@ -79,8 +79,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib nsis\pluginapi.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib nsis\pluginapi.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 
 !ENDIF 
 
Index: tmp/org.txm.setups/nsis/Examples/Plugin/nsis.pas
===================================================================
--- tmp/org.txm.setups/nsis/Examples/Plugin/nsis.pas	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/Plugin/nsis.pas	(revision 2956)
@@ -50,9 +50,18 @@
     );
   TVariableList = INST_0..__INST_LAST;
 
+type
+  PluginCallbackMessages = (
+    NSPIM_UNLOAD,   // This is the last message a plugin gets, do final cleanup
+    NSPIM_GUIUNLOAD // Called after .onGUIEnd
+    );
+  TNSPIM = NSPIM_UNLOAD..NSPIM_GUIUNLOAD;
+
+  //TPluginCallback = function (const NSPIM: Integer): Pointer; cdecl;
+
   TExecuteCodeSegment = function (const funct_id: Integer; const parent: HWND): Integer;  stdcall;
-  Tvalidate_filename = procedure (const filename: PChar); cdecl;
-  TRegisterPluginCallback = function (const unknow: Integer; const uknown2: Integer): Integer; cdecl;
+  Tvalidate_filename = procedure (const filename: PChar); stdcall;
+  TRegisterPluginCallback = function (const DllInstance: HMODULE; const CallbackFunction: Pointer): Integer; stdcall;
 
   pexec_flags_t = ^exec_flags_t;
   exec_flags_t = record
@@ -75,7 +84,7 @@
   pextrap_t = ^extrap_t;
   extrap_t = record
     exec_flags: Pointer; // exec_flags_t;
-    exec_code_segment: Pointer; //  TFarProc;
+    exec_code_segment: TExecuteCodeSegment; //  TFarProc;
     validate_filename: Pointer; // Tvalidate_filename;
     RegisterPluginCallback: Pointer; //TRegisterPluginCallback;
   end;
@@ -93,10 +102,7 @@
   g_hwndParent: HWND;
   g_hwndList: HWND;
   g_hwndLogList: HWND;
-
   g_extraparameters: pextrap_t;
-  func : TExecuteCodeSegment;
-  extrap : extrap_t;
 
 procedure Init(const hwndParent: HWND; const string_size: integer; const variables: PChar; const stacktop: pointer; const extraparameters: pointer = nil);
 
@@ -116,23 +122,21 @@
   g_hwndParent := hwndParent;
   g_stacktop   := stacktop;
   g_variables  := variables;
-  g_hwndList := 0;
-  g_hwndList := FindWindowEx(FindWindowEx(g_hwndParent, 0, '#32770', nil), 0,'SysListView32', nil);
+  g_hwndList   := FindWindowEx(FindWindowEx(g_hwndParent, 0, '#32770', nil), 0,'SysListView32', nil);
   g_extraparameters := extraparameters;
-  extrap := g_extraparameters^;
 end;
 
+
 function Call(NSIS_func : String) : Integer;
 var
-  NSISFun: Integer; //The ID of nsis function
+  codeoffset: Integer; //The ID of nsis function
 begin
   Result := 0;
-  NSISFun := StrToIntDef(NSIS_func, 0);
-  if (NSISFun <> 0) and (g_extraparameters <> nil) then
+  codeoffset := StrToIntDef(NSIS_func, 0);
+  if (codeoffset <> 0) and (g_extraparameters <> nil) then
     begin
-    @func := extrap.exec_code_segment;
-    NSISFun := NSISFun - 1;
-    Result := func(NSISFun, g_hwndParent);
+    codeoffset := codeoffset - 1;
+    Result := g_extraparameters.exec_code_segment(codeoffset, g_hwndParent);
     end;
 end;
 
@@ -147,8 +151,8 @@
   ItemCount := SendMessage(g_hwndList, LVM_GETITEMCOUNT, 0, 0);
   item.iItem := ItemCount;
   item.mask := LVIF_TEXT;
-  item.pszText := PAnsiChar(Msg);
-  ListView_InsertItem(g_hwndList, item );
+  item.pszText := PChar(Msg);
+  ListView_InsertItem(g_hwndList, item);
   ListView_EnsureVisible(g_hwndList, ItemCount, TRUE);
 end;
 
@@ -191,8 +195,12 @@
 end;
 
 procedure NSISDialog(const text, caption: string; const buttons: integer);
+var
+  hwndOwner: HWND;
 begin
-  MessageBox(g_hwndParent, PChar(text), PChar(caption), buttons);
+  hwndOwner := g_hwndParent;
+  if not IsWindow(g_hwndParent) then hwndOwner := 0; // g_hwndParent is not valid in NSPIM_[GUI]UNLOAD
+  MessageBox(hwndOwner, PChar(text), PChar(caption), buttons);
 end;
 
 begin
Index: tmp/org.txm.setups/nsis/Examples/install-shared.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/install-shared.nsi	(revision 0)
+++ tmp/org.txm.setups/nsis/Examples/install-shared.nsi	(revision 2956)
@@ -0,0 +1,81 @@
+/*
+
+This example script installs a simple application for all users on a machine.
+
+All-users installers should only write to HKLM, $ProgramFiles, $CommonFiles and the 
+"All context" versions of $LocalAppData, $Templates, $SMPrograms etc.
+
+It should not write to HKCU nor any folders in the users profile!
+If the application requires writable template data in $AppData it 
+must copy the required files from a shared location the 
+first time a user launches the application.
+
+*/
+
+!define NAME "All-users example"
+!define REGPATH_UNINSTSUBKEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${NAME}"
+Name "${NAME}"
+OutFile "Install ${NAME}.exe"
+Unicode True
+RequestExecutionLevel Admin ; Request admin rights on WinVista+ (when UAC is turned on)
+InstallDir "$ProgramFiles\$(^Name)"
+InstallDirRegKey HKLM "${REGPATH_UNINSTSUBKEY}" "UninstallString"
+
+!include LogicLib.nsh
+!include Integration.nsh
+
+Page Directory
+Page InstFiles
+
+Uninstpage UninstConfirm
+Uninstpage InstFiles
+
+!macro EnsureAdminRights
+  UserInfo::GetAccountType
+  Pop $0
+  ${If} $0 != "admin" ; Require admin rights on WinNT4+
+    MessageBox MB_IconStop "Administrator rights required!"
+    SetErrorLevel 740 ; ERROR_ELEVATION_REQUIRED
+    Quit
+  ${EndIf}
+!macroend
+
+Function .onInit
+  SetShellVarContext All
+  !insertmacro EnsureAdminRights
+FunctionEnd
+
+Function un.onInit
+  SetShellVarContext All
+  !insertmacro EnsureAdminRights
+FunctionEnd
+
+
+Section "Program files (Required)"
+  SectionIn Ro
+
+  SetOutPath $InstDir
+  WriteUninstaller "$InstDir\Uninst.exe"
+  WriteRegStr HKLM "${REGPATH_UNINSTSUBKEY}" "DisplayName" "${NAME}"
+  WriteRegStr HKLM "${REGPATH_UNINSTSUBKEY}" "DisplayIcon" "$InstDir\MyApp.exe,0"
+  WriteRegStr HKLM "${REGPATH_UNINSTSUBKEY}" "UninstallString" '"$InstDir\Uninst.exe"'
+  WriteRegDWORD HKLM "${REGPATH_UNINSTSUBKEY}" "NoModify" 1
+  WriteRegDWORD HKLM "${REGPATH_UNINSTSUBKEY}" "NoRepair" 1
+
+  File "/oname=$InstDir\MyApp.exe" "${NSISDIR}\Bin\MakeLangId.exe" ; Pretend that we have a real application to install
+SectionEnd
+
+Section "Start Menu shortcut"
+  CreateShortcut /NoWorkingDir "$SMPrograms\${NAME}.lnk" "$InstDir\MyApp.exe"
+SectionEnd
+
+
+Section -Uninstall
+  ${UnpinShortcut} "$SMPrograms\${NAME}.lnk"
+  Delete "$SMPrograms\${NAME}.lnk"
+
+  Delete "$InstDir\MyApp.exe"
+  Delete "$InstDir\Uninst.exe"
+  RMDir "$InstDir"
+  DeleteRegKey HKLM "${REGPATH_UNINSTSUBKEY}"
+SectionEnd
Index: tmp/org.txm.setups/nsis/Examples/StartMenu/Example.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/StartMenu/Example.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/StartMenu/Example.nsi	(revision 2956)
@@ -40,11 +40,11 @@
 	StrCmp $R1 ">" skip
 
 		CreateDirectory $SMPROGRAMS\$R0
-		CreateShortCut $SMPROGRAMS\$R0\MakeNSISw.lnk $INSTDIR\makensisw.exe
+		CreateShortcut $SMPROGRAMS\$R0\MakeNSISw.lnk $INSTDIR\makensisw.exe
 
 		SetShellVarContext All
 		CreateDirectory $SMPROGRAMS\$R0
-		CreateShortCut "$SMPROGRAMS\$R0\All users MakeNSISw.lnk" $INSTDIR\makensisw.exe
+		CreateShortcut "$SMPROGRAMS\$R0\All users MakeNSISw.lnk" $INSTDIR\makensisw.exe
 
 	skip:
 SectionEnd
\ No newline at end of file
Index: tmp/org.txm.setups/nsis/Examples/Modern UI/WelcomeFinish.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/Modern UI/WelcomeFinish.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/Modern UI/WelcomeFinish.nsi	(revision 2956)
@@ -13,6 +13,7 @@
   ;Name and file
   Name "Modern UI Test"
   OutFile "WelcomeFinish.exe"
+  Unicode True
 
   ;Default installation folder
   InstallDir "$LOCALAPPDATA\Modern UI Test"
Index: tmp/org.txm.setups/nsis/Examples/Modern UI/MultiLanguage.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/Modern UI/MultiLanguage.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/Modern UI/MultiLanguage.nsi	(revision 2956)
@@ -2,6 +2,8 @@
 ;Multilingual Example Script
 ;Written by Joost Verburg
 
+!pragma warning error all
+
 ;--------------------------------
 ;Include Modern UI
 
@@ -10,6 +12,9 @@
 ;--------------------------------
 ;General
 
+  ;Properly display all languages (Installer will not work on Windows 95, 98 or ME!)
+  Unicode true
+
   ;Name and file
   Name "Modern UI Test"
   OutFile "MultiLanguage.exe"
@@ -28,6 +33,9 @@
 
   !define MUI_ABORTWARNING
 
+  ;Show all languages, despite user's codepage
+  !define MUI_LANGDLL_ALLLANGUAGES
+
 ;--------------------------------
 ;Language Selection Dialog Settings
 
@@ -39,18 +47,25 @@
 ;--------------------------------
 ;Pages
 
+  !insertmacro MUI_PAGE_WELCOME
   !insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Docs\Modern UI\License.txt"
   !insertmacro MUI_PAGE_COMPONENTS
   !insertmacro MUI_PAGE_DIRECTORY
   !insertmacro MUI_PAGE_INSTFILES
+  !insertmacro MUI_PAGE_FINISH
   
+  !insertmacro MUI_UNPAGE_WELCOME
   !insertmacro MUI_UNPAGE_CONFIRM
+  !insertmacro MUI_UNPAGE_LICENSE "${NSISDIR}\Docs\Modern UI\License.txt"
+  !insertmacro MUI_UNPAGE_COMPONENTS
+  !insertmacro MUI_UNPAGE_DIRECTORY
   !insertmacro MUI_UNPAGE_INSTFILES
+  !insertmacro MUI_UNPAGE_FINISH
 
 ;--------------------------------
 ;Languages
 
-  !insertmacro MUI_LANGUAGE "English" ;first language is the default language
+  !insertmacro MUI_LANGUAGE "English" ; The first language is the default language
   !insertmacro MUI_LANGUAGE "French"
   !insertmacro MUI_LANGUAGE "German"
   !insertmacro MUI_LANGUAGE "Spanish"
@@ -106,6 +121,17 @@
   !insertmacro MUI_LANGUAGE "Afrikaans"
   !insertmacro MUI_LANGUAGE "Catalan"
   !insertmacro MUI_LANGUAGE "Esperanto"
+  !insertmacro MUI_LANGUAGE "Asturian"
+  !insertmacro MUI_LANGUAGE "Basque"
+  !insertmacro MUI_LANGUAGE "Pashto"
+  !insertmacro MUI_LANGUAGE "ScotsGaelic"
+  !insertmacro MUI_LANGUAGE "Georgian"
+  !insertmacro MUI_LANGUAGE "Vietnamese"
+  !insertmacro MUI_LANGUAGE "Welsh"
+  !insertmacro MUI_LANGUAGE "Armenian"
+  !insertmacro MUI_LANGUAGE "Corsican"
+  !insertmacro MUI_LANGUAGE "Tatar"
+  !insertmacro MUI_LANGUAGE "Hindi"
 
 ;--------------------------------
 ;Reserve Files
Index: tmp/org.txm.setups/nsis/Examples/Modern UI/Basic.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/Modern UI/Basic.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/Modern UI/Basic.nsi	(revision 2956)
@@ -13,6 +13,7 @@
   ;Name and file
   Name "Modern UI Test"
   OutFile "Basic.exe"
+  Unicode True
 
   ;Default installation folder
   InstallDir "$LOCALAPPDATA\Modern UI Test"
Index: tmp/org.txm.setups/nsis/Examples/Modern UI/StartMenu.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/Modern UI/StartMenu.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/Modern UI/StartMenu.nsi	(revision 2956)
@@ -13,6 +13,7 @@
   ;Name and file
   Name "Modern UI Test"
   OutFile "StartMenu.exe"
+  Unicode True
 
   ;Default installation folder
   InstallDir "$LOCALAPPDATA\Modern UI Test"
@@ -76,7 +77,7 @@
     
     ;Create shortcuts
     CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
-    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+    CreateShortcut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
   
   !insertmacro MUI_STARTMENU_WRITE_END
 
Index: tmp/org.txm.setups/nsis/Examples/Modern UI/HeaderBitmap.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/Modern UI/HeaderBitmap.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/Modern UI/HeaderBitmap.nsi	(revision 2956)
@@ -13,6 +13,7 @@
   ;Name and file
   Name "Modern UI Test"
   OutFile "HeaderBitmap.exe"
+  Unicode True
 
   ;Default installation folder
   InstallDir "$LOCALAPPDATA\Modern UI Test"
Index: tmp/org.txm.setups/nsis/Examples/InstallOptions/test.ini
===================================================================
--- tmp/org.txm.setups/nsis/Examples/InstallOptions/test.ini	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/InstallOptions/test.ini	(revision 2956)
@@ -41,12 +41,12 @@
 
 [Field 5]
 Type=FileRequest
-State=C:\poop.poop
+State=C:\dummy.xyz
 Left=10
 Right=-10
 Top=56
 Bottom=68
-Filter=Poop Files|*.poop|All files|*.*
+Filter=XYZ Files|*.xyz|All files|*.*
 Flags=GROUP|FILE_MUST_EXIST|FILE_EXPLORER|FILE_HIDEREADONLY
 
 [Field 6]
Index: tmp/org.txm.setups/nsis/Examples/InstallOptions/testlink.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/InstallOptions/testlink.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/InstallOptions/testlink.nsi	(revision 2956)
@@ -19,7 +19,7 @@
 ;Only useful for BZIP2 compression
 ;Use ReserveFile for your own InstallOptions INI files too!
 
-ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
+ReserveFile /plugin InstallOptions.dll
 ReserveFile "testlink.ini"
 
 ;Order of pages
Index: tmp/org.txm.setups/nsis/Examples/InstallOptions/testnotify.ini
===================================================================
--- tmp/org.txm.setups/nsis/Examples/InstallOptions/testnotify.ini	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/InstallOptions/testnotify.ini	(revision 2956)
@@ -41,8 +41,8 @@
 [Field 5]
 Type=FileRequest
 Flags=GROUP|FILE_MUST_EXIST|FILE_EXPLORER|FILE_HIDEREADONLY
-State=C:\poop.poop
-Filter=Poop Files|*.poop|All files|*.*
+State=C:\dummy.xyz
+Filter=XYZ Files|*.xyz|All files|*.*
 Left=10
 Right=-10
 Top=56
Index: tmp/org.txm.setups/nsis/Examples/InstallOptions/test.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/InstallOptions/test.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/InstallOptions/test.nsi	(revision 2956)
@@ -17,7 +17,7 @@
 ;Only useful for BZIP2 compression
 ;Use ReserveFile for your own InstallOptions INI files too!
 
-ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
+ReserveFile /plugin InstallOptions.dll
 ReserveFile "test.ini"
 
 ;Order of pages
Index: tmp/org.txm.setups/nsis/Examples/InstallOptions/testimgs.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/InstallOptions/testimgs.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/InstallOptions/testimgs.nsi	(revision 2956)
@@ -15,7 +15,7 @@
 ;Only useful for BZIP2 compression
 ;Use ReserveFile for your own InstallOptions INI files too!
 
-ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
+ReserveFile /plugin InstallOptions.dll
 ReserveFile "testimgs.ini"
 ReserveFile "${NSISDIR}\Contrib\Graphics\Checks\colorful.bmp"
 ReserveFile "${NSISDIR}\Contrib\Graphics\Checks\modern.bmp"
Index: tmp/org.txm.setups/nsis/Examples/InstallOptions/testlink.ini
===================================================================
--- tmp/org.txm.setups/nsis/Examples/InstallOptions/testlink.ini	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/InstallOptions/testlink.ini	(revision 2956)
@@ -32,8 +32,8 @@
 Right=-40
 Top=70
 Bottom=80
-State=http://nsis.sourceforge.net/
-Text=* Homepage http://nsis.sourceforge.net/
+State=https://nsis.sourceforge.io/
+Text=* Homepage https://nsis.sourceforge.io/
 
 [Field 5]
 Type=Text
Index: tmp/org.txm.setups/nsis/Examples/nsDialogs/example.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/nsDialogs/example.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/nsDialogs/example.nsi	(revision 2956)
@@ -1,20 +1,30 @@
-!include nsDialogs.nsh
-!include LogicLib.nsh
-
 Name "nsDialogs Example"
 OutFile "nsDialogs Example.exe"
+Caption "$(^Name)"
 
+Unicode True
 XPStyle on
+RequestExecutionLevel user
 
+!include nsDialogs.nsh
+!include LogicLib.nsh
+!include WinCore.nsh ; MAKELONG
+
+LicenseText "All the action takes place on the next page..." "Start"
+SubCaption 0 ": Ready?"
+
 Page license
 Page custom nsDialogsPage
+Page custom LBPage
+Page custom RangesPage
+Page custom NotifyPage
+!pragma warning disable 8000 ; "Page instfiles not used, no sections will be executed!"
 
 Var BUTTON
 Var EDIT
 Var CHECKBOX
 
 Function nsDialogsPage
-
 	nsDialogs::Create 1018
 	Pop $0
 
@@ -30,6 +40,7 @@
 	Pop $EDIT
 	GetFunctionAddress $0 OnChange
 	nsDialogs::OnChange $EDIT $0
+	${NSD_Edit_SetCueBannerText} $EDIT 0 "Type 'hello there' and get a free surprise"
 
 	${NSD_CreateCheckbox} 0 -50 100% 8u Test
 	Pop $CHECKBOX
@@ -40,43 +51,205 @@
 	Pop $0
 
 	nsDialogs::Show
-
 FunctionEnd
 
 Function OnClick
-
 	Pop $0 # HWND
-
 	MessageBox MB_OK clicky
-
 FunctionEnd
 
 Function OnChange
-
 	Pop $0 # HWND
 
-	System::Call user32::GetWindowText(i$EDIT,t.r0,i${NSIS_MAX_STRLEN})
-
+	System::Call user32::GetWindowText(p$EDIT,t.r0,i${NSIS_MAX_STRLEN})
 	${If} $0 == "hello there"
 		MessageBox MB_OK "right back at ya"
 	${EndIf}
-
 FunctionEnd
 
 Function OnBack
-
 	MessageBox MB_YESNO "are you sure?" IDYES +2
 	Abort
-
 FunctionEnd
 
 Function OnCheckbox
-
 	Pop $0 # HWND
-
 	MessageBox MB_OK "checkbox clicked"
+FunctionEnd
 
+!macro BeginControlsTestPage title
+	nsDialogs::Create 1018
+	Pop $0
+	${NSD_SetText} $hWndParent "$(^Name): ${title}"
+!macroend
+
+!macro CreateButton x y w h txt var handler data
+	${NSD_CreateButton} ${x} ${y} ${w} ${h} "${txt}"
+	Pop ${var}
+	nsDialogs::SetUserData ${var} ${data}
+	${NSD_OnClick} ${var} ${handler}
+!macroend
+
+
+Function LBPage
+	!insertmacro BeginControlsTestPage "ListBox"
+
+	${NSD_CreateSortedListBox} 1u 0 -2u 70u ""
+	Pop $1
+	${NSD_LB_AddString} $1 "Foo"
+	${NSD_LB_AddString} $1 "Bar"
+
+	StrCpy $9 1
+	${NSD_CreateText} 1u 75u -2u 12u "New item #$9"
+	Pop $EDIT
+	!insertmacro CreateButton 1u 90u 50u 12u "Add (&Sorted)" $0 LBAction Add
+	!insertmacro CreateButton 53u 90u 50u 12u "&Prepend" $0 LBAction Prepend
+	!insertmacro CreateButton 105u 90u 50u 12u "&Append" $0 LBAction Append
+	!insertmacro CreateButton 160u 90u 50u 12u "&Delete Last" $0 LBAction DL
+	!insertmacro CreateButton 215u 90u 50u 12u "&Clear" $0 LBAction Clear
+
+	nsDialogs::Show
 FunctionEnd
 
+Function LBAction
+	Pop $0
+	nsDialogs::GetUserData $0
+	Pop $0
+	${NSD_GetText} $EDIT $8
+
+	${Select} $0
+	${Case} "Add"
+		${NSD_LB_AddString} $1 $8
+	${Case} "Prepend"
+		${NSD_LB_PrependString} $1 $8
+	${Case} "Append"
+		${NSD_LB_AppendString} $1 $8
+	${Case} "DL"
+		${NSD_LB_GetCount} $1 $8
+		${If} $8 U> 0
+			IntOp $8 $8 - 1
+			${NSD_LB_DelItem} $1 $8
+		${EndIf}
+		Return
+	${Case} "Clear"
+		${NSD_LB_Clear} $1
+        Return
+	${EndSelect}
+
+	IntOp $9 $9 + 1
+	${NSD_SetText} $EDIT "New item #$9"
+FunctionEnd
+
+
+Function RangesPage
+	!insertmacro BeginControlsTestPage "Ranges"
+
+	${NSD_CreateHTrackBar} 1 0 -2 20u ""
+	Pop $1
+	${NSD_TrackBar_SetRangeMax} $1 10
+	${NSD_TrackBar_SetTicFreq} $1 1
+	${NSD_TrackBar_SetPos} $1 3
+
+	StrCpy $9 20 ; Progress pos
+	${NSD_CreateProgressBar} 1 25u -2 8u ""
+	Pop $2
+	${NSD_CreateTimer} RangesTimer 1000
+
+	${NSD_CreateNumber} 1 40u 50u 12u "42"
+	Pop $3
+	${NSD_CreateUpDown} 0 0 0 0 ""
+	Pop $4
+	${NSD_UD_SetBuddy} $4 $3
+	${MAKELONG} $5 $0 50 0 ; 0..50
+	${NSD_UD_SetPackedRange} $4 $5
+
+	nsDialogs::Show
+FunctionEnd
+
+Function RangesTimer
+	IntOp $9 $9 + 5
+	${IfThen} $9 > 100 ${|} StrCpy $9 0 ${|}
+	${NSD_ProgressBar_SetPos} $2 $9
+FunctionEnd
+
+
+Function NotifyPage
+	!insertmacro BeginControlsTestPage "WM_NOTIFY"
+
+	nsDialogs::CreateControl "${__NSD_RichEdit_CLASS_20A}" "${__NSD_RichEdit_STYLE}" "${__NSD_RichEdit_EXSTYLE}" 1 1 -2 50u "" ; Forcing ANSI control, see forums.winamp.com/showthread.php?p=3169999
+	Pop $9
+	${NSD_OnNotify} $9 OnNotify
+	IntOp $8 ${ENM_LINK} | ${ENM_KEYEVENTS}
+	${NSD_RichEd_SetEventMask} $9 $8
+	SendMessage $9 ${EM_AUTOURLDETECT} 1 0
+	${NSD_SetText} $9 "{\rtf1\ansi{\fonttbl\f0\fswiss Helvetica;}\f0\pard http://nsis.sf.net\par {\b Click the link!}\par\par Type something and I will block every other character...}"
+
+	${NSD_InitCommonControlsEx} ${ICC_DATE_CLASSES}
+	${NSD_CreateDatePicker} 1% 55u 48% 12u ""
+	Pop $1
+	${NSD_OnNotify} $1 onDateTimeNotify
+	${NSD_CreateLabel} 51% 56u 48% 12u "Change the date..."
+	Pop $9
+
+	/*
+	${NSD_CreateCalendar} 1% 23% 150u 90u ""
+	Pop $1
+	${NSD_AddStyle} $1 ${MCS_NOTODAY}
+	System::Call 'USER32::SendMessage(p$1, i${MCM_GETMINREQRECT}, p0, @r2)'
+	System::Call '*$2(i,i,i.r2,i.r3)'
+	#System::Call 'USER32::SendMessage(p$1, i${MCM_GETMAXTODAYWIDTH}, p0, *i0r4)'
+	#${IfThen} $4 > $2 ${|} StrCpy $2 $4 ${|}
+	System::Call 'USER32::SetWindowPos(p$1,p0,i,i,ir2,ir3,i0x16)'
+	*/
+
+	nsDialogs::Show
+FunctionEnd
+
+Function OnNotify
+	Pop $1 ; HWND
+	Pop $2 ; Code
+	Pop $3 ; NMHDR*
+	${If} $2 = ${EN_LINK}
+		System::Call '*$3(p,p,p,p.r2,p,p,i.r4,i.r5)' ; Extract from ENLINK*
+		${IfThen} $2 <> ${WM_LBUTTONDOWN} ${|} Return ${|}
+		IntOp $2 $5 - $4
+		System::Call '*(ir4,ir5,l,&t$2,i)p.r2' ; Create TEXTRANGE and a text buffer
+		${If} $2 P<> 0
+			IntPtrOp $3 $2 + 16 ; Find buffer
+			System::Call '*$2(i,i,p$3)' ; Set buffer in TEXTRANGE
+			SendMessage $1 ${EM_GETTEXTRANGE} "" $2 $4
+			${If} $4 <> 0
+				System::Call 'SHELL32::ShellExecute(p$hWndParent, p0, pr3, p0, p0, i 1)'
+			${EndIf}
+			System::Free $2
+		${EndIf}
+	${ElseIf} $2 = ${EN_MSGFILTER}
+		Var /Global Toggle
+		System::Call '*$3(p,i,i,i.r4)' ; MSGFILTER->msg
+		${If} $4 = ${WM_CHAR}
+			IntOp $Toggle $Toggle ^ 1
+			${If} $Toggle & 1
+				${NSD_Return} 1
+			${EndIf}
+		${EndIf}
+	${EndIf}
+FunctionEnd
+
+Function onDateTimeNotify
+Pop $1 ; HWND
+Pop $2 ; Code
+Pop $3 ; NMHDR*
+${If} $2 = ${DTN_DATETIMECHANGE}
+	System::Call 'USER32::SendMessage(p$1, i${DTM_GETSYSTEMTIME}, p0, @r3)i.r0'
+	${If} $0 = ${GDT_VALID}
+		System::Call '*$3(&i2.R1, &i2.R2, &i2, &i2.R3, &i2, &i2, &i2, &i2)' ; SYSTEMTIME
+		StrCpy $0 "$R1/$R2/$R3"
+	${Else}
+		StrCpy $0 "N/A"
+	${EndIf}
+	${NSD_SetText} $9 $0
+${EndIf}
+FunctionEnd
+
 Section
 SectionEnd
Index: tmp/org.txm.setups/nsis/Examples/nsDialogs/welcome.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/nsDialogs/welcome.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/nsDialogs/welcome.nsi	(revision 2956)
@@ -1,5 +1,6 @@
 !include MUI.nsh
 !include LogicLib.nsh
+!include nsDialogs.nsh
 !include WinMessages.nsh
 !include FileFunc.nsh
 
@@ -12,114 +13,7 @@
 
 !insertmacro MUI_LANGUAGE English
 
-!define WS_EX_CLIENTEDGE    0x00000200
 
-!define WS_CHILD            0x40000000
-!define WS_VISIBLE          0x10000000
-!define WS_DISABLED         0x08000000
-!define WS_CLIPSIBLINGS     0x04000000
-!define WS_MAXIMIZE         0x01000000
-!define WS_VSCROLL          0x00200000
-!define WS_HSCROLL          0x00100000
-!define WS_GROUP            0x00020000
-!define WS_TABSTOP          0x00010000
-
-!define ES_LEFT             0x00000000
-!define ES_CENTER           0x00000001
-!define ES_RIGHT            0x00000002
-!define ES_MULTILINE        0x00000004
-!define ES_UPPERCASE        0x00000008
-!define ES_LOWERCASE        0x00000010
-!define ES_PASSWORD         0x00000020
-!define ES_AUTOVSCROLL      0x00000040
-!define ES_AUTOHSCROLL      0x00000080
-!define ES_NOHIDESEL        0x00000100
-!define ES_OEMCONVERT       0x00000400
-!define ES_READONLY         0x00000800
-!define ES_WANTRETURN       0x00001000
-!define ES_NUMBER           0x00002000
-
-!define SS_LEFT             0x00000000
-!define SS_CENTER           0x00000001
-!define SS_RIGHT            0x00000002
-!define SS_ICON             0x00000003
-!define SS_BLACKRECT        0x00000004
-!define SS_GRAYRECT         0x00000005
-!define SS_WHITERECT        0x00000006
-!define SS_BLACKFRAME       0x00000007
-!define SS_GRAYFRAME        0x00000008
-!define SS_WHITEFRAME       0x00000009
-!define SS_USERITEM         0x0000000A
-!define SS_SIMPLE           0x0000000B
-!define SS_LEFTNOWORDWRAP   0x0000000C
-!define SS_OWNERDRAW        0x0000000D
-!define SS_BITMAP           0x0000000E
-!define SS_ENHMETAFILE      0x0000000F
-!define SS_ETCHEDHORZ       0x00000010
-!define SS_ETCHEDVERT       0x00000011
-!define SS_ETCHEDFRAME      0x00000012
-!define SS_TYPEMASK         0x0000001F
-!define SS_REALSIZECONTROL  0x00000040
-!define SS_NOPREFIX         0x00000080
-!define SS_NOTIFY           0x00000100
-!define SS_CENTERIMAGE      0x00000200
-!define SS_RIGHTJUST        0x00000400
-!define SS_REALSIZEIMAGE    0x00000800
-!define SS_SUNKEN           0x00001000
-!define SS_EDITCONTROL      0x00002000
-!define SS_ENDELLIPSIS      0x00004000
-!define SS_PATHELLIPSIS     0x00008000
-!define SS_WORDELLIPSIS     0x0000C000
-!define SS_ELLIPSISMASK     0x0000C000
-
-!define BS_PUSHBUTTON       0x00000000
-!define BS_DEFPUSHBUTTON    0x00000001
-!define BS_CHECKBOX         0x00000002
-!define BS_AUTOCHECKBOX     0x00000003
-!define BS_RADIOBUTTON      0x00000004
-!define BS_3STATE           0x00000005
-!define BS_AUTO3STATE       0x00000006
-!define BS_GROUPBOX         0x00000007
-!define BS_USERBUTTON       0x00000008
-!define BS_AUTORADIOBUTTON  0x00000009
-!define BS_PUSHBOX          0x0000000A
-!define BS_OWNERDRAW        0x0000000B
-!define BS_TYPEMASK         0x0000000F
-!define BS_LEFTTEXT         0x00000020
-!define BS_TEXT             0x00000000
-!define BS_ICON             0x00000040
-!define BS_BITMAP           0x00000080
-!define BS_LEFT             0x00000100
-!define BS_RIGHT            0x00000200
-!define BS_CENTER           0x00000300
-!define BS_TOP              0x00000400
-!define BS_BOTTOM           0x00000800
-!define BS_VCENTER          0x00000C00
-!define BS_PUSHLIKE         0x00001000
-!define BS_MULTILINE        0x00002000
-!define BS_NOTIFY           0x00004000
-!define BS_FLAT             0x00008000
-!define BS_RIGHTBUTTON      ${BS_LEFTTEXT}
-
-!define LR_DEFAULTCOLOR     0x0000
-!define LR_MONOCHROME       0x0001
-!define LR_COLOR            0x0002
-!define LR_COPYRETURNORG    0x0004
-!define LR_COPYDELETEORG    0x0008
-!define LR_LOADFROMFILE     0x0010
-!define LR_LOADTRANSPARENT  0x0020
-!define LR_DEFAULTSIZE      0x0040
-!define LR_VGACOLOR         0x0080
-!define LR_LOADMAP3DCOLORS  0x1000
-!define LR_CREATEDIBSECTION 0x2000
-!define LR_COPYFROMRESOURCE 0x4000
-!define LR_SHARED           0x8000
-
-!define IMAGE_BITMAP        0
-!define IMAGE_ICON          1
-!define IMAGE_CURSOR        2
-!define IMAGE_ENHMETAFILE   3
-
 Var DIALOG
 Var HEADLINE
 Var TEXT
@@ -202,7 +96,7 @@
 	Pop $IMAGECTL
 
 	StrCpy $0 $PLUGINSDIR\welcome.bmp
-	System::Call 'user32::LoadImage(i 0, t r0, i ${IMAGE_BITMAP}, i 0, i 0, i ${LR_LOADFROMFILE}) i.s'
+	System::Call 'user32::LoadImage(p 0, t r0, i ${IMAGE_BITMAP}, i 0, i 0, i ${LR_LOADFROMFILE})p.s'
 	Pop $IMAGE
 	
 	SendMessage $IMAGECTL ${STM_SETIMAGE} ${IMAGE_BITMAP} $IMAGE
@@ -215,9 +109,9 @@
 	nsDialogs::CreateControl STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 120u 32u -130u -32u "nsDialogs is the next generation of user interfaces in NSIS. It gives the developer full control over custom pages. Some of the features include control text containing variables, callbacks directly into script functions and creation of any type of control. Create boring old edit boxes or load some external library and create custom controls with no need of creating your own plug-in.$\r$\n$\r$\nUnlike InstallOptions, nsDialogs doesn't use INI files to communicate with the script. By interacting directly with the script, nsDialogs can perform much faster without the need of costly, old and inefficient INI operations. Direct interaction also allows direct calls to functions defined in the script and removes the need of conversion functions like Io2Nsis.$\r$\n$\r$\nHit the Next button to see how it all fits into a mock directory page."
 	Pop $TEXT
 
-	SetCtlColors $DIALOG "" 0xffffff
-	SetCtlColors $HEADLINE "" 0xffffff
-	SetCtlColors $TEXT "" 0xffffff
+	SetCtlColors $DIALOG 0 0xffffff
+	SetCtlColors $HEADLINE 0 0xffffff
+	SetCtlColors $TEXT 0 0xffffff
 
 	Call HideControls
 
@@ -225,7 +119,7 @@
 
 	Call ShowControls
 
-	System::Call gdi32::DeleteObject(i$IMAGE)
+	System::Call gdi32::DeleteObject(p$IMAGE)
 
 FunctionEnd
 
@@ -257,7 +151,7 @@
 	GetFunctionAddress $0 DirChange
 	nsDialogs::OnChange $DIRECTORY $0
 
-	System::Call shlwapi::SHAutoComplete(i$DIRECTORY,i${SHACF_FILESYSTEM})
+	System::Call shlwapi::SHAutoComplete(p$DIRECTORY,i${SHACF_FILESYSTEM})
 
 	nsDialogs::CreateControl STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 -10u 100% 10u ""
 	Pop $FREESPACE
@@ -304,7 +198,7 @@
 
 	GetDlgItem $0 $HWNDPARENT 1
 
-	System::Call user32::GetWindowText(i$DIRECTORY,t.d,i${NSIS_MAX_STRLEN})
+	System::Call user32::GetWindowText(p$DIRECTORY,t.d,i${NSIS_MAX_STRLEN})
 
 	${If} ${FileExists} $INSTDIR\makensis.exe
 		EnableWindow $0 1
Index: tmp/org.txm.setups/nsis/Examples/nsDialogs/timer.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/nsDialogs/timer.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/nsDialogs/timer.nsi	(revision 2956)
@@ -1,9 +1,11 @@
 !include LogicLib.nsh
 !include nsDialogs.nsh
+!include WinMessages.nsh
 
 Name "nsDialogs Timer Example"
 OutFile "nsDialogs Timer Example.exe"
 XPStyle on
+RequestExecutionLevel user
 
 Var DIALOG
 Var TEXT
@@ -14,10 +16,11 @@
 Var BUTTON2
 
 Page custom nsDialogsPage
+!pragma warning disable 8000 ; "Page instfiles not used, no sections will be executed!"
 
 Function OnTimer
 
-  	SendMessage $PROGBAR ${PBM_GETPOS} 0 0 $1
+	SendMessage $PROGBAR ${PBM_GETPOS} 0 0 $1
 	${If} $1 = 100
 		SendMessage $PROGBAR ${PBM_SETPOS} 0 0
 	${Else}
@@ -28,7 +31,7 @@
 
 Function OnTimer2
 
-  	SendMessage $PROGBAR2 ${PBM_GETPOS} 0 0 $1
+	SendMessage $PROGBAR2 ${PBM_GETPOS} 0 0 $1
 	${If} $1 = 100
 		SendMessage $PROGBAR2 ${PBM_SETPOS} 0 0
 	${Else}
@@ -39,10 +42,10 @@
 
 Function OnTimer3
 
-  	SendMessage $PROGBAR3 ${PBM_GETPOS} 0 0 $1
+	SendMessage $PROGBAR3 ${PBM_GETPOS} 0 0 $1
 	${If} $1 >= 100
 		${NSD_KillTimer} OnTimer3
- 		MessageBox MB_OK "Timer 3 killed"
+		MessageBox MB_OK "Timer 3 killed"
 	${Else}
 		SendMessage $PROGBAR3 ${PBM_DELTAPOS} 2 0
 	${EndIf}
@@ -82,6 +85,8 @@
 
 	${NSD_CreateProgressBar} 0u 52u 100% 12u ""
 	Pop $PROGBAR2
+	SendMessage $PROGBAR2 ${PBM_SETBARCOLOR} 0 0x0000FF ; No visual styles
+	SendMessage $PROGBAR2 ${PBM_SETSTATE} ${PBST_ERROR} 0 ; Vista+
 
 	${NSD_CreateButton} 0u 67u 100u 14u "Kill Timer 2"
 	Pop $BUTTON2
Index: tmp/org.txm.setups/nsis/Examples/nsDialogs/InstallOptions.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/nsDialogs/InstallOptions.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/nsDialogs/InstallOptions.nsi	(revision 2956)
@@ -17,7 +17,7 @@
 Function nsDialogsIO
 
 	InitPluginsDir
-	File /oname=$PLUGINSDIR\io.ini "${NSISDIR}\Examples\InstallOptions\test.ini"
+	File /oname=$PLUGINSDIR\io.ini "..\InstallOptions\test.ini"
 
 	${If} ${Cmd} `MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Test the right-to-left version?" IDYES`
 		WriteINIStr $PLUGINSDIR\io.ini Settings RTL 1
Index: tmp/org.txm.setups/nsis/Examples/bigtest.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/bigtest.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/bigtest.nsi	(revision 2956)
@@ -36,6 +36,7 @@
 LicenseData "bigtest.nsi"
 
 RequestExecutionLevel admin
+ManifestSupportedOS all
 
 ;--------------------------------
 
@@ -66,7 +67,7 @@
 Section "" ; empty string makes it hidden, so would starting with -
 
   ; write reg info
-  StrCpy $1 "POOOOOOOOOOOP"
+  StrCpy $1 "Hello World"
   DetailPrint "I like to be able to see what is going on (debug) $1"
   WriteRegStr HKLM SOFTWARE\NSISTest\BigNSISTest "Install_Dir" "$INSTDIR"
 
@@ -77,7 +78,7 @@
   SetOutPath $INSTDIR
   File /a "silent.nsi"
   CreateDirectory "$INSTDIR\MyProjectFamily\MyProject" ; 2 recursively create a directory for fun.
-  WriteUninstaller "bt-uninst.exe"
+  WriteUninstaller "$INSTDIR\bt-uninst.exe"
   
   Nop ; for fun
 
@@ -138,7 +139,7 @@
   
 SectionEnd
 
-Section "Test CreateShortCut"
+Section "Test CreateShortcut"
 
   SectionIn 1 2 3
 
@@ -148,6 +149,27 @@
 
 SectionGroup Group2
 
+!define ASSERT `!insertmacro ASSERT "${U+24}{__FILE__}" ${U+24}{__LINE__} `
+!macro ASSERT __file __line __xpr
+${__xpr} +2
+MessageBox MB_ICONSTOP `ASSERT: ${__xpr} (${__file}:${__line})`
+!macroend
+
+Section "Integer"
+IntOp $0 0xffffffff >> 31
+${ASSERT} `IntCmpU $0 -1`
+IntOp $0 0xffffffff >>> 31
+${ASSERT} `IntCmpU $0 1`
+IntOp $0 1 << 31
+${ASSERT} `IntCmpU $0 0x80000000`
+IntOp $0 0x80000000 ^ 0x40000000
+${ASSERT} `IntCmpU $0 0xC0000000`
+ClearErrors
+IntOp $0 1 / 0
+${ASSERT} `IfErrors ` ; Division by zero must set the error flag
+${ASSERT} `IntCmpU $0 0` ; Unspecified result, hopefully it's zero
+SectionEnd
+
 Section "Test Branching" 
   
   BeginTestSection:
@@ -238,10 +260,10 @@
   
   CreateDirectory "$SMPROGRAMS\Big NSIS Test"
   SetOutPath $INSTDIR ; for working directory
-  CreateShortCut "$SMPROGRAMS\Big NSIS Test\Uninstall BIG NSIS Test.lnk" "$INSTDIR\bt-uninst.exe" ; use defaults for parameters, icon, etc.
+  CreateShortcut "$SMPROGRAMS\Big NSIS Test\Uninstall BIG NSIS Test.lnk" "$INSTDIR\bt-uninst.exe" ; use defaults for parameters, icon, etc.
   ; this one will use notepad's icon, start it minimized, and give it a hotkey (of Ctrl+Shift+Q)
-  CreateShortCut "$SMPROGRAMS\Big NSIS Test\silent.nsi.lnk" "$INSTDIR\silent.nsi" "" "$WINDIR\notepad.exe" 0 SW_SHOWMINIMIZED CONTROL|SHIFT|Q
-  CreateShortCut "$SMPROGRAMS\Big NSIS Test\TheDir.lnk" "$INSTDIR\" "" "" 0 SW_SHOWMAXIMIZED CONTROL|SHIFT|Z
+  CreateShortcut "$SMPROGRAMS\Big NSIS Test\silent.nsi.lnk" "$INSTDIR\silent.nsi" "" "$WINDIR\notepad.exe" 0 SW_SHOWMINIMIZED CONTROL|SHIFT|Q
+  CreateShortcut "$SMPROGRAMS\Big NSIS Test\TheDir.lnk" "$INSTDIR\" "" "" 0 SW_SHOWMAXIMIZED CONTROL|SHIFT|Z
 
 FunctionEnd
 
Index: tmp/org.txm.setups/nsis/Examples/UserInfo/UserInfo.nsi
===================================================================
--- tmp/org.txm.setups/nsis/Examples/UserInfo/UserInfo.nsi	(revision 2955)
+++ tmp/org.txm.setups/nsis/Examples/UserInfo/UserInfo.nsi	(revision 2956)
@@ -1,13 +1,16 @@
 Name "UserInfo.dll test"
 OutFile UserInfo.exe
+RequestExecutionLevel Highest
 
 !define REALMSG "$\nOriginal non-restricted account type: $2"
 
 Section
 	ClearErrors
 	UserInfo::GetName
-	IfErrors Win9x
+	IfErrors PluginFail
 	Pop $0
+	StrCmp $0 "" 0 +2 ; GetName can return a empty string on Win9x
+		StrCpy $0 "?"
 	UserInfo::GetAccountType
 	Pop $1
 	# GetOriginalAccountType will check the tokens of the original user of the
@@ -19,7 +22,7 @@
 	# "admin" while GetAccountType will return "user".
 	UserInfo::GetOriginalAccountType
 	Pop $2
-	StrCmp $1 "Admin" 0 +3
+	StrCmp $1 "Admin" 0 +3 ; Note: Win9x always returns "Admin"
 		MessageBox MB_OK 'User "$0" is in the Administrators group${REALMSG}'
 		Goto done
 	StrCmp $1 "Power" 0 +3
@@ -34,10 +37,8 @@
 	MessageBox MB_OK "Unknown error"
 	Goto done
 
-	Win9x:
-		# This one means you don't need to care about admin or
-		# not admin because Windows 9x doesn't either
-		MessageBox MB_OK "Error! This DLL can't run under Windows 9x!"
+	PluginFail:
+		MessageBox MB_OK "Error! Unable to call plug-in!"
 
 	done:
 SectionEnd
Index: tmp/org.txm.setups/nsis/Contrib/Graphics/Header/nsis3-grey-right.bmp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Contrib/Graphics/Header/nsis3-grey-right.bmp
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Contrib/Graphics/Header/nsis3-branding-r.bmp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Contrib/Graphics/Header/nsis3-branding-r.bmp
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Contrib/Graphics/Header/nsis3-branding.bmp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Contrib/Graphics/Header/nsis3-branding.bmp
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Contrib/Graphics/Header/nsis3-metro.bmp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Contrib/Graphics/Header/nsis3-metro.bmp
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Contrib/Graphics/Header/nsis3-vintage.bmp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Contrib/Graphics/Header/nsis3-vintage.bmp
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Contrib/Graphics/Header/nsis3-metro-right.bmp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Contrib/Graphics/Header/nsis3-metro-right.bmp
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Contrib/Graphics/Header/nsis3-grey.bmp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Contrib/Graphics/Header/nsis3-grey.bmp
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Contrib/Graphics/Header/nsis3-vintage-right.bmp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Contrib/Graphics/Header/nsis3-vintage-right.bmp
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Contrib/Graphics/Icons/nsis3-uninstall.ico
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Contrib/Graphics/Icons/nsis3-uninstall.ico
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Contrib/Graphics/Icons/nsis3-install.ico
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Contrib/Graphics/Icons/nsis3-install.ico
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Contrib/Graphics/Icons/nsis-menu.ico
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Contrib/Graphics/Icons/nsis-menu.ico
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Contrib/Graphics/Icons/nsis3-install-alt.ico
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Contrib/Graphics/Icons/nsis3-install-alt.ico
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Contrib/Graphics/Wizard/nsis3-branding.bmp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Contrib/Graphics/Wizard/nsis3-branding.bmp
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Contrib/Graphics/Wizard/nsis3-grey.bmp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Contrib/Graphics/Wizard/nsis3-grey.bmp
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Contrib/Graphics/Wizard/nsis3-metro.bmp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Contrib/Graphics/Wizard/nsis3-metro.bmp
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Contrib/Graphics/Wizard/nsis3-vintage.bmp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Contrib/Graphics/Wizard/nsis3-vintage.bmp
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Contrib/UIs/modern_headerbmp.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.setups/nsis/Contrib/UIs/modern_smalldesc.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.setups/nsis/Contrib/UIs/modern_headerbmpr.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.setups/nsis/Contrib/UIs/modern_nodesc.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.setups/nsis/Contrib/UIs/sdbarker_tiny.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.setups/nsis/Contrib/UIs/default.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.setups/nsis/Contrib/UIs/modern.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.setups/nsis/Contrib/Modern UI/System.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Modern UI/System.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Modern UI/System.nsh	(revision 2956)
@@ -1,25 +1,20 @@
 /*
 
-NSIS Modern User Interface - Version 1.8
-Copyright 2002-2015 Joost Verburg
+NSIS Modern User Interface - Version 1.81
+Copyright 2002-2020 Joost Verburg
 
 */
 
-!echo "NSIS Modern User Interface version 1.8 - Copyright 2002-2015 Joost Verburg"
-
-;--------------------------------
-
 !ifndef MUI_INCLUDED
+!verbose push 3
 !define MUI_INCLUDED
+!define MUI_SYSVERSION "1.81"
+!verbose pop
+!echo "NSIS Modern User Interface version ${MUI_SYSVERSION} - Copyright 2002-2020 Joost Verburg"
 
-!define MUI_SYSVERSION "1.8"
-
-!verbose push
-
-!ifndef MUI_VERBOSE
-  !define MUI_VERBOSE 3
-!endif
-
+;--------------------------------
+!verbose push 3
+!define /IfNDef MUI_VERBOSE 3
 !verbose ${MUI_VERBOSE}
 
 ;--------------------------------
@@ -129,10 +124,17 @@
     !insertmacro MUI_DEFAULT MUI_INSTFILESPAGE_COLORS "/windows"
     !insertmacro MUI_DEFAULT MUI_INSTFILESPAGE_PROGRESSBAR "smooth"
     !insertmacro MUI_DEFAULT MUI_BGCOLOR "FFFFFF"
+    !insertmacro MUI_DEFAULT MUI_TEXTCOLOR "000000"
     !insertmacro MUI_DEFAULT MUI_WELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini"
     !insertmacro MUI_DEFAULT MUI_UNWELCOMEFINISHPAGE_INI "${NSISDIR}\Contrib\Modern UI\ioSpecial.ini"
     !insertmacro MUI_DEFAULT MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"
     !insertmacro MUI_DEFAULT MUI_UNWELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"
+    !if "${MUI_WELCOMEFINISHPAGE_BITMAP}" == ""
+      !error "Invalid MUI_WELCOMEFINISHPAGE_BITMAP"
+    !endif
+    !if "${MUI_UNWELCOMEFINISHPAGE_BITMAP}" == ""
+      !error "Invalid MUI_UNWELCOMEFINISHPAGE_BITMAP"
+    !endif
 
     !ifdef MUI_HEADERIMAGE
 
@@ -145,6 +147,13 @@
         !endif
       !endif
 
+      !if "${MUI_HEADERIMAGE_BITMAP}" == ""
+        !error "Invalid MUI_HEADERIMAGE_BITMAP"
+      !endif
+      !if "${MUI_HEADERIMAGE_UNBITMAP}" == ""
+        !error "Invalid MUI_HEADERIMAGE_UNBITMAP"
+      !endif
+
       !ifdef MUI_HEADERIMAGE_BITMAP_RTL
         !ifndef MUI_HEADERIMAGE_UNBITMAP_RTL
           !define MUI_HEADERIMAGE_UNBITMAP_RTL "${MUI_HEADERIMAGE_BITMAP_RTL}"
@@ -152,6 +161,13 @@
             !insertmacro MUI_SET MUI_HEADERIMAGE_UNBITMAP_RTL_NOSTRETCH
           !endif
         !endif
+
+        !if "${MUI_HEADERIMAGE_BITMAP_RTL}" == ""
+          !error "Invalid MUI_HEADERIMAGE_BITMAP_RTL"
+        !endif
+        !if "${MUI_HEADERIMAGE_UNBITMAP_RTL}" == ""
+          !error "Invalid MUI_HEADERIMAGE_UNBITMAP_RTL"
+        !endif
       !endif
 
     !endif
@@ -402,24 +418,24 @@
 
   !ifndef MUI_HEADER_TRANSPARENT_TEXT
 
-    SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
+    SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
 
     GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038
-    SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
+    SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
 
   !else
 
-    SetCtlColors $MUI_TEMP1 "" "transparent"
+    SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "transparent"
 
     GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038
-    SetCtlColors $MUI_TEMP1 "" "transparent"
+    SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "transparent"
 
   !endif
 
-  GetDlgItem $MUI_TEMP1 $HWNDPARENT 1034
+  GetDlgItem $MUI_TEMP1 $HWNDPARENT 1034 ; Header background
   SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
 
-  GetDlgItem $MUI_TEMP1 $HWNDPARENT 1039
+  GetDlgItem $MUI_TEMP1 $HWNDPARENT 1039 ; Header image
   SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
 
   GetDlgItem $MUI_TEMP1 $HWNDPARENT 1028
@@ -694,6 +710,10 @@
 
 !macro MUI_PAGE_INIT
 
+  !ifdef MUI_INSERT
+    !warning "MUI_[UN]PAGE_* inserted after MUI_LANGUAGE"
+  !endif
+
   !insertmacro MUI_INTERFACE
 
   !insertmacro MUI_DEFAULT MUI_PAGE_UNINSTALLER_PREFIX ""
@@ -1104,6 +1124,10 @@
 
     UninstallText "${MUI_UNCONFIRMPAGE_TEXT_TOP}" "${MUI_UNCONFIRMPAGE_TEXT_LOCATION}"
 
+    !ifdef MUI_UNCONFIRMPAGE_VARIABLE
+      DirVar "${MUI_UNCONFIRMPAGE_VARIABLE}"
+    !endif
+
   PageExEnd
 
   !insertmacro MUI_UNFUNCTION_CONFIRMPAGE un.mui.ConfirmPre_${MUI_UNIQUEID} un.mui.ConfirmShow_${MUI_UNIQUEID} un.mui.ConfirmLeave_${MUI_UNIQUEID}
@@ -1261,16 +1285,16 @@
 
     !insertmacro INSTALLOPTIONS_INITDIALOG "ioSpecial.ini"
     Pop $MUI_HWND
-    SetCtlColors $MUI_HWND "" "${MUI_BGCOLOR}"
+    SetCtlColors $MUI_HWND "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
 
     GetDlgItem $MUI_TEMP1 $MUI_HWND 1201
-    SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
+    SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
 
     CreateFont $MUI_TEMP2 "$(^Font)" "12" "700"
     SendMessage $MUI_TEMP1 ${WM_SETFONT} $MUI_TEMP2 0
 
     GetDlgItem $MUI_TEMP1 $MUI_HWND 1202
-    SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
+    SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
 
     !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW
 
@@ -1371,9 +1395,10 @@
 
   Function "${SHOW}"
     !ifdef MUI_DIRECTORYPAGE_BGCOLOR
+      !insertmacro MUI_DEFAULT MUI_DIRECTORYPAGE_TEXTCOLOR ""
       FindWindow $MUI_TEMP1 "#32770" "" $HWNDPARENT
       GetDlgItem $MUI_TEMP1 $MUI_TEMP1 1019
-      SetCtlColors $MUI_TEMP1 "" "${MUI_DIRECTORYPAGE_BGCOLOR}"
+      SetCtlColors $MUI_TEMP1 "${MUI_DIRECTORYPAGE_TEXTCOLOR}" "${MUI_DIRECTORYPAGE_BGCOLOR}"
     !endif
     
     !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW
@@ -1421,15 +1446,16 @@
   Pop $MUI_HWND
 
   !ifdef MUI_STARTMENUPAGE_BGCOLOR
+    !insertmacro MUI_DEFAULT MUI_STARTMENUPAGE_TEXTCOLOR ""
     GetDlgItem $MUI_TEMP1 $MUI_HWND 1002
-    SetCtlColors $MUI_TEMP1 "" "${MUI_STARTMENUPAGE_BGCOLOR}"
+    SetCtlColors $MUI_TEMP1 "${MUI_STARTMENUPAGE_TEXTCOLOR}" "${MUI_STARTMENUPAGE_BGCOLOR}"
     GetDlgItem $MUI_TEMP1 $MUI_HWND 1004
-    SetCtlColors $MUI_TEMP1 "" "${MUI_STARTMENUPAGE_BGCOLOR}"
+    SetCtlColors $MUI_TEMP1 "${MUI_STARTMENUPAGE_TEXTCOLOR}" "${MUI_STARTMENUPAGE_BGCOLOR}"
   !endif
 
   !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW
-
   StartMenu::Show
+  !insertmacro MUI_PAGE_FUNCTION_CUSTOM DESTROYED
 
     Pop $MUI_TEMP1
     StrCmp $MUI_TEMP1 "success" 0 +2
@@ -1570,11 +1596,11 @@
           !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "Bottom" "120"
         !endif
         !ifdef MUI_FINISHPAGE_REBOOTLATER_DEFAULT
-		  !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "State" "0"
+          !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "State" "0"
           !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "State" "1"
         !else
           !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "State" "1"
-		  !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "State" "0"
+          !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 5" "State" "0"
         !endif
 
         Goto mui.finish_load
@@ -1739,26 +1765,26 @@
 
     !insertmacro INSTALLOPTIONS_INITDIALOG "ioSpecial.ini"
     Pop $MUI_HWND
-    SetCtlColors $MUI_HWND "" "${MUI_BGCOLOR}"
+    SetCtlColors $MUI_HWND "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
 
     GetDlgItem $MUI_TEMP1 $MUI_HWND 1201
-    SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
+    SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
 
     CreateFont $MUI_TEMP2 "$(^Font)" "12" "700"
     SendMessage $MUI_TEMP1 ${WM_SETFONT} $MUI_TEMP2 0
 
     GetDlgItem $MUI_TEMP1 $MUI_HWND 1202
-    SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
+    SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
 
     !ifndef MUI_FINISHPAGE_NOREBOOTSUPPORT
 
       IfRebootFlag 0 mui.finish_noreboot_show
 
         GetDlgItem $MUI_TEMP1 $MUI_HWND 1203
-        SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
+        SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
 
         GetDlgItem $MUI_TEMP1 $MUI_HWND 1204
-        SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
+        SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
 
         Goto mui.finish_show
 
@@ -1768,7 +1794,7 @@
 
     !ifdef MUI_FINISHPAGE_RUN
       GetDlgItem $MUI_TEMP1 $MUI_HWND 1203
-      SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
+      SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
     !endif
 
     !ifdef MUI_FINISHPAGE_SHOWREADME
@@ -1777,7 +1803,7 @@
       !else
         GetDlgItem $MUI_TEMP1 $MUI_HWND 1204
       !endif
-      SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
+      SetCtlColors $MUI_TEMP1 "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
     !endif
 
     !ifdef MUI_FINISHPAGE_LINK
@@ -1795,6 +1821,27 @@
       mui.finish_show:
     !endif
 
+    !ifndef MUI_FORCECLASSICCONTROLS
+    ${If} ${IsHighContrastModeActive}
+    !endif
+      ; SetCtlColors does not change the check/radio text color (bug #443)
+      !ifndef MUI_FINISHPAGE_NOREBOOTSUPPORT
+        GetDlgItem $MUI_TEMP1 $MUI_HWND 1203
+        System::Call 'UXTHEME::SetWindowTheme(p$MUI_TEMP1,w" ",w" ")'
+        GetDlgItem $MUI_TEMP1 $MUI_HWND 1204
+        System::Call 'UXTHEME::SetWindowTheme(p$MUI_TEMP1,w" ",w" ")'
+      !else ifdef MUI_FINISHPAGE_RUN | MUI_FINISHPAGE_SHOWREADME
+        GetDlgItem $MUI_TEMP1 $MUI_HWND 1203
+        System::Call 'UXTHEME::SetWindowTheme(p$MUI_TEMP1,w" ",w" ")'
+        !ifdef MUI_FINISHPAGE_RUN & MUI_FINISHPAGE_SHOWREADME
+        GetDlgItem $MUI_TEMP1 $MUI_HWND 1204
+        System::Call 'UXTHEME::SetWindowTheme(p$MUI_TEMP1,w" ",w" ")'
+        !endif
+      !endif
+    !ifndef MUI_FORCECLASSICCONTROLS
+    ${EndIf}
+    !endif
+
     !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW
 
     !ifdef MUI_FINISHPAGE_CANCEL_ENABLED
@@ -2048,7 +2095,7 @@
   !verbose push
   !verbose ${MUI_VERBOSE}
 
-  ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
+  ReserveFile /plugin InstallOptions.dll
 
   !verbose pop
 
@@ -2059,7 +2106,7 @@
   !verbose push
   !verbose ${MUI_VERBOSE}
 
-  ReserveFile "${NSISDIR}\Plugins\LangDLL.dll"
+  ReserveFile /plugin LangDLL.dll
 
   !verbose pop
 
@@ -2068,40 +2115,35 @@
 ;--------------------------------
 ;LANGUAGES
 
-!macro MUI_LANGUAGE LANGUAGE
+!macro MUI_LANGUAGE NLFID
 
   ;Include a language
 
   !verbose push
   !verbose ${MUI_VERBOSE}
 
+  ; MUI_PAGE_UNINSTALLER_PREFIX is undefined by uninstaller pages so we check MUI_UNINSTALLER as well
+  !ifndef MUI_PAGE_UNINSTALLER_PREFIX && MUI_UNINSTALLER
+    !ifndef MUI_DISABLE_INSERT_LANGUAGE_AFTER_PAGES_WARNING ; Define this to avoid the warning if you only have custom pages
+      !warning "MUI_LANGUAGE should be inserted after the MUI_[UN]PAGE_* macros"
+    !endif
+  !endif
+
   !insertmacro MUI_INSERT
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nlf"
+  LoadLanguageFile "${NSISDIR}\Contrib\Language files\${NLFID}.nlf"
 
   ;Include language file
-  !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nsh" "${NSISDIR}\Contrib\Language files\English.nsh"
+  !insertmacro LANGFILE_INCLUDE_WITHDEFAULT \
+    "${NSISDIR}\Contrib\Language files\${NLFID}.nsh" "${NSISDIR}\Contrib\Language files\English.nsh"
 
-  ;Add language to list of languages for selection dialog  
-  !ifndef MUI_LANGDLL_LANGUAGES
-    !define MUI_LANGDLL_LANGUAGES "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' "
-    !define MUI_LANGDLL_LANGUAGES_CP "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' "
-  !else
-    !ifdef MUI_LANGDLL_LANGUAGES_TEMP
-      !undef MUI_LANGDLL_LANGUAGES_TEMP
-    !endif
-    !define MUI_LANGDLL_LANGUAGES_TEMP "${MUI_LANGDLL_LANGUAGES}"
-    !undef MUI_LANGDLL_LANGUAGES
-
-	!ifdef MUI_LANGDLL_LANGUAGES_CP_TEMP
-      !undef MUI_LANGDLL_LANGUAGES_CP_TEMP
-    !endif
-    !define MUI_LANGDLL_LANGUAGES_CP_TEMP "${MUI_LANGDLL_LANGUAGES_CP}"
-    !undef MUI_LANGDLL_LANGUAGES_CP
-
-    !define MUI_LANGDLL_LANGUAGES "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' ${MUI_LANGDLL_LANGUAGES_TEMP}"
-    !define MUI_LANGDLL_LANGUAGES_CP "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' ${MUI_LANGDLL_LANGUAGES_CP_TEMP}"
-  !endif
+  ;Add language to list of languages for selection dialog
+  !define /ifndef MUI_LANGDLL_LANGUAGES ""
+  !define /redef MUI_LANGDLL_LANGUAGES \
+    `"${LANGFILE_${NLFID}_LANGDLL}" "${LANG_${NLFID}}" ${MUI_LANGDLL_LANGUAGES}`
+  !define /ifndef MUI_LANGDLL_LANGUAGES_CP ""
+  !define /redef MUI_LANGDLL_LANGUAGES_CP \
+    `"${LANGFILE_${NLFID}_LANGDLL}" "${LANG_${NLFID}}" "${LANG_${NLFID}_CP}" ${MUI_LANGDLL_LANGUAGES_CP}`
   
   !verbose pop
 
@@ -2115,6 +2157,10 @@
   !verbose push
   !verbose ${MUI_VERBOSE}
 
+  !ifndef MUI_LANGDLL_LANGUAGES
+    !warning "MUI_LANGDLL_DISPLAY should only be used after inserting the MUI_LANGUAGE macro(s)"
+  !endif
+
   !insertmacro MUI_DEFAULT MUI_LANGDLL_WINDOWTITLE "Installer Language"
   !insertmacro MUI_DEFAULT MUI_LANGDLL_INFO "Please select a language."
 
@@ -2172,7 +2218,8 @@
 
 !macro MUI_UNGETLANGUAGE
 
-  !verbose pop
+  !verbose push
+  !verbose ${MUI_VERBOSE}
 
   !ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME
 
@@ -2201,6 +2248,5 @@
 ;--------------------------------
 ;END
 
+!verbose pop
 !endif
-
-!verbose pop
Index: tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Localization.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Localization.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Localization.nsh	(revision 2956)
@@ -11,8 +11,8 @@
 !macro MUI_LANGDLL_VARIABLES
 
   !ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME
-    !ifndef MUI_LANGDLL_REGISTRY_VARAIBLES
-      !define MUI_LANGDLL_REGISTRY_VARAIBLES
+    !ifndef MUI_LANGDLL_REGISTRY_VARIABLES
+      !define MUI_LANGDLL_REGISTRY_VARIABLES
 
       ;/GLOBAL because the macros are included in a function
       Var /GLOBAL mui.LangDLL.RegistryLanguage
@@ -26,41 +26,43 @@
 ;--------------------------------
 ;Include langauge files
 
-!macro MUI_LANGUAGE LANGUAGE
+!macro MUI_LANGUAGEEX LangDir NLFID
 
-  ;Include a language
+  !verbose push ${MUI_VERBOSE}
 
-  !verbose push
-  !verbose ${MUI_VERBOSE}
+  !ifndef MUI_PAGE_UNINSTALLER_PREFIX
+    !ifndef MUI_DISABLE_INSERT_LANGUAGE_AFTER_PAGES_WARNING ; Define this to avoid the warning if you only have custom pages
+      !warning "MUI_LANGUAGE[EX] should be inserted after the MUI_[UN]PAGE_* macros"
+    !endif
+  !endif
 
   !insertmacro MUI_INSERT
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nlf"
+  ;Include a language
+  LoadLanguageFile "${LangDir}\${NLFID}.nlf"
 
-  ;Include language file
-  !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nsh" "${NSISDIR}\Contrib\Language files\English.nsh"
+  ;Include MUI language file
+  !insertmacro LANGFILE_INCLUDE_WITHDEFAULT \
+    "${LangDir}\${NLFID}.nsh" "${NSISDIR}\Contrib\Language files\English.nsh"
 
   ;Add language to list of languages for selection dialog
-  !ifndef MUI_LANGDLL_LANGUAGES
-    !define MUI_LANGDLL_LANGUAGES "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' "
-    !define MUI_LANGDLL_LANGUAGES_CP "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' "
-  !else
-    !ifdef MUI_LANGDLL_LANGUAGES_TEMP
-      !undef MUI_LANGDLL_LANGUAGES_TEMP
-    !endif
-    !define MUI_LANGDLL_LANGUAGES_TEMP "${MUI_LANGDLL_LANGUAGES}"
-    !undef MUI_LANGDLL_LANGUAGES
+  !define /ifndef MUI_LANGDLL_LANGUAGES ""
+  !define /redef MUI_LANGDLL_LANGUAGES \
+    `"${LANGFILE_${NLFID}_LANGDLL}" "${LANG_${NLFID}}" ${MUI_LANGDLL_LANGUAGES}`
+  !define /ifndef MUI_LANGDLL_LANGUAGES_CP ""
+  !define /redef MUI_LANGDLL_LANGUAGES_CP \
+    `"${LANGFILE_${NLFID}_LANGDLL}" "${LANG_${NLFID}}" "${LANG_${NLFID}_CP}" ${MUI_LANGDLL_LANGUAGES_CP}`
 
-    !ifdef MUI_LANGDLL_LANGUAGES_CP_TEMP
-      !undef MUI_LANGDLL_LANGUAGES_CP_TEMP
-    !endif
-    !define MUI_LANGDLL_LANGUAGES_CP_TEMP "${MUI_LANGDLL_LANGUAGES_CP}"
-    !undef MUI_LANGDLL_LANGUAGES_CP
+  !verbose pop
 
-    !define MUI_LANGDLL_LANGUAGES "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' ${MUI_LANGDLL_LANGUAGES_TEMP}"
-    !define MUI_LANGDLL_LANGUAGES_CP "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' ${MUI_LANGDLL_LANGUAGES_CP_TEMP}"
-  !endif
+!macroend
 
+!macro MUI_LANGUAGE NLFID
+
+  !verbose push ${MUI_VERBOSE}
+
+  !insertmacro MUI_LANGUAGEEX "${NSISDIR}\Contrib\Language files" "${NLFID}"
+
   !verbose pop
 
 !macroend
@@ -74,12 +76,16 @@
   !verbose push
   !verbose ${MUI_VERBOSE}
 
+  !ifndef MUI_LANGDLL_LANGUAGES
+    !warning "MUI_LANGDLL_DISPLAY should only be used after inserting the MUI_LANGUAGE macro(s)"
+  !endif
+
   !insertmacro MUI_LANGDLL_VARIABLES
 
   !insertmacro MUI_DEFAULT MUI_LANGDLL_WINDOWTITLE "Installer Language"
   !insertmacro MUI_DEFAULT MUI_LANGDLL_INFO "Please select a language."
 
-  !ifdef MUI_LANGDLL_REGISTRY_VARAIBLES
+  !ifdef MUI_LANGDLL_REGISTRY_VARIABLES
 
     ReadRegStr $mui.LangDLL.RegistryLanguage "${MUI_LANGDLL_REGISTRY_ROOT}" "${MUI_LANGDLL_REGISTRY_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}"
     
@@ -95,7 +101,7 @@
   !endif
 
   !ifndef MUI_LANGDLL_ALWAYSSHOW
-  !ifdef MUI_LANGDLL_REGISTRY_VARAIBLES
+  !ifdef MUI_LANGDLL_REGISTRY_VARIABLES
     ${if} $mui.LangDLL.RegistryLanguage == ""
   !endif
   !endif
@@ -113,7 +119,7 @@
     ${endif}
   
   !ifndef MUI_LANGDLL_ALWAYSSHOW
-  !ifdef MUI_LANGDLL_REGISTRY_VARAIBLES
+  !ifdef MUI_LANGDLL_REGISTRY_VARIABLES
     ${endif}
   !endif
   !endif
@@ -185,7 +191,7 @@
   !verbose push
   !verbose ${MUI_VERBOSE}
 
-  ReserveFile "${NSISDIR}\Plugins\LangDLL.dll"
+  ReserveFile /plugin LangDLL.dll
 
   !verbose pop
 
Index: tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages/Finish.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages/Finish.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages/Finish.nsh	(revision 2956)
@@ -50,8 +50,8 @@
   !endif
   
   !ifdef MUI_FINISHPAGE_SHOWREADME
-    !ifndef MUI_FINISHPAGE_SHOREADME_VARAIBLES
-      !define MUI_FINISHPAGE_SHOREADME_VARAIBLES
+    !ifndef MUI_FINISHPAGE_SHOWREADME_VARIABLES
+      !define MUI_FINISHPAGE_SHOWREADME_VARIABLES
       Var mui.FinishPage.ShowReadme
     !endif
   !endif
@@ -71,7 +71,10 @@
     !endif
   !endif
 
-  !insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"  
+  !insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"
+  !if "${MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP}" == ""
+    !error "Invalid MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP"
+  !endif
 
 !macroend
 
@@ -264,11 +267,7 @@
     ;Image control
     ${NSD_CreateBitmap} 0u 0u 109u 193u ""
     Pop $mui.FinishPage.Image
-    !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
-      ${NSD_SetStretchedImage} $mui.FinishPage.Image $PLUGINSDIR\modern-wizard.bmp $mui.FinishPage.Image.Bitmap
-    !else
-      ${NSD_SetImage} $mui.FinishPage.Image $PLUGINSDIR\modern-wizard.bmp $mui.FinishPage.Image.Bitmap
-    !endif
+    !insertmacro MUI_INTERNAL_FULLWINDOW_LOADWIZARDIMAGE "${MUI_PAGE_UNINSTALLER_PREFIX}" $mui.FinishPage.Image $PLUGINSDIR\modern-wizard.bmp $mui.FinishPage.Image.Bitmap
     
     ;Positiong of controls
 
@@ -328,22 +327,22 @@
         ;Title text
         ${NSD_CreateLabel} 120u 10u 195u ${MUI_FINISHPAGE_TITLE_HEIGHT}u "${MUI_FINISHPAGE_TITLE}"
         Pop $mui.FinishPage.Title
-        SetCtlColors $mui.FinishPage.Title "" "${MUI_BGCOLOR}"
+        SetCtlColors $mui.FinishPage.Title "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
         CreateFont $mui.FinishPage.Title.Font "$(^Font)" "12" "700"
         SendMessage $mui.FinishPage.Title ${WM_SETFONT} $mui.FinishPage.Title.Font 0
 
         ;Finish text
-        ${NSD_CreateLabel} 120u 45u 195u ${MUI_FINISHPAGE_TEXT_HEIGHT_BUTTONS}u "${MUI_FINISHPAGE_TEXT_REBOOT}"
+        ${NSD_CreateLabel} 120u ${MUI_FINISHPAGE_TEXT_TOP}u 195u ${MUI_FINISHPAGE_TEXT_HEIGHT_BUTTONS}u "${MUI_FINISHPAGE_TEXT_REBOOT}"
         Pop $mui.FinishPage.Text
-        SetCtlColors $mui.FinishPage.Text "" "${MUI_BGCOLOR}"
+        SetCtlColors $mui.FinishPage.Text "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
       
         ;Radio buttons for reboot page
         ${NSD_CreateRadioButton} 120u ${MUI_FINISHPAGE_REBOOTNOW_TOP}u 195u 10u "${MUI_FINISHPAGE_TEXT_REBOOTNOW}"
         Pop $mui.FinishPage.RebootNow
-        SetCtlColors $mui.FinishPage.RebootNow "" "${MUI_BGCOLOR}"        
+        SetCtlColors $mui.FinishPage.RebootNow "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"        
         ${NSD_CreateRadioButton} 120u ${MUI_FINISHPAGE_REBOOTLATER_TOP}u 195u 10u "${MUI_FINISHPAGE_TEXT_REBOOTLATER}"
         Pop $mui.FinishPage.RebootLater
-        SetCtlColors $mui.FinishPage.RebootLater "" "${MUI_BGCOLOR}"
+        SetCtlColors $mui.FinishPage.RebootLater "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
         !ifndef MUI_FINISHPAGE_REBOOTLATER_DEFAULT
           SendMessage $mui.FinishPage.RebootNow ${BM_SETCHECK} ${BST_CHECKED} 0
         !else
@@ -358,7 +357,7 @@
         ;Title text
         ${NSD_CreateLabel} 120u 10u 195u ${MUI_FINISHPAGE_TITLE_HEIGHT}u "${MUI_FINISHPAGE_TITLE}"
         Pop $mui.FinishPage.Title
-        SetCtlColors $mui.FinishPage.Title "" "${MUI_BGCOLOR}"
+        SetCtlColors $mui.FinishPage.Title "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
         CreateFont $mui.FinishPage.Title.Font "$(^Font)" "12" "700"
         SendMessage $mui.FinishPage.Title ${WM_SETFONT} $mui.FinishPage.Title.Font 0
 
@@ -369,13 +368,13 @@
           ${NSD_CreateLabel} 120u ${MUI_FINISHPAGE_TEXT_TOP}u 195u ${MUI_FINISHPAGE_TEXT_HEIGHT_BUTTONS}u "${MUI_FINISHPAGE_TEXT}"
         !endif
         Pop $mui.FinishPage.Text
-        SetCtlColors $mui.FinishPage.Text "" "${MUI_BGCOLOR}"
+        SetCtlColors $mui.FinishPage.Text "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
     
         ;Checkboxes
         !ifdef MUI_FINISHPAGE_RUN
           ${NSD_CreateCheckbox} 120u ${MUI_FINISHPAGE_RUN_TOP}u 195u 10u "${MUI_FINISHPAGE_RUN_TEXT}"
           Pop $mui.FinishPage.Run
-          SetCtlColors $mui.FinishPage.Run "" "${MUI_BGCOLOR}"
+          SetCtlColors $mui.FinishPage.Run "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
           !ifndef MUI_FINISHPAGE_RUN_NOTCHECKED
             SendMessage $mui.FinishPage.Run ${BM_SETCHECK} ${BST_CHECKED} 0
           !endif
@@ -384,7 +383,7 @@
         !ifdef MUI_FINISHPAGE_SHOWREADME
           ${NSD_CreateCheckbox} 120u ${MUI_FINISHPAGE_SHOWREADME_TOP}u 195u 10u "${MUI_FINISHPAGE_SHOWREADME_TEXT}"
           Pop $mui.FinishPage.ShowReadme
-          SetCtlColors $mui.FinishPage.ShowReadme "" "${MUI_BGCOLOR}"
+          SetCtlColors $mui.FinishPage.ShowReadme "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
           !ifndef MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
             SendMessage $mui.FinishPage.ShowReadme ${BM_SETCHECK} ${BST_CHECKED} 0
           !endif
@@ -409,10 +408,29 @@
       StrCpy $mui.FinishPage.DisableAbortWarning "1"
     !endif
 
+    !ifndef MUI_FORCECLASSICCONTROLS
+    ${If} ${IsHighContrastModeActive}
+    !endif
+      ; SetCtlColors does not change the check/radio text color (bug #443)
+      !ifndef MUI_FINISHPAGE_NOREBOOTSUPPORT
+        System::Call 'UXTHEME::SetWindowTheme(p$mui.FinishPage.RebootNow,w" ",w" ")'
+        System::Call 'UXTHEME::SetWindowTheme(p$mui.FinishPage.RebootLater,w" ",w" ")'
+      !endif
+      !ifdef MUI_FINISHPAGE_RUN
+        System::Call 'UXTHEME::SetWindowTheme(p$mui.FinishPage.Run,w" ",w" ")'
+      !endif
+      !ifdef MUI_FINISHPAGE_SHOWREADME
+        System::Call 'UXTHEME::SetWindowTheme(p$mui.FinishPage.ShowReadme,w" ",w" ")'
+      !endif
+    !ifndef MUI_FORCECLASSICCONTROLS
+    ${EndIf}
+    !endif
+
     ;Show page
     Call ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}muiPageLoadFullWindow
     !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW
     nsDialogs::Show
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM DESTROYED
     Call ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}muiPageUnloadFullWindow 
     
     !ifdef MUI_FINISHPAGE_CANCEL_ENABLED
Index: tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages/License.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages/License.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages/License.nsh	(revision 2956)
@@ -80,8 +80,6 @@
     !insertmacro MUI_UNSET MUI_LICENSEPAGE_CHECKBOX_TEXT_ACCEPT
     !insertmacro MUI_UNSET MUI_LICENSEPAGE_CHECKBOX_TEXT_DECLINE
 
-  !verbose pop
-
 !macroend
 
 !macro MUI_PAGE_LICENSE LICENSEDATA
@@ -123,7 +121,7 @@
 
   Function "${SHOW}"
 
-    ;Get conrol handles
+    ;Get control handles
     FindWindow $mui.LicensePage "#32770" "" $HWNDPARENT
     GetDlgItem $mui.LicensePage.TopText $mui.LicensePage 1040
     GetDlgItem $mui.LicensePage.Text $mui.LicensePage 1006
Index: tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages/StartMenu.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages/StartMenu.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages/StartMenu.nsh	(revision 2956)
@@ -136,13 +136,14 @@
     GetDlgItem $mui.StartMenuPage.FolderList $mui.StartMenuPage 1004
 
     !ifdef MUI_STARTMENUPAGE_BGCOLOR
-      SetCtlColors $mui.StartMenuPage.Location "" "${MUI_STARTMENUPAGE_BGCOLOR}"
-      SetCtlColors $mui.StartMenuMenu.FolderList "" "${MUI_STARTMENUPAGE_BGCOLOR}"
+      !insertmacro MUI_DEFAULT MUI_STARTMENUPAGE_TEXTCOLOR ""
+      SetCtlColors $mui.StartMenuPage.Location "${MUI_STARTMENUPAGE_TEXTCOLOR}" "${MUI_STARTMENUPAGE_BGCOLOR}"
+      SetCtlColors $mui.StartMenuMenu.FolderList "${MUI_STARTMENUPAGE_TEXTCOLOR}" "${MUI_STARTMENUPAGE_BGCOLOR}"
     !endif
 
     !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW
-
     StartMenu::Show
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM DESTROYED
 
     Pop $mui.StartMenuPage.Temp
     ${if} $mui.StartMenuPage.Temp ==  "success"
Index: tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages/Directory.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages/Directory.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages/Directory.nsh	(revision 2956)
@@ -16,12 +16,12 @@
     
     Var mui.DirectoryPage.Text
     
-    Var mui.DirectoryPage.DirectoryBox        
+    Var mui.DirectoryPage.DirectoryBox
     Var mui.DirectoryPage.Directory
     Var mui.DirectoryPage.BrowseButton
     
     Var mui.DirectoryPage.SpaceRequired
-    Var mui.DirectoryPage.SpaceAvailable    
+    Var mui.DirectoryPage.SpaceAvailable
   !endif
 
 !macroend
@@ -106,13 +106,14 @@
     FindWindow $mui.DirectoryPage "#32770" "" $HWNDPARENT
     GetDlgItem $mui.DirectoryPage.Text $mui.DirectoryPage 1006
     GetDlgItem $mui.DirectoryPage.DirectoryBox $mui.DirectoryPage 1020
-    GetDlgItem $mui.DirectoryPage.Directory $mui.DirectoryPage 1019 
+    GetDlgItem $mui.DirectoryPage.Directory $mui.DirectoryPage 1019
     GetDlgItem $mui.DirectoryPage.BrowseButton $mui.DirectoryPage 1001
-    GetDlgItem $mui.DirectoryPage.SpaceRequired $mui.DirectoryPage 1023    
+    GetDlgItem $mui.DirectoryPage.SpaceRequired $mui.DirectoryPage 1023
     GetDlgItem $mui.DirectoryPage.SpaceAvailable $mui.DirectoryPage 1024
   
     !ifdef MUI_DIRECTORYPAGE_BGCOLOR
-      SetCtlColors $mui.DirectoryPage.Directory "" "${MUI_DIRECTORYPAGE_BGCOLOR}"
+      !insertmacro MUI_DEFAULT MUI_DIRECTORYPAGE_TEXTCOLOR ""
+      SetCtlColors $mui.DirectoryPage.Directory "${MUI_DIRECTORYPAGE_TEXTCOLOR}" "${MUI_DIRECTORYPAGE_BGCOLOR}"
     !endif
     
     !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW
Index: tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages/UninstallConfirm.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages/UninstallConfirm.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages/UninstallConfirm.nsh	(revision 2956)
@@ -41,6 +41,10 @@
 
     UninstallText "${MUI_UNCONFIRMPAGE_TEXT_TOP}" "${MUI_UNCONFIRMPAGE_TEXT_LOCATION}"
 
+    !ifdef MUI_UNCONFIRMPAGE_VARIABLE
+      DirVar "${MUI_UNCONFIRMPAGE_VARIABLE}"
+    !endif
+
   PageExEnd
 
   !insertmacro MUI_UNFUNCTION_CONFIRMPAGE un.mui.ConfirmPre_${MUI_UNIQUEID} un.mui.ConfirmShow_${MUI_UNIQUEID} un.mui.ConfirmLeave_${MUI_UNIQUEID}
Index: tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages/Welcome.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages/Welcome.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages/Welcome.nsh	(revision 2956)
@@ -20,10 +20,13 @@
     Var mui.WelcomePage.Title
     Var mui.WelcomePage.Title.Font
     
-    Var mui.WelcomePage.Text    
+    Var mui.WelcomePage.Text
   !endif
   
-  !insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"  
+  !insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"
+  !if "${MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP}" == ""
+    !error "Invalid MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP"
+  !endif
 
 !macroend
 
@@ -126,11 +129,7 @@
     ;Image control
     ${NSD_CreateBitmap} 0u 0u 109u 193u ""
     Pop $mui.WelcomePage.Image
-    !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
-      ${NSD_SetStretchedImage} $mui.WelcomePage.Image $PLUGINSDIR\modern-wizard.bmp $mui.WelcomePage.Image.Bitmap
-    !else
-      ${NSD_SetImage} $mui.WelcomePage.Image $PLUGINSDIR\modern-wizard.bmp $mui.WelcomePage.Image.Bitmap
-    !endif
+    !insertmacro MUI_INTERNAL_FULLWINDOW_LOADWIZARDIMAGE "${MUI_PAGE_UNINSTALLER_PREFIX}" $mui.WelcomePage.Image $PLUGINSDIR\modern-wizard.bmp $mui.WelcomePage.Image.Bitmap
 
     ;Positiong of controls
 
@@ -148,19 +147,20 @@
     ;Title
     ${NSD_CreateLabel} 120u 10u 195u ${MUI_WELCOMEPAGE_TITLE_HEIGHT}u "${MUI_WELCOMEPAGE_TITLE}"
     Pop $mui.WelcomePage.Title
-    SetCtlColors $mui.WelcomePage.Title "" "${MUI_BGCOLOR}"    
+    SetCtlColors $mui.WelcomePage.Title "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"    
     CreateFont $mui.WelcomePage.Title.Font "$(^Font)" "12" "700"
     SendMessage $mui.WelcomePage.Title ${WM_SETFONT} $mui.WelcomePage.Title.Font 0
 
     ;Welcome text
     ${NSD_CreateLabel} 120u ${MUI_WELCOMEPAGE_TEXT_TOP}u 195u 130u "${MUI_WELCOMEPAGE_TEXT}"
     Pop $mui.WelcomePage.Text
-    SetCtlColors $mui.WelcomePage.Text "" "${MUI_BGCOLOR}"
+    SetCtlColors $mui.WelcomePage.Text "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
 
     ;Show page
     Call ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}muiPageLoadFullWindow
     !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW
     nsDialogs::Show
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM DESTROYED
     Call ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}muiPageUnloadFullWindow    
 
     ;Delete image from memory
Index: tmp/org.txm.setups/nsis/Contrib/Modern UI 2/MUI2.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Modern UI 2/MUI2.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Modern UI 2/MUI2.nsh	(revision 2956)
@@ -1,25 +1,21 @@
 /*
 
-NSIS Modern User Interface - Version 2.0
-Copyright 2002-2015 Joost Verburg
+NSIS Modern User Interface - Version 2.1
+Copyright 2002-2020 Joost Verburg
+Contributors: Amir Szekely, Anders Kjersem
 
 */
 
-!echo "NSIS Modern User Interface version 2.0 - Copyright 2002-2015 Joost Verburg"
-
-;--------------------------------
-
 !ifndef MUI_INCLUDED
+!verbose push 3
 !define MUI_INCLUDED
+!define MUI_SYSVERSION "2.1"
+!verbose pop
+!echo "NSIS Modern User Interface version ${MUI_SYSVERSION} - Copyright 2002-2020 Joost Verburg"
 
-!define MUI_SYSVERSION "2.0"
-
-!verbose push
-
-!ifndef MUI_VERBOSE
-  !define MUI_VERBOSE 3
-!endif
-
+;--------------------------------
+!verbose push 3
+!define /IfNDef MUI_VERBOSE 3
 !verbose ${MUI_VERBOSE}
 
 !addincludedir "${NSISDIR}\Contrib\Modern UI 2"
@@ -117,6 +113,5 @@
 
 !macroend
 
-!endif
-
 !verbose pop
+!endif ;~ MUI_INCLUDED
Index: tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Pages.nsh	(revision 2956)
@@ -10,6 +10,10 @@
 
 !macro MUI_PAGE_INIT
 
+  !ifdef MUI_INSERT
+    !warning "MUI_PAGE_* inserted after MUI_LANGUAGE"
+  !endif
+
   ;Include interface settings in neccesary
   !insertmacro MUI_INTERFACE
 
@@ -29,6 +33,10 @@
 
 !macro MUI_UNPAGE_INIT
 
+  !ifdef MUI_INSERT
+    !warning "MUI_UNPAGE_* inserted after MUI_LANGUAGE"
+  !endif
+
   ;Include interface settings
   !insertmacro MUI_INTERFACE
 
@@ -41,7 +49,7 @@
   
   ;Generate unique ID
   !insertmacro MUI_UNSET MUI_UNIQUEID
-  !define MUI_UNIQUEID ${__LINE__}  
+  !define MUI_UNIQUEID ${__LINE__}
 
 !macroend
 
@@ -158,3 +166,159 @@
   !endif
 
 !macroend
+
+!macro MUI_INTERNAL_FULLWINDOW_LOADWIZARDIMAGE _un _hwndImg _ImgPath _RetImgHandle
+
+  !ifdef MUI_${_un}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
+    !insertmacro MUI_DEFAULT MUI_${_un}WELCOMEFINISHPAGE_BITMAP_STRETCH NoStretchNoCropNoAlign ; Legacy compatibility
+  !endif
+  !insertmacro MUI_DEFAULT MUI_${_un}WELCOMEFINISHPAGE_BITMAP_STRETCH FitControl
+
+  !if "${MUI_${_un}WELCOMEFINISHPAGE_BITMAP_STRETCH}" == "NoStretchNoCropNoAlign"
+
+    ${NSD_SetImage} ${_hwndImg} "${_ImgPath}" "${_RetImgHandle}"
+
+  !else if "${MUI_${_un}WELCOMEFINISHPAGE_BITMAP_STRETCH}" == "NoStretchNoCrop"
+
+    !insertmacro MUI_LOADANDXALIGNIMAGE ${_hwndImg} "${_ImgPath}" Auto "${_RetImgHandle}"
+
+  !else if "${MUI_${_un}WELCOMEFINISHPAGE_BITMAP_STRETCH}" == "AspectFitHeight"
+
+    !insertmacro MUI_LOADANDASPECTSTRETCHIMAGETOCONTROLHEIGHT ${_hwndImg} "${_ImgPath}" Auto "${_RetImgHandle}"
+
+  !else
+
+    !if "${MUI_${_un}WELCOMEFINISHPAGE_BITMAP_STRETCH}" != "FitControl"
+      !warning 'MUI_${_un}WELCOMEFINISHPAGE_BITMAP_STRETCH set to unknown value, defaulting to FitControl'
+    !endif
+    ${NSD_SetStretchedImage} ${_hwndImg} "${_ImgPath}" "${_RetImgHandle}"
+
+  !endif
+
+!macroend
+
+
+;--------------------------------
+;Helper macros
+
+!include Util.nsh
+
+!macro MUI_INTERNAL_LOADANDSIZEIMAGE _macro _hwndImg _ImgPath _XAlign _RetImgHandle
+  !if "${_XAlign}" == "Auto"
+    ${if} $(^RTL) == 1
+      Push "*${_ImgPath}"
+    ${Else}
+      Push "${_ImgPath}"
+    ${EndIf}
+  !else if "${_XAlign}" == "Right"
+    Push "*${_ImgPath}"
+  !else
+    Push "${_ImgPath}"
+  !endif
+  Push "${_hwndImg}"
+  ${CallArtificialFunction} ${_macro}
+  !if "${_RetImgHandle}" == "Leak"
+    !insertmacro _LOGICLIB_TEMP
+    Pop $_LOGICLIB_TEMP
+  !else if "${_RetImgHandle}" != "Stack"
+    Pop ${_RetImgHandle}
+  !endif
+!macroend
+
+!macro MUI_LOADANDXALIGNIMAGE _hwndImg _ImgPath _XAlign _RetImgHandle
+!insertmacro MUI_INTERNAL_LOADANDSIZEIMAGE \
+  MUI_INTERNAL_LOADANDXALIGNIMAGE "${_hwndImg}" "${_ImgPath}" "${_XAlign}" "${_RetImgHandle}"
+!macroend
+!macro MUI_INTERNAL_LOADANDXALIGNIMAGE
+  System::Store "S"
+  System::Call 'USER32::GetWindowRect(psr0,@r1)'
+  System::Call 'USER32::MapWindowPoints(p0,p$hwndparent,pr1,i2)' ; Note: Assuming control is not in inner dialog
+  System::Call '*$1(i.r5,i.r6,i.r7,i.r8)'
+  IntOp $7 $7 - $5
+  IntOp $8 $8 - $6
+
+  Pop $1
+  StrCpy $3 $1 1
+  ${If} $3 == "*" ; Move control to the right?
+    StrCpy $1 $1 "" 1
+  ${Endif}
+  System::Call 'USER32::LoadImage(p0,tr1,i${IMAGE_BITMAP},i0,i0,i${LR_LOADFROMFILE})p.r2'
+  SendMessage $0 ${STM_SETIMAGE} ${IMAGE_BITMAP} $2 $1
+  Push $2 ; Return value
+  System::Call 'GDI32::DeleteObject(pr1)' ; Note: Assuming the previous image (if any) was a bitmap
+  System::Call 'USER32::GetClientRect(pr0,@r1)'
+  System::Call '*$1(i,i,i.r1,i.r2)'
+
+  ${If} $3 == "*"
+  ${AndIf} $1 < $7 ; ImgW < CtlW
+    IntOp $3 $7 - $1
+    IntOp $5 $5 + $3
+    System::Call 'USER32::SetWindowPos(pr0,p0,ir5,ir6,i,i,i0x15)'
+  ${EndIf}
+
+  System::Store "L"
+!macroend
+
+!macro MUI_LOADANDASPECTSTRETCHIMAGETOCONTROLHEIGHT _hwndImg _ImgPath _XAlign _RetImgHandle
+!insertmacro MUI_INTERNAL_LOADANDSIZEIMAGE \
+  MUI_INTERNAL_LOADANDASPECTSTRETCHIMAGETOCONTROLHEIGHT "${_hwndImg}" "${_ImgPath}" "${_XAlign}" "${_RetImgHandle}"
+!macroend
+!macro MUI_INTERNAL_LOADANDASPECTSTRETCHIMAGETOCONTROLHEIGHT
+  System::Store "S"
+  System::Call 'USER32::GetWindowRect(psr0,@r1)'
+  System::Call 'USER32::MapWindowPoints(p0,p$hwndparent,pr1,i2)' ; Note: Assuming control is not in inner dialog
+  System::Call '*$1(i.r5,i.r6,i.r7,i.r8)'
+  IntOp $7 $7 - $5
+  IntOp $8 $8 - $6
+
+  Pop $1
+  StrCpy $3 $1 1
+  ${If} $3 == "*" ; Move control to the right?
+    StrCpy $1 $1 "" 1
+  ${Endif}
+  System::Call 'USER32::LoadImage(p0,tr1,i${IMAGE_BITMAP},i0,i0,i${LR_LOADFROMFILE})p.r2'
+  SendMessage $0 ${STM_SETIMAGE} ${IMAGE_BITMAP} $2 $1
+  Push $2 ; Return value
+  System::Call 'GDI32::DeleteObject(pr1)' ; Note: Assuming the previous image (if any) was a bitmap
+  System::Call 'USER32::GetClientRect(pr0,@r1)'
+  System::Call '*$1(i,i,i.r1,i.r2)'
+
+  IntOp $R7 $7 * 10000
+  IntOp $R8 $8 * 10000
+  IntOp $R1 $1 * 10000
+  IntOp $R2 $2 * 10000
+  IntOp $R3 $R1 / $2
+  StrCpy $R4 10000
+  ${If} $R1 > $R2
+    StrCpy $R3 10000
+    IntOp $R4 $R2 / $1
+  ${EndIf}
+
+  ${DoWhile} $R2 > $R8 ; ImgH > CtlH
+    IntOp $R1 $R1 - $R3
+    IntOp $R2 $R2 - $R4
+  ${Loop}
+  ${DoWhile} $R2 < $R8 ; ImgH < CtlH
+    IntOp $R1 $R1 + $R3
+    IntOp $R2 $R2 + $R4
+  ${Loop}
+  IntOp $1 $R1 / 10000
+  IntOp $2 $R2 / 10000
+
+  ${If} $1 < $7
+  ${AndIf} $3 == "*"
+    IntOp $R3 $7 - $1
+    IntOp $5 $5 + $R3
+  ${EndIf}
+
+  ${DoWhile} $2 > $8 ; Non-aspect-maintained stretch to make it a pixel perfect match
+    IntOp $2 $2 - 1
+    IntOp $1 $1 - 1
+    ${IfThen} $3 == "*" ${|} IntOp $5 $5 + 1 ${|}
+  ${Loop}
+
+  System::Call 'USER32::SetWindowPos(pr0,p0,ir5,ir6,ir1,ir2,i0x14)'
+  System::Store "L"
+!macroend
+
+
Index: tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Deprecated.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Deprecated.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Deprecated.nsh	(revision 2956)
@@ -5,6 +5,21 @@
 
 */
 
+
+!macro MUI_LEGACY_MAP_NOSTRETCH NAME R
+  !if "${R}" != ""
+    !ifdef ${NAME}NOSTRETCH
+        !define /IfNDef ${NAME}STRETCH NoStretchNoCropNoAlign
+    !endif
+  !else
+    !insertmacro ${__MACRO__} ${NAME}BITMAP_ 1
+    !insertmacro ${__MACRO__} ${NAME}BITMAP_RTL_ 1
+    !insertmacro ${__MACRO__} ${NAME}UNBITMAP_ 1
+    !insertmacro ${__MACRO__} ${NAME}UNBITMAP_RTL_ 1
+  !endif
+!macroend
+
+
 ;--------------------------------
 ;InstallOptions
 
@@ -66,7 +81,6 @@
 
 !macro MUI_RESERVEFILE_INSTALLOPTIONS
 
-  !define MUI_DOLLAR "$"
-  !error "MUI_RESERVEFILE_INSTALLOPTIONS is no longer supported as InstallOptions is no longer used by MUI2. Instead, use ReserveFile '${MUI_DOLLAR}{NSISDIR}\Plugins\InstallOptions.dll'. It is also recommended to upgrade to nsDialogs."
+  !error `MUI_RESERVEFILE_INSTALLOPTIONS is no longer supported as InstallOptions is no longer used by MUI2. Instead, use "ReserveFile /plugin InstallOptions.dll". It is also recommended to upgrade to nsDialogs.`
 
 !macroend
Index: tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Interface.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Interface.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Modern UI 2/Interface.nsh	(revision 2956)
@@ -49,28 +49,51 @@
     !insertmacro MUI_DEFAULT MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
     !insertmacro MUI_DEFAULT MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
     !insertmacro MUI_DEFAULT MUI_BGCOLOR "FFFFFF"
+    !insertmacro MUI_DEFAULT MUI_TEXTCOLOR "000000"
 
+    ;Map *_NOSTRETCH legacy define to the correct *_STRETCH value
+    !verbose push 2
+    !insertmacro MUI_LEGACY_MAP_NOSTRETCH MUI_HEADERIMAGE_ ""
+    !insertmacro MUI_LEGACY_MAP_NOSTRETCH MUI_WELCOMEFINISHPAGE_ ""
+    !insertmacro MUI_LEGACY_MAP_NOSTRETCH MUI_UNWELCOMEFINISHPAGE_ ""
+    !verbose pop
+
     ;Default header images
     !ifdef MUI_HEADERIMAGE
 
       !insertmacro MUI_DEFAULT MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\nsis.bmp"
+      !insertmacro MUI_DEFAULT MUI_HEADERIMAGE_BITMAP_STRETCH "FitControl"
+      !insertmacro MUI_DEFAULT MUI_HEADERIMAGE_BITMAP_RTL_STRETCH ${MUI_HEADERIMAGE_BITMAP_STRETCH}
 
       !ifndef MUI_HEADERIMAGE_UNBITMAP
         !define MUI_HEADERIMAGE_UNBITMAP "${MUI_HEADERIMAGE_BITMAP}"
-        !ifdef MUI_HEADERIMAGE_BITMAP_NOSTRETCH
-          !insertmacro MUI_SET MUI_HEADERIMAGE_UNBITMAP_NOSTRETCH ""
-        !endif
+        !insertmacro MUI_SET MUI_HEADERIMAGE_UNBITMAP_STRETCH ${MUI_HEADERIMAGE_BITMAP_STRETCH}
       !endif
 
+      !if "${MUI_HEADERIMAGE_BITMAP}" == ""
+        !error "Invalid MUI_HEADERIMAGE_BITMAP"
+      !endif
+      !if "${MUI_HEADERIMAGE_UNBITMAP}" == ""
+        !error "Invalid MUI_HEADERIMAGE_UNBITMAP"
+      !endif
+
       !ifdef MUI_HEADERIMAGE_BITMAP_RTL
         !ifndef MUI_HEADERIMAGE_UNBITMAP_RTL
           !define MUI_HEADERIMAGE_UNBITMAP_RTL "${MUI_HEADERIMAGE_BITMAP_RTL}"
-          !ifdef MUI_HEADERIMAGE_BITMAP_RTL_NOSTRETCH
-            !insertmacro MUI_SET MUI_HEADERIMAGE_UNBITMAP_RTL_NOSTRETCH ""
-          !endif
+          !insertmacro MUI_SET MUI_HEADERIMAGE_UNBITMAP_RTL_STRETCH ${MUI_HEADERIMAGE_BITMAP_RTL_STRETCH}
         !endif
+
+        !if "${MUI_HEADERIMAGE_BITMAP_RTL}" == ""
+          !error "Invalid MUI_HEADERIMAGE_BITMAP_RTL"
+        !endif
+        !if "${MUI_HEADERIMAGE_UNBITMAP_RTL}" == ""
+          !error "Invalid MUI_HEADERIMAGE_UNBITMAP_RTL"
+        !endif
       !endif
 
+      !insertmacro MUI_DEFAULT MUI_HEADERIMAGE_UNBITMAP_STRETCH ${MUI_HEADERIMAGE_BITMAP_STRETCH}
+      !insertmacro MUI_DEFAULT MUI_HEADERIMAGE_UNBITMAP_RTL_STRETCH ${MUI_HEADERIMAGE_BITMAP_RTL_STRETCH}
+
     !endif
 
     ;Default texts
@@ -133,44 +156,76 @@
 ;--------------------------------
 ;Initialization of GUI
 
-!macro MUI_HEADERIMAGE_INIT UNINSTALLER
+!macro MUI_HEADERIMAGE_INITHELPER_LOADIMAGEWITHMACRO MACRO
 
-  ;Load and display header image
+  !ifdef MUI_HEADERIMAGE_RIGHT
+    !ifndef MUI_OPTIMIZE_ALWAYSLTR ; Undocumented
+      ${if} $(^RTL) == 1
+        !insertmacro ${MACRO} $mui.Header.Image "${PATH}" Left Leak
+      ${Else}
+        !insertmacro ${MACRO} $mui.Header.Image "${PATH}" Right Leak
+      ${EndIf}
+    !else
+      !insertmacro ${MACRO} $mui.Header.Image "${PATH}" Right Leak
+    !endif
+  !else
+    !insertmacro ${MACRO} $mui.Header.Image "${PATH}" Auto Leak
+  !endif
 
-  !ifdef MUI_HEADERIMAGE
+!macroend
+!macro MUI_HEADERIMAGE_INITHELPER_LOADIMAGE UN RTL IMGRESID PATH
 
-    InitPluginsDir
+  GetDlgItem $mui.Header.Image $HWNDPARENT ${IMGRESID} ; This variable is not used by every mode but we have to reference it to avoid a compiler warning.
 
-    !ifdef MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_RTL
+  !if "${MUI_HEADERIMAGE_${UN}BITMAP${RTL}_STRETCH}" == "NoStretchNoCropNoAlign"
 
-      ${if} $(^RTL) == 1
+    SetBrandingImage /IMGID=${IMGRESID} "${PATH}"
 
-        File "/oname=$PLUGINSDIR\modern-header.bmp" "${MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_RTL}"
+  !else if "${MUI_HEADERIMAGE_${UN}BITMAP${RTL}_STRETCH}" == "NoStretchNoCrop"
 
-        !ifndef MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_RTL_NOSTRETCH
-          SetBrandingImage /IMGID=1046 /RESIZETOFIT "$PLUGINSDIR\modern-header.bmp"
-        !else
-          SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"
-        !endif
+    !insertmacro MUI_HEADERIMAGE_INITHELPER_LOADIMAGEWITHMACRO \
+      MUI_LOADANDXALIGNIMAGE
 
-      ${else}
+  !else if "${MUI_HEADERIMAGE_${UN}BITMAP${RTL}_STRETCH}" == "AspectFitHeight"
 
+    !insertmacro MUI_HEADERIMAGE_INITHELPER_LOADIMAGEWITHMACRO \
+      MUI_LOADANDASPECTSTRETCHIMAGETOCONTROLHEIGHT
+
+  !else
+
+    !if "${MUI_HEADERIMAGE_${UN}BITMAP${RTL}_STRETCH}" != "FitControl"
+      !warning 'MUI_HEADERIMAGE_${UN}BITMAP${RTL}_STRETCH set to unknown value, defaulting to FitControl'
     !endif
+    SetBrandingImage /IMGID=${IMGRESID} /RESIZETOFIT "${PATH}"
 
-        File "/oname=$PLUGINSDIR\modern-header.bmp" "${MUI_HEADERIMAGE_${UNINSTALLER}BITMAP}"
+  !endif
 
-        !ifndef MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_NOSTRETCH
-          SetBrandingImage /IMGID=1046 /RESIZETOFIT "$PLUGINSDIR\modern-header.bmp"
-        !else
-          SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"
-        !endif
+!macroend
 
-    !ifdef MUI_HEADERIMAGE_${UNINSTALLER}BITMAP_RTL
+!macro MUI_HEADERIMAGE_INIT UN IMGRESID
 
-      ${endif}
+  ;Load and display header image
 
+  !ifdef MUI_HEADERIMAGE
+
+    InitPluginsDir
+
+    !ifdef MUI_HEADERIMAGE_${UN}BITMAP_RTL
+      ${if} $(^RTL) == 1
+
+        File "/oname=$PLUGINSDIR\modern-header.bmp" "${MUI_HEADERIMAGE_${UN}BITMAP_RTL}"
+        !insertmacro MUI_HEADERIMAGE_INITHELPER_LOADIMAGE "${UN}" "_RTL" ${IMGRESID} "$PLUGINSDIR\modern-header.bmp"
+
+      ${else}
     !endif
 
+        File "/oname=$PLUGINSDIR\modern-header.bmp" "${MUI_HEADERIMAGE_${UN}BITMAP}"
+        !insertmacro MUI_HEADERIMAGE_INITHELPER_LOADIMAGE "${UN}" "" ${IMGRESID} "$PLUGINSDIR\modern-header.bmp"
+
+    !ifdef MUI_HEADERIMAGE_${UN}BITMAP_RTL
+      ${endif}
+    !endif
+
   !endif
 
 !macroend
@@ -183,27 +238,29 @@
   GetDlgItem $mui.Header.Text $HWNDPARENT 1037
   CreateFont $mui.Header.Text.Font "$(^Font)" "$(^FontSize)" "700"
   SendMessage $mui.Header.Text ${WM_SETFONT} $mui.Header.Text.Font 0
-  
+
   GetDlgItem $mui.Header.SubText $HWNDPARENT 1038
 
   !ifndef MUI_HEADER_TRANSPARENT_TEXT
-    SetCtlColors $mui.Header.Text "" "${MUI_BGCOLOR}"
-    SetCtlColors $mui.Header.SubText "" "${MUI_BGCOLOR}"
+    SetCtlColors $mui.Header.Text "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
+    SetCtlColors $mui.Header.SubText "${MUI_TEXTCOLOR}" "${MUI_BGCOLOR}"
   !else
-    SetCtlColors $mui.Header.Text "" "transparent"
-    SetCtlColors $mui.Header.SubText "" "transparent"
+    SetCtlColors $mui.Header.Text "${MUI_TEXTCOLOR}" "transparent"
+    SetCtlColors $mui.Header.SubText "${MUI_TEXTCOLOR}" "transparent"
   !endif
-  
+
   ;Header image
-  !insertmacro MUI_HEADERIMAGE_INIT "${UNINSTALLER}"
+  !insertmacro MUI_HEADERIMAGE_INIT "${UNINSTALLER}" 1046
 
   ;Header background
   GetDlgItem $mui.Header.Background $HWNDPARENT 1034
   SetCtlColors $mui.Header.Background "" "${MUI_BGCOLOR}"
 
-  ;Header image background
-  GetDlgItem $mui.Header.Image $HWNDPARENT 1039
-  SetCtlColors $mui.Header.Image "" "${MUI_BGCOLOR}"
+  ;Header icon image background
+  !ifndef MUI_HEADERIMAGE
+    GetDlgItem $mui.Header.Image $HWNDPARENT 1039
+    SetCtlColors $mui.Header.Image "" "${MUI_BGCOLOR}"
+  !endif
 
   ;Branding text
   GetDlgItem $mui.Branding.Background $HWNDPARENT 1028
@@ -211,11 +268,11 @@
   GetDlgItem $mui.Branding.Text $HWNDPARENT 1256
   SetCtlColors $mui.Branding.Text /BRANDING
   SendMessage $mui.Branding.Text ${WM_SETTEXT} 0 "STR:$(^Branding) "
-  
+
   ;Lines
   GetDlgItem $mui.Line.Standard $HWNDPARENT 1035
   GetDlgItem $mui.Line.FullWindow $HWNDPARENT 1045
-  
+
   ;Buttons
   GetDlgItem $mui.Button.Next $HWNDPARENT 1
   GetDlgItem $mui.Button.Cancel $HWNDPARENT 2
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Vietnamese.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Vietnamese.nsh	(revision 0)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Vietnamese.nsh	(revision 2956)
@@ -0,0 +1,129 @@
+ï»¿;Language: Vietnamese (1066)
+;By NGUYÃŠÌƒN MaÌ£nh HuÌ€ng <loveleeyoungae@yahoo.com>
+
+!insertmacro LANGFILE "Vietnamese" = "Tiáº¿ng Viá»‡t" "Tieng Viet"
+
+!ifdef MUI_WELCOMEPAGE
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "ChaÌ€o mÆ°Ì€ng Ä‘ÃªÌ�n vÆ¡Ì�i TrÆ¡Ì£ liÌ� CaÌ€i Ä‘ÄƒÌ£t $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "TriÌ€nh trÆ¡Ì£ liÌ� seÌƒ hÆ°Æ¡Ì�ng dÃ¢Ìƒn baÌ£n viÃªÌ£c caÌ€i Ä‘ÄƒÌ£t $(^NameDA).$\r$\n$\r$\nBaÌ£n nÃªn Ä‘oÌ�ng tÃ¢Ì�t caÌ‰ caÌ�c chÆ°Æ¡ng triÌ€nh khaÌ�c trÆ°Æ¡Ì�c khi bÄƒÌ�t Ä‘Ã¢Ì€u caÌ€i Ä‘ÄƒÌ£t. Ä�iÃªÌ€u naÌ€y coÌ� thÃªÌ‰ giuÌ�p cÃ¢Ì£p nhÃ¢Ì£t caÌ�c tÃ¢Ì£p tin hÃªÌ£ thÃ´Ì�ng maÌ€ khÃ´ng cÃ¢Ì€n phaÌ‰i khÆ¡Ì‰i Ä‘Ã´Ì£ng laÌ£i maÌ�y tiÌ�nh.$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_UNWELCOMEPAGE
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "ChaÌ€o mÆ°Ì€ng Ä‘ÃªÌ�n vÆ¡Ì�i TrÆ¡Ì£ liÌ� GÆ¡Ìƒ boÌ‰ $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "TriÌ€nh trÆ¡Ì£ liÌ� seÌƒ hÆ°Æ¡Ì�ng dÃ¢Ìƒn baÌ£n viÃªÌ£c gÆ¡Ìƒ boÌ‰ $(^NameDA).$\r$\n$\r$\nTrÆ°Æ¡Ì�c khi bÄƒÌ�t Ä‘Ã¢Ì€u gÆ¡Ìƒ boÌ‰, haÌƒy chÄƒÌ�c chÄƒÌ�n rÄƒÌ€ng $(^NameDA) Ä‘ang khÃ´ng chaÌ£y.$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "ThoÌ‰a thuÃ¢Ì£n GiÃ¢Ì�y pheÌ�p"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Vui loÌ€ng xem xeÌ�t caÌ�c Ä‘iÃªÌ€u khoaÌ‰n giÃ¢Ì�y pheÌ�p trÆ°Æ¡Ì�c khi caÌ€i Ä‘ÄƒÌ£t $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "NÃªÌ�u baÌ£n chÃ¢Ì�p thuÃ¢Ì£n caÌ�c Ä‘iÃªÌ€u khoaÌ‰n cuÌ‰a thoÌ‰a thuÃ¢Ì£n, haÌƒy nhÃ¢Ì�n â€œTÃ´i Ä‘Ã´Ì€ng yÌ�â€� Ä‘ÃªÌ‰ tiÃªÌ�p tuÌ£c. BaÌ£n phaÌ‰i chÃ¢Ì�p thuÃ¢Ì£n baÌ‰n thoÌ‰a thuÃ¢Ì£n Ä‘ÃªÌ‰ caÌ€i Ä‘ÄƒÌ£t $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "NÃªÌ�u baÌ£n chÃ¢Ì�p thuÃ¢Ì£n caÌ�c Ä‘iÃªÌ€u khoaÌ‰n cuÌ‰a thoÌ‰a thuÃ¢Ì£n, haÌƒy nhÃ¢Ì�n Ã´ bÃªn dÆ°Æ¡Ì�i. BaÌ£n phaÌ‰i chÃ¢Ì�p thuÃ¢Ì£n baÌ‰n thoÌ‰a thuÃ¢Ì£n Ä‘ÃªÌ‰ caÌ€i Ä‘ÄƒÌ£t $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "NÃªÌ�u baÌ£n chÃ¢Ì�p thuÃ¢Ì£n caÌ�c Ä‘iÃªÌ€u khoaÌ‰n cuÌ‰a thoÌ‰a thuÃ¢Ì£n, haÌƒy choÌ£n Ã´ Ä‘Ã¢Ì€u tiÃªn bÃªn dÆ°Æ¡Ì�i. BaÌ£n phaÌ‰i chÃ¢Ì�p thuÃ¢Ì£n baÌ‰n thoÌ‰a thuÃ¢Ì£n Ä‘ÃªÌ‰ caÌ€i Ä‘ÄƒÌ£t $(^NameDA). $_CLICK"
+!endif
+
+!ifdef MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "ThoÌ‰a thuÃ¢Ì£n GiÃ¢Ì�y pheÌ�p"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Vui loÌ€ng xem xeÌ�t caÌ�c Ä‘iÃªÌ€u khoaÌ‰n giÃ¢Ì�y pheÌ�p trÆ°Æ¡Ì�c khi gÆ¡Ìƒ boÌ‰ $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "NÃªÌ�u baÌ£n chÃ¢Ì�p thuÃ¢Ì£n caÌ�c Ä‘iÃªÌ€u khoaÌ‰n cuÌ‰a thoÌ‰a thuÃ¢Ì£n, haÌƒy nhÃ¢Ì�n â€œTÃ´i Ä‘Ã´Ì€ng yÌ�â€� Ä‘ÃªÌ‰ tiÃªÌ�p tuÌ£c. BaÌ£n phaÌ‰i chÃ¢Ì�p thuÃ¢Ì£n baÌ‰n thoÌ‰a thuÃ¢Ì£n Ä‘ÃªÌ‰ gÆ¡Ìƒ boÌ‰ $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "NÃªÌ�u baÌ£n chÃ¢Ì�p thuÃ¢Ì£n caÌ�c Ä‘iÃªÌ€u khoaÌ‰n cuÌ‰a thoÌ‰a thuÃ¢Ì£n, haÌƒy nhÃ¢Ì�n Ã´ bÃªn dÆ°Æ¡Ì�i. BaÌ£n phaÌ‰i chÃ¢Ì�p thuÃ¢Ì£n baÌ‰n thoÌ‰a thuÃ¢Ì£n Ä‘ÃªÌ‰ gÆ¡Ìƒ boÌ‰ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "NÃªÌ�u baÌ£n chÃ¢Ì�p thuÃ¢Ì£n caÌ�c Ä‘iÃªÌ€u khoaÌ‰n cuÌ‰a thoÌ‰a thuÃ¢Ì£n, haÌƒy choÌ£n Ã´ Ä‘Ã¢Ì€u tiÃªn bÃªn dÆ°Æ¡Ì�i. BaÌ£n phaÌ‰i chÃ¢Ì�p thuÃ¢Ì£n baÌ‰n thoÌ‰a thuÃ¢Ì£n Ä‘ÃªÌ‰ gÆ¡Ìƒ boÌ‰ $(^NameDA). $_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Ã‚Ì�n Page Down Ä‘ÃªÌ‰ xem phÃ¢Ì€n coÌ€n laÌ£i cuÌ‰a thoÌ‰a thuÃ¢Ì£n."
+!endif
+
+!ifdef MUI_COMPONENTSPAGE
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "ChoÌ£n thaÌ€nh phÃ¢Ì€n"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "ChoÌ£n caÌ�c tiÌ�nh nÄƒng cuÌ‰a $(^NameDA) maÌ€ baÌ£n muÃ´Ì�n caÌ€i Ä‘ÄƒÌ£t."
+!endif
+
+!ifdef MUI_UNCOMPONENTSPAGE
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "ChoÌ£n thaÌ€nh phÃ¢Ì€n"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "ChoÌ£n caÌ�c tiÌ�nh nÄƒng cuÌ‰a $(^NameDA) maÌ€ baÌ£n muÃ´Ì�n gÆ¡Ìƒ boÌ‰."
+!endif
+
+!ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "MÃ´ taÌ‰"
+  !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "RÃª chuÃ´Ì£t lÃªn trÃªn mÃ´Ì£t thaÌ€nh phÃ¢Ì€n Ä‘ÃªÌ‰ thÃ¢Ì�y mÃ´ taÌ‰ cuÌ‰a noÌ�."
+  !else
+    #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO 
+  !endif
+!endif
+
+!ifdef MUI_DIRECTORYPAGE
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "ChoÌ£n thÆ° muÌ£c caÌ€i Ä‘ÄƒÌ£t"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "ChoÌ£n thÆ° muÌ£c Ä‘ÃªÌ‰ caÌ€i Ä‘ÄƒÌ£t $(^NameDA)."
+!endif
+
+!ifdef MUI_UNDIRECTORYPAGE
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "ChoÌ£n thÆ° muÌ£c gÆ¡Ìƒ boÌ‰"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "ChoÌ£n thÆ° muÌ£c Ä‘ÃªÌ‰ gÆ¡Ìƒ boÌ‰ $(^NameDA)."
+!endif
+
+!ifdef MUI_INSTFILESPAGE
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "CaÌ€i Ä‘ÄƒÌ£t"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Vui loÌ€ng Ä‘Æ¡Ì£i trong khi $(^NameDA) Ä‘ang Ä‘Æ°Æ¡Ì£c caÌ€i Ä‘ÄƒÌ£t."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "CaÌ€i Ä‘ÄƒÌ£t hoaÌ€n tÃ¢Ì�t"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "ViÃªÌ£c caÌ€i Ä‘ÄƒÌ£t Ä‘aÌƒ hoaÌ€n tÃ¢Ì�t thaÌ€nh cÃ´ng."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "CaÌ€i Ä‘ÄƒÌ£t biÌ£ huÌ‰y"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "ViÃªÌ£c caÌ€i Ä‘ÄƒÌ£t khÃ´ng hoaÌ€n tÃ¢Ì�t thaÌ€nh cÃ´ng."
+!endif
+
+!ifdef MUI_UNINSTFILESPAGE
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "GÆ¡Ìƒ boÌ‰"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Vui loÌ€ng Ä‘Æ¡Ì£i trong khi $(^NameDA) Ä‘ang Ä‘Æ°Æ¡Ì£c gÆ¡Ìƒ boÌ‰."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "GÆ¡Ìƒ boÌ‰ hoaÌ€n tÃ¢Ì�t"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "ViÃªÌ£c gÆ¡Ìƒ boÌ‰ Ä‘aÌƒ hoaÌ€n tÃ¢Ì�t thaÌ€nh cÃ´ng."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "GÆ¡Ìƒ boÌ‰ biÌ£ huÌ‰y"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "ViÃªÌ£c gÆ¡Ìƒ boÌ‰ khÃ´ng hoaÌ€n tÃ¢Ì�t thaÌ€nh cÃ´ng."
+!endif
+
+!ifdef MUI_FINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "HoaÌ€n tÃ¢Ì�t CaÌ€i Ä‘ÄƒÌ£t $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) Ä‘aÌƒ Ä‘Æ°Æ¡Ì£c caÌ€i Ä‘ÄƒÌ£t vaÌ€o maÌ�y tiÌ�nh cuÌ‰a baÌ£n.$\r$\n$\r$\nNhÃ¢Ì�n â€œHoaÌ€n thaÌ€nhâ€� Ä‘ÃªÌ‰ Ä‘oÌ�ng TriÌ€nh trÆ¡Ì£ liÌ�."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "MaÌ�y tiÌ�nh cuÌ‰a baÌ£n phaÌ‰i Ä‘Æ°Æ¡Ì£c khÆ¡Ì‰i Ä‘Ã´Ì£ng laÌ£i Ä‘ÃªÌ‰ hoaÌ€n tÃ¢Ì�t viÃªÌ£c caÌ€i Ä‘ÄƒÌ£t $(^NameDA). BaÌ£n coÌ� muÃ´Ì�n khÆ¡Ì‰i Ä‘Ã´Ì£ng laÌ£i ngay khÃ´ng?"
+!endif
+
+!ifdef MUI_UNFINISHPAGE
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "HoaÌ€n tÃ¢Ì�t GÆ¡Ìƒ boÌ‰ $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) Ä‘aÌƒ Ä‘Æ°Æ¡Ì£c gÆ¡Ìƒ boÌ‰ khoÌ‰i maÌ�y tiÌ�nh cuÌ‰a baÌ£n.$\r$\n$\r$\nNhÃ¢Ì�n â€œHoaÌ€n thaÌ€nhâ€� Ä‘ÃªÌ‰ Ä‘oÌ�ng TriÌ€nh trÆ¡Ì£ liÌ�."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "MaÌ�y tiÌ�nh cuÌ‰a baÌ£n phaÌ‰i Ä‘Æ°Æ¡Ì£c khÆ¡Ì‰i Ä‘Ã´Ì£ng laÌ£i Ä‘ÃªÌ‰ hoaÌ€n tÃ¢Ì�t viÃªÌ£c gÆ¡Ìƒ boÌ‰ $(^NameDA). BaÌ£n coÌ� muÃ´Ì�n khÆ¡Ì‰i Ä‘Ã´Ì£ng laÌ£i ngay khÃ´ng?"
+!endif
+
+!ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "KhÆ¡Ì‰i Ä‘Ã´Ì£ng laÌ£i ngay"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "TÃ´i muÃ´Ì�n khÆ¡Ì‰i Ä‘Ã´Ì£ng laÌ£i sau"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&ChaÌ£y $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "HiÃªÌ£n &Readme"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&HoaÌ€n thaÌ€nh"  
+!endif
+
+!ifdef MUI_STARTMENUPAGE
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "ChoÌ£n thÆ° muÌ£c TriÌ€nh Ä‘Æ¡n Start"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "ChoÌ£n mÃ´Ì£t thÆ° muÌ£c trÃªn TriÌ€nh Ä‘Æ¡n Start Ä‘ÃªÌ‰ taÌ£o lÃ´Ì�i tÄƒÌ�t cho $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "ChoÌ£n thÆ° muÌ£c trÃªn TriÌ€nh Ä‘Æ¡n Start maÌ€ baÌ£n muÃ´Ì�n taÌ£o lÃ´Ì�i tÄƒÌ�t cho chÆ°Æ¡ng triÌ€nh. BaÌ£n cuÌƒng coÌ� thÃªÌ‰ nhÃ¢Ì£p tÃªn Ä‘ÃªÌ‰ taÌ£o thÆ° muÌ£c mÆ¡Ì�i."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "KhÃ´ng taÌ£o lÃ´Ì�i tÄƒÌ�t"
+!endif
+
+!ifdef MUI_UNCONFIRMPAGE
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "GÆ¡Ìƒ boÌ‰ $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "GÆ¡Ìƒ boÌ‰ $(^NameDA) khoÌ‰i maÌ�y tiÌ�nh cuÌ‰a baÌ£n."
+!endif
+
+!ifdef MUI_ABORTWARNING
+  ${LangFileString} MUI_TEXT_ABORTWARNING "BaÌ£n coÌ� thÃ¢Ì£t sÆ°Ì£ muÃ´Ì�n thoaÌ�t triÌ€nh CaÌ€i Ä‘ÄƒÌ£t $(^Name) khÃ´ng?"
+!endif
+
+!ifdef MUI_UNABORTWARNING
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "BaÌ£n coÌ� thÃ¢Ì£t sÆ°Ì£ muÃ´Ì�n thoaÌ�t triÌ€nh GÆ¡Ìƒ boÌ‰ $(^Name) khÃ´ng?"
+!endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "ChoÌ£n ngÆ°Æ¡Ì€i duÌ€ng"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "ChoÌ£n ngÆ°Æ¡Ì€i duÌ€ng maÌ€ baÌ£n muÃ´Ì�n caÌ€i Ä‘ÄƒÌ£t $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "ChoÌ£n giÆ°Ìƒa viÃªÌ£c caÌ€i Ä‘ÄƒÌ£t $(^NameDA) cho riÃªng baÌ£n hoÄƒÌ£c cho tÃ¢Ì�t caÌ‰ ngÆ°Æ¡Ì€i duÌ€ng cuÌ‰a maÌ�y tiÌ�nh naÌ€y. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "CaÌ€i Ä‘ÄƒÌ£t cho bÃ¢Ì�t kiÌ€ ngÆ°Æ¡Ì€i naÌ€o sÆ°Ì‰ duÌ£ng maÌ�y tiÌ�nh naÌ€y"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "ChiÌ‰ caÌ€i Ä‘ÄƒÌ£t cho riÃªng tÃ´i"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/German.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/German.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/German.nlf	(revision 2956)
@@ -1,51 +1,51 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1031
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
-# Translation by L.King, changes by R. Bisswanger, Tim Kosse
+# Translation by L.King, changes by R. Bisswanger, Tim Kosse, Frederik Schwarzer & Sebastian Stange
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-$(^Name) Installation
+Installation von $(^Name)
 # ^UninstallCaption
-$(^Name) Deinstallation
+Deinstallation von $(^Name)
 # ^LicenseSubCaption
 : Lizenzabkommen
 # ^ComponentsSubCaption
-: Installations-Optionen
+: Installationsoptionen
 # ^DirSubCaption
 : Zielverzeichnis
 # ^InstallingSubCaption
-: Installiere
+: Wird installiert
 # ^CompletedSubCaption
 : Fertig
 # ^UnComponentsSubCaption
-: Deinstallations-Optionen
+: Deinstallationsoptionen
 # ^UnDirSubCaption
 : Quellverzeichnis
 # ^ConfirmSubCaption
-: Bestätigung
+: BestÃ¤tigung
 # ^UninstallingSubCaption
-: Entferne
+: Wird entfernt
 # ^UnCompletedSubCaption
 : Fertig
 # ^BackBtn
-< &Zurück
+< &ZurÃ¼ck
 # ^NextBtn
 &Weiter >
 # ^AgreeBtn
 &Annehmen
 # ^AcceptBtn
-Ich &akzeptiere das Lizenzabkommen.
+Lizenzabkommen &akzeptieren
 # ^DontAcceptBtn
-Ich &lehne das Lizenzabkommen ab.
+Lizenzabkommen ab&lehnen
 # ^InstallBtn
 &Installieren
 # ^UninstallBtn
@@ -55,7 +55,7 @@
 # ^CloseBtn
 &Beenden
 # ^BrowseBtn
-&Durchsuchen...
+&Durchsuchen ...
 # ^ShowDetailsBtn
 &Details anzeigen
 # ^ClickNext
@@ -71,111 +71,111 @@
 # ^LicenseText
 Bitte lesen Sie das Lizenzabkommen, bevor Sie $(^NameDA) installieren. Wenn Sie alle Bedingungen des Abkommens akzeptieren, klicken Sie auf Annehmen.
 # ^LicenseTextCB
-Bitte lesen Sie das Lizenzabkommen, bevor Sie $(^NameDA) installieren. Wenn Sie alle Bedingungen des Abkommens akzeptieren, aktivieren Sie das Kontrollkästchen. $_CLICK
+Bitte lesen Sie das Lizenzabkommen, bevor Sie $(^NameDA) installieren. Wenn Sie alle Bedingungen des Abkommens akzeptieren, aktivieren Sie das KontrollkÃ¤stchen. $_CLICK
 # ^LicenseTextRB
-Bitte lesen Sie das Lizenzabkommen, bevor Sie $(^NameDA) installieren. Wenn Sie alle Bedingungen des Abkommens akzeptieren, wählen Sie die entsprechende Option. $_CLICK
+Bitte lesen Sie das Lizenzabkommen, bevor Sie $(^NameDA) installieren. Wenn Sie alle Bedingungen des Abkommens akzeptieren, wÃ¤hlen Sie die entsprechende Option. $_CLICK
 # ^UnLicenseText
 Bitte lesen Sie das Lizenzabkommen, bevor Sie $(^NameDA) entfernen. Wenn Sie alle Bedingungen des Abkommens akzeptieren, klicken Sie auf Annehmen.
 # ^UnLicenseTextCB
-Bitte lesen Sie das Lizenzabkommen, bevor Sie $(^NameDA) entfernen. Wenn Sie alle Bedingungen des Abkommens akzeptieren, aktivieren Sie das Kontrollkästchen. $_CLICK
+Bitte lesen Sie das Lizenzabkommen, bevor Sie $(^NameDA) entfernen. Wenn Sie alle Bedingungen des Abkommens akzeptieren, aktivieren Sie das KontrollkÃ¤stchen. $_CLICK
 # ^UnLicenseTextRB
-Bitte lesen Sie das Lizenzabkommen, bevor Sie $(^NameDA) entfernen. Wenn Sie alle Bedingungen des Abkommens akzeptieren, wählen Sie die entsprechende Option. $_CLICK
+Bitte lesen Sie das Lizenzabkommen, bevor Sie $(^NameDA) entfernen. Wenn Sie alle Bedingungen des Abkommens akzeptieren, wÃ¤hlen Sie die entsprechende Option. $_CLICK
 # ^Custom
 Benutzerdefiniert
 # ^ComponentsText
-Wählen Sie die Komponenten aus, die Sie installieren möchten und wählen Sie diejenigen ab, die Sie nicht installieren wollen. $_CLICK
+WÃ¤hlen Sie die Komponenten, welche Sie installieren wollen. $_CLICK
 # ^ComponentsSubText1
-Installations-Typ bestimmen:
+Installationstyp bestimmen:
 # ^ComponentsSubText2_NoInstTypes
-Wählen Sie die Komponenten aus, die Sie installieren möchten:
+WÃ¤hlen Sie die zu installierenden Komponenten:
 # ^ComponentsSubText2
-oder wählen Sie zusätzliche Komponenten aus, die Sie installieren möchten:
+oder wÃ¤hlen Sie zusÃ¤tzliche zu installierende Komponenten:
 # ^UnComponentsText
-Wählen Sie die Komponenten aus, die Sie entfernen möchten und wählen Sie diejenigen ab, die Sie nicht entfernen wollen. $_CLICK
+WÃ¤hlen Sie die Komponenten, welche Sie entfernen wollen. $_CLICK
 # ^UnComponentsSubText1
-Deinstallations-Typ bestimmen:
+Deinstallationstyp bestimmen:
 # ^UnComponentsSubText2_NoInstTypes
-Wählen Sie die Komponenten aus, die Sie entfernen möchten:
+WÃ¤hlen Sie die zu entfernenden Komponenten:
 # ^UnComponentsSubText2
-oder wählen Sie zusätzliche Komponenten aus, die Sie entfernen möchten:
+oder wÃ¤hlen Sie zusÃ¤tzliche Komponenten, welche Sie entfernen mÃ¶chten:
 # ^DirText
-$(^NameDA) wird in das unten angegebene Verzeichnis installiert. Falls Sie in ein anderes Verzeichnis installieren möchten, klicken Sie auf Durchsuchen und wählen Sie ein anderes Verzeichnis aus. $_CLICK
+$(^NameDA) wird in das unten angegebene Verzeichnis installiert. Falls Sie in ein anderes Verzeichnis installieren mÃ¶chten, klicken Sie auf Durchsuchen und wÃ¤hlen Sie ein anderes Verzeichnis aus. $_CLICK
 # ^DirSubText
 Zielverzeichnis
 # ^DirBrowseText
-Wählen Sie das Verzeichnis aus, in das Sie $(^NameDA) installieren möchten:
+WÃ¤hlen Sie das Verzeichnis aus, in das Sie $(^NameDA) installieren mÃ¶chten:
 # ^UnDirText
-$(^NameDA) wird aus dem unten angegebenen Verzeichnis entfernt. Falls sich $(^NameDA) in einem anderen Verzeichnis befindet, klicken Sie auf Durchsuchen und wählen Sie das richtige Verzeichnis aus. $_CLICK
+$(^NameDA) wird aus dem unten angegebenen Verzeichnis entfernt. Falls sich $(^NameDA) in einem anderen Verzeichnis befindet, klicken Sie auf Durchsuchen und wÃ¤hlen Sie das richtige Verzeichnis aus. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Wählen Sie das Verzeichnis aus, in dem sich $(^NameDA) befindet:
+WÃ¤hlen Sie das Verzeichnis aus, in dem sich $(^NameDA) befindet:
 # ^SpaceAvailable
-"Verfügbarer Speicher: "
+"VerfÃ¼gbarer Speicher: "
 # ^SpaceRequired
-"Benötigter Speicher: "
+"BenÃ¶tigter Speicher: "
 # ^UninstallingText
 $(^NameDA) wird aus dem unten angegebenen Verzeichnis entfernt. $_CLICK
 # ^UninstallingSubText
-Entferne aus:
+Wird entfernt aus:
 # ^FileError
-Fehler beim Überschreiben der Datei: \r\n\t"$0"\r\nKlicken Sie auf Abbrechen, um abzubrechen,\r\nauf Wiederholen, um den Schreibvorgang erneut zu versuchen\r\noder auf Ignorieren, um diese Datei zu überspringen.
+Fehler beim Ãœberschreiben der Datei: \r\n\t"$0"\r\nKlicken Sie auf Abbrechen, um abzubrechen,\r\nauf Wiederholen, um den Schreibvorgang erneut zu versuchen,\r\noder auf Ignorieren, um diese Datei zu Ã¼berspringen.
 # ^FileError_NoIgnore
-Fehler beim Überschreiben der Datei: \r\n\t"$0"\r\nKlicken Sie auf Wiederholen, um den Schreibvorgang erneut zu versuchen\r\noder auf Abbrechen, um die Installation zu beenden.
+Fehler beim Ãœberschreiben der Datei: \r\n\t"$0"\r\nKlicken Sie auf Wiederholen, um den Schreibvorgang erneut zu versuchen,\r\noder auf Abbrechen, um die Installation zu beenden.
 # ^CantWrite
 "Fehler beim Schreiben: "
 # ^CopyFailed
 Kopieren fehlgeschlagen
 # ^CopyTo
-"Kopiere nach "
+"Wird kopiert nach "
 # ^Registering
-"Registriere: "
+"Wird registriert: "
 # ^Unregistering
-"Deregistriere: "
+"Wird deregistriert: "
 # ^SymbolNotFound
 "Symbol ist nicht vorhanden: "
 # ^CouldNotLoad
 "Fehler beim Laden von "
 # ^CreateFolder
-"Erstelle Verzeichnis: "
+"Verzeichnis wird erstellt: "
 # ^CreateShortcut
-"Erstelle Verknüpfung: "
+"VerknÃ¼pfung wird erstellt: "
 # ^CreatedUninstaller
-"Erstelle Deinstallations-Programm: "
+"Deinstallationsprogramm wird erstellt: "
 # ^Delete
-"Lösche Datei: "
+"Datei wird gelÃ¶scht: "
 # ^DeleteOnReboot
-"Lösche Datei nach Neustart: "
+"Datei wird nach Neustart gelÃ¶scht: "
 # ^ErrorCreatingShortcut
-"Fehler beim Erstellen der Verknüpfung: "
+"Fehler beim Erstellen der VerknÃ¼pfung: "
 # ^ErrorCreating
 "Fehler beim Erstellen: "
 # ^ErrorDecompressing
-Fehler beim Dekomprimieren. Beschädigtes Installations-Programm?
+Fehler beim Entpacken. Ist das Installationsprogramm beschÃ¤digt?
 # ^ErrorRegistering
 Fehler beim Registrieren der DLL
 # ^ExecShell
 "ExecShell: "
 # ^Exec
-"Starte: "
+"Wird gestartet: "
 # ^Extract
-"Dekomprimiere: "
+"Wird entpackt: "
 # ^ErrorWriting
-"Dekomprimierung: Fehler beim Schreiben der Datei "
+"Entpacken: Fehler beim Schreiben der Datei "
 # ^InvalidOpcode
-Beschädigtes Installations-Programm: ungültiger Befehlscode
+BeschÃ¤digtes Installationsprogramm: ungÃ¼ltiger Befehlscode
 # ^NoOLE
-"Kein OLE für: "
+"Kein OLE fÃ¼r: "
 # ^OutputFolder
 "Zielverzeichnis: "
 # ^RemoveFolder
-"Entferne Verzeichnis: "
+"Verzeichnis wird entfernt: "
 # ^RenameOnReboot
 "Umbenennen nach Neustart: "
 # ^Rename
 "Umbenennen: "
 # ^Skipped
-"Übersprungen: "
+"Ãœbersprungen: "
 # ^CopyDetails
 Details in die Zwischenablage kopieren
 # ^LogInstall
@@ -183,8 +183,8 @@
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Farsi.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Farsi.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Farsi.nsh	(revision 2956)
@@ -1,121 +1,121 @@
-;Language: Farsi (1065)
+ï»¿;Language: Farsi (1065)
 ;By FzerorubigD - FzerorubigD@gmail.com - Thanx to all people help me in forum.persiantools.com
 
-!insertmacro LANGFILE "Farsi" "Farsi"
+!insertmacro LANGFILE "Farsi" "Persian" "Ù�Ø§Ø±Ø³ÛŒ" "Farsi"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Èå ÈÑäÇãå äÕÈ  $(^NameDA) ÎæÔ ÂãÏíÏ."
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Çíä ÈÑäÇãå ÔãÇ ÑÇ ÏÑ äÕÈ  $(^NameDA) íÇÑí ãíßäÏ.$\r$\n$\r$\nÊæÕíå ãíßäíã ßáíå ÈÑäÇãå åÇí ÏÑ ÍÇá ÇÌÑÇ ÑÇ ÈÈäÏíÏ. Çíä Èå ÈÑäÇãå äÕÈ ÇÌÇÒå ãíÏåÏ ßå ÝÇíáåÇí áÇÒã ÑÇ ÈÏæä äíÇÒ Èå ÑÇå ÇäÏÇÒí ÏæÈÇÑå ßÇã�íæÊÑ ÔãÇ Èå ÑæÒ ßäÏ.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Ø¨Ù‡ Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù†ØµØ¨ $(^NameDA) Ø®ÙˆØ´ Ø¢Ù…Ø¯ÛŒØ¯."
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ø§ÛŒÙ† Ø¨Ø±Ù†Ø§Ù…Ù‡ Ø´Ù…Ø§ Ø±Ø§ Ø¯Ø± Ù†ØµØ¨ $(^NameDA) ÛŒØ§Ø±ÛŒ Ù…ÛŒâ€ŒÚ©Ù†Ø¯.$\r$\n$\r$\nØªÙˆØµÛŒÙ‡ Ù…ÛŒâ€ŒÚ©Ù†ÛŒÙ… Ú©Ù„ÛŒÙ‡ Ø¨Ø±Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø¯Ø± Ø­Ø§Ù„ Ø§Ø¬Ø±Ø§ Ø±Ø§ Ø¨Ø¨Ù†Ø¯ÛŒØ¯. Ø§ÛŒÙ† Ø¨Ù‡ Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù†ØµØ¨ Ø§Ø¬Ø§Ø²Ù‡ Ù…ÛŒâ€ŒØ¯Ù‡Ø¯ Ú©Ù‡ Ù�Ø§ÛŒÙ„â€ŒÙ‡Ø§ÛŒ Ù„Ø§Ø²Ù… Ø±Ø§ Ø¨Ø¯ÙˆÙ† Ù†ÛŒØ§Ø² Ø¨Ù‡ Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ Ø¯ÙˆØ¨Ø§Ø±Ù‡â€ŒÛŒ Ú©Ø§Ù…Ù¾ÛŒÙˆØªØ± Ø´Ù…Ø§ Ø¨Ù‡ Ø±ÙˆØ² Ú©Ù†Ø¯.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Èå ÈÑäÇãå ÍÐÝ $(^NameDA) ÎæÔ ÂãÏíÏ."
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT " Çíä ÈÑäÇãå ÈÑÇí ÍÐÝ $(^NameDA) Èå ÔãÇ ßãß ãíßäÏ.$\r$\n$\r$\nÞÈá ÇÒ ÍÐÝ  $(^NameDA) ãØãÆä ÔæíÏ Çíä ÈÑäÇãå ÏÑ ÍÇá ÇÌÑÇ äÈÇÔÏ.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Ø¨Ù‡ Ø¨Ø±Ù†Ø§Ù…Ù‡ Ø­Ø°Ù� $(^NameDA) Ø®ÙˆØ´ Ø¢Ù…Ø¯ÛŒØ¯."
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT " Ø§ÛŒÙ† Ø¨Ø±Ù†Ø§Ù…Ù‡ Ø¨Ø±Ø§ÛŒ Ø­Ø°Ù� $(^NameDA) Ø¨Ù‡ Ø´Ù…Ø§ Ú©Ù…Ú© Ù…ÛŒâ€ŒÚ©Ù†Ø¯.$\r$\n$\r$\nÙ‚Ø¨Ù„ Ø§Ø² Ø­Ø°Ù� $(^NameDA) Ù…Ø·Ù…Ø¦Ù† Ø´ÙˆÛŒØ¯ Ø§ÛŒÙ† Ø¨Ø±Ù†Ø§Ù…Ù‡ Ø¯Ø± Ø­Ø§Ù„ Ø§Ø¬Ø±Ø§ Ù†Ø¨Ø§Ø´Ø¯.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "ÊæÇÝÞäÇãå äÕÈ"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "áØÝÇ �íÔ ÇÒ äÕÈ $(^NameDA) ãÝÇÏ ÊæÇÝÞäÇãå ÑÇ ãÑæÑ ßäíÏ."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ç�Ñ ßáíå ÈäÏåÇí ÊæÇÝÞäÇãå ÑÇ ÞÈæá ÏÇÑíÏ Ïßãå ãæÇÝÞã ÑÇ ÈÝÔÇÑíÏ. ÈÑÇí äÕÈ  $(^NameDA) ÔãÇ ÈÇíÓÊ Çíä ÊæÇÝÞäÇãå ÑÇ ÞÈæá ßäíÏ."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ç�Ñ ßáíå ÈäÏåÇí ÊæÇÝÞäÇãå ÑÇ ÞÈæá ÏÇÑíÏ Êíß ÒíÑ ÑÇ ÇäÊÎÇÈ ßäíÏ. ÈÑÇí äÕÈ  $(^NameDA) ÔãÇ ÈÇíÓÊ Çíä ÊæÇÝÞäÇãå ÑÇ ÞÈæá ßäíÏ. $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ç�Ñ ßáíå ÈäÏåÇí ÊæÇÝÞäÇãå ÑÇ ÞÈæá ÏÇÑíÏ �Òíäå Çæá ÑÇ ÇäÊÎÇÈ ßäíÏ. ÈÑÇí äÕÈ  $(^NameDA) ÔãÇ ÈÇíÓÊ Çíä ÊæÇÝÞäÇãå ÑÇ ÞÈæá ßäíÏ. $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "ØªÙˆØ§Ù�Ù‚Ù†Ø§Ù…Ù‡ Ù†ØµØ¨"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Ù„Ø·Ù�Ø§ Ù¾ÛŒØ´ Ø§Ø² Ù†ØµØ¨ $(^NameDA) Ù…Ù�Ø§Ø¯ ØªÙˆØ§Ù�Ù‚Ù†Ø§Ù…Ù‡ Ø±Ø§ Ù…Ø±ÙˆØ± Ú©Ù†ÛŒØ¯."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ø§Ú¯Ø± Ú©Ù„ÛŒÙ‡ Ø¨Ù†Ø¯Ù‡Ø§ÛŒ ØªÙˆØ§Ù�Ù‚Ù†Ø§Ù…Ù‡ Ø±Ø§ Ù‚Ø¨ÙˆÙ„ Ø¯Ø§Ø±ÛŒØ¯ Ø¯Ú©Ù…Ù‡â€ŒÛŒ Ù…ÙˆØ§Ù�Ù‚Ù… Ø±Ø§ Ø¨Ù�Ø´Ø§Ø±ÛŒØ¯. Ø¨Ø±Ø§ÛŒ Ù†ØµØ¨ $(^NameDA) Ø´Ù…Ø§ Ø¨Ø§ÛŒØ³Øª Ø§ÛŒÙ† ØªÙˆØ§Ù�Ù‚Ù†Ø§Ù…Ù‡ Ø±Ø§ Ù‚Ø¨ÙˆÙ„ Ú©Ù†ÛŒØ¯."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ø§Ú¯Ø± Ú©Ù„ÛŒÙ‡ Ø¨Ù†Ø¯Ù‡Ø§ÛŒ ØªÙˆØ§Ù�Ù‚Ù†Ø§Ù…Ù‡ Ø±Ø§ Ù‚Ø¨ÙˆÙ„ Ø¯Ø§Ø±ÛŒØ¯ ØªÛŒÚ© Ø²ÛŒØ± Ø±Ø§ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯. Ø¨Ø±Ø§ÛŒ Ù†ØµØ¨ $(^NameDA) Ø´Ù…Ø§ Ø¨Ø§ÛŒØ³Øª Ø§ÛŒÙ† ØªÙˆØ§Ù�Ù‚Ù†Ø§Ù…Ù‡ Ø±Ø§ Ù‚Ø¨ÙˆÙ„ Ú©Ù†ÛŒØ¯. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ø§Ú¯Ø± Ú©Ù„ÛŒÙ‡ Ø¨Ù†Ø¯Ù‡Ø§ÛŒ ØªÙˆØ§Ù�Ù‚Ù†Ø§Ù…Ù‡ Ø±Ø§ Ù‚Ø¨ÙˆÙ„ Ø¯Ø§Ø±ÛŒØ¯ Ú¯Ø²ÛŒÙ†Ù‡ Ø§ÙˆÙ„ Ø±Ø§ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯. Ø¨Ø±Ø§ÛŒ Ù†ØµØ¨ $(^NameDA) Ø´Ù…Ø§ Ø¨Ø§ÛŒØ³Øª Ø§ÛŒÙ† ØªÙˆØ§Ù�Ù‚Ù†Ø§Ù…Ù‡ Ø±Ø§ Ù‚Ø¨ÙˆÙ„ Ú©Ù†ÛŒØ¯. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "ÊæÇÝÞäÇãå ÍÐÝ"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "áØÝÇ ßáíå ÈäÏåÇí Çíä ÊæÇÝÞäÇãå ÑÇ ÞÈá ÇÑ ÍÐÝ $(^NameDA) ãÑæÑ ßäíÏ."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ç�Ñ ßáíå ÈäÏåÇí ÊæÇÝÞäÇãå ÑÇ ÞÈæá ÏÇÑíÏ Ïßãå ãæÇÝÞã ÑÇ ÈÝÔÇÑíÏ. ÈÑÇí ÍÐÝ $(^NameDA) ÔãÇ ÈÇíÓÊ Çíä ÊæÇÝÞäÇãå ÑÇ ÞÈæá ßäíÏ."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ç�Ñ ßáíå ÈäÏåÇí ÊæÇÝÞäÇãå ÑÇ ÞÈæá ÏÇÑíÏ Êíß ÒíÑ ÑÇ ÇäÊÎÇÈ ßäíÏ. ÈÑÇí ÍÐÝ $(^NameDA) ÔãÇ ÈÇíÓÊ Çíä ÊæÇÝÞäÇãå Ñ ÞÈæá ßäíÏ. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ç�Ñ ßáíå ÈäÏåÇí ÊæÇÝÞäÇãå ÑÇ ÞÈæá ÏÇÑíÏ �Òíäå Çæá ÑÇ ÇäÊÎÇÈ ßäíÏ. ÈÑÇí ÍÐÝ $(^NameDA) ÔãÇ ÈÇíÓÊ Çíä ÊæÇÝÞäÇãå Ñ ÞÈæá ßäíÏ. $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "ØªÙˆØ§Ù�Ù‚Ù†Ø§Ù…Ù‡ Ø­Ø°Ù�"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Ù„Ø·Ù�Ø§ Ú©Ù„ÛŒÙ‡ Ø¨Ù†Ø¯Ù‡Ø§ÛŒ Ø§ÛŒÙ† ØªÙˆØ§Ù�Ù‚Ù†Ø§Ù…Ù‡ Ø±Ø§ Ù‚Ø¨Ù„ Ø§Ø± Ø­Ø°Ù� $(^NameDA) Ù…Ø±ÙˆØ± Ú©Ù†ÛŒØ¯."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ø§Ú¯Ø± Ú©Ù„ÛŒÙ‡ Ø¨Ù†Ø¯Ù‡Ø§ÛŒ ØªÙˆØ§Ù�Ù‚Ù†Ø§Ù…Ù‡ Ø±Ø§ Ù‚Ø¨ÙˆÙ„ Ø¯Ø§Ø±ÛŒØ¯ Ø¯Ú©Ù…Ù‡â€ŒÛŒ Ù…ÙˆØ§Ù�Ù‚Ù… Ø±Ø§ Ø¨Ù�Ø´Ø§Ø±ÛŒØ¯. Ø¨Ø±Ø§ÛŒ Ø­Ø°Ù� $(^NameDA) Ø´Ù…Ø§ Ø¨Ø§ÛŒØ³Øª Ø§ÛŒÙ† ØªÙˆØ§Ù�Ù‚Ù†Ø§Ù…Ù‡ Ø±Ø§ Ù‚Ø¨ÙˆÙ„ Ú©Ù†ÛŒØ¯."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ø§Ú¯Ø± Ú©Ù„ÛŒÙ‡ Ø¨Ù†Ø¯Ù‡Ø§ÛŒ ØªÙˆØ§Ù�Ù‚Ù†Ø§Ù…Ù‡ Ø±Ø§ Ù‚Ø¨ÙˆÙ„ Ø¯Ø§Ø±ÛŒØ¯ ØªÛŒÚ© Ø²ÛŒØ± Ø±Ø§ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯. Ø¨Ø±Ø§ÛŒ Ø­Ø°Ù� $(^NameDA) Ø´Ù…Ø§ Ø¨Ø§ÛŒØ³Øª Ø§ÛŒÙ† ØªÙˆØ§Ù�Ù‚Ù†Ø§Ù…Ù‡ Ø± Ù‚Ø¨ÙˆÙ„ Ú©Ù†ÛŒØ¯. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ø§Ú¯Ø± Ú©Ù„ÛŒÙ‡ Ø¨Ù†Ø¯Ù‡Ø§ÛŒ ØªÙˆØ§Ù�Ù‚Ù†Ø§Ù…Ù‡ Ø±Ø§ Ù‚Ø¨ÙˆÙ„ Ø¯Ø§Ø±ÛŒØ¯ Ú¯Ø²ÛŒÙ†Ù‡ Ø§ÙˆÙ„ Ø±Ø§ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯. Ø¨Ø±Ø§ÛŒ Ø­Ø°Ù� $(^NameDA) Ø´Ù…Ø§ Ø¨Ø§ÛŒØ³Øª Ø§ÛŒÙ† ØªÙˆØ§Ù�Ù‚Ù†Ø§Ù…Ù‡ Ø± Ù‚Ø¨ÙˆÙ„ Ú©Ù†ÛŒØ¯. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "ÈÑÇí ÏíÏä ãÊä Èå ÕæÑÊ ßÇãá ÇÒ ßáíÏ Page Down ÇÓÊÝÇÏå ßäíÏ."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Ø¨Ø±Ø§ÛŒ Ø¯ÛŒØ¯Ù† Ù…ØªÙ† Ø¨Ù‡ ØµÙˆØ±Øª Ú©Ø§Ù…Ù„ Ø§Ø² Ú©Ù„ÛŒØ¯ Page Down Ø§Ø³ØªÙ�Ø§Ø¯Ù‡ Ú©Ù†ÛŒØ¯."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "ÇäÊÎÇÈ ÇÌÒÇí ÈÑäÇãå "
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "ÇÌÒÇíí ÇÒ  $(^NameDA) ßå ãíÎæÇåíÏ äÕÈ ÔæäÏ ÑÇ ÇäÊÎÇÈ ßäíÏ."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Ø§Ù†ØªØ®Ø§Ø¨ Ø§Ø¬Ø²Ø§ÛŒ Ø¨Ø±Ù†Ø§Ù…Ù‡ "
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Ø§Ø¬Ø²Ø§ÛŒÛŒ Ø§Ø² $(^NameDA) Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ù†ØµØ¨ Ø´ÙˆÙ†Ø¯ Ø±Ø§ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "ÇäÊÎÇÈ ÇÌÒÇí ÈÑäÇãå"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "ÇÌÒÇíí ÇÒ $(^NameDA) ÑÇ ßå ãíÎæÇåíÏ ÍÐÝ ßäíÏ ÇäÊÎÇÈ ßäíÏ."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Ø§Ù†ØªØ®Ø§Ø¨ Ø§Ø¬Ø²Ø§ÛŒ Ø¨Ø±Ù†Ø§Ù…Ù‡"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Ø§Ø¬Ø²Ø§ÛŒÛŒ Ø§Ø² $(^NameDA) Ø±Ø§ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø­Ø°Ù� Ú©Ù†ÛŒØ¯ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "ÊæÖíÍÇÊ"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "ØªÙˆØ¶ÛŒØ­Ø§Øª"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "äÔÇä�Ñ ãÇæÓ ÑÇ ÈÑ Ñæí  ÇÌÒÇíí ßå ãíÎæÇåíÏ ÈÈÑíÏ ÊÇ ÊæÖíÍÇÊ Âä ÑÇ ÈÈíäíÏ."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ù†Ø´Ø§Ù†Ú¯Ø± Ù…Ø§ÙˆØ³ Ø±Ø§ Ø¨Ø± Ø±ÙˆÛŒ Ø§Ø¬Ø²Ø§ÛŒÛŒ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø¨Ø¨Ø±ÛŒØ¯ ØªØ§ ØªÙˆØ¶ÛŒØ­Ø§Øª Ø¢Ù† Ø±Ø§ Ø¨Ø¨ÛŒÙ†ÛŒØ¯."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "äÔÇä�Ñ ãÇæÓ ÑÇ ÈÑ Ñæí  ÇÌÒÇíí ßå ãíÎæÇåíÏ ÈÈÑíÏ ÊÇ ÊæÖíÍÇÊ Âä ÑÇ ÈÈíäíÏ."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ÙŠÙƒÙŠ Ø§Ø² Ú¯Ø²ÙŠÙ†Ù‡ Ù‡Ø§ÙŠ Ù†ØµØ¨ Ø±Ø§ Ø§Ù†ØªØ®Ø§Ø¨ ÙƒÙ†ÙŠØ¯ ØªØ§ ØªÙˆØ¶ÙŠØ­Ø§Øª Ù…Ø±Ø¨ÙˆØ· Ø¨Ù‡ Ø¢Ù† Ø±Ø§ Ø¨Ø¨ÙŠÙ†ÙŠØ¯."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "ÇäÊÎÇÈ �æÔå äÕÈ"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "�æÔå Çí ßå ãíÎæÇåíÏ  $(^NameDA) ÏÑ Âä äÕÈ ÔæÏ ÑÇ ÇäÊÎÇÈ ßäíÏ."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Ø§Ù†ØªØ®Ø§Ø¨ Ù¾ÙˆØ´Ù‡ Ù†ØµØ¨"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Ù¾ÙˆØ´Ù‡â€ŒØ§ÛŒ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ $(^NameDA) Ø¯Ø± Ø¢Ù† Ù†ØµØ¨ Ø´ÙˆØ¯ Ø±Ø§ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "�æÔå ÍÐÝ ÑÇ ÇäÊÎÇÈ ßäíÏ"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "�æÔå Çí ßå ãíÎæÇåíÏ $(^NameDA) ÑÇ ÇÒ Âä ÍÐÝ ßäíÏ ÇäÊÎÇÈ ßäíÏ."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Ù¾ÙˆØ´Ù‡ Ø­Ø°Ù� Ø±Ø§ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Ù¾ÙˆØ´Ù‡â€ŒØ§ÛŒ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ $(^NameDA) Ø±Ø§ Ø§Ø² Ø¢Ù† Ø­Ø°Ù� Ú©Ù†ÛŒØ¯ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "äÕÈ ÈÑäÇãå"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "áØÝÇ ãÏÊ ÒãÇäí ßå  $(^NameDA) ÏÑ ÍÇá äÕÈ ÇÓÊ ÑÇ ÕÈÑ ßäíÏ."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "äÕÈ �ÇíÇä íÇÝÊ"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "ÈÑäÇãå äÕÈ ÈÇ ãæÝÞíÊ �ÇíÇä íÇÝÊ."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "ÈÑäÇãå äÕÈ áÛæ ÔÏ."
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "ÈÑäÇãå äÕÈ Èå ÕæÑÊ äíãå ÊãÇã �ÇíÇä íÇÝÊ."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Ù†ØµØ¨ Ø¨Ø±Ù†Ø§Ù…Ù‡"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Ù„Ø·Ù�Ø§ Ù…Ø¯Øª Ø²Ù…Ø§Ù†ÛŒ Ú©Ù‡ $(^NameDA) Ø¯Ø± Ø­Ø§Ù„ Ù†ØµØ¨ Ø§Ø³Øª Ø±Ø§ ØµØ¨Ø± Ú©Ù†ÛŒØ¯."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Ù†ØµØ¨ Ù¾Ø§ÛŒØ§Ù† ÛŒØ§Ù�Øª"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù†ØµØ¨ Ø¨Ø§ Ù…ÙˆÙ�Ù‚ÛŒØª Ù¾Ø§ÛŒØ§Ù† ÛŒØ§Ù�Øª."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù†ØµØ¨ Ù„ØºÙˆ Ø´Ø¯."
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù†ØµØ¨ Ø¨Ù‡ ØµÙˆØ±Øª Ù†ÛŒÙ…Ù‡ ØªÙ…Ø§Ù… Ù¾Ø§ÛŒØ§Ù† ÛŒØ§Ù�Øª."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "ÍÐÝ ÈÑäÇãå"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "áØÝÇ ãÏÊ ÒãÇäí ßå  $(^NameDA) ÏÑ ÍÇá ÍÐÝ ÇÓÊ ÑÇ ÕÈÑ ßäíÏ."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "ÍÐÝ �ÇíÇä íÇÝÊ"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "ÈÑäÇãå ÍÐÝ ÈÇ ãæÝÞíÊ �ÇíÇä íÇÝÊ."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "ÈÑäÇãå ÍÐÝ áÛæ ÔÏ"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "ÈÑäÇãå ÍÐÝ Èå ÕæÑÊ äíãå ÊãÇã �ÇíÇä íÇÝÊ"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Ø­Ø°Ù� Ø¨Ø±Ù†Ø§Ù…Ù‡"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Ù„Ø·Ù�Ø§ Ù…Ø¯Øª Ø²Ù…Ø§Ù†ÛŒ Ú©Ù‡ $(^NameDA) Ø¯Ø± Ø­Ø§Ù„ Ø­Ø°Ù� Ø§Ø³Øª Ø±Ø§ ØµØ¨Ø± Ú©Ù†ÛŒØ¯."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Ø­Ø°Ù� Ù¾Ø§ÛŒØ§Ù† ÛŒØ§Ù�Øª"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Ø¨Ø±Ù†Ø§Ù…Ù‡ Ø­Ø°Ù� Ø¨Ø§ Ù…ÙˆÙ�Ù‚ÛŒØª Ù¾Ø§ÛŒØ§Ù† ÛŒØ§Ù�Øª."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Ø¨Ø±Ù†Ø§Ù…Ù‡ Ø­Ø°Ù� Ù„ØºÙˆ Ø´Ø¯"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Ø¨Ø±Ù†Ø§Ù…Ù‡ Ø­Ø°Ù� Ø¨Ù‡ ØµÙˆØ±Øª Ù†ÛŒÙ…Ù‡ ØªÙ…Ø§Ù… Ù¾Ø§ÛŒØ§Ù† ÛŒØ§Ù�Øª"
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "ÈÑäÇãå äÕÈ  $(^NameDA) �ÇíÇä íÇÝÊ"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) ÈÑ Ñæí ßÇã�íæÊÑ ÔãÇ äÕÈ ÔÏ.$\r$\n$\r$\nÈÑ Ñæí Ïßãå �ÇíÇä ÈÑÇí ÎÑæÌ ÇÒ Çíä ÈÑäÇãå ßáíß ßäíÏ."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "ßÇã�íæÊÑ ÔãÇ ÈÑÇí Êßãíá äÕÈ $(^NameDA) ÈÇíÓÊí ÏæÈÇÑå ÑÇå ÇäÏÇÒí ÔæÏ. ÂíÇ ãíÎæÇåíÏ Çíä ßÇÑ ÑÇ ÇáÇä ÇäÌÇã ÏåíÏ¿"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù†ØµØ¨ $(^NameDA) Ù¾Ø§ÛŒØ§Ù† ÛŒØ§Ù�Øª"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) Ø¨Ø± Ø±ÙˆÛŒ Ú©Ø§Ù…Ù¾ÛŒÙˆØªØ± Ø´Ù…Ø§ Ù†ØµØ¨ Ø´Ø¯.$\r$\n$\r$\nØ¨Ø± Ø±ÙˆÛŒ Ø¯Ú©Ù…Ù‡â€ŒÛŒ Ù¾Ø§ÛŒØ§Ù† Ø¨Ø±Ø§ÛŒ Ø®Ø±ÙˆØ¬ Ø§Ø² Ø§ÛŒÙ† Ø¨Ø±Ù†Ø§Ù…Ù‡ Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Ú©Ø§Ù…Ù¾ÛŒÙˆØªØ± Ø´Ù…Ø§ Ø¨Ø±Ø§ÛŒ ØªÚ©Ù…ÛŒÙ„ Ù†ØµØ¨ $(^NameDA) Ø¨Ø§ÛŒØ³ØªÛŒ Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ Ø´ÙˆØ¯. Ø¢ÛŒØ§ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø§ÛŒÙ† Ú©Ø§Ø± Ø±Ø§ Ø§Ù„Ø§Ù† Ø§Ù†Ø¬Ø§Ù… Ø¯Ù‡ÛŒØ¯ØŸ"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "ÈÑäÇãå ÍÐÝ $(^NameDA) �ÇíÇä íÇÝÊ"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) ÇÒ Ñæí ßÇã�íæÊÑ ÔãÇ ÍÐÝ ÔÏ.$\r$\n$\r$\nÈÑ Ñæí Ïßãå �ÇíÇä ÈÑÇí ÎÑæÌ ÇÒ Çíä ÈÑäÇãå ßáíß ßäíÏ."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "ßÇã�íæÊÑ ÔãÇ ÈÑÇí Êßãíá ÍÐÝ$(^NameDA) ÈÇíÓÊ ÏæÈÇÑå ÑÇå ÇäÏÇÒí ÔæÏ.ÂíÇ ãíÎæÇåíÏ Çíä ßÇÑ ÑÇ ÇáÇä ÇäÌÇã ÏåíÏ¿"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Ø¨Ø±Ù†Ø§Ù…Ù‡ Ø­Ø°Ù� $(^NameDA) Ù¾Ø§ÛŒØ§Ù† ÛŒØ§Ù�Øª"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) Ø§Ø² Ø±ÙˆÛŒ Ú©Ø§Ù…Ù¾ÛŒÙˆØªØ± Ø´Ù…Ø§ Ø­Ø°Ù� Ø´Ø¯.$\r$\n$\r$\nØ¨Ø± Ø±ÙˆÛŒ Ø¯Ú©Ù…Ù‡â€ŒÛŒ Ù¾Ø§ÛŒØ§Ù† Ø¨Ø±Ø§ÛŒ Ø®Ø±ÙˆØ¬ Ø§Ø² Ø§ÛŒÙ† Ø¨Ø±Ù†Ø§Ù…Ù‡ Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Ú©Ø§Ù…Ù¾ÛŒÙˆØªØ± Ø´Ù…Ø§ Ø¨Ø±Ø§ÛŒ ØªÚ©Ù…ÛŒÙ„ Ø­Ø°Ù�$(^NameDA) Ø¨Ø§ÛŒØ³Øª Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ Ø´ÙˆØ¯.Ø¢ÛŒØ§ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø§ÛŒÙ† Ú©Ø§Ø± Ø±Ø§ Ø§Ù„Ø§Ù† Ø§Ù†Ø¬Ø§Ù… Ø¯Ù‡ÛŒØ¯ØŸ"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "ÑÇå ÇäÏÇÒí ãÌÏÏ."
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "ãä ÎæÏã Çíä ßÇÑ ÑÇ ÇäÌÇã ÎæÇåã ÏÇÏ."
-  ${LangFileString} MUI_TEXT_FINISH_RUN "&ÇÌÑÇí  $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&äãÇíÔ ÝÇíá ÊæÖíÍÇÊ"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&�ÇíÇä"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ Ù…Ø¬Ø¯Ø¯."
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ù…Ù† Ø®ÙˆØ¯Ù… Ø§ÛŒÙ† Ú©Ø§Ø± Ø±Ø§ Ø§Ù†Ø¬Ø§Ù… Ø®ÙˆØ§Ù‡Ù… Ø¯Ø§Ø¯."
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&Ø§Ø¬Ø±Ø§ÛŒ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Ù†Ù…Ø§ÛŒØ´ Ù�Ø§ÛŒÙ„ ØªÙˆØ¶ÛŒØ­Ø§Øª"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Ù¾Ø§ÛŒØ§Ù†"
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "ÇäÊÎÇÈ �æÔå ÏÑ ãäæí ÈÑäÇãå åÇ"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "�æÔå Çí ßå ãíÎæÇåíÏ ãíÇäÈÑåÇí  $(^NameDA) ÏÑ Âä ÞÑÇÑ È�íÑäÏ ÑÇ ÇäÊÎÇÈ ßäíÏ."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "�æÔå Çí ÏÑ ãäæí ÈÑäÇãå åÇ ßå ãíÎæÇåíÏ ãíÇäÈÑåÇí ÈÑäÇãå ÏÑ ÂäÌÇ ÇíÌÇÏ ÔæäÏ ÑÇ ÇäÊÎÇÈ ßäíÏ. ÈÑÇí ÇíÌÇÏ íß �æÔå ÌÏíÏ ãíÊæÇäíÏ íß äÇã ÊÇí� ßäíÏ."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "ãíÇäÈÑí äÓÇÒ"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Ø§Ù†ØªØ®Ø§Ø¨ Ù¾ÙˆØ´Ù‡ Ø¯Ø± Ù…Ù†ÙˆÛŒ Ø¨Ø±Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Ù¾ÙˆØ´Ù‡â€ŒØ§ÛŒ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ù…ÛŒØ§Ù†Ø¨Ø±Ù‡Ø§ÛŒ $(^NameDA) Ø¯Ø± Ø¢Ù† Ù‚Ø±Ø§Ø± Ø¨Ú¯ÛŒØ±Ù†Ø¯ Ø±Ø§ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Ù¾ÙˆØ´Ù‡â€ŒØ§ÛŒ Ø¯Ø± Ù…Ù†ÙˆÛŒ Ø¨Ø±Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ù…ÛŒØ§Ù†Ø¨Ø±Ù‡Ø§ÛŒ Ø¨Ø±Ù†Ø§Ù…Ù‡ Ø¯Ø± Ø¢Ù†Ø¬Ø§ Ø§ÛŒØ¬Ø§Ø¯ Ø´ÙˆÙ†Ø¯ Ø±Ø§ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯. Ø¨Ø±Ø§ÛŒ Ø§ÛŒØ¬Ø§Ø¯ ÛŒÚ© Ù¾ÙˆØ´Ù‡ Ø¬Ø¯ÛŒØ¯ Ù…ÛŒØªÙˆØ§Ù†ÛŒØ¯ ÛŒÚ© Ù†Ø§Ù… ØªØ§ÛŒÙ¾ Ú©Ù†ÛŒØ¯."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ù…ÛŒØ§Ù†Ø¨Ø±ÛŒ Ù†Ø³Ø§Ø²"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "ÍÐÝ $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "�Çß ßÑÏä $(^NameDA) ÇÒ Ñæí ßÇã�íæÊÑ ÔãÇ."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Ø­Ø°Ù� $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† $(^NameDA) Ø§Ø² Ø±ÙˆÛŒ Ú©Ø§Ù…Ù¾ÛŒÙˆØªØ± Ø´Ù…Ø§."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "ÂíÇ ãØãÆäíÏ ßå ãíÎæÇåíÏ ÇÒ ÈÑäÇãå äÕÈ $(^Name) ÎÇÑÌ ÔæíÏ¿"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Ø¢ÛŒØ§ Ù…Ø·Ù…Ø¦Ù†ÛŒØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø§Ø² Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù†ØµØ¨ $(^Name) Ø®Ø§Ø±Ø¬ Ø´ÙˆÛŒØ¯ØŸ"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "ÂíÇ ãØãÆäíÏ ßå ãíÎæÇåíÏ ÇÒ ÈÑäÇãå ÍÐÝ  $(^Name) ÎÇÑÌ ÔæíÏ¿"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ø¢ÛŒØ§ Ù…Ø·Ù…Ø¦Ù†ÛŒØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø§Ø² Ø¨Ø±Ù†Ø§Ù…Ù‡ Ø­Ø°Ù� $(^Name) Ø®Ø§Ø±Ø¬ Ø´ÙˆÛŒØ¯ØŸ"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Romanian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Romanian.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Romanian.nsh	(revision 2956)
@@ -1,130 +1,128 @@
-;Language: Romanian (1048)
+ï»¿;Language: Romanian (1048)
 ;Translated by Cristian Pirvu (pcristip@yahoo.com)
 ;Updates by Sorin Sbarnea - INTERSOL SRL (sbarneasorin@intersol.ro) - ROBO Design (www.robodesign.ro)
 ;New revision by George Radu (georadu@hotmail.com) http://mediatae.3x.ro
 ;New revision by Vlad Rusu (vlad@bitattack.ro)
-;	- Use Romanian letters ãâîºþ
+;	- Use Romanian letters ÄƒÃ¢Ã®ÅŸÅ£
 ;	- ".. produsului" removed as unnecessary
-;	- "Eliminã" related terms replaced with more appropiate "Dezinstaleazã"
+;	- "EliminÄƒ" related terms replaced with more appropiate "DezinstaleazÄƒ"
 ;	- Misc language tweaks
-!insertmacro LANGFILE "Romanian" "Romana"
 
+!insertmacro LANGFILE "Romanian" = "RomÃ¢nÄƒ" "Romana"
+
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bine aþi venit la instalarea $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Aceastã aplicaþie va instala $(^NameDA).$\r$\n$\r$\nEste recomandat sã închideþi toate aplicaþiile înainte de începerea procesului de instalare. Acest lucru vã poate asigura un proces de instalare fãrã erori sau situaþii neprevãzute.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bine aÅ£i venit la instalarea $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "AceastÄƒ aplicaÅ£ie va instala $(^NameDA).$\r$\n$\r$\nEste recomandat sÄƒ Ã®nchideÅ£i toate aplicaÅ£iile Ã®nainte de Ã®nceperea procesului de instalare. Acest lucru vÄƒ poate asigura un proces de instalare fÄƒrÄƒ erori sau situaÅ£ii neprevÄƒzute.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Bine aþi venit la dezinstalarea $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Aceastã aplicaþie va dezinstala $(^NameDA).$\r$\n$\r$\nEste recomandat sã închideþi toate aplicaþiile înainte de începerea procesului de dezinstalare. Acest lucru vã poate asigura un proces de dezinstalare fãrã erori sau situaþii neprevãzute.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Bine aÅ£i venit la dezinstalarea $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "AceastÄƒ aplicaÅ£ie va dezinstala $(^NameDA).$\r$\n$\r$\nEste recomandat sÄƒ Ã®nchideÅ£i toate aplicaÅ£iile Ã®nainte de Ã®nceperea procesului de dezinstalare. Acest lucru vÄƒ poate asigura un proces de dezinstalare fÄƒrÄƒ erori sau situaÅ£ii neprevÄƒzute.$\r$\n$\r$\n$_CLICK"
 !endif
 
-!ifdef MUI_WELCOMEPAGE | MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Terminare"
-!endif
-
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Contract de licenþã"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Citiþi cu atenþie termenii contractului de licenþã înainte de a instala $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Dacã acceptaþi termenii contractului de licenþã, apãsati De Acord. Pentru a instala $(^NameDA) trebuie sã acceptaþi termenii din contractul de licenþã."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Dacã acceptaþi termenii contractului de licenþã, bifaþi cãsuþa de mai jos. Pentru a instala $(^NameDA) trebuie sã acceptaþi termenii din contractul de licenþã. $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Dacã acceptaþi termenii contractului de licenþã, selectaþi prima opþiune de mai jos. Pentru a instala $(^NameDA) trebuie sã acceptaþi termenii din contractul de licenþã. $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Contract de licenÅ£Äƒ"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "CitiÅ£i cu atenÅ£ie termenii contractului de licenÅ£Äƒ Ã®nainte de a instala $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "DacÄƒ acceptaÅ£i termenii contractului de licenÅ£Äƒ, apÄƒsati De Acord. Pentru a instala $(^NameDA) trebuie sÄƒ acceptaÅ£i termenii din contractul de licenÅ£Äƒ."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "DacÄƒ acceptaÅ£i termenii contractului de licenÅ£Äƒ, bifaÅ£i cÄƒsuÅ£a de mai jos. Pentru a instala $(^NameDA) trebuie sÄƒ acceptaÅ£i termenii din contractul de licenÅ£Äƒ. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "DacÄƒ acceptaÅ£i termenii contractului de licenÅ£Äƒ, selectaÅ£i prima opÅ£iune de mai jos. Pentru a instala $(^NameDA) trebuie sÄƒ acceptaÅ£i termenii din contractul de licenÅ£Äƒ. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Contract de licenþã"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Citiþi cu atenþie termenii contractului de licenþã înainte de a dezinstala $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Dacã acceptaþi termenii contractului de licenþã, apãsati De Acord. Pentru a dezinstala $(^NameDA) trebuie sã acceptaþi termenii din contractul de licenþã."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Dacã acceptaþi termenii contractului de licenþã, bifaþi cãsuþa de mai jos. Pentru a dezinstala $(^NameDA) trebuie sã acceptaþi termenii din contractul de licenþã. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Dacã acceptaþi termenii contractului de licenþã, selectaþi prima opþiune de mai jos. Pentru a dezinstala $(^NameDA) trebuie sã acceptaþi termenii din contractul de licenþã. $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Contract de licenÅ£Äƒ"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "CitiÅ£i cu atenÅ£ie termenii contractului de licenÅ£Äƒ Ã®nainte de a dezinstala $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "DacÄƒ acceptaÅ£i termenii contractului de licenÅ£Äƒ, apÄƒsati De Acord. Pentru a dezinstala $(^NameDA) trebuie sÄƒ acceptaÅ£i termenii din contractul de licenÅ£Äƒ."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "DacÄƒ acceptaÅ£i termenii contractului de licenÅ£Äƒ, bifaÅ£i cÄƒsuÅ£a de mai jos. Pentru a dezinstala $(^NameDA) trebuie sÄƒ acceptaÅ£i termenii din contractul de licenÅ£Äƒ. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "DacÄƒ acceptaÅ£i termenii contractului de licenÅ£Äƒ, selectaÅ£i prima opÅ£iune de mai jos. Pentru a dezinstala $(^NameDA) trebuie sÄƒ acceptaÅ£i termenii din contractul de licenÅ£Äƒ. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Apãsaþi Page Down pentru a vizualiza restul contractului de licenþã."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "ApÄƒsaÅ£i Page Down pentru a vizualiza restul contractului de licenÅ£Äƒ."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
   ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Selectare componente"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Selectaþi componentele $(^NameDA) pe care doriþi sã le instalaþi."
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "SelectaÅ£i componentele $(^NameDA) pe care doriÅ£i sÄƒ le instalaÅ£i."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Selectare componente"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Selectaþi componentele $(^NameDA) pe care doriþi sã le dezinstalaþi."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "SelectaÅ£i componentele $(^NameDA) pe care doriÅ£i sÄƒ le dezinstalaÅ£i."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Descriere"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Aºezaþi mouse-ul deasupra fiecãrei componente pentru a vizualiza descrierea acesteia."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "AÅŸezaÅ£i mouse-ul deasupra fiecÄƒrei componente pentru a vizualiza descrierea acesteia."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Aºezaþi mouse-ul deasupra fiecãrei componente pentru a vizualiza descrierea acesteia."
+    #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO 
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Selectare director destinaþie"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Selectaþi directorul în care doriþi sã instalaþi $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Selectare director destinaÅ£ie"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "SelectaÅ£i directorul Ã®n care doriÅ£i sÄƒ instalaÅ£i $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
   ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Selectare director de dezinstalat"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Selectaþi directorul din care doriþi sã dezinstalaþi $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "SelectaÅ£i directorul din care doriÅ£i sÄƒ dezinstalaÅ£i $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "În curs de instalare"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Vã rugãm sã aºteptaþi, $(^NameDA) se instaleazã."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Instalare terminatã"
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "ÃŽn curs de instalare"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "VÄƒ rugÄƒm sÄƒ aÅŸteptaÅ£i, $(^NameDA) se instaleazÄƒ."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Instalare terminatÄƒ"
   ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Instalarea s-a terminat cu succes."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Instalare anulatã"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Instalarea a fost anulatã de utilizator."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Instalare anulatÄƒ"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Instalarea a fost anulatÄƒ de utilizator."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "În curs de dezinstalare"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Vã rugãm sã aºteptaþi, $(^NameDA) se dezinstaleazã."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Dezinstalare terminatã"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "ÃŽn curs de dezinstalare"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "VÄƒ rugÄƒm sÄƒ aÅŸteptaÅ£i, $(^NameDA) se dezinstaleazÄƒ."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Dezinstalare terminatÄƒ"
   ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Dezinstalarea s-a terminat cu succes."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Dezinstalare anulatã"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Dezinstalarea fost anulatã de utilizator."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Dezinstalare anulatÄƒ"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Dezinstalarea fost anulatÄƒ de utilizator."
 !endif
 
 !ifdef MUI_FINISHPAGE
   ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Terminare instalare $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) a fost instalat.$\r$\n$\r$\nApãsaþi Terminare pentru a încheia instalarea."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Trebuie sã reporniþi calculatorul pentru a termina instalarea. Doriþi sã-l reporniþi acum?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) a fost instalat.$\r$\n$\r$\nApÄƒsaÅ£i Terminare pentru a Ã®ncheia instalarea."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Trebuie sÄƒ reporniÅ£i calculatorul pentru a termina instalarea. DoriÅ£i sÄƒ-l reporniÅ£i acum?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
   ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Terminare dezinstalare $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) a fost dezinstalat.$\r$\n$\r$\nApãsaþi Terminare pentru a încheia dezinstalarea."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Trebuie sã reporniþi calculatorul pentru a termina dezinstalarea. Doriþi sã-l reporniþi acum?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) a fost dezinstalat.$\r$\n$\r$\nApÄƒsaÅ£i Terminare pentru a Ã®ncheia dezinstalarea."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Trebuie sÄƒ reporniÅ£i calculatorul pentru a termina dezinstalarea. DoriÅ£i sÄƒ-l reporniÅ£i acum?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Reporneºte acum"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Repornesc eu mai târziu"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "ReporneÅŸte acum"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Repornesc eu mai tÃ¢rziu"
   ${LangFileString} MUI_TEXT_FINISH_RUN "Executare $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Afiºare fiºier readme (citeºte-mã)."
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "AfiÅŸare fiÅŸier readme (citeÅŸte-mÄƒ)."
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Terminare"
 !endif
 
 !ifdef MUI_STARTMENUPAGE
   ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Selectare grup Meniul Start"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Selectaþi un grup in Meniul Start pentru a crea comenzi rapide pentru produs."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Selectaþi grupul din Meniul Start în care vor fi create comenzi rapide pentru produs. Puteþi de asemenea sã creaþi un grup nou."
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "SelectaÅ£i un grup in Meniul Start pentru a crea comenzi rapide pentru produs."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "SelectaÅ£i grupul din Meniul Start Ã®n care vor fi create comenzi rapide pentru produs. PuteÅ£i de asemenea sÄƒ creaÅ£i un grup nou."
   ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Nu doresc comenzi rapide"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
   ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Dezinstalare $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Dezinstalare $(^NameDA) din calculatorul dumneavoastrã."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Dezinstalare $(^NameDA) din calculatorul dumneavoastrÄƒ."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Sunteþi sigur(ã) cã doriþi sã anulaþi instalarea $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "SunteÅ£i sigur(Äƒ) cÄƒ doriÅ£i sÄƒ anulaÅ£i instalarea $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Sunteþi sigur(ã) cã doriþi sã anulaþi dezinstalarea $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "SunteÅ£i sigur(Äƒ) cÄƒ doriÅ£i sÄƒ anulaÅ£i dezinstalarea $(^Name)?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Breton.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Breton.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Breton.nlf	(revision 2956)
@@ -1,4 +1,4 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Start editing here
 # Language ID
@@ -6,35 +6,35 @@
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
-# Translation by KAD-Korvigelloù an Drouizig (drouizig@drouizig.org)
+# Translation by KAD-KorvigelloÃ¹ an Drouizig (drouizig@drouizig.org)
 # ^Branding
-Reizhiad staliañ Nullsoft %s
+Nullsoft Install System %s
 # ^SetupCaption
-Staliañ ha kefluniañ $(^Name)
+StaliaÃ± ha kefluniaÃ± $(^Name)
 # ^UninstallCaption
-Distaliañ $(^Name)
+DistaliaÃ± $(^Name)
 # ^LicenseSubCaption
-: Aotre arverañ
+: Aotre arveraÃ±
 # ^ComponentsSubCaption
-: Dibaboù staliañ
+: DibaboÃ¹ staliaÃ±
 # ^DirSubCaption
-: Kavlec'h staliañ
+: Kavlec'h staliaÃ±
 # ^InstallingSubCaption
-: O staliañ ar restroù
+: O staliaÃ± ar restroÃ¹
 # ^CompletedSubCaption
 : Echu eo
 # ^UnComponentsSubCaption
-: Dibaboù distaliañ
+: DibaboÃ¹ distaliaÃ±
 # ^UnDirSubCaption
-: Kavlec'h distaliañ
+: Kavlec'h distaliaÃ±
 # ^ConfirmSubCaption
-: Kadarnañ
+: KadarnaÃ±
 # ^UninstallingSubCaption
-: O tistaliañ ar restroù
+: O tistaliaÃ± ar restroÃ¹
 # ^UnCompletedSubCaption
 : Echu eo
 # ^BackBtn
@@ -44,73 +44,73 @@
 # ^AgreeBtn
 &A-du emaon
 # ^AcceptBtn
-&Degemer holl dermoù al lañvaz emglev
+&Degemer holl dermoÃ¹ al laÃ±vaz emglev
 # ^DontAcceptBtn
-&Chom hep degemer termoù al lañvaz emglev
+&Chom hep degemer termoÃ¹ al laÃ±vaz emglev
 # ^InstallBtn
-&Staliañ
+&StaliaÃ±
 # ^UninstallBtn
-&Distaliañ
+&DistaliaÃ±
 # ^CancelBtn
-Nullañ
+NullaÃ±
 # ^CloseBtn
-&Serriñ
+&SerriÃ±
 # ^BrowseBtn
 F&urchal...
 # ^ShowDetailsBtn
-Muioc'h a &ditouroù
+Muioc'h a &ditouroÃ¹
 # ^ClickNext
-Klikit war « War-lerc'h » evit mont war-raok.
+Klikit war Â« War-lerc'h Â» evit mont war-raok.
 # ^ClickInstall
-Klikit war « Staliañ » evit kregiñ gant ar staliadur.
+Klikit war Â« StaliaÃ± Â» evit kregiÃ± gant ar staliadur.
 # ^ClickUninstall
-Klikit war « Distaliañ » evit kregiñ gant an distaliadur.
+Klikit war Â« DistaliaÃ± Â» evit kregiÃ± gant an distaliadur.
 # ^Name
 Anv
 # ^Completed
 Echu eo
 # ^LicenseText
-Bezit aketus en ur lenn an aotre arverañ a-raok staliañ $(^NameDA) mar plij. Mar degemerit pep term eus an aotre, klikit war « A-du emaon ».
+Bezit aketus en ur lenn an aotre arveraÃ± a-raok staliaÃ± $(^NameDA) mar plij. Mar degemerit pep term eus an aotre, klikit war Â« A-du emaon Â».
 # ^LicenseTextCB
-Bezit aketus en ur lenn an aotre arverañ a-raok staliañ $(^NameDA) mar plij. Mar degemerit pep term eus an aotre, klikit war al log a-zindan. $_CLICK
+Bezit aketus en ur lenn an aotre arveraÃ± a-raok staliaÃ± $(^NameDA) mar plij. Mar degemerit pep term eus an aotre, klikit war al log a-zindan. $_CLICK
 # ^LicenseTextRB
-Bezit aketus en ur lenn an aotre arverañ a-raok staliañ $(^NameDA) mar plij. Mar degemerit pep term eus an aotre, dizuzit an dibab kentañ a-zindan. $_CLICK
+Bezit aketus en ur lenn an aotre arveraÃ± a-raok staliaÃ± $(^NameDA) mar plij. Mar degemerit pep term eus an aotre, dizuzit an dibab kentaÃ± a-zindan. $_CLICK
 # ^UnLicenseText
-Bezit aketus en ur lenn an aotre arverañ a-raok distaliañ $(^NameDA) mar plij. Mar degemerit pep term eus an aotre, klikit war « A-du emaon ».
+Bezit aketus en ur lenn an aotre arveraÃ± a-raok distaliaÃ± $(^NameDA) mar plij. Mar degemerit pep term eus an aotre, klikit war Â« A-du emaon Â».
 # ^UnLicenseTextCB
-Bezit aketus en ur lenn an aotre arverañ a-raok distaliañ $(^NameDA) mar plij. Mar degemerit pep term eus an aotre, klikit war al log a-zindan. $_CLICK
+Bezit aketus en ur lenn an aotre arveraÃ± a-raok distaliaÃ± $(^NameDA) mar plij. Mar degemerit pep term eus an aotre, klikit war al log a-zindan. $_CLICK
 # ^UnLicenseTextRB
-Bezit aketus en ur lenn an aotre arverañ a-raok distaliañ $(^NameDA) mar plij. Mar degemerit pep term eus an aotre, diuzit an dibab kentañ a-zindan. $_CLICK
+Bezit aketus en ur lenn an aotre arveraÃ± a-raok distaliaÃ± $(^NameDA) mar plij. Mar degemerit pep term eus an aotre, diuzit an dibab kentaÃ± a-zindan. $_CLICK
 # ^Custom
 Diouzh ho kiz
 # ^ComponentsText
-Dibabit an elfennoù a fell deoc'h staliañ pe diziuzit an elfennoù a fell deoc'h leuskel a-gostez. $_CLICK
+Dibabit an elfennoÃ¹ a fell deoc'h staliaÃ± pe diziuzit an elfennoÃ¹ a fell deoc'h leuskel a-gostez. $_CLICK
 # ^ComponentsSubText1
-Dibabit pe seurt staliañ a vo :
+Dibabit pe seurt staliaÃ± a vo :
 # ^ComponentsSubText2_NoInstTypes
-Dibabit an elfennoù da staliañ :
+Dibabit an elfennoÃ¹ da staliaÃ± :
 # ^ComponentsSubText2
-Pe dibabit an elfennoù diret a fell deoc'h staliañ :
+Pe dibabit an elfennoÃ¹ diret a fell deoc'h staliaÃ± :
 # ^UnComponentsText
-Dibabit an elfennoù a fell deoc'h distaliañ pe diziuzit an elfennoù a fell deoc'h mirout. $_CLICK
+Dibabit an elfennoÃ¹ a fell deoc'h distaliaÃ± pe diziuzit an elfennoÃ¹ a fell deoc'h mirout. $_CLICK
 # ^UnComponentsSubText1
-Dibabit peseurt distaliañ a vo :
+Dibabit peseurt distaliaÃ± a vo :
 # ^UnComponentsSubText2_NoInstTypes
-Dibabit an elfennoù da zistaliañ :
+Dibabit an elfennoÃ¹ da zistaliaÃ± :
 # ^UnComponentsSubText2
-Pe dibabit an elfennoù diret a fell deoc'h distaliañ :
+Pe dibabit an elfennoÃ¹ diret a fell deoc'h distaliaÃ± :
 # ^DirText
-Staliet e vo $(^NameDA) gant ar goulev-mañ er c'havlec'h da-heul. Mar fell deoc'h dibab ur c'havlec'h all, klikit war « Furchal » ha dibabit ur c'havlec'h all. $_CLICK
+Staliet e vo $(^NameDA) gant ar goulev-maÃ± er c'havlec'h da-heul. Mar fell deoc'h dibab ur c'havlec'h all, klikit war Â« Furchal Â» ha dibabit ur c'havlec'h all. $_CLICK
 # ^DirSubText
 Kavlec'h bukenn
 # ^DirBrowseText
-Dibabit ar c'havlec'h e vo diazezet $(^NameDA) ennañ :
+Dibabit ar c'havlec'h e vo diazezet $(^NameDA) ennaÃ± :
 # ^UnDirText
-Distaliet e vo $(^NameDA) gant ar goulev-mañ adalek ar c'havlec'h da heul. Ma fell deoc'h distaliañ adalek ur c'havlec'h all, klikit war « Furchal » ha diuzit ur c'havlec'h all. $_CLICK
+Distaliet e vo $(^NameDA) gant ar goulev-maÃ± adalek ar c'havlec'h da heul. Ma fell deoc'h distaliaÃ± adalek ur c'havlec'h all, klikit war Â« Furchal Â» ha diuzit ur c'havlec'h all. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Diuzit ar c'havlec'h evit distaliañ $(^NameDA) adalek :
+Diuzit ar c'havlec'h evit distaliaÃ± $(^NameDA) adalek :
 # ^SpaceAvailable
 "Egor kantenn vak : "
 # ^SpaceRequired
@@ -118,53 +118,53 @@
 # ^UninstallingText
 Distaliet e vo $(^NameDA) adalek ar c'havelec'h da-heul. $_CLICK
 # ^UninstallingSubText
-Distaliañ adalek :
+DistaliaÃ± adalek :
 # ^FileError
-Fazi en ur zigeriñ ur restr evit skrivañ : \r\n\r\n$0\r\n\r\nKlikit war « Paouez » evit paouez gant ar staliañ,\r\n« Adober » evit eseañ en-dro, pe\r\n« Tremen » evit leuskel a-gostez ar restr-mañ.
+Fazi en ur zigeriÃ± ur restr evit skrivaÃ± : \r\n\r\n$0\r\n\r\nKlikit war Â« Paouez Â» evit paouez gant ar staliaÃ±,\r\nÂ« Adober Â» evit eseaÃ± en-dro, pe\r\nÂ« Tremen Â» evit leuskel a-gostez ar restr-maÃ±.
 # ^FileError_NoIgnore
-Fazi en ur zigeriñ ur restr a-benn skrivañ : \r\n\r\n$0\r\n\r\nKlikit war « Adober » evit esaeañ en-dro, pe\r\nwar « Nullañ » evit paouez gant ar staliañ.
+Fazi en ur zigeriÃ± ur restr a-benn skrivaÃ± : \r\n\r\n$0\r\n\r\nKlikit war Â« Adober Â» evit esaeaÃ± en-dro, pe\r\nwar Â« NullaÃ± Â» evit paouez gant ar staliaÃ±.
 # ^CantWrite
-"N'haller ket skrivañ : "
+"N'haller ket skrivaÃ± : "
 # ^CopyFailed
-Kopiañ faziet
+KopiaÃ± faziet
 # ^CopyTo
-"Kopiañ da "
+"KopiaÃ± da "
 # ^Registering
-"Oc'h enskrivañ : "
+"Oc'h enskrivaÃ± : "
 # ^Unregistering
-"O tienskrivañ : "
+"O tienskrivaÃ± : "
 # ^SymbolNotFound
 "N'haller ket kavout ur simbolenn : "
 # ^CouldNotLoad
-"N'haller ket kargañ : "
+"N'haller ket kargaÃ± : "
 # ^CreateFolder
-"Krouiñ kavlec'h : "
+"KrouiÃ± kavlec'h : "
 # ^CreateShortcut
-"Krouiñ berradenn : "
+"KrouiÃ± berradenn : "
 # ^CreatedUninstaller
-"Skoazeller distaliañ krouet : "
+"Skoazeller distaliaÃ± krouet : "
 # ^Delete
 "Dilemel restr : "
 # ^DeleteOnReboot
-"Dilemel en ur adloc'hañ : "
+"Dilemel en ur adloc'haÃ± : "
 # ^ErrorCreatingShortcut
-"Fazi en ur grouiñ berradenn : "
+"Fazi en ur grouiÃ± berradenn : "
 # ^ErrorCreating
-"Fazi en ur grouiñ : "
+"Fazi en ur grouiÃ± : "
 # ^ErrorDecompressing
-Fazi en ur ziwaskañ stlenn ! Skoazeller staliañ gwastet ?
+Fazi en ur ziwaskaÃ± stlenn ! Skoazeller staliaÃ± gwastet ?
 # ^ErrorRegistering
-Fazi en ur enskrivañ an DLL
+Fazi en ur enskrivaÃ± an DLL
 # ^ExecShell
 "ExecShell : "
 # ^Exec
-"Lañsañ : "
+"LaÃ±saÃ± : "
 # ^Extract
-"Eztennañ : "
+"EztennaÃ± : "
 # ^ErrorWriting
-"Eztennañ : fazi en ur skrivañ restr "
+"EztennaÃ± : fazi en ur skrivaÃ± restr "
 # ^InvalidOpcode
-Skoazeller staliañ gwastet : opcode direizh
+Skoazeller staliaÃ± gwastet : opcode direizh
 # ^NoOLE
 "OLE ebet evit : "
 # ^OutputFolder
@@ -178,14 +178,14 @@
 # ^Skipped
 "Laosket a-gostez: "
 # ^CopyDetails
-Kopiañ ar munudoù er golver
+KopiaÃ± ar munudoÃ¹ er golver
 # ^LogInstall
-Tresañ an argerzh staliañ
+TresaÃ± an argerzh staliaÃ±
 # ^Byte
 E
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Estonian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Estonian.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Estonian.nsh	(revision 2956)
@@ -1,11 +1,11 @@
-;Language: Estonian (1061)
+ï»¿;Language: Estonian (1061)
 ;Translated by johnny izzo (izzo@hot.ee)
 
-!insertmacro LANGFILE "Estonian" "Eesti keel"
+!insertmacro LANGFILE "Estonian" = "Eesti keel" =
 
 !ifdef MUI_WELCOMEPAGE
   ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) paigaldamine!"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "See abiline aitab paigaldada $(^NameDA).$\r$\n$\r$\nEnne paigaldamise alustamist on soovitatav kõik teised programmid sulgeda, see võimaldab teatud süsteemifaile uuendada ilma arvutit taaskäivitamata.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "See abiline aitab paigaldada $(^NameDA).$\r$\n$\r$\nEnne paigaldamise alustamist on soovitatav kÃµik teised programmid sulgeda, see vÃµimaldab teatud sÃ¼steemifaile uuendada ilma arvutit taaskÃ¤ivitamata.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
@@ -15,22 +15,22 @@
 
 !ifdef MUI_LICENSEPAGE
   ${LangFileString} MUI_TEXT_LICENSE_TITLE "Litsentsileping"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Enne $(^NameDA) paigaldamist vaata palun litsentsileping üle."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Kui sa oled lepingu tingimustega nõus, vali jätkamiseks Nõustun. $(^NameDA) paigaldamiseks pead sa lepinguga nõustuma."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Kui nõustud lepingu tingimustega, vali allolev märkeruut. $(^NameDA) paigaldamiseks pead lepinguga nõustuma. $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Kui nõustud lepingu tingimustega, märgi allpool esimene valik. $(^NameDA) paigaldamiseks pead lepinguga nõustuma. $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Enne $(^NameDA) paigaldamist vaata palun litsentsileping Ã¼le."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Kui sa oled lepingu tingimustega nÃµus, vali jÃ¤tkamiseks NÃµustun. $(^NameDA) paigaldamiseks pead sa lepinguga nÃµustuma."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Kui nÃµustud lepingu tingimustega, vali allolev mÃ¤rkeruut. $(^NameDA) paigaldamiseks pead lepinguga nÃµustuma. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Kui nÃµustud lepingu tingimustega, mÃ¤rgi allpool esimene valik. $(^NameDA) paigaldamiseks pead lepinguga nÃµustuma. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
   ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Litsentsileping"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Enne $(^NameDA) eemaldamist vaata palun litsentsileping üle."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Kui sa oled lepingu tingimustega nõus, vali jätkamiseks Nõustun. $(^NameDA) eemaldamiseks pead sa lepinguga nõustuma."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Kui nõustud lepingu tingimustega, vali allolev märkeruut. $(^NameDA) eemaldamiseks pead lepinguga nõustuma. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Kui nõustud lepingu tingimustega, märgi allpool esimene valik. $(^NameDA) eemaldamiseks pead lepinguga nõustuma. $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Enne $(^NameDA) eemaldamist vaata palun litsentsileping Ã¼le."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Kui sa oled lepingu tingimustega nÃµus, vali jÃ¤tkamiseks NÃµustun. $(^NameDA) eemaldamiseks pead sa lepinguga nÃµustuma."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Kui nÃµustud lepingu tingimustega, vali allolev mÃ¤rkeruut. $(^NameDA) eemaldamiseks pead lepinguga nÃµustuma. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Kui nÃµustud lepingu tingimustega, mÃ¤rgi allpool esimene valik. $(^NameDA) eemaldamiseks pead lepinguga nÃµustuma. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Vajuta Page Down, et näha ülejäänud teksti."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Vajuta Page Down, et nÃ¤ha Ã¼lejÃ¤Ã¤nud teksti."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
@@ -46,9 +46,9 @@
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Kirjeldus"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Nihuta hiir komponendile, et näha selle kirjeldust."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Nihuta hiir komponendile, et nÃ¤ha selle kirjeldust."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Nihuta hiir komponendile, et näha selle kirjeldust."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Vali komponent, et nÃ¤ha selle kirjeldust."
   !endif
 !endif
 
@@ -68,43 +68,43 @@
   ${LangFileString} MUI_TEXT_FINISH_TITLE "Programm paigaldatud"
   ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Paigaldus edukalt sooritatud."
   ${LangFileString} MUI_TEXT_ABORT_TITLE "Paigaldus katkestatud"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Paigaldamine ebaõnnestus."
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Paigaldamine ebaÃµnnestus."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Eemaldan..."
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Palun oota kuni $(^NameDA) on eemaldatud."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Eemaldamine lõpetatud"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Eemaldamine edukalt lõpule viidud."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Eemaldamine lÃµpetatud"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Eemaldamine edukalt lÃµpule viidud."
   ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Eemaldamine katkestatud"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Eemaldamine ebaõnestus."
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Eemaldamine ebaÃµnestus."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "$(^NameDA) paigalduse lõpule viimine."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) on sinu arvutisse paigaldatud.$\r$\n$\r$\nAbilise sulgemiseks vajuta Lõpeta."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "$(^NameDA) täielikuks paigaldamiseks tuleb arvuti taaskäivitada. Kas soovid arvuti kohe taaskäivitada ?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "$(^NameDA) paigalduse lÃµpule viimine."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) on sinu arvutisse paigaldatud.$\r$\n$\r$\nAbilise sulgemiseks vajuta LÃµpeta."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "$(^NameDA) tÃ¤ielikuks paigaldamiseks tuleb arvuti taaskÃ¤ivitada. Kas soovid arvuti kohe taaskÃ¤ivitada ?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "$(^NameDA) eemaldamise lõpule viimine."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) on sinu arvutist eemaldatud.$\r$\n$\r$\nAbilise sulgemiseks vajuta Lõpeta."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "$(^NameDA) täielikuks eemaldamiseks tuleb arvuti taaskäivitada. Kas soovid arvuti kohe taaskäivitada ?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "$(^NameDA) eemaldamise lÃµpule viimine."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) on sinu arvutist eemaldatud.$\r$\n$\r$\nAbilise sulgemiseks vajuta LÃµpeta."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "$(^NameDA) tÃ¤ielikuks eemaldamiseks tuleb arvuti taaskÃ¤ivitada. Kas soovid arvuti kohe taaskÃ¤ivitada ?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Taaskäivita kohe"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Taaskäivitan hiljem käsitsi"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "Käivita $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "TaaskÃ¤ivita kohe"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "TaaskÃ¤ivitan hiljem kÃ¤sitsi"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "KÃ¤ivita $(^NameDA)"
   ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Kuva Loemind"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "Lõpeta"  
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "LÃµpeta"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Vali Start-menüü kaust"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Vali $(^NameDA) otseteede jaoks Start-menüü kaust."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Vali Start-menüü kaust, kuhu soovid paigutada programmi otseteed. Võid ka sisestada nime, et luua uus kaust."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ära loo otseteid"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Vali Start-menÃ¼Ã¼ kaust"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Vali $(^NameDA) otseteede jaoks Start-menÃ¼Ã¼ kaust."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Vali Start-menÃ¼Ã¼ kaust, kuhu soovid paigutada programmi otseteed. VÃµid ka sisestada nime, et luua uus kaust."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ã„ra loo otseteid"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Serbian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Serbian.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Serbian.nsh	(revision 2956)
@@ -1,121 +1,121 @@
-;Language: Serbian (3098)
-;Translation by Ñð�àí Îáóžèíà <obucina@srpskijezik.edu.yu>
+ï»¿;Language: Serbian (3098)
+;Translation by Ð¡Ñ€Ñ’Ð°Ð½ ÐžÐ±ÑƒÑ›Ð¸Ð½Ð° <obucina@srpskijezik.edu.yu>
 
-!insertmacro LANGFILE "Serbian" "Serbian Cyrillic"
+!insertmacro LANGFILE "Serbian" "Serbian (Cyrillic)" "Ð¡Ñ€Ð¿Ñ�ÐºÐ¸" "Srpski (Cyrillic)"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Äîáðîäîøëè ó âîäè÷ çà èíñòàëàöè¼ó ïðîãðàìà $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Áèžåòå âî�åíè êðîç ïðîöåñ èíñòàëàöè¼å ïðîãðàìà $(^NameDA).$\r$\n$\r$\nÏðåïîðó÷šèâî ¼å äà èñêšó÷èòå ñâå äðóãå ïðîãðàìå ïðå ïî÷åòêà èíñòàëàöè¼å. Îâî ìîæå îìîãóžèòè àæóðèðàœå ñèñòåìñêèõ ôà¼ëîâà áåç ïîòðåáå çà ïîíîâíèì ïîêðåòàœåì ðà÷óíàðà.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Ð”Ð¾Ð±Ñ€Ð¾Ð´Ð¾ÑˆÐ»Ð¸ Ñƒ Ð²Ð¾Ð´Ð¸Ñ‡ Ð·Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ð‘Ð¸Ñ›ÐµÑ‚Ðµ Ð²Ð¾Ñ’ÐµÐ½Ð¸ ÐºÑ€Ð¾Ð· Ð¿Ñ€Ð¾Ñ†ÐµÑ� Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^NameDA).$\r$\n$\r$\nÐŸÑ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡Ñ™Ð¸Ð²Ð¾ Ñ˜Ðµ Ð´Ð° Ð¸Ñ�ÐºÑ™ÑƒÑ‡Ð¸Ñ‚Ðµ Ñ�Ð²Ðµ Ð´Ñ€ÑƒÐ³Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ðµ Ð¿Ñ€Ðµ Ð¿Ð¾Ñ‡ÐµÑ‚ÐºÐ° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ. ÐžÐ²Ð¾ Ð¼Ð¾Ð¶Ðµ Ð¾Ð¼Ð¾Ð³ÑƒÑ›Ð¸Ñ‚Ð¸ Ð°Ð¶ÑƒÑ€Ð¸Ñ€Ð°ÑšÐµ Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ñ�ÐºÐ¸Ñ… Ñ„Ð°Ñ˜Ð»Ð¾Ð²Ð° Ð±ÐµÐ· Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ðµ Ð·Ð° Ð¿Ð¾Ð½Ð¾Ð²Ð½Ð¸Ð¼ Ð¿Ð¾ÐºÑ€ÐµÑ‚Ð°ÑšÐµÐ¼ Ñ€Ð°Ñ‡ÑƒÐ½Ð°Ñ€Ð°.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Äîáðîäîøëè ó äåèíñòàëàöè¼ó ïðîãðàìà $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Áèžåòå âî�åíè êðîç ïðîöåñ äåèíñòàëàöè¼å ïðîãðàìà $(^NameDA).$\r$\n$\r$\nÏðå ïî÷åòêà äåèíñòàëàöè¼å, óâåðèòå ñå äà ¼å ïðîãðàì $(^NameDA) èñêšó÷åí. $_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Ð”Ð¾Ð±Ñ€Ð¾Ð´Ð¾ÑˆÐ»Ð¸ Ñƒ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ð‘Ð¸Ñ›ÐµÑ‚Ðµ Ð²Ð¾Ñ’ÐµÐ½Ð¸ ÐºÑ€Ð¾Ð· Ð¿Ñ€Ð¾Ñ†ÐµÑ� Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^NameDA).$\r$\n$\r$\nÐŸÑ€Ðµ Ð¿Ð¾Ñ‡ÐµÑ‚ÐºÐ° Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ, ÑƒÐ²ÐµÑ€Ð¸Ñ‚Ðµ Ñ�Ðµ Ð´Ð° Ñ˜Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ $(^NameDA) Ð¸Ñ�ÐºÑ™ÑƒÑ‡ÐµÐ½. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Äîãîâîð î ïðàâó êîðèøžåœà"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Ïàæšèâî ïðî÷èòà¼òå äîãîâîð î ïðàâó êîðèøžåœà ïðå èíñòàëàöè¼å ïðîãðàìà $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Àêî ïðèõâàòàòå ñâå óñëîâå äîãîâîðà, ïðèòèñíèòå äóãìå „Ïðèõâàòàì“ çà íàñòàâàê. Ìîðàòå ïðèõâàòèòè äîãîâîð äà áèñòå èíñòàëèðàëè ïðîãðàì $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Àêî ïðèõâàòàòå ñâå óñëîâå äîãîâîðà, îáåëåæèòå êâàäðàòèž èñïîä. Ìîðàòå ïðèõâàòèòè äîãîâîð äà áèñòå èíñòàëèðàëè ïðîãðàì $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Àêî ïðèõâàòàòå ñâå óñëîâå äîãîâîðà, èçàáåðèòå ïðâó îïöè¼ó èñïîä. Ìîðàòå ïðèõâàòèòè äîãîâîð äà áèñòå èíñòàëèðàëè ïðîãðàì $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ð”Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð¾ Ð¿Ñ€Ð°Ð²Ñƒ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ°"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "ÐŸÐ°Ð¶Ñ™Ð¸Ð²Ð¾ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ˜Ñ‚Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð¾ Ð¿Ñ€Ð°Ð²Ñƒ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ° Ð¿Ñ€Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ð�ÐºÐ¾ Ð¿Ñ€Ð¸Ñ…Ð²Ð°Ñ‚Ð°Ñ‚Ðµ Ñ�Ð²Ðµ ÑƒÑ�Ð»Ð¾Ð²Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð°, Ð¿Ñ€Ð¸Ñ‚Ð¸Ñ�Ð½Ð¸Ñ‚Ðµ Ð´ÑƒÐ³Ð¼Ðµ â€žÐŸÑ€Ð¸Ñ…Ð²Ð°Ñ‚Ð°Ð¼â€œ Ð·Ð° Ð½Ð°Ñ�Ñ‚Ð°Ð²Ð°Ðº. ÐœÐ¾Ñ€Ð°Ñ‚Ðµ Ð¿Ñ€Ð¸Ñ…Ð²Ð°Ñ‚Ð¸Ñ‚Ð¸ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð´Ð° Ð±Ð¸Ñ�Ñ‚Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð»Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ð�ÐºÐ¾ Ð¿Ñ€Ð¸Ñ…Ð²Ð°Ñ‚Ð°Ñ‚Ðµ Ñ�Ð²Ðµ ÑƒÑ�Ð»Ð¾Ð²Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð°, Ð¾Ð±ÐµÐ»ÐµÐ¶Ð¸Ñ‚Ðµ ÐºÐ²Ð°Ð´Ñ€Ð°Ñ‚Ð¸Ñ› Ð¸Ñ�Ð¿Ð¾Ð´. ÐœÐ¾Ñ€Ð°Ñ‚Ðµ Ð¿Ñ€Ð¸Ñ…Ð²Ð°Ñ‚Ð¸Ñ‚Ð¸ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð´Ð° Ð±Ð¸Ñ�Ñ‚Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð»Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ð�ÐºÐ¾ Ð¿Ñ€Ð¸Ñ…Ð²Ð°Ñ‚Ð°Ñ‚Ðµ Ñ�Ð²Ðµ ÑƒÑ�Ð»Ð¾Ð²Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð°, Ð¸Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿Ñ€Ð²Ñƒ Ð¾Ð¿Ñ†Ð¸Ñ˜Ñƒ Ð¸Ñ�Ð¿Ð¾Ð´. ÐœÐ¾Ñ€Ð°Ñ‚Ðµ Ð¿Ñ€Ð¸Ñ…Ð²Ð°Ñ‚Ð¸Ñ‚Ð¸ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð´Ð° Ð±Ð¸Ñ�Ñ‚Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð»Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Äîãîâîð î ïðàâó êîðèøžåœà"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Ïàæšèâî ïðî÷èòà¼òå äîãîâîð î ïðàâó êîðèøžåœà ïðå äåèíñòàëàöè¼å ïðîãðàìà $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Àêî ïðèõâàòàòå ñâå óñëîâå äîãîâîðà, ïðèòèñíèòå äóãìå „Ïðèõâàòàì“ çà íàñòàâàê. Ìîðàòå ïðèõâàòèòè äîãîâîð äà áèñòå äåèíñòàëèðàëè ïðîãðàì $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Àêî ïðèõâàòàòå ñâå óñëîâå äîãîâîðà, îáåëåæèòå êâàäðàòèž èñïîä. Ìîðàòå ïðèõâàòèòè äîãîâîð äà áèñòå äåèíñòàëèðàëè ïðîãðàì $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Àêî ïðèõâàòàòå ñâå óñëîâå äîãîâîðà, èçàáåðèòå ïðâó îïöè¼ó èñïîä. Ìîðàòå ïðèõâàòèòè äîãîâîð äà áèñòå äåèíñòàëèðàëè ïðîãðàì $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ð”Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð¾ Ð¿Ñ€Ð°Ð²Ñƒ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ°"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "ÐŸÐ°Ð¶Ñ™Ð¸Ð²Ð¾ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ˜Ñ‚Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð¾ Ð¿Ñ€Ð°Ð²Ñƒ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ° Ð¿Ñ€Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ð�ÐºÐ¾ Ð¿Ñ€Ð¸Ñ…Ð²Ð°Ñ‚Ð°Ñ‚Ðµ Ñ�Ð²Ðµ ÑƒÑ�Ð»Ð¾Ð²Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð°, Ð¿Ñ€Ð¸Ñ‚Ð¸Ñ�Ð½Ð¸Ñ‚Ðµ Ð´ÑƒÐ³Ð¼Ðµ â€žÐŸÑ€Ð¸Ñ…Ð²Ð°Ñ‚Ð°Ð¼â€œ Ð·Ð° Ð½Ð°Ñ�Ñ‚Ð°Ð²Ð°Ðº. ÐœÐ¾Ñ€Ð°Ñ‚Ðµ Ð¿Ñ€Ð¸Ñ…Ð²Ð°Ñ‚Ð¸Ñ‚Ð¸ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð´Ð° Ð±Ð¸Ñ�Ñ‚Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð»Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ð�ÐºÐ¾ Ð¿Ñ€Ð¸Ñ…Ð²Ð°Ñ‚Ð°Ñ‚Ðµ Ñ�Ð²Ðµ ÑƒÑ�Ð»Ð¾Ð²Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð°, Ð¾Ð±ÐµÐ»ÐµÐ¶Ð¸Ñ‚Ðµ ÐºÐ²Ð°Ð´Ñ€Ð°Ñ‚Ð¸Ñ› Ð¸Ñ�Ð¿Ð¾Ð´. ÐœÐ¾Ñ€Ð°Ñ‚Ðµ Ð¿Ñ€Ð¸Ñ…Ð²Ð°Ñ‚Ð¸Ñ‚Ð¸ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð´Ð° Ð±Ð¸Ñ�Ñ‚Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð»Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ð�ÐºÐ¾ Ð¿Ñ€Ð¸Ñ…Ð²Ð°Ñ‚Ð°Ñ‚Ðµ Ñ�Ð²Ðµ ÑƒÑ�Ð»Ð¾Ð²Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð°, Ð¸Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿Ñ€Ð²Ñƒ Ð¾Ð¿Ñ†Ð¸Ñ˜Ñƒ Ð¸Ñ�Ð¿Ð¾Ð´. ÐœÐ¾Ñ€Ð°Ñ‚Ðµ Ð¿Ñ€Ð¸Ñ…Ð²Ð°Ñ‚Ð¸Ñ‚Ð¸ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð´Ð° Ð±Ð¸Ñ�Ñ‚Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð»Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Ïðèòèñíèòå Page Down äà áèñòå âèäåëè îñòàòàê äîãîâîðà."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "ÐŸÑ€Ð¸Ñ‚Ð¸Ñ�Ð½Ð¸Ñ‚Ðµ Page Down Ð´Ð° Ð±Ð¸Ñ�Ñ‚Ðµ Ð²Ð¸Ð´ÐµÐ»Ð¸ Ð¾Ñ�Ñ‚Ð°Ñ‚Ð°Ðº Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð°."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Èçáîð êîìïîíåíòè çà èíñòàëàöè¼ó"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Èçàáåðèòå êîìïîíåíòå çà èíñòàëàöè¼ó. Èíñòàëèðà¼ó ñå ñàìî îçíà÷åíå êîìïîíåíòå."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Ð˜Ð·Ð±Ð¾Ñ€ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸ Ð·Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Ð˜Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ðµ Ð·Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ. Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ˜Ñƒ Ñ�Ðµ Ñ�Ð°Ð¼Ð¾ Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ðµ."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Èçáîð êîìïîíåíòè çà äåèíñòàëàöè¼ó"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Èçàáåðèòå êîìïîíåíòå çà äåèíñòàëàöè¼ó. Äåèíñòàëèðà¼ó ñå ñàìî îçíà÷åíå êîìïîíåíòå."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Ð˜Ð·Ð±Ð¾Ñ€ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸ Ð·Ð° Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Ð˜Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ðµ Ð·Ð° Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ. Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ˜Ñƒ Ñ�Ðµ Ñ�Ð°Ð¼Ð¾ Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ðµ."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Îïèñ"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "ÐžÐ¿Ð¸Ñ�"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ïðå�èòå êóðñîðîì ìèøà ïðåêî èìåíà êîìïîíåíòå äà áèñòå âèäåëè œåí îïèñ."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ÐŸÑ€ÐµÑ’Ð¸Ñ‚Ðµ ÐºÑƒÑ€Ñ�Ð¾Ñ€Ð¾Ð¼ Ð¼Ð¸ÑˆÐ° Ð¿Ñ€ÐµÐºÐ¾ Ð¸Ð¼ÐµÐ½Ð° ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ðµ Ð´Ð° Ð±Ð¸Ñ�Ñ‚Ðµ Ð²Ð¸Ð´ÐµÐ»Ð¸ ÑšÐµÐ½ Ð¾Ð¿Ð¸Ñ�."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ïðå�èòå êóðñîðîì ìèøà ïðåêî èìåíà êîìïîíåíòå äà áèñòå âèäåëè œåí îïèñ."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ð˜Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñƒ Ð´Ð° Ð±Ð¸Ñ�Ñ‚Ðµ Ð²Ð¸Ð´ÐµÐ»Ð¸ ÑšÐµÐ½ Ð¾Ð¿Ð¸Ñ�."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Èçáîð ôîëäåðà çà èíñòàëàöè¼ó"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Èçàáåðèòå ôîëäåð ó êî¼è žåòå èíñòàëèðàòè ïðîãðàì $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Ð˜Ð·Ð±Ð¾Ñ€ Ñ„Ð¾Ð»Ð´ÐµÑ€Ð° Ð·Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Ð˜Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ„Ð¾Ð»Ð´ÐµÑ€ Ñƒ ÐºÐ¾Ñ˜Ð¸ Ñ›ÐµÑ‚Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Èçáîð ôîëäåðà çà äåèíñòàëaöè¼ó"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Èçàáåðèòå ôîëäåð èç êîãà žåòå äåèíñòàëèðàòè ïðîãðàì $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Ð˜Ð·Ð±Ð¾Ñ€ Ñ„Ð¾Ð»Ð´ÐµÑ€Ð° Ð·Ð° Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»aÑ†Ð¸Ñ˜Ñƒ"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Ð˜Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ„Ð¾Ð»Ð´ÐµÑ€ Ð¸Ð· ÐºÐ¾Ð³Ð° Ñ›ÐµÑ‚Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Èíñòàëàöè¼à"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Ñà÷åêà¼òå äîê ñå ïðîãðàì $(^NameDA) èíñòàëèðà."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Çàâðøåíà èíñòàëàöè¼à"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Èíñòàëàöè¼à ¼å óñïåøíî çàâðøåíà."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Ïðåêèíóòà èíñòàëàöè¼à"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Èíñòàëàöè¼à ¼å ïðåêèíóòà è íè¼å óñïåøíî çàâðøåíà."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Ð¡Ð°Ñ‡ÐµÐºÐ°Ñ˜Ñ‚Ðµ Ð´Ð¾Ðº Ñ�Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ $(^NameDA) Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Ð—Ð°Ð²Ñ€ÑˆÐµÐ½Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð° Ñ˜Ðµ ÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾ Ð·Ð°Ð²Ñ€ÑˆÐµÐ½Ð°."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "ÐŸÑ€ÐµÐºÐ¸Ð½ÑƒÑ‚Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð° Ñ˜Ðµ Ð¿Ñ€ÐµÐºÐ¸Ð½ÑƒÑ‚Ð° Ð¸ Ð½Ð¸Ñ˜Ðµ ÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾ Ð·Ð°Ð²Ñ€ÑˆÐµÐ½Ð°."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Äåèíñòàëàöè¼à"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Ñà÷åêà¼òå äîê ñå ïðîãðàì $(^NameDA) äåèíñòàëèðà."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Çàâðøåíà äåèíñòàëàöè¼à"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Äåèíñòàëàöè¼à ¼å óñïåøíî çàâðøåíà."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Ïðåêèíóòà äåèíñòàëàöè¼à"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Äåèíñòàëàöè¼à ¼å ïðåêèíóòà è íè¼å óñïåøíî çàâðøåíà."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Ð¡Ð°Ñ‡ÐµÐºÐ°Ñ˜Ñ‚Ðµ Ð´Ð¾Ðº Ñ�Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ $(^NameDA) Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Ð—Ð°Ð²Ñ€ÑˆÐµÐ½Ð° Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð° Ñ˜Ðµ ÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾ Ð·Ð°Ð²Ñ€ÑˆÐµÐ½Ð°."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "ÐŸÑ€ÐµÐºÐ¸Ð½ÑƒÑ‚Ð° Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð° Ñ˜Ðµ Ð¿Ñ€ÐµÐºÐ¸Ð½ÑƒÑ‚Ð° Ð¸ Ð½Ð¸Ñ˜Ðµ ÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾ Ð·Ð°Ð²Ñ€ÑˆÐµÐ½Ð°."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Çàâðøåíà èíñòàëàöè¼à ïðîãðàìà $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Ïðîãðàì $(^NameDA) ¼å èíñòàëèðàí íà ðà÷óíàð.$\r$\n$\r$\nÏðèòèñíèòå äóãìå „Êðà¼“ çà çàòâàðàœå îâîã ïðîçîðà."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Ðà÷óíàð ìîðà áèòè ïîíîâî ïîêðåíóò äà áè ñå ïðîöåñ èíñòàëàöè¼å ïðîãðàìà $(^NameDA) óñïåøíî çàâðøèî. Æåëèòå ëè òî îäìàõ äà óðàäèòå?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Ð—Ð°Ð²Ñ€ÑˆÐµÐ½Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼ $(^NameDA) Ñ˜Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ Ð½Ð° Ñ€Ð°Ñ‡ÑƒÐ½Ð°Ñ€.$\r$\n$\r$\nÐŸÑ€Ð¸Ñ‚Ð¸Ñ�Ð½Ð¸Ñ‚Ðµ Ð´ÑƒÐ³Ð¼Ðµ â€žÐšÑ€Ð°Ñ˜â€œ Ð·Ð° Ð·Ð°Ñ‚Ð²Ð°Ñ€Ð°ÑšÐµ Ð¾Ð²Ð¾Ð³ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€Ð°."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Ð Ð°Ñ‡ÑƒÐ½Ð°Ñ€ Ð¼Ð¾Ñ€Ð° Ð±Ð¸Ñ‚Ð¸ Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ð¿Ð¾ÐºÑ€ÐµÐ½ÑƒÑ‚ Ð´Ð° Ð±Ð¸ Ñ�Ðµ Ð¿Ñ€Ð¾Ñ†ÐµÑ� Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^NameDA) ÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾ Ð·Ð°Ð²Ñ€ÑˆÐ¸Ð¾. Ð–ÐµÐ»Ð¸Ñ‚Ðµ Ð»Ð¸ Ñ‚Ð¾ Ð¾Ð´Ð¼Ð°Ñ… Ð´Ð° ÑƒÑ€Ð°Ð´Ð¸Ñ‚Ðµ?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Çàâðøåíà äåèíñòàëàöè¼à ïðîãðàìà $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Ïðîãðàì $(^NameDA) ¼å äåèíñòàëèðàí ñà ðà÷óíàðà.$\r$\n$\r$\nÏðèòèñíèòå äóãìå „Êðà¼“ çà çàòâàðàœå îâîã ïðîçîðà."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Ðà÷óíàð ìîðà áèòè ïîíîâî ïîêðåíóò äà áè ñå ïðîöåñ äåèíñòàëàöè¼å ïðîãðàìà $(^NameDA) óñïåøíî çàâðøèî. Æåëèòå ëè òî äà óðàäèòå îäìàõ?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Ð—Ð°Ð²Ñ€ÑˆÐµÐ½Ð° Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼ $(^NameDA) Ñ˜Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ Ñ�Ð° Ñ€Ð°Ñ‡ÑƒÐ½Ð°Ñ€Ð°.$\r$\n$\r$\nÐŸÑ€Ð¸Ñ‚Ð¸Ñ�Ð½Ð¸Ñ‚Ðµ Ð´ÑƒÐ³Ð¼Ðµ â€žÐšÑ€Ð°Ñ˜â€œ Ð·Ð° Ð·Ð°Ñ‚Ð²Ð°Ñ€Ð°ÑšÐµ Ð¾Ð²Ð¾Ð³ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€Ð°."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Ð Ð°Ñ‡ÑƒÐ½Ð°Ñ€ Ð¼Ð¾Ñ€Ð° Ð±Ð¸Ñ‚Ð¸ Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ð¿Ð¾ÐºÑ€ÐµÐ½ÑƒÑ‚ Ð´Ð° Ð±Ð¸ Ñ�Ðµ Ð¿Ñ€Ð¾Ñ†ÐµÑ� Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^NameDA) ÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾ Ð·Ð°Ð²Ñ€ÑˆÐ¸Ð¾. Ð–ÐµÐ»Ð¸Ñ‚Ðµ Ð»Ð¸ Ñ‚Ð¾ Ð´Ð° ÑƒÑ€Ð°Ð´Ð¸Ñ‚Ðµ Ð¾Ð´Ð¼Ð°Ñ…?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Îäìàõ ïîíîâî ïîêðåíè ðà÷óíàð"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Áåç ïîíîâíîã ïîêðåòàœà"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "Ïîêðåíè ïðîãðàì $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Ïðèêàæè Ïðî÷èòà¼Ìå ôà¼ë"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "Êðà¼"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "ÐžÐ´Ð¼Ð°Ñ… Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ð¿Ð¾ÐºÑ€ÐµÐ½Ð¸ Ñ€Ð°Ñ‡ÑƒÐ½Ð°Ñ€"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ð‘ÐµÐ· Ð¿Ð¾Ð½Ð¾Ð²Ð½Ð¾Ð³ Ð¿Ð¾ÐºÑ€ÐµÑ‚Ð°ÑšÐ°"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "ÐŸÐ¾ÐºÑ€ÐµÐ½Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "ÐŸÑ€Ð¸ÐºÐ°Ð¶Ð¸ ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ˜ÐœÐµ Ñ„Ð°Ñ˜Ð»"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "ÐšÑ€Ð°Ñ˜"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Èçáîð ôîëäåðà ó Ñòàðò ìåíè¼ó"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Èçàáåðèòå ôîëäåð ó Ñòàðò ìåíè¼ó ó êîìå žåòå êðåèðàòè ïðå÷èöå."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Èçàáåðèòå ôîëäåð ó Ñòàðò ìåíè¼ó ó êîìå æåëèòå äà áóäó êðåèðàíå ïðå÷èöå ïðîãðàìà. Ìîæåòå óïèñàòè è èìå çà êðåèðàœå íîâîã ôîëäåðà."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Áåç êðåèðàœà ïðå÷èöà"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Ð˜Ð·Ð±Ð¾Ñ€ Ñ„Ð¾Ð»Ð´ÐµÑ€Ð° Ñƒ Ð¡Ñ‚Ð°Ñ€Ñ‚ Ð¼ÐµÐ½Ð¸Ñ˜Ñƒ"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Ð˜Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ„Ð¾Ð»Ð´ÐµÑ€ Ñƒ Ð¡Ñ‚Ð°Ñ€Ñ‚ Ð¼ÐµÐ½Ð¸Ñ˜Ñƒ Ñƒ ÐºÐ¾Ð¼Ðµ Ñ›ÐµÑ‚Ðµ ÐºÑ€ÐµÐ¸Ñ€Ð°Ñ‚Ð¸ Ð¿Ñ€ÐµÑ‡Ð¸Ñ†Ðµ."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Ð˜Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ„Ð¾Ð»Ð´ÐµÑ€ Ñƒ Ð¡Ñ‚Ð°Ñ€Ñ‚ Ð¼ÐµÐ½Ð¸Ñ˜Ñƒ Ñƒ ÐºÐ¾Ð¼Ðµ Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð±ÑƒÐ´Ñƒ ÐºÑ€ÐµÐ¸Ñ€Ð°Ð½Ðµ Ð¿Ñ€ÐµÑ‡Ð¸Ñ†Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð°. ÐœÐ¾Ð¶ÐµÑ‚Ðµ ÑƒÐ¿Ð¸Ñ�Ð°Ñ‚Ð¸ Ð¸ Ð¸Ð¼Ðµ Ð·Ð° ÐºÑ€ÐµÐ¸Ñ€Ð°ÑšÐµ Ð½Ð¾Ð²Ð¾Ð³ Ñ„Ð¾Ð»Ð´ÐµÑ€Ð°."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ð‘ÐµÐ· ÐºÑ€ÐµÐ¸Ñ€Ð°ÑšÐ° Ð¿Ñ€ÐµÑ‡Ð¸Ñ†Ð°"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Äåèíñòàëàöè¼à ïðîãðàìà $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Äåèíñòàëàöè¼à ïðîãðàìà $(^NameDA) ñà ðà÷óíàðà."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^NameDA) Ñ�Ð° Ñ€Ð°Ñ‡ÑƒÐ½Ð°Ñ€Ð°."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Ñèãóðíî æåëèòå äà ïðåêèíåòå èíñòàëàöè¼ó ïðîãðàìà $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Ð¡Ð¸Ð³ÑƒÑ€Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð¿Ñ€ÐµÐºÐ¸Ð½ÐµÑ‚Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ñèãóðíî æåëèòå äà ïðåêèíåòå äåèíñòàëàöè¼ó ïðîãðàìà $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ð¡Ð¸Ð³ÑƒÑ€Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð¿Ñ€ÐµÐºÐ¸Ð½ÐµÑ‚Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^Name)?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Asturian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Asturian.nsh	(revision 0)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Asturian.nsh	(revision 2956)
@@ -0,0 +1,129 @@
+ï»¿;Language: Asturian (1150)
+;By Marcos (marcoscostales@gmail.com).
+
+!insertmacro LANGFILE "Asturian" = "Asturies" =
+
+!ifdef MUI_WELCOMEPAGE
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "BienvenÃ­u al Asistente d'InstalaciÃ³n de $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Esti programa instalarÃ¡ $(^NameDA) nel to ordenador.$\r$\n$\r$\nEncamiÃ©ntase que zarres toles demÃ¡s aplicaciones enantes d'aniciar la instalaciÃ³n. Esto faerÃ¡ posible anovar ficheros rellacionaos col sistema ensin tener que reaniciar el to ordenador.$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_UNWELCOMEPAGE
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "BienvenÃ­u al Asistente de DesinstalaciÃ³n de $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Esti asistente guiarÃ¡te durante la desinstalaciÃ³n de $(^NameDA).$\r$\n$\r$\nEnantes d'aniciar la desinstalaciÃ³n, asegÃºrate de que $(^NameDA) nun se ta executando.$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Alcuerdu de llicencia"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Por favor revisa los tÃ©rminos de la llicencia enantes d'instalar $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Si aceutes tolos tÃ©rminos del alcuerdu, seleiciona Aceuto pa siguir. Tienes d'aceutar l'alcuerdu pa instalar $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Si aceutes los tÃ©rminos del alcuerdu, conseÃ±a embaxo la caxella. Tienes d'aceutar los tÃ©rminos pa instalar $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Si aceutes los tÃ©rminos del alcuerdu, seleiciona embaxo la primer opciÃ³n. Tienes d'aceutar los tÃ©rminos pa instalar $(^NameDA). $_CLICK"
+!endif
+
+!ifdef MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Alcuerdu de llicencia"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Por favor revisa los tÃ©rminos de la llicencia enantes de desinstalar $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Si aceutes tolos tÃ©rminos del alcuerdu, seleiciona Aceuto pa siguir. Tienes d'aceutar l'alcuerdu pa desinstalar $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Si aceutes los tÃ©rminos del alcuerdu, conseÃ±a embaxu la caxella. Tienes d'aceutar los tÃ©rminos pa desinstalar $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Si aceutes los tÃ©rminos del alcuerdu, seleccione embaxu la primer opciÃ³n. Tienes d'aceutar los tÃ©rminos pa desinstalar $(^NameDA). $_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Calca Avanzar PÃ¡xina pa ver el restu del alcuerdu."
+!endif
+
+!ifdef MUI_COMPONENTSPAGE
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "SeleiciÃ³n de componentes"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Seleicione quÃ© carauterÃ­stiques de $(^NameDA) deseyes instalar."
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "DescripciÃ³n"
+!endif
+
+!ifdef MUI_UNCOMPONENTSPAGE
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "SeleiciÃ³n de componentes"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Seleicione quÃ© carauterÃ­stiques de $(^NameDA) quies desinstalar."
+!endif
+
+!ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
+  !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Allugue'l mur enriba d'un componente pa ver la so descripciÃ³n."
+  !else
+    #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO
+  !endif
+!endif
+
+!ifdef MUI_DIRECTORYPAGE
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Escoyer llugar d'instalaciÃ³n"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Escueye'l direutoriu pa instalar $(^NameDA)."
+!endif
+
+!ifdef MUI_UNDIRECTORYPAGE
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Escoyer llugar de desinstalaciÃ³n"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Escueye'l direutoriu dende'l cual se desinstalarÃ¡ $(^NameDA)."
+!endif
+
+!ifdef MUI_INSTFILESPAGE
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Instalando"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Por favor espera mientres $(^NameDA) s'instala."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "InstalaciÃ³n Completada"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "La instalaciÃ³n completÃ³se correutamente."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "InstalaciÃ³n Desaniciada"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "La instalaciÃ³n nun se completÃ³ correutamente."
+!endif
+
+!ifdef MUI_UNINSTFILESPAGE
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Desinstalando"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Por favor espera mientres $(^NameDA) se desinstala."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "DesinstalaciÃ³n Completada"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "La desinstalaciÃ³n completÃ³se correutamente."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "DesinstalaciÃ³n Desaniciada"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "La desinstalaciÃ³n nun se completÃ³ correutamente."
+!endif
+
+!ifdef MUI_FINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Completando l'Asistente d'InstalaciÃ³n de $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) foi instalÃ¡u nel to sistema.$\r$\n$\r$\nCalca Finar pa zarrar esti asistente."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "El to sistema tien de reaniciase pa que pueda completase la instalaciÃ³n de $(^NameDA). Â¿Quies reaniciar agora?"
+!endif
+
+!ifdef MUI_UNFINISHPAGE
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Completando l'Asistente de DesinstalaciÃ³n de $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) foi desinstalÃ¡u del to sistema.$\r$\n$\r$\nCalca Finar pa zarrar esti asistente."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "El to ordenador tien que reaniciar pa finar la desinstalaciÃ³n de $(^NameDA). Â¿Quies reiniciar agora?"
+!endif
+
+!ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Reaniciar agora"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Deseo reaniciar manualmente mÃ¡s sero"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&Executar $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Ver LlÃ©ame"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Finar"  
+!endif
+
+!ifdef MUI_STARTMENUPAGE
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Escoyer Carpeta del MenÃº Aniciu"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Escueye una Carpeta del MenÃº Aniciu pa los accesos direutos de $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Seleiciona una carpeta del MenÃº Aniciu na que quieras criar los accesos direutos del programa. TamiÃ©n puedes introducir un nome pa criar una nueva carpeta."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Non criar accesos direutos"
+!endif
+
+!ifdef MUI_UNCONFIRMPAGE
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Desinstalar $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Desaniciar $(^NameDA) del to sistema."
+!endif
+
+!ifdef MUI_ABORTWARNING
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Â¿De xuru que quies colar de la instalaciÃ³n de $(^Name)?"
+!endif
+
+!ifdef MUI_UNABORTWARNING
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Â¿De xuru que quies colar de la desinstalaciÃ³n de $(^Name)?"
+!endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Escoyer Usuarios"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Escueye los usuarios pa los cuales quies instalar $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Seleiciona si quies instalar $(^NameDA) namÃ¡i pa tÃ­ o pa tolos usuarios d'esti Ordenador.$(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "InstalaciÃ³n pa cualisquier usuariu d'esti ordenador"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "InstalaciÃ³n namÃ¡i pa mÃ­"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Vietnamese.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Vietnamese.nlf	(revision 0)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Vietnamese.nlf	(revision 2956)
@@ -0,0 +1,191 @@
+ï»¿# Header, don't edit
+NLF v6
+# Start editing here
+# Language ID
+1066
+# Font and size - dash (-) means default
+-
+-
+# Codepage - dash (-) means ASCII code page
+1258
+# RTL - anything else than RTL means LTR
+-
+# Translation by NGUYÃŠÌƒN MaÌ£nh HuÌ€ng <loveleeyoungae@yahoo.com>
+# ^Branding
+Nullsoft Install System %s
+# ^SetupCaption
+CaÌ€i Ä‘ÄƒÌ£t $(^Name)
+# ^UninstallCaption
+GÆ¡Ìƒ boÌ‰ $(^Name)
+# ^LicenseSubCaption
+: ThoÌ‰a thuÃ¢Ì£n GiÃ¢Ì�y pheÌ�p
+# ^ComponentsSubCaption
+: TuÌ€y choÌ£n CaÌ€i Ä‘ÄƒÌ£t
+# ^DirSubCaption
+: ThÆ° muÌ£c CaÌ€i Ä‘ÄƒÌ£t
+# ^InstallingSubCaption
+: CaÌ€i Ä‘ÄƒÌ£t
+# ^CompletedSubCaption
+: HoaÌ€n thaÌ€nh
+# ^UnComponentsSubCaption
+: TuÌ€y choÌ£n GÆ¡Ìƒ boÌ‰
+# ^UnDirSubCaption
+: ThÆ° muÌ£c GÆ¡Ìƒ boÌ‰
+# ^ConfirmSubCaption
+: XaÌ�c nhÃ¢Ì£n
+# ^UninstallingSubCaption
+: GÆ¡Ìƒ boÌ‰
+# ^UnCompletedSubCaption
+: HoaÌ€n thaÌ€nh
+# ^BackBtn
+< &LuÌ€i
+# ^NextBtn
+&TiÃªÌ�n >
+# ^AgreeBtn
+TÃ´&i Ä‘Ã´Ì€ng yÌ�
+# ^AcceptBtn
+TÃ´&i chÃ¢Ì�p thuÃ¢Ì£n caÌ�c Ä‘iÃªÌ€u khoaÌ‰n cuÌ‰a ThoÌ‰a thuÃ¢Ì£n GiÃ¢Ì�y pheÌ�p
+# ^DontAcceptBtn
+TÃ´i &khÃ´ng chÃ¢Ì�p thuÃ¢Ì£n caÌ�c Ä‘iÃªÌ€u khoaÌ‰n cuÌ‰a ThoÌ‰a thuÃ¢Ì£n GiÃ¢Ì�y pheÌ�p
+# ^InstallBtn
+&CaÌ€i Ä‘ÄƒÌ£t
+# ^UninstallBtn
+&GÆ¡Ìƒ boÌ‰
+# ^CancelBtn
+HuÌ‰y boÌ‰
+# ^CloseBtn
+Ä�oÌ�n&g
+# ^BrowseBtn
+Du&yÃªÌ£t...
+# ^ShowDetailsBtn
+&HiÃªÌ£n chi tiÃªÌ�t
+# ^ClickNext
+NhÃ¢Ì�n TiÃªÌ�n Ä‘ÃªÌ‰ tiÃªÌ�p tuÌ£c.
+# ^ClickInstall
+NhÃ¢Ì�n â€œCaÌ€i Ä‘ÄƒÌ£tâ€� Ä‘ÃªÌ‰ bÄƒÌ�t Ä‘Ã¢Ì€u viÃªÌ£c caÌ€i Ä‘ÄƒÌ£t.
+# ^ClickUninstall
+NhÃ¢Ì�n â€œGÆ¡Ìƒ boÌ‰â€� Ä‘ÃªÌ‰ bÄƒÌ�t Ä‘Ã¢Ì€u viÃªÌ£c gÆ¡Ìƒ boÌ‰.
+# ^Name
+TÃªn
+# ^Completed
+HoaÌ€n thaÌ€nh
+# ^LicenseText
+Vui loÌ€ng xem xeÌ�t thoÌ‰a thuÃ¢Ì£n giÃ¢Ì�y pheÌ�p trÆ°Æ¡Ì�c khi caÌ€i Ä‘ÄƒÌ£t $(^NameDA). NÃªÌ�u baÌ£n chÃ¢Ì�p thuÃ¢Ì£n tÃ¢Ì�t caÌ‰ caÌ�c Ä‘iÃªÌ€u khoaÌ‰n cuÌ‰a thoÌ‰a thuÃ¢Ì£n, haÌƒy nhÃ¢Ì�n â€œTÃ´i Ä‘Ã´Ì€ng yÌ�â€�.
+# ^LicenseTextCB
+Vui loÌ€ng xem xeÌ�t thoÌ‰a thuÃ¢Ì£n giÃ¢Ì�y pheÌ�p trÆ°Æ¡Ì�c khi caÌ€i Ä‘ÄƒÌ£t $(^NameDA). NÃªÌ�u baÌ£n chÃ¢Ì�p thuÃ¢Ì£n tÃ¢Ì�t caÌ‰ caÌ�c Ä‘iÃªÌ€u khoaÌ‰n cuÌ‰a thoÌ‰a thuÃ¢Ì£n, haÌƒy nhÃ¢Ì�n Ã´ bÃªn dÆ°Æ¡Ì�i. $_CLICK
+# ^LicenseTextRB
+Vui loÌ€ng xem xeÌ�t thoÌ‰a thuÃ¢Ì£n giÃ¢Ì�y pheÌ�p trÆ°Æ¡Ì�c khi caÌ€i Ä‘ÄƒÌ£t $(^NameDA). NÃªÌ�u baÌ£n chÃ¢Ì�p thuÃ¢Ì£n tÃ¢Ì�t caÌ‰ caÌ�c Ä‘iÃªÌ€u khoaÌ‰n cuÌ‰a thoÌ‰a thuÃ¢Ì£n, haÌƒy choÌ£n Ã´ Ä‘Ã¢Ì€u tiÃªn bÃªn dÆ°Æ¡Ì�i. $_CLICK
+# ^UnLicenseText
+Vui loÌ€ng xem xeÌ�t thoÌ‰a thuÃ¢Ì£n giÃ¢Ì�y pheÌ�p trÆ°Æ¡Ì�c khi gÆ¡Ìƒ boÌ‰ $(^NameDA). NÃªÌ�u baÌ£n chÃ¢Ì�p thuÃ¢Ì£n tÃ¢Ì�t caÌ‰ caÌ�c Ä‘iÃªÌ€u khoaÌ‰n cuÌ‰a thoÌ‰a thuÃ¢Ì£n, haÌƒy nhÃ¢Ì�n â€œTÃ´i Ä‘Ã´Ì€ng yÌ�â€�.
+# ^UnLicenseTextCB
+Vui loÌ€ng xem xeÌ�t thoÌ‰a thuÃ¢Ì£n giÃ¢Ì�y pheÌ�p trÆ°Æ¡Ì�c khi gÆ¡Ìƒ boÌ‰ $(^NameDA). NÃªÌ�u baÌ£n chÃ¢Ì�p thuÃ¢Ì£n tÃ¢Ì�t caÌ‰ caÌ�c Ä‘iÃªÌ€u khoaÌ‰n cuÌ‰a thoÌ‰a thuÃ¢Ì£n, haÌƒy nhÃ¢Ì�n Ã´ bÃªn dÆ°Æ¡Ì�i. $_CLICK
+# ^UnLicenseTextRB
+Vui loÌ€ng xem xeÌ�t thoÌ‰a thuÃ¢Ì£n giÃ¢Ì�y pheÌ�p trÆ°Æ¡Ì�c khi gÆ¡Ìƒ boÌ‰ $(^NameDA). NÃªÌ�u baÌ£n chÃ¢Ì�p thuÃ¢Ì£n tÃ¢Ì�t caÌ‰ caÌ�c Ä‘iÃªÌ€u khoaÌ‰n cuÌ‰a thoÌ‰a thuÃ¢Ì£n, haÌƒy choÌ£n Ã´ Ä‘Ã¢Ì€u tiÃªn bÃªn dÆ°Æ¡Ì�i. $_CLICK
+# ^Custom
+TuÌ€y biÃªÌ�n
+# ^ComponentsText
+ChoÌ£n thaÌ€nh phÃ¢Ì€n maÌ€ baÌ£n muÃ´Ì�n caÌ€i Ä‘ÄƒÌ£t vaÌ€ khÃ´ng choÌ£n caÌ�c thaÌ€nh phÃ¢Ì€n maÌ€ baÌ£n khÃ´ng muÃ´Ì�n caÌ€i Ä‘ÄƒÌ£t. $_CLICK
+# ^ComponentsSubText1
+ChoÌ£n kiÃªÌ‰u caÌ€i Ä‘ÄƒÌ£t:
+# ^ComponentsSubText2_NoInstTypes
+ChoÌ£n thaÌ€nh phÃ¢Ì€n Ä‘ÃªÌ‰ caÌ€i Ä‘ÄƒÌ£t:
+# ^ComponentsSubText2
+HoÄƒÌ£c, choÌ£n thaÌ€nh phÃ¢Ì€n phuÌ£ maÌ€ baÌ£n muÃ´Ì�n caÌ€i Ä‘ÄƒÌ£t:
+# ^UnComponentsText
+ChoÌ£n thaÌ€nh phÃ¢Ì€n maÌ€ baÌ£n muÃ´Ì�n gÆ¡Ìƒ boÌ‰ vaÌ€ khÃ´ng choÌ£n caÌ�c thaÌ€nh phÃ¢Ì€n maÌ€ baÌ£n khÃ´ng muÃ´Ì�n gÆ¡Ìƒ boÌ‰. $_CLICK
+# ^UnComponentsSubText1
+ChoÌ£n kiÃªÌ‰u gÆ¡Ìƒ boÌ‰:
+# ^UnComponentsSubText2_NoInstTypes
+ChoÌ£n thaÌ€nh phÃ¢Ì€n Ä‘ÃªÌ‰ gÆ¡Ìƒ boÌ‰:
+# ^UnComponentsSubText2
+HoÄƒÌ£c, choÌ£n thaÌ€nh phÃ¢Ì€n phuÌ£ maÌ€ baÌ£n muÃ´Ì�n gÆ¡Ìƒ boÌ‰:
+# ^DirText
+TriÌ€nh trÆ¡Ì£ liÌ� seÌƒ caÌ€i Ä‘ÄƒÌ£t $(^NameDA) vaÌ€o thÆ° muÌ£c sau. Ä�ÃªÌ‰ caÌ€i Ä‘ÄƒÌ£t vaÌ€o mÃ´Ì£t thÆ° muÌ£c khaÌ�c, haÌƒy nhÃ¢Ì�n DuyÃªÌ£t Ä‘ÃªÌ‰ choÌ£n thÆ° muÌ£c. $_CLICK
+# ^DirSubText
+ThÆ° muÌ£c Ä‘iÌ�ch
+# ^DirBrowseText
+ChoÌ£n thÆ° muÌ£c Ä‘ÃªÌ‰ caÌ€i Ä‘ÄƒÌ£t $(^NameDA):
+# ^UnDirText
+TriÌ€nh trÆ¡Ì£ liÌ� seÌƒ gÆ¡Ìƒ boÌ‰ $(^NameDA) khoÌ‰i thÆ° muÌ£c sau. Ä�ÃªÌ‰ gÆ¡Ìƒ boÌ‰ khoÌ‰i mÃ´Ì£t thÆ° muÌ£c khaÌ�c, haÌƒy nhÃ¢Ì�n DuyÃªÌ£t Ä‘ÃªÌ‰ choÌ£n thÆ° muÌ£c. $_CLICK
+# ^UnDirSubText
+""
+# ^UnDirBrowseText
+ChoÌ£n thÆ° muÌ£c Ä‘ÃªÌ‰ gÆ¡Ìƒ boÌ‰ $(^NameDA):
+# ^SpaceAvailable
+"Dung lÆ°Æ¡Ì£ng hiÃªÌ£n coÌ�: "
+# ^SpaceRequired
+"Dung lÆ°Æ¡Ì£ng yÃªu cÃ¢Ì€u: "
+# ^UninstallingText
+$(^NameDA) seÌƒ biÌ£ gÆ¡Ìƒ boÌ‰ khoÌ‰i thÆ° muÌ£c sau. $_CLICK
+# ^UninstallingSubText
+Ä�ang gÆ¡Ìƒ boÌ‰ khoÌ‰i:
+# ^FileError
+LÃ´Ìƒi khi mÆ¡Ì‰ tÃ¢Ì£p tin Ä‘ÃªÌ‰ ghi: \r\n\r\n$0\r\n\r\nNhÃ¢Ì�n â€œHuÌ‰y boÌ‰â€� Ä‘ÃªÌ‰ ngÆ°Ì€ng viÃªÌ£c caÌ€i Ä‘ÄƒÌ£t,\r\nâ€œThÆ°Ì‰ laÌ£iâ€� Ä‘ÃªÌ‰ thÆ°Ì‰ lÃ¢Ì€n nÆ°Ìƒa, hoÄƒÌ£c\r\nâ€œBoÌ‰ quaâ€� Ä‘ÃªÌ‰ boÌ‰ qua tÃ¢Ì£p tin naÌ€y.
+# ^FileError_NoIgnore
+LÃ´Ìƒi khi mÆ¡Ì‰ tÃ¢Ì£p tin Ä‘ÃªÌ‰ ghi: \r\n\r\n$0\r\n\r\nNhÃ¢Ì�n â€œThÆ°Ì‰ laÌ£iâ€� Ä‘ÃªÌ‰ thÆ°Ì‰ lÃ¢Ì€n nÆ°Ìƒa, hoÄƒÌ£c\r\nâ€œHuÌ‰y boÌ‰â€� Ä‘ÃªÌ‰ ngÆ°Ì€ng viÃªÌ£c caÌ€i Ä‘ÄƒÌ£t.
+# ^CantWrite
+"KhÃ´ng thÃªÌ‰ ghi: "
+# ^CopyFailed
+Sao cheÌ�p biÌ£ thÃ¢Ì�t baÌ£i
+# ^CopyTo
+"Sao cheÌ�p vaÌ€o "
+# ^Registering
+"Ä�ang Ä‘Äƒng kiÌ�: "
+# ^Unregistering
+"Ä�ang huÌ‰y Ä‘Äƒng kiÌ�: "
+# ^SymbolNotFound
+"KhÃ´ng thÃªÌ‰ tiÌ€m thÃ¢Ì�y biÃªÌ‰u tÆ°Æ¡Ì£ng: "
+# ^CouldNotLoad
+"KhÃ´ng thÃªÌ‰ naÌ£p: "
+# ^CreateFolder
+"TaÌ£o thÆ° muÌ£c: "
+# ^CreateShortcut
+"TaÌ£o lÃ´Ì�i tÄƒÌ�t: "
+# ^CreatedUninstaller
+"TaÌ£o triÌ€nh gÆ¡Ìƒ boÌ‰: "
+# ^Delete
+"XoÌ�a tÃ¢Ì£p tin: "
+# ^DeleteOnReboot
+"XoÌ�a khi khÆ¡Ì‰i Ä‘Ã´Ì£ng laÌ£i: "
+# ^ErrorCreatingShortcut
+"LÃ´Ìƒi khi taÌ£o lÃ´Ì�i tÄƒÌ�t: "
+# ^ErrorCreating
+"LÃ´Ìƒi khi taÌ£o: "
+# ^ErrorDecompressing
+LÃ´Ìƒi khi giaÌ‰i neÌ�n dÆ°Ìƒ liÃªÌ£u! CoÌ� thÃªÌ‰ triÌ€nh caÌ€i Ä‘ÄƒÌ£t Ä‘aÌƒ biÌ£ hoÌ‰ng?
+# ^ErrorRegistering
+LÃ´Ìƒi khi Ä‘Äƒng kiÌ� DLL
+# ^ExecShell
+"ExecShell: "
+# ^Exec
+"ThÆ°Ì£c thi: "
+# ^Extract
+"TriÌ�ch xuÃ¢Ì�t: "
+# ^ErrorWriting
+"TriÌ�ch xuÃ¢Ì�t: lÃ´i khi ghi vaÌ€o tÃ¢Ì£p tin "
+# ^InvalidOpcode
+TriÌ€nh caÌ€i Ä‘ÄƒÌ£t biÌ£ hoÌ‰ng: maÌƒ taÌ�c vuÌ£ bÃ¢Ì�t hÆ¡Ì£p lÃªÌ£
+# ^NoOLE
+"KhÃ´ng coÌ� OLE cho: "
+# ^OutputFolder
+"ThÆ° muÌ£c Ä‘Ã¢Ì€u ra: "
+# ^RemoveFolder
+"XoÌ�a thÆ° muÌ£c: "
+# ^RenameOnReboot
+"Ä�Ã´Ì‰i tÃªn khi khÆ¡Ì‰i Ä‘Ã´Ì£ng laÌ£i: "
+# ^Rename
+"Ä�Ã´Ì‰i tÃªn: "
+# ^Skipped
+"Ä�aÌƒ boÌ‰ qua: "
+# ^CopyDetails
+Sao cheÌ�p Chi tiÃªÌ�t vaÌ€o Clipboard
+# ^LogInstall
+LÆ°u kiÌ� quaÌ� triÌ€nh caÌ€i Ä‘ÄƒÌ£t
+# ^Byte
+B
+# ^Kilo
+ K
+# ^Mega
+ M
+# ^Giga
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Farsi.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Farsi.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Farsi.nlf	(revision 2956)
@@ -1,4 +1,4 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Start editing here
 # Language ID
@@ -6,186 +6,186 @@
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1256
 # RTL - anything else than RTL means LTR
 RTL
 # Translation By FzerorubigD - FzerorubigD@gmail.com - Thanx to all people help me in forum.persiantools.com, Elnaz Sarbar <elnaz@farsiweb.info>
 # ^Branding
-ÓíÓÊã äÕÈ äÇá�ÓÇÝÊ %s
+Nullsoft Install System %s
 # ^SetupCaption
-äÕÈ $(^Name) 
+Ù†ØµØ¨ $(^Name) 
 # ^UninstallCaption
-ÍÐÝ $(^Name) 
+Ø­Ø°Ù� $(^Name) 
 # ^LicenseSubCaption
-: ãÌæÒ äÕÈ
+: Ù…Ø¬ÙˆØ² Ù†ØµØ¨
 # ^ComponentsSubCaption
-: �Òíäå�åÇì äÕÈ
+: Ú¯Ø²ÛŒÙ†Ù‡â€ŒÙ‡Ø§ÛŒ Ù†ØµØ¨
 # ^DirSubCaption
-: �æÔå äÕÈ
+: Ù¾ÙˆØ´Ù‡ Ù†ØµØ¨
 # ^InstallingSubCaption
-: ÏÑ ÍÇá äÕÈ
+: Ø¯Ø± Ø­Ø§Ù„ Ù†ØµØ¨
 # ^CompletedSubCaption
-: �ÇíÇä íÇÝÊ
+: Ù¾Ø§ÛŒØ§Ù† ÛŒØ§Ù�Øª
 # ^UnComponentsSubCaption
-: �Òíäå�åÇì ÍÐÝ
+: Ú¯Ø²ÛŒÙ†Ù‡â€ŒÙ‡Ø§ÛŒ Ø­Ø°Ù�
 # ^UnDirSubCaption
-: �æÔå ÍÐÝ
+: Ù¾ÙˆØ´Ù‡â€ŒÛŒ Ø­Ø°Ù�
 # ^ConfirmSubCaption
-: ÊÃííÏ
+: ØªØ£ÛŒÛŒØ¯
 # ^UninstallingSubCaption
-: ÏÑ ÍÇá ÍÐÝ
+: Ø¯Ø± Ø­Ø§Ù„ Ø­Ø°Ù�
 # ^UnCompletedSubCaption
-: �ÇíÇä íÇÝÊ
+: Ù¾Ø§ÛŒØ§Ù† ÛŒØ§Ù�Øª
 # ^BackBtn
-&ÞÈá 
+&Ù‚Ø¨Ù„ 
 # ^NextBtn
-&ÈÚÏ
+&Ø¨Ø¹Ø¯
 # ^AgreeBtn
-&ãæÇÝÞã
+&Ù…ÙˆØ§Ù�Ù‚Ù…
 # ^AcceptBtn
-ãä åãå ÈäÏåÇì ãÌæÒ ÑÇ ÞÈæá &ÏÇÑã
+Ù…Ù† Ù‡Ù…Ù‡â€ŒÛŒ Ø¨Ù†Ø¯Ù‡Ø§ÛŒ Ù…Ø¬ÙˆØ² Ø±Ø§ Ù‚Ø¨ÙˆÙ„ &Ø¯Ø§Ø±Ù…
 # ^DontAcceptBtn
-ãä ÈäÏåÇì ãÌæÒ ÑÇ ÞÈæá &äÏÇÑã
+Ù…Ù† Ø¨Ù†Ø¯Ù‡Ø§ÛŒ Ù…Ø¬ÙˆØ² Ø±Ø§ Ù‚Ø¨ÙˆÙ„ &Ù†Ø¯Ø§Ø±Ù…
 # ^InstallBtn
-&äÕÈ
+&Ù†ØµØ¨
 # ^UninstallBtn
-&ÍÐÝ
+&Ø­Ø°Ù�
 # ^CancelBtn
-ÇäÕÑÇÝ
+Ø§Ù†ØµØ±Ø§Ù�
 # ^CloseBtn
-&ÈÓÊä
+&Ø¨Ø³ØªÙ†
 # ^BrowseBtn
-&ãÑæÑ...
+&Ù…Ø±ÙˆØ±...
 # ^ShowDetailsBtn
-äãÇíÔ ÌÒÆíÇÊ
+Ù†Ù…Ø§ÛŒØ´ Ø¬Ø²Ø¦ÛŒØ§Øª
 # ^ClickNext
-ÈÑÇì ÇÏÇãå Ñæì Ï˜ãå  ÈÚÏ ˜áí˜ ˜äíÏ.
+Ø¨Ø±Ø§ÛŒ Ø§Ø¯Ø§Ù…Ù‡ Ø±ÙˆÛŒ Ø¯Ú©Ù…Ù‡â€ŒÛŒ Ø¨Ø¹Ø¯ Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯.
 # ^ClickInstall
-ÈÑÇì ÔÑæÚ äÕÈ Ñæì Ï˜ãå äÕÈ ˜áí˜ ˜äíÏ.
+Ø¨Ø±Ø§ÛŒ Ø´Ø±ÙˆØ¹ Ù†ØµØ¨ Ø±ÙˆÛŒ Ø¯Ú©Ù…Ù‡â€ŒÛŒ Ù†ØµØ¨ Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯.
 # ^ClickUninstall
-ÈÑÇì ÔÑæÚ ÍÐÝ Ñæì Ï˜ãå ÍÐÝ ˜áí˜ ˜äíÏ.
+Ø¨Ø±Ø§ÛŒ Ø´Ø±ÙˆØ¹ Ø­Ø°Ù� Ø±ÙˆÛŒ Ø¯Ú©Ù…Ù‡â€ŒÛŒ Ø­Ø°Ù� Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯.
 # ^Name
-äÇã
+Ù†Ø§Ù…
 # ^Completed
-�ÇíÇä íÇÝÊ
+Ù¾Ø§ÛŒØ§Ù† ÛŒØ§Ù�Øª
 # ^LicenseText
-áØÝÇð ÞÈá ÇÒ äÕÈ $(^NameDA) ãÊä ãÌæÒ ÑÇ ÈÎæÇäíÏ. Ç�Ñ åãå ÈäÏåÇì Âä ÑÇ ÞÈæá ÏÇÑíÏ Ñæì Ï˜ãå ãæÇÝÞã ˜áí˜ ˜äíÏ.
+Ù„Ø·Ù�Ø§Ù‹ Ù‚Ø¨Ù„ Ø§Ø² Ù†ØµØ¨ $(^NameDA) Ù…ØªÙ† Ù…Ø¬ÙˆØ² Ø±Ø§ Ø¨Ø®ÙˆØ§Ù†ÛŒØ¯. Ø§Ú¯Ø± Ù‡Ù…Ù‡â€ŒÛŒ Ø¨Ù†Ø¯Ù‡Ø§ÛŒ Ø¢Ù† Ø±Ø§ Ù‚Ø¨ÙˆÙ„ Ø¯Ø§Ø±ÛŒØ¯ Ø±ÙˆÛŒ Ø¯Ú©Ù…Ù‡â€ŒÛŒ Ù…ÙˆØ§Ù�Ù‚Ù… Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯.
 # ^LicenseTextCB
-áØÝÇð ÞÈá ÇÒ äÕÈ $(^NameDA) ãÊä ãÌæÒ ÑÇ ÈÎæÇäíÏ. Ç�Ñ åãå ÈäÏåÇì Âä ÑÇ ÞÈæá ÏÇÑíÏ Ñæì ÌÚÈå äÔÇäå�Òäì ÒíÑ ˜áí˜ ˜äíÏ. $_CLICK
+Ù„Ø·Ù�Ø§Ù‹ Ù‚Ø¨Ù„ Ø§Ø² Ù†ØµØ¨ $(^NameDA) Ù…ØªÙ† Ù…Ø¬ÙˆØ² Ø±Ø§ Ø¨Ø®ÙˆØ§Ù†ÛŒØ¯. Ø§Ú¯Ø± Ù‡Ù…Ù‡â€ŒÛŒ Ø¨Ù†Ø¯Ù‡Ø§ÛŒ Ø¢Ù† Ø±Ø§ Ù‚Ø¨ÙˆÙ„ Ø¯Ø§Ø±ÛŒØ¯ Ø±ÙˆÛŒ Ø¬Ø¹Ø¨Ù‡ Ù†Ø´Ø§Ù†Ù‡â€ŒØ²Ù†ÛŒ Ø²ÛŒØ± Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯. $_CLICK
 # ^LicenseTextRB
-áØÝÇð ÞÈá ÇÒ äÕÈ $(^NameDA) ãÊä ãÌæÒ ÑÇ ÈÎæÇäíÏ. Ç�Ñ åãå ÈäÏåÇì Âä ÑÇ ÞÈæá ÏÇÑíÏ �Òíäå Çæá ÑÇ ÇäÊÎÇÈ ˜äíÏ. $_CLICK
+Ù„Ø·Ù�Ø§Ù‹ Ù‚Ø¨Ù„ Ø§Ø² Ù†ØµØ¨ $(^NameDA) Ù…ØªÙ† Ù…Ø¬ÙˆØ² Ø±Ø§ Ø¨Ø®ÙˆØ§Ù†ÛŒØ¯. Ø§Ú¯Ø± Ù‡Ù…Ù‡â€ŒÛŒ Ø¨Ù†Ø¯Ù‡Ø§ÛŒ Ø¢Ù† Ø±Ø§ Ù‚Ø¨ÙˆÙ„ Ø¯Ø§Ø±ÛŒØ¯ Ú¯Ø²ÛŒÙ†Ù‡â€ŒÛŒ Ø§ÙˆÙ„ Ø±Ø§ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯. $_CLICK
 # ^UnLicenseText
-áØÝÇð ÞÈá ÇÒ ÍÐÝ $(^NameDA) ãÊä ãÌæÒ ÑÇ ÈÎæÇäíÏ. Ç�Ñ åãå ÈäÏåÇì Âä ÑÇ ÞÈæá ÏÇÑíÏ Ñæì Ï˜ãå ãæÇÝÞã ˜áí˜ ˜äíÏ.
+Ù„Ø·Ù�Ø§Ù‹ Ù‚Ø¨Ù„ Ø§Ø² Ø­Ø°Ù� $(^NameDA) Ù…ØªÙ† Ù…Ø¬ÙˆØ² Ø±Ø§ Ø¨Ø®ÙˆØ§Ù†ÛŒØ¯. Ø§Ú¯Ø± Ù‡Ù…Ù‡â€ŒÛŒ Ø¨Ù†Ø¯Ù‡Ø§ÛŒ Ø¢Ù† Ø±Ø§ Ù‚Ø¨ÙˆÙ„ Ø¯Ø§Ø±ÛŒØ¯ Ø±ÙˆÛŒ Ø¯Ú©Ù…Ù‡â€ŒÛŒ Ù…ÙˆØ§Ù�Ù‚Ù… Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯.
 # ^UnLicenseTextCB
-áØÝÇð ÞÈá ÇÒ ÍÐÝ $(^NameDA) ãÊä ãÌæÒ ÑÇ ÈÎæÇäíÏ. Ç�Ñ åãå ÈäÏåÇì Âä ÑÇ ÞÈæá ÏÇÑíÏ Ñæì ÌÚÈå äÔÇäå�Òäì ÒíÑ ˜áí˜ ˜äíÏ. $_CLICK
+Ù„Ø·Ù�Ø§Ù‹ Ù‚Ø¨Ù„ Ø§Ø² Ø­Ø°Ù� $(^NameDA) Ù…ØªÙ† Ù…Ø¬ÙˆØ² Ø±Ø§ Ø¨Ø®ÙˆØ§Ù†ÛŒØ¯. Ø§Ú¯Ø± Ù‡Ù…Ù‡â€ŒÛŒ Ø¨Ù†Ø¯Ù‡Ø§ÛŒ Ø¢Ù† Ø±Ø§ Ù‚Ø¨ÙˆÙ„ Ø¯Ø§Ø±ÛŒØ¯ Ø±ÙˆÛŒ Ø¬Ø¹Ø¨Ù‡ Ù†Ø´Ø§Ù†Ù‡â€ŒØ²Ù†ÛŒ Ø²ÛŒØ± Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯. $_CLICK
 # ^UnLicenseTextRB
-áØÝÇð ÞÈá ÇÒ ÍÐÝ $(^NameDA) ãÊä ãÌæÒ ÑÇ ÈÎæÇäíÏ. Ç�Ñ åãå ÈäÏåÇì Âä ÑÇ ÞÈæá ÏÇÑíÏ �Òíäå Çæá ÑÇ ÇäÊÎÇÈ ˜äíÏ. $_CLICK
+Ù„Ø·Ù�Ø§Ù‹ Ù‚Ø¨Ù„ Ø§Ø² Ø­Ø°Ù� $(^NameDA) Ù…ØªÙ† Ù…Ø¬ÙˆØ² Ø±Ø§ Ø¨Ø®ÙˆØ§Ù†ÛŒØ¯. Ø§Ú¯Ø± Ù‡Ù…Ù‡â€ŒÛŒ Ø¨Ù†Ø¯Ù‡Ø§ÛŒ Ø¢Ù† Ø±Ø§ Ù‚Ø¨ÙˆÙ„ Ø¯Ø§Ø±ÛŒØ¯ Ú¯Ø²ÛŒÙ†Ù‡â€ŒÛŒ Ø§ÙˆÙ„ Ø±Ø§ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯. $_CLICK
 # ^Custom
-ÓÝÇÑÔì
+Ø³Ù�Ø§Ø±Ø´ÛŒ
 # ^ComponentsText
-˜äÇÑ ÈÎÔ�åÇíì ˜å ãì�ÎæÇåíÏ äÕÈ ÔæäÏ äÔÇäå ÈÒäíÏ æ äÔÇäå ÈÎÔ�åÇíì ÑÇ ˜å äãì�ÎæÇåíÏ äÕÈ ÔæäÏ ÈÑÏÇÑíÏ. $_CLICK
+Ú©Ù†Ø§Ø± Ø¨Ø®Ø´â€ŒÙ‡Ø§ÛŒÛŒ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ù†ØµØ¨ Ø´ÙˆÙ†Ø¯ Ù†Ø´Ø§Ù†Ù‡ Ø¨Ø²Ù†ÛŒØ¯ Ùˆ Ù†Ø´Ø§Ù†Ù‡ Ø¨Ø®Ø´â€ŒÙ‡Ø§ÛŒÛŒ Ø±Ø§ Ú©Ù‡ Ù†Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ù†ØµØ¨ Ø´ÙˆÙ†Ø¯ Ø¨Ø±Ø¯Ø§Ø±ÛŒØ¯. $_CLICK
 # ^ComponentsSubText1
-äæÚ äÕÈ ÑÇ ãÔÎÕ ˜äíÏ: 
+Ù†ÙˆØ¹ Ù†ØµØ¨ Ø±Ø§ Ù…Ø´Ø®Øµ Ú©Ù†ÛŒØ¯: 
 # ^ComponentsSubText2_NoInstTypes
-ÈÎÔ�åÇíì ÑÇ ˜å ãì�ÎæÇåíÏ äÕÈ ÔæäÏ ÇäÊÎÇÈ ˜äíÏ:
+Ø¨Ø®Ø´â€ŒÙ‡Ø§ÛŒÛŒ Ø±Ø§ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ù†ØµØ¨ Ø´ÙˆÙ†Ø¯ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯:
 # ^ComponentsSubText2
-íÇ¡ ÈÎÔ�åÇì ÇÎÊíÇÑì ÑÇ ˜å ãì�ÎæÇåíÏ äÕÈ ÔæäÏ ÇäÊÎÇÈ ˜äíÏ: 
+ÛŒØ§ØŒ Ø¨Ø®Ø´â€ŒÙ‡Ø§ÛŒ Ø§Ø®ØªÛŒØ§Ø±ÛŒ Ø±Ø§ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ù†ØµØ¨ Ø´ÙˆÙ†Ø¯ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯: 
 # ^UnComponentsText
-˜äÇÑ ÈÎÔ�åÇíì ˜å ãì�ÎæÇåíÏ ÍÐÝ ÔæäÏ äÔÇäå ÈÒäíÏ æ äÔÇäå ÈÎÔ�åÇíì ÑÇ ˜å äãì�ÎæÇåíÏ ÍÐÝ ÔæäÏ ÈÑÏÇÑíÏ. $_CLICK
+Ú©Ù†Ø§Ø± Ø¨Ø®Ø´â€ŒÙ‡Ø§ÛŒÛŒ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø­Ø°Ù� Ø´ÙˆÙ†Ø¯ Ù†Ø´Ø§Ù†Ù‡ Ø¨Ø²Ù†ÛŒØ¯ Ùˆ Ù†Ø´Ø§Ù†Ù‡ Ø¨Ø®Ø´â€ŒÙ‡Ø§ÛŒÛŒ Ø±Ø§ Ú©Ù‡ Ù†Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø­Ø°Ù� Ø´ÙˆÙ†Ø¯ Ø¨Ø±Ø¯Ø§Ø±ÛŒØ¯. $_CLICK
 # ^UnComponentsSubText1
-äæÚ ÍÐÝ ÑÇ ÇäÊÎÇÈ ˜äíÏ: 
+Ù†ÙˆØ¹ Ø­Ø°Ù� Ø±Ø§ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯: 
 # ^UnComponentsSubText2_NoInstTypes
-ÈÎÔ�åÇíì ÑÇ ˜å ãì�ÎæÇåíÏ ÍÐÝ ÔæäÏ ÇäÊÎÇÈ ˜äíÏ:
+Ø¨Ø®Ø´â€ŒÙ‡Ø§ÛŒÛŒ Ø±Ø§ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø­Ø°Ù� Ø´ÙˆÙ†Ø¯ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯:
 # ^UnComponentsSubText2
-íÇ¡ ÈÎÔ�åÇì ÇÎÊíÇÑì ÑÇ ˜å ãì�ÎæÇåíÏ ÍÐÝ ÔæäÏ ÇäÊÎÇÈ ˜äíÏ: 
+ÛŒØ§ØŒ Ø¨Ø®Ø´â€ŒÙ‡Ø§ÛŒ Ø§Ø®ØªÛŒØ§Ø±ÛŒ Ø±Ø§ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø­Ø°Ù� Ø´ÙˆÙ†Ø¯ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯: 
 # ^DirText
-ÈÑäÇãå äÕÈ¡ $(^NameDA) ÑÇ ÏÑ �æÔå ÒíÑ äÕÈ ÎæÇåÏ ˜ÑÏ. ÈÑÇì äÕÈ ÏÑ �æÔå Ïí�Ñ Ñæì Ï˜ãå ãÑæÑ ˜áí˜ ˜äíÏ æ �æÔå Ïí�Ñì ÇäÊÎÇÈ ˜äíÏ. $_CLICK
+Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù†ØµØ¨ØŒ $(^NameDA) Ø±Ø§ Ø¯Ø± Ù¾ÙˆØ´Ù‡â€ŒÛŒ Ø²ÛŒØ± Ù†ØµØ¨ Ø®ÙˆØ§Ù‡Ø¯ Ú©Ø±Ø¯. Ø¨Ø±Ø§ÛŒ Ù†ØµØ¨ Ø¯Ø± Ù¾ÙˆØ´Ù‡â€ŒÛŒ Ø¯ÛŒÚ¯Ø± Ø±ÙˆÛŒ Ø¯Ú©Ù…Ù‡ Ù…Ø±ÙˆØ± Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯ Ùˆ Ù¾ÙˆØ´Ù‡â€ŒÛŒ Ø¯ÛŒÚ¯Ø±ÛŒ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯. $_CLICK
 # ^DirSubText
-�æÔå ãÞÕÏ
+Ù¾ÙˆØ´Ù‡â€ŒÛŒ Ù…Ù‚ØµØ¯
 # ^DirBrowseText
-ÇäÊÎÇÈ �æÔå ÈÑÇì äÕÈ $(^NameDA):
+Ø§Ù†ØªØ®Ø§Ø¨ Ù¾ÙˆØ´Ù‡ Ø¨Ø±Ø§ÛŒ Ù†ØµØ¨ $(^NameDA):
 # ^UnDirText
-ÈÑäÇãå äÕÈ¡ $(^NameDA) ÑÇ ÇÒ �æÔå ÒíÑ ÍÐÝ ÎæÇåÏ ˜ÑÏ. ÈÑÇì äÕÈ ÏÑ �æÔå Ïí�Ñ Ñæì Ï˜ãå ãÑæÑ ˜áí˜ ˜äíÏ æ �æÔå Ïí�Ñì ÇäÊÎÇÈ ˜äíÏ. $_CLICK
+Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù†ØµØ¨ØŒ $(^NameDA) Ø±Ø§ Ø§Ø² Ù¾ÙˆØ´Ù‡â€ŒÛŒ Ø²ÛŒØ± Ø­Ø°Ù� Ø®ÙˆØ§Ù‡Ø¯ Ú©Ø±Ø¯. Ø¨Ø±Ø§ÛŒ Ù†ØµØ¨ Ø¯Ø± Ù¾ÙˆØ´Ù‡â€ŒÛŒ Ø¯ÛŒÚ¯Ø± Ø±ÙˆÛŒ Ø¯Ú©Ù…Ù‡ Ù…Ø±ÙˆØ± Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯ Ùˆ Ù¾ÙˆØ´Ù‡â€ŒÛŒ Ø¯ÛŒÚ¯Ø±ÛŒ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-ÇäÊÎÇÈ �æÔå ÈÑÇì ÍÐÝ $(^NameDA):
+Ø§Ù†ØªØ®Ø§Ø¨ Ù¾ÙˆØ´Ù‡ Ø¨Ø±Ø§ÛŒ Ø­Ø°Ù� $(^NameDA):
 # ^SpaceAvailable
-"ÝÖÇì ãæÌæÏ: "
+"Ù�Ø¶Ø§ÛŒ Ù…ÙˆØ¬ÙˆØ¯: "
 # ^SpaceRequired
-"ÝÖÇì ãæÑÏ äíÇÒ: "
+"Ù�Ø¶Ø§ÛŒ Ù…ÙˆØ±Ø¯ Ù†ÛŒØ§Ø²: "
 # ^UninstallingText
-þ(^NameDA) ÇÒ �æÔå ÒíÑ ÍÐÝ ÎæÇåÏ ÔÏ. $_CLICK
+$(^NameDA) Ø§Ø² Ù¾ÙˆØ´Ù‡â€ŒÛŒ Ø²ÛŒØ± Ø­Ø°Ù� Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯. $_CLICK
 # ^UninstallingSubText
-ÍÐÝ ÇÒ: 
+Ø­Ø°Ù� Ø§Ø²: 
 # ^FileError
-ÎØÇ åä�Çã ÈÇÒ ˜ÑÏä �ÑæäÏå ÈÑÇì äæÔÊä: \r\n\r\n$0\r\n\n ÈÑÇì ÊæÞÝ äÕÈ Ñæì Abort \r\n ÈÑÇì ÊáÇÔ ãÌÏÏ Ñæì Retry \r\n æ ÈÑÇì ÕÑÝ�äÙÑ ÇÒ Çíä �ÑæäÏå Ñæì Ignore ˜áí˜ ˜äíÏ.
+Ø®Ø·Ø§ Ù‡Ù†Ú¯Ø§Ù… Ø¨Ø§Ø² Ú©Ø±Ø¯Ù† Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø¨Ø±Ø§ÛŒ Ù†ÙˆØ´ØªÙ†: \r\n\r\n$0\r\n\n Ø¨Ø±Ø§ÛŒ ØªÙˆÙ‚Ù� Ù†ØµØ¨ Ø±ÙˆÛŒ Abort \r\n Ø¨Ø±Ø§ÛŒ ØªÙ„Ø§Ø´ Ù…Ø¬Ø¯Ø¯ Ø±ÙˆÛŒ Retry \r\n Ùˆ Ø¨Ø±Ø§ÛŒ ØµØ±Ù�â€ŒÙ†Ø¸Ø± Ø§Ø² Ø§ÛŒÙ† Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø±ÙˆÛŒ Ignore Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯.
 # ^FileError_NoIgnore
-ÎØÇ åä�Çã ÈÇÒ ˜ÑÏä �ÑæäÏå ÈÑÇì äæÔÊä: \r\n\r\n$0\r\n\nÈÑÇì ÊáÇÔ ãÌÏÏ Ñæì Retry\r\næ ÈÑÇì ÇäÕÑÇÝ Ñæì Cancel ˜áí˜ ˜äíÏ.
+Ø®Ø·Ø§ Ù‡Ù†Ú¯Ø§Ù… Ø¨Ø§Ø² Ú©Ø±Ø¯Ù† Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø¨Ø±Ø§ÛŒ Ù†ÙˆØ´ØªÙ†: \r\n\r\n$0\r\n\nØ¨Ø±Ø§ÛŒ ØªÙ„Ø§Ø´ Ù…Ø¬Ø¯Ø¯ Ø±ÙˆÛŒ Retry\r\nÙˆ Ø¨Ø±Ø§ÛŒ Ø§Ù†ØµØ±Ø§Ù� Ø±ÙˆÛŒ Cancel Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯.
 # ^CantWrite
-"äæÔÊä ãã˜ä äíÓÊ: "
+"Ù†ÙˆØ´ØªÙ† Ù…Ù…Ú©Ù† Ù†ÛŒØ³Øª: "
 # ^CopyFailed
-äÓÎå�ÈÑÏÇÑì äÇãæÝÞ ÈæÏ.
+Ù†Ø³Ø®Ù‡â€ŒØ¨Ø±Ø¯Ø§Ø±ÛŒ Ù†Ø§Ù…ÙˆÙ�Ù‚ Ø¨ÙˆØ¯.
 # ^CopyTo
-"äÓÎå�ÈÑÏÇÑì ÏÑ: "
+"Ù†Ø³Ø®Ù‡â€ŒØ¨Ø±Ø¯Ø§Ø±ÛŒ Ø¯Ø±: "
 # ^Registering
-"ÏÑ ÍÇá ËÈÊ: "
+"Ø¯Ø± Ø­Ø§Ù„ Ø«Ø¨Øª: "
 # ^Unregistering
-"ÏÑ ÍÇá ÍÐÝ ËÈÊ: "
+"Ø¯Ø± Ø­Ø§Ù„ Ø­Ø°Ù� Ø«Ø¨Øª: "
 # ^SymbolNotFound
-"ÚáÇãÊ �íÏÇ äÔÏ: "
+"Ø¹Ù„Ø§Ù…Øª Ù¾ÛŒØ¯Ø§ Ù†Ø´Ø¯: "
 # ^CouldNotLoad
-"ÈÇÑ�ÐÇÑì ãã˜ä äíÓÊ: "
+"Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ù…Ù…Ú©Ù† Ù†ÛŒØ³Øª: "
 # ^CreateFolder
-"ÇíÌÇÏ �æÔå: "
+"Ø§ÛŒØ¬Ø§Ø¯ Ù¾ÙˆØ´Ù‡: "
 # ^CreateShortcut
-"ÇíÌÇÏ ãíÇä�ÈõÑ: "
+"Ø§ÛŒØ¬Ø§Ø¯ Ù…ÛŒØ§Ù†â€ŒØ¨Ù�Ø±: "
 # ^CreatedUninstaller
-"ÍÐÝ�˜ääÏå ÇíÌÇÏ ÔÏ: "
+"Ø­Ø°Ù�â€ŒÚ©Ù†Ù†Ø¯Ù‡ Ø§ÛŒØ¬Ø§Ø¯ Ø´Ø¯: "
 # ^Delete
-"ÍÐÝ �ÑæäÏå: "
+"Ø­Ø°Ù� Ù¾Ø±ÙˆÙ†Ø¯Ù‡: "
 # ^DeleteOnReboot
-"ÍÐÝ åä�Çã ÑÇå ÇäÏÇÒì ãÌÏÏ: "
+"Ø­Ø°Ù� Ù‡Ù†Ú¯Ø§Ù… Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ Ù…Ø¬Ø¯Ø¯: "
 # ^ErrorCreatingShortcut
-"ÎØÇ åä�Çã ÇíÌÇÏ ãíÇä�ÈõÑ: "
+"Ø®Ø·Ø§ Ù‡Ù†Ú¯Ø§Ù… Ø§ÛŒØ¬Ø§Ø¯ Ù…ÛŒØ§Ù†â€ŒØ¨Ù�Ø±: "
 # ^ErrorCreating
-"ÎØÇ åä�Çã ÇíÌÇÏ: "
+"Ø®Ø·Ø§ Ù‡Ù†Ú¯Ø§Ù… Ø§ÛŒØ¬Ø§Ø¯: "
 # ^ErrorDecompressing
-ÎØÇ åä�Çã ÈÇÒ ˜ÑÏä ÇØáÇÚÇÊ! äÕÈ�˜ääÏå ÎÑÇÈ ÇÓÊ¿
+Ø®Ø·Ø§ Ù‡Ù†Ú¯Ø§Ù… Ø¨Ø§Ø² Ú©Ø±Ø¯Ù† Ø§Ø·Ù„Ø§Ø¹Ø§Øª! Ù†ØµØ¨â€ŒÚ©Ù†Ù†Ø¯Ù‡ Ø®Ø±Ø§Ø¨ Ø§Ø³ØªØŸ
 # ^ErrorRegistering
-ÎØÇ åä�Çã ËÈÊ DLL
+Ø®Ø·Ø§ Ù‡Ù†Ú¯Ø§Ù… Ø«Ø¨Øª DLL
 # ^ExecShell
-"�æÓÊå ÇÌÑÇíì: "
+"Ù¾ÙˆØ³ØªÙ‡ Ø§Ø¬Ø±Ø§ÛŒÛŒ: "
 # ^Exec
-"ÇÌÑÇ: "
+"Ø§Ø¬Ø±Ø§: "
 # ^Extract
-"ÇÓÊÎÑÇÌ: "
+"Ø§Ø³ØªØ®Ø±Ø§Ø¬: "
 # ^ErrorWriting
-"ÇÓÊÎÑÇÌ: ÎØÇ åä�Çã äæÔÊä ÏÑ �ÑæäÏå"
+"Ø§Ø³ØªØ®Ø±Ø§Ø¬: Ø®Ø·Ø§ Ù‡Ù†Ú¯Ø§Ù… Ù†ÙˆØ´ØªÙ† Ø¯Ø± Ù¾Ø±ÙˆÙ†Ø¯Ù‡"
 # ^InvalidOpcode
-äÕÈ�˜ääÏå ÎÑÇÈ ÇÓÊ: ˜Ï ÚãáíÇÊì äÇãÚÊÈÑ.
+Ù†ØµØ¨â€ŒÚ©Ù†Ù†Ø¯Ù‡ Ø®Ø±Ø§Ø¨ Ø§Ø³Øª: Ú©Ø¯ Ø¹Ù…Ù„ÛŒØ§ØªÛŒ Ù†Ø§Ù…Ø¹ØªØ¨Ø±.
 # ^NoOLE
-"þOLE æÌæÏ äÏÇÑÏ: "
+"â€�OLE ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯: "
 # ^OutputFolder
-"�æÔå ÎÑæÌì: "
+"Ù¾ÙˆØ´Ù‡â€ŒÛŒ Ø®Ø±ÙˆØ¬ÛŒ: "
 # ^RemoveFolder
-"ÍÐÝ �æÔå: "
+"Ø­Ø°Ù� Ù¾ÙˆØ´Ù‡: "
 # ^RenameOnReboot
-"ÊÛííÑ äÇã åä�Çã ÑÇå ÇäÏÇÒì ãÌÏÏ: "
+"ØªØºÛŒÛŒØ± Ù†Ø§Ù… Ù‡Ù†Ú¯Ø§Ù… Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ Ù…Ø¬Ø¯Ø¯: "
 # ^Rename
-"ÊÛííÑ äÇã: "
+"ØªØºÛŒÛŒØ± Ù†Ø§Ù…: "
 # ^Skipped
-"�Ôã �æÔì ÔÏ: "
+"Ú†Ø´Ù… Ù¾ÙˆØ´ÛŒ Ø´Ø¯: "
 # ^CopyDetails
-äÓÎå�ÈÑÏÇÑì ÌÒÆíÇÊ ÏÑ ˜áí��ÈÑÏ
+Ù†Ø³Ø®Ù‡â€ŒØ¨Ø±Ø¯Ø§Ø±ÛŒ Ø¬Ø²Ø¦ÛŒØ§Øª Ø¯Ø± Ú©Ù„ÛŒÙ¾â€ŒØ¨Ø±Ø¯
 # ^LogInstall
-ËÈÊ ÑæäÏ äÕÈ
+Ø«Ø¨Øª Ø±ÙˆÙ†Ø¯ Ù†ØµØ¨
 # ^Byte
- ÈÇíÊ
+ Ø¨Ø§ÛŒØª
 # ^Kilo
- ˜íáæ
+ Ú©ÛŒÙ„Ùˆ
 # ^Mega
- ã�Ç
+ Ù…Ú¯Ø§
 # ^Giga
- �í�Ç
+ Ú¯ÛŒÚ¯Ø§
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Romanian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Romanian.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Romanian.nlf	(revision 2956)
@@ -1,11 +1,11 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1048
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1250
 # RTL - anything else than RTL means LTR
 -
@@ -14,12 +14,12 @@
 # and Sorin Sbarnea INTERSOL SRL (sorin@intersol.ro) v4
 # New revision by George Radu (georadu@hotmail.com)
 # New revision by Iulian Dogariu (iulian@jayomega.net)
-#   - Use Romanian letters ãâîºþ
+#   - Use Romanian letters ÄƒÃ¢Ã®ÅŸÅ£
 #   - Use imperative forms on buttons
 #   - Replace some neologisms
 # New revision by Vlad Rusu (vlad@bitattack.ro)
-#	- "Rasfoieºte" replaced with "Alege" - more appropiate
-#	- "Eliminã" related terms replaced with more appropiate "Dezinstaleazã"
+#	- "RasfoieÅŸte" replaced with "Alege" - more appropiate
+#	- "EliminÄƒ" related terms replaced with more appropiate "DezinstaleazÄƒ"
 #	- Fixed: Wrong translation in ^FileError and ^FileError_NoIgnore -> no translation
 #	  needed Abort/Retry/Ignore, as these are not translated into local language, OS related
 # ^Branding
@@ -29,143 +29,143 @@
 # ^UninstallCaption
 Dezinstalare $(^Name)
 # ^LicenseSubCaption
-: Contract de licenþã
+: Contract de licenÅ£Äƒ
 # ^ComponentsSubCaption
-: Opþiuni instalare
+: OpÅ£iuni instalare
 # ^DirSubCaption
-: Directorul destinaþie
+: Directorul destinaÅ£ie
 # ^InstallingSubCaption
-: În curs de instalare
+: ÃŽn curs de instalare
 # ^CompletedSubCaption
-: Instalare terminatã
+: Instalare terminatÄƒ
 # ^UnComponentsSubCaption
-: Opþiuni dezinstalare
+: OpÅ£iuni dezinstalare
 # ^UnDirSubCaption
 : Directorul de dezinstalare
 # ^ConfirmSubCaption
-: Confirmã
+: ConfirmÄƒ
 # ^UninstallingSubCaption
-: În curs de dezinstalare
+: ÃŽn curs de dezinstalare
 # ^UnCompletedSubCaption
-: Terminã
+: TerminÄƒ
 # ^BackBtn
-< Îna&poi
+< ÃŽna&poi
 # ^NextBtn
-Îna&inte >
+ÃŽna&inte >
 # ^AgreeBtn
 &De acord
 # ^AcceptBtn
-&Accept termenii contractului de licenþã
+&Accept termenii contractului de licenÅ£Äƒ
 # ^DontAcceptBtn
-Nu accept termenii contractului de licenþã
+Nu accept termenii contractului de licenÅ£Äƒ
 # ^InstallBtn
-&Instaleazã
+&InstaleazÄƒ
 # ^UninstallBtn
-&Dezinstaleazã
+&DezinstaleazÄƒ
 # ^CancelBtn
-&Renunþã
+&RenunÅ£Äƒ
 # ^CloseBtn
-În&chide
+ÃŽn&chide
 # ^BrowseBtn
 &Alege...
 # ^ShowDetailsBtn
-Aratã &detalii
+AratÄƒ &detalii
 # ^ClickNext
-Apãsaþi Înainte pentru a continua.
+ApÄƒsaÅ£i ÃŽnainte pentru a continua.
 # ^ClickInstall
-Apãsaþi Instaleazã pentru a începe instalarea.
+ApÄƒsaÅ£i InstaleazÄƒ pentru a Ã®ncepe instalarea.
 # ^ClickUninstall
-Apãsaþi Dezinstaleazã pentru a începe dezinstalarea.
+ApÄƒsaÅ£i DezinstaleazÄƒ pentru a Ã®ncepe dezinstalarea.
 # ^Name
 Nume
 # ^Completed
 Terminat
 # ^LicenseText
-Citiþi cu atenþie contractul de licenþã înainte de a instala $(^NameDA). Dacã acceptaþi termenii contractului de licenþã, apãsaþi butonul De acord.
+CitiÅ£i cu atenÅ£ie contractul de licenÅ£Äƒ Ã®nainte de a instala $(^NameDA). DacÄƒ acceptaÅ£i termenii contractului de licenÅ£Äƒ, apÄƒsaÅ£i butonul De acord.
 # ^LicenseTextCB
-Citiþi cu atenþie contractul de licenþã înainte de a instala $(^NameDA). Dacã acceptaþi termenii contractului de licenþã, bifaþi cãsuþa de mai jos. $_CLICK
+CitiÅ£i cu atenÅ£ie contractul de licenÅ£Äƒ Ã®nainte de a instala $(^NameDA). DacÄƒ acceptaÅ£i termenii contractului de licenÅ£Äƒ, bifaÅ£i cÄƒsuÅ£a de mai jos. $_CLICK
 # ^LicenseTextRB
-Citiþi cu atenþie contractul de licenþã înainte de a instala $(^NameDA). Dacã acceptaþi termenii contractului de licenþã, selectaþi prima opþiune de mai jos. $_CLICK
+CitiÅ£i cu atenÅ£ie contractul de licenÅ£Äƒ Ã®nainte de a instala $(^NameDA). DacÄƒ acceptaÅ£i termenii contractului de licenÅ£Äƒ, selectaÅ£i prima opÅ£iune de mai jos. $_CLICK
 # ^UnLicenseText
-Citiþi cu atenþie contractul de licenþã înainte de a dezinstala $(^NameDA). Dacã acceptaþi termenii contractului de licenþã, apãsaþi butonul De acord.
+CitiÅ£i cu atenÅ£ie contractul de licenÅ£Äƒ Ã®nainte de a dezinstala $(^NameDA). DacÄƒ acceptaÅ£i termenii contractului de licenÅ£Äƒ, apÄƒsaÅ£i butonul De acord.
 # ^UnLicenseTextCB
-Citiþi cu atenþie contractul de licenþã înainte de a dezinstala $(^NameDA). Dacã acceptaþi termenii contractului de licenþã, bifaþi cãsuþa de mai jos. $_CLICK
+CitiÅ£i cu atenÅ£ie contractul de licenÅ£Äƒ Ã®nainte de a dezinstala $(^NameDA). DacÄƒ acceptaÅ£i termenii contractului de licenÅ£Äƒ, bifaÅ£i cÄƒsuÅ£a de mai jos. $_CLICK
 # ^UnLicenseTextRB
-Citiþi cu atenþie contractul de licenþã înainte de a dezinstala $(^NameDA). Dacã acceptaþi termenii contractului de licenþã, selectaþi prima opþiune de mai jos. $_CLICK
+CitiÅ£i cu atenÅ£ie contractul de licenÅ£Äƒ Ã®nainte de a dezinstala $(^NameDA). DacÄƒ acceptaÅ£i termenii contractului de licenÅ£Äƒ, selectaÅ£i prima opÅ£iune de mai jos. $_CLICK
 # ^Custom
-Personalizatã
+PersonalizatÄƒ
 # ^ComponentsText
-Alegeþi componentele pe care doriþi sã le instalaþi. $_CLICK
+AlegeÅ£i componentele pe care doriÅ£i sÄƒ le instalaÅ£i. $_CLICK
 # ^ComponentsSubText1
-Alegeþi tipul instalãrii:
+AlegeÅ£i tipul instalÄƒrii:
 # ^ComponentsSubText2_NoInstTypes
-Alegeþi componentele ce urmeazã a fi instalate:
+AlegeÅ£i componentele ce urmeazÄƒ a fi instalate:
 # ^ComponentsSubText2
-Sau, alegeþi componentele opþionale pe care doriþi sã le instalaþi:
+Sau, alegeÅ£i componentele opÅ£ionale pe care doriÅ£i sÄƒ le instalaÅ£i:
 # ^UnComponentsText
-Alegeþi componentele pe care doriþi sã le dezinstalaþi. $_CLICK
+AlegeÅ£i componentele pe care doriÅ£i sÄƒ le dezinstalaÅ£i. $_CLICK
 # ^UnComponentsSubText1
-Alegeþi tipul de dezinstalare:
+AlegeÅ£i tipul de dezinstalare:
 # ^UnComponentsSubText2_NoInstTypes
-Alegeþi componentele ce urmeazã a fi dezinstalate:
+AlegeÅ£i componentele ce urmeazÄƒ a fi dezinstalate:
 # ^UnComponentsSubText2
-Sau, alegeþi componentele opþionale pe care doriþi sã le dezinstalaþi:
+Sau, alegeÅ£i componentele opÅ£ionale pe care doriÅ£i sÄƒ le dezinstalaÅ£i:
 # ^DirText
-$(^NameDA) se va instala în urmãtorul director. Pentru a alege altã destinaþie, apãsaþi Alege ºi alegeþi alt director. $_CLICK
+$(^NameDA) se va instala Ã®n urmÄƒtorul director. Pentru a alege altÄƒ destinaÅ£ie, apÄƒsaÅ£i Alege ÅŸi alegeÅ£i alt director. $_CLICK
 # ^DirSubText
-Director destinaþie
+Director destinaÅ£ie
 # ^DirBrowseText
-Alegeþi directorul în care doriþi sã instalaþi $(^NameDA):
+AlegeÅ£i directorul Ã®n care doriÅ£i sÄƒ instalaÅ£i $(^NameDA):
 # ^UnDirText
-$(^NameDA) se va dezinstala din urmãtorul director. Pentru a dezinstala din alt director, apãsaþi Alege ºi alegeþi alt director. $_CLICK
+$(^NameDA) se va dezinstala din urmÄƒtorul director. Pentru a dezinstala din alt director, apÄƒsaÅ£i Alege ÅŸi alegeÅ£i alt director. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Alegeþi directorul de dezinstalare al $(^NameDA):
+AlegeÅ£i directorul de dezinstalare al $(^NameDA):
 # ^SpaceAvailable
-"Spaþiu disponibil: "
+"SpaÅ£iu disponibil: "
 # ^SpaceRequired
-"Spaþiu necesar: "
+"SpaÅ£iu necesar: "
 # ^UninstallingText
-Aceastã aplicaþie va dezinstala $(^NameDA) din computerul Dv. $_CLICK
+AceastÄƒ aplicaÅ£ie va dezinstala $(^NameDA) din computerul Dv. $_CLICK
 # ^UninstallingSubText
 Dezinstalare din:
 # ^FileError
-Eroare la scrierea fiºierului: \r\n\t"$0"\r\nApãsaþi Abort pentru oprirea instalãrii,\r\nRetry pentru a mai încerca o datã scrierea fiºierului, \r\nIgnore pentru a trece peste acest fiºier.
+Eroare la scrierea fiÅŸierului: \r\n\t"$0"\r\nApÄƒsaÅ£i Abort pentru oprirea instalÄƒrii,\r\nRetry pentru a mai Ã®ncerca o datÄƒ scrierea fiÅŸierului, \r\nIgnore pentru a trece peste acest fiÅŸier.
 # ^FileError_NoIgnore
-Eroare la scrierea fiºierului: \r\n\t"$0"\r\nApãsaþi Retry pentru a mai încerca o datã, sau\r\nAbort pentru oprirea instalãrii.
+Eroare la scrierea fiÅŸierului: \r\n\t"$0"\r\nApÄƒsaÅ£i Retry pentru a mai Ã®ncerca o datÄƒ, sau\r\nAbort pentru oprirea instalÄƒrii.
 # ^CantWrite
 "Nu am putut scrie: "
 # ^CopyFailed
-Copierea a eºuat
+Copierea a eÅŸuat
 # ^CopyTo
-"Copiere în "
+"Copiere Ã®n "
 # ^Registering
-"Se înregistreazã: "
+"Se Ã®nregistreazÄƒ: "
 # ^Unregistering
-"Se dezînregistreazã din registru: "
+"Se dezÃ®nregistreazÄƒ din registru: "
 # ^SymbolNotFound
-"Simbolul nu a fost gãsit: "
+"Simbolul nu a fost gÄƒsit: "
 # ^CouldNotLoad
-"Nu am putut încãrca: "
+"Nu am putut Ã®ncÄƒrca: "
 # ^CreateFolder
 "Creare director: "
 # ^CreateShortcut
-"Creare comandã rapidã: "
+"Creare comandÄƒ rapidÄƒ: "
 # ^CreatedUninstaller
-"S-a creat aplicaþia de dezinstalare: "
+"S-a creat aplicaÅ£ia de dezinstalare: "
 # ^Delete
-"ªtergere fiºier: "
+"Åžtergere fiÅŸier: "
 # ^DeleteOnReboot
-"ªtergere la repornire: "
+"Åžtergere la repornire: "
 # ^ErrorCreatingShortcut
 "Eroare la crearea comenzii rapide: "
 # ^ErrorCreating
 "Eroare la creare: "
 # ^ErrorDecompressing
-Eroare la dezarhivarea datelor! Aplicatia de instalare este defectã?
+Eroare la dezarhivarea datelor! Aplicatia de instalare este defectÄƒ?
 # ^ErrorRegistering
-Eroare la Înregistrarea DLL-ului
+Eroare la ÃŽnregistrarea DLL-ului
 # ^ExecShell
 "ExecShell: "
 # ^Exec
@@ -173,30 +173,30 @@
 # ^Extract
 "Extragere: "
 # ^ErrorWriting
-"Extragere: eroare la scriere în fiºier "
+"Extragere: eroare la scriere Ã®n fiÅŸier "
 # ^InvalidOpcode
-Aplicaþie de instalare defectã: opcode incorect
+AplicaÅ£ie de instalare defectÄƒ: opcode incorect
 # ^NoOLE
-"Nu existã OLE pentru: "
+"Nu existÄƒ OLE pentru: "
 # ^OutputFolder
-"Directorul destinaþie: "
+"Directorul destinaÅ£ie: "
 # ^RemoveFolder
-"ªtergere destinaþie: "
+"Åžtergere destinaÅ£ie: "
 # ^RenameOnReboot
 "Redenumire la repornirea computerului: "
 # ^Rename
 "Redenumire: "
 # ^Skipped
-"Sãrite: "
+"SÄƒrite: "
 # ^CopyDetails
-Copiere detalii în clipboard
+Copiere detalii Ã®n clipboard
 # ^LogInstall
 Jurnal proces instalare
 # ^Byte
 O
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Polish.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Polish.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Polish.nsh	(revision 2956)
@@ -1,132 +1,132 @@
-;Language: Polish (1045)
-;By Piotr Murawski & Rafa³ Lampe
+ï»¿;Language: Polish (1045)
+;By Piotr Murawski & RafaÅ‚ Lampe
 ;Updated by cube and SYSTEMsoft Group
-;Updated by Pawe³ Porwisz, http://www.pepesoft.tox.pl
-;Corrected by Mateusz Gola (aka Prozac) - http://www.videopedia.pl/avirecomp
+;Updated by Mateusz Gola (aka Prozac) - http://www.avirecomp.com
+;Updated by PaweÅ‚ Porwisz (http://www.pawelporwisz.pl)
 
-!insertmacro LANGFILE "Polish" "Polski"
+!insertmacro LANGFILE "Polish" = "Polski" =
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Witamy w kreatorze instalacji programu $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Kreator ten pomo¿e Ci zainstalowaæ program $(^NameDA).$\r$\n$\r$\nZalecane jest zamkniêcie wszystkich uruchomionych programów przed rozpoczêciem instalacji. Pozwoli to na uaktualnienie niezbêdnych plików systemowych bez koniecznoœci ponownego uruchamiania komputera.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Witamy w kreatorze instalacji $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Kreator ten pomoÅ¼e Ci zainstalowaÄ‡ $(^NameDA).$\r$\n$\r$\nZalecane jest zamkniÄ™cie wszystkich uruchomionych programÃ³w przed rozpoczÄ™ciem instalacji. Pozwoli to na uaktualnienie niezbÄ™dnych plikÃ³w systemowych bez koniecznoÅ›ci ponownego uruchamiania komputera.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
   ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Witamy w kreatorze deinstalacji $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Kreator poprowadzi Ciê przez proces deinstalacji $(^NameDA).$\r$\n$\r$\nPrzed rozpoczêciem deinstalacji programu, upewnij siê, czy $(^NameDA) NIE jest w³aœnie uruchomiony.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Kreator ten pomoÅ¼e Ci odinstalowaÄ‡ $(^NameDA).$\r$\n$\r$\nPrzed rozpoczÄ™ciem deinstalacji, upewnij siÄ™, Å¼e $(^NameDA) nie jest uruchomiony.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
   ${LangFileString} MUI_TEXT_LICENSE_TITLE "Umowa licencyjna"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Przed instalacj¹ programu $(^NameDA) zapoznaj siê z warunkami licencji."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Je¿eli akceptujesz warunki umowy, wybierz Zgadzam siê, aby kontynuowaæ. Musisz zaakceptowaæ warunki umowy, aby zainstalowaæ $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Je¿eli akceptujesz warunki umowy, zaznacz pole wyboru poni¿ej, aby kontynuowaæ. Musisz zaakceptowaæ warunki umowy, aby zainstalowaæ $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Je¿eli akceptujesz warunki umowy, wybierz pierwsz¹ opcjê poni¿ej, aby kontynuowaæ. Musisz zaakceptowaæ warunki umowy, aby zainstalowaæ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Przed instalacjÄ… $(^NameDA) zapoznaj siÄ™ z warunkami licencji."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "JeÅ¼eli akceptujesz warunki umowy, kliknij przycisk 'Zgadzam siÄ™', aby kontynuowaÄ‡. Musisz zaakceptowaÄ‡ warunki umowy, aby zainstalowaÄ‡ $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "JeÅ¼eli akceptujesz warunki umowy, zaznacz poniÅ¼sze pole wyboru, aby kontynuowaÄ‡. Musisz zaakceptowaÄ‡ warunki umowy, aby zainstalowaÄ‡ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "JeÅ¼eli akceptujesz warunki umowy, wybierz pierwszÄ… z poniÅ¼szych opcji, aby kontynuowaÄ‡. Musisz zaakceptowaÄ‡ warunki umowy, aby zainstalowaÄ‡ $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
   ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Umowa licencyjna"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Przed deinstalacj¹ programu $(^NameDA) zapoznaj siê z warunkami licencji."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Je¿eli akceptujesz warunki umowy, wybierz Zgadzam siê, aby kontynuowaæ. Musisz zaakceptowaæ warunki umowy, aby odinstalowaæ $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Je¿eli akceptujesz warunki umowy, zaznacz pole wyboru poni¿ej, aby kontynuowaæ. Musisz zaakceptowaæ warunki umowy, aby odinstalowaæ $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Je¿eli akceptujesz warunki umowy, wybierz pierwsz¹ opcjê poni¿ej, aby kontynuowaæ. Musisz zaakceptowaæ warunki umowy, aby odinstalowaæ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Przed deinstalacjÄ… $(^NameDA) zapoznaj siÄ™ z warunkami licencji."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "JeÅ¼eli akceptujesz warunki umowy, kliknij przycisk 'Zgadzam siÄ™', aby kontynuowaÄ‡. Musisz zaakceptowaÄ‡ warunki umowy, aby odinstalowaÄ‡ $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "JeÅ¼eli akceptujesz warunki umowy, zaznacz poniÅ¼sze pole wyboru, aby kontynuowaÄ‡. Musisz zaakceptowaÄ‡ warunki umowy, aby odinstalowaÄ‡ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "JeÅ¼eli akceptujesz warunki umowy, wybierz pierwszÄ… z poniÅ¼szych opcji, aby kontynuowaÄ‡. Musisz zaakceptowaÄ‡ warunki umowy, aby odinstalowaÄ‡ $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Naciœnij klawisz Page Down, aby zobaczyæ resztê umowy."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "NaciÅ›nij klawisz Page Down, aby zobaczyÄ‡ dalszÄ… czÄ™Å›Ä‡ umowy."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
   ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Wybierz komponenty"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Wybierz komponenty programu $(^NameDA), które chcesz zainstalowaæ."
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Wybierz komponenty $(^NameDA), ktÃ³re chcesz zainstalowaÄ‡."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Wybierz komponenty"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Wybierz, które elementy $(^NameDA) chcesz odinstalowaæ."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Wybierz, ktÃ³re elementy $(^NameDA) chcesz odinstalowaÄ‡."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Opis"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Przesuñ kursor myszy nad komponent, aby zobaczyæ jego opis."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "PrzesuÅ„ kursor myszy nad komponent, aby zobaczyÄ‡ jego opis."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Przesuñ kursor myszy nad komponent, aby zobaczyæ jego opis."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Wybierz komponent, aby zobaczyÄ‡ jego opis."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Wybierz lokalizacjê dla instalacji"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Wybierz folder, w którym ma byæ zainstalowany $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Wybierz lokalizacjÄ™ dla instalacji"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Wybierz folder, w ktÃ³rym chcesz zainstalowaÄ‡ $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Wybór miejsca deinstalacji"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Wybierz folder, z którego chcesz odinstalowaæ $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Wybierz lokalizacjÄ™ dla deinstalacji"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Wybierz folder, z ktÃ³rego chcesz odinstalowaÄ‡ $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Instalacja"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Proszê czekaæ, podczas gdy $(^NameDA) jest instalowany."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Zakoñczono instalacjê"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Instalacja zakoñczona pomyœlnie."
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "ProszÄ™ czekaÄ‡, trwa instalacja $(^NameDA)."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "ZakoÅ„czono instalacjÄ™"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Instalacja zakoÅ„czona pomyÅ›lnie."
   ${LangFileString} MUI_TEXT_ABORT_TITLE "Instalacja przerwana"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Instalacja nie zosta³a zakoñczona pomyœlnie."
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Instalacja nie zostaÅ‚a zakoÅ„czona pomyÅ›lnie."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Deinstalacja"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Proszê czekaæ, $(^NameDA) jest odinstalowywany."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Zakoñczono odinstalowanie"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Odinstalowanie zakoñczone pomyœlnie."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "ProszÄ™ czekaÄ‡, trwa deinstalacja $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "ZakoÅ„czono deinstalacjÄ™"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Odinstalowanie zakoÅ„czone pomyÅ›lnie."
   ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Deinstalacja przerwana"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Deinstalacja nie zosta³a zakoñczona pomyœlnie."
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Deinstalacja nie zostaÅ‚a zakoÅ„czona pomyÅ›lnie."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Koñczenie pracy kreatora instalacji $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) zosta³ pomyœlnie zainstalowany na Twoim komputerze.$\r$\n$\r$\nKliknij Zakoñcz, aby zakoñczyæ dzia³anie kreatora."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Twój komputer musi zostaæ ponownie uruchomiony, aby zakoñczyæ instalacjê programu $(^NameDA). Czy chcesz zrobiæ to teraz?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "KoÅ„czenie pracy kreatora instalacji $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) zostaÅ‚ pomyÅ›lnie zainstalowany na Twoim komputerze.$\r$\n$\r$\nKliknij przycisk 'ZakoÅ„cz', aby zakoÅ„czyÄ‡ dziaÅ‚anie instalatora."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "TwÃ³j komputer musi zostaÄ‡ ponownie uruchomiony, aby zakoÅ„czyÄ‡ instalacjÄ™ $(^NameDA). Czy chcesz teraz ponownie uruchomiÄ‡ komputer?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Koñczenie pracy kreatora deinstalacji $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) zosta³ odinstalowany z Twojego komputera.$\r$\n$\r$\nKliknij Zakoñcz, aby zakoñczyæ dzia³anie kreatora."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Twój komputer musi zostaæ ponownie uruchomiony w celu zakoñczenia deinstalacji programu $(^NameDA). Czy chcesz zrobiæ to teraz?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "KoÅ„czenie pracy kreatora deinstalacji $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) zostaÅ‚ odinstalowany z Twojego komputera.$\r$\n$\r$\nKliknij przycisk 'ZakoÅ„cz', aby zakoÅ„czyÄ‡ dziaÅ‚anie deinstalatora."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "TwÃ³j komputer musi zostaÄ‡ ponownie uruchomiony w celu zakoÅ„czenia deinstalacji $(^NameDA). Czy chcesz teraz ponownie uruchomiÄ‡ komputer?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
   ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Uruchom ponownie teraz"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Sam uruchomiê ponownie komputer póŸniej"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "&Uruchom program $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Poka¿ plik ReadMe"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Zakoñcz"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Sam uruchomiÄ™ ponownie komputer pÃ³Åºniej"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&Uruchom $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&PokaÅ¼ plik ReadMe"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&ZakoÅ„cz"
 !endif
 
 !ifdef MUI_STARTMENUPAGE
   ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Wybierz folder w menu Start"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Wybierz folder menu Start, w którym zostan¹ umieszczone skróty do programu"
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Wybierz folder w menu Start, w którym chcia³byœ umieœciæ skróty do programu. Mo¿esz tak¿e utworzyæ nowy folder wpisuj¹c jego nazwê."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Nie twórz skrótów"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Wybierz folder menu Start, w ktÃ³rym zostanÄ… umieszczone skrÃ³ty do $(^NameDA)"
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Wybierz folder w menu Start, w ktÃ³rym chciaÅ‚byÅ› umieÅ›ciÄ‡ skrÃ³ty do programu. MoÅ¼esz takÅ¼e utworzyÄ‡ nowy folder wpisujÄ…c jego nazwÄ™."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Nie twÃ³rz skrÃ³tÃ³w"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
   ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Odinstaluj $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Usuñ $(^NameDA) z Twojego komputera."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "UsuÅ„ $(^NameDA) z Twojego komputera."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Czy na pewno chcesz zakoñczyæ dzia³anie instalatora $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Czy na pewno chcesz zakoÅ„czyÄ‡ dziaÅ‚anie instalatora $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Czy na pewno chcesz przerwaæ proces deinstalacji $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Czy na pewno chcesz przerwaÄ‡ proces deinstalacji $(^Name)?"
 !endif
 
 !ifdef MULTIUSER_INSTALLMODEPAGE
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Wybierz u¿ytkowników"
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Wybierz, dla których u¿ytkowników chcesz zainstalowaæ program $(^NameDA)."
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Wybierz, czy chcesz zainstalowaæ program $(^NameDA) tylko dla siebie, czy dla wszystkich u¿ytkowników tego komputera. $(^ClickNext)"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Zainstaluj dla wszystkich u¿ytkowników tego komputera"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Wybierz uÅ¼ytkownikÃ³w"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Wybierz, dla ktÃ³rych uÅ¼ytkownikÃ³w chcesz zainstalowaÄ‡ $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Wybierz, czy chcesz zainstalowaÄ‡ $(^NameDA) tylko dla siebie, czy dla wszystkich uÅ¼ytkownikÃ³w tego komputera. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Zainstaluj dla wszystkich uÅ¼ytkownikÃ³w tego komputera"
   ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Zainstaluj tylko dla mnie"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Slovenian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Slovenian.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Slovenian.nsh	(revision 2956)
@@ -1,32 +1,33 @@
-;Language: Slovenian (1060)
+ï»¿;Language: Slovenian (1060)
 ;By Janez Dolinar, edited by Martin Srebotnjak - Lugos.si
 
-!insertmacro LANGFILE "Slovenian" "Slovenski jezik"
+# We use "slovenski", the other alternative is "slovenÅ¡Ä�ina" (Note: "slovenÄ�ina" is the native name of Slovak)
+!insertmacro LANGFILE "Slovenian" = "Slovenski" =
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Dobrodošli v èarovniku namestitve $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ta èarovnik vas vodi skozi namestitev programa $(^NameDA).$\r$\n$\r$\nPred namestitvijo je priporoèeno zapreti vsa ostala okna in programe. S tem omogoèite nemoteno namestitev programa in potrebnih sistemskih datotek brez ponovnega zagona raèunalnika.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "DobrodoÅ¡li v Ä�arovniku namestitve $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ta Ä�arovnik vas vodi skozi namestitev programa $(^NameDA).$\r$\n$\r$\nPred namestitvijo je priporoÄ�eno zapreti vsa ostala okna in programe. S tem omogoÄ�ite nemoteno namestitev programa in potrebnih sistemskih datotek brez ponovnega zagona raÄ�unalnika.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Dobrodošli v èarovniku za odstranitev $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ta èarovnik vas bo vodil skozi odstranitev $(^NameDA).$\r$\n$\r$\nPreden priènete z odstranitvijo, se preprièajte, da program $(^NameDA) ni zagnan.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "DobrodoÅ¡li v Ä�arovniku za odstranitev $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ta Ä�arovnik vas bo vodil skozi odstranitev $(^NameDA).$\r$\n$\r$\nPreden priÄ�nete z odstranitvijo, se prepriÄ�ajte, da program $(^NameDA) ni zagnan.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Licenèna pogodba"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Prosimo, da si ogledate pogoje licenène pogodbe pred namestitvijo $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Èe se strinjate s pogoji, pritisnite Se strinjam. Da bi lahko namestili $(^NameDA), se morate s pogodbo strinjati."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Èe se strinjate z licenènimi pogoji pogodbe, spodaj izberite ustrezno okence. Za namestitev $(^NameDA) se morate strinjati s pogoji pogodbe. $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Èe se strinjate z licenènimi pogoji pogodbe, spodaj izberite prvo možnost. Za namestitev $(^NameDA) se morate strinjati s pogoji pogodbe. $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "LicenÄ�na pogodba"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Prosimo, da si ogledate pogoje licenÄ�ne pogodbe pred namestitvijo $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "ÄŒe se strinjate s pogoji, pritisnite Se strinjam. Da bi lahko namestili $(^NameDA), se morate s pogodbo strinjati."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "ÄŒe se strinjate z licenÄ�nimi pogoji pogodbe, spodaj izberite ustrezno okence. Za namestitev $(^NameDA) se morate strinjati s pogoji pogodbe. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ÄŒe se strinjate z licenÄ�nimi pogoji pogodbe, spodaj izberite prvo moÅ¾nost. Za namestitev $(^NameDA) se morate strinjati s pogoji pogodbe. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Licenèna pogodba"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Prosimo, da pred odstranitvijo $(^NameDA) pregledate pogoje licenène pogodbe."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Èe se strinjate s pogoji licenène pogodbe, izberite Se strinjam. Za odstranitev $(^NameDA) se morate strinjati s pogoji."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Èe se strinjate s pogoji licenène pogodbe, kliknite na okence spodaj. Za odstranitev $(^NameDA) se morate strinjati s pogoji. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Èe se strinjate s pogoji licenène pogodbe, spodaj izberite prvo podano možnost. Za odstranitev $(^NameDA) se morate strinjati s pogoji. $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "LicenÄ�na pogodba"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Prosimo, da pred odstranitvijo $(^NameDA) pregledate pogoje licenÄ�ne pogodbe."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "ÄŒe se strinjate s pogoji licenÄ�ne pogodbe, izberite Se strinjam. Za odstranitev $(^NameDA) se morate strinjati s pogoji."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "ÄŒe se strinjate s pogoji licenÄ�ne pogodbe, kliknite na okence spodaj. Za odstranitev $(^NameDA) se morate strinjati s pogoji. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ÄŒe se strinjate s pogoji licenÄ�ne pogodbe, spodaj izberite prvo podano moÅ¾nost. Za odstranitev $(^NameDA) se morate strinjati s pogoji. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
@@ -35,95 +36,95 @@
 
 !ifdef MUI_COMPONENTSPAGE
   ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Izbor komponent"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Izberite, katere komponente izdelka $(^NameDA) želite namestiti."
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Izberite, katere komponente izdelka $(^NameDA) Å¾elite namestiti."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Izbor komponent"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Izberite komponente $(^NameDA), ki jih želite odstraniti."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Izberite komponente $(^NameDA), ki jih Å¾elite odstraniti."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Opis"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Povlecite miško nad komponento, da vidite njen opis."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Povlecite miÅ¡ko nad komponento, da vidite njen opis."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Povlecite miško nad komponento, da vidite njen opis."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Izberite komponento za prikaz njenega opisa."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
   ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Izberite pot namestive"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Izberite mapo, v katero želite namestiti $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Izberite mapo, v katero Å¾elite namestiti $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
   ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Izbor mape"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Izberite mapo, iz katere želite odstraniti $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Izberite mapo, iz katere Å¾elite odstraniti $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Namešèanje poteka"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Prosimo, poèakajte, $(^NameDA) se namešèa."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Dokonèana namestitev"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Namestitev je uspešno zakljuèena."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "NameÅ¡Ä�anje poteka"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Prosimo, poÄ�akajte, $(^NameDA) se nameÅ¡Ä�a."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "DokonÄ�ana namestitev"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Namestitev je uspeÅ¡no zakljuÄ�ena."
   ${LangFileString} MUI_TEXT_ABORT_TITLE "Prekinjena namestitev"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Namestitev ni bila uspešno zakljuèena."
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Namestitev ni bila uspeÅ¡no zakljuÄ�ena."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Odstranjevanje poteka"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Prosimo, poèakajte, dokler se program $(^NameDA) odstranjuje."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Odstranitev konèana"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Odstranitev je uspešno konèana."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Prosimo, poÄ�akajte, dokler se program $(^NameDA) odstranjuje."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Odstranitev konÄ�ana"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Odstranitev je uspeÅ¡no konÄ�ana."
   ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Odstranitev prekinjena"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Odstranitev ni bila konèana uspešno."
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Odstranitev ni bila konÄ�ana uspeÅ¡no."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Zakljuèevanje namestitve $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Program $(^NameDA) je bil namešèen na vaš raèunalnik.$\r$\n$\r$\nPritisnite Dokonèaj za zaprtje èarovnika."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Za dokonèanje namestitve $(^NameDA) morate ponovno zagnati raèunalnik. Želite zdaj ponovno zagnati raèunalnik?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "ZakljuÄ�evanje namestitve $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Program $(^NameDA) je bil nameÅ¡Ä�en na vaÅ¡ raÄ�unalnik.$\r$\n$\r$\nPritisnite DokonÄ�aj za zaprtje Ä�arovnika."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Za dokonÄ�anje namestitve $(^NameDA) morate ponovno zagnati raÄ�unalnik. Å½elite zdaj ponovno zagnati raÄ�unalnik?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Èarovnik za odstranitev $(^NameDA) se zakljuèuje"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Program $(^NameDA) je odstranjen z vašega raèunalnika.$\r$\n$\r$\nKliknite Dokonèaj, da zaprete èarovnika."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Da bi se namestitev $(^NameDA) dokonèala, morate ponovno zagnati raèunalnik. Želite zdaj znova zagnati raèunalnik?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "ÄŒarovnik za odstranitev $(^NameDA) se zakljuÄ�uje"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Program $(^NameDA) je odstranjen z vaÅ¡ega raÄ�unalnika.$\r$\n$\r$\nKliknite DokonÄ�aj, da zaprete Ä�arovnika."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Da bi se namestitev $(^NameDA) dokonÄ�ala, morate ponovno zagnati raÄ�unalnik. Å½elite zdaj znova zagnati raÄ�unalnik?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
   ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ponovni zagon"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Raèunalnik želim znova zagnati kasneje"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "&Zaženi $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Pokaži BeriMe"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "Do&konèaj"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "RaÄ�unalnik Å¾elim znova zagnati kasneje"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&ZaÅ¾eni $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&PokaÅ¾i BeriMe"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "Do&konÄ�aj"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
   ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Izberite mapo menija Start"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Izberite mapo menija Start za bližnjice do $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Izberite mapo menija Start, kjer želite ustvariti bližnjico do programa. Èe vpišete novo ime, boste ustvarili istoimensko mapo."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ne ustvari bližnjic"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Izberite mapo menija Start za bliÅ¾njice do $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Izberite mapo menija Start, kjer Å¾elite ustvariti bliÅ¾njico do programa. ÄŒe vpiÅ¡ete novo ime, boste ustvarili istoimensko mapo."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ne ustvari bliÅ¾njic"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
   ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Odstranitev $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Odstrani $(^NameDA) z vašega raèunalnika."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Odstrani $(^NameDA) z vaÅ¡ega raÄ�unalnika."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Ste preprièani, da želite prekiniti namestitev $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Ste prepriÄ�ani, da Å¾elite prekiniti namestitev $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ste preprièani, da želite zapustiti odstranitev $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ste prepriÄ�ani, da Å¾elite zapustiti odstranitev $(^Name)?"
 !endif
 
 !ifdef MULTIUSER_INSTALLMODEPAGE
   ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Izberite uporabnike"
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Izberite uporabnike, za katere želite namestiti $(^NameDA)."
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Izberite, ali želite namestiti $(^NameDA) le zase ali za vse uporabnike tega raèunalnika. $(^ClickNext)"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Namesti za vse uporabnike tega raèunalnika"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Izberite uporabnike, za katere Å¾elite namestiti $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Izberite, ali Å¾elite namestiti $(^NameDA) le zase ali za vse uporabnike tega raÄ�unalnika. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Namesti za vse uporabnike tega raÄ�unalnika"
   ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Namesti le zame"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Finnish.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Finnish.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Finnish.nsh	(revision 2956)
@@ -1,38 +1,39 @@
-;Compatible with Modern UI 1.86
+ï»¿;Compatible with Modern UI 1.86
 ;Language: Finnish (1035)
 ;By Eclipser (Jonne Lehtinen) <Eclipser at pilvikaupunki dot com>
 ;Updated by Puuhis (puuhis@puuhis.net)
+;Updated 11/08 by WTLib Team
 
-!insertmacro LANGFILE "Finnish" "Suomi"
+!insertmacro LANGFILE "Finnish" = "Suomi" =
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Tervetuloa ohjelman $(^NameDA) asennukseen"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Tämä avustaja ohjaa sinut ohjelman $(^NameDA) asennuksen läpi.$\r$\n$\r$\nOn suositeltavaa sulkea kaikki muut ohjelmat ennen asennuksen aloittamista, jotta asennus voisi päivittää tiettyjä järjestelmätiedostoja käynnistämättä konetta uudelleen.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Tervetuloa $(^NameDA) -ohjelman asennukseen"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Saat tarvittavia ohjeita sitÃ¤ mukaa kuin $(^NameDA) -ohjelman asennus edistyy.$\r$\n$\r$\nOn suositeltavaa sulkea kaikki muut ohjelmat ennen asennuksen aloittamista, jotta asennus voi pÃ¤ivittÃ¤Ã¤ jÃ¤rjestelmÃ¤tiedostoja kÃ¤ynnistÃ¤mÃ¤ttÃ¤ konetta uudelleen.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Tervetuloa $(^NameDA) -ohjelmiston poisto-ohjelmaan"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Tämä velho auttaa sinut läpi $(^NameDA) -ohjelmiston poistamisen.$\r$\n$\r$\nEnnen poisto-ohjelman aloitusta, varmista ettei $(^NameDA) ole käynnissä.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Tervetuloa $(^NameDA) -ohjelman poisto-ohjelmaan"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Saat tarvittavia ohjeita sitÃ¤ mukaa kuin $(^NameDA) -ohjelman poisto edistyy.$\r$\n$\r$\nEnnen poiston aloittamista varmista, ettei $(^NameDA) ole kÃ¤ynnissÃ¤.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Lisenssisopimus"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Lue lisenssiehdot tarkasti ennen ohjelman $(^NameDA) asentamista."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Jos hyväksyt ehdot, valitse Hyväksyn jatkaaksesi. Sinun pitää hyväksyä ehdot asentaaksesi ohjelman $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Jos hyväksyt ehdot, laita rasti alla olevaan ruutuun. Sinun pitää hyväksyä ehdot asentaaksesi ohjelman $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Jos hyväksyt ehdot, valitse ensimmäinen vaihtoehto alapuolelta. Sinun pitää hyväksyä ehdot asentaaksesi ohjelman $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "KÃ¤yttÃ¶oikeussopimus"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Lue kÃ¤yttÃ¶ehdot huolellisesti ennen $(^NameDA) -ohjelman asentamista."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Jos hyvÃ¤ksyt ehdot, valitse HyvÃ¤ksyn. Ohjelman asentaminen edellyttÃ¤Ã¤ kÃ¤yttÃ¶ehtojen hyvÃ¤ksymistÃ¤."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Jos hyvÃ¤ksyt ehdot, laita rasti alla olevaan ruutuun. Ohjelman asentaminen edellyttÃ¤Ã¤ kÃ¤yttÃ¶ehtojen hyvÃ¤ksymistÃ¤. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Jos hyvÃ¤ksyt ehdot, valitse ensimmÃ¤inen vaihtoehto alapuolelta. Ohjelman asentaminen edellyttÃ¤Ã¤ kÃ¤yttÃ¶ehtojen hyvÃ¤ksymistÃ¤. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Lisenssisopimus"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Lue huolellisesti lisenssiehdot ennen $(^NameDA) -ohjelmiston poistoa."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Jos hyväksyt säännöt ja ehdot, paina Hyväksyn -nappia jatkaakseni. Sinun täytyy hyväksyä ehdot poistaaksesi $(^NameDA) -ohjelmiston."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Jos hyväksyt ehdot, klikkaa valintaruutua alhaalla. Sinun täytyy hyväksyä ehdot poistaaksesi $(^NameDA) -ohjelmiston. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Jos hyväksyt ehdot, valitse ensimmäinen vaihtoehto alhaalta. Sinun täytyy hyväksyä ehdot poistaaksesi $(^NameDA) -ohjelmiston. $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "KÃ¤yttÃ¶oikeussopimus"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Lue kÃ¤yttÃ¶ehdot huolellisesti ennen $(^NameDA) -ohjelman poistoa."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Jos hyvÃ¤ksyt ehdot, valitse HyvÃ¤ksyn. Ohjelman asentaminen edellyttÃ¤Ã¤ kÃ¤yttÃ¶ehtojen hyvÃ¤ksymistÃ¤."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Jos hyvÃ¤ksyt ehdot, laita rasti alla olevaan ruutuun. Ohjelman asentaminen edellyttÃ¤Ã¤ kÃ¤yttÃ¶ehtojen hyvÃ¤ksymistÃ¤. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Jos hyvÃ¤ksyt ehdot, valitse ensimmÃ¤inen vaihtoehto alapuolelta. Ohjelman asentaminen edellyttÃ¤Ã¤ kÃ¤yttÃ¶ehtojen hyvÃ¤ksymistÃ¤. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Paina Page Down nähdäksesi loput sopimuksesta."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Paina Page Down -nÃ¤ppÃ¤intÃ¤ nÃ¤hdÃ¤ksesi loput sopimuksesta."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
@@ -48,76 +49,76 @@
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Selitys"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Siirrä hiiri komponentin nimen päälle saadaksesi sen selityksen."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "SiirrÃ¤ hiiri komponentin nimen pÃ¤Ã¤lle nÃ¤hdÃ¤ksesi sen selityksen."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Siirrä hiiri komponentin nimen päälle saadaksesi sen selityksen."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Valitse komponentti nÃ¤hdÃ¤ksesi sen selityksen."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Valitse asennuskohde"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Valitse hakemisto, johon haluat asentaa ohjelman $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Valitse asennuskansio"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Valitse kansio, johon haluat asentaa $(^NameDA) -ohjelman."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Valitse paikka mistä poistetaan"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Valitse kansio mistä $(^NameDA) poistetaan."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Valitse kansio, josta poistetaan"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Valitse kansio, josta $(^NameDA) poistetaan."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Asennetaan"
   ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Odota... $(^NameDA) asennetaan..."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Asennus valmis"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Asennus valmistui onnistuneesti."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Asennus keskeytettiin"
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Asennus valmis."
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Asennus onnistui."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Asennus keskeytyi."
   ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Asennus ei onnistunut."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Poistetaan"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Odota... Ohjelmaa $(^NameDA) poistetaan."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Poisto valmis"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Ohjelma poistettiin onnistuneesti."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Poisto lopetettu"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Ohjelmaa poisto epäonnistuneesti."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Odota... $(^NameDA) poistetaan."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Poisto valmis."
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Poisto onnistui."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Poisto keskeytyi."
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Poisto epÃ¤onnistui."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Viimeistellään ohjelman $(^NameDA) asennusta"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) on asennettu koneellesi.$\r$\n$\r$\nValitse Valmis sulkeaksesi avustajan."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Tietokoneesi pitää käynnistää uudelleen jotta ohjelman $(^NameDA) asennus saataisiin valmiiksi. Haluatko käynnistää koneen uudelleen nyt?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "$(^NameDA) -ohjelman asennus on valmis"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) on asennettu tietokoneelle.$\r$\n$\r$\nValitse Valmis sulkeaksesi asennusohjelman."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "$(^NameDA) -ohjelman asennuksen viimeisteleminen edellyttÃ¤Ã¤ tietokoneen uudelleenkÃ¤ynnistÃ¤mistÃ¤. Haluatko kÃ¤ynnistÃ¤Ã¤ tietokoneen uudelleen nyt?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Viimeistellään $(^NameDA) -ohjelmiston poistamista"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) on poistettu koneeltasi.$\r$\n$\r$\nPaina Lopeta -nappia sulkeaksesi tämän velhon."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Jotta $(^NameDA) -ohjelmiston poistaminen olisi valmis, tulee tietokone käynnistää uudelleen. Haluatko uudelleenkäynnistää nyt?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "$(^NameDA) on poistettu"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) on poistettu tietokoneelta.$\r$\n$\r$\nValitse Lopeta sulkeaksesi poisto-ohjelman."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "$(^NameDA) -ohjelman poiston viimeisteleminen edellyttÃ¤Ã¤ tietokoneen uudelleenkÃ¤ynnistÃ¤mistÃ¤. Haluatko kÃ¤ynnistÃ¤Ã¤ tietokoneen uudelleen nyt?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Käynnistä uudelleen nyt"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Käynnistän koneen myöhemmin uudelleen"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "Käynnistä $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Näytä LueMinut"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "KÃ¤ynnistÃ¤ uudelleen nyt"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "KÃ¤ynnistÃ¤n uudelleen myÃ¶hemmin"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "KÃ¤ynnistÃ¤ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "NÃ¤ytÃ¤ Lueminut-tiedosto"
   ${LangFileString} MUI_BUTTONTEXT_FINISH "&Valmis"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Valitse Käynnistä-valikon hakemisto"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Valitse Käynnistä-valikon hakemisto ohjelman pikakuvakkeille."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Valitse Käynnistä-valikon hakemisto, johon haluaisit luoda ohjelman pikakuvakkeet. Voit myös kirjoittaa uuden nimen."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Älä luo pikakuvakkeita"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Valitse KÃ¤ynnistÃ¤-valikon kansio"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Valitse KÃ¤ynnistÃ¤-valikon kansio, johon ohjelman pikakuvakkeet asennetaan."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Valitse KÃ¤ynnistÃ¤-valikon kansio, johon haluat asentaa ohjelman pikakuvakkeet. Voit myÃ¶s kirjoittaa uuden kansion nimen."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ã„lÃ¤ luo pikakuvakkeita."
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
   ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Poista $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Poista $(^NameDA) tietokoneestasi."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Poista $(^NameDA) tietokoneesta."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Haluatko varmasti lopettaa $(^Name) Asennuksen?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Haluatko varmasti keskeyttÃ¤Ã¤ $(^Name) -ohjelman asennuksen?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Oletko varma että haluat poistua $(^Name) poisto-ohjelmasta?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Haluatko varmasti keskeyttÃ¤Ã¤ $(^Name) -ohjelman poiston?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Slovak.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Slovak.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Slovak.nsh	(revision 2956)
@@ -1,133 +1,133 @@
-;Language: Slovak (1051)
+ï»¿;Language: Slovak (1051)
 ;Translated by:
 ;  Kypec (peter.dzugas@mahe.sk)
 ;edited by:
-;  Marián Hikaník (podnety@mojepreklady.net)
-;  Ivan Masár <helix84@centrum.sk>, 2008.
+;  MariÃ¡n HikanÃ­k (podnety@mojepreklady.net)
+;  Ivan MasÃ¡r <helix84@centrum.sk>, 2008.
 
-!insertmacro LANGFILE "Slovak" "Slovensky"
+!insertmacro LANGFILE "Slovak" = "SlovenÄ�ina" "Slovencina"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Vitajte v sprievodcovi inštaláciou programu $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Tento sprievodca vás prevedie inštaláciou $(^NameDA).$\r$\n$\r$\nPred zaèiatkom inštalácie sa odporúèa ukonèi� všetky ostatné programy. Tým umožníte aktualizovanie systémových súborov bez potreby reštartovania vášho poèítaèa.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Vitajte v sprievodcovi inÅ¡talÃ¡ciou programu $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Tento sprievodca vÃ¡s prevedie inÅ¡talÃ¡ciou $(^NameDA).$\r$\n$\r$\nPred zaÄ�iatkom inÅ¡talÃ¡cie sa odporÃºÄ�a ukonÄ�iÅ¥ vÅ¡etky ostatnÃ© programy. TÃ½m umoÅ¾nÃ­te aktualizovanie systÃ©movÃ½ch sÃºborov bez potreby reÅ¡tartovania vÃ¡Å¡ho poÄ�Ã­taÄ�a.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Vitajte v sprievodcovi odinštalovaním programu $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Tento sprievodca vás prevedie procesom odinštalovania programu $(^NameDA).$\r$\n$\r$\nPred spustením procesu odinštalovania sa uistite, že program $(^NameDA) nie je práve aktívny.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Vitajte v sprievodcovi odinÅ¡talovanÃ­m programu $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Tento sprievodca vÃ¡s prevedie procesom odinÅ¡talovania programu $(^NameDA).$\r$\n$\r$\nPred spustenÃ­m procesu odinÅ¡talovania sa uistite, Å¾e program $(^NameDA) nie je prÃ¡ve aktÃ­vny.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Licenèná zmluva"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Pred inštaláciou $(^NameDA) si prosím preštudujte licenèné podmienky."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ak súhlasíte s podmienkami zmluvy, kliknite na tlaèidlo Súhlasím a môžete pokraèova� v inštalácii. Ak chcete v inštalácii pokraèova�, musíte odsúhlasi� podmienky licenènej zmluvy $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ak súhlasíte s podmienkami zmluvy, zaškrtnite nižšie uvedené políèko. Ak chcete v inštalácii pokraèova�, musíte odsúhlasi� podmienky licenènej zmluvy $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ak súhlasíte s podmienkami zmluvy, oznaète prvú z nižšie uvedených možností. Ak chcete v inštalácii pokraèova�, musíte odsúhlasi� podmienky licenènej zmluvy $(^NameDA)."
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "LicenÄ�nÃ¡ zmluva"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Pred inÅ¡talÃ¡ciou $(^NameDA) si prosÃ­m preÅ¡tudujte licenÄ�nÃ© podmienky."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ak sÃºhlasÃ­te s podmienkami zmluvy, kliknite na tlaÄ�idlo SÃºhlasÃ­m a mÃ´Å¾ete pokraÄ�ovaÅ¥ v inÅ¡talÃ¡cii. Ak chcete v inÅ¡talÃ¡cii pokraÄ�ovaÅ¥, musÃ­te odsÃºhlasiÅ¥ podmienky licenÄ�nej zmluvy $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ak sÃºhlasÃ­te s podmienkami zmluvy, zaÅ¡krtnite niÅ¾Å¡ie uvedenÃ© polÃ­Ä�ko. Ak chcete v inÅ¡talÃ¡cii pokraÄ�ovaÅ¥, musÃ­te odsÃºhlasiÅ¥ podmienky licenÄ�nej zmluvy $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ak sÃºhlasÃ­te s podmienkami zmluvy, oznaÄ�te prvÃº z niÅ¾Å¡ie uvedenÃ½ch moÅ¾nostÃ­. Ak chcete v inÅ¡talÃ¡cii pokraÄ�ovaÅ¥, musÃ­te odsÃºhlasiÅ¥ podmienky licenÄ�nej zmluvy $(^NameDA)."
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Licenèná zmluva"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Pred odinštalovaním programu $(^NameDA) si prosím preèítajte licenèné podmienky."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ak súhlasíte s podmienkami zmluvy, zvo¾te Súhlasím. Licenènú zmluvu musíte odsúhlasi�, ak chcete v odinštalovaní programu $(^NameDA) pokraèova�."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ak súhlasíte s podmienkami zmluvy, zaškrtnite nižšie uvedené políèko. Licenènú zmluvu musíte odsúhlasi�, ak chcete pokraèova� v odinštalovaní programu $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ak súhlasíte s podmienkami licenènej zmluvy, oznaète prvú z nižšie uvedených možností. Licenènú zmluvu musíte odsúhlasi�, ak chcete pokraèova� v odinštalovaní programu $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "LicenÄ�nÃ¡ zmluva"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Pred odinÅ¡talovanÃ­m programu $(^NameDA) si prosÃ­m preÄ�Ã­tajte licenÄ�nÃ© podmienky."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ak sÃºhlasÃ­te s podmienkami zmluvy, zvoÄ¾te SÃºhlasÃ­m. LicenÄ�nÃº zmluvu musÃ­te odsÃºhlasiÅ¥, ak chcete v odinÅ¡talovanÃ­ programu $(^NameDA) pokraÄ�ovaÅ¥."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ak sÃºhlasÃ­te s podmienkami zmluvy, zaÅ¡krtnite niÅ¾Å¡ie uvedenÃ© polÃ­Ä�ko. LicenÄ�nÃº zmluvu musÃ­te odsÃºhlasiÅ¥, ak chcete pokraÄ�ovaÅ¥ v odinÅ¡talovanÃ­ programu $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ak sÃºhlasÃ­te s podmienkami licenÄ�nej zmluvy, oznaÄ�te prvÃº z niÅ¾Å¡ie uvedenÃ½ch moÅ¾nostÃ­. LicenÄ�nÃº zmluvu musÃ­te odsÃºhlasiÅ¥, ak chcete pokraÄ�ovaÅ¥ v odinÅ¡talovanÃ­ programu $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Stlaèením klávesu Page Down posuniete text licenènej zmluvy."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "StlaÄ�enÃ­m klÃ¡vesu Page Down posuniete text licenÄ�nej zmluvy."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Vo¾ba súèastí programu"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Zvo¾te si tie súèasti programu $(^NameDA), ktoré chcete nainštalova�."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "VoÄ¾ba sÃºÄ�astÃ­ programu"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "ZvoÄ¾te si tie sÃºÄ�asti programu $(^NameDA), ktorÃ© chcete nainÅ¡talovaÅ¥."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Vo¾ba súèastí"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Zvo¾te súèasti programu $(^NameDA), ktoré chcete odinštalova�."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "VoÄ¾ba sÃºÄ�astÃ­"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "ZvoÄ¾te sÃºÄ�asti programu $(^NameDA), ktorÃ© chcete odinÅ¡talovaÅ¥."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Popis"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Pri prejdení kurzorom myši nad názvom súèasti sa zobrazí jej popis."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Pri prejdenÃ­ kurzorom myÅ¡i nad nÃ¡zvom sÃºÄ�asti sa zobrazÃ­ jej popis."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Pri prejdení kurzorom myši nad názvom súèasti sa zobrazí jej popis."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "OznaÄ�te nejakÃº sÃºÄ�asÅ¥, ak chcete zobraziÅ¥ jej podrobnejÅ¡Ã­ popis."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Vo¾ba umiestnenia programu"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Vyberte si prieèinok, do ktorého chcete nainštalova� program $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "VoÄ¾ba umiestnenia programu"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Vyberte si prieÄ�inok, do ktorÃ©ho chcete nainÅ¡talovaÅ¥ program $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Umiestenie programu pre odinštalovanie"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Vyberte si prieèinok, z ktorého chcete odinštalova� program $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Umiestenie programu pre odinÅ¡talovanie"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Vyberte si prieÄ�inok, z ktorÃ©ho chcete odinÅ¡talovaÅ¥ program $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Inštalácia"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Poèkajte prosím, kým prebehne inštalácia programu $(^NameDA)."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Ukonèenie inštalácie"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Inštalácia bola dokonèená úspešne."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Prerušenie inštalácie"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Inštaláciu sa nepodarilo dokonèi�."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "InÅ¡talÃ¡cia"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "PoÄ�kajte prosÃ­m, kÃ½m prebehne inÅ¡talÃ¡cia programu $(^NameDA)."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "UkonÄ�enie inÅ¡talÃ¡cie"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "InÅ¡talÃ¡cia bola dokonÄ�enÃ¡ ÃºspeÅ¡ne."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "PreruÅ¡enie inÅ¡talÃ¡cie"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "InÅ¡talÃ¡ciu sa nepodarilo dokonÄ�iÅ¥."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Odinštalovanie"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Èakajte prosím, kým prebehne odinštalovanie programu $(^NameDA)."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Ukonèenie odinštalovania"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Odinštalovanie bolo úspešne dokonèené."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Prerušenie odinštalovania"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Odinštalovanie sa neukonèilo úspešne."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "OdinÅ¡talovanie"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "ÄŒakajte prosÃ­m, kÃ½m prebehne odinÅ¡talovanie programu $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "UkonÄ�enie odinÅ¡talovania"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "OdinÅ¡talovanie bolo ÃºspeÅ¡ne dokonÄ�enÃ©."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "PreruÅ¡enie odinÅ¡talovania"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "OdinÅ¡talovanie sa neukonÄ�ilo ÃºspeÅ¡ne."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Dokonèenie inštalácie programu $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Program $(^NameDA) bol nainštalovaný do vášho poèítaèa.$\r$\nKliknite na tlaèidlo Dokonèi� a tento sprievodca sa ukonèí."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Pre úplné dokonèenie inštalácie programu $(^NameDA) je potrebné reštartova� váš poèítaè. Chcete ho reštartova� ihneï?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "DokonÄ�enie inÅ¡talÃ¡cie programu $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Program $(^NameDA) bol nainÅ¡talovanÃ½ do vÃ¡Å¡ho poÄ�Ã­taÄ�a.$\r$\nKliknite na tlaÄ�idlo DokonÄ�iÅ¥ a tento sprievodca sa ukonÄ�Ã­."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Pre ÃºplnÃ© dokonÄ�enie inÅ¡talÃ¡cie programu $(^NameDA) je potrebnÃ© reÅ¡tartovaÅ¥ vÃ¡Å¡ poÄ�Ã­taÄ�. Chcete ho reÅ¡tartovaÅ¥ ihneÄ�?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Dokonèenie sprievodcu odinštalovaním"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Program $(^NameDA) bol odinštalovaný z vášho poèítaèa.$\r$\n$\r$\nKliknite na tlaèidlo Dokonèi� a tento sprievodca sa ukonèí."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Pre úplné dokonèenie odinštalovania programu $(^NameDA) je nutné reštartova� váš poèítaè. Chcete ho reštartova� ihneï?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "DokonÄ�enie sprievodcu odinÅ¡talovanÃ­m"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Program $(^NameDA) bol odinÅ¡talovanÃ½ z vÃ¡Å¡ho poÄ�Ã­taÄ�a.$\r$\n$\r$\nKliknite na tlaÄ�idlo DokonÄ�iÅ¥ a tento sprievodca sa ukonÄ�Ã­."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Pre ÃºplnÃ© dokonÄ�enie odinÅ¡talovania programu $(^NameDA) je nutnÃ© reÅ¡tartovaÅ¥ vÃ¡Å¡ poÄ�Ã­taÄ�. Chcete ho reÅ¡tartovaÅ¥ ihneÄ�?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Reštartova� teraz"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Reštartova� neskôr (manuálne)"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "&Spusti� program $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Zobrazi� súbor s informáciami"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Dokonèi�"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "ReÅ¡tartovaÅ¥ teraz"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "ReÅ¡tartovaÅ¥ neskÃ´r (manuÃ¡lne)"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&SpustiÅ¥ program $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&ZobraziÅ¥ sÃºbor s informÃ¡ciami"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&DokonÄ�iÅ¥"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Vo¾ba umiestnenia v ponuke Štart"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Vyberte si prieèinok v ponuke Štart, kam sa umiestnia odkazy na program $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Vyberte si prieèinok v ponuke Štart, v ktorom chcete vytvori� odkazy na program. Takisto môžete napísa� názov nového prieèinka."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Nevytvára� odkazy"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "VoÄ¾ba umiestnenia v ponuke Å tart"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Vyberte si prieÄ�inok v ponuke Å tart, kam sa umiestnia odkazy na program $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Vyberte si prieÄ�inok v ponuke Å tart, v ktorom chcete vytvoriÅ¥ odkazy na program. Takisto mÃ´Å¾ete napÃ­saÅ¥ nÃ¡zov novÃ©ho prieÄ�inka."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "NevytvÃ¡raÅ¥ odkazy"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Odinštalovanie programu $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Odstránenie programu $(^NameDA) z vášho poèítaèa."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "OdinÅ¡talovanie programu $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "OdstrÃ¡nenie programu $(^NameDA) z vÃ¡Å¡ho poÄ�Ã­taÄ�a."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Naozaj chcete ukonèi� inštaláciu programu $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Naozaj chcete ukonÄ�iÅ¥ inÅ¡talÃ¡ciu programu $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Naozaj chcete ukonèi� proces odinštalovania programu $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Naozaj chcete ukonÄ�iÅ¥ proces odinÅ¡talovania programu $(^Name)?"
 !endif
 
 !ifdef MULTIUSER_INSTALLMODEPAGE
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Vybra� používate¾ov"
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Vyberte pre ktorých používate¾ov chcete nainštalova� $(^NameDA)."
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Vyberte, èi chcete nainštalova� program $(^NameDA) iba pre seba alebo pre všetkých používate¾ov tohto poèítaèa. $(^ClickNext)"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Nainštalova� pre všetkých používate¾ov tohto poèítaèa"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Nainštalova� iba pre mòa"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "VybraÅ¥ pouÅ¾Ã­vateÄ¾ov"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Vyberte pre ktorÃ½ch pouÅ¾Ã­vateÄ¾ov chcete nainÅ¡talovaÅ¥ $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Vyberte, Ä�i chcete nainÅ¡talovaÅ¥ program $(^NameDA) iba pre seba alebo pre vÅ¡etkÃ½ch pouÅ¾Ã­vateÄ¾ov tohto poÄ�Ã­taÄ�a. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "NainÅ¡talovaÅ¥ pre vÅ¡etkÃ½ch pouÅ¾Ã­vateÄ¾ov tohto poÄ�Ã­taÄ�a"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "NainÅ¡talovaÅ¥ iba pre mÅˆa"
 !endif
\ No newline at end of file
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Afrikaans.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Afrikaans.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Afrikaans.nsh	(revision 2956)
@@ -1,11 +1,11 @@
-;Language: Afrikaans (1078)
+ï»¿;Language: Afrikaans (1078)
 ;By Friedel Wolff
 
-!insertmacro LANGFILE "Afrikaans" "Afrikaans"
+!insertmacro LANGFILE "Afrikaans" = "Afrikaans" =
 
 !ifdef MUI_WELCOMEPAGE
   ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Welkom by die $(^NameDA) Installasieslimmerd"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Hierdie slimmerd lei mens deur die installasie van $(^NameDA).$\r$\n$\r$\nDit word aanbeveel dat u alle ander programme afsluit voor die begin van die installasie. Dit maak dit moontlik om die relevante stelsellêers op te dateer sonder om die rekenaar te herlaai.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Hierdie slimmerd lei mens deur die installasie van $(^NameDA).$\r$\n$\r$\nDit word aanbeveel dat u alle ander programme afsluit voor die begin van die installasie. Dit maak dit moontlik om die relevante stelsellÃªers op te dateer sonder om die rekenaar te herlaai.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
@@ -35,7 +35,7 @@
 
 !ifdef MUI_COMPONENTSPAGE
   ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Kies komponente"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Kies watter komponente van $(^NameDA) geïnstalleer moet word."
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Kies watter komponente van $(^NameDA) geÃ¯nstalleer moet word."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
@@ -48,7 +48,7 @@
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
     ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Beweeg die muis oor 'n komponent om sy beskrywing te sien."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Beweeg die muis oor 'n komponent om sy beskrywing te sien."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Kies 'n komponent om sy beskrywing te sien."
   !endif
 !endif
 
@@ -64,7 +64,7 @@
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Installeer tans"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Wag asb. terwyl $(^NameDA) geïnstalleer word."
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Wag asb. terwyl $(^NameDA) geÃ¯nstalleer word."
   ${LangFileString} MUI_TEXT_FINISH_TITLE "Installasie voltooid"
   ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Die installasie is suksesvol voltooi."
   ${LangFileString} MUI_TEXT_ABORT_TITLE "Installasie gestaak"
@@ -82,7 +82,7 @@
 
 !ifdef MUI_FINISHPAGE
   ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Voltooi van die $(^NameDA) Installasieslimmerd"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) is geïnstalleer op uw rekenaar.$\r$\n$\r$\nKlik op Voltooi om hierdie slimmerd af te sluit."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) is geÃ¯nstalleer op uw rekenaar.$\r$\n$\r$\nKlik op Voltooi om hierdie slimmerd af te sluit."
   ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Die rekenaar moet oorbegin word om die installasie van $(^NameDA) te voltooi. Wil u nou oorbegin?"
 !endif
 
@@ -96,7 +96,7 @@
   ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Begin nou oor"
   ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ek wil later self oorbegin"
   ${LangFileString} MUI_TEXT_FINISH_RUN "&Laat loop $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Wys Leesmy-lêer"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Wys Leesmy-lÃªer"
   ${LangFileString} MUI_BUTTONTEXT_FINISH "&Voltooi"  
 !endif
 
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Corsican.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Corsican.nsh	(revision 0)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Corsican.nsh	(revision 2956)
@@ -0,0 +1,133 @@
+ï»¿/*
+** Language: Corsican (1155)
+** Traduzzione corsa da Patriccollu di Santa Maria Ã¨ SichÃ¨ - <Patrick.Santa-Maria(AT)laposte.net>
+** ISO 639-1: co
+** ISO 639-2: cos
+*/
+
+!insertmacro LANGFILE "Corsican" = "Corsu" =
+
+!ifdef MUI_WELCOMEPAGE
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Benvenuta in l'Assistente d'Installazione di $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "St'Assistente d'Installazione hÃ  da aiutavvi Ã  installÃ  $(^NameDA).$\r$\n$\r$\nHÃ¨ ricumandatu di chjode tutti l'altri appiecazioni nanzu di avviÃ  st'Assistente. Quessu permetterÃ  di mudificÃ  i schedarii di u sistema senza riavviÃ  l'urdinatore.$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_UNWELCOMEPAGE
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Benvenuta in l'Assistente di Disinstallazione di $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "St'Assistente hÃ  da aiutavvi Ã  disinstallÃ  $(^NameDA).$\r$\n$\r$\nNanzu di principiÃ  a disinstallazione, ci vole Ã  assicurassi chÃ¬ $(^NameDA) Ã¹n sia micca in funzione.$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Cuntrattu di Licenza"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Ci vole Ã  leghje i termini di a licenza nanzu d'installÃ  $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "S'Ã¨ voi site d'accunsentu cÃ¹ i termini di u cuntrattu, sceglie Accunsentu per cuntinuÃ . Ci vole Ã  accettÃ  u cuntrattu per installÃ  $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "S'Ã¨ voi site d'accunsentu cÃ¹ i termini di u cuntrattu, sceglie a casella inghjÃ². Ci vole Ã  accettÃ  u cuntrattu per installÃ  $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "S'Ã¨ voi site d'accunsentu cÃ¹ i termini di u cuntrattu, sceglie a prima ozzione inghjÃ². Ci vole Ã  accettÃ  u cuntrattu per installÃ  $(^NameDA). $_CLICK"
+!endif
+
+!ifdef MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Cuntrattu di Licenza"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Ci vole Ã  leghje i termini di a licenza nanzu di disinstallÃ  $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "S'Ã¨ voi site d'accunsentu cÃ¹ i termini di u cuntrattu, sceglie Accunsentu per cuntinuÃ . Ci vole Ã  accettÃ  u cuntrattu per disinstallÃ  $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "S'Ã¨ voi site d'accunsentu cÃ¹ i termini di u cuntrattu, sceglie a casella inghjÃ². Ci vole Ã  accettÃ  u cuntrattu per disinstallÃ  $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "S'Ã¨ voi site d'accunsentu cÃ¹ i termini di u cuntrattu, sceglie a prima ozzione inghjÃ². Ci vole Ã  accettÃ  u cuntrattu per disinstallÃ  $(^NameDA). $_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Sceglie Pagina Seguente per vede a seguita di u ducumentu."
+!endif
+
+!ifdef MUI_COMPONENTSPAGE
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Sceglie i Cumpunenti"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Sceglie i funzioni di $(^NameDA) chÃ¬ voi vulete installÃ ."
+!endif
+
+!ifdef MUI_UNCOMPONENTSPAGE
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Sceglie i Cumpunenti"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Sceglie i funzioni di $(^NameDA) chÃ¬ voi vulete disinstallÃ ."
+!endif
+
+!ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Discrizzione"
+  !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "PiazzÃ  u topu nant'Ã  un cumpunentu per fighjÃ  a so discrizzione."
+  !else
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "SelezziunÃ  un cumpunentu per fighjÃ  a so discrizzione."
+  !endif
+!endif
+
+!ifdef MUI_DIRECTORYPAGE
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Sceglie u Cartulare d'Installazione"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Sceglie u cartulare d'installazione di $(^NameDA)."
+!endif
+
+!ifdef MUI_UNDIRECTORYPAGE
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Sceglie u Cartulare di Disinstallazione"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Sceglie u cartulare di disinstallazione di $(^NameDA)."
+!endif
+
+!ifdef MUI_INSTFILESPAGE
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Installazione in corsu"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Aspettate per piacÃ¨ chÃ¬ $(^NameDA) sia installatu."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Installazione Compia"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "L'installazione hÃ¨ compia bÃ¨."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Installazione Interrotta"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "L'installazione Ã¹n hÃ¨ micca compia bÃ¨."
+!endif
+
+!ifdef MUI_UNINSTFILESPAGE
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Desinstallazione in corsu"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Aspettate per piacÃ¨ chÃ¬ $(^NameDA) sia disinstallatu."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Disinstallazione Compia"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "A disinstallazione hÃ¨ compia bÃ¨."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Disinstallazione Interrotta"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "A disinstallazione Ã¹n hÃ¨ micca compia bÃ¨."
+!endif
+
+!ifdef MUI_FINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Fine d'Installazione di $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) hÃ¨ statu installatu nant'Ã  l'urdinatore.$\r$\n$\r$\nSceglie PiantÃ  per chjode l'Assistente."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "L'urdinatore deve esse piantatu Ã¨ rilanciatu per compie l'installazione di $(^NameDA). Vulete piantallu Ã¨ rilanciallu avÃ  ?"
+!endif
+
+!ifdef MUI_UNFINISHPAGE
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Fine di Disinstallazione di $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) hÃ¨ statu disinstallatu da l'urdinatore.$\r$\n$\r$\nSceglie PiantÃ  per chjode l'Assistente."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "L'urdinatore deve esse piantatu Ã¨ rilanciatu per compie a disinstallazione di $(^NameDA). Vulete piantallu Ã¨ rilanciallu avÃ  ?"
+!endif
+
+!ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "RilanciÃ  avÃ "
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Vogliu fallu dopu dapermÃ¨"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&Eseguisce $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&AffissÃ  u schedariu LisezMoi/Readme"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&PiantÃ "
+!endif
+
+!ifdef MUI_STARTMENUPAGE
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Sceglie un Cartulare di u 'Menu DÃ©marrer'"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Sceglie un cartulare di u 'Menu DÃ©marrer' per l'accurtatoghjii di $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Sceglie un cartulare di u 'Menu DÃ©marrer' induve l'accurtatoghjii di u prugramma seranu creati. Pudete dinÃ¹ scrive un nome per creÃ  un novu cartulare."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ã™n creÃ  micca d'accurtatoghji"
+!endif
+
+!ifdef MUI_UNCONFIRMPAGE
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "DisinstallÃ  $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "CacciÃ  $(^NameDA) da l'urdinatore."
+!endif
+
+!ifdef MUI_ABORTWARNING
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Site sicuru di vulÃ¨ chitÃ  l'Assistente d'Installazione di $(^Name) ?"
+!endif
+
+!ifdef MUI_UNABORTWARNING
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Site sicuru di vulÃ¨ chitÃ  a Disinstallazione di $(^Name) ?"
+!endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Scelta di l'Utilizatori"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Sceglie l'utilizatori chÃ¬ puderanu impiegÃ  $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "SelezziunÃ  s'Ã¨llu ci vole Ã  installÃ  $(^NameDA) solu per voi o per tutti l'utilizatori di l'urdinatore. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "InstallÃ  per tutti l'utilizatori di l'urdinatore"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "InstallÃ  solu per mÃ¨"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Portuguese.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Portuguese.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Portuguese.nsh	(revision 2956)
@@ -1,95 +1,95 @@
-;Language: Portuguese (2070)
+ï»¿;Language: Portuguese (2070)
 ;By Ramon <ramon@netcabo.pt>
 
-!insertmacro LANGFILE "Portuguese" "Português"
+!insertmacro LANGFILE "Portuguese" = "PortuguÃªs" "Portugues"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bem vindo ao Assistente de Instalação do $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Este assistente ajudá-lo-á durante a instalação do $(^NameDA).$\r$\n$\r$\nÉ recomendado que feche todas as outras aplicações antes de iniciar a Instalação. Isto permitirá que o Instalador actualize ficheiros relacionados com o sistema sem necessidade de reiniciar o computador.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bem vindo ao Assistente de InstalaÃ§Ã£o do $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Este assistente ajudÃ¡-lo-Ã¡ durante a instalaÃ§Ã£o do $(^NameDA).$\r$\n$\r$\nÃ‰ recomendado que feche todas as outras aplicaÃ§Ãµes antes de iniciar a InstalaÃ§Ã£o. Isto permitirÃ¡ que o Instalador actualize ficheiros relacionados com o sistema sem necessidade de reiniciar o computador.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Bem vindo ao Assistente de desinstalação do $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Este assistente ajudá-lo-á durante a desinstalação do $(^NameDA).$\r$\n$\r$\nAntes de iniciar a desinstalação, certifique-se de que o $(^NameDA) não está em execução.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Bem vindo ao Assistente de desinstalaÃ§Ã£o do $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Este assistente ajudÃ¡-lo-Ã¡ durante a desinstalaÃ§Ã£o do $(^NameDA).$\r$\n$\r$\nAntes de iniciar a desinstalaÃ§Ã£o, certifique-se de que o $(^NameDA) nÃ£o estÃ¡ em execuÃ§Ã£o.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Contrato de Licença"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Por favor, verifique os termos da licença antes de instalar o $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Se aceitar os termos da licença, clique em 'Aceito' para continuar. Deverá aceitar o contrato para instalar o $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Se aceitar os termos da licença, clique na caixa de seleção abaixo. Deverá aceitar o contrato para instalar o $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Se aceitar os termos da licença, selecione a primeira opção abaixo. Você deve aceitar o contrato para instalar o $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Contrato de LicenÃ§a"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Por favor, verifique os termos da licenÃ§a antes de instalar o $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Se aceitar os termos da licenÃ§a, clique em 'Aceito' para continuar. DeverÃ¡ aceitar o contrato para instalar o $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Se aceitar os termos da licenÃ§a, clique na caixa de seleÃ§Ã£o abaixo. DeverÃ¡ aceitar o contrato para instalar o $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Se aceitar os termos da licenÃ§a, selecione a primeira opÃ§Ã£o abaixo. VocÃª deve aceitar o contrato para instalar o $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Contrato de Licença"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Por favor, verifique os termos da licença antes de desinstalar o $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Se aceitar os termos da licença, clique em 'Aceito' para continuar. Deverá aceitar o contrato para desinstalar o $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Se aceitar os termos da licença, clique na caixa de seleção abaixo. Deverá aceitar o contrato para desinstalar o $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Se aceitar os termos da licença, selecione a primeira opção abaixo. Você deve aceitar o contrato para desinstalar o $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Contrato de LicenÃ§a"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Por favor, verifique os termos da licenÃ§a antes de desinstalar o $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Se aceitar os termos da licenÃ§a, clique em 'Aceito' para continuar. DeverÃ¡ aceitar o contrato para desinstalar o $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Se aceitar os termos da licenÃ§a, clique na caixa de seleÃ§Ã£o abaixo. DeverÃ¡ aceitar o contrato para desinstalar o $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Se aceitar os termos da licenÃ§a, selecione a primeira opÃ§Ã£o abaixo. VocÃª deve aceitar o contrato para desinstalar o $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Tecle Page Down para ver o restante da licença."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Tecle Page Down para ver o restante da licenÃ§a."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
   ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Escolha de Componentes"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Escolha quais as características do $(^NameDA) que deseja instalar."
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Escolha quais as caracterÃ­sticas do $(^NameDA) que deseja instalar."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Escolher Componentes"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Escolha quais as características do $(^NameDA) que deseja desinstalar."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Escolha quais as caracterÃ­sticas do $(^NameDA) que deseja desinstalar."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Descrição"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "DescriÃ§Ã£o"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Posicione o rato sobre um componente para ver a sua descrição."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Posicione o rato sobre um componente para ver a sua descriÃ§Ã£o."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Posicione o rato sobre um componente para ver a sua descrição."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Seleccione um componente para ver a sua descriÃ§Ã£o."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Escolha do Local da Instalação"
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Escolha do Local da InstalaÃ§Ã£o"
   ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Escolha a pasta na qual deseja instalar o $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Escolha o Local de desinstalação"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Escolha o Local de desinstalaÃ§Ã£o"
   ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Escolha a pasta de onde pretende desinstalar o $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Instalando"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Por favor, aguarde enquanto o $(^NameDA) está sendo instalado."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Instalação Completa"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "A instalação foi concluída com sucesso."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Instalação Abortada"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "A instalação não foi concluída com sucesso."
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Por favor, aguarde enquanto o $(^NameDA) estÃ¡ sendo instalado."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "InstalaÃ§Ã£o Completa"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "A instalaÃ§Ã£o foi concluÃ­da com sucesso."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "InstalaÃ§Ã£o Abortada"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "A instalaÃ§Ã£o nÃ£o foi concluÃ­da com sucesso."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Desinstalando"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Por favor, aguarde enquanto o $(^NameDA) está sendo desinstalado."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Desinstalação Completa"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "A desinstalação foi concluída com sucesso."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Desinstalação Abortada"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "A desinstalação não foi concluída com sucesso"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Por favor, aguarde enquanto o $(^NameDA) estÃ¡ sendo desinstalado."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "DesinstalaÃ§Ã£o Completa"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "A desinstalaÃ§Ã£o foi concluÃ­da com sucesso."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "DesinstalaÃ§Ã£o Abortada"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "A desinstalaÃ§Ã£o nÃ£o foi concluÃ­da com sucesso"
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Concluindo o Assistente de Instalação do $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Concluindo o Assistente de InstalaÃ§Ã£o do $(^NameDA)"
   ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) foi instalado no seu computador.$\r$\n$\r$\nClique em Terminar para fechar este assistente."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "O seu computador deve ser reiniciado para concluír a instalação do $(^NameDA). Deseja reiniciar agora?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "O seu computador deve ser reiniciado para concluÃ­r a instalaÃ§Ã£o do $(^NameDA). Deseja reiniciar agora?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Concluíndo o assistente de desisntalação do $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "ConcluÃ­ndo o assistente de desisntalaÃ§Ã£o do $(^NameDA)"
   ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) foi removido do seu computador.$\r$\n$\r$\nClique em Terminar para fechar este assistente."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "O seu computador deve ser reiniciado para concluír a desinstalação do $(^NameDA). Deseja reiniciar agora?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "O seu computador deve ser reiniciado para concluÃ­r a desinstalaÃ§Ã£o do $(^NameDA). Deseja reiniciar agora?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
@@ -103,8 +103,8 @@
 !ifdef MUI_STARTMENUPAGE
   ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Escolha uma Pasta do Menu Iniciar"
   ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Escolha uma pasta do Menu Iniciar para os atalhos do programa."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Selecione uma pasta do Menu Iniciar em que deseja criar os atalhos do programa. Você pode também digitar um nome para criar uma nova pasta. "
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Não criar atalhos"
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Selecione uma pasta do Menu Iniciar em que deseja criar os atalhos do programa. VocÃª pode tambÃ©m digitar um nome para criar uma nova pasta. "
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "NÃ£o criar atalhos"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
@@ -113,9 +113,17 @@
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Deseja realmente cancelar a instalação do $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Deseja realmente cancelar a instalaÃ§Ã£o do $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Deseja realmente cancelar a desinstalação do $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Deseja realmente cancelar a desinstalaÃ§Ã£o do $(^Name)?"
 !endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Escolha utilizadores"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Escolha para quais utilizadores deseja instalar o $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Escolha se deseja instalar o $(^NameDA) apenas para si ou para todos os utilizadores. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Instalar para todos os utilizadores"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Instalar apenas para si"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Estonian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Estonian.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Estonian.nlf	(revision 2956)
@@ -1,11 +1,11 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1061
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1257
 # RTL - anything else than RTL means LTR
 -
@@ -41,11 +41,11 @@
 # ^NextBtn
 Edasi >
 # ^AgreeBtn
-Nõustun
+NÃµustun
 # ^AcceptBtn
-Nõustun litsentsilepingu tingimustega
+NÃµustun litsentsilepingu tingimustega
 # ^DontAcceptBtn
-Ei nõustu litsentsilepingu tingimustega
+Ei nÃµustu litsentsilepingu tingimustega
 # ^InstallBtn
 Paigalda
 # ^UninstallBtn
@@ -59,7 +59,7 @@
 # ^ShowDetailsBtn
 Detailid
 # ^ClickNext
-Jätkamiseks vajuta Edasi.
+JÃ¤tkamiseks vajuta Edasi.
 # ^ClickInstall
 Paigaldamise alustamiseks vajuta Paigalda.
 # ^ClickUninstall
@@ -69,43 +69,43 @@
 # ^Completed
 Valmis
 # ^LicenseText
-Enne $(^NameDA) paigaldamist vaata palun litsentsileping üle. Kui sa nõustud kõigi lepingu tingimustega, vajuta Nõustun.
+Enne $(^NameDA) paigaldamist vaata palun litsentsileping Ã¼le. Kui sa nÃµustud kÃµigi lepingu tingimustega, vajuta NÃµustun.
 # ^LicenseTextCB
-Enne $(^NameDA) paigaldamist vaata palun litsentsileping üle. Kui sa nõustud kõigi lepingu tingimustega, vali allolev märkeruut. $_CLICK
+Enne $(^NameDA) paigaldamist vaata palun litsentsileping Ã¼le. Kui sa nÃµustud kÃµigi lepingu tingimustega, vali allolev mÃ¤rkeruut. $_CLICK
 # ^LicenseTextRB
-Enne $(^NameDA) paigaldamist vaata palun litsentsileping üle. Kui sa nõustud kõigi lepingu tingimustega, märgi allpool esimene valik. $_CLICK
+Enne $(^NameDA) paigaldamist vaata palun litsentsileping Ã¼le. Kui sa nÃµustud kÃµigi lepingu tingimustega, mÃ¤rgi allpool esimene valik. $_CLICK
 # ^UnLicenseText
-Enne $(^NameDA) eemaldamist vaata palun litsentsileping üle. Kui sa nõustud kõigi lepingu tingimustega, vajuta Nõustun.
+Enne $(^NameDA) eemaldamist vaata palun litsentsileping Ã¼le. Kui sa nÃµustud kÃµigi lepingu tingimustega, vajuta NÃµustun.
 # ^UnLicenseTextCB
-Enne $(^NameDA) eemaldamist vaata palun litsentsileping üle. Kui sa nõustud kõigi lepingu tingimustega, vali allolev märkeruut. $_CLICK
+Enne $(^NameDA) eemaldamist vaata palun litsentsileping Ã¼le. Kui sa nÃµustud kÃµigi lepingu tingimustega, vali allolev mÃ¤rkeruut. $_CLICK
 # ^UnLicenseTextRB
-Enne $(^NameDA) eemaldamist vaata palun litsentsileping üle. Kui sa nõustud kõigi lepingu tingimustega, märgi allpool esimene valik. $_CLICK
+Enne $(^NameDA) eemaldamist vaata palun litsentsileping Ã¼le. Kui sa nÃµustud kÃµigi lepingu tingimustega, mÃ¤rgi allpool esimene valik. $_CLICK
 # ^Custom
 Kohandatud
 # ^ComponentsText
-Märgista komponendid mida soovid paigaldada ja eemalda märgistus neilt, mida ei soovi paigaldada. $_CLICK
+MÃ¤rgista komponendid mida soovid paigaldada ja eemalda mÃ¤rgistus neilt, mida ei soovi paigaldada. $_CLICK
 # ^ComponentsSubText1
-Vali paigalduse tüüp:
+Vali paigalduse tÃ¼Ã¼p:
 # ^ComponentsSubText2_NoInstTypes
 Vali paigaldatavad komponendid:
 # ^ComponentsSubText2
-või vali lisakomponendid mida soovid paigaldada:
+vÃµi vali lisakomponendid mida soovid paigaldada:
 # ^UnComponentsText
-Märgista komponendid mida soovid eemaldada ja eemalda märgistus neilt, mida ei soovi eemaldada. $_CLICK
+MÃ¤rgista komponendid mida soovid eemaldada ja eemalda mÃ¤rgistus neilt, mida ei soovi eemaldada. $_CLICK
 # ^UnComponentsSubText1
-Vali eemalduse tüüp:
+Vali eemalduse tÃ¼Ã¼p:
 # ^UnComponentsSubText2_NoInstTypes
 Vali eemaldatavad komponendid:
 # ^UnComponentsSubText2
-või vali lisakomponendid mida soovid eemaldada:
+vÃµi vali lisakomponendid mida soovid eemaldada:
 # ^DirText
-$(^NameDA) paigaldatakse järgmisse kausta. Et mujale paigaldada, vajuta sirvi ja vali teine kaust. $_CLICK
+$(^NameDA) paigaldatakse jÃ¤rgmisse kausta. Et mujale paigaldada, vajuta sirvi ja vali teine kaust. $_CLICK
 # ^DirSubText
 Sihtkaust
 # ^DirBrowseText
 Vali kaust kuhu $(^NameDA) paigaldada:
 # ^UnDirText
-$(^NameDA) eemaldatakse järgmisest kaustast. Et mujalt eemaldada, vajuta sirvi ja vali teine kaust. $_CLICK
+$(^NameDA) eemaldatakse jÃ¤rgmisest kaustast. Et mujalt eemaldada, vajuta sirvi ja vali teine kaust. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
@@ -115,17 +115,17 @@
 # ^SpaceRequired
 "Vajalik ruum: "
 # ^UninstallingText
-$(^NameDA) eemaldatakse järgmisest kaustast. $_CLICK
+$(^NameDA) eemaldatakse jÃ¤rgmisest kaustast. $_CLICK
 # ^UninstallingSubText
 Eemaldan sealt:
 # ^FileError
-Tõrge faili avamisel kirjutamiseks: \r\n\t"$0"\r\nPaigalduse katkestamiseks vajuta Katkesta,\r\nvajuta Ürita uuesti, et faili kirjutamist uuesti proovida, või\r\nIgnoreeri, et see fail vahele jätta.
+TÃµrge faili avamisel kirjutamiseks: \r\n\t"$0"\r\nPaigalduse katkestamiseks vajuta Katkesta,\r\nvajuta Ãœrita uuesti, et faili kirjutamist uuesti proovida, vÃµi\r\nIgnoreeri, et see fail vahele jÃ¤tta.
 # ^FileError_NoIgnore
-Tõrge faili avamisel kirjutamiseks: \r\n\t"$0"\r\nVajuta Ürita uuesti, et faili kirjutamist uuesti proovida, või\r\nLoobu, et paigaldamine katkestada
+TÃµrge faili avamisel kirjutamiseks: \r\n\t"$0"\r\nVajuta Ãœrita uuesti, et faili kirjutamist uuesti proovida, vÃµi\r\nLoobu, et paigaldamine katkestada
 # ^CantWrite
 "Ei saa kirjutada: "
 # ^CopyFailed
-Kopeerimine ebaõnnestus
+Kopeerimine ebaÃµnnestus
 # ^CopyTo
 "Kopeeri sinna "
 # ^Registering
@@ -133,7 +133,7 @@
 # ^Unregistering
 "Deregistreerin: "
 # ^SymbolNotFound
-"Ei leidnud sümbolit: "
+"Ei leidnud sÃ¼mbolit: "
 # ^CouldNotLoad
 "Ei saanud laadida: "
 # ^CreateFolder
@@ -145,46 +145,46 @@
 # ^Delete
 "Kustuta fail: "
 # ^DeleteOnReboot
-"Kustuta taaskäivitamisel: "
+"Kustuta taaskÃ¤ivitamisel: "
 # ^ErrorCreatingShortcut
-"Tõrge otsetee loomisel: "
+"TÃµrge otsetee loomisel: "
 # ^ErrorCreating
-"Tõrge loomisel: "
+"TÃµrge loomisel: "
 # ^ErrorDecompressing
-Tõrge andmete lahtipakkimisel! Vigane paigaldaja?
+TÃµrge andmete lahtipakkimisel! Vigane paigaldaja?
 # ^ErrorRegistering
-Tõrge DLL-i registreerimisel
+TÃµrge DLL-i registreerimisel
 # ^ExecShell
 "ExecShell: "
 # ^Exec
-"Käivita: "
+"KÃ¤ivita: "
 # ^Extract
 "Paki lahti: "
 # ^ErrorWriting
 "Paki lahti: viga faili kirjutamisel "
 # ^InvalidOpcode
-Paigaldaja kõlbmatu: vigane opkood
+Paigaldaja kÃµlbmatu: vigane opkood
 # ^NoOLE
 "No OLE for: "
 # ^OutputFolder
-"Väljastatav kaust: "
+"VÃ¤ljastatav kaust: "
 # ^RemoveFolder
 "Eemalda kaust: "
 # ^RenameOnReboot
-"Taaskäivitusel nimeta ümber: "
+"TaaskÃ¤ivitusel nimeta Ã¼mber: "
 # ^Rename
-"Nimeta ümber: "
+"Nimeta Ã¼mber: "
 # ^Skipped
-"Vahele jäetud: "
+"Vahele jÃ¤etud: "
 # ^CopyDetails
-Kopeeri detailid lõikelauale
+Kopeeri detailid lÃµikelauale
 # ^LogInstall
 Logi paigaldusprotsess
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Kurdish.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Kurdish.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Kurdish.nsh	(revision 2956)
@@ -1,111 +1,111 @@
-;Language: Kurdish
-;By Rêzan Tovjîn
-;Updated by Erdal Ronahî (erdal.ronahi@gmail.com)
+ï»¿;Language: Kurdish
+;By RÃªzan TovjÃ®n
+;Updated by Erdal RonahÃ® (erdal.ronahi@gmail.com)
 
-!insertmacro LANGFILE "Kurdish" "Kurdî"
+!insertmacro LANGFILE "Kurdish" = "KurdÃ®" "Kurdi"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) Tu bi xêr hatî sêrbaziya sazkirinê"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ev sêrbaz dê di dema sazkirina $(^NameDA) de rêberiya te bike.$\r$\n$\r$\nBerî tu dest bi sazkirinê bikî, em pêþniyar dikin tu hemû bernameyên vekirî bigirî. Bi vî rengî beyî tu komputera ji nû ve vekî dê hinek dosiyên pergalê bêpirsgirêk werin sazkirin.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) Tu bi xÃªr hatÃ® sÃªrbaziya sazkirinÃª"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ev sÃªrbaz dÃª di dema sazkirina $(^NameDA) de rÃªberiya te bike.$\r$\n$\r$\nBerÃ® tu dest bi sazkirinÃª bikÃ®, em pÃªÅŸniyar dikin tu hemÃ» bernameyÃªn vekirÃ® bigirÃ®. Bi vÃ® rengÃ® beyÃ® tu komputera ji nÃ» ve vekÃ® dÃª hinek dosiyÃªn pergalÃª bÃªpirsgirÃªk werin sazkirin.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Tu bi xêr hatî sêrbaziya rakirina bernameya $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ev sêrbaz ji bo rakirina bernameya $(^NameDA) dê alîkariya te bike.$\r$\n$\r$\nBerî tu dest bi rakirina bernameyê bikî, bernameyên vekirî hemûyan bigire. Bi vî rengî dû re tu mecbûr namînî ku komputera xwe bigirî û ji nû ve veki.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Tu bi xÃªr hatÃ® sÃªrbaziya rakirina bernameya $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ev sÃªrbaz ji bo rakirina bernameya $(^NameDA) dÃª alÃ®kariya te bike.$\r$\n$\r$\nBerÃ® tu dest bi rakirina bernameyÃª bikÃ®, bernameyÃªn vekirÃ® hemÃ»yan bigire. Bi vÃ® rengÃ® dÃ» re tu mecbÃ»r namÃ®nÃ® ku komputera xwe bigirÃ® Ã» ji nÃ» ve veki.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Peymana Lîsansê"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Ji kerema xwe re berî tu bernameya $(^NameDA) saz bikî, peymana lîsansê bixwîne."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Heke tu þertên peymanê dipejirînî, 'Ez Dipejirînim'ê bitikîne. Ji bo sazkirina bernameya $(^NameDA) divê tu þertên peymanê bipejirînî."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Heke tu þertên peymanê dipejirînî, zeviya piþtrastkirinê ya jêrîn dagire. Ji bo tu bikarî bernameya $(^NameDA) saz bikî divê tu þertên peymanê bipejirînî. $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Heke tu þertên peymanê dipejirînî, biþkojka erêkirinê ya jêrîn bitikîne. Ji bo sazkirina bernameya $(^NameDA) divê tu þertên peymanê bipejirînî. $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Peymana LÃ®sansÃª"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Ji kerema xwe re berÃ® tu bernameya $(^NameDA) saz bikÃ®, peymana lÃ®sansÃª bixwÃ®ne."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Heke tu ÅŸertÃªn peymanÃª dipejirÃ®nÃ®, 'Ez DipejirÃ®nim'Ãª bitikÃ®ne. Ji bo sazkirina bernameya $(^NameDA) divÃª tu ÅŸertÃªn peymanÃª bipejirÃ®nÃ®."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Heke tu ÅŸertÃªn peymanÃª dipejirÃ®nÃ®, zeviya piÅŸtrastkirinÃª ya jÃªrÃ®n dagire. Ji bo tu bikarÃ® bernameya $(^NameDA) saz bikÃ® divÃª tu ÅŸertÃªn peymanÃª bipejirÃ®nÃ®. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Heke tu ÅŸertÃªn peymanÃª dipejirÃ®nÃ®, biÅŸkojka erÃªkirinÃª ya jÃªrÃ®n bitikÃ®ne. Ji bo sazkirina bernameya $(^NameDA) divÃª tu ÅŸertÃªn peymanÃª bipejirÃ®nÃ®. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Peymana Lîsansê"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Berî tu bernameya $(^NameDA) ji pergala xwe rakî peymanê bixwîne."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Heke tu þertên peymanê dipejirînî, 'Dipejirînim'ê bitikîne. Ji bo rakirina bernameya  $(^NameDA) divê tu þertên peymanê bipejirînî."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Heke tu þertên peymanê dipejirînî, zeviya erêkirinê ya jêrîn dagire. Ji bo tu bernameya $(^NameDA) ji pergala xwe rakî divê tu peymanê bipejirînî. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Heke tu þertên peymanê dipejirînî, biþkojka erêkirinê ya jêrîn hilbijêre. Ji bo tu bernameya  $(^NameDA) ji pergala xwe rakî divê tu þertên peymanê bipejirînî. $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Peymana LÃ®sansÃª"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "BerÃ® tu bernameya $(^NameDA) ji pergala xwe rakÃ® peymanÃª bixwÃ®ne."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Heke tu ÅŸertÃªn peymanÃª dipejirÃ®nÃ®, 'DipejirÃ®nim'Ãª bitikÃ®ne. Ji bo rakirina bernameya  $(^NameDA) divÃª tu ÅŸertÃªn peymanÃª bipejirÃ®nÃ®."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Heke tu ÅŸertÃªn peymanÃª dipejirÃ®nÃ®, zeviya erÃªkirinÃª ya jÃªrÃ®n dagire. Ji bo tu bernameya $(^NameDA) ji pergala xwe rakÃ® divÃª tu peymanÃª bipejirÃ®nÃ®. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Heke tu ÅŸertÃªn peymanÃª dipejirÃ®nÃ®, biÅŸkojka erÃªkirinÃª ya jÃªrÃ®n hilbijÃªre. Ji bo tu bernameya  $(^NameDA) ji pergala xwe rakÃ® divÃª tu ÅŸertÃªn peymanÃª bipejirÃ®nÃ®. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Ji bo dûmahîka peymanê biþkojka 'page down' bitikîne."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Ji bo dÃ»mahÃ®ka peymanÃª biÅŸkojka 'page down' bitikÃ®ne."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
   ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Hilbijartina pareyan"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Ji bo sazkirina $(^NameDA) pareyên tu dixwazî hilbijêre."
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Ji bo sazkirina $(^NameDA) pareyÃªn tu dixwazÃ® hilbijÃªre."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Hilbijartina Pareyan"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Pareya bernameya $(^NameDA) ku tu dixwazî rakî hilbijêre."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Pareya bernameya $(^NameDA) ku tu dixwazÃ® rakÃ® hilbijÃªre."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Dazanîn"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "DazanÃ®n"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ji bo tu der barê pareyan de agahiyan bistînî nîþanekê bibe ser pareyekê."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ji bo tu der barÃª pareyan de agahiyan bistÃ®nÃ® nÃ®ÅŸanekÃª bibe ser pareyekÃª."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ji bo tu der barê pareyan de agahiyan bistînî nîþanekê bibe ser pareyekê."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ji bo tu der barÃª pareyan de agahiyan bistÃ®nÃ® pareyekÃª hilbijÃªre." 
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Hilbijartina peldanka armanckirî"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Peldanka tu dixwazî bernameya $(^NameDA) tê de were sazkirin hilbijêre."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Hilbijartina peldanka armanckirÃ®"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Peldanka tu dixwazÃ® bernameya $(^NameDA) tÃª de were sazkirin hilbijÃªre."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Hilbijartina Peldanka Dê Were Rakirin"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Peldanka bernameya $(^NameDA) ku tudixwazî rakî hilbijêre."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Hilbijartina Peldanka DÃª Were Rakirin"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Peldanka bernameya $(^NameDA) ku tudixwazÃ® rakÃ® hilbijÃªre."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Tê sazkirin"
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "TÃª sazkirin"
   ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Ji kerema xwe re heta sazkirina $(^NameDA) biqede raweste."
   ${LangFileString} MUI_TEXT_FINISH_TITLE "Sazkirin Qediya"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Sazkirin bi serkeftinî qediya."
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Sazkirin bi serkeftinÃ® qediya."
   ${LangFileString} MUI_TEXT_ABORT_TITLE "Sazkirin hate betalkirin"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Sazkirin be tevahî qediya."
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Sazkirin be tevahÃ® qediya."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Tê rakirin"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "TÃª rakirin"
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Heta bernameya $(^NameDA) ji pergala te were rakirin raweste."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Rakirina Bernameyê Biqedîne"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Rakirina bernameyê bi serkeftin pêk hat."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Rakirina bernameyê hate betalkirin"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Rakirina bernameyê neqediya."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Rakirina BernameyÃª BiqedÃ®ne"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Rakirina bernameyÃª bi serkeftin pÃªk hat."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Rakirina bernameyÃª hate betalkirin"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Rakirina bernameyÃª neqediya."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Sêrbaziya sazkirina $(^NameDA) diqede."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) li komputera te hate barkirin.$\r$\n$\r$\n'Biqedîne'yê bitikîne û sazkirinê bi dawî bîne."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Ji bo bidawîkirina sazkirina $(^NameDA) divê tu komputerê ji nû ve vekî.Tu dixwazî komputerê ji nû ve vekî?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "SÃªrbaziya sazkirina $(^NameDA) diqede."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) li komputera te hate barkirin.$\r$\n$\r$\n'BiqedÃ®ne'yÃª bitikÃ®ne Ã» sazkirinÃª bi dawÃ® bÃ®ne."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Ji bo bidawÃ®kirina sazkirina $(^NameDA) divÃª tu komputerÃª ji nÃ» ve vekÃ®.Tu dixwazÃ® komputerÃª ji nÃ» ve vekÃ®?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Sêrbaziya Rakirina Bernameya $(^NameDA) Tê Temamkirin"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Bernameya $(^NameDA) ji pergale hate rakirin.$\r$\n$\r$\nJi bo girtina sêrbaz 'biqedîne'yê bitikîne."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Ji bo rakirina bernameya $(^NameDA) biqede divê tu komputera xwe ji nû ve vekî. Tu dixwazî niha komputera te were girtin û ji nû ve dest pê bike?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "SÃªrbaziya Rakirina Bernameya $(^NameDA) TÃª Temamkirin"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Bernameya $(^NameDA) ji pergale hate rakirin.$\r$\n$\r$\nJi bo girtina sÃªrbaz 'biqedÃ®ne'yÃª bitikÃ®ne."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Ji bo rakirina bernameya $(^NameDA) biqede divÃª tu komputera xwe ji nÃ» ve vekÃ®. Tu dixwazÃ® niha komputera te were girtin Ã» ji nÃ» ve dest pÃª bike?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ji nû ve veke"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ezê paþê ji nû ve vekim."
-  ${LangFileString} MUI_TEXT_FINISH_RUN "Bernameya $(^NameDA) bixebitîne"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Dosiya min bixwîne/readme &nîþan bide"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Biqedîne"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ji nÃ» ve veke"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "EzÃª paÅŸÃª ji nÃ» ve vekim."
+  ${LangFileString} MUI_TEXT_FINISH_RUN "Bernameya $(^NameDA) bixebitÃ®ne"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Dosiya min bixwÃ®ne/readme &nÃ®ÅŸan bide"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&BiqedÃ®ne"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Hilbijartina Peldanka Pêþeka Destpêkê"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Peldanka pêþeka destpêkê ya ku dê kineriya $(^NameDA) tê de were bikaranîn hilbijêre."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Peldanka pêþeka destpêkê ya ku dê kineriya bernameyê tê de were bicihkirin hilbijêre.  Tu dikarî bi navekî nû peldankeke nû ava bikî."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Bêyî çêkirina kineriyê bidomîne"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Hilbijartina Peldanka PÃªÅŸeka DestpÃªkÃª"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Peldanka pÃªÅŸeka destpÃªkÃª ya ku dÃª kineriya $(^NameDA) tÃª de were bikaranÃ®n hilbijÃªre."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Peldanka pÃªÅŸeka destpÃªkÃª ya ku dÃª kineriya bernameyÃª tÃª de were bicihkirin hilbijÃªre.  Tu dikarÃ® bi navekÃ® nÃ» peldankeke nÃ» ava bikÃ®."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "BÃªyÃ® Ã§Ãªkirina kineriyÃª bidomÃ®ne"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
@@ -114,9 +114,9 @@
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Tu bawer î ku dixwazî ji sazkirina $(^Name) derkevî?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Tu bawer Ã® ku dixwazÃ® ji sazkirina $(^Name) derkevÃ®?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Tu bawer î ku dixwazî dest ji rakirina bernameya $(^Name) berdî?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Tu bawer Ã® ku dixwazÃ® dest ji rakirina bernameya $(^Name) berdÃ®?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Serbian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Serbian.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Serbian.nlf	(revision 2956)
@@ -1,190 +1,190 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 3098
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1251
 # RTL - anything else than RTL means LTR
 -
-# Translation by Ñð�àí Îáóžèíà <obucina@srpskijezik.edu.yu>
+# Translation by Ð¡Ñ€Ñ’Ð°Ð½ ÐžÐ±ÑƒÑ›Ð¸Ð½Ð° <obucina@srpskijezik.edu.yu>
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-$(^Name) Èíñòàëàöè¼à
+$(^Name) Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°
 # ^UninstallCaption
-$(^Name) Äåèíñòàëàöè¼à
+$(^Name) Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°
 # ^LicenseSubCaption
-: Äîãîâîð î ïðàâó êîðèøžåœà
+: Ð”Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð¾ Ð¿Ñ€Ð°Ð²Ñƒ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ°
 # ^ComponentsSubCaption
-: Îïöè¼å èíñòàëàöè¼å
+: ÐžÐ¿Ñ†Ð¸Ñ˜Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ
 # ^DirSubCaption
-: Èçáîð ôîëäåðà çà èíñòàëàöè¼ó
+: Ð˜Ð·Ð±Ð¾Ñ€ Ñ„Ð¾Ð»Ð´ÐµÑ€Ð° Ð·Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ
 # ^InstallingSubCaption
-: Èíñòàëàöè¼à
+: Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°
 # ^CompletedSubCaption
-: Çàâðøåíà èíñòàëàöè¼à
+: Ð—Ð°Ð²Ñ€ÑˆÐµÐ½Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°
 # ^UnComponentsSubCaption
-: Îïöè¼å äåèíñòàëàöè¼å
+: ÐžÐ¿Ñ†Ð¸Ñ˜Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ
 # ^UnDirSubCaption
-: Èçáîð ôîëäåðà çà äåèíñòàëàöè¼ó
+: Ð˜Ð·Ð±Ð¾Ñ€ Ñ„Ð¾Ð»Ð´ÐµÑ€Ð° Ð·Ð° Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ
 # ^ConfirmSubCaption
-: Ïîòâð�èâàœå
+: ÐŸÐ¾Ñ‚Ð²Ñ€Ñ’Ð¸Ð²Ð°ÑšÐµ
 # ^UninstallingSubCaption
-: Äåèíñòàëàöè¼à
+: Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°
 # ^UnCompletedSubCaption
-: Çàâðøåíà äåèíñòàëàöè¼à
+: Ð—Ð°Ð²Ñ€ÑˆÐµÐ½Ð° Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°
 # ^BackBtn
-< Íàçàä
+< Ð�Ð°Ð·Ð°Ð´
 # ^NextBtn
-Íàïðåä >
+Ð�Ð°Ð¿Ñ€ÐµÐ´ >
 # ^AgreeBtn
-Ïðèõâàòàì
+ÐŸÑ€Ð¸Ñ…Ð²Ð°Ñ‚Ð°Ð¼
 # ^AcceptBtn
-Ïðèõâàòàì óñëîâå äîãîâîðà î ïðàâó êîðèøžåœà
+ÐŸÑ€Ð¸Ñ…Ð²Ð°Ñ‚Ð°Ð¼ ÑƒÑ�Ð»Ð¾Ð²Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð° Ð¾ Ð¿Ñ€Ð°Ð²Ñƒ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ°
 # ^DontAcceptBtn
-Íå ïðèõâàòàì óñëîâå äîãîâîðà î ïðàâó êîðèøžåœà
+Ð�Ðµ Ð¿Ñ€Ð¸Ñ…Ð²Ð°Ñ‚Ð°Ð¼ ÑƒÑ�Ð»Ð¾Ð²Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð° Ð¾ Ð¿Ñ€Ð°Ð²Ñƒ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ°
 # ^InstallBtn
-Èíñòàëèðà¼
+Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ˜
 # ^UninstallBtn
-Äåèíñòàëèðà¼
+Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ˜
 # ^CancelBtn
-Îäóñòàíè
+ÐžÐ´ÑƒÑ�Ñ‚Ð°Ð½Ð¸
 # ^CloseBtn
-Çàòâîðè
+Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸
 # ^BrowseBtn
-Èçáîð...
+Ð˜Ð·Ð±Ð¾Ñ€...
 # ^ShowDetailsBtn
-Äåòàšè
+Ð”ÐµÑ‚Ð°Ñ™Ð¸
 # ^ClickNext
-Ïðèòèñíèòå äóãìå „Íàïðåä“ çà íàñòàâàê.
+ÐŸÑ€Ð¸Ñ‚Ð¸Ñ�Ð½Ð¸Ñ‚Ðµ Ð´ÑƒÐ³Ð¼Ðµ â€žÐ�Ð°Ð¿Ñ€ÐµÐ´â€œ Ð·Ð° Ð½Ð°Ñ�Ñ‚Ð°Ð²Ð°Ðº.
 # ^ClickInstall
-Ïðèòèñíèòå äóãìå „Èíñòàëèðà¼“ çà ïî÷åòàê èíñòàëàöè¼å.
+ÐŸÑ€Ð¸Ñ‚Ð¸Ñ�Ð½Ð¸Ñ‚Ðµ Ð´ÑƒÐ³Ð¼Ðµ â€žÐ˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ˜â€œ Ð·Ð° Ð¿Ð¾Ñ‡ÐµÑ‚Ð°Ðº Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ.
 # ^ClickUninstall
-Ïðèòèñíèòå äóãìå „Äåèíñòàëèðà¼“ çà ïî÷åòàê äåèíñòàëàöè¼å.
+ÐŸÑ€Ð¸Ñ‚Ð¸Ñ�Ð½Ð¸Ñ‚Ðµ Ð´ÑƒÐ³Ð¼Ðµ â€žÐ”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ˜â€œ Ð·Ð° Ð¿Ð¾Ñ‡ÐµÑ‚Ð°Ðº Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ.
 # ^Name
-Èìå
+Ð˜Ð¼Ðµ
 # ^Completed
-Çàâðøåíî
+Ð—Ð°Ð²Ñ€ÑˆÐµÐ½Ð¾
 # ^LicenseText
-Ïàæšèâî ïðî÷èòà¼òå äîãîâîð î ïðàâó êîðèøžåœà ïðå èíñòàëàöè¼å ïðîãðàìà $(^NameDA). Àêî ïðèõâàòàòå ñâå óñëîâå äîãîâîðà, ïðèòèñíèòå äóãìå „Ïðèõâàòàì“.
+ÐŸÐ°Ð¶Ñ™Ð¸Ð²Ð¾ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ˜Ñ‚Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð¾ Ð¿Ñ€Ð°Ð²Ñƒ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ° Ð¿Ñ€Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^NameDA). Ð�ÐºÐ¾ Ð¿Ñ€Ð¸Ñ…Ð²Ð°Ñ‚Ð°Ñ‚Ðµ Ñ�Ð²Ðµ ÑƒÑ�Ð»Ð¾Ð²Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð°, Ð¿Ñ€Ð¸Ñ‚Ð¸Ñ�Ð½Ð¸Ñ‚Ðµ Ð´ÑƒÐ³Ð¼Ðµ â€žÐŸÑ€Ð¸Ñ…Ð²Ð°Ñ‚Ð°Ð¼â€œ.
 # ^LicenseTextCB
-Ïàæšèâî ïðî÷èòà¼òå äîãîâîð î ïðàâó êîðèøžåœà ïðå èíñòàëàöè¼å ïðîãðàìà $(^NameDA). Àêî ïðèõâàòàòå ñâå óñëîâå äîãîâîðà, îáåëåæèòå êâàäðàòèž èñïîä. $_CLICK
+ÐŸÐ°Ð¶Ñ™Ð¸Ð²Ð¾ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ˜Ñ‚Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð¾ Ð¿Ñ€Ð°Ð²Ñƒ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ° Ð¿Ñ€Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^NameDA). Ð�ÐºÐ¾ Ð¿Ñ€Ð¸Ñ…Ð²Ð°Ñ‚Ð°Ñ‚Ðµ Ñ�Ð²Ðµ ÑƒÑ�Ð»Ð¾Ð²Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð°, Ð¾Ð±ÐµÐ»ÐµÐ¶Ð¸Ñ‚Ðµ ÐºÐ²Ð°Ð´Ñ€Ð°Ñ‚Ð¸Ñ› Ð¸Ñ�Ð¿Ð¾Ð´. $_CLICK
 # ^LicenseTextRB
-Ïàæšèâî ïðî÷èòà¼òå äîãîâîð î ïðàâó êîðèøžåœà ïðå èíñòàëàöè¼å ïðîãðàìà $(^NameDA). Àêî ïðèõâàòàòå ñâå óñëîâå äîãîâîðà, èçàáåðèòå ïðâó îïöè¼ó èñïîä. $_CLICK
+ÐŸÐ°Ð¶Ñ™Ð¸Ð²Ð¾ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ˜Ñ‚Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð¾ Ð¿Ñ€Ð°Ð²Ñƒ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ° Ð¿Ñ€Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^NameDA). Ð�ÐºÐ¾ Ð¿Ñ€Ð¸Ñ…Ð²Ð°Ñ‚Ð°Ñ‚Ðµ Ñ�Ð²Ðµ ÑƒÑ�Ð»Ð¾Ð²Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð°, Ð¸Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿Ñ€Ð²Ñƒ Ð¾Ð¿Ñ†Ð¸Ñ˜Ñƒ Ð¸Ñ�Ð¿Ð¾Ð´. $_CLICK
 # ^UnLicenseText
-Ïàæšèâî ïðî÷èòà¼òå äîãîâîð î ïðàâó êîðèøžåœà ïðå äåèíñòàëàöè¼å ïðîãðàìà $(^NameDA). Àêî ïðèõâàòàòå ñâå óñëîâå äîãîâîðà, ïðèòèñíèòå äóãìå „Ïðèõâàòàì“.
+ÐŸÐ°Ð¶Ñ™Ð¸Ð²Ð¾ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ˜Ñ‚Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð¾ Ð¿Ñ€Ð°Ð²Ñƒ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ° Ð¿Ñ€Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^NameDA). Ð�ÐºÐ¾ Ð¿Ñ€Ð¸Ñ…Ð²Ð°Ñ‚Ð°Ñ‚Ðµ Ñ�Ð²Ðµ ÑƒÑ�Ð»Ð¾Ð²Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð°, Ð¿Ñ€Ð¸Ñ‚Ð¸Ñ�Ð½Ð¸Ñ‚Ðµ Ð´ÑƒÐ³Ð¼Ðµ â€žÐŸÑ€Ð¸Ñ…Ð²Ð°Ñ‚Ð°Ð¼â€œ.
 # ^UnLicenseTextCB
-Ïàæšèâî ïðî÷èòà¼òå äîãîâîð î ïðàâó êîðèøžåœà ïðå äåèíñòàëàöè¼å ïðîãðàìà $(^NameDA). Àêî ïðèõâàòàòå ñâå óñëîâå äîãîâîðà, îáåëåæèòå êâàäðàòèž èñïîä. $_CLICK
+ÐŸÐ°Ð¶Ñ™Ð¸Ð²Ð¾ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ˜Ñ‚Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð¾ Ð¿Ñ€Ð°Ð²Ñƒ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ° Ð¿Ñ€Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^NameDA). Ð�ÐºÐ¾ Ð¿Ñ€Ð¸Ñ…Ð²Ð°Ñ‚Ð°Ñ‚Ðµ Ñ�Ð²Ðµ ÑƒÑ�Ð»Ð¾Ð²Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð°, Ð¾Ð±ÐµÐ»ÐµÐ¶Ð¸Ñ‚Ðµ ÐºÐ²Ð°Ð´Ñ€Ð°Ñ‚Ð¸Ñ› Ð¸Ñ�Ð¿Ð¾Ð´. $_CLICK
 # ^UnLicenseTextRB
-Ïàæšèâî ïðî÷èòà¼òå äîãîâîð î ïðàâó êîðèøžåœà ïðå äåèíñòàëàöè¼å ïðîãðàìà $(^NameDA). Àêî ïðèõâàòàòå ñâå óñëîâå äîãîâîðà, èçàáåðèòå ïðâó îïöè¼ó èñïîä. $_CLICK
+ÐŸÐ°Ð¶Ñ™Ð¸Ð²Ð¾ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ˜Ñ‚Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð¾ Ð¿Ñ€Ð°Ð²Ñƒ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ° Ð¿Ñ€Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° $(^NameDA). Ð�ÐºÐ¾ Ð¿Ñ€Ð¸Ñ…Ð²Ð°Ñ‚Ð°Ñ‚Ðµ Ñ�Ð²Ðµ ÑƒÑ�Ð»Ð¾Ð²Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð°, Ð¸Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿Ñ€Ð²Ñƒ Ð¾Ð¿Ñ†Ð¸Ñ˜Ñƒ Ð¸Ñ�Ð¿Ð¾Ð´. $_CLICK
 # ^Custom
-Ïðèëàãî�àâàœå
+ÐŸÑ€Ð¸Ð»Ð°Ð³Ð¾Ñ’Ð°Ð²Ð°ÑšÐµ
 # ^ComponentsText
-Èçàáåðèòå êîìïîíåíòå çà èíñòàëàöè¼ó. Èíñòàëèðà¼ó ñå ñàìî îçíà÷åíå êîìïîíåíòå. $_CLICK
+Ð˜Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ðµ Ð·Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ. Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ˜Ñƒ Ñ�Ðµ Ñ�Ð°Ð¼Ð¾ Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ðµ. $_CLICK
 # ^ComponentsSubText1
-Èçàáåðèòå òèï èíñòàëàöè¼å:
+Ð˜Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ‚Ð¸Ð¿ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ:
 # ^ComponentsSubText2_NoInstTypes
-Èçàáåðèòå êîìïîíåíòå çà èíñòàëàöè¼ó: 
+Ð˜Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ðµ Ð·Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ: 
 # ^ComponentsSubText2
-Èëè, èçàáåðèòå îïöèîíå êîìïîíåíòå êî¼å æåëèòå äà èíñòàëèðàòå: 
+Ð˜Ð»Ð¸, Ð¸Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¾Ð¿Ñ†Ð¸Ð¾Ð½Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ðµ ÐºÐ¾Ñ˜Ðµ Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ: 
 # ^UnComponentsText
-Èçàáåðèòå êîìïîíåíòå çà äåèíñòàëàöè¼ó. Äåèíñòàëèðà¼ó ñå ñàìî îçíà÷åíå êîìïîíåíòå. $_CLICK
+Ð˜Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ðµ Ð·Ð° Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ. Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ˜Ñƒ Ñ�Ðµ Ñ�Ð°Ð¼Ð¾ Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ðµ. $_CLICK
 # ^UnComponentsSubText1
-Èçàáåðèòå òèï äåèíñòàëàöè¼å: 
+Ð˜Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ‚Ð¸Ð¿ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ: 
 # ^UnComponentsSubText2_NoInstTypes
-Èçàáåðèòå êîìïîíåíòå çà äåèíñòàëàöè¼ó: 
+Ð˜Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ðµ Ð·Ð° Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ: 
 # ^UnComponentsSubText2
-Èëè, èçàáåðèòå îïöèîíå êîìïîíåíòå êî¼å æåëèòå äà äåèíñòàëèðàòå: 
+Ð˜Ð»Ð¸, Ð¸Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¾Ð¿Ñ†Ð¸Ð¾Ð½Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ðµ ÐºÐ¾Ñ˜Ðµ Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ: 
 # ^DirText
-Ïðîãðàì $(^NameDA) žå áèòè èíñòàëèðàí ó íàâåäåíè ôîëäåð. Çà èíñòàëàöè¼ó ó äðóãè ôîëäåð ïðèòèñíèòå äóãìå „Èçáîð...“ è èçàáåðèòå ôîëäåð. $_CLICK
+ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼ $(^NameDA) Ñ›Ðµ Ð±Ð¸Ñ‚Ð¸ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ Ñƒ Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ð¸ Ñ„Ð¾Ð»Ð´ÐµÑ€. Ð—Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ Ñƒ Ð´Ñ€ÑƒÐ³Ð¸ Ñ„Ð¾Ð»Ð´ÐµÑ€ Ð¿Ñ€Ð¸Ñ‚Ð¸Ñ�Ð½Ð¸Ñ‚Ðµ Ð´ÑƒÐ³Ð¼Ðµ â€žÐ˜Ð·Ð±Ð¾Ñ€...â€œ Ð¸ Ð¸Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ„Ð¾Ð»Ð´ÐµÑ€. $_CLICK
 # ^DirSubText
-Ôîëäåð
+Ð¤Ð¾Ð»Ð´ÐµÑ€
 # ^DirBrowseText
-Èçàáåðèòå ôîëäåð ó êî¼è žåòå èíñòàëèðàòè ïðîãðàì $(^NameDA):
+Ð˜Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ„Ð¾Ð»Ð´ÐµÑ€ Ñƒ ÐºÐ¾Ñ˜Ð¸ Ñ›ÐµÑ‚Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ $(^NameDA):
 # ^UnDirText
-Ïðîãðàì $(^NameDA) žå áèòè äåèíñòàëèðàí èç íàâåäåíîã ôîëäåðà. Çà äåèíñòàëàöè¼ó èç äðóãîã ôîëäåðà ïðèòèñíèòå äóãìå „Èçáîð...“ è èçàáåðèòå ôîëäåð. $_CLICK
+ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼ $(^NameDA) Ñ›Ðµ Ð±Ð¸Ñ‚Ð¸ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ Ð¸Ð· Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ð¾Ð³ Ñ„Ð¾Ð»Ð´ÐµÑ€Ð°. Ð—Ð° Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ Ð¸Ð· Ð´Ñ€ÑƒÐ³Ð¾Ð³ Ñ„Ð¾Ð»Ð´ÐµÑ€Ð° Ð¿Ñ€Ð¸Ñ‚Ð¸Ñ�Ð½Ð¸Ñ‚Ðµ Ð´ÑƒÐ³Ð¼Ðµ â€žÐ˜Ð·Ð±Ð¾Ñ€...â€œ Ð¸ Ð¸Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ„Ð¾Ð»Ð´ÐµÑ€. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Èçàáåðèòå ôîëäåð èç êîãà žåòå äåèíñòàëèðàòè ïðîãðàì $(^NameDA):
+Ð˜Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ„Ð¾Ð»Ð´ÐµÑ€ Ð¸Ð· ÐºÐ¾Ð³Ð° Ñ›ÐµÑ‚Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ $(^NameDA):
 # ^SpaceAvailable
-"Ñëîáîäàí ïðîñòîð: "
+"Ð¡Ð»Ð¾Ð±Ð¾Ð´Ð°Ð½ Ð¿Ñ€Ð¾Ñ�Ñ‚Ð¾Ñ€: "
 # ^SpaceRequired
-"Ïîòðåáàí ïðîñòîð: "
+"ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð°Ð½ Ð¿Ñ€Ð¾Ñ�Ñ‚Ð¾Ñ€: "
 # ^UninstallingText
-Ïðîãðàì $(^NameDA) žå áèòè äåèíñòàëèðàí èç íàâåäåíîã ôîëäåðà. $_CLICK
+ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼ $(^NameDA) Ñ›Ðµ Ð±Ð¸Ñ‚Ð¸ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ Ð¸Ð· Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ð¾Ð³ Ñ„Ð¾Ð»Ð´ÐµÑ€Ð°. $_CLICK
 # ^UninstallingSubText
-Äåèíñòàëàöè¼à èç: 
+Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð° Ð¸Ð·: 
 # ^FileError
-Ãðåøêà ïðè îòâàðàœó ôà¼ëà çà ïèñàœå: \r\n\t"$0"\r\nÏðèòèñíèòå äóãìå „Îäóñòàíè“ çà ïðåêèä èíñòàëàöè¼å,\r\n„Ïîíîâè“ çà ïîíîâíè ïîêóøà¼ ïèñàœà ó ôà¼ë, èëè\r\n„Èãíîðèøè“ çà ïðåñêàêàœå îâîã ôà¼ëà.
+Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚Ð²Ð°Ñ€Ð°ÑšÑƒ Ñ„Ð°Ñ˜Ð»Ð° Ð·Ð° Ð¿Ð¸Ñ�Ð°ÑšÐµ: \r\n\t"$0"\r\nÐŸÑ€Ð¸Ñ‚Ð¸Ñ�Ð½Ð¸Ñ‚Ðµ Ð´ÑƒÐ³Ð¼Ðµ â€žÐžÐ´ÑƒÑ�Ñ‚Ð°Ð½Ð¸â€œ Ð·Ð° Ð¿Ñ€ÐµÐºÐ¸Ð´ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ,\r\nâ€žÐŸÐ¾Ð½Ð¾Ð²Ð¸â€œ Ð·Ð° Ð¿Ð¾Ð½Ð¾Ð²Ð½Ð¸ Ð¿Ð¾ÐºÑƒÑˆÐ°Ñ˜ Ð¿Ð¸Ñ�Ð°ÑšÐ° Ñƒ Ñ„Ð°Ñ˜Ð», Ð¸Ð»Ð¸\r\nâ€žÐ˜Ð³Ð½Ð¾Ñ€Ð¸ÑˆÐ¸â€œ Ð·Ð° Ð¿Ñ€ÐµÑ�ÐºÐ°ÐºÐ°ÑšÐµ Ð¾Ð²Ð¾Ð³ Ñ„Ð°Ñ˜Ð»Ð°.
 # ^FileError_NoIgnore
-Ãðåøêà ïðè îòâàðàœó ôà¼ëà çà ïèñàœå: \r\n\t"$0"\r\nÏðèòèñíèòå äóãìå „Ïîíîâè“ çà ïîíîâíè ïîêóøà¼ ïèñàœà ó ôà¼ë, èëè\r\n„Îäóñòàíè“ çà ïðåêèä èíñòàëèðàœà.
+Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚Ð²Ð°Ñ€Ð°ÑšÑƒ Ñ„Ð°Ñ˜Ð»Ð° Ð·Ð° Ð¿Ð¸Ñ�Ð°ÑšÐµ: \r\n\t"$0"\r\nÐŸÑ€Ð¸Ñ‚Ð¸Ñ�Ð½Ð¸Ñ‚Ðµ Ð´ÑƒÐ³Ð¼Ðµ â€žÐŸÐ¾Ð½Ð¾Ð²Ð¸â€œ Ð·Ð° Ð¿Ð¾Ð½Ð¾Ð²Ð½Ð¸ Ð¿Ð¾ÐºÑƒÑˆÐ°Ñ˜ Ð¿Ð¸Ñ�Ð°ÑšÐ° Ñƒ Ñ„Ð°Ñ˜Ð», Ð¸Ð»Ð¸\r\nâ€žÐžÐ´ÑƒÑ�Ñ‚Ð°Ð½Ð¸â€œ Ð·Ð° Ð¿Ñ€ÐµÐºÐ¸Ð´ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°ÑšÐ°.
 # ^CantWrite
-"Íåìîãóžå ïèñàœå: "
+"Ð�ÐµÐ¼Ð¾Ð³ÑƒÑ›Ðµ Ð¿Ð¸Ñ�Ð°ÑšÐµ: "
 # ^CopyFailed
-Íåóñïåøíî êîïèðàœå
+Ð�ÐµÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾ ÐºÐ¾Ð¿Ð¸Ñ€Ð°ÑšÐµ
 # ^CopyTo
-"Êîïèðàœå ó "
+"ÐšÐ¾Ð¿Ð¸Ñ€Ð°ÑšÐµ Ñƒ "
 # ^Registering
-"Ðåãèñòðîâàœå: "
+"Ð ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ð¾Ð²Ð°ÑšÐµ: "
 # ^Unregistering
-"Äåðåãèñòðîâàœå: "
+"Ð”ÐµÑ€ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ð¾Ð²Ð°ÑšÐµ: "
 # ^SymbolNotFound
-"Ñèìáîë íè¼å íà�åí: "
+"Ð¡Ð¸Ð¼Ð±Ð¾Ð» Ð½Ð¸Ñ˜Ðµ Ð½Ð°Ñ’ÐµÐ½: "
 # ^CouldNotLoad
-"Íåìîãóžå ó÷èòàâàœå: "
+"Ð�ÐµÐ¼Ð¾Ð³ÑƒÑ›Ðµ ÑƒÑ‡Ð¸Ñ‚Ð°Ð²Ð°ÑšÐµ: "
 # ^CreateFolder
-"Êðåèðàœå ôîëäåðà: "
+"ÐšÑ€ÐµÐ¸Ñ€Ð°ÑšÐµ Ñ„Ð¾Ð»Ð´ÐµÑ€Ð°: "
 # ^CreateShortcut
-"Êðåèðàœå ïðå÷èöå: "
+"ÐšÑ€ÐµÐ¸Ñ€Ð°ÑšÐµ Ð¿Ñ€ÐµÑ‡Ð¸Ñ†Ðµ: "
 # ^CreatedUninstaller
-"Êðåèðàœå äåèíñòàëåðà: "
+"ÐšÑ€ÐµÐ¸Ñ€Ð°ÑšÐµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»ÐµÑ€Ð°: "
 # ^Delete
-"Áðèñàœå ôà¼ëà: "
+"Ð‘Ñ€Ð¸Ñ�Ð°ÑšÐµ Ñ„Ð°Ñ˜Ð»Ð°: "
 # ^DeleteOnReboot
-"Áðèñàœå ïðè ðåñòàðòó: "
+"Ð‘Ñ€Ð¸Ñ�Ð°ÑšÐµ Ð¿Ñ€Ð¸ Ñ€ÐµÑ�Ñ‚Ð°Ñ€Ñ‚Ñƒ: "
 # ^ErrorCreatingShortcut
-"Ãðåøêà ïðè êðåèðàœó ïðå÷èöå: "
+"Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ ÐºÑ€ÐµÐ¸Ñ€Ð°ÑšÑƒ Ð¿Ñ€ÐµÑ‡Ð¸Ñ†Ðµ: "
 # ^ErrorCreating
-"Ãðåøêà ïðè êðåèðàœó: "
+"Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ ÐºÑ€ÐµÐ¸Ñ€Ð°ÑšÑƒ: "
 # ^ErrorDecompressing
-Ãðåøêà ïðè îòïàêèâàœó ïîäàòàêà! Îøòåžåí èíñòàëàöèîíè ïðîãðàì?
+Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚Ð¿Ð°ÐºÐ¸Ð²Ð°ÑšÑƒ Ð¿Ð¾Ð´Ð°Ñ‚Ð°ÐºÐ°! ÐžÑˆÑ‚ÐµÑ›ÐµÐ½ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ð¾Ð½Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼?
 # ^ErrorRegistering
-Ãðåøêà ïðè ðåãèñòðîâàœó áèáëèîòåêå
+Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ñ€ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ð¾Ð²Ð°ÑšÑƒ Ð±Ð¸Ð±Ð»Ð¸Ð¾Ñ‚ÐµÐºÐµ
 # ^ExecShell
-"Èçâðøàâàœå ó îêðóæåœó: "
+"Ð˜Ð·Ð²Ñ€ÑˆÐ°Ð²Ð°ÑšÐµ Ñƒ Ð¾ÐºÑ€ÑƒÐ¶ÐµÑšÑƒ: "
 # ^Exec
-"Èçâðøàâàœå: "
+"Ð˜Ð·Ð²Ñ€ÑˆÐ°Ð²Ð°ÑšÐµ: "
 # ^Extract
-"Îòïàêèâàœå: "
+"ÐžÑ‚Ð¿Ð°ÐºÐ¸Ð²Ð°ÑšÐµ: "
 # ^ErrorWriting
-"Îòïàêèâàœå: ãðåøêà ïðè óïèñó ó ôà¼ë "
+"ÐžÑ‚Ð¿Ð°ÐºÐ¸Ð²Ð°ÑšÐµ: Ð³Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ ÑƒÐ¿Ð¸Ñ�Ñƒ Ñƒ Ñ„Ð°Ñ˜Ð» "
 # ^InvalidOpcode
-Îøòåžåí èíñòàëàöèîíè ïðîãðàì: íåèñïðàâíà êîìàíäà 
+ÐžÑˆÑ‚ÐµÑ›ÐµÐ½ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ð¾Ð½Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼: Ð½ÐµÐ¸Ñ�Ð¿Ñ€Ð°Ð²Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° 
 # ^NoOLE
-"Íåìà OLE ïîäðøêå çà: "
+"Ð�ÐµÐ¼Ð° OLE Ð¿Ð¾Ð´Ñ€ÑˆÐºÐµ Ð·Ð°: "
 # ^OutputFolder
-"Èçëàçíè ôîëäåð: "
+"Ð˜Ð·Ð»Ð°Ð·Ð½Ð¸ Ñ„Ð¾Ð»Ð´ÐµÑ€: "
 # ^RemoveFolder
-"Áðèñàœå ôîëäåðà: "
+"Ð‘Ñ€Ð¸Ñ�Ð°ÑšÐµ Ñ„Ð¾Ð»Ð´ÐµÑ€Ð°: "
 # ^RenameOnReboot
-"Ïðåèìåíîâàœå ïðè ðåñòàðòîâàœó: "
+"ÐŸÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑšÐµ Ð¿Ñ€Ð¸ Ñ€ÐµÑ�Ñ‚Ð°Ñ€Ñ‚Ð¾Ð²Ð°ÑšÑƒ: "
 # ^Rename
-"Ïðåèìåíîâàí: "
+"ÐŸÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½: "
 # ^Skipped
-"Ïðåñêî÷åí: "
+"ÐŸÑ€ÐµÑ�ÐºÐ¾Ñ‡ÐµÐ½: "
 # ^CopyDetails
-Êîïèðà¼ äåòàšå ó êëèïáîðä
+ÐšÐ¾Ð¿Ð¸Ñ€Ð°Ñ˜ Ð´ÐµÑ‚Ð°Ñ™Ðµ Ñƒ ÐºÐ»Ð¸Ð¿Ð±Ð¾Ñ€Ð´
 # ^LogInstall
-Âîäè çàïèñíèê î ïðîöåñó èíñòàëàöè¼å
+Ð’Ð¾Ð´Ð¸ Ð·Ð°Ð¿Ð¸Ñ�Ð½Ð¸Ðº Ð¾ Ð¿Ñ€Ð¾Ñ†ÐµÑ�Ñƒ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ðµ
 # ^Byte
 B
 # ^Kilo
-k
+ k
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Asturian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Asturian.nlf	(revision 0)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Asturian.nlf	(revision 2956)
@@ -0,0 +1,190 @@
+ï»¿# Header, don't edit ;Asturian - Asturies
+NLF v6
+# Language ID (none exists at the moment)
+9997
+# Font and size - dash (-) means default
+-
+-
+# Codepage - dash (-) means ASCII code page
+1252
+# RTL - anything else than RTL means LTR
+-
+# Translation by Marcos (marcoscostales@gmail.com).
+# ^Branding
+Nullsoft Install System %s
+# ^SetupCaption
+InstalaciÃ³n de $(^Name)
+# ^UninstallCaption
+DesinstalaciÃ³n de $(^Name)
+# ^LicenseSubCaption
+: Alcuerdu de Llicencia
+# ^ComponentsSubCaption
+: Opciones d'InstalaciÃ³n
+# ^DirSubCaption
+: Direutoriu d'InstalaciÃ³n
+# ^InstallingSubCaption
+: Instalando
+# ^CompletedSubCaption
+: CompletÃ¡u
+# ^UnComponentsSubCaption
+: Opciones de DesinstalaciÃ³n
+# ^UnDirSubCaption
+: Direutoriu de DesinstalaciÃ³n
+# ^ConfirmSubCaption
+: ConfirmaciÃ³n
+# ^UninstallingSubCaption
+: Desinstalando
+# ^UnCompletedSubCaption
+: CompletÃ¡u
+# ^BackBtn
+< &AtrÃ¡s
+# ^NextBtn
+&Siguiente >
+# ^AgreeBtn
+A&ceuto
+# ^AcceptBtn
+A&ceuto los tÃ©rminos de la llicencia
+# ^DontAcceptBtn
+&Non aceuto los tÃ©rminos de la llicencia
+# ^InstallBtn
+&Instalar
+# ^UninstallBtn
+&Desinstalar
+# ^CancelBtn
+Encaboxar
+# ^CloseBtn
+&Zarrar
+# ^BrowseBtn
+&Restolar...
+# ^ShowDetailsBtn
+Ver &detalles
+# ^ClickNext
+Calca Siguiente pa siguir.
+# ^ClickInstall
+Calca Instalar pa entamar la instalaciÃ³n.
+# ^ClickUninstall
+Calca Desinstalar pa entamar la desinstalaciÃ³n.
+# ^Name
+Nome
+# ^Completed
+CompletÃ¡u
+# ^LicenseText
+Por favor, revisa l'acuerdu de llicencia enantes d'instalar $(^NameDA). Si aceutes tolos tÃ©rminos del alcuerdu, calca Aceuto.
+# ^LicenseTextCB
+Por favor, revisa l'alcuerdu de llicencia enantes d'instalar $(^NameDA). Si aceutes tolos tÃ©rminos del alcuerdu, marca embaxo la caxella. $_CLICK
+# ^LicenseTextRB
+Por favor, revisa l'alcuerdu de llicencia enantes d'instalar $(^NameDA). Si aceutes tolos tÃ©rminos del alcuerdu, seleiciona embaxo la primer opciÃ³n. $_CLICK
+# ^UnLicenseText
+Por favor, revisa l'alcuerdu de llicencia enantes de desinstalar $(^NameDA). Si aceutes tolos tÃ©rminos del alcuerdu, calca Aceuto.
+# ^UnLicenseTextCB
+Por favor, revisa l'alcuerdu de llicencia enantes de desinstalar $(^NameDA). Si aceutes tolos tÃ©rminos del alcuerdu, marca embaxo la caxella. $_CLICK.
+# ^UnLicenseTextRB
+Por favor, revisa l'alcuerdu de llicencia enantes de desinstalar $(^NameDA). Si aceutes tolos tÃ©rminos del alcuerdu, seleiciona embaxo la primer opciÃ³n. $_CLICK
+# ^Custom
+Personalizada
+# ^ComponentsText
+ConseÃ±a los componentes que deseyes instalar y desconseÃ±a los componentes que nun quies instalar. $_CLICK
+# ^ComponentsSubText1
+Tipos d'instalaciÃ³n:
+# ^ComponentsSubText2_NoInstTypes
+Seleiciona los componentes a instalar:
+# ^ComponentsSubText2
+O selecciona los componentes opcionales que deseyes instalar:
+# ^UnComponentsText
+ConseÃ±a los componentes que deseyes desinstalar y desconseÃ±a los componentes que nun quieras desinstalar. $_CLICK
+# ^UnComponentsSubText1
+Tipos de desinstalaciÃ³n:
+# ^UnComponentsSubText2_NoInstTypes
+Seleiciona los componentes a desinstalar:
+# ^UnComponentsSubText2
+O seleiciona los componentes opcionales que deseyes desinstalar:
+# ^DirText
+El programa d'instalaciÃ³n instalarÃ¡ $(^NameDA) nel siguiente direutoriu. Pa instalar nun direutoriu distintu, calca Restolar y seleiciona otru direutoriu. $_CLICK
+# ^DirSubText
+Direutoriu de DestÃ­n
+# ^DirBrowseText
+Seleiciona'l direutoriu nel qu'instalarÃ¡ $(^NameDA):
+# ^UnDirText
+El programa d'instalaciÃ³n desinstalarÃ¡ $(^NameDA) del siguiente direutoriu. Pa desinstalar d'un direutoriu distintu, calca Restolar y seleiciona otru direutoriu. $_CLICK
+# ^UnDirSubText
+""
+# ^UnDirBrowseText
+Seleiciona'l direutoriu dende'l cual desinstalarÃ¡ $(^NameDA):
+# ^SpaceAvailable
+Espaciu disponible: 
+# ^SpaceRequired
+Espaciu requerÃ­u: 
+# ^UninstallingText
+$(^NameDA) sedrÃ¡ desinstalÃ¡u del siguiente direutoriu. $_CLICK
+# ^UninstallingSubText
+Desinstalando dende:
+# ^FileError
+Error abriendo ficheru pa escritura: \r\n\t"$0"\r\nCalca albortar p'anular la instalaciÃ³n,\r\nreintentar pa volver a intentar escribir el ficheru, u\r\nomitir pa inorar esti ficheru
+# ^FileError_NoIgnore
+Error abriendo ficheru pa escritura: \r\n\t"$0"\r\nCalca reintentar pa volver a intentar escribir el ficheru, o\r\nencaboxar p'anular la instalaciÃ³n
+# ^CantWrite
+"Nun pudo escribise: "
+# ^CopyFailed
+FallÃ³ la copia
+# ^CopyTo
+"Copiar a "
+# ^Registering
+"Rexistrando: "
+# ^Unregistering
+"Desaniciando rexistru: "
+# ^SymbolNotFound
+"Nun pudo atopase sÃ­mbolu: "
+# ^CouldNotLoad
+"Nun pudo cargase: "
+# ^CreateFolder
+"Criar direutoriu: "
+# ^CreateShortcut
+"Criar accesu direutu: "
+# ^CreatedUninstaller
+"Criar desinstalador: "
+# ^Delete
+"Desaniciar ficheru: "
+# ^DeleteOnReboot
+"Desaniciar al reaniciu: "
+# ^ErrorCreatingShortcut
+"Fallu criando accesu direutu: "
+# ^ErrorCreating
+"Fallu criando: "
+# ^ErrorDecompressing
+Â¡Error descomprimiendo datos! Â¿Instalador corruptu?
+# ^ErrorRegistering
+Fallu rexistrando DLL
+# ^ExecShell
+"Executar comandu: "
+# ^Exec
+"Executar: "
+# ^Extract
+"Estrayer: "
+# ^ErrorWriting
+"Extrayer: fallu escribiendo al ficheru "
+# ^InvalidOpcode
+Instalador corruptu: cÃ³digu d'operaciÃ³n non vÃ¡lidu
+# ^NoOLE
+"Ensin OLE pa: "
+# ^OutputFolder
+"Direutoriu de salida: "
+# ^RemoveFolder
+"Desaniciar direutoriu: "
+# ^RenameOnReboot
+"Renomar al reaniciu: "
+# ^Rename
+"Renomar: "
+# ^Skipped
+"OmitÃ­u: "
+# ^CopyDetails
+Copiar Detalles al Cartafueyu
+# ^LogInstall
+Rexistrar procesu d'instalaciÃ³n 
+# ^Byte
+B
+# ^Kilo
+ K
+# ^Mega
+ M
+# ^Giga
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Basque.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Basque.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Basque.nsh	(revision 2956)
@@ -1,7 +1,7 @@
-;Language: Basque (1069)
-;By Iñaki San Vicente
+ï»¿;Language: Basque (1069)
+;By IÃ±aki San Vicente
 
-!insertmacro LANGFILE "Basque" "Euskera"
+!insertmacro LANGFILE "Basque" = "Euskera" =
 
 !ifdef MUI_WELCOMEPAGE
   ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Ongi etorri $(^NameDA) -ren instalazio programara"
@@ -30,7 +30,7 @@
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Sakatu Av Pág hitzarmenaren gainontzeko atalak ikusteko."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Sakatu Av PÃ¡g hitzarmenaren gainontzeko atalak ikusteko."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
@@ -48,7 +48,7 @@
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
     ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Jarri sagua osagai baten gainean dagokion azalpena ikusteko."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Jarri sagua osagai baten gainean dagokion azalpena ikusteko."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Hautatu osagai bat bere azalpena ikusteko."
   !endif
 !endif
 
@@ -119,3 +119,11 @@
 !ifdef MUI_UNABORTWARNING
   ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ziur zaude $(^Name)-ren ezabaketa laguntzailetik irten nahi duzula?"
 !endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Hautatu Erabiltzaileak"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Hautatu zein erabiltzailerentzat ezartzea nahi duzun $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Hautatu norentzat ezartzea nahi duzun $(^NameDA) zuretzat bakarrik edo ordenagailu honetako erabiltzaile guztientzat. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Ezarri ordenagailu hau erabiltzen duen edonorentzat"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Ezarri niretzat bakarrik"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Uzbek.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Uzbek.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Uzbek.nsh	(revision 2956)
@@ -1,7 +1,7 @@
-;Language: Uzbek (1091)
+ï»¿;Language: Uzbek (1091)
 ;Translation updated by Emil Garipov [emil.garipov@gmail.com] 
 
-!insertmacro LANGFILE "Uzbek" "Uzbek"
+!insertmacro LANGFILE "Uzbek" = "Oâ€˜zbek" "O'zbek"
 
 !ifdef MUI_WELCOMEPAGE
   ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Sizni o'rnatish dastur tabriklaydi $(^NameDA)"
@@ -48,7 +48,7 @@
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
     ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Sichqonchaning kursorini komponent tasvirini o'qish uchun ustiga quying."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Sichqonchaning kursorini komponent tasvirini o'qish uchun ustiga quying."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Tasvirini o'qish o'chun, komponentni tanlang."
   !endif
 !endif
 
@@ -101,9 +101,9 @@
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Papka $\"Ïóñê$\" menyusida"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Dastur belgilarini joylashtirish uchun $\"Ïóñê$\" menyusidan papka tanlang."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "$\"Ïóñê$\" menyusidan dastur belgilari joylashadigan papka tanlang. Siz papkaning boshqa ismini kiritishingiz mumkin"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Papka $\"Ã�Ã³Ã±Ãª$\" menyusida"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Dastur belgilarini joylashtirish uchun $\"Ã�Ã³Ã±Ãª$\" menyusidan papka tanlang."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "$\"Ã�Ã³Ã±Ãª$\" menyusidan dastur belgilari joylashadigan papka tanlang. Siz papkaning boshqa ismini kiritishingiz mumkin"
   ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Belgilar yaratilmasin"
 !endif
 
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Italian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Italian.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Italian.nsh	(revision 2956)
@@ -1,117 +1,117 @@
-;Language: Italian (1040)
+ï»¿;Language: Italian (1040)
 ;By SANFACE Software <sanface@sanface.com> v1.67 accents
 ;Review and update from v1.65 to v1.67 by Alessandro Staltari < staltari (a) geocities.com >
 ;Review and update from v1.67 to v1.68 by Lorenzo Bevilacqua < meow811@libero.it >
 
-!insertmacro LANGFILE "Italian" "Italiano"
+!insertmacro LANGFILE "Italian" = "Italiano" =
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Benvenuti nel programma di installazione di $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Questo programma installerà $(^NameDA) nel vostro computer.$\r$\n$\r$\nSi 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} MUI_TEXT_WELCOME_INFO_TITLE "Installazione di $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Questo programma installerÃ  $(^NameDA) nel computer.$\r$\n$\r$\nSi 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"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Benvenuti nella procedura guidata di disinstallazione di $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Questa procedura vi guiderà nella disinstallazione di $(^NameDA).$\r$\n$\r$\nPrima di iniziare la disinstallazione, assicuratevi che $(^Name) non sia in esecuzione.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Disinstallazione di $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Questa programma ti guiderÃ  nella disinstallazione di $(^NameDA).$\r$\n$\r$\nPrima di iniziare la disinstallazione, assicurati che $(^Name) non sia in esecuzione.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Licenza d'uso"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Prego leggere le condizioni della licenza d'uso prima di installare $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Se si accettano i termini della licenza d'uso scegliere Accetto per continuare. È necessario accettare i termini della licenza d'uso per installare $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Se si accettano i termini della licenza d'uso, selezionare la casella sottostante. È necessario accettare i termini della licenza d'uso per installare $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Se si accettano i termini della licenza d'uso, selezionare la prima opzione sottostante. È necessario accettare i termini della licenza d'uso per installare $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Accordo di licenza"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Leggi le condizioni dell'accordo di licenza prima di installare $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Se accetti tutti i termini dell'accordo di licenza, seleziona 'Accetto' per continuare. Per installare $(^NameDA) Ã¨ necessario accettare i termini dell'accordo di licenza."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Se accetti i termini dell'accordo di licenza, seleziona la casella sottostante. Per installare $(^NameDA) Ã¨ necessario accettare i termini dell'accordo di licenza. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Se accetti i termini dell'accordo di licenza, seleziona la prima opzione sottostante. Per installare $(^NameDA) Ã¨ necessario accettare i termini della licenza d'uso. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Licenza d'uso"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Prego leggere le condizioni della licenza d'uso prima di disinstallare $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Se si accettano i termini della licenza d'uso scegliere Accetto per continuare. È necessario accettare i termini della licenza d'uso per disinstallare $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Se si accettano i termini della licenza d'uso, selezionare la casella sottostante. È necessario accettare i termini della licenza d'uso per disinstallare $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Se si accettano i termini della licenza d'uso, selezionare la prima opzione sottostante. È necessario accettare i termini della licenza d'uso per disinstallare $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Accordo di licenza"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Leggi le condizioni dell'accordo di licenza prima di installare $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Se accetti tutti i termini dell'accordo di licenza, seleziona 'Accetto' per continuare. Per installare $(^NameDA) Ã¨ necessario accettare i termini dell'accordo di licenza."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Se accetti i termini dell'accordo di licenza, seleziona la casella sottostante. Per installare $(^NameDA) Ã¨ necessario accettare i termini dell'accordo di licenza. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Se accetti i termini dell'accordo di licenza, seleziona la prima opzione sottostante. Per installare $(^NameDA) Ã¨ necessario accettare i termini della licenza d'uso. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Premere Page Down per vedere il resto della licenza d'uso."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Premi 'PagGiÃ¹' per visualizzare il resto dell'accordo di licenza."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Selezione dei componenti"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Selezionare i componenti di $(^NameDA) che si desidera installare."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Selezione componenti"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Seleziona i componenti di $(^NameDA) da installare."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Selezione componenti"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Scegliere i componenti di $(^NameDA) che si desidera disinstallare."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Seleziona i componenti di $(^NameDA) da disinstallare."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Descrizione"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Posizionare il puntatore del mouse sul componente per vederne la descrizione."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Posiziona il puntatore del mouse sul componente per visualizzare  la relativa descrizione."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Posizionare il puntatore del mouse sul componente per vederne la descrizione."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Seleziona un componente per visualizzare la relativa descrizione."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Scelta della cartella di installazione"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Scegliere la cartella nella quale installare $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Selezione cartella installazione"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Seleziona la cartella nella quale installare $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Scelta della cartella da cui disinstallare"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Scegliere la cartella dalla quale disinstallare $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Selezione cartella da cui disinstallare"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Seleziona la cartella dalla quale disinstallare $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Installazione in corso"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Prego attendere mentre $(^NameDA) viene installato."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Installazione"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Attendi il completamento dell'installazione di $(^NameDA)."
   ${LangFileString} MUI_TEXT_FINISH_TITLE "Installazione completata"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "L'installazione è stata completata con successo."
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "L'installazione Ã¨ stata completata correttamente."
   ${LangFileString} MUI_TEXT_ABORT_TITLE "Installazione interrotta"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "L'installazione non è stata completata correttamente."
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "L'installazione non Ã¨ stata completata correttamente."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Disinstallazione in corso"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Prego attendere mentre $(^NameDA) viene disinstallato."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Disinstallazione"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Attendi il completamento della disinstallazione di $(^NameDA)."
   ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Disinstallazione completata"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "La disinstallazione è stata completata con successo."
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "La disinstallazione Ã¨ stata completata correttamente."
   ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Disinstallazione interrotta"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "La disintallazione non è stata completata correttamente."
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "La disintallazione non Ã¨ stata completata correttamente."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Completamento dell'installazione di $(^NameDA)."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) è stato installato sul vostro computer.$\r$\n$\r$\nScegliere Fine per chiudere il programma di installazione."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Il computer deve essere riavviato per completare l'installazione di $(^NameDA). Vuoi riavviarlo ora?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Installazione di $(^NameDA) completata."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) Ã¨ stato installato.$\r$\n$\r$\nScegli 'Chiudi' per chiudere il programma di installazione."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Per completare l'installazione di $(^NameDA) il computer deve essere riavviato. Vuoi riavviarlo ora?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Completamento della disinstallazione di $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) è stato disinstallato dal computer.$\r$\n$\r$\nSelezionare Fine per terminare questa procedura."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Il computer deve essere riavviato per completare l'installazione di $(^NameDA). Vuoi riavviarlo ora?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Disinstallazione di $(^NameDA) completata."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) Ã¨ stato disinstallato.$\r$\n$\r$\nSeleziona 'Chiudi' per chiudere questa procedura."  
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Per completare la disinstallazione di $(^NameDA) il computer deve essere riavviato. Vuoi riavviarlo ora?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Riavvia adesso"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Preferisco riavviarlo manualmente più tardi"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Riavvia ora"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Preferisco riavviarlo manualmente piÃ¹ tardi"
   ${LangFileString} MUI_TEXT_FINISH_RUN "Esegui $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Mostra il file Readme"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Fine"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Visualizza il file Readme"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Chiudi"
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Scelta della cartella del menu Start"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Scegliere una cartella del menu Start per i collegamenti del programma."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Scegliere la cartella del menu Start in cui verranno creati i collegamenti del programma. È possibile inserire un nome per creare una nuova cartella."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Non creare i collegamenti al programma."
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Selezione cartella menu Start"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Seleziona la cartella del menu Start in cui creare i collegamenti del programma."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Seleziona la cartella del menu Start in cui verranno creati i collegamenti del programma. Ãˆ possibile inserire un nome per creare una nuova cartella."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Non creare i collegamenti del programma."
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Disinstalla $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Rimuove $(^NameDA) dal computer."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Disinstallazione"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Disinstalla il programma $(^NameDA)."
 !endif
 
 !ifdef MUI_ABORTWARNING
@@ -123,9 +123,9 @@
 !endif
 
 !ifdef MULTIUSER_INSTALLMODEPAGE
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Scelta degli Utenti"
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Scegliete per quali utenti volete installare $(^NameDA)."
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Scegliete se volete installare $(^NameDA) solo per voi o per tutti gli utenti di questo sistema. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Configurazione profilo utenti"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Seleziona per quali utenti vuoi installare $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Seleziona se vuoi installare $(^NameDA) solo per questo utente o per tutti gli utenti di questo sistema. $(^ClickNext)"
   ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Installazione per tutti gli utenti"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Installazione personale"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Installazione per il singolo utente"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Polish.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Polish.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Polish.nlf	(revision 2956)
@@ -1,4 +1,4 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Start editing here
 # Language ID
@@ -6,21 +6,21 @@
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1250
 # RTL - anything else than RTL means LTR
 -
-# Translation by Piotr Murawski & Rafa³ Lampe
+# Translation by Piotr Murawski & RafaÅ‚ Lampe
 # Updated by cube and SYSTEMsoft Group
-# Corrections by Marek Stepien <marcoos@aviary.pl> - http://www.aviary.pl/
-# Updated by Pawe³ Porwisz, http://www.pepesoft.tox.pl
-# Corrected by Mateusz Gola (aka Prozac) - http://www.videopedia.pl/avirecomp
+# Corrected by Marek StÄ™pieÅ„ <mstepien@aviary.pl> - http://www.aviary.pl
+# Corrected by Mateusz Gola (aka Prozac) - http://www.avirecomp.com
+# Updated by PaweÅ‚ Porwisz (http://www.pawelporwisz.pl)
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-Instalator programu $(^Name)
+Instalator $(^Name)
 # ^UninstallCaption
-Deinstalator programu $(^Name)
+Deinstalator $(^Name)
 # ^LicenseSubCaption
 : Umowa licencyjna
 # ^ComponentsSubCaption
@@ -28,9 +28,9 @@
 # ^DirSubCaption
 : Folder instalacyjny
 # ^InstallingSubCaption
-: Instalowanie plików
+: Instalowanie plikÃ³w
 # ^CompletedSubCaption
-: Zakoñczono
+: ZakoÅ„czono
 # ^UnComponentsSubCaption
 : Opcje deinstalacji
 # ^UnDirSubCaption
@@ -38,19 +38,19 @@
 # ^ConfirmSubCaption
 : Potwierdzenie
 # ^UnDirSubCaption
-: Deinstalowanie plików
+: Deinstalowanie plikÃ³w
 # ^UnCompletedSubCaption
-: Zakoñczono
+: ZakoÅ„czono
 # ^BackBtn
 < &Wstecz
 # ^NextBtn
 &Dalej >
 # ^AgreeBtn
-&Zgadzam siê
+&Zgadzam siÄ™
 # ^AcceptBtn
-&Akceptujê warunki umowy licencyjnej
+&AkceptujÄ™ warunki umowy licencyjnej
 # ^DontAcceptBtn
-&Nie akceptujê warunków umowy licencyjnej
+&Nie akceptujÄ™ warunkÃ³w umowy licencyjnej
 # ^InstallBtn
 &Zainstaluj
 # ^UninstallBtn
@@ -60,63 +60,63 @@
 # ^CloseBtn
 &Zamknij
 # ^BrowseBtn
-&Przegl¹daj...
+&PrzeglÄ…daj...
 # ^ShowDetailsBtn
-Poka¿ &szczegó³y
+PokaÅ¼ &szczegÃ³Å‚y
 # ^ClickNext
-Kliknij Dalej, aby kontynuowaæ.
+Kliknij przycisk 'Dalej', aby kontynuowaÄ‡.
 # ^ClickInstall
-Kliknij Zainstaluj, aby rozpocz¹æ instalacjê.
+Kliknij przycisk 'Zainstaluj', aby rozpoczÄ…Ä‡ instalacjÄ™.
 # ^ClickUninstall
-Kliknij Odinstaluj, aby rozpocz¹æ deinstalacjê.
+Kliknij przycisk 'Odinstaluj', aby rozpoczÄ…Ä‡ deinstalacjÄ™.
 # ^Name
 Nazwa
 # ^Completed
-Zakoñczono
+ZakoÅ„czono
 # ^LicenseText
-Przed zainstalowaniem $(^NameDA) przeczytaj umowê licencyjn¹. Jeœli akceptujesz wszystkie warunki umowy, kliknij Zgadzam siê.
+Przed instalacjÄ… $(^NameDA) zapoznaj siÄ™ z warunkami licencji. JeÅ›li akceptujesz wszystkie warunki umowy, kliknij przycisk 'Zgadzam siÄ™'.
 # ^LicenseTextCB
-Przed zainstalowaniem $(^NameDA) przeczytaj umowê licencyjn¹. Jeœli akceptujesz wszystkie warunki umowy, kliknij pole wyboru poni¿ej. $_CLICK.
+Przed instalacjÄ… $(^NameDA) zapoznaj siÄ™ z warunkami licencji. JeÅ›li akceptujesz wszystkie warunki umowy, kliknij poniÅ¼sze pole wyboru. $_CLICK.
 # ^LicenseTextRB
-Przed zainstalowaniem $(^NameDA) przeczytaj umowê licencyjn¹. Jeœli akceptujesz wszystkie warunki umowy, wybierz pierwsz¹ opcjê poni¿ej. $_CLICK.
+Przed instalacjÄ… $(^NameDA) zapoznaj siÄ™ z warunkami licencji. JeÅ›li akceptujesz wszystkie warunki umowy, wybierz pierwszÄ… z poniÅ¼szych opcji. $_CLICK.
 # ^UnLicenseText
-Przed odinstalowaniem $(^NameDA) przeczytaj umowê licencyjn¹. Jeœli akceptujesz wszystkie warunki umowy, kliknij Zgadzam siê.
+Przed deinstalacjÄ… $(^NameDA) zapoznaj siÄ™ z warunkami licencji. JeÅ›li akceptujesz wszystkie warunki umowy, kliknij przycisk 'Zgadzam siÄ™'.
 # ^UnLicenseTextCB
-Przed odinstalowaniem $(^NameDA) przeczytaj umowê licencyjn¹. Jeœli akceptujesz wszystkie warunki umowy, kliknij pole wyboru poni¿ej. $_CLICK.
+Przed deinstalacjÄ… $(^NameDA) zapoznaj siÄ™ z warunkami licencji. JeÅ›li akceptujesz wszystkie warunki umowy, kliknij poniÅ¼sze pole wyboru. $_CLICK.
 # ^UnLicenseTextRB
-Przed odinstalowaniem $(^NameDA) przeczytaj licencjê. Jeœli akceptujesz wszystkie warunki umowy, wybierz pierwsz¹ opcjê poni¿ej. $_CLICK.
+Przed deinstalacjÄ… $(^NameDA) zapoznaj siÄ™ z warunkami licencji. JeÅ›li akceptujesz wszystkie warunki umowy, wybierz pierwszÄ… z poniÅ¼szych opcji. $_CLICK.
 # ^Custom
-U¿ytkownika
+UÅ¼ytkownika
 # ^ComponentsText
-Zaznacz komponenty, które chcesz zainstalowaæ i odznacz te, których nie chcesz instalowaæ. $_CLICK
+Zaznacz komponenty, ktÃ³re chcesz zainstalowaÄ‡ i odznacz te, ktÃ³rych nie chcesz instalowaÄ‡. $_CLICK
 # ^ComponentsSubText1
 Wybierz typ instalacji:
 # ^ComponentsSubText2_NoInstTypes
 Wybierz komponenty do zainstalowania:
 # ^ComponentsSubText2
-Albo wybierz opcjonalne komponenty, które chcesz zainstalowaæ:
+Albo wybierz opcjonalne komponenty, ktÃ³re chcesz zainstalowaÄ‡:
 # ^UnComponentsText
-Zaznacz komponenty, które chcesz odinstalowaæ i odznacz te, które nie zostan¹ odinstalowane. $_CLICK
+Zaznacz komponenty, ktÃ³re chcesz odinstalowaÄ‡ i odznacz te, ktÃ³re nie zostanÄ… odinstalowane. $_CLICK
 # ^UnComponentsSubText1
 Wybierz typ deinstalacji:
 # ^UnComponentsSubText2_NoInstTypes
 Wybierz komponenty do odinstalowania:
 # ^UnComponentsSubText2
-Albo wybierz opcjonalne komponenty, które chcesz odinstalowaæ:
+Albo wybierz opcjonalne komponenty, ktÃ³re chcesz odinstalowaÄ‡:
 # ^DirText
-Instalator zainstaluje program $(^NameDA) w nastêpuj¹cym folderze. Aby zainstalowaæ w innym folderze, kliknij Przegl¹daj i wybierz folder. $_CLICK
+Instalator zainstaluje $(^NameDA) w podanym poniÅ¼ej folderze docelowym (moÅ¼esz takÅ¼e kliknÄ…Ä‡ przycisk 'PrzeglÄ…daj...' i wybraÄ‡ inny folder). $_CLICK
 # ^DirSubText
 Folder docelowy
 # ^DirBrowseText
 Wybierz folder instalacyjny $(^NameDA):
 # ^UnDirText
-Deinstalator usunie $(^NameDA) z nastêpuj¹cego folderu. Aby odinstalowaæ z innego folderu, kliknij Przegl¹daj i wybierz folder. $_CLICK
+Deinstalator usunie $(^NameDA) z nastÄ™pujÄ…cego folderu. Aby odinstalowaÄ‡ z innego folderu, kliknij przycisk 'PrzeglÄ…daj...' i wybierz folder. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Wybierz folder, z którego zostanie odinstalowany program $(^NameDA):
+Wybierz folder, z ktÃ³rego zostanie odinstalowany $(^NameDA):
 # ^SpaceAvailable
-"Dostêpne miejsce: "
+"DostÄ™pne miejsce: "
 # ^SpaceRequired
 "Wymagane miejsce: "
 # ^UninstallingText
@@ -124,72 +124,72 @@
 # ^UninstallingSubText
 Deinstalacja z: 
 # ^FileError
-B³¹d otwarcia pliku do zapisu: \r\n\r\n$0\r\n\r\nWybierz Anuluj, aby przerwaæ instalacjê,\r\nPonów, aby ponowiæ zapis do pliku lub\r\nIgnoruj, aby pomin¹æ ten plik.
+BÅ‚Ä…d otwarcia pliku do zapisu: \r\n\r\n$0\r\n\r\nWybierz 'Anuluj', aby przerwaÄ‡ instalacjÄ™,\r\n'PonÃ³w', aby ponowiÄ‡ zapis do pliku lub\r\n'Ignoruj', aby pominÄ…Ä‡ ten plik.
 # ^FileError_NoIgnore
-B³¹d otwarcia pliku do zapisu: \r\n\r\n$0\r\n\r\nWybierz Ponów, aby ponowiæ zapis do pliku lub\r\nAnuluj, aby przerwaæ instalacjê.
+BÅ‚Ä…d otwarcia pliku do zapisu: \r\n\r\n$0\r\n\r\nWybierz 'PonÃ³w', aby ponowiÄ‡ zapis do pliku lub\r\n'Anuluj', aby przerwaÄ‡ instalacjÄ™.
 # ^CantWrite
-"Nie mo¿na zapisaæ: "
+"Nie moÅ¼na zapisaÄ‡: "
 # ^CopyFailed
-B³¹d kopiowania
+BÅ‚Ä…d kopiowania
 # ^CopyTo
 "Kopiuj do "
 # ^Registering 
 "Rejestrowanie: "
 # ^Unregistering
-"Odrejestrowywanie: "
+"Wyrejestrowywanie: "
 # ^SymbolNotFound
-"Nie mo¿na odnaleŸæ symbolu: "
+"Nie moÅ¼na odnaleÅºÄ‡ symbolu: "
 # ^CouldNotLoad
-"Nie mo¿na wczytaæ: "
+"Nie moÅ¼na wczytaÄ‡: "
 #^CreateFolder
-"Utwórz folder: "
+"UtwÃ³rz folder: "
 # ^CreateShortcut
-"Utwórz skrót: "
+"UtwÃ³rz skrÃ³t: "
 # ^CreatedUninstaller
 "Utworzono deinstalator: "
 # ^Delete
-"Usuñ plik: "
+"UsuÅ„ plik: "
 # ^DeleteOnReboot
-"Usuñ przy ponownym uruchomieniu: "
+"UsuÅ„ przy ponownym uruchomieniu: "
 # ^ErrorCreatingShortcut
-"B³¹d tworzenia skrótu: "
+"BÅ‚Ä…d tworzenia skrÃ³tu: "
 # ^ErrorCreating
-"B³¹d tworzenia: "
+"BÅ‚Ä…d tworzenia: "
 # ^ErrorDecompressing
-B³¹d rozpakowywania danych! Uszkodzony instalator?
+BÅ‚Ä…d wyodrÄ™bniania danych! Uszkodzony instalator?
 # ^ErrorRegistering
-B³¹d rejestracji pliku DLL
+BÅ‚Ä…d rejestracji pliku DLL
 # ^ExecShell
 "ExecShell: "
 # ^Exec
 "Uruchom: "
 # ^Extract
-"Rozpakuj: "
+"WyodrÄ™bnij: "
 # ^ErrorWriting
-"Rozpakuj: b³¹d zapisu do pliku "
+"WyodrÄ™bnij: bÅ‚Ä…d zapisu do pliku "
 # ^InvalidOpcode
-Instalator uszkodzony: nieprawid³owy kod operacji
+Instalator uszkodzony: nieprawidÅ‚owy kod operacji
 # ^NoOLE
 "Brak OLE dla: "
 # ^OutputFolder
-"Folder wyjœciowy: "
+"Folder wyjÅ›ciowy: "
 # ^RemoveFolder
-"Usuñ folder: "
+"UsuÅ„ folder: "
 # ^RenameOnReboot
-"Zmieñ nazwê przy ponownym uruchomieniu: "
+"ZmieÅ„ nazwÄ™ przy ponownym uruchomieniu: "
 # ^Rename
-"Zmieñ nazwê: "
+"ZmieÅ„ nazwÄ™: "
 # ^Skipped
-"Pominiête: "
+"PominiÄ™te: "
 # ^CopyDetails
-Kopiuj szczegó³y do schowka
+Kopiuj szczegÃ³Å‚y do schowka
 # ^LogInstall
 Rejestruj przebieg instalacji
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Slovenian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Slovenian.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Slovenian.nlf	(revision 2956)
@@ -1,33 +1,33 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1060
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1250
 # RTL - anything else than RTL means LTR
 -
 # Translation by Janez Dolinar, edited by Martin Srebotnjak - Lugos.si
 # ^Branding
-Namestitveni sistem Nullsoft %s
+Nullsoft Install System %s
 # ^SetupCaption
 Namestitev $(^Name)
 # ^UninstallCaption
 Odstranitev $(^Name)
 # ^LicenseSubCaption
-: Licenèna pogodba
+: LicenÄ�na pogodba
 # ^ComponentsSubCaption
-: Možnosti namestitve
+: MoÅ¾nosti namestitve
 # ^DirSubCaption
 : Mapa namestitve
 # ^InstallingSubCaption
-: Namešèanje poteka
+: NameÅ¡Ä�anje poteka
 # ^CompletedSubCaption
-: Dokonèano
+: DokonÄ�ano
 # ^UnComponentsSubCaption
-: Možnosti odstranitve
+: MoÅ¾nosti odstranitve
 # ^UnDirSubCaption
 : Mapa odstranitve
 # ^ConfirmSubCaption
@@ -35,7 +35,7 @@
 # ^UninstallingSubCaption
 : Odstranjevanje poteka
 # ^UnCompletedSubCaption
-: Dokonèano
+: DokonÄ�ano
 # ^BackBtn
 < &Nazaj
 # ^NextBtn
@@ -43,15 +43,15 @@
 # ^AgreeBtn
 Se &strinjam
 # ^AcceptBtn
-&Sprejmem pogoje licenène pogodbe
+&Sprejmem pogoje licenÄ�ne pogodbe
 # ^DontAcceptBtn
-&Ne sprejmem pogojev licenène pogodbe
+&Ne sprejmem pogojev licenÄ�ne pogodbe
 # ^InstallBtn
 &Namesti
 # ^UninstallBtn
 &Odstrani
 # ^CancelBtn
-Preklièi
+PrekliÄ�i
 # ^CloseBtn
 &Zapri
 # ^BrowseBtn
@@ -61,55 +61,55 @@
 # ^ClickNext
 Kliknite Naprej za nadaljevanje.
 # ^ClickInstall	
-Kliknite Namesti za zaèetek namestitve.
+Kliknite Namesti za zaÄ�etek namestitve.
 # ^ClickUninstall	
 Kliknite Odstrani za odstranitev.
 # ^NameIme
 Ime
 # ^Completed
-Dokonèano
+DokonÄ�ano
 # ^LicenseText
-Prosimo, da pred namestitvijo $(^NameDA) pregledate licenèno pogodbo. Èe se z njo strinjate, pritisnite Se strinjam.
+Prosimo, da pred namestitvijo $(^NameDA) pregledate licenÄ�no pogodbo. ÄŒe se z njo strinjate, pritisnite Se strinjam.
 # ^LicenseTextCB
-Prosimo, da pred namestitvijo $(^NameDA) pregledate licenèno pogodbo. Èe sprejmete vse naštete pogoje, potrdite spodnje polje. $_CLICK
+Prosimo, da pred namestitvijo $(^NameDA) pregledate licenÄ�no pogodbo. ÄŒe sprejmete vse naÅ¡tete pogoje, potrdite spodnje polje. $_CLICK
 # ^LicenseTextRB
-Prosimo, da pred namestitvijo $(^NameDA) pregledate licenèno pogodbo. Èe sprejmete vse naštete pogoje, izberite prvo spodaj podano možnost. $_CLICK
+Prosimo, da pred namestitvijo $(^NameDA) pregledate licenÄ�no pogodbo. ÄŒe sprejmete vse naÅ¡tete pogoje, izberite prvo spodaj podano moÅ¾nost. $_CLICK
 # ^UnLicenseText
-Prosimo, da pred odstranitvijo $(^NameDA) pregledate licenèno pogodbo. Èe se z njo strinjate, pritisnite Se strinjam.
+Prosimo, da pred odstranitvijo $(^NameDA) pregledate licenÄ�no pogodbo. ÄŒe se z njo strinjate, pritisnite Se strinjam.
 # ^UnLicenseTextCB
-Prosimo, da pred odstranitvijo $(^NameDA) pregledate licenèno pogodbo. Èe sprejmete vse naštete pogoje, potrdite spodnje polje. $_CLICK
+Prosimo, da pred odstranitvijo $(^NameDA) pregledate licenÄ�no pogodbo. ÄŒe sprejmete vse naÅ¡tete pogoje, potrdite spodnje polje. $_CLICK
 # ^UnLicenseTextRB
-Prosimo, da pred odstranitvijo $(^NameDA) pregledate licenèno pogodbo. Èe sprejmete vse naštete pogoje, izberite prvo spodaj podano možnost. $_CLICK
+Prosimo, da pred odstranitvijo $(^NameDA) pregledate licenÄ�no pogodbo. ÄŒe sprejmete vse naÅ¡tete pogoje, izberite prvo spodaj podano moÅ¾nost. $_CLICK
 # ^Custom
 Po meri ...
 # ^ComponentsText
-Oznaèite komponente, ki jih želite namestiti, in pustite neoznaèene tiste, katerih ne želite namestiti. $_CLICK
+OznaÄ�ite komponente, ki jih Å¾elite namestiti, in pustite neoznaÄ�ene tiste, katerih ne Å¾elite namestiti. $_CLICK
 # ^ComponentsSubText1
 Izberite vrsto namestitve:
 # ^ComponentsSubText2_NoInstTypes
 Izberite komponente namestitve:
 # ^ComponentsSubText2
-Ali pa izberite komponente, ki jih želite namestiti:
+Ali pa izberite komponente, ki jih Å¾elite namestiti:
 # ^UnComponentsText
-Oznaèite komponente, ki jih želite odstraniti, in pustite neoznaèene tiste, ki jih ne želite odstraniti. $_CLICK
+OznaÄ�ite komponente, ki jih Å¾elite odstraniti, in pustite neoznaÄ�ene tiste, ki jih ne Å¾elite odstraniti. $_CLICK
 # ^UnComponentsSubText1
 Izberite vrsto odstranitve:
 # ^UnComponentsSubText2_NoInstTypes
 Izberite komponente za odstranitev:
 # ^UnComponentsSubText2
-Ali pa izberite komponente namestitve, ki jih želite odstraniti:
+Ali pa izberite komponente namestitve, ki jih Å¾elite odstraniti:
 # ^DirText
-$(^NameDA) boste namestili v sledeèo mapo. Za izbiro druge mape kliknite tipko Prebrskaj in izberite drugo mapo. $_CLICK
+$(^NameDA) boste namestili v sledeÄ�o mapo. Za izbiro druge mape kliknite tipko Prebrskaj in izberite drugo mapo. $_CLICK
 # ^DirSubText
 Ciljna mapa
 # ^DirBrowseText
-Izberite mapo, kamor želite namestiti $(^NameDA):
+Izberite mapo, kamor Å¾elite namestiti $(^NameDA):
 # ^UnDirText
-Odstranili boste $(^NameDA) iz sledeèe mape. Za izbiro druge mape kliknite tipko Prebrskaj in izberite drugo mapo. $_CLICK
+Odstranili boste $(^NameDA) iz sledeÄ�e mape. Za izbiro druge mape kliknite tipko Prebrskaj in izberite drugo mapo. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Izberite mapo, od koder želite odstraniti $(^NameDA):
+Izberite mapo, od koder Å¾elite odstraniti $(^NameDA):
 # ^SpaceAvailable
 "Prostor na disku: "
 # ^SpaceRequired
@@ -121,11 +121,11 @@
 # ^FileError
 Napaka pri odpiranju datoteke za pisanje: \r\n\r\n$0\r\n\r\nPritisnite Prekini za prekinitev namestitve,\r\nPonovi za ponoven poskus ali\r\nPrezri za izpust te datoteke.
 # ^FileError_NoIgnore
-Napaka pri odpiranju datoteke za pisanje: \r\n\r\n$0\r\n\r\nPritisnite Ponovi za ponoven poskus pisanja ali\r\Preklièi za prekinitev namestitve.
+Napaka pri odpiranju datoteke za pisanje: \r\n\r\n$0\r\n\r\nPritisnite Ponovi za ponoven poskus pisanja ali\r\PrekliÄ�i za prekinitev namestitve.
 # ^CantWrite
-"Ni mogoèe pisati: "
+"Ni mogoÄ�e pisati: "
 # ^CopyFailed
-Kopiranje neuspešno
+Kopiranje neuspeÅ¡no
 # ^CopyTo
 "Kopiranje v "
 # ^Registering
@@ -133,13 +133,13 @@
 # ^Unregistering
 "Preklic registracije: "
 # ^SymbolNotFound
-"Ni mogoèe najti simbola: "
+"Ni mogoÄ�e najti simbola: "
 # ^CouldNotLoad
-"Ni mogoèe naložiti: "
+"Ni mogoÄ�e naloÅ¾iti: "
 # ^CreateFolder
 "Ustvarjanje mape: "
 # ^CreateShortcut
-"Ustvarjanje bližnjice: "
+"Ustvarjanje bliÅ¾njice: "
 # ^CreatedUninstaller
 "Ustvarjena odstranitev: "
 # ^Delete
@@ -147,11 +147,11 @@
 # ^DeleteOnReboot
 "Brisanje ob ponovnem zagonu: "
 # ^ErrorCreatingShortcut
-"Napaka ustvarjanja bližnjice: "
+"Napaka ustvarjanja bliÅ¾njice: "
 # ^ErrorCreating
 "Napaka ustvarjanja: "
 # ^ErrorDecompressing
-Napaka pri razširjanju podatkov! Je namestitvena datoteka okvarjena?
+Napaka pri razÅ¡irjanju podatkov! Je namestitvena datoteka okvarjena?
 # ^ErrorRegistering
 Napaka registracije DLL
 # ^ExecShell
@@ -159,13 +159,13 @@
 # ^Exec
 "Izvajanje: "
 # ^Extract
-"Razširjanje: "
+"RazÅ¡irjanje: "
 # ^ErrorWriting
-"Razširjanje: napaka pri pisanju v datoteko "
+"RazÅ¡irjanje: napaka pri pisanju v datoteko "
 # ^InvalidOpcode
-Namestitev neveljavna: napaèen ukaz
+Namestitev neveljavna: napaÄ�en ukaz
 # ^NoOLE
-"Neobstojeèi OLE za: "
+"NeobstojeÄ�i OLE za: "
 # ^OutputFolder
 "Ciljna mapa: "
 # ^RemoveFolder
@@ -175,16 +175,16 @@
 # ^Rename
 "Preimenovanje: "
 # ^Skipped
-"Izpušèeno: "
+"IzpuÅ¡Ä�eno: "
 # ^CopyDetails
-Kopiraj podrobnosti v odložišèe
+Kopiraj podrobnosti v odloÅ¾iÅ¡Ä�e
 # ^LogInstall
 Shrani potek namestitve
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Finnish.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Finnish.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Finnish.nlf	(revision 2956)
@@ -1,4 +1,4 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Start editing here
 # Language ID
@@ -6,18 +6,19 @@
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
 # Translation by Eclipser (Jonne Lehtinen) <Eclipser at pilvikaupunki dot net>
 # Corrections by the Mozilla.fi crew
+# Upd 11/08 by WTLib Team
 # ^Branding
-Nullsoftin asennusjärjestelmä %s
+Nullsoft Install System %s
 # ^SetupCaption
-$(^Name) Asennus
+$(^Name) -ohjelman asennus
 # ^UninstallCaption
-$(^Name) Poisto
+$(^Name) -ohjelman poisto
 # ^LicenseSubCaption
 : Lisenssisopimus
 # ^ComponentsSubCaption
@@ -43,11 +44,11 @@
 # ^NextBtn
 &Seuraava >
 # ^AgreeBtn
-&Hyväksyn
+&HyvÃ¤ksyn
 # ^AcceptBtn
-Hyväksyn lisenssisopimuksen ehdot
+HyvÃ¤ksyn lisenssisopimuksen ehdot
 # ^DontAcceptBtn
-En hyväksy sopimuksen ehtoja
+En hyvÃ¤ksy sopimuksen ehtoja
 # ^InstallBtn
 &Asenna
 # ^UninstallBtn
@@ -59,7 +60,7 @@
 # ^BrowseBtn
 S&elaa...
 # ^ShowDetailsBtn
-&Näytä tiedot
+&NÃ¤ytÃ¤ tiedot
 # ^ClickNext
 Valitse Seuraava jatkaaksesi.
 # ^ClickInstall
@@ -71,17 +72,17 @@
 # ^Completed
 Valmis
 # ^LicenseText
-Lue lisenssisopimus ennen asentamista. Jos hyväksyt sopimuksen kaikki ehdot, valitse Hyväksyn.
+Lue lisenssisopimus ennen asentamista. Jos hyvÃ¤ksyt sopimuksen kaikki ehdot, valitse HyvÃ¤ksyn.
 # ^LicenseTextCB
-Lue lisenssisopimus ennen asentamista. Jos hyväksyt sopimuksen kaikki ehdot, laita rasti ruutuun. $_CLICK
+Lue lisenssisopimus ennen asentamista. Jos hyvÃ¤ksyt sopimuksen kaikki ehdot, laita rasti ruutuun. $_CLICK
 # ^LicenseTextRB
-Lue lisenssisopimus ennen asentamista. Jos hyväksyt sopimuksen kaikki ehdot, valitse ensimmäinen vaihtoehto alapuolelta. $_CLICK
+Lue lisenssisopimus ennen asentamista. Jos hyvÃ¤ksyt sopimuksen kaikki ehdot, valitse ensimmÃ¤inen vaihtoehto alapuolelta. $_CLICK
 # ^UnLicenseText
-Lue lisenssisopimus ennen poistamista. Jos hyväksyt sopimuksen kaikki ehdot, valitse Hyväksyn.
+Lue lisenssisopimus ennen poistamista. Jos hyvÃ¤ksyt sopimuksen kaikki ehdot, valitse HyvÃ¤ksyn.
 # ^UnLicenseTextCB
-Lue lisenssisopimus ennen poistamista. Jos hyväksyt sopimuksen kaikki ehdot, laita rasti ruutuun. $_CLICK
+Lue lisenssisopimus ennen poistamista. Jos hyvÃ¤ksyt sopimuksen kaikki ehdot, laita rasti ruutuun. $_CLICK
 # ^UnLicenseTextRB
-Lue lisenssisopimus ennen poistamista. Jos hyväksyt sopimuksen kaikki ehdot, valitse ensimmäinen vaihtoehto alapuolelta. $_CLICK
+Lue lisenssisopimus ennen poistamista. Jos hyvÃ¤ksyt sopimuksen kaikki ehdot, valitse ensimmÃ¤inen vaihtoehto alapuolelta. $_CLICK
 # ^Custom
 Oma
 # ^ComponentsText
@@ -101,13 +102,13 @@
 # ^UnComponentsSubText2
 Tai, valitse valinnaiset komponentit, jotka haluat poistaa
 # ^DirText
-Asennus asentaa ohjelman $(^NameDA) seuraavaan kansioon. Jos haluat asentaa sen johonkin muuhun kansioon, valitse Selaa, ja valitse toinen kansio. $_CLICK
+$(^NameDA) -ohjelma asennetaan seuraavaan kansioon. Jos haluat asentaa sen johonkin muuhun kansioon, valitse Selaa, ja valitse toinen kansio. $_CLICK
 # ^DirSubText
 Kohdekansio
 # ^DirBrowseText
 Valitse kansio, johon haluat asentaa ohjelman $(^NameDA):
 # ^UnDirText
-Asennus poistaa ohjelman $(^NameDA) seuraavasta kansiosta. Jos haluat poistaa sen jostakin muusta kansiosta, valitse Selaa, ja valitse toinen kansio. $_CLICK
+Poistetaan ohjelman $(^NameDA) seuraavasta kansiosta. Jos haluat poistaa sen jostakin muusta kansiosta, valitse Selaa, ja valitse toinen kansio. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
@@ -117,25 +118,25 @@
 # ^SpaceRequired
 "Tarvittava tila: "
 # ^UninstallingText
-Tämä ohjelma poistaa ohjelman $(^NameDA) tietokoneelta. $_CLICK
+TÃ¤mÃ¤ ohjelma poistaa ohjelman $(^NameDA) tietokoneelta. $_CLICK
 # ^UninstallingSubText
 Poistetaan kansiosta:
 # ^FileError
-Tiedostoon ei voitu kirjoittaa: \r\n\t"$0"\r\nLopeta asennus valitsemalla Hylkää,\r\nyritä uudelleen valitsemalla Uudelleen, tai\r\nohita tiedosto valitsemalla Ohita
+Tiedostoon ei voitu kirjoittaa: \r\n\t"$0"\r\nLopeta asennus valitsemalla HylkÃ¤Ã¤,\r\nyritÃ¤ uudelleen valitsemalla Uudelleen, tai\r\nohita tiedosto valitsemalla Ohita
 # ^FileError_NoIgnore
-Tiedostoon ei voitu kirjoittaa: \r\n\t"$0"\r\nYritä uudelleen valitsemalla Uudelleen, tai\r\nlopeta asennus valitsemalla Hylkää
+Tiedostoon ei voitu kirjoittaa: \r\n\t"$0"\r\nYritÃ¤ uudelleen valitsemalla Uudelleen, tai\r\nlopeta asennus valitsemalla HylkÃ¤Ã¤
 # ^CantWrite
 "Ei voi kirjoittaa: "
 # ^CopyFailed
-Kopiointi epäonnistui
+Kopiointi epÃ¤onnistui
 # ^CopyTo
 "Kopioidaan kohteeseen "
 # ^Registering
-"Rekisteröidään: "
+"RekisterÃ¶idÃ¤Ã¤n: "
 # ^Unregistering
-"Poistetaan rekisteröinti: "
+"Poistetaan rekisterÃ¶inti: "
 # ^SymbolNotFound
-"Symbolia ei löytynyt: "
+"Symbolia ei lÃ¶ytynyt: "
 # ^CouldNotLoad
 "Ei voitu ladata: "
 # ^CreateFolder
@@ -147,7 +148,7 @@
 # ^Delete
 "Poista: "
 # ^DeleteOnReboot
-"Poista käynnistyksen yhteydessä: "
+"Poista kÃ¤ynnistyksen yhteydessÃ¤: "
 # ^ErrorCreatingShortcut
 "Virhe luotaessa pikakuvaketta: "
 # ^ErrorCreating
@@ -155,7 +156,7 @@
 # ^ErrorDecompressing
 Pakettia ei voitu purkaa. Korruptoitunut asennusohjelma?
 # ^ErrorRegistering
-Virhe rekisteröidessä DLL-tiedostoa
+Virhe rekisterÃ¶idessÃ¤ DLL-tiedostoa
 # ^ExecShell
 "ExecShell: "
 # ^Exec
@@ -173,20 +174,20 @@
 # ^RemoveFolder
 "Poista kansio: "
 # ^RenameOnReboot
-"Muuta nimi uudelleenkäynnistyksen yhteydessä: "
+"Muuta nimi uudelleenkÃ¤ynnistyksen yhteydessÃ¤: "
 # ^Rename
 "Muuta nimi: "
 # ^Skipped
 "Ohitettiin: "
 # ^CopyDetails
-Kopioi tiedot leikepöydälle
+Kopioi tiedot leikepÃ¶ydÃ¤lle
 # ^LogInstall
 Tallenna asennusloki
 # ^Byte
 t
 # ^Kilo
-k
+ k
 # ^Mega
-M
+ M
 # ^Giga
-G
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Thai.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Thai.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Thai.nsh	(revision 2956)
@@ -1,121 +1,121 @@
-;Language: Thai (1054)
+ï»¿;Language: Thai (1054)
 ;By SoKoOLz, TuW@nNu (asdfuae)
 
-!insertmacro LANGFILE "Thai" "Thai"
+!insertmacro LANGFILE "Thai" = "à¹„à¸—à¸¢" /* TODO: ISO 11940? */ "Thai"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "ÂÔ¹´ÕµéÍ¹ÃÑºà¢éÒÊÙè¡ÒÃµÔ´µÑé§â»Ãá¡ÃÁ $(^NameDA) "
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "µÑÇµÔ´µÑé§ÍÑµÔâ¹ÁÑµÔ¨Ð¹Ó¤Ø³ä»ÊÙè¡ÒÃµÔ´µÑé§¢Í§ $(^NameDA).$\r$\n$\r$\nàÃÒ¢Íá¹Ð¹ÓãËé»Ô´â»Ãá¡ÃÁÍ×è¹æãËéËÁ´¡èÍ¹·Õè¨ÐàÃÔèÁµÔ´µÑé§, ¹Õè¨Ðà»ç¹¡ÒÃÍÑ»à´·ä¿Åìä´é§èÒÂ¢Öé¹â´Â¤Ø³äÁè¨Óà»ç¹µéÍ§·Ó¡ÒÃÃÕºÙ·¤ÍÁ¾ÔÇàµÍÃì¢Í§¤Ø³$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "à¸¢à¸´à¸™à¸”à¸µà¸•à¹‰à¸­à¸™à¸£à¸±à¸šà¹€à¸‚à¹‰à¸²à¸ªà¸¹à¹ˆà¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹‚à¸›à¸£à¹�à¸�à¸£à¸¡ $(^NameDA) "
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "à¸•à¸±à¸§à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸­à¸±à¸•à¸´à¹‚à¸™à¸¡à¸±à¸•à¸´à¸ˆà¸°à¸™à¸³à¸„à¸¸à¸“à¹„à¸›à¸ªà¸¹à¹ˆà¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸‚à¸­à¸‡ $(^NameDA).$\r$\n$\r$\nà¹€à¸£à¸²à¸‚à¸­à¹�à¸™à¸°à¸™à¸³à¹ƒà¸«à¹‰à¸›à¸´à¸”à¹‚à¸›à¸£à¹�à¸�à¸£à¸¡à¸­à¸·à¹ˆà¸™à¹†à¹ƒà¸«à¹‰à¸«à¸¡à¸”à¸�à¹ˆà¸­à¸™à¸—à¸µà¹ˆà¸ˆà¸°à¹€à¸£à¸´à¹ˆà¸¡à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡, à¸™à¸µà¹ˆà¸ˆà¸°à¹€à¸›à¹‡à¸™à¸�à¸²à¸£à¸­à¸±à¸›à¹€à¸”à¸—à¹„à¸Ÿà¸¥à¹Œà¹„à¸”à¹‰à¸‡à¹ˆà¸²à¸¢à¸‚à¸¶à¹‰à¸™à¹‚à¸”à¸¢à¸„à¸¸à¸“à¹„à¸¡à¹ˆà¸ˆà¸³à¹€à¸›à¹‡à¸™à¸•à¹‰à¸­à¸‡à¸—à¸³à¸�à¸²à¸£à¸£à¸µà¸šà¸¹à¸—à¸„à¸­à¸¡à¸žà¸´à¸§à¹€à¸•à¸­à¸£à¹Œà¸‚à¸­à¸‡à¸„à¸¸à¸“$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "ÂÔ¹´ÕµéÍ¹ÃÑºÊÙè¡ÒÃÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§ÍÑµÔâ¹ÁÑµÔ¢Í§ $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "µÑÇµÔ´µÑé§ÍÑµÔâ¹ÁÑµÔ¹Õé¨Ð¹Ó¤Ø³ä»ÊÙè¡ÒÃÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§¢Í§ $(^NameDA).$\r$\n$\r$\n¡ÒÃ¨ÐàÃÔèÁ¡ÒÃÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§¹Õé, â»Ã´µÃÇ¨ÊÍºÇèÒ $(^NameDA) äÁèä´éãªéÍÂÙè$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "à¸¢à¸´à¸™à¸”à¸µà¸•à¹‰à¸­à¸™à¸£à¸±à¸šà¸ªà¸¹à¹ˆà¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸­à¸±à¸•à¸´à¹‚à¸™à¸¡à¸±à¸•à¸´à¸‚à¸­à¸‡ $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "à¸•à¸±à¸§à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸­à¸±à¸•à¸´à¹‚à¸™à¸¡à¸±à¸•à¸´à¸™à¸µà¹‰à¸ˆà¸°à¸™à¸³à¸„à¸¸à¸“à¹„à¸›à¸ªà¸¹à¹ˆà¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸‚à¸­à¸‡ $(^NameDA).$\r$\n$\r$\nà¸�à¸²à¸£à¸ˆà¸°à¹€à¸£à¸´à¹ˆà¸¡à¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸™à¸µà¹‰, à¹‚à¸›à¸£à¸”à¸•à¸£à¸§à¸ˆà¸ªà¸­à¸šà¸§à¹ˆà¸² $(^NameDA) à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¹ƒà¸Šà¹‰à¸­à¸¢à¸¹à¹ˆ$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "¢éÍµ¡Å§àÃ×èÍ§ÅÔ¢ÊÔ·¸Ôì"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "â»Ã´ÍèÒ¹·Ç¹ÅÔ¢ÊÔ·¸Ôìã¹ËÑÇ¢éÍµèÒ§æÍÕ¡¤ÃÑé§¡èÍ¹·Õè¤Ø³¨Ð·Ó¡ÒÃµÔ´µÑé§ $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "¶éÒ¤Ø³ÂÍÁÃÑº¢éÍµ¡Å§àÃ×èÍ§ÅÔ¢ÊÔ·¸Ôì, ¡´ ©Ñ¹ÂÍÁÃÑº à¾×èÍ·ÓµèÍä», ¤Ø³µéÍ§ÂÍÁÃÑºã¹¢éÍµ¡Å§ÅÔ¢ÊÔ·¸Ôìà¾×èÍ·Õè¨Ð·Ó¡ÒÃµÔ´µÑé§ $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "¶éÒ¤Ø³ÂÍÁÃÑº¢éÍµ¡Å§àÃ×èÍ§ÅÔ¢ÊÔ·¸, ¡´àÅ×Í¡ã¹¡ÅèÍ§¢éÒ§ÅèÒ§¹Õé  ¤Ø³µéÍ§ÂÍÁÃÑºã¹¢éÍµ¡Å§ÅÔ¢ÊÔ·¸Ôìà¾×èÍ·Õè¨Ð·Ó¡ÒÃµÔ´µÑé§ $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "¶éÒ¤Ø³ÂÍÁÃÑº¢éÍµ¡Å§àÃ×èÍ§ÅÔ¢ÊÔ·¸,  àÅ×Í¡µÑÇàÅ×Í¡áÃ¡´éÒ¹ÅèÒ§¹Õé ¤Ø³µéÍ§ÂÍÁÃÑºã¹¢éÍµ¡Å§ÅÔ¢ÊÔ·¸Ôìà¾×èÍ·Õè¨Ð·Ó¡ÒÃµÔ´µÑé§ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "à¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¹€à¸£à¸·à¹ˆà¸­à¸‡à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œ"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "à¹‚à¸›à¸£à¸”à¸­à¹ˆà¸²à¸™à¸—à¸§à¸™à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œà¹ƒà¸™à¸«à¸±à¸§à¸‚à¹‰à¸­à¸•à¹ˆà¸²à¸‡à¹†à¸­à¸µà¸�à¸„à¸£à¸±à¹‰à¸‡à¸�à¹ˆà¸­à¸™à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸ˆà¸°à¸—à¸³à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "à¸–à¹‰à¸²à¸„à¸¸à¸“à¸¢à¸­à¸¡à¸£à¸±à¸šà¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¹€à¸£à¸·à¹ˆà¸­à¸‡à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œ, à¸�à¸” à¸‰à¸±à¸™à¸¢à¸­à¸¡à¸£à¸±à¸š à¹€à¸žà¸·à¹ˆà¸­à¸—à¸³à¸•à¹ˆà¸­à¹„à¸›, à¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸¢à¸­à¸¡à¸£à¸±à¸šà¹ƒà¸™à¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œà¹€à¸žà¸·à¹ˆà¸­à¸—à¸µà¹ˆà¸ˆà¸°à¸—à¸³à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "à¸–à¹‰à¸²à¸„à¸¸à¸“à¸¢à¸­à¸¡à¸£à¸±à¸šà¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¹€à¸£à¸·à¹ˆà¸­à¸‡à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜, à¸�à¸”à¹€à¸¥à¸·à¸­à¸�à¹ƒà¸™à¸�à¸¥à¹ˆà¸­à¸‡à¸‚à¹‰à¸²à¸‡à¸¥à¹ˆà¸²à¸‡à¸™à¸µà¹‰  à¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸¢à¸­à¸¡à¸£à¸±à¸šà¹ƒà¸™à¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œà¹€à¸žà¸·à¹ˆà¸­à¸—à¸µà¹ˆà¸ˆà¸°à¸—à¸³à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "à¸–à¹‰à¸²à¸„à¸¸à¸“à¸¢à¸­à¸¡à¸£à¸±à¸šà¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¹€à¸£à¸·à¹ˆà¸­à¸‡à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜,  à¹€à¸¥à¸·à¸­à¸�à¸•à¸±à¸§à¹€à¸¥à¸·à¸­à¸�à¹�à¸£à¸�à¸”à¹‰à¸²à¸™à¸¥à¹ˆà¸²à¸‡à¸™à¸µà¹‰ à¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸¢à¸­à¸¡à¸£à¸±à¸šà¹ƒà¸™à¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œà¹€à¸žà¸·à¹ˆà¸­à¸—à¸µà¹ˆà¸ˆà¸°à¸—à¸³à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "¢éÍµ¡Å§àÃ×èÍ§ÅÔ¢ÊÔ·¸Ôì"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "¡ÃØ³ÒÍèÒ¹¢éÍµ¡Å§´éÒ¹ÅÔ¢ÊÔ·¸Ôì¡èÍ¹µÔ´µÑé§â»Ãá¡ÃÁ $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "¶éÒ¤Ø³ÂÍÁÃÑºã¹¢éÍµ¡Å§¹Õé ¡ÃØ³Ò¡´»ØèÁ ©Ñ¹ÂÍÁÃÑº áÅÐ¤Ø³¨ÐµéÍ§µ¡Å§¡èÍ¹·Õè¨ÐàÃÔèÁ¡ÒÃÂ¡àÅÔ¡µÔ´µÑé§â»Ãá¡ÃÁ $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "¶éÒ¤Ø³ÂÍÁÃÑº¢éÍµ¡Å§àÃ×èÍ§ÅÔ¢ÊÔ·¸Ôì, ¡´àÅ×Í¡ã¹¡ÅèÍ§¢éÒ§ÅèÒ§¹Õé ¤Ø³µéÍ§ÂÍÁÃÑºã¹¢éÍµ¡Å§ÅÔ¢ÊÔ·¸Ôìà¾×èÍ·Õè¨Ð·Ó¡ÒÃµÔ´µÑé§ $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "¶éÒ¤Ø³ÂÍÁÃÑº¢éÍµ¡Å§àÃ×èÍ§ÅÔ¢ÊÔ·¸Ôì, àÅ×Í¡µÑÇàÅ×Í¡áÃ¡´éÒ¹ÅèÒ§¹Õé ¤Ø³µéÍ§ÂÍÁÃÑºã¹¢éÍµ¡Å§ÅÔ¢ÊÔ·¸Ôìà¾×èÍ·Õè¨Ð·Ó¡ÒÃµÔ´µÑé§ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "à¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¹€à¸£à¸·à¹ˆà¸­à¸‡à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œ"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "à¸�à¸£à¸¸à¸“à¸²à¸­à¹ˆà¸²à¸™à¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¸”à¹‰à¸²à¸™à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œà¸�à¹ˆà¸­à¸™à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹‚à¸›à¸£à¹�à¸�à¸£à¸¡ $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "à¸–à¹‰à¸²à¸„à¸¸à¸“à¸¢à¸­à¸¡à¸£à¸±à¸šà¹ƒà¸™à¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¸™à¸µà¹‰ à¸�à¸£à¸¸à¸“à¸²à¸�à¸”à¸›à¸¸à¹ˆà¸¡ à¸‰à¸±à¸™à¸¢à¸­à¸¡à¸£à¸±à¸š à¹�à¸¥à¸°à¸„à¸¸à¸“à¸ˆà¸°à¸•à¹‰à¸­à¸‡à¸•à¸�à¸¥à¸‡à¸�à¹ˆà¸­à¸™à¸—à¸µà¹ˆà¸ˆà¸°à¹€à¸£à¸´à¹ˆà¸¡à¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹‚à¸›à¸£à¹�à¸�à¸£à¸¡ $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "à¸–à¹‰à¸²à¸„à¸¸à¸“à¸¢à¸­à¸¡à¸£à¸±à¸šà¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¹€à¸£à¸·à¹ˆà¸­à¸‡à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œ, à¸�à¸”à¹€à¸¥à¸·à¸­à¸�à¹ƒà¸™à¸�à¸¥à¹ˆà¸­à¸‡à¸‚à¹‰à¸²à¸‡à¸¥à¹ˆà¸²à¸‡à¸™à¸µà¹‰ à¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸¢à¸­à¸¡à¸£à¸±à¸šà¹ƒà¸™à¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œà¹€à¸žà¸·à¹ˆà¸­à¸—à¸µà¹ˆà¸ˆà¸°à¸—à¸³à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "à¸–à¹‰à¸²à¸„à¸¸à¸“à¸¢à¸­à¸¡à¸£à¸±à¸šà¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¹€à¸£à¸·à¹ˆà¸­à¸‡à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œ, à¹€à¸¥à¸·à¸­à¸�à¸•à¸±à¸§à¹€à¸¥à¸·à¸­à¸�à¹�à¸£à¸�à¸”à¹‰à¸²à¸™à¸¥à¹ˆà¸²à¸‡à¸™à¸µà¹‰ à¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸¢à¸­à¸¡à¸£à¸±à¸šà¹ƒà¸™à¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œà¹€à¸žà¸·à¹ˆà¸­à¸—à¸µà¹ˆà¸ˆà¸°à¸—à¸³à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "¡´ Page Down à¾×èÍÍèÒ¹¢éÍµ¡Å§·Ñé§ËÁ´"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "à¸�à¸” Page Down à¹€à¸žà¸·à¹ˆà¸­à¸­à¹ˆà¸²à¸™à¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”"
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "àÅ×Í¡ÊèÇ¹»ÃÐ¡Íº"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "àÅ×Í¡ÊÔè§·Õè¤Ø³µéÍ§¡ÒÃãªé§Ò¹¨Ò¡ $(^NameDA) ·Õè¤Ø³µéÍ§¡ÒÃµÔ´µÑé§"
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "à¹€à¸¥à¸·à¸­à¸�à¸ªà¹ˆà¸§à¸™à¸›à¸£à¸°à¸�à¸­à¸š"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "à¹€à¸¥à¸·à¸­à¸�à¸ªà¸´à¹ˆà¸‡à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸ˆà¸²à¸� $(^NameDA) à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡"
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "àÅ×Í¡ÊèÇ¹»ÃÐ¡Íº"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "àÅ×Í¡ÊÔè§·Õè¤Ø³µéÍ§¡ÒÃãªé§Ò¹¨Ò¡ $(^NameDA) ·Õè¤Ø³µéÍ§Â¡àÅÔ¡¡ÒÃµÔ´µÑé§"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "à¹€à¸¥à¸·à¸­à¸�à¸ªà¹ˆà¸§à¸™à¸›à¸£à¸°à¸�à¸­à¸š"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "à¹€à¸¥à¸·à¸­à¸�à¸ªà¸´à¹ˆà¸‡à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸ˆà¸²à¸� $(^NameDA) à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡"
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "ÃÒÂÅÐàÍÕÂ´"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "à¸£à¸²à¸¢à¸¥à¸°à¹€à¸­à¸µà¸¢à¸”"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "¢ÂÑºàÁÒÊì¢Í§¤Ø³àË¹×ÍÊèÇ¹»ÃÐ¡Íºà¾×èÍ´ÙÃÒÂÅÐàÍÕÂ´"
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "à¸‚à¸¢à¸±à¸šà¹€à¸¡à¸²à¸ªà¹Œà¸‚à¸­à¸‡à¸„à¸¸à¸“à¹€à¸«à¸™à¸·à¸­à¸ªà¹ˆà¸§à¸™à¸›à¸£à¸°à¸�à¸­à¸šà¹€à¸žà¸·à¹ˆà¸­à¸”à¸¹à¸£à¸²à¸¢à¸¥à¸°à¹€à¸­à¸µà¸¢à¸”"
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "¢ÂÑºàÁÒÊì¢Í§¤Ø³àË¹×ÍÊèÇ¹»ÃÐ¡Íºà¾×èÍ´ÙÃÒÂÅÐàÍÕÂ´"
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "à¹€à¸¥à¸·à¸­à¸�à¸ªà¹ˆà¸§à¸™à¸›à¸£à¸°à¸�à¸­à¸šà¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸”à¸¹à¸£à¸²à¸¢à¸¥à¸°à¹€à¸­à¸µà¸¢à¸”"
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "àÅ×Í¡·Õè·ÕèµéÍ§¡ÒÃµÔ´µÑé§"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "àÅ×Í¡á¼éÁ·ÕèµéÍ§¡ÒÃµÔ´µÑé§ $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "à¹€à¸¥à¸·à¸­à¸�à¸—à¸µà¹ˆà¸—à¸µà¹ˆà¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "à¹€à¸¥à¸·à¸­à¸�à¹�à¸œà¹‰à¸¡à¸—à¸µà¹ˆà¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "àÅ×Í¡á¿éÁ·ÕèµéÍ§¡ÒÃÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "àÅ×Í¡á¿éÁ·Õè¤Ø³µéÍ§¡ÒÃÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§¢Í§ $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "à¹€à¸¥à¸·à¸­à¸�à¹�à¸Ÿà¹‰à¸¡à¸—à¸µà¹ˆà¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "à¹€à¸¥à¸·à¸­à¸�à¹�à¸Ÿà¹‰à¸¡à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸‚à¸­à¸‡ $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "¡ÓÅÑ§µÔ´µÑé§"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "â»Ã´ÃÍã¹¢³Ð·Õè $(^NameDA) ¡ÓÅÑ§¶Ù¡µÔ´µÑé§"
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "¡ÒÃµÔ´µÑé§àÊÃç¨ÊÔé¹"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "¡ÒÃµÔ´µÑé§àÊÃç¨ÊÁºÙÃ³ì"
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "¡ÒÃµÔ´µÑé§¶Ù¡Â¡àÅÔ¡"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "¡ÒÃµÔ´µÑé§äÁèàÊÃç¨ÊÁºÙÃ³ì"
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "à¸�à¸³à¸¥à¸±à¸‡à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "à¹‚à¸›à¸£à¸”à¸£à¸­à¹ƒà¸™à¸‚à¸“à¸°à¸—à¸µà¹ˆ $(^NameDA) à¸�à¸³à¸¥à¸±à¸‡à¸–à¸¹à¸�à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡"
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹€à¸ªà¸£à¹‡à¸ˆà¸ªà¸´à¹‰à¸™"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹€à¸ªà¸£à¹‡à¸ˆà¸ªà¸¡à¸šà¸¹à¸£à¸“à¹Œ"
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸–à¸¹à¸�à¸¢à¸�à¹€à¸¥à¸´à¸�"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹„à¸¡à¹ˆà¹€à¸ªà¸£à¹‡à¸ˆà¸ªà¸¡à¸šà¸¹à¸£à¸“à¹Œ"
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "¡ÓÅÑ§Â¡àÅÔ¡¡ÒÃµÔ´µÑé§"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "â»Ã´ÃÍã¹¢³Ð·Õè $(^NameDA) ¡ÓÅÑ§¶Ù¡Â¡àÅÔ¡¡ÒÃµÔ´µÑé§."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "¡ÒÃÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§àÊÃç¨ÊÔé¹"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "¡ÒÃÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§àÊÃç¨ÊÔé¹â´ÂÊÁºÙÃ³ì"
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "¡ÒÃÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§¶Ù¡Â¡àÅÔ¡"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "¡ÒÃÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§äÁèÊÓàÃç¨"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "à¸�à¸³à¸¥à¸±à¸‡à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "à¹‚à¸›à¸£à¸”à¸£à¸­à¹ƒà¸™à¸‚à¸“à¸°à¸—à¸µà¹ˆ $(^NameDA) à¸�à¸³à¸¥à¸±à¸‡à¸–à¸¹à¸�à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "à¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹€à¸ªà¸£à¹‡à¸ˆà¸ªà¸´à¹‰à¸™"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "à¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹€à¸ªà¸£à¹‡à¸ˆà¸ªà¸´à¹‰à¸™à¹‚à¸”à¸¢à¸ªà¸¡à¸šà¸¹à¸£à¸“à¹Œ"
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "à¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸–à¸¹à¸�à¸¢à¸�à¹€à¸¥à¸´à¸�"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "à¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹„à¸¡à¹ˆà¸ªà¸³à¹€à¸£à¹‡à¸ˆ"
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "¡ÒÃµÔ´µÑé§ÍÑµÔâ¹ÁÑµÔ¢Í§  $(^NameDA) ¡ÓÅÑ§àÊÃç¨ÊÔé¹"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) ä´é¶Ù¡µÔ´µÑé§Å§ã¹à¤Ã×èÍ§¤ÍÁ¾ÔÇàµÍÃì¢Í§¤Ø³áÅéÇ$\r$\n$\r$\n¡´ àÊÃç¨ÊÔé¹à¾×èÍ»Ô´µÑÇµÔ´µÑé§ÍÑµÔâ¹ÁÑµÔ"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "à¤Ã×èÍ§¤ÍÁ¾ÔÇàµÍÃì¢Í§¤Ø³¨Óà»ç¹µéÍ§ÃÕÊµÒÃ·ìà¾×èÍ¡ÒÃµÔ´µÑé§¢Í§ $(^NameDA) ¨ÐàÃÕÂºÃéÍÂ, ¤Ø³µéÍ§¡ÒÃ¨Ð ÃÕºÙ· à´ÕëÂÇ¹ÕéäËÁ?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸­à¸±à¸•à¸´à¹‚à¸™à¸¡à¸±à¸•à¸´à¸‚à¸­à¸‡  $(^NameDA) à¸�à¸³à¸¥à¸±à¸‡à¹€à¸ªà¸£à¹‡à¸ˆà¸ªà¸´à¹‰à¸™"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) à¹„à¸”à¹‰à¸–à¸¹à¸�à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸¥à¸‡à¹ƒà¸™à¹€à¸„à¸£à¸·à¹ˆà¸­à¸‡à¸„à¸­à¸¡à¸žà¸´à¸§à¹€à¸•à¸­à¸£à¹Œà¸‚à¸­à¸‡à¸„à¸¸à¸“à¹�à¸¥à¹‰à¸§$\r$\n$\r$\nà¸�à¸” à¹€à¸ªà¸£à¹‡à¸ˆà¸ªà¸´à¹‰à¸™à¹€à¸žà¸·à¹ˆà¸­à¸›à¸´à¸”à¸•à¸±à¸§à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸­à¸±à¸•à¸´à¹‚à¸™à¸¡à¸±à¸•à¸´"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "à¹€à¸„à¸£à¸·à¹ˆà¸­à¸‡à¸„à¸­à¸¡à¸žà¸´à¸§à¹€à¸•à¸­à¸£à¹Œà¸‚à¸­à¸‡à¸„à¸¸à¸“à¸ˆà¸³à¹€à¸›à¹‡à¸™à¸•à¹‰à¸­à¸‡à¸£à¸µà¸ªà¸•à¸²à¸£à¸—à¹Œà¹€à¸žà¸·à¹ˆà¸­à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸‚à¸­à¸‡ $(^NameDA) à¸ˆà¸°à¹€à¸£à¸µà¸¢à¸šà¸£à¹‰à¸­à¸¢, à¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸ˆà¸° à¸£à¸µà¸šà¸¹à¸— à¹€à¸”à¸µà¹‹à¸¢à¸§à¸™à¸µà¹‰à¹„à¸«à¸¡?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "¡ÒÃÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§ÍÑµÔâ¹ÁÑµÔ¢Í§ $(^NameDA) ¡ÓÅÑ§àÊÃç¨ÊÁºÙÃ³ì"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) ä´é¶Ù¡Â¡àÅÔ¡ÍÍ¡¨Ò¡à¤Ã×èÍ§¤ÍÁ¾ÔÇàµÍÃì¢Í§¤Ø³áÅéÇ $\r$\n$\r$\n¡´ àÊÃç¨ÊÔé¹ à¾×èÍ»Ô´Ë¹éÒ¨ÍµÔ´µÑé§ÍÑµÔâ¹ÁÑµÔ"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "à¤Ã×èÍ§¤ÍÁ¾ÔÇàµÍÃì¢Í§¤Ø³¨Óà»ç¹µéÍ§ÃÕÊµÒÃì·ã¹¡ÒÃ·Õè¨Ð·Ó¡ÒÃÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§¢Í§ $(^NameDA) àÊÃç¨ÊÔé¹, ¤Ø³µéÍ§¡ÒÃ¨ÐÃÕºÙ·à´ÕëÂÇ¹ÕéäËÁ?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "à¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸­à¸±à¸•à¸´à¹‚à¸™à¸¡à¸±à¸•à¸´à¸‚à¸­à¸‡ $(^NameDA) à¸�à¸³à¸¥à¸±à¸‡à¹€à¸ªà¸£à¹‡à¸ˆà¸ªà¸¡à¸šà¸¹à¸£à¸“à¹Œ"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) à¹„à¸”à¹‰à¸–à¸¹à¸�à¸¢à¸�à¹€à¸¥à¸´à¸�à¸­à¸­à¸�à¸ˆà¸²à¸�à¹€à¸„à¸£à¸·à¹ˆà¸­à¸‡à¸„à¸­à¸¡à¸žà¸´à¸§à¹€à¸•à¸­à¸£à¹Œà¸‚à¸­à¸‡à¸„à¸¸à¸“à¹�à¸¥à¹‰à¸§ $\r$\n$\r$\nà¸�à¸” à¹€à¸ªà¸£à¹‡à¸ˆà¸ªà¸´à¹‰à¸™ à¹€à¸žà¸·à¹ˆà¸­à¸›à¸´à¸”à¸«à¸™à¹‰à¸²à¸ˆà¸­à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸­à¸±à¸•à¸´à¹‚à¸™à¸¡à¸±à¸•à¸´"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "à¹€à¸„à¸£à¸·à¹ˆà¸­à¸‡à¸„à¸­à¸¡à¸žà¸´à¸§à¹€à¸•à¸­à¸£à¹Œà¸‚à¸­à¸‡à¸„à¸¸à¸“à¸ˆà¸³à¹€à¸›à¹‡à¸™à¸•à¹‰à¸­à¸‡à¸£à¸µà¸ªà¸•à¸²à¸£à¹Œà¸—à¹ƒà¸™à¸�à¸²à¸£à¸—à¸µà¹ˆà¸ˆà¸°à¸—à¸³à¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸‚à¸­à¸‡ $(^NameDA) à¹€à¸ªà¸£à¹‡à¸ˆà¸ªà¸´à¹‰à¸™, à¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸ˆà¸°à¸£à¸µà¸šà¸¹à¸—à¹€à¸”à¸µà¹‹à¸¢à¸§à¸™à¸µà¹‰à¹„à¸«à¸¡?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "ÃÕºÙ· à´ÕëÂÇ¹Õé"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "©Ñ¹µéÍ§¡ÒÃ ÃÕºÙ·´éÇÂµ¹àÍ§ ·ÕËÅÑ§"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "&ÃÑ¹ $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&áÊ´§ÃÒÂÅÐàÍÕÂ´"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&àÊÃç¨ÊÔé¹"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "à¸£à¸µà¸šà¸¹à¸— à¹€à¸”à¸µà¹‹à¸¢à¸§à¸™à¸µà¹‰"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "à¸‰à¸±à¸™à¸•à¹‰à¸­à¸‡à¸�à¸²à¸£ à¸£à¸µà¸šà¸¹à¸—à¸”à¹‰à¸§à¸¢à¸•à¸™à¹€à¸­à¸‡ à¸—à¸µà¸«à¸¥à¸±à¸‡"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&à¸£à¸±à¸™ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&à¹�à¸ªà¸”à¸‡à¸£à¸²à¸¢à¸¥à¸°à¹€à¸­à¸µà¸¢à¸”"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&à¹€à¸ªà¸£à¹‡à¸ˆà¸ªà¸´à¹‰à¸™"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "àÅ×Í¡á¿éÁ Start Menu"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "àÅ×Í¡á¿éÁ Start Menu à¾×èÍÊÃéÒ§ªÍÃìµ¤Ñ·¢Í§ $(^NameDA). "
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "àÅ×Í¡á¼éÁ Start Menu ·Õè¤Ø³µéÍ§¡ÒÃ¨ÐÊÃéÒ§ªÍÃìµ¤Ñ·¢Í§â»Ãá¡ÃÁ, ¤Ø³ÂÑ§ÊÒÁÒÃ¶¡ÓË¹´ª×èÍà¾×èÍÊÃéÒ§á¿éÁãËÁèä´éÍÕ¡´éÇÂ"
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "äÁèµéÍ§ÊÃéÒ§ ªÍÃìµ¤Ñ·"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "à¹€à¸¥à¸·à¸­à¸�à¹�à¸Ÿà¹‰à¸¡ Start Menu"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "à¹€à¸¥à¸·à¸­à¸�à¹�à¸Ÿà¹‰à¸¡ Start Menu à¹€à¸žà¸·à¹ˆà¸­à¸ªà¸£à¹‰à¸²à¸‡à¸Šà¸­à¸£à¹Œà¸•à¸„à¸±à¸—à¸‚à¸­à¸‡ $(^NameDA). "
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "à¹€à¸¥à¸·à¸­à¸�à¹�à¸œà¹‰à¸¡ Start Menu à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸ˆà¸°à¸ªà¸£à¹‰à¸²à¸‡à¸Šà¸­à¸£à¹Œà¸•à¸„à¸±à¸—à¸‚à¸­à¸‡à¹‚à¸›à¸£à¹�à¸�à¸£à¸¡, à¸„à¸¸à¸“à¸¢à¸±à¸‡à¸ªà¸²à¸¡à¸²à¸£à¸–à¸�à¸³à¸«à¸™à¸”à¸Šà¸·à¹ˆà¸­à¹€à¸žà¸·à¹ˆà¸­à¸ªà¸£à¹‰à¸²à¸‡à¹�à¸Ÿà¹‰à¸¡à¹ƒà¸«à¸¡à¹ˆà¹„à¸”à¹‰à¸­à¸µà¸�à¸”à¹‰à¸§à¸¢"
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "à¹„à¸¡à¹ˆà¸•à¹‰à¸­à¸‡à¸ªà¸£à¹‰à¸²à¸‡ à¸Šà¸­à¸£à¹Œà¸•à¸„à¸±à¸—"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Â¡àÅÔ¡¡ÒÃµÔ´µÑé§ $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Â¡àÅÔ¡¡ÒÃµÔ´µÑé§ $(^NameDA) ¨Ò¡à¤Ã×èÍ§¤ÍÁ¾ÔÇàµÍÃì¢Í§¤Ø³"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $(^NameDA) à¸ˆà¸²à¸�à¹€à¸„à¸£à¸·à¹ˆà¸­à¸‡à¸„à¸­à¸¡à¸žà¸´à¸§à¹€à¸•à¸­à¸£à¹Œà¸‚à¸­à¸‡à¸„à¸¸à¸“"
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "¤Ø³á¹èã¨ËÃ×ÍÇèÒ¤Ø³µéÍ§¡ÒÃ¨ÐÍÍ¡¨Ò¡¡ÒÃµÔ´µÑé§¢Í§ $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "à¸„à¸¸à¸“à¹�à¸™à¹ˆà¹ƒà¸ˆà¸«à¸£à¸·à¸­à¸§à¹ˆà¸²à¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸ˆà¸°à¸­à¸­à¸�à¸ˆà¸²à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸‚à¸­à¸‡ $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "¤Ø³á¹èã¨ËÃ×ÍÇèÒ¤Ø³µéÍ§¡ÒÃÍÍ¡¨Ò¡¡ÒÃÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§¢Í§ $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "à¸„à¸¸à¸“à¹�à¸™à¹ˆà¹ƒà¸ˆà¸«à¸£à¸·à¸­à¸§à¹ˆà¸²à¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸­à¸­à¸�à¸ˆà¸²à¸�à¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸‚à¸­à¸‡ $(^Name)?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Afrikaans.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Afrikaans.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Afrikaans.nlf	(revision 2956)
@@ -1,17 +1,17 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1078
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
 # Translation by Friedel Wolff
 # ^Branding
-Nullsoft Installeerstelsel %s
+Nullsoft Install System %s
 # ^SetupCaption
 $(^Name) Installasie
 # ^UninstallCaption
@@ -83,15 +83,15 @@
 # ^Custom
 Aangepast
 # ^ComponentsText
-Kies die komponente wat u wil installeer en deselekteer dié wat u nie wil installeer nie. $_CLICK
+Kies die komponente wat u wil installeer en deselekteer diÃ© wat u nie wil installeer nie. $_CLICK
 # ^ComponentsSubText1
 Kies die installasietipe:
 # ^ComponentsSubText2_NoInstTypes
-Kies die komponente wat geïnstalleer moet word:
+Kies die komponente wat geÃ¯nstalleer moet word:
 # ^ComponentsSubText2
-Of kies die komponente wat geïnstalleer moet word:
+Of kies die komponente wat geÃ¯nstalleer moet word:
 # ^UnComponentsText
-Kies die komponente wat u wil verwyder en deselekteer dié wat u nie wil verwyder nie. $_CLICK
+Kies die komponente wat u wil verwyder en deselekteer diÃ© wat u nie wil verwyder nie. $_CLICK
 # ^UnComponentsSubText1
 Kies die verwyderingstipe:
 # ^UnComponentsSubText2_NoInstTypes
@@ -99,7 +99,7 @@
 # ^UnComponentsSubText2
 Of kies die komponente wat verwyder moet word:
 # ^DirText
-$(^NameDA) sal in die volgende gids geïnstalleer word. Om elders te installeer, klik op Blaai en kies 'n ander een. $_CLICK
+$(^NameDA) sal in die volgende gids geÃ¯nstalleer word. Om elders te installeer, klik op Blaai en kies 'n ander een. $_CLICK
 # ^DirSubText
 Installasiegids
 # ^DirBrowseText
@@ -119,13 +119,13 @@
 # ^UninstallingSubText
 Verwydering uit:
 # ^FileError
-Fout met skryf na lêer: \r\n\r\n$0\r\n\r\nKlik Staak om de installasie te stop,\r\nProbeer weer om weer te probeer of\r\nIgnoreer om dié lêer oor te slaan.
+Fout met skryf na lÃªer: \r\n\r\n$0\r\n\r\nKlik Staak om de installasie te stop,\r\nProbeer weer om weer te probeer of\r\nIgnoreer om diÃ© lÃªer oor te slaan.
 # ^FileError_NoIgnore
-Fout met skryf na lêer: \r\n\r\n$0\r\n\r\nKlik Probeer weer om op nuut te probeer, of \r\nKanselleer om die installasie te stop.
+Fout met skryf na lÃªer: \r\n\r\n$0\r\n\r\nKlik Probeer weer om op nuut te probeer, of \r\nKanselleer om die installasie te stop.
 # ^CantWrite
 "Kon nie skyf nie: "
 # ^CopyFailed
-Kopiëring het misluk
+KopiÃ«ring het misluk
 # ^CopyTo
 "Kopieer na "
 # ^Registering
@@ -143,7 +143,7 @@
 # ^CreatedUninstaller
 "Verwyderingsprogram gemaak: "
 # ^Delete
-"Verwyder lêer: "
+"Verwyder lÃªer: "
 # ^DeleteOnReboot
 "Verwyder na herbegin van rekenaar: "
 # ^ErrorCreatingShortcut
@@ -151,7 +151,7 @@
 # ^ErrorCreating
 "Fout met skep: "
 # ^ErrorDecompressing
-Fout met uitpak van data! Korrupte installasielêer?
+Fout met uitpak van data! Korrupte installasielÃªer?
 # ^ErrorRegistering
 Fout met registrasie van DLL
 # ^ExecShell
@@ -161,7 +161,7 @@
 # ^Extract
 "Pak uit: "
 # ^ErrorWriting
-"Uitpak: fout met skryf na lêer "
+"Uitpak: fout met skryf na lÃªer "
 # ^InvalidOpcode
 Installasieprogram korrup: ongeldige opcode
 # ^NoOLE
@@ -183,8 +183,8 @@
 # ^Byte
 G
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 #  ^Giga
-G
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/PortugueseBR.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/PortugueseBR.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/PortugueseBR.nsh	(revision 2956)
@@ -1,110 +1,110 @@
-;Language: Brazilian Portuguese (1046)
-;By Felipe
+ï»¿;Language: Brazilian Portuguese (1046)
+;By Diego Pedroso and Felipe, reviewed by Georger AraÃºjo
 
-!insertmacro LANGFILE "PortugueseBR" "Português Brasileiro"
+!insertmacro LANGFILE "PortugueseBR" "Brazilian Portuguese" "PortuguÃªs Brasileiro" "Portugues Brasileiro"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bem-vindo ao Assistente de Instalação do $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Este assistente guiará você através da instalação do $(^NameDA).$\r$\n$\r$\nÉ recomendado que você feche todos os outros aplicativos antes de iniciar o Instalador. Isto tornará possível atualizar os arquivos de sistema relevantes sem ter que reiniciar seu computador.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bem-vindo ao Instalador do $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "O instalador guiarÃ¡ vocÃª durante a instalaÃ§Ã£o do $(^NameDA).$\r$\n$\r$\nAntes de comeÃ§ar a instalaÃ§Ã£o, Ã© recomendado que vocÃª feche todos os outros aplicativos. Isto tornarÃ¡ possÃ­vel atualizar os arquivos de sistema relevantes sem ter que reiniciar seu computador.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Bem-vindo ao Assistente de Desinstalação do $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Este assistente guiará você através da desinstalação do $(^NameDA).$\r$\n$\r$\nAntes de iniciar a desinstalação, tenha certeza de que o $(^NameDA) não está em execução.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Bem-vindo ao Desinstalador do $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Este assistente guiarÃ¡ vocÃª durante a desinstalaÃ§Ã£o do $(^NameDA).$\r$\n$\r$\nAntes de iniciar a desinstalaÃ§Ã£o, certifique-se que o $(^NameDA) nÃ£o estÃ¡ em execuÃ§Ã£o.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Acordo da licença"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Por favor, reveja os termos da licença antes de instalar o $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Se você aceita os termos do acordo, clique em Eu Concordo para continuar. Você deve aceitar o acordo para instalar o $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Se você aceita os termos do acordo, clique na caixa de seleção abaixo. Você deve aceitar o acordo para instalar o $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Se você aceita os termos do acordo, selecione a primeira opção abaixo. Você deve aceitar o acordo para instalar o $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Acordo de LicenÃ§a"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Por favor, leia com atenÃ§Ã£o os termos da licenÃ§a antes de instalar o $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Se vocÃª aceita os termos do acordo, clique em Eu Concordo para continuar. VocÃª deve aceitar o acordo para instalar o $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Se vocÃª aceita os termos do acordo, clique na caixa de seleÃ§Ã£o abaixo. VocÃª deve aceitar o acordo para instalar o $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Se vocÃª aceita os termos do acordo, selecione a primeira opÃ§Ã£o abaixo. VocÃª deve aceitar o acordo para instalar o $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Acordo da licença"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Por favor, reveja os termos da licença antes de desinstalar o $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Se você aceita os termos do acordo, clique em Eu Concordo para continuar. Você deve aceitar o acordo para desinstalar o $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Se você aceita os termos do acordo, clique na caixa de seleção abaixo. Você deve aceitar o acordo para desinstalar o $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Se você aceita os termos do acordo, selecione a primeira opção abaixo. Você deve aceitar o acordo para desinstalar o $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Acordo de LicenÃ§a"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Por favor, leia com atenÃ§Ã£o os termos da licenÃ§a antes de desinstalar o $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Se vocÃª aceita os termos do acordo, clique em Eu Concordo para continuar. VocÃª deve aceitar o acordo para desinstalar o $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Se vocÃª aceita os termos do acordo, clique na caixa de seleÃ§Ã£o abaixo. VocÃª deve aceitar o acordo para desinstalar o $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Se vocÃª aceita os termos do acordo, selecione a primeira opÃ§Ã£o abaixo. VocÃª deve aceitar o acordo para desinstalar o $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Pressione Page Down para ver o resto do acordo."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Pressione Page Down para ver o restante do acordo."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
   ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Escolher Componentes"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Escolha quais funções do $(^NameDA) você quer instalar."
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Escolha quais funÃ§Ãµes do $(^NameDA) vocÃª quer instalar."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Escolher Componentes"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Escolha quais funções do $(^NameDA) você quer desinstalar."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Escolha quais funÃ§Ãµes do $(^NameDA) vocÃª quer desinstalar."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Descrição"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "DescriÃ§Ã£o"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Posicione seu mouse sobre um componente para ver sua descrição."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Posicione o mouse sobre um componente para ver sua descriÃ§Ã£o."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Posicione seu mouse sobre um componente para ver sua descrição."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Selecione um componente para ver sua descriÃ§Ã£o."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Escolher o Local da Instalação"
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Escolha o Local da InstalaÃ§Ã£o"
   ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Escolha a pasta na qual instalar o $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Escolher o Local da Desinstalação"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Escolha o Local da DesinstalaÃ§Ã£o"
   ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Escolha a pasta da qual desinstalar o $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Instalando"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Por favor espere enquanto o $(^NameDA) está sendo instalado."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Instalação Completa"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "O Instalador completou com sucesso."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Instalação Abortada"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "O Instalador não completou com sucesso."
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Por favor espere enquanto o $(^NameDA) estÃ¡ sendo instalado."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "InstalaÃ§Ã£o Completa"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "A instalaÃ§Ã£o foi completada com sucesso."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "InstalaÃ§Ã£o Abortada"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "A instalaÃ§Ã£o nÃ£o foi completada com sucesso."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Desinstalando"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Por favor espere enquanto o $(^NameDA) está sendo desinstalado."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Desinstalação Completa"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "A desinstalação foi completada com sucesso."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Desinstalação Abortada"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "A desinstalação não foi completada com sucesso."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Por favor espere enquanto o $(^NameDA) estÃ¡ sendo desinstalado."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "DesinstalaÃ§Ã£o Completa"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "A desinstalaÃ§Ã£o foi completada com sucesso."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "DesinstalaÃ§Ã£o Abortada"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "A desinstalaÃ§Ã£o nÃ£o foi completada com sucesso."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Completando o Assistente de Instalação do $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "O $(^NameDA) foi instalado no seu computador.$\r$\n$\r$\nClique em Terminar para fechar este assistente."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Seu computador deve ser reiniciado para completar a instalação do $(^NameDA). Você quer reiniciar agora?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Completando a instalaÃ§Ã£o do $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "O $(^NameDA) foi instalado no seu computador.$\r$\n$\r$\nClique em Concluir para fechar o instalador."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Seu computador deve ser reiniciado para completar a instalaÃ§Ã£o do $(^NameDA). VocÃª quer reiniciar agora?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Completando o Assistente de Desinstalação do $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) foi desinstalado do seu computador.$\r$\n$\r$\nClique em Terminar para fechar este assistente."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Seu computador tem que ser reiniciado para completar a desinstalação do $(^NameDA). Você quer reiniciar agora?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Concluindo a desinstalaÃ§Ã£o do $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "O $(^NameDA) foi desinstalado do seu computador.$\r$\n$\r$\nClique em Concluir para fechar o instalador."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Seu computador deve ser reiniciado para completar a desinstalaÃ§Ã£o do $(^NameDA). VocÃª quer reiniciar agora?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
   ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Reiniciar agora"
   ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Eu quero reiniciar manualmente depois"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "&Executar $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Mostrar o Readme"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Terminar"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&Executar o $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Mostrar o Leia-me"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Concluir"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Escolher a Pasta do Menu Iniciar"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Escolher uma pasta do Menu Iniciar para os atalhos do $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Selecione a pasta do Menu Iniciar na qual você gostaria de criar os atalhos do programa. Você pode também inserir um nome para criar uma nova pasta."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Não criar atalhos"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Escolha a Pasta do Menu Iniciar"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Escolha uma pasta do Menu Iniciar para os atalhos do $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Selecione a pasta do Menu Iniciar na qual vocÃª quer que os atalhos do programa sejam criados. VocÃª tambÃ©m pode inserir um nome para criar uma nova pasta."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "NÃ£o criar atalhos"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
@@ -113,17 +113,17 @@
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Você tem certeza de que quer sair do Instalador do $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "VocÃª tem certeza que quer sair da InstalaÃ§Ã£o do $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Você tem certeza de que quer sair da Desinstalação do $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "VocÃª tem certeza que quer sair da DesinstalaÃ§Ã£o do $(^Name)?"
 !endif
 
 !ifdef MULTIUSER_INSTALLMODEPAGE
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Escolher Usuários"
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Escolher para quais usuários você quer instalar o $(^NameDA)."
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Selecione se você quer instalar o $(^NameDA) para si mesmo ou para todos os usuários deste computador. $(^ClickNext)"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Instalar para qualquer um usando este computador"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Instalar apenas para mim"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Escolher UsuÃ¡rios"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Escolha para quais usuÃ¡rios vocÃª quer instalar o $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Selecione se vocÃª quer instalar o $(^NameDA) somente para vocÃª ou para todos os usuÃ¡rios deste computador. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Instalar para todos os usuÃ¡rios deste computador"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Instalar somente para mim"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Slovak.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Slovak.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Slovak.nlf	(revision 2956)
@@ -1,190 +1,190 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1051
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1250
 # RTL - anything else than RTL means LTR
 -
-#Translated by: Kypec (peter.dzugas@mahe.sk); edited by: Marián Hikaník (podnety@mojepreklady.net), Ivan Masár <helix84@centrum.sk>, 2008.
+#Translated by: Kypec (peter.dzugas@mahe.sk); edited by: MariÃ¡n HikanÃ­k (podnety@mojepreklady.net), Ivan MasÃ¡r <helix84@centrum.sk>, 2008.
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-Inštalácia programu $(^Name)
+InÅ¡talÃ¡cia programu $(^Name)
 # ^UninstallCaption
-Odinštalovanie programu $(^Name)
+OdinÅ¡talovanie programu $(^Name)
 # ^LicenseSubCaption
-: Licenèná zmluva
+: LicenÄ�nÃ¡ zmluva
 # ^ComponentsSubCaption
-: Možnosti inštalácie
+: MoÅ¾nosti inÅ¡talÃ¡cie
 # ^DirSubCaption
-: Inštalaèný prieèinok
+: InÅ¡talaÄ�nÃ½ prieÄ�inok
 # ^InstallingSubCaption
-: Prebieha inštalácia
+: Prebieha inÅ¡talÃ¡cia
 # ^CompletedSubCaption
 : Hotovo
 # ^UnComponentsSubCaption
-: Možnosti odinštalovania
+: MoÅ¾nosti odinÅ¡talovania
 # ^UnDirSubCaption
-: Prieèinok s informáciami pre odinštalovanie
+: PrieÄ�inok s informÃ¡ciami pre odinÅ¡talovanie
 # ^ConfirmSubCaption
 : Potvrdenie
 # ^UninstallingSubCaption
-: Prebieha odinštalácia
+: Prebieha odinÅ¡talÃ¡cia
 # ^UnCompletedSubCaption
 : Hotovo
 # ^BackBtn
-< &Spä�
+< &SpÃ¤Å¥
 # ^NextBtn
-Ï&alej >
+ÄŽ&alej >
 # ^AgreeBtn
-&Súhlasím
+&SÃºhlasÃ­m
 # ^AcceptBtn
-&Súhlasím s podmienkami licenènej zmluvy
+&SÃºhlasÃ­m s podmienkami licenÄ�nej zmluvy
 # ^DontAcceptBtn
-N&esúhlasím s podmienkami licenènej zmluvy
+N&esÃºhlasÃ­m s podmienkami licenÄ�nej zmluvy
 # ^InstallBtn
-&Nainštalova�
+&NainÅ¡talovaÅ¥
 # ^UninstallBtn
-&Odinštalova�
+&OdinÅ¡talovaÅ¥
 # ^CancelBtn
-Zruši�
+ZruÅ¡iÅ¥
 # ^CloseBtn
-&Zatvori�
+&ZatvoriÅ¥
 # ^BrowseBtn
-&Preh¾adáva�...
+&PrehÄ¾adÃ¡vaÅ¥...
 # ^ShowDetailsBtn
 &Podrobnosti
 # ^ClickNext
-V inštalácii pokraèujte kliknutím na tlaèidlo Ïalej.
+V inÅ¡talÃ¡cii pokraÄ�ujte kliknutÃ­m na tlaÄ�idlo ÄŽalej.
 # ^ClickInstall
-Pre spustenie inštalácie kliknite na tlaèidlo Nainštalova�.
+Pre spustenie inÅ¡talÃ¡cie kliknite na tlaÄ�idlo NainÅ¡talovaÅ¥.
 # ^ClickUninstall
-Pre spustenie procesu odinštalovania kliknite na tlaèidlo Odinštalova�.
+Pre spustenie procesu odinÅ¡talovania kliknite na tlaÄ�idlo OdinÅ¡talovaÅ¥.
 # ^Name
-Názov
+NÃ¡zov
 # ^Completed
 Hotovo
 # ^LicenseText
-Pred inštaláciou programu si prosím dôkladne preèítajte licenènú zmluvu $(^NameDA). Ak súhlasíte so všetkými jej podmienkami, kliknite na tlaèidlo Súhlasím.
+Pred inÅ¡talÃ¡ciou programu si prosÃ­m dÃ´kladne preÄ�Ã­tajte licenÄ�nÃº zmluvu $(^NameDA). Ak sÃºhlasÃ­te so vÅ¡etkÃ½mi jej podmienkami, kliknite na tlaÄ�idlo SÃºhlasÃ­m.
 # ^LicenseTextCB
-Pred inštaláciou programu si prosím dôkladne preèítajte licenènú zmluvu $(^NameDA). Ak súhlasíte so všetkými jej podmienkami, zaškrtnite nasledujúce políèko. $_CLICK
+Pred inÅ¡talÃ¡ciou programu si prosÃ­m dÃ´kladne preÄ�Ã­tajte licenÄ�nÃº zmluvu $(^NameDA). Ak sÃºhlasÃ­te so vÅ¡etkÃ½mi jej podmienkami, zaÅ¡krtnite nasledujÃºce polÃ­Ä�ko. $_CLICK
 # ^LicenseTextRB
-Pred inštaláciou programu si prosím dôkladne preèítajte licenènú zmluvu $(^NameDA). Ak súhlasíte so všetkými jej podmienkami, oznaète prvú z nasledujúcich možností. $_CLICK
+Pred inÅ¡talÃ¡ciou programu si prosÃ­m dÃ´kladne preÄ�Ã­tajte licenÄ�nÃº zmluvu $(^NameDA). Ak sÃºhlasÃ­te so vÅ¡etkÃ½mi jej podmienkami, oznaÄ�te prvÃº z nasledujÃºcich moÅ¾nostÃ­. $_CLICK
 # ^UnLicenseText
-Pred odinštalovaním programu si prosím dôkladne preèítajte licenènú zmluvu $(^NameDA). Ak súhlasíte so všetkými jej podmienkami, kliknite na tlaèidlo Súhlasím.
+Pred odinÅ¡talovanÃ­m programu si prosÃ­m dÃ´kladne preÄ�Ã­tajte licenÄ�nÃº zmluvu $(^NameDA). Ak sÃºhlasÃ­te so vÅ¡etkÃ½mi jej podmienkami, kliknite na tlaÄ�idlo SÃºhlasÃ­m.
 # ^UnLicenseTextCB
-Pred odinštalovaním programu si prosím dôkladne preèítajte licenènú zmluvu $(^NameDA). Ak súhlasíte so všetkými jej podmienkami, zaškrtnite nasledujúce políèko. $_CLICK
+Pred odinÅ¡talovanÃ­m programu si prosÃ­m dÃ´kladne preÄ�Ã­tajte licenÄ�nÃº zmluvu $(^NameDA). Ak sÃºhlasÃ­te so vÅ¡etkÃ½mi jej podmienkami, zaÅ¡krtnite nasledujÃºce polÃ­Ä�ko. $_CLICK
 # ^UnLicenseTextRB
-Pred odinštalovaním programu si prosím dôkladne preèítajte licenènú zmluvu $(^NameDA). Ak súhlasíte so všetkými jej podmienkami, oznaète prvú z nasledujúcich možností. $_CLICK
+Pred odinÅ¡talovanÃ­m programu si prosÃ­m dÃ´kladne preÄ�Ã­tajte licenÄ�nÃº zmluvu $(^NameDA). Ak sÃºhlasÃ­te so vÅ¡etkÃ½mi jej podmienkami, oznaÄ�te prvÃº z nasledujÃºcich moÅ¾nostÃ­. $_CLICK
 # ^Custom
-Volite¾ná
+VoliteÄ¾nÃ¡
 # ^ComponentsText
-Oznaète súèasti programu, ktoré chcete nainštalova� a odznaète tie, ktoré nainštalova� nechcete. $_CLICK
+OznaÄ�te sÃºÄ�asti programu, ktorÃ© chcete nainÅ¡talovaÅ¥ a odznaÄ�te tie, ktorÃ© nainÅ¡talovaÅ¥ nechcete. $_CLICK
 # ^ComponentsSubText1
-Vyberte si typ inštalácie:
+Vyberte si typ inÅ¡talÃ¡cie:
 # ^ComponentsSubText2_NoInstTypes
-Vyberte si tie súèasti programu, ktoré chcete nainštalova�:
+Vyberte si tie sÃºÄ�asti programu, ktorÃ© chcete nainÅ¡talovaÅ¥:
 # ^ComponentsSubText2
-Alebo oznaète volite¾né doplnky, ktoré chcete nainštalova�:
+Alebo oznaÄ�te voliteÄ¾nÃ© doplnky, ktorÃ© chcete nainÅ¡talovaÅ¥:
 # ^UnComponentsText
-Oznaète súèasti programu, ktoré chcete odinštalova� a odznaète tie, ktoré chcete ponecha� nainštalované. $_CLICK
+OznaÄ�te sÃºÄ�asti programu, ktorÃ© chcete odinÅ¡talovaÅ¥ a odznaÄ�te tie, ktorÃ© chcete ponechaÅ¥ nainÅ¡talovanÃ©. $_CLICK
 # ^UnComponentsSubText1
-Zvo¾te typ deinštalácie:
+ZvoÄ¾te typ deinÅ¡talÃ¡cie:
 # ^UnComponentsSubText2_NoInstTypes
-Vyberte súèasti, ktoré chcete odinštalova�:
+Vyberte sÃºÄ�asti, ktorÃ© chcete odinÅ¡talovaÅ¥:
 # ^UnComponentsSubText2
-Alebo oznaète volite¾né súèasti, ktoré chcete odinštalova�:
+Alebo oznaÄ�te voliteÄ¾nÃ© sÃºÄ�asti, ktorÃ© chcete odinÅ¡talovaÅ¥:
 # ^DirText
-$(^NameDA) bude nainštalovaný do nasledujúceho prieèinka. Inštalova� do iného prieèinka môžete po kliknutí na tlaèidlo Preh¾adáva� a vybraní iného prieèinka. $_CLICK
+$(^NameDA) bude nainÅ¡talovanÃ½ do nasledujÃºceho prieÄ�inka. InÅ¡talovaÅ¥ do inÃ©ho prieÄ�inka mÃ´Å¾ete po kliknutÃ­ na tlaÄ�idlo PrehÄ¾adÃ¡vaÅ¥ a vybranÃ­ inÃ©ho prieÄ�inka. $_CLICK
 # ^DirSubText
-Cie¾ový prieèinok
+CieÄ¾ovÃ½ prieÄ�inok
 # ^DirBrowseText
-Zvo¾te prieèinok, do ktorého sa nainštaluje program $(^NameDA):
+ZvoÄ¾te prieÄ�inok, do ktorÃ©ho sa nainÅ¡taluje program $(^NameDA):
 # ^UnDirText
-Inštalátor odinštaluje program $(^NameDA) z nasledovného prieèinka. Ak ho chcete odinštalova� z iného prieèinka, kliknite na tlaèidlo Preh¾adáva� a vyberte iný prieèinok. $_CLICK
+InÅ¡talÃ¡tor odinÅ¡taluje program $(^NameDA) z nasledovnÃ©ho prieÄ�inka. Ak ho chcete odinÅ¡talovaÅ¥ z inÃ©ho prieÄ�inka, kliknite na tlaÄ�idlo PrehÄ¾adÃ¡vaÅ¥ a vyberte inÃ½ prieÄ�inok. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Zvo¾te prieèinok, z ktorého sa odinštaluje program $(^NameDA):
+ZvoÄ¾te prieÄ�inok, z ktorÃ©ho sa odinÅ¡taluje program $(^NameDA):
 # ^SpaceAvailable
-"Vo¾né miesto na disku: "
+"VoÄ¾nÃ© miesto na disku: "
 # ^SpaceRequired
-"Potrebné miesto na disku: "
+"PotrebnÃ© miesto na disku: "
 # ^UninstallingText
-Program $(^NameDA) sa odinštaluje z nasledovného prieèinka. $_CLICK
+Program $(^NameDA) sa odinÅ¡taluje z nasledovnÃ©ho prieÄ�inka. $_CLICK
 # ^UninstallingSubText
-Prebieha odinštalovanie z:
+Prebieha odinÅ¡talovanie z:
 # ^FileError
-Chyba pri otváraní súboru na zápis: \r\n\r\n$0\r\n\r\n. Ak chcete inštaláciu ukonèi�, kliknite na tlaèidlo Ukonèi�,\r\ ak chcete zápis súboru zopakova�, kliknite na tlaèidlo Opakova� alebo kliknite na tlaèidlo \r\nIgnorova�, ak chcete inštaláciu tohto súboru vynecha�.
+Chyba pri otvÃ¡ranÃ­ sÃºboru na zÃ¡pis: \r\n\r\n$0\r\n\r\n. Ak chcete inÅ¡talÃ¡ciu ukonÄ�iÅ¥, kliknite na tlaÄ�idlo UkonÄ�iÅ¥,\r\ ak chcete zÃ¡pis sÃºboru zopakovaÅ¥, kliknite na tlaÄ�idlo OpakovaÅ¥ alebo kliknite na tlaÄ�idlo \r\nIgnorovaÅ¥, ak chcete inÅ¡talÃ¡ciu tohto sÃºboru vynechaÅ¥.
 # ^FileError_NoIgnore
-Chyba pri otváraní súboru na zápis: \r\n\r\n$0\r\n\r\n. Ak chcete zopakova� zápis súboru, kliknite na tlaèidlo Opakova�, alebo kliknite na tlaèidlo \r\nZruši�, v prípade, že chcete inštaláciu ukonèi�.
+Chyba pri otvÃ¡ranÃ­ sÃºboru na zÃ¡pis: \r\n\r\n$0\r\n\r\n. Ak chcete zopakovaÅ¥ zÃ¡pis sÃºboru, kliknite na tlaÄ�idlo OpakovaÅ¥, alebo kliknite na tlaÄ�idlo \r\nZruÅ¡iÅ¥, v prÃ­pade, Å¾e chcete inÅ¡talÃ¡ciu ukonÄ�iÅ¥.
 # ^CantWrite
-"Nemožno zapísa� súbor: "
+"NemoÅ¾no zapÃ­saÅ¥ sÃºbor: "
 # ^CopyFailed
-Kopírovanie zlyhalo.
+KopÃ­rovanie zlyhalo.
 # ^CopyTo
-"Kopírova� do "
+"KopÃ­rovaÅ¥ do "
 # ^Registering
 "Registruje sa: "
 # ^Unregistering
-"Vymazáva sa z registra: "
+"VymazÃ¡va sa z registra: "
 # ^SymbolNotFound
-"Nemožno nájs� symbol: "
+"NemoÅ¾no nÃ¡jsÅ¥ symbol: "
 # ^CouldNotLoad
-"Nemožno naèíta�: "
+"NemoÅ¾no naÄ�Ã­taÅ¥: "
 # ^CreateFolder
-"Vytvorený prieèinok: "
+"VytvorenÃ½ prieÄ�inok: "
 # ^CreateShortcut
-"Vytvorený odkaz: "
+"VytvorenÃ½ odkaz: "
 # ^CreatedUninstaller
-"Program pre odinštalovanie: "
+"Program pre odinÅ¡talovanie: "
 # ^Delete
-"Vymazaný súbor: "
+"VymazanÃ½ sÃºbor: "
 # ^DeleteOnReboot
-"Vymaza� po reštartovaní systému: "
+"VymazaÅ¥ po reÅ¡tartovanÃ­ systÃ©mu: "
 # ^ErrorCreatingShortcut
-"Chyba pri vytváraní odkazu: "
+"Chyba pri vytvÃ¡ranÃ­ odkazu: "
 # ^ErrorCreating
-"Chyba pri vytváraní: "
+"Chyba pri vytvÃ¡ranÃ­: "
 # ^ErrorDecompressing
-Chyba pri dekomprimovaní dát! Inštalátor je pravdepodobne poškodený...
+Chyba pri dekomprimovanÃ­ dÃ¡t! InÅ¡talÃ¡tor je pravdepodobne poÅ¡kodenÃ½...
 # ^ErrorRegistering
-Chyba pri registrácii súèasti
+Chyba pri registrÃ¡cii sÃºÄ�asti
 # ^ExecShell
-"Vykona� príkaz: "
+"VykonaÅ¥ prÃ­kaz: "
 # ^Exec
-"Spusti�: "
+"SpustiÅ¥: "
 # ^Extract
 "Extrahuje sa: "
 # ^ErrorWriting
-"Chyba pri zápise do súboru "
+"Chyba pri zÃ¡pise do sÃºboru "
 # ^InvalidOpcode
-Inštalátor je pravdepodobne poškodený, pretože obsahuje neplatný operaèný kód.
+InÅ¡talÃ¡tor je pravdepodobne poÅ¡kodenÃ½, pretoÅ¾e obsahuje neplatnÃ½ operaÄ�nÃ½ kÃ³d.
 # ^NoOLE
-"Žiadny zápis OLE pre: "
+"Å½iadny zÃ¡pis OLE pre: "
 # ^OutputFolder
-"Výstupný prieèinok: "
+"VÃ½stupnÃ½ prieÄ�inok: "
 # ^RemoveFolder
-"Odstráni� prieèinok: "
+"OdstrÃ¡niÅ¥ prieÄ�inok: "
 # ^RenameOnReboot
-"Premenova� po reštartovaní systému: "
+"PremenovaÅ¥ po reÅ¡tartovanÃ­ systÃ©mu: "
 # ^Rename
-"Premenova�: "
+"PremenovaÅ¥: "
 # ^Skipped
-"Vynechané: "
+"VynechanÃ©: "
 # ^CopyDetails
-Skopírova� podrobnosti do schránky
+SkopÃ­rovaÅ¥ podrobnosti do schrÃ¡nky
 # ^LogInstall
-Zaznamena� priebeh inštalácie
+ZaznamenaÅ¥ priebeh inÅ¡talÃ¡cie
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Indonesian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Indonesian.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Indonesian.nsh	(revision 2956)
@@ -1,7 +1,7 @@
-;Language: Indonesian (1057)
+ï»¿;Language: Indonesian (1057)
 ;By Ariel825010106@yahoo.com modified by was.uthm@gmail.com in April 2009
 
-!insertmacro LANGFILE "Indonesian" "Indonesian"
+!insertmacro LANGFILE "Indonesian" = "Bahasa Indonesia" =
 
 !ifdef MUI_WELCOMEPAGE
   ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Selamat datang di program instalasi $(^NameDA)"
@@ -48,7 +48,7 @@
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
     ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Tunjuk ke salah satu komponen untuk melihat deskripsi tentang komponen itu."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Tunjuk ke salah satu komponen untuk melihat deskripsi tentang komponen itu."
+    #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO
   !endif
 !endif
 
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Corsican.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Corsican.nlf	(revision 0)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Corsican.nlf	(revision 2956)
@@ -0,0 +1,192 @@
+ï»¿# Header, don't edit
+NLF v6
+# Language ID
+1155
+# Font and size - dash (-) means default
+-
+-
+# Codepage - dash (-) means ASCII code page
+1252
+# RTL - anything other than RTL means LTR
+-
+# Translation by Patriccollu di Santa Maria Ã¨ SichÃ¨ - <Patrick.Santa-Maria(AT)laposte.net>
+# Created on April 24th, 2016 for version 3.0rc1
+# Traduzzione corsa creata da Patriccollu di Santa Maria Ã¨ SichÃ¨
+# ^Branding
+Nullsoft Install System %s
+# ^SetupCaption
+Assistente d'Installazione di $(^Name)
+# ^UninstallCaption
+Disinstallazione di $(^Name)
+# ^LicenseSubCaption
+: Cuntrattu d'Utilizazione
+# ^ComponentsSubCaption
+: Ozzioni d'Installazione
+# ^DirSubCaption
+: Cartulare d'Installazione
+# ^InstallingSubCaption
+: Installazione in corsu
+# ^CompletedSubCaption
+: Compiu
+# ^UnComponentsSubCaption
+: Ozzioni di Disinstallazione
+# ^UnDirSubCaption
+: Cartulare di Disinstallazione
+# ^ConfirmSubCaption
+: Cunfirmazione
+# ^UninstallingSubCaption
+: Disinstallazione in corsu
+# ^UnCompletedSubCaption
+: Compiu
+# ^BackBtn
+< &Precedente
+# ^NextBtn
+&Seguente >
+# ^AgreeBtn
+&Accunsentu
+# ^AcceptBtn
+SÃ² d'&accunsentu cÃ¹ i termini di u Cuntrattu di Licenza
+# ^DontAcceptBtn
+Ã™n sÃ² &micca d'accunsentu cÃ¹ i termini di u Cuntrattu di Licenza
+# ^InstallBtn
+&InstallÃ 
+# ^UninstallBtn
+&DisinstallÃ 
+# ^CancelBtn
+AbbandunÃ 
+# ^CloseBtn
+&Chjode
+# ^BrowseBtn
+&SfugliÃ ...
+# ^ShowDetailsBtn
+AffissÃ  i &ditaglii
+# ^ClickNext
+Sceglie Seguente per cuntinuÃ .
+# ^ClickInstall
+Sceglie InstallÃ  per principiÃ  l'installazione.
+# ^ClickUninstall
+Sceglie DisinstallÃ  per principiÃ  a disinstallazione.
+# ^Name
+Nome
+# ^Completed
+Compiu
+# ^LicenseText
+Ci vole Ã  leghje u cuntrattu di licenza nanzu d'installÃ  $(^NameDA). S'Ã¨ voi site d'accunsentu cÃ¹ tutti i termini di u cuntrattu, sceglie Accunsentu.
+# ^LicenseTextCB
+Ci vole Ã  leghje u cuntrattu di licenza nanzu d'installÃ  $(^NameDA). S'Ã¨ voi site d'accunsentu cÃ¹ tutti i termini di u cuntrattu, sceglie a casella inghjÃ². $_CLICK
+# ^LicenseTextRB
+Ci vole Ã  leghje u cuntrattu di licenza nanzu d'installÃ  $(^NameDA). S'Ã¨ voi site d'accunsentu cÃ¹ tutti i termini di u cuntrattu, sceglie a prima ozzione inghjÃ². $_CLICK
+# ^UnLicenseText
+Ci vole Ã  leghje u cuntrattu di licenza nanzu di disinstallÃ  $(^NameDA). S'Ã¨ voi site d'accunsentu cÃ¹ tutti i termini di u cuntrattu, sceglie Accunsentu.
+# ^UnLicenseTextCB
+Ci vole Ã  leghje u cuntrattu di licenza nanzu di disinstallÃ  $(^NameDA). S'Ã¨ voi site d'accunsentu cÃ¹ tutti i termini di u cuntrattu, sceglie a casella inghjÃ². $_CLICK
+# ^UnLicenseTextRB
+Ci vole Ã  leghje u cuntrattu di licenza nanzu di disinstallÃ  $(^NameDA). S'Ã¨ voi site d'accunsentu cÃ¹ tutti i termini di u cuntrattu, sceglie a prima ozzione inghjÃ². $_CLICK
+# ^Custom
+Persunalizatu
+# ^ComponentsText
+SelezziunÃ  i cumpunenti chÃ¬ voi vulete installÃ  Ã¨ viutÃ  a casella di quelli ch'ellu Ã¹n ci vole Ã  installÃ . $_CLICK
+# ^ComponentsSubText1
+SelezziunÃ  u tipu d'installazione :
+# ^ComponentsSubText2_NoInstTypes
+SelezziunÃ  i cumpunenti Ã  installÃ  :
+# ^ComponentsSubText2
+OsinnÃ², selezziunÃ  i cumpunenti addizziunali chÃ¬ voi vulete installÃ  :
+# ^UnComponentsText
+SelezziunÃ  i cumpunenti chÃ¬ voi vulete disinstallÃ  Ã¨ viutÃ  a casella di quelli ch'ellu Ã¹n ci vole Ã  disinstallÃ . $_CLICK
+# ^UnComponentsSubText1
+SelezziunÃ  u tipu di disinstallazione :
+# ^UnComponentsSubText2_NoInstTypes
+SelezziunÃ  i cumpunenti Ã  disinstallÃ  :
+# ^UnComponentsSubText2
+OsinnÃ², selezziunÃ  i cumpunenti addizziunali chÃ¬ voi vulete disinstallÃ  :
+# ^DirText
+L'Assistente hÃ  da installÃ  $(^NameDA) in quessu cartulare. Per installÃ  in un altru cartulare, sceglie SfugliÃ  Ã¨ selezziunÃ  un altru cartulare. $_CLICK
+# ^DirSubText
+Cartulare di Destinazione
+# ^DirBrowseText
+SelezziunÃ  u cartulare d'installazione di $(^NameDA) :
+# ^UnDirText
+L'Assistente hÃ  da disinstallÃ  $(^NameDA) da quessu cartulare. Per disinstallÃ  da un altru cartulare, sceglie SfugliÃ  Ã¨ selezziunÃ  un altru cartulare. $_CLICK
+# ^UnDirSubText
+Cartulare d'Installazione
+# ^UnDirBrowseText
+SelezziunÃ  u cartulare di disinstallazione di $(^NameDA) :
+# ^SpaceAvailable
+Spaziu dispunibule : 
+# ^SpaceRequired
+Spaziu richiestu : 
+# ^UninstallingText
+$(^NameDA) serÃ  disinstallatu da quessu cartulare. $_CLICK
+# ^UninstallingSubText
+Disinstallazione da :
+# ^FileError
+Sbagliu durante l'accessu in scrittura di u schedariu : \r\n\r\n$0\r\n\r\nSceglie Interrompe per piantÃ  l'installazione,\r\nTorna per pruvÃ  torna, o\r\nIgnurÃ  per ignurÃ  u schedariu.
+# ^FileError_NoIgnore
+Sbagliu durante l'accessu in scrittura di u schedariu : \r\n\r\n$0\r\n\r\nSceglie Torna per pruvÃ  torna, o\r\nAbbandunÃ  per piantÃ  l'installazione.
+# ^CantWrite
+Ã™n pÃ² micca scrive : 
+# ^CopyFailed
+Fiascu di copia
+# ^CopyTo
+CupiÃ  ver di 
+# ^Registering
+Arregistramentu : 
+# ^Unregistering
+Disarregistramentu : 
+# ^SymbolNotFound
+Ã™n pÃ² micca truvÃ  di simbolu : 
+# ^CouldNotLoad
+Ã™n pÃ² micca caricÃ  : 
+# ^CreateFolder
+Creazione di u cartulare : 
+# ^CreateShortcut
+Creazione di l'accurtatoghju : 
+# ^CreatedUninstaller
+Assistente di disinstallazione creatu : 
+# ^Delete
+Squassatura di schedariu : 
+# ^DeleteOnReboot
+Squassatura Ã  l'avviu di l'urdinatore : 
+# ^ErrorCreatingShortcut
+Sbagliu durante a creazione di l'accurtatoghju : 
+# ^ErrorCreating
+Sbagliu durante a creazione di : 
+# ^ErrorDecompressing
+Sbagliu durante a scumprezzione di dati : Stalladore alteratu ?
+# ^ErrorRegistering
+Sbagliu durante l'arregistramentu di DLL
+# ^ExecShell
+ExecShell : 
+# ^Exec
+Eseguisce : 
+# ^Extract
+Estrae : 
+# ^ErrorWriting
+Estrae : sbagliu di scrittura ver di u schedariu 
+# ^InvalidOpcode
+Stalladore alteratu : opcode micca accettevule
+# ^NoOLE
+Alcunu OLE per : 
+# ^OutputFolder
+Cartulare di destinazione : 
+# ^RemoveFolder
+CacciÃ  u cartulare : 
+# ^RenameOnReboot
+RinumÃ  Ã  l'avviu di l'urdinatore : 
+# ^Rename
+RinumÃ  : 
+# ^Skipped
+Tralasciatu : 
+# ^CopyDetails
+CupiÃ  i Ditaglii ver di u Preme'Papei
+# ^LogInstall
+ArregistrÃ  u ghjurnale d'installazione
+# ^Byte
+o
+# ^Kilo
+ K
+# ^Mega
+ M
+# ^Giga
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Portuguese.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Portuguese.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Portuguese.nlf	(revision 2956)
@@ -1,4 +1,4 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Start editing here
 # Language ID
@@ -6,37 +6,37 @@
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
 # Translation v4.0.3 by DragonSoull <dragonsoull@madalien.tk> with help from Dre` - Updated by Ramon
 # ^Branding
-Sistema de Instalação Nullsoft %s
+Nullsoft Install System %s
 # ^SetupCaption
-Instalação de $(^Name)
+InstalaÃ§Ã£o de $(^Name)
 # ^UninstallCaption
-Desinstalação de $(^Name)
+DesinstalaÃ§Ã£o de $(^Name)
 # ^LicenseSubCaption
-: Contrato de Licença
+: Contrato de LicenÃ§a
 # ^ComponentsSubCaption
-: Opções de instalação
+: OpÃ§Ãµes de instalaÃ§Ã£o
 # ^DirSubCaption
-: Diretório de instalação
+: DiretÃ³rio de instalaÃ§Ã£o
 # ^InstallingSubCaption
 : Instalando Ficheiros
 # ^CompletedSubCaption
-: Concluído
+: ConcluÃ­do
 # ^UnComponentsSubCaption
-: Opções de Desinstalação
+: OpÃ§Ãµes de DesinstalaÃ§Ã£o
 # ^UnDirSubCaption
-: Pasta de Desinstalação
+: Pasta de DesinstalaÃ§Ã£o
 # ^ConfirmSubCaption
-: Confirmação
+: ConfirmaÃ§Ã£o
 # ^UninstallingSubCaption
 : Desinstalando
 # ^UnCompletedSubCaption
-: Concluído
+: ConcluÃ­do
 # ^BackBtn
 < &Anterior
 # ^NextBtn
@@ -44,9 +44,9 @@
 # ^AgreeBtn
 &Aceito
 # ^AcceptBtn
-Eu &aceito os termos do Contrato de Licença
+Eu &aceito os termos do Contrato de LicenÃ§a
 # ^DontAcceptBtn
-Eu &não aceito os termos do Contrato de Licença
+Eu &nÃ£o aceito os termos do Contrato de LicenÃ§a
 # ^InstallBtn
 &Instalar
 # ^UninstallBtn
@@ -62,31 +62,31 @@
 # ^ClickNext
 Clique em 'Seguinte' para continuar.
 # ^ClickInstall
-Clique em 'Instalar' para iniciar a instalação.
+Clique em 'Instalar' para iniciar a instalaÃ§Ã£o.
 # ^ClickUninstall
-Clique em 'Desinstalar' para iniciar a desinstalação.
+Clique em 'Desinstalar' para iniciar a desinstalaÃ§Ã£o.
 # ^Name
 Nome
 # ^Completed
-Concluído
+ConcluÃ­do
 # ^LicenseText
-Por favor reveja o acordo de licensa antes de instalar $(^NameDA). Se concorda com todos os termos da licensa, clique em 'Aceito'.
+Por favor reveja o acordo de licenÃ§a antes de instalar $(^NameDA). Se concorda com todos os termos da licenÃ§a, clique em 'Aceito'.
 # ^LicenseTextCB
-Por favor reveja o acordo de licensa antes de instalar $(^NameDA). Se concorda com todos os termos da licensa, clique na caixa de seleção abaixo. $_CLICK
+Por favor reveja o acordo de licenÃ§a antes de instalar $(^NameDA). Se concorda com todos os termos da licenÃ§a, clique na caixa de seleÃ§Ã£o abaixo. $_CLICK
 # ^LicenseTextRB
-Por favor reveja o acordo de licensa antes de instalar $(^NameDA). Se concorda com todos os termos da licensa, escolha a primeira opção abaixo. $_CLICK
+Por favor reveja o acordo de licenÃ§a antes de instalar $(^NameDA). Se concorda com todos os termos da licenÃ§a, escolha a primeira opÃ§Ã£o abaixo. $_CLICK
 # ^UnLicenseText
-Por favor reveja o acordo de licensa antes de desinstalar $(^NameDA). Se concorda com todos os termos da licensa, clique em 'Aceito'.
+Por favor reveja o acordo de licenÃ§a antes de desinstalar $(^NameDA). Se concorda com todos os termos da licenÃ§a, clique em 'Aceito'.
 # ^UnLicenseTextCB
-Por favor reveja o acordo de licensa antes de desinstalar $(^NameDA). Se concorda com todos os termos da licensa, clique na caixa de seleção abaixo. $_CLICK
+Por favor reveja o acordo de licenÃ§a antes de desinstalar $(^NameDA). Se concorda com todos os termos da licenÃ§a, clique na caixa de seleÃ§Ã£o abaixo. $_CLICK
 # ^UnLicenseTextRB
-Por favor reveja o acordo de licensa antes de desinstalar $(^NameDA). Se concorda com todos os termos da licensa, escolha a primeira opção abaixo. $_CLICK
+Por favor reveja o acordo de licenÃ§a antes de desinstalar $(^NameDA). Se concorda com todos os termos da licenÃ§a, escolha a primeira opÃ§Ã£o abaixo. $_CLICK
 # ^Custom
 Personalizado
 # ^ComponentsText
-Marque os componentes que deseja instalar e desmarque os componentes que não deseja instalar. $_CLICK
+Marque os componentes que deseja instalar e desmarque os componentes que nÃ£o deseja instalar. $_CLICK
 # ^ComponentsSubText1
-Escolha o tipo de instalação:
+Escolha o tipo de instalaÃ§Ã£o:
 # ^ComponentsSubText2_NoInstTypes
 Escolha os componentes para instalar:
 # ^ComponentsSubText2
@@ -94,37 +94,37 @@
 # ^UnComponentsText
 Marque os componentes que queira desinstalar e vice versa. $_CLICK
 # ^UnComponentsSubText1
-Escolha o tipo de desinstalação: 
+Escolha o tipo de desinstalaÃ§Ã£o: 
 # ^UnComponentsSubText2_NoInstTypes
 Escolha os componentes para desinstalar:
 # ^UnComponentsSubText2
 Ou, escolha os componentes opcionais que queira desinstalar:
 # ^DirText
-O $(^NameDA) será instalado na seguinte pasta. Para instalar numa pasta diferente, clique em 'Procurar...' e escolha outra pasta. $_CLICK
+O $(^NameDA) serÃ¡ instalado na seguinte pasta. Para instalar numa pasta diferente, clique em 'Procurar...' e escolha outra pasta. $_CLICK
 # ^DirSubText
 Pasta de Destino
 # ^DirBrowseText
 Escolha uma pasta para instalar o $(^NameDA):
 # ^UnDirText
-O $(^NameDA) será desinstalado da seguinte pasta. Para desinstalar de uma pasta diferente, clique em 'Procurar...' e escolha outra pasta. $_CLICK
+O $(^NameDA) serÃ¡ desinstalado da seguinte pasta. Para desinstalar de uma pasta diferente, clique em 'Procurar...' e escolha outra pasta. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Escolha uma pasta de onde será desinstalado o $(^NameDA):
+Escolha uma pasta de onde serÃ¡ desinstalado o $(^NameDA):
 # ^SpaceAvailable
-"Espaço disponível: "
+"EspaÃ§o disponÃ­vel: "
 # ^SpaceRequired
-"Espaço necessário: "
+"EspaÃ§o necessÃ¡rio: "
 # ^UninstallingText
-$(^NameDA) será desinstalado da seguinte pasta. $_CLICK
+$(^NameDA) serÃ¡ desinstalado da seguinte pasta. $_CLICK
 # ^UninstallingSubText
 Desinstalando de:
 # ^FileError
-Erro ao abrir ficheiro para escrita: \r\n\t"$0"\r\nClique em Abortar para abortar a instalação,\r\nRepetir para tentar novamente a escrita do ficheiro, ou\r\nIgnorar para ignorar este ficheiro.
+Erro ao abrir ficheiro para escrita: \r\n\t"$0"\r\nClique em Abortar para abortar a instalaÃ§Ã£o,\r\nRepetir para tentar novamente a escrita do ficheiro, ou\r\nIgnorar para ignorar este ficheiro.
 # ^FileError_NoIgnore
-Erro ao abrir ficheiro para escrita: \r\n\t"$0"\r\nClique em Repetir para tentar novamente a gravação do ficheiro, ou\r\nCancelar para abortar a instalação.
+Erro ao abrir ficheiro para escrita: \r\n\t"$0"\r\nClique em Repetir para tentar novamente a gravaÃ§Ã£o do ficheiro, ou\r\nCancelar para abortar a instalaÃ§Ã£o.
 # ^CantWrite
-"Não foi possível escrever: "
+"NÃ£o foi possÃ­vel escrever: "
 # ^CopyFailed
 Falha ao copiar
 # ^CopyTo
@@ -134,11 +134,11 @@
 # ^Unregistering
 "Desregistando: "
 # ^SymbolNotFound
-"Símbolo não encontrado: "
+"SÃ­mbolo nÃ£o encontrado: "
 # ^CouldNotLoad
-"Não foi possível carregar: "
+"NÃ£o foi possÃ­vel carregar: "
 # ^CreateFolder
-"Criando diretório: "
+"Criando diretÃ³rio: "
 # ^CreateShortcut
 "Criando atalho: "
 # ^CreatedUninstaller
@@ -164,7 +164,7 @@
 # ^ErrorWriting
 "Extraindo: erro ao escrever ficheiro "
 # ^InvalidOpcode
-Instalador corrompido: código de operação inválido
+Instalador corrompido: cÃ³digo de operaÃ§Ã£o invÃ¡lido
 # ^NoOLE
 "Sem OLE para: "
 # ^OutputFolder
@@ -178,14 +178,14 @@
 # ^Skipped
 "Ignorado: "
 # ^CopyDetails
-Copiar detalhes para a Área de Transfêrencia
+Copiar detalhes para a Ã�rea de TransfÃªrencia
 # ^LogInstall
-Registar processo de instalação
+Registar processo de instalaÃ§Ã£o
 # ^Byte
 B
 # kilo
-K
+ K
 # mega
-M
+ M
 # giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/SpanishInternational.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/SpanishInternational.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/SpanishInternational.nsh	(revision 2956)
@@ -1,17 +1,17 @@
-;Language: Spanish International (3082)
-;By Darwin Rodrigo Toledo Cáceres - www.winamp-es.com - niwrad777@gmail.com
+ï»¿;Language: Spanish International (3082)
+;By Darwin Rodrigo Toledo CÃ¡ceres - www.winamp-es.com - niwrad777@gmail.com
 ;Base by Monki y Joel
 
-!insertmacro LANGFILE "SpanishInternational" "Español (Alfabetización Internacional)"
+!insertmacro LANGFILE "SpanishInternational" "Spanish (International)" "EspaÃ±ol (AlfabetizaciÃ³n Internacional)" "Espanol (Alfabetizacion Internacional)"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bienvenido al Asistente de Instalación de $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Este asistente le guiará a través de la instalación de $(^NameDA).$\r$\n$\r$\nSe recomienda que cierre todas la demás aplicaciones antes de iniciar la instalación. Esto hará posible actualizar archivos de sistema sin tener que reiniciar su computadora.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bienvenido al Asistente de InstalaciÃ³n de $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Este asistente le guiarÃ¡ a travÃ©s de la instalaciÃ³n de $(^NameDA).$\r$\n$\r$\nSe recomienda que cierre todas la demÃ¡s aplicaciones antes de iniciar la instalaciÃ³n. Esto harÃ¡ posible actualizar archivos de sistema sin tener que reiniciar su computadora.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Bienvenido al Asistente de Desinstalación de $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Este asistente le guiará durante la desinstalación de $(^NameDA).$\r$\n$\r$\nAntes de iniciar la desinstalación, asegúrese de que $(^NameDA) no se está ejecutando.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Bienvenido al Asistente de DesinstalaciÃ³n de $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Este asistente le guiarÃ¡ durante la desinstalaciÃ³n de $(^NameDA).$\r$\n$\r$\nAntes de iniciar la desinstalaciÃ³n, asegÃºrese de que $(^NameDA) no se estÃ¡ ejecutando.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
@@ -19,92 +19,92 @@
   ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Por favor revise el acuerdo de licencia antes de instalar $(^NameDA)."
   ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Si acepta todas las condiciones del acuerdo, seleccione Acepto para continuar. Debe aceptar el acuerdo para instalar $(^NameDA)."
   ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Si acepta las condiciones del acuerdo, marque abajo la casilla. Debe aceptar las condiciones para instalar $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Si acepta las condiciones del acuerdo, seleccione abajo la primera opción. Debe aceptar las condiciones para instalar $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Si acepta las condiciones del acuerdo, seleccione abajo la primera opciÃ³n. Debe aceptar las condiciones para instalar $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
   ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Acuerdo de licencia"
   ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Por favor revise el acuerdo de licencia antes de desinstalar $(^NameDA)."
   ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Si acepta todas las condiciones del acuerdo, seleccione Acepto para continuar. Debe aceptar el acuerdo para desinstalar $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Si acepta los términos del acuerdo, marque abajo la casilla. Debe aceptar los términos para desinstalar $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Si acepta los términos del acuerdo, seleccione abajo la primera opción. Debe aceptar los términos para desinstalar $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Si acepta los tÃ©rminos del acuerdo, marque abajo la casilla. Debe aceptar los tÃ©rminos para desinstalar $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Si acepta los tÃ©rminos del acuerdo, seleccione abajo la primera opciÃ³n. Debe aceptar los tÃ©rminos para desinstalar $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Presione Avanzar Página para ver el resto del acuerdo."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Presione Avanzar PÃ¡gina para ver el resto del acuerdo."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Selección de componentes"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Seleccione qué características de $(^NameDA) desea instalar."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "SelecciÃ³n de componentes"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Seleccione quÃ© caracterÃ­sticas de $(^NameDA) desea instalar."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Selección de componentes"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Seleccione qué características de $(^NameDA) desea desinstalar."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "SelecciÃ³n de componentes"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Seleccione quÃ© caracterÃ­sticas de $(^NameDA) desea desinstalar."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Descripción"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "DescripciÃ³n"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Sitúe el ratón encima de un componente para ver su descripción."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "SitÃºe el ratÃ³n encima de un componente para ver su descripciÃ³n."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Sitúe el ratón encima de un componente para ver su descripción."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Seleccione un componente para ver su descripciÃ³n."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Elegir lugar de instalación"
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Elegir lugar de instalaciÃ³n"
   ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Elija la carpeta para instalar $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Elegir lugar de desinstalación"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Elija la carpeta desde la cual desinstalará $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Elegir lugar de desinstalaciÃ³n"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Elija la carpeta desde la cual desinstalarÃ¡ $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Instalando"
   ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Por favor espere mientras $(^NameDA) se instala."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Instalación Finalizada"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "La instalación se ha finalizado correctamente."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Instalación Abortada"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "La instalación no se terminó correctamente."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "InstalaciÃ³n Finalizada"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "La instalaciÃ³n se ha finalizado correctamente."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "InstalaciÃ³n Abortada"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "La instalaciÃ³n no se terminÃ³ correctamente."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Desinstalando"
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Por favor espere mientras $(^NameDA) se desinstala."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Desinstalación Finalizada"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "La desinstalación se ha finalizado correctamente."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Desinstalación Abortada"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "La desinstalación no se terminó correctamente."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "DesinstalaciÃ³n Finalizada"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "La desinstalaciÃ³n se ha finalizado correctamente."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "DesinstalaciÃ³n Abortada"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "La desinstalaciÃ³n no se terminÃ³ correctamente."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Finalizando el Asistente de Instalación de $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Finalizando el Asistente de InstalaciÃ³n de $(^NameDA)"
   ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) ha sido instalado en su sistema.$\r$\n$\r$\nPresione Terminar para cerrar este asistente."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Su sistema debe ser reiniciado para poder finalizar la instalación de $(^NameDA). ¿Desea reiniciar ahora?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Su sistema debe ser reiniciado para poder finalizar la instalaciÃ³n de $(^NameDA). Â¿Desea reiniciar ahora?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Completando el Asistente de Desinstalación de $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Completando el Asistente de DesinstalaciÃ³n de $(^NameDA)"
   ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) ha sido desinstalado de su sistema.$\r$\n$\r$\nPresione Terminar para cerrar este asistente."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Su computadora debe ser reiniciada para finalizar la desinstalación de $(^NameDA). ¿Desea reiniciar ahora?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Su computadora debe ser reiniciada para finalizar la desinstalaciÃ³n de $(^NameDA). Â¿Desea reiniciar ahora?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
   ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Reiniciar ahora"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Deseo reiniciar manualmente más tarde"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Deseo reiniciar manualmente mÃ¡s tarde"
   ${LangFileString} MUI_TEXT_FINISH_RUN "&Ejecutar $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Mostrar Léame"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Mostrar LÃ©ame"
   ${LangFileString} MUI_BUTTONTEXT_FINISH "&Terminar"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Elegir Carpeta del Menú Inicio"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Elija una Carpeta del Menú Inicio para los accesos directos de $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Seleccione una carpeta del Menú Inicio en la que quiera crear los accesos directos del programa. También puede introducir un nombre para crear una nueva carpeta."
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Elegir Carpeta del MenÃº Inicio"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Elija una Carpeta del MenÃº Inicio para los accesos directos de $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Seleccione una carpeta del MenÃº Inicio en la que quiera crear los accesos directos del programa. TambiÃ©n puede introducir un nombre para crear una nueva carpeta."
   ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "No crear accesos directos"
 !endif
 
@@ -114,17 +114,17 @@
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "¿Está seguro de que desea salir de la instalación de $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Â¿EstÃ¡ seguro de que desea salir de la instalaciÃ³n de $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "¿Está seguro de que desea salir de la desinstalación de $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Â¿EstÃ¡ seguro de que desea salir de la desinstalaciÃ³n de $(^Name)?"
 !endif
 
 !ifdef MULTIUSER_INSTALLMODEPAGE
   ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Elegir Usuarios"
   ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Elija los usuarios para los cuales Ud. desea instalar $(^NameDA)."
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Elija una opción si desea instalar $(^NameDA) para sólo para Ud., o para todos los usuarios de esta computadora.$(^ClickNext)"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Instación para cualquier usuario de esta computadora"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Instalación solo para mí"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Elija una opciÃ³n si desea instalar $(^NameDA) para sÃ³lo para Ud., o para todos los usuarios de esta computadora.$(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "InstaciÃ³n para cualquier usuario de esta computadora"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "InstalaciÃ³n solo para mÃ­"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Kurdish.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Kurdish.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Kurdish.nlf	(revision 2956)
@@ -1,51 +1,51 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID (none exists for Kurdish at this time)
 9999
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
--
+# Codepage - dash (-) means ASCII code page
+1254
 # RTL - anything else than RTL means LTR
 -
-# Translation by Rêzan Tovjîn(chagy) (retovjin@hotmail.com.com)
+# Translation by RÃªzan TovjÃ®n(chagy) (retovjin@hotmail.com.com)
 # ^Branding
-Nullsoft Pergala Sazkirinê %s
+Nullsoft Install System %s
 # ^SetupCaption
 $(^Name) Sazkirin
 # ^UninstallCaption
 $(^Name) Rakirin
 # ^LicenseSubCaption
-: Peymana Lîsansê
+: Peymana LÃ®sansÃª
 # ^ComponentsSubCaption
-: Vebijêrkên Sazkirinê
+: VebijÃªrkÃªn SazkirinÃª
 # ^DirSubCaption
-: Peldanka Sazkirinê
+: Peldanka SazkirinÃª
 # ^InstallingSubCaption
-: Tê Sazkirin
+: TÃª Sazkirin
 # ^CompletedSubCaption
 : Qediya
 # ^UnComponentsSubCaption
-: Vebijêrkên Rakirinê
+: VebijÃªrkÃªn RakirinÃª
 # ^UnDirSubCaption
-: Peldanka Rakirinê
+: Peldanka RakirinÃª
 # ^ConfirmSubCaption
-: Erêkirin
+: ErÃªkirin
 # ^UninstallingSubCaption
-: Tê Rakirin
+: TÃª Rakirin
 # ^UnCompletedSubCaption
 : Qediya
 # ^BackBtn
 < &Vegere
 # ^NextBtn
-&Bidomîne >
+&BidomÃ®ne >
 # ^AgreeBtn
-&Ez Dipejirînim
+&Ez DipejirÃ®nim
 # ^AcceptBtn
-Þertên Peymanê &Dipejirînim
+ÅžertÃªn PeymanÃª &DipejirÃ®nim
 # ^DontAcceptBtn
-Þertên Peymanê Napejirînim
+ÅžertÃªn PeymanÃª NapejirÃ®nim
 # ^InstallBtn
 &Saz Bike
 # ^UninstallBtn
@@ -55,136 +55,136 @@
 # ^CloseBtn
 &Bigire
 # ^BrowseBtn
-&Çavlêgerîn...
+&Ã‡avlÃªgerÃ®n...
 # ^ShowDetailsBtn
-Hûragahiyan &Nîþan Bide
+HÃ»ragahiyan &NÃ®ÅŸan Bide
 # ^ClickNext
-Ji bo berdewamê 'Bidomîne'yê bitikîne.
+Ji bo berdewamÃª 'BidomÃ®ne'yÃª bitikÃ®ne.
 # ^ClickInstall
-Ji bo destpêka sazkirinê 'Saz Bike'yê bitikîne.
+Ji bo destpÃªka sazkirinÃª 'Saz Bike'yÃª bitikÃ®ne.
 # ^ClickUninstall
-Ji bo destpêka rakirinê 'Rake' bitikîne.
+Ji bo destpÃªka rakirinÃª 'Rake' bitikÃ®ne.
 # ^Name
 nav
 # ^Completed
 Qediya
 # ^LicenseText
-Ji kerema xwe re berî tu bernameya $(^NameDA) saz bikî, çavekî li peymana lîsansê bigerîne. Heke tu hemû þertên peymanê dipejirînî, 'Ez Dipejirînim'ê bitikîne.
+Ji kerema xwe re berÃ® tu bernameya $(^NameDA) saz bikÃ®, Ã§avekÃ® li peymana lÃ®sansÃª bigerÃ®ne. Heke tu hemÃ» ÅŸertÃªn peymanÃª dipejirÃ®nÃ®, 'Ez DipejirÃ®nim'Ãª bitikÃ®ne.
 # ^LicenseTextCB
-Ji kerema xwe re berî tu bernameya $(^NameDA) saz bikî, çavekî li peymana lîsansê bigerîne. Heke tu hemû þertan dipejirînî, zeviya erêkirinê ya jêrîn dagire. $_CLICK
+Ji kerema xwe re berÃ® tu bernameya $(^NameDA) saz bikÃ®, Ã§avekÃ® li peymana lÃ®sansÃª bigerÃ®ne. Heke tu hemÃ» ÅŸertan dipejirÃ®nÃ®, zeviya erÃªkirinÃª ya jÃªrÃ®n dagire. $_CLICK
 # ^LicenseTextRB
-Ji kerema xwe re berî tu bernameya $(^NameDA) saz bikî çavekî li peymana lîsansê bigerîne. Heke tu hemû þertên peymanê dipejirînî, zeviya vebijêrkê ya jêrîn dagire. $_CLICK
+Ji kerema xwe re berÃ® tu bernameya $(^NameDA) saz bikÃ® Ã§avekÃ® li peymana lÃ®sansÃª bigerÃ®ne. Heke tu hemÃ» ÅŸertÃªn peymanÃª dipejirÃ®nÃ®, zeviya vebijÃªrkÃª ya jÃªrÃ®n dagire. $_CLICK
 # ^UnLicenseText
-Ji kerema xwe re berî tu bernameya $(^NameDA) rakî, çavekî li peymana lîsansê bigerîne. Heke tu hemû þertên peymanê dipejirînî, 'Ez Dipejirînim'ê bitikîn.
+Ji kerema xwe re berÃ® tu bernameya $(^NameDA) rakÃ®, Ã§avekÃ® li peymana lÃ®sansÃª bigerÃ®ne. Heke tu hemÃ» ÅŸertÃªn peymanÃª dipejirÃ®nÃ®, 'Ez DipejirÃ®nim'Ãª bitikÃ®n.
 # ^UnLicenseTextCB
-Ji kerema xwe re berî tu bernameya $(^NameDA) ji pergala xwe rakî, çavekî li peymana lîsansê bigerîne. Heke tu hemû þertên peymanê dipejirînî, zeviya jêrîn a erêkirinê dagire. $_CLICK
+Ji kerema xwe re berÃ® tu bernameya $(^NameDA) ji pergala xwe rakÃ®, Ã§avekÃ® li peymana lÃ®sansÃª bigerÃ®ne. Heke tu hemÃ» ÅŸertÃªn peymanÃª dipejirÃ®nÃ®, zeviya jÃªrÃ®n a erÃªkirinÃª dagire. $_CLICK
 # ^UnLicenseTextRB
-Ji kerema xwe re berî tu bernameya $(^NameDA) ji pergala xwe rakî, çavekî li peymana lîsansê bigerîne. Heke tu hemû þertên peymanê dipejirînî, zeviya vebijêrkê ya jêrîn dagire. $_CLICK
+Ji kerema xwe re berÃ® tu bernameya $(^NameDA) ji pergala xwe rakÃ®, Ã§avekÃ® li peymana lÃ®sansÃª bigerÃ®ne. Heke tu hemÃ» ÅŸertÃªn peymanÃª dipejirÃ®nÃ®, zeviya vebijÃªrkÃª ya jÃªrÃ®n dagire. $_CLICK
 # ^Custom
 Taybet
 # ^ComponentsText
-Beþên tu dixwazî saz bikî hilbijêre û niqirên 'check' beþên tu naxwazî werin sazkirin rake. $_CLICK
+BeÅŸÃªn tu dixwazÃ® saz bikÃ® hilbijÃªre Ã» niqirÃªn 'check' beÅŸÃªn tu naxwazÃ® werin sazkirin rake. $_CLICK
 # ^ComponentsSubText1
-Awayê sazkirinê hilbijêre:
+AwayÃª sazkirinÃª hilbijÃªre:
 # ^ComponentsSubText2_NoInstTypes
-Beþên dê werin sazkirin hilbijêre:
+BeÅŸÃªn dÃª werin sazkirin hilbijÃªre:
 # ^ComponentsSubText2
-an jî, beþên beþên tu dixwazî werin sazkirin hilbijêre:
+an jÃ®, beÅŸÃªn beÅŸÃªn tu dixwazÃ® werin sazkirin hilbijÃªre:
 # ^UnComponentsText
-Beþên tu dixwazî rakî hilbijêre, an jî niqira 'check'a ber beþên tu daxwazî were rakirin, rake. $_CLICK
+BeÅŸÃªn tu dixwazÃ® rakÃ® hilbijÃªre, an jÃ® niqira 'check'a ber beÅŸÃªn tu daxwazÃ® were rakirin, rake. $_CLICK
 # ^UnComponentsSubText1
-Awayê rakirinê hilbijêre:
+AwayÃª rakirinÃª hilbijÃªre:
 # ^UnComponentsSubText2_NoInstTypes
-Beþên dê werin rakirin hilbijêre:
+BeÅŸÃªn dÃª werin rakirin hilbijÃªre:
 # ^UnComponentsSubText2
-an jî beþên tu dixwazî werin rakirin hilbijêre:
+an jÃ® beÅŸÃªn tu dixwazÃ® werin rakirin hilbijÃªre:
 # ^DirText
-$(^NameDA) dê ji aliyê sazkirinê ve li peldanka jêrîn were sazkirin. Ji bo tu li peldankeke din saz bikî 'Çavlêgerîn'ê bitikîne û peldankeke din hilbijêre. $_CLICK
+$(^NameDA) dÃª ji aliyÃª sazkirinÃª ve li peldanka jÃªrÃ®n were sazkirin. Ji bo tu li peldankeke din saz bikÃ® 'Ã‡avlÃªgerÃ®n'Ãª bitikÃ®ne Ã» peldankeke din hilbijÃªre. $_CLICK
 # ^DirSubText
-Peldanka Armanckirî
+Peldanka ArmanckirÃ®
 # ^DirBrowseText
-Peldanka tu dixwazî bernameya $(^NameDA) lê were sazkirin hilbijêre:
+Peldanka tu dixwazÃ® bernameya $(^NameDA) lÃª were sazkirin hilbijÃªre:
 # ^UnDirText
-$(^NameDA) dê ji aliyê sazkirinê ve ji peldanka jêrîn were rakirin. Ji bo tu ji peldankeke cuda rakî 'Çavlêgerîn'ê bitikîne û peldankeke din hilbijêre. $_CLICK
+$(^NameDA) dÃª ji aliyÃª sazkirinÃª ve ji peldanka jÃªrÃ®n were rakirin. Ji bo tu ji peldankeke cuda rakÃ® 'Ã‡avlÃªgerÃ®n'Ãª bitikÃ®ne Ã» peldankeke din hilbijÃªre. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Peldanka tu dixwazî bernameya $(^NameDA) jê were rakirin hilbijêre:
+Peldanka tu dixwazÃ® bernameya $(^NameDA) jÃª were rakirin hilbijÃªre:
 # ^SpaceAvailable
-"Herêma vala ku dikare were bikaranîn: "
+"HerÃªma vala ku dikare were bikaranÃ®n: "
 # ^SpaceRequired
-"Herêma vala ya pêwist: "
+"HerÃªma vala ya pÃªwist: "
 # ^UninstallingText
-Bernameya $(^NameDA) dê ji peldanka jêrîn were rakirin. $_CLICK
+Bernameya $(^NameDA) dÃª ji peldanka jÃªrÃ®n were rakirin. $_CLICK
 # ^UninstallingSubText
-tê rakirin:
+tÃª rakirin:
 # ^FileError
-Dosya ji bo nivîsandinê venebû: \r\n\t"$0"\r\nJi bo destjêberdana sazkirinê abort'ê bitikîne,\r\nji bo ceribandina ji nû ve  retry'ê , an jî\r\nji bo tu dosiyê tune bihesibînî û berdewam bikî ignore'yê bitikîne
+Dosya ji bo nivÃ®sandinÃª venebÃ»: \r\n\t"$0"\r\nJi bo destjÃªberdana sazkirinÃª abort'Ãª bitikÃ®ne,\r\nji bo ceribandina ji nÃ» ve  retry'Ãª , an jÃ®\r\nji bo tu dosiyÃª tune bihesibÃ®nÃ® Ã» berdewam bikÃ® ignore'yÃª bitikÃ®ne
 # ^FileError_NoIgnore
-Dosya ji bo nivîsandinê vebenebû: \r\n\t"$0"\r\nJi bo nivîsandina ji nû ve retry'yê, an jî\r\nJi bo destjêberdana sazkirinê abort'ê hilbijêre
+Dosya ji bo nivÃ®sandinÃª vebenebÃ»: \r\n\t"$0"\r\nJi bo nivÃ®sandina ji nÃ» ve retry'yÃª, an jÃ®\r\nJi bo destjÃªberdana sazkirinÃª abort'Ãª hilbijÃªre
 # ^CantWrite
-"Nehate Nivîsandin: "
+"Nehate NivÃ®sandin: "
 # ^CopyFailed
-Çewtiya Jibergirtinê
+Ã‡ewtiya JibergirtinÃª
 # ^CopyTo
 "Ji Ber Bigire "
 # ^Registering
-"Tê Tomarkirin: "
+"TÃª Tomarkirin: "
 # ^Unregistering
-"Tomarî Tê Jêbirin: "
+"TomarÃ® TÃª JÃªbirin: "
 # ^SymbolNotFound
-"Dawêr Nehate Dîtin: "
+"DawÃªr Nehate DÃ®tin: "
 # ^CouldNotLoad
 "Nehate Barkirin: "
 # ^CreateFolder
-"Peldankê Çêke: "
+"PeldankÃª Ã‡Ãªke: "
 # ^CreateShortcut
-"Kineriyê Çêke: "
+"KineriyÃª Ã‡Ãªke: "
 # ^CreatedUninstaller
-"Sêrbazê Rakirinê Hate Çêkirin: "
+"SÃªrbazÃª RakirinÃª Hate Ã‡Ãªkirin: "
 # ^Delete
-"Dosyayê Jê Bibe: "
+"DosyayÃª JÃª Bibe: "
 # ^DeleteOnReboot
-"Dema ji nû ve dest pê kir dosiyê jê bibe: "
+"Dema ji nÃ» ve dest pÃª kir dosiyÃª jÃª bibe: "
 # ^ErrorCreatingShortcut
-"Dema çêkirina kineriyê çewtî derket: "
+"Dema Ã§Ãªkirina kineriyÃª Ã§ewtÃ® derket: "
 # ^ErrorCreating
-"Çewtiya çêkirinê: "
+"Ã‡ewtiya Ã§ÃªkirinÃª: "
 # ^ErrorDecompressing
-Di dema vekirina daneyan de çewtî derket! Sazkirina Çewt?
+Di dema vekirina daneyan de Ã§ewtÃ® derket! Sazkirina Ã‡ewt?
 # ^ErrorRegistering
-Çewtiya tomariya DLL
+Ã‡ewtiya tomariya DLL
 # ^ExecShell
-"Qalikê Xebatê: "
+"QalikÃª XebatÃª: "
 # ^Exec
-"Bixebitîne: "
+"BixebitÃ®ne: "
 # ^Extract
 "Veke: "
 # ^ErrorWriting
-"Veke: Dema li dosiyê hate nivîsîn çewtiyek derket "
+"Veke: Dema li dosiyÃª hate nivÃ®sÃ®n Ã§ewtiyek derket "
 # ^InvalidOpcode
-Sazkirina Xirabe: koda nerast pêkanînê
+Sazkirina Xirabe: koda nerast pÃªkanÃ®nÃª
 # ^NoOLE
-"OLE nehate dîtin: "
+"OLE nehate dÃ®tin: "
 # ^OutputFolder
-"Peldanka derketinê: "
+"Peldanka derketinÃª: "
 # ^RemoveFolder
-"Peldankê jê bibe: "
+"PeldankÃª jÃª bibe: "
 # ^RenameOnReboot
-"Dema ji nû hate destpêkirin ji nû ve bi nav bike: "
+"Dema ji nÃ» hate destpÃªkirin ji nÃ» ve bi nav bike: "
 # ^Rename
 "Nav Biguhere: "
 # ^Skipped
 "Hate gavkirin: "
 # ^CopyDetails
-Hûragahiyan li Pano'yê binivîse
+HÃ»ragahiyan li Pano'yÃª binivÃ®se
 # ^LogInstall
-Pêkanîna sazkirinê li lênûska rewþê binivîse
+PÃªkanÃ®na sazkirinÃª li lÃªnÃ»ska rewÅŸÃª binivÃ®se
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Malay.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Malay.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Malay.nsh	(revision 2956)
@@ -1,7 +1,7 @@
-;Language: Malay (1086)
+ï»¿;Language: Malay (1086)
 ;By muhammadazwa@yahoo.com
 
-!insertmacro LANGFILE "Malay" "Malay"
+!insertmacro LANGFILE "Malay" = "Bahasa Melayu" =
 
 !ifdef MUI_WELCOMEPAGE
   ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Assalamualaikum, Selamat datang ke $(^NameDA) Setup Wizard"
@@ -48,7 +48,7 @@
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
     ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Alihkan tetikus ke komponen untuk mengetahui penerangannya."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Alihkan tetikus ke komponen untuk mengetahui penerangannya."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Pilih komponen untuk mengetahui penerangannya."
   !endif
 !endif
 
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Spanish.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Spanish.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Spanish.nsh	(revision 2956)
@@ -1,110 +1,110 @@
-;Language: Spanish (1034)
+ï»¿;Language: Spanish (1034)
 ;By MoNKi & Joel
-;Updates & Review Darwin Rodrigo Toledo Cáceres - www.winamp-es.com - niwrad777@gmail.com
+;Updates & Review Darwin Rodrigo Toledo CÃ¡ceres - www.winamp-es.com - niwrad777@gmail.com
 
-!insertmacro LANGFILE "Spanish" "Español"
+!insertmacro LANGFILE "Spanish" = "EspaÃ±ol" "Espanol"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bienvenido al Asistente de Instalación de $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Este programa instalará $(^NameDA) en su ordenador.$\r$\n$\r$\nSe 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} MUI_TEXT_WELCOME_INFO_TITLE "Bienvenido al Asistente de InstalaciÃ³n de $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Este programa instalarÃ¡ $(^NameDA) en su ordenador.$\r$\n$\r$\nSe 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"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Bienvenido al Asistente de Desinstalación de $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Este asistente le guiará durante la desinstalación de $(^NameDA).$\r$\n$\r$\nAntes de comenzar la desinstalación, asegúrese de que $(^NameDA) no se está ejecutando.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Bienvenido al Asistente de DesinstalaciÃ³n de $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Este asistente le guiarÃ¡ durante la desinstalaciÃ³n de $(^NameDA).$\r$\n$\r$\nAntes de comenzar la desinstalaciÃ³n, asegÃºrese de que $(^NameDA) no se estÃ¡ ejecutando.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
   ${LangFileString} MUI_TEXT_LICENSE_TITLE "Acuerdo de licencia"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Por favor revise los términos de la licencia antes de instalar $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Si acepta todos los términos del acuerdo, seleccione Acepto para continuar. Debe aceptar el acuerdo para instalar $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Si acepta los términos del acuerdo, marque abajo la casilla. Debe aceptar los términos para instalar $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Si acepta los términos del acuerdo, seleccione abajo la primera opción. Debe aceptar los términos para instalar $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Por favor revise los tÃ©rminos de la licencia antes de instalar $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Si acepta todos los tÃ©rminos del acuerdo, seleccione Acepto para continuar. Debe aceptar el acuerdo para instalar $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Si acepta los tÃ©rminos del acuerdo, marque abajo la casilla. Debe aceptar los tÃ©rminos para instalar $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Si acepta los tÃ©rminos del acuerdo, seleccione abajo la primera opciÃ³n. Debe aceptar los tÃ©rminos para instalar $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
   ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Acuerdo de licencia"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Por favor revise los términos de la licencia antes de desinstalar $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Si acepta todos los términos del acuerdo, seleccione Acepto para continuar. Debe aceptar el acuerdo para desinstalar $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Si acepta los términos del acuerdo, marque abajo la casilla. Debe aceptar los términos para desinstalar $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Si acepta los términos del acuerdo, seleccione abajo la primera opción. Debe aceptar los términos para desinstalar $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Por favor revise los tÃ©rminos de la licencia antes de desinstalar $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Si acepta todos los tÃ©rminos del acuerdo, seleccione Acepto para continuar. Debe aceptar el acuerdo para desinstalar $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Si acepta los tÃ©rminos del acuerdo, marque abajo la casilla. Debe aceptar los tÃ©rminos para desinstalar $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Si acepta los tÃ©rminos del acuerdo, seleccione abajo la primera opciÃ³n. Debe aceptar los tÃ©rminos para desinstalar $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Presione Avanzar Página para ver el resto del acuerdo."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Presione Avanzar PÃ¡gina para ver el resto del acuerdo."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Selección de componentes"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Seleccione qué características de $(^NameDA) desea instalar."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "SelecciÃ³n de componentes"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Seleccione quÃ© caracterÃ­sticas de $(^NameDA) desea instalar."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Selección de componentes"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Seleccione qué características de $(^NameDA) desea desinstalar."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "SelecciÃ³n de componentes"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Seleccione quÃ© caracterÃ­sticas de $(^NameDA) desea desinstalar."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Descripción"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "DescripciÃ³n"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Sitúe el ratón encima de un componente para ver su descripción."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "SitÃºe el ratÃ³n encima de un componente para ver su descripciÃ³n."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Sitúe el ratón encima de un componente para ver su descripción."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Seleccione un componente para ver su descripciÃ³n."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Elegir lugar de instalación"
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Elegir lugar de instalaciÃ³n"
   ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Elija el directorio para instalar $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Elegir lugar de desinstalación"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Elija el directorio desde el cual se desinstalará $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Elegir lugar de desinstalaciÃ³n"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Elija el directorio desde el cual se desinstalarÃ¡ $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Instalando"
   ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Por favor espere mientras $(^NameDA) se instala."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Instalación Completada"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "La instalación se ha completado correctamente."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Instalación Anulada"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "La instalación no se completó correctamente."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "InstalaciÃ³n Completada"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "La instalaciÃ³n se ha completado correctamente."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "InstalaciÃ³n Anulada"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "La instalaciÃ³n no se completÃ³ correctamente."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Desinstalando"
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Por favor espere mientras $(^NameDA) se desinstala."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Desinstalación Completada"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "La desinstalación se ha completado correctamente."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Desinstalación Anulada"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "La desinstalación no se completó correctamente."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "DesinstalaciÃ³n Completada"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "La desinstalaciÃ³n se ha completado correctamente."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "DesinstalaciÃ³n Anulada"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "La desinstalaciÃ³n no se completÃ³ correctamente."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Completando el Asistente de Instalación de $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Completando el Asistente de InstalaciÃ³n de $(^NameDA)"
   ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) ha sido instalado en su sistema.$\r$\n$\r$\nPresione Terminar para cerrar este asistente."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Su sistema debe ser reiniciado para que pueda completarse la instalación de $(^NameDA). ¿Desea reiniciar ahora?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Su sistema debe ser reiniciado para que pueda completarse la instalaciÃ³n de $(^NameDA). Â¿Desea reiniciar ahora?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Completando el Asistente de Desinstalación de $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Completando el Asistente de DesinstalaciÃ³n de $(^NameDA)"
   ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) ha sido desinstalado de su sistema.$\r$\n$\r$\nPresione Terminar para cerrar este asistente."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Su ordenador debe ser reiniciado para completar la desinstalación de $(^NameDA). ¿Desea reiniciar ahora?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Su ordenador debe ser reiniciado para completar la desinstalaciÃ³n de $(^NameDA). Â¿Desea reiniciar ahora?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
   ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Reiniciar ahora"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Deseo reiniciar manualmente más tarde"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Deseo reiniciar manualmente mÃ¡s tarde"
   ${LangFileString} MUI_TEXT_FINISH_RUN "&Ejecutar $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Ver Léame"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Ver LÃ©ame"
   ${LangFileString} MUI_BUTTONTEXT_FINISH "&Terminar"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Elegir Carpeta del Menú Inicio"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Elija una Carpeta del Menú Inicio para los accesos directos de $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Seleccione una carpeta del Menú Inicio en la que quiera crear los accesos directos del programa. También puede introducir un nombre para crear una nueva carpeta."
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Elegir Carpeta del MenÃº Inicio"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Elija una Carpeta del MenÃº Inicio para los accesos directos de $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Seleccione una carpeta del MenÃº Inicio en la que quiera crear los accesos directos del programa. TambiÃ©n puede introducir un nombre para crear una nueva carpeta."
   ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "No crear accesos directos"
 !endif
 
@@ -114,17 +114,17 @@
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "¿Está seguro de que desea salir de la instalación de $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Â¿EstÃ¡ seguro de que desea salir de la instalaciÃ³n de $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "¿Está seguro de que desea salir de la desinstalación de $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Â¿EstÃ¡ seguro de que desea salir de la desinstalaciÃ³n de $(^Name)?"
 !endif
 
 !ifdef MULTIUSER_INSTALLMODEPAGE
   ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Elegir Usuarios"
   ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Elija los usuarios para los cuales Ud. desea instalar $(^NameDA)."
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Seleccione si desea instalar $(^NameDA) sólo para Ud. o para todos los usuarios de este Ordenador.$(^ClickNext)"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Instación para cualquier usuario de este ordenador"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Instalación solo para mí"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Seleccione si desea instalar $(^NameDA) sÃ³lo para Ud. o para todos los usuarios de este Ordenador.$(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "InstaciÃ³n para cualquier usuario de este ordenador"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "InstalaciÃ³n solo para mÃ­"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Danish.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Danish.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Danish.nsh	(revision 2956)
@@ -1,109 +1,109 @@
-;Language: Danish (1030)
-;By Claus Futtrup
+ï»¿;Language: Danish (1030)
+;By Claus Futtrup, scootergrisen
 
-!insertmacro LANGFILE "Danish" "Dansk"
+!insertmacro LANGFILE "Danish" = "Dansk" =
 
 !ifdef MUI_WELCOMEPAGE
   ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Velkommen til installationsguiden for $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Denne guide vil installere $(^NameDA) på din computer.$\r$\n$\r$\nDet anbefales, at du lukker alle kørende programmer inden start af installationsguiden. Dette vil tillade guiden at opdatere de nødvendige systemfiler uden at skulle genstarte computeren.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Denne guide hjÃ¦lper dig gennem installationen af $(^NameDA).$\r$\n$\r$\nDet anbefales, at du lukker alle kÃ¸rende programmer inden start af installationsguiden. Det gÃ¸r det muligt at opdatere de nÃ¸dvendige systemfiler uden at skulle genstarte din computer.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
   ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Velkommen til $(^NameDA) afinstallationsguiden"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Denne afinstallationsguide vil hjælpe dig gennem afinstallationen af $(^NameDA).$\r$\n$\r$\nFør start af afinstallationen skal du være sikker på at $(^NameDA) ikke kører.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Denne guide hjÃ¦lper dig gennem afinstallationen af $(^NameDA).$\r$\n$\r$\nFÃ¸r start af afinstallationen skal du vÃ¦re sikker pÃ¥ at $(^NameDA) ikke kÃ¸rer.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
   ${LangFileString} MUI_TEXT_LICENSE_TITLE "Licensaftale"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Læs venligst licensaftalen før du installerer $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Tryk 'Jeg accepterer' hvis du ønsker at accepterer alle vilkårene i aftalen og forsætte. Du skal acceptere vilkårene for at installere $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Hvis du accepterer alle vilkårene i aftalen, skal du markere afkrydsningsfeltet nedenfor. Du skal acceptere vilkårene for at installere $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Hvis du accepterer alle vilkårene i aftalen, skal du vælge den første mulighed nedenfor. Du skal acceptere vilkårene for at installere $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "LÃ¦s venligst licensaftalen fÃ¸r installationen af $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Hvis du accepterer vilkÃ¥rene i aftalen, skal du klikke pÃ¥ Jeg accepterer for at fortsÃ¦tte. Du skal acceptere aftalen for at installere $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Hvis du accepterer vilkÃ¥rene i aftalen, skal du klikke pÃ¥ afkrydsningsfeltet nedenfor. Du skal acceptere aftalen for at installere $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Hvis du accepterer vilkÃ¥rene i aftalen, skal du vÃ¦lge den fÃ¸rste valgmulighed nedenfor. Du skal acceptere aftalen for at installere $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
   ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Licensaftale"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Læs venligst licensvilkårene før afinstalleringen af $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Hvis du accepterer vilkårene for aftalen, skal du trykke 'Jeg accepterer' for at fortsætte. Du skal acceptere aftalen for at afinstallere $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Hvis du accepterer vilkårene for aftalen, skal du markere afkrydsningsfeltet nedenfor. Du skal acceptere aftalen for at afinstallere $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Hvis du accepterer vilkårene for aftalen, skal du vælge den første mulighed nedenfor. Du skal acceptere aftalen for at afinstallere $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "LÃ¦s venligst licensaftalen fÃ¸r afinstallationen af $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Hvis du accepterer vilkÃ¥rene i aftalen, skal du klikke pÃ¥ Jeg accepterer for at fortsÃ¦tte. Du skal acceptere aftalen for at afinstallere $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Hvis du accepterer vilkÃ¥rene i aftalen, skal du klikke pÃ¥ afkrydsningsfeltet nedenfor. Du skal acceptere aftalen for at afinstallere $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Hvis du accepterer vilkÃ¥rene i aftalen, skal du vÃ¦lge den fÃ¸rste valgmulighed nedenfor. Du skal acceptere aftalen for at afinstallere $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Tryk Page Down for at se resten af aftalen."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Tryk pÃ¥ Page Down for at se resten af aftalen."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Vælg komponenter"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Vælg hvilke features af $(^NameDA) du vil installere."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "VÃ¦lg komponenter"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "VÃ¦lg hvilke faciliteter af $(^NameDA) du vil installere."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Vælg komponenter"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Vælg hvilke features af $(^NameDA) du vil afinstallere."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "VÃ¦lg komponenter"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "VÃ¦lg hvilke faciliteter af $(^NameDA) du vil afinstallere."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Beskrivelse"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Placer musemarkøren over en komponent for at se beskrivelsen af komponenten."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Placer musemarkÃ¸ren over en komponent for at se dens beskrivelse."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Placer musemarkøren over en komponent for at se beskrivelsen af komponenten."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "VÃ¦lg en komponent for at se dens beskrivelse."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Vælg installationsmappe"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Vælg hvilken mappe du vil installere $(^NameDA) i."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "VÃ¦lg installationsmappe"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "VÃ¦lg den mappe hvori du vil installere $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Vælg afinstallationsmappe"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Vælg den mappe hvorfra du vil afinstallere $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "VÃ¦lg afinstallationsmappe"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "VÃ¦lg den mappe hvorfra du vil afinstallere $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Installerer"
   ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Vent venligst mens $(^NameDA) bliver installeret."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Installation gennemført"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Installationsguiden blev gennemført med succes."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Installation gennemfÃ¸rt"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Installationsguiden blev gennemfÃ¸rt."
   ${LangFileString} MUI_TEXT_ABORT_TITLE "Installation afbrudt"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Installationsguiden blev ikke gennemført."
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Installationsguiden blev ikke gennemfÃ¸rt."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Afinstallerer"
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Vent venligst mens $(^NameDA) bliver afinstalleret."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Afinstallationen er færdig"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Afinstallationen blev afsluttet med succes."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Afinstallationen er blevet afbrudt"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Afinstallationen blev ikke genmmenført."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Afinstallation gennemfÃ¸rt"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Afinstallationen blev gennemfÃ¸rt."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Afinstallation afbrudt"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Afinstallationen blev ikke gennemfÃ¸rt."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Afslutter $(^NameDA) installationsguiden"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) er blevet installeret på din computer.$\r$\n$\r$\nTryk 'Afslut' for at lukke installationsguiden."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Din computer skal genstartes før installationen af $(^NameDA) er afsluttet. Vil du genstarte nu?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "GennemfÃ¸rer $(^NameDA) installationsguiden"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) er blevet installeret pÃ¥ din computer.$\r$\n$\r$\nTryk pÃ¥ Afslut for at lukke installationsguiden."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Din computer skal genstartes for at gennemfÃ¸re installationen af $(^NameDA). Vil du genstarte nu?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Afslutter $(^NameDA) afinstallationsguiden"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) er blevet afinstalleret fra din computer.$\r$\n$\r$\nTryk 'Afslut' for at lukke denne guide."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Din computer skal genstartes for at gennemføre afinstallationen af $(^NameDA). Vil du genstarte nu?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "GennemfÃ¸rer $(^NameDA) afinstallationsguiden"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) er blevet afinstalleret fra din computer.$\r$\n$\r$\nTryk pÃ¥ Afslut for at lukke installationsguiden."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Din computer skal genstartes for at gennemfÃ¸re afinstallationen af $(^NameDA). Vil du genstarte nu?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
   ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Genstart nu"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Jeg genstarter selv på et andet tidspunkt"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "&Start $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Vis vigtig information"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Jeg genstarter selv pÃ¥ et senere tidspunkt"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&KÃ¸r $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Vis Readme"
   ${LangFileString} MUI_BUTTONTEXT_FINISH "&Afslut"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Vælg Start Menu mappe"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Vælg en Start Menu mappe til programmets genveje."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Vælg Start Menu mappen hvor du vil lave programmets genveje. Du kan også skrive et navn for at oprette en ny mappe."
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "VÃ¦lg mappe i menuen Start"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "VÃ¦lg en mappe i menuen Start til programmets genveje."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "VÃ¦lg mappe i menuen Start hvori du vil oprette programmets genveje. Du kan ogsÃ¥ skrive et navn for at oprette en ny mappe."
   ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Opret ikke genveje"
 !endif
 
@@ -113,9 +113,17 @@
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Er du sikker på, at du vil afslutte $(^Name) installationen?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Er du sikker pÃ¥, at du vil afslutte installationen af $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Er du sikker på at du vil afbryde $(^Name) afinstallationen?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Er du sikker pÃ¥, at du vil afslutte afinstallationen af $(^Name)?"
 !endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "VÃ¦lg brugere"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "VÃ¦lg de brugere som skal have installeret $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "VÃ¦lg hvorvidt du vil installere $(^NameDA) kun for dig selv eller for alle brugere pÃ¥ denne computer. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Installer for alle som bruger denne computer"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Installer kun for mig"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Uzbek.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Uzbek.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Uzbek.nlf	(revision 2956)
@@ -1,11 +1,11 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1091
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
@@ -57,7 +57,7 @@
 # ^BrowseBtn
 &Ko'rish ...
 # ^ShowDetailsBtn
-&Äåòàëè...
+&Ã„Ã¥Ã²Ã Ã«Ã¨...
 # ^ClickNext
 Davom etish uchun 'Oldinga'tugmachasini bosing.
 # ^ClickInstall
@@ -181,10 +181,10 @@
 # ^LogInstall
 O'rnatish xisobotini chiqorish
 # byte
-áàéò
+Ã¡Ã Ã©Ã²
 # kilo
- Ê
+ ÃŠ
 # mega
- Ì
+ ÃŒ
 # giga
- Ã
\ No newline at end of file
+ Ãƒ
\ No newline at end of file
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Basque.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Basque.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Basque.nlf	(revision 2956)
@@ -1,15 +1,15 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1069
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
-# Translation by Iñaki San Vicente
+# Translation by IÃ±aki San Vicente
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
@@ -151,7 +151,7 @@
 # ^ErrorCreating
 "Hutsegitea sortzerakoan: "
 # ^ErrorDecompressing
-¡Hutsegitea datuak deskomprimatzean! Instalatzailea okerra?
+Â¡Hutsegitea datuak deskomprimatzean! Instalatzailea okerra?
 # ^ErrorRegistering
 Hutsegitea DLL erregistratzerakoan
 # ^ExecShell
@@ -183,8 +183,8 @@
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Italian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Italian.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Italian.nlf	(revision 2956)
@@ -1,43 +1,43 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1040
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
 # Translation orginally started by Orfanik - http://www.orfanik.hu
 # Updated v2 to v6 by Alessandro Staltari < staltari (a) geocities.com >
-# corrected by < mdalco@gmail.com >
+# Revised by < mdalco@gmail.com > and bovirus < bovirus@gmail.com >
 # ^Branding
-Sistema di installazione Nullsoft %s
+Nullsoft Install System %s
 # ^SetupCaption
 Installazione di $(^Name)
 # ^UninstallCaption
 Disinstallazione di $(^Name)
 # ^LicenseSubCaption
-: Licenza d'uso
+: Accordo di licenza
 # ^ComponentsSubCaption
-: Opzioni di installazione
+: Opzioni installazione
 # ^DirSubCaption
-: Cartella di installazione
+: Cartella installazione
 # ^InstallingSubCaption
-: Installazione dei file
+: Installazione
 # ^CompletedSubCaption
-: Completata
+: Installazione completata
 # ^UnComponentsSubCaption
-: Opzioni di disinstallazione
+: Opzioni disinstallazione
 # ^UnDirSubCaption
-: Cartella di disinstallazione
+: Cartella disinstallazione
 # ^ConfirmSubCaption
 : Conferma
 # ^UninstallingSubCaption
-: Rimozione dei file
+: Disinstallazione
 # ^UnCompletedSubCaption
-: Completata
+: Disisntallazione completata
 # ^BackBtn
 < &Indietro
 # ^NextBtn
@@ -59,71 +59,71 @@
 # ^BrowseBtn
 S&foglia...
 # ^ShowDetailsBtn
-Mostra &dettagli
+Visualizza &dettagli
 # ^ClickNext
-Per proseguire, scegliere Avanti.
+Per proseguire, seleziona 'Avanti'.
 # ^ClickInstall
-Per avviare l'installazione, selezionare Installa.
+Per avviare l'installazione, seleziona 'Installa'.
 # ^ClickUninstall
-Per avviare la disinstallazione, selezionare Disinstalla.
+Per avviare la disinstallazione, seleziona 'Disinstalla'.
 # ^Name
 Nome
 # ^Completed
-Completata
+Installazione completata
 # ^LicenseText
-Leggere la licenza prima di procedere con l'installazione di $(^NameDA). Se si accettano le condizioni di licenza, selezionare Accetto.
+Leggi la licenza prima di procedere con l'installazione di $(^NameDA). Se accetti le condizioni della licenza, seleziona 'Accetto'.
 # ^LicenseTextCB
-Leggere la licenza prima di procedere con l'installazione di $(^NameDA). Se si accettano pienamente le condizioni di licenza, selezionare la casella sottostante. $_CLICK
+Leggi licenza prima di procedere con l'installazione di $(^NameDA). Se accetti tutte le condizioni della licenza, seleziona la casella sottostante. $_CLICK
 # ^LicesnseTextRB
-Leggere la licenza prima di procedere con l'installazione di $(^NameDA). Se si accettano pienamente le condizioni di licenza, selezionare la prima delle opzioni sottoindicate. $_CLICK
+Leggi la licenza prima di procedere con l'installazione di $(^NameDA). Se accetti tutte le condizioni della licenza, seleziona la prima delle opzioni sottoindicate. $_CLICK
 # ^UnLicenseText
-Leggere la licenza prima di procedere con la disinstallazione di $(^NameDA). Se si accettano pienamente le condizioni di licenza, selezionare Accetto. $_CLICK
+Leggi la licenza prima di procedere con la disinstallazione di $(^NameDA). Se accetti tutte le condizioni della licenza, seleziona 'Accetto'. $_CLICK
 # ^UnLicenseTextCB
-Leggere la licenza prima di procedere con la disinstallazione di $(^NameDA). Se si accettano pienamente le condizioni di licenza, selezionare la casella sottostante. $_CLICK
+Leggi la licenza prima di procedere con la disinstallazione di $(^NameDA). Se accetti tutte le condizioni della licenza, seleziona la casella sottostante. $_CLICK
 # ^UnLicesnseTextRB
-Leggere la licenza prima di procedere con la disinstallazione di $(^NameDA). Se si accettano pienamente le condizioni di licenza, selezionare la prima delle opzioni sottoindicate. $_CLICK
+Leggi la licenza prima di procedere con la disinstallazione di $(^NameDA). Se accetti tutte le condizioni della licenza, seleziona la prima delle opzioni sottoindicate. $_CLICK
 # ^Custom
 Personalizzata
 # ^ComponentsText
-Selezionare i componenti che si desidera installare.
+Seleziona componenti da installare.
 # ^ComponentsSubText1
-Selezionare il tipo d'installazione:
+Seleziona tipo installazione:
 # ^ComponentsSubText2_NoInstTypes
-Selezionare i componenti da installare:
+Seleziona componenti da installare:
 # ^ComponentsSubText2
-Oppure, selezionare i componenti opzionali che si desidera installare:
+Oppure, seleziona componenti opzionali da installare:
 # ^UnComponentsText
-Selezionare i componenti che si desidera disinstallare.
+Seleziona componenti da disinstallare.
 # ^UnComponentsSubText1
-Selezionare il tipo di disinstallazione:
+Seleziona tipo disinstallazione:
 # ^UnComponentsSubText2_NoInstTypes
-Selezionare i componenti da disinstallare:
+Seleziona componenti da disinstallare:
 # ^UnComponentsSubText2
-Oppure, selezionare i componenti opzionali che si desidera disinstallare :
+Oppure, seleziona componenti opzionali da disinstallare :
 # ^DirText
-Questa procedura installerà $(^NameDA) nella cartella seguente. Per installare in una cartella diversa, selezionare Sfoglia e sceglierne un'altra. $_CLICK
+Questa procedura installerÃ  $(^NameDA) in questa cartella.\r\nPer installare in una cartella diversa, seleziona 'Sfoglia' e scegli un'altra cartella.\r\n$_CLICK
 # ^DirSubText
-Cartella di destinazione
+Cartella destinazione
 # ^DirBrowseText
-Selezionare la cartella dove installare $(^NameDA):
+Seleziona la cartella dove installare $(^NameDA):
 # ^UnDirText
-Questa procedura disinstallerà $(^NameDA) nella cartella seguente. Per disinstallare da una cartella diversa, selezionare Sfoglia e sceglierene un'altra. $_CLICK
+Questa procedura disinstallerÃ  $(^NameDA) da questa cartella.\r\nPer disinstallare da una cartella diversa, seleziona 'Sfoglia' e scegli un'altra cartella.\r\n$_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Selezionare la cartella dalla quale disinstallare $(^NameDA):
+Seleziona la cartella dalla quale disinstallare $(^NameDA):
 # ^SpaceAvailable
 "Spazio disponibile: "
 # ^SpaceRequired
 "Spazio richiesto: "
 # ^UninstallingText
-$(^NameDA) verrà disinstallato dalla cartella seguente. $_CLICK
+$(^NameDA) verrÃ  disinstallato da questa cartella.\r\n$_CLICK
 # ^UninstallingSubText
 Rimozione da:
 # ^FileError
-Errore nell'apertura del file per la scrittura: \r\n\t"$0"\r\nSeleziona Termina per interrompere l'installazione,\r\nsu Riprova per ritentare, oppure\r\nsu Ignora per saltare questo file.
+Errore nell'apertura del file per la scrittura: \r\n\t"$0"\r\nSeleziona 'Termina' per interrompere l'installazione,\r\n'Riprova' per ritentare, oppure\r\n'Ignora' per saltare questo file.
 # ^FileError_NoIgnore
-Errore nell'apertura del file per la scrittura: \r\n\t"$0"\r\nSeleziona Riprova per ritentare, oppure\r\nsu Termina per interrompere l'installazione
+Errore nell'apertura del file per la scrittura: \r\n\t"$0"\r\nSeleziona 'Riprova' per ritentare, oppure\r\n'Termina' per interrompere l'installazione
 # ^CantWrite
 "Impossibile scrivere: "
 # ^CopyFailed
@@ -131,62 +131,62 @@
 # ^CopyTo
 "Copia in "
 # ^Registering
-"Registrazione in corso: "
+"Registrazione di: "
 # ^Unregistering
-"Deregistrazione in corso: "
+"Deregistrazione di: "
 # ^SymbolNotFound
 "Impossibile trovare il simbolo: "
 # ^CouldNotLoad
 "Impossibile caricare: "
 # ^CreateFolder
-"Crea cartella: "
+"Creazione cartella: "
 # ^CreateShortcut
-"Crea collegamento: "
+"Creazione collegamento: "
 # ^CreatedUninstaller
-"Creato il programma di disinstallazione: "
+"Creazione programma disinstallazione: "
 # ^Delete
-"Elimina file: "
+"Eliminazione file: "
 # ^DeleteOnReboot
 "Elimina al riavvio: "
 # ^ErrorCreatingShortcut
 "Errore nella creazione del collegamento: "
 # ^ErrorCreating
-"Errore nella creazione: "
+"Errore nella creazione di: "
 # ^ErrorDecompressing
-Errore nella decompressione dei dati! Programma di installazione corrotto?
+Errore nella decompressione dei dati! Probabile programma di installazione corrotto.
 # ^ErrorRegistering
 Errore nella registrazione della DLL
 # ^ExecShell
 "ExecShell: "
 # ^Exec
-"Esecuzione: "
+"Esecuzione di: "
 # ^Extract
-"Estrazione: "
+"Estrazione di: "
 # ^ErrorWriting
-"Estrazione: errore nella scrittura sul file "
+"Estrazione: errore nella scrittura nel file "
 # ^InvalidOpcode
 Programma di installazione corrotto: opcode non valido
 # ^NoOLE
 "Nessuna OLE per: "
 # ^OutputFolder 
-"Cartella di destinazione: "
+"Cartella destinazione: "
 # ^RemoveFolder
-"Rimuovi cartella: "
+"Rimozione cartella: "
 # ^RenameOnReboot
-"Rinomina al riavvio: "
+"Al riavvio rinomina: "
 # ^Rename
 Rinomina 
 # ^Skipped
 "Saltato: "
 # ^CopyDetails
-Copia i dettagli negli appunti
+Copia i dettagli negli Appunti
 # ^LogInstall
-Log del processo di installazione
+Registro eventi processo installazione
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/SerbianLatin.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/SerbianLatin.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/SerbianLatin.nsh	(revision 2956)
@@ -1,31 +1,31 @@
-;Language: Serbian Latin (2074)
-;Translation by Srðan Obuæina <obucina@srpskijezik.edu.yu>
+ï»¿;Language: Serbian Latin (2074)
+;Translation by SrÄ‘an ObuÄ‡ina <obucina@srpskijezik.edu.yu>
 
-!insertmacro LANGFILE "SerbianLatin" "Serbian Latin"
+!insertmacro LANGFILE "SerbianLatin" "Serbian (Latin)" "Srpski" =
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Dobrodošli u vodiè za instalaciju programa $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Biæete voðeni kroz proces instalacije programa $(^NameDA).$\r$\n$\r$\nPreporuèljivo je da iskljuèite sve druge programe pre poèetka instalacije. Ovo može omoguæiti ažuriranje sistemskih fajlova bez potrebe za ponovnim pokretanjem raèunara.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "DobrodoÅ¡li u vodiÄ� za instalaciju programa $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "BiÄ‡ete voÄ‘eni kroz proces instalacije programa $(^NameDA).$\r$\n$\r$\nPreporuÄ�ljivo je da iskljuÄ�ite sve druge programe pre poÄ�etka instalacije. Ovo moÅ¾e omoguÄ‡iti aÅ¾uriranje sistemskih fajlova bez potrebe za ponovnim pokretanjem raÄ�unara.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Dobrodošli u deinstalaciju programa $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Biæete voðeni kroz proces deinstalacije programa $(^NameDA).$\r$\n$\r$\nPre poèetka deinstalacije, uverite se da je program $(^NameDA) iskljuèen. $_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "DobrodoÅ¡li u deinstalaciju programa $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "BiÄ‡ete voÄ‘eni kroz proces deinstalacije programa $(^NameDA).$\r$\n$\r$\nPre poÄ�etka deinstalacije, uverite se da je program $(^NameDA) iskljuÄ�en. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Dogovor o pravu korišæenja"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Pažljivo proèitajte dogovor o pravu korišæenja pre instalacije programa $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ako prihvatate sve uslove dogovora, pritisnite dugme „Prihvatam“ za nastavak. Morate prihvatiti dogovor da biste instalirali program $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ako prihvatate sve uslove dogovora, obeležite kvadratiæ ispod. Morate prihvatiti dogovor da biste instalirali program $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Dogovor o pravu koriÅ¡Ä‡enja"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "PaÅ¾ljivo proÄ�itajte dogovor o pravu koriÅ¡Ä‡enja pre instalacije programa $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ako prihvatate sve uslove dogovora, pritisnite dugme â€žPrihvatamâ€œ za nastavak. Morate prihvatiti dogovor da biste instalirali program $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ako prihvatate sve uslove dogovora, obeleÅ¾ite kvadratiÄ‡ ispod. Morate prihvatiti dogovor da biste instalirali program $(^NameDA). $_CLICK"
   ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ako prihvatate sve uslove dogovora, izaberite prvu opciju ispod. Morate prihvatiti dogovor da biste instalirali program $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Dogovor o pravu korišæenja"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Pažlivo proèitajte dogovor o pravu korišæenja pre deinstalacije programa $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ako prihvatate sve uslove dogovora, pritisnite dugme „Prihvatam“ za nastavak. Morate prihvatiti dogovor da biste deinstalirali program $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ako prihvatate sve uslove dogovora, obeležite kvadratiæ ispod. Morate prihvatiti dogovor da biste deinstalirali program $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Dogovor o pravu koriÅ¡Ä‡enja"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "PaÅ¾livo proÄ�itajte dogovor o pravu koriÅ¡Ä‡enja pre deinstalacije programa $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ako prihvatate sve uslove dogovora, pritisnite dugme â€žPrihvatamâ€œ za nastavak. Morate prihvatiti dogovor da biste deinstalirali program $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ako prihvatate sve uslove dogovora, obeleÅ¾ite kvadratiÄ‡ ispod. Morate prihvatiti dogovor da biste deinstalirali program $(^NameDA). $_CLICK"
   ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ako prihvatate sve uslove dogovora, izaberite prvu opciju ispod. Morate prihvatiti dogovor da biste deinstalirali program $(^NameDA). $_CLICK"
 !endif
 
@@ -35,87 +35,87 @@
 
 !ifdef MUI_COMPONENTSPAGE
   ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Izbor komponenti za instalaciju"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Izaberite komponente za instalaciju. Instaliraju se samo oznaèene komponente."
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Izaberite komponente za instalaciju. Instaliraju se samo oznaÄ�ene komponente."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Izbor komponenti za deinstalaciju"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Izaberite komponente za deinstalaciju. Deinstaliraju se samo oznaèene komponente."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Izaberite komponente za deinstalaciju. Deinstaliraju se samo oznaÄ�ene komponente."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Opis"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Preðite kursorom miša preko imena komponente da biste videli njen opis."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "PreÄ‘ite kursorom miÅ¡a preko imena komponente da biste videli njen opis."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Preðite kursorom miša preko imena komponente da biste videli njen opis."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Izaberite komponentu da biste videli njen opis."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
   ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Izbor foldera za instalaciju"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Izaberite folder u koji æete instalirati program $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Izaberite folder u koji Ä‡ete instalirati program $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
   ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Izbor foldera za deinstalaciju"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Izaberite folder iz koga æete deinstalirati program $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Izaberite folder iz koga Ä‡ete deinstalirati program $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Instalacija"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Saèekajte dok se program $(^NameDA) instalira."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Završena instalacija"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Instalacija je uspešno završena."
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "SaÄ�ekajte dok se program $(^NameDA) instalira."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "ZavrÅ¡ena instalacija"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Instalacija je uspeÅ¡no zavrÅ¡ena."
   ${LangFileString} MUI_TEXT_ABORT_TITLE "Prekinuta instalacija"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Instalacija je prekinuta i nije uspešno završena."
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Instalacija je prekinuta i nije uspeÅ¡no zavrÅ¡ena."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Deinstalacija"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Saèekajte dok se program $(^NameDA) deinstalira."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Završena deinstalacija"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Deinstalacija je uspešno završena."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "SaÄ�ekajte dok se program $(^NameDA) deinstalira."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "ZavrÅ¡ena deinstalacija"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Deinstalacija je uspeÅ¡no zavrÅ¡ena."
   ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Prekinuta deinstalacija"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Deinstalacija je prekinuta i nije uspešno završena."
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Deinstalacija je prekinuta i nije uspeÅ¡no zavrÅ¡ena."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Završena instalacija programa $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Program $(^NameDA) je instaliran na raèunar.$\r$\n$\r$\nPritisnite dugme „Kraj“ za zatvaranje ovog prozora."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Raèunar mora biti ponovo pokrenut da bi se proces instalacije programa $(^NameDA) uspešno završio. Želite li to odmah da uradite?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "ZavrÅ¡ena instalacija programa $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Program $(^NameDA) je instaliran na raÄ�unar.$\r$\n$\r$\nPritisnite dugme â€žKrajâ€œ za zatvaranje ovog prozora."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "RaÄ�unar mora biti ponovo pokrenut da bi se proces instalacije programa $(^NameDA) uspeÅ¡no zavrÅ¡io. Å½elite li to odmah da uradite?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Završena deinstalacija programa $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Program $(^NameDA) je deinstaliran sa raèunara.$\r$\n$\r$\nPritisnite dugme „Kraj“ za zatvaranje ovog prozora."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Raèunar mora biti ponovo pokrenut da bi se proces deinstalacije programa $(^NameDA) uspešno završio. Želite li to da uradite odmah?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "ZavrÅ¡ena deinstalacija programa $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Program $(^NameDA) je deinstaliran sa raÄ�unara.$\r$\n$\r$\nPritisnite dugme â€žKrajâ€œ za zatvaranje ovog prozora."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "RaÄ�unar mora biti ponovo pokrenut da bi se proces deinstalacije programa $(^NameDA) uspeÅ¡no zavrÅ¡io. Å½elite li to da uradite odmah?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Odmah ponovo pokreni raèunar"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Odmah ponovo pokreni raÄ�unar"
   ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Bez ponovnog pokretanja"
   ${LangFileString} MUI_TEXT_FINISH_RUN "Pokreni program $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Prikaži ProèitajMe fajl"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "PrikaÅ¾i ProÄ�itajMe fajl"
   ${LangFileString} MUI_BUTTONTEXT_FINISH "Kraj"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
   ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Izbor foldera u Start meniju"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Izaberite folder u Start meniju u kome æete kreirati preèice."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Izaberite folder u Start meniju u kome želite da budu kreirane preèice programa. Možete upisati i ime za kreiranje novog foldera."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Bez kreiranja preèica"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Izaberite folder u Start meniju u kome Ä‡ete kreirati preÄ�ice."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Izaberite folder u Start meniju u kome Å¾elite da budu kreirane preÄ�ice programa. MoÅ¾ete upisati i ime za kreiranje novog foldera."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Bez kreiranja preÄ�ica"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
   ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Deinstalacija programa $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Deinstalacija programa $(^NameDA) sa raèunara."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Deinstalacija programa $(^NameDA) sa raÄ�unara."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Sigurno želite da prekinete instalaciju programa $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Sigurno Å¾elite da prekinete instalaciju programa $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Sigurno želite da prekinete deinstalaciju programa $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Sigurno Å¾elite da prekinete deinstalaciju programa $(^Name)?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Hungarian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Hungarian.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Hungarian.nsh	(revision 2956)
@@ -1,122 +1,122 @@
-;Language: Hungarian (1038)
+ï»¿;Language: Hungarian (1038)
 ;Translation by Jozsef Tamas Herczeg ( - 1.61-ig),
-;               Lajos Molnar (Orfanik) <orfanik@axelero.hu> ( 1.62 - tõl)
+;               Lajos Molnar (Orfanik) <orfanik@axelero.hu> ( 1.62 - tÅ‘l)
 
-!insertmacro LANGFILE "Hungarian" "Magyar"
+!insertmacro LANGFILE "Hungarian" = "Magyar" =
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Üdvözli a(z) $(^NameDA) Telepítõ Varázsló"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "A(z) $(^NameDA) telepítése következik a számítógépre.$\r$\n$\r$\nJavasoljuk, hogy indítás elõtt zárja be a futó alkalmazásokat. Így a telepítõ a rendszer újraindítása nélkül tudja frissíteni a szükséges rendszerfájlokat.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "ÃœdvÃ¶zli a(z) $(^NameDA) TelepÃ­tÅ‘ VarÃ¡zslÃ³"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "A(z) $(^NameDA) telepÃ­tÃ©se kÃ¶vetkezik a szÃ¡mÃ­tÃ³gÃ©pre.$\r$\n$\r$\nJavasoljuk, hogy indÃ­tÃ¡s elÅ‘tt zÃ¡rja be a futÃ³ alkalmazÃ¡sokat. Ã�gy a telepÃ­tÅ‘ a rendszer ÃºjraindÃ­tÃ¡sa nÃ©lkÃ¼l tudja frissÃ­teni a szÃ¼ksÃ©ges rendszerfÃ¡jlokat.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Üdvözli a(z) $(^NameDA) Eltávolító Varázsló"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ez a varázsló segíti a(z) $(^NameDA) eltávolításában.$\r$\n$\r$\nMielõtt elkezdi az eltávilítást gyõzõdjön meg arról, hogy a(z) $(^NameDA) nem fut.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "ÃœdvÃ¶zli a(z) $(^NameDA) EltÃ¡volÃ­tÃ³ VarÃ¡zslÃ³"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ez a varÃ¡zslÃ³ segÃ­ti a(z) $(^NameDA) eltÃ¡volÃ­tÃ¡sÃ¡ban.$\r$\n$\r$\nMielÅ‘tt elkezdi az eltÃ¡vilÃ­tÃ¡st gyÅ‘zÅ‘djÃ¶n meg arrÃ³l, hogy a(z) $(^NameDA) nem fut.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Licencszerzõdés"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "A(z) $(^NameDA) telepítése elõtt tekintse át a szerzõdés feltételeit."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ha elfogadja a szerzõdés valamennyi feltételét, az Elfogadom gombbal folytathatja. El kell fogadnia a(z) $(^NameDA) telepítéséhez."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Amennyiben elfogadja a feltételeket, jelölje be a jelölõnényzeten. A(z) $(^NameDA) telepítéséhez el kell fogadnia a feltételeket. $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Amennyiben elfogadja a feltételeket, válassza az elsõ opciót. A(z) $(^NameDA) telepítéséhez el kell fogadnia a feltételeket. $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "LicencszerzÅ‘dÃ©s"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "A(z) $(^NameDA) telepÃ­tÃ©se elÅ‘tt tekintse Ã¡t a szerzÅ‘dÃ©s feltÃ©teleit."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ha elfogadja a szerzÅ‘dÃ©s valamennyi feltÃ©telÃ©t, az Elfogadom gombbal folytathatja. El kell fogadnia a(z) $(^NameDA) telepÃ­tÃ©sÃ©hez."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Amennyiben elfogadja a feltÃ©teleket, jelÃ¶lje be a jelÃ¶lÅ‘nÃ©nyzeten. A(z) $(^NameDA) telepÃ­tÃ©sÃ©hez el kell fogadnia a feltÃ©teleket. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Amennyiben elfogadja a feltÃ©teleket, vÃ¡lassza az elsÅ‘ opciÃ³t. A(z) $(^NameDA) telepÃ­tÃ©sÃ©hez el kell fogadnia a feltÃ©teleket. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Licencszerzõdés"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "A(z) $(^NameDA) eltávolítása elõtt tekintse át a szerzõdés feltételeit."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ha elfogadja a szerzõdés valamennyi feltételét, az Elfogadom gombbal folytathatja. El kell fogadnia a(z) $(^NameDA) eltávolításához."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Amennyiben elfogadja a feltételeket, jelölje be a jelölõnényzeten. A(z) $(^NameDA) eltávolításához el kell fogadnia a feltételeket. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Amennyiben elfogadja a feltételeket, válassza az elsõ opciót. A(z) $(^NameDA) eltávolításához el kell fogadnia a feltételeket. $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "LicencszerzÅ‘dÃ©s"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "A(z) $(^NameDA) eltÃ¡volÃ­tÃ¡sa elÅ‘tt tekintse Ã¡t a szerzÅ‘dÃ©s feltÃ©teleit."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ha elfogadja a szerzÅ‘dÃ©s valamennyi feltÃ©telÃ©t, az Elfogadom gombbal folytathatja. El kell fogadnia a(z) $(^NameDA) eltÃ¡volÃ­tÃ¡sÃ¡hoz."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Amennyiben elfogadja a feltÃ©teleket, jelÃ¶lje be a jelÃ¶lÅ‘nÃ©nyzeten. A(z) $(^NameDA) eltÃ¡volÃ­tÃ¡sÃ¡hoz el kell fogadnia a feltÃ©teleket. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Amennyiben elfogadja a feltÃ©teleket, vÃ¡lassza az elsÅ‘ opciÃ³t. A(z) $(^NameDA) eltÃ¡volÃ­tÃ¡sÃ¡hoz el kell fogadnia a feltÃ©teleket. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "A PageDown gombbal olvashatja el a szerzõdés folytatását."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "A PageDown gombbal olvashatja el a szerzÅ‘dÃ©s folytatÃ¡sÃ¡t."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Összetevõk kiválasztása"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Válassza ki, hogy a(z) $(^NameDA) mely funkcióit kívánja telepíteni."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Ã–sszetevÅ‘k kivÃ¡lasztÃ¡sa"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "VÃ¡lassza ki, hogy a(z) $(^NameDA) mely funkciÃ³it kÃ­vÃ¡nja telepÃ­teni."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Összetevõk kiválasztása"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Válassza ki, hogy a(z) $(^NameDA) mely funkcióit kívánja eltávolítani."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Ã–sszetevÅ‘k kivÃ¡lasztÃ¡sa"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "VÃ¡lassza ki, hogy a(z) $(^NameDA) mely funkciÃ³it kÃ­vÃ¡nja eltÃ¡volÃ­tani."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Leírás"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "LeÃ­rÃ¡s"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Vigye rá az egeret az összetevõre, hogy megtekinthesse a leírását."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Vigye rÃ¡ az egeret az Ã¶sszetevÅ‘re, hogy megtekinthesse a leÃ­rÃ¡sÃ¡t."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Vigye rá az egeret az összetevõre, hogy megtekinthesse a leírását."
+    #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO 
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Telepítési hely kiválasztása"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Válassza ki a(z) $(^NameDA) telepítésének mappáját."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "TelepÃ­tÃ©si hely kivÃ¡lasztÃ¡sa"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "VÃ¡lassza ki a(z) $(^NameDA) telepÃ­tÃ©sÃ©nek mappÃ¡jÃ¡t."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Telepítési hely kiválasztása"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Válassza ki a(z) $(^NameDA) telepítésének mappáját."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "TelepÃ­tÃ©si hely kivÃ¡lasztÃ¡sa"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "VÃ¡lassza ki a(z) $(^NameDA) telepÃ­tÃ©sÃ©nek mappÃ¡jÃ¡t."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Telepítési folyamat"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Kis türelmet a(z) $(^NameDA) telepítéséig."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Telepítés befejezõdött"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "A telepítés sikeresen befejezõdött."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "A telepítés megszakadt"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "A telepítés sikertelen volt."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "TelepÃ­tÃ©si folyamat"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Kis tÃ¼relmet a(z) $(^NameDA) telepÃ­tÃ©sÃ©ig."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "TelepÃ­tÃ©s befejezÅ‘dÃ¶tt"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "A telepÃ­tÃ©s sikeresen befejezÅ‘dÃ¶tt."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "A telepÃ­tÃ©s megszakadt"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "A telepÃ­tÃ©s sikertelen volt."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Eltávolítási folyamat"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Kis türelmet a(z) $(^NameDA) eltávolításáig."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Az eltávolítás befejezõdött"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Az eltávolítás sikeresen befejezõdött."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Az eltávolítás megszakadt"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Az eltávolítás sikertelen volt."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "EltÃ¡volÃ­tÃ¡si folyamat"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Kis tÃ¼relmet a(z) $(^NameDA) eltÃ¡volÃ­tÃ¡sÃ¡ig."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Az eltÃ¡volÃ­tÃ¡s befejezÅ‘dÃ¶tt"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Az eltÃ¡volÃ­tÃ¡s sikeresen befejezÅ‘dÃ¶tt."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Az eltÃ¡volÃ­tÃ¡s megszakadt"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Az eltÃ¡volÃ­tÃ¡s sikertelen volt."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "A(z) $(^NameDA) telepítése megtörtént."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "A(z) $(^NameDA) telepítése megtörtént.$\r$\n$\r$\nA Befejezés gomb megnyomásával zárja be a varázslót."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "A(z) $(^NameDA) telepítésének befejezéséhez újra kell indítani a rendszert. Most akarja újraindítani?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "A(z) $(^NameDA) telepÃ­tÃ©se megtÃ¶rtÃ©nt."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "A(z) $(^NameDA) telepÃ­tÃ©se megtÃ¶rtÃ©nt.$\r$\n$\r$\nA BefejezÃ©s gomb megnyomÃ¡sÃ¡val zÃ¡rja be a varÃ¡zslÃ³t."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "A(z) $(^NameDA) telepÃ­tÃ©sÃ©nek befejezÃ©sÃ©hez Ãºjra kell indÃ­tani a rendszert. Most akarja ÃºjraindÃ­tani?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "A(z) $(^NameDA) eltávolítás varázslójának befejezése."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "A(z) $(^NameDA) eltávolítása sikeresen befejezõdött.$\r$\n$\r$\nA Finish-re kattintva bezárul ez a varázsló."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "A számítógépet újra kell indítani, hogy a(z) $(^NameDA) eltávolítása teljes legyen. Akarja most újraindítani a rendszert?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "A(z) $(^NameDA) eltÃ¡volÃ­tÃ¡s varÃ¡zslÃ³jÃ¡nak befejezÃ©se."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "A(z) $(^NameDA) eltÃ¡volÃ­tÃ¡sa sikeresen befejezÅ‘dÃ¶tt.$\r$\n$\r$\nA Finish-re kattintva bezÃ¡rul ez a varÃ¡zslÃ³."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "A szÃ¡mÃ­tÃ³gÃ©pet Ãºjra kell indÃ­tani, hogy a(z) $(^NameDA) eltÃ¡volÃ­tÃ¡sa teljes legyen. Akarja most ÃºjraindÃ­tani a rendszert?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Most indítom újra"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Késõbb fogom újraindítani"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "$(^NameDA) futtatása"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "OlvassEl fájl megjelenítése"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Befejezés"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Most indÃ­tom Ãºjra"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "KÃ©sÅ‘bb fogom ÃºjraindÃ­tani"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "$(^NameDA) futtatÃ¡sa"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "OlvassEl fÃ¡jl megjelenÃ­tÃ©se"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&BefejezÃ©s"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Start menü mappa kijelölése"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Start menü mappa kijelölése a program parancsikonjaihoz."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Jelöljön ki egy mappát a Start menüben, melybe a program parancsikonjait fogja elhelyezni. Beírhatja új mappa nevét is."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Nincs parancsikon elhelyezés"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Start menÃ¼ mappa kijelÃ¶lÃ©se"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Start menÃ¼ mappa kijelÃ¶lÃ©se a program parancsikonjaihoz."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "JelÃ¶ljÃ¶n ki egy mappÃ¡t a Start menÃ¼ben, melybe a program parancsikonjait fogja elhelyezni. BeÃ­rhatja Ãºj mappa nevÃ©t is."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Nincs parancsikon elhelyezÃ©s"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "A(z) $(^NameDA) Eltávolítása."
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "A(z) $(^NameDA) eltávolítása következik a számítógéprõl."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "A(z) $(^NameDA) EltÃ¡volÃ­tÃ¡sa."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "A(z) $(^NameDA) eltÃ¡volÃ­tÃ¡sa kÃ¶vetkezik a szÃ¡mÃ­tÃ³gÃ©prÅ‘l."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Biztos, hogy ki akar lépni a(z) $(^Name) Telepítõbõl?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Biztos, hogy ki akar lÃ©pni a(z) $(^Name) TelepÃ­tÅ‘bÅ‘l?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Biztos, hogy ki akar lépni a(z) $(^Name) Eltávolítóból?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Biztos, hogy ki akar lÃ©pni a(z) $(^Name) EltÃ¡volÃ­tÃ³bÃ³l?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Thai.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Thai.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Thai.nlf	(revision 2956)
@@ -1,4 +1,4 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Start editing here
 # Language ID
@@ -6,7 +6,7 @@
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 874
 # RTL - anything else than RTL means LTR
 -
@@ -14,178 +14,178 @@
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-$(^Name) µÔ´µÑé§
+$(^Name) à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡
 # ^UninstallCaption
-$(^Name) Â¡àÅÔ¡¡ÒÃµÔ´µÑé§
+$(^Name) à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡
 # ^LicenseSubCaption
-: ¢éÍµ¡Å§àÃ×èÍ§ÅÔ¢ÊÔ·¸Ôì
+: à¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¹€à¸£à¸·à¹ˆà¸­à¸‡à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œ
 # ^ComponentsSubCaption
-: µÑÇàÅ×Í¡¡ÒÃµÔ´µÑé§
+: à¸•à¸±à¸§à¹€à¸¥à¸·à¸­à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡
 # ^DirSubCaption
-: á¿éÁ·ÕèµÔ´µÑé§
+: à¹�à¸Ÿà¹‰à¸¡à¸—à¸µà¹ˆà¸•à¸´à¸”à¸•à¸±à¹‰à¸‡
 # ^InstallingSubCaption
-: ¡ÓÅÑ§µÔ´µÑé§
+: à¸�à¸³à¸¥à¸±à¸‡à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡
 # ^CompletedSubCaption
-: àÊÃç¨ÊÔé¹
+: à¹€à¸ªà¸£à¹‡à¸ˆà¸ªà¸´à¹‰à¸™
 # ^UnComponentsSubCaption
-: µÑÇàÅ×Í¡Â¡àÅÔ¡¡ÒÃµÔ´µÑé§
+: à¸•à¸±à¸§à¹€à¸¥à¸·à¸­à¸�à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡
 # ^UnDirSubCaption
-: á¿éÁ·ÕèÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§
+: à¹�à¸Ÿà¹‰à¸¡à¸—à¸µà¹ˆà¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡
 # ^ConfirmSubCaption
-: Â×¹ÂÑ¹
+: à¸¢à¸·à¸™à¸¢à¸±à¸™
 # ^UninstallingSubCaption
-: ¡ÓÅÑ§Â¡àÅÔ¡¡ÒÃµÔ´µÑé§
+: à¸�à¸³à¸¥à¸±à¸‡à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡
 # ^UnCompletedSubCaption
-: àÊÃç¨ÊÔé¹
+: à¹€à¸ªà¸£à¹‡à¸ˆà¸ªà¸´à¹‰à¸™
 # ^BackBtn
-< &¡ÅÑºä»
+< &à¸�à¸¥à¸±à¸šà¹„à¸›
 # ^NextBtn
-&µèÍä» >
+&à¸•à¹ˆà¸­à¹„à¸› >
 # ^AgreeBtn
-&µ¡Å§
+&à¸•à¸�à¸¥à¸‡
 # ^AcceptBtn
-&µ¡Å§ÂÍÁÃÑº¢éÍµèÒ§æã¹ËÑÇ¢éÍÅÔ¢ÊÔ·¸Ôì 
+&à¸•à¸�à¸¥à¸‡à¸¢à¸­à¸¡à¸£à¸±à¸šà¸‚à¹‰à¸­à¸•à¹ˆà¸²à¸‡à¹†à¹ƒà¸™à¸«à¸±à¸§à¸‚à¹‰à¸­à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œ 
 # ^DontAcceptBtn
-&äÁèÂÍÁÃÑº¢éÍµèÒ§æã¹ËÑÇ¢éÍÅÔ¢ÊÔ·¸Ôì
+&à¹„à¸¡à¹ˆà¸¢à¸­à¸¡à¸£à¸±à¸šà¸‚à¹‰à¸­à¸•à¹ˆà¸²à¸‡à¹†à¹ƒà¸™à¸«à¸±à¸§à¸‚à¹‰à¸­à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œ
 # ^InstallBtn
-&µÔ´µÑé§
+&à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡
 # ^UninstallBtn
-&Â¡àÅÔ¡¡ÒÃµÔ´µÑé§
+&à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡
 # ^CancelBtn
-Â¡àÅÔ¡
+à¸¢à¸�à¹€à¸¥à¸´à¸�
 # ^CloseBtn
-&»Ô´
+&à¸›à¸´à¸”
 # ^BrowseBtn
-à&ÃÕÂ¡´Ù...
+à¹€&à¸£à¸µà¸¢à¸�à¸”à¸¹...
 # ^ShowDetailsBtn
-&ÃÒÂÅÐàÍÕÂ´
+&à¸£à¸²à¸¢à¸¥à¸°à¹€à¸­à¸µà¸¢à¸”
 # ^ClickNext
-¡´ µèÍä» à¾×èÍàÃÔèÁÃÐººÍÑµÔâ¹ÁÑµÔ
+à¸�à¸” à¸•à¹ˆà¸­à¹„à¸› à¹€à¸žà¸·à¹ˆà¸­à¹€à¸£à¸´à¹ˆà¸¡à¸£à¸°à¸šà¸šà¸­à¸±à¸•à¸´à¹‚à¸™à¸¡à¸±à¸•à¸´
 # ^ClickInstall
-¡´  µÔ´µÑé§ à¾×èÍ·Ó¡ÒÃµÔ´µÑé§
+à¸�à¸”  à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ à¹€à¸žà¸·à¹ˆà¸­à¸—à¸³à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡
 # ^ClickUninstall
-¡´  Â¡àÅÔ¡¡ÒÃµÔ´µÑé§ à¾×èÍÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§
+à¸�à¸”  à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ à¹€à¸žà¸·à¹ˆà¸­à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡
 # ^Name
-ª×èÍ
+à¸Šà¸·à¹ˆà¸­
 # ^Completed
-àÊÃç¨ÊÔé¹áÅéÇ
+à¹€à¸ªà¸£à¹‡à¸ˆà¸ªà¸´à¹‰à¸™à¹�à¸¥à¹‰à¸§
 # ^LicenseText
-â»Ã´ÍèÒ¹·Ç¹àÃ×èÍ§¡ÒÃÂÍÁÃÑºã¹ÅÔ¢ÊÔ·¸Ôì¡èÍ¹·Õè¤Ø³¨Ð·Ó¡ÒÃµÔ´µÑé§ $(^NameDA). ¶éÒ¤Ø³ÂÍÁÃÑº¢éÍµ¡Å§ã¹·Ø¡æ´éÒ¹, ¡´ ©Ñ¹ÂÍÁÃÑº
+à¹‚à¸›à¸£à¸”à¸­à¹ˆà¸²à¸™à¸—à¸§à¸™à¹€à¸£à¸·à¹ˆà¸­à¸‡à¸�à¸²à¸£à¸¢à¸­à¸¡à¸£à¸±à¸šà¹ƒà¸™à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œà¸�à¹ˆà¸­à¸™à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸ˆà¸°à¸—à¸³à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $(^NameDA). à¸–à¹‰à¸²à¸„à¸¸à¸“à¸¢à¸­à¸¡à¸£à¸±à¸šà¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¹ƒà¸™à¸—à¸¸à¸�à¹†à¸”à¹‰à¸²à¸™, à¸�à¸” à¸‰à¸±à¸™à¸¢à¸­à¸¡à¸£à¸±à¸š
 # ^LicenseTextCB
-â»Ã´ÍèÒ¹·Ç¹àÃ×èÍ§¡ÒÃÂÍÁÃÑºã¹ÅÔ¢ÊÔ·¸Ôì¡èÍ¹·Õè¤Ø³¨Ð·Ó¡ÒÃµÔ´µÑé§ $(^NameDA). ¶éÒ¤Ø³ÂÍÁÃÑº¢éÍµ¡Å§ã¹·Ø¡æ´éÒ¹, ¡´àÅ×Í¡·Õè¡ÅèÍ§´éÒ¹ÅèÒ§. $_CLICK
+à¹‚à¸›à¸£à¸”à¸­à¹ˆà¸²à¸™à¸—à¸§à¸™à¹€à¸£à¸·à¹ˆà¸­à¸‡à¸�à¸²à¸£à¸¢à¸­à¸¡à¸£à¸±à¸šà¹ƒà¸™à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œà¸�à¹ˆà¸­à¸™à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸ˆà¸°à¸—à¸³à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $(^NameDA). à¸–à¹‰à¸²à¸„à¸¸à¸“à¸¢à¸­à¸¡à¸£à¸±à¸šà¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¹ƒà¸™à¸—à¸¸à¸�à¹†à¸”à¹‰à¸²à¸™, à¸�à¸”à¹€à¸¥à¸·à¸­à¸�à¸—à¸µà¹ˆà¸�à¸¥à¹ˆà¸­à¸‡à¸”à¹‰à¸²à¸™à¸¥à¹ˆà¸²à¸‡. $_CLICK
 # ^LicenseTextRB
-â»Ã´ÍèÒ¹·Ç¹àÃ×èÍ§¡ÒÃÂÍÁÃÑºã¹ÅÔ¢ÊÔ·¸Ôì¡èÍ¹·Õè¤Ø³¨Ð·Ó¡ÒÃµÔ´µÑé§ $(^NameDA). ¶éÒ¤Ø³ÂÍÁÃÑº¢éÍµ¡Å§ã¹·Ø¡æ´éÒ¹, àÅ×Í¡µÑÇàÅ×Í¡áÃ¡¢éÒ§ÅèÒ§. $_CLICK
+à¹‚à¸›à¸£à¸”à¸­à¹ˆà¸²à¸™à¸—à¸§à¸™à¹€à¸£à¸·à¹ˆà¸­à¸‡à¸�à¸²à¸£à¸¢à¸­à¸¡à¸£à¸±à¸šà¹ƒà¸™à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œà¸�à¹ˆà¸­à¸™à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸ˆà¸°à¸—à¸³à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $(^NameDA). à¸–à¹‰à¸²à¸„à¸¸à¸“à¸¢à¸­à¸¡à¸£à¸±à¸šà¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¹ƒà¸™à¸—à¸¸à¸�à¹†à¸”à¹‰à¸²à¸™, à¹€à¸¥à¸·à¸­à¸�à¸•à¸±à¸§à¹€à¸¥à¸·à¸­à¸�à¹�à¸£à¸�à¸‚à¹‰à¸²à¸‡à¸¥à¹ˆà¸²à¸‡. $_CLICK
 # ^UnLicenseText
-â»Ã´ÍèÒ¹·Ç¹àÃ×èÍ§¡ÒÃÂÍÁÃÑºã¹ÅÔ¢ÊÔ·¸Ôì¡èÍ¹·Õè¤Ø³¨Ð·Ó¡ÒÃÂ¡àÅÔ¡µÔ´µÑé§ $(^NameDA). ¶éÒ¤Ø³ÂÍÁÃÑº¢éÍµ¡Å§ã¹·Ø¡æ´éÒ¹, ¡´ ©Ñ¹ÂÍÁÃÑº
+à¹‚à¸›à¸£à¸”à¸­à¹ˆà¸²à¸™à¸—à¸§à¸™à¹€à¸£à¸·à¹ˆà¸­à¸‡à¸�à¸²à¸£à¸¢à¸­à¸¡à¸£à¸±à¸šà¹ƒà¸™à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œà¸�à¹ˆà¸­à¸™à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸ˆà¸°à¸—à¸³à¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $(^NameDA). à¸–à¹‰à¸²à¸„à¸¸à¸“à¸¢à¸­à¸¡à¸£à¸±à¸šà¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¹ƒà¸™à¸—à¸¸à¸�à¹†à¸”à¹‰à¸²à¸™, à¸�à¸” à¸‰à¸±à¸™à¸¢à¸­à¸¡à¸£à¸±à¸š
 # ^UnLicenseTextCB
-â»Ã´ÍèÒ¹·Ç¹àÃ×èÍ§¡ÒÃÂÍÁÃÑºã¹ÅÔ¢ÊÔ·¸Ôì¡èÍ¹·Õè¤Ø³¨Ð·Ó¡ÒÃÂ¡àÅÔ¡µÔ´µÑé§ $(^NameDA). ¶éÒ¤Ø³ÂÍÁÃÑº¢éÍµ¡Å§ã¹·Ø¡æ´éÒ¹, ¡´àÅ×Í¡·Õè¡ÅèÍ§´éÒ¹ÅèÒ§. $_CLICK
+à¹‚à¸›à¸£à¸”à¸­à¹ˆà¸²à¸™à¸—à¸§à¸™à¹€à¸£à¸·à¹ˆà¸­à¸‡à¸�à¸²à¸£à¸¢à¸­à¸¡à¸£à¸±à¸šà¹ƒà¸™à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œà¸�à¹ˆà¸­à¸™à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸ˆà¸°à¸—à¸³à¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $(^NameDA). à¸–à¹‰à¸²à¸„à¸¸à¸“à¸¢à¸­à¸¡à¸£à¸±à¸šà¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¹ƒà¸™à¸—à¸¸à¸�à¹†à¸”à¹‰à¸²à¸™, à¸�à¸”à¹€à¸¥à¸·à¸­à¸�à¸—à¸µà¹ˆà¸�à¸¥à¹ˆà¸­à¸‡à¸”à¹‰à¸²à¸™à¸¥à¹ˆà¸²à¸‡. $_CLICK
 # ^UnLicenseTextRB
-â»Ã´ÍèÒ¹·Ç¹àÃ×èÍ§¡ÒÃÂÍÁÃÑºã¹ÅÔ¢ÊÔ·¸Ôì¡èÍ¹·Õè¤Ø³¨Ð·Ó¡ÒÃÂ¡àÅÔ¡µÔ´µÑé§ $(^NameDA). ¶éÒ¤Ø³ÂÍÁÃÑº¢éÍµ¡Å§ã¹·Ø¡æ´éÒ¹, àÅ×Í¡µÑÇàÅ×Í¡áÃ¡¢éÒ§ÅèÒ§. $_CLICK
+à¹‚à¸›à¸£à¸”à¸­à¹ˆà¸²à¸™à¸—à¸§à¸™à¹€à¸£à¸·à¹ˆà¸­à¸‡à¸�à¸²à¸£à¸¢à¸­à¸¡à¸£à¸±à¸šà¹ƒà¸™à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œà¸�à¹ˆà¸­à¸™à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸ˆà¸°à¸—à¸³à¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $(^NameDA). à¸–à¹‰à¸²à¸„à¸¸à¸“à¸¢à¸­à¸¡à¸£à¸±à¸šà¸‚à¹‰à¸­à¸•à¸�à¸¥à¸‡à¹ƒà¸™à¸—à¸¸à¸�à¹†à¸”à¹‰à¸²à¸™, à¹€à¸¥à¸·à¸­à¸�à¸•à¸±à¸§à¹€à¸¥à¸·à¸­à¸�à¹�à¸£à¸�à¸‚à¹‰à¸²à¸‡à¸¥à¹ˆà¸²à¸‡. $_CLICK
 # ^Custom
-¡ÓË¹´àÍ§
+à¸�à¸³à¸«à¸™à¸”à¹€à¸­à¸‡
 # ^ComponentsText
-àÅ×èÍ¡ÊÔè§·Õè¤Ø³µéÍ§¡ÒÃµÔ´µÑé§áÅÐäÁèàÅ×Í¡ÊÔè§·Õè¤Ø³äÁèµéÍ§¡ÒÃµÔ´µÑé§ $_CLICK
+à¹€à¸¥à¸·à¹ˆà¸­à¸�à¸ªà¸´à¹ˆà¸‡à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹�à¸¥à¸°à¹„à¸¡à¹ˆà¹€à¸¥à¸·à¸­à¸�à¸ªà¸´à¹ˆà¸‡à¸—à¸µà¹ˆà¸„à¸¸à¸“à¹„à¸¡à¹ˆà¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $_CLICK
 # ^ComponentsSubText1
-àÅ×Í¡ÇÔ¸Õ¡ÒÃ¡ÒÃµÔ´µÑé§:
+à¹€à¸¥à¸·à¸­à¸�à¸§à¸´à¸˜à¸µà¸�à¸²à¸£à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡:
 # ^ComponentsSubText2_NoInstTypes
-àÅ×Í¡ÊÔè§·Õè¤Ø³µéÍ§¡ÒÃµÔ´µÑé§:
+à¹€à¸¥à¸·à¸­à¸�à¸ªà¸´à¹ˆà¸‡à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡:
 # ^ComponentsSubText2
-ËÃ×Í, àÅ×Í¡µÑÇàÅ×Í¡·Õè¤Ø³µéÍ§¡ÒÃµÔ´µÑé§:
+à¸«à¸£à¸·à¸­, à¹€à¸¥à¸·à¸­à¸�à¸•à¸±à¸§à¹€à¸¥à¸·à¸­à¸�à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡:
 # ^UnComponentsText
-àÅ×Í¡µÑÇàÅ×Í¡·Õè¤Ø³µéÍ§¡ÒÃ¨ÐÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§áÅÐäÁèàÅ×Í¡ÊÔè§·Õè¤Ø³äÁèµéÍ§¡ÒÃ¨ÐÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§ $_CLICK
+à¹€à¸¥à¸·à¸­à¸�à¸•à¸±à¸§à¹€à¸¥à¸·à¸­à¸�à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸ˆà¸°à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹�à¸¥à¸°à¹„à¸¡à¹ˆà¹€à¸¥à¸·à¸­à¸�à¸ªà¸´à¹ˆà¸‡à¸—à¸µà¹ˆà¸„à¸¸à¸“à¹„à¸¡à¹ˆà¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸ˆà¸°à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $_CLICK
 # ^UnComponentsSubText1
-àÅ×Í¡ÇÔ¸Õ¡ÒÃÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§:
+à¹€à¸¥à¸·à¸­à¸�à¸§à¸´à¸˜à¸µà¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡:
 # ^UnComponentsSubText2_NoInstTypes
-àÅ×Í¡µÑÇàÅ×Í¡·ÕèµéÍ§¡ÒÃ¨ÐÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§:
+à¹€à¸¥à¸·à¸­à¸�à¸•à¸±à¸§à¹€à¸¥à¸·à¸­à¸�à¸—à¸µà¹ˆà¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸ˆà¸°à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡:
 # ^UnComponentsSubText2
-ËÃ×Í, àÅ×Í¡¨Ò¡µÑÇàÅ×Í¡Í×è¹æ·Õè¤Ø³µéÍ§¡ÒÃ¨ÐÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§:
+à¸«à¸£à¸·à¸­, à¹€à¸¥à¸·à¸­à¸�à¸ˆà¸²à¸�à¸•à¸±à¸§à¹€à¸¥à¸·à¸­à¸�à¸­à¸·à¹ˆà¸™à¹†à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸ˆà¸°à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡:
 # ^DirText
-µÑÇµÔ´µÑé§¨Ð·Ó¡ÒÃµÔ´µÑé§ $(^NameDA) Å§ã¹á¿éÁ´Ñ§µèÍä»¹Õé, ¶éÒµéÍ§¡ÒÃµÔ´µÑé§Å§ã¹á¿éÁÍ×è¹, ¡´ àÃÕÂ¡´ÙáÅÐàÅ×Í¡á¿éÁÍ×è¹ $_CLICK
+à¸•à¸±à¸§à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸ˆà¸°à¸—à¸³à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $(^NameDA) à¸¥à¸‡à¹ƒà¸™à¹�à¸Ÿà¹‰à¸¡à¸”à¸±à¸‡à¸•à¹ˆà¸­à¹„à¸›à¸™à¸µà¹‰, à¸–à¹‰à¸²à¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸¥à¸‡à¹ƒà¸™à¹�à¸Ÿà¹‰à¸¡à¸­à¸·à¹ˆà¸™, à¸�à¸” à¹€à¸£à¸µà¸¢à¸�à¸”à¸¹à¹�à¸¥à¸°à¹€à¸¥à¸·à¸­à¸�à¹�à¸Ÿà¹‰à¸¡à¸­à¸·à¹ˆà¸™ $_CLICK
 # ^DirSubText
-á¿éÁ·ÕèµéÍ§¡ÒÃµÔ´µÑé§
+à¹�à¸Ÿà¹‰à¸¡à¸—à¸µà¹ˆà¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡
 # ^DirBrowseText
-àÅ×Í¡á¿éÁ·ÕèµéÍ§¡ÒÃµÔ´µÑé§ $(^NameDA) ã¹:
+à¹€à¸¥à¸·à¸­à¸�à¹�à¸Ÿà¹‰à¸¡à¸—à¸µà¹ˆà¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $(^NameDA) à¹ƒà¸™:
 # ^UnDirText
-µÑÇµÔ´µÑé§¨Ð·Ó¡ÒÃÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§ $(^NameDA) ¨Ò¡á¿éÁ´Ñ§µèÍä»¹Õé, ¶éÒµéÍ§¡ÒÃÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§¨Ò¡á¿éÁÍ×è¹, ¡´ àÃÕÂ¡´Ù áÅÐàÅ×Í¡á¿éÁÍ×è¹ $_CLICK
+à¸•à¸±à¸§à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸ˆà¸°à¸—à¸³à¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $(^NameDA) à¸ˆà¸²à¸�à¹�à¸Ÿà¹‰à¸¡à¸”à¸±à¸‡à¸•à¹ˆà¸­à¹„à¸›à¸™à¸µà¹‰, à¸–à¹‰à¸²à¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸ˆà¸²à¸�à¹�à¸Ÿà¹‰à¸¡à¸­à¸·à¹ˆà¸™, à¸�à¸” à¹€à¸£à¸µà¸¢à¸�à¸”à¸¹ à¹�à¸¥à¸°à¹€à¸¥à¸·à¸­à¸�à¹�à¸Ÿà¹‰à¸¡à¸­à¸·à¹ˆà¸™ $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-àÅ×Í¡á¿éÁ·ÕèµéÍ§¡ÒÃÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§ $(^NameDA) ¨Ò¡:
+à¹€à¸¥à¸·à¸­à¸�à¹�à¸Ÿà¹‰à¸¡à¸—à¸µà¹ˆà¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ $(^NameDA) à¸ˆà¸²à¸�:
 # ^SpaceAvailable
-"ÁÕ¾×é¹·ÕèàËÅ×Í: "
+"à¸¡à¸µà¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¹€à¸«à¸¥à¸·à¸­: "
 # ^SpaceRequired
-"µéÍ§¡ÒÃ¾×é¹·Õè: "
+"à¸•à¹‰à¸­à¸‡à¸�à¸²à¸£à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆ: "
 # ^UninstallingText
-$(^NameDA) ¨Ð¶Ù¡Â¡àÅÔ¡¡ÒÃµÔ´µÑé§¨Ò¡á¿éÁµèÍä»¹Õé. $_CLICK
+$(^NameDA) à¸ˆà¸°à¸–à¸¹à¸�à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸ˆà¸²à¸�à¹�à¸Ÿà¹‰à¸¡à¸•à¹ˆà¸­à¹„à¸›à¸™à¸µà¹‰. $_CLICK
 # ^UninstallingSubText
-Â¡àÅÔ¡¡ÒÃµÔ´µÑé§¨Ò¡:
+à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸ˆà¸²à¸�:
 # ^FileError
-äÁèÊÒÁÒÃ¶à»Ô´ä¿ÅìÊÓËÃÑºà¢ÕÂ¹ä´é: \r\n\r\n$0\r\n\r\n¡´ Â¡àÅÔ¡ à¾×èÍËÂØ´¡ÒÃµÔ´µÑé§,\r\nÅÍ§ÍÕ¡¤ÃÑé§ à¾×èÍÅÍ§ÍÕ¡¤ÃÑé§, ËÃ×Í\r\nà¾Ô¡à©Â à¾×èÍ¢éÒÁä¿Åì¹Õé.
+à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸›à¸´à¸”à¹„à¸Ÿà¸¥à¹Œà¸ªà¸³à¸«à¸£à¸±à¸šà¹€à¸‚à¸µà¸¢à¸™à¹„à¸”à¹‰: \r\n\r\n$0\r\n\r\nà¸�à¸” à¸¢à¸�à¹€à¸¥à¸´à¸� à¹€à¸žà¸·à¹ˆà¸­à¸«à¸¢à¸¸à¸”à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡,\r\nà¸¥à¸­à¸‡à¸­à¸µà¸�à¸„à¸£à¸±à¹‰à¸‡ à¹€à¸žà¸·à¹ˆà¸­à¸¥à¸­à¸‡à¸­à¸µà¸�à¸„à¸£à¸±à¹‰à¸‡, à¸«à¸£à¸·à¸­\r\nà¹€à¸žà¸´à¸�à¹€à¸‰à¸¢ à¹€à¸žà¸·à¹ˆà¸­à¸‚à¹‰à¸²à¸¡à¹„à¸Ÿà¸¥à¹Œà¸™à¸µà¹‰.
 # ^FileError_NoIgnore
-äÁèÊÒÁÒÃ¶à»Ô´ä¿ÅìÊÓËÃÑºà¢ÕÂ¹ä´é: \r\n\r\n$0\r\n\r\n¡´ ÅÍ§ÍÕ¡¤ÃÑé§ à¾×èÍÅÍ§ÍÕ¡¤ÃÑé§, ËÃ×Í\r\nÂ¡àÅÔ¡à¾×èÍËÂØ´¡ÒÃµÔ´µÑé§
+à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸›à¸´à¸”à¹„à¸Ÿà¸¥à¹Œà¸ªà¸³à¸«à¸£à¸±à¸šà¹€à¸‚à¸µà¸¢à¸™à¹„à¸”à¹‰: \r\n\r\n$0\r\n\r\nà¸�à¸” à¸¥à¸­à¸‡à¸­à¸µà¸�à¸„à¸£à¸±à¹‰à¸‡ à¹€à¸žà¸·à¹ˆà¸­à¸¥à¸­à¸‡à¸­à¸µà¸�à¸„à¸£à¸±à¹‰à¸‡, à¸«à¸£à¸·à¸­\r\nà¸¢à¸�à¹€à¸¥à¸´à¸�à¹€à¸žà¸·à¹ˆà¸­à¸«à¸¢à¸¸à¸”à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡
 # ^CantWrite
-"äÁèÊÒÁÒÃ¶à¢ÕÂ¹: "
+"à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸‚à¸µà¸¢à¸™: "
 # ^CopyFailed
-¤Ñ´ÅÍ¡¼Ô´¾ÅÒ´
+à¸„à¸±à¸”à¸¥à¸­à¸�à¸œà¸´à¸”à¸žà¸¥à¸²à¸”
 # ^CopyTo
-"¤Ñ´ÅÍ¡ä»ÂÑ§ "
+"à¸„à¸±à¸”à¸¥à¸­à¸�à¹„à¸›à¸¢à¸±à¸‡ "
 # ^Registering
-"¡ÓÅÑ§Å§·ÐàºÕÂ¹: "
+"à¸�à¸³à¸¥à¸±à¸‡à¸¥à¸‡à¸—à¸°à¹€à¸šà¸µà¸¢à¸™: "
 # ^Unregistering
-"Â¡àÅÔ¡¡ÒÃÅ§·ÐàºÕÂ¹: "
+"à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸¥à¸‡à¸—à¸°à¹€à¸šà¸µà¸¢à¸™: "
 # ^SymbolNotFound
-"äÁèÊÒÁÒÃ¶ËÒÊÑ­ÅÑ¡É³ìä´é: "
+"à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸«à¸²à¸ªà¸±à¸�à¸¥à¸±à¸�à¸©à¸“à¹Œà¹„à¸”à¹‰: "
 # ^CouldNotLoad
-"äÁèÊÒÁÒÃ¶âËÅ´ä´é: "
+"à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹‚à¸«à¸¥à¸”à¹„à¸”à¹‰: "
 # ^CreateFolder
-"ÊÃéÒ§á¿éÁ: "
+"à¸ªà¸£à¹‰à¸²à¸‡à¹�à¸Ÿà¹‰à¸¡: "
 # ^CreateShortcut
-"ÊÃéÒ§ªÍÃìµ¤Ñ·: "
+"à¸ªà¸£à¹‰à¸²à¸‡à¸Šà¸­à¸£à¹Œà¸•à¸„à¸±à¸—: "
 # ^CreatedUninstaller
-"ÊÃéÒ§µÑÇÂ¡àÅÔ¡¡ÒÃµÔ´µÑé§: "
+"à¸ªà¸£à¹‰à¸²à¸‡à¸•à¸±à¸§à¸¢à¸�à¹€à¸¥à¸´à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡: "
 # ^Delete
-"Åºä¿Åì: "
+"à¸¥à¸šà¹„à¸Ÿà¸¥à¹Œ: "
 # ^DeleteOnReboot
-"ÅºµÍ¹ÃÕºÙ·: "
+"à¸¥à¸šà¸•à¸­à¸™à¸£à¸µà¸šà¸¹à¸—: "
 # ^ErrorCreatingShortcut
-"ÁÕ»Ñ­ËÒÊÃéÒ§ä¿ÅìªÍÃìµ¤Ñ·: "
+"à¸¡à¸µà¸›à¸±à¸�à¸«à¸²à¸ªà¸£à¹‰à¸²à¸‡à¹„à¸Ÿà¸¥à¹Œà¸Šà¸­à¸£à¹Œà¸•à¸„à¸±à¸—: "
 # ^ErrorCreating
-"ÁÕ»Ñ­ËÒã¹¡ÒÃÊÃéÒ§ä¿Åì: "
+"à¸¡à¸µà¸›à¸±à¸�à¸«à¸²à¹ƒà¸™à¸�à¸²à¸£à¸ªà¸£à¹‰à¸²à¸‡à¹„à¸Ÿà¸¥à¹Œ: "
 # ^ErrorDecompressing
-ÁÕ»Ñ­ËÒã¹¡ÒÃ¤ÅÒÂ¢éÍÁÙÅ! à¡Ô´¢éÍ¼Ô´¾ÅÒ´¨Ò¡µÑÇµÔ´µÑé§?
+à¸¡à¸µà¸›à¸±à¸�à¸«à¸²à¹ƒà¸™à¸�à¸²à¸£à¸„à¸¥à¸²à¸¢à¸‚à¹‰à¸­à¸¡à¸¹à¸¥! à¹€à¸�à¸´à¸”à¸‚à¹‰à¸­à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¸ˆà¸²à¸�à¸•à¸±à¸§à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡?
 # ^ErrorRegistering
-ÁÕ»Ñ­ËÒã¹¡ÒÃÅ§·ÐàºÕÂ¹ DLL
+à¸¡à¸µà¸›à¸±à¸�à¸«à¸²à¹ƒà¸™à¸�à¸²à¸£à¸¥à¸‡à¸—à¸°à¹€à¸šà¸µà¸¢à¸™ DLL
 # ^ExecShell
-"ÃÑ¹àªÅÅìä¿Åì: "
+"à¸£à¸±à¸™à¹€à¸Šà¸¥à¸¥à¹Œà¹„à¸Ÿà¸¥à¹Œ: "
 # ^Exec
-"ÃÑ¹ä¿Åì: "
+"à¸£à¸±à¸™à¹„à¸Ÿà¸¥à¹Œ: "
 # ^Extract
-"áµ¡ä¿Åì: "
+"à¹�à¸•à¸�à¹„à¸Ÿà¸¥à¹Œ: "
 # ^ErrorWriting
-"áµ¡ä¿Åì: à¡Ô´»Ñ­ËÒã¹¡ÒÃà¢ÕÂ¹ä¿Åì"
+"à¹�à¸•à¸�à¹„à¸Ÿà¸¥à¹Œ: à¹€à¸�à¸´à¸”à¸›à¸±à¸�à¸«à¸²à¹ƒà¸™à¸�à¸²à¸£à¹€à¸‚à¸µà¸¢à¸™à¹„à¸Ÿà¸¥à¹Œ"
 # ^InvalidOpcode
-µÑÇµÔ´µÑé§ÁÕ»Ñ­ËÒ: ÃËÑÊ opcode ¼Ô´¾ÅÒ´
+à¸•à¸±à¸§à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸¡à¸µà¸›à¸±à¸�à¸«à¸²: à¸£à¸«à¸±à¸ª opcode à¸œà¸´à¸”à¸žà¸¥à¸²à¸”
 # ^NoOLE
-"äÁèÁÕ OLE ÊÓËÃÑº: "
+"à¹„à¸¡à¹ˆà¸¡à¸µ OLE à¸ªà¸³à¸«à¸£à¸±à¸š: "
 # ^OutputFolder
-"á¿éÁ·ÕµÔ´µÑé§: "
+"à¹�à¸Ÿà¹‰à¸¡à¸—à¸µà¸•à¸´à¸”à¸•à¸±à¹‰à¸‡: "
 # ^RemoveFolder
-"Åºá¿éÁ: "
+"à¸¥à¸šà¹�à¸Ÿà¹‰à¸¡: "
 # ^RenameOnReboot
-"à»ÅÕèÂ¹ª×èÍµÍ¹ÃÕºÙ·: "
+"à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸Šà¸·à¹ˆà¸­à¸•à¸­à¸™à¸£à¸µà¸šà¸¹à¸—: "
 # ^Rename
-"à»ÅÕèÂ¹ª×èÍ: "
+"à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸Šà¸·à¹ˆà¸­: "
 # ^Skipped
-"¢éÒÁ: "
+"à¸‚à¹‰à¸²à¸¡: "
 # ^CopyDetails
-¤Ñ´ÅÍ¡ÃÒÂÅÐàÍÕÂ´Å§¤ÅÔ»ºÍÃì´
+à¸„à¸±à¸”à¸¥à¸­à¸�à¸£à¸²à¸¢à¸¥à¸°à¹€à¸­à¸µà¸¢à¸”à¸¥à¸‡à¸„à¸¥à¸´à¸›à¸šà¸­à¸£à¹Œà¸”
 # ^LogInstall
-ºÑ¹·Ö¡¡ÒÃµÔ´µÑé§
+à¸šà¸±à¸™à¸—à¸¶à¸�à¸�à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/PortugueseBR.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/PortugueseBR.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/PortugueseBR.nlf	(revision 2956)
@@ -1,4 +1,4 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Start editing here
 # Language ID
@@ -6,34 +6,33 @@
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
-# Translation by Diego Marcos
-# Corrections by Felipe
+# Translation by Diego Pedroso and Felipe, reviewed by Georger AraÃºjo
 # ^Branding
-Sistema de Instalação Nullsoft %s
+Nullsoft Install System %s
 # ^SetupCaption
-Instalação do $(^Name)
+InstalaÃ§Ã£o do $(^Name)
 # ^UninstallCaption
-Desinstalação do $(^Name)
+DesinstalaÃ§Ã£o do $(^Name)
 # ^LicenseSubCaption
-: Acordo da Licença
+: Acordo de licenÃ§a
 # ^ComponentsSubCaption
-: Opções da Instalação
+: OpÃ§Ãµes da InstalaÃ§Ã£o
 # ^DirSubCaption
-: Pasta da Instalação
+: Pasta da InstalaÃ§Ã£o
 # ^InstallingSubCaption
 : Instalando
 # ^CompletedSubCaption
 : Completado
 # ^UnComponentsSubCaption
-: Opções da Desinstalação
+: OpÃ§Ãµes da DesinstalaÃ§Ã£o
 # ^UnDirSubCaption
-: Pasta da Desinstalação
+: Pasta da DesinstalaÃ§Ã£o
 # ^ConfirmSubCaption
-: Confirmação
+: ConfirmaÃ§Ã£o
 # ^UninstallingSubCaption
 : Desinstalando
 # ^UnCompletedSubCaption
@@ -41,13 +40,13 @@
 # ^BackBtn
 < &Voltar
 # ^NextBtn
-&Próximo >
+&PrÃ³ximo >
 # ^AgreeBtn
 Eu &Concordo
 # ^AcceptBtn
-Eu &aceito os termos no Acordo da Licença
+Eu &aceito os termos do Acordo de LicenÃ§a
 # ^DontAcceptBtn
-Eu &não aceito os termos no Acordo da Licença
+Eu &nÃ£o aceito os termos do Acordo de LicenÃ§a
 # ^InstallBtn
 &Instalar
 # ^UninstallBtn
@@ -61,73 +60,73 @@
 # ^ShowDetailsBtn
 Mostrar &detalhes
 # ^ClickNext
-Clique em Próximo para continuar.
+Clique em PrÃ³ximo para continuar.
 # ^ClickInstall
-Clique em Instalar para iniciar a instalação.
+Clique em Instalar para iniciar a instalaÃ§Ã£o.
 # ^ClickUninstall
-Clique em Desinstalar para iniciar a desinstalação.
+Clique em Desinstalar para iniciar a desinstalaÃ§Ã£o.
 # ^Name
 Nome
 # ^Completed
 Completado
 # ^LicenseText
-Por favor reveja o acordo da licença antes de instalar o $(^NameDA). Se você aceita todos os termos do acordo, clique em Eu Concordo.
+Por favor, leia com atenÃ§Ã£o o acordo de licenÃ§a antes de instalar o $(^NameDA). Se vocÃª aceita todos os termos do acordo, clique em Eu Concordo.
 # ^LicenseTextCB
-Por favor reveja o acordo da licença antes de instalar o $(^NameDA). Se você aceita todos os termos do acordo, clique na caixa de seleção abaixo. $_CLICK
+Por favor, leia com atenÃ§Ã£o o acordo de licenÃ§a antes de instalar o $(^NameDA). Se vocÃª aceita todos os termos do acordo, clique na caixa de seleÃ§Ã£o abaixo. $_CLICK
 # ^LicenseTextRB
-Por favor reveja o acordo da licença antes de instalar o $(^NameDA). Se você aceita todos os termos do acordo, selecione a primeira opção abaixo. $_CLICK
+Por favor, leia com atenÃ§Ã£o o acordo de licenÃ§a antes de instalar o $(^NameDA). Se vocÃª aceita todos os termos do acordo, selecione a primeira opÃ§Ã£o abaixo. $_CLICK
 # ^UnLicenseText
-Por favor reveja o acordo da licença antes de desinstalar o $(^NameDA). Se você aceita todos os termos do acordo, clique em Eu Concordo.
+Por favor, leia com atenÃ§Ã£o o acordo de licenÃ§a antes de desinstalar o $(^NameDA). Se vocÃª aceita todos os termos do acordo, clique em Eu Concordo.
 # ^UnLicenseTextCB
-Por favor reveja o acordo da licença antes de desinstalar o $(^NameDA). Se você aceita todos os termos do acordo, clique na caixa de seleção abaixo. $_CLICK
+Por favor, leia com atenÃ§Ã£o o acordo de licenÃ§a antes de desinstalar o $(^NameDA). Se vocÃª aceita todos os termos do acordo, clique na caixa de seleÃ§Ã£o abaixo. $_CLICK
 # ^UnLicenseTextRB
-Por favor reveja o acordo da licença antes de desinstalar o $(^NameDA). Se você aceita todos os termos do acordo, selecione a primeira opção abaixo. $_CLICK
+Por favor, leia com atenÃ§Ã£o o acordo de licenÃ§a antes de desinstalar o $(^NameDA). Se vocÃª aceita todos os termos do acordo, selecione a primeira opÃ§Ã£o abaixo. $_CLICK
 # ^Custom
 Personalizado
 # ^ComponentsText
-Marque os componentes que você quer instalar e desmarque os componentes que você não quer instalar. $_CLICK
+Marque os componentes que vocÃª quer instalar e desmarque os componentes que vocÃª nÃ£o quer instalar. $_CLICK
 # ^ComponentsSubText1
-Selecione o tipo de instalação:
+Selecione o tipo de instalaÃ§Ã£o:
 # ^ComponentsSubText2_NoInstTypes
 Selecione os componentes a instalar:
 # ^ComponentsSubText2
-Ou, selecione os componentes opcionais que você deseja instalar:
+Ou, selecione os componentes opcionais que vocÃª deseja instalar:
 # ^UnComponentsText
-Marque os componentes que você quer desinstalar e desmarque os componentes que você não quer desinstalar. $_CLICK
+Marque os componentes que vocÃª quer desinstalar e desmarque os componentes que vocÃª nÃ£o quer desinstalar. $_CLICK
 # ^UnComponentsSubText1
-Selecione o tipo de desinstalação:
+Selecione o tipo de desinstalaÃ§Ã£o:
 # ^UnComponentsSubText2_NoInstTypes
 Selecione os componentes a desinstalar:
 # ^UnComponentsSubText2
-Ou, selecione os componentes opcionais que você deseja desinstalar:
+Ou, selecione os componentes opcionais que vocÃª deseja desinstalar:
 # ^DirText
-O Instalador instalará o $(^NameDA) na seguinte pasta. Para instalar em uma pasta diferente, clique em Procurar e selecione outra pasta. $_CLICK
+O $(^NameDA) serÃ¡ instalado na pasta a seguir. Para instalar em uma pasta diferente, clique em Procurar e selecione outra pasta. $_CLICK
 # ^DirSubText
-Pasta Destino
+Pasta de Destino
 # ^DirBrowseText
 Selecione a pasta para instalar o $(^NameDA):
 # ^UnDirText
-O Instalador desinstalará o $(^NameDA) da seguinte pasta. Para desinstalar de uma pasta diferente, clique em Procurar e selecione outra pasta. $_CLICK
+O $(^NameDA) serÃ¡ desinstalado da pasta a seguir. Para desinstalar de uma pasta diferente, clique em Procurar e selecione outra pasta. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
 Selecione a pasta de onde desinstalar o $(^NameDA):
 # ^SpaceAvailable
-"Espaço disponível: "
+"EspaÃ§o disponÃ­vel: "
 # ^SpaceRequired
-"Espaço requerido: "
+"EspaÃ§o necessÃ¡rio: "
 # ^UninstallingText
-O $(^NameDA) será desinstalado da seguinte pasta. $_CLICK
+O $(^NameDA) serÃ¡ desinstalado da pasta a seguir. $_CLICK
 # ^UninstallingSubText
 Desinstalando de:
 # ^FileError
-Erro ao abrir o arquivo para a gravação: \r\n\r\n$0\r\n\r\nClique em Abortar para parar a instalação,\r\nRepetir para tentar de novo, ou\r\nIgnorar para pular este arquivo.
+Erro ao abrir o arquivo para gravaÃ§Ã£o: \r\n\r\n$0\r\n\r\nClique em Abortar para parar a instalaÃ§Ã£o,\r\nRepetir para tentar de novo, ou\r\nIgnorar para pular este arquivo.
 # ^FileError_NoIgnore
-Erro ao abrir o arquivo para a gravação: \r\n\r\n$0\r\n\r\nClique em Repetir para tentar de novo, ou\r\nCancelar para parar a instalação.
+Erro ao abrir o arquivo para gravaÃ§Ã£o: \r\n\r\n$0\r\n\r\nClique em Repetir para tentar de novo, ou\r\nCancelar para parar a instalaÃ§Ã£o.
 # ^CantWrite
-"Não pode escrever: "
+"NÃ£o foi possÃ­vel gravar: "
 # ^CopyFailed
-Falhou em copiar
+Falha ao copiar
 # ^CopyTo
 "Copiar para "
 # ^Registering
@@ -135,9 +134,9 @@
 # ^Unregistering
 "Desfazendo o registro: "
 # ^SymbolNotFound
-"Não pôde achar o símbolo: "
+"NÃ£o foi possÃ­vel localizar o sÃ­mbolo: "
 # ^CouldNotLoad
-"Não pôde carregar: "
+"NÃ£o foi possÃ­vel carregar: "
 # ^CreateFolder
 "Criar pasta: "
 # ^CreateShortcut
@@ -145,19 +144,19 @@
 # ^CreatedUninstaller
 "Desinstalador criado: "
 # ^Delete
-"Apagar o arquivo: "
+"Excluir o arquivo: "
 # ^DeleteOnReboot
-"Apagar ao reiniciar: "
+"Excluir ao reiniciar: "
 # ^ErrorCreatingShortcut
-"Erro ao criar o atalho: "
+"Erro ao criar atalho: "
 # ^ErrorCreating
 "Erro ao criar: "
 # ^ErrorDecompressing
-Erro ao descompactar os dados! Instalador corrompido?
+Erro ao descomprimir os dados! Instalador corrompido?
 # ^ErrorRegistering
 Erro ao registar a DLL
 # ^ExecShell
-"Executar pelo Shell: "
+"ExecShell: "
 # ^Exec
 "Executar: "
 # ^Extract
@@ -165,13 +164,13 @@
 # ^ErrorWriting
 "Extrair: erro ao gravar o arquivo "
 # ^InvalidOpcode
-Instalador corrompido: opcode inválido
+Instalador corrompido: opcode invÃ¡lido
 # ^NoOLE
 "Sem OLE para: "
 # ^OutputFolder
-"Pasta de saída: "
+"Pasta de saÃ­da: "
 # ^RemoveFolder
-"Remover a pasta: "
+"Excluir a pasta: "
 # ^RenameOnReboot
 "Renomear ao reiniciar: "
 # ^Rename
@@ -179,14 +178,14 @@
 # ^Skipped
 "Ignorado: "
 # ^CopyDetails
-Copiar os Detalhes para a Área de Transferência
+Copiar os Detalhes para a Ã�rea de TransferÃªncia
 # ^LogInstall
-Pôr no Log o processo de instalação
+Registrar o processo de instalaÃ§Ã£o
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
\ No newline at end of file
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Indonesian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Indonesian.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Indonesian.nlf	(revision 2956)
@@ -1,15 +1,19 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1057
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
--
+# Codepage - dash (-) means ASCII code page
+1252
 # RTL - anything else than RTL means LTR
 -
-# Translation ariel825010106@yahoo.com modified and completed by was.uthm@gmail.com in April 2009
+# Revision date: 2009 April
+# Translators:
+## Ariel <ariel825010106@yahoo.com>, <www.ariel106.cjb.net>
+## was.uthm@gmail.com
+#
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
@@ -183,8 +187,8 @@
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Mongolian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Mongolian.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Mongolian.nsh	(revision 2956)
@@ -1,121 +1,129 @@
-;Language: Mongolian (1104)
+ï»¿;Language: Mongolian (1104)
 ;By Bayarsaikhan Enkhtaivan
 
-!insertmacro LANGFILE "Mongolian" "Mongolian"
+!insertmacro LANGFILE "Mongolian" "Mongolian (Cyrillic)" "ÐœÐ¾Ð½Ð³Ð¾Ð» ÐšÐ¸Ñ€Ð¸Ð»Ð»" "Mongol kirill"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) Ñóóëãàöàä òàâòàé ìîðèë"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "$(^NameDA) ñóóëãàöûí èëáý÷èíã òà øóóä àøèãëàæ áîëíî.$\r$\n$\r$\n¯¿íèéã ñóóëãàõûí ºìíº áóñàä á¿õ ïðîãðàìóóäàà õààõûã çºâëºæ áàéíà. Ñèñòåìèéí ôàéëóóäûã øèíý÷èëáýë êîìïüþòåðýý äàõèí à÷ààëàõã¿é áàéõ áîëîìæòîé.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) Ð¡ÑƒÑƒÐ»Ð³Ð°Ñ†Ð°Ð´ Ñ‚Ð°Ð²Ñ‚Ð°Ð¹ Ð¼Ð¾Ñ€Ð¸Ð»"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "$(^NameDA) Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ†Ñ‹Ð½ Ð¸Ð»Ð±Ñ�Ñ‡Ð¸Ð½Ð³ Ñ‚Ð° ÑˆÑƒÑƒÐ´ Ð°ÑˆÐ¸Ð³Ð»Ð°Ð¶ Ð±Ð¾Ð»Ð½Ð¾.$\r$\n$\r$\nÒ®Ò¯Ð½Ð¸Ð¹Ð³ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ…Ñ‹Ð½ Ó©Ð¼Ð½Ó© Ð±ÑƒÑ�Ð°Ð´ Ð±Ò¯Ñ… Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ÑƒÑƒÐ´Ð°Ð° Ñ…Ð°Ð°Ñ…Ñ‹Ð³ Ð·Ó©Ð²Ð»Ó©Ð¶ Ð±Ð°Ð¹Ð½Ð°. Ð¡Ð¸Ñ�Ñ‚ÐµÐ¼Ð¸Ð¹Ð½ Ñ„Ð°Ð¹Ð»ÑƒÑƒÐ´Ñ‹Ð³ ÑˆÐ¸Ð½Ñ�Ñ‡Ð¸Ð»Ð±Ñ�Ð» ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ñ�Ñ� Ð´Ð°Ñ…Ð¸Ð½ Ð°Ñ‡Ð°Ð°Ð»Ð°Ñ…Ð³Ò¯Ð¹ Ð±Ð°Ð¹Ñ… Ð±Ð¾Ð»Ð¾Ð¼Ð¶Ñ‚Ð¾Ð¹.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "$(^NameDA) Ñóóëãàöûã óñòãàõ èëáý÷èíä òàâòàé ìîðèë"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "$(^NameDA) óñòãàöûí èëáý÷èíã òà øóóä àøèãëàæ áîëíî.$\r$\n$\r$\nÓñòãàõûí ºìíº $(^NameDA) íü àæèëëààã¿é ýñýõèéã øàëãà.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "$(^NameDA) Ð¡ÑƒÑƒÐ»Ð³Ð°Ñ†Ñ‹Ð³ ÑƒÑ�Ñ‚Ð³Ð°Ñ… Ð¸Ð»Ð±Ñ�Ñ‡Ð¸Ð½Ð´ Ñ‚Ð°Ð²Ñ‚Ð°Ð¹ Ð¼Ð¾Ñ€Ð¸Ð»"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "$(^NameDA) ÑƒÑ�Ñ‚Ð³Ð°Ñ†Ñ‹Ð½ Ð¸Ð»Ð±Ñ�Ñ‡Ð¸Ð½Ð³ Ñ‚Ð° ÑˆÑƒÑƒÐ´ Ð°ÑˆÐ¸Ð³Ð»Ð°Ð¶ Ð±Ð¾Ð»Ð½Ð¾.$\r$\n$\r$\nÐ£Ñ�Ñ‚Ð³Ð°Ñ…Ñ‹Ð½ Ó©Ð¼Ð½Ó© $(^NameDA) Ð½ÑŒ Ð°Ð¶Ð¸Ð»Ð»Ð°Ð°Ð³Ò¯Ð¹ Ñ�Ñ�Ñ�Ñ…Ð¸Ð¹Ð³ ÑˆÐ°Ð»Ð³Ð°.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ëèöåíçèéí çºâøººðºë"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "$(^NameDA)-ûã ñóóëãàõûíõàà ºìíº çºâøèëöëèéí ç¿éë¿¿äèéã óíøèíà óó."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Õýðýâ çºâøèëöëèéí ç¿éëñèéã çºâøººð÷ áàéâàë, Çºâøººðëºº òîâ÷èéã äàðàí ¿ðãýëæë¿¿ëíý ¿¿. $(^NameDA)-ûã ñóóëãàõûí òóëä çààâàë çºâøººðºõ øààðäëàãàòàé."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Õýðýâ çºâøèëöëèéí ç¿éëñèéã çºâøººð÷ áàéâàë, Çºâëºõ õàéðöãèéã äàðàí ¿ðãýëæë¿¿ëíý ¿¿. $(^NameDA)-ûã ñóóëãàõûí òóëä çààâàë çºâøººðºõ øààðäëàãàòàé. $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Õýðýâ çºâøèëöëèéí ç¿éëñèéã çºâøººð÷ áàéâàë, äîîðõîîñ ýõíèéã íü ñîíãîí ¿ðãýëæë¿¿ëíý ¿¿. $(^NameDA)-ûã ñóóëãàõûí òóëä çààâàë çºâøººðºõ øààðäëàãàòàé. $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¹Ð½ Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ó©Ð»"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "$(^NameDA)-Ñ‹Ð³ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ…Ñ‹Ð½Ñ…Ð°Ð° Ó©Ð¼Ð½Ó© Ð·Ó©Ð²ÑˆÐ¸Ð»Ñ†Ð»Ð¸Ð¹Ð½ Ð·Ò¯Ð¹Ð»Ò¯Ò¯Ð´Ð¸Ð¹Ð³ ÑƒÐ½ÑˆÐ¸Ð½Ð° ÑƒÑƒ."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ð¥Ñ�Ñ€Ñ�Ð² Ð·Ó©Ð²ÑˆÐ¸Ð»Ñ†Ð»Ð¸Ð¹Ð½ Ð·Ò¯Ð¹Ð»Ñ�Ð¸Ð¹Ð³ Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ñ‡ Ð±Ð°Ð¹Ð²Ð°Ð», Ð—Ó©Ð²ÑˆÓ©Ó©Ñ€Ð»Ó©Ó© Ñ‚Ð¾Ð²Ñ‡Ð¸Ð¹Ð³ Ð´Ð°Ñ€Ð°Ð½ Ò¯Ñ€Ð³Ñ�Ð»Ð¶Ð»Ò¯Ò¯Ð»Ð½Ñ� Ò¯Ò¯. $(^NameDA)-Ñ‹Ð³ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ…Ñ‹Ð½ Ñ‚ÑƒÐ»Ð´ Ð·Ð°Ð°Ð²Ð°Ð» Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ó©Ñ… ÑˆÐ°Ð°Ñ€Ð´Ð»Ð°Ð³Ð°Ñ‚Ð°Ð¹."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ð¥Ñ�Ñ€Ñ�Ð² Ð·Ó©Ð²ÑˆÐ¸Ð»Ñ†Ð»Ð¸Ð¹Ð½ Ð·Ò¯Ð¹Ð»Ñ�Ð¸Ð¹Ð³ Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ñ‡ Ð±Ð°Ð¹Ð²Ð°Ð», Ð—Ó©Ð²Ð»Ó©Ñ… Ñ…Ð°Ð¹Ñ€Ñ†Ð³Ð¸Ð¹Ð³ Ð´Ð°Ñ€Ð°Ð½ Ò¯Ñ€Ð³Ñ�Ð»Ð¶Ð»Ò¯Ò¯Ð»Ð½Ñ� Ò¯Ò¯. $(^NameDA)-Ñ‹Ð³ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ…Ñ‹Ð½ Ñ‚ÑƒÐ»Ð´ Ð·Ð°Ð°Ð²Ð°Ð» Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ó©Ñ… ÑˆÐ°Ð°Ñ€Ð´Ð»Ð°Ð³Ð°Ñ‚Ð°Ð¹. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ð¥Ñ�Ñ€Ñ�Ð² Ð·Ó©Ð²ÑˆÐ¸Ð»Ñ†Ð»Ð¸Ð¹Ð½ Ð·Ò¯Ð¹Ð»Ñ�Ð¸Ð¹Ð³ Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ñ‡ Ð±Ð°Ð¹Ð²Ð°Ð», Ð´Ð¾Ð¾Ñ€Ñ…Ð¾Ð¾Ñ� Ñ�Ñ…Ð½Ð¸Ð¹Ð³ Ð½ÑŒ Ñ�Ð¾Ð½Ð³Ð¾Ð½ Ò¯Ñ€Ð³Ñ�Ð»Ð¶Ð»Ò¯Ò¯Ð»Ð½Ñ� Ò¯Ò¯. $(^NameDA)-Ñ‹Ð³ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ…Ñ‹Ð½ Ñ‚ÑƒÐ»Ð´ Ð·Ð°Ð°Ð²Ð°Ð» Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ó©Ñ… ÑˆÐ°Ð°Ñ€Ð´Ð»Ð°Ð³Ð°Ñ‚Ð°Ð¹. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ëèöåíçèéí çºâøººðºë"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "$(^NameDA) óñòãàõûí ºìíº çºâøèëöëèéí ç¿éëñèéã óíøèíà óó."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Õýðýâ çºâøèëöëèéí ç¿éëñèéã çºâøººð÷ áàéâàë, Çºâøººðëºº òîâ÷èéã äàðàí ¿ðãýëæë¿¿ëíý ¿¿. $(^NameDA)-ûã óñòãàõûí òóëä çààâàë çºâøººðºõ øààðäëàãàòàé."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Õýðýâ çºâøèëöëèéí ç¿éëñèéã çºâøººð÷ áàéâàë, Çºâëºõ õàéðöãèéã äàðàí ¿ðãýëæë¿¿ëíý ¿¿. $(^NameDA)-ûã óñòãàõûí òóëä çààâàë çºâøººðºõ øààðäëàãàòàé. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Õýðýâ çºâøèëöëèéí ç¿éëñèéã çºâøººð÷ áàéâàë, äîîðõîîñ ýõíèéã íü ñîíãîí ¿ðãýëæë¿¿ëíý ¿¿. $(^NameDA)-ûã óñòãàõûí òóëä çààâàë çºâøººðºõ øààðäëàãàòàé. $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¹Ð½ Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ó©Ð»"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "$(^NameDA) ÑƒÑ�Ñ‚Ð³Ð°Ñ…Ñ‹Ð½ Ó©Ð¼Ð½Ó© Ð·Ó©Ð²ÑˆÐ¸Ð»Ñ†Ð»Ð¸Ð¹Ð½ Ð·Ò¯Ð¹Ð»Ñ�Ð¸Ð¹Ð³ ÑƒÐ½ÑˆÐ¸Ð½Ð° ÑƒÑƒ."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ð¥Ñ�Ñ€Ñ�Ð² Ð·Ó©Ð²ÑˆÐ¸Ð»Ñ†Ð»Ð¸Ð¹Ð½ Ð·Ò¯Ð¹Ð»Ñ�Ð¸Ð¹Ð³ Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ñ‡ Ð±Ð°Ð¹Ð²Ð°Ð», Ð—Ó©Ð²ÑˆÓ©Ó©Ñ€Ð»Ó©Ó© Ñ‚Ð¾Ð²Ñ‡Ð¸Ð¹Ð³ Ð´Ð°Ñ€Ð°Ð½ Ò¯Ñ€Ð³Ñ�Ð»Ð¶Ð»Ò¯Ò¯Ð»Ð½Ñ� Ò¯Ò¯. $(^NameDA)-Ñ‹Ð³ ÑƒÑ�Ñ‚Ð³Ð°Ñ…Ñ‹Ð½ Ñ‚ÑƒÐ»Ð´ Ð·Ð°Ð°Ð²Ð°Ð» Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ó©Ñ… ÑˆÐ°Ð°Ñ€Ð´Ð»Ð°Ð³Ð°Ñ‚Ð°Ð¹."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ð¥Ñ�Ñ€Ñ�Ð² Ð·Ó©Ð²ÑˆÐ¸Ð»Ñ†Ð»Ð¸Ð¹Ð½ Ð·Ò¯Ð¹Ð»Ñ�Ð¸Ð¹Ð³ Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ñ‡ Ð±Ð°Ð¹Ð²Ð°Ð», Ð—Ó©Ð²Ð»Ó©Ñ… Ñ…Ð°Ð¹Ñ€Ñ†Ð³Ð¸Ð¹Ð³ Ð´Ð°Ñ€Ð°Ð½ Ò¯Ñ€Ð³Ñ�Ð»Ð¶Ð»Ò¯Ò¯Ð»Ð½Ñ� Ò¯Ò¯. $(^NameDA)-Ñ‹Ð³ ÑƒÑ�Ñ‚Ð³Ð°Ñ…Ñ‹Ð½ Ñ‚ÑƒÐ»Ð´ Ð·Ð°Ð°Ð²Ð°Ð» Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ó©Ñ… ÑˆÐ°Ð°Ñ€Ð´Ð»Ð°Ð³Ð°Ñ‚Ð°Ð¹. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ð¥Ñ�Ñ€Ñ�Ð² Ð·Ó©Ð²ÑˆÐ¸Ð»Ñ†Ð»Ð¸Ð¹Ð½ Ð·Ò¯Ð¹Ð»Ñ�Ð¸Ð¹Ð³ Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ñ‡ Ð±Ð°Ð¹Ð²Ð°Ð», Ð´Ð¾Ð¾Ñ€Ñ…Ð¾Ð¾Ñ� Ñ�Ñ…Ð½Ð¸Ð¹Ð³ Ð½ÑŒ Ñ�Ð¾Ð½Ð³Ð¾Ð½ Ò¯Ñ€Ð³Ñ�Ð»Ð¶Ð»Ò¯Ò¯Ð»Ð½Ñ� Ò¯Ò¯. $(^NameDA)-Ñ‹Ð³ ÑƒÑ�Ñ‚Ð³Ð°Ñ…Ñ‹Ð½ Ñ‚ÑƒÐ»Ð´ Ð·Ð°Ð°Ð²Ð°Ð» Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ó©Ñ… ÑˆÐ°Ð°Ñ€Ð´Ð»Ð°Ð³Ð°Ñ‚Ð°Ð¹. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Page Down òîâ÷èéã äàðàí çºâøèëöëèéã äîîø ã¿éëãýíý ¿¿."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Page Down Ñ‚Ð¾Ð²Ñ‡Ð¸Ð¹Ð³ Ð´Ð°Ñ€Ð°Ð½ Ð·Ó©Ð²ÑˆÐ¸Ð»Ñ†Ð»Ð¸Ð¹Ð³ Ð´Ð¾Ð¾Ñˆ Ð³Ò¯Ð¹Ð»Ð³Ñ�Ð½Ñ� Ò¯Ò¯."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Íýãäëèéã ñîíãîõ"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "$(^NameDA)-ûã ñóóëãàõàä øààðäàãäàõ õýñãèéã ñîíãîíî óó."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Ð�Ñ�Ð³Ð´Ð»Ð¸Ð¹Ð³ Ñ�Ð¾Ð½Ð³Ð¾Ñ…"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "$(^NameDA)-Ñ‹Ð³ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ…Ð°Ð´ ÑˆÐ°Ð°Ñ€Ð´Ð°Ð³Ð´Ð°Ñ… Ñ…Ñ�Ñ�Ð³Ð¸Ð¹Ð³ Ñ�Ð¾Ð½Ð³Ð¾Ð½Ð¾ ÑƒÑƒ."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Íýãäëèéã ñîíãîõ"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "$(^NameDA)-ûí óñòãàõ øààðäëàãàòàé íýãäëèéã ñîíãîõ."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Ð�Ñ�Ð³Ð´Ð»Ð¸Ð¹Ð³ Ñ�Ð¾Ð½Ð³Ð¾Ñ…"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "$(^NameDA)-Ñ‹Ð½ ÑƒÑ�Ñ‚Ð³Ð°Ñ… ÑˆÐ°Ð°Ñ€Ð´Ð»Ð°Ð³Ð°Ñ‚Ð°Ð¹ Ð½Ñ�Ð³Ð´Ð»Ð¸Ð¹Ð³ Ñ�Ð¾Ð½Ð³Ð¾Ñ…."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Òàéëáàð"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Ð¢Ð°Ð¹Ð»Ð±Ð°Ñ€"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Òà õóëãàíààðàà íýãäëèéí äýýð î÷èõîä ò¿¿íèé òàéëáàðûã õàðóóëíà."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ð¢Ð° Ñ…ÑƒÐ»Ð³Ð°Ð½Ð°Ð°Ñ€Ð°Ð° Ð½Ñ�Ð³Ð´Ð»Ð¸Ð¹Ð½ Ð´Ñ�Ñ�Ñ€ Ð¾Ñ‡Ð¸Ñ…Ð¾Ð´ Ñ‚Ò¯Ò¯Ð½Ð¸Ð¹ Ñ‚Ð°Ð¹Ð»Ð±Ð°Ñ€Ñ‹Ð³ Ñ…Ð°Ñ€ÑƒÑƒÐ»Ð½Ð°."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Òà õóëãàíààðàà íýãäëèéí äýýð î÷èõîä ò¿¿íèé òàéëáàðûã õàðóóëíà."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ð�Ñ�Ð³Ð´Ð»Ð¸Ð¹Ð³ Ñ�Ð¾Ð½Ð³Ð¾Ð²Ð¾Ð» Ñ‚Ò¯Ò¯Ð½Ð¸Ð¹ Ñ‚Ð°Ð¹Ð»Ð±Ð°Ñ€Ñ‹Ð³ Ñ…Ð°Ñ€Ð½Ð°."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Ñóóëãàõ áàéðëàëûã ñîíãîõ"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "$(^NameDA) ñóóëãàöûí ñóóëãàõ çàìûã ñîíãî."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Ð¡ÑƒÑƒÐ»Ð³Ð°Ñ… Ð±Ð°Ð¹Ñ€Ð»Ð°Ð»Ñ‹Ð³ Ñ�Ð¾Ð½Ð³Ð¾Ñ…"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "$(^NameDA) Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ†Ñ‹Ð½ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ… Ð·Ð°Ð¼Ñ‹Ð³ Ñ�Ð¾Ð½Ð³Ð¾."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Óñòãàöûí áàéðëàëûã ñîíãîõ"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "$(^NameDA)-ûã óñòãàõ õàâòñûã ñîíãîõ."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Ð£Ñ�Ñ‚Ð³Ð°Ñ†Ñ‹Ð½ Ð±Ð°Ð¹Ñ€Ð»Ð°Ð»Ñ‹Ð³ Ñ�Ð¾Ð½Ð³Ð¾Ñ…"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "$(^NameDA)-Ñ‹Ð³ ÑƒÑ�Ñ‚Ð³Ð°Ñ… Ñ…Ð°Ð²Ñ‚Ñ�Ñ‹Ð³ Ñ�Ð¾Ð½Ð³Ð¾Ñ…."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Ñóóëãàæ áàéíà"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "$(^NameDA)-ûã ñóóëãàæ äóóñòàë ò¿ð õ¿ëýýíý ¿¿."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Ñóóëãàæ äóóñëàà"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Ñóóëãàö àìæèëòòàé áîëîâ."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Ñóóëãàëò òàñëàãäëàà"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Ñóóëãàëò àìæèëòã¿é áîëîâ."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Ð¡ÑƒÑƒÐ»Ð³Ð°Ð¶ Ð±Ð°Ð¹Ð½Ð°"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "$(^NameDA)-Ñ‹Ð³ Ñ�ÑƒÑƒÐ»Ð³Ð°Ð¶ Ð´ÑƒÑƒÑ�Ñ‚Ð°Ð» Ñ‚Ò¯Ñ€ Ñ…Ò¯Ð»Ñ�Ñ�Ð½Ñ� Ò¯Ò¯."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Ð¡ÑƒÑƒÐ»Ð³Ð°Ð¶ Ð´ÑƒÑƒÑ�Ð»Ð°Ð°"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Ð¡ÑƒÑƒÐ»Ð³Ð°Ñ† Ð°Ð¼Ð¶Ð¸Ð»Ñ‚Ñ‚Ð°Ð¹ Ð±Ð¾Ð»Ð¾Ð²."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Ð¡ÑƒÑƒÐ»Ð³Ð°Ð»Ñ‚ Ñ‚Ð°Ñ�Ð»Ð°Ð³Ð´Ð»Ð°Ð°"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Ð¡ÑƒÑƒÐ»Ð³Ð°Ð»Ñ‚ Ð°Ð¼Ð¶Ð¸Ð»Ñ‚Ð³Ò¯Ð¹ Ð±Ð¾Ð»Ð¾Ð²."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Óñòãàæ áàéíà"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "$(^NameDA) -ûã çàéëóóëæ äóóñòàë ò¿ð õ¿ëýýíý ¿¿."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Óñòãàæ äóóñëàà"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Óñòãàëò àìæèëòòàé äóóñëàà."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Óñòãàö òàñëàãäëàà"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Óñòãàëò àìæèëòã¿é áîëëîî."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Ð£Ñ�Ñ‚Ð³Ð°Ð¶ Ð±Ð°Ð¹Ð½Ð°"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "$(^NameDA) -Ñ‹Ð³ Ð·Ð°Ð¹Ð»ÑƒÑƒÐ»Ð¶ Ð´ÑƒÑƒÑ�Ñ‚Ð°Ð» Ñ‚Ò¯Ñ€ Ñ…Ò¯Ð»Ñ�Ñ�Ð½Ñ� Ò¯Ò¯."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Ð£Ñ�Ñ‚Ð³Ð°Ð¶ Ð´ÑƒÑƒÑ�Ð»Ð°Ð°"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Ð£Ñ�Ñ‚Ð³Ð°Ð»Ñ‚ Ð°Ð¼Ð¶Ð¸Ð»Ñ‚Ñ‚Ð°Ð¹ Ð´ÑƒÑƒÑ�Ð»Ð°Ð°."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Ð£Ñ�Ñ‚Ð³Ð°Ñ† Ñ‚Ð°Ñ�Ð»Ð°Ð³Ð´Ð»Ð°Ð°"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Ð£Ñ�Ñ‚Ð³Ð°Ð»Ñ‚ Ð°Ð¼Ð¶Ð¸Ð»Ñ‚Ð³Ò¯Ð¹ Ð±Ð¾Ð»Ð»Ð¾Ð¾."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "$(^NameDA) Ñóóëãàöûí èëáý÷èí äóóñëàà"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) íü òàíû êîìïüþòåðò ñóóëàà.$\r$\n$\r$\nÒºãñãºë äýýð äàðâàë õààíà."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "$(^NameDA)-ûí ñóóëãàöûí äàðààëàëä òà êîìïüþòåðýý äàõèí à÷ààëñíààð äóóñíà. Òà äàõèí à÷ààëàõûã õ¿ñýæ áàéíà óó?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "$(^NameDA) Ð¡ÑƒÑƒÐ»Ð³Ð°Ñ†Ñ‹Ð½ Ð¸Ð»Ð±Ñ�Ñ‡Ð¸Ð½ Ð´ÑƒÑƒÑ�Ð»Ð°Ð°"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) Ð½ÑŒ Ñ‚Ð°Ð½Ñ‹ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ñ‚ Ñ�ÑƒÑƒÐ»Ð°Ð°.$\r$\n$\r$\nÐ¢Ó©Ð³Ñ�Ð³Ó©Ð» Ð´Ñ�Ñ�Ñ€ Ð´Ð°Ñ€Ð²Ð°Ð» Ñ…Ð°Ð°Ð½Ð°."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "$(^NameDA)-Ñ‹Ð½ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ†Ñ‹Ð½ Ð´Ð°Ñ€Ð°Ð°Ð»Ð°Ð»Ð´ Ñ‚Ð° ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ñ�Ñ� Ð´Ð°Ñ…Ð¸Ð½ Ð°Ñ‡Ð°Ð°Ð»Ñ�Ð½Ð°Ð°Ñ€ Ð´ÑƒÑƒÑ�Ð½Ð°. Ð¢Ð° Ð´Ð°Ñ…Ð¸Ð½ Ð°Ñ‡Ð°Ð°Ð»Ð°Ñ…Ñ‹Ð³ Ñ…Ò¯Ñ�Ñ�Ð¶ Ð±Ð°Ð¹Ð½Ð° ÑƒÑƒ?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "$(^NameDA) Óñòãàöûí èëáý÷èí äóóñëàà"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) íü òàíû êîìïüþòåðýýñ çàéëóóëàãäëàà.$\r$\n$\r$\nÒºãñãºë äýýð äàðâàë õààíà."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "$(^NameDA) Óñòãàöûí äàðààëàëä òà êîìïüþòåðýý äàõèí à÷ààëñíààð äóóñíà. Òà ä.à÷ààëìààð áàéíà óó?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "$(^NameDA) Ð£Ñ�Ñ‚Ð³Ð°Ñ†Ñ‹Ð½ Ð¸Ð»Ð±Ñ�Ñ‡Ð¸Ð½ Ð´ÑƒÑƒÑ�Ð»Ð°Ð°"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) Ð½ÑŒ Ñ‚Ð°Ð½Ñ‹ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ñ�Ñ�Ñ� Ð·Ð°Ð¹Ð»ÑƒÑƒÐ»Ð°Ð³Ð´Ð»Ð°Ð°.$\r$\n$\r$\nÐ¢Ó©Ð³Ñ�Ð³Ó©Ð» Ð´Ñ�Ñ�Ñ€ Ð´Ð°Ñ€Ð²Ð°Ð» Ñ…Ð°Ð°Ð½Ð°."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "$(^NameDA) Ð£Ñ�Ñ‚Ð³Ð°Ñ†Ñ‹Ð½ Ð´Ð°Ñ€Ð°Ð°Ð»Ð°Ð»Ð´ Ñ‚Ð° ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ñ�Ñ� Ð´Ð°Ñ…Ð¸Ð½ Ð°Ñ‡Ð°Ð°Ð»Ñ�Ð½Ð°Ð°Ñ€ Ð´ÑƒÑƒÑ�Ð½Ð°. Ð¢Ð° Ð´.Ð°Ñ‡Ð°Ð°Ð»Ð¼Ð°Ð°Ñ€ Ð±Ð°Ð¹Ð½Ð° ÑƒÑƒ?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ä.À÷ààë"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Áè äàðàà ä.à÷ààëàõûã õ¿ñýæ áàéíà."
-  ${LangFileString} MUI_TEXT_FINISH_RUN "$(^NameDA) àæèëëóóëàõ"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Readme õàðóóëàõ"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Òºãñãºë"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ð”.Ð�Ñ‡Ð°Ð°Ð»"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ð‘Ð¸ Ð´Ð°Ñ€Ð°Ð° Ð´.Ð°Ñ‡Ð°Ð°Ð»Ð°Ñ…Ñ‹Ð³ Ñ…Ò¯Ñ�Ñ�Ð¶ Ð±Ð°Ð¹Ð½Ð°."
+  ${LangFileString} MUI_TEXT_FINISH_RUN "$(^NameDA) Ð°Ð¶Ð¸Ð»Ð»ÑƒÑƒÐ»Ð°Ñ…"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Readme Ñ…Ð°Ñ€ÑƒÑƒÐ»Ð°Ñ…"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Ð¢Ó©Ð³Ñ�Ð³Ó©Ð»"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Start öýñíèé õàâòñûã ñîíãî"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Start öýñ äýõ $(^NameDA) shortcut-ûí õàâòñûã ñîíãî."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Start öýñýíä ïðîãðàìûí shortcut ¿¿ñãýõ õàâòñûã ñîíãî. Ýñâýë òà øèíý íýðýýð ¿¿ñãýæ áîëíî."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Do not create shortcuts"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Start Ñ†Ñ�Ñ�Ð½Ð¸Ð¹ Ñ…Ð°Ð²Ñ‚Ñ�Ñ‹Ð³ Ñ�Ð¾Ð½Ð³Ð¾"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Start Ñ†Ñ�Ñ� Ð´Ñ�Ñ… $(^NameDA) shortcut-Ñ‹Ð½ Ñ…Ð°Ð²Ñ‚Ñ�Ñ‹Ð³ Ñ�Ð¾Ð½Ð³Ð¾."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Start Ñ†Ñ�Ñ�Ñ�Ð½Ð´ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ñ‹Ð½ shortcut Ò¯Ò¯Ñ�Ð³Ñ�Ñ… Ñ…Ð°Ð²Ñ‚Ñ�Ñ‹Ð³ Ñ�Ð¾Ð½Ð³Ð¾. Ð­Ñ�Ð²Ñ�Ð» Ñ‚Ð° ÑˆÐ¸Ð½Ñ� Ð½Ñ�Ñ€Ñ�Ñ�Ñ€ Ò¯Ò¯Ñ�Ð³Ñ�Ð¶ Ð±Ð¾Ð»Ð½Ð¾."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Shortcut Ò¯Ò¯Ñ�Ð³Ñ�Ñ…Ð³Ò¯Ð¹"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "$(^NameDA)--ûí Óñòãàö"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "$(^NameDA) -ûã òàíû êîìïüþòåðýýñ çàéëóóëàõ."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "$(^NameDA)--Ñ‹Ð½ Ð£Ñ�Ñ‚Ð³Ð°Ñ†"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "$(^NameDA) -Ñ‹Ð³ Ñ‚Ð°Ð½Ñ‹ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ñ�Ñ�Ñ� Ð·Ð°Ð¹Ð»ÑƒÑƒÐ»Ð°Ñ…."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "$(^Name) -ûí ñóóëãàöààñ ãàðìààð áàéíà óó?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "$(^Name) -Ñ‹Ð½ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ†Ð°Ð°Ñ� Ð³Ð°Ñ€Ð¼Ð°Ð°Ñ€ Ð±Ð°Ð¹Ð½Ð° ÑƒÑƒ?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "$(^Name) Óñòãàöààñ ãàðìààð áàéíà óó?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "$(^Name) Ð£Ñ�Ñ‚Ð³Ð°Ñ†Ð°Ð°Ñ� Ð³Ð°Ñ€Ð¼Ð°Ð°Ñ€ Ð±Ð°Ð¹Ð½Ð° ÑƒÑƒ?"
 !endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Ð¥Ñ�Ñ€Ñ�Ð³Ð»Ñ�Ð³Ñ‡ Ñ�Ð¾Ð½Ð³Ð¾Ñ…"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "$(^NameDA)-Ñ‹Ð³ Ð°Ð»ÑŒ Ñ…Ñ�Ñ€Ñ�Ð³Ð»Ñ�Ð³Ñ‡Ð¸Ð´ Ð·Ð¾Ñ€Ð¸ÑƒÐ»Ð¶ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ… Ð²Ñ�."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "$(^NameDA)-Ñ‹Ð³ Ð·Ó©Ð²Ñ…Ó©Ð½ Ó©Ó©Ñ€Ñ‚Ó©Ó© Ñ�Ñ�Ð²Ñ�Ð» Ñ�Ð½Ñ� ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€ Ð´Ñ�Ñ�Ñ€Ñ… Ð±Ò¯Ñ… Ñ…Ñ�Ñ€Ñ�Ð³Ð»Ñ�Ð³Ñ‡Ð´Ñ�Ð´ Ð·Ð¾Ñ€Ð¸ÑƒÐ»Ð¶ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ…Ñ‹Ð³ Ñ�Ð¾Ð½Ð³Ð¾. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Ð­Ð½Ñ� ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€ Ð´Ñ�Ñ�Ñ€Ñ… Ð±Ò¯Ñ… Ñ…Ñ�Ñ€Ñ�Ð³Ð»Ñ�Ñ‡Ð´Ñ�Ð´ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ…"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Ð—Ó©Ð²Ñ…Ó©Ð½ Ó©Ó©Ñ€Ñ‚Ó©Ó© Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ…"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/SpanishInternational.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/SpanishInternational.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/SpanishInternational.nlf	(revision 2956)
@@ -1,44 +1,44 @@
-# Header, don't edit ;Español (Alfabetización Internacional)
+ï»¿# Header, don't edit ;EspaÃ±ol (AlfabetizaciÃ³n Internacional)
 NLF v6
 # Language ID
 3082
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
-# Translation by Darwin Rodrigo Toledo Cáceres - www.winamp-es.com - nwrad777@gmail.com
+# Translation by Darwin Rodrigo Toledo CÃ¡ceres - www.winamp-es.com - nwrad777@gmail.com
 # Base traslation by MoNKi & Joel
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-Instalación de $(^Name)
+InstalaciÃ³n de $(^Name)
 # ^UninstallCaption
-Desinstalación de $(^Name)
+DesinstalaciÃ³n de $(^Name)
 # ^LicenseSubCaption
 : Acuerdo de Licencia
 # ^ComponentsSubCaption
-: Opciones de Instalación
+: Opciones de InstalaciÃ³n
 # ^DirSubCaption
-: Carpeta de Instalación
+: Carpeta de InstalaciÃ³n
 # ^InstallingSubCaption
 : Instalando
 # ^CompletedSubCaption
 : Finalizado
 # ^UnComponentsSubCaption
-: Opciones de Desinstalación
+: Opciones de DesinstalaciÃ³n
 # ^UnDirSubCaption
-: Carpeta de Desinstalación
+: Carpeta de DesinstalaciÃ³n
 # ^ConfirmSubCaption
-: Confirmación
+: ConfirmaciÃ³n
 # ^UninstallingSubCaption
 : Desinstalando
 # ^UnCompletedSubCaption
 : Finalizado
 # ^BackBtn
-< &Atrás
+< &AtrÃ¡s
 # ^NextBtn
 &Siguiente >
 # ^AgreeBtn
@@ -62,9 +62,9 @@
 # ^ClickNext
 Presione Siguiente para continuar.
 # ^ClickInstall
-Presione Instalar para iniciar la instalación.
+Presione Instalar para iniciar la instalaciÃ³n.
 # ^ClickUninstall
-Presione Desinstalar para iniciar la desinstalación.
+Presione Desinstalar para iniciar la desinstalaciÃ³n.
 # ^Name
 Nombre
 # ^Completed
@@ -74,19 +74,19 @@
 # ^LicenseTextCB
 Por favor, revise el acuerdo de licencia antes de instalar $(^NameDA). Si usted acepta todas las condiciones del acuerdo, marque abajo la casilla. $_CLICK
 # ^LicenseTextRB
-Por favor, revise el acuerdo de licencia antes de instalar $(^NameDA). Si usted acepta todas las condiciones del acuerdo, seleccione abajo la primera opción. $_CLICK
+Por favor, revise el acuerdo de licencia antes de instalar $(^NameDA). Si usted acepta todas las condiciones del acuerdo, seleccione abajo la primera opciÃ³n. $_CLICK
 # ^UnLicenseText
 Por favor, revise el acuerdo de licencia antes de desinstalar $(^NameDA). Si usted acepta todas las condiciones del acuerdo, presione Acepto.
 # ^UnLicenseTextCB
 Por favor, revise el acuerdo de licencia antes de desinstalar $(^NameDA). Si usted acepta todas las condiciones del acuerdo, marque abajo la casilla. $_CLICK
 # ^UnLicenseTextRB
-Por favor, revise el acuerdo de licencia antes de desinstalar $(^NameDA). Si usted acepta todas las condiciones del acuerdo, seleccione abajo la primera opción. $_CLICK
+Por favor, revise el acuerdo de licencia antes de desinstalar $(^NameDA). Si usted acepta todas las condiciones del acuerdo, seleccione abajo la primera opciÃ³n. $_CLICK
 # ^Custom
 Personalizada
 # ^ComponentsText
 Marque los componentes que desee instalar y desmarque los componentes que no desee instalar. $_CLICK
 # ^ComponentsSubText1
-Seleccione el tipo de instalación:
+Seleccione el tipo de instalaciÃ³n:
 # ^ComponentsSubText2_NoInstTypes
 Seleccione los componentes a instalar:
 # ^ComponentsSubText2
@@ -94,35 +94,35 @@
 # ^UnComponentsText
 Marque los componentes que desee desinstalar y desmarque los componentes que no desee desinstalar. $_CLICK
 # ^UnComponentsSubText1
-Seleccione el tipo de desinstalación:
+Seleccione el tipo de desinstalaciÃ³n:
 # ^UnComponentsSubText2_NoInstTypes
 Seleccione los componentes a desinstalar:
 # ^UnComponentsSubText2
 O seleccione los componentes opcionales que desee desinstalar:
 # ^DirText
-El programa de instalación instalará $(^NameDA) en la siguiente carpeta. Para instalar en una carpeta diferente, presione Examinar y seleccione otra carpeta. $_CLICK
+El programa de instalaciÃ³n instalarÃ¡ $(^NameDA) en la siguiente carpeta. Para instalar en una carpeta diferente, presione Examinar y seleccione otra carpeta. $_CLICK
 # ^DirSubText
 Carpeta de Destino
 # ^DirBrowseText
-Seleccione la carpeta en la que instalará $(^NameDA):
+Seleccione la carpeta en la que instalarÃ¡ $(^NameDA):
 # ^UnDirText
-El programa de instalación desinstalará $(^NameDA) de la siguiente carpeta. Para desinstalar de una carpeta diferente, presione Examinar y seleccione otra carpeta. $_CLICK
+El programa de instalaciÃ³n desinstalarÃ¡ $(^NameDA) de la siguiente carpeta. Para desinstalar de una carpeta diferente, presione Examinar y seleccione otra carpeta. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Seleccione la carpeta desde la que desinstalará $(^NameDA):
+Seleccione la carpeta desde la que desinstalarÃ¡ $(^NameDA):
 # ^SpaceAvailable
 Espacio disponible:
 # ^SpaceRequired
 Espacio requerido:
 # ^UninstallingText
-$(^NameDA) será desinstalado de la siguiente carpeta. $_CLICK
+$(^NameDA) serÃ¡ desinstalado de la siguiente carpeta. $_CLICK
 # ^UninstallingSubText
 Desinstalando desde:
 # ^FileError
-Error abriendo archivo para escribir: \r\n\r\n$0\r\n\r\nPresione Abortar para detener la instalación,\r\nReintentar para probar otra vez, o\r\nOmitir para ignorar este archivo.
+Error abriendo archivo para escribir: \r\n\r\n$0\r\n\r\nPresione Abortar para detener la instalaciÃ³n,\r\nReintentar para probar otra vez, o\r\nOmitir para ignorar este archivo.
 # ^FileError_NoIgnore
-Error abriendo archivo para escribir: \r\n\r\n$0\r\n\r\nPresione Reintentar para probar otra vez, o\r\nCancelar para detener la instalación.
+Error abriendo archivo para escribir: \r\n\r\n$0\r\n\r\nPresione Reintentar para probar otra vez, o\r\nCancelar para detener la instalaciÃ³n.
 # ^CantWrite
 "No pudo escribirse: "
 # ^CopyFailed
@@ -134,15 +134,15 @@
 # ^Unregistering
 "Eliminando registro: "
 # ^SymbolNotFound
-"No se encontró simbolo: "
+"No se encontrÃ³ simbolo: "
 # ^CouldNotLoad
 "No pudo cargarse: "
 # ^CreateFolder
-"Crear carpeta: "
+"Creando carpeta: "
 # ^CreateShortcut
-"Crear acceso directo: "
+"Creando acceso directo: "
 # ^CreatedUninstaller
-"Crear desinstalador: "
+"Creando desinstalador: "
 # ^Delete
 "Borrar archivo: "
 # ^DeleteOnReboot
@@ -152,19 +152,19 @@
 # ^ErrorCreating
 "Error creando: "
 # ^ErrorDecompressing
-¡Error descomprimiendo datos! ¿Instalador corrupto?
+Â¡Error descomprimiendo datos! Â¿Instalador corrupto?
 # ^ErrorRegistering
 Error registrando DLL
 # ^ExecShell
-"Ejecutar comando: "
+"Ejecutando comando: "
 # ^Exec
-"Ejecutar: "
+"Ejecutando: "
 # ^Extract
-"Extraer: "
+"Extrayendo: "
 # ^ErrorWriting
-"Extraer: error escribiendo al archivo "
+"Extrayendo: error escribiendo al archivo "
 # ^InvalidOpcode
-Instalador corrupto: código de operación no válido
+Instalador corrupto: cÃ³digo de operaciÃ³n no vÃ¡lido
 # ^NoOLE
 "Sin OLE para: "
 # ^OutputFolder
@@ -180,12 +180,12 @@
 # ^CopyDetails
 Copiar Detalles al Portapapeles
 # ^LogInstall
-Registrar proceso de instalación
+Registrar proceso de instalaciÃ³n
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Belarusian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Belarusian.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Belarusian.nsh	(revision 2956)
@@ -1,121 +1,129 @@
-;Language: Belarusian (1059)
-;Translated by Sitnikov Vjacheslav [ glory_man@tut.by ]
+ï»¿;Language: Belarusian (1059)
+;Translated by PrydesparBLR [ prydespar@outlook.com.by ]
 
-!insertmacro LANGFILE "Belarusian" "Byelorussian"
+!insertmacro LANGFILE "Belarusian" = "Ð‘ÐµÐ»Ð°Ñ€ÑƒÑ�ÐºÐ°Ñ�" "Bielaruskaja" ; BieÅ‚aruskaja
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Âàñ âiòàå ìàéñòàð ¢ñòàíî¢ê³ $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ãýòàÿ ïðàãðàìà ¢ñòàëþå $(^NameDA) íà Âàø êàìïóòàð.$\r$\n$\r$\nÏåðàä ïà÷àòêàì óñòàíî¢êi ïðàïàíóåì çà÷ûí³öü óñå ïðàãðàìû, ÿê³ÿ âûêîíâàþööà ¢ ñàïðà¢äíû ìîìàíò. Ãýòà äàïàìîæà ïðàãðàìå ¢ñòàíî¢ê³ àáíàâ³öü ñ³ñòýìíûÿ ôàéëû áåç ïåðàçàãðóçê³ êàìïóòàðà.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Ð’Ð°Ñ� Ð²iÑ‚Ð°Ðµ ÑžÑ�Ñ‚Ð°Ð»Ñ‘ÑžÑˆÑ‡Ñ‹Ðº $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ð“Ñ�Ñ‚Ð° Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ð° ÑžÑ�Ñ‚Ð°Ð»ÑŽÐµ $(^NameDA) Ð½Ð° Ð’Ð°Ñˆ ÐºÐ°Ð¼Ð¿'ÑŽÑ‚Ð°Ñ€.$\r$\n$\r$\nÐŸÐµÑ€Ð°Ð´ ÑƒÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½ÐµÐ¼ Ð¿Ñ€Ð°Ð¿Ð°Ð½ÑƒÐµÐ¼ Ð·Ð°ÐºÑ€Ñ‹Ñ†ÑŒ ÑƒÑ�Ðµ Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹, Ñ�ÐºÑ–Ñ� Ð²Ñ‹ÐºÐ¾Ð½Ð²Ð°ÑŽÑ†Ñ†Ð° Ð½Ð° Ð´Ð°Ð´Ð·ÐµÐ½Ñ‹ Ð¼Ð¾Ð¼Ð°Ð½Ñ‚. Ð“Ñ�Ñ‚Ð° Ð´Ð°Ð¿Ð°Ð¼Ð¾Ð¶Ð° ÑžÑ�Ñ‚Ð°Ð»Ñ‘ÑžÑˆÑ‡Ñ‹ÐºÑƒ Ð°Ð±Ð½Ð°Ð²Ñ–Ñ†ÑŒ Ñ�Ñ–Ñ�Ñ‚Ñ�Ð¼Ð½Ñ‹Ñ� Ñ„Ð°Ð¹Ð»Ñ‹ Ð±ÐµÐ· Ð¿ÐµÑ€Ð°Ð·Ð°Ð¿ÑƒÑ�ÐºÑƒ ÐºÐ°Ð¼Ð¿'ÑŽÑ‚Ð°Ñ€Ð°.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Âàñ âiòàå ìàéñòàð âûäàëåííÿ $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ãýòàÿ ïðàãðàìà âûäàë³öü $(^NameDA) ç Âàøàãà êàìïóòàðà.$\r$\n$\r$\nÏåðàä ïà÷àòêàì âûäàëåííÿ ïåðàêàíàéöåñÿ ¢ òûì, øòî ïðàãðàìà $(^NameDA) íå âûêîíâàåööà.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Ð’Ñ‹ Ð²Ñ‹Ñ€Ð°ÑˆÑ‹Ð»Ñ– Ð²Ñ‹Ð´Ð°Ð»Ñ–Ñ†ÑŒ $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ð“Ñ�Ñ‚Ð° Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ð° Ð²Ñ‹Ð´Ð°Ð»Ñ–Ñ†ÑŒ $(^NameDA) Ð· Ð’Ð°ÑˆÐ°Ð³Ð° ÐºÐ°Ð¼Ð¿'ÑŽÑ‚Ð°Ñ€Ð°.$\r$\n$\r$\nÐŸÐµÑ€Ð°Ð´ Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½ÐµÐ¼ Ð¿ÐµÑ€Ð°ÐºÐ°Ð½Ð°Ð¹Ñ†ÐµÑ�Ñ� Ñž Ñ‚Ñ‹Ð¼, ÑˆÑ‚Ð¾ Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ð° $(^NameDA) Ð½Ðµ Ð·Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð½Ð°.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ëiöåíçiéíàå ïàãàäíåííå"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Êàë³ ëàñêà, ïðà÷ûòàéöå ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ ïåðàä ïà÷àòêàì óñòàíî¢êi $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Êàëi Âû ïðûìàåöå ¢ìîâû Ëiöåíçiéíàãà ïàãàäíåííÿ, íàö³ñí³öå êíîïêó $\"Çãîäçåí$\". Ãýòà íåàáõîäíà äëÿ ¢ñòàíî¢ê³ ïðàãðàìû."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Êàëi Âû ïðûìàåöå ¢ìîâû Ëiöåíçiéíàãà ïàãàäíåííÿ, óñòàëþéöå ñöÿæîê í³æýé. Ãýòà íåàáõîäíà äëÿ ¢ñòàíî¢ê³ ïðàãðàìû. $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Êàëi Âû ïðûìàåöå ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ, âûëó÷ûöå ïåðøû âàðûÿíò ç ïðàïàíîâàíûõ í³æýé. Ãýòà íåàáõîäíà äëÿ ¢ñòàíî¢ê³ ïðàãðàìû. $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ð›iÑ†ÐµÐ½Ð·iÐ¹Ð½Ð°Ðµ Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ðµ"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "ÐšÐ°Ð»Ñ– Ð»Ð°Ñ�ÐºÐ°, Ð¿Ñ€Ð°Ñ‡Ñ‹Ñ‚Ð°Ð¹Ñ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ� Ð¿ÐµÑ€Ð°Ð´ ÑƒÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½ÐµÐ¼ $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "ÐšÐ°Ð»i Ð’Ñ‹ Ð¿Ñ€Ñ‹Ð¼Ð°ÐµÑ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›iÑ†ÐµÐ½Ð·iÐ¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ�, Ð½Ð°Ñ†Ñ–Ñ�Ð½Ñ–Ñ†Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ $\"ÐŸÑ€Ñ‹Ð½Ñ�Ñ†ÑŒ$\". Ð“Ñ�Ñ‚Ð° Ð½ÐµÐ°Ð±Ñ…Ð¾Ð´Ð½Ð° Ð´Ð»Ñ� ÑžÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ñ� Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "ÐšÐ°Ð»i Ð’Ñ‹ Ð¿Ñ€Ñ‹Ð¼Ð°ÐµÑ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›iÑ†ÐµÐ½Ð·iÐ¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ�, Ð½Ð°Ñ†Ñ–Ñ�Ð½Ñ–Ñ†Ðµ Ð½Ð° Ñ�Ñ†Ñ�Ð¶Ð¾Ðº Ð½Ñ–Ð¶Ñ�Ð¹. Ð“Ñ�Ñ‚Ð° Ð½ÐµÐ°Ð±Ñ…Ð¾Ð´Ð½Ð° Ð´Ð»Ñ� ÑžÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ñ� Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ÐšÐ°Ð»i Ð’Ñ‹ Ð¿Ñ€Ñ‹Ð¼Ð°ÐµÑ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ�, Ð²Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ Ð¿ÐµÑ€ÑˆÑ‹ Ð²Ð°Ñ€Ñ‹Ñ�Ð½Ñ‚ Ð· Ð¿Ñ€Ð°Ð¿Ð°Ð½Ð°Ð²Ð°Ð½Ñ‹Ñ… Ð½Ñ–Ð¶Ñ�Ð¹. Ð“Ñ�Ñ‚Ð° Ð½ÐµÐ°Ð±Ñ…Ð¾Ð´Ð½Ð° Ð´Ð»Ñ� ÑžÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ñ� Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ë³öýíç³éíàå ïàãàäíåííå"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Êàë³ ëàñêà, ïðà÷ûòàéöå ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ ïåðàä ïà÷àòêàì âûäàëåííÿ $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Êàë³ Âû ïðûìàåöå ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ, íàö³ñí³öå êíîïêó $\"Çãîäçåí$\". Ãýòà íåàáõîäíà äëÿ âûäàëåííÿ ïðàãðàìû. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Êàë³ Âû ïðûìàåöå ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ, óñòàëþéöå ñöÿæîê í³æýé. Ãýòà íåàáõîäíà äëÿ âûäàëåííÿ ïðàãðàìû. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Êàë³ Âû ïðûìàåöå ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ, âûëó÷ûöå ïåðøû âàðûÿíò ç ïðàïàíàâàíûõ í³æýé. Ãýòà íåàáõîäíà äëÿ âûäàëåííÿ ïðàãðàìû. $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ðµ Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ðµ"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "ÐšÐ°Ð»Ñ– Ð»Ð°Ñ�ÐºÐ°, Ð¿Ñ€Ð°Ñ‡Ñ‹Ñ‚Ð°Ð¹Ñ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ� Ð¿ÐµÑ€Ð°Ð´ Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½ÐµÐ¼ $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "ÐšÐ°Ð»Ñ– Ð’Ñ‹ Ð¿Ñ€Ñ‹Ð¼Ð°ÐµÑ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ�, Ð½Ð°Ñ†Ñ–Ñ�Ð½Ñ–Ñ†Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ $\"ÐŸÑ€Ñ‹Ð½Ñ�Ñ†ÑŒ$\". Ð“Ñ�Ñ‚Ð° Ð½ÐµÐ°Ð±Ñ…Ð¾Ð´Ð½Ð° Ð´Ð»Ñ� Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ñ� Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "ÐšÐ°Ð»Ñ– Ð’Ñ‹ Ð¿Ñ€Ñ‹Ð¼Ð°ÐµÑ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ�, Ð½Ð°Ñ†Ñ–Ñ�Ð½Ñ–Ñ†Ðµ Ð½Ð° Ñ�Ñ†Ñ�Ð¶Ð¾Ðº Ð½Ñ–Ð¶Ñ�Ð¹. Ð“Ñ�Ñ‚Ð° Ð½ÐµÐ°Ð±Ñ…Ð¾Ð´Ð½Ð° Ð´Ð»Ñ� Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ñ� Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ÐšÐ°Ð»Ñ– Ð’Ñ‹ Ð¿Ñ€Ñ‹Ð¼Ð°ÐµÑ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ�, Ð²Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ Ð¿ÐµÑ€ÑˆÑ‹ Ð²Ð°Ñ€Ñ‹Ñ�Ð½Ñ‚ Ð· Ð¿Ñ€Ð°Ð¿Ð°Ð½Ð°Ð²Ð°Ð½Ñ‹Ñ… Ð½Ñ–Ð¶Ñ�Ð¹. Ð“Ñ�Ñ‚Ð° Ð½ÐµÐ°Ð±Ñ…Ð¾Ð´Ð½Ð° Ð´Ð»Ñ� Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ñ� Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Âûêàðûñòî¢âàéöå êíîïêi $\"PageUp$\" i $\"PageDown$\" äëÿ ïåðàìÿø÷ýííÿ ïà òýêñöå."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Ð’Ñ‹ÐºÐ°Ñ€Ñ‹Ñ�Ñ‚Ð¾ÑžÐ²Ð°Ð¹Ñ†Ðµ ÐºÐ½Ð¾Ð¿Ðºi $\"PageUp$\" i $\"PageDown$\" Ð´Ð»Ñ� Ð¿ÐµÑ€Ð°Ð¼Ñ�ÑˆÑ‡Ñ�Ð½Ð½Ñ� Ð¿Ð° Ñ‚Ñ�ÐºÑ�Ñ†Ðµ."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Êàìïàíåíòû ïðàãðàìû, ÿêàÿ ¢ñòàë¸¢âàåööà"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Âûçíà÷öå êàìïàíåíòû $(^NameDA), ÿê³ÿ Âû æàäàåöå ¢ñòàëÿâàöü."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "ÐšÐ°Ð¼Ð¿Ð°Ð½ÐµÐ½Ñ‚Ñ‹ Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹, Ñ�ÐºÐ°Ñ� ÑžÑ�Ñ‚Ð°Ð»Ñ‘ÑžÐ²Ð°ÐµÑ†Ñ†Ð°"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Ð’Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ ÐºÐ°Ð¼Ð¿Ð°Ð½ÐµÐ½Ñ‚Ñ‹ $(^NameDA), Ñ�ÐºÑ–Ñ� Ð’Ñ‹ Ð¶Ð°Ð´Ð°ÐµÑ†Ðµ ÑžÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ñ†ÑŒ."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Êàìïàíåíòû ïðàãðàìû"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Âûçíà÷öå êàìïàíåíòû $(^NameDA), ÿê³ÿ Âû æàäàåöå âûäàë³öü."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "ÐšÐ°Ð¼Ð¿Ð°Ð½ÐµÐ½Ñ‚Ñ‹ Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Ð’Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ ÐºÐ°Ð¼Ð¿Ð°Ð½ÐµÐ½Ñ‚Ñ‹ $(^NameDA), Ñ�ÐºÑ–Ñ� Ð’Ñ‹ Ð¶Ð°Ð´Ð°ÐµÑ†Ðµ Ð²Ñ‹Ð´Ð°Ð»Ñ–Ñ†ÑŒ."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Àï³ñàííå"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Ð�Ð¿Ñ–Ñ�Ð°Ð½Ð½Ðµ"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Óñòàëþéöå êóðñîð ìûøû íà íàçâó êàìïàíåíòà, êàá ïðà÷ûòàöü ÿãî àï³ñàííå."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ÐŸÐµÑ€Ð°Ð¼Ñ�Ñ�Ñ†Ñ–Ñ†Ðµ ÐºÑƒÑ€Ñ�Ð¾Ñ€ Ð¼Ñ‹ÑˆÑ‹ Ð½Ð° Ð½Ð°Ð·Ð²Ñƒ ÐºÐ°Ð¼Ð¿Ð°Ð½ÐµÐ½Ñ‚Ð°, ÐºÐ°Ð± Ð¿Ñ€Ð°Ñ‡Ñ‹Ñ‚Ð°Ñ†ÑŒ Ñ�Ð³Ð¾ Ð°Ð¿Ñ–Ñ�Ð°Ð½Ð½Ðµ."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Óñòàëþéöå êóðñîð ìûøû íà íàçâó êàìïàíåíòà, êàá ïðà÷ûòàöü ÿãî àï³ñàííå."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ð’Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ ÐºÐ°Ð¼Ð¿Ð°Ð½ÐµÐ½Ñ‚, ÐºÐ°Ð± Ð¿Ñ€Ð°Ñ‡Ñ‹Ñ‚Ð°Ñ†ÑŒ Ñ�Ð³Ð¾ Ð°Ð¿Ñ–Ñ�Ð°Ð½Ð½Ðµ."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Âûáàð ïàïê³ ¢ñòàíî¢ê³"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Âûçíà÷öå ïàïêó äëÿ ¢ñòàíî¢ê³ $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Ð’Ñ‹Ð±Ð°Ñ€ Ð¿Ð°Ð¿ÐºÑ– Ð´Ð»Ñ� ÑžÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ñ�"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Ð’Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ Ð¿Ð°Ð¿ÐºÑƒ, Ñƒ Ñ�ÐºÑƒÑŽ Ð¿Ð°Ñ‚Ñ€Ñ�Ð±Ð½Ð° ÑžÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ñ†ÑŒ $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Âûáàð ïàïê³ äëÿ âûäàëåííÿ"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Âûçíà÷öå ïàïêó, ç ÿêîé ïàòðýáíà âûäàë³öü $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Ð’Ñ‹Ð±Ð°Ñ€ Ð¿Ð°Ð¿ÐºÑ– Ð´Ð»Ñ� Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ñ�"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Ð’Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ Ð¿Ð°Ð¿ÐºÑƒ, Ð· Ñ�ÐºÐ¾Ð¹ Ð¿Ð°Ñ‚Ñ€Ñ�Ð±Ð½Ð° Ð²Ñ‹Ð´Ð°Ð»Ñ–Ñ†ÑŒ $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Êàï³ðàâàííå ôàéëà¢"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Ïà÷àêàéöå, êàë³ ëàñêà, âûêîíâàåööà êàï³ðàâàííå ôàéëà¢ $(^NameDA) íà Âàø êàìïóòàð..."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Óñòàíî¢êà çàâåðøàíà"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Óñòàíî¢êà ïàñïÿõîâà çàâåðøàíà."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Óñòàíî¢êà ïåðàðâàíà"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Óñòàíî¢êà íå çàâåðøàíà."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "ÐšÐ°Ð¿Ñ–Ñ�Ð²Ð°Ð½Ð½Ðµ Ñ„Ð°Ð¹Ð»Ð°Ñž"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "ÐŸÐ°Ñ‡Ð°ÐºÐ°Ð¹Ñ†Ðµ, ÐºÐ°Ð»Ñ– Ð»Ð°Ñ�ÐºÐ°, Ð²Ñ‹ÐºÐ¾Ð½Ð²Ð°ÐµÑ†Ñ†Ð° ÐºÐ°Ð¿Ñ–Ñ�Ð²Ð°Ð½Ð½Ðµ Ñ„Ð°Ð¹Ð»Ð°Ñž $(^NameDA) Ð½Ð° Ð’Ð°Ñˆ ÐºÐ°Ð¼Ð¿'ÑŽÑ‚Ð°Ñ€..."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Ð£Ñ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ðµ Ð·Ð°Ð²ÐµÑ€ÑˆÐ°Ð½Ð°"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Ð£Ñ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ðµ Ð¿Ð°Ñ�Ð¿Ñ�Ñ…Ð¾Ð²Ð° Ð·Ð°Ð²ÐµÑ€ÑˆÐ°Ð½Ð°."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Ð£Ñ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ðµ Ð¿ÐµÑ€Ð°Ñ€Ð²Ð°Ð½Ð°"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Ð£Ñ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ðµ Ð½Ðµ Ð·Ð°Ð²ÐµÑ€ÑˆÐ°Ð½Ð°."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Âûäàëåííå"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Ïà÷àêàéöå, êàë³ ëàñêà, âûêîíâàåööà âûäàëåííå ôàéëà¢ $(^NameDA) ç Âàøàãà êàìïóòàðà..."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Âûäàëåííå çàâåðøàíà"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Âûäàëåííå ïðàãðàìû ïàñïÿõîâà çàâåðøàíà."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Âûäàëåííå ïåðàðâàíà"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Âûäàëåííå âûêàíàíà íå ïî¢íàñöþ."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Ð’Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ðµ"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "ÐŸÐ°Ñ‡Ð°ÐºÐ°Ð¹Ñ†Ðµ, ÐºÐ°Ð»Ñ– Ð»Ð°Ñ�ÐºÐ°, Ð²Ñ‹ÐºÐ¾Ð½Ð²Ð°ÐµÑ†Ñ†Ð° Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ðµ Ñ„Ð°Ð¹Ð»Ð°Ñž $(^NameDA) Ð· Ð’Ð°ÑˆÐ°Ð³Ð° ÐºÐ°Ð¼Ð¿'ÑŽÑ‚Ð°Ñ€Ð°..."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Ð’Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ðµ Ð·Ð°Ð²ÐµÑ€ÑˆÐ°Ð½Ð°"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Ð’Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ðµ Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹ Ð¿Ð°Ñ�Ð¿Ñ�Ñ…Ð¾Ð²Ð° Ð·Ð°Ð²ÐµÑ€ÑˆÐ°Ð½Ð°."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Ð’Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ðµ Ð¿ÐµÑ€Ð°Ñ€Ð²Ð°Ð½Ð°"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Ð’Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ðµ Ð²Ñ‹ÐºÐ°Ð½Ð°Ð½Ð° Ð½Ðµ Ð¿Ð¾ÑžÐ½Ð°Ñ�Ñ†ÑŽ."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Çàêàí÷ýííå ìàéñòðà ¢ñòàíî¢ê³ $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Óñòàíî¢êà $(^NameDA) âûêàíàíà.$\r$\n$\r$\nÍàö³ñí³öå êíîïêó $\"Ãàòîâà$\" äëÿ âûéñöÿ ç ïðàãðàìû ¢ñòàíî¢ê³."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Êàá çàêîí÷ûöü óñòàíî¢êó $(^NameDA), íåàáõîäíà ïåðàçàãðóç³öü êàìïóòàð. Ö³ æàäàåöå Âû çðàá³öü ãýòà çàðàç?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Ð—Ð°ÐºÐ°Ð½Ñ‡Ñ�Ð½Ð½Ðµ ÑžÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ñ� $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Ð£Ñ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ðµ $(^NameDA) Ð²Ñ‹ÐºÐ°Ð½Ð°Ð½Ð°.$\r$\n$\r$\nÐ�Ð°Ñ†Ñ–Ñ�Ð½Ñ–Ñ†Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ $\"Ð“Ð°Ñ‚Ð¾Ð²Ð°$\", ÐºÐ°Ð± Ð²Ñ‹Ð¹Ñ�Ñ†Ñ–."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "ÐšÐ°Ð± Ð·Ð°Ð²ÐµÑ€ÑˆÑ‹Ñ†ÑŒ ÑƒÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ðµ $(^NameDA), Ð½ÐµÐ°Ð±Ñ…Ð¾Ð´Ð½Ð° Ð¿ÐµÑ€Ð°Ð·Ð°Ð¿ÑƒÑ�Ñ†Ñ–Ñ†ÑŒ ÐºÐ°Ð¼Ð¿'ÑŽÑ‚Ð°Ñ€. Ð¦Ñ– Ð¶Ð°Ð´Ð°ÐµÑ†Ðµ Ð’Ñ‹ Ð·Ñ€Ð°Ð±Ñ–Ñ†ÑŒ Ð³Ñ�Ñ‚Ð° Ð·Ð°Ñ€Ð°Ð·?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Çàêàí÷ýííå ðàáîòû ìàéñòàðà âûäàëåííÿ $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Ïðàãðàìà $(^NameDA) âûäàëåíà ç Âàøàãà êàìïóòàðà.$\r$\n$\r$\nÍàö³ñí³öå êíîïêó $\"Ãàòîâà$\"êàá âûéñö³ ç ïðàãðàìû âûäàëåííÿ."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Êàá ñêîí÷ûöü âûäàëåííå  $(^NameDA), íåàáõîäíà ïåðàçàãðóç³öü êàìïóòàð. Ö³ æàäàåöå Âû çðàá³öü ãýòà çàðàç?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Ð—Ð°ÐºÐ°Ð½Ñ‡Ñ�Ð½Ð½Ðµ Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ñ� $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Ð’Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ðµ $(^NameDA) Ð· Ð’Ð°ÑˆÐ°Ð³Ð° ÐºÐ°Ð¼Ð¿'ÑŽÑ‚Ð°Ñ€Ð° Ð²Ñ‹ÐºÐ°Ð½Ð°Ð½Ð°.$\r$\n$\r$\nÐ�Ð°Ñ†Ñ–Ñ�Ð½Ñ–Ñ†Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ $\"Ð“Ð°Ñ‚Ð¾Ð²Ð°$\"ÐºÐ°Ð± Ð²Ñ‹Ð¹Ñ�Ñ†Ñ–."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "ÐšÐ°Ð± Ð·Ð°Ð²ÐµÑ€ÑˆÑ‹Ñ†ÑŒ Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ðµ  $(^NameDA), Ð½ÐµÐ°Ð±Ñ…Ð¾Ð´Ð½Ð° Ð¿ÐµÑ€Ð°Ð·Ð°Ð¿ÑƒÑ�Ñ†Ñ–Ñ†ÑŒ ÐºÐ°Ð¼Ð¿'ÑŽÑ‚Ð°Ñ€. Ð¦Ñ– Ð¶Ð°Ð´Ð°ÐµÑ†Ðµ Ð’Ñ‹ Ð·Ñ€Ð°Ð±Ñ–Ñ†ÑŒ Ð³Ñ�Ñ‚Ð° Ð·Ð°Ñ€Ð°Ð·?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Òàê, ïåðàçàãðóç³öü êàìïóòàð çàðàç"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Íå, ïåðàçàãðóç³öü êàìïóòàð ïàçíåé"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "&Çàïóñö³öü $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Ïàêàçàöü ³íôàðìàöûþ àá ïðàãðàìå"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Ãàòîâà"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ð¢Ð°Ðº, Ð¿ÐµÑ€Ð°Ð·Ð°Ð¿ÑƒÑ�Ñ†Ñ–Ñ†ÑŒ ÐºÐ°Ð¼Ð¿'ÑŽÑ‚Ð°Ñ€ Ð·Ð°Ñ€Ð°Ð·"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ð�Ðµ, Ð¿ÐµÑ€Ð°Ð·Ð°Ð¿ÑƒÑ�Ñ†Ñ–Ñ†ÑŒ ÐºÐ°Ð¼Ð¿'ÑŽÑ‚Ð°Ñ€ Ð¿Ð°Ð·Ð½ÐµÐ¹"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&Ð—Ð°Ð¿ÑƒÑ�Ñ†Ñ–Ñ†ÑŒ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&ÐŸÐ°ÐºÐ°Ð·Ð°Ñ†ÑŒ Ñ–Ð½Ñ„Ð°Ñ€Ð¼Ð°Ñ†Ñ‹ÑŽ Ð°Ð± Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ðµ"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Ð“Ð°Ñ‚Ð¾Ð²Ð°"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Ïàïêà ¢ ìåíþ $\"Ïóñê$\""
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Âûëó÷ûöå ïàïêó ¢ ìåíþ $\"Ïóñê$\" äëÿ ðàçìÿø÷ýííÿ ÿðëûêî¢ ïðàãðàìû."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Âûëó÷ûöå ïàïêó ¢ ìåíþ $\"Ïóñê$\", êóäû áóäóöü çìåø÷àíû ÿðëûê³ ïðàãðàìû. Âû òàêñàìà ìîæàöå àçíà÷ûöü ³íøàå ³ìÿ ïàïê³."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Íå ñòâàðàöü ÿðëûê³"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "ÐŸÐ°Ð¿ÐºÐ° Ñž Ð¼ÐµÐ½ÑŽ $\"ÐŸÑƒÑ�Ðº$\""
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Ð’Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ Ð¿Ð°Ð¿ÐºÑƒ Ñž Ð¼ÐµÐ½ÑŽ $\"ÐŸÑƒÑ�Ðº$\" Ð´Ð»Ñ� Ñ€Ð°Ð·Ð¼Ñ�ÑˆÑ‡Ñ�Ð½Ð½Ñ� Ñ�Ñ€Ð»Ñ‹ÐºÐ¾Ñž Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Ð’Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ Ð¿Ð°Ð¿ÐºÑƒ Ñž Ð¼ÐµÐ½ÑŽ $\"ÐŸÑƒÑ�Ðº$\", ÐºÑƒÐ´Ñ‹ Ð±ÑƒÐ´ÑƒÑ†ÑŒ Ð·Ð¼ÐµÑˆÑ‡Ð°Ð½Ñ‹ Ñ�Ñ€Ð»Ñ‹ÐºÑ– Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹. Ð’Ñ‹ Ñ‚Ð°ÐºÑ�Ð°Ð¼Ð° Ð¼Ð¾Ð¶Ð°Ñ†Ðµ ÑžÐ²ÐµÑ�Ñ†Ñ– Ñ–Ð½ÑˆÐ°Ðµ Ñ–Ð¼Ñ� Ð¿Ð°Ð¿ÐºÑ–."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ð�Ðµ Ñ�Ñ‚Ð²Ð°Ñ€Ð°Ñ†ÑŒ Ñ�Ñ€Ð»Ñ‹ÐºÑ–"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Âûäàëåííå $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Âûäàëåííå $(^NameDA) ç Âàøàãà êàìïóòàðà."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Ð’Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ðµ $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Ð’Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ðµ $(^NameDA) Ð· Ð’Ð°ÑˆÐ°Ð³Ð° ÐºÐ°Ð¼Ð¿'ÑŽÑ‚Ð°Ñ€Ð°."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Âû ñàïðà¢äû æàäàåöå ñêàñàâàöü óñòàíî¢êó $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Ð’Ñ‹ Ñ�Ð°Ð¿Ñ€Ð°ÑžÐ´Ñ‹ Ð¶Ð°Ð´Ð°ÐµÑ†Ðµ Ñ�ÐºÐ°Ñ�Ð°Ð²Ð°Ñ†ÑŒ ÑƒÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ðµ $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Âû ñàïðà¢äû æàäàåöå ñêàñàâàöü âûäàëåííå $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ð’Ñ‹ Ñ�Ð°Ð¿Ñ€Ð°ÑžÐ´Ñ‹ Ð¶Ð°Ð´Ð°ÐµÑ†Ðµ Ñ�ÐºÐ°Ñ�Ð°Ð²Ð°Ñ†ÑŒ Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ðµ $(^Name)?"
 !endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Ð’Ñ‹Ð±Ñ€Ð°Ñ†ÑŒ ÐºÐ°Ñ€Ñ‹Ñ�Ñ‚Ð°Ð»ÑŒÐ½Ñ–ÐºÐ°Ñž"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Ð’Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ, Ð´Ð»Ñ� Ñ�ÐºÑ–Ñ… ÐºÐ°Ñ€Ñ‹Ñ�Ñ‚Ð°Ð»ÑŒÐ½Ñ–ÐºÐ°Ñž Ð’Ñ‹ Ñ…Ð¾Ñ‡Ð°Ñ†Ðµ ÑƒÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ñ†ÑŒ $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Ð’Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ, ÑžÑ�Ñ‚Ð°Ð»Ñ‘ÑžÐ²Ð°Ñ†ÑŒ $(^NameDA) Ñ‚Ð¾Ð»ÑŒÐºÑ– Ð´Ð»Ñ� Ñ�Ñ�Ð±Ðµ Ð°Ð±Ð¾ Ð´Ð»Ñ� ÑžÑ�Ñ–Ñ… ÐºÐ°Ñ€Ñ‹Ñ�Ñ‚Ð°Ð»ÑŒÐ½Ñ–ÐºÐ°Ñž Ð³Ñ�Ñ‚Ð°Ð³Ð° ÐºÐ°Ð¼Ð¿'ÑŽÑ‚Ð°Ñ€Ð°. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Ð£Ñ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ñ†ÑŒ Ð´Ð»Ñ� ÑžÑ�Ñ–Ñ… ÐºÐ°Ñ€Ñ‹Ñ�Ñ‚Ð°Ð»ÑŒÐ½Ñ–ÐºÐ°Ñž"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Ð£Ñ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ñ†ÑŒ Ñ‚Ð¾Ð»ÑŒÐºÑ– Ð´Ð»Ñ� Ð±Ñ�Ð³ÑƒÑ‡Ð°Ð³Ð° ÐºÐ°Ñ€Ñ‹Ñ�Ñ‚Ð°Ð»ÑŒÐ½Ñ–ÐºÐ°"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Malay.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Malay.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Malay.nlf	(revision 2956)
@@ -1,12 +1,12 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1086
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
--
+# Codepage - dash (-) means ASCII code page
+1252
 # RTL - anything else than RTL means LTR
 -
 # Translation muhammadazwa@yahoo.com
@@ -183,8 +183,8 @@
 # ^Byte
 Bait
 # ^Kilo
-Kilo
+ Kilo
 # ^Mega
-Mega
+ Mega
 # ^Giga
-Giga
\ No newline at end of file
+ Giga
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Armenian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Armenian.nsh	(revision 0)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Armenian.nsh	(revision 2956)
@@ -0,0 +1,130 @@
+ï»¿;Language: Armenian (1067)
+;Translation by Hrant Ohanyan (h.ohanyan@haysoft.org)
+
+!insertmacro LANGFILE "Armenian" = "Õ€Õ¡ÕµÕ¥Ö€Õ¥Õ¶" "Hayeren" 
+
+!ifdef MUI_WELCOMEPAGE
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Õ�Õ¥Õ¦ Õ¸Õ²Õ»Õ¸Ö‚Õ¶Õ¸Ö‚Õ´ Õ§ $(^NameDA) Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ«Õ¹Õ¨"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ô±ÕµÕ½ Õ®Ö€Õ¡Õ£Õ«Ö€Õ¨ Õ¯Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ« $(^NameDA)-Õ¨ Õ�Õ¥Ö€ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ¹Õ¸Ö‚Õ´Ö‰$\r$\n$\r$\nÔ½Õ¸Ö€Õ°Õ¸Ö‚Ö€Õ¤ Õ¥Õ¶Ö„ Õ¿Õ¡Õ¬Õ«Õ½ ÖƒÕ¡Õ¯Õ¥Õ¬ Õ¡Õ·Õ­Õ¡Õ¿Õ¸Õ² Õ¢Õ¸Õ¬Õ¸Ö€ Õ®Ö€Õ¡Õ£Ö€Õ¥Ö€Õ¨Ö‰ Ô´Õ¡ Õ°Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¯Õ¿Õ¡ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Õ¸Ö‚Ö� Õ°Õ¥Õ¿Õ¸ Õ­Õ¸Ö‚Õ½Õ¡ÖƒÕ¥Õ¬ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ¹Õ¨ Õ¾Õ¥Ö€Õ¡Õ£Õ¸Ö€Õ®Õ¡Ö€Õ¯Õ¥Õ¬Õ¸Ö‚Ö�Ö‰$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_UNWELCOMEPAGE
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Õ�Õ¥Õ¦ Õ¸Õ²Õ»Õ¸Ö‚Õ¶Õ¸Ö‚Õ´ Õ§ $(^NameDA)-Õ¨ Õ°Õ¥Õ¼Õ¡Ö�Õ¶Õ¥Õ¬Õ¸Ö‚ Õ®Ö€Õ¡Õ£Õ«Ö€Õ¨"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ô±ÕµÕ½ Õ®Ö€Õ¡Õ£Õ«Ö€Õ¨ Õ¯Õ»Õ¶Õ»Õ« $(^NameDA)-Õ¨ Õ�Õ¥Ö€ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ¹Õ«Ö�Ö‰$\r$\n$\r$\nÕ‹Õ¶Õ»Õ¥Õ¬Õ¸Ö‚Ö� Õ¡Õ¼Õ¡Õ» Õ°Õ¡Õ´Õ¸Õ¦Õ¾Õ¥Ö„, Õ¸Ö€ $(^NameDA) Õ®Ö€Õ¡Õ£Õ«Ö€Õ¨ Õ¢Õ¡Ö�Õ¡Õ® Õ¹Õ§Ö‰$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ô±Ö€Õ¿Õ¸Õ¶Õ¡Õ£Ö€Õ¡ÕµÕ«Õ¶ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "$(^NameDA)-Õ¨ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Õ¸Ö‚Ö� Õ¡Õ¼Õ¡Õ» Õ®Õ¡Õ¶Õ¸Õ©Õ¡Ö�Õ¥Ö„ Õ¡Ö€Õ¿Õ¸Õ¶Õ¡Õ£Ö€Õ¡ÕµÕ«Õ¶ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶Õ¸Ö‚Õ©ÕµÕ¡Õ¶Õ¨Ö‰"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "ÔµÕ©Õ¥ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶Õ¡Õ£Õ«Ö€Õ¨, Õ¡ÕºÕ¡ Õ½Õ¥Õ²Õ´Õ¥Ö„ $\"Õ€Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶ Õ¥Õ´$\"Ö‰ Ô¾Ö€Õ¡Õ£Õ«Ö€Õ¨ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ ÕºÕ¥Õ¿Ö„ Õ§ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¥Ö„Ö‰"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "ÔµÕ©Õ¥ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶Õ¡Õ£Õ«Ö€Õ¨Õ� Õ¤Ö€Õ¥Ö„ Õ¶Õ«Õ·Õ¨ Õ¶Õ¥Ö€Ö„Ö‡Õ¸Ö‚Õ´Ö‰ Ô¾Ö€Õ¡Õ£Õ«Ö€Õ¨ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ ÕºÕ¥Õ¿Ö„ Õ§ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¥Ö„: $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ÔµÕ©Õ¥ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶Õ¡Õ£Õ«Ö€Õ¨Õ� Õ¨Õ¶Õ¿Ö€Õ¥Ö„ Õ¶Õ¥Ö€Ö„Õ¸Õ¶Õ·ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ«Ö� Õ¡Õ¼Õ¡Õ»Õ«Õ¶Õ¨Ö‰ Ô¾Ö€Õ¡Õ£Õ«Ö€Õ¨ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ ÕºÕ¥Õ¿Ö„ Õ§ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¥Ö„: $_CLICK"
+!endif
+
+!ifdef MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ô±Ö€Õ¿Õ¸Õ¶Õ¡Õ£Ö€Õ¡ÕµÕ«Õ¶ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "$(^NameDA)-Õ¨ Õ»Õ¶Õ»Õ¥Õ¬Õ¸Ö‚Ö� Õ¡Õ¼Õ¡Õ» Õ®Õ¡Õ¶Õ¸Õ©Õ¡Ö�Õ¥Ö„ Õ¡Ö€Õ¿Õ¸Õ¶Õ¡Õ£Ö€Õ¡ÕµÕ«Õ¶ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶Õ¸Ö‚Õ©ÕµÕ¡Õ¶Õ¨Ö‰"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "ÔµÕ©Õ¥ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶Õ¡Õ£Õ«Ö€Õ¨Õ� Õ½Õ¥Õ²Õ´Õ¥Ö„ $\"Õ€Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶ Õ¥Õ´$\" Õ¯Õ¸Õ³Õ¡Õ¯Õ¨Ö‰ Õ‹Õ¶Õ»Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ ÕºÕ¥Õ¿Ö„ Õ§ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¥Ö„Ö‰ $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "ÔµÕ©Õ¥ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶Õ¡Õ£Õ«Ö€Õ¨Õ� Õ¤Ö€Õ¥Ö„ Õ¶Õ«Õ·Õ¨ Õ¶Õ¥Ö€Ö„Ö‡Õ¸Ö‚Õ´Ö‰ Õ‹Õ¶Õ»Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ ÕºÕ¥Õ¿Ö„ Õ§ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¥Ö„Ö‰ $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ÔµÕ©Õ¥ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶Õ¡Õ£Õ«Ö€Õ¨Õ� Õ¨Õ¶Õ¿Ö€Õ¥Ö„ Õ¶Õ¥Ö€Ö„Õ¸Õ¶Õ·ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ«Ö� Õ¡Õ¼Õ¡Õ»Õ«Õ¶Õ¨Ö‰ Õ‹Õ¶Õ»Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ ÕºÕ¥Õ¿Ö„ Õ§ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¥Ö„Ö‰  $_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Õ�Õ¥Ö„Õ½Õ¿Õ¨ Õ¯Õ¡Ö€Õ¤Õ¡Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Ö„ Õ¯Õ¸Õ³Õ¡Õ¯Õ¶Õ¥Ö€Õ� $\"PageUp$\" Ö‡ $\"PageDown$\"Ö‰"
+!endif
+
+!ifdef MUI_COMPONENTSPAGE
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Õ�Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¾Õ¸Õ² Õ®Ö€Õ¡Õ£Ö€Õ« Õ¢Õ¡Õ²Õ¡Õ¤Ö€Õ«Õ¹Õ¶Õ¥Ö€Õ¨"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Ô¸Õ¶Õ¿Ö€Õ¥Ö„ $(^NameDA)-Õ« Õ¢Õ¡Õ²Õ¡Õ¤Ö€Õ«Õ¹Õ¶Õ¥Ö€Õ¨, Õ¸Ö€Õ¸Õ¶Ö„ Ö�Õ¡Õ¶Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Ö‰"
+
+!endif
+
+!ifdef MUI_UNCOMPONENTSPAGE
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Ô¾Ö€Õ¡Õ£Ö€Õ« Õ¢Õ¡Õ²Õ¡Õ¤Ö€Õ«Õ¹Õ¶Õ¥Ö€Õ¨"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Ô¸Õ¶Õ¿Ö€Õ¥Ö„ $(^NameDA)-Õ« Õ¢Õ¡Õ²Õ¡Õ¤Ö€Õ«Õ¹Õ¶Õ¥Ö€Õ¨, Õ¸Ö€Õ¸Õ¶Ö„ Ö�Õ¡Õ¶Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ»Õ¶Õ»Õ¥Õ¬Ö‰"
+!endif
+
+!ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Õ†Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨"
+  !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Õ„Õ¯Õ¶Õ«Õ¯Õ« Õ½Õ¬Õ¡Ö„Õ¨ Õ¸Ö‚Õ²Õ²Õ¥Ö„ Õ¢Õ¡Õ²Õ¡Õ¤Ö€Õ«Õ¹Õ« Õ¾Ö€Õ¡Õ� Õ¶Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¯Õ¡Ö€Õ¤Õ¡Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰"
+  !else
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Õ„Õ¯Õ¶Õ«Õ¯Õ« Õ½Õ¬Õ¡Ö„Õ¨ Õ¸Ö‚Õ²Õ²Õ¥Ö„ Õ¢Õ¡Õ²Õ¡Õ¤Ö€Õ«Õ¹Õ« Õ¾Ö€Õ¡Õ� Õ¶Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¯Õ¡Ö€Õ¤Õ¡Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰"
+  !endif
+!endif
+
+!ifdef MUI_DIRECTORYPAGE
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Õ�Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Õ¸Ö‚ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ« Õ¨Õ¶Õ¿Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Ô¸Õ¶Õ¿Ö€Õ¥Ö„ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ¨, Õ¸Ö€Õ¿Õ¥Õ² ÕºÕ¥Õ¿Ö„ Õ§ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬ $(^NameDA)-Õ¨Ö‰"
+!endif
+
+!ifdef MUI_UNDIRECTORYPAGE
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Õ‹Õ¶Õ»Õ¥Õ¬Õ¸Ö‚ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ« Õ¨Õ¶Õ¿Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Ô¸Õ¶Õ¿Ö€Õ¥Ö„ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ¨, Õ¸Ö€Õ¿Õ¥Õ²Õ«Ö� ÕºÕ¥Õ¿Ö„ Õ§ Õ»Õ¶Õ»Õ¥Õ¬ $(^NameDA)-Õ¨Ö‰"
+!endif
+
+!ifdef MUI_INSTFILESPAGE
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Õ–Õ¡ÕµÕ¬Õ¥Ö€Õ¨ ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¾Õ¸Ö‚Õ´ Õ¥Õ¶"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Õ�ÕºÕ¡Õ½Õ¥Ö„, ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¸Ö‚Õ´ Õ§ $(^NameDA)-Õ« Ö†Õ¡ÕµÕ¬Õ¥Ö€Õ¨..."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Õ�Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¾Õ¥Ö�"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Õ€Õ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¡Õ´Õ¢ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¾Õ¥Ö�"
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Õ�Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¸Ö‚Õ´Õ¨ Õ¨Õ¶Õ¤Õ°Õ¡Õ¿Õ¾Õ¥Õ¬ Õ§Ö‰"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Õ�Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¸Ö‚Õ´Õ¨ Õ¹Õ« Õ¡Õ¾Õ¡Ö€Õ¿Õ¾Õ¥Õ¬Ö‰"
+!endif
+
+!ifdef MUI_UNINSTFILESPAGE
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Õ‹Õ¶Õ»Õ¸Ö‚Õ´ Õ§"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Õ�ÕºÕ¡Õ½Õ¥Ö„, Õ»Õ¶Õ»Õ¸Ö‚Õ´ Õ§ $(^NameDA)-Õ« Ö†Õ¡ÕµÕ¬Õ¥Ö€Õ¨..."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Õ‹Õ¶Õ»Õ¾Õ¥Ö�"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Ô¾Ö€Õ¡Õ£Õ«Ö€Õ¨ Õ°Õ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¡Õ´Õ¢ Õ»Õ¶Õ»Õ¾Õ¥Ö�Ö‰"
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Õ‹Õ¶Õ»Õ´Õ¡Õ¶ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¨Õ¶Õ¤Õ°Õ¡Õ¿Õ¾Õ¥Õ¬ Õ§Ö‰"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Ô¾Ö€Õ¡Õ£Õ«Ö€Õ¨ Õ¡Õ´Õ¢Õ¸Õ²Õ»Õ¸Ö‚Õ©ÕµÕ¡Õ´Õ¢ Õ¹Õ« Õ»Õ¶Õ»Õ¾Õ¥Õ¬Ö‰"
+!endif
+
+!ifdef MUI_FINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "$(^NameDA)-Õ« Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ´Õ¡Õ¶ Õ¡Õ·Õ­Õ¡Õ¿Õ¡Õ¶Ö„Õ« Õ¡Õ¾Õ¡Ö€Õ¿Õ¸Ö‚Õ´"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA)-Õ¨ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¾Õ¥Ö�Ö‰$\r$\n$\r$\nÕ�Õ¥Õ²Õ´Õ¥Ö„ $\"ÕŠÕ¡Õ¿Ö€Õ¡Õ½Õ¿ Õ§$\" Õ¯Õ¸Õ³Õ¡Õ¯Õ¨Õ� Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ«Õ¹Õ¨ ÖƒÕ¡Õ¯Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "$(^NameDA)-Õ« Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¸Ö‚Õ´Õ¨ Õ¡Õ¾Õ¡Ö€Õ¿Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ ÕºÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Ö‚Õ´ Õ§ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ¹Õ« Õ¾Õ¥Ö€Õ¡Õ£Õ¸Ö€Õ®Õ¡Ö€Õ¯Õ¸Ö‚Õ´: ÕŽÕ¥Ö€Õ¡Õ£Õ¸Ö€Õ®Õ¡Ö€Õ¯Õ¥ÕžÕ¬Ö‰"
+!endif
+
+!ifdef MUI_UNFINISHPAGE
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "$(^NameDA)-Õ« Õ»Õ¶Õ»Õ¥Õ¬Õ¸Ö‚ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¡Õ´ÖƒÕ¸ÖƒÕ¸Ö‚Õ´ "
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) Õ®Ö€Õ¡Õ£Õ«Ö€Õ¨ Õ»Õ¶Õ»Õ¾Õ¥Õ¬ Õ§ Õ�Õ¥Ö€ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ¹Õ«Ö�Ö‰ $\r$\n$\r$\nÕ�Õ¥Õ²Õ´Õ¥Ö„ $\"ÕŠÕ¡Õ¿Ö€Õ¡Õ½Õ¿ Õ§ $\" Õ¯Õ¸Õ³Õ¡Õ¯Õ¨Õ� Õ®Ö€Õ¡Õ£Ö€Õ«Ö� Õ¤Õ¸Ö‚Ö€Õ½ Õ£Õ¡Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "$(^NameDA)-Õ« Õ»Õ¶Õ»Õ¸Ö‚Õ´Õ¨ Õ¡Õ¾Õ¡Ö€Õ¿Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ ÕºÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Ö‚Õ´ Õ§ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ¹Õ« Õ¾Õ¥Ö€Õ¡Õ£Õ¸Ö€Õ®Õ¡Ö€Õ¯Õ¸Ö‚Õ´: ÕŽÕ¥Ö€Õ¡Õ£Õ¸Ö€Õ®Õ¡Ö€Õ¯Õ¥ÕžÕ¬Ö‰"
+!endif
+
+!ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ô±ÕµÕ¸, Õ¾Õ¥Ö€Õ¡Õ£Õ¸Ö€Õ®Õ¡Ö€Õ¯Õ¥Õ¬ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ«Õ¹Õ¨Ö‰"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "ÕˆÕ¹, Õ¥Õ½ Õ¾Õ¥Ö€Õ¡Õ£Õ¸Ö€Õ®Õ¡Ö€Õ¯Õ¥Õ´ Õ¡Õ¾Õ¥Õ¬Õ« Õ¸Ö‚Õ·Ö‰"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&Ô²Õ¡Ö�Õ¥Õ¬$(^NameDA)-Õ¨"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Õ‘Õ¸Ö‚Ö�Õ¡Õ¤Ö€Õ¥Õ¬ ReadMe Ö†Õ¡ÕµÕ¬Õ¨"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&ÕŠÕ¡Õ¿Ö€Õ¡Õ½Õ¿ Õ§"  
+!endif
+
+!ifdef MUI_STARTMENUPAGE
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Ô¹Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ� $\"Start$\" Õ¨Õ¶Õ¿Ö€Õ¡Ö�Õ¡Õ¶Õ¯Õ¸Ö‚Õ´"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Ô¸Õ¶Õ¿Ö€Õ¥Ö„ $\"Start$\"-Õ« Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ¨Õ� Õ®Ö€Õ¡Õ£Ö€Õ« ÕºÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€"
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Ô¸Õ¶Õ¿Ö€Õ¥Ö„  $\"Start$\"-Õ« Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ¨, Õ¸Ö€Õ¿Õ¥Õ² Õ¯Õ½Õ¿Õ¥Õ²Õ®Õ¾Õ¥Õ¶ Õ®Ö€Õ¡Õ£Ö€Õ« ÕºÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€Õ¨Ö‰"
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Õ‰Õ½Õ¿Õ¥Õ²Õ®Õ¥Õ¬ ÕºÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€"
+!endif
+
+!ifdef MUI_UNCONFIRMPAGE
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "$(^NameDA)-Õ« Õ»Õ¶Õ»Õ¸Ö‚Õ´"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "$(^NameDA)-Õ¨ Õ»Õ¶Õ»Õ¾Õ¸Ö‚Õ´ Õ§ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ¹Õ«Ö�Ö‰"
+!endif
+
+!ifdef MUI_ABORTWARNING
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Ô¸Õ¶Õ¤Õ°Õ¡Õ¿Õ¥ÕžÕ¬ $(^Name)-Õ« Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¸Ö‚Õ´Õ¨Ö‰"
+!endif
+
+!ifdef MUI_UNABORTWARNING
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ô¿Õ¡Õ¶Õ£Õ¶Õ¥Ö�Õ¶Õ¥ÕžÕ¬ $(^Name)-Õ« Õ»Õ¶Õ»Õ¸Ö‚Õ´Õ¨Ö‰"
+!endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Ô¸Õ¶Õ¿Ö€Õ¥Õ¬ Ö…Õ£Õ¿Õ¾Õ¸Õ²Õ¶Õ¥Ö€Õ«Õ¶"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Ô¸Õ¶Õ¿Ö€Õ¥Ö„, Õ©Õ¥ Õ¸Ö€ Ö…Õ£Õ¿Õ¾Õ¸Õ²Õ¶Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€ Õ¥Ö„ Ö�Õ¡Õ¶Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬ $(^NameDA)-Õ¨:"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Ô¸Õ¶Õ¿Ö€Õ¥Ö„, Õ©Õ¥ Õ«Õ¶Õ¹ÕºÕ¥Õ½ Õ¥Ö„ Ö�Õ¡Õ¶Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬ $(^NameDA)-Õ¨Õ� Õ´Õ«Õ¡ÕµÕ¶ Õ�Õ¥Õ¦ Õ°Õ¡Õ´Õ¡Ö€, Õ©Õ¥ Õ¢Õ¸Õ¬Õ¸Ö€ Ö…Õ£Õ¿Õ¾Õ¸Õ²Õ¶Õ¥Ö€Õ«: $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Õ�Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€ Ö…Õ£Õ¿Õ¾Õ¸Õ²Õ¶Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Õ�Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬ Õ´Õ«Õ¡ÕµÕ¶ Õ«Õ¶Õ± Õ°Õ¡Õ´Õ¡Ö€"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Lithuanian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Lithuanian.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Lithuanian.nsh	(revision 2956)
@@ -1,121 +1,121 @@
-;Language: Lithuanian (1063)
+ï»¿;Language: Lithuanian (1063)
 ;By Vytautas Krivickas (Vytautas). Updated by Danielius Scepanskis (Daan daniel@takas.lt) 2004.01.09
 
-!insertmacro LANGFILE "Lithuanian" "Lietuviu"
+!insertmacro LANGFILE "Lithuanian" = "LietuviÅ³" "Lietuviu"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Sveiki atvykæ á $(^NameDA) ádiegimo programà."
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ði programa jums padës lengvai ádiegti $(^NameDA).$\r$\n$\r$\nRekomenduojama iðjungti visas programas, prieð pradedant ádiegimà. Tai leis atnaujinti sistemos failus neperkraunat kompiuterio.$\r$\n$\r$\n"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Sveiki atvykÄ™ Ä¯ $(^NameDA) Ä¯diegimo programÄ…."
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Å i programa jums padÄ—s lengvai Ä¯diegti $(^NameDA).$\r$\n$\r$\nRekomenduojama iÅ¡jungti visas programas, prieÅ¡ pradedant Ä¯diegimÄ…. Tai leis atnaujinti sistemos failus neperkraunat kompiuterio.$\r$\n$\r$\n"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Sveiki atvykæ á $(^NameDA) paðalinimo programà."
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ði programa jums padës lengvai iðtrinti $(^NameDA).$\r$\n$\r$\nPrieð pradedant pasitikrinkite kad $(^NameDA) yra iðjungta.$\r$\n$\r$\n"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Sveiki atvykÄ™ Ä¯ $(^NameDA) paÅ¡alinimo programÄ…."
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Å i programa jums padÄ—s lengvai iÅ¡trinti $(^NameDA).$\r$\n$\r$\nPrieÅ¡ pradedant pasitikrinkite kad $(^NameDA) yra iÅ¡jungta.$\r$\n$\r$\n"
 !endif
 
 !ifdef MUI_LICENSEPAGE
   ${LangFileString} MUI_TEXT_LICENSE_TITLE "Naudojimo sutartis"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Praðome perskaityti sutartá prieð ádiegdami $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Jei jûs sutinkate su nurodytomis sàlygomis, spauskite Sutinku. Jûs privalote sutikti, jei norite ádiegti $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Jei jûs sutinkate su nurodytomis sàlygomis, padëkite varnelæ tam skirtame laukelyje. Jûs privalote sutikti, jei norite ádiegti $(^NameDA). "
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Jei jûs sutinkate su nurodytomis sàlygomis, pasirinkite pirmà pasirinkimà esantá þemiau. Jûs privalote sutikti, jei norite ádiegti $(^NameDA). "
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "PraÅ¡ome perskaityti sutartÄ¯ prieÅ¡ Ä¯diegdami $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Jei jÅ«s sutinkate su nurodytomis sÄ…lygomis, spauskite Sutinku. JÅ«s privalote sutikti, jei norite Ä¯diegti $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Jei jÅ«s sutinkate su nurodytomis sÄ…lygomis, padÄ—kite varnelÄ™ tam skirtame laukelyje. JÅ«s privalote sutikti, jei norite Ä¯diegti $(^NameDA). "
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Jei jÅ«s sutinkate su nurodytomis sÄ…lygomis, pasirinkite pirmÄ… pasirinkimÄ… esantÄ¯ Å¾emiau. JÅ«s privalote sutikti, jei norite Ä¯diegti $(^NameDA). "
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
   ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Naudojimo sutartis"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Praðome perskaityti sutartá prieð $(^NameDA) paðalinimà."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Jei jûs sutinkate su nurodytomis sàlygomis, spauskite Sutinku. Jûs privalote sutikti, jei norite iðtrinti $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "s, padëkite varnelæ tam skirtame laukelyje. Jûs privalote sutikti, jei norite iðtrinti $(^NameDA). "
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Jei jûs sutinkate su nurodytomis sàlygomis, pasirinkite pirmà pasirinkimà esantá þemiau. Jûs privalote sutikti, jei norite iðtrinti $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "PraÅ¡ome perskaityti sutartÄ¯ prieÅ¡ $(^NameDA) paÅ¡alinimÄ…."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Jei jÅ«s sutinkate su nurodytomis sÄ…lygomis, spauskite Sutinku. JÅ«s privalote sutikti, jei norite iÅ¡trinti $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "s, padÄ—kite varnelÄ™ tam skirtame laukelyje. JÅ«s privalote sutikti, jei norite iÅ¡trinti $(^NameDA). "
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Jei jÅ«s sutinkate su nurodytomis sÄ…lygomis, pasirinkite pirmÄ… pasirinkimÄ… esantÄ¯ Å¾emiau. JÅ«s privalote sutikti, jei norite iÅ¡trinti $(^NameDA)."
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Paspauskite Page Down ir perskaitykite visà sutartá."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Paspauskite Page Down ir perskaitykite visÄ… sutartÄ¯."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
   ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Pasirinkite"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Pasirinkite kokias $(^NameDA) galimybes jûs norite ádiegti."
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Pasirinkite kokias $(^NameDA) galimybes jÅ«s norite Ä¯diegti."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Pasirinkite"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Pasirinkite kokias $(^NameDA) galimybes jûs norite paðalinti."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Pasirinkite kokias $(^NameDA) galimybes jÅ«s norite paÅ¡alinti."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Paaiðkinimas"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "PaaiÅ¡kinimas"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Uþveskite pelës þymeklá ant komponento ir pamatysite jo apraðymà."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "UÅ¾veskite pelÄ—s Å¾ymeklÄ¯ ant komponento ir pamatysite jo apraÅ¡ymÄ…."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Uþveskite pelës þymeklá ant komponento ir pamatysite jo apraðymà."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Pasirinkite komponentÄ¯ ir pamatysite jo apraÅ¡ymÄ…."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Pasirinkite ádiegimo vietà"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Pasirinkite katalogà á kûri ádiegsite $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Pasirinkite Ä¯diegimo vietÄ…"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Pasirinkite katalogÄ… Ä¯ kÅ«ri Ä¯diegsite $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Pasirinkite iðtrinimo vietà"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Pasirinkite katalogà ið kurio iðtrinsite $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Pasirinkite iÅ¡trinimo vietÄ…"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Pasirinkite katalogÄ… iÅ¡ kurio iÅ¡trinsite $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Diegiama"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Praðome palaukti, kol $(^NameDA) bus ádiegtas."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Ádiegimas baigtas"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Ádiegimas baigtas sekmingai."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Ádiegimas nutrauktas"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Ádiegimas nebuvo baigtas sekmingai."
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "PraÅ¡ome palaukti, kol $(^NameDA) bus Ä¯diegtas."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Ä®diegimas baigtas"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Ä®diegimas baigtas sekmingai."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Ä®diegimas nutrauktas"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Ä®diegimas nebuvo baigtas sekmingai."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Ðalinama"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Praðome palaukti, kol $(^NameDA) bus paðalinta."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Programos paðalinimas baigtas"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Iðtrynimas baigtas sekmingai."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Iðtrynimas nutrauktas"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Iðtrynimas nebuvo baigtas sekmingai."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Å alinama"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "PraÅ¡ome palaukti, kol $(^NameDA) bus paÅ¡alinta."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Programos paÅ¡alinimas baigtas"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "IÅ¡trynimas baigtas sekmingai."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "IÅ¡trynimas nutrauktas"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "IÅ¡trynimas nebuvo baigtas sekmingai."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Baigiu $(^NameDA) ádiegimo procesà"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) buvo ádiegtas á jûsø kompiuterá.$\r$\n$\r$\nPaspauskite Baigti."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Jûsø kompiuteris turi bûti perkrautas, kad bûtø baigtas $(^NameDA) ádiegimas. Ar jûs norite perkrauti dabar?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Baigiu $(^NameDA) Ä¯diegimo procesÄ…"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) buvo Ä¯diegtas Ä¯ jÅ«sÅ³ kompiuterÄ¯.$\r$\n$\r$\nPaspauskite Baigti."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "JÅ«sÅ³ kompiuteris turi bÅ«ti perkrautas, kad bÅ«tÅ³ baigtas $(^NameDA) Ä¯diegimas. Ar jÅ«s norite perkrauti dabar?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Baigiu $(^NameDA) paðalinimo programà."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) buvo iðtrinta ið jûsø kompiuterio.$\r$\n$\r$\nPaspauskite Baigti."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Jûsø kompiuteris turi bûti perkrautas, kad bûtø baigtas $(^NameDA) paðalinimas. Ar jûs norite perkrauti dabar?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Baigiu $(^NameDA) paÅ¡alinimo programÄ…."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) buvo iÅ¡trinta iÅ¡ jÅ«sÅ³ kompiuterio.$\r$\n$\r$\nPaspauskite Baigti."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "JÅ«sÅ³ kompiuteris turi bÅ«ti perkrautas, kad bÅ«tÅ³ baigtas $(^NameDA) paÅ¡alinimas. Ar jÅ«s norite perkrauti dabar?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
   ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Perkrauti dabar"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Að noriu perkrauti veliau pats"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "AÅ¡ noriu perkrauti veliau pats"
   ${LangFileString} MUI_TEXT_FINISH_RUN "&Leisti $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Parodyti dokumentacijà"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Parodyti dokumentacijÄ…"
   ${LangFileString} MUI_BUTTONTEXT_FINISH "&Baigti"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Pasirinkite Start Menu katalogà"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Pasirinkite Start Menu katalogà, kuriame bus sukurtos programos nuorodos."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Pasirinkite Start Menu katalogà, kuriame bus sukurtos programos nuorodos. Jûs taip pat galite sukurti naujà katalogà."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Nekurti nuorodø"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Pasirinkite Start Menu katalogÄ…"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Pasirinkite Start Menu katalogÄ…, kuriame bus sukurtos programos nuorodos."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Pasirinkite Start Menu katalogÄ…, kuriame bus sukurtos programos nuorodos. JÅ«s taip pat galite sukurti naujÄ… katalogÄ…."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Nekurti nuorodÅ³"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
   ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Panaikinti $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Iðtrinti $(^NameDA) ið jûsø kompiuterio."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "IÅ¡trinti $(^NameDA) iÅ¡ jÅ«sÅ³ kompiuterio."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Ar jûs tikrai norite iðjungti $(^Name) ádiegimo programà?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Ar jÅ«s tikrai norite iÅ¡jungti $(^Name) Ä¯diegimo programÄ…?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ar jûs tikrai norite iðjungti $(^Name) paðalinimo programà?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ar jÅ«s tikrai norite iÅ¡jungti $(^Name) paÅ¡alinimo programÄ…?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Spanish.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Spanish.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Spanish.nlf	(revision 2956)
@@ -1,52 +1,52 @@
-# Header, don't edit ;Español - España (Alfabetización Tradicional)
+ï»¿# Header, don't edit ;EspaÃ±ol - EspaÃ±a (AlfabetizaciÃ³n Tradicional)
 NLF v6
 # Language ID
 1034
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
 # Translation by MoNKi & Joel
-# Review and minor corrections Darwin Rodrigo Toledo Cáceres (niwrad777@gmail.com) www.winamp-es.com
+# Review and minor corrections Darwin Rodrigo Toledo CÃ¡ceres (niwrad777@gmail.com) www.winamp-es.com
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-Instalación de $(^Name)
+InstalaciÃ³n de $(^Name)
 # ^UninstallCaption
-Desinstalación de $(^Name)
+DesinstalaciÃ³n de $(^Name)
 # ^LicenseSubCaption
 : Acuerdo de Licencia
 # ^ComponentsSubCaption
-: Opciones de Instalación
+: Opciones de InstalaciÃ³n
 # ^DirSubCaption
-: Directorio de Instalación
+: Directorio de InstalaciÃ³n
 # ^InstallingSubCaption
 : Instalando
 # ^CompletedSubCaption
 : Completado
 # ^UnComponentsSubCaption
-: Opciones de Desinstalación
+: Opciones de DesinstalaciÃ³n
 # ^UnDirSubCaption
-: Directorio de Desinstalación
+: Directorio de DesinstalaciÃ³n
 # ^ConfirmSubCaption
-: Confirmación
+: ConfirmaciÃ³n
 # ^UninstallingSubCaption
 : Desinstalando
 # ^UnCompletedSubCaption
 : Completado
 # ^BackBtn
-< &Atrás
+< &AtrÃ¡s
 # ^NextBtn
 &Siguiente >
 # ^AgreeBtn
 A&cepto
 # ^AcceptBtn
-A&cepto los términos de la licencia
+A&cepto los tÃ©rminos de la licencia
 # ^DontAcceptBtn
-&No acepto los términos de la licencia
+&No acepto los tÃ©rminos de la licencia
 # ^InstallBtn
 &Instalar
 # ^UninstallBtn
@@ -62,31 +62,31 @@
 # ^ClickNext
 Presione Siguiente para continuar.
 # ^ClickInstall
-Presione Instalar para comenzar la instalación.
+Presione Instalar para comenzar la instalaciÃ³n.
 # ^ClickUninstall
-Presione Desinstalar para comenzar la desinstalación.
+Presione Desinstalar para comenzar la desinstalaciÃ³n.
 # ^Name
 Nombre
 # ^Completed
 Completado
 # ^LicenseText
-Por favor, revise el acuerdo de licencia antes de instalar $(^NameDA). Si acepta todos los términos del acuerdo, presione Acepto.
+Por favor, revise el acuerdo de licencia antes de instalar $(^NameDA). Si acepta todos los tÃ©rminos del acuerdo, presione Acepto.
 # ^LicenseTextCB
-Por favor, revise el acuerdo de licencia antes de instalar $(^NameDA). Si acepta todos los términos del acuerdo, marque abajo la casilla. $_CLICK
+Por favor, revise el acuerdo de licencia antes de instalar $(^NameDA). Si acepta todos los tÃ©rminos del acuerdo, marque abajo la casilla. $_CLICK
 # ^LicenseTextRB
-Por favor, revise el acuerdo de licencia antes de instalar $(^NameDA). Si acepta todos los términos del acuerdo, seleccione abajo la primera opción. $_CLICK
+Por favor, revise el acuerdo de licencia antes de instalar $(^NameDA). Si acepta todos los tÃ©rminos del acuerdo, seleccione abajo la primera opciÃ³n. $_CLICK
 # ^UnLicenseText
-Por favor, revise el acuerdo de licencia antes de desinstalar $(^NameDA). Si acepta todos los términos del acuerdo, presione Acepto.
+Por favor, revise el acuerdo de licencia antes de desinstalar $(^NameDA). Si acepta todos los tÃ©rminos del acuerdo, presione Acepto.
 # ^UnLicenseTextCB
-Por favor, revise el acuerdo de licencia antes de desinstalar $(^NameDA). Si acepta todos los términos del acuerdo, marque abajo la casilla. $_CLICK.
+Por favor, revise el acuerdo de licencia antes de desinstalar $(^NameDA). Si acepta todos los tÃ©rminos del acuerdo, marque abajo la casilla. $_CLICK.
 # ^UnLicenseTextRB
-Por favor, revise el acuerdo de licencia antes de desinstalar $(^NameDA). Si acepta todos los términos del acuerdo, seleccione abajo la primera opción. $_CLICK
+Por favor, revise el acuerdo de licencia antes de desinstalar $(^NameDA). Si acepta todos los tÃ©rminos del acuerdo, seleccione abajo la primera opciÃ³n. $_CLICK
 # ^Custom
 Personalizada
 # ^ComponentsText
 Marque los componentes que desee instalar y desmarque los componentes que no desee instalar. $_CLICK
 # ^ComponentsSubText1
-Tipos de instalación:
+Tipos de instalaciÃ³n:
 # ^ComponentsSubText2_NoInstTypes
 Seleccione los componentes a instalar:
 # ^ComponentsSubText2
@@ -94,39 +94,39 @@
 # ^UnComponentsText
 Marque los componentes que desee desinstalar y desmarque los componentes que no desee desinstalar. $_CLICK
 # ^UnComponentsSubText1
-Tipos de desinstalación:
+Tipos de desinstalaciÃ³n:
 # ^UnComponentsSubText2_NoInstTypes
 Seleccione los componentes a desinstalar:
 # ^UnComponentsSubText2
 O seleccione los componentes opcionales que desee desinstalar:
 # ^DirText
-El programa de instalación instalará $(^NameDA) en el siguiente directorio. Para instalar en un directorio diferente, presione Examinar y seleccione otro directorio. $_CLICK
+El programa de instalaciÃ³n instalarÃ¡ $(^NameDA) en el siguiente directorio. Para instalar en un directorio diferente, presione Examinar y seleccione otro directorio. $_CLICK
 # ^DirSubText
 Directorio de Destino
 # ^DirBrowseText
-Seleccione el directorio en el que instalará $(^NameDA):
+Seleccione el directorio en el que instalarÃ¡ $(^NameDA):
 # ^UnDirText
-El programa de instalación desinstalará $(^NameDA) del siguiente directorio. Para desinstalar de un directorio diferente, presione Examinar y seleccione otro directorio. $_CLICK
+El programa de instalaciÃ³n desinstalarÃ¡ $(^NameDA) del siguiente directorio. Para desinstalar de un directorio diferente, presione Examinar y seleccione otro directorio. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Seleccione el directorio desde el cual desinstalará $(^NameDA):
+Seleccione el directorio desde el cual desinstalarÃ¡ $(^NameDA):
 # ^SpaceAvailable
 Espacio disponible: 
 # ^SpaceRequired
 Espacio requerido: 
 # ^UninstallingText
-$(^NameDA) será desinstalado del siguiente directorio. $_CLICK
+$(^NameDA) serÃ¡ desinstalado del siguiente directorio. $_CLICK
 # ^UninstallingSubText
 Desinstalando desde:
 # ^FileError
-Error abriendo archivo para escritura: \r\n\t"$0"\r\nPresione abortar para anular la instalación,\r\nreintentar para volver a intentar escribir el archivo, u\r\nomitir para ignorar este archivo
+Error abriendo archivo para escritura: \r\n\t"$0"\r\nPresione abortar para anular la instalaciÃ³n,\r\nreintentar para volver a intentar escribir el archivo, u\r\nomitir para ignorar este archivo
 # ^FileError_NoIgnore
-Error abriendo archivo para escritura: \r\n\t"$0"\r\nPresione reintentar para volver a intentar escribir el archivo, o\r\ncancelar para anular la instalación
+Error abriendo archivo para escritura: \r\n\t"$0"\r\nPresione reintentar para volver a intentar escribir el archivo, o\r\ncancelar para anular la instalaciÃ³n
 # ^CantWrite
 "No pudo escribirse: "
 # ^CopyFailed
-Falló la copia
+FallÃ³ la copia
 # ^CopyTo
 "Copiar a "
 # ^Registering
@@ -134,15 +134,15 @@
 # ^Unregistering
 "Eliminando registro: "
 # ^SymbolNotFound
-"No pudo encontrarse símbolo: "
+"No pudo encontrarse sÃ­mbolo: "
 # ^CouldNotLoad
 "No pudo cargarse: "
 # ^CreateFolder
-"Crear directorio: "
+"Creando directorio: "
 # ^CreateShortcut
-"Crear acceso directo: "
+"Creando acceso directo: "
 # ^CreatedUninstaller
-"Crear desinstalador: "
+"Creando desinstalador: "
 # ^Delete
 "Borrar archivo: "
 # ^DeleteOnReboot
@@ -152,19 +152,19 @@
 # ^ErrorCreating
 "Error creando: "
 # ^ErrorDecompressing
-¡Error descomprimiendo datos! ¿Instalador corrupto?
+Â¡Error descomprimiendo datos! Â¿Instalador corrupto?
 # ^ErrorRegistering
 Error registrando DLL
 # ^ExecShell
-"Ejecutar comando: "
+"Extrayendo  comando: "
 # ^Exec
-"Ejecutar: "
+"Extrayendo : "
 # ^Extract
 "Extraer: "
 # ^ErrorWriting
 "Extraer: error escribiendo al archivo "
 # ^InvalidOpcode
-Instalador corrupto: código de operación no válido
+Instalador corrupto: cÃ³digo de operaciÃ³n no vÃ¡lido
 # ^NoOLE
 "Sin OLE para: "
 # ^OutputFolder
@@ -180,12 +180,12 @@
 # ^CopyDetails
 Copiar Detalles al Portapapeles
 # ^LogInstall
-Registrar proceso de instalación 
+Registrar proceso de instalaciÃ³n 
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Greek.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Greek.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Greek.nsh	(revision 2956)
@@ -1,121 +1,121 @@
-;Language: Greek (1032)
+ï»¿;Language: Greek (1032)
 ;By Makidis N. Michael - http://dias.aueb.gr/~p3010094/
 
-!insertmacro LANGFILE "Greek" "Greek"
+!insertmacro LANGFILE "Greek" = "Î•Î»Î»Î·Î½Î¹ÎºÎ¬" "Ellinika"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Êáëþò Þëèáôå óôçí ÅãêáôÜóôáóç ôïõ '$(^NameDA)'"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ï ïäçãüò áõôüò èá óáò êáèïäçãÞóåé êáôÜ ôç äéÜñêåéá ôçò åãêáôÜóôáóçò ôïõ '$(^NameDA)'.$\r$\n$\r$\nÓõíéóôÜôáé íá êëåßóåôå üëåò ôéò Üëëåò åöáñìïãÝò ðñéí îåêéíÞóåôå ôçí ÅãêáôÜóôáóç. Áõôü èá åðéôñÝøåé óôçí ÅãêáôÜóôáóç íá åíçìåñþóåé ôá ó÷åôéêÜ áñ÷åßá óõóôÞìáôïò ÷ùñßò ôçí åðáíåêêßíçóç ôïõ õðïëïãéóôÞ óáò.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "ÎšÎ±Î»ÏŽÏ‚ Î®Î»Î¸Î±Ï„Îµ ÏƒÏ„Î·Î½ Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Ï„Î¿Ï… '$(^NameDA)'"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "ÎŸ Î¿Î´Î·Î³ÏŒÏ‚ Î±Ï…Ï„ÏŒÏ‚ Î¸Î± ÏƒÎ±Ï‚ ÎºÎ±Î¸Î¿Î´Î·Î³Î®ÏƒÎµÎ¹ ÎºÎ±Ï„Î¬ Ï„Î· Î´Î¹Î¬Ï�ÎºÎµÎ¹Î± Ï„Î·Ï‚ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ Ï„Î¿Ï… '$(^NameDA)'.$\r$\n$\r$\nÎ£Ï…Î½Î¹ÏƒÏ„Î¬Ï„Î±Î¹ Î½Î± ÎºÎ»ÎµÎ¯ÏƒÎµÏ„Îµ ÏŒÎ»ÎµÏ‚ Ï„Î¹Ï‚ Î¬Î»Î»ÎµÏ‚ ÎµÏ†Î±Ï�Î¼Î¿Î³Î­Ï‚ Ï€Ï�Î¹Î½ Î¾ÎµÎºÎ¹Î½Î®ÏƒÎµÏ„Îµ Ï„Î·Î½ Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·. Î‘Ï…Ï„ÏŒ Î¸Î± ÎµÏ€Î¹Ï„Ï�Î­ÏˆÎµÎ¹ ÏƒÏ„Î·Î½ Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î½Î± ÎµÎ½Î·Î¼ÎµÏ�ÏŽÏƒÎµÎ¹ Ï„Î± ÏƒÏ‡ÎµÏ„Î¹ÎºÎ¬ Î±Ï�Ï‡ÎµÎ¯Î± ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Ï‡Ï‰Ï�Î¯Ï‚ Ï„Î·Î½ ÎµÏ€Î±Î½ÎµÎºÎºÎ¯Î½Î·ÏƒÎ· Ï„Î¿Ï… Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î® ÏƒÎ±Ï‚.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Êáëþò Þëèáôå óôïí ïäçãü áðåãêáô. ôïõ '$(^NameDA)'"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ï ïäçãüò áõôüò èá óáò êáèïäçãÞóåé êáôÜ ôç äéÜñêåéá ôçò áðåãêáôÜóôáóçò ôïõ '$(^NameDA)'.$\r$\n$\r$\nÐñéí îåêéíÞóåôå ôçí áðåãêáôÜóôáóç, âåâáéùèåßôå üôé ôï '$(^NameDA)' äåí ôñÝ÷åé.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "ÎšÎ±Î»ÏŽÏ‚ Î®Î»Î¸Î±Ï„Îµ ÏƒÏ„Î¿Î½ Î¿Î´Î·Î³ÏŒ Î±Ï€ÎµÎ³ÎºÎ±Ï„. Ï„Î¿Ï… '$(^NameDA)'"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "ÎŸ Î¿Î´Î·Î³ÏŒÏ‚ Î±Ï…Ï„ÏŒÏ‚ Î¸Î± ÏƒÎ±Ï‚ ÎºÎ±Î¸Î¿Î´Î·Î³Î®ÏƒÎµÎ¹ ÎºÎ±Ï„Î¬ Ï„Î· Î´Î¹Î¬Ï�ÎºÎµÎ¹Î± Ï„Î·Ï‚ Î±Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ Ï„Î¿Ï… '$(^NameDA)'.$\r$\n$\r$\nÎ Ï�Î¹Î½ Î¾ÎµÎºÎ¹Î½Î®ÏƒÎµÏ„Îµ Ï„Î·Î½ Î±Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·, Î²ÎµÎ²Î±Î¹Ï‰Î¸ÎµÎ¯Ï„Îµ ÏŒÏ„Î¹ Ï„Î¿ '$(^NameDA)' Î´ÎµÎ½ Ï„Ï�Î­Ï‡ÎµÎ¹.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Óõìöùíßá ¢äåéáò ×ñÞóçò"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "ÅëÝãîôå ôçí Üäåéá ÷ñÞóçò ðñéí åãêáôáóôÞóåôå ôï '$(^NameDA)'."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "ÅÜí áðïäÝ÷åóôå ôïõò üñïõò ôçò Üäåéáò ÷ñÞóçò, êÜíôå êëéê óôï Óõìöùíþ ãéá íá óõíå÷ßóåôå. ÐñÝðåé íá áðïäå÷èåßôå ôç óõìöùíßá ãéá íá åãêáôáóôÞóåôå ôï '$(^NameDA)'."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "ÅÜí áðïäÝ÷åóôå ôïõò üñïõò ôçò Üäåéáò ÷ñÞóçò, êÜíôå êëéê óôçí åðéëïãÞ ðáñáêÜôù. ÐñÝðåé íá áðïäå÷èåßôå ôç óõìöùíßá ãéá íá åãêáôáóôÞóåôå ôï '$(^NameDA)'. $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ÅÜí áðïäÝ÷åóôå ôïõò üñïõò ôçò Üäåéáò ÷ñÞóçò, êÜíôå êëéê óôçí ðñþôç åðéëïãÞ ðáñáêÜôù. ÐñÝðåé íá áðïäå÷èåßôå ôç óõìöùíßá ãéá íá åãêáôáóôÞóåôå ôï '$(^NameDA)'. $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Î£Ï…Î¼Ï†Ï‰Î½Î¯Î± Î†Î´ÎµÎ¹Î±Ï‚ Î§Ï�Î®ÏƒÎ·Ï‚"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Î•Î»Î­Î³Î¾Ï„Îµ Ï„Î·Î½ Î¬Î´ÎµÎ¹Î± Ï‡Ï�Î®ÏƒÎ·Ï‚ Ï€Ï�Î¹Î½ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¿ '$(^NameDA)'."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Î•Î¬Î½ Î±Ï€Î¿Î´Î­Ï‡ÎµÏƒÏ„Îµ Ï„Î¿Ï…Ï‚ ÏŒÏ�Î¿Ï…Ï‚ Ï„Î·Ï‚ Î¬Î´ÎµÎ¹Î±Ï‚ Ï‡Ï�Î®ÏƒÎ·Ï‚, ÎºÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÏƒÏ„Î¿ Î£Ï…Î¼Ï†Ï‰Î½ÏŽ Î³Î¹Î± Î½Î± ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ. Î Ï�Î­Ï€ÎµÎ¹ Î½Î± Î±Ï€Î¿Î´ÎµÏ‡Î¸ÎµÎ¯Ï„Îµ Ï„Î· ÏƒÏ…Î¼Ï†Ï‰Î½Î¯Î± Î³Î¹Î± Î½Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¿ '$(^NameDA)'."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Î•Î¬Î½ Î±Ï€Î¿Î´Î­Ï‡ÎµÏƒÏ„Îµ Ï„Î¿Ï…Ï‚ ÏŒÏ�Î¿Ï…Ï‚ Ï„Î·Ï‚ Î¬Î´ÎµÎ¹Î±Ï‚ Ï‡Ï�Î®ÏƒÎ·Ï‚, ÎºÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÏƒÏ„Î·Î½ ÎµÏ€Î¹Î»Î¿Î³Î® Ï€Î±Ï�Î±ÎºÎ¬Ï„Ï‰. Î Ï�Î­Ï€ÎµÎ¹ Î½Î± Î±Ï€Î¿Î´ÎµÏ‡Î¸ÎµÎ¯Ï„Îµ Ï„Î· ÏƒÏ…Î¼Ï†Ï‰Î½Î¯Î± Î³Î¹Î± Î½Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¿ '$(^NameDA)'. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Î•Î¬Î½ Î±Ï€Î¿Î´Î­Ï‡ÎµÏƒÏ„Îµ Ï„Î¿Ï…Ï‚ ÏŒÏ�Î¿Ï…Ï‚ Ï„Î·Ï‚ Î¬Î´ÎµÎ¹Î±Ï‚ Ï‡Ï�Î®ÏƒÎ·Ï‚, ÎºÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÏƒÏ„Î·Î½ Ï€Ï�ÏŽÏ„Î· ÎµÏ€Î¹Î»Î¿Î³Î® Ï€Î±Ï�Î±ÎºÎ¬Ï„Ï‰. Î Ï�Î­Ï€ÎµÎ¹ Î½Î± Î±Ï€Î¿Î´ÎµÏ‡Î¸ÎµÎ¯Ï„Îµ Ï„Î· ÏƒÏ…Î¼Ï†Ï‰Î½Î¯Î± Î³Î¹Î± Î½Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¿ '$(^NameDA)'. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Óõìöùíßá ¢äåéáò ×ñÞóçò"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "ÅëÝãîôå ôçí Üäåéá ÷ñÞóçò ðñéí áðåãêáôáóôÞóåôå ôï '$(^NameDA)'."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "ÅÜí áðïäÝ÷åóôå ôïõò üñïõò ôçò Üäåéáò ÷ñÞóçò, êÜíôå êëéê óôï Óõìöùíþ ãéá íá óõíå÷ßóåôå. ÐñÝðåé íá áðïäå÷èåßôå ôç óõìöùíßá ãéá íá áðåãêáôáóôÞóåôå ôï '$(^NameDA)'."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "ÅÜí áðïäÝ÷åóôå ôïõò üñïõò ôçò Üäåéáò ÷ñÞóçò, êÜíôå êëéê óôçí åðéëïãÞ ðáñáêÜôù. ÐñÝðåé íá áðïäå÷èåßôå ôç óõìöùíßá ãéá íá áðåãêáôáóôÞóåôå ôï '$(^NameDA)'. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ÅÜí áðïäÝ÷åóôå ôïõò üñïõò ôçò Üäåéáò ÷ñÞóçò, êÜíôå êëéê óôçí ðñþôç åðéëïãÞ ðáñáêÜôù. ÐñÝðåé íá áðïäå÷èåßôå ôç óõìöùíßá ãéá íá áðåãêáôáóôÞóåôå ôï '$(^NameDA)'. $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Î£Ï…Î¼Ï†Ï‰Î½Î¯Î± Î†Î´ÎµÎ¹Î±Ï‚ Î§Ï�Î®ÏƒÎ·Ï‚"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Î•Î»Î­Î³Î¾Ï„Îµ Ï„Î·Î½ Î¬Î´ÎµÎ¹Î± Ï‡Ï�Î®ÏƒÎ·Ï‚ Ï€Ï�Î¹Î½ Î±Ï€ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¿ '$(^NameDA)'."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Î•Î¬Î½ Î±Ï€Î¿Î´Î­Ï‡ÎµÏƒÏ„Îµ Ï„Î¿Ï…Ï‚ ÏŒÏ�Î¿Ï…Ï‚ Ï„Î·Ï‚ Î¬Î´ÎµÎ¹Î±Ï‚ Ï‡Ï�Î®ÏƒÎ·Ï‚, ÎºÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÏƒÏ„Î¿ Î£Ï…Î¼Ï†Ï‰Î½ÏŽ Î³Î¹Î± Î½Î± ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ. Î Ï�Î­Ï€ÎµÎ¹ Î½Î± Î±Ï€Î¿Î´ÎµÏ‡Î¸ÎµÎ¯Ï„Îµ Ï„Î· ÏƒÏ…Î¼Ï†Ï‰Î½Î¯Î± Î³Î¹Î± Î½Î± Î±Ï€ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¿ '$(^NameDA)'."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Î•Î¬Î½ Î±Ï€Î¿Î´Î­Ï‡ÎµÏƒÏ„Îµ Ï„Î¿Ï…Ï‚ ÏŒÏ�Î¿Ï…Ï‚ Ï„Î·Ï‚ Î¬Î´ÎµÎ¹Î±Ï‚ Ï‡Ï�Î®ÏƒÎ·Ï‚, ÎºÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÏƒÏ„Î·Î½ ÎµÏ€Î¹Î»Î¿Î³Î® Ï€Î±Ï�Î±ÎºÎ¬Ï„Ï‰. Î Ï�Î­Ï€ÎµÎ¹ Î½Î± Î±Ï€Î¿Î´ÎµÏ‡Î¸ÎµÎ¯Ï„Îµ Ï„Î· ÏƒÏ…Î¼Ï†Ï‰Î½Î¯Î± Î³Î¹Î± Î½Î± Î±Ï€ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¿ '$(^NameDA)'. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Î•Î¬Î½ Î±Ï€Î¿Î´Î­Ï‡ÎµÏƒÏ„Îµ Ï„Î¿Ï…Ï‚ ÏŒÏ�Î¿Ï…Ï‚ Ï„Î·Ï‚ Î¬Î´ÎµÎ¹Î±Ï‚ Ï‡Ï�Î®ÏƒÎ·Ï‚, ÎºÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÏƒÏ„Î·Î½ Ï€Ï�ÏŽÏ„Î· ÎµÏ€Î¹Î»Î¿Î³Î® Ï€Î±Ï�Î±ÎºÎ¬Ï„Ï‰. Î Ï�Î­Ï€ÎµÎ¹ Î½Î± Î±Ï€Î¿Î´ÎµÏ‡Î¸ÎµÎ¯Ï„Îµ Ï„Î· ÏƒÏ…Î¼Ï†Ï‰Î½Î¯Î± Î³Î¹Î± Î½Î± Î±Ï€ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¿ '$(^NameDA)'. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "ÐáôÞóôå ôï Page Down ãéá íá äåßôå ôï õðüëïéðï ôçò Üäåéáò ÷ñÞóçò."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Î Î±Ï„Î®ÏƒÏ„Îµ Ï„Î¿ Page Down Î³Î¹Î± Î½Î± Î´ÎµÎ¯Ï„Îµ Ï„Î¿ Ï…Ï€ÏŒÎ»Î¿Î¹Ï€Î¿ Ï„Î·Ï‚ Î¬Î´ÎµÎ¹Î±Ï‚ Ï‡Ï�Î®ÏƒÎ·Ï‚."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "ÅðéëïãÞ Óôïé÷åßùí"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "ÅðéëÝîôå ôá óôïé÷åßá ôïõ '$(^NameDA)' ðïõ èÝëåôå íá åãêáôáóôÞóåôå."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Î•Ï€Î¹Î»Î¿Î³Î® Î£Ï„Î¿Î¹Ï‡ÎµÎ¯Ï‰Î½"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Î•Ï€Î¹Î»Î­Î¾Ï„Îµ Ï„Î± ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î± Ï„Î¿Ï… '$(^NameDA)' Ï€Î¿Ï… Î¸Î­Î»ÎµÏ„Îµ Î½Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "ÅðéëïãÞ Óôïé÷åßùí"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "ÅðéëÝîôå ôá óôïé÷åßá ôïõ '$(^NameDA)' ðïõ èÝëåôå íá áðåãêáôáóôÞóåôå."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Î•Ï€Î¹Î»Î¿Î³Î® Î£Ï„Î¿Î¹Ï‡ÎµÎ¯Ï‰Î½"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Î•Ï€Î¹Î»Î­Î¾Ï„Îµ Ï„Î± ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î± Ï„Î¿Ï… '$(^NameDA)' Ï€Î¿Ï… Î¸Î­Î»ÎµÏ„Îµ Î½Î± Î±Ï€ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "ÐåñéãñáöÞ"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Î ÎµÏ�Î¹Î³Ï�Î±Ï†Î®"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ÐåñÜóôå ôï äåßêôç ôïõ ðïíôéêéïý ðÜíù áðü Ýíá óôïé÷åßï ãéá íá äåßôå ôçí ðåñéãñáöÞ ôïõ."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Î ÎµÏ�Î¬ÏƒÏ„Îµ Ï„Î¿ Î´ÎµÎ¯ÎºÏ„Î· Ï„Î¿Ï… Ï€Î¿Î½Ï„Î¹ÎºÎ¹Î¿Ï� Ï€Î¬Î½Ï‰ Î±Ï€ÏŒ Î­Î½Î± ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î¿ Î³Î¹Î± Î½Î± Î´ÎµÎ¯Ï„Îµ Ï„Î·Î½ Ï€ÎµÏ�Î¹Î³Ï�Î±Ï†Î® Ï„Î¿Ï…."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ÐåñÜóôå ôï äåßêôç ôïõ ðïíôéêéïý ðÜíù áðü Ýíá óôïé÷åßï ãéá íá äåßôå ôçí ðåñéãñáöÞ ôïõ."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Î•Ï€Î¹Î»Î­Î¾Ï„Îµ Î­Î½Î± ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î¿ Î³Î¹Î± Î½Î± Î´ÎµÎ¯Ï„Îµ Ï„Î·Î½ Ï€ÎµÏ�Î¹Î³Ï�Î±Ï†Î® Ï„Î¿Ï…."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "ÅðéëïãÞ ÈÝóçò ÅãêáôÜóôáóçò"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "ÅðéëÝîôå ôï öÜêåëï ìÝóá óôïí ïðïßï èá åãêáôáóôáèåß ôï '$(^NameDA)'."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Î•Ï€Î¹Î»Î¿Î³Î® Î˜Î­ÏƒÎ·Ï‚ Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Î•Ï€Î¹Î»Î­Î¾Ï„Îµ Ï„Î¿ Ï†Î¬ÎºÎµÎ»Î¿ Î¼Î­ÏƒÎ± ÏƒÏ„Î¿Î½ Î¿Ï€Î¿Î¯Î¿ Î¸Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸ÎµÎ¯ Ï„Î¿ '$(^NameDA)'."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "ÅðéëïãÞ ÈÝóçò ÁðåãêáôÜóôáóçò"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "ÅðéëÝîôå ôï öÜêåëï áðü ôïí ïðïßï èá áðåãêáôáóôáèåß ôï '$(^NameDA)'."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Î•Ï€Î¹Î»Î¿Î³Î® Î˜Î­ÏƒÎ·Ï‚ Î‘Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Î•Ï€Î¹Î»Î­Î¾Ï„Îµ Ï„Î¿ Ï†Î¬ÎºÎµÎ»Î¿ Î±Ï€ÏŒ Ï„Î¿Î½ Î¿Ï€Î¿Î¯Î¿ Î¸Î± Î±Ï€ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸ÎµÎ¯ Ï„Î¿ '$(^NameDA)'."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "ÅãêáôÜóôáóç Óå ÅîÝëéîç"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Ðáñáêáëþ ðåñéìÝíåôå üóï ôï '$(^NameDA)' åãêáèßóôáôáé."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Ç ÅãêáôÜóôáóç Ïëïêëçñþèçêå"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Ç åãêáôÜóôáóç ïëïêëçñþèçêå åðéôõ÷þò."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Ç ÅãêáôÜóôáóç Äéáêüðçêå"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Ç åãêáôÜóôáóç äåí ïëïêëçñþèçêå åðéôõ÷þò."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î£Îµ Î•Î¾Î­Î»Î¹Î¾Î·"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Î Î±Ï�Î±ÎºÎ±Î»ÏŽ Ï€ÎµÏ�Î¹Î¼Î­Î½ÎµÏ„Îµ ÏŒÏƒÎ¿ Ï„Î¿ '$(^NameDA)' ÎµÎ³ÎºÎ±Î¸Î¯ÏƒÏ„Î±Ï„Î±Î¹."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Î— Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· ÎŸÎ»Î¿ÎºÎ»Î·Ï�ÏŽÎ¸Î·ÎºÎµ"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Î— ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î¿Î»Î¿ÎºÎ»Î·Ï�ÏŽÎ¸Î·ÎºÎµ ÎµÏ€Î¹Ï„Ï…Ï‡ÏŽÏ‚."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Î— Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î”Î¹Î±ÎºÏŒÏ€Î·ÎºÎµ"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Î— ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î´ÎµÎ½ Î¿Î»Î¿ÎºÎ»Î·Ï�ÏŽÎ¸Î·ÎºÎµ ÎµÏ€Î¹Ï„Ï…Ï‡ÏŽÏ‚."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "ÁðåãêáôÜóôáóç Óå ÅîÝëéîç"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Ðáñáêáëþ ðåñéìÝíåôå üóï ôï '$(^NameDA)' áðåãêáèßóôáôáé."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Ç ÁðåãêáôÜóôáóç Ïëïêëçñþèçêå"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Ç áðåãêáôÜóôáóç ïëïêëçñþèçêå åðéôõ÷þò."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Ç ÁðåãêáôÜóôáóç Äéáêüðçêå"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Ç áðåãêáôÜóôáóç äåí ïëïêëçñþèçêå åðéôõ÷þò."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Î‘Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î£Îµ Î•Î¾Î­Î»Î¹Î¾Î·"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Î Î±Ï�Î±ÎºÎ±Î»ÏŽ Ï€ÎµÏ�Î¹Î¼Î­Î½ÎµÏ„Îµ ÏŒÏƒÎ¿ Ï„Î¿ '$(^NameDA)' Î±Ï€ÎµÎ³ÎºÎ±Î¸Î¯ÏƒÏ„Î±Ï„Î±Î¹."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Î— Î‘Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· ÎŸÎ»Î¿ÎºÎ»Î·Ï�ÏŽÎ¸Î·ÎºÎµ"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Î— Î±Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î¿Î»Î¿ÎºÎ»Î·Ï�ÏŽÎ¸Î·ÎºÎµ ÎµÏ€Î¹Ï„Ï…Ï‡ÏŽÏ‚."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Î— Î‘Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î”Î¹Î±ÎºÏŒÏ€Î·ÎºÎµ"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Î— Î±Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î´ÎµÎ½ Î¿Î»Î¿ÎºÎ»Î·Ï�ÏŽÎ¸Î·ÎºÎµ ÎµÏ€Î¹Ï„Ï…Ï‡ÏŽÏ‚."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "ÏëïêëÞñùóç ôçò ÅãêáôÜóôáóçò ôïõ '$(^NameDA)'"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Ôï '$(^NameDA)' åãêáôáóôÜèçêå óôïí õðïëïãéóôÞ óáò.$\r$\n$\r$\nÊÜíôå êëéê óôï ÔÝëïò ãéá íá êëåßóåôå áõôüí ôïí ïäçãü."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "ÐñÝðåé íá ãßíåé åðáíåêêßíçóç ôïõ õðïëïãéóôÞ óáò ãéá íá ïëïêëçñùèåß ç åãêáôÜóôáóç ôïõ '$(^NameDA)'. ÈÝëåôå íá åðáíåêêéíÞóåôå ôïí õðïëïãéóôÞ óáò ôþñá;"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "ÎŸÎ»Î¿ÎºÎ»Î®Ï�Ï‰ÏƒÎ· Ï„Î·Ï‚ Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ Ï„Î¿Ï… '$(^NameDA)'"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Î¤Î¿ '$(^NameDA)' ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î¬Î¸Î·ÎºÎµ ÏƒÏ„Î¿Î½ Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î® ÏƒÎ±Ï‚.$\r$\n$\r$\nÎšÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÏƒÏ„Î¿ Î¤Î­Î»Î¿Ï‚ Î³Î¹Î± Î½Î± ÎºÎ»ÎµÎ¯ÏƒÎµÏ„Îµ Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ Î¿Î´Î·Î³ÏŒ."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Î Ï�Î­Ï€ÎµÎ¹ Î½Î± Î³Î¯Î½ÎµÎ¹ ÎµÏ€Î±Î½ÎµÎºÎºÎ¯Î½Î·ÏƒÎ· Ï„Î¿Ï… Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î® ÏƒÎ±Ï‚ Î³Î¹Î± Î½Î± Î¿Î»Î¿ÎºÎ»Î·Ï�Ï‰Î¸ÎµÎ¯ Î· ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Ï„Î¿Ï… '$(^NameDA)'. Î˜Î­Î»ÎµÏ„Îµ Î½Î± ÎµÏ€Î±Î½ÎµÎºÎºÎ¹Î½Î®ÏƒÎµÏ„Îµ Ï„Î¿Î½ Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î® ÏƒÎ±Ï‚ Ï„ÏŽÏ�Î±;"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "ÏëïêëÞñùóç ôçò ÁðåãêáôÜóôáóçò ôïõ '$(^NameDA)'"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Ôï '$(^NameDA)' áðåãêáôáóôÜèçêå áðü ôïí õðïëïãéóôÞ óáò.$\r$\n$\r$\nÊÜíôå êëéê óôï ÔÝëïò ãéá íá êëåßóåôå áõôüí ôïí ïäçãü."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "ÐñÝðåé íá ãßíåé åðáíåêêßíçóç ôïõ õðïëïãéóôÞ óáò ãéá íá ïëïêëçñùèåß ç áðåãêáôÜóôáóç ôïõ '$(^NameDA)'. ÈÝëåôå íá åðáíåêêéíÞóåôå ôïí õðïëïãéóôÞ óáò ôþñá;"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "ÎŸÎ»Î¿ÎºÎ»Î®Ï�Ï‰ÏƒÎ· Ï„Î·Ï‚ Î‘Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ Ï„Î¿Ï… '$(^NameDA)'"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Î¤Î¿ '$(^NameDA)' Î±Ï€ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î¬Î¸Î·ÎºÎµ Î±Ï€ÏŒ Ï„Î¿Î½ Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î® ÏƒÎ±Ï‚.$\r$\n$\r$\nÎšÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÏƒÏ„Î¿ Î¤Î­Î»Î¿Ï‚ Î³Î¹Î± Î½Î± ÎºÎ»ÎµÎ¯ÏƒÎµÏ„Îµ Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ Î¿Î´Î·Î³ÏŒ."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Î Ï�Î­Ï€ÎµÎ¹ Î½Î± Î³Î¯Î½ÎµÎ¹ ÎµÏ€Î±Î½ÎµÎºÎºÎ¯Î½Î·ÏƒÎ· Ï„Î¿Ï… Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î® ÏƒÎ±Ï‚ Î³Î¹Î± Î½Î± Î¿Î»Î¿ÎºÎ»Î·Ï�Ï‰Î¸ÎµÎ¯ Î· Î±Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Ï„Î¿Ï… '$(^NameDA)'. Î˜Î­Î»ÎµÏ„Îµ Î½Î± ÎµÏ€Î±Î½ÎµÎºÎºÎ¹Î½Î®ÏƒÎµÏ„Îµ Ï„Î¿Î½ Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î® ÏƒÎ±Ï‚ Ï„ÏŽÏ�Î±;"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Íá ãßíåé åðáíåêêßíçóç ôþñá"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Èá åðáíåêêéíÞóù ôïí õðïëïãéóôÞ ìïõ áñãüôåñá"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "&ÅêôÝëåóç ôïõ '$(^NameDA)'"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "ÅìöÜíéóç ôïõ &áñ÷åßïõ Readme"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&ÔÝëïò"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Î�Î± Î³Î¯Î½ÎµÎ¹ ÎµÏ€Î±Î½ÎµÎºÎºÎ¯Î½Î·ÏƒÎ· Ï„ÏŽÏ�Î±"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Î˜Î± ÎµÏ€Î±Î½ÎµÎºÎºÎ¹Î½Î®ÏƒÏ‰ Ï„Î¿Î½ Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î® Î¼Î¿Ï… Î±Ï�Î³ÏŒÏ„ÎµÏ�Î±"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&Î•ÎºÏ„Î­Î»ÎµÏƒÎ· Ï„Î¿Ï… '$(^NameDA)'"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï„Î¿Ï… &Î±Ï�Ï‡ÎµÎ¯Î¿Ï… Readme"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Î¤Î­Î»Î¿Ï‚"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "ÅðéëïãÞ ÖáêÝëïõ ãéá ôï Ìåíïý ¸íáñîç"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "ÅðéëÝîôå Ýíá öÜêåëï ôïõ ìåíïý ¸íáñîç ãéá ôéò óõíôïìåýóåéò ôïõ '$(^NameDA)'."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "ÅðéëÝîôå Ýíá öÜêåëï ôïõ ìåíïý ¸íáñîç ãéá ôéò óõíôïìåýóåéò ôïõ ðñïãñÜììáôïò. Ìðïñåßôå åðßóçò íá åéóÜãåôå Ýíá üíïìá ãéá íá äçìéïõñãÞóåôå Ýíá íÝï öÜêåëï."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Íá ìç äçìéïõñãçèïýí óõíôïìåýóåéò"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Î•Ï€Î¹Î»Î¿Î³Î® Î¦Î±ÎºÎ­Î»Î¿Ï… Î³Î¹Î± Ï„Î¿ ÎœÎµÎ½Î¿Ï� ÎˆÎ½Î±Ï�Î¾Î·"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Î•Ï€Î¹Î»Î­Î¾Ï„Îµ Î­Î½Î± Ï†Î¬ÎºÎµÎ»Î¿ Ï„Î¿Ï… Î¼ÎµÎ½Î¿Ï� ÎˆÎ½Î±Ï�Î¾Î· Î³Î¹Î± Ï„Î¹Ï‚ ÏƒÏ…Î½Ï„Î¿Î¼ÎµÏ�ÏƒÎµÎ¹Ï‚ Ï„Î¿Ï… '$(^NameDA)'."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Î•Ï€Î¹Î»Î­Î¾Ï„Îµ Î­Î½Î± Ï†Î¬ÎºÎµÎ»Î¿ Ï„Î¿Ï… Î¼ÎµÎ½Î¿Ï� ÎˆÎ½Î±Ï�Î¾Î· Î³Î¹Î± Ï„Î¹Ï‚ ÏƒÏ…Î½Ï„Î¿Î¼ÎµÏ�ÏƒÎµÎ¹Ï‚ Ï„Î¿Ï… Ï€Ï�Î¿Î³Ï�Î¬Î¼Î¼Î±Ï„Î¿Ï‚. ÎœÏ€Î¿Ï�ÎµÎ¯Ï„Îµ ÎµÏ€Î¯ÏƒÎ·Ï‚ Î½Î± ÎµÎ¹ÏƒÎ¬Î³ÎµÏ„Îµ Î­Î½Î± ÏŒÎ½Î¿Î¼Î± Î³Î¹Î± Î½Î± Î´Î·Î¼Î¹Î¿Ï…Ï�Î³Î®ÏƒÎµÏ„Îµ Î­Î½Î± Î½Î­Î¿ Ï†Î¬ÎºÎµÎ»Î¿."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Î�Î± Î¼Î· Î´Î·Î¼Î¹Î¿Ï…Ï�Î³Î·Î¸Î¿Ï�Î½ ÏƒÏ…Î½Ï„Î¿Î¼ÎµÏ�ÏƒÎµÎ¹Ï‚"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "ÁðåãêáôÜóôáóç ôïõ '$(^NameDA)'"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Áöáßñåóç ôïõ '$(^NameDA)' áðü ôïí õðïëïãéóôÞ óáò."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Î‘Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Ï„Î¿Ï… '$(^NameDA)'"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Î‘Ï†Î±Î¯Ï�ÎµÏƒÎ· Ï„Î¿Ï… '$(^NameDA)' Î±Ï€ÏŒ Ï„Î¿Î½ Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î® ÏƒÎ±Ï‚."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Åßóôå óßãïõñïé ðùò èÝëåôå íá ôåñìáôßóåôå ôçí åãêáôÜóôáóç ôïõ '$(^Name)';"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Î•Î¯ÏƒÏ„Îµ ÏƒÎ¯Î³Î¿Ï…Ï�Î¿Î¹ Ï€Ï‰Ï‚ Î¸Î­Î»ÎµÏ„Îµ Î½Î± Ï„ÎµÏ�Î¼Î±Ï„Î¯ÏƒÎµÏ„Îµ Ï„Î·Î½ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Ï„Î¿Ï… '$(^Name)';"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Åßóôå óßãïõñïé ðùò èÝëåôå íá ôåñìáôßóåôå ôçí áðåãêáôÜóôáóç ôïõ '$(^Name)';"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Î•Î¯ÏƒÏ„Îµ ÏƒÎ¯Î³Î¿Ï…Ï�Î¿Î¹ Ï€Ï‰Ï‚ Î¸Î­Î»ÎµÏ„Îµ Î½Î± Ï„ÎµÏ�Î¼Î±Ï„Î¯ÏƒÎµÏ„Îµ Ï„Î·Î½ Î±Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Ï„Î¿Ï… '$(^Name)';"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Danish.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Danish.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Danish.nlf	(revision 2956)
@@ -1,15 +1,16 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
+# Start editing here
 # Language ID
 1030
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
-# Translation by Claus Futtrup
+# Translation by Claus Futtrup, scootergrisen
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
@@ -19,39 +20,39 @@
 # ^LicenseSubCaption
 : Licensaftale
 # ^ComponentsSubCaption
-: Installationsmuligheder
+: Installationsvalgmuligheder
 # ^DirSubCaption
 : Installationsmappe
 # ^InstallingSubCaption
 : Installerer
 # ^CompletedSubCaption
-: Gennemført
+: GennemfÃ¸rt
 # ^UnComponentsSubCaption
-: Afinstallationsmuligheder
+: Afinstallationsvalgmuligheder
 # ^UnDirSubCaption
 : Afinstallationsmappe
 # ^ConfirmSubCaption
-: Bekræft
+: BekrÃ¦ft
 # ^UninstallingSubCaption
 : Afinstallerer
 # ^UnCompletedSubCaption
-: Gennemført
+: GennemfÃ¸rt
 # ^BackBtn
 < &Tilbage
 # ^NextBtn
-&Næste >
+&NÃ¦ste >
 # ^AgreeBtn
 Jeg &accepterer
 # ^AcceptBtn
-Jeg &accepterer vilkårene i licensaftalen
+Jeg &accepterer vilkÃ¥rene i licensaftalen
 # ^DontAcceptBtn
-Jeg &accepterer ikke vilkårene i licensaftalen
+Jeg &accepterer ikke vilkÃ¥rene i licensaftalen
 # ^InstallBtn
 &Installer
 # ^UninstallBtn
 &Afinstaller
 # ^CancelBtn
-Afbryd
+Annuller
 # ^CloseBtn
 &Luk
 # ^BrowseBtn
@@ -59,69 +60,69 @@
 # ^ShowDetailsBtn
 Vis &detaljer
 # ^ClickNext
-Tryk Næste for at fortsætte.
+Tryk pÃ¥ NÃ¦ste for at fortsÃ¦tte.
 # ^ClickInstall
-Tryk Installer for at starte installationen.
+Tryk pÃ¥ Installer for at starte installationen.
 # ^ClickUninstall
-Tryk Afinstaller for at starte afinstallationen.
+Tryk pÃ¥ Afinstaller for at starte afinstallationen.
 # ^Name
 Navn
 # ^Completed
-Gennemført
+GennemfÃ¸rt
 # ^LicenseText
-Læs venligst licensaftalen før installationen af $(^NameDA). Hvis du accepterer alle betingelser i aftalen, skal du trykke 'Jeg accepterer'.
+GennemlÃ¦s venligst licensaftalen fÃ¸r installationen af $(^NameDA). Hvis du accepterer alle vilkÃ¥r i aftalen, skal du klikke pÃ¥ Jeg accepterer.
 # ^LicenseTextCB
-Læs venligst licensaftalen før installationen af $(^NameDA). Hvis du accepterer alle betingelser i aftalen, skal du markere afkrydsningsfeltet nedenfor. $_CLICK
+GennemlÃ¦s venligst licensaftalen fÃ¸r installationen af $(^NameDA). Hvis du accepterer alle vilkÃ¥r i aftalen, skal du klikke pÃ¥ afkrydsningsfeltet nedenfor. $_CLICK
 # ^LicenseTextRB
-Læs venligst licensaftalen før installationen af $(^NameDA). Hvis du accepterer alle betingelser i aftalen, skal du vælge den første mulighed nedenfor. $_CLICK
+GennemlÃ¦s venligst licensaftalen fÃ¸r installationen af $(^NameDA). Hvis du accepterer alle vilkÃ¥r i aftalen, skal du vÃ¦lge den fÃ¸rste valgmulighed nedenfor. $_CLICK
 # ^UnLicenseText
-Læs venligst licensaftalen før afinstallationen af $(^NameDA). Hvis du accepterer alle betingelser i aftalen, skal du trykke 'Jeg accepterer'
+GennemlÃ¦s venligst licensaftalen fÃ¸r afinstallationen af $(^NameDA). Hvis du accepterer alle vilkÃ¥r i aftalen, skal du trykke pÃ¥ Jeg accepterer.
 # ^UnLicenseTextCB
-Læs venligst licensaftalen før afinstallationen af $(^NameDA). Hvis du accepterer alle betingelser i aftalen, skal du markere afkrydsningsfeltet nedenfor. $_CLICK
+GennemlÃ¦s venligst licensaftalen fÃ¸r afinstallationen af $(^NameDA). Hvis du accepterer alle vilkÃ¥r i aftalen, skal du klikke pÃ¥ afkrydsningsfeltet nedenfor. $_CLICK
 # ^UnLicenseTextRB
-Læs venligst licensaftalen før afinstallationen af $(^NameDA). Hvis du accepterer alle betingelser i aftalen, skal du vælge den første mulighed nedenfor $_CLICK
+GennemlÃ¦s venligst licensaftalen fÃ¸r afinstallationen af $(^NameDA). Hvis du accepterer alle vilkÃ¥r i aftalen, skal du vÃ¦lge den fÃ¸rste valgmulighed nedenfor. $_CLICK
 # ^Custom
 Brugerdefineret
 # ^ComponentsText
-Marker de komponenter du vil installere, og fjern markeringen af de komponenter du ikke vil installere. $_CLICK
+TilvÃ¦lg de komponenter du vil installere, og fravÃ¦lg de komponenter du ikke vil installere. $_CLICK
 # ^ComponentsSubText1
-Vælg installationstype:
+VÃ¦lg installationstype:
 # ^ComponentsSubText2_NoInstTypes
-Vælg de komponenter der skal installeres:
+VÃ¦lg de komponenter der skal installeres:
 # ^ComponentsSubText2
-Eller vælg de tillægskomponenter komponenter du ønsker at installere:
+Eller vÃ¦lg de valgfrie komponenter du Ã¸nsker at installere:
 # ^UnComponentsText
-Marker de komponenter du vil afinstallere, og fjern markeringen af de komponenter du ikke vil afinstallere. $_CLICK
+TilvÃ¦lg de komponenter du vil afinstallere, og fravÃ¦lg de komponenter du ikke vil afinstallere. $_CLICK
 # ^UnComponentsSubText1
-Vælg afinstallationstype:
+VÃ¦lg afinstallationstype:
 # ^UnComponentsSubText2_NoInstTypes
-Vælg de komponenter der skal afinstalleres:
+VÃ¦lg de komponenter der skal afinstalleres:
 # ^UnComponentsSubText2
-Eller vælg de tillægskomponenter du ønsker at afinstallere:
+Eller vÃ¦lg de valgfrie komponenter du Ã¸nsker at afinstallere:
 # ^DirText
-Installationsguiden vil installere $(^NameDA) i følgende mappe. For at installere i en anden mappe, tryk Gennemse og vælg en anden mappe. $_CLICK
+Installationsguiden vil installere $(^NameDA) i fÃ¸lgende mappe. For at installere i en anden mappe, tryk pÃ¥ Gennemse og vÃ¦lg en anden mappe. $_CLICK
 # ^DirSubText
 Destinationsmappe
 # ^DirBrowseText
-Vælg den mappe $(^NameDA) skal installeres i:
+VÃ¦lg den mappe hvori $(^NameDA) skal installeres:
 # ^UnDirText
-Installationsguiden vil afinstallere $(^NameDA) fra følgende mappe. For at afinstallere fra en anden mappe, tryk Gennemse og vælg en anden mappe. $_CLICK
+Installationsguiden vil afinstallere $(^NameDA) fra fÃ¸lgende mappe. For at afinstallere fra en anden mappe, tryk pÃ¥ Gennemse og vÃ¦lg en anden mappe. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Vælg den mappe hvorfra $(^NameDA) skal afinstalleres:
+VÃ¦lg den mappe hvorfra $(^NameDA) skal afinstalleres:
 # ^SpaceAvailable
 "Ledig plads: "
 # ^SpaceRequired
-"Nødvendig plads: "
+"NÃ¸dvendig plads: "
 # ^UninstallingText
-$(^NameDA) vil blive afinstalleret fra følgende mappe. $_CLICK
+$(^NameDA) vil blive afinstalleret fra fÃ¸lgende mappe. $_CLICK
 # ^UninstallingSubText
 Afinstallerer fra:
 # ^FileError
-Fejl ved skrivning af fil: \r\n\t"$0"\r\nTryk Afbryd for at afbryde installationen,\r\nPrøv Igen for at prøve at skrive til filen, eller\r\nIgnorer for at springe over denne fil
+Fejl ved skrivning af fil til skrivning: \r\n\r\n$0\r\n\r\nTryk pÃ¥ Annuller for at stoppe installationen,\r\nPrÃ¸v igen for at prÃ¸ve igen, eller\r\nIgnorer for at springe over denne fil.
 # ^FileError_NoIgnore
-Fejl ved åbning af fil: \r\n\t"$0"\r\nTryk Prøv Igen for at prøve at skrive til filen, eller\r\nAfbryd for at afbryde installationen
+Fejl ved Ã¥bning af fil til skrivning: \r\n\r\n$0\r\n\r\nTryk pÃ¥ PrÃ¸v igen for at prÃ¸ve igen, eller\r\nAnnuller for at stoppe installationen.
 # ^CantWrite
 "Kan ikke skrive: "
 # ^CopyFailed
@@ -135,7 +136,7 @@
 # ^SymbolNotFound
 "Kunne ikke finde symbol: "
 # ^CouldNotLoad
-"Kunne ikke hente: "
+"Kunne ikke indlÃ¦se: "
 # ^CreateFolder
 "Opret mappe: "
 # ^CreateShortcut
@@ -151,19 +152,19 @@
 # ^ErrorCreating
 "Fejl ved oprettelse: "
 # ^ErrorDecompressing
-Fejl ved udpakning af data! Installationsguiden skadet?
+Fejl ved udpakning af data! Beskadiget installationsguide?
 # ^ErrorRegistering
 Fejl ved registrering af DLL
 # ^ExecShell
 "ExecShell: "
 # ^Exec
-"Kør: "
+"KÃ¸r: "
 # ^Extract
 "Udpak: "
 # ^ErrorWriting
-"Udpak: Fejl ved skrivning til fil "
+"Udpak: fejl ved skrivning til fil "
 # ^InvalidOpcode
-Installationsguide i stykker: Ugyldig opcode
+Beskadiget installationsguide: ugyldig opcode
 # ^NoOLE
 "Ingen OLE for: "
 # ^OutputFolder
@@ -171,9 +172,9 @@
 # ^RemoveFolder
 "Slet mappe: "
 # ^RenameOnReboot
-"Omdøb ved genstart: "
+"OmdÃ¸b ved genstart: "
 # ^Rename
-"Omdøb: "
+"OmdÃ¸b: "
 # ^Skipped
 "Sprunget over: "
 # ^CopyDetails
@@ -183,8 +184,8 @@
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Latvian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Latvian.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Latvian.nsh	(revision 2956)
@@ -1,122 +1,122 @@
-;Language: Latvieðu [Latvian] - (1062)
-;By Valdis Griíis
-;Corrections by Kristaps Meòìelis / x-f (x-f 'AT' inbox.lv)
+ï»¿;Language: LatvieÅ¡u [Latvian] - (1062)
+;By Valdis GriÄ·is
+;Corrections by Kristaps MeÅ†Ä£elis / x-f (x-f 'AT' inbox.lv)
 
-!insertmacro LANGFILE "Latvian" "Latvieðu"
+!insertmacro LANGFILE "Latvian" = "LatvieÅ¡u" "Latviesu"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Esiet sveicinâti '$(^NameDA)' uzstâdîðanas vednî"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ðis uzstâdîðanas vednis jums palîdzçs veikt '$(^NameDA)' uzstâdîðanu.$\r$\n$\r$\nÏoti ieteicams aizvçrt citas programmas pirms ðîs programmas uzstâdîðanas veikðanas. Tas ïaus atjaunot svarîgus sistçmas failus bez datora pârstartçðanas.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Esiet sveicinÄ�ti '$(^NameDA)' uzstÄ�dÄ«Å¡anas vednÄ«"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Å is uzstÄ�dÄ«Å¡anas vednis jums palÄ«dzÄ“s veikt '$(^NameDA)' uzstÄ�dÄ«Å¡anu.$\r$\n$\r$\nÄ»oti ieteicams aizvÄ“rt citas programmas pirms Å¡Ä«s programmas uzstÄ�dÄ«Å¡anas veikÅ¡anas. Tas Ä¼aus atjaunot svarÄ«gus sistÄ“mas failus bez datora pÄ�rstartÄ“Å¡anas.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Esiet sveicinâti '$(^NameDA)' atinstalçðanas vednî"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ðis vednis jums palîdzçs veikt '$(^NameDA)' atinstalçðanu.$\r$\n$\r$\nPirms sâkt atinstalçðanas procesu, pârliecinieties, vai '$(^NameDA)' paðlaik nedarbojas.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Esiet sveicinÄ�ti '$(^NameDA)' atinstalÄ“Å¡anas vednÄ«"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Å is vednis jums palÄ«dzÄ“s veikt '$(^NameDA)' atinstalÄ“Å¡anu.$\r$\n$\r$\nPirms sÄ�kt atinstalÄ“Å¡anas procesu, pÄ�rliecinieties, vai '$(^NameDA)' paÅ¡laik nedarbojas.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Licences lîgums"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Lûdzu izlasiet licences lîgumu pirms '$(^NameDA)' uzstâdîðanas."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ja piekrîtat licences lîguma noteikumiem, spiediet 'Piekrîtu', lai turpinâtu uzstâdîðanu. Jums ir jâpiekrît licences noteikumiem, lai uzstâdîtu '$(^NameDA)'."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ja piekrîtat licences lîguma noteikumiem, tad atzîmçjiet izvçles rûtiòu. Jums ir jâpiekrît licences noteikumiem, lai uzstâdîtu '$(^NameDA)'. $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ja piekrîtat licences lîguma noteikumiem, tad izvçlieties pirmo zemâkesoðo opciju. Jums ir jâpiekrît licences noteikumiem, lai uzstâdîtu '$(^NameDA)'. $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Licences lÄ«gums"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "LÅ«dzu izlasiet licences lÄ«gumu pirms '$(^NameDA)' uzstÄ�dÄ«Å¡anas."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ja piekrÄ«tat licences lÄ«guma noteikumiem, spiediet 'PiekrÄ«tu', lai turpinÄ�tu uzstÄ�dÄ«Å¡anu. Jums ir jÄ�piekrÄ«t licences noteikumiem, lai uzstÄ�dÄ«tu '$(^NameDA)'."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ja piekrÄ«tat licences lÄ«guma noteikumiem, tad atzÄ«mÄ“jiet izvÄ“les rÅ«tiÅ†u. Jums ir jÄ�piekrÄ«t licences noteikumiem, lai uzstÄ�dÄ«tu '$(^NameDA)'. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ja piekrÄ«tat licences lÄ«guma noteikumiem, tad izvÄ“lieties pirmo zemÄ�kesoÅ¡o opciju. Jums ir jÄ�piekrÄ«t licences noteikumiem, lai uzstÄ�dÄ«tu '$(^NameDA)'. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Licences lîgums"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Lûdzu izlasiet licences lîgumu pirms '$(^NameDA)' atinstalçðanas."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ja piekrîtat licences noteikumiem, spiediet 'Piekrîtu', lai turpinâtu. Jums ir jâpiekrît licences noteikumiem, lai atinstalçtu '$(^NameDA)'."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ja piekrîtat licences lîguma noteikumiem, tad iezîmçjiet izvçles rûtiòu. Jums ir jâpiekrît licences noteikumiem, lai atinstalçtu '$(^NameDA)'. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ja piekrîtat licences lîguma noteikumiem, tad izvçlieties pirmo zemâkesoðo opciju. Jums ir jâpiekrît licences noteikumiem, lai atinstalçtu '$(^NameDA)'. $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Licences lÄ«gums"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "LÅ«dzu izlasiet licences lÄ«gumu pirms '$(^NameDA)' atinstalÄ“Å¡anas."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ja piekrÄ«tat licences noteikumiem, spiediet 'PiekrÄ«tu', lai turpinÄ�tu. Jums ir jÄ�piekrÄ«t licences noteikumiem, lai atinstalÄ“tu '$(^NameDA)'."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ja piekrÄ«tat licences lÄ«guma noteikumiem, tad iezÄ«mÄ“jiet izvÄ“les rÅ«tiÅ†u. Jums ir jÄ�piekrÄ«t licences noteikumiem, lai atinstalÄ“tu '$(^NameDA)'. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ja piekrÄ«tat licences lÄ«guma noteikumiem, tad izvÄ“lieties pirmo zemÄ�kesoÅ¡o opciju. Jums ir jÄ�piekrÄ«t licences noteikumiem, lai atinstalÄ“tu '$(^NameDA)'. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Spiediet 'Page Down', lai aplûkotu visu lîgumu."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Spiediet 'Page Down', lai aplÅ«kotu visu lÄ«gumu."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Izvçlieties komponentus"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Izvçlieties nepiecieðamâs '$(^NameDA)' sastâvdaïas, kuras uzstâdît."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "IzvÄ“lieties komponentus"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "IzvÄ“lieties nepiecieÅ¡amÄ�s '$(^NameDA)' sastÄ�vdaÄ¼as, kuras uzstÄ�dÄ«t."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Izvçlieties komponentus"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Izvçlieties nepiecieðamâs '$(^NameDA)' sastâvdaïas, kuras atinstalçt."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "IzvÄ“lieties komponentus"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "IzvÄ“lieties nepiecieÅ¡amÄ�s '$(^NameDA)' sastÄ�vdaÄ¼as, kuras atinstalÄ“t."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Apraksts"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Novietojiet peles kursoru uz komponenta, lai tiktu parâdîts tâ apraksts."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Novietojiet peles kursoru uz komponenta, lai tiktu parÄ�dÄ«ts tÄ� apraksts."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Novietojiet peles kursoru uz komponenta, lai tiktu parâdîts tâ apraksts."
+    #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO 
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Izvçlieties uzstâdîðanas mapi"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Izvçlieties mapi, kurâ uzstâdît '$(^NameDA)'."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "IzvÄ“lieties uzstÄ�dÄ«Å¡anas mapi"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "IzvÄ“lieties mapi, kurÄ� uzstÄ�dÄ«t '$(^NameDA)'."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Izvçlieties atinstalçðanas mapi"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Izvçlieties mapi, no kuras notiks '$(^NameDA)' atinstalçðana."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "IzvÄ“lieties atinstalÄ“Å¡anas mapi"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "IzvÄ“lieties mapi, no kuras notiks '$(^NameDA)' atinstalÄ“Å¡ana."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Notiek uzstâdîðana"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Lûdzu uzgaidiet, kamçr notiek '$(^NameDA)' uzstâdîðana."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Uzstâdîðana pabeigta"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Uzstâdîðana noritçja veiksmîgi."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Uzstâdîðana atcelta"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Uzstâdîðana nenoritçja veiksmîgi."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Notiek uzstÄ�dÄ«Å¡ana"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "LÅ«dzu uzgaidiet, kamÄ“r notiek '$(^NameDA)' uzstÄ�dÄ«Å¡ana."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "UzstÄ�dÄ«Å¡ana pabeigta"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "UzstÄ�dÄ«Å¡ana noritÄ“ja veiksmÄ«gi."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "UzstÄ�dÄ«Å¡ana atcelta"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "UzstÄ�dÄ«Å¡ana nenoritÄ“ja veiksmÄ«gi."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Notiek atinstalçðana"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Lûdzu uzgaidiet, kamçr '$(^NameDA)' tiek atinstalçta."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Atinstalçðana pabeigta"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Atinstalçðana noritçja veiksmîgi."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Atinstalçðana atcelta"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Atinstalçðana nenoritçja veiksmîgi."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Notiek atinstalÄ“Å¡ana"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "LÅ«dzu uzgaidiet, kamÄ“r '$(^NameDA)' tiek atinstalÄ“ta."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "AtinstalÄ“Å¡ana pabeigta"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "AtinstalÄ“Å¡ana noritÄ“ja veiksmÄ«gi."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "AtinstalÄ“Å¡ana atcelta"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "AtinstalÄ“Å¡ana nenoritÄ“ja veiksmÄ«gi."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Tiek pabeigta '$(^NameDA)' uzstâdîðana"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "'$(^NameDA)' tika veiksmîgi uzstâdîta jûsu datorâ.$\r$\n$\r$\nNospiediet 'Pabeigt', lai aizvçrtu vedni."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Jûsu datoru ir nepiecieðams pârstartçt, lai pabeigtu '$(^NameDA)' uzstâdîðanu. Vai vçlaties pârstartçt datoru tûlît?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Tiek pabeigta '$(^NameDA)' uzstÄ�dÄ«Å¡ana"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "'$(^NameDA)' tika veiksmÄ«gi uzstÄ�dÄ«ta jÅ«su datorÄ�.$\r$\n$\r$\nNospiediet 'Pabeigt', lai aizvÄ“rtu vedni."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "JÅ«su datoru ir nepiecieÅ¡ams pÄ�rstartÄ“t, lai pabeigtu '$(^NameDA)' uzstÄ�dÄ«Å¡anu. Vai vÄ“laties pÄ�rstartÄ“t datoru tÅ«lÄ«t?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Tiek pabeigta '$(^NameDA)' atinstalâcija"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "'$(^NameDA)' tika veiksmîgi izdzçsta no jûsu datora.$\r$\n$\r$\nNospiediet 'Pabeigt', lai aizvçrtu vedni."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Jûsu datoru nepiecieðams pârstartçt, lai pabeigtu '$(^NameDA)' atinstalçðanu. Vai vçlaties pârstartçt datoru tûlît?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Tiek pabeigta '$(^NameDA)' atinstalÄ�cija"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "'$(^NameDA)' tika veiksmÄ«gi izdzÄ“sta no jÅ«su datora.$\r$\n$\r$\nNospiediet 'Pabeigt', lai aizvÄ“rtu vedni."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "JÅ«su datoru nepiecieÅ¡ams pÄ�rstartÄ“t, lai pabeigtu '$(^NameDA)' atinstalÄ“Å¡anu. Vai vÄ“laties pÄ�rstartÄ“t datoru tÅ«lÄ«t?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Pârstartçt tûlît"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Es vçlos pârstartçt pats vçlâk"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "PÄ�rstartÄ“t tÅ«lÄ«t"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Es vÄ“los pÄ�rstartÄ“t pats vÄ“lÄ�k"
   ${LangFileString} MUI_TEXT_FINISH_RUN "P&alaist '$(^NameDA)'"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Pa&râdît LasiMani failu"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Pa&rÄ�dÄ«t LasiMani failu"
   ${LangFileString} MUI_BUTTONTEXT_FINISH "&Pabeigt"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Izvçlieties 'Start Menu' folderi"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Izvçlieties 'Start Menu' mapi '$(^NameDA)' saîsnçm."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Izvçlieties 'Start Menu' mapi, kurâ tiks izveidotas programmas saîsnes. Varat arî pats izveidot jaunu mapi."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Neveidot saîsnes"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "IzvÄ“lieties 'Start Menu' folderi"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "IzvÄ“lieties 'Start Menu' mapi '$(^NameDA)' saÄ«snÄ“m."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "IzvÄ“lieties 'Start Menu' mapi, kurÄ� tiks izveidotas programmas saÄ«snes. Varat arÄ« pats izveidot jaunu mapi."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Neveidot saÄ«snes"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "'$(^NameDA)' atinstalçðana"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Dzçst '$(^NameDA)' no jûsu datora."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "'$(^NameDA)' atinstalÄ“Å¡ana"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "DzÄ“st '$(^NameDA)' no jÅ«su datora."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Vai tieðâm vçlaties pârtraukt '$(^Name)' uzstâdîðanu?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Vai tieÅ¡Ä�m vÄ“laties pÄ�rtraukt '$(^Name)' uzstÄ�dÄ«Å¡anu?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Vai tieðâm vçlaties pârtraukt '$(^Name)' atinstalçðanu?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Vai tieÅ¡Ä�m vÄ“laties pÄ�rtraukt '$(^Name)' atinstalÄ“Å¡anu?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/ScotsGaelic.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/ScotsGaelic.nsh	(revision 0)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/ScotsGaelic.nsh	(revision 2956)
@@ -0,0 +1,129 @@
+ï»¿;Language: GÃ idhlig (1169)
+;Le GunChleoc
+
+!insertmacro LANGFILE "ScotsGaelic" "Scottish Gaelic" "GÃ idhlig" "Gaidhlig"
+
+!ifdef MUI_WELCOMEPAGE
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "FÃ ilte gu stÃ ladh $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "StiÃ¹iridh sinn tron stÃ ladh aig $(^NameDA) thu.$\r$\n$\r$\nMholamaid gun dÃ¹in thu a h-uile aplacaid eile mus tÃ²isich thu air an stÃ ladh. Mar sin, â€™s urrainn dhuinn faidhlichean iomchaidh an t-siostaim Ã¹rachadh gun fheum air ath-thÃ²iseachadh aâ€™ choimpiutair agad.$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_UNWELCOMEPAGE
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "FÃ ilte gun dÃ¬-stÃ ladh aig $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "StiÃ¹iridh sinn tron dÃ¬-stÃ ladh aig $(^NameDA) thu.$\r$\n$\r$\nMus tÃ²isich thu air an dÃ¬-stÃ ladh, dÃ¨an cinnteach nach eil $(^NameDA) aâ€™ ruith.$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Aonta ceadachais"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "An doir thu sÃ¹il air teirmichean aâ€™ cheadachais mus stÃ laich thu $(^NameDA)?"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ma ghabhas tu ri teirmichean an aonta, briog air â€œGabhaidh mi risâ€� gus leantainn air adhart. Feumaidh tu gabhail ris an aonta mus urrainn dhut $(^NameDA) a stÃ ladh."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ma ghabhas tu ri teirmichean an aonta, thoir cromag sa bhogsa gu h-Ã¬osal. Feumaidh tu gabhail ris an aonta mus urrainn dhut $(^NameDA) a stÃ ladh. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ma ghabhas tu ri teirmichean an aonta, tagh aâ€™ chiad roghainn gu h-Ã¬osal. Feumaidh tu gabhail ris an aonta mus urrainn dhut $(^NameDA) a stÃ ladh. $_CLICK"
+!endif
+
+!ifdef MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Aonta ceadachais"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "An doir thu sÃ¹il air teirmichean aâ€™ cheadachais mus dÃ¬-stÃ laich thu $(^NameDA)?"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ma ghabhas tu ri teirmichean an aonta, briog air â€œGabhaidh mi risâ€� gus leantainn air adhart. Feumaidh tu gabhail ris an aonta mus urrainn dhut $(^NameDA) a dhÃ¬-stÃ ladh."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ma ghabhas tu ri teirmichean an aonta, cuir cromag sa bhogsa gu h-Ã¬osal. Feumaidh tu gabhail ris an aonta mus urrainn dhut $(^NameDA) a dhÃ¬-stÃ ladh. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ma ghabhas tu ri teirmichean an aonta, tagh aâ€™ chiad roghainn gu h-Ã¬osal. Feumaidh tu gabhail ris an aonta mus urrainn dhut $(^NameDA) a dhÃ¬-stÃ ladh. $_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "BrÃ¹th air Page Down gus an corr dhen aonta a shealltainn."
+!endif
+
+!ifdef MUI_COMPONENTSPAGE
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Tagh co-phÃ irtean"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Tagh na gleusan aig $(^NameDA) a tha thu airson stÃ ladh."
+!endif
+
+!ifdef MUI_UNCOMPONENTSPAGE
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Tagh co-phÃ irtean"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Tagh na gleusan aig $(^NameDA) a tha thu airson dÃ¬-stÃ ladh."
+!endif
+
+!ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Tuairisgeul"
+  !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Cuir an luchag agad air co-phÃ irt gus a tuairisgeul a shealltainn."
+  !else
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Tagh co-phÃ irt gus a tuairisgeul a shealltainn."
+  !endif
+!endif
+
+!ifdef MUI_DIRECTORYPAGE
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Tagh ionad an stÃ laidh"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Tagh am pasgan san dÃ¨id $(^NameDA) a stÃ ladh."
+!endif
+
+!ifdef MUI_UNDIRECTORYPAGE
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Tagh ionad an dÃ¬-stÃ laidh"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Tagh am pasgan on a thÃ¨id $(^NameDA) a dhÃ¬-stÃ ladh."
+!endif
+
+!ifdef MUI_INSTFILESPAGE
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "â€™Ga stÃ ladh"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Fuirich ort fhad â€™s a tha $(^NameDA) â€™ga stÃ ladh."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "StÃ ladh deiseil"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Tha an stÃ ladh deiseil."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Chaidh sgur dhen stÃ ladh"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Cha deach an stÃ ladh a choileanadh."
+!endif
+
+!ifdef MUI_UNINSTFILESPAGE
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "â€™Ga dhÃ¬-stÃ ladh"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Fuirich ort fhad â€™s a tha $(^NameDA) â€™ga dhÃ¬-stÃ ladh."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "DÃ¬-stÃ ladh deiseil"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Chaidh a dhÃ¬-stÃ ladh."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Chaidh sgur dhen dÃ¬-stÃ ladh"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Cha deach an dÃ¬-stÃ ladh a choileanadh."
+!endif
+
+!ifdef MUI_FINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Aâ€™ coileanadh an stÃ laidh aig $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Chaidh $(^NameDA) a stÃ ladh air aâ€™ choimpiutair agad.$\r$\n$\r$\nBriog air â€œCrÃ¬ochnaichâ€� gus an t-inneal-stÃ laidh a dhÃ¹nadh."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Tha ath-thÃ²iseachadh a dhÃ¬th air aâ€™ choimpiutair agad gus an stÃ ladh aig $(^NameDA) a choileanadh. A bheil thu airson ath-thÃ²iseachadh an-drÃ sta?"
+!endif
+
+!ifdef MUI_UNFINISHPAGE
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Aâ€™ coileanadh an dÃ¬-stÃ laidh aig $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Chaidh $(^NameDA) a dhÃ¬-stÃ ladh on choimpiutair agad.$\r$\n$\r$\nBriog air â€œCrÃ¬ochnaichâ€� gus an t-inneal-stÃ laidh a dhÃ¹nadh."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Tha ath-thÃ²iseachadh a dhÃ¬th air aâ€™ choimpiutair agad gus an dÃ¬-stÃ ladh aig $(^NameDA) a choileanadh. A bheil thu airson ath-thÃ²iseachadh an-drÃ sta?"
+!endif
+
+!ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ath-tÃ²isich an-drÃ sta"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "NÃ¬ mi fhÃ¬n ath-thÃ²iseachadh a lÃ imh uaireigin eile"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&Ruith $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Seall am faidhle â€œLeughmiâ€�"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&CrÃ¬ochnaich"
+!endif
+
+!ifdef MUI_STARTMENUPAGE
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Tagh pasgan sa chlÃ r-taice tÃ²iseachaidh"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Tagh pasgan sa chlÃ r-taice tÃ²iseachaidh airson na h-ath-ghoiridean aig $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Tagh pasgan sa chlÃ r-taice tÃ²iseachaidh sa bheil thu airson na h-ath-ghoiridean aig aâ€™ phrÃ²gram a chruthachadh. â€™S urrainn dhut cuideachd ainm a chur a-steach gus pasgan Ã¹r a chruthachadh."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Na cruthaich ath-ghoiridean"
+!endif
+
+!ifdef MUI_UNCONFIRMPAGE
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "DÃ¬-stÃ laich $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Thoir $(^NameDA) air falbh on choimpiutair agad."
+!endif
+
+!ifdef MUI_ABORTWARNING
+  ${LangFileString} MUI_TEXT_ABORTWARNING "A bheil thu cinnteach gu bheil thu airson an stÃ ladh aig $(^Name) fhÃ gail?"
+!endif
+
+!ifdef MUI_UNABORTWARNING
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "A bheil thu cinnteach gu bheil thu airson an dÃ¬-stÃ ladh aig $(^Name) fhÃ gail?"
+!endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Tagh cleachdaichean"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Tagh na cleachdaichean dhan a thÃ¨id $(^NameDA) a stÃ ladh."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Tagh an stÃ laich thu $(^NameDA) air do shon fhÃ¬n a-mhÃ in no airson a h-uile cleachdaiche air aâ€™ choimpiutair seo. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "StÃ laich airson duine sam bith a chleachdas an coimpiutair seo"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Na stÃ laich ach air mo shon-sa"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/SerbianLatin.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/SerbianLatin.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/SerbianLatin.nlf	(revision 2956)
@@ -1,15 +1,15 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 2074
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1250
 # RTL - anything else than RTL means LTR
 -
-# Translation by Srðan Obuæina <obucina@srpskijezik.edu.yu>
+# Translation by SrÄ‘an ObuÄ‡ina <obucina@srpskijezik.edu.yu>
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
@@ -17,7 +17,7 @@
 # ^UninstallCaption
 $(^Name) Deinstalacija
 # ^LicenseSubCaption
-: Dogovor o pravu korišæenja
+: Dogovor o pravu koriÅ¡Ä‡enja
 # ^ComponentsSubCaption
 : Opcije instalacije
 # ^DirSubCaption
@@ -25,17 +25,17 @@
 # ^InstallingSubCaption
 : Instalacija
 # ^CompletedSubCaption
-: Završena instalacija
+: ZavrÅ¡ena instalacija
 # ^UnComponentsSubCaption
 : Opcije deinstalacije
 # ^UnDirSubCaption
 : Izbor foldera za deinstalaciju
 # ^ConfirmSubCaption
-: Potvrðivanje
+: PotvrÄ‘ivanje
 # ^UninstallingSubCaption
 : Deinstalacija
 # ^UnCompletedSubCaption
-: Završena deinstalacija
+: ZavrÅ¡ena deinstalacija
 # ^BackBtn
 < Nazad
 # ^NextBtn
@@ -43,9 +43,9 @@
 # ^AgreeBtn
 Prihvatam
 # ^AcceptBtn
-Prihvatam uslove dogovora o pravu korišæenja
+Prihvatam uslove dogovora o pravu koriÅ¡Ä‡enja
 # ^DontAcceptBtn
-Ne prihvatam uslove dogovora o pravu korišæenja
+Ne prihvatam uslove dogovora o pravu koriÅ¡Ä‡enja
 # ^InstallBtn
 Instaliraj
 # ^UninstallBtn
@@ -59,73 +59,73 @@
 # ^ShowDetailsBtn
 Detalji
 # ^ClickNext
-Pritisnite dugme „Napred“ za nastavak.
+Pritisnite dugme â€žNapredâ€œ za nastavak.
 # ^ClickInstall
-Pritisnite dugme „Instaliraj“ za poèetak instalacije.
+Pritisnite dugme â€žInstalirajâ€œ za poÄ�etak instalacije.
 # ^ClickUninstall
-Pritisnite dugme „Deinstaliraj“ za poèetak deinstalacije.
+Pritisnite dugme â€žDeinstalirajâ€œ za poÄ�etak deinstalacije.
 # ^Name
 Ime
 # ^Completed
-Završeno
+ZavrÅ¡eno
 # ^LicenseText
-Pažlivo proèitajte dogovor o pravu korišæenja pre instalacije programa $(^NameDA). Ako prihvatate sve uslove dogovora, pritisnite dugme „Prihvatam“.
+PaÅ¾livo proÄ�itajte dogovor o pravu koriÅ¡Ä‡enja pre instalacije programa $(^NameDA). Ako prihvatate sve uslove dogovora, pritisnite dugme â€žPrihvatamâ€œ.
 # ^LicenseTextCB
-Pažlivo proèitajte dogovor o pravu korišæenja pre instalacije programa $(^NameDA). Ako prihvatate sve uslove dogovora, obeležite kvadratiæ ispod. $_CLICK
+PaÅ¾livo proÄ�itajte dogovor o pravu koriÅ¡Ä‡enja pre instalacije programa $(^NameDA). Ako prihvatate sve uslove dogovora, obeleÅ¾ite kvadratiÄ‡ ispod. $_CLICK
 # ^LicenseTextRB
-Pažlivo proèitajte dogovor o pravu korišæenja pre instalacije programa $(^NameDA). Ako prihvatate sve uslove dogovora, izaberite prvu opciju ispod. $_CLICK
+PaÅ¾livo proÄ�itajte dogovor o pravu koriÅ¡Ä‡enja pre instalacije programa $(^NameDA). Ako prihvatate sve uslove dogovora, izaberite prvu opciju ispod. $_CLICK
 # ^UnLicenseText
-Pažlivo proèitajte dogovor o pravu korišæenja pre deinstalacije programa $(^NameDA). Ako prihvatate sve uslove dogovora, pritisnite dugme „Prihvatam“.
+PaÅ¾livo proÄ�itajte dogovor o pravu koriÅ¡Ä‡enja pre deinstalacije programa $(^NameDA). Ako prihvatate sve uslove dogovora, pritisnite dugme â€žPrihvatamâ€œ.
 # ^UnLicenseTextCB
-Pažlivo proèitajte dogovor o pravu korišæenja pre deinstalacije programa $(^NameDA). Ako prihvatate sve uslove dogovora, obeležite kvadratiæ ispod. $_CLICK
+PaÅ¾livo proÄ�itajte dogovor o pravu koriÅ¡Ä‡enja pre deinstalacije programa $(^NameDA). Ako prihvatate sve uslove dogovora, obeleÅ¾ite kvadratiÄ‡ ispod. $_CLICK
 # ^UnLicenseTextRB
-Pažlivo proèitajte dogovor o pravu korišæenja pre deinstalacije programa $(^NameDA). Ako prihvatate sve uslove dogovora, izaberite prvu opciju ispod. $_CLICK
+PaÅ¾livo proÄ�itajte dogovor o pravu koriÅ¡Ä‡enja pre deinstalacije programa $(^NameDA). Ako prihvatate sve uslove dogovora, izaberite prvu opciju ispod. $_CLICK
 # ^Custom
-Prilagoðavanje
+PrilagoÄ‘avanje
 # ^ComponentsText
-Izaberite komponente za instalaciju. Instaliraju se samo oznaèene komponente. $_CLICK
+Izaberite komponente za instalaciju. Instaliraju se samo oznaÄ�ene komponente. $_CLICK
 # ^ComponentsSubText1
 Izaberite tip instalacije:
 # ^ComponentsSubText2_NoInstTypes
 Izaberite komponente za instalaciju: 
 # ^ComponentsSubText2
-Ili, izaberite opcione komponente koje želite da instalirate: 
+Ili, izaberite opcione komponente koje Å¾elite da instalirate: 
 # ^UnComponentsText
-Izaberite komponente za deinstalaciju. Deinstaliraju se samo oznaèene komponente. $_CLICK
+Izaberite komponente za deinstalaciju. Deinstaliraju se samo oznaÄ�ene komponente. $_CLICK
 # ^UnComponentsSubText1
 Izaberite tip deinstalacije: 
 # ^UnComponentsSubText2_NoInstTypes
 Izaberite komponente za deinstalaciju: 
 # ^UnComponentsSubText2
-Ili, izaberite opcione komponente koje želite da deinstalirate: 
+Ili, izaberite opcione komponente koje Å¾elite da deinstalirate: 
 # ^DirText
-Program $(^NameDA) æe biti instaliran u navedeni folder. Za instalaciju u drugi folder pritisnite dugme „Izbor...“ i izaberite folder. $_CLICK
+Program $(^NameDA) Ä‡e biti instaliran u navedeni folder. Za instalaciju u drugi folder pritisnite dugme â€žIzbor...â€œ i izaberite folder. $_CLICK
 # ^DirSubText
 Folder
 # ^DirBrowseText
-Izaberite folder u koji æete instalirati program $(^NameDA):
+Izaberite folder u koji Ä‡ete instalirati program $(^NameDA):
 # ^UnDirText
-Program $(^NameDA) æe biti deinstaliran iz navedenog foldera. Za deinstalaciju iz drugog foldera pritisnite dugme „Izbor...“ i izaberite folder. $_CLICK
+Program $(^NameDA) Ä‡e biti deinstaliran iz navedenog foldera. Za deinstalaciju iz drugog foldera pritisnite dugme â€žIzbor...â€œ i izaberite folder. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Izaberite folder iz koga æete deinstalirati program $(^NameDA):
+Izaberite folder iz koga Ä‡ete deinstalirati program $(^NameDA):
 # ^SpaceAvailable
 "Slobodan prostor: "
 # ^SpaceRequired
 "Potreban prostor: "
 # ^UninstallingText
-Program $(^NameDA) æe biti deinstaliran iz navedenog foldera. $_CLICK
+Program $(^NameDA) Ä‡e biti deinstaliran iz navedenog foldera. $_CLICK
 # ^UninstallingSubText
 Deinstalacija iz: 
 # ^FileError
-Greška pri otvaranju fajla za pisanje: \r\n\t"$0"\r\nPritisnite dugme „Odustani“ za prekid instalacije,\r\n„Ponovi“ za ponovni pokušaj pisanja u fajl, ili\r\n„Ignoriši“ za preskakanje ovog fajla.
+GreÅ¡ka pri otvaranju fajla za pisanje: \r\n\t"$0"\r\nPritisnite dugme â€žOdustaniâ€œ za prekid instalacije,\r\nâ€žPonoviâ€œ za ponovni pokuÅ¡aj pisanja u fajl, ili\r\nâ€žIgnoriÅ¡iâ€œ za preskakanje ovog fajla.
 # ^FileError_NoIgnore
-Greška pri otvaranju fajla za pisanje: \r\n\t"$0"\r\nPritisnite dugme „Ponovi“ za ponovni pokušaj pisanja u fajl, ili\r\n„Odustani“ za prekid instaliranja.
+GreÅ¡ka pri otvaranju fajla za pisanje: \r\n\t"$0"\r\nPritisnite dugme â€žPonoviâ€œ za ponovni pokuÅ¡aj pisanja u fajl, ili\r\nâ€žOdustaniâ€œ za prekid instaliranja.
 # ^CantWrite
-"Nemoguæe pisanje: "
+"NemoguÄ‡e pisanje: "
 # ^CopyFailed
-Neuspešno kopiranje
+NeuspeÅ¡no kopiranje
 # ^CopyTo
 "Kopiranje u "
 # ^Registering
@@ -133,13 +133,13 @@
 # ^Unregistering
 "Deregistrovanje: "
 # ^SymbolNotFound
-"Simbol nije naðen: "
+"Simbol nije naÄ‘en: "
 # ^CouldNotLoad
-"Nemoguæe uèitavanje: "
+"NemoguÄ‡e uÄ�itavanje: "
 # ^CreateFolder
 "Kreiranje foldera: "
 # ^CreateShortcut
-"Kreiranje preèice: "
+"Kreiranje preÄ�ice: "
 # ^CreatedUninstaller
 "Kreiranje deinstalera: "
 # ^Delete
@@ -147,25 +147,25 @@
 # ^DeleteOnReboot
 "Brisanje pri restartu: "
 # ^ErrorCreatingShortcut
-"Greška pri kreiranju preèice: "
+"GreÅ¡ka pri kreiranju preÄ�ice: "
 # ^ErrorCreating
-"Greška pri kreiranju: "
+"GreÅ¡ka pri kreiranju: "
 # ^ErrorDecompressing
-Greška pri otpakivanju podataka! Ošteæen instalacioni program?
+GreÅ¡ka pri otpakivanju podataka! OÅ¡teÄ‡en instalacioni program?
 # ^ErrorRegistering
-Greška pri registrovanju biblioteke
+GreÅ¡ka pri registrovanju biblioteke
 # ^ExecShell
-"Izvršavanje u okruženju: "
+"IzvrÅ¡avanje u okruÅ¾enju: "
 # ^Exec
-"Izvršavanje: "
+"IzvrÅ¡avanje: "
 # ^Extract
 "Otpakivanje: "
 # ^ErrorWriting
-"Otpakivanje: greška pri upisu u fajl "
+"Otpakivanje: greÅ¡ka pri upisu u fajl "
 # ^InvalidOpcode
-Ošteæen instalacioni program: neispravna komanda 
+OÅ¡teÄ‡en instalacioni program: neispravna komanda 
 # ^NoOLE
-"Nema OLE podrške za: "
+"Nema OLE podrÅ¡ke za: "
 # ^OutputFolder
 "Izlazni folder: "
 # ^RemoveFolder
@@ -175,7 +175,7 @@
 # ^Rename
 "Preimenovan: "
 # ^Skipped
-"Preskoèen: "
+"PreskoÄ�en: "
 # ^CopyDetails
 Kopiraj detalje u klipbord
 # ^LogInstall
@@ -183,8 +183,8 @@
 # ^Byte
 B
 # ^Kilo
-k
+ k
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Hungarian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Hungarian.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Hungarian.nlf	(revision 2956)
@@ -1,191 +1,191 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1038
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1250
 # RTL - anything else than RTL means LTR
 -
 # Translation by Soft-Trans Bt. (V2)
 # Translation by Orfanik Kft.   (V3-V6)
 # ^Branding
-Nullsoft Telepítõrendszer %s
+Nullsoft Install System %s
 # ^SetupCaption
-$(^Name) Telepítõ
+$(^Name) TelepÃ­tÅ‘
 # ^UninstallCaption
-$(^Name) Eltávolító
+$(^Name) EltÃ¡volÃ­tÃ³
 # ^LicenseSubCaption
-: Licencszerzõdés
+: LicencszerzÅ‘dÃ©s
 # ^ComponentsSubCaption
-: Telepítési lehetõségek
+: TelepÃ­tÃ©si lehetÅ‘sÃ©gek
 # ^DirSubCaption
-: Célmappa
+: CÃ©lmappa
 # ^InstallingSubCaption
-: Fájlok telepítése
+: FÃ¡jlok telepÃ­tÃ©se
 # ^CompletedSubCaption
-: Kész
+: KÃ©sz
 # ^UnComponentsSubCaption
-: Eltávolítási lehetõségek
+: EltÃ¡volÃ­tÃ¡si lehetÅ‘sÃ©gek
 # ^UnDirSubCaption
-: Eltávolítás mappája
+: EltÃ¡volÃ­tÃ¡s mappÃ¡ja
 # ^ConfirmSubCaption
-: Megerõsítés
+: MegerÅ‘sÃ­tÃ©s
 # ^UninstallingSubCaption
-: Fájlok eltávolítása
+: FÃ¡jlok eltÃ¡volÃ­tÃ¡sa
 # ^UnCompletedSubCaption
-: Kész
+: KÃ©sz
 # ^BackBtn
 < &Vissza
 # ^NextBtn
-&Tovább >
+&TovÃ¡bb >
 # ^AgreeBtn
 &Elfogadom
 # ^AcceptBtn
-&Elfogadom a Licencszerzõdés feltételeit
+&Elfogadom a LicencszerzÅ‘dÃ©s feltÃ©teleit
 # ^DontAcceptBtn
-&Nem fogadom el a Licencszerzõdés feltételeit
+&Nem fogadom el a LicencszerzÅ‘dÃ©s feltÃ©teleit
 # ^InstallBtn
-&Telepítés
+&TelepÃ­tÃ©s
 # ^UninstallBtn
-&Eltávolítás
+&EltÃ¡volÃ­tÃ¡s
 # ^CancelBtn
-&Mégse
+&MÃ©gse
 # ^CloseBtn
-&Bezárás
+&BezÃ¡rÃ¡s
 # ^BrowseBtn
-&Tallózás...
+&TallÃ³zÃ¡s...
 # ^ShowDetailsBtn
-&Részletek
+&RÃ©szletek
 # ^ClickNext
-Kattintson a Tovább-ra a folytatáshoz.
+Kattintson a TovÃ¡bb-ra a folytatÃ¡shoz.
 # ^ClickInstall
-Kattintson a Telepítésre a telepítéshez.
+Kattintson a TelepÃ­tÃ©sre a telepÃ­tÃ©shez.
 # ^ClickUninstall
-Kattintson az Eltávolításra az eltávolításhoz.
+Kattintson az EltÃ¡volÃ­tÃ¡sra az eltÃ¡volÃ­tÃ¡shoz.
 # ^Name
-Név
+NÃ©v
 # ^Completed
-Kész
+KÃ©sz
 # ^LicenseText
-A(z) $(^NameDA) telepítése elõtt tekintse át a szerzõdés feltételeit. Ha elfogadja a szerzõdés valamennyi feltételét, az Elfogadom gombbal folytathatja.
+A(z) $(^NameDA) telepÃ­tÃ©se elÅ‘tt tekintse Ã¡t a szerzÅ‘dÃ©s feltÃ©teleit. Ha elfogadja a szerzÅ‘dÃ©s valamennyi feltÃ©telÃ©t, az Elfogadom gombbal folytathatja.
 # ^LicenseTextCB
-A(z) $(^NameDA) telepítése elõtt tekintse át a szerzõdés feltételeit. Ha elfogadja a szerzõdés valamennyi feltételét, jelölje be a Jelölõnégyzeten. $_CLICK
+A(z) $(^NameDA) telepÃ­tÃ©se elÅ‘tt tekintse Ã¡t a szerzÅ‘dÃ©s feltÃ©teleit. Ha elfogadja a szerzÅ‘dÃ©s valamennyi feltÃ©telÃ©t, jelÃ¶lje be a JelÃ¶lÅ‘nÃ©gyzeten. $_CLICK
 # ^LicenseTextRB
-A(z) $(^NameDA) telepítése elõtt tekintse át a szerzõdés feltételeit. Ha elfogadja a szerzõdés valamennyi feltételét, válassza az elsõ lehetõséget. $_CLICK
+A(z) $(^NameDA) telepÃ­tÃ©se elÅ‘tt tekintse Ã¡t a szerzÅ‘dÃ©s feltÃ©teleit. Ha elfogadja a szerzÅ‘dÃ©s valamennyi feltÃ©telÃ©t, vÃ¡lassza az elsÅ‘ lehetÅ‘sÃ©get. $_CLICK
 # ^UnLicenseText
-A(z) $(^NameDA) eltávolítása elõtt tekintse át a szerzõdés feltételeit. Ha elfogadja a szerzõdés valamennyi feltételét, az Elfogadom gombbal folytathatja.
+A(z) $(^NameDA) eltÃ¡volÃ­tÃ¡sa elÅ‘tt tekintse Ã¡t a szerzÅ‘dÃ©s feltÃ©teleit. Ha elfogadja a szerzÅ‘dÃ©s valamennyi feltÃ©telÃ©t, az Elfogadom gombbal folytathatja.
 # ^UnLicenseTextCB
-A(z) $(^NameDA) eltávolítása elõtt tekintse át a szerzõdés feltételeit. Ha elfogadja a szerzõdés valamennyi feltételét, jelölje be a Jelölõnégyzeten. $_CLICK
+A(z) $(^NameDA) eltÃ¡volÃ­tÃ¡sa elÅ‘tt tekintse Ã¡t a szerzÅ‘dÃ©s feltÃ©teleit. Ha elfogadja a szerzÅ‘dÃ©s valamennyi feltÃ©telÃ©t, jelÃ¶lje be a JelÃ¶lÅ‘nÃ©gyzeten. $_CLICK
 # ^UnLicenseTextRB
-A(z) $(^NameDA) eltávolítása elõtt tekintse át a szerzõdés feltételeit. Ha elfogadja a szerzõdés valamennyi feltételét, válassza az elsõ lehetõséget. $_CLICK
+A(z) $(^NameDA) eltÃ¡volÃ­tÃ¡sa elÅ‘tt tekintse Ã¡t a szerzÅ‘dÃ©s feltÃ©teleit. Ha elfogadja a szerzÅ‘dÃ©s valamennyi feltÃ©telÃ©t, vÃ¡lassza az elsÅ‘ lehetÅ‘sÃ©get. $_CLICK
 # ^Custom
-Egyéni
+EgyÃ©ni
 # ^ComponentsText
-Jelölje be azokat az összetevõket amelyeket telepíteni kíván és törölje a jelölést a nem kívánt összetevõknél. $_CLICK
+JelÃ¶lje be azokat az Ã¶sszetevÅ‘ket amelyeket telepÃ­teni kÃ­vÃ¡n Ã©s tÃ¶rÃ¶lje a jelÃ¶lÃ©st a nem kÃ­vÃ¡nt Ã¶sszetevÅ‘knÃ©l. $_CLICK
 # ^ComponentsSubText1
-Válassza ki a telepítés típusát:
+VÃ¡lassza ki a telepÃ­tÃ©s tÃ­pusÃ¡t:
 # ^ComponentsSubText2_NoInstTypes
-Válassza ki a telepítendõ összetevõket:
+VÃ¡lassza ki a telepÃ­tendÅ‘ Ã¶sszetevÅ‘ket:
 # ^ComponentsSubText2
-vagy, jelölje ki a választható összetevõk közül a telepíteni kívánta(ka)t:
+vagy, jelÃ¶lje ki a vÃ¡laszthatÃ³ Ã¶sszetevÅ‘k kÃ¶zÃ¼l a telepÃ­teni kÃ­vÃ¡nta(ka)t:
 # ^UnComponentsText
-Jelölje be azokat az összetevõket amelyeket el kíván távolítani és törölje a jelölést az eltávolítani nem kívánt összetevõknél. $_CLICK
+JelÃ¶lje be azokat az Ã¶sszetevÅ‘ket amelyeket el kÃ­vÃ¡n tÃ¡volÃ­tani Ã©s tÃ¶rÃ¶lje a jelÃ¶lÃ©st az eltÃ¡volÃ­tani nem kÃ­vÃ¡nt Ã¶sszetevÅ‘knÃ©l. $_CLICK
 # ^UnComponentsSubText1
-Válassza ki az Eltávolítás típusát:
+VÃ¡lassza ki az EltÃ¡volÃ­tÃ¡s tÃ­pusÃ¡t:
 # ^UnComponentsSubText2_NoInstTypes
-Válassza ki az eltávolítandó összetevõket:
+VÃ¡lassza ki az eltÃ¡volÃ­tandÃ³ Ã¶sszetevÅ‘ket:
 # ^UnComponentsSubText2
-vagy, jelölje ki a választható összetevõk közül az eltávolítani kívánta(ka)t:
+vagy, jelÃ¶lje ki a vÃ¡laszthatÃ³ Ã¶sszetevÅ‘k kÃ¶zÃ¼l az eltÃ¡volÃ­tani kÃ­vÃ¡nta(ka)t:
 # ^DirText
-A $(^NameDA) a következõ mappába kerül. Másik mappa választásához kattintson a Tallózás gombra. $_CLICK
+A $(^NameDA) a kÃ¶vetkezÅ‘ mappÃ¡ba kerÃ¼l. MÃ¡sik mappa vÃ¡lasztÃ¡sÃ¡hoz kattintson a TallÃ³zÃ¡s gombra. $_CLICK
 # ^DirSubText
-Telepítés helye
+TelepÃ­tÃ©s helye
 # ^DirBrowseText
-A(z) $(^NameDA) telepítési helyének kiválasztása:
+A(z) $(^NameDA) telepÃ­tÃ©si helyÃ©nek kivÃ¡lasztÃ¡sa:
 # ^UnDirText
-A(z) $(^NameDA) eltávolítása a következõ mappából. Másik mappa választásához kattintson a Tallózás gombra. $_CLICK
+A(z) $(^NameDA) eltÃ¡volÃ­tÃ¡sa a kÃ¶vetkezÅ‘ mappÃ¡bÃ³l. MÃ¡sik mappa vÃ¡lasztÃ¡sÃ¡hoz kattintson a TallÃ³zÃ¡s gombra. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Válassza ki, hogy a $(^NameDA) melyik mappából kerüljön eltávolításra:
+VÃ¡lassza ki, hogy a $(^NameDA) melyik mappÃ¡bÃ³l kerÃ¼ljÃ¶n eltÃ¡volÃ­tÃ¡sra:
 # ^SpaceAvailable
-"Szabad terület: "
+"Szabad terÃ¼let: "
 # ^SpaceRequired
-"Helyigény: "
+"HelyigÃ©ny: "
 # ^UninstallingText
-A(z) $(^NameDA) eltávolítása következik a számítógéprõl. $_CLICK
+A(z) $(^NameDA) eltÃ¡volÃ­tÃ¡sa kÃ¶vetkezik a szÃ¡mÃ­tÃ³gÃ©prÅ‘l. $_CLICK
 # ^UninstallingSubText
-Eltávolítás helye:
+EltÃ¡volÃ­tÃ¡s helye:
 # ^FileError
-Hiba történt a fájl írásra történõ megnyitásakor: \r\n\t"$0"\r\nA Mégse gomb megnyomásával megszakíthatja a telepítést,\r\naz Ismét gombbal megismételheti a fájl írását,\r\na Kihagyás gombbal kihagyhatja ezt a fájlt.
+Hiba tÃ¶rtÃ©nt a fÃ¡jl Ã­rÃ¡sra tÃ¶rtÃ©nÅ‘ megnyitÃ¡sakor: \r\n\t"$0"\r\nA MÃ©gse gomb megnyomÃ¡sÃ¡val megszakÃ­thatja a telepÃ­tÃ©st,\r\naz IsmÃ©t gombbal megismÃ©telheti a fÃ¡jl Ã­rÃ¡sÃ¡t,\r\na KihagyÃ¡s gombbal kihagyhatja ezt a fÃ¡jlt.
 # ^FileError_NoIgnore
-Hiba történt a fájl írásra történõ megnyitásakor:  \r\n\t"$0"\r\nAz Újra gomb megnyomásával megismételheti a mûveletet, vagy \r\na Mégse gombbal megszakíthatja a telepítést.
+Hiba tÃ¶rtÃ©nt a fÃ¡jl Ã­rÃ¡sra tÃ¶rtÃ©nÅ‘ megnyitÃ¡sakor:  \r\n\t"$0"\r\nAz Ãšjra gomb megnyomÃ¡sÃ¡val megismÃ©telheti a mÅ±veletet, vagy \r\na MÃ©gse gombbal megszakÃ­thatja a telepÃ­tÃ©st.
 # ^CantWrite
-"Nem írható: "
+"Nem Ã­rhatÃ³: "
 # ^CopyFailed
-A másolás megszakadt
+A mÃ¡solÃ¡s megszakadt
 # ^CopyTo
-"Másolás ide: "
+"MÃ¡solÃ¡s ide: "
 # ^Registering
-"Bejegyzés: "
+"BejegyzÃ©s: "
 # ^Unregistering
-"Eltávolítás: "
+"EltÃ¡volÃ­tÃ¡s: "
 # ^SymbolNotFound
-"A következõ szimbólum nem található: "
+"A kÃ¶vetkezÅ‘ szimbÃ³lum nem talÃ¡lhatÃ³: "
 # ^CouldNotLoad
-"Nem tölthetõ be: "
+"Nem tÃ¶lthetÅ‘ be: "
 # ^CreateFolder
-"Mappa létrehozás: "
+"Mappa lÃ©trehozÃ¡s: "
 # ^CreateShortcut
-"Parancsikon létrehozása: "
+"Parancsikon lÃ©trehozÃ¡sa: "
 # ^CreatedUninstaller
-"Létrehozott eltávolító: "
+"LÃ©trehozott eltÃ¡volÃ­tÃ³: "
 # ^Delete
-"Törölt fájl: "
+"TÃ¶rÃ¶lt fÃ¡jl: "
 # ^DeleteOnReboot
-"Rendszerindításkor törlendõ: "
+"RendszerindÃ­tÃ¡skor tÃ¶rlendÅ‘: "
 # ^ErrorCreatingShortcut
-"Hiba a parancsikon létrehozásakor: "
+"Hiba a parancsikon lÃ©trehozÃ¡sakor: "
 # ^ErrorCreating
-"Hiba a létrehozáskor: "
+"Hiba a lÃ©trehozÃ¡skor: "
 # ^ErrorDecompressing
-Hiba az adatok kibontásakor! Megsérült a Telepítõ?
+Hiba az adatok kibontÃ¡sakor! MegsÃ©rÃ¼lt a TelepÃ­tÅ‘?
 # ^ErrorRegistering
-Hiba a DLL regisztrálásakor
+Hiba a DLL regisztrÃ¡lÃ¡sakor
 # ^ExecShell
-"Végrehajtás a hozzárendeléseken keresztül: "
+"VÃ©grehajtÃ¡s a hozzÃ¡rendelÃ©seken keresztÃ¼l: "
 # ^Exec
-"Végrehajtás: "
+"VÃ©grehajtÃ¡s: "
 # ^Extract
-"Kibontás: "
+"KibontÃ¡s: "
 # ^ErrorWriting
-"Kibontás: Hiba a fájl írásakor "
+"KibontÃ¡s: Hiba a fÃ¡jl Ã­rÃ¡sakor "
 # ^InvalidOpcode
-Sérült a telepítõ: hibás utasítás
+SÃ©rÃ¼lt a telepÃ­tÅ‘: hibÃ¡s utasÃ­tÃ¡s
 # ^NoOLE
 "Nincs OLE: "
 # ^OutputFolder
 "Kimeneti mappa: "
 # ^RemoveFolder
-"Mappa eltávolítása: "
+"Mappa eltÃ¡volÃ­tÃ¡sa: "
 # ^RenameOnReboot
-"Átnevezés rendszerindításkor: "
+"Ã�tnevezÃ©s rendszerindÃ­tÃ¡skor: "
 # ^Rename
-"Átnevezés: "
+"Ã�tnevezÃ©s: "
 # ^Skipped
 "Kihagyott: "
 # ^CopyDetails
-Adatok vágólapra másolása
+Adatok vÃ¡gÃ³lapra mÃ¡solÃ¡sa
 # ^LogInstall
-Telepítõ ellenõrzõlista
+TelepÃ­tÅ‘ ellenÅ‘rzÅ‘lista
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Albanian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Albanian.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Albanian.nsh	(revision 2956)
@@ -1,129 +1,129 @@
-;Language: Albanian (1052)
+ï»¿;Language: Albanian (1052)
 ;Translation Besnik Bleta, besnik@programeshqip.org
 
-!insertmacro LANGFILE "Albanian" "Albanian"
+!insertmacro LANGFILE "Albanian" = "Shqip" =
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Mirësevini te Rregullimi i $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ky do t'ju udhëheqë gjatë instalimit të $(^NameDA).$\r$\n$\r$\nKëshillohet që të mbyllni tërë zbatimet e tjera para se të nisni Rregullimin. Kjo bën të mundur përditësimin e kartelave të rëndësishme të sistemit pa u dashur të riniset kompjuteri juaj.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "MirÃ«sevini te Rregullimi i $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ky do t'ju udhÃ«heqÃ« gjatÃ« instalimit tÃ« $(^NameDA).$\r$\n$\r$\nKÃ«shillohet qÃ« tÃ« mbyllni tÃ«rÃ« zbatimet e tjera para se tÃ« nisni Rregullimin. Kjo bÃ«n tÃ« mundur pÃ«rditÃ«simin e kartelave tÃ« rÃ«ndÃ«sishme tÃ« sistemit pa u dashur tÃ« riniset kompjuteri juaj.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Mirësevini te Çinstalimi i $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ky do t'ju udhëheqë gjatë çinstalimit të $(^NameDA).$\r$\n$\r$\nPara nisjes së çinstalimit, sigurohuni që $(^NameDA) nuk është duke xhiruar.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "MirÃ«sevini te Ã‡instalimi i $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ky do t'ju udhÃ«heqÃ« gjatÃ« Ã§instalimit tÃ« $(^NameDA).$\r$\n$\r$\nPara nisjes sÃ« Ã§instalimit, sigurohuni qÃ« $(^NameDA) nuk Ã«shtÃ« duke xhiruar.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Marrëveshje Licence"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Ju lutem shqyrtoni kushtet e licencës përpara se të instaloni $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Nëse i pranoni kushtet e marrëveshjes, klikoni Pajtohem për të vazhduar. Duhet ta pranoni marrëveshjen për të instaluar $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Nëse pranoni kushtet e marrëveshjes, klikoni kutizën më poshtë. Duhet të pranoni marrëveshjen për të instaluar $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Nëse pranoni kushtet e marrëveshjes, përzgjidhni më poshtë mundësinë e parë. Duhet të pranoni marrëveshjen për të instaluar $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "MarrÃ«veshje Licence"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Ju lutem shqyrtoni kushtet e licencÃ«s pÃ«rpara se tÃ« instaloni $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "NÃ«se i pranoni kushtet e marrÃ«veshjes, klikoni Pajtohem pÃ«r tÃ« vazhduar. Duhet ta pranoni marrÃ«veshjen pÃ«r tÃ« instaluar $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "NÃ«se pranoni kushtet e marrÃ«veshjes, klikoni kutizÃ«n mÃ« poshtÃ«. Duhet tÃ« pranoni marrÃ«veshjen pÃ«r tÃ« instaluar $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "NÃ«se pranoni kushtet e marrÃ«veshjes, pÃ«rzgjidhni mÃ« poshtÃ« mundÃ«sinÃ« e parÃ«. Duhet tÃ« pranoni marrÃ«veshjen pÃ«r tÃ« instaluar $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Marrëveshje Licence"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Ju lutem shqyrtoni kushtet e licencës përpara çinstalimit të $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Nëse i pranoni kushtet e marrëveshjes, klikoni Pajtohem për të vazhduar. Duhet të pranoni marrëveshjen për të çinstaluar $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Nëse pranoni kushtet e marrëveshjes, klikoni kutizën më poshtë. Duhet të pranoni marrëveshjen për të çinstaluar $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Nëse pranoni kushtet e marrëveshjes, përzgjidhni mundësinë e parë më poshtë. Duhet të pranoni marrëveshjen për të çinstaluar $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "MarrÃ«veshje Licence"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Ju lutem shqyrtoni kushtet e licencÃ«s pÃ«rpara Ã§instalimit tÃ« $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "NÃ«se i pranoni kushtet e marrÃ«veshjes, klikoni Pajtohem pÃ«r tÃ« vazhduar. Duhet tÃ« pranoni marrÃ«veshjen pÃ«r tÃ« Ã§instaluar $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "NÃ«se pranoni kushtet e marrÃ«veshjes, klikoni kutizÃ«n mÃ« poshtÃ«. Duhet tÃ« pranoni marrÃ«veshjen pÃ«r tÃ« Ã§instaluar $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "NÃ«se pranoni kushtet e marrÃ«veshjes, pÃ«rzgjidhni mundÃ«sinÃ« e parÃ« mÃ« poshtÃ«. Duhet tÃ« pranoni marrÃ«veshjen pÃ«r tÃ« Ã§instaluar $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Shtypni Page Down për të parë pjesën e mbetur të marrëveshjes."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Shtypni Page Down pÃ«r tÃ« parÃ« pjesÃ«n e mbetur tÃ« marrÃ«veshjes."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Përzgjidhni Përbërës"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Zgjidhni cilat anë të $(^NameDA) doni të instalohen."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "PÃ«rzgjidhni PÃ«rbÃ«rÃ«s"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Zgjidhni cilat anÃ« tÃ« $(^NameDA) doni tÃ« instalohen."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Zgjidhni Përbërësa"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Zgjidhni cilat anë të $(^NameDA) doni të çinstalohen."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Zgjidhni PÃ«rbÃ«rÃ«sa"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Zgjidhni cilat anÃ« tÃ« $(^NameDA) doni tÃ« Ã§instalohen."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Përshkrim"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "PÃ«rshkrim"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Për të parë përshkrimin e një përbërësi, vendosni miun përsipër tij."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "PÃ«r tÃ« parÃ« pÃ«rshkrimin e njÃ« pÃ«rbÃ«rÃ«si, vendosni miun pÃ«rsipÃ«r tij."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Për të parë përshkrimin e një përbërësi, vendosni miun përsipër tij."
+    #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
   ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Zgjidhni Vend Instalimi"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Zgjidhni dosjen tek e cila të instalohet $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Zgjidhni dosjen tek e cila tÃ« instalohet $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Zgjidhni Vend Çinstalimi"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Zgjidhni dosjen prej së cilës të çinstalohet $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Zgjidhni Vend Ã‡instalimi"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Zgjidhni dosjen prej sÃ« cilÃ«s tÃ« Ã§instalohet $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Po instalohet"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Ju lutem prisni ndërkohë që $(^NameDA) instalohet."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Instalim i Plotësuar"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Rregullimi u plotësua me sukses."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Instalimi u Ndërpre"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Rregullimi nuk u plotësua me sukses."
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Ju lutem prisni ndÃ«rkohÃ« qÃ« $(^NameDA) instalohet."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Instalim i PlotÃ«suar"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Rregullimi u plotÃ«sua me sukses."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Instalimi u NdÃ«rpre"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Rregullimi nuk u plotÃ«sua me sukses."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Çinstalim"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Ju lutem prisni ndërsa $(^NameDA) çinstalohet."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Çinstalim i Plotë"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Çinstalimi u plotësua me sukses."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Çinstalimi u Ndërpre"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Çinstalimi nuk plotësua me sukses."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Ã‡instalim"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Ju lutem prisni ndÃ«rsa $(^NameDA) Ã§instalohet."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Ã‡instalim i PlotÃ«"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Ã‡instalimi u plotÃ«sua me sukses."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Ã‡instalimi u NdÃ«rpre"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Ã‡instalimi nuk plotÃ«sua me sukses."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Po plotësoj Rregullimin e $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) u instalua në kompjuterin tuaj.$\r$\n$\r$\nPër mbylljen e procesit, klikoni Përfundoje."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Që të mund të plotësohet instalimi i $(^NameDA) kompjuteri juaj duhet të riniset. Doni ta rinisni tani?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Po plotÃ«soj Rregullimin e $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) u instalua nÃ« kompjuterin tuaj.$\r$\n$\r$\nPÃ«r mbylljen e procesit, klikoni PÃ«rfundoje."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "QÃ« tÃ« mund tÃ« plotÃ«sohet instalimi i $(^NameDA) kompjuteri juaj duhet tÃ« riniset. Doni ta rinisni tani?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Po plotësoj Çinstalimin e $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) u çinstalua prej kompjuterit tuaj.$\r$\n$\r$\nPër mbylljen e procesit, klikoni Përfundoje."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Kompjuteri juaj duhet të riniset që të mund të plotësohet çinstalimi i $(^NameDA). Doni ta rinisni tani?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Po plotÃ«soj Ã‡instalimin e $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) u Ã§instalua prej kompjuterit tuaj.$\r$\n$\r$\nPÃ«r mbylljen e procesit, klikoni PÃ«rfundoje."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Kompjuteri juaj duhet tÃ« riniset qÃ« tÃ« mund tÃ« plotÃ«sohet Ã§instalimi i $(^NameDA). Doni ta rinisni tani?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
   ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Rinise tani"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Dua ta rinis dorazi më vonë"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Dua ta rinis dorazi mÃ« vonÃ«"
   ${LangFileString} MUI_TEXT_FINISH_RUN "&Nis $(^NameDA)"
   ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Shfaq Readme"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Përfundoje"  
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&PÃ«rfundoje"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
   ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Zgjidhni Dosje Menuje Start"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Zgjidhni një dosje Menuje Start për shkurtore $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Përzgjidhni dosjen e Menusë Start në të cilën do të donit të krijonit shkurtoret për programin. Mundeni edhe të jepni një emër për të krijuar një dosje të re."
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Zgjidhni njÃ« dosje Menuje Start pÃ«r shkurtore $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "PÃ«rzgjidhni dosjen e MenusÃ« Start nÃ« tÃ« cilÃ«n do tÃ« donit tÃ« krijonit shkurtoret pÃ«r programin. Mundeni edhe tÃ« jepni njÃ« emÃ«r pÃ«r tÃ« krijuar njÃ« dosje tÃ« re."
   ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Mos krijo shkurtore"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Çinstalo $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Ã‡instalo $(^NameDA)"
   ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Hiqeni $(^NameDA) prej kompjuterit tuaj."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Jeni i sigurt që doni të dilni nga Rregullimi i $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Jeni i sigurt qÃ« doni tÃ« dilni nga Rregullimi i $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Jeni i sigurt që doni të dilni nga Çinstalimi i $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Jeni i sigurt qÃ« doni tÃ« dilni nga Ã‡instalimi i $(^Name)?"
 !endif
 
 !ifdef MULTIUSER_INSTALLMODEPAGE
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Zgjidhni Përdoruesa"
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Zgjidhni për cilët përdoruesa doni të instalohet $(^NameDA)."
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Përzgjidhni në doni të instalohet $(^NameDA) vetëm për veten tuaj apo për tërë përdoruesit e këtij kompjuteri. $(^ClickNext)"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Instaloje për këdo në këtë kompjuter"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Instaloje vetëm për mua"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Zgjidhni PÃ«rdoruesa"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Zgjidhni pÃ«r cilÃ«t pÃ«rdoruesa doni tÃ« instalohet $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "PÃ«rzgjidhni nÃ« doni tÃ« instalohet $(^NameDA) vetÃ«m pÃ«r veten tuaj apo pÃ«r tÃ«rÃ« pÃ«rdoruesit e kÃ«tij kompjuteri. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Instaloje pÃ«r kÃ«do nÃ« kÃ«tÃ« kompjuter"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Instaloje vetÃ«m pÃ«r mua"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/French.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/French.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/French.nsh	(revision 2956)
@@ -1,16 +1,16 @@
-;Language: French (1036)
-;By Sébastien Delahaye <seb@delahaye.net>
+ï»¿;Language: French (1036)
+;By SÃ©bastien Delahaye <seb@delahaye.net>
 
-!insertmacro LANGFILE "French" "French"
+!insertmacro LANGFILE "French" = "FranÃ§ais" "Francais"
 
 !ifdef MUI_WELCOMEPAGE
   ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bienvenue dans le programme d'installation de $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Vous êtes sur le point d'installer $(^NameDA) sur votre ordinateur.$\r$\n$\r$\nAvant de démarrer l'installation, il est recommandé de fermer toutes les autres applications. Cela permettra la mise à jour de certains fichiers système sans redémarrer votre ordinateur.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Vous Ãªtes sur le point d'installer $(^NameDA) sur votre ordinateur.$\r$\n$\r$\nAvant de dÃ©marrer l'installation, il est recommandÃ© de fermer toutes les autres applications. Cela permettra la mise Ã  jour de certains fichiers systÃ¨me sans redÃ©marrer votre ordinateur.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Bienvenue dans le programme de désinstallation de $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Vous êtes sur le point de désinstaller $(^NameDA) de votre ordinateur.$\r$\n$\r$\nAvant d'amorcer la désinstallation, assurez-vous que $(^NameDA) ne soit pas en cours d'exécution.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Bienvenue dans le programme de dÃ©sinstallation de $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Vous Ãªtes sur le point de dÃ©sinstaller $(^NameDA) de votre ordinateur.$\r$\n$\r$\nAvant d'amorcer la dÃ©sinstallation, assurez-vous que $(^NameDA) ne soit pas en cours d'exÃ©cution.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
@@ -18,15 +18,15 @@
   ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Veuillez examiner les termes de la licence avant d'installer $(^NameDA)."
   ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Si vous acceptez les conditions de la licence utilisateur, cliquez sur J'accepte pour continuer. Vous devez accepter la licence utilisateur afin d'installer $(^NameDA)."
   ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Si vous acceptez les conditions de la licence utilisateur, cochez la case ci-dessous. Vous devez accepter la licence utilisateur afin d'installer $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Si vous acceptez les conditions de la licence utilisateur, sélectionnez le premier choix ci-dessous. Vous devez accepter la licence utilisateur afin d'installer $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Si vous acceptez les conditions de la licence utilisateur, sÃ©lectionnez le premier choix ci-dessous. Vous devez accepter la licence utilisateur afin d'installer $(^NameDA)."
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
   ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Licence utilisateur"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Veuillez examiner les conditions de la licence avant de désinstaller $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Si vous acceptez les conditions de la licence utilisateur, cliquez sur J'accepte pour continuer. Vous devez accepter la licence utilisateur afin de désinstaller $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Si vous acceptez les conditions de la licence utilisateur, cochez la case ci-dessous. Vous devez accepter la licence utilisateur afin de désintaller $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Si vous acceptez les conditions de la licence utilisateur, sélectionnez le premier choix ci-dessous. Vous devez accepter la licence utilisateur afin de désinstaller $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Veuillez examiner les conditions de la licence avant de dÃ©sinstaller $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Si vous acceptez les conditions de la licence utilisateur, cliquez sur J'accepte pour continuer. Vous devez accepter la licence utilisateur afin de dÃ©sinstaller $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Si vous acceptez les conditions de la licence utilisateur, cochez la case ci-dessous. Vous devez accepter la licence utilisateur afin de dÃ©sintaller $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Si vous acceptez les conditions de la licence utilisateur, sÃ©lectionnez le premier choix ci-dessous. Vous devez accepter la licence utilisateur afin de dÃ©sinstaller $(^NameDA)."
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
@@ -40,7 +40,7 @@
 
 !ifdef MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Choisissez les composants"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Cochez les composants de $(^NameDA) que vous souhaitez désinstaller."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Cochez les composants de $(^NameDA) que vous souhaitez dÃ©sinstaller."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
@@ -48,7 +48,7 @@
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
     ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Passez le curseur de votre souris sur un composant pour en voir la description."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Passez le curseur de votre souris sur un composant pour en voir la description."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "SÃ©lectionnez un composant pour en voir la description."
   !endif
 !endif
 
@@ -58,72 +58,72 @@
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Choisissez le dossier de désinstallation"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Choisissez le dossier à partir duquel vous voulez désinstaller $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Choisissez le dossier de dÃ©sinstallation"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Choisissez le dossier Ã  partir duquel vous voulez dÃ©sinstaller $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Installation en cours"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Veuillez patienter pendant l'installation des fichiers de $(^NameDA) sur votre machine."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Installation terminée"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "L'installation s'est terminée avec succès."
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Veuillez patienter pendant l'installation de $(^NameDA)."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Installation terminÃ©e"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "L'installation s'est terminÃ©e avec succÃ¨s."
   ${LangFileString} MUI_TEXT_ABORT_TITLE "Installation interrompue"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "L'installation n'a pas été terminée."
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "L'installation n'a pas Ã©tÃ© terminÃ©e."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Désinstallation en cours"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Veuillez patienter pendant que $(^NameDA) est en train d'être supprimé de votre ordinateur."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Désinstallation terminée"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "La désinstallation s'est terminée avec succès."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Désinstallation interrompue"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "La désinstallation n'a pas été terminée."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "DÃ©sinstallation en cours"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Veuillez patienter pendant la dÃ©sinstallation de $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "DÃ©sinstallation terminÃ©e"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "La dÃ©sinstallation s'est terminÃ©e avec succÃ¨s."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "DÃ©sinstallation interrompue"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "La dÃ©sinstallation n'a pas Ã©tÃ© terminÃ©e."
 !endif
 
 !ifdef MUI_FINISHPAGE
   ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Fin de l'installation de $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) a été installé sur votre ordinateur.$\r$\n$\r$\nCliquez sur Fermer pour quitter le programme d'installation."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Votre ordinateur doit être redémarré afin de compléter l'installation de $(^NameDA). Souhaitez-vous redémarrer maintenant ?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) a Ã©tÃ© installÃ© sur votre ordinateur.$\r$\n$\r$\nCliquez sur Fermer pour quitter le programme d'installation."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Votre ordinateur doit Ãªtre redÃ©marrÃ© afin de complÃ©ter l'installation de $(^NameDA). Souhaitez-vous redÃ©marrer maintenant ?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Fin de la désinstallation de $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) a été supprimé de votre ordinateur.$\r$\n$\r$\nCliquez sur Fermer pour quitter le programme d'installation."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Votre ordinateur doit être redémarré pour terminer la désinstallation de $(^NameDA). Souhaitez-vous redémarrer maintenant ?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Fin de la dÃ©sinstallation de $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) a Ã©tÃ© supprimÃ© de votre ordinateur.$\r$\n$\r$\nCliquez sur Fermer pour quitter le programme d'installation."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Votre ordinateur doit Ãªtre redÃ©marrÃ© pour terminer la dÃ©sinstallation de $(^NameDA). Souhaitez-vous redÃ©marrer maintenant ?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Redémarrer maintenant"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Je souhaite redémarrer moi-même plus tard"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "RedÃ©marrer maintenant"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Je souhaite redÃ©marrer moi-mÃªme plus tard"
   ${LangFileString} MUI_TEXT_FINISH_RUN "Lancer $(^NameDA)"
   ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Afficher le fichier Readme"
   ${LangFileString} MUI_BUTTONTEXT_FINISH "&Fermer"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Choisissez un dossier dans le menu Démarrer"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Choisissez un dossier dans le menu Démarrer pour les raccourcis de l'application."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Choisissez le dossier du menu Démarrer dans lequel vous voulez placer les raccourcis du programme. Vous pouvez également entrer un nouveau nom pour créer un nouveau dossier."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ne pas créer de raccourcis"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Choisissez un dossier dans le menu DÃ©marrer"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Choisissez un dossier dans le menu DÃ©marrer pour les raccourcis de l'application."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Choisissez le dossier du menu DÃ©marrer dans lequel vous voulez placer les raccourcis du programme. Vous pouvez Ã©galement entrer un nouveau nom pour crÃ©er un nouveau dossier."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ne pas crÃ©er de raccourcis"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Désinstaller $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "DÃ©sinstaller $(^NameDA)"
   ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Supprimer $(^NameDA) de votre ordinateur."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Êtes-vous sûr de vouloir quitter l'installation de $(^Name) ?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "ÃŠtes-vous sÃ»r de vouloir quitter l'installation de $(^Name) ?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Êtes-vous sûr de vouloir quitter la désinstallation de $(^Name) ?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "ÃŠtes-vous sÃ»r de vouloir quitter la dÃ©sinstallation de $(^Name) ?"
 !endif
 
 !ifdef MULTIUSER_INSTALLMODEPAGE
   ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Choix des utilisateurs"
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Sélection des utilisateurs désirant utiliser $(^NameDA)."
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Choix entre installer $(^NameDA) seulement pour vous-même  ou bien pour tous les utilisateurs du système. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "SÃ©lection des utilisateurs dÃ©sirant utiliser $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Choix entre installer $(^NameDA) seulement pour vous-mÃªme ou bien pour tous les utilisateurs du systÃ¨me. $(^ClickNext)"
   ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Installer pour tous les utilisateurs"
   ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Installer seulement pour moi"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Swedish.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Swedish.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Swedish.nsh	(revision 2956)
@@ -1,122 +1,130 @@
-;Compatible with Modern UI 1.72
+ï»¿;Compatible with Modern UI 1.72
 ;Language: Swedish (1053)
 ;By Magnus Bonnevier (magnus.bonnevier@telia.com), updated by Rickard Angbratt (r.angbratt@home.se), updated by Ulf Axelsson (ulf.axelsson@gmail.com)
 
-!insertmacro LANGFILE "Swedish" "Svenska"
+!insertmacro LANGFILE "Swedish" = "Svenska" =
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Välkommen till installationsguiden för $(^NameDA)."
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Denna guide tar dig igenom installationen av $(^NameDA).$\r$\n$\r$\nDet 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} MUI_TEXT_WELCOME_INFO_TITLE "VÃ¤lkommen till installationsguiden fÃ¶r $(^NameDA)."
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Denna guide tar dig igenom installationen av $(^NameDA).$\r$\n$\r$\nDet 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"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Välkommen till avinstallationsguiden för $(^NameDA)."
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Denna guide tar dig igenom avinstallationen av $(^NameDA).$\r$\n$\r$\nInnan du startar avinstallationen, försäkra dig om att $(^NameDA) inte körs.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "VÃ¤lkommen till avinstallationsguiden fÃ¶r $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Denna guide tar dig igenom avinstallationen av $(^NameDA).$\r$\n$\r$\nInnan du startar avinstallationen, fÃ¶rsÃ¤kra dig om att $(^NameDA) inte kÃ¶rs.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
   ${LangFileString} MUI_TEXT_LICENSE_TITLE "Licensavtal"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Var vänlig läs igenom licensvillkoren innan du installerar $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Om du accepterar villkoren i avtalet, klicka Jag Godkänner för att fortsätta. Du måste acceptera avtalet för att installera $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Om du accepterar villkoren i avtalet, klicka i checkrutan nedan. Du måste acceptera avtalet för att installera $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Om du accepterar villkoren i avtalet, välj det första alternativet nedan. Du måste acceptera avtalet för att installera $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Var vÃ¤nlig lÃ¤s igenom licensvillkoren innan du installerar $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Om du accepterar villkoren i avtalet, klicka Jag GodkÃ¤nner fÃ¶r att fortsÃ¤tta. Du mÃ¥ste acceptera avtalet fÃ¶r att installera $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Om du accepterar villkoren i avtalet, klicka i checkrutan nedan. Du mÃ¥ste acceptera avtalet fÃ¶r att installera $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Om du accepterar villkoren i avtalet, vÃ¤lj det fÃ¶rsta alternativet nedan. Du mÃ¥ste acceptera avtalet fÃ¶r att installera $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
   ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Licensavtal"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Var vänlig läs igenom licensvillkoren innan du avinstallerar $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Om du accepterar villkoren i avtalet, klicka Jag Godkänner för att fortsätta. Du måste acceptera avtalet för att avinstallera $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Om du accepterar villkoren i avtalet, klicka i checkrutan nedan. Du måste acceptera avtalet för att avinstallera $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Om du accepterar villkoren i avtalet, välj det första alternativet nedan. Du måste acceptera avtalet för att avinstallera $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Var vÃ¤nlig lÃ¤s igenom licensvillkoren innan du avinstallerar $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Om du accepterar villkoren i avtalet, klicka Jag GodkÃ¤nner fÃ¶r att fortsÃ¤tta. Du mÃ¥ste acceptera avtalet fÃ¶r att avinstallera $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Om du accepterar villkoren i avtalet, klicka i checkrutan nedan. Du mÃ¥ste acceptera avtalet fÃ¶r att avinstallera $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Om du accepterar villkoren i avtalet, vÃ¤lj det fÃ¶rsta alternativet nedan. Du mÃ¥ste acceptera avtalet fÃ¶r att avinstallera $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Tryck Page Down för att se resten av licensavtalet."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Tryck Page Down fÃ¶r att se resten av licensavtalet."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Välj komponenter"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Välj vilka alternativ av $(^NameDA) som du vill installera."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "VÃ¤lj komponenter"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "VÃ¤lj vilka alternativ av $(^NameDA) som du vill installera."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Välj komponenter"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Välj vilka alternativ av $(^NameDA) som du vill avinstallera."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "VÃ¤lj komponenter"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "VÃ¤lj vilka alternativ av $(^NameDA) som du vill avinstallera."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Beskrivning"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Håll muspekaren över ett alternativ för att se dess beskrivning."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "HÃ¥ll muspekaren Ã¶ver ett alternativ fÃ¶r att se dess beskrivning."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Håll muspekaren över ett alternativ för att se dess beskrivning."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "VÃ¤lj ett alternativ fÃ¶r att se dess beskrivning."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Välj installationsväg"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Välj katalog att installera $(^NameDA) i."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "VÃ¤lj installationsvÃ¤g"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "VÃ¤lj katalog att installera $(^NameDA) i."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Välj avinstallationsväg"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Välj katalog att avinstallera $(^NameDA) från."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "VÃ¤lj avinstallationsvÃ¤g"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "VÃ¤lj katalog att avinstallera $(^NameDA) frÃ¥n."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Installerar"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Var vänlig vänta medan $(^NameDA) installeras."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Installationen är klar"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Var vÃ¤nlig vÃ¤nta medan $(^NameDA) installeras."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Installationen Ã¤r klar"
   ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Guiden avslutades korrekt."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Installationen avbröts"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Guiden genomfördes inte korrekt."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Installationen avbrÃ¶ts"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Guiden genomfÃ¶rdes inte korrekt."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Avinstallerar"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Var vänlig vänta medan $(^NameDA) avinstalleras."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Avinstallationen genomförd"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Avinstallationen genomfördes korrekt."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Var vÃ¤nlig vÃ¤nta medan $(^NameDA) avinstalleras."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Avinstallationen genomfÃ¶rd"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Avinstallationen genomfÃ¶rdes korrekt."
   ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Avinstallationen avbruten"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Avinstallationen genomfördes inte korrekt."
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Avinstallationen genomfÃ¶rdes inte korrekt."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Avslutar installationsguiden för $(^NameDA)."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) har installerats på din dator.$\r$\n$\r$\nKlicka på Slutför för att avsluta guiden."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Din dator måste startas om för att fullborda installationen av $(^NameDA). Vill du starta om nu?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Avslutar installationsguiden fÃ¶r $(^NameDA)."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) har installerats pÃ¥ din dator.$\r$\n$\r$\nKlicka pÃ¥ SlutfÃ¶r fÃ¶r att avsluta guiden."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Din dator mÃ¥ste startas om fÃ¶r att fullborda installationen av $(^NameDA). Vill du starta om nu?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Avslutar avinstallationsguiden för $(^NameDA)."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) komponenter har avinstallerats från din dator.$\r$\n$\r$\nKlicka på Slutför för att avsluta guiden."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Din dator måste startas om för att fullborda avinstallationen av $(^NameDA). Vill du starta om nu?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Avslutar avinstallationsguiden fÃ¶r $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) komponenter har avinstallerats frÃ¥n din dator.$\r$\n$\r$\nKlicka pÃ¥ SlutfÃ¶r fÃ¶r att avsluta guiden."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Din dator mÃ¥ste startas om fÃ¶r att fullborda avinstallationen av $(^NameDA). Vill du starta om nu?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
   ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Starta om nu"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Jag vill starta om själv senare"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "&Kör $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Jag vill starta om sjÃ¤lv senare"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&KÃ¶r $(^NameDA)"
   ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Visa Readme-filen"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Slutför"  
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&SlutfÃ¶r"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Välj Startmenykatalog"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Välj en Startmenykatalog för programmets genvägar."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Välj startmenykatalog i vilken du vill skapa programmets genvägar. Du kan ange ett eget namn för att skapa en ny katalog."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Skapa ej genvägar"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "VÃ¤lj Startmenykatalog"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "VÃ¤lj en Startmenykatalog fÃ¶r programmets genvÃ¤gar."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "VÃ¤lj startmenykatalog i vilken du vill skapa programmets genvÃ¤gar. Du kan ange ett eget namn fÃ¶r att skapa en ny katalog."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Skapa ej genvÃ¤gar"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
   ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Avinstallera $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Ta bort $(^NameDA) från din dator."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Ta bort $(^NameDA) frÃ¥n din dator."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Är du säker på att du vill avbryta installationen av $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Ã„r du sÃ¤ker pÃ¥ att du vill avbryta installationen av $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Är du säker på att du vill avbryta avinstallationen av $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ã„r du sÃ¤ker pÃ¥ att du vill avbryta avinstallationen av $(^Name)?"
 !endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "VÃ¤lj anvÃ¤ndare"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "VÃ¤lj fÃ¶r vilka anvÃ¤ndare du vill installera $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "VÃ¤lj huruvida du vill installera $(^NameDA) enbart fÃ¶r dig sjÃ¤lv eller fÃ¶r alla anvÃ¤ndare pÃ¥ denna dator. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Installera fÃ¶r alla som anvÃ¤nder denna dator"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Installera bara fÃ¶r mig"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Mongolian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Mongolian.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Mongolian.nlf	(revision 2956)
@@ -1,11 +1,11 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1104
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1251
 # RTL - anything else than RTL means LTR
 -
@@ -13,178 +13,178 @@
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-$(^Name) Ñóóëãàö
+$(^Name) Ð¡ÑƒÑƒÐ»Ð³Ð°Ñ†
 # ^UninstallCaption
-$(^Name) Ñóóëãàñíûã óñòãàõ
+$(^Name) Ð¡ÑƒÑƒÐ»Ð³Ð°Ñ�Ð½Ñ‹Ð³ ÑƒÑ�Ñ‚Ð³Ð°Ñ…
 # ^LicenseSubCaption
-: Ëèöåíçèéí çºâøººðºë
+: Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¹Ð½ Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ó©Ð»
 # ^ComponentsSubCaption
-: Ñóóëãàõ ñîíãîëò
+: Ð¡ÑƒÑƒÐ»Ð³Ð°Ñ… Ñ�Ð¾Ð½Ð³Ð¾Ð»Ñ‚
 # ^DirSubCaption
-: Ñóóëãàõ Õàâòàñ
+: Ð¡ÑƒÑƒÐ»Ð³Ð°Ñ… Ð¥Ð°Ð²Ñ‚Ð°Ñ�
 # ^InstallingSubCaption
-:Ñóóëãàæ áàéíà
+:Ð¡ÑƒÑƒÐ»Ð³Ð°Ð¶ Ð±Ð°Ð¹Ð½Ð°
 # ^CompletedSubCaption
-: Äóóñëàà
+: Ð”ÑƒÑƒÑ�Ð»Ð°Ð°
 # ^UnComponentsSubCaption
-: Ñóóëãàñíûã óñòãàõûí Ñîíãîëò
+: Ð¡ÑƒÑƒÐ»Ð³Ð°Ñ�Ð½Ñ‹Ð³ ÑƒÑ�Ñ‚Ð³Ð°Ñ…Ñ‹Ð½ Ð¡Ð¾Ð½Ð³Ð¾Ð»Ñ‚
 # ^UnDirSubCaption
-: Ñóóëãàñíûã óñòãàõ Õàâòàñ
+: Ð¡ÑƒÑƒÐ»Ð³Ð°Ñ�Ð½Ñ‹Ð³ ÑƒÑ�Ñ‚Ð³Ð°Ñ… Ð¥Ð°Ð²Ñ‚Ð°Ñ�
 # ^ConfirmSubCaption
-: Áàòëàìæ
+: Ð‘Ð°Ñ‚Ð»Ð°Ð¼Ð¶
 # ^UninstallingSubCaption
-: Ñóóëãàñíûã óñòãàæ áàéíà
+: Ð¡ÑƒÑƒÐ»Ð³Ð°Ñ�Ð½Ñ‹Ð³ ÑƒÑ�Ñ‚Ð³Ð°Ð¶ Ð±Ð°Ð¹Ð½Ð°
 # ^UnCompletedSubCaption
-: Äóóñëàà
+: Ð”ÑƒÑƒÑ�Ð»Ð°Ð°
 # ^BackBtn
-< &Áóöàõ
+< &Ð‘ÑƒÑ†Ð°Ñ…
 # ^NextBtn
-&Öààø>
+&Ð¦Ð°Ð°Ñˆ>
 # ^AgreeBtn
-&Çºâøººðëºº
+&Ð—Ó©Ð²ÑˆÓ©Ó©Ñ€Ð»Ó©Ó©
 # ^AcceptBtn
-Áè Ëèöåíçèéí Çºâøººðëèéí ç¿éë¿¿äèéã  &çºâøººð÷ áàéíà
+Ð‘Ð¸ Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¹Ð½ Ð—Ó©Ð²ÑˆÓ©Ó©Ñ€Ð»Ð¸Ð¹Ð½ Ð·Ò¯Ð¹Ð»Ò¯Ò¯Ð´Ð¸Ð¹Ð³  &Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ñ‡ Ð±Ð°Ð¹Ð½Ð°
 # ^DontAcceptBtn
-Áè Ëèöåíçèéí Çºâøººðëèéí ç¿éë¿¿äèéã  &çºâøººðºõã¿é áàéíà
+Ð‘Ð¸ Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¹Ð½ Ð—Ó©Ð²ÑˆÓ©Ó©Ñ€Ð»Ð¸Ð¹Ð½ Ð·Ò¯Ð¹Ð»Ò¯Ò¯Ð´Ð¸Ð¹Ð³  &Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ó©Ñ…Ð³Ò¯Ð¹ Ð±Ð°Ð¹Ð½Ð°
 # ^InstallBtn
-&Ñóóëãà
+&Ð¡ÑƒÑƒÐ»Ð³Ð°
 # ^UninstallBtn
-&Óñòãà
+&Ð£Ñ�Ñ‚Ð³Ð°
 # ^CancelBtn
-Áîëèõ
+Ð‘Ð¾Ð»Ð¸Ñ…
 # ^CloseBtn
 &Xaax
 # ^BrowseBtn
-Õ&ºòëºõ...
+Ð¥&Ó©Ñ‚Ð»Ó©Ñ…...
 # ^ShowDetailsBtn
-&Äýëãýðýíã¿é
+&Ð”Ñ�Ð»Ð³Ñ�Ñ€Ñ�Ð½Ð³Ò¯Ð¹
 # ^ClickNext
-Öààø äýýð äàðâàë ¿ðãýëæèëíý.
+Ð¦Ð°Ð°Ñˆ Ð´Ñ�Ñ�Ñ€ Ð´Ð°Ñ€Ð²Ð°Ð» Ò¯Ñ€Ð³Ñ�Ð»Ð¶Ð¸Ð»Ð½Ñ�.
 # ^ClickInstall
-Ñóóëãà äýýð äàðâàë ñóóëãàö ýõýëíý.
+Ð¡ÑƒÑƒÐ»Ð³Ð° Ð´Ñ�Ñ�Ñ€ Ð´Ð°Ñ€Ð²Ð°Ð» Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ† Ñ�Ñ…Ñ�Ð»Ð½Ñ�.
 # ^ClickUninstall
-Óñòãà äýýð äàðâàë ñóóëãàöûí óñòãàëò ýõýëíý.
+Ð£Ñ�Ñ‚Ð³Ð° Ð´Ñ�Ñ�Ñ€ Ð´Ð°Ñ€Ð²Ð°Ð» Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ†Ñ‹Ð½ ÑƒÑ�Ñ‚Ð³Ð°Ð»Ñ‚ Ñ�Ñ…Ñ�Ð»Ð½Ñ�.
 # ^Name
-Íýð
+Ð�Ñ�Ñ€
 # ^Completed
-Äóóñëàà
+Ð”ÑƒÑƒÑ�Ð»Ð°Ð°
 # ^LicenseText
-$(^NameDA)-ã ñóóëãàõûí ºìíº Ëèöåíçèéí Çºâøººðëèéã óíøèíà óó. Õýðýâ òà çºâøèëöëèéí ç¿éë¿¿äèéã çºâøººð÷ áàéâàë, Çºâøººðëºº-ã äàðíà óó.
+$(^NameDA)-Ð³ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ…Ñ‹Ð½ Ó©Ð¼Ð½Ó© Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¹Ð½ Ð—Ó©Ð²ÑˆÓ©Ó©Ñ€Ð»Ð¸Ð¹Ð³ ÑƒÐ½ÑˆÐ¸Ð½Ð° ÑƒÑƒ. Ð¥Ñ�Ñ€Ñ�Ð² Ñ‚Ð° Ð·Ó©Ð²ÑˆÐ¸Ð»Ñ†Ð»Ð¸Ð¹Ð½ Ð·Ò¯Ð¹Ð»Ò¯Ò¯Ð´Ð¸Ð¹Ð³ Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ñ‡ Ð±Ð°Ð¹Ð²Ð°Ð», Ð—Ó©Ð²ÑˆÓ©Ó©Ñ€Ð»Ó©Ó©-Ð³ Ð´Ð°Ñ€Ð½Ð° ÑƒÑƒ.
 # ^LicenseTextCB
-$(^NameDA)-ã ñóóëãàõûí ºìíº Ëèöåíçèéí Çºâøººðëèéã óíøèíà óó. Õýðýâ òà çºâøèëöëèéí ç¿éë¿¿äèéã çºâøººð÷ áàéâàë, äîîðõ í¿äèéã ÷àãòàëíà óó. $_CLICK
+$(^NameDA)-Ð³ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ…Ñ‹Ð½ Ó©Ð¼Ð½Ó© Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¹Ð½ Ð—Ó©Ð²ÑˆÓ©Ó©Ñ€Ð»Ð¸Ð¹Ð³ ÑƒÐ½ÑˆÐ¸Ð½Ð° ÑƒÑƒ. Ð¥Ñ�Ñ€Ñ�Ð² Ñ‚Ð° Ð·Ó©Ð²ÑˆÐ¸Ð»Ñ†Ð»Ð¸Ð¹Ð½ Ð·Ò¯Ð¹Ð»Ò¯Ò¯Ð´Ð¸Ð¹Ð³ Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ñ‡ Ð±Ð°Ð¹Ð²Ð°Ð», Ð´Ð¾Ð¾Ñ€Ñ… Ð½Ò¯Ð´Ð¸Ð¹Ð³ Ñ‡Ð°Ð³Ñ‚Ð°Ð»Ð½Ð° ÑƒÑƒ. $_CLICK
 # ^LicenseTextRB
-$(^NameDA)-ã ñóóëãàõûí ºìíº Ëèöåíçèéí Çºâøººðëèéã óíøèíà óó. Õýðýâ òà çºâøèëöëèéí ç¿éë¿¿äèéã çºâøººð÷ áàéâàë, äîîðõ ýõíèé ñîíãîëòûã ñîíãîíî óó. $_CLICK
+$(^NameDA)-Ð³ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ…Ñ‹Ð½ Ó©Ð¼Ð½Ó© Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¹Ð½ Ð—Ó©Ð²ÑˆÓ©Ó©Ñ€Ð»Ð¸Ð¹Ð³ ÑƒÐ½ÑˆÐ¸Ð½Ð° ÑƒÑƒ. Ð¥Ñ�Ñ€Ñ�Ð² Ñ‚Ð° Ð·Ó©Ð²ÑˆÐ¸Ð»Ñ†Ð»Ð¸Ð¹Ð½ Ð·Ò¯Ð¹Ð»Ò¯Ò¯Ð´Ð¸Ð¹Ð³ Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ñ‡ Ð±Ð°Ð¹Ð²Ð°Ð», Ð´Ð¾Ð¾Ñ€Ñ… Ñ�Ñ…Ð½Ð¸Ð¹ Ñ�Ð¾Ð½Ð³Ð¾Ð»Ñ‚Ñ‹Ð³ Ñ�Ð¾Ð½Ð³Ð¾Ð½Ð¾ ÑƒÑƒ. $_CLICK
 # ^UnLicenseText
-$(^NameDA)-ã ñóóëãàõûí ºìíº Ëèöåíçèéí Çºâøººðëèéã óíøèíà óó. Õýðýâ òà çºâøèëöëèéí ç¿éë¿¿äèéã çºâøººð÷ áàéâàë, Çºâøººðëºº-ã äàðíà óó.
+$(^NameDA)-Ð³ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ…Ñ‹Ð½ Ó©Ð¼Ð½Ó© Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¹Ð½ Ð—Ó©Ð²ÑˆÓ©Ó©Ñ€Ð»Ð¸Ð¹Ð³ ÑƒÐ½ÑˆÐ¸Ð½Ð° ÑƒÑƒ. Ð¥Ñ�Ñ€Ñ�Ð² Ñ‚Ð° Ð·Ó©Ð²ÑˆÐ¸Ð»Ñ†Ð»Ð¸Ð¹Ð½ Ð·Ò¯Ð¹Ð»Ò¯Ò¯Ð´Ð¸Ð¹Ð³ Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ñ‡ Ð±Ð°Ð¹Ð²Ð°Ð», Ð—Ó©Ð²ÑˆÓ©Ó©Ñ€Ð»Ó©Ó©-Ð³ Ð´Ð°Ñ€Ð½Ð° ÑƒÑƒ.
 # ^UnLicenseTextCB
-$(^NameDA)-ã ñóóëãàõûí ºìíº Ëèöåíçèéí Çºâøººðëèéã óíøèíà óó. Õýðýâ òà çºâøèëöëèéí ç¿éë¿¿äèéã çºâøººð÷ áàéâàë, äîîðõ í¿äèéã ÷àãòàëíà óó. $_CLICK
+$(^NameDA)-Ð³ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ…Ñ‹Ð½ Ó©Ð¼Ð½Ó© Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¹Ð½ Ð—Ó©Ð²ÑˆÓ©Ó©Ñ€Ð»Ð¸Ð¹Ð³ ÑƒÐ½ÑˆÐ¸Ð½Ð° ÑƒÑƒ. Ð¥Ñ�Ñ€Ñ�Ð² Ñ‚Ð° Ð·Ó©Ð²ÑˆÐ¸Ð»Ñ†Ð»Ð¸Ð¹Ð½ Ð·Ò¯Ð¹Ð»Ò¯Ò¯Ð´Ð¸Ð¹Ð³ Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ñ‡ Ð±Ð°Ð¹Ð²Ð°Ð», Ð´Ð¾Ð¾Ñ€Ñ… Ð½Ò¯Ð´Ð¸Ð¹Ð³ Ñ‡Ð°Ð³Ñ‚Ð°Ð»Ð½Ð° ÑƒÑƒ. $_CLICK
 # ^UnLicenseTextRB
-$(^NameDA)-ã ñóóëãàõûí ºìíº Ëèöåíçèéí Çºâøººðëèéã óíøèíà óó. Õýðýâ òà çºâøèëöëèéí ç¿éë¿¿äèéã çºâøººð÷ áàéâàë, äîîðõ ýõíèé ñîíãîëòûã ñîíãîíî óó. $_CLICK
+$(^NameDA)-Ð³ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ…Ñ‹Ð½ Ó©Ð¼Ð½Ó© Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¹Ð½ Ð—Ó©Ð²ÑˆÓ©Ó©Ñ€Ð»Ð¸Ð¹Ð³ ÑƒÐ½ÑˆÐ¸Ð½Ð° ÑƒÑƒ. Ð¥Ñ�Ñ€Ñ�Ð² Ñ‚Ð° Ð·Ó©Ð²ÑˆÐ¸Ð»Ñ†Ð»Ð¸Ð¹Ð½ Ð·Ò¯Ð¹Ð»Ò¯Ò¯Ð´Ð¸Ð¹Ð³ Ð·Ó©Ð²ÑˆÓ©Ó©Ñ€Ñ‡ Ð±Ð°Ð¹Ð²Ð°Ð», Ð´Ð¾Ð¾Ñ€Ñ… Ñ�Ñ…Ð½Ð¸Ð¹ Ñ�Ð¾Ð½Ð³Ð¾Ð»Ñ‚Ñ‹Ð³ Ñ�Ð¾Ð½Ð³Ð¾Ð½Ð¾ ÑƒÑƒ. $_CLICK
 # ^Custom
-Áóñàä
+Ð‘ÑƒÑ�Ð°Ð´
 # ^ComponentsText
-Ñóóëãàõûã õ¿ññýí íýãäëýý ÷àãòëààä, ñóóëãàõûã õ¿ñýõã¿é áóéãàà á¿¿ ÷àãòëààðàé. $_CLICK
+Ð¡ÑƒÑƒÐ»Ð³Ð°Ñ…Ñ‹Ð³ Ñ…Ò¯Ñ�Ñ�Ñ�Ð½ Ð½Ñ�Ð³Ð´Ð»Ñ�Ñ� Ñ‡Ð°Ð³Ñ‚Ð»Ð°Ð°Ð´, Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ…Ñ‹Ð³ Ñ…Ò¯Ñ�Ñ�Ñ…Ð³Ò¯Ð¹ Ð±ÑƒÐ¹Ð³Ð°Ð° Ð±Ò¯Ò¯ Ñ‡Ð°Ð³Ñ‚Ð»Ð°Ð°Ñ€Ð°Ð¹. $_CLICK
 # ^ComponentsSubText1
-Ñóóëãàõ òºðëèéã ñîíãîíî óó:
+Ð¡ÑƒÑƒÐ»Ð³Ð°Ñ… Ñ‚Ó©Ñ€Ð»Ð¸Ð¹Ð³ Ñ�Ð¾Ð½Ð³Ð¾Ð½Ð¾ ÑƒÑƒ:
 # ^ComponentsSubText2_NoInstTypes
-Ñóóëãàõ íýãäëèéã ñîíãîíî óó:
+Ð¡ÑƒÑƒÐ»Ð³Ð°Ñ… Ð½Ñ�Ð³Ð´Ð»Ð¸Ð¹Ð³ Ñ�Ð¾Ð½Ð³Ð¾Ð½Ð¾ ÑƒÑƒ:
 # ^ComponentsSubText2
-Ýñâýë, çààâàë ñóóëãàõã¿é áàéõ íýãäë¿¿äèéã ñîíãî:
+Ð­Ñ�Ð²Ñ�Ð», Ð·Ð°Ð°Ð²Ð°Ð» Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ…Ð³Ò¯Ð¹ Ð±Ð°Ð¹Ñ… Ð½Ñ�Ð³Ð´Ð»Ò¯Ò¯Ð´Ð¸Ð¹Ð³ Ñ�Ð¾Ð½Ð³Ð¾:
 # ^UnComponentsText
-Óñòãàõûã õ¿ññýí íýãäëýý ÷àãòëààä, óñòãàõûã õ¿ñýõã¿é áàéãààãàà á¿¿ ÷àãòëààðàé. $_CLICK
+Ð£Ñ�Ñ‚Ð³Ð°Ñ…Ñ‹Ð³ Ñ…Ò¯Ñ�Ñ�Ñ�Ð½ Ð½Ñ�Ð³Ð´Ð»Ñ�Ñ� Ñ‡Ð°Ð³Ñ‚Ð»Ð°Ð°Ð´, ÑƒÑ�Ñ‚Ð³Ð°Ñ…Ñ‹Ð³ Ñ…Ò¯Ñ�Ñ�Ñ…Ð³Ò¯Ð¹ Ð±Ð°Ð¹Ð³Ð°Ð°Ð³Ð°Ð° Ð±Ò¯Ò¯ Ñ‡Ð°Ð³Ñ‚Ð»Ð°Ð°Ñ€Ð°Ð¹. $_CLICK
 # ^UnComponentsSubText1
-Óñòãàõ òºðëèéã ñîíãîíî óó:
+Ð£Ñ�Ñ‚Ð³Ð°Ñ… Ñ‚Ó©Ñ€Ð»Ð¸Ð¹Ð³ Ñ�Ð¾Ð½Ð³Ð¾Ð½Ð¾ ÑƒÑƒ:
 # ^UnComponentsSubText2_NoInstTypes
-Óñòãàõ íýãäë¿¿äèéã ñîíãîíî óól:
+Ð£Ñ�Ñ‚Ð³Ð°Ñ… Ð½Ñ�Ð³Ð´Ð»Ò¯Ò¯Ð´Ð¸Ð¹Ð³ Ñ�Ð¾Ð½Ð³Ð¾Ð½Ð¾ ÑƒÑƒl:
 # ^UnComponentsSubText2
-Ýñâýë, çààâàë óñòãàõã¿é áàéõ íýãäë¿¿äèéã ñîíãî:
+Ð­Ñ�Ð²Ñ�Ð», Ð·Ð°Ð°Ð²Ð°Ð» ÑƒÑ�Ñ‚Ð³Ð°Ñ…Ð³Ò¯Ð¹ Ð±Ð°Ð¹Ñ… Ð½Ñ�Ð³Ð´Ð»Ò¯Ò¯Ð´Ð¸Ð¹Ð³ Ñ�Ð¾Ð½Ð³Ð¾:
 # ^DirText
-$(^NameDA) íü äàðààõ õàâòñàíä ñóóíà. ªºð ãàçàð ñóóëãàõûã õ¿ñâýë Õºòëºõ òîâ÷ äýýð äàðàí ººð õàâòàñ ñîíãîíî óó. $_CLICK
+$(^NameDA) Ð½ÑŒ Ð´Ð°Ñ€Ð°Ð°Ñ… Ñ…Ð°Ð²Ñ‚Ñ�Ð°Ð½Ð´ Ñ�ÑƒÑƒÐ½Ð°. Ó¨Ó©Ñ€ Ð³Ð°Ð·Ð°Ñ€ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ…Ñ‹Ð³ Ñ…Ò¯Ñ�Ð²Ñ�Ð» Ð¥Ó©Ñ‚Ð»Ó©Ñ… Ñ‚Ð¾Ð²Ñ‡ Ð´Ñ�Ñ�Ñ€ Ð´Ð°Ñ€Ð°Ð½ Ó©Ó©Ñ€ Ñ…Ð°Ð²Ñ‚Ð°Ñ� Ñ�Ð¾Ð½Ð³Ð¾Ð½Ð¾ ÑƒÑƒ. $_CLICK
 # ^DirSubText
-Çîðèëòîò Õàâòàñ
+Ð—Ð¾Ñ€Ð¸Ð»Ñ‚Ð¾Ñ‚ Ð¥Ð°Ð²Ñ‚Ð°Ñ�
 # ^DirBrowseText
-$(^NameDA)-ûã ñóóëãàõ õàâòñûã ñîíãîõ:
+$(^NameDA)-Ñ‹Ð³ Ñ�ÑƒÑƒÐ»Ð³Ð°Ñ… Ñ…Ð°Ð²Ñ‚Ñ�Ñ‹Ð³ Ñ�Ð¾Ð½Ð³Ð¾Ñ…:
 # ^UnDirText
-$(^NameDA)-ã óã õàâòàñíààñ óñòãàíà. ªºð ãàçðààñ óñòãàõûã õ¿ñâýë Õºòëºõ òîâ÷ äýýð äàðàí ººð õàâòàñ ñîíãîíî óó. $_CLICK
+$(^NameDA)-Ð³ ÑƒÐ³ Ñ…Ð°Ð²Ñ‚Ð°Ñ�Ð½Ð°Ð°Ñ� ÑƒÑ�Ñ‚Ð³Ð°Ð½Ð°. Ó¨Ó©Ñ€ Ð³Ð°Ð·Ñ€Ð°Ð°Ñ� ÑƒÑ�Ñ‚Ð³Ð°Ñ…Ñ‹Ð³ Ñ…Ò¯Ñ�Ð²Ñ�Ð» Ð¥Ó©Ñ‚Ð»Ó©Ñ… Ñ‚Ð¾Ð²Ñ‡ Ð´Ñ�Ñ�Ñ€ Ð´Ð°Ñ€Ð°Ð½ Ó©Ó©Ñ€ Ñ…Ð°Ð²Ñ‚Ð°Ñ� Ñ�Ð¾Ð½Ð³Ð¾Ð½Ð¾ ÑƒÑƒ. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-$(^NameDA)-ã óñòãàõ õàâòñûã ñîíãîõ:
+$(^NameDA)-Ð³ ÑƒÑ�Ñ‚Ð³Ð°Ñ… Ñ…Ð°Ð²Ñ‚Ñ�Ñ‹Ð³ Ñ�Ð¾Ð½Ð³Ð¾Ñ…:
 # ^SpaceAvailable
-"Áîëîìæèò çàé: "
+"Ð‘Ð¾Ð»Ð¾Ð¼Ð¶Ð¸Ñ‚ Ð·Ð°Ð¹: "
 # ^SpaceRequired
-"Øààðäàãäàõ çàé: "
+"Ð¨Ð°Ð°Ñ€Ð´Ð°Ð³Ð´Ð°Ñ… Ð·Ð°Ð¹: "
 # ^UninstallingText
-$(^NameDA) íü óã õàâòàñíààñ óñòãàãäëàà. $_CLICK
+$(^NameDA) Ð½ÑŒ ÑƒÐ³ Ñ…Ð°Ð²Ñ‚Ð°Ñ�Ð½Ð°Ð°Ñ� ÑƒÑ�Ñ‚Ð³Ð°Ð³Ð´Ð»Ð°Ð°. $_CLICK
 # ^UninstallingSubText
-Óñòãàãäàõ ãàçàð:
+Ð£Ñ�Ñ‚Ð³Ð°Ð³Ð´Ð°Ñ… Ð³Ð°Ð·Ð°Ñ€:
 # ^FileError
-Ôàéë áè÷èõýýð íýýõýä àëäëàà: \r\n\t"$0"\r\nÒàñëàõ äàðâàë ñóóëãàëò òàñëàãäàíà,\r\nÄàõüÿ äàðâàë ôàéëûã áè÷èõýýð äàõèí îðîëäîíî,\r\nýñâýë ¯ë òîîõ äàðâàë óã ôàéëûã àëãàñíà
+Ð¤Ð°Ð¹Ð» Ð±Ð¸Ñ‡Ð¸Ñ…Ñ�Ñ�Ñ€ Ð½Ñ�Ñ�Ñ…Ñ�Ð´ Ð°Ð»Ð´Ð»Ð°Ð°: \r\n\t"$0"\r\nÐ¢Ð°Ñ�Ð»Ð°Ñ… Ð´Ð°Ñ€Ð²Ð°Ð» Ñ�ÑƒÑƒÐ»Ð³Ð°Ð»Ñ‚ Ñ‚Ð°Ñ�Ð»Ð°Ð³Ð´Ð°Ð½Ð°,\r\nÐ”Ð°Ñ…ÑŒÑ� Ð´Ð°Ñ€Ð²Ð°Ð» Ñ„Ð°Ð¹Ð»Ñ‹Ð³ Ð±Ð¸Ñ‡Ð¸Ñ…Ñ�Ñ�Ñ€ Ð´Ð°Ñ…Ð¸Ð½ Ð¾Ñ€Ð¾Ð»Ð´Ð¾Ð½Ð¾,\r\nÑ�Ñ�Ð²Ñ�Ð» Ò®Ð» Ñ‚Ð¾Ð¾Ñ… Ð´Ð°Ñ€Ð²Ð°Ð» ÑƒÐ³ Ñ„Ð°Ð¹Ð»Ñ‹Ð³ Ð°Ð»Ð³Ð°Ñ�Ð½Ð°
 # ^FileError_NoIgnore
-Ôàéë áè÷èõýýð íýýõýä àëäëàà: \r\n\t"$0"\r\nÄàõèÿ äàðâàë ôàéëûã áè÷èõýýð äàõèí îðîëäîíî, \r\nýñâýë áîëèõ äàðâàë ñóóëãàëò òàñëàãäàíà
+Ð¤Ð°Ð¹Ð» Ð±Ð¸Ñ‡Ð¸Ñ…Ñ�Ñ�Ñ€ Ð½Ñ�Ñ�Ñ…Ñ�Ð´ Ð°Ð»Ð´Ð»Ð°Ð°: \r\n\t"$0"\r\nÐ”Ð°Ñ…Ð¸Ñ� Ð´Ð°Ñ€Ð²Ð°Ð» Ñ„Ð°Ð¹Ð»Ñ‹Ð³ Ð±Ð¸Ñ‡Ð¸Ñ…Ñ�Ñ�Ñ€ Ð´Ð°Ñ…Ð¸Ð½ Ð¾Ñ€Ð¾Ð»Ð´Ð¾Ð½Ð¾, \r\nÑ�Ñ�Ð²Ñ�Ð» Ð±Ð¾Ð»Ð¸Ñ… Ð´Ð°Ñ€Ð²Ð°Ð» Ñ�ÑƒÑƒÐ»Ð³Ð°Ð»Ñ‚ Ñ‚Ð°Ñ�Ð»Ð°Ð³Ð´Ð°Ð½Ð°
 # ^CantWrite
-"Áè÷èæ ÷àäñàíã¿é: "
+"Ð‘Ð¸Ñ‡Ð¸Ð¶ Ñ‡Ð°Ð´Ñ�Ð°Ð½Ð³Ò¯Ð¹: "
 # ^CopyFailed
-Õóóëàëò á¿òñýíã¿é
+Ð¥ÑƒÑƒÐ»Ð°Ð»Ñ‚ Ð±Ò¯Ñ‚Ñ�Ñ�Ð½Ð³Ò¯Ð¹
 # ^CopyTo
-"Õóóëàõ íü "
+"Ð¥ÑƒÑƒÐ»Ð°Ñ… Ð½ÑŒ "
 # ^Registering
-"Á¿ðòãýæ áàéíà: "
+"Ð‘Ò¯Ñ€Ñ‚Ð³Ñ�Ð¶ Ð±Ð°Ð¹Ð½Ð°: "
 # ^Unregistering
-"Á¿ðòãýëèéã àðèëãàæ áàéíà: "
+"Ð‘Ò¯Ñ€Ñ‚Ð³Ñ�Ð»Ð¸Ð¹Ð³ Ð°Ñ€Ð¸Ð»Ð³Ð°Ð¶ Ð±Ð°Ð¹Ð½Ð°: "
 # ^SymbolNotFound
-"Òýìäýã õàéãäñàíã¿é: "
+"Ð¢Ñ�Ð¼Ð´Ñ�Ð³ Ñ…Ð°Ð¹Ð³Ð´Ñ�Ð°Ð½Ð³Ò¯Ð¹: "
 # ^CouldNotLoad
-"Äóóäàãäñàíã¿é: "
+"Ð”ÑƒÑƒÐ´Ð°Ð³Ð´Ñ�Ð°Ð½Ð³Ò¯Ð¹: "
 # ^CreateFolder
-"¯¿ñãýõ õàâòàñ: "
+"Ò®Ò¯Ñ�Ð³Ñ�Ñ… Ñ…Ð°Ð²Ñ‚Ð°Ñ�: "
 # ^CreateShortcut
-"¯¿ñãýõ shortcut: "
+"Ò®Ò¯Ñ�Ð³Ñ�Ñ… shortcut: "
 # ^CreatedUninstaller
-"¯¿ññýí uninstaller: "
+"Ò®Ò¯Ñ�Ñ�Ñ�Ð½ uninstaller: "
 # ^Delete
-"Ôàéë óñòãàõ: "
+"Ð¤Ð°Ð¹Ð» ÑƒÑ�Ñ‚Ð³Ð°Ñ…: "
 # ^DeleteOnReboot
-"Ä.à÷ààëàõàä óñòãàõ: "
+"Ð”.Ð°Ñ‡Ð°Ð°Ð»Ð°Ñ…Ð°Ð´ ÑƒÑ�Ñ‚Ð³Ð°Ñ…: "
 # ^ErrorCreatingShortcut
-"Shortcut ¿¿ñãýõýä àëäëàà: "
+"Shortcut Ò¯Ò¯Ñ�Ð³Ñ�Ñ…Ñ�Ð´ Ð°Ð»Ð´Ð»Ð°Ð°: "
 # ^ErrorCreating
-"¯¿ñãýõ àëäàà: "
+"Ò®Ò¯Ñ�Ð³Ñ�Ñ… Ð°Ð»Ð´Ð°Ð°: "
 # ^ErrorDecompressing
-ªãºãäºë çàäëàõàä àëäëàà! Ñóóëãàö ýâäýð÷ýý?
+Ó¨Ð³Ó©Ð³Ð´Ó©Ð» Ð·Ð°Ð´Ð»Ð°Ñ…Ð°Ð´ Ð°Ð»Ð´Ð»Ð°Ð°! Ð¡ÑƒÑƒÐ»Ð³Ð°Ñ† Ñ�Ð²Ð´Ñ�Ñ€Ñ‡Ñ�Ñ�?
 # ^ErrorRegistering
-DLL á¿ðòã¿¿ëýõýä àëäëàà
+DLL Ð±Ò¯Ñ€Ñ‚Ð³Ò¯Ò¯Ð»Ñ�Ñ…Ñ�Ð´ Ð°Ð»Ð´Ð»Ð°Ð°
 # ^ExecShell
-"Àæèëëóóëàõ êîìàíä(ExecShell): "
+"Ð�Ð¶Ð¸Ð»Ð»ÑƒÑƒÐ»Ð°Ñ… ÐºÐ¾Ð¼Ð°Ð½Ð´(ExecShell): "
 # ^Exec
-"Àæèëëóóëàõ: "
+"Ð�Ð¶Ð¸Ð»Ð»ÑƒÑƒÐ»Ð°Ñ…: "
 # ^Extract
-"Çàäëàõ: "
+"Ð—Ð°Ð´Ð»Ð°Ñ…: "
 # ^ErrorWriting
-"Çàäëàëò:ôàéë ðóó áè÷èõýä àëäàà "
+"Ð—Ð°Ð´Ð»Ð°Ð»Ñ‚:Ñ„Ð°Ð¹Ð» Ñ€ÑƒÑƒ Ð±Ð¸Ñ‡Ð¸Ñ…Ñ�Ð´ Ð°Ð»Ð´Ð°Ð° "
 # ^InvalidOpcode
-Ñóóëãàö ýâäýð÷ýý: çàäëàõ êîä áóðóó
+Ð¡ÑƒÑƒÐ»Ð³Ð°Ñ† Ñ�Ð²Ð´Ñ�Ñ€Ñ‡Ñ�Ñ�: Ð·Ð°Ð´Ð»Ð°Ñ… ÐºÐ¾Ð´ Ð±ÑƒÑ€ÑƒÑƒ
 # ^NoOLE
-"OLE áàéõã¿é: "
+"OLE Ð±Ð°Ð¹Ñ…Ð³Ò¯Ð¹: "
 # ^OutputFolder
-"Ãàðãàõ õàâòàñ: "
+"Ð“Ð°Ñ€Ð³Ð°Ñ… Ñ…Ð°Ð²Ñ‚Ð°Ñ�: "
 # ^RemoveFolder
-"Óñòãàõ õàâòàñ: "
+"Ð£Ñ�Ñ‚Ð³Ð°Ñ… Ñ…Ð°Ð²Ñ‚Ð°Ñ�: "
 # ^RenameOnReboot
-"Ä.à÷ààëàõàä äàõèí íýðëýõ: "
+"Ð”.Ð°Ñ‡Ð°Ð°Ð»Ð°Ñ…Ð°Ð´ Ð´Ð°Ñ…Ð¸Ð½ Ð½Ñ�Ñ€Ð»Ñ�Ñ…: "
 # ^Rename
-"Äàõèí íýðëýõ: "
+"Ð”Ð°Ñ…Ð¸Ð½ Ð½Ñ�Ñ€Ð»Ñ�Ñ…: "
 # ^Skipped
-"Àëãàññàí: "
+"Ð�Ð»Ð³Ð°Ñ�Ñ�Ð°Ð½: "
 # ^CopyDetails
-Äýëãýðýíã¿éã Clipboard ðóó õóóëàõ
+Ð”Ñ�Ð»Ð³Ñ�Ñ€Ñ�Ð½Ð³Ò¯Ð¹Ð³ Clipboard Ñ€ÑƒÑƒ Ñ…ÑƒÑƒÐ»Ð°Ñ…
 # ^LogInstall
-Ñóóëãàõ ÿâöûí áàðèìò
+Ð¡ÑƒÑƒÐ»Ð³Ð°Ñ… Ñ�Ð²Ñ†Ñ‹Ð½ Ð±Ð°Ñ€Ð¸Ð¼Ñ‚
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Belarusian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Belarusian.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Belarusian.nlf	(revision 2956)
@@ -1,190 +1,190 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1059
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1251
 # RTL - anything else than RTL means LTR
 -
-# Translation by Sitnikov Vjacheslav [ glory_man@tut.by ]
+# Translation by PrydesparBLR [ prydespar@outlook.com ]
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-Óñòàíî¢êà $(^Name)
+Ð£Ñ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ðµ $(^Name)
 # ^UninstallCaption
-Âûäàëåííå $(^Name)
+Ð’Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ðµ $(^Name)
 # ^LicenseSubCaption
-: Ë³öýíç³éíàå ïàãàäíåííå
+: Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ðµ Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ðµ
 # ^ComponentsSubCaption
-: Ïàðàìåòðû ¢ñòàíî¢ê³
+: ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ ÑžÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ñ�
 # ^DirSubCaption
-: Ïàïêà óñòàíî¢ê³
+: ÐŸÐ°Ð¿ÐºÐ° ÑžÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ñ�
 # ^InstallingSubCaption
-: Êàï³ðàâàííå ôàéëà¢
+: ÐšÐ°Ð¿Ñ–Ñ�Ð²Ð°Ð½Ð½Ðµ Ñ„Ð°Ð¹Ð»Ð°Ñž
 # ^CompletedSubCaption
-: Ïðàöýäóðà çàâåðøåíà
+: ÐŸÑ€Ð°Ñ†Ñ�Ð´ÑƒÑ€Ð° Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð°
 # ^UnComponentsSubCaption
-: Ïàðàìåòðû âûäàëåííÿ
+: ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ñ�
 # ^UnDirSubCaption
-: Ïàïêà âûäàëåííÿ
+: ÐŸÐ°Ð¿ÐºÐ° Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ñ�
 # ^ConfirmSubCaption
-: Ïàöâÿðäæýííå
+: ÐŸÐ°Ñ†Ð²Ñ�Ñ€Ð´Ð¶Ñ�Ð½Ð½Ðµ
 # ^UninstallingSubCaption
-: Âûäàëåííå ôàéëà¢
+: Ð’Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ðµ Ñ„Ð°Ð¹Ð»Ð°Ñž
 # ^UnCompletedSubCaption
-: Ïðàöýäóðà çàâåðøàíà
+: ÐŸÑ€Ð°Ñ†Ñ�Ð´ÑƒÑ€Ð° Ð·Ð°Ð²ÐµÑ€ÑˆÐ°Ð½Ð°
 # ^BackBtn
-< &Íàçàä
+< &Ð�Ð°Ð·Ð°Ð´
 # ^NextBtn
-&Äàëåé >
+&Ð”Ð°Ð»ÐµÐ¹ >
 # ^AgreeBtn
-&Çãîäçåí
+&ÐŸÑ€Ñ‹Ð½Ñ�Ñ†ÑŒ
 # ^AcceptBtn
-ß &ïðûìàþ ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ
+Ð¯ &Ð¿Ñ€Ñ‹Ð¼Ð°ÑŽ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ�
 # ^DontAcceptBtn
-ß í&å ïðûìàþ ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ
+Ð¯ Ð½&Ðµ Ð¿Ñ€Ñ‹Ð¼Ð°ÑŽ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ�
 # ^InstallBtn
-&Óñòàëÿâàöü
+&Ð£Ñ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ñ†ÑŒ
 # ^UninstallBtn
-Âûä&àë³öü
+Ð’Ñ‹Ð´&Ð°Ð»Ñ–Ñ†ÑŒ
 # ^CancelBtn
-Àäìÿí³öü
+Ð¡ÐºÐ°Ñ�Ð°Ð²Ð°Ñ†ÑŒ
 # ^CloseBtn
-Çà&÷ûí³öü
+Ð—Ð°&ÐºÑ€Ñ‹Ñ†ÑŒ
 # ^BrowseBtn
-À&ãëÿä ...
+Ð�&Ð³Ð»Ñ�Ð´ ...
 # ^ShowDetailsBtn
-Ïàäðà&áÿçíà...
+ÐŸÐ°Ð´Ñ€Ð°&Ð±Ñ�Ð·Ð½Ð°Ñ�Ñ†Ñ–...
 # ^ClickNext
-Íàö³ñí³öå êíîïêó "Äàëåé", êàá ïðàöÿãíóöü óñòàíî¢êó ïðàãðàìû.
+Ð�Ð°Ñ†Ñ–Ñ�Ð½Ñ–Ñ†Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ "Ð”Ð°Ð»ÐµÐ¹", ÐºÐ°Ð± Ð¿Ñ€Ð°Ñ†Ñ�Ð³Ð½ÑƒÑ†ÑŒ ÑƒÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ðµ Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹.
 # ^ClickInstall
-Íàö³ñí³öå êíîïêó "Óñòàëÿâàöü" äëÿ ïà÷àòêó ïðàöýñà ¢ñòàíî¢ê³ ïðàãðàìû.
+Ð�Ð°Ñ†Ñ–Ñ�Ð½Ñ–Ñ†Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ "Ð£Ñ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ñ†ÑŒ", ÐºÐ°Ð± Ð¿Ð°Ñ‡Ð°Ñ†ÑŒ Ð¿Ñ€Ð°Ñ†Ñ�Ñ� ÑžÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ñ� Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹.
 # ^ClickUninstall
-Íàö³ñí³öå êíîïêó "Âûäàë³öü" äëÿ ïà÷àòêó ïðàöýñà âûäàëåííÿ ïðàãðàìû.
+Ð�Ð°Ñ†Ñ–Ñ�Ð½Ñ–Ñ†Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ "Ð’Ñ‹Ð´Ð°Ð»Ñ–Ñ†ÑŒ", ÐºÐ°Ð± Ð¿Ð°Ñ‡Ð°Ñ†ÑŒ Ð¿Ñ€Ð°Ñ†Ñ�Ñ� Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ñ� Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹.
 # ^Name
-²ìÿ
+Ð†Ð¼Ñ�
 # ^Completed
-Çàâåðøàíà
+Ð—Ð°Ð²ÐµÑ€ÑˆÐ°Ð½Ð°
 # ^LicenseText
-Êàë³ ëàñêà, ïðà÷ûòàéöå ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ ïåðàä ïà÷àòêàì óñòàíî¢ê³ $(^NameDA). Êàë³ Âû ïðûìàåöå ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ, íàö³ñí³öå êíîïêó "Çãîäçåí".
+ÐšÐ°Ð»Ñ– Ð»Ð°Ñ�ÐºÐ°, Ð¿Ñ€Ð°Ñ‡Ñ‹Ñ‚Ð°Ð¹Ñ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ� Ð¿ÐµÑ€Ð°Ð´ Ð¿Ð°Ñ‡Ð°Ñ‚ÐºÐ°Ð¼ ÑƒÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ñ� $(^NameDA). ÐšÐ°Ð»Ñ– Ð’Ñ‹ Ð¿Ñ€Ñ‹Ð¼Ð°ÐµÑ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ�, Ð½Ð°Ñ†Ñ–Ñ�Ð½Ñ–Ñ†Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ "ÐŸÑ€Ñ‹Ð½Ñ�Ñ†ÑŒ".
 # ^LicenseTextCB
-Êàë³ ëàñêà, ïðà÷ûòàéöå ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ ïåðàä ïà÷àòêàì óñòàíî¢ê³ $(^NameDA). Êàë³ Âû ïðûìàåöå ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ, óñòàëþéöå ñöÿæîê í³æýé. $_CLICK
+ÐšÐ°Ð»Ñ– Ð»Ð°Ñ�ÐºÐ°, Ð¿Ñ€Ð°Ñ‡Ñ‹Ñ‚Ð°Ð¹Ñ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ� Ð¿ÐµÑ€Ð°Ð´ Ð¿Ð°Ñ‡Ð°Ñ‚ÐºÐ°Ð¼ ÑƒÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ñ� $(^NameDA). ÐšÐ°Ð»Ñ– Ð’Ñ‹ Ð¿Ñ€Ñ‹Ð¼Ð°ÐµÑ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ�, Ð½Ð°Ñ†Ñ–Ñ�Ð½Ñ–Ñ†Ðµ Ð½Ð° Ñ�Ñ†Ñ�Ð¶Ð¾Ðº Ð½Ñ–Ð¶Ñ�Ð¹. $_CLICK
 # ^LicenseTextRB
-Êàë³ ëàñêà, ïðà÷ûòàéöå ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ ïåðàä ïà÷àòêàì óñòàíî¢ê³ $(^NameDA). Êàë³ Âû ïðûìàåöå ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ, âûëó÷ûöå ïåðøû âàðûÿíò ç ïðàïàíàâàíûõ íiæýé. $_CLICK
+ÐšÐ°Ð»Ñ– Ð»Ð°Ñ�ÐºÐ°, Ð¿Ñ€Ð°Ñ‡Ñ‹Ñ‚Ð°Ð¹Ñ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ� Ð¿ÐµÑ€Ð°Ð´ Ð¿Ð°Ñ‡Ð°Ñ‚ÐºÐ°Ð¼ ÑƒÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ñ� $(^NameDA). ÐšÐ°Ð»Ñ– Ð’Ñ‹ Ð¿Ñ€Ñ‹Ð¼Ð°ÐµÑ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ�, Ð²Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ Ð¿ÐµÑ€ÑˆÑ‹ Ð²Ð°Ñ€Ñ‹Ñ�Ð½Ñ‚ Ð· Ð¿Ñ€Ð°Ð¿Ð°Ð½Ð°Ð²Ð°Ð½Ñ‹Ñ… Ð½iÐ¶Ñ�Ð¹. $_CLICK
 # ^UnLicenseText
-Êàë³ ëàñêà, ïðà÷ûòàéöå ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ ïåðàä ïà÷àòêàì âûäàëåííÿ $(^NameDA). Êàë³ Âû ïðûìàåöå ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ, íàöiñíiöå êíîïêó "Çãîäçåí".
+ÐšÐ°Ð»Ñ– Ð»Ð°Ñ�ÐºÐ°, Ð¿Ñ€Ð°Ñ‡Ñ‹Ñ‚Ð°Ð¹Ñ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ� Ð¿ÐµÑ€Ð°Ð´ Ð¿Ð°Ñ‡Ð°Ñ‚ÐºÐ°Ð¼ Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ñ� $(^NameDA). ÐšÐ°Ð»Ñ– Ð’Ñ‹ Ð¿Ñ€Ñ‹Ð¼Ð°ÐµÑ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ�, Ð½Ð°Ñ†iÑ�Ð½iÑ†Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ "ÐŸÑ€Ñ‹Ð½Ñ�Ñ†ÑŒ".
 # ^UnLicenseTextCB
-Êàë³ ëàñêà, ïðà÷ûòàéöå ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ ïåðàä ïà÷àòêàì âûäàëåííÿ $(^NameDA). Êàë³ Âû ïðûìàåöå ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ, óñòàëþéöå ñöÿæîê í³æýé. $_CLICK
+ÐšÐ°Ð»Ñ– Ð»Ð°Ñ�ÐºÐ°, Ð¿Ñ€Ð°Ñ‡Ñ‹Ñ‚Ð°Ð¹Ñ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ� Ð¿ÐµÑ€Ð°Ð´ Ð¿Ð°Ñ‡Ð°Ñ‚ÐºÐ°Ð¼ Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ñ� $(^NameDA). ÐšÐ°Ð»Ñ– Ð’Ñ‹ Ð¿Ñ€Ñ‹Ð¼Ð°ÐµÑ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ�, Ð½Ð°Ñ†Ñ–Ñ�Ð½Ñ–Ñ†Ðµ Ð½Ð° Ñ�Ñ†Ñ�Ð¶Ð¾Ðº Ð½Ñ–Ð¶Ñ�Ð¹. $_CLICK
 # ^UnLicenseTextRB
-Êàë³ ëàñêà, ïðà÷ûòàéöå ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ ïåðàä ïà÷àòêàì âûäàëåííÿ $(^NameDA). Êàë³ Âû ïðûìàåöå ¢ìîâû Ë³öýíç³éíàãà ïàãàäíåííÿ, âûëó÷ûöå ïåðøû âàðûÿíò ç ïðàïàíàâàíûõ íiæýé. $_CLICK
+ÐšÐ°Ð»Ñ– Ð»Ð°Ñ�ÐºÐ°, Ð¿Ñ€Ð°Ñ‡Ñ‹Ñ‚Ð°Ð¹Ñ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ� Ð¿ÐµÑ€Ð°Ð´ Ð¿Ð°Ñ‡Ð°Ñ‚ÐºÐ°Ð¼ Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ñ� $(^NameDA). ÐšÐ°Ð»Ñ– Ð’Ñ‹ Ð¿Ñ€Ñ‹Ð¼Ð°ÐµÑ†Ðµ ÑžÐ¼Ð¾Ð²Ñ‹ Ð›Ñ–Ñ†Ñ�Ð½Ð·Ñ–Ð¹Ð½Ð°Ð³Ð° Ð¿Ð°Ð³Ð°Ð´Ð½ÐµÐ½Ð½Ñ�, Ð²Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ Ð¿ÐµÑ€ÑˆÑ‹ Ð²Ð°Ñ€Ñ‹Ñ�Ð½Ñ‚ Ð· Ð¿Ñ€Ð°Ð¿Ð°Ð½Ð°Ð²Ð°Ð½Ñ‹Ñ… Ð½iÐ¶Ñ�Ð¹. $_CLICK
 # ^Custom
-Âûáàðêîâà
+Ð’Ñ‹Ð±Ð°Ñ€Ð°Ñ‡Ð½Ð°
 # ^ComponentsText
-Âûçíà÷öå êàìïàíåíòû ïðàãðàìû, ÿêiÿ Âû æàäàåöå ¢ñòàíàâiöü. $_CLICK
+Ð’Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ ÐºÐ°Ð¼Ð¿Ð°Ð½ÐµÐ½Ñ‚Ñ‹ Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹, Ñ�ÐºiÑ� Ð’Ñ‹ Ð¶Ð°Ð´Ð°ÐµÑ†Ðµ ÑžÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ñ†ÑŒ. $_CLICK
 # ^ComponentsSubText1
-Âûçíà÷öå òûï óñòàíî¢êi:
+Ð’Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ Ñ‚Ñ‹Ð¿ ÑƒÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ñ�:
 # ^ComponentsSubText2_NoInstTypes
-Âûçíà÷öå êàìïàíåíòû ïðàãðàìû, êàá óñòàíàâiöü iõ:
+Ð’Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ ÐºÐ°Ð¼Ð¿Ð°Ð½ÐµÐ½Ñ‚Ñ‹ Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹, ÐºÐ°Ð± ÑƒÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ñ†ÑŒ iÑ…:
 # ^ComponentsSubText2
-àëüáî âûçíà÷öå êàìïàíåíòû ïðàãðàìû, êàá óñòàíàâiöü iõ ïà ñâàéìó æàäàííþ:
+Ð°Ð±Ð¾ Ð²Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ ÐºÐ°Ð¼Ð¿Ð°Ð½ÐµÐ½Ñ‚Ñ‹ Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹, ÐºÐ°Ð± ÑƒÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ñ†ÑŒ iÑ… Ð¿Ð° Ñ�Ð²Ð°Ð¹Ð¼Ñƒ Ð¶Ð°Ð´Ð°Ð½Ð½ÑŽ:
 # ^UnComponentsText
-Âûçíà÷öå êàìïàíåíòû, ÿêiÿ Âû æàäàåöå âûäàëiöü, i çíiìiöå ñöÿæê³, âûáðàíûÿ äëÿ òûõ êàìïàíåíòà¢, ÿêiÿ íå òðýáà âûäàëÿöü. $_CLICK
+Ð’Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ ÐºÐ°Ð¼Ð¿Ð°Ð½ÐµÐ½Ñ‚Ñ‹, Ñ�ÐºiÑ� Ð’Ñ‹ Ð¶Ð°Ð´Ð°ÐµÑ†Ðµ Ð²Ñ‹Ð´Ð°Ð»iÑ†ÑŒ, i Ð·Ð½iÐ¼iÑ†Ðµ Ñ�Ñ†Ñ�Ð¶ÐºÑ–, Ð²Ñ‹Ð±Ñ€Ð°Ð½Ñ‹Ñ� Ð´Ð»Ñ� Ñ‚Ñ‹Ñ… ÐºÐ°Ð¼Ð¿Ð°Ð½ÐµÐ½Ñ‚Ð°Ñž, Ñ�ÐºiÑ� Ð½Ðµ Ñ‚Ñ€Ñ�Ð±Ð° Ð²Ñ‹Ð´Ð°Ð»Ñ�Ñ†ÑŒ. $_CLICK
 # ^UnComponentsSubText1
-Âûçíà÷öå òûï âûäàëåííÿ:
+Ð’Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ Ñ‚Ñ‹Ð¿ Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ñ�:
 # ^UnComponentsSubText2_NoInstTypes
-Âûçíà÷öå êàìïàíåíòû äëÿ âûäàëåííÿ:
+Ð’Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ ÐºÐ°Ð¼Ð¿Ð°Ð½ÐµÐ½Ñ‚Ñ‹ Ð´Ð»Ñ� Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ñ�:
 # ^UnComponentsSubText2
-àëüáî âûçíà÷öå êàìïàíåíòû ïðàãðàìû äëÿ âûäàëåííÿ:
+Ð°Ð±Ð¾ Ð²Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ ÐºÐ°Ð¼Ð¿Ð°Ð½ÐµÐ½Ñ‚Ñ‹ Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹ Ð´Ð»Ñ� Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ñ�:
 # ^DirText
-Ïðàãðàìà ¢ñòàëþå $(^NameDA) ó âûçíà÷àíóþ ïàïêó. Êàá óñòàíàâiöü ïðàãðàìó ¢ iíøàé ïàïê³, íàöiñíiöå êíîïêó "Àãëÿä" i âûçíà÷öå ïàòðýáíóþ ïàïêó. $_CLICK
+ÐŸÑ€Ð°Ð³Ñ€Ð°Ð¼Ð° ÑžÑ�Ñ‚Ð°Ð»ÑŽÐµ $(^NameDA) Ñƒ Ð²Ñ‹Ð±Ñ€Ð°Ð½ÑƒÑŽ Ð¿Ð°Ð¿ÐºÑƒ. ÐšÐ°Ð± ÑƒÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ñ†ÑŒ Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñƒ Ñž iÐ½ÑˆÐ°Ð¹ Ð¿Ð°Ð¿ÐºÑ–, Ð½Ð°Ñ†iÑ�Ð½iÑ†Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ "Ð�Ð³Ð»Ñ�Ð´" i Ð²Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ Ð¿Ð°Ñ‚Ñ€Ñ�Ð±Ð½ÑƒÑŽ Ð¿Ð°Ð¿ÐºÑƒ. $_CLICK
 # ^DirSubText
-Ïàïêà óñòàíî¢êi
+ÐŸÐ°Ð¿ÐºÐ° ÑžÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ñ�
 # ^DirBrowseText
-Âûçíà÷öå ïàïêó äëÿ ¢ñòàíî¢êi $(^NameDA):
+Ð’Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ Ð¿Ð°Ð¿ÐºÑƒ Ð´Ð»Ñ� ÑžÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ñ� $(^NameDA):
 # ^UnDirText
-Ïðàãðàìà âûäàëiöü $(^NameDA) ç àäçíà÷àíàé ïàïê³. Êàá âûðàá³öü âûäàëåííå ç iíøàé ïàïê³, íàöiñíiöå êíîïêó "Àãëÿä" i âûçíà÷öå ïàòðýáíóþ ïàïêó. $_CLICK
+ÐŸÑ€Ð°Ð³Ñ€Ð°Ð¼Ð° Ð²Ñ‹Ð´Ð°Ð»iÑ†ÑŒ $(^NameDA) Ð· Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð°Ð¹ Ð¿Ð°Ð¿ÐºÑ–. ÐšÐ°Ð± Ð²Ñ‹Ð´Ð°Ð»Ñ–Ñ†ÑŒ Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñƒ Ð· iÐ½ÑˆÐ°Ð¹ Ð¿Ð°Ð¿ÐºÑ–, Ð½Ð°Ñ†iÑ�Ð½iÑ†Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ "Ð�Ð³Ð»Ñ�Ð´" i Ð²Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ Ð¿Ð°Ñ‚Ñ€Ñ�Ð±Ð½ÑƒÑŽ Ð¿Ð°Ð¿ÐºÑƒ. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Âûçíà÷öå ïàïêó, ç ÿêîé Âû æàäàåöå âûäàëiöü $(^NameDA):
+Ð’Ñ‹Ð±ÐµÑ€Ñ‹Ñ†Ðµ Ð¿Ð°Ð¿ÐºÑƒ, Ð· Ñ�ÐºÐ¾Ð¹ Ð’Ñ‹ Ð¶Ð°Ð´Ð°ÐµÑ†Ðµ Ð²Ñ‹Ð´Ð°Ð»iÑ†ÑŒ $(^NameDA):
 # ^SpaceAvailable
-"Äàñÿæíà íà äûñêó: "
+"Ð”Ð°Ñ�Ñ‚ÑƒÐ¿Ð½Ð° Ð½Ð° Ð´Ñ‹Ñ�ÐºÑƒ: "
 # ^SpaceRequired
-"Ïàòðýáíàå ìåñöà íà äûñêó: "
+"ÐŸÐ°Ñ‚Ñ€Ñ�Ð±Ð½Ð° Ð¼ÐµÑ�Ñ†Ð° Ð½Ð° Ð´Ñ‹Ñ�ÐºÑƒ: "
 # ^UninstallingText
-Ïðàãðàìà âûäàëiöü $(^NameDA) ç Âàøàãà êàìïóòàðà. $_CLICK
+ÐŸÑ€Ð°Ð³Ñ€Ð°Ð¼Ð° Ð²Ñ‹Ð´Ð°Ð»iÑ†ÑŒ $(^NameDA) Ð· Ð’Ð°ÑˆÐ°Ð³Ð° ÐºÐ°Ð¼Ð¿'ÑŽÑ‚Ð°Ñ€Ð°. $_CLICK
 # ^UninstallingSubText
-Âûäàëåííå ç:
+Ð’Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ðµ Ð·:
 # ^FileError
-Íåìàã÷ûìà àä÷ûí³öü ôàéë äëÿ çàïiñó: \r\n\r\n$0\r\n\r\nÍàöiñíiöå êíîïêó "Ïåðàïûíiöü", êàá ïåðàïûíiöü óñòàíî¢êó;\r\n"Ïà¢òàðûöü", êàá ïà¢òàðûöü ñïðîáó çàïiñó ¢ ôàéë;\r\n"²ãíàðàâàöü", êàá ïðàïóñöiöü ãýòà äçåÿííå.
+Ð�ÐµÐ¼Ð°Ð³Ñ‡Ñ‹Ð¼Ð° Ð°Ð´ÐºÑ€Ñ‹Ñ†ÑŒ Ñ„Ð°Ð¹Ð» Ð´Ð»Ñ� Ð·Ð°Ð¿iÑ�Ñƒ: \r\n\r\n$0\r\n\r\nÐ�Ð°Ñ†iÑ�Ð½iÑ†Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ "ÐŸÐµÑ€Ð°Ð¿Ñ‹Ð½iÑ†ÑŒ", ÐºÐ°Ð± Ð¿ÐµÑ€Ð°Ð¿Ñ‹Ð½iÑ†ÑŒ ÑƒÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ðµ;\r\n"ÐŸÐ°ÑžÑ‚Ð°Ñ€Ñ‹Ñ†ÑŒ", ÐºÐ°Ð± Ð¿Ð°ÑžÑ‚Ð°Ñ€Ñ‹Ñ†ÑŒ Ñ�Ð¿Ñ€Ð¾Ð±Ñƒ Ð·Ð°Ð¿iÑ�Ñƒ Ñž Ñ„Ð°Ð¹Ð»;\r\n"Ð†Ð³Ð½Ð°Ñ€Ð°Ð²Ð°Ñ†ÑŒ", ÐºÐ°Ð± Ð¿Ñ€Ð°Ð¿ÑƒÑ�Ñ†iÑ†ÑŒ Ð³Ñ�Ñ‚Ð° Ð´Ð·ÐµÑ�Ð½Ð½Ðµ.
 # ^FileError_NoIgnore
-Íåìàã÷ûìà àä÷ûí³öü ôàéë äëÿ çàïiñó: \r\n\r\n$0\r\n\r\nÍàöiñíiöå êíîïêó "Ïà¢òàðûöü", êàá ïà¢òàðûöü ñïðîáó çàïiñó ¢ ôàéë;\r\n"Àäìÿí³öü", êàá ïåðàïûíiöü óñòàíî¢êó.
+Ð�ÐµÐ¼Ð°Ð³Ñ‡Ñ‹Ð¼Ð° Ð°Ð´ÐºÑ€Ñ‹Ñ†ÑŒ Ñ„Ð°Ð¹Ð» Ð´Ð»Ñ� Ð·Ð°Ð¿iÑ�Ñƒ: \r\n\r\n$0\r\n\r\nÐ�Ð°Ñ†iÑ�Ð½iÑ†Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ "ÐŸÐ°ÑžÑ‚Ð°Ñ€Ñ‹Ñ†ÑŒ", ÐºÐ°Ð± Ð¿Ð°ÑžÑ‚Ð°Ñ€Ñ‹Ñ†ÑŒ Ñ�Ð¿Ñ€Ð¾Ð±Ñƒ Ð·Ð°Ð¿iÑ�Ñƒ Ñž Ñ„Ð°Ð¹Ð»;\r\n"Ð¡ÐºÐ°Ñ�Ð°Ð²Ð°Ñ†ÑŒ", ÐºÐ°Ð± Ð¿ÐµÑ€Ð°Ð¿Ñ‹Ð½iÑ†ÑŒ ÑƒÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ðµ.
 # ^CantWrite
-"Íåìàã÷ûìà çàïiñàöü: "
+"Ð�ÐµÐ¼Ð°Ð³Ñ‡Ñ‹Ð¼Ð° Ð·Ð°Ð¿iÑ�Ð°Ñ†ÑŒ: "
 # ^CopyFailed
-Êàïiðàâàííå íÿ¢äàëà
+ÐŸÐ°Ð¼Ñ‹Ð»ÐºÐ° Ð¿Ñ€Ñ‹ ÐºÐ°Ð¿Ñ–Ñ�Ð²Ð°Ð½Ð½Ñ–
 # ^CopyTo
-"Êàïiðàâàííå ¢ "
+"ÐšÐ°Ð¿Ñ–Ñ�Ð²Ð°Ð½Ð½Ðµ Ñž "
 # ^Registering
-"Ðýãiñòðàöûÿ: "
+"Ð Ñ�Ð³iÑ�Ñ‚Ñ€Ð°Ñ†Ñ‹Ñ�: "
 # ^Unregistering
-"Âûäàëåííå ðýãiñòðàöûi: "
+"Ð’Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ðµ Ñ€Ñ�Ð³iÑ�Ñ‚Ñ€Ð°Ñ†Ñ‹i: "
 # ^SymbolNotFound
-"Íåìàã÷ûìà àäøóêàöü ñiìâàë: "
+"Ð�ÐµÐ¼Ð°Ð³Ñ‡Ñ‹Ð¼Ð° Ð·Ð½Ð°Ð¹Ñ�Ñ†Ñ– Ñ�iÐ¼Ð²Ð°Ð»: "
 # ^CouldNotLoad
-"Íåìàã÷ûìà çàãðóçiöü: "
+"Ð�ÐµÐ¼Ð°Ð³Ñ‡Ñ‹Ð¼Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·iÑ†ÑŒ: "
 # ^CreateFolder
-"Ñòâàðýííå ïàïê³: "
+"Ð¡Ñ‚Ð²Ð°Ñ€Ñ�Ð½Ð½Ðµ Ð¿Ð°Ð¿ÐºÑ–: "
 # ^CreateShortcut
-"Ñòâàðýííå ÿðëûêó: "
+"Ð¡Ñ‚Ð²Ð°Ñ€Ñ�Ð½Ð½Ðµ Ñ�Ñ€Ð»Ñ‹ÐºÐ°: "
 # ^CreatedUninstaller
-"Ñòâàðýííå ïðàãðàìû âûäàëåííÿ: "
+"Ð¡Ñ‚Ð²Ð°Ñ€Ñ�Ð½Ð½Ðµ Ð¿Ñ€Ð°Ð³Ñ€Ð°Ð¼Ñ‹ Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ñ�: "
 # ^Delete
-"Âûäàëåííå ôàéëà: "
+"Ð’Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ðµ Ñ„Ð°Ð¹Ð»Ð°: "
 # ^DeleteOnReboot
-"Âûäàëåííå ïàñëÿ ïåðåçàãðóçêi êàìïóòàðà: "
+"Ð’Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ðµ Ð¿Ð°Ñ�Ð»Ñ� Ð¿ÐµÑ€Ð°Ð·Ð°Ð¿ÑƒÑ�ÐºÑƒ ÐºÐ°Ð¼Ð¿'ÑŽÑ‚Ð°Ñ€Ð°: "
 # ^ErrorCreatingShortcut
-"Ïàìûëêà ñòâàðýííÿ ÿðëûêó: " 
+"ÐŸÐ°Ð¼Ñ‹Ð»ÐºÐ° Ñ�Ñ‚Ð²Ð°Ñ€Ñ�Ð½Ð½Ñ� Ñ�Ñ€Ð»Ñ‹ÐºÐ°: " 
 # ^ErrorCreating
-"Ïàìûëêà ñòâàðýííÿ: "
+"ÐŸÐ°Ð¼Ñ‹Ð»ÐºÐ° Ñ�Ñ‚Ð²Ð°Ñ€Ñ�Ð½Ð½Ñ�: "
 # ^ErrorDecompressing
-Íåìàã÷ûìà âûöÿãíóöü äàäçåíûÿ. Ìàã÷ûìà ïàøêîäæàíû äûñòðûáóòû¢.
+Ð�ÐµÐ¼Ð°Ð³Ñ‡Ñ‹Ð¼Ð° Ð²Ñ‹Ñ†Ñ�Ð³Ð½ÑƒÑ†ÑŒ Ð´Ð°Ð´Ð·ÐµÐ½Ñ‹Ñ�. ÐœÐ°Ð³Ñ‡Ñ‹Ð¼Ð° Ð¿Ð°ÑˆÐºÐ¾Ð´Ð¶Ð°Ð½Ñ‹ Ð´Ñ‹Ñ�Ñ‚Ñ€Ñ‹Ð±ÑƒÑ‚Ñ‹Ñž.
 # ^ErrorRegistering
-Íåìàã÷ûìà çàðýã³ñòðàâàöü á³áë³ÿòýêó (DLL)
+Ð�ÐµÐ¼Ð°Ð³Ñ‡Ñ‹Ð¼Ð° Ð·Ð°Ñ€Ñ�Ð³Ñ–Ñ�Ñ‚Ñ€Ð°Ð²Ð°Ñ†ÑŒ Ð±Ñ–Ð±Ð»Ñ–Ñ�Ñ‚Ñ�ÐºÑƒ (DLL)
 # ^ExecShell
-"Âûêàíàííå êàìàíäû àáàëîíê³: " 
+"Ð’Ñ‹ÐºÐ°Ð½Ð°Ð½Ð½Ðµ ÐºÐ°Ð¼Ð°Ð½Ð´Ñ‹ Ð°Ð±Ð°Ð»Ð¾Ð½ÐºÑ–: " 
 # ^Exec
-"Âûêàíàííå: "
+"Ð’Ñ‹ÐºÐ°Ð½Ð°Ð½Ð½Ðµ: "
 # ^Extract
-"Âûìàííå: "
+"Ð’Ñ‹Ð¼Ð°Ð½Ð½Ðµ: "
 # ^ErrorWriting
-"Âûìàííå: ïàìûëêà çàïiñó ôàéëà"
+"Ð’Ñ‹Ð¼Ð°Ð½Ð½Ðµ: Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ° Ð·Ð°Ð¿iÑ�Ñƒ Ñ„Ð°Ð¹Ð»Ð°"
 # ^InvalidOpcode
-äûñòðûáóòû¢ ïàøêîäæàíû: êîä ïàìûëêi
+Ð´Ñ‹Ñ�Ñ‚Ñ€Ñ‹Ð±ÑƒÑ‚Ñ‹Ñž Ð¿Ð°ÑˆÐºÐ¾Ð´Ð¶Ð°Ð½Ñ‹: ÐºÐ¾Ð´ Ð¿Ð°Ð¼Ñ‹Ð»Ðºi
 # ^NoOLE
-"Íÿìà OLE äëÿ: " 
+"Ð�Ñ�Ð¼Ð° OLE Ð´Ð»Ñ�: " 
 # ^OutputFolder
-"Êàòàëîã óñòàíî¢êi: "
+"ÐŸÐ°Ð¿ÐºÐ° ÑƒÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ñ�: "
 # ^RemoveFolder
-"Âûäàëåííå ïàïê³: "
+"Ð’Ñ‹Ð´Ð°Ð»ÐµÐ½Ð½Ðµ Ð¿Ð°Ð¿ÐºÑ–: "
 # ^RenameOnReboot
-"Ïåðàíàçâà ïàñëÿ ïåðåçàãðóçêi êàìïóòàðà: "
+"ÐŸÐµÑ€Ð°Ð¹Ð¼ÐµÐ½Ð°Ð²Ð°Ð½Ð½Ðµ Ð¿Ð°Ñ�Ð»Ñ� Ð¿ÐµÑ€Ð°Ð·Ð°Ð¿ÑƒÑ�ÐºÑƒ ÐºÐ°Ð¼Ð¿'ÑŽÑ‚Ð°Ñ€Ð°: "
 # ^Rename
-"Ïåðàíàçâà: "
+"ÐŸÐµÑ€Ð°Ð¹Ð¼ÐµÐ½Ð°Ð²Ð°Ð½Ð½Ðµ: "
 # ^Skipped
-"Ïðàïóø÷àíà: "
+"ÐŸÑ€Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð½Ð°: "
 # ^CopyDetails
-Êàïiðàâàöü çâåñòêi ¢ áóôåð àáìåíà 
+ÐšÐ°Ð¿Ñ–Ñ�Ð²Ð°Ñ†ÑŒ Ð·Ð²ÐµÑ�Ñ‚Ðºi Ñž Ð±ÑƒÑ„ÐµÑ€ Ð°Ð±Ð¼ÐµÐ½Ð° 
 # ^LogInstall
-Çàïiñâàöü ó ëîã ïðàöýñ óñòàíî¢êi
+Ð—Ð°Ð¿iÑ�Ð²Ð°Ñ†ÑŒ Ñƒ Ð»Ð¾Ð³ Ð¿Ñ€Ð°Ñ†Ñ�Ñ� ÑƒÑ�Ñ‚Ð°Ð»Ñ�Ð²Ð°Ð½Ð½Ñ�
 # byte
-Á
+Ð‘
 # kilo
-Ê
+ Ðš
 # mega
-Ì
+ Ðœ
 # giga
-Ã
\ No newline at end of file
+ Ð“
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Korean.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Korean.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Korean.nsh	(revision 2956)
@@ -1,121 +1,121 @@
-;Language: Korean (1042)
+ï»¿;Language: Korean (1042)
 ;By linak linak@korea.com ( ~ V2.0 BETA3 ) By kippler@gmail.com(www.kipple.pe.kr) ( V2.0 BETA3 ~ ) (last update:2007/09/05)
 
-!insertmacro LANGFILE "Korean" "Korean"
+!insertmacro LANGFILE "Korean" = "í•œêµ­ì–´" "Hangugeo"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) ¼³Ä¡¸¦ ½ÃÀÛÇÕ´Ï´Ù."
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "ÀÌ ÇÁ·Î±×·¥Àº ´ç½ÅÀÇ ÄÄÇ»ÅÍ¿¡ $(^NameDA)(À»)¸¦ ¼³Ä¡ÇÒ °ÍÀÔ´Ï´Ù.$\r$\n$\r$\n¼³Ä¡¸¦ ½ÃÀÛÇÏ±â Àü °¡´ÉÇÑ ÇÑ ¸ðµç ÇÁ·Î±×·¥À» Á¾·áÇÏ¿© ÁÖ½Ã±â ¹Ù¶ø´Ï´Ù. ÀÌ´Â ÀçºÎÆÃÀ» ÇÏÁö ¾Ê°í¼­µµ ½Ã½ºÅÛ ÆÄÀÏÀ» ¼öÁ¤ÇÒ ¼ö ÀÖ°Ô ÇØÁÝ´Ï´Ù.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) ì„¤ì¹˜ë¥¼ ì‹œìž‘í•©ë‹ˆë‹¤."
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "ì�´ í”„ë¡œê·¸ëž¨ì�€ ë‹¹ì‹ ì�˜ ì»´í“¨í„°ì—� $(^NameDA)(ì�„)ë¥¼ ì„¤ì¹˜í•  ê²ƒìž…ë‹ˆë‹¤.$\r$\n$\r$\nì„¤ì¹˜ë¥¼ ì‹œìž‘í•˜ê¸° ì „ ê°€ëŠ¥í•œ í•œ ëª¨ë“  í”„ë¡œê·¸ëž¨ì�„ ì¢…ë£Œí•˜ì—¬ ì£¼ì‹œê¸° ë°”ëž�ë‹ˆë‹¤. ì�´ëŠ” ìž¬ë¶€íŒ…ì�„ í•˜ì§€ ì•Šê³ ì„œë�„ ì‹œìŠ¤í…œ íŒŒì�¼ì�„ ìˆ˜ì •í•  ìˆ˜ ìžˆê²Œ í•´ì¤�ë‹ˆë‹¤.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "$(^NameDA) Á¦°Å¸¦ ½ÃÀÛÇÕ´Ï´Ù."
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "ÀÌ ÇÁ·Î±×·¥Àº ´ç½ÅÀÇ ÄÄÇ»ÅÍ¿¡¼­ $(^NameDA)(À»)¸¦ Á¦°ÅÇÒ °ÍÀÔ´Ï´Ù.$\r$\n$\r$\nÁ¦°Å¸¦ ½ÃÀÛÇÏ±â Àü¿¡ $(^NameDA)(À»)¸¦ Á¾·áÇÏ¿© ÁÖ½Ã±â ¹Ù¶ø´Ï´Ù.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "$(^NameDA) ì œê±°ë¥¼ ì‹œìž‘í•©ë‹ˆë‹¤."
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "ì�´ í”„ë¡œê·¸ëž¨ì�€ ë‹¹ì‹ ì�˜ ì»´í“¨í„°ì—�ì„œ $(^NameDA)(ì�„)ë¥¼ ì œê±°í•  ê²ƒìž…ë‹ˆë‹¤.$\r$\n$\r$\nì œê±°ë¥¼ ì‹œìž‘í•˜ê¸° ì „ì—� $(^NameDA)(ì�„)ë¥¼ ì¢…ë£Œí•˜ì—¬ ì£¼ì‹œê¸° ë°”ëž�ë‹ˆë‹¤.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "»ç¿ë±Ç °è¾à"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "$(^NameDA)(À»)¸¦ ¼³Ä¡ÇÏ½Ã±â Àü¿¡ »ç¿ë±Ç °è¾à ³»¿ëÀ» »ìÆìº¸½Ã±â ¹Ù¶ø´Ï´Ù."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "³»¿ë¿¡ µ¿ÀÇÇÏ¼Ì´Ù¸é 'µ¿ÀÇÇÔ'À» ´­·¯ ÁÖ¼¼¿ä. $(^NameDA)(À»)¸¦ ¼³Ä¡ÇÏ±â À§ÇØ¼­´Â ¹Ýµå½Ã ³»¿ë¿¡ µ¿ÀÇÇÏ¼Å¾ß ÇÕ´Ï´Ù."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "³»¿ë¿¡ µ¿ÀÇÇÏ¼Ì´Ù¸é ¾Æ·¡ »çÇ×À» ¼±ÅÃÇØ ÁÖ¼¼¿ä. $(^NameDA)(À»)¸¦ ¼³Ä¡ÇÏ±â À§ÇØ¼­´Â ¹Ýµå½Ã ³»¿ë¿¡ µ¿ÀÇÇÏ¼Å¾ß ÇÕ´Ï´Ù. $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "³»¿ë¿¡ µ¿ÀÇÇÏ¼Ì´Ù¸é Ã¹ ¹øÂ° »çÇ×À» ¼±ÅÃÇØ ÁÖ¼¼¿ä. $(^NameDA)(À»)¸¦ ¼³Ä¡ÇÏ±â À§ÇØ¼­´Â ¹Ýµå½Ã ³»¿ë¿¡ µ¿ÀÇÇÏ¼Å¾ß ÇÕ´Ï´Ù. $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "ì‚¬ìš©ê¶Œ ê³„ì•½"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "$(^NameDA)(ì�„)ë¥¼ ì„¤ì¹˜í•˜ì‹œê¸° ì „ì—� ì‚¬ìš©ê¶Œ ê³„ì•½ ë‚´ìš©ì�„ ì‚´íŽ´ë³´ì‹œê¸° ë°”ëž�ë‹ˆë‹¤."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "ë‚´ìš©ì—� ë�™ì�˜í•˜ì…¨ë‹¤ë©´ 'ë�™ì�˜í•¨'ì�„ ëˆŒëŸ¬ ì£¼ì„¸ìš”. $(^NameDA)(ì�„)ë¥¼ ì„¤ì¹˜í•˜ê¸° ìœ„í•´ì„œëŠ” ë°˜ë“œì‹œ ë‚´ìš©ì—� ë�™ì�˜í•˜ì…”ì•¼ í•©ë‹ˆë‹¤."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "ë‚´ìš©ì—� ë�™ì�˜í•˜ì…¨ë‹¤ë©´ ì•„ëž˜ ì‚¬í•­ì�„ ì„ íƒ�í•´ ì£¼ì„¸ìš”. $(^NameDA)(ì�„)ë¥¼ ì„¤ì¹˜í•˜ê¸° ìœ„í•´ì„œëŠ” ë°˜ë“œì‹œ ë‚´ìš©ì—� ë�™ì�˜í•˜ì…”ì•¼ í•©ë‹ˆë‹¤. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ë‚´ìš©ì—� ë�™ì�˜í•˜ì…¨ë‹¤ë©´ ì²« ë²ˆì§¸ ì‚¬í•­ì�„ ì„ íƒ�í•´ ì£¼ì„¸ìš”. $(^NameDA)(ì�„)ë¥¼ ì„¤ì¹˜í•˜ê¸° ìœ„í•´ì„œëŠ” ë°˜ë“œì‹œ ë‚´ìš©ì—� ë�™ì�˜í•˜ì…”ì•¼ í•©ë‹ˆë‹¤. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "»ç¿ë±Ç °è¾à µ¿ÀÇ"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "$(^NameDA)(À»)¸¦ Á¦°ÅÇÏ½Ã±â Àü¿¡ »ç¿ë±Ç °è¾à ³»¿ëÀ» »ìÆìº¸½Ã±â ¹Ù¶ø´Ï´Ù."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "³»¿ë¿¡ µ¿ÀÇÇÏ¼Ì´Ù¸é 'µ¿ÀÇÇÔ'À» ´­·¯ ÁÖ¼¼¿ä. $(^NameDA)(À»)¸¦ Á¦°ÅÇÏ±â À§ÇØ¼­´Â ¹Ýµå½Ã ³»¿ë¿¡ µ¿ÀÇÇÏ¼Å¾ß ÇÕ´Ï´Ù."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "³»¿ë¿¡ µ¿ÀÇÇÏ¼Ì´Ù¸é ¾Æ·¡ »çÇ×À» ¼±ÅÃÇØ ÁÖ¼¼¿ä. $(^NameDA)(À»)¸¦ Á¦°ÅÇÏ±â À§ÇØ¼­´Â ¹Ýµå½Ã ³»¿ë¿¡ µ¿ÀÇÇÏ¼Å¾ß ÇÕ´Ï´Ù. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "³»¿ë¿¡ µ¿ÀÇÇÏ¼Ì´Ù¸é Ã¹ ¹øÂ° »çÇ×À» ¼±ÅÃÇØ ÁÖ¼¼¿ä. $(^NameDA)(À»)¸¦ Á¦°ÅÇÏ±â À§ÇØ¼­´Â ¹Ýµå½Ã ³»¿ë¿¡ µ¿ÀÇÇÏ¼Å¾ß ÇÕ´Ï´Ù. $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "ì‚¬ìš©ê¶Œ ê³„ì•½ ë�™ì�˜"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "$(^NameDA)(ì�„)ë¥¼ ì œê±°í•˜ì‹œê¸° ì „ì—� ì‚¬ìš©ê¶Œ ê³„ì•½ ë‚´ìš©ì�„ ì‚´íŽ´ë³´ì‹œê¸° ë°”ëž�ë‹ˆë‹¤."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "ë‚´ìš©ì—� ë�™ì�˜í•˜ì…¨ë‹¤ë©´ 'ë�™ì�˜í•¨'ì�„ ëˆŒëŸ¬ ì£¼ì„¸ìš”. $(^NameDA)(ì�„)ë¥¼ ì œê±°í•˜ê¸° ìœ„í•´ì„œëŠ” ë°˜ë“œì‹œ ë‚´ìš©ì—� ë�™ì�˜í•˜ì…”ì•¼ í•©ë‹ˆë‹¤."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "ë‚´ìš©ì—� ë�™ì�˜í•˜ì…¨ë‹¤ë©´ ì•„ëž˜ ì‚¬í•­ì�„ ì„ íƒ�í•´ ì£¼ì„¸ìš”. $(^NameDA)(ì�„)ë¥¼ ì œê±°í•˜ê¸° ìœ„í•´ì„œëŠ” ë°˜ë“œì‹œ ë‚´ìš©ì—� ë�™ì�˜í•˜ì…”ì•¼ í•©ë‹ˆë‹¤. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ë‚´ìš©ì—� ë�™ì�˜í•˜ì…¨ë‹¤ë©´ ì²« ë²ˆì§¸ ì‚¬í•­ì�„ ì„ íƒ�í•´ ì£¼ì„¸ìš”. $(^NameDA)(ì�„)ë¥¼ ì œê±°í•˜ê¸° ìœ„í•´ì„œëŠ” ë°˜ë“œì‹œ ë‚´ìš©ì—� ë�™ì�˜í•˜ì…”ì•¼ í•©ë‹ˆë‹¤. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "»ç¿ë±Ç °è¾à µ¿ÀÇ »çÇ×ÀÇ ³ª¸ÓÁö ºÎºÐÀ» º¸½Ã·Á¸é [Page Down] Å°¸¦ ´­·¯ ÁÖ¼¼¿ä."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "ì‚¬ìš©ê¶Œ ê³„ì•½ ë�™ì�˜ ì‚¬í•­ì�˜ ë‚˜ë¨¸ì§€ ë¶€ë¶„ì�„ ë³´ì‹œë ¤ë©´ [Page Down] í‚¤ë¥¼ ëˆŒëŸ¬ ì£¼ì„¸ìš”."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "±¸¼º ¿ä¼Ò ¼±ÅÃ"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "¼³Ä¡ÇÏ°íÀÚ ÇÏ´Â $(^NameDA)ÀÇ ±¸¼º ¿ä¼Ò¸¦ ¼±ÅÃÇØ ÁÖ¼¼¿ä."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "êµ¬ì„± ìš”ì†Œ ì„ íƒ�"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "ì„¤ì¹˜í•˜ê³ ìž� í•˜ëŠ” $(^NameDA)ì�˜ êµ¬ì„± ìš”ì†Œë¥¼ ì„ íƒ�í•´ ì£¼ì„¸ìš”."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "±¸¼º ¿ä¼Ò ¼±ÅÃ"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Á¦°ÅÇÏ°íÀÚ ÇÏ´Â $(^NameDA)ÀÇ ±¸¼º ¿ä¼Ò¸¦ ¼±ÅÃÇØ ÁÖ¼¼¿ä."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "êµ¬ì„± ìš”ì†Œ ì„ íƒ�"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "ì œê±°í•˜ê³ ìž� í•˜ëŠ” $(^NameDA)ì�˜ êµ¬ì„± ìš”ì†Œë¥¼ ì„ íƒ�í•´ ì£¼ì„¸ìš”."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "»ó¼¼ ¼³¸í"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "ìƒ�ì„¸ ì„¤ëª…"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "»ó¼¼ ¼³¸íÀ» º¸°í ½ÍÀ¸½Å ºÎºÐ¿¡ ¸¶¿ì½º¸¦ ¿Ã·Á³õÀ¸¼¼¿ä."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ìƒ�ì„¸ ì„¤ëª…ì�„ ë³´ê³  ì‹¶ìœ¼ì‹  ë¶€ë¶„ì—� ë§ˆìš°ìŠ¤ë¥¼ ì˜¬ë ¤ë†“ìœ¼ì„¸ìš”."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "»ó¼¼ ¼³¸íÀ» º¸°í ½ÍÀ¸½Å ºÎºÐ¿¡ ¸¶¿ì½º¸¦ ¿Ã·Á³õÀ¸¼¼¿ä."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ìƒ�ì„¸ ì„¤ëª…ì�„ ë³´ê³  ì‹¶ìœ¼ì‹  ë¶€ë¶„ì�„ ì„ íƒ�í•˜ì„¸ìš”."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "¼³Ä¡ À§Ä¡ ¼±ÅÃ"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "$(^NameDA)(À»)¸¦ ¼³Ä¡ÇÒ Æú´õ¸¦ ¼±ÅÃÇØ ÁÖ¼¼¿ä."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "ì„¤ì¹˜ ìœ„ì¹˜ ì„ íƒ�"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "$(^NameDA)(ì�„)ë¥¼ ì„¤ì¹˜í•  í�´ë�”ë¥¼ ì„ íƒ�í•´ ì£¼ì„¸ìš”."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Á¦°Å À§Ä¡ ¼±ÅÃ"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "$(^NameDA)(À»)¸¦ Á¦°ÅÇÒ Æú´õ¸¦ ¼±ÅÃÇØ ÁÖ¼¼¿ä."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "ì œê±° ìœ„ì¹˜ ì„ íƒ�"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "$(^NameDA)(ì�„)ë¥¼ ì œê±°í•  í�´ë�”ë¥¼ ì„ íƒ�í•´ ì£¼ì„¸ìš”."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "¼³Ä¡Áß"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "$(^NameDA)(À»)¸¦ ¼³Ä¡ÇÏ´Â µ¿¾È Àá½Ã ±â´Ù·Á ÁÖ¼¼¿ä."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "¼³Ä¡ ¿Ï·á"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "¼³Ä¡°¡ ¼º°øÀûÀ¸·Î ¿Ï·áµÇ¾ú½À´Ï´Ù."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "¼³Ä¡ Ãë¼Ò"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "ÇÁ·Î±×·¥ ¼³Ä¡°¡ Ãë¼ÒµÇ¾ú½À´Ï´Ù."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "ì„¤ì¹˜ì¤‘"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "$(^NameDA)(ì�„)ë¥¼ ì„¤ì¹˜í•˜ëŠ” ë�™ì•ˆ ìž ì‹œ ê¸°ë‹¤ë ¤ ì£¼ì„¸ìš”."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "ì„¤ì¹˜ ì™„ë£Œ"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "ì„¤ì¹˜ê°€ ì„±ê³µì �ìœ¼ë¡œ ì™„ë£Œë�˜ì—ˆìŠµë‹ˆë‹¤."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "ì„¤ì¹˜ ì·¨ì†Œ"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "í”„ë¡œê·¸ëž¨ ì„¤ì¹˜ê°€ ì·¨ì†Œë�˜ì—ˆìŠµë‹ˆë‹¤."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Á¦°ÅÁß"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "$(^NameDA)(À»)¸¦ Á¦°ÅÇÏ´Â µ¿¾È Àá½Ã ±â´Ù·Á ÁÖ½Ã±â ¹Ù¶ø´Ï´Ù."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Á¦°Å ¸¶Ä§"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "ÇÁ·Î±×·¥À» ¼º°øÀûÀ¸·Î Á¦°ÅÇÏ¿´½À´Ï´Ù."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "ÇÁ·Î±×·¥ Á¦°Å Ãë¼Ò"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "ÇÁ·Î±×·¥ Á¦°Å°¡ Ãë¼ÒµÇ¾ú½À´Ï´Ù."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "ì œê±°ì¤‘"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "$(^NameDA)(ì�„)ë¥¼ ì œê±°í•˜ëŠ” ë�™ì•ˆ ìž ì‹œ ê¸°ë‹¤ë ¤ ì£¼ì‹œê¸° ë°”ëž�ë‹ˆë‹¤."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "ì œê±° ë§ˆì¹¨"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "í”„ë¡œê·¸ëž¨ì�„ ì„±ê³µì �ìœ¼ë¡œ ì œê±°í•˜ì˜€ìŠµë‹ˆë‹¤."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "í”„ë¡œê·¸ëž¨ ì œê±° ì·¨ì†Œ"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "í”„ë¡œê·¸ëž¨ ì œê±°ê°€ ì·¨ì†Œë�˜ì—ˆìŠµë‹ˆë‹¤."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "$(^NameDA) ¼³Ä¡ ¿Ï·á"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA)ÀÇ ¼³Ä¡°¡ ¿Ï·áµÇ¾ú½À´Ï´Ù. ¼³Ä¡ ÇÁ·Î±×·¥À» ¸¶Ä¡·Á¸é '¸¶Ä§' ¹öÆ°À» ´­·¯ ÁÖ¼¼¿ä."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "$(^NameDA)ÀÇ ¼³Ä¡¸¦ ¿Ï·áÇÏ±â À§ÇØ¼­´Â ½Ã½ºÅÛÀ» ´Ù½Ã ½ÃÀÛÇØ¾ß ÇÕ´Ï´Ù. Áö±Ý ÀçºÎÆÃ ÇÏ½Ã°Ú½À´Ï±î?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "$(^NameDA) ì„¤ì¹˜ ì™„ë£Œ"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA)ì�˜ ì„¤ì¹˜ê°€ ì™„ë£Œë�˜ì—ˆìŠµë‹ˆë‹¤.$\r$\n$\r$\nì„¤ì¹˜ í”„ë¡œê·¸ëž¨ì�„ ë§ˆì¹˜ë ¤ë©´ 'ë§ˆì¹¨' ë²„íŠ¼ì�„ ëˆŒëŸ¬ ì£¼ì„¸ìš”."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "$(^NameDA)ì�˜ ì„¤ì¹˜ë¥¼ ì™„ë£Œí•˜ê¸° ìœ„í•´ì„œëŠ” ì‹œìŠ¤í…œì�„ ë‹¤ì‹œ ì‹œìž‘í•´ì•¼ í•©ë‹ˆë‹¤. ì§€ê¸ˆ ìž¬ë¶€íŒ… í•˜ì‹œê² ìŠµë‹ˆê¹Œ?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Á¦°Å ¿Ï·á"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA)ÀÇ Á¦°Å°¡ ¿Ï·á µÇ¾ú½À´Ï´Ù."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "$(^NameDA)ÀÇ Á¦°Å¸¦ ¿Ï·áÇÏ±â À§ÇØ¼­´Â ½Ã½ºÅÛÀ» ´Ù½Ã ½ÃÀÛÇØ¾ß ÇÕ´Ï´Ù. Áö±Ý ÀçºÎÆÃ ÇÏ½Ã°Ú½À´Ï±î?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "$(^NameDA) ì œê±° ì™„ë£Œ"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA)ì�˜ ì œê±°ê°€ ì™„ë£Œ ë�˜ì—ˆìŠµë‹ˆë‹¤.$\r$\n$\r$\nì„¤ì¹˜ í”„ë¡œê·¸ëž¨ì�„ ë§ˆì¹˜ë ¤ë©´ 'ë§ˆì¹¨' ë²„íŠ¼ì�„ ëˆŒëŸ¬ ì£¼ì„¸ìš”."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "$(^NameDA)ì�˜ ì œê±°ë¥¼ ì™„ë£Œí•˜ê¸° ìœ„í•´ì„œëŠ” ì‹œìŠ¤í…œì�„ ë‹¤ì‹œ ì‹œìž‘í•´ì•¼ í•©ë‹ˆë‹¤. ì§€ê¸ˆ ìž¬ë¶€íŒ… í•˜ì‹œê² ìŠµë‹ˆê¹Œ?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Áö±Ý ÀçºÎÆÃ ÇÏ°Ú½À´Ï´Ù."
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "³ªÁß¿¡ ÀçºÎÆÃ ÇÏ°Ú½À´Ï´Ù."
-  ${LangFileString} MUI_TEXT_FINISH_RUN "$(^NameDA) ½ÇÇàÇÏ±â(&R)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Readme ÆÄÀÏ º¸±â(&S)"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "¸¶Ä§"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "ì§€ê¸ˆ ìž¬ë¶€íŒ… í•˜ê² ìŠµë‹ˆë‹¤."
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "ë‚˜ì¤‘ì—� ìž¬ë¶€íŒ… í•˜ê² ìŠµë‹ˆë‹¤."
+  ${LangFileString} MUI_TEXT_FINISH_RUN "$(^NameDA) ì‹¤í–‰í•˜ê¸°(&R)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Readme íŒŒì�¼ ë³´ê¸°(&S)"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "ë§ˆì¹¨"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "½ÃÀÛ ¸Þ´º Æú´õ ¼±ÅÃ"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "ÇÁ·Î±×·¥ÀÇ ¹Ù·Î °¡±â ¾ÆÀÌÄÜÀÌ »ý¼ºµÉ ½ÃÀÛ ¸Þ´º Æú´õ ¼±ÅÃ."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "ÇÁ·Î±×·¥ÀÇ ¹Ù·Î °¡±â ¾ÆÀÌÄÜÀÌ »ý¼ºµÉ ½ÃÀÛ ¸Þ´º Æú´õ¸¦ ¼±ÅÃÇÏ¼¼¿ä. »õ·Î¿î Æú´õ¸¦ »ý¼ºÇÏ·Á¸é Æú´õ ÀÌ¸§À» ÀÔ·ÂÇÏ¼¼¿ä."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "¹Ù·Î °¡±â ¾ÆÀÌÄÜÀ» ¸¸µéÁö ¾Ê°Ú½À´Ï´Ù."
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "ì‹œìž‘ ë©”ë‰´ í�´ë�” ì„ íƒ�"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "í”„ë¡œê·¸ëž¨ì�˜ ë°”ë¡œ ê°€ê¸° ì•„ì�´ì½˜ì�´ ìƒ�ì„±ë�  ì‹œìž‘ ë©”ë‰´ í�´ë�” ì„ íƒ�."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "í”„ë¡œê·¸ëž¨ì�˜ ë°”ë¡œ ê°€ê¸° ì•„ì�´ì½˜ì�´ ìƒ�ì„±ë�  ì‹œìž‘ ë©”ë‰´ í�´ë�”ë¥¼ ì„ íƒ�í•˜ì„¸ìš”. ìƒˆë¡œìš´ í�´ë�”ë¥¼ ìƒ�ì„±í•˜ë ¤ë©´ í�´ë�” ì�´ë¦„ì�„ ìž…ë ¥í•˜ì„¸ìš”."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "ë°”ë¡œ ê°€ê¸° ì•„ì�´ì½˜ì�„ ë§Œë“¤ì§€ ì•Šê² ìŠµë‹ˆë‹¤."
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "$(^NameDA) Á¦°Å"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "$(^NameDA) Á¦°ÅÇÏ±â"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "$(^NameDA) ì œê±°"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "$(^NameDA) ì œê±°í•˜ê¸°"
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "$(^Name) ¼³Ä¡¸¦ Ãë¼ÒÇÏ½Ã°Ú½À´Ï±î?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "$(^Name) ì„¤ì¹˜ë¥¼ ì·¨ì†Œí•˜ì‹œê² ìŠµë‹ˆê¹Œ?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "$(^Name) Á¦°Å¸¦ Ãë¼ÒÇÏ½Ã°Ú½À´Ï±î?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "$(^Name) ì œê±°ë¥¼ ì·¨ì†Œí•˜ì‹œê² ìŠµë‹ˆê¹Œ?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Armenian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Armenian.nlf	(revision 0)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Armenian.nlf	(revision 2956)
@@ -0,0 +1,191 @@
+ï»¿# Header, don't edit
+NLF v6
+# Start editing here
+# Language ID
+1067
+# Font and size - dash (-) means default
+-
+-
+# Codepage - dash (-) means ASCII code page
+1200
+# RTL - anything else than RTL means LTR
+-
+# Translation by Hrant Ohanyan (h.ohanyan@haysoft.org) 
+# ^Branding
+Nullsoft Install System %s
+# ^SetupCaption
+Õ�Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬ $(^Name)-Õ¨
+# ^UninstallCaption
+Õ‹Õ¶Õ»Õ¥Õ¬ $(^Name)-Õ¨
+# ^LicenseSubCaption
+: Ô±Ö€Õ¿Õ¸Õ¶Õ¡Õ£Ö€Õ¡ÕµÕ«Õ¶ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶
+# ^ComponentsSubCaption
+: Õ�Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Õ¸Ö‚ Õ¨Õ¶Õ¿Ö€Õ¡Õ¶Ö„Õ¶Õ¥Ö€Õ¨
+# ^DirSubCaption
+: Õ�Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Õ¸Ö‚ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ¨
+# ^InstallingSubCaption
+: Õ–Õ¡ÕµÕ¬Õ¥Ö€Õ¨ ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¾Õ¸Ö‚Õ´ Õ¥Õ¶
+# ^CompletedSubCaption
+: Ô³Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¡Õ¾Õ¡Ö€Õ¿Õ¾Õ¥Ö�
+# ^UnComponentsSubCaption
+: Õ�Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Õ¸Ö‚ Õ¨Õ¶Õ¿Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨
+# ^UnDirSubCaption
+: Õ‹Õ¶Õ»Õ¾Õ¸Õ² Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ¨
+# ^ConfirmSubCaption
+: Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Ö„
+# ^UninstallingSubCaption
+: Õ–Õ¡ÕµÕ¬Õ¥Ö€Õ¨ Õ»Õ¶Õ»Õ¾Õ¸Ö‚Õ´ Õ¥Õ¶
+# ^UnCompletedSubCaption
+: Ô³Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¡Õ¾Õ¡Ö€Õ¿Õ¾Õ¥Ö�
+# ^BackBtn
+Â« &Õ†Õ¡Õ­Õ¸Ö€Õ¤Õ¨
+# ^NextBtn
+&Õ€Õ¡Õ»Õ¸Ö€Õ¤Õ¨ Â»
+# ^AgreeBtn
+Õ€Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶& Õ¥Õ´
+# ^AcceptBtn
+ÔµÕ½ &Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¸Ö‚Õ´ Õ¥Õ´ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶Õ¡Õ£Ö€Õ« ÕºÕ¡ÕµÕ´Õ¡Õ¶Õ¶Õ¥Ö€Õ¨
+# ^DontAcceptBtn
+ÔµÕ½ &Õ¹Õ¥Õ´ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¸Ö‚Õ´ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶Õ¡Õ£Ö€Õ« ÕºÕ¡ÕµÕ´Õ¡Õ¶Õ¶Õ¥Ö€Õ¨
+# ^InstallBtn
+&Õ�Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬
+# ^UninstallBtn
+Õ‹Õ¶&Õ»Õ¥Õ¬
+# ^CancelBtn
+Õ‰Õ¥Õ²Õ¡Ö€Õ¯Õ¥Õ¬
+# ^CloseBtn
+&Õ“Õ¡Õ¯Õ¥Õ¬
+# ^BrowseBtn
+Ô´&Õ«Õ¿Õ¥Õ¬ ...
+# ^ShowDetailsBtn
+&Õ„Õ¡Õ¶Ö€Õ¡Õ´Õ¡Õ½Õ¶...
+# ^ClickNext
+Õ‡Õ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ½Õ¥Õ²Õ´Õ¥Ö„ 'Ô±Õ¼Õ¡Õ»'Ö‰
+# ^ClickInstall
+Õ�Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ½Õ¥Õ²Õ´Õ¥Ö„ 'Õ�Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬'Ö‰
+# ^ClickUninstall
+Ô¾Ö€Õ¡Õ£Õ«Ö€Õ¨ Õ»Õ¶Õ»Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ½Õ¥Õ²Õ´Õ¥Ö„ 'Õ‹Õ¶Õ»Õ¥Õ¬'Ö‰
+# ^Name
+Ô±Õ¶Õ¸Ö‚Õ¶Õ¨
+# ^Completed
+ÕŠÕ¡Õ¿Ö€Õ¡Õ½Õ¿ Õ§
+# ^LicenseText
+$(^NameDA)-Õ¨ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Õ¸Ö‚Ö� Õ¡Õ¼Õ¡Õ» Õ®Õ¡Õ¶Õ¸Õ©Õ¡Ö�Õ¥Ö„ Õ¡Ö€Õ¿Õ¸Õ¶Õ¡Õ£Ö€Õ¡ÕµÕ«Õ¶ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶Õ¸Ö‚Õ©ÕµÕ¡Õ¶Õ¨Ö‰ ÔµÕ©Õ¥ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ¡ÕµÕ¶Õ� Õ½Õ¥Õ²Õ´Õ¥Ö„ 'Õ€Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶ Õ¥Õ´'Ö‰
+# ^LicenseTextCB
+$(^NameDA)-Õ¨ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Õ¸Ö‚Ö� Õ¡Õ¼Õ¡Õ» Õ®Õ¡Õ¶Õ¸Õ©Õ¡Ö�Õ¥Ö„ Õ¡Ö€Õ¿Õ¸Õ¶Õ¡Õ£Ö€Õ¡ÕµÕ«Õ¶ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶Õ¸Ö‚Õ©ÕµÕ¡Õ¶Õ¨Ö‰ ÔµÕ©Õ¥ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ¡ÕµÕ¶Õ� Õ¤Ö€Õ¥Ö„ Õ¶Õ«Õ·Õ¨ Õ¶Õ¥Ö€Ö„Ö‡Õ¸Ö‚Õ´Ö‰ $_CLICK
+# ^LicenseTextRB
+$(^NameDA)-Õ¨ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Õ¸Ö‚Ö� Õ¡Õ¼Õ¡Õ» Õ®Õ¡Õ¶Õ¸Õ©Õ¡Ö�Õ¥Ö„ Õ¡Ö€Õ¿Õ¸Õ¶Õ¡Õ£Ö€Õ¡ÕµÕ«Õ¶ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶Õ¸Ö‚Õ©ÕµÕ¡Õ¶Õ¨Ö‰ ÔµÕ©Õ¥ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ¡ÕµÕ¶Õ� Õ¨Õ¶Õ¿Ö€Õ¥Ö„ Õ¶Õ¥Ö€Ö„Õ¸Õ¶Õ·ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ«Ö� Õ¡Õ¼Õ¡Õ»Õ«Õ¶Õ¨Ö‰ $_CLICK
+# ^UnLicenseText
+$(^NameDA)-Õ¨ Õ»Õ¶Õ»Õ¥Õ¬Õ¸Ö‚Ö� Õ¡Õ¼Õ¡Õ» Õ®Õ¡Õ¶Õ¸Õ©Õ¡Ö�Õ¥Ö„ Õ¡Ö€Õ¿Õ¸Õ¶Õ¡Õ£Ö€Õ¡ÕµÕ«Õ¶ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶Õ¸Ö‚Õ©ÕµÕ¡Õ¶Õ¨Ö‰ ÔµÕ©Õ¥ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ¡ÕµÕ¶Õ� Õ½Õ¥Õ²Õ´Õ¥Ö„ 'Õ€Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶ Õ¥Õ´'Ö‰
+# ^UnLicenseTextCB
+$(^NameDA)-Õ¨ Õ»Õ¶Õ»Õ¥Õ¬Õ¸Ö‚Ö� Õ¡Õ¼Õ¡Õ» Õ®Õ¡Õ¶Õ¸Õ©Õ¡Ö�Õ¥Ö„ Õ¡Ö€Õ¿Õ¸Õ¶Õ¡Õ£Ö€Õ¡ÕµÕ«Õ¶ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶Õ¸Ö‚Õ©ÕµÕ¡Õ¶Õ¨Ö‰ ÔµÕ©Õ¥ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ¡ÕµÕ¶Õ� Õ¤Ö€Õ¥Ö„ Õ¶Õ«Õ·Õ¨ Õ¶Õ¥Ö€Ö„Ö‡Õ¸Ö‚Õ´Ö‰ $_CLICK
+# ^UnLicenseTextRB
+$(^NameDA)-Õ¨ Õ»Õ¶Õ»Õ¥Õ¬Õ¸Ö‚Ö� Õ¡Õ¼Õ¡Õ» Õ®Õ¡Õ¶Õ¸Õ©Õ¡Ö�Õ¥Ö„ Õ¡Ö€Õ¿Õ¸Õ¶Õ¡Õ£Ö€Õ¡ÕµÕ«Õ¶ Õ°Õ¡Õ´Õ¡Õ±Õ¡ÕµÕ¶Õ¸Ö‚Õ©ÕµÕ¡Õ¶Õ¨Ö‰ ÔµÕ©Õ¥ Õ¨Õ¶Õ¤Õ¸Ö‚Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ¡ÕµÕ¶Õ� Õ¨Õ¶Õ¿Ö€Õ¥Ö„ Õ¶Õ¥Ö€Ö„Õ¸Õ¶Õ·ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ«Ö� Õ¡Õ¼Õ¡Õ»Õ«Õ¶Õ¨Ö‰ $_CLICK
+# ^Custom
+Õ€Õ¡Ö€Õ´Õ¡Ö€Õ¥Ö�Õ¾Õ¡Õ®
+# ^ComponentsText
+Ô¸Õ¶Õ¿Ö€Õ¥Ö„ Õ¡ÕµÕ¶ Õ¢Õ¡Õ²Õ¡Õ¤Ö€Õ«Õ¹Õ¶Õ¥Ö€Õ¨, Õ¸Ö€Õ¸Õ¶Ö„ Ö�Õ¡Õ¶Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Ö‰ $_CLICK
+# ^ComponentsSubText1
+Ô¸Õ¶Õ¿Ö€Õ¥Ö„ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Õ¸Ö‚ Õ¥Õ²Õ¡Õ¶Õ¡Õ¯Õ¨.
+# ^ComponentsSubText2_NoInstTypes
+Õ�Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ¨Õ¶Õ¿Ö€Õ¥Ö„ Õ¢Õ¡Õ²Õ¡Õ¤Ö€Õ«Õ¹Õ¶Õ¥Ö€Õ¨.
+# ^ComponentsSubText2
+Õ¯Õ¡Õ´ Õ¨Õ¶Õ¿Ö€Õ¥Ö„ Õ¬Ö€Õ¡Ö�Õ¸Ö‚Ö�Õ«Õ¹ Õ¢Õ¡Õ²Õ¡Õ¤Ö€Õ«Õ¹Õ¶Õ¥Ö€.
+# ^UnComponentsText
+Õ‹Õ¶Õ»Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ¨Õ¶Õ¿Ö€Õ¥Ö„ Õ¢Õ¡Õ²Õ¡Õ¤Ö€Õ«Õ¹Õ¶Õ¥Ö€Õ¨Ö‰ $_CLICK
+# ^UnComponentsSubText1
+Ô¸Õ¶Õ¿Ö€Õ¥Ö„ Õ»Õ¶Õ»Õ¥Õ¬Õ¸Ö‚ Õ¥Õ²Õ¡Õ¶Õ¡Õ¯Õ¨.
+# ^UnComponentsSubText2_NoInstTypes
+Ô¸Õ¶Õ¿Ö€Õ¥Ö„ Õ»Õ¶Õ»Õ¥Õ¬Õ¸Ö‚ Õ¢Õ¡Õ²Õ¡Õ¤Ö€Õ«Õ¹Õ¶Õ¥Ö€Õ¨.
+# ^UnComponentsSubText2
+Õ¯Õ¡Õ´ Õ»Õ¶Õ»Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ¨Õ¶Õ¿Ö€Õ¥Ö„ Õ¬Ö€Õ¡Ö�Õ¸Ö‚Ö�Õ«Õ¹ Õ¢Õ¡Õ²Õ¡Õ¤Ö€Õ«Õ¹Õ¶Õ¥Ö€Ö‰
+# ^DirText
+Ô¾Ö€Õ¡Õ£Õ«Ö€Õ¨ Õ¯Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ« $(^NameDA)-Õ¨ Õ¶Õ·Õ¾Õ¡Õ® Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ¸Ö‚Õ´Ö‰ Ô±ÕµÕ¬ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ¸Ö‚Õ´ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ½Õ¥Õ²Õ´Õ¥Ö„ 'Ô¸Õ¶Õ¿Ö€Õ¥Õ¬' Ö‡ Õ¨Õ¶Õ¿Ö€Õ¥Ö„ Õ¡ÕµÕ¶Ö‰ $_CLICK
+# ^DirSubText
+Õ�Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Õ¸Ö‚ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¯Õ¨
+# ^DirBrowseText
+Õ†Õ·Õ¥Ö„ $(^NameDA)-Õ« Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Õ¸Ö‚ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ¨.
+# ^UnDirText
+Ô¾Ö€Õ¡Õ£Õ«Ö€Õ¨ Õ¯Õ»Õ¶Õ»Õ« $(^NameDA)-Õ¨ Õ¶Õ·Õ¾Õ¡Õ® Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ«Ö�Ö‰ Ô±ÕµÕ¬ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ«Ö� Õ»Õ¶Õ»Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ½Õ¥Õ²Õ´Õ¥Ö„ 'Ô¸Õ¶Õ¿Ö€Õ¥Õ¬' Ö‡ Õ¨Õ¶Õ¿Ö€Õ¥Ö„ Õ¡ÕµÕ¶Ö‰ $_CLICK
+# ^UnDirSubText
+""
+# ^UnDirBrowseText
+Ô¸Õ¶Õ¿Ö€Õ¥Ö„ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ¨, Õ¸Ö€Õ«Ö� ÕºÕ¥Õ¿Ö„ Õ§ Õ»Õ¶Õ»Õ¥Õ¬ $(^NameDA)-Õ¨.
+# ^SpaceAvailable
+"Õ€Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ§. "
+# ^SpaceRequired
+"ÕŠÕ¡Õ°Õ¡Õ¶Õ»Õ¾Õ¸Ö‚Õ´ Õ§. "
+# ^UninstallingText
+$(^NameDA) Õ®Ö€Õ¡Õ£Õ«Ö€Õ¨ Õ¯Õ»Õ¶Õ»Õ¾Õ« Õ�Õ¥Ö€ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ¹Õ«Ö�Ö‰ $_CLICK
+# ^UninstallingSubText
+Õ‹Õ¶Õ»Õ¾Õ¸Ö‚Õ´ Õ§Õ�
+# ^FileError
+Õ€Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€ Õ¹Õ§ Õ¢Õ¡Ö�Õ¥Õ¬ Ö†Õ¡ÕµÕ¬Õ¨Õ� Õ£Ö€Õ¡Õ¶Ö�Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰ \r\n\t"$0"\r\n'Ô´Õ¡Õ¤Õ¡Ö€Õ¥Ö�Õ¶Õ¥Õ¬'Õ� Õ¨Õ¶Õ¤Õ°Õ¡Õ¿Õ¥Õ¬ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¸Ö‚Õ´Õ¨,\r\n"Ô¿Ö€Õ¯Õ¶Õ¥Õ¬"Õ� Õ¯Ö€Õ¯Õ«Õ¶ ÖƒÕ¸Ö€Õ±Õ¥Õ¬,\r\n"Ô²Õ¡Ö� Õ©Õ¸Õ²Õ¶Õ¥Õ¬"Õ� Õ¢Õ¡Ö� Õ©Õ¸Õ²Õ¶Õ¥Õ¬ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨Ö‰
+# ^FileError_NoIgnore
+Õ€Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€ Õ¹Õ§ Õ¢Õ¡Ö�Õ¥Õ¬ Ö†Õ¡ÕµÕ¬Õ¨Õ� Õ£Ö€Õ¡Õ¶Ö�Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰ \r\n\t"$0"\r\n'Ô¿Ö€Õ¯Õ¶Õ¥Õ¬'Õ� Õ¯Ö€Õ¯Õ«Õ¶ ÖƒÕ¸Ö€Õ±Õ¥Õ¬,\r\n'Ô´Õ¡Õ¤Õ¡Ö€Õ¥Ö�Õ¶Õ¥Õ¬'Õ� Õ¨Õ¶Õ¤Õ°Õ¡Õ¿Õ¥Õ¬ Õ¿Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¸Ö‚Õ´Õ¨Ö‰
+# ^CantWrite
+"Õ€Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€ Õ¹Õ§ Õ£Ö€Õ¡Õ¶Ö�Õ¥Õ¬ "
+# ^CopyFailed
+Õ�Õ­Õ¡Õ¬Õ� ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Õ¬Õ¸Ö‚ ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯
+# ^CopyTo
+"ÕŠÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Õ¬Õ� "
+# ^Registering
+"Ô³Ö€Õ¡Õ¶Ö�Õ¸Ö‚Õ´. "
+# ^Unregistering
+"ÕŽÕ¥Ö€Õ¡Õ£Ö€Õ¡Õ¶Ö�Õ¸Ö‚Õ´. "
+# ^SymbolNotFound
+"Õ€Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€ Õ¹Õ§ Õ£Õ¿Õ¶Õ¥Õ¬Õ� "
+# ^CouldNotLoad
+"Õ€Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€ Õ¹Õ§ Õ¢Õ¡Ö�Õ¥Õ¬. "
+# ^CreateFolder
+"Õ�Õ¿Õ¥Õ²Õ®Õ¾Õ¸Ö‚Õ´ Õ§ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯ "
+# ^CreateShortcut
+"Õ�Õ¿Õ¥Õ²Õ®Õ¾Õ¸Ö‚Õ´ Õ¥Õ¶ ÕºÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€."
+# ^CreatedUninstaller
+"Õ�Õ¿Õ¥Õ²Õ®Õ¾Õ¸Ö‚Õ´ Õ»Õ¶Õ»Õ´Õ¡Õ¶ Õ®Ö€Õ¡Õ£Õ«Ö€Õ¨. "
+# ^Delete
+"Õ–Õ¡ÕµÕ¬Õ¥Ö€Õ« Õ»Õ¶Õ»Õ¸Ö‚Õ´. "
+# ^DeleteOnReboot
+"Ô¿Õ»Õ¶Õ»Õ¾Õ« Õ¾Õ¥Ö€Õ¡Õ£Õ¸Ö€Õ®Õ¡Ö€Õ¯Õ¥Õ¬Õ¸Ö‚Ö� Õ°Õ¥Õ¿Õ¸. "
+# ^ErrorCreatingShortcut
+"Õ�Õ­Õ¡Õ¬Õ� ÕºÕ«Õ¿Õ¡Õ¯Õ¨ Õ½Õ¿Õ¥Õ²Õ®Õ¥Õ¬Õ«Õ½. " 
+# ^ErrorCreating
+"Õ�Õ­Õ¡Õ¬. "
+# ^ErrorDecompressing
+Õ�Õ­Õ¡Õ¬Õ� Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ¨ Õ¢Õ¡Ö�Õ¥Õ¬Õ¸Ö‚ ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Ö‰
+# ^ErrorRegistering
+Õ€Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€ Õ¹Õ§ Õ£Ö€Õ¡Õ¶Ö�Õ¥Õ¬ Õ£Ö€Õ¡Õ¤Õ¡Ö€Õ¡Õ¶Õ¨(DLL)
+# ^ExecShell
+"Õ–Õ¡ÕµÕ¬Õ« Õ¯Õ«Ö€Õ¡Õ¼Õ¸Ö‚Õ´. " 
+# ^Exec
+"Ô¿Õ¡Õ¿Õ¡Ö€Õ¾Õ¸Ö‚Õ´ Õ§. "
+# ^Extract
+"Õ€Õ¡Õ¶Õ¸Ö‚Õ´ Õ§. "
+# ^ErrorWriting
+"Õ–Õ¡ÕµÕ¬Õ¥Ö€Õ¨ Õ£Ö€Õ¥Õ¬Õ¸Ö‚ Õ½Õ­Õ¡Õ¬. "
+# ^InvalidOpcode
+Õ�Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ«Õ¹Õ¨ Õ¾Õ¶Õ¡Õ½Õ¾Õ¡Õ® Õ§.
+# ^NoOLE
+"Õ‰Õ¯Õ¡ OLEÕ�" 
+# ^OutputFolder
+"Õ�Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ¥Õ¬Õ¸Ö‚ Õ©Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ¨. "
+# ^RemoveFolder
+"Ô¹Õ²Õ©Õ¡ÕºÕ¡Õ¶Õ¡Õ¯Õ« Õ»Õ¶Õ»Õ¸Ö‚Õ´. "
+# ^RenameOnReboot
+"Ô¿Õ¡Õ¶Õ¾Õ¡Õ¶Õ¡ÖƒÕ¸Õ­Õ¾Õ« Õ¾Õ¥Ö€Õ¡Õ£Õ¸Ö€Õ®Õ¡Ö€Õ¯Õ¥Õ¬Õ¸Ö‚Ö� Õ°Õ¥Õ¿Õ¸. "
+# ^Rename
+"Ô±Õ¶Õ¾Õ¡Õ¶Õ¡ÖƒÕ¸Õ­Õ¸Ö‚Õ´. "
+# ^Skipped
+"Ô²Õ¡Ö� Õ©Õ¸Õ²Õ¶Õ¡Õ®. "
+# ^CopyDetails
+ÕŠÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Õ¬ Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ¨ 
+# ^LogInstall
+Õ�Õ¥Õ²Õ¡Õ¯Õ¡ÕµÕ´Õ¡Õ¶ Õ°Õ¡Õ·Õ¾Õ¥Õ¿Õ¾Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶
+# byte
+Õ¢Õ¡ÕµÕ©
+# kilo
+ Ô¿
+# mega
+ Õ„
+# giga
+ Ô³
\ No newline at end of file
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Arabic.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Arabic.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Arabic.nsh	(revision 2956)
@@ -1,122 +1,130 @@
-;Language: Arabic (1025)
+ï»¿;Language: Arabic (1025)
 ;Translation by asdfuae@msn.com
 ;updated by Rami Kattan
 
-!insertmacro LANGFILE "Arabic" "Arabic"
+!insertmacro LANGFILE "Arabic" = "Ø§Ù„Ø¹Ø±Ø¨ÙŠØ©" "Al-Arabiyyah"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "ãÑÍÈÇ Èß Ýí ãÑÔÏ ÅÚÏÇÏ $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "ÓíÓÇÚÏß åÐÇ ÇáãÑÔÏ Ýí ÊäÕíÈ $(^NameDA).$\r$\n$\r$\nãä ÇáãÝÖá ÅÛáÇÞ ÌãíÚ ÇáÈÑÇãÌ ÞÈá ÇáÊäÕíÈ. ÓíÓÇÚÏ åÐÇ Ýí ÊÌÏíÏ ãáÝÇÊ ÇáäÙÇã Ïæä ÇáÍÇÌÉ áÅÚÇÏÉ ÊÔÛíá ÇáÌåÇÒ.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Ù…Ø±Ø­Ø¨Ø§ Ø¨Ùƒ Ù�ÙŠ Ù…Ø±Ø´Ø¯ Ø¥Ø¹Ø¯Ø§Ø¯ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ø³ÙŠØ³Ø§Ø¹Ø¯Ùƒ Ù‡Ø°Ø§ Ø§Ù„Ù…Ø±Ø´Ø¯ Ù�ÙŠ ØªÙ†ØµÙŠØ¨ $(^NameDA).$\r$\n$\r$\nÙ…Ù† Ø§Ù„Ù…Ù�Ø¶Ù„ Ø¥ØºÙ„Ø§Ù‚ Ø¬Ù…ÙŠØ¹ Ø§Ù„Ø¨Ø±Ø§Ù…Ø¬ Ù‚Ø¨Ù„ Ø§Ù„ØªÙ†ØµÙŠØ¨. Ø³ÙŠØ³Ø§Ø¹Ø¯ Ù‡Ø°Ø§ Ù�ÙŠ ØªØ¬Ø¯ÙŠØ¯ Ù…Ù„Ù�Ø§Øª Ø§Ù„Ù†Ø¸Ø§Ù… Ø¯ÙˆÙ† Ø§Ù„Ø­Ø§Ø¬Ø© Ù„Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙŠÙ„ Ø§Ù„Ø¬Ù‡Ø§Ø².$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "ãÑÍÈÇ Èß Ýí ãÑÔÏ ÅÒÇáÉ $(^NameDA) "
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "åÐÇ ÇáãÑÔÏ ÓíÏáøß ÃËäÇÁ ÅÒÇáÉ $(^NameDA).$\r$\n$\r$\n ÞÈá ÇáÈÏÁ ÈÇáÅÒÇáÉ¡ íÑÌì ÇáÊÃßÏ ãä Ãä $(^NameDA) ÛíÑ ÔÛøÇá.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Ù…Ø±Ø­Ø¨Ø§ Ø¨Ùƒ Ù�ÙŠ Ù…Ø±Ø´Ø¯ Ø¥Ø²Ø§Ù„Ø© $(^NameDA) "
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ù‡Ø°Ø§ Ø§Ù„Ù…Ø±Ø´Ø¯ Ø³ÙŠØ¯Ù„Ù‘Ùƒ Ø£Ø«Ù†Ø§Ø¡ Ø¥Ø²Ø§Ù„Ø© $(^NameDA).$\r$\n$\r$\n Ù‚Ø¨Ù„ Ø§Ù„Ø¨Ø¯Ø¡ Ø¨Ø§Ù„Ø¥Ø²Ø§Ù„Ø©ØŒ ÙŠØ±Ø¬Ù‰ Ø§Ù„ØªØ£ÙƒØ¯ Ù…Ù† Ø£Ù† $(^NameDA) ØºÙŠØ± Ø´ØºÙ‘Ø§Ù„.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "ÅÊÝÇÞíÉþ ÇáÊÑÎíÕ"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "ÇáÑÌÇÁ ãÑÇÌÚÉ ÅÊÝÇÞíÉþ ÇáÊÑÎíÕ ÞÈá ÊäÕíÈ $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "ÚäÏ ÇáãæÇÝÞÉ Úáì ÔÑæØ ÇáÅÊÝÇÞíÉþ¡ ÅÖÛØ ÃæÇÝÞ ááãÊÇÈÚÉ. íÌÈ ÇáãæÇÝÞÉ Úáì ÇáÅÊÝÇÞíÉþ áÊäÕíÈ $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "ÚäÏ ÇáãæÇÝÞÉ Úáì ÔÑæØ ÇáÅÊÝÇÞíÉþ¡ Úáøã ãÑÈÚ ÇáÚáÇãÉ ÇáÊÇáí. íÌÈ ÇáãæÇÝÞÉ Úáì ÇáÅÊÝÇÞíÉþ áÊäÕíÈ $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ÚäÏ ÇáãæÇÝÞÉ Úáì ÔÑæØ ÇáÅÊÝÇÞíÉ¡ ÅÎÊÑ ÇáÎíÇÑ ÇáÃæá ãä ÇáÊÇáí. íÌÈ ÇáãæÇÝÞÉ Úáì ÇáÅÊÝÇÞíÉ áÊäÕíÈ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ø¥ØªÙ�Ø§Ù‚ÙŠØ©â€� Ø§Ù„ØªØ±Ø®ÙŠØµ"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Ø§Ù„Ø±Ø¬Ø§Ø¡ Ù…Ø±Ø§Ø¬Ø¹Ø© Ø¥ØªÙ�Ø§Ù‚ÙŠØ©â€� Ø§Ù„ØªØ±Ø®ÙŠØµ Ù‚Ø¨Ù„ ØªÙ†ØµÙŠØ¨ $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ø¹Ù†Ø¯ Ø§Ù„Ù…ÙˆØ§Ù�Ù‚Ø© Ø¹Ù„Ù‰ Ø´Ø±ÙˆØ· Ø§Ù„Ø¥ØªÙ�Ø§Ù‚ÙŠØ©â€�ØŒ Ø¥Ø¶ØºØ· Ø£ÙˆØ§Ù�Ù‚ Ù„Ù„Ù…ØªØ§Ø¨Ø¹Ø©. ÙŠØ¬Ø¨ Ø§Ù„Ù…ÙˆØ§Ù�Ù‚Ø© Ø¹Ù„Ù‰ Ø§Ù„Ø¥ØªÙ�Ø§Ù‚ÙŠØ©â€� Ù„ØªÙ†ØµÙŠØ¨ $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ø¹Ù†Ø¯ Ø§Ù„Ù…ÙˆØ§Ù�Ù‚Ø© Ø¹Ù„Ù‰ Ø´Ø±ÙˆØ· Ø§Ù„Ø¥ØªÙ�Ø§Ù‚ÙŠØ©â€�ØŒ Ø¹Ù„Ù‘Ù… Ù…Ø±Ø¨Ø¹ Ø§Ù„Ø¹Ù„Ø§Ù…Ø© Ø§Ù„ØªØ§Ù„ÙŠ. ÙŠØ¬Ø¨ Ø§Ù„Ù…ÙˆØ§Ù�Ù‚Ø© Ø¹Ù„Ù‰ Ø§Ù„Ø¥ØªÙ�Ø§Ù‚ÙŠØ©â€� Ù„ØªÙ†ØµÙŠØ¨ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ø¹Ù†Ø¯ Ø§Ù„Ù…ÙˆØ§Ù�Ù‚Ø© Ø¹Ù„Ù‰ Ø´Ø±ÙˆØ· Ø§Ù„Ø¥ØªÙ�Ø§Ù‚ÙŠØ©ØŒ Ø¥Ø®ØªØ± Ø§Ù„Ø®ÙŠØ§Ø± Ø§Ù„Ø£ÙˆÙ„ Ù…Ù† Ø§Ù„ØªØ§Ù„ÙŠ. ÙŠØ¬Ø¨ Ø§Ù„Ù…ÙˆØ§Ù�Ù‚Ø© Ø¹Ù„Ù‰ Ø§Ù„Ø¥ØªÙ�Ø§Ù‚ÙŠØ© Ù„ØªÙ†ØµÙŠØ¨ $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "ÅÊÝÇÞíÉ ÇáÊÑÎíÕ"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "ÇáÑÌÇÁ ãÑÇÌÚÉ ÔÑæØ ÇáÊÑÎíÕ ÞÈá ÅÒÇáÉ $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "ÚäÏ ÇáãæÇÝÞÉ Úáì ÔÑæØ ÇáÅÊÝÇÞíÉ¡ ÅÖÛØ Úáì ãæÇÝÞ. íÌÈ ÇáãæÇÝÞÉ Úáì ÇáÅÊÝÇÞíÉ áÅÒÇáÉ $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "ÚäÏ ÇáãæÇÝÞÉ Úáì ÔÑæØ ÇáÅÊÝÇÞíÉ¡ Úáøã ÇáãÑÈÚ ÇáÚáÇãÉ ÇáÊÇáí. íÌÈ ÇáãæÇÝÞÉ Úáì ÇáÅÊÝÇÞíÉ áÅÒÇáÉ $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ÚäÏ ÇáãæÇÝÞÉ Úáì ÔÑæØ ÇáÅÊÝÇÞíÉ¡ ÅÎÊÑ ÇáÎíÇÑ ÇáÃæá ãä ÇáÊÇáí. íÌÈ ÇáãæÇÝÞÉ Úáì ÇáÅÊÝÇÞíÉ áÅÒÇáÉ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ø¥ØªÙ�Ø§Ù‚ÙŠØ© Ø§Ù„ØªØ±Ø®ÙŠØµ"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Ø§Ù„Ø±Ø¬Ø§Ø¡ Ù…Ø±Ø§Ø¬Ø¹Ø© Ø´Ø±ÙˆØ· Ø§Ù„ØªØ±Ø®ÙŠØµ Ù‚Ø¨Ù„ Ø¥Ø²Ø§Ù„Ø© $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ø¹Ù†Ø¯ Ø§Ù„Ù…ÙˆØ§Ù�Ù‚Ø© Ø¹Ù„Ù‰ Ø´Ø±ÙˆØ· Ø§Ù„Ø¥ØªÙ�Ø§Ù‚ÙŠØ©ØŒ Ø¥Ø¶ØºØ· Ø¹Ù„Ù‰ Ù…ÙˆØ§Ù�Ù‚. ÙŠØ¬Ø¨ Ø§Ù„Ù…ÙˆØ§Ù�Ù‚Ø© Ø¹Ù„Ù‰ Ø§Ù„Ø¥ØªÙ�Ø§Ù‚ÙŠØ© Ù„Ø¥Ø²Ø§Ù„Ø© $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ø¹Ù†Ø¯ Ø§Ù„Ù…ÙˆØ§Ù�Ù‚Ø© Ø¹Ù„Ù‰ Ø´Ø±ÙˆØ· Ø§Ù„Ø¥ØªÙ�Ø§Ù‚ÙŠØ©ØŒ Ø¹Ù„Ù‘Ù… Ø§Ù„Ù…Ø±Ø¨Ø¹ Ø§Ù„Ø¹Ù„Ø§Ù…Ø© Ø§Ù„ØªØ§Ù„ÙŠ. ÙŠØ¬Ø¨ Ø§Ù„Ù…ÙˆØ§Ù�Ù‚Ø© Ø¹Ù„Ù‰ Ø§Ù„Ø¥ØªÙ�Ø§Ù‚ÙŠØ© Ù„Ø¥Ø²Ø§Ù„Ø© $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ø¹Ù†Ø¯ Ø§Ù„Ù…ÙˆØ§Ù�Ù‚Ø© Ø¹Ù„Ù‰ Ø´Ø±ÙˆØ· Ø§Ù„Ø¥ØªÙ�Ø§Ù‚ÙŠØ©ØŒ Ø¥Ø®ØªØ± Ø§Ù„Ø®ÙŠØ§Ø± Ø§Ù„Ø£ÙˆÙ„ Ù…Ù† Ø§Ù„ØªØ§Ù„ÙŠ. ÙŠØ¬Ø¨ Ø§Ù„Ù…ÙˆØ§Ù�Ù‚Ø© Ø¹Ù„Ù‰ Ø§Ù„Ø¥ØªÙ�Ø§Ù‚ÙŠØ© Ù„Ø¥Ø²Ø§Ù„Ø© $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "ÅÖÚØ ãÝÊÇÍ ÕÝÍÉ ááÃÓÝá áÑÄíÉ ÈÇÞí ÇáÅÊÝÇÞíÉ"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Ø¥Ø¶Ø¹Ø· Ù…Ù�ØªØ§Ø­ ØµÙ�Ø­Ø© Ù„Ù„Ø£Ø³Ù�Ù„ Ù„Ø±Ø¤ÙŠØ© Ø¨Ø§Ù‚ÙŠ Ø§Ù„Ø¥ØªÙ�Ø§Ù‚ÙŠØ©"
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "ÅÎÊÑ ÇáãßæäÇÊ"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "ÅÎÊÑ ãíÒÇÊ $(^NameDA) ÇáãÑÇÏ ÊäÕíÈåÇ."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Ø¥Ø®ØªØ± Ø§Ù„Ù…ÙƒÙˆÙ†Ø§Øª"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Ø¥Ø®ØªØ± Ù…ÙŠØ²Ø§Øª $(^NameDA) Ø§Ù„Ù…Ø±Ø§Ø¯ ØªÙ†ØµÙŠØ¨Ù‡Ø§."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "ÅÎÊÑ ÇáãßæäÇÊ"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "ÅÎÊÑ ãíÒÇÊ $(^NameDA) ÇáãÑÇÏ ÅÒÇáÊåÇ."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Ø¥Ø®ØªØ± Ø§Ù„Ù…ÙƒÙˆÙ†Ø§Øª"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Ø¥Ø®ØªØ± Ù…ÙŠØ²Ø§Øª $(^NameDA) Ø§Ù„Ù…Ø±Ø§Ø¯ Ø¥Ø²Ø§Ù„ØªÙ‡Ø§."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "ÇáæÕÝ"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Ø§Ù„ÙˆØµÙ�"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ÃÔÑ ÈÇáÝÃÑÉ ÝæÞ ÃÍÏ ÇáãßæäÇÊ áÑÄíÉ ÇáæÕÝ"
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ø£Ø´Ø± Ø¨Ø§Ù„Ù�Ø£Ø±Ø© Ù�ÙˆÙ‚ Ø£Ø­Ø¯ Ø§Ù„Ù…ÙƒÙˆÙ†Ø§Øª Ù„Ø±Ø¤ÙŠØ© Ø§Ù„ÙˆØµÙ�"
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ÃÔÑ ÈÇáÝÃÑÉ ÝæÞ ÃÍÏ ÇáãßæäÇÊ áÑÄíÉ ÇáæÕÝ"
+    #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "ÅÎÊÑ ãæÞÚ ÇáÊäÕíÈ"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "ÅÎÊÑ ÇáãÌáÏ ÇáãÑÇÏ ÊäÕíÈ $(^NameDA) Ýíå."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Ø¥Ø®ØªØ± Ù…ÙˆÙ‚Ø¹ Ø§Ù„ØªÙ†ØµÙŠØ¨"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Ø¥Ø®ØªØ± Ø§Ù„Ù…Ø¬Ù„Ø¯ Ø§Ù„Ù…Ø±Ø§Ø¯ ØªÙ†ØµÙŠØ¨ $(^NameDA) Ù�ÙŠÙ‡."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "ÅÎÊÑ ãæÞÚ ÇáãÒíá"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "ÅÎÊÑ ÇáãÌáÏ ÇáÐí ÓíÒÇá ãäå $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Ø¥Ø®ØªØ± Ù…ÙˆÙ‚Ø¹ Ø§Ù„Ù…Ø²ÙŠÙ„"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Ø¥Ø®ØªØ± Ø§Ù„Ù…Ø¬Ù„Ø¯ Ø§Ù„Ø°ÙŠ Ø³ÙŠØ²Ø§Ù„ Ù…Ù†Ù‡ $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "ÊäÕíÈ"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "ÇáÑÌÇÁ ÇáÅäÊÙÇÑ ÃËäÇÁ ÊäÕíÈ $(^NameDA)."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "ÅäÊåì ÇáÊäÕíÈ"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "ÅäÊåÊ ÚãáíÉ ÇáÊäÕíÈ ÈäÌÇÍ."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "ÅáÛÇÁ ÇáÊäÕíÈ"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "áã íäÊåí ÇáÊäÕíÈ ÈäÌÇÍ."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "ØªÙ†ØµÙŠØ¨"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Ø§Ù„Ø±Ø¬Ø§Ø¡ Ø§Ù„Ø¥Ù†ØªØ¸Ø§Ø± Ø£Ø«Ù†Ø§Ø¡ ØªÙ†ØµÙŠØ¨ $(^NameDA)."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Ø¥Ù†ØªÙ‡Ù‰ Ø§Ù„ØªÙ†ØµÙŠØ¨"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Ø¥Ù†ØªÙ‡Øª Ø¹Ù…Ù„ÙŠØ© Ø§Ù„ØªÙ†ØµÙŠØ¨ Ø¨Ù†Ø¬Ø§Ø­."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Ø¥Ù„ØºØ§Ø¡ Ø§Ù„ØªÙ†ØµÙŠØ¨"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Ù„Ù… ÙŠÙ†ØªÙ‡ÙŠ Ø§Ù„ØªÙ†ØµÙŠØ¨ Ø¨Ù†Ø¬Ø§Ø­."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "ÅÒÇáÉ"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "ÇáÑÌÇÁ ÇáÅäÊÙÇÑ ÃËäÇÁ ÅÒÇáÉ $(^NameDA)."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "ÅäÊåì"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "ÅäÊåÊ ÚãáíÉ ÇáÅÒÇáÉ ÈäÌÇÍ."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "ÅáÛÇÁ ÇáÅÒÇáÉ"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "áã ÊäÊåí ÇáÅÒÇáÉ ÈäÌÇÍ."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Ø¥Ø²Ø§Ù„Ø©"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Ø§Ù„Ø±Ø¬Ø§Ø¡ Ø§Ù„Ø¥Ù†ØªØ¸Ø§Ø± Ø£Ø«Ù†Ø§Ø¡ Ø¥Ø²Ø§Ù„Ø© $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Ø¥Ù†ØªÙ‡Ù‰"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Ø¥Ù†ØªÙ‡Øª Ø¹Ù…Ù„ÙŠØ© Ø§Ù„Ø¥Ø²Ø§Ù„Ø© Ø¨Ù†Ø¬Ø§Ø­."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Ø¥Ù„ØºØ§Ø¡ Ø§Ù„Ø¥Ø²Ø§Ù„Ø©"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Ù„Ù… ØªÙ†ØªÙ‡ÙŠ Ø§Ù„Ø¥Ø²Ø§Ù„Ø© Ø¨Ù†Ø¬Ø§Ø­."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "ÅäåÇÁ ãÑÔÏ ÅÚÏÇÏ $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "áÞÏ Êã ÊäÕíÈ $(^NameDA) Úáì ÇáÌåÇÒ$\r$\n$\r$\nÅÖÛØ ÅäåÇÁ áÅÛáÇÞ ãÑÔÏ ÇáÅÚÏÇÏ."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "íÌÈ ÅÚÇÏÉ ÊÔÛíá ÇáÌåÇÒ áÅäåÇÁ ÊäÕíÈ $(^NameDA). åá ÊÑíÏ ÅÚÇÏÉ ÇáÊÔÛíá ÇáÂä¿"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Ø¥Ù†Ù‡Ø§Ø¡ Ù…Ø±Ø´Ø¯ Ø¥Ø¹Ø¯Ø§Ø¯ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Ù„Ù‚Ø¯ ØªÙ… ØªÙ†ØµÙŠØ¨ $(^NameDA) Ø¹Ù„Ù‰ Ø§Ù„Ø¬Ù‡Ø§Ø²$\r$\n$\r$\nØ¥Ø¶ØºØ· Ø¥Ù†Ù‡Ø§Ø¡ Ù„Ø¥ØºÙ„Ø§Ù‚ Ù…Ø±Ø´Ø¯ Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "ÙŠØ¬Ø¨ Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙŠÙ„ Ø§Ù„Ø¬Ù‡Ø§Ø² Ù„Ø¥Ù†Ù‡Ø§Ø¡ ØªÙ†ØµÙŠØ¨ $(^NameDA). Ù‡Ù„ ØªØ±ÙŠØ¯ Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù„ØªØ´ØºÙŠÙ„ Ø§Ù„Ø¢Ù†ØŸ"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "ÅäåÇÁ ãÑÔÏ ÅÒÇáÉ $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "áÞÏ Êã ÅÒÇáÉ $(^NameDA) ãä ÇáÌåÇÒ.$\r$\n$\r$\n ÅÖÛØ ÅäåÇÁ áÅÛáÇÞ ÇáãÑÔÏ."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "íÌÈ ÅÚÇÏÉ ÊÔÛíá ÇáÌåÇÒ áÅäåÇÁ ÅÒÇáÉ $(^NameDA). åá ÊÑíÏ ÅÚÇÏÉ ÇáÊÔÛíá ÇáÂä¿"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Ø¥Ù†Ù‡Ø§Ø¡ Ù…Ø±Ø´Ø¯ Ø¥Ø²Ø§Ù„Ø© $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Ù„Ù‚Ø¯ ØªÙ… Ø¥Ø²Ø§Ù„Ø© $(^NameDA) Ù…Ù† Ø§Ù„Ø¬Ù‡Ø§Ø².$\r$\n$\r$\n Ø¥Ø¶ØºØ· Ø¥Ù†Ù‡Ø§Ø¡ Ù„Ø¥ØºÙ„Ø§Ù‚ Ø§Ù„Ù…Ø±Ø´Ø¯."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "ÙŠØ¬Ø¨ Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙŠÙ„ Ø§Ù„Ø¬Ù‡Ø§Ø² Ù„Ø¥Ù†Ù‡Ø§Ø¡ Ø¥Ø²Ø§Ù„Ø© $(^NameDA). Ù‡Ù„ ØªØ±ÙŠØ¯ Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù„ØªØ´ØºÙŠÙ„ Ø§Ù„Ø¢Ù†ØŸ"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "ÃÚÏ ÇáÊÔÛíá ÇáÂä"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "ÃÑÛÈ Ýí ÅÚÇÏÉ ÊÔÛíá ÇáÌåÇÒ Ýí æÞÊ áÇÍÞ"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "&ÔÛá $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "ÇÚÑÖ& ÃÞÑÃäí"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&ÅäåÇÁ"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ø£Ø¹Ø¯ Ø§Ù„ØªØ´ØºÙŠÙ„ Ø§Ù„Ø¢Ù†"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ø£Ø±ØºØ¨ Ù�ÙŠ Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙŠÙ„ Ø§Ù„Ø¬Ù‡Ø§Ø² Ù�ÙŠ ÙˆÙ‚Øª Ù„Ø§Ø­Ù‚"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&Ø´ØºÙ„ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Ø§Ø¹Ø±Ø¶& Ø£Ù‚Ø±Ø£Ù†ÙŠ"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Ø¥Ù†Ù‡Ø§Ø¡"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "ÅÎÊÑ ãÌáÏ ÞÇÆãÉ ÇÈÏÃ"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "ÅÎÊÑ ãÌáÏ ÞÇÆãÉ ÇÈÏÃ áÅÎÊÕÇÑÇÊ $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "ÅÎÊÑ ÇáãÌáÏ Ýí ÞÇÆãÉ ÇÈÏÃ ÇáÐí ÓÊäÔÃ Ýíå ÅÎÊÕÇÑÇÊ ÇáÈÑäÇãÌ. íãßä ÃíÖÇ ßÊÇÈÉ ÅÓã áÅäÔÇÁ ãÌáÏ ÌÏíÏ."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "áÇ ÊäÔÆ ÅÎÊÕÇÑÇÊ"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Ø¥Ø®ØªØ± Ù…Ø¬Ù„Ø¯ Ù‚Ø§Ø¦Ù…Ø© Ø§Ø¨Ø¯Ø£"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Ø¥Ø®ØªØ± Ù…Ø¬Ù„Ø¯ Ù‚Ø§Ø¦Ù…Ø© Ø§Ø¨Ø¯Ø£ Ù„Ø¥Ø®ØªØµØ§Ø±Ø§Øª $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Ø¥Ø®ØªØ± Ø§Ù„Ù…Ø¬Ù„Ø¯ Ù�ÙŠ Ù‚Ø§Ø¦Ù…Ø© Ø§Ø¨Ø¯Ø£ Ø§Ù„Ø°ÙŠ Ø³ØªÙ†Ø´Ø£ Ù�ÙŠÙ‡ Ø¥Ø®ØªØµØ§Ø±Ø§Øª Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬. ÙŠÙ…ÙƒÙ† Ø£ÙŠØ¶Ø§ ÙƒØªØ§Ø¨Ø© Ø¥Ø³Ù… Ù„Ø¥Ù†Ø´Ø§Ø¡ Ù…Ø¬Ù„Ø¯ Ø¬Ø¯ÙŠØ¯."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ù„Ø§ ØªÙ†Ø´Ø¦ Ø¥Ø®ØªØµØ§Ø±Ø§Øª"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "ÅÒÇáÉ $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "ÅÒÇáÉ $(^NameDA) ãä ÇáÌåÇÒ."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Ø¥Ø²Ø§Ù„Ø© $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Ø¥Ø²Ø§Ù„Ø© $(^NameDA) Ù…Ù† Ø§Ù„Ø¬Ù‡Ø§Ø²."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "åá ÃäÊ ãÊÃßÏ ãä ÅÛáÇÞ ãäÕøÈ $(^Name)¿"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Ù‡Ù„ Ø£Ù†Øª Ù…ØªØ£ÙƒØ¯ Ù…Ù† Ø¥ØºÙ„Ø§Ù‚ Ù…Ù†ØµÙ‘Ø¨ $(^Name)ØŸ"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "åá ÃäÊ ãÊÃßÏ ãä Ãäß ÇáÎÑæÌ ãä ãÒíá $(^Name)¿"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ù‡Ù„ Ø£Ù†Øª Ù…ØªØ£ÙƒØ¯ Ù…Ù† Ø£Ù†Ùƒ Ø§Ù„Ø®Ø±ÙˆØ¬ Ù…Ù† Ù…Ø²ÙŠÙ„ $(^Name)ØŸ"
 !endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Ø§Ø®ØªØ± Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ†"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Ø­Ø¯Ø¯ Ù„Ù…Ù† Ù…Ù† Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† ØªØ±ÙŠØ¯ ØªØ±ÙƒÙŠØ¨ $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Ø­Ø¯Ø¯ Ù„Ù…Ù† ØªØ±ÙŠØ¯ ØªØ±ÙƒÙŠØ¨ $(^NameDA) Ù„Ù†Ù�Ø³Ùƒ Ù�Ù‚Ø· Ø£Ù… Ù„Ø¬Ù…ÙŠØ¹ Ù…Ø³ØªØ®Ø¯Ù…ÙŠ Ø§Ù„Ø­Ø§Ø³Ø¨. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "ØªØ±ÙƒÙŠØ¨ Ù„Ø¬Ù…ÙŠØ¹ Ù…Ø³ØªØ®Ø¯Ù…ÙŠ Ù‡Ø°Ø§ Ø§Ù„Ø­Ø§Ø³Ø¨"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "ØªØ±ÙƒÙŠØ¨ Ù„ÙŠ Ù�Ù‚Ø·"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Lithuanian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Lithuanian.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Lithuanian.nlf	(revision 2956)
@@ -1,36 +1,36 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1063
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1257
 # RTL - anything else than RTL means LTR
 -
 # Translation by Vytautas Krivickas (Vytautas)
 # Updated by Danielius Scepanskis (Daan daniel@takas.lt) 2004.03.24
 # ^Branding
-Nullsoft instaliavimo sistema %s
+Nullsoft Install System %s
 # ^SetupCaption
-$(^Name) Ádiegimas
+$(^Name) Ä®diegimas
 # ^UninstallCaption
-$(^Name) Ðalinti
+$(^Name) Å alinti
 # ^LicenseSubCaption
 : Naudojimo sutartis
 # ^ComponentsSubCaption
-: Ádiegimo nustatymai
+: Ä®diegimo nustatymai
 # ^DirSubCaption
-: Ádiegimo katalogas
+: Ä®diegimo katalogas
 # ^InstallingSubCaption
-: Ádiegiama
+: Ä®diegiama
 # ^CompletedSubCaption
 : Baigta
 # ^UnComponentsSubCaption
-: Iðtrinimo nustatymai
+: IÅ¡trinimo nustatymai
 # ^UnDirSubCaption
-: Iðtrinimo katalogas
+: IÅ¡trinimo katalogas
 # ^ConfirmSubCaption
 : Patvirtinimas
 # ^UninstallingSubCaption
@@ -42,19 +42,19 @@
 # ^NextBtn
 &Toliau >
 # ^AgreeBtn
-Að &sutinku
+AÅ¡ &sutinku
 # ^AcceptBtn
-Að &sutinku su naudojimo sutarties sàlygomis
+AÅ¡ &sutinku su naudojimo sutarties sÄ…lygomis
 # ^DontAcceptBtn
-Að &nesutinku su naudojimo sutarties sàlygomis
+AÅ¡ &nesutinku su naudojimo sutarties sÄ…lygomis
 # ^InstallBtn
-&Ádiegti
+&Ä®diegti
 # ^UninstallBtn
 &Panaikinti
 # ^CancelBtn
 Nutraukti
 # ^CloseBtn
-&Uþdaryti
+&UÅ¾daryti
 # ^BrowseBtn
 P&asirinkti...
 # ^ShowDetailsBtn
@@ -62,115 +62,115 @@
 # ^ClickNext
 Paspauskite toliau
 # ^ClickInstall
-Paspauskite ádiegti
+Paspauskite Ä¯diegti
 # ^ClickUninstall
-Paspauskite iðtrinti
+Paspauskite iÅ¡trinti
 # ^Name
 Vardas
 # ^Completed
 Baigta
 # ^LicenseText
-Praðome perskaityti sutartá prieð ádiegdami $(^NameDA). Jei jûs sutinkate su nurodytomis sàlygomis, spauskite Sutinku.
+PraÅ¡ome perskaityti sutartÄ¯ prieÅ¡ Ä¯diegdami $(^NameDA). Jei jÅ«s sutinkate su nurodytomis sÄ…lygomis, spauskite Sutinku.
 # ^LicenseTextCB
-Praðome perskaityti sutartá prieð ádiegdami $(^NameDA). Jei jûs sutinkate su nurodytomis sàlygomis, padëkite varnelæ tam skirtame laukelyje. $_CLICK
+PraÅ¡ome perskaityti sutartÄ¯ prieÅ¡ Ä¯diegdami $(^NameDA). Jei jÅ«s sutinkate su nurodytomis sÄ…lygomis, padÄ—kite varnelÄ™ tam skirtame laukelyje. $_CLICK
 # ^LicenseTextRB
-Praðome perskaityti sutartá prieð ádiegdami $(^NameDA). Jei jûs sutinkate su nurodytomis sàlygomis, pasirinkite pirmà pasirinkimà esantá þemiau. $_CLICK
+PraÅ¡ome perskaityti sutartÄ¯ prieÅ¡ Ä¯diegdami $(^NameDA). Jei jÅ«s sutinkate su nurodytomis sÄ…lygomis, pasirinkite pirmÄ… pasirinkimÄ… esantÄ¯ Å¾emiau. $_CLICK
 # ^UnLicenseText
-Praðome perskaityti sutartá prieð iðtrinant $(^NameDA). Jei jûs sutinkate su nurodytomis sàlygomis, spauskite Sutinku.
+PraÅ¡ome perskaityti sutartÄ¯ prieÅ¡ iÅ¡trinant $(^NameDA). Jei jÅ«s sutinkate su nurodytomis sÄ…lygomis, spauskite Sutinku.
 # ^UnLicenseTextCB
-Praðome perskaityti sutartá prieð iðtrinant $(^NameDA). Jei jûs sutinkate su nurodytomis sàlygomis, padëkite varnelæ tam skirtame laukelyje. $_CLICK
+PraÅ¡ome perskaityti sutartÄ¯ prieÅ¡ iÅ¡trinant $(^NameDA). Jei jÅ«s sutinkate su nurodytomis sÄ…lygomis, padÄ—kite varnelÄ™ tam skirtame laukelyje. $_CLICK
 # ^UnLicenseTextRB
-Praðome perskaityti sutartá prieð iðtrinant $(^NameDA). Jei jûs sutinkate su nurodytomis sàlygomis, pasirinkite pirmà pasirinkimà esantá þemiau.  $_CLICK
+PraÅ¡ome perskaityti sutartÄ¯ prieÅ¡ iÅ¡trinant $(^NameDA). Jei jÅ«s sutinkate su nurodytomis sÄ…lygomis, pasirinkite pirmÄ… pasirinkimÄ… esantÄ¯ Å¾emiau.  $_CLICK
 # ^Custom
 Kitoks
 # ^ComponentsText
-Padëkite varneles laukeliuose komponentø kuriuos norite ádiegti ir nuimkite nuo kuriø nenorite ádiegti. $_CLICK
+PadÄ—kite varneles laukeliuose komponentÅ³ kuriuos norite Ä¯diegti ir nuimkite nuo kuriÅ³ nenorite Ä¯diegti. $_CLICK
 # ^ComponentsSubText1
-Pasirinkite ádiegimo bûdà:
+Pasirinkite Ä¯diegimo bÅ«dÄ…:
 # ^ComponentsSubText2_NoInstTypes
-Pasirinkite komponentus, kuriuos ádiegti:
+Pasirinkite komponentus, kuriuos Ä¯diegti:
 # ^ComponentsSubText2
-Arba, pasirinkite neprivalomus komponentus, kuriuos jûs norite ádiegti:
+Arba, pasirinkite neprivalomus komponentus, kuriuos jÅ«s norite Ä¯diegti:
 # ^UnComponentsText
-Padëkite varneles laukeliuose komponentø kuriuos norite paðalinti ir nuimkite nuo kuriø nenorite paðalinti. $_CLICK
+PadÄ—kite varneles laukeliuose komponentÅ³ kuriuos norite paÅ¡alinti ir nuimkite nuo kuriÅ³ nenorite paÅ¡alinti. $_CLICK
 # ^UnComponentsSubText1
-Pasirinkite ðalinimo bûdà:
+Pasirinkite Å¡alinimo bÅ«dÄ…:
 # ^UnComponentsSubText2_NoInstTypes
-Pasirinkite komponentus, kuriuos ðalinti:
+Pasirinkite komponentus, kuriuos Å¡alinti:
 # ^UnComponentsSubText2
-Arba, pasirinkite neprivalomus komponentus, kuriuos jûs norite paðalinti:
+Arba, pasirinkite neprivalomus komponentus, kuriuos jÅ«s norite paÅ¡alinti:
 # ^DirText
-Ádiegimas dabar ádiegs $(^NameDA) ðiame kataloge. Jeigu norite pakeisti ðá katalogà, paspauskite Pasirinkti. $_CLICK
+Ä®diegimas dabar Ä¯diegs $(^NameDA) Å¡iame kataloge. Jeigu norite pakeisti Å¡Ä¯ katalogÄ…, paspauskite Pasirinkti. $_CLICK
 # ^DirSubText
-Ádiegimo katalogas
+Ä®diegimo katalogas
 # ^DirBrowseText
-Pasirinkite katalogà, kur ádiegti $(^NameDA):
+Pasirinkite katalogÄ…, kur Ä¯diegti $(^NameDA):
 # ^UnDirText
-Ádiegimas dabar paðalins $(^NameDA) ið ðio katalogo. Jeigu norite pakeisti ðá katalogà paspauskite Pasirinkti. $_CLICK
+Ä®diegimas dabar paÅ¡alins $(^NameDA) iÅ¡ Å¡io katalogo. Jeigu norite pakeisti Å¡Ä¯ katalogÄ… paspauskite Pasirinkti. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Pasirinkite katalogà ið kurio paðalinti $(^NameDA):
+Pasirinkite katalogÄ… iÅ¡ kurio paÅ¡alinti $(^NameDA):
 # ^SpaceAvailable
 Yra vietos: 
 # ^SpaceRequired
 Reikia vietos: 
 # ^UninstallingText
-$(^NameDA) dabar bus paðalintas ið ðio katalogo. $_CLICK
+$(^NameDA) dabar bus paÅ¡alintas iÅ¡ Å¡io katalogo. $_CLICK
 # ^UninstallingSubText
-Trinama ið:
+Trinama iÅ¡:
 # ^FileError
-Klaida atidarant failà áraðymui: \r\n\t"$0"\r\nPaspauskite Nutraukti, jei norite nutraukti ádiegimà,\r\nPakartoti, jei norite pabandyti dar kartà áraðyti failà, ar\r\nIgnoruoti, jei norite praleisti ðá failà
+Klaida atidarant failÄ… Ä¯raÅ¡ymui: \r\n\t"$0"\r\nPaspauskite Nutraukti, jei norite nutraukti Ä¯diegimÄ…,\r\nPakartoti, jei norite pabandyti dar kartÄ… Ä¯raÅ¡yti failÄ…, ar\r\nIgnoruoti, jei norite praleisti Å¡Ä¯ failÄ…
 # ^FileError_NoIgnore
-Klaida atidarant failà áraðymui: \r\n\t"$0"\r\nPaspauskite Pakartoti, jei norite pabandyti dar kartà áraðyti failà, ar\r\nNutraukti, jei norite nutraukti ádiegimà.
+Klaida atidarant failÄ… Ä¯raÅ¡ymui: \r\n\t"$0"\r\nPaspauskite Pakartoti, jei norite pabandyti dar kartÄ… Ä¯raÅ¡yti failÄ…, ar\r\nNutraukti, jei norite nutraukti Ä¯diegimÄ….
 # ^CantWrite
-"Negalima áraðyti: "
+"Negalima Ä¯raÅ¡yti: "
 # ^CopyFailed
 Kopijavimas nepavyko
 # ^CopyTo
-Kopijuoti á 
+Kopijuoti Ä¯ 
 # ^Registering
-"Uþregistruojama: "
+"UÅ¾registruojama: "
 # ^Unregistering
-"Iðregistruojama: "
+"IÅ¡registruojama: "
 # ^SymbolNotFound
 Nerastas simbolis: 
 # ^CouldNotLoad
-Negaliu ákrauti: 
+Negaliu Ä¯krauti: 
 # ^CreateFolder
-Sukurti katalogà: 
+Sukurti katalogÄ…: 
 # ^CreateShortcut
-Sukurti nuorodà: 
+Sukurti nuorodÄ…: 
 # ^CreatedUninstaller
-Sukurti panaikinimo programà:
+Sukurti panaikinimo programÄ…:
 # ^Delete
-Iðtrinti failà: 
+IÅ¡trinti failÄ…: 
 # ^DeleteOnReboot
-"Iðtrinti perkraunant: "
+"IÅ¡trinti perkraunant: "
 # ^ErrorCreatingShortcut
-"Klaida kuriant nuorodà: "
+"Klaida kuriant nuorodÄ…: "
 # ^ErrorCreating
 "Klaida kuriant: "
 # ^ErrorDecompressing
-Klaida iðskleidþiant duomenis! Sugadintas ádiegimo failas?
+Klaida iÅ¡skleidÅ¾iant duomenis! Sugadintas Ä¯diegimo failas?
 # ^ErrorRegistering
-Klaida uþregistruojant DLL
+Klaida uÅ¾registruojant DLL
 # ^ExecShell
 "VykdytiShell: "
 # ^Exec
 "Vykdyti: "
 # ^Extract
-"Iðskleisti: "
+"IÅ¡skleisti: "
 # ^ErrorWriting
-Iðskleisti: klaida áraðant á failà
+IÅ¡skleisti: klaida Ä¯raÅ¡ant Ä¯ failÄ…
 # ^InvalidOpcode
-Ádiegimo failas sugadintas: neteisingas opkodas
+Ä®diegimo failas sugadintas: neteisingas opkodas
 # ^NoOLE
-"Nëra OLE dël: "
+"NÄ—ra OLE dÄ—l: "
 # ^OutputFolder
 "Paskirties katalogas: "
 # ^RemoveFolder
-"Panaikinti katalogà: "
+"Panaikinti katalogÄ…: "
 # ^RenameOnReboot
 "Pervardinti perkraunant: "
 # ^Rename
@@ -178,14 +178,14 @@
 # ^Skipped
 "Praleista: "
 # ^CopyDetails
-Kopijuoti detales á atmintá
+Kopijuoti detales Ä¯ atmintÄ¯
 # ^LogInstall
-Áraðyti ádiegimo detales
+Ä®raÅ¡yti Ä¯diegimo detales
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Greek.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Greek.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Greek.nlf	(revision 2956)
@@ -1,11 +1,11 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1032
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1253
 # RTL - anything else than RTL means LTR
 -
@@ -13,178 +13,178 @@
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-ÅãêáôÜóôáóç ôïõ '$(^Name)'
+Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Ï„Î¿Ï… '$(^Name)'
 # ^UninstallCaption
-ÁðåãêáôÜóôáóç ôïõ '$(^Name)'
+Î‘Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Ï„Î¿Ï… '$(^Name)'
 # ^LicenseSubCaption
-: Óõìöùíßá ¢äåéáò ×ñÞóçò
+: Î£Ï…Î¼Ï†Ï‰Î½Î¯Î± Î†Î´ÎµÎ¹Î±Ï‚ Î§Ï�Î®ÏƒÎ·Ï‚
 # ^ComponentsSubCaption
-: ÅðéëïãÝò ÅãêáôÜóôáóçò
+: Î•Ï€Î¹Î»Î¿Î³Î­Ï‚ Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚
 # ^DirSubCaption
-: ÖÜêåëïò ÅãêáôÜóôáóçò
+: Î¦Î¬ÎºÎµÎ»Î¿Ï‚ Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚
 # ^InstallingSubCaption
-: ÅãêáôÜóôáóç óå åîÝëéîç
+: Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· ÏƒÎµ ÎµÎ¾Î­Î»Î¹Î¾Î·
 # ^CompletedSubCaption
-: Ïëïêëçñþèçêå
+: ÎŸÎ»Î¿ÎºÎ»Î·Ï�ÏŽÎ¸Î·ÎºÎµ
 # ^UnComponentsSubCaption
-: ÅðéëïãÝò ÁðåãêáôÜóôáóçò
+: Î•Ï€Î¹Î»Î¿Î³Î­Ï‚ Î‘Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚
 # ^UnDirSubCaption
-: ÖÜêåëïò ÁðåãêáôÜóôáóçò
+: Î¦Î¬ÎºÎµÎ»Î¿Ï‚ Î‘Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚
 # ^ConfirmSubCaption
-: Åðéâåâáßùóç
+: Î•Ï€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ·
 # ^UninstallingSubCaption
-: ÁðåãêáôÜóôáóç óå åîÝëéîç
+: Î‘Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· ÏƒÎµ ÎµÎ¾Î­Î»Î¹Î¾Î·
 # ^UnCompletedSubCaption
-: Ïëïêëçñþèçêå
+: ÎŸÎ»Î¿ÎºÎ»Î·Ï�ÏŽÎ¸Î·ÎºÎµ
 # ^BackBtn
-< &Ðßóù
+< &Î Î¯ÏƒÏ‰
 # ^NextBtn
-&Åðüìåíï >
+&Î•Ï€ÏŒÎ¼ÎµÎ½Î¿ >
 # ^AgreeBtn
-&Óõìöùíþ
+&Î£Ï…Î¼Ï†Ï‰Î½ÏŽ
 # ^AcceptBtn
-&ÁðïäÝ÷ïìáé ôïõò üñïõò ôçò Üäåéáò ÷ñÞóçò
+&Î‘Ï€Î¿Î´Î­Ï‡Î¿Î¼Î±Î¹ Ï„Î¿Ï…Ï‚ ÏŒÏ�Î¿Ï…Ï‚ Ï„Î·Ï‚ Î¬Î´ÎµÎ¹Î±Ï‚ Ï‡Ï�Î®ÏƒÎ·Ï‚
 # ^DontAcceptBtn
-&Äåí áðïäÝ÷ïìáé ôïõò üñïõò ôçò Üäåéáò ÷ñÞóçò
+&Î”ÎµÎ½ Î±Ï€Î¿Î´Î­Ï‡Î¿Î¼Î±Î¹ Ï„Î¿Ï…Ï‚ ÏŒÏ�Î¿Ï…Ï‚ Ï„Î·Ï‚ Î¬Î´ÎµÎ¹Î±Ï‚ Ï‡Ï�Î®ÏƒÎ·Ï‚
 # ^InstallBtn
-&ÅãêáôÜóôáóç
+&Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·
 # ^UninstallBtn
-Áðå&ãêáôÜóô.
+Î‘Ï€Îµ&Î³ÎºÎ±Ï„Î¬ÏƒÏ„.
 # ^CancelBtn
-¢êõñï
+Î†ÎºÏ…Ï�Î¿
 # ^CloseBtn
-&Êëåßóéìï
+&ÎšÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿
 # ^BrowseBtn
-Á&íáæÞôçóç...
+Î‘&Î½Î±Î¶Î®Ï„Î·ÏƒÎ·...
 # ^ShowDetailsBtn
-&ËåðôïìÝñåéåò
+&Î›ÎµÏ€Ï„Î¿Î¼Î­Ï�ÎµÎ¹ÎµÏ‚
 # ^ClickNext
-ÊÜíôå êëéê óôï Åðüìåíï ãéá íá óõíå÷ßóåôå.
+ÎšÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÏƒÏ„Î¿ Î•Ï€ÏŒÎ¼ÎµÎ½Î¿ Î³Î¹Î± Î½Î± ÏƒÏ…Î½ÎµÏ‡Î¯ÏƒÎµÏ„Îµ.
 # ^ClickInstall
-ÊÜíôå êëéê óôï ÅãêáôÜóôáóç ãéá íá áñ÷ßóåôå ôçí åãêáôÜóôáóç.
+ÎšÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÏƒÏ„Î¿ Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î³Î¹Î± Î½Î± Î±Ï�Ï‡Î¯ÏƒÎµÏ„Îµ Ï„Î·Î½ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·.
 # ^ClickUninstall
-ÊÜíôå êëéê óôï ÁðåãêáôÜóôáóç ãéá íá áñ÷ßóåôå ôçí áðåãêáôÜóôáóç.
+ÎšÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÏƒÏ„Î¿ Î‘Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î³Î¹Î± Î½Î± Î±Ï�Ï‡Î¯ÏƒÎµÏ„Îµ Ï„Î·Î½ Î±Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·.
 # ^Name
-¼íïìá
+ÎŒÎ½Î¿Î¼Î±
 # ^Completed
-Ïëïêëçñþèçêå
+ÎŸÎ»Î¿ÎºÎ»Î·Ï�ÏŽÎ¸Î·ÎºÎµ
 # ^LicenseText
-ÅëÝãîôå ôçí Üäåéá ÷ñÞóçò ðñéí åãêáôáóôÞóåôå ôï '$(^NameDA)'. ÅÜí áðïäÝ÷åóôå üëïõò ôïõò üñïõò, êÜíôå êëéê óôï Óõìöùíþ.
+Î•Î»Î­Î³Î¾Ï„Îµ Ï„Î·Î½ Î¬Î´ÎµÎ¹Î± Ï‡Ï�Î®ÏƒÎ·Ï‚ Ï€Ï�Î¹Î½ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¿ '$(^NameDA)'. Î•Î¬Î½ Î±Ï€Î¿Î´Î­Ï‡ÎµÏƒÏ„Îµ ÏŒÎ»Î¿Ï…Ï‚ Ï„Î¿Ï…Ï‚ ÏŒÏ�Î¿Ï…Ï‚, ÎºÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÏƒÏ„Î¿ Î£Ï…Î¼Ï†Ï‰Î½ÏŽ.
 # ^LicenseTextCB
-ÅëÝãîôå ôçí Üäåéá ÷ñÞóçò ðñéí åãêáôáóôÞóåôå ôï '$(^NameDA)'. ÅÜí áðïäÝ÷åóôå üëïõò ôïõò üñïõò, êÜíôå êëéê óôçí åðéëïãÞ ðáñáêÜôù. $_CLICK
+Î•Î»Î­Î³Î¾Ï„Îµ Ï„Î·Î½ Î¬Î´ÎµÎ¹Î± Ï‡Ï�Î®ÏƒÎ·Ï‚ Ï€Ï�Î¹Î½ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¿ '$(^NameDA)'. Î•Î¬Î½ Î±Ï€Î¿Î´Î­Ï‡ÎµÏƒÏ„Îµ ÏŒÎ»Î¿Ï…Ï‚ Ï„Î¿Ï…Ï‚ ÏŒÏ�Î¿Ï…Ï‚, ÎºÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÏƒÏ„Î·Î½ ÎµÏ€Î¹Î»Î¿Î³Î® Ï€Î±Ï�Î±ÎºÎ¬Ï„Ï‰. $_CLICK
 # ^LicenseTextRB
-ÅëÝãîôå ôçí Üäåéá ÷ñÞóçò ðñéí åãêáôáóôÞóåôå ôï '$(^NameDA)'. ÅÜí áðïäÝ÷åóôå üëïõò ôïõò üñïõò, êÜíôå êëéê óôçí ðñþôç åðéëïãÞ ðáñáêÜôù. $_CLICK
+Î•Î»Î­Î³Î¾Ï„Îµ Ï„Î·Î½ Î¬Î´ÎµÎ¹Î± Ï‡Ï�Î®ÏƒÎ·Ï‚ Ï€Ï�Î¹Î½ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¿ '$(^NameDA)'. Î•Î¬Î½ Î±Ï€Î¿Î´Î­Ï‡ÎµÏƒÏ„Îµ ÏŒÎ»Î¿Ï…Ï‚ Ï„Î¿Ï…Ï‚ ÏŒÏ�Î¿Ï…Ï‚, ÎºÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÏƒÏ„Î·Î½ Ï€Ï�ÏŽÏ„Î· ÎµÏ€Î¹Î»Î¿Î³Î® Ï€Î±Ï�Î±ÎºÎ¬Ï„Ï‰. $_CLICK
 # ^UnLicenseText
-ÅëÝãîôå ôçí Üäåéá ÷ñÞóçò ðñéí áðåãêáôáóôÞóåôå ôï '$(^NameDA)'. ÅÜí áðïäÝ÷åóôå üëïõò ôïõò üñïõò, êÜíôå êëéê óôï Óõìöùíþ.
+Î•Î»Î­Î³Î¾Ï„Îµ Ï„Î·Î½ Î¬Î´ÎµÎ¹Î± Ï‡Ï�Î®ÏƒÎ·Ï‚ Ï€Ï�Î¹Î½ Î±Ï€ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¿ '$(^NameDA)'. Î•Î¬Î½ Î±Ï€Î¿Î´Î­Ï‡ÎµÏƒÏ„Îµ ÏŒÎ»Î¿Ï…Ï‚ Ï„Î¿Ï…Ï‚ ÏŒÏ�Î¿Ï…Ï‚, ÎºÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÏƒÏ„Î¿ Î£Ï…Î¼Ï†Ï‰Î½ÏŽ.
 # ^UnLicenseTextCB
-ÅëÝãîôå ôçí Üäåéá ÷ñÞóçò ðñéí áðåãêáôáóôÞóåôå ôï '$(^NameDA)'. ÅÜí áðïäÝ÷åóôå üëïõò ôïõò üñïõò, êÜíôå êëéê óôçí åðéëïãÞ ðáñáêÜôù. $_CLICK
+Î•Î»Î­Î³Î¾Ï„Îµ Ï„Î·Î½ Î¬Î´ÎµÎ¹Î± Ï‡Ï�Î®ÏƒÎ·Ï‚ Ï€Ï�Î¹Î½ Î±Ï€ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¿ '$(^NameDA)'. Î•Î¬Î½ Î±Ï€Î¿Î´Î­Ï‡ÎµÏƒÏ„Îµ ÏŒÎ»Î¿Ï…Ï‚ Ï„Î¿Ï…Ï‚ ÏŒÏ�Î¿Ï…Ï‚, ÎºÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÏƒÏ„Î·Î½ ÎµÏ€Î¹Î»Î¿Î³Î® Ï€Î±Ï�Î±ÎºÎ¬Ï„Ï‰. $_CLICK
 # ^UnLicenseTextRB
-ÅëÝãîôå ôçí Üäåéá ÷ñÞóçò ðñéí áðåãêáôáóôÞóåôå ôï '$(^NameDA)'. ÅÜí áðïäÝ÷åóôå üëïõò ôïõò üñïõò, êÜíôå êëéê óôçí ðñþôç åðéëïãÞ ðáñáêÜôù. $_CLICK
+Î•Î»Î­Î³Î¾Ï„Îµ Ï„Î·Î½ Î¬Î´ÎµÎ¹Î± Ï‡Ï�Î®ÏƒÎ·Ï‚ Ï€Ï�Î¹Î½ Î±Ï€ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¿ '$(^NameDA)'. Î•Î¬Î½ Î±Ï€Î¿Î´Î­Ï‡ÎµÏƒÏ„Îµ ÏŒÎ»Î¿Ï…Ï‚ Ï„Î¿Ï…Ï‚ ÏŒÏ�Î¿Ï…Ï‚, ÎºÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÏƒÏ„Î·Î½ Ï€Ï�ÏŽÏ„Î· ÎµÏ€Î¹Î»Î¿Î³Î® Ï€Î±Ï�Î±ÎºÎ¬Ï„Ï‰. $_CLICK
 # ^Custom
-ÐñïóáñìïóìÝíç
+Î Ï�Î¿ÏƒÎ±Ï�Î¼Î¿ÏƒÎ¼Î­Î½Î·
 # ^ComponentsText
-ÅðéëÝîôå ôá óôïé÷åßá ðïõ èÝëåôå íá åãêáôáóôÞóåôå êáé áðïåðéëÝîôå ôá óôïé÷åßá ðïõ äå èÝëåôå íá åãêáôáóôÞóåôå. $_CLICK
+Î•Ï€Î¹Î»Î­Î¾Ï„Îµ Ï„Î± ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î± Ï€Î¿Ï… Î¸Î­Î»ÎµÏ„Îµ Î½Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ ÎºÎ±Î¹ Î±Ï€Î¿ÎµÏ€Î¹Î»Î­Î¾Ï„Îµ Ï„Î± ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î± Ï€Î¿Ï… Î´Îµ Î¸Î­Î»ÎµÏ„Îµ Î½Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ. $_CLICK
 # ^ComponentsSubText1
-ÅðéëÝîôå ôýðï åãêáôÜóôáóçò:
+Î•Ï€Î¹Î»Î­Î¾Ï„Îµ Ï„Ï�Ï€Î¿ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚:
 # ^ComponentsSubText2_NoInstTypes
-ÅðéëÝîôå ôá óôïé÷åßá ðïõ èÝëåôå íá åãêáôáóôÞóåôå:
+Î•Ï€Î¹Î»Î­Î¾Ï„Îµ Ï„Î± ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î± Ï€Î¿Ï… Î¸Î­Î»ÎµÏ„Îµ Î½Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ:
 # ^ComponentsSubText2
-¹, åðéëÝîôå ôá ðñïáéñåôéêÜ óôïé÷åßá ðïõ èÝëåôå íá åãêáôáóôÞóåôå:
+Î‰, ÎµÏ€Î¹Î»Î­Î¾Ï„Îµ Ï„Î± Ï€Ï�Î¿Î±Î¹Ï�ÎµÏ„Î¹ÎºÎ¬ ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î± Ï€Î¿Ï… Î¸Î­Î»ÎµÏ„Îµ Î½Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ:
 # ^UnComponentsText
-ÅðéëÝîôå ôá óôïé÷åßá ðïõ èÝëåôå íá áðåãêáôáóôÞóåôå êáé áðïåðéëÝîôå ôá óôïé÷åßá ðïõ äå èÝëåôå íá áðåãêáôáóôÞóåôå. $_CLICK
+Î•Ï€Î¹Î»Î­Î¾Ï„Îµ Ï„Î± ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î± Ï€Î¿Ï… Î¸Î­Î»ÎµÏ„Îµ Î½Î± Î±Ï€ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ ÎºÎ±Î¹ Î±Ï€Î¿ÎµÏ€Î¹Î»Î­Î¾Ï„Îµ Ï„Î± ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î± Ï€Î¿Ï… Î´Îµ Î¸Î­Î»ÎµÏ„Îµ Î½Î± Î±Ï€ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ. $_CLICK
 # ^UnComponentsSubText1
-ÅðéëÝîôå ôýðï áðåãêáôÜóôáóçò:
+Î•Ï€Î¹Î»Î­Î¾Ï„Îµ Ï„Ï�Ï€Î¿ Î±Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚:
 # ^UnComponentsSubText2_NoInstTypes
-ÅðéëÝîôå ôá óôïé÷åßá ðïõ èÝëåôå íá áðåãêáôáóôÞóåôå:
+Î•Ï€Î¹Î»Î­Î¾Ï„Îµ Ï„Î± ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î± Ï€Î¿Ï… Î¸Î­Î»ÎµÏ„Îµ Î½Î± Î±Ï€ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ:
 # ^UnComponentsSubText2
-¹, åðéëÝîôå ôá ðñïáéñåôéêÜ óôïé÷åßá ðïõ èÝëåôå íá áðåãêáôáóôÞóåôå:
+Î‰, ÎµÏ€Î¹Î»Î­Î¾Ï„Îµ Ï„Î± Ï€Ï�Î¿Î±Î¹Ï�ÎµÏ„Î¹ÎºÎ¬ ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î± Ï€Î¿Ï… Î¸Î­Î»ÎµÏ„Îµ Î½Î± Î±Ï€ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ:
 # ^DirText
-Ôï ðñüãñáììá åãêáôÜóôáóçò èá åãêáôáóôÞóåé ôï '$(^NameDA)' óôïí ðáñáêÜôù öÜêåëï. Ãéá íá ôï åãêáôáóôÞóåôå óå Ýíáí Üëëï öÜêåëï, êÜíôå êëéê óôï ÁíáæÞôçóç êáé åðéëÝîôå êÜðïéïí Üëëï öÜêåëï. $_CLICK
+Î¤Î¿ Ï€Ï�ÏŒÎ³Ï�Î±Î¼Î¼Î± ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ Î¸Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÎ¹ Ï„Î¿ '$(^NameDA)' ÏƒÏ„Î¿Î½ Ï€Î±Ï�Î±ÎºÎ¬Ï„Ï‰ Ï†Î¬ÎºÎµÎ»Î¿. Î“Î¹Î± Î½Î± Ï„Î¿ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ ÏƒÎµ Î­Î½Î±Î½ Î¬Î»Î»Î¿ Ï†Î¬ÎºÎµÎ»Î¿, ÎºÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÏƒÏ„Î¿ Î‘Î½Î±Î¶Î®Ï„Î·ÏƒÎ· ÎºÎ±Î¹ ÎµÏ€Î¹Î»Î­Î¾Ï„Îµ ÎºÎ¬Ï€Î¿Î¹Î¿Î½ Î¬Î»Î»Î¿ Ï†Î¬ÎºÎµÎ»Î¿. $_CLICK
 # ^DirSubText
-ÖÜêåëïò ÅãêáôÜóôáóçò
+Î¦Î¬ÎºÎµÎ»Î¿Ï‚ Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚
 # ^DirBrowseText
-ÅðéëÝîôå ôï öÜêåëï åãêáôÜóôáóçò ãéá ôï '$(^NameDA)':
+Î•Ï€Î¹Î»Î­Î¾Ï„Îµ Ï„Î¿ Ï†Î¬ÎºÎµÎ»Î¿ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ Î³Î¹Î± Ï„Î¿ '$(^NameDA)':
 # ^UnDirText
-Ôï ðñüãñáììá åãêáôÜóôáóçò èá áðåãêáôáóôÞóåé ôï '$(^NameDA)' áðü ôïí ðáñáêÜôù öÜêåëï. Ãéá íá áðåãêáôáóôÞóåôå áðü Ýíáí Üëëï öÜêåëï, êÜíôå êëéê óôï ÁíáæÞôçóç êáé åðéëÝîôå êÜðïéïí Üëëï öÜêåëï. $_CLICK
+Î¤Î¿ Ï€Ï�ÏŒÎ³Ï�Î±Î¼Î¼Î± ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ Î¸Î± Î±Ï€ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÎ¹ Ï„Î¿ '$(^NameDA)' Î±Ï€ÏŒ Ï„Î¿Î½ Ï€Î±Ï�Î±ÎºÎ¬Ï„Ï‰ Ï†Î¬ÎºÎµÎ»Î¿. Î“Î¹Î± Î½Î± Î±Ï€ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Î±Ï€ÏŒ Î­Î½Î±Î½ Î¬Î»Î»Î¿ Ï†Î¬ÎºÎµÎ»Î¿, ÎºÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÏƒÏ„Î¿ Î‘Î½Î±Î¶Î®Ï„Î·ÏƒÎ· ÎºÎ±Î¹ ÎµÏ€Î¹Î»Î­Î¾Ï„Îµ ÎºÎ¬Ï€Î¿Î¹Î¿Î½ Î¬Î»Î»Î¿ Ï†Î¬ÎºÎµÎ»Î¿. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-ÅðéëÝîôå ôï öÜêåëï áðåãêáôÜóôáóçò ãéá ôï '$(^NameDA)':
+Î•Ï€Î¹Î»Î­Î¾Ï„Îµ Ï„Î¿ Ï†Î¬ÎºÎµÎ»Î¿ Î±Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ Î³Î¹Î± Ï„Î¿ '$(^NameDA)':
 # ^SpaceAvailable
-"ÄéáèÝóéìïò ÷þñïò: "
+"Î”Î¹Î±Î¸Î­ÏƒÎ¹Î¼Î¿Ï‚ Ï‡ÏŽÏ�Î¿Ï‚: "
 # ^SpaceRequired
-"Áðáéôïýìåíïò ÷þñïò: "
+"Î‘Ï€Î±Î¹Ï„Î¿Ï�Î¼ÎµÎ½Î¿Ï‚ Ï‡ÏŽÏ�Î¿Ï‚: "
 # ^UninstallingText
-Ôï '$(^NameDA)' èá áðåãêáôáóôáèåß áðü ôïí áêüëïõèï öÜêåëï. $_CLICK
+Î¤Î¿ '$(^NameDA)' Î¸Î± Î±Ï€ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸ÎµÎ¯ Î±Ï€ÏŒ Ï„Î¿Î½ Î±ÎºÏŒÎ»Î¿Ï…Î¸Î¿ Ï†Î¬ÎºÎµÎ»Î¿. $_CLICK
 # ^UninstallingSubText
-ÁðåãêáôÜóô. áðü:
+Î‘Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„. Î±Ï€ÏŒ:
 # ^FileError
-ÓöÜëìá êáôÜ ôï Üíïéãìá áñ÷åßïõ ãéá åããñáöÞ: \r\n\t"$0"\r\nÅðéëÝîôå ìáôáßùóç ãéá íá ìáôáéþóåôå ôçí åãêáôÜóôáóç,\r\nåðáíÜëçøç ãéá íá äïêéìÜóåôå íá ãñÜøåôå ôï áñ÷åßï ðÜëé, Þ\r\nðáñÜâëåøç ãéá íá ðáñáëåßøåôå áõôü ôï áñ÷åßï.
+Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î¿ Î¬Î½Î¿Î¹Î³Î¼Î± Î±Ï�Ï‡ÎµÎ¯Î¿Ï… Î³Î¹Î± ÎµÎ³Î³Ï�Î±Ï†Î®: \r\n\t"$0"\r\nÎ•Ï€Î¹Î»Î­Î¾Ï„Îµ Î¼Î±Ï„Î±Î¯Ï‰ÏƒÎ· Î³Î¹Î± Î½Î± Î¼Î±Ï„Î±Î¹ÏŽÏƒÎµÏ„Îµ Ï„Î·Î½ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·,\r\nÎµÏ€Î±Î½Î¬Î»Î·ÏˆÎ· Î³Î¹Î± Î½Î± Î´Î¿ÎºÎ¹Î¼Î¬ÏƒÎµÏ„Îµ Î½Î± Î³Ï�Î¬ÏˆÎµÏ„Îµ Ï„Î¿ Î±Ï�Ï‡ÎµÎ¯Î¿ Ï€Î¬Î»Î¹, Î®\r\nÏ€Î±Ï�Î¬Î²Î»ÎµÏˆÎ· Î³Î¹Î± Î½Î± Ï€Î±Ï�Î±Î»ÎµÎ¯ÏˆÎµÏ„Îµ Î±Ï…Ï„ÏŒ Ï„Î¿ Î±Ï�Ï‡ÎµÎ¯Î¿.
 # ^FileError_NoIgnore
-ÓöÜëìá êáôÜ ôï Üíïéãìá áñ÷åßïõ ãéá åããñáöÞ: \r\n\t"$0"\r\nÅðéëÝîôå åðáíÜëçøç ãéá íá äïêéìÜóåôå íá ãñÜøåôå ôï áñ÷åßï ðÜëé, Þ\r\nìáôáßùóç ãéá íá ìáôáéþóåôå ôçí åãêáôÜóôáóç.
+Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î¿ Î¬Î½Î¿Î¹Î³Î¼Î± Î±Ï�Ï‡ÎµÎ¯Î¿Ï… Î³Î¹Î± ÎµÎ³Î³Ï�Î±Ï†Î®: \r\n\t"$0"\r\nÎ•Ï€Î¹Î»Î­Î¾Ï„Îµ ÎµÏ€Î±Î½Î¬Î»Î·ÏˆÎ· Î³Î¹Î± Î½Î± Î´Î¿ÎºÎ¹Î¼Î¬ÏƒÎµÏ„Îµ Î½Î± Î³Ï�Î¬ÏˆÎµÏ„Îµ Ï„Î¿ Î±Ï�Ï‡ÎµÎ¯Î¿ Ï€Î¬Î»Î¹, Î®\r\nÎ¼Î±Ï„Î±Î¯Ï‰ÏƒÎ· Î³Î¹Î± Î½Î± Î¼Î±Ï„Î±Î¹ÏŽÏƒÎµÏ„Îµ Ï„Î·Î½ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·.
 # ^CantWrite
-"Áäõíáìßá åããñáöÞò: "
+"Î‘Î´Ï…Î½Î±Î¼Î¯Î± ÎµÎ³Î³Ï�Î±Ï†Î®Ï‚: "
 # ^CopyFailed
-ÁíôéãñáöÞ áðÝôõ÷å
+Î‘Î½Ï„Î¹Î³Ï�Î±Ï†Î® Î±Ï€Î­Ï„Ï…Ï‡Îµ
 # ^CopyTo
-"ÁíôéãñáöÞ óôï "
+"Î‘Î½Ï„Î¹Î³Ï�Î±Ï†Î® ÏƒÏ„Î¿ "
 # ^Registering
-"Êáôá÷þñçóç: "
+"ÎšÎ±Ï„Î±Ï‡ÏŽÏ�Î·ÏƒÎ·: "
 # ^Unregistering
-"ÊáôÜñãçóç êáôá÷þñçóçò: "
+"ÎšÎ±Ï„Î¬Ï�Î³Î·ÏƒÎ· ÎºÎ±Ï„Î±Ï‡ÏŽÏ�Î·ÏƒÎ·Ï‚: "
 # ^SymbolNotFound
-"Áäõíáìßá åýñåóçò óõìâüëïõ: "
+"Î‘Î´Ï…Î½Î±Î¼Î¯Î± ÎµÏ�Ï�ÎµÏƒÎ·Ï‚ ÏƒÏ…Î¼Î²ÏŒÎ»Î¿Ï…: "
 # ^CouldNotLoad
-"Áäõíáìßá öüñôùóçò: "
+"Î‘Î´Ï…Î½Î±Î¼Î¯Î± Ï†ÏŒÏ�Ï„Ï‰ÏƒÎ·Ï‚: "
 # ^CreateFolder
-"Äçìéïõñãßá öáêÝëïõ: "
+"Î”Î·Î¼Î¹Î¿Ï…Ï�Î³Î¯Î± Ï†Î±ÎºÎ­Î»Î¿Ï…: "
 # ^CreateShortcut
-"Äçìéïõñãßá óõíôüìåõóçò: "
+"Î”Î·Î¼Î¹Î¿Ï…Ï�Î³Î¯Î± ÏƒÏ…Î½Ï„ÏŒÎ¼ÎµÏ…ÏƒÎ·Ï‚: "
 # ^CreatedUninstaller
-"Äçìéïõñãßá ðñïãñÜììáôïò áðåãêáôÜóôáóçò: "
+"Î”Î·Î¼Î¹Î¿Ï…Ï�Î³Î¯Î± Ï€Ï�Î¿Î³Ï�Î¬Î¼Î¼Î±Ï„Î¿Ï‚ Î±Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚: "
 # ^Delete
-"ÄéáãñáöÞ áñ÷åßïõ: "
+"Î”Î¹Î±Î³Ï�Î±Ï†Î® Î±Ï�Ï‡ÎµÎ¯Î¿Ï…: "
 # ^DeleteOnReboot
-"ÄéáãñáöÞ óôçí åðáíåêêßíçóç: "
+"Î”Î¹Î±Î³Ï�Î±Ï†Î® ÏƒÏ„Î·Î½ ÎµÏ€Î±Î½ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·: "
 # ^ErrorCreatingShortcut
-"ÓöÜëìá óôç äçìéïõñãßá óõíôüìåõóçò: "
+"Î£Ï†Î¬Î»Î¼Î± ÏƒÏ„Î· Î´Î·Î¼Î¹Î¿Ï…Ï�Î³Î¯Î± ÏƒÏ…Î½Ï„ÏŒÎ¼ÎµÏ…ÏƒÎ·Ï‚: "
 # ^ErrorCreating
-"ÓöÜëìá óôç äçìéïõñãßá: "
+"Î£Ï†Î¬Î»Î¼Î± ÏƒÏ„Î· Î´Î·Î¼Î¹Î¿Ï…Ï�Î³Î¯Î±: "
 # ^ErrorDecompressing
-ÓöÜëìá óôçí áðïóõìðßåóç äåäïìÝíùí! ÊáôåóôñáììÝíï ðñüãñáììá åãêáôÜóôáóçò;
+Î£Ï†Î¬Î»Î¼Î± ÏƒÏ„Î·Î½ Î±Ï€Î¿ÏƒÏ…Î¼Ï€Î¯ÎµÏƒÎ· Î´ÎµÎ´Î¿Î¼Î­Î½Ï‰Î½! ÎšÎ±Ï„ÎµÏƒÏ„Ï�Î±Î¼Î¼Î­Î½Î¿ Ï€Ï�ÏŒÎ³Ï�Î±Î¼Î¼Î± ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚;
 # ^ErrorRegistering
-ÓöÜëìá êáôá÷þñçóçò ôïõ DLL
+Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î±Ï‡ÏŽÏ�Î·ÏƒÎ·Ï‚ Ï„Î¿Ï… DLL
 # ^ExecShell
-"ÅêôÝëåóç (ExecShell): "
+"Î•ÎºÏ„Î­Î»ÎµÏƒÎ· (ExecShell): "
 # ^Exec
-"ÅêôÝëåóç: "
+"Î•ÎºÏ„Î­Î»ÎµÏƒÎ·: "
 # ^Extract
-"Áðïóõìðßåóç: "
+"Î‘Ï€Î¿ÏƒÏ…Î¼Ï€Î¯ÎµÏƒÎ·: "
 # ^ErrorWriting
-"Áðïóõìðßåóç: óöÜëìá åããñáöÞò óôï áñ÷åßï "
+"Î‘Ï€Î¿ÏƒÏ…Î¼Ï€Î¯ÎµÏƒÎ·: ÏƒÏ†Î¬Î»Î¼Î± ÎµÎ³Î³Ï�Î±Ï†Î®Ï‚ ÏƒÏ„Î¿ Î±Ï�Ï‡ÎµÎ¯Î¿ "
 # ^InvalidOpcode
-ÅãêáôÜóôáóç êáôåóôñáììÝíç: ìç-Ýãêõñï opcode
+Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· ÎºÎ±Ï„ÎµÏƒÏ„Ï�Î±Î¼Î¼Î­Î½Î·: Î¼Î·-Î­Î³ÎºÏ…Ï�Î¿ opcode
 # ^NoOLE
-"¼÷é OLE ãéá ôï: "
+"ÎŒÏ‡Î¹ OLE Î³Î¹Î± Ï„Î¿: "
 # ^OutputFolder
-"ÖÜêåëïò åîüäïõ: "
+"Î¦Î¬ÎºÎµÎ»Î¿Ï‚ ÎµÎ¾ÏŒÎ´Î¿Ï…: "
 # ^RemoveFolder
-"ÄéáãñáöÞ öáêÝëïõ: "
+"Î”Î¹Î±Î³Ï�Î±Ï†Î® Ï†Î±ÎºÎ­Î»Î¿Ï…: "
 # ^RenameOnReboot
-"Ìåôïíïìáóßá óôçí åðáíåêêßíçóç: "
+"ÎœÎµÏ„Î¿Î½Î¿Î¼Î±ÏƒÎ¯Î± ÏƒÏ„Î·Î½ ÎµÏ€Î±Î½ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·: "
 # ^Rename
-"Ìåôïíïìáóßá: "
+"ÎœÎµÏ„Î¿Î½Î¿Î¼Î±ÏƒÎ¯Î±: "
 # ^Skipped
-"Ðáñáëåßöèçêå: "
+"Î Î±Ï�Î±Î»ÎµÎ¯Ï†Î¸Î·ÎºÎµ: "
 # ^CopyDetails
-ÁíôéãñáöÞ ëåðôïìåñåéþí óôï Ðñü÷åéñï
+Î‘Î½Ï„Î¹Î³Ï�Î±Ï†Î® Î»ÎµÏ€Ï„Î¿Î¼ÎµÏ�ÎµÎ¹ÏŽÎ½ ÏƒÏ„Î¿ Î Ï�ÏŒÏ‡ÎµÎ¹Ï�Î¿
 # ^LogInstall
-ÊáôáãñáöÞ äéáäéêáóßáò åãêáôÜóôáóçò
+ÎšÎ±Ï„Î±Î³Ï�Î±Ï†Î® Î´Î¹Î±Î´Î¹ÎºÎ±ÏƒÎ¯Î±Ï‚ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Latvian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Latvian.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Latvian.nlf	(revision 2956)
@@ -1,191 +1,191 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1062
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1257
 # RTL - anything else than RTL means LTR
 -
-# Translation by Valdis Griíis (valmiera-9@inbox.lv)
-# Corrections by Kristaps Meòìelis / x-f (x-f 'AT' inbox.lv)
+# Translation by Valdis GriÄ·is (valmiera-9@inbox.lv)
+# Corrections by Kristaps MeÅ†Ä£elis / x-f (x-f 'AT' inbox.lv)
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-'$(^Name)' Uzstâdîðana
+'$(^Name)' UzstÄ�dÄ«Å¡ana
 # ^UninstallCaption
-'$(^Name)' Atinstalçðana
+'$(^Name)' AtinstalÄ“Å¡ana
 # ^LicenseSubCaption
-: Licences lîgums
+: Licences lÄ«gums
 # ^ComponentsSubCaption
-: Uzstâdîðanas opcijas
+: UzstÄ�dÄ«Å¡anas opcijas
 # ^DirSubCaption
-: Uzstâdîðanas mape
+: UzstÄ�dÄ«Å¡anas mape
 # ^InstallingSubCaption
-: Notiek uzstâdîðana
+: Notiek uzstÄ�dÄ«Å¡ana
 # ^CompletedSubCaption
-: Uzstâdîðana pabeigta.
+: UzstÄ�dÄ«Å¡ana pabeigta.
 # ^UnComponentsSubCaption
-: Atinstalçðanas opcijas
+: AtinstalÄ“Å¡anas opcijas
 # ^UnDirSubCaption
-: Atinstalçðanas mape
+: AtinstalÄ“Å¡anas mape
 # ^ConfirmSubCaption
-: Apstiprinâðana
+: ApstiprinÄ�Å¡ana
 # ^UninstallingSubCaption
-: Notiek atinstalçðana
+: Notiek atinstalÄ“Å¡ana
 # ^UnCompletedSubCaption
-: Atinstalçðana pabeigta
+: AtinstalÄ“Å¡ana pabeigta
 # ^BackBtn
-< &Atpakaï
+< &AtpakaÄ¼
 # ^NextBtn
-&Tâlâk >
+&TÄ�lÄ�k >
 # ^AgreeBtn
-Es &piekrîtu
+Es &piekrÄ«tu
 # ^AcceptBtn
-Es &piekrîtu licences lîguma noteikumiem
+Es &piekrÄ«tu licences lÄ«guma noteikumiem
 # ^DontAcceptBtn
-Es &nepiekrîtu licences lîguma noteikumiem
+Es &nepiekrÄ«tu licences lÄ«guma noteikumiem
 # ^InstallBtn
-&Uzstâdît
+&UzstÄ�dÄ«t
 # ^UninstallBtn
-&Atinstalçt
+&AtinstalÄ“t
 # ^CancelBtn
 Atcelt
 # ^CloseBtn
-Ai&zvçrt
+Ai&zvÄ“rt
 # ^BrowseBtn
-Pâ&rlûkot...
+PÄ�&rlÅ«kot...
 # ^ShowDetailsBtn
-Parâdît &detaïas
+ParÄ�dÄ«t &detaÄ¼as
 # ^ClickNext
-Spiediet 'Tâlâk', lai turpinâtu.
+Spiediet 'TÄ�lÄ�k', lai turpinÄ�tu.
 # ^ClickInstall
-Spiediet 'Uzstâdît', lai sâktu uzstâdîðanas procesu.
+Spiediet 'UzstÄ�dÄ«t', lai sÄ�ktu uzstÄ�dÄ«Å¡anas procesu.
 # ^ClickUninstall
-Spiediet 'Atinstalçt', lai sâktu atinstalçðanas procesu.
+Spiediet 'AtinstalÄ“t', lai sÄ�ktu atinstalÄ“Å¡anas procesu.
 # ^Name
-Vârds
+VÄ�rds
 # ^Completed
-Uzstâdîðana pabeigta
+UzstÄ�dÄ«Å¡ana pabeigta
 # ^LicenseText
-Lûdzu izlasiet licences lîgumu pirms '$(^NameDA)' uzstâdîðanas. Ja piekrîtat licences lîguma noteikumiem, tad spiediet 'Es piekrîtu'.
+LÅ«dzu izlasiet licences lÄ«gumu pirms '$(^NameDA)' uzstÄ�dÄ«Å¡anas. Ja piekrÄ«tat licences lÄ«guma noteikumiem, tad spiediet 'Es piekrÄ«tu'.
 # ^LicenseTextCB
-Lûdzu izlasiet licences lîgumu pirms '$(^NameDA)' uzstâdîðanas. Ja piekrîtat licences lîguma noteikumiem, tad atzîmçjiet izvçles rûtiòu. $_CLICK
+LÅ«dzu izlasiet licences lÄ«gumu pirms '$(^NameDA)' uzstÄ�dÄ«Å¡anas. Ja piekrÄ«tat licences lÄ«guma noteikumiem, tad atzÄ«mÄ“jiet izvÄ“les rÅ«tiÅ†u. $_CLICK
 # ^LicenseTextRB
-Lûdzu izlasiet licences lîgumu pirms '$(^NameDA)' uzstâdîðanas. Ja piekrîtat licences lîguma noteikumiem, tad izvçlieties pirmo zemâkesoðo opciju. $_CLICK
+LÅ«dzu izlasiet licences lÄ«gumu pirms '$(^NameDA)' uzstÄ�dÄ«Å¡anas. Ja piekrÄ«tat licences lÄ«guma noteikumiem, tad izvÄ“lieties pirmo zemÄ�kesoÅ¡o opciju. $_CLICK
 # ^UnLicenseText
-Lûdzu izlasiet licences lîgumu pirms '$(^NameDA)' atinstalçðanas. Ja piekrîtat licences lîguma noteikumiem, tad spiediet 'Es piekrîtu'.
+LÅ«dzu izlasiet licences lÄ«gumu pirms '$(^NameDA)' atinstalÄ“Å¡anas. Ja piekrÄ«tat licences lÄ«guma noteikumiem, tad spiediet 'Es piekrÄ«tu'.
 # ^UnLicenseTextCB
-Lûdzu izlasiet licences lîgumu pirms '$(^NameDA)' atinstalçðanas. Ja piekrîtat licences lîguma noteikumiem, tad atzîmçjiet izvçles rûtiòu. $_CLICK
+LÅ«dzu izlasiet licences lÄ«gumu pirms '$(^NameDA)' atinstalÄ“Å¡anas. Ja piekrÄ«tat licences lÄ«guma noteikumiem, tad atzÄ«mÄ“jiet izvÄ“les rÅ«tiÅ†u. $_CLICK
 # ^UnLicenseTextRB
-Lûdzu izlasiet licences lîgumu pirms '$(^NameDA)' atinstalçðanas. Ja piekrîtat licences lîguma noteikumiem, tad izvçlieties zemâkesoðo opciju. $_CLICK
+LÅ«dzu izlasiet licences lÄ«gumu pirms '$(^NameDA)' atinstalÄ“Å¡anas. Ja piekrÄ«tat licences lÄ«guma noteikumiem, tad izvÄ“lieties zemÄ�kesoÅ¡o opciju. $_CLICK
 # ^Custom
-Pielâgots
+PielÄ�gots
 # ^ComponentsText
-Izvçlieties, kurus komponentus vçlaties uzstâdît un neiezîmçjiet tos, kurus nevçlaties uzstâdît. $_CLICK
+IzvÄ“lieties, kurus komponentus vÄ“laties uzstÄ�dÄ«t un neiezÄ«mÄ“jiet tos, kurus nevÄ“laties uzstÄ�dÄ«t. $_CLICK
 # ^ComponentsSubText1
-Izvçlieties uzstâdîðanas veidu:
+IzvÄ“lieties uzstÄ�dÄ«Å¡anas veidu:
 # ^ComponentsSubText2_NoInstTypes
-Izvçlieties uzstâdâmos komponentus:
+IzvÄ“lieties uzstÄ�dÄ�mos komponentus:
 # ^ComponentsSubText2
-Vai arî – izvçlieties tikai nepiecieðamos komponentus, kurus vçlaties uzstâdît:
+Vai arÄ« â€“ izvÄ“lieties tikai nepiecieÅ¡amos komponentus, kurus vÄ“laties uzstÄ�dÄ«t:
 # ^UnComponentsText
-Izvçlieties, kurus komponentus atinstalçt un neiezîmçjiet tos, kurus nevçlaties atinstalçt. $_CLICK
+IzvÄ“lieties, kurus komponentus atinstalÄ“t un neiezÄ«mÄ“jiet tos, kurus nevÄ“laties atinstalÄ“t. $_CLICK
 # ^UnComponentsSubText1
-Izvçlieties atinstalçðanas veidu:
+IzvÄ“lieties atinstalÄ“Å¡anas veidu:
 # ^UnComponentsSubText2_NoInstTypes
-Izvçlieties atinstalçjamos komponentus:
+IzvÄ“lieties atinstalÄ“jamos komponentus:
 # ^UnComponentsSubText2
-Vai arî – izvçlieties tikai nepiecieðamos komponentus, kurus vçlaties atinstalçt:
+Vai arÄ« â€“ izvÄ“lieties tikai nepiecieÅ¡amos komponentus, kurus vÄ“laties atinstalÄ“t:
 # ^DirText
-'$(^NameDA)' tiks uzstâdîta ðajâ mapç. Lai to uzstâdîtu citâ mapç, nospiediet 'Pârlûkot' un izvçlieties citu mapi. $_CLICK
+'$(^NameDA)' tiks uzstÄ�dÄ«ta Å¡ajÄ� mapÄ“. Lai to uzstÄ�dÄ«tu citÄ� mapÄ“, nospiediet 'PÄ�rlÅ«kot' un izvÄ“lieties citu mapi. $_CLICK
 # ^DirSubText
-Uzstâdîðanas mape
+UzstÄ�dÄ«Å¡anas mape
 # ^DirBrowseText
-Izvçlieties mapi, kurâ uzstâdît '$(^NameDA)':
+IzvÄ“lieties mapi, kurÄ� uzstÄ�dÄ«t '$(^NameDA)':
 # ^UnDirText
-'$(^NameDA)' tiks atinstalçta no ðîs mapes. Lai to atinstalçtu no citas mapes, nospiediet 'Pârlûkot' un izvçlieties citu mapi. $_CLICK
+'$(^NameDA)' tiks atinstalÄ“ta no Å¡Ä«s mapes. Lai to atinstalÄ“tu no citas mapes, nospiediet 'PÄ�rlÅ«kot' un izvÄ“lieties citu mapi. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Izvçlieties mapi, no kuras atinstalçt '$(^NameDA)':
+IzvÄ“lieties mapi, no kuras atinstalÄ“t '$(^NameDA)':
 # ^SpaceAvailable
 "Pieejamais diska apjoms: "
 # ^SpaceRequired
-"Nepiecieðamais diska apjoms: "
+"NepiecieÅ¡amais diska apjoms: "
 # ^UninstallingText
-'$(^NameDA)' tiks atinstalçta no ðîs mapes. $_CLICK
+'$(^NameDA)' tiks atinstalÄ“ta no Å¡Ä«s mapes. $_CLICK
 # ^UninstallingSubText
-Atinstalçðana no:
+AtinstalÄ“Å¡ana no:
 # ^FileError
-Kïûda atverot failu rakstîðanai: \r\n\t"$0"\r\nNospiediet 'Atcelt', lai atceltu uzstâdîðanas procesu,\r\n'Mçìinât vçlreiz', lai atkârtoti mçìinâtu rakstît failâ vai\r\n'Ignorçt', lai izlaistu ðî faila uzstâdîðanu
+KÄ¼Å«da atverot failu rakstÄ«Å¡anai: \r\n\t"$0"\r\nNospiediet 'Atcelt', lai atceltu uzstÄ�dÄ«Å¡anas procesu,\r\n'MÄ“Ä£inÄ�t vÄ“lreiz', lai atkÄ�rtoti mÄ“Ä£inÄ�tu rakstÄ«t failÄ� vai\r\n'IgnorÄ“t', lai izlaistu Å¡Ä« faila uzstÄ�dÄ«Å¡anu
 # ^FileError_NoIgnore
-Kïûda atverot failu rakstîðanai: \r\n\t"$0"\r\nNospiediet 'Atcelt', lai pârtrauktu uzstâdîðanas procesu
+KÄ¼Å«da atverot failu rakstÄ«Å¡anai: \r\n\t"$0"\r\nNospiediet 'Atcelt', lai pÄ�rtrauktu uzstÄ�dÄ«Å¡anas procesu
 # ^CantWrite
-"Nevar ierakstît: "
+"Nevar ierakstÄ«t: "
 # ^CopyFailed
-Kopçðana neizdevâs
+KopÄ“Å¡ana neizdevÄ�s
 # ^CopyTo
-"Kopç uz "
+"KopÄ“ uz "
 # ^Registering
-"Reìistrç: "
+"ReÄ£istrÄ“: "
 # ^Unregistering
-"Atreìistrç: "
+"AtreÄ£istrÄ“: "
 # ^SymbolNotFound
 "Simbols nav atrasts: "
 # ^CouldNotLoad
-"Nav iespçjams ielâdçt: "
+"Nav iespÄ“jams ielÄ�dÄ“t: "
 # ^CreateFolder
 "Izveido mapi: "
 # ^CreateShortcut
-"Izveido saîsni: "
+"Izveido saÄ«sni: "
 # ^CreatedUninstaller
-"Izveidots atinstalçtâjs: "
+"Izveidots atinstalÄ“tÄ�js: "
 # ^Delete
-"Dzçð failu: "
+"DzÄ“Å¡ failu: "
 # ^DeleteOnReboot
-"Dzçst pçc pârstartçðanas: "
+"DzÄ“st pÄ“c pÄ�rstartÄ“Å¡anas: "
 # ^ErrorCreatingShortcut
-"Kïûda veidojot saîsni: "
+"KÄ¼Å«da veidojot saÄ«sni: "
 # ^ErrorCreating
-"Kïûda veidojot: "
+"KÄ¼Å«da veidojot: "
 # ^ErrorDecompressing
-Kïûda atkompresçjot datus! Bojâta instalâcija?
+KÄ¼Å«da atkompresÄ“jot datus! BojÄ�ta instalÄ�cija?
 # ^ErrorRegistering
-Kïûda reìistrçjot DLL failu
+KÄ¼Å«da reÄ£istrÄ“jot DLL failu
 # ^ExecShell
-"Izpilda èaulâ: "
+"Izpilda Ä�aulÄ�: "
 # ^Exec
 "Izpilda: "
 # ^Extract
-"Atspieþ: "
+"AtspieÅ¾: "
 # ^ErrorWriting
-"Atspieðana: kïûda rakstot failâ "
+"AtspieÅ¡ana: kÄ¼Å«da rakstot failÄ� "
 # ^InvalidOpcode
-Instalâcija bojâta: nederîgs CRC kods
+InstalÄ�cija bojÄ�ta: nederÄ«gs CRC kods
 # ^NoOLE
-"Nav OLE priekð: "
+"Nav OLE priekÅ¡: "
 # ^OutputFolder
 "Izvades mape: "
 # ^RemoveFolder
-"Dzçð mapi: "
+"DzÄ“Å¡ mapi: "
 # ^RenameOnReboot
-"Pârsaukt pçc pârstartçðanas: "
+"PÄ�rsaukt pÄ“c pÄ�rstartÄ“Å¡anas: "
 # ^Rename
-"Pârsaukt: "
+"PÄ�rsaukt: "
 # ^Skipped
 "Izlaists: "
 # ^CopyDetails
-Iekopçt detaïas starpliktuvç
+IekopÄ“t detaÄ¼as starpliktuvÄ“
 # ^LogInstall
-Ierakstît þurnâla failâ uzstâdîðanas procesu
+IerakstÄ«t Å¾urnÄ�la failÄ� uzstÄ�dÄ«Å¡anas procesu
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/ScotsGaelic.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/ScotsGaelic.nlf	(revision 0)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/ScotsGaelic.nlf	(revision 2956)
@@ -0,0 +1,191 @@
+ï»¿# Header, don't edit
+NLF v6
+# Start editing here
+# Language ID
+1169
+# Font and size - dash (-) means default
+-
+-
+# Codepage - dash (-) means ASCII code page
+1252
+# RTL - anything else than RTL means LTR
+-
+# Translation by GunChleoc
+# ^Branding
+Nullsoft Install System %s
+# ^SetupCaption
+Aâ€™ stÃ ladh $(^Name)
+# ^UninstallCaption
+Aâ€™ dÃ¬-stÃ ladh $(^Name)
+# ^LicenseSubCaption
+: Aonta ceadachais
+# ^ComponentsSubCaption
+: Roghainnean an stÃ laidh
+# ^DirSubCaption
+: Pasgan an stÃ laidh
+# ^InstallingSubCaption
+: â€™Ga stÃ ladh
+# ^CompletedSubCaption
+: Deiseil
+# ^UnComponentsSubCaption
+: Roghainnean an dÃ¬-stÃ laidh
+# ^UnDirSubCaption
+: Pasgan an dÃ¬-stÃ laidh
+# ^ConfirmSubCaption
+: Dearbhadh
+# ^UninstallingSubCaption
+: â€™Ga dhÃ¬-stÃ ladh
+# ^UnCompletedSubCaption
+: Deiseil
+# ^BackBtn
+< Air ai&s
+# ^NextBtn
+Air adha&rt >
+# ^AgreeBtn
+&Gabhaidh mi ris
+# ^AcceptBtn
+&Gabhaidh mi teirmichean an aonta cheadachais
+# ^DontAcceptBtn
+&DiÃ¹ltaidh mi teirmichean an aonta ceadachais
+# ^InstallBtn
+&StÃ laich
+# ^UninstallBtn
+&DÃ¬-stÃ laich
+# ^CancelBtn
+Sguir dheth
+# ^CloseBtn
+&DÃ¹in
+# ^BrowseBtn
+&RÃ¹raichâ€¦
+# ^ShowDetailsBtn
+&Mion-fhiosrachadh
+# ^ClickNext
+Briog air â€œAir adhartâ€� gus leantainn air adhart.
+# ^ClickInstall
+Briog air â€œStÃ laichâ€� gus tÃ²iseachadh air an stÃ ladh.
+# ^ClickUninstall
+Briog air â€œDÃ¬-stÃ laichâ€� gus tÃ²iseachadh air an dÃ¬-stÃ ladh.
+# ^Name
+Ainm
+# ^Completed
+Coileanta
+# ^LicenseText
+Feuch an doir thu sÃ¹il air an aonta cheadachais mus stÃ laich thu $(^NameDA). Ma ghabhas tu ris a h-uile teirm san aonta, briog air â€œGabhaidh mi risâ€�.
+# ^LicenseTextCB
+Feuch an doir thu sÃ¹il air an aonta cheadachais mus stÃ laich thu $(^NameDA). Ma ghabhas tu ris a h-uile teirm san aonta, cuir cromag sa bhogsa gu h-Ã¬osal. $_CLICK
+# ^LicenseTextRB
+Feuch an doir thu sÃ¹il air an aonta cheadachais mus stÃ laich thu $(^NameDA). Ma ghabhas tu ris a h-uile teirm san aonta, tagh aâ€™ chiad roghainn gu h-Ã¬osal. $_CLICK
+# ^UnLicenseText
+Feuch an doir thu sÃ¹il air an aonta cheadachais mus dÃ¬-stÃ laich thu $(^NameDA). Ma ghabhas tu ris a h-uile teirm san aonta, Briog air â€œGabhaidh mi risâ€�.
+# ^UnLicenseTextCB
+Feuch an doir thu sÃ¹il air an aonta cheadachais mus dÃ¬-stÃ laich thu $(^NameDA). Ma ghabhas tu ris a h-uile teirm san aonta, cuir cromag sa bhogsa gu h-Ã¬osal. $_CLICK
+# ^UnLicenseTextRB
+Feuch an doir thu sÃ¹il air an aonta cheadachais mus dÃ¬-stÃ laich thu $(^NameDA). Ma ghabhas tu ris a h-uile teirm san aonta, tagh aâ€™ chiad roghainn gu h-Ã¬osal. $_CLICK
+# ^Custom
+GnÃ thaichte
+# ^ComponentsText
+Thoir cromag ann am bogsaichean nan co-phÃ irtean a tha thu airson stÃ ladh is thoir air falbh i o bhogsaichean nan co-phÃ irtean nach eil thu ag iarraidh. $_CLICK
+# ^ComponentsSubText1
+Tagh an seÃ²rsa dhen stÃ ladh:
+# ^ComponentsSubText2_NoInstTypes
+Tagh na co-phÃ irtean a tha thu airson stÃ ladh:
+# ^ComponentsSubText2
+No tagh na co-phÃ irtean roghainneil a tha thu airson stÃ ladh:
+# ^UnComponentsText
+Thoir cromag ann am bogsaichean nan co-phÃ irtean a tha thu airson dÃ¬-stÃ ladh is thoir air falbh i o bhogsaichean nan co-phÃ irtean a tha thu airson cumail. $_CLICK
+# ^UnComponentsSubText1
+Tagh an seÃ²rsa dhen dÃ¬-stÃ ladh:
+# ^UnComponentsSubText2_NoInstTypes
+Tagh na co-phÃ irtean a tha thu airson dÃ¬-stÃ ladh:
+# ^UnComponentsSubText2
+No tagh na co-phÃ irtean roghainneil a tha thu airson dÃ¬-stÃ ladh:
+# ^DirText
+ThÃ¨id $(^NameDA) a stÃ ladh sa phasgan seo. Gus stÃ ladh ann am pasgan eile, briog air â€œRÃ¹raichâ€� is tagh pasgan eile. $_CLICK
+# ^DirSubText
+Pasgan-uidhe
+# ^DirBrowseText
+Tagh am pasgan san dÃ¨id $(^NameDA) a stÃ ladh:
+# ^UnDirText
+ThÃ¨id $(^NameDA) a dhÃ¬-stÃ ladh on phasgan seo. Gus dÃ¬-stÃ ladh o phasgan eile, briog air â€œRÃ¹raichâ€� is tagh pasgan eile. $_CLICK
+# ^UnDirSubText
+""
+# ^UnDirBrowseText
+Tagh am pasgan on a tha thu airson $(^NameDA) a dhÃ¬-stÃ ladh:
+# ^SpaceAvailable
+"Ã€ite ri fhaighinn: "
+# ^SpaceRequired
+"Ã€ite air a bheil feum: "
+# ^UninstallingText
+ThÃ¨id $(^NameDA) a dhÃ¬-stÃ ladh on phasgan seo. $_CLICK
+# ^UninstallingSubText
+â€™Ga dhÃ¬-stÃ ladh o:
+# ^FileError
+Thachair mearachd aâ€™ fosgladh an fhaidhle a chum sgrÃ¬obhaidh: \r\n\r\n$0\r\n\r\nBriog air â€œSguir dhethâ€� gus sgur dhen stÃ ladh, air\r\nâ€œFeuch ris a-rithistâ€� gus feuchainn ris a-rithist no air\r\nâ€œLeig seachadâ€� gus leum a ghearradh thairis air an fhaidhle seo.
+# ^FileError_NoIgnore
+Thachair mearachd aâ€™ fosgladh an fhaidhle seo a chum sgrÃ¬obhaidh: \r\n\r\n$0\r\n\r\nBriog air â€œFeuch ris a-rithistâ€� gus feuchainn ris a-rithist no air\r\nâ€œSguir dhethâ€� gus sgur dhen stÃ ladh.
+# ^CantWrite
+"Cha ghabh sgrÃ¬obhadh ann: "
+# ^CopyFailed
+Cha deach leinn lethbhreac dheth a dhÃ¨anamh
+# ^CopyTo
+"Cuir lethbhreac gu "
+# ^Registering
+"Aâ€™ clÃ radh: "
+# ^Unregistering
+"Aâ€™ neo-chlÃ radh: "
+# ^SymbolNotFound
+"Cha deach an samhla a lorg: "
+# ^CouldNotLoad
+"Cha bâ€™ urrainn dhuinn a luchdadh: "
+# ^CreateFolder
+"Cruthaich pasgan: "
+# ^CreateShortcut
+"Cruthaich ath-ghoirid: "
+# ^CreatedUninstaller
+"DÃ¬-stÃ laichear air a chruthachadh: "
+# ^Delete
+"Sguab Ã s dhan fhaidhle: "
+# ^DeleteOnReboot
+"Sguab Ã s leis an ath-thÃ²iseachadh: "
+# ^ErrorCreatingShortcut
+"Mearachd le cruthachadh na h-ath-ghoirid: "
+# ^ErrorCreating
+"Mearachd le cruthachadh: "
+# ^ErrorDecompressing
+Thachair mearachd aâ€™ dÃ¬-dhÃ¹mhlachadh an dÃ ta! â€™S dÃ²cha gu bheil an t-inneal-stÃ laidh coirbte.
+# ^ErrorRegistering
+Mearachd le clÃ radh DLL
+# ^ExecShell
+"ExecShell: "
+# ^Exec
+"Cuir Ã ithne an gnÃ¬omh: "
+# ^Extract
+"DÃ¬-dhÃ¹mhlaich: "
+# ^ErrorWriting
+"DÃ¬-dhÃ¹mhlachadh: mearachd aâ€™ sgrÃ¬obhadh gu faidhle "
+# ^InvalidOpcode
+StÃ laichear coirbte: opcode mÃ¬-dhligheach
+# ^NoOLE
+"Chan eil OLE ann airson: "
+# ^OutputFolder
+"Pasgan Ã s-chuir: "
+# ^RemoveFolder
+"Thoir pasgan air falbh: "
+# ^RenameOnReboot
+"Cuir ainm Ã¹r air leis an ath-thÃ²iseachadh: "
+# ^Rename
+"Cuir ainm Ã¹r air: "
+# ^Skipped
+"Air leum a ghearradh: "
+# ^CopyDetails
+Cuir lethbhreac dhen mhion-fhiosrachadh san stÃ²r-bhÃ²rd
+# ^LogInstall
+DÃ¨an loga dhen stÃ ladh
+# ^Byte
+B
+# ^Kilo
+ K
+# ^Mega
+ M
+# ^Giga
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/TradChinese.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/TradChinese.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/TradChinese.nsh	(revision 2956)
@@ -1,122 +1,131 @@
-;Language: 'Chinese (Traditional)' (1028)
-;Translator: Kii Ali <kiiali@cpatch.org>
-;Revision date: 2004-12-15
+ï»¿;Language: 'Chinese (Traditional)' (1028)
+;Translator: Kii Ali <kiiali@cpatch.org>, <kiiali@ms1.url.com.tw>, <kiiali@pchome.com.tw>
+;Translator: Walter Cheuk <wwycheuk@gmail.com>
+;Revision date: 2017-03-17
 
-!insertmacro LANGFILE "TradChinese" "Chinese (Traditional)"
+!insertmacro LANGFILE "TradChinese" "Chinese (Traditional)" "ä¸­æ–‡(ç¹�é«”)" "Hanyu (Fantizi)"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Åwªï¨Ï¥Î $(^NameDA) ¦w¸ËºëÆF"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "³o­ÓºëÆF±N«ü¤Þ§A§¹¦¨ $(^NameDA) ªº¦w¸Ë¶iµ{¡C$\r$\n$\r$\n¦b¶}©l¦w¸Ë¤§«e¡A«ØÄ³¥ýÃö³¬¨ä¥L©Ò¦³À³¥Îµ{¦¡¡C³o±N¤¹³\\¡u¦w¸Ëµ{¦¡¡v§ó·s«ü©wªº¨t²ÎÀÉ®×¡A¦Ó¤£»Ý­n­«·s±Ò°Ê§Aªº¹q¸£¡C$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "æ­¡è¿Žä½¿ç”¨ $(^NameDA) å®‰è£�ç²¾é�ˆ"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "æœ¬ç²¾é�ˆæœƒå¼•å°Žæ‚¨å®Œæˆ�å®‰è£� $(^NameDA)ã€‚$\r$\n$\r$\nåœ¨é–‹å§‹å®‰è£�ä¹‹å‰�ï¼Œå»ºè­°å…ˆé—œé–‰å…¶ä»–æ‰€æœ‰æ‡‰ç”¨ç¨‹å¼�ã€‚é€™å°‡å…�è¨±å®‰è£�ç¨‹å¼�æ›´æ–°ç›¸é—œçš„ç³»çµ±æª”æ¡ˆï¼Œè€Œä¸�éœ€è¦�é‡�æ–°å•Ÿå‹•é›»è…¦ã€‚$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Åwªï¨Ï¥Î $(^NameDA) ¸Ñ°£¦w¸ËºëÆF"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "³o­ÓºëÆF±N¥þµ{«ü¤Þ§A $(^NameDA) ªº¸Ñ°£¦w¸Ë¶iµ{¡C$\r$\n$\r$\n¦b¶}©l¸Ñ°£¦w¸Ë¤§«e¡A½T»{ $(^NameDA) ¨Ã¥¼°õ¦æ·í¤¤¡C$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "æ­¡è¿Žä½¿ç”¨ $(^NameDA) è§£é™¤å®‰è£�ç²¾é�ˆ"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "æœ¬ç²¾é�ˆæœƒå¼•å°Žæ‚¨è§£é™¤å®‰è£� $(^NameDA)ã€‚$\r$\n$\r$\nåœ¨é–‹å§‹è§£é™¤å®‰è£�ä¹‹å‰�ï¼Œè«‹ç¢ºèª� $(^NameDA) ä¸¦æœªæœ‰åŸ·è¡Œã€‚$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "±ÂÅv¨óÄ³"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "¦b¦w¸Ë $(^NameDA) ¤§«e¡A½ÐÀË¾\±ÂÅv±ø´Ú¡C"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "¦pªG§A±µ¨ü¨óÄ³¤¤ªº±ø´Ú¡A«ö¤@¤U [§Ú¦P·N(I)] Ä~Äò¦w¸Ë¡C¦pªG§A¿ï¨ú [¨ú®ø(C)] ¡A¦w¸Ëµ{¦¡±N·|Ãö³¬¡C¥²¶·­n±µ¨ü¨óÄ³¤~¯à¦w¸Ë $(^NameDA) ¡C"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "¦pªG§A±µ¨ü¨óÄ³¤¤ªº±ø´Ú¡A«ö¤@¤U¤U¤èªº¤Ä¿ï®Ø¡C¥²¶·­n±µ¨ü¨óÄ³¤~¯à¦w¸Ë $(^NameDA)¡C$_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "¦pªG§A±µ¨ü¨óÄ³¤¤ªº±ø´Ú¡A¿ï¾Ü¤U¤è²Ä¤@­Ó¿ï¶µ¡C¥²¶·­n±µ¨ü¨óÄ³¤~¯à¦w¸Ë $(^NameDA)¡C$_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "æŽˆæ¬Šå�”è­°"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "åœ¨å®‰è£� $(^NameDA) ä¹‹å‰�ï¼Œè«‹æª¢é–±æŽˆæ¬Šæ¢�æ¬¾ã€‚"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "å¦‚æžœæŽ¥å�—å�”è­°çš„æ¢�æ¬¾ï¼ŒæŒ‰ [æˆ‘å�Œæ„�(A)] ç¹¼çºŒå®‰è£�ã€‚å¿…é ˆè¦�æŽ¥å�—å�”è­°æ‰�èƒ½å®‰è£� $(^NameDA) ã€‚"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "å¦‚æžœæŽ¥å�—å�”è­°çš„æ¢�æ¬¾ï¼ŒæŒ‰ä¸‹æ–¹çš„å‹¾é�¸æ¡†ã€‚å¿…é ˆè¦�æŽ¥å�—å�”è­°æ‰�èƒ½å®‰è£� $(^NameDA)ã€‚$_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "å¦‚æžœæŽ¥å�—å�”è­°ä¸­çš„æ¢�æ¬¾ï¼Œé�¸æ“‡ä¸‹æ–¹ç¬¬ä¸€å€‹é�¸é …ã€‚å¿…é ˆè¦�æŽ¥å�—å�”è­°æ‰�èƒ½å®‰è£� $(^NameDA)ã€‚$_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "±ÂÅv¨óÄ³"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "¦b¸Ñ°£¦w¸Ë $(^NameDA) ¤§«e¡A½ÐÀË¾\±ÂÅv±ø´Ú¡C"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "¦pªG§A±µ¨ü¨óÄ³¤¤ªº±ø´Ú¡A«ö¤@¤U [§Ú¦P·N(I)] Ä~Äò¸Ñ°£¦w¸Ë¡C¦pªG§A¿ï¨ú [¨ú®ø(C)] ¡A¦w¸Ëµ{¦¡±N·|Ãö³¬¡C¥²¶·­n±µ¨ü¨óÄ³¤~¯à¸Ñ°£¦w¸Ë $(^NameDA) ¡C"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "¦pªG§A±µ¨ü¨óÄ³¤¤ªº±ø´Ú¡A«ö¤@¤U¤U¤èªº¤Ä¿ï®Ø¡C¥²¶·­n±µ¨ü¨óÄ³¤~¯à¸Ñ°£¦w¸Ë $(^NameDA)¡C$_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "¦pªG§A±µ¨ü¨óÄ³¤¤ªº±ø´Ú¡A¿ï¾Ü¤U¤è²Ä¤@­Ó¿ï¶µ¡C¥²¶·­n±µ¨ü¨óÄ³¤~¯à¸Ñ°£¦w¸Ë $(^NameDA)¡C$_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "æŽˆæ¬Šå�”è­°"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "åœ¨è§£é™¤å®‰è£� $(^NameDA) ä¹‹å‰�ï¼Œè«‹æª¢é–±æŽˆæ¬Šæ¢�æ¬¾ã€‚"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "å¦‚æžœæŽ¥å�—å�”è­°çš„æ¢�æ¬¾ï¼ŒæŒ‰ [æˆ‘å�Œæ„�(A)] ç¹¼çºŒè§£é™¤å®‰è£�ã€‚å¦‚æžœé�¸å�– [å�–æ¶ˆ] ï¼Œå®‰è£�ç¨‹å¼�æœƒé—œé–‰ã€‚å¿…é ˆè¦�æŽ¥å�—å�”è­°æ‰�èƒ½è§£é™¤å®‰è£� $(^NameDA) ã€‚"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "å¦‚æžœæŽ¥å�—å�”è­°çš„æ¢�æ¬¾ï¼ŒæŒ‰ä¸‹æ–¹çš„å‹¾é�¸æ¡†ã€‚å¿…é ˆè¦�æŽ¥å�—å�”è­°æ‰�èƒ½è§£é™¤å®‰è£� $(^NameDA)ã€‚$_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "å¦‚æžœæŽ¥å�—å�”è­°çš„æ¢�æ¬¾ï¼Œé�¸æ“‡ä¸‹æ–¹ç¬¬ä¸€å€‹é�¸é …ã€‚å¿…é ˆè¦�æŽ¥å�—å�”è­°æ‰�èƒ½è§£é™¤å®‰è£� $(^NameDA)ã€‚$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "ÀË¾\¨óÄ³ªº¨ä¾l³¡¤À¡A½Ð«ö [PgDn] ©¹¤U±²°Ê­¶­±¡C"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "æª¢é–±å�”è­°çš„å…¶é¤˜éƒ¨åˆ†ï¼ŒæŒ‰ [PgDn] å¾€ä¸‹æ�²å‹•é �é�¢ã€‚"
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "¿ï¾Ü¤¸¥ó"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "¿ï¾Ü§A·Q­n¦w¸Ë $(^NameDA) ªº¨º¨Ç¥\¯à¡C"
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "é�¸æ“‡å…ƒä»¶"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "é�¸æ“‡æƒ³è¦�å®‰è£� $(^NameDA) çš„åŠŸèƒ½ã€‚"
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "¿ï¨ú¤¸¥ó"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "¿ï¨ú $(^NameDA) ·í¤¤§A·Q­n¸Ñ°£¦w¸Ëªº¥\¯à¡C"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "é�¸å�–å…ƒä»¶"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "é�¸å�– $(^NameDA) ç•¶ä¸­æƒ³è¦�è§£é™¤çš„åŠŸèƒ½ã€‚"
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "´y­z"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "èªªæ˜Ž"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "²¾°Ê§Aªº·Æ¹««ü¼Ð¨ì¤¸¥ó¤§¤W¡A«K¥i¨£¨ì¥¦ªº´y­z¡C"
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "å°‡æ»‘é¼ æŒ‡æ¨™å�œæ‡¸åˆ°å…ƒä»¶ä¹‹ä¸Šï¼Œå�³å�¯è¦‹åˆ°å…¶èªªæ˜Žã€‚"
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "²¾°Ê§Aªº·Æ¹««ü¼Ð¨ì¤¸¥ó¤§¤W¡A«K¥i¨£¨ì¥¦ªº´y­z¡C"
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "é�¸å�–å…ƒä»¶ï¼Œå�³å�¯è¦‹åˆ°å…¶èªªæ˜Žã€‚"
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "¿ï¨ú¦w¸Ë¦ì¸m"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "¿ï¨ú $(^NameDA) ­n¦w¸Ëªº¸ê®Æ§¨¡C"
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "é�¸å�–å®‰è£�ä½�ç½®"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "é�¸å�– $(^NameDA) è¦�å®‰è£�çš„è³‡æ–™å¤¾ã€‚"
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "¿ï¨ú¸Ñ°£¦w¸Ë¦ì¸m"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "¿ï¨ú $(^NameDA) ­n¸Ñ°£¦w¸Ëªº¸ê®Æ§¨¡C"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "é�¸å�–è§£é™¤å®‰è£�ä½�ç½®"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "é�¸å�– $(^NameDA) è¦�è§£é™¤å®‰è£�çš„è³‡æ–™å¤¾ã€‚"
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "¥¿¦b¦w¸Ë"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "$(^NameDA) ¥¿¦b¦w¸Ë¡A½Ðµ¥­Ô¡C"
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "¦w¸Ë§¹¦¨"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "¦w¸Ëµ{¦¡¤w¦¨¥\¦a°õ¦æ§¹¦¨¡C"
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "¦w¸Ë¤v¤¤¤î"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "¦w¸Ëµ{¦¡¨Ã¥¼¦¨¥\¦a°õ¦æ§¹¦¨¡C"
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "å®‰è£�"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "$(^NameDA) æ­£åœ¨å®‰è£�ï¼Œè«‹ç¨�å€™ã€‚"
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "å®Œæˆ�å®‰è£�"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "å®‰è£�å·²å®Œæˆ�ã€‚"
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "å·²ä¸­æ­¢å®‰è£�"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "å®‰è£�ä¸¦æœªå®Œæˆ�ã€‚"
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "¥¿¦b¸Ñ°£¦w¸Ë"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "$(^NameDA) ¥¿¦b¸Ñ°£¦w¸Ë¡A½Ðµ¥­Ô¡C"
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "¸Ñ°£¦w¸Ë¤w§¹¦¨"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "¸Ñ°£¦w¸Ëµ{¦¡¤w¦¨¥\¦a°õ¦æ§¹¦¨¡C"
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "¸Ñ°£¦w¸Ë¤w¤¤¤î"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "¸Ñ°£¦w¸Ëµ{¦¡¨Ã¥¼¦¨¥\¦a°õ¦æ§¹¦¨¡C"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "è§£é™¤å®‰è£�"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "$(^NameDA) æ­£åœ¨è§£é™¤å®‰è£�ï¼Œè«‹ç¨�å€™ã€‚"
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "å®Œæˆ�è§£é™¤å®‰è£�"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "è§£é™¤å®‰è£�å·²å®Œæˆ�ã€‚"
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "å·²ä¸­æ­¢è§£é™¤å®‰è£�"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "è§£é™¤å®‰è£�ä¸¦æœªå®Œæˆ�ã€‚"
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "¥¿¦b§¹¦¨ $(^NameDA) ¦w¸ËºëÆF"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) ¤w¦w¸Ë¦b§Aªº¨t²Î¡C$\r$\n«ö¤@¤U [§¹¦¨(F)] Ãö³¬¦¹ºëÆF¡C"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "§Aªº¨t²Î»Ý­n­«·s±Ò°Ê¡A¥H«K§¹¦¨ $(^NameDA) ªº¦w¸Ë¡C²{¦b­n­«·s±Ò°Ê¶Ü¡H"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "å�³å°‡å®Œæˆ�å®‰è£� $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "å·²åœ¨é›»è…¦å®‰è£� $(^NameDA) ã€‚$\r$\næŒ‰ [å®Œæˆ�(F)] é—œé–‰å®‰è£�ç¨‹å¼�ã€‚"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "é›»è…¦éœ€è¦�é‡�æ–°é–‹æ©Ÿï¼Œæ‰�èƒ½å®Œæˆ�å®‰è£� $(^NameDA) ã€‚è¦�é¦¬ä¸Šé‡�æ–°é–‹æ©Ÿå—Žï¼Ÿ"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "¥¿¦b§¹¦¨ $(^NameDA) ¸Ñ°£¦w¸ËºëÆF"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) ¤w±q§Aªº¹q¸£¸Ñ°£¦w¸Ë¡C$\r$\n$\r$\n«ö¤@¤U [§¹¦¨] Ãö³¬³o­ÓºëÆF¡C"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "¹q¸£»Ý­n­«·s±Ò°Ê¡A¥H«K§¹¦¨ $(^NameDA) ªº¸Ñ°£¦w¸Ë¡C²{¦b·Q­n­«·s±Ò°Ê¶Ü¡H"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "å�³å°‡å®Œæˆ�è§£é™¤å®‰è£� $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "å·²è‡ªé›»è…¦è§£é™¤å®‰è£� $(^NameDA) ã€‚$\r$\n$\r$\næŒ‰ [å®Œæˆ�(F)] é—œé–‰å®‰è£�ç¨‹å¼�ã€‚"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "é›»è…¦éœ€è¦�é‡�æ–°é–‹æ©Ÿï¼Œæ‰�èƒ½å®Œæˆ�è§£é™¤å®‰è£� $(^NameDA) ã€‚è¦�é¦¬ä¸Šé‡�æ–°é–‹æ©Ÿå—Žï¼Ÿ"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "¬O¡A²{¦b­«·s±Ò°Ê(&Y)"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "§_¡A§Úµy«á¦A¦Û¦æ­«·s±Ò°Ê(&N)"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "°õ¦æ $(^NameDA)(&R)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Åã¥Ü¡uÅª§ÚÀÉ®×¡v(&M)"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "§¹¦¨(&F)"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "æ˜¯ï¼Œé¦¬ä¸Šé‡�æ–°é–‹æ©Ÿ(&Y)"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "å�¦ï¼Œæˆ‘ç¨�å¾Œå†�è‡ªè¡Œé‡�æ–°é–‹æ©Ÿ(&N)"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "åŸ·è¡Œ $(^NameDA)(&R)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "é¡¯ç¤ºã€Œè®€æˆ‘æª”æ¡ˆã€�(&S)"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "å®Œæˆ�(&F)"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "¿ï¾Ü¡u¶}©l¥\¯àªí¡v¸ê®Æ§¨"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "¿ï¾Ü¡u¶}©l¥\¯àªí¡v¸ê®Æ§¨¡A¥Î©óµ{¦¡ªº±¶®|¡C"
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "¿ï¾Ü¡u¶}©l¥\¯àªí¡v¸ê®Æ§¨¡A¥H«K«Ø¥ßµ{¦¡ªº±¶®|¡C§A¤]¥i¥H¿é¤J¦WºÙ¡A«Ø¥ß·s¸ê®Æ§¨¡C"
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "¤£­n«Ø¥ß±¶®|(&N)"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "é�¸æ“‡ã€Œé–‹å§‹åŠŸèƒ½è¡¨ã€�è³‡æ–™å¤¾"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "é�¸æ“‡ã€Œé–‹å§‹åŠŸèƒ½è¡¨ã€�è³‡æ–™å¤¾ï¼Œç”¨æ–¼ç¨‹å¼�çš„æ�·å¾‘ã€‚"
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "é�¸æ“‡ã€Œé–‹å§‹åŠŸèƒ½è¡¨ã€�è³‡æ–™å¤¾ï¼Œä»¥ä¾¿å»ºç«‹ç¨‹å¼�çš„æ�·å¾‘ã€‚ä½ ä¹Ÿå�¯ä»¥è¼¸å…¥å��ç¨±ï¼Œå»ºç«‹æ–°è³‡æ–™å¤¾ã€‚"
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "ä¸�è¦�å»ºç«‹æ�·å¾‘(&N)"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "¸Ñ°£¦w¸Ë $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "±q§Aªº¹q¸£¸Ñ°£¦w¸Ë $(^NameDA) ¡C"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "è§£é™¤å®‰è£� $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "è‡ªé›»è…¦è§£é™¤å®‰è£� $(^NameDA) ã€‚"
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "§A½T©w­nÂ÷¶} $(^Name) ¦w¸Ëµ{¦¡¡H"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "ç¢ºå®šè¦�çµ�æ�Ÿ $(^Name) çš„å®‰è£�ç¨‹å¼�å—Žï¼Ÿ"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "§A½T©w­nÂ÷¶} $(^Name) ¸Ñ°£¦w¸Ë¶Ü¡H"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "ç¢ºå®šè¦�çµ�æ�Ÿ $(^Name) çš„è§£é™¤å®‰è£�ç¨‹å¼�å—Žï¼Ÿ"
 !endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "é�¸æ“‡ä½¿ç”¨è€…"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "é�¸æ“‡è¦�å°‡ $(^NameDA) å®‰è£�çµ¦å“ªä½�ä½¿ç”¨è€…ã€‚"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "é�¸æ“‡åƒ…å°‡ $(^NameDA) å®‰è£�çµ¦è‡ªå·±ä½¿ç”¨ï¼Œé‚„æ˜¯æ­¤é›»è…¦çš„æ‰€æœ‰ä½¿ç”¨è€…çš†å�¯ä½¿ç”¨ã€‚ $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "å®‰è£�çµ¦æ­¤é›»è…¦çš„æ‰€æœ‰ä½¿ç”¨è€…"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "åƒ…å®‰è£�çµ¦è‡ªå·±"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Norwegian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Norwegian.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Norwegian.nsh	(revision 2956)
@@ -1,54 +1,54 @@
-;Language: Norwegian (2068)
-;By Jonas Lindsrøm (jonasc_88@hotmail.com) Reviewed and fixed by Jan Ivar Beddari, d0der at online.no
+ï»¿;Language: Norwegian (2068)
+;By Jonas LindsrÃ¸m (jonasc_88@hotmail.com) Reviewed and fixed by Jan Ivar Beddari, d0der at online.no
 
-!insertmacro LANGFILE "Norwegian" "Norwegian"
+!insertmacro LANGFILE "Norwegian" = "Norsk" =
 
 !ifdef MUI_WELCOMEPAGE
   ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Velkommen til veiviseren for installasjon av $(^NameDA) "
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Denne veiviseren vil lede deg gjennom installasjonen av $(^NameDA).$\r$\n$\r$\nDet anbefales at du avslutter alle andre programmer før du fortsetter. Dette vil la installasjonsprogrammet forandre på systemfiler uten at du må starte datamaskinen på nytt.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Denne veiviseren vil lede deg gjennom installasjonen av $(^NameDA).$\r$\n$\r$\nDet anbefales at du avslutter alle andre programmer fÃ¸r du fortsetter. Dette vil la installasjonsprogrammet forandre pÃ¥ systemfiler uten at du mÃ¥ starte datamaskinen pÃ¥ nytt.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
   ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Velkommen til veiviseren for avinstallasjon av $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Denne veiviseren vil lede deg gjennom avinstallasjonen av $(^NameDA).$\r$\n$\r$\nFør du fortsetter må du forsikre deg om at $(^NameDA) ikke kjører.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Denne veiviseren vil lede deg gjennom avinstallasjonen av $(^NameDA).$\r$\n$\r$\nFÃ¸r du fortsetter mÃ¥ du forsikre deg om at $(^NameDA) ikke kjÃ¸rer.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
   ${LangFileString} MUI_TEXT_LICENSE_TITLE "Lisensavtale"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Vennligst les gjennom lisensavtalen før du starter installasjonen av $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Hvis du godtar lisensavtalen trykk Godta for å fortsette. Du må godta lisensavtalen for å installere $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Hvis du godtar lisensavtalen, kryss av på merket under. Du må godta lisensavtalen for å installere $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Hvis du godtar lisensavtalen, velg det første alternativet ovenfor. Du må godta lisensavtalen for å installere $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Vennligst les gjennom lisensavtalen fÃ¸r du starter installasjonen av $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Hvis du godtar lisensavtalen trykk Godta for Ã¥ fortsette. Du mÃ¥ godta lisensavtalen for Ã¥ installere $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Hvis du godtar lisensavtalen, kryss av pÃ¥ merket under. Du mÃ¥ godta lisensavtalen for Ã¥ installere $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Hvis du godtar lisensavtalen, velg det fÃ¸rste alternativet ovenfor. Du mÃ¥ godta lisensavtalen for Ã¥ installere $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
   ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Lisensavtale"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Vennligst les gjennom lisensavtalen før du avinstallerer $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Hvis du godtar lisensavtalen trykk Godta for å fortsette.  Du må godta lisensavtalen for å avintallere $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Hvis du godtar lisensavtalen, kryss av på merket under. Du må godta lisensavtalen for å avinstallere $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Hvis du godtar lisensavtalen, velg det første alternativet ovenfor. Du må godta lisensavtalen for å avinstallere $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Vennligst les gjennom lisensavtalen fÃ¸r du avinstallerer $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Hvis du godtar lisensavtalen trykk Godta for Ã¥ fortsette.  Du mÃ¥ godta lisensavtalen for Ã¥ avintallere $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Hvis du godtar lisensavtalen, kryss av pÃ¥ merket under. Du mÃ¥ godta lisensavtalen for Ã¥ avinstallere $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Hvis du godtar lisensavtalen, velg det fÃ¸rste alternativet ovenfor. Du mÃ¥ godta lisensavtalen for Ã¥ avinstallere $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Trykk Page Down knappen for å se resten av lisensavtalen."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Trykk Page Down knappen for Ã¥ se resten av lisensavtalen."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
   ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Velg komponenter"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Velg hvilke deler av $(^NameDA) du ønsker å installere."
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Velg hvilke deler av $(^NameDA) du Ã¸nsker Ã¥ installere."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Velg komponenter"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Velg hvilke deler av $(^NameDA) du ønsker å avinstallere."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Velg hvilke deler av $(^NameDA) du Ã¸nsker Ã¥ avinstallere."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Beskrivelse"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Beveg musen over komponentene for å se beskrivelsen."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Beveg musen over komponentene for Ã¥ se beskrivelsen."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Beveg musen over komponentene for å se beskrivelsen."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Velg en komponent for Ã¥ se beskrivelsen."
   !endif
 !endif
 
@@ -63,47 +63,47 @@
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Installasjonen pågår"
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Installasjonen pÃ¥gÃ¥r"
   ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Vennligst vent mens $(^NameDA) blir installert."
   ${LangFileString} MUI_TEXT_FINISH_TITLE "Installasjonen er ferdig"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Installasjonen ble fullført uten feil."
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Installasjonen ble fullfÃ¸rt uten feil."
   ${LangFileString} MUI_TEXT_ABORT_TITLE "Installasjonen er avbrutt"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Installasjonen ble ikke fullført riktig."
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Installasjonen ble ikke fullfÃ¸rt riktig."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Avinstallasjon pågår"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Avinstallasjon pÃ¥gÃ¥r"
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Vennligst vent mens $(^NameDA) blir avinstallert."
   ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Avinstallasjon ferdig"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Avinstallasjonen ble utført uten feil."
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Avinstallasjonen ble utfÃ¸rt uten feil."
   ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Avinstallasjon avbrutt"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Avinstallasjonen ble ikke utført riktig."
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Avinstallasjonen ble ikke utfÃ¸rt riktig."
 !endif
 
 !ifdef MUI_FINISHPAGE
   ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Avslutter $(^NameDA) installasjonsveiviser"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) er klart til bruk på din datamskin.$\r$\n$\r$\nTrykk Ferdig for å avslutte installasjonsprogrammet."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Du må starte datamaskinen på nytt for å fullføre installasjonen av $(^NameDA). Vil du starte datamaskinen på nytt nå?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) er klart til bruk pÃ¥ din datamskin.$\r$\n$\r$\nTrykk Ferdig for Ã¥ avslutte installasjonsprogrammet."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Du mÃ¥ starte datamaskinen pÃ¥ nytt for Ã¥ fullfÃ¸re installasjonen av $(^NameDA). Vil du starte datamaskinen pÃ¥ nytt nÃ¥?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Fullfører avinstallasjonen av $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) har blitt avinstallert fra din datamaskin.$\r$\n$\r$\nTrykk på ferdig for å avslutte denne veiviseren."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Datamaskinen må starte på nytt for å fullføre avinstallasjonen av $(^NameDA). Vil du starte datamaskinen på nytt nå?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "FullfÃ¸rer avinstallasjonen av $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) har blitt avinstallert fra din datamaskin.$\r$\n$\r$\nTrykk pÃ¥ ferdig for Ã¥ avslutte denne veiviseren."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Datamaskinen mÃ¥ starte pÃ¥ nytt for Ã¥ fullfÃ¸re avinstallasjonen av $(^NameDA). Vil du starte datamaskinen pÃ¥ nytt nÃ¥?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ja. Start datamaskinen på nytt nå"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Nei. Jeg vil starte datamaskinen på nytt senere"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "&Kjør $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ja. Start datamaskinen pÃ¥ nytt nÃ¥"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Nei. Jeg vil starte datamaskinen pÃ¥ nytt senere"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&KjÃ¸r $(^NameDA)"
   ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Vis Readme filen"
   ${LangFileString} MUI_BUTTONTEXT_FINISH "&Ferdig"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Velg plassering på startmenyen"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Velg plassering pÃ¥ startmenyen"
   ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Velg hvilken mappe snarveiene til $(^NameDA) skal ligge i."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Velg mappe for snarveiene til programmet. Du kan også skrive inn et nytt navn for å lage en ny mappe."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Velg mappe for snarveiene til programmet. Du kan ogsÃ¥ skrive inn et nytt navn for Ã¥ lage en ny mappe."
   ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ikke lag snarveier"
 !endif
 
@@ -113,9 +113,17 @@
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Er du sikker på at du vil avslutte installasjonen av $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Er du sikker pÃ¥ at du vil avslutte installasjonen av $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Er du sikker på at du vil avbryte avinstallasjonen av $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Er du sikker pÃ¥ at du vil avbryte avinstallasjonen av $(^Name)?"
 !endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Velg brukere"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Velg hvilke brukere du vil installere $(^NameDA) for."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Velg om du vil installere $(^NameDA) bare for deg selv, eller for alle som bruker denne maskinen. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Installer for alle som bruker denne maskinen"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Installer bare for meg"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Georgian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Georgian.nsh	(revision 0)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Georgian.nsh	(revision 2956)
@@ -0,0 +1,121 @@
+ï»¿;Language: Georgian (1079)
+;Translation by David Huriev and format updated by Jim Park
+
+!insertmacro LANGFILE "Georgian" = "áƒ¥áƒ�áƒ áƒ—áƒ£áƒšáƒ˜" "Kartuli"
+
+!ifdef MUI_WELCOMEPAGE
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "áƒ›áƒ�áƒ’áƒ”áƒ¡áƒ�áƒšáƒ›áƒ”áƒ‘áƒ�áƒ— $(^NameDA)â€“áƒ˜áƒ¡ áƒ¡áƒ�áƒ˜áƒœáƒ¡áƒ¢áƒ�áƒšáƒ�áƒªáƒ˜áƒ� áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ�"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "áƒ”áƒ¡ áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ� áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ�áƒ•áƒ¡ $(^NameDA)â€“áƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒ™áƒ�áƒ›áƒžáƒ˜áƒ£áƒ¢áƒ”áƒ áƒ¨áƒ˜.$\r$\n$\r$\náƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ�áƒ›áƒ“áƒ” áƒ áƒ”áƒ™áƒ�áƒ›áƒ”áƒœáƒ“áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ� áƒ§áƒ•áƒ”áƒšáƒ� áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ˜áƒ¡ áƒ“áƒ�áƒ®áƒ£áƒ áƒ•áƒ�. áƒ�áƒ› áƒ¨áƒ”áƒ›áƒ—áƒ®áƒ•áƒ”áƒ•áƒ�áƒ¨áƒ˜ áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ� áƒ¡áƒ˜áƒ¡áƒ¢áƒ”áƒ›áƒ£áƒ  áƒ¤áƒ�áƒ˜áƒšáƒ”áƒ‘áƒ¡ áƒ˜áƒ¡áƒ” áƒ¨áƒ”áƒªáƒ•áƒšáƒ˜áƒ¡, áƒ áƒ�áƒ› áƒ™áƒ�áƒ›áƒžáƒ˜áƒ£áƒ¢áƒ”áƒ áƒ¡ áƒ’áƒ�áƒ“áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ� áƒ�áƒ  áƒ“áƒ�áƒ¡áƒ­áƒ˜áƒ áƒ“áƒ”áƒ‘áƒ�.$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_UNWELCOMEPAGE
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "áƒ›áƒ�áƒ’áƒ”áƒ¡áƒ�áƒšáƒ›áƒ”áƒ‘áƒ�áƒ— $(^NameDA)â€“áƒ˜áƒ¡ áƒ“áƒ”áƒ˜áƒœáƒ¡áƒ¢áƒ�áƒšáƒ�áƒªáƒ˜áƒ˜áƒ¡ áƒ¤áƒ�áƒœáƒ¯áƒ�áƒ áƒ�"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "áƒ”áƒ¡ áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ� áƒ¬áƒ�áƒ¨áƒšáƒ˜áƒ¡ $(^NameDA)â€“áƒ¡ áƒ™áƒ�áƒ›áƒžáƒ˜áƒ£áƒ¢áƒ”áƒ áƒ˜áƒ“áƒ�áƒœ.$\r$\n$\r$\náƒ¬áƒ�áƒ¨áƒšáƒ�áƒ›áƒ“áƒ” áƒ“áƒ�áƒ®áƒ£áƒ áƒ”áƒ— áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ� $(^NameDA).$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "áƒ¡áƒ�áƒšáƒ˜áƒªáƒ”áƒœáƒ–áƒ˜áƒ� áƒ¨áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ�"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "áƒ¡áƒ�áƒœáƒ�áƒ› $(^NameDA)â€“áƒ¡ áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ�áƒ•áƒ— áƒ’áƒ�áƒ”áƒªáƒ�áƒœáƒ˜áƒ— áƒ¡áƒ�áƒšáƒ˜áƒªáƒ”áƒœáƒ–áƒ˜áƒ� áƒ¨áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ�áƒ¡."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "áƒ—áƒ£ áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ˜áƒ— áƒžáƒ˜áƒ áƒ�áƒ‘áƒ”áƒ‘áƒ¡, áƒ“áƒ�áƒ�áƒ¬áƒ™áƒ�áƒžáƒ£áƒœáƒ”áƒ— áƒ¦áƒ˜áƒšáƒ�áƒ™áƒ–áƒ” $\"áƒ•áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ˜$\". áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ˜áƒ¡ áƒ©áƒ�áƒ¡áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ�áƒ“ áƒ�áƒ£áƒªáƒ˜áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜áƒ� áƒ“áƒ�áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ�."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "áƒ—áƒ£ áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ˜áƒ— áƒžáƒ˜áƒ áƒ�áƒ‘áƒ”áƒ‘áƒ¡, áƒ›áƒ�áƒœáƒ˜áƒ¨áƒœáƒ”áƒ— áƒ¤áƒ�áƒœáƒ¯áƒ�áƒ áƒ� áƒ¥áƒ•áƒ”áƒ›áƒ�áƒ—. $(^NameDA)â€“áƒ˜áƒ¡ áƒ©áƒ�áƒ¡áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ�áƒ“ áƒ�áƒ£áƒªáƒ˜áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜áƒ� áƒžáƒ˜áƒ áƒ�áƒ‘áƒ”áƒ‘áƒ–áƒ” áƒ“áƒ�áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ�. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "áƒ—áƒ£ áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ˜áƒ— áƒžáƒ˜áƒ áƒ�áƒ‘áƒ”áƒ‘áƒ¡ áƒ›áƒ�áƒœáƒ˜áƒ¨áƒœáƒ”áƒ— áƒ¥áƒ•áƒ”áƒ›áƒ�áƒ— áƒ›áƒ�áƒªáƒ”áƒ›áƒ£áƒšáƒ˜ áƒžáƒ˜áƒ áƒ•áƒ”áƒšáƒ˜ áƒ•áƒ�áƒ áƒ˜áƒ�áƒœáƒ¢áƒ˜. $(^NameDA)â€“áƒ˜áƒ¡ áƒ©áƒ�áƒ¡áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ�áƒ“ áƒ�áƒ£áƒªáƒ˜áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜áƒ� áƒžáƒ˜áƒ áƒ�áƒ‘áƒ”áƒ‘áƒ–áƒ” áƒ“áƒ�áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ�. $_CLICK"
+!endif
+
+!ifdef MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "áƒ¡áƒ�áƒšáƒ˜áƒªáƒ”áƒœáƒ–áƒ˜áƒ� áƒ¨áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ�"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "áƒ¡áƒ�áƒœáƒ�áƒ› áƒ¬áƒ�áƒ¨áƒšáƒ˜áƒ— $(^NameDA)â€“áƒ¡ áƒ’áƒ�áƒ”áƒªáƒ�áƒœáƒ˜áƒ— áƒ¡áƒ�áƒšáƒ˜áƒªáƒ”áƒœáƒ–áƒ˜áƒ� áƒ¨áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ�áƒ¡."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "áƒ—áƒ£ áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ˜áƒ— áƒžáƒ˜áƒ áƒ�áƒ‘áƒ”áƒ‘áƒ¡ áƒ“áƒ�áƒ�áƒ¬áƒ™áƒ�áƒžáƒ£áƒœáƒ”áƒ— áƒ¦áƒ˜áƒšáƒ�áƒ™áƒ–áƒ” $\"áƒ—áƒ�áƒœáƒ®áƒ›áƒ�áƒ‘áƒ�$\". $(^NameDA)â€“áƒ˜áƒ¡ áƒ¬áƒ�áƒ¡áƒ�áƒ¨áƒšáƒ”áƒšáƒ�áƒ“ áƒ¡áƒ�áƒ­áƒ˜áƒ áƒ�áƒ� áƒžáƒ˜áƒ áƒ�áƒ”áƒ‘áƒ”áƒ‘áƒ–áƒ” áƒ“áƒ�áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ�. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "áƒ—áƒ£ áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ˜áƒ— áƒžáƒ˜áƒ áƒ�áƒ‘áƒ”áƒ‘áƒ¡ áƒ›áƒ�áƒœáƒ˜áƒ¨áƒœáƒ”áƒ— áƒ¤áƒ�áƒœáƒ¯áƒ�áƒ áƒ� áƒ¥áƒ•áƒ”áƒ›áƒ�áƒ—. $(^NameDA)â€“áƒ¡ áƒ¬áƒ�áƒ¡áƒ�áƒ¨áƒšáƒ”áƒšáƒ�áƒ“ áƒ¡áƒ�áƒ­áƒ˜áƒ áƒ�áƒ� áƒžáƒ˜áƒ áƒ�áƒ”áƒ‘áƒ”áƒ‘áƒ–áƒ” áƒ“áƒ�áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ�. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "áƒ—áƒ£ áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ˜áƒ— áƒžáƒ˜áƒ áƒ�áƒ‘áƒ”áƒ‘áƒ¡ áƒ›áƒ�áƒœáƒ˜áƒ¨áƒœáƒ”áƒ— áƒ¥áƒ•áƒ”áƒ›áƒ�áƒ— áƒ›áƒ�áƒªáƒ”áƒ›áƒ£áƒšáƒ˜ áƒžáƒ˜áƒ áƒ•áƒ”áƒšáƒ˜ áƒ•áƒ�áƒ áƒ˜áƒ�áƒœáƒ¢áƒ˜. $(^NameDA)â€“áƒ¡ áƒ¬áƒ�áƒ¡áƒ�áƒ¨áƒšáƒ”áƒšáƒ�áƒ“ áƒ¡áƒ�áƒ­áƒ˜áƒ áƒ�áƒ� áƒžáƒ˜áƒ áƒ�áƒ”áƒ‘áƒ”áƒ‘áƒ–áƒ” áƒ“áƒ�áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ�. $_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "áƒ¢áƒ”áƒ¥áƒ¡áƒ¢áƒ˜áƒ¡ áƒ¬áƒ�áƒ¡áƒ�áƒ™áƒ˜áƒ—áƒ®áƒ�áƒ“ áƒ’áƒ�áƒ›áƒ�áƒ˜áƒ§áƒ”áƒœáƒ”áƒ— áƒ¦áƒ˜áƒšáƒ�áƒ™áƒ”áƒ‘áƒ˜ $\"PageUp$\" áƒ“áƒ� $\"PageDown$\"."
+!endif
+
+!ifdef MUI_COMPONENTSPAGE
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "áƒ©áƒ�áƒ¡áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ˜ áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ˜áƒ¡ áƒ™áƒ�áƒ›áƒžáƒ�áƒœáƒ”áƒœáƒ¢áƒ”áƒ‘áƒ˜"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "áƒ�áƒ˜áƒ áƒ©áƒ˜áƒ”áƒ— $(^NameDA)â€“áƒ˜áƒ¡ áƒ™áƒ�áƒ›áƒžáƒ�áƒœáƒ”áƒœáƒ¢áƒ”áƒ‘áƒ˜, áƒ áƒ�áƒ›áƒšáƒ˜áƒ¡ áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ�áƒª áƒ’áƒ¡áƒ£áƒ áƒ—."
+!endif
+
+!ifdef MUI_UNCOMPONENTSPAGE
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ˜áƒ¡ áƒ™áƒ�áƒ›áƒžáƒ�áƒœáƒ”áƒœáƒ¢áƒ”áƒ‘áƒ˜"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "áƒ�áƒ˜áƒ áƒ©áƒ˜áƒ”áƒ— $(^NameDA)â€“áƒ˜áƒ¡ áƒ™áƒ�áƒ›áƒžáƒ�áƒœáƒ”áƒœáƒ¢áƒ”áƒ‘áƒ˜, áƒ áƒ�áƒ›áƒšáƒ˜áƒ¡ áƒ¬áƒ�áƒ¨áƒšáƒ�áƒª áƒ’áƒ¡áƒ£áƒ áƒ—."
+!endif
+
+!ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "áƒ¨áƒ”áƒ›áƒ�áƒ“áƒ’áƒ”áƒœáƒšáƒ�áƒ‘áƒ�"
+  !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "áƒ›áƒ˜áƒ˜áƒ§áƒ•áƒ�áƒœáƒ”áƒ— áƒ›áƒ�áƒ£áƒ¡áƒ˜ áƒ™áƒ�áƒ›áƒžáƒ�áƒœáƒ”áƒœáƒ¢áƒ˜áƒ¡ áƒ¡áƒ�áƒ®áƒ”áƒšáƒ¬áƒ�áƒ“áƒ”áƒ‘áƒ�áƒ¡áƒ—áƒ�áƒœ áƒ›áƒ˜áƒ¡ áƒ¡áƒ áƒ£áƒšáƒ�áƒ“ áƒ¬áƒ�áƒ¡áƒ�áƒ™áƒ˜áƒ—áƒ®áƒ�áƒ“."
+  !else
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "áƒ�áƒ˜áƒ áƒ©áƒ˜áƒ”áƒ— áƒ™áƒ�áƒ›áƒžáƒ�áƒœáƒ”áƒœáƒ¢áƒ˜, áƒ¨áƒ”áƒ›áƒ�áƒ“áƒ’áƒ”áƒœáƒšáƒ�áƒ‘áƒ˜áƒ¡ áƒ“áƒ�áƒ¡áƒ�áƒœáƒ�áƒ®áƒ�áƒ“."
+  !endif
+!endif
+
+!ifdef MUI_DIRECTORYPAGE
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "áƒ©áƒ�áƒ¡áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ˜ áƒ¤áƒ�áƒšáƒ“áƒ”áƒ áƒ˜áƒ¡ áƒ›áƒ�áƒœáƒ˜áƒ¨áƒ•áƒœáƒ�"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "áƒ�áƒ˜áƒ áƒ©áƒ˜áƒ”áƒ— $(^NameDA)â€“áƒ¡ áƒ©áƒ�áƒ¡áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ˜ áƒ¤áƒ�áƒšáƒ“áƒ”áƒ áƒ˜."
+!endif
+
+!ifdef MUI_UNDIRECTORYPAGE
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "áƒ¬áƒ�áƒ¡áƒ�áƒ¨áƒšáƒ”áƒšáƒ˜ áƒ¤áƒ�áƒšáƒ“áƒ”áƒ áƒ˜áƒ¡ áƒ›áƒ�áƒœáƒ˜áƒ¨áƒ•áƒœáƒ�"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "áƒ›áƒ˜áƒ£áƒ—áƒ˜áƒ—áƒ”áƒ— áƒ¤áƒ�áƒšáƒ“áƒ”áƒ áƒ˜, áƒ¡áƒ�áƒ˜áƒ“áƒ�áƒœáƒ�áƒª áƒ£áƒœáƒ“áƒ� áƒ¬áƒ�áƒ˜áƒ¨áƒ�áƒšáƒ�áƒ¡ $(^NameDA)."
+!endif
+
+!ifdef MUI_INSTFILESPAGE
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ�"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "áƒ“áƒ�áƒ”áƒšáƒ�áƒ“áƒ”áƒ—, áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒ�áƒ áƒ”áƒ�áƒ‘áƒ¡ $(^NameDA)â€“áƒ˜áƒ¡ áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ�..."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ� áƒ“áƒ�áƒ¡áƒ áƒ£áƒšáƒ”áƒ‘áƒ£áƒšáƒ˜áƒ�"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ� áƒ¬áƒ�áƒ áƒ›áƒ�áƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ©áƒ�áƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ�."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ� áƒ¨áƒ”áƒ¬áƒ§áƒ“áƒ�"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ� áƒ�áƒ  áƒ“áƒ�áƒ¡áƒ áƒ£áƒšáƒ”áƒ‘áƒ£áƒšáƒ�."
+!endif
+
+!ifdef MUI_UNINSTFILESPAGE
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "áƒ¬áƒ�áƒ¨áƒšáƒ�"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "áƒ“áƒ�áƒ”áƒšáƒ�áƒ“áƒ”áƒ—, áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒ�áƒ áƒ”áƒ�áƒ‘áƒ¡ $(^NameDA)â€“áƒ˜áƒ¡ áƒ¬áƒ�áƒ¨áƒšáƒ�..."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "áƒ¬áƒ�áƒ˜áƒ¨áƒ�áƒšáƒ�"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ� áƒ¡áƒ áƒ£áƒšáƒ�áƒ“ áƒ¬áƒ�áƒ˜áƒ¨áƒ�áƒšáƒ�."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "áƒ¨áƒ”áƒ¬áƒ§áƒ“áƒ� áƒ¬áƒ�áƒ¨áƒšáƒ�"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "áƒ¡áƒ áƒ£áƒšáƒ�áƒ“ áƒ�áƒ  áƒ¬áƒ�áƒ¨áƒšáƒ˜áƒšáƒ�."
+!endif
+
+!ifdef MUI_FINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "áƒ“áƒ�áƒ¡áƒ áƒ£áƒšáƒ“áƒ� $(^NameDA)â€“áƒ˜áƒ¡ áƒ¡áƒ�áƒ˜áƒœáƒ¡áƒ¢áƒ�áƒšáƒ�áƒªáƒ˜áƒ� áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ�"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) áƒ©áƒ�áƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ� áƒ™áƒ�áƒ›áƒžáƒ˜áƒ£áƒ¢áƒ”áƒ áƒ¨áƒ˜.$\r$\n$\r$\náƒ“áƒ�áƒ�áƒ¬áƒ™áƒ�áƒžáƒ£áƒœáƒ”áƒ— áƒ¦áƒ˜áƒšáƒ�áƒ™áƒ–áƒ” $\"áƒ›áƒ–áƒ�áƒ“áƒ�áƒ�$\" áƒ¡áƒ�áƒ˜áƒœáƒ¡áƒ¢áƒ�áƒšáƒ�áƒªáƒ˜áƒ� áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ˜áƒ“áƒ�áƒœ áƒ’áƒ�áƒ›áƒ�áƒ¡áƒ�áƒ¡áƒ•áƒšáƒ”áƒšáƒ�áƒ“."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "$(^NameDA)â€“áƒ˜áƒ¡ áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡ áƒ“áƒ�áƒ¡áƒ�áƒ¡áƒ áƒ£áƒšáƒ”áƒ‘áƒšáƒ�áƒ“ áƒ’áƒ�áƒ“áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ”áƒ— áƒ™áƒ�áƒ›áƒžáƒ˜áƒ£áƒ¢áƒ”áƒ áƒ˜. áƒ�áƒ®áƒšáƒ�áƒ•áƒ” áƒ’áƒ¡áƒ£áƒ áƒ— áƒ›áƒ˜áƒ¡áƒ˜ áƒ’áƒ�áƒ“áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ�?"
+!endif
+
+!ifdef MUI_UNFINISHPAGE
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "$(^NameDA)â€“áƒ˜áƒ¡ áƒ¬áƒ�áƒ¨áƒšáƒ˜áƒ¡ áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ�"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) áƒ¬áƒ�áƒ˜áƒ¨áƒ�áƒšáƒ� áƒ™áƒ�áƒ›áƒžáƒ˜áƒ£áƒ¢áƒ”áƒ áƒ˜áƒ“áƒ�áƒœ.$\r$\n$\r$\náƒ“áƒ�áƒ�áƒ¬áƒ™áƒ�áƒžáƒ£áƒœáƒ”áƒ— áƒ¦áƒ˜áƒšáƒ�áƒ™áƒ–áƒ” $\"áƒ›áƒ–áƒ�áƒ“áƒ�áƒ�$\" áƒ¬áƒ�áƒ¨áƒšáƒ˜áƒ¡ áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ˜áƒ“áƒ�áƒœ áƒ’áƒ�áƒ›áƒ�áƒ¡áƒ�áƒ¡áƒ•áƒšáƒ”áƒšáƒ�áƒ“."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "$(^NameDA)â€“áƒ˜áƒ¡ áƒ¡áƒ áƒ£áƒšáƒ�áƒ“ áƒ¬áƒ�áƒ¡áƒ�áƒ¨áƒšáƒ”áƒšáƒ�áƒ“ áƒ’áƒ�áƒ“áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ”áƒ— áƒ™áƒ�áƒ›áƒžáƒ˜áƒ£áƒ¢áƒ”áƒ áƒ˜. áƒ�áƒ®áƒšáƒ�áƒ•áƒ” áƒ’áƒ¡áƒ£áƒ áƒ— áƒ›áƒ˜áƒ¡áƒ˜ áƒ’áƒ�áƒ“áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ�?"
+!endif
+
+!ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "áƒ“áƒ˜áƒ�áƒ®, áƒ�áƒ®áƒšáƒ�áƒ•áƒ” áƒ’áƒ�áƒ“áƒ�áƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ�áƒ¡"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "áƒ�áƒ áƒ�, áƒ›áƒ�áƒ’áƒ•áƒ˜áƒ�áƒœáƒ”áƒ‘áƒ˜áƒ— áƒ’áƒ�áƒ“áƒ�áƒ•áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ�áƒ• áƒ™áƒ�áƒ›áƒžáƒ˜áƒ£áƒ¢áƒ”áƒ áƒ¡"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "$(^NameDA)â€“áƒ˜áƒ¡ &áƒ©áƒ�áƒ áƒ—áƒ•áƒ�"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "ReadMe &áƒ¤áƒ�áƒ˜áƒšáƒ˜áƒ¡ áƒ©áƒ•áƒ”áƒœáƒ”áƒ‘áƒ�" #FIXME: BUGBUG "ReadMe"?
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&áƒ›áƒ–áƒ�áƒ“áƒ�áƒ�"  
+!endif
+
+!ifdef MUI_STARTMENUPAGE
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "áƒ›áƒ”áƒœáƒ˜áƒ£áƒ¨áƒ˜ áƒ�áƒ áƒ¡áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ¤áƒ�áƒšáƒ“áƒ”áƒ áƒ˜ $\"áƒ¡áƒ¢áƒ�áƒ áƒ¢áƒ˜$\""
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "áƒ�áƒ˜áƒ áƒ©áƒ˜áƒ”áƒ— áƒ¤áƒ�áƒšáƒ“áƒ”áƒ áƒ˜ áƒ›áƒ”áƒœáƒ˜áƒ£áƒ¨áƒ˜ $\"áƒ¡áƒ¢áƒ�áƒ áƒ¢áƒ˜$\" $(^NameDA)â€“áƒ˜áƒ¡ áƒ˜áƒ�áƒ áƒšáƒ˜áƒ§áƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒ�áƒœáƒ¡áƒ�áƒ—áƒ�áƒ•áƒ¡áƒ”áƒ‘áƒšáƒ�áƒ“."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "áƒ�áƒ˜áƒ áƒ©áƒ˜áƒ”áƒ— áƒ¤áƒ�áƒšáƒ“áƒ”áƒ áƒ˜ áƒ›áƒ”áƒœáƒ˜áƒ£áƒ¨áƒ˜ $\"áƒ¡áƒ¢áƒ�áƒ áƒ¢áƒ˜$\", áƒ¡áƒ�áƒ“áƒ�áƒª áƒ’áƒ�áƒœáƒ—áƒ�áƒ•áƒ¡áƒ“áƒ”áƒ‘áƒ� áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ˜áƒ¡ áƒ˜áƒ�áƒ áƒšáƒ˜áƒ§áƒ”áƒ‘áƒ˜. áƒ—áƒ¥áƒ•áƒ”áƒœ áƒ¡áƒ®áƒ•áƒ� áƒ¡áƒ�áƒ®áƒ”áƒšáƒ˜áƒª áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒ�áƒ— áƒ›áƒ˜áƒ£áƒ—áƒ˜áƒ—áƒ�áƒ— áƒ�áƒ®áƒ�áƒšáƒ˜ áƒ¤áƒ�áƒšáƒ“áƒ”áƒ áƒ˜áƒ¡ áƒ¨áƒ”áƒ¡áƒ�áƒ¥áƒ›áƒœáƒ”áƒšáƒ�áƒ“."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "áƒ�áƒ  áƒ¨áƒ”áƒ˜áƒ¥áƒ›áƒœáƒ�áƒ¡ áƒ˜áƒ�áƒ áƒšáƒ˜áƒ§áƒ˜"
+!endif
+
+!ifdef MUI_UNCONFIRMPAGE
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "$(^NameDA)â€“áƒ˜áƒ¡ áƒ¬áƒ�áƒ¨áƒšáƒ�"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "$(^NameDA)â€“áƒ˜áƒ¡ áƒ™áƒ�áƒ›áƒžáƒ˜áƒ£áƒ¢áƒ”áƒ áƒ˜áƒ“áƒ�áƒœ áƒ¬áƒ�áƒ¨áƒšáƒ�."
+!endif
+
+!ifdef MUI_ABORTWARNING
+  ${LangFileString} MUI_TEXT_ABORTWARNING "áƒœáƒ�áƒ›áƒ“áƒ•áƒ˜áƒšáƒ�áƒ“ áƒ’áƒ¡áƒ£áƒ áƒ— áƒ£áƒ�áƒ áƒ˜ áƒ—áƒ¥áƒ•áƒ�áƒ— $(^Name)â€“áƒ˜áƒ¡ áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ�áƒ–áƒ”?"
+!endif
+
+!ifdef MUI_UNABORTWARNING
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "áƒœáƒ�áƒ›áƒ“áƒ•áƒ˜áƒšáƒ�áƒ“ áƒ’áƒ¡áƒ£áƒ áƒ— áƒ£áƒ�áƒ áƒ˜ áƒ—áƒ¥áƒ•áƒ�áƒ— $(^Name)â€“áƒ˜áƒ¡ áƒ¬áƒ�áƒ¨áƒšáƒ�áƒ–áƒ”?"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Albanian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Albanian.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Albanian.nlf	(revision 2956)
@@ -1,4 +1,4 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Start editing here
 # Language ID
@@ -6,37 +6,37 @@
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1250
 # RTL - anything else than RTL means LTR
 -
-# Përkthimi nga Besnik Bleta, besnik@programeshqip.org
+# PÃ«rkthimi nga Besnik Bleta, besnik@programeshqip.org
 # ^Branding
-Sistemi Nullsoft për Instalime %s
+Nullsoft Install System %s
 # ^SetupCaption
 Rregullimi i $(^Name)
 # ^UninstallCaption
-Çinstalimi i $(^Name)
+Ã‡instalimi i $(^Name)
 # ^LicenseSubCaption
-: Marrëveshje Licence
+: MarrÃ«veshje Licence
 # ^ComponentsSubCaption
-: Mundësi Instalimi
+: MundÃ«si Instalimi
 # ^DirSubCaption
 : Dosje Instalimi
 # ^InstallingSubCaption
 : Po instalohet
 # ^CompletedSubCaption
-: U plotësua
+: U plotÃ«sua
 # ^UnComponentsSubCaption
-: Mundësi Çinstalimi
+: MundÃ«si Ã‡instalimi
 # ^UnDirSubCaption
-: Dosje Çinstalimi
+: Dosje Ã‡instalimi
 # ^ConfirmSubCaption
 : Ripohim
 # ^UninstallingSubCaption
-: Po çinstalohet
+: Po Ã§instalohet
 # ^UnCompletedSubCaption
-: U plotësua
+: U plotÃ«sua
 # ^BackBtn
 < &Mbrapsht
 # ^NextBtn
@@ -44,13 +44,13 @@
 # ^AgreeBtn
 &Pajtohem
 # ^AcceptBtn
-&I pranoj kushtet e Marrëveshjes së Licensës
+&I pranoj kushtet e MarrÃ«veshjes sÃ« LicensÃ«s
 # ^DontAcceptBtn
-&Nuk i pranoj kushtet e Marrëveshjes së Licensës
+&Nuk i pranoj kushtet e MarrÃ«veshjes sÃ« LicensÃ«s
 # ^InstallBtn
 &Instaloje
 # ^UninstallBtn
-&Çinstaloje
+&Ã‡instaloje
 # ^CancelBtn
 Anuloje
 # ^CloseBtn
@@ -58,81 +58,81 @@
 # ^BrowseBtn
 Sh&fletoni...
 # ^ShowDetailsBtn
-Shfaq &hollësi
+Shfaq &hollÃ«si
 # ^ClickNext
-Klikoni Tjetri për të vazhduar.
+Klikoni Tjetri pÃ«r tÃ« vazhduar.
 # ^ClickInstall
-Për të filluar instalimin klikoni Instaloje.
+PÃ«r tÃ« filluar instalimin klikoni Instaloje.
 # ^ClickUninstall
-Për të filluar çinstalimin klikoni Çinstaloje.
+PÃ«r tÃ« filluar Ã§instalimin klikoni Ã‡instaloje.
 # ^Name
-Emër
+EmÃ«r
 # ^Completed
-U plotësua
+U plotÃ«sua
 # ^LicenseText
-Ju lutem, para instalimit të $(^NameDA), shqyrtoni marrëveshjen e licencës. Nëse i pranoni tërë kushtet e marrëveshjes, klikoni Pajtohem.
+Ju lutem, para instalimit tÃ« $(^NameDA), shqyrtoni marrÃ«veshjen e licencÃ«s. NÃ«se i pranoni tÃ«rÃ« kushtet e marrÃ«veshjes, klikoni Pajtohem.
 # ^LicenseTextCB
-Ju lutem, para instalimit të $(^NameDA), shqyrtoni marrëveshjen e licensës. Nëse i pranoni tërë kushtet e marrëveshjes, klikoni kutizën më poshtë. $_CLICK
+Ju lutem, para instalimit tÃ« $(^NameDA), shqyrtoni marrÃ«veshjen e licensÃ«s. NÃ«se i pranoni tÃ«rÃ« kushtet e marrÃ«veshjes, klikoni kutizÃ«n mÃ« poshtÃ«. $_CLICK
 # ^LicenseTextRB
-Ju lutem, para instalimit të $(^NameDA), shqyrtoni marrëveshjen e licensës. Nëse i pranoni tërë kushtet e marrëveshjes, përzgjidhni mundësinë e parë më poshtë. $_CLICK
+Ju lutem, para instalimit tÃ« $(^NameDA), shqyrtoni marrÃ«veshjen e licensÃ«s. NÃ«se i pranoni tÃ«rÃ« kushtet e marrÃ«veshjes, pÃ«rzgjidhni mundÃ«sinÃ« e parÃ« mÃ« poshtÃ«. $_CLICK
 # ^UnLicenseText
-Ju lutem, para çinstalimit të $(^NameDA), shqyrtoni marrëveshjen e licensës. Nëse i pranoni tërë kushtet e marrëveshjes, klikoni Pajtohem.
+Ju lutem, para Ã§instalimit tÃ« $(^NameDA), shqyrtoni marrÃ«veshjen e licensÃ«s. NÃ«se i pranoni tÃ«rÃ« kushtet e marrÃ«veshjes, klikoni Pajtohem.
 # ^UnLicenseTextCB
-Ju lutem, para çinstalimit të $(^NameDA), shqyrtoni marrëveshjen e licensës. Nëse i pranoni tërë kushtet e marrëveshjes, klikoni kutizën më poshtë. $_CLICK
+Ju lutem, para Ã§instalimit tÃ« $(^NameDA), shqyrtoni marrÃ«veshjen e licensÃ«s. NÃ«se i pranoni tÃ«rÃ« kushtet e marrÃ«veshjes, klikoni kutizÃ«n mÃ« poshtÃ«. $_CLICK
 # ^UnLicenseTextRB
-Ju lutem, para çinstalimit të $(^NameDA), shqyrtoni marrëveshjen e licensës. Nëse i pranoni tërë kushtet e marrëveshjes, përzgjidhni mundësinë e parë më poshtë. $_CLICK
+Ju lutem, para Ã§instalimit tÃ« $(^NameDA), shqyrtoni marrÃ«veshjen e licensÃ«s. NÃ«se i pranoni tÃ«rÃ« kushtet e marrÃ«veshjes, pÃ«rzgjidhni mundÃ«sinÃ« e parÃ« mÃ« poshtÃ«. $_CLICK
 # ^Custom
 Vetjake
 # ^ComponentsText
-U vini shenjë përbërësve që doni të instalohen dhe hiquani shenjën  përbërësvet që nuk doni të instalohen. $_CLICK
+U vini shenjÃ« pÃ«rbÃ«rÃ«sve qÃ« doni tÃ« instalohen dhe hiquani shenjÃ«n  pÃ«rbÃ«rÃ«svet qÃ« nuk doni tÃ« instalohen. $_CLICK
 # ^ComponentsSubText1
-Përzgjidhni llojin e instalimit:
+PÃ«rzgjidhni llojin e instalimit:
 # ^ComponentsSubText2_NoInstTypes
-Përzgjidhni përbërësit për instalim:
+PÃ«rzgjidhni pÃ«rbÃ«rÃ«sit pÃ«r instalim:
 # ^ComponentsSubText2
-Ose, përzgjidhni përbërësit e mundshëm që doni të instalohen:
+Ose, pÃ«rzgjidhni pÃ«rbÃ«rÃ«sit e mundshÃ«m qÃ« doni tÃ« instalohen:
 # ^UnComponentsText
-U vini shenjë përbërësve që doni të çinstalohen dhe hiquni shenjën përbërësve që nuk doni të çinstalohen. $_CLICK
+U vini shenjÃ« pÃ«rbÃ«rÃ«sve qÃ« doni tÃ« Ã§instalohen dhe hiquni shenjÃ«n pÃ«rbÃ«rÃ«sve qÃ« nuk doni tÃ« Ã§instalohen. $_CLICK
 # ^UnComponentsSubText1
-Përzgjidhni llojin e çinstalimit:
+PÃ«rzgjidhni llojin e Ã§instalimit:
 # ^UnComponentsSubText2_NoInstTypes
-Përzgjidhni përbërësit për çinstalim:
+PÃ«rzgjidhni pÃ«rbÃ«rÃ«sit pÃ«r Ã§instalim:
 # ^UnComponentsSubText2
-Ose, përzgjidhni përbërësit e mundshëm që doni të çinstalohen:
+Ose, pÃ«rzgjidhni pÃ«rbÃ«rÃ«sit e mundshÃ«m qÃ« doni tÃ« Ã§instalohen:
 # ^DirText
-Rregullimi do ta instalojë $(^NameDA) në dosjen vijuese. Për instalim në një dosje tjetër, klikoni Shfletoni dhe përzgjidhni një tjetër dosje. $_CLICK
+Rregullimi do ta instalojÃ« $(^NameDA) nÃ« dosjen vijuese. PÃ«r instalim nÃ« njÃ« dosje tjetÃ«r, klikoni Shfletoni dhe pÃ«rzgjidhni njÃ« tjetÃ«r dosje. $_CLICK
 # ^DirSubText
-Dosje Vendmbërritje
+Dosje VendmbÃ«rritje
 # ^DirBrowseText
-Përzgjidhni dosjen ku të instalohet $(^NameDA):
+PÃ«rzgjidhni dosjen ku tÃ« instalohet $(^NameDA):
 # ^UnDirText
-Rregullimi do të çinstalojë $(^NameDA) prej dosjes vijuese. Për çinstalim prej një dosjeje tjetër, klikoni Shfletoni dhe përzgjidhni një tjetër dosje. $_CLICK
+Rregullimi do tÃ« Ã§instalojÃ« $(^NameDA) prej dosjes vijuese. PÃ«r Ã§instalim prej njÃ« dosjeje tjetÃ«r, klikoni Shfletoni dhe pÃ«rzgjidhni njÃ« tjetÃ«r dosje. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Përzgjidhni dosjen prej nga ku të çinstalohet $(^NameDA):
+PÃ«rzgjidhni dosjen prej nga ku tÃ« Ã§instalohet $(^NameDA):
 # ^SpaceAvailable
-"Hapësirë e mundshme: "
+"HapÃ«sirÃ« e mundshme: "
 # ^SpaceRequired
-"Hapësirë e nevojshme: "
+"HapÃ«sirÃ« e nevojshme: "
 # ^UninstallingText
-$(^NameDA) do të çinstalohet prej dosjes vijuese. $_CLICK
+$(^NameDA) do tÃ« Ã§instalohet prej dosjes vijuese. $_CLICK
 # ^UninstallingSubText
-Po çinstalohet prej:
+Po Ã§instalohet prej:
 # ^FileError
-Gabim në hapje kartele për shkrim: \r\n\r\n$0\r\n\r\nKlikoni Ndërprite për të ndalur instalimin,\r\nRiprovo për të provuar sërish, ose\r\nShpërfille për të sanashkaluar këtë kartelë.
+Gabim nÃ« hapje kartele pÃ«r shkrim: \r\n\r\n$0\r\n\r\nKlikoni NdÃ«rprite pÃ«r tÃ« ndalur instalimin,\r\nRiprovo pÃ«r tÃ« provuar sÃ«rish, ose\r\nShpÃ«rfille pÃ«r tÃ« sanashkaluar kÃ«tÃ« kartelÃ«.
 # ^FileError_NoIgnore
-Gabim në hapje kartele për shkrim: \r\n\r\n$0\r\n\r\nKlikoni Riprovo për të provuar sërish, ose\r\nAnulo për të ndalur instalimin.
+Gabim nÃ« hapje kartele pÃ«r shkrim: \r\n\r\n$0\r\n\r\nKlikoni Riprovo pÃ«r tÃ« provuar sÃ«rish, ose\r\nAnulo pÃ«r tÃ« ndalur instalimin.
 # ^CantWrite
 "S'shkruaj dot: "
 # ^CopyFailed
-Kopjimi dështoi
+Kopjimi dÃ«shtoi
 # ^CopyTo
 "Kopjo tek "
 # ^Registering
 "Regjistrim: "
 # ^Unregistering
-"Çregjistrim: "
+"Ã‡regjistrim: "
 # ^SymbolNotFound
 "S'u gjet dot simbol: "
 # ^CouldNotLoad
@@ -142,50 +142,50 @@
 # ^CreateShortcut
 "Krijo shkurtore: "
 # ^CreatedUninstaller
-"Krijo çinstalues: "
+"Krijo Ã§instalues: "
 # ^Delete
-"Fshi kartelë: "
+"Fshi kartelÃ«: "
 # ^DeleteOnReboot
-"Fshi gjatë rinisjes: "
+"Fshi gjatÃ« rinisjes: "
 # ^ErrorCreatingShortcut
-"Gabim në krijim shkurtoresh: "
+"Gabim nÃ« krijim shkurtoresh: "
 # ^ErrorCreating
-"Gabim në krijimin e: "
+"Gabim nÃ« krijimin e: "
 # ^ErrorDecompressing
-Gabim në çngjeshje të dhënash! Instalues i dëmtuar?
+Gabim nÃ« Ã§ngjeshje tÃ« dhÃ«nash! Instalues i dÃ«mtuar?
 # ^ErrorRegistering
-Gabim në regjistrim DLL-je
+Gabim nÃ« regjistrim DLL-je
 # ^ExecShell
 "ExecShell: "
 # ^Exec
 "Ekzekuto: "
 # ^Extract
-"Përfto: "
+"PÃ«rfto: "
 # ^ErrorWriting
-"Përftim: gabim në shkrim te kartela "
+"PÃ«rftim: gabim nÃ« shkrim te kartela "
 # ^InvalidOpcode
-Instalues i dëmtuar: opcode i pavlefshëm
+Instalues i dÃ«mtuar: opcode i pavlefshÃ«m
 # ^NoOLE
-"Pa OLE për: "
+"Pa OLE pÃ«r: "
 # ^OutputFolder
-"Dosje përfundimesh: "
+"Dosje pÃ«rfundimesh: "
 # ^RemoveFolder
 "Hiq dosjen: "
 # ^RenameOnReboot
-"Riemërtoje gjatë rinisjes: "
+"RiemÃ«rtoje gjatÃ« rinisjes: "
 # ^Rename
-"Riemërtoje: "
+"RiemÃ«rtoje: "
 # ^Skipped
 "U anashkalua: "
 # ^CopyDetails
-Kopjo Hollësira Te Clipboard
+Kopjo HollÃ«sira Te Clipboard
 # ^LogInstall
 Regjistro procesin e instalimit
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/French.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/French.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/French.nlf	(revision 2956)
@@ -1,11 +1,11 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1036
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
@@ -16,7 +16,7 @@
 # ^SetupCaption
 Installation de $(^Name)
 # ^UninstallCaption
-Désinstallation de $(^Name)
+DÃ©sinstallation de $(^Name)
 # ^LicenseSubCaption
 : Licence
 # ^ComponentsSubCaption
@@ -26,19 +26,19 @@
 # ^InstallingSubCaption
 : Installation des fichiers
 # ^CompletedSubCaption
-: Terminé
+: TerminÃ©
 # ^UnComponentsSubCaption
-: Options de désinstallation
+: Options de dÃ©sinstallation
 # ^UnDirSubCaption
-: Dossier de désinstallation
+: Dossier de dÃ©sinstallation
 # ^ConfirmSubCaption
 : Confirmation
 # ^UninstallingSubCaption
-: Désinstallation des fichiers
+: DÃ©sinstallation des fichiers
 # ^UnCompletedSubCaption
-: Terminé
+: TerminÃ©
 # ^BackBtn
-< &Précédent
+< &PrÃ©cÃ©dent
 # ^NextBtn
 &Suivant >
 # ^AgreeBtn
@@ -50,7 +50,7 @@
 # ^InstallBtn
 &Installer
 # ^UninstallBtn
-&Désinstaller
+&DÃ©sinstaller
 # ^CancelBtn
 Annuler
 # ^CloseBtn
@@ -62,71 +62,71 @@
 # ^ClickNext
 Cliquez sur Suivant pour continuer.
 # ^ClickInstall
-Cliquez sur Installer pour démarrer l'installation.
+Cliquez sur Installer pour dÃ©marrer l'installation.
 # ^ClickUninstall
-Cliquez sur Désinstaller pour démarrer la désinstallation.
+Cliquez sur DÃ©sinstaller pour dÃ©marrer la dÃ©sinstallation.
 # ^Name
 Nom
 # ^Completed
-Terminé
+TerminÃ©
 # ^LicenseText
 Veuillez examiner le contrat de licence avant d'installer $(^NameDA). Si vous acceptez tous les termes du contrat, cliquez sur J'accepte.
 # ^LicenseTextCB
-Veuillez examiner le contrat de licence avant d'installer $(^NameDA). Si vous acceptez tous les termes du contrat, cochez la boîte de contrôle ci-dessous. $_CLICK
+Veuillez examiner le contrat de licence avant d'installer $(^NameDA). Si vous acceptez tous les termes du contrat, cochez la boÃ®te de contrÃ´le ci-dessous. $_CLICK
 # ^LicesnseTextRB
-Veuillez examiner le contrat de licence avant d'installer $(^NameDA). Si vous acceptez tous les termes du contrat, sélectionnez la première option ci-dessous. $_CLICK
+Veuillez examiner le contrat de licence avant d'installer $(^NameDA). Si vous acceptez tous les termes du contrat, sÃ©lectionnez la premiÃ¨re option ci-dessous. $_CLICK
 # ^UnLicenseText
-Veuillez examiner le contrat de licence avant de désinstaller $(^NameDA). Si vous acceptez tous les termes du contrat, cliquez sur J'accepte.
+Veuillez examiner le contrat de licence avant de dÃ©sinstaller $(^NameDA). Si vous acceptez tous les termes du contrat, cliquez sur J'accepte.
 # ^UnLicenseTextCB
-Veuillez examiner le contrat de licence avant de désinstaller $(^NameDA). Si vous acceptez tous les termes du contrat, cochez la boîte de contrôle ci-dessous. $_CLICK
+Veuillez examiner le contrat de licence avant de dÃ©sinstaller $(^NameDA). Si vous acceptez tous les termes du contrat, cochez la boÃ®te de contrÃ´le ci-dessous. $_CLICK
 # ^UnLicesnseTextRB
-Veuillez examiner le contrat de licence avant de désinstaller $(^NameDA). Si vous acceptez tous les termes du contrat, sélectionnez la première option ci-dessous. $_CLICK
+Veuillez examiner le contrat de licence avant de dÃ©sinstaller $(^NameDA). Si vous acceptez tous les termes du contrat, sÃ©lectionnez la premiÃ¨re option ci-dessous. $_CLICK
 # ^Custom
-Personnalisée
+PersonnalisÃ©e
 # ^ComponentsText
-Cochez les composants que vous désirez installer et décochez ceux que vous ne désirez pas installer. $_CLICK
+Cochez les composants que vous dÃ©sirez installer et dÃ©cochez ceux que vous ne dÃ©sirez pas installer. $_CLICK
 # ^ComponentsSubText1
 Type d'installation :
 # ^ComponentsSubText2_NoInstTypes
-Sélectionnez les composants à installer :
+SÃ©lectionnez les composants Ã  installer :
 # ^ComponentsSubText2
-Ou, sélectionnez les composants optionnels que vous voulez installer :
+Ou, sÃ©lectionnez les composants optionnels que vous voulez installer :
 # ^UnComponentsText
-Cochez les composants que vous désirez désinstaller et décochez ceux que vous ne désirez pas désinstaller. $_CLICK
+Cochez les composants que vous dÃ©sirez dÃ©sinstaller et dÃ©cochez ceux que vous ne dÃ©sirez pas dÃ©sinstaller. $_CLICK
 # ^UnComponentsSubText1
-Sélectionnez le type de désinstallation :
+SÃ©lectionnez le type de dÃ©sinstallation :
 # ^UnComponentsSubText2_NoInstTypes
-Sélectionnez les composants à désinstaller :
+SÃ©lectionnez les composants Ã  dÃ©sinstaller :
 # ^UnComponentsSubText2
-Ou, sélectionnez les composants optionnels que vous voulez désinstaller :
+Ou, sÃ©lectionnez les composants optionnels que vous voulez dÃ©sinstaller :
 # ^DirText
 Ceci installera $(^NameDA) dans le dossier suivant. Pour installer dans un autre dossier, cliquez sur Parcourir et choisissez un autre dossier. $_CLICK
 # ^DirSubText
 Dossier d'installation
 # ^DirBrowseText
-Sélectionnez le dossier d'installation pour $(^NameDA) :
+SÃ©lectionnez le dossier d'installation pour $(^NameDA) :
 # ^UnDirText
-Ceci désinstallera $(^NameDA) du dossier suivant. Pour désinstaller d'un autre dossier, cliquez sur Parcourir et choisissez un autre dossier. $_CLICK
+Ceci dÃ©sinstallera $(^NameDA) du dossier suivant. Pour dÃ©sinstaller d'un autre dossier, cliquez sur Parcourir et choisissez un autre dossier. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Sélectionnez le dossier de désinstallation pour $(^NameDA) :
+SÃ©lectionnez le dossier de dÃ©sinstallation pour $(^NameDA) :
 # ^SpaceAvailable
 "Espace disponible : "
 # ^SpaceRequired
 "Espace requis : "
 # ^UninstallingText
-Ce programme désinstallera $(^NameDA) de votre ordinateur. $_CLICK
+Ce programme dÃ©sinstallera $(^NameDA) de votre ordinateur. $_CLICK
 # ^UninstallingSubText
-Désinstallation à partir de :
+DÃ©sinstallation Ã  partir de :
 # ^FileError
-Erreur lors de l'ouverture du fichier en écriture : \r\n\t"$0"\r\nAppuyez sur Abandonner pour annuler l'installation,\r\nRéessayer pour réessayer l'écriture du fichier, ou\r\nIgnorer pour passer ce fichier
+Erreur lors de l'ouverture du fichier en Ã©criture : \r\n\t"$0"\r\nAppuyez sur Abandonner pour annuler l'installation,\r\nRÃ©essayer pour rÃ©essayer l'Ã©criture du fichier, ou\r\nIgnorer pour passer ce fichier
 # ^FileError_NoIgnore
-Erreur lors de l'ouverture du fichier en écriture : \r\n\t"$0"\r\nAppuyez sur Réessayez pour re-écrire le fichier, ou\r\nAnnuler pour abandonner l'installation
+Erreur lors de l'ouverture du fichier en Ã©criture : \r\n\t"$0"\r\nAppuyez sur RÃ©essayez pour re-Ã©crire le fichier, ou\r\nAnnuler pour abandonner l'installation
 # ^CantWrite
-"Impossible d'écrire : "
+"Impossible d'Ã©crire : "
 # ^CopyFailed
-Échec de la copie
+Ã‰chec de la copie
 # ^CopyTo
 "Copier vers "
 # ^Registering
@@ -138,31 +138,31 @@
 # ^CouldNotLoad
 "Impossible de charger : "
 # ^CreateFolder
-"Création du dossier : "
+"CrÃ©ation du dossier : "
 # ^CreateShortcut
-"Création du raccourci : "
+"CrÃ©ation du raccourci : "
 # ^CreatedUninstaller
-"Création de la désinstallation : "
+"CrÃ©ation de la dÃ©sinstallation : "
 # ^Delete
 "Suppression : "
 # ^DeleteOnReboot
-"Suppression au redémarrage : "
+"Suppression au redÃ©marrage : "
 # ^ErrorCreatingShortcut
-"Erreur lors de la création du raccourci : "
+"Erreur lors de la crÃ©ation du raccourci : "
 # ^ErrorCreating
-"Erreur de la création : "
+"Erreur de la crÃ©ation : "
 # ^ErrorDecompressing
-Erreur lors de la décompression des données ! Installation corrompue ?
+Erreur lors de la dÃ©compression des donnÃ©es ! Installation corrompue ?
 # ^ErrorRegistering
 Erreur lors de l'enregistrement de la DLL
 # ^ExecShell
 "ExecShell: "
 # ^Exec
-"Exécution : "
+"ExÃ©cution : "
 # ^Extract
 "Extraction : "
 # ^ErrorWriting
-"Extraction : erreur d'écriture du fichier "
+"Extraction : erreur d'Ã©criture du fichier "
 # ^InvalidOpcode
 Installation corrompue : opcode incorrect
 # ^NoOLE
@@ -172,20 +172,20 @@
 # ^RemoveFolder
 "Suppression du dossier : "
 # ^RenameOnReboot
-"Renommer au redémarrage : "
+"Renommer au redÃ©marrage : "
 # ^Rename
 "Renommer : "
 # ^Skipped
-"Passé : "
+"PassÃ© : "
 # ^CopyDetails
-Copier les Détails dans le Presse-papier
+Copier les DÃ©tails dans le Presse-papier
 # ^LogInstall
-Enregistrer le déroulement de l'installation
+Enregistrer le dÃ©roulement de l'installation
 # ^Byte
 o
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Swedish.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Swedish.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Swedish.nlf	(revision 2956)
@@ -1,11 +1,11 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1053
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
@@ -25,27 +25,27 @@
 # ^InstallingSubCaption
 : Installerar
 # ^CompletedSubCaption
-: Slutförd
+: SlutfÃ¶rd
 # ^UnComponentsSubCaption
 : Avinstallationsval
 # ^UnDirSubCaption
 : Avinstallationskatalog
 # ^ConfirmSubCaption
-: Bekräftelse
+: BekrÃ¤ftelse
 # ^UninstallingSubCaption
 : Avinstallerar
 # ^UnCompletedSubCaption
-: Slutförd
+: SlutfÃ¶rd
 # ^BackBtn
 < &Tillbaka
 # ^NextBtn
-&Nästa >
+&NÃ¤sta >
 # ^AgreeBtn
-Jag &Godkänner
+Jag &GodkÃ¤nner
 # ^AcceptBtn
-Jag &Godkänner villkoren i licensavtalet
+Jag &GodkÃ¤nner villkoren i licensavtalet
 # ^DontAcceptBtn
-Jag &Godkänner inte villkoren i licensavtalet
+Jag &GodkÃ¤nner inte villkoren i licensavtalet
 # ^InstallBtn
 &Installera
 # ^UninstallBtn
@@ -53,75 +53,75 @@
 # ^CancelBtn
 Avbryt
 # ^CloseBtn
-&Stäng
+&StÃ¤ng
 # ^BrowseBtn
-B&läddra...
+B&lÃ¤ddra...
 # ^ShowDetailsBtn
 Visa &detaljer
 # ^ClickNext
-Klicka på Nästa för att fortsätta.
+Klicka pÃ¥ NÃ¤sta fÃ¶r att fortsÃ¤tta.
 # ^ClickInstall
-Klicka på Installera för att starta installationen.
+Klicka pÃ¥ Installera fÃ¶r att starta installationen.
 # ^ClickUninstall
-Klicka på Avinstallera för att starta avinstallationen.
+Klicka pÃ¥ Avinstallera fÃ¶r att starta avinstallationen.
 # ^Name
 Namn
 # ^Completed
-Slutförd
+SlutfÃ¶rd
 # ^LicenseText
-Var vänlig läs igenom licensvillkoren innan du installerar $(^NameDA). Om du accepterar villkoren i avtalet, klicka Jag Godkänner.
+Var vÃ¤nlig lÃ¤s igenom licensvillkoren innan du installerar $(^NameDA). Om du accepterar villkoren i avtalet, klicka Jag GodkÃ¤nner.
 # ^LicenseTextCB
-Var vänlig läs igenom licensvillkoren innan du installerar $(^NameDA). Om du accepterar villkoren i avtalet, klicka i checkrutan nedan. $_CLICK
+Var vÃ¤nlig lÃ¤s igenom licensvillkoren innan du installerar $(^NameDA). Om du accepterar villkoren i avtalet, klicka i checkrutan nedan. $_CLICK
 # ^LicenseTextRB
-Var vänlig läs igenom licensvillkoren innan du installerar $(^NameDA). Om du accepterar villkoren i avtalet, välj det första alternativet nedan. $_CLICK
+Var vÃ¤nlig lÃ¤s igenom licensvillkoren innan du installerar $(^NameDA). Om du accepterar villkoren i avtalet, vÃ¤lj det fÃ¶rsta alternativet nedan. $_CLICK
 # ^UnLicenseText
-Var vänlig läs igenom licensvillkoren innan du avinstallerar $(^NameDA). Om du accepterar villkoren i avtalet, klicka Jag Godkänner.
+Var vÃ¤nlig lÃ¤s igenom licensvillkoren innan du avinstallerar $(^NameDA). Om du accepterar villkoren i avtalet, klicka Jag GodkÃ¤nner.
 # ^UnLicenseTextCB
-Var vänlig läs igenom licensvillkoren innan du avinstallerar $(^NameDA). Om du accepterar villkoren i avtalet, klicka i checkrutan nedan. $_CLICK
+Var vÃ¤nlig lÃ¤s igenom licensvillkoren innan du avinstallerar $(^NameDA). Om du accepterar villkoren i avtalet, klicka i checkrutan nedan. $_CLICK
 # ^UnLicenseTextRB
-Var vänlig läs igenom licensvillkoren innan du avinstallerar $(^NameDA). Om du accepterar villkoren i avtalet, välj det första alternativet nedan. $_CLICK
+Var vÃ¤nlig lÃ¤s igenom licensvillkoren innan du avinstallerar $(^NameDA). Om du accepterar villkoren i avtalet, vÃ¤lj det fÃ¶rsta alternativet nedan. $_CLICK
 # ^Custom
 Valfri
 # ^ComponentsText
 Markera de komponenter du vill installera och avmarkera de komponenter du inte vill installera. $_CLICK
 # ^ComponentsSubText1
-Välj typ av installation:
+VÃ¤lj typ av installation:
 # ^ComponentsSubText2_NoInstTypes
-Välj komponenter att installera:
+VÃ¤lj komponenter att installera:
 # ^ComponentsSubText2
-Eller, välj de alternativa komponenter du önskar installera:
+Eller, vÃ¤lj de alternativa komponenter du Ã¶nskar installera:
 # ^UnComponentsText
 Markera de komponenter du vill avinstallera och avmarkera de komponenter du inte vill avinstallera. $_CLICK
 # ^UnComponentsSubText1
-Välj typ av avinstallation:
+VÃ¤lj typ av avinstallation:
 # ^UnComponentsSubText2_NoInstTypes
-Välj komponenter att avinstallera:
+VÃ¤lj komponenter att avinstallera:
 # ^UnComponentsSubText2
-Eller, välj de alternativa komponenter du önskar avinstallera:
+Eller, vÃ¤lj de alternativa komponenter du Ã¶nskar avinstallera:
 # ^DirText
-Guiden kommer att installera $(^NameDA) i följande katalog. För att installera i en annan katalog, klicka Bläddra och välj en alternativ katalog. $_CLICK
+Guiden kommer att installera $(^NameDA) i fÃ¶ljande katalog. FÃ¶r att installera i en annan katalog, klicka BlÃ¤ddra och vÃ¤lj en alternativ katalog. $_CLICK
 # ^DirSubText
-Målkatalog
+MÃ¥lkatalog
 # ^DirBrowseText
-Välj katalog att installera $(^NameDA) i:
+VÃ¤lj katalog att installera $(^NameDA) i:
 # ^UnDirText
-Installationsguiden kommer att avinstallera $(^NameDA) från följande katalog. För att avinstallera från en annan katalog, klicka Bläddra och välj en annan katalog. $_CLICK
+Installationsguiden kommer att avinstallera $(^NameDA) frÃ¥n fÃ¶ljande katalog. FÃ¶r att avinstallera frÃ¥n en annan katalog, klicka BlÃ¤ddra och vÃ¤lj en annan katalog. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Välj katalog att avinstallera $(^NameDA) från:
+VÃ¤lj katalog att avinstallera $(^NameDA) frÃ¥n:
 # ^SpaceAvailable
-"Utrymme tillgängligt: "
+"Utrymme tillgÃ¤ngligt: "
 # ^SpaceRequired
-"Utrymme som behövs: "
+"Utrymme som behÃ¶vs: "
 # ^UninstallingText
-$(^NameDA) kommer att avinstalleras från följande katalog. $_CLICK
+$(^NameDA) kommer att avinstalleras frÃ¥n fÃ¶ljande katalog. $_CLICK
 # ^UninstallingSubText
-Avinstallerar från:
+Avinstallerar frÃ¥n:
 # ^FileError
-Fel vid Öppning av fil för skrivning: \r\n\t"$0"\r\nKlicka på avbryt för att avbryta installationen,\r\nförsök igen för att försöka skriva till filen igen, eller\r\nIgnorera för att skippa denna fil
+Fel vid Ã–ppning av fil fÃ¶r skrivning: \r\n\t"$0"\r\nKlicka pÃ¥ avbryt fÃ¶r att avbryta installationen,\r\nfÃ¶rsÃ¶k igen fÃ¶r att fÃ¶rsÃ¶ka skriva till filen igen, eller\r\nIgnorera fÃ¶r att skippa denna fil
 # ^FileError_NoIgnore
-Fel vid Öppning av fil för skrivning: \r\n\t"$0"\r\nKlicka på försök igen för att skriva till filen igen, eller\r\navbryt för att avbryta installationen
+Fel vid Ã–ppning av fil fÃ¶r skrivning: \r\n\t"$0"\r\nKlicka pÃ¥ fÃ¶rsÃ¶k igen fÃ¶r att skriva till filen igen, eller\r\navbryt fÃ¶r att avbryta installationen
 # ^CantWrite
 "Kan inte skriva: "
 # ^CopyFailed
@@ -139,7 +139,7 @@
 # ^CreateFolder
 "Skapa katalog: "
 # ^CreateShortcut
-"Skapa genväg: "
+"Skapa genvÃ¤g: "
 # ^CreatedUninstaller
 "Skapade avinstallationsprogram: "
 # ^Delete
@@ -147,7 +147,7 @@
 # ^DeleteOnReboot
 "Radera vid omstart: "
 # ^ErrorCreatingShortcut
-"Fel vid skapande av genväg: "
+"Fel vid skapande av genvÃ¤g: "
 # ^ErrorCreating
 "Fel vid skapande: "
 # ^ErrorDecompressing
@@ -157,7 +157,7 @@
 # ^ExecShell
 "ExecShell: "
 # ^Exec
-"Kör: "
+"KÃ¶r: "
 # ^Extract
 "Extrahera: "
 # ^ErrorWriting
@@ -165,26 +165,26 @@
 # ^InvalidOpcode
 Installationspaket skadat: ogiltig opcode
 # ^NoOLE
-"Ingen OLE för: "
+"Ingen OLE fÃ¶r: "
 # ^OutputFolder
-"Målkatalog: "
+"MÃ¥lkatalog: "
 # ^RemoveFolder
 "Ta bort katalog: "
 # ^RenameOnReboot
-"Döp om vid omstart: "
+"DÃ¶p om vid omstart: "
 # ^Rename
-"Döp om: "
+"DÃ¶p om: "
 # ^Skipped
 "Ignorerad: "
 # ^CopyDetails
 Kopiera detaljinformation till klippbordet
 # ^LogInstall
-Logga installationsförfarandet
+Logga installationsfÃ¶rfarandet
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Korean.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Korean.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Korean.nlf	(revision 2956)
@@ -1,191 +1,191 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Start editing here
 # Language ID
 1042
 # Font and size - dash (-) means default
-±¼¸²
+êµ´ë¦¼
 9
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 949
 # RTL - anything else than RTL means LTR
 -
 # Translation by dTomoyo dtomoyo@empal.com ( ~V2.0 BETA2 ) / By hardkoder@gmail.com (V2.0 BETA3 ~ )
 # ^Branding
-³Î¼ÒÇÁÆ® ¼³Ä¡ ½Ã½ºÅÛ %s
+Nullsoft Install System %s
 # ^SetupCaption
-$(^Name) ¼³Ä¡
+$(^Name) ì„¤ì¹˜
 # ^UninstallCaption
-$(^Name) Á¦°Å
+$(^Name) ì œê±°
 # ^LicenseSubCaption
-: »ç¿ë±Ç °è¾à µ¿ÀÇ
+: ì‚¬ìš©ê¶Œ ê³„ì•½ ë�™ì�˜
 # ^ComponentsSubCaption
-: ¼³Ä¡ ¿É¼Ç
+: ì„¤ì¹˜ ì˜µì…˜
 # ^DirSubCaption
-: Æú´õ ÁöÁ¤
+: í�´ë�” ì§€ì •
 # ^InstallingSubCaption
-: ÆÄÀÏ ¼³Ä¡Áß
+: íŒŒì�¼ ì„¤ì¹˜ì¤‘
 # ^CompletedSubCaption
-: ¼³Ä¡ ¿Ï·á
+: ì„¤ì¹˜ ì™„ë£Œ
 # ^UnComponentsSubCaption
-: Á¦°Å ¿É¼Ç
+: ì œê±° ì˜µì…˜
 # ^UnDirSubCaption
-: Á¦°Å Æú´õ
+: ì œê±° í�´ë�”
 # ^ConfirmSubCaption
-: È®ÀÎ 
+: í™•ì�¸ 
 # ^UninstallingSubCaption
-: Á¦°ÅÁß
+: ì œê±°ì¤‘
 # ^UnCompletedSubCaption
-: Á¦°Å ¿Ï·á
+: ì œê±° ì™„ë£Œ
 # ^BackBtn
-< µÚ·Î
+< ë’¤ë¡œ
 # ^NextBtn
-´ÙÀ½ >
+ë‹¤ì�Œ >
 # ^AgreeBtn
-µ¿ÀÇÇÔ
+ë�™ì�˜í•¨
 # ^AcceptBtn
-À§ »çÇ×¿¡ µ¿ÀÇÇÕ´Ï´Ù.
+ìœ„ ì‚¬í•­ì—� ë�™ì�˜í•©ë‹ˆë‹¤.
 # ^DontAcceptBtn
-µ¿ÀÇÇÏÁö ¾Ê½À´Ï´Ù.
+ë�™ì�˜í•˜ì§€ ì•ŠìŠµë‹ˆë‹¤.
 # ^InstallBtn
-¼³Ä¡
+ì„¤ì¹˜
 # ^UninstallBtn
-Á¦°Å
+ì œê±°
 # ^CancelBtn
-Ãë¼Ò
+ì·¨ì†Œ
 # ^CloseBtn
-´ÝÀ½
+ë‹«ì�Œ
 # ^BrowseBtn
-Ã£¾Æº¸±â...
+ì°¾ì•„ë³´ê¸°...
 # ^ShowDetailsBtn
-ÀÚ¼¼È÷ º¸±â
+ìž�ì„¸ížˆ ë³´ê¸°
 # ^ClickNext
-°è¼ÓÇÏ½Ã·Á¸é '´ÙÀ½' ¹öÆ°À» ´­·¯ ÁÖ¼¼¿ä.
+ê³„ì†�í•˜ì‹œë ¤ë©´ 'ë‹¤ì�Œ' ë²„íŠ¼ì�„ ëˆŒëŸ¬ ì£¼ì„¸ìš”.
 # ^ClickInstall
-¼³Ä¡¸¦ ½ÃÀÛÇÏ½Ã·Á¸é '¼³Ä¡' ¹öÆ°À» ´­·¯ ÁÖ¼¼¿ä.
+ì„¤ì¹˜ë¥¼ ì‹œìž‘í•˜ì‹œë ¤ë©´ 'ì„¤ì¹˜' ë²„íŠ¼ì�„ ëˆŒëŸ¬ ì£¼ì„¸ìš”.
 # ^ClickUninstall
-'Á¦°Å' ¹öÆ°À» ´©¸£¸é Á¦°Å°¡ ½ÃÀÛµË´Ï´Ù.
+'ì œê±°' ë²„íŠ¼ì�„ ëˆ„ë¥´ë©´ ì œê±°ê°€ ì‹œìž‘ë�©ë‹ˆë‹¤.
 # ^Name
-ÀÌ¸§
+ì�´ë¦„
 # ^Completed
-¿Ï·á
+ì™„ë£Œ
 # ^LicenseText
-$(^NameDA)(À»)¸¦ ¼³Ä¡ÇÏ±â Àü¿¡ »ç¿ë±Ç °è¾à ³»¿ëÀ» »ìÆìº¸½Ã±â ¹Ù¶ø´Ï´Ù. ³»¿ë¿¡ µ¿ÀÇÇÏ¼Ì´Ù¸é 'µ¿ÀÇÇÔ'À» ´­·¯ ÁÖ¼¼¿ä.
+$(^NameDA)(ì�„)ë¥¼ ì„¤ì¹˜í•˜ê¸° ì „ì—� ì‚¬ìš©ê¶Œ ê³„ì•½ ë‚´ìš©ì�„ ì‚´íŽ´ë³´ì‹œê¸° ë°”ëž�ë‹ˆë‹¤. ë‚´ìš©ì—� ë�™ì�˜í•˜ì…¨ë‹¤ë©´ 'ë�™ì�˜í•¨'ì�„ ëˆŒëŸ¬ ì£¼ì„¸ìš”.
 # ^LicenseTextCB
-$(^NameDA)(À»)¸¦ ¼³Ä¡ÇÏ±â Àü¿¡ »ç¿ë±Ç °è¾à ³»¿ëÀ» »ìÆìº¸½Ã±â ¹Ù¶ø´Ï´Ù. ³»¿ë¿¡ µ¿ÀÇÇÏ¼Ì´Ù¸é ¾Æ·¡ »çÇ×À» Ã¼Å©ÇØ ÁÖ¼¼¿ä. $_CLICK
+$(^NameDA)(ì�„)ë¥¼ ì„¤ì¹˜í•˜ê¸° ì „ì—� ì‚¬ìš©ê¶Œ ê³„ì•½ ë‚´ìš©ì�„ ì‚´íŽ´ë³´ì‹œê¸° ë°”ëž�ë‹ˆë‹¤. ë‚´ìš©ì—� ë�™ì�˜í•˜ì…¨ë‹¤ë©´ ì•„ëž˜ ì‚¬í•­ì�„ ì²´í�¬í•´ ì£¼ì„¸ìš”. $_CLICK
 # ^LicesnseTextRB
-$(^NameDA)(À»)¸¦ ¼³Ä¡ÇÏ±â Àü¿¡ »ç¿ë±Ç °è¾à ³»¿ëÀ» »ìÆìº¸½Ã±â ¹Ù¶ø´Ï´Ù. ³»¿ë¿¡ µ¿ÀÇÇÏ¼Ì´Ù¸é ¾Æ·¡ ¿É¼ÇÀ» ¼±ÅÃÇØ ÁÖ¼¼¿ä. $_CLICK
+$(^NameDA)(ì�„)ë¥¼ ì„¤ì¹˜í•˜ê¸° ì „ì—� ì‚¬ìš©ê¶Œ ê³„ì•½ ë‚´ìš©ì�„ ì‚´íŽ´ë³´ì‹œê¸° ë°”ëž�ë‹ˆë‹¤. ë‚´ìš©ì—� ë�™ì�˜í•˜ì…¨ë‹¤ë©´ ì•„ëž˜ ì˜µì…˜ì�„ ì„ íƒ�í•´ ì£¼ì„¸ìš”. $_CLICK
 # ^UnLicenseText
-$(^NameDA)(À»)¸¦ Á¦°ÅÇÏ±â Àü¿¡ »ç¿ë±Ç °è¾à ³»¿ëÀ» »ìÆìº¸½Ã±â ¹Ù¶ø´Ï´Ù. ³»¿ë¿¡ µ¿ÀÇÇÏ¼Ì´Ù¸é 'µ¿ÀÇÇÔ'À» ´­·¯ ÁÖ¼¼¿ä.
+$(^NameDA)(ì�„)ë¥¼ ì œê±°í•˜ê¸° ì „ì—� ì‚¬ìš©ê¶Œ ê³„ì•½ ë‚´ìš©ì�„ ì‚´íŽ´ë³´ì‹œê¸° ë°”ëž�ë‹ˆë‹¤. ë‚´ìš©ì—� ë�™ì�˜í•˜ì…¨ë‹¤ë©´ 'ë�™ì�˜í•¨'ì�„ ëˆŒëŸ¬ ì£¼ì„¸ìš”.
 # ^UnLicenseTextCB
-$(^NameDA)(À»)¸¦ Á¦°ÅÇÏ±â Àü¿¡ »ç¿ë±Ç °è¾à ³»¿ëÀ» »ìÆìº¸½Ã±â ¹Ù¶ø´Ï´Ù. ³»¿ë¿¡ µ¿ÀÇÇÏ¼Ì´Ù¸é ¾Æ·¡ »çÇ×À» Ã¼Å©ÇØ ÁÖ¼¼¿ä. $_CLICK
+$(^NameDA)(ì�„)ë¥¼ ì œê±°í•˜ê¸° ì „ì—� ì‚¬ìš©ê¶Œ ê³„ì•½ ë‚´ìš©ì�„ ì‚´íŽ´ë³´ì‹œê¸° ë°”ëž�ë‹ˆë‹¤. ë‚´ìš©ì—� ë�™ì�˜í•˜ì…¨ë‹¤ë©´ ì•„ëž˜ ì‚¬í•­ì�„ ì²´í�¬í•´ ì£¼ì„¸ìš”. $_CLICK
 # ^UnLicesnseTextRB
-$(^NameDA)(À»)¸¦ Á¦°ÅÇÏ±â Àü¿¡ »ç¿ë±Ç °è¾à ³»¿ëÀ» »ìÆìº¸½Ã±â ¹Ù¶ø´Ï´Ù. ³»¿ë¿¡ µ¿ÀÇÇÏ¼Ì´Ù¸é ¾Æ·¡ ¿É¼ÇÀ» ¼±ÅÃÇØ ÁÖ¼¼¿ä. $_CLICK
+$(^NameDA)(ì�„)ë¥¼ ì œê±°í•˜ê¸° ì „ì—� ì‚¬ìš©ê¶Œ ê³„ì•½ ë‚´ìš©ì�„ ì‚´íŽ´ë³´ì‹œê¸° ë°”ëž�ë‹ˆë‹¤. ë‚´ìš©ì—� ë�™ì�˜í•˜ì…¨ë‹¤ë©´ ì•„ëž˜ ì˜µì…˜ì�„ ì„ íƒ�í•´ ì£¼ì„¸ìš”. $_CLICK
 # ^Custom
-»ç¿ëÀÚ Á¤ÀÇ
+ì‚¬ìš©ìž� ì •ì�˜
 # ^ComponentsText
-¼³Ä¡¸¦ ¿øÇÏ½Ã´Â ±¸¼º ¿ä¼Ò¸¦ ¼±ÅÃÇÏ¿© ÁÖ½Ã±â ¹Ù¶ø´Ï´Ù. $_CLICK
+ì„¤ì¹˜ë¥¼ ì›�í•˜ì‹œëŠ” êµ¬ì„± ìš”ì†Œë¥¼ ì„ íƒ�í•˜ì—¬ ì£¼ì‹œê¸° ë°”ëž�ë‹ˆë‹¤. $_CLICK
 # ^ComponentsSubText1
-¼³Ä¡ ÇüÅÂ ¼±ÅÃ:
+ì„¤ì¹˜ í˜•íƒœ ì„ íƒ�:
 # ^ComponentsSubText2_NoInstTypes
-¼³Ä¡ÇÏ·Á´Â ±¸¼º ¿ä¼Ò ¼±ÅÃ:
+ì„¤ì¹˜í•˜ë ¤ëŠ” êµ¬ì„± ìš”ì†Œ ì„ íƒ�:
 # ^ComponentsSubText2
-±¸¼º¿ä¼Ò Á÷Á¢ ¼±ÅÃ:
+êµ¬ì„±ìš”ì†Œ ì§�ì ‘ ì„ íƒ�:
 # ^UnComponentsText
-Á¦°Å¸¦ ¿øÇÏ´Â ±¸¼º ¿ä¼Ò¸¦ Ã¼Å©ÇØ ÁÖ½Ã±â ¹Ù¶ø´Ï´Ù. $_CLICK
+ì œê±°ë¥¼ ì›�í•˜ëŠ” êµ¬ì„± ìš”ì†Œë¥¼ ì²´í�¬í•´ ì£¼ì‹œê¸° ë°”ëž�ë‹ˆë‹¤. $_CLICK
 # ^UnComponentsSubText1
-Á¦°Å ÇüÅÂ ¼±ÅÃ:
+ì œê±° í˜•íƒœ ì„ íƒ�:
 # ^UnComponentsSubText2_NoInstTypes
-Á¦°ÅÇÏ·Á´Â ±¸¼º ¿ä¼Ò ¼±ÅÃ:
+ì œê±°í•˜ë ¤ëŠ” êµ¬ì„± ìš”ì†Œ ì„ íƒ�:
 # ^UnComponentsSubText2
-Á¦°ÅÇÏ·Á´Â ±¸¼º¿ä¼Ò Á÷Á¢ ¼±ÅÃ:
+ì œê±°í•˜ë ¤ëŠ” êµ¬ì„±ìš”ì†Œ ì§�ì ‘ ì„ íƒ�:
 # ^DirText
-$(^NameDA)(À»)¸¦ ´ÙÀ½ Æú´õ¿¡ ¼³Ä¡ÇÒ ¿¹Á¤ÀÔ´Ï´Ù. \r\n´Ù¸¥ Æú´õ¿¡ ¼³Ä¡ÇÏ°í ½ÍÀ¸½Ã¸é 'Ã£¾Æº¸±â' ¹öÆ°À» ´­·¯¼­ ´Ù¸¥ Æú´õ¸¦ ¼±ÅÃÇØ ÁÖ¼¼¿ä. $_CLICK
+$(^NameDA)(ì�„)ë¥¼ ë‹¤ì�Œ í�´ë�”ì—� ì„¤ì¹˜í•  ì˜ˆì •ìž…ë‹ˆë‹¤. \r\në‹¤ë¥¸ í�´ë�”ì—� ì„¤ì¹˜í•˜ê³  ì‹¶ìœ¼ì‹œë©´ 'ì°¾ì•„ë³´ê¸°' ë²„íŠ¼ì�„ ëˆŒëŸ¬ì„œ ë‹¤ë¥¸ í�´ë�”ë¥¼ ì„ íƒ�í•´ ì£¼ì„¸ìš”. $_CLICK
 # ^DirSubText
-¼³Ä¡ Æú´õ
+ì„¤ì¹˜ í�´ë�”
 # ^DirBrowseText
-$(^NameDA)(À»)¸¦ ´ÙÀ½ Æú´õ¿¡ ¼³Ä¡ÇÕ´Ï´Ù:
+$(^NameDA)(ì�„)ë¥¼ ë‹¤ì�Œ í�´ë�”ì—� ì„¤ì¹˜í•©ë‹ˆë‹¤:
 # ^UnDirText
-$(^NameDA)(À»)¸¦ ´ÙÀ½ Æú´õ¿¡¼­ Á¦°ÅÇÒ ¿¹Á¤ÀÔ´Ï´Ù. \r\n´Ù¸¥ Æú´õ¿¡¼­ Á¦°ÅÇÏ°í ½ÍÀ¸½Ã¸é 'Ã£¾Æº¸±â' ¹öÆ°À» ´­·¯¼­ ´Ù¸¥ Æú´õ¸¦ ¼±ÅÃÇØ ÁÖ¼¼¿ä. $_CLICK
+$(^NameDA)(ì�„)ë¥¼ ë‹¤ì�Œ í�´ë�”ì—�ì„œ ì œê±°í•  ì˜ˆì •ìž…ë‹ˆë‹¤. \r\në‹¤ë¥¸ í�´ë�”ì—�ì„œ ì œê±°í•˜ê³  ì‹¶ìœ¼ì‹œë©´ 'ì°¾ì•„ë³´ê¸°' ë²„íŠ¼ì�„ ëˆŒëŸ¬ì„œ ë‹¤ë¥¸ í�´ë�”ë¥¼ ì„ íƒ�í•´ ì£¼ì„¸ìš”. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-$(^NameDA)(À»)¸¦ ´ÙÀ½ Æú´õ¿¡¼­ Á¦°Å ÇÕ´Ï´Ù:
+$(^NameDA)(ì�„)ë¥¼ ë‹¤ì�Œ í�´ë�”ì—�ì„œ ì œê±° í•©ë‹ˆë‹¤:
 # ^SpaceAvailable
-"³²Àº µð½ºÅ© °ø°£: "
+"ë‚¨ì�€ ë””ìŠ¤í�¬ ê³µê°„: "
 # ^SpaceRequired
-"ÇÊ¿äÇÑ µð½ºÅ© °ø°£: "
+"í•„ìš”í•œ ë””ìŠ¤í�¬ ê³µê°„: "
 # ^UninstallingText
-½Ã½ºÅÛ¿¡¼­ $(^NameDA)(À»)¸¦ Á¦°Å ÇÒ °ÍÀÔ´Ï´Ù. $_CLICK
+ì‹œìŠ¤í…œì—�ì„œ $(^NameDA)(ì�„)ë¥¼ ì œê±° í•  ê²ƒìž…ë‹ˆë‹¤. $_CLICK
 # ^UninstallingText
-Á¦°Å ´ë»ó:
+ì œê±° ëŒ€ìƒ�:
 # ^FileError
-´ÙÀ½ ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù.: \r\n\t"$0"\r\n'Áß´Ü'À» ´­·¯ ¼³Ä¡¸¦ Á¾·áÇÏ°Å³ª,\r'´Ù½Ã ½Ãµµ'¸¦ ´­·¯ ´Ù½Ã ½ÃµµÇØ º¸°Å³ª,\r'¹«½Ã'¸¦ ´­·¯ ÀÌ ÆÄÀÏÀ» °Ç³Ê ¶Ù¼¼¿ä.
+ë‹¤ì�Œ íŒŒì�¼ì�„ ì—´ ìˆ˜ ì—†ìŠµë‹ˆë‹¤.: \r\n\t"$0"\r\n'ì¤‘ë‹¨'ì�„ ëˆŒëŸ¬ ì„¤ì¹˜ë¥¼ ì¢…ë£Œí•˜ê±°ë‚˜,\r'ë‹¤ì‹œ ì‹œë�„'ë¥¼ ëˆŒëŸ¬ ë‹¤ì‹œ ì‹œë�„í•´ ë³´ê±°ë‚˜,\r'ë¬´ì‹œ'ë¥¼ ëˆŒëŸ¬ ì�´ íŒŒì�¼ì�„ ê±´ë„ˆ ë›°ì„¸ìš”.
 # ^FileError_NoIgnore
-´ÙÀ½ ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù.: \r\n\t"$0"\r\n'´Ù½Ã ½Ãµµ'¸¦ ´­·¯ ´Ù½Ã ½ÃµµÇØ º¸°Å³ª,\r'Ãë¼Ò'¸¦ ´­·¯ ¼³Ä¡¸¦ Á¾·áÇÏ¼¼¿ä.
+ë‹¤ì�Œ íŒŒì�¼ì�„ ì—´ ìˆ˜ ì—†ìŠµë‹ˆë‹¤.: \r\n\t"$0"\r\n'ë‹¤ì‹œ ì‹œë�„'ë¥¼ ëˆŒëŸ¬ ë‹¤ì‹œ ì‹œë�„í•´ ë³´ê±°ë‚˜,\r'ì·¨ì†Œ'ë¥¼ ëˆŒëŸ¬ ì„¤ì¹˜ë¥¼ ì¢…ë£Œí•˜ì„¸ìš”.
 # ^CantWrite
-"±â·ÏÇÒ ¼ö ¾øÀ½: "
+"ê¸°ë¡�í•  ìˆ˜ ì—†ì�Œ: "
 # ^CopyFailed
-º¹»ç ½ÇÆÐ
+ë³µì‚¬ ì‹¤íŒ¨
 # ^CopyTo
-"ÆÄÀÏ º¹»ç "
+"íŒŒì�¼ ë³µì‚¬ "
 # ^Registering
-"µî·ÏÁß: "
+"ë“±ë¡�ì¤‘: "
 # ^Unregistering
-"µî·Ï ÇØÁ¦Áß: "
+"ë“±ë¡� í•´ì œì¤‘: "
 # ^SymbolNotFound
-"½Éº¼À» Ã£À» ¼ö ¾øÀ½: "
+"ì‹¬ë³¼ì�„ ì°¾ì�„ ìˆ˜ ì—†ì�Œ: "
 # ^CouldNotLoad
-"ºÒ·¯¿Ã ¼ö ¾øÀ½: "
+"ë¶ˆëŸ¬ì˜¬ ìˆ˜ ì—†ì�Œ: "
 # ^CreateFolder
-"Æú´õ »ý¼º: "
+"í�´ë�” ìƒ�ì„±: "
 # ^CreateShortcut
-"¹Ù·Î °¡±â »ý¼º: "
+"ë°”ë¡œ ê°€ê¸° ìƒ�ì„±: "
 # ^CreatedUninstaller
-"¾ðÀÎ½ºÅç·¯ »ý¼º: "
+"ì–¸ì�¸ìŠ¤í†¨ëŸ¬ ìƒ�ì„±: "
 # ^Delete
-"ÆÄÀÏ »èÁ¦: "
+"íŒŒì�¼ ì‚­ì œ: "
 # ^DeleteOnReboot
-"ÀçºÎÆÃ½Ã »èÁ¦: "
+"ìž¬ë¶€íŒ…ì‹œ ì‚­ì œ: "
 # ^ErrorCreatingShortcut
-"¹Ù·Î °¡±â »ý¼º ¿À·ù: "
+"ë°”ë¡œ ê°€ê¸° ìƒ�ì„± ì˜¤ë¥˜: "
 # ^ErrorCreating
-"»ý¼º ½ÇÆÐ: "
+"ìƒ�ì„± ì‹¤íŒ¨: "
 # ^ErrorDecompressing
-¾ÐÃà ÇØÁ¦Áß ¿À·ù ¹ß»ý! ¼³Ä¡ ÆÄÀÏÀÌ ¼Õ»óµÇ¾ú½À´Ï´Ù.
+ì••ì¶• í•´ì œì¤‘ ì˜¤ë¥˜ ë°œìƒ�! ì„¤ì¹˜ íŒŒì�¼ì�´ ì†�ìƒ�ë�˜ì—ˆìŠµë‹ˆë‹¤.
 # ^ErrorRegistering
-DLL µî·Ï ½ÇÆÐ
+DLL ë“±ë¡� ì‹¤íŒ¨
 # ^ExecShell
-"½© ½ÇÇà: "
+"ì‰˜ ì‹¤í–‰: "
 # ^Exec
-"½ÇÇà: "
+"ì‹¤í–‰: "
 # ^Extract
-"¾ÐÃà ÇØÁ¦: "
+"ì••ì¶• í•´ì œ: "
 # ^ErrorWriting
-"¾ÐÃà ÇØÁ¦: ÆÄÀÏÀ» ±â·ÏÇÏ´Â µµÁß ¿À·ù ¹ß»ý "
+"ì••ì¶• í•´ì œ: íŒŒì�¼ì�„ ê¸°ë¡�í•˜ëŠ” ë�„ì¤‘ ì˜¤ë¥˜ ë°œìƒ� "
 # ^InvalidOpcode
-ÀÎ½ºÅç·¯ ¼Õ»óµÊ: Àß¸øµÈ ½ÇÇàÄÚµå
+ì�¸ìŠ¤í†¨ëŸ¬ ì†�ìƒ�ë�¨: ìž˜ëª»ë�œ ì‹¤í–‰ì½”ë“œ
 # ^NoOLE
-"OLE Á¤º¸ ¾øÀ½: "
+"OLE ì •ë³´ ì—†ì�Œ: "
 # ^OutputFolder
-"´ë»ó Æú´õ: "
+"ëŒ€ìƒ� í�´ë�”: "
 # ^RemoveFolder
-"Æú´õ »èÁ¦: "
+"í�´ë�” ì‚­ì œ: "
 # ^RenameOnReboot
-"ÀçºÎÆÃ½Ã ÀÌ¸§ º¯°æ: "
+"ìž¬ë¶€íŒ…ì‹œ ì�´ë¦„ ë³€ê²½: "
 # ^Rename
-"ÀÌ¸§ º¯°æ: "
+"ì�´ë¦„ ë³€ê²½: "
 # ^Skipped
-"°Ç³Ê¶Ü: "
+"ê±´ë„ˆëœ€: "
 # ^CopyDetails
-ÀÚ¼¼ÇÑ ³»¿ëÀ» Å¬¸³º¸µå·Î º¹»ç
+ìž�ì„¸í•œ ë‚´ìš©ì�„ í�´ë¦½ë³´ë“œë¡œ ë³µì‚¬
 # ^LogInstall
-¼³Ä¡ ·Î±× ÀÛ¼º
+ì„¤ì¹˜ ë¡œê·¸ ìž‘ì„±
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Galician.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Galician.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Galician.nsh	(revision 2956)
@@ -1,32 +1,32 @@
-;Language: Galician (1110)
+ï»¿;Language: Galician (1110)
 ;Ramon Flores <fa2ramon@usc.es>
 
-!insertmacro LANGFILE "Galician" "Galego"
+!insertmacro LANGFILE "Galician" = "Galego" =
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Benvindo ao Asistente de Instalación do $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Este asistente vai axudá-lo durante a instalación do $(^NameDA).$\r$\n$\r$\nRecomenda-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} MUI_TEXT_WELCOME_INFO_TITLE "Benvindo ao Asistente de InstalaciÃ³n do $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Este asistente vai axudÃ¡-lo durante a instalaciÃ³n do $(^NameDA).$\r$\n$\r$\nRecomenda-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"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Benvindo ao Asistente de desinstalación do $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Este asistente vai axudá-lo durante a desinstalación do $(^NameDA).$\r$\n$\r$\nAntes de iniciar a desinstalación, certifique-se de que o $(^NameDA) non está a executar-se.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Benvindo ao Asistente de desinstalaciÃ³n do $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Este asistente vai axudÃ¡-lo durante a desinstalaciÃ³n do $(^NameDA).$\r$\n$\r$\nAntes de iniciar a desinstalaciÃ³n, certifique-se de que o $(^NameDA) non estÃ¡ a executar-se.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
   ${LangFileString} MUI_TEXT_LICENSE_TITLE "Contrato de licenza"
   ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Por favor, verifique os termos da licenza antes de instalar o $(^NameDA)."
   ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Se aceitar os termos da licenza, clique en 'Aceito' para continuar. Cumpre aceitar o contrato para instalar o $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Se aceitar os termos da licenza, clique na caixa de selección abaixo. Cumpre aceitar o contrato para instalar o $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Se aceitar os termos da licenza, seleccione a primeira opción abaixo. Cumpre aceitar o contrato para instalar o $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Se aceitar os termos da licenza, clique na caixa de selecciÃ³n abaixo. Cumpre aceitar o contrato para instalar o $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Se aceitar os termos da licenza, seleccione a primeira opciÃ³n abaixo. Cumpre aceitar o contrato para instalar o $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
   ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Contrato de licenza"
   ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Por favor, verifique os termos da licenza antes de desinstalar o $(^NameDA)."
   ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Se aceitar os termos da licenza, clique en 'Aceito' para continuar. Cumpre aceitar o contrato para desinstalar o $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Se aceitar os termos da licenza, clique na caixa de selección abaixo. Cumpre aceitar o contrato para desinstalar o $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Se aceitar os termos da licenza, seleccione a primeira opción abaixo. Cumpre aceitar o contrato para desinstalar o $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Se aceitar os termos da licenza, clique na caixa de selecciÃ³n abaixo. Cumpre aceitar o contrato para desinstalar o $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Se aceitar os termos da licenza, seleccione a primeira opciÃ³n abaixo. Cumpre aceitar o contrato para desinstalar o $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
@@ -35,61 +35,61 @@
 
 !ifdef MUI_COMPONENTSPAGE
   ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Escolla de componentes"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Escolla que características do $(^NameDA) que desexa instalar."
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Escolla que caracterÃ­sticas do $(^NameDA) que desexa instalar."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Escoller componentes"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Escolla que características do $(^NameDA) desexa desinstalar."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Escolla que caracterÃ­sticas do $(^NameDA) desexa desinstalar."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Descrición"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "DescriciÃ³n"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Posicione o rato sobre un componente para ver a sua descrición."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Posicione o rato sobre un componente para ver a sua descriciÃ³n."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Posicione o rato sobre un componente para ver a sua descrición."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Seleccione un componente para ver a sua descriciÃ³n."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Escolla do local da instalación"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Escolla a directória na cal desexa instalar o $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Escolla do local da instalaciÃ³n"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Escolla a directÃ³ria na cal desexa instalar o $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Escolla o Local de desinstalación"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Escolla a directória de onde pretende desinstalar o $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Escolla o Local de desinstalaciÃ³n"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Escolla a directÃ³ria de onde pretende desinstalar o $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Instalando"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Por favor, agarde entanto o $(^NameDA) está sendo instalado."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Instalación completa"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "A instalación concluiu con suceso."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Instalación Abortada"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "A instalación concluiu sen suceso."
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Por favor, agarde entanto o $(^NameDA) estÃ¡ sendo instalado."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "InstalaciÃ³n completa"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "A instalaciÃ³n concluiu con suceso."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "InstalaciÃ³n Abortada"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "A instalaciÃ³n concluiu sen suceso."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Desinstalando"
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Por favor, agarde entanto se desinstala o $(^NameDA)."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Desinstalación completa"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "A desinstalación concluiu con suceso."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Desinstalación abortada"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "A desinstalación non concluiu con suceso"
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "DesinstalaciÃ³n completa"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "A desinstalaciÃ³n concluiu con suceso."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "DesinstalaciÃ³n abortada"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "A desinstalaciÃ³n non concluiu con suceso"
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Concluindo o Asistente de instalación do $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Concluindo o Asistente de instalaciÃ³n do $(^NameDA)"
   ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Instalou-se o $(^NameDA) no seu computador.$\r$\n$\r$\nClique en Rematar para fechar este asistente."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Cumpre reiniciar o seu computador para concluír a instalación do $(^NameDA). Desexa reiniciar agora?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Cumpre reiniciar o seu computador para concluÃ­r a instalaciÃ³n do $(^NameDA). Desexa reiniciar agora?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Concluíndo o asistente de desinstalación do $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "ConcluÃ­ndo o asistente de desinstalaciÃ³n do $(^NameDA)"
   ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Eliminou-se $(^NameDA) do seu computador.$\r$\n$\r$\nClique em Rematar para fechar este asistente."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Cumpre reiniciar o seu computador para concluír a desinstalación do $(^NameDA). Desexa reiniciá-lo agora?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Cumpre reiniciar o seu computador para concluÃ­r a desinstalaciÃ³n do $(^NameDA). Desexa reiniciÃ¡-lo agora?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
@@ -103,7 +103,7 @@
 !ifdef MUI_STARTMENUPAGE
   ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Escolla un cartafol do Menu Iniciar"
   ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Escolla un cartafol do Menu Iniciar para os atallos do programa."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Seleccione o cartafol do Menu Iniciar no que desexa criar os atallos do programa. Tamén é posíbel dixitar un nome para criar un novo cartafol. "
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Seleccione o cartafol do Menu Iniciar no que desexa criar os atallos do programa. TamÃ©n Ã© posÃ­bel dixitar un nome para criar un novo cartafol. "
   ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Non criar atallos"
 !endif
 
@@ -113,9 +113,9 @@
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Realmente desexa cancelar a instalación do $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Realmente desexa cancelar a instalaciÃ³n do $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Realmente desexa cancelar a desinstalación do $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Realmente desexa cancelar a desinstalaciÃ³n do $(^Name)?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Dutch.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Dutch.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Dutch.nsh	(revision 2956)
@@ -1,7 +1,7 @@
-;Language: Dutch (1043)
+ï»¿;Language: Dutch (1043)
 ;By Joost Verburg
 
-!insertmacro LANGFILE "Dutch" "Nederlands"
+!insertmacro LANGFILE "Dutch" = "Nederlands" =
 
 !ifdef MUI_WELCOMEPAGE
   ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Welkom bij de $(^NameDA)-installatiewizard"
@@ -9,7 +9,7 @@
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Welkom bij de $(^NameDA)-deïnstallatiewizard"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Welkom bij de $(^NameDA)-deÃ¯nstallatiewizard"
   ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Deze wizard zal $(^NameDA) van uw syteem verwijderen.$\r$\n$\r$\nControleer voordat u begint met verwijderen of $(^NameDA) is afgesloten.$\r$\n$\r$\n$_CLICK"
 !endif
 
@@ -48,7 +48,7 @@
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
     ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Beweeg uw muis over een onderdeel om de beschrijving te zien."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Beweeg uw muis over een onderdeel om de beschrijving te zien."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Selecteer een onderdeel om de beschrijving te zien."
   !endif
 !endif
 
@@ -64,7 +64,7 @@
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Bezig met installeren"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Een ogenblik geduld terwijl $(^NameDA) wordt geïnstalleerd."
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Een ogenblik geduld terwijl $(^NameDA) wordt geÃ¯nstalleerd."
   ${LangFileString} MUI_TEXT_FINISH_TITLE "Installatie voltooid"
   ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "De installatie is succesvol voltooid."
   ${LangFileString} MUI_TEXT_ABORT_TITLE "Installatie afgebroken"
@@ -82,12 +82,12 @@
 
 !ifdef MUI_FINISHPAGE
   ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Voltooien van de $(^NameDA)-installatiewizard"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) is geïnstalleerd op uw systeem.$\r$\n$\r$\nKlik op Voltooien om deze wizard te sluiten."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) is geÃ¯nstalleerd op uw systeem.$\r$\n$\r$\nKlik op Voltooien om deze wizard te sluiten."
   ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Uw systeem moet opnieuw worden opgestart om de installatie van $(^NameDA) te voltooien. Wilt u nu herstarten?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Voltooien van de $(^NameDA)-deïnstallatiewizard"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Voltooien van de $(^NameDA)-deÃ¯nstallatiewizard"
   ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) is van uw systeem verwijderd.$\r$\n$\r$\nKlik op Voltooien om deze wizard te sluiten."
   ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Uw systeem moet opnieuw worden opgestart om het verwijderen van $(^NameDA) te voltooien. Wilt u nu herstarten?"
 !endif
@@ -117,7 +117,7 @@
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Weet u zeker dat u de $(^Name)-deïnstallatie wilt afsluiten?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Weet u zeker dat u de $(^Name)-deÃ¯nstallatie wilt afsluiten?"
 !endif
 
 !ifdef MULTIUSER_INSTALLMODEPAGE
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Arabic.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Arabic.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Arabic.nlf	(revision 2956)
@@ -1,190 +1,190 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1025
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1256
 # RTL - anything else than RTL means LTR
 RTL
 # Translation by asdfuae@msn.com, updated by Rami Kattan
 # ^Branding
-äÙÇã ÇáÊäÕíÈ äáÓæÝÊ %s
+Nullsoft Install System %s
 # ^SetupCaption
-ÊäÕíÈ $(^Name)
+ØªÙ†ØµÙŠØ¨ $(^Name)
 # ^UninstallCaption
-ÅÒÇáÉ $(^Name)
+Ø¥Ø²Ø§Ù„Ø© $(^Name)
 # ^LicenseSubCaption
-ÅÊÝÇÞíÉþ ÇáÊÑÎíÕ :
+Ø¥ØªÙ�Ø§Ù‚ÙŠØ©â€� Ø§Ù„ØªØ±Ø®ÙŠØµ :
 # ^ComponentsSubCaption
-ÎíÇÑÇÊ ÇáÊäÕíÈ :
+Ø®ÙŠØ§Ø±Ø§Øª Ø§Ù„ØªÙ†ØµÙŠØ¨ :
 # ^DirSubCaption
-ãÌáÏ ÇáÊäÕíÈ :
+Ù…Ø¬Ù„Ø¯ Ø§Ù„ØªÙ†ØµÙŠØ¨ :
 # ^InstallingSubCaption
-ÊäÕíÈ :
+ØªÙ†ØµÙŠØ¨ :
 # ^CompletedSubCaption
-ÅäÊåì :
+Ø¥Ù†ØªÙ‡Ù‰ :
 # ^UnComponentsSubCaption
-ÎíÇÑÇÊ ÇáÅÒÇáÉ :
+Ø®ÙŠØ§Ø±Ø§Øª Ø§Ù„Ø¥Ø²Ø§Ù„Ø© :
 # ^UnDirSubCaption
-ãÌáÏ ÇáÅÒÇáÉ :
+Ù…Ø¬Ù„Ø¯ Ø§Ù„Ø¥Ø²Ø§Ù„Ø© :
 # ^ConfirmSubCaption
-ÊÃßíÏ :
+ØªØ£ÙƒÙŠØ¯ :
 # ^UninstallingSubCaption
-ÅÒÇáÉ :
+Ø¥Ø²Ø§Ù„Ø© :
 # ^UnCompletedSubCaption
-ÅäÊåì :
+Ø¥Ù†ØªÙ‡Ù‰ :
 # ^BackBtn
-< Çá&ÓÇÈÞ
+< Ø§Ù„&Ø³Ø§Ø¨Ù‚
 # ^NextBtn
-Çá&ÊÇáí >
+Ø§Ù„&ØªØ§Ù„ÙŠ >
 # ^AgreeBtn
-ãæÇÝÞ&
+Ù…ÙˆØ§Ù�Ù‚&
 # ^AcceptBtn
-&ÃæÇÝÞ Úáì ÔÑæØ ÇÊÝÇÞíÉ ÇáÊÑÎíÕ
+&Ø£ÙˆØ§Ù�Ù‚ Ø¹Ù„Ù‰ Ø´Ø±ÙˆØ· Ø§ØªÙ�Ø§Ù‚ÙŠØ© Ø§Ù„ØªØ±Ø®ÙŠØµ
 # ^DontAcceptBtn
-&áÇ ÃæÇÝÞ Úáì ÔÑæØ ÇÊÝÇÞíÉ ÇáÊÑÎíÕ
+&Ù„Ø§ Ø£ÙˆØ§Ù�Ù‚ Ø¹Ù„Ù‰ Ø´Ø±ÙˆØ· Ø§ØªÙ�Ø§Ù‚ÙŠØ© Ø§Ù„ØªØ±Ø®ÙŠØµ
 # ^InstallBtn
-&ÊäÕíÈ
+&ØªÙ†ØµÙŠØ¨
 # ^UninstallBtn
-&ÅÒÇáÉ
+&Ø¥Ø²Ø§Ù„Ø©
 # ^CancelBtn
-ÅáÛÇÁ
+Ø¥Ù„ØºØ§Ø¡
 # ^CloseBtn
-Å&ÛáÇÞ
+Ø¥&ØºÙ„Ø§Ù‚
 # ^BrowseBtn
-&ÚÑÖ...
+&Ø¹Ø±Ø¶...
 # ^ShowDetailsBtn
-Å&ÙåÇÑ ÇáÊÝÇÕíá
+Ø¥&Ø¸Ù‡Ø§Ø± Ø§Ù„ØªÙ�Ø§ØµÙŠÙ„
 # ^ClickNext
-ÅÖÛØ Úáì ÇáÊÇáí ááãÊÇÈÚÉ.
+Ø¥Ø¶ØºØ· Ø¹Ù„Ù‰ Ø§Ù„ØªØ§Ù„ÙŠ Ù„Ù„Ù…ØªØ§Ø¨Ø¹Ø©.
 # ^ClickInstall
-ÅÖÛØ Úáì ÊäÕíÈ áÊÔÛíá ÇáÊäÕíÈ.
+Ø¥Ø¶ØºØ· Ø¹Ù„Ù‰ ØªÙ†ØµÙŠØ¨ Ù„ØªØ´ØºÙŠÙ„ Ø§Ù„ØªÙ†ØµÙŠØ¨.
 # ^ClickUninstall
-ÅÖÛØ Úáì ÅÒÇáÉ áÊÔÛíá ÇáÅÒÇáÉ.
+Ø¥Ø¶ØºØ· Ø¹Ù„Ù‰ Ø¥Ø²Ø§Ù„Ø© Ù„ØªØ´ØºÙŠÙ„ Ø§Ù„Ø¥Ø²Ø§Ù„Ø©.
 # ^Name
-ÇáÅÓã
+Ø§Ù„Ø¥Ø³Ù…
 # ^Completed
-ÅäÊåì
+Ø¥Ù†ØªÙ‡Ù‰
 # ^LicenseText
-ÇáÑÌÇÁ ãÑÇÌÚÉ ÅÊÝÇÞíÉ ÇáÊÑÎíÕ ÞÈá ÊäÕíÈ $(^NameDA). ÚäÏ ÇáãæÇÝÞÉ Úáì ÌãíÚ ÔÑæØ ÇáÅÊÝÇÞíÉ¡ ÅÖÛØ ãæÇÝÞ.
+Ø§Ù„Ø±Ø¬Ø§Ø¡ Ù…Ø±Ø§Ø¬Ø¹Ø© Ø¥ØªÙ�Ø§Ù‚ÙŠØ© Ø§Ù„ØªØ±Ø®ÙŠØµ Ù‚Ø¨Ù„ ØªÙ†ØµÙŠØ¨ $(^NameDA). Ø¹Ù†Ø¯ Ø§Ù„Ù…ÙˆØ§Ù�Ù‚Ø© Ø¹Ù„Ù‰ Ø¬Ù…ÙŠØ¹ Ø´Ø±ÙˆØ· Ø§Ù„Ø¥ØªÙ�Ø§Ù‚ÙŠØ©ØŒ Ø¥Ø¶ØºØ· Ù…ÙˆØ§Ù�Ù‚.
 # ^LicenseTextCB
-ÇáÑÌÇÁ ãÑÇÌÚÉ ÅÊÝÇÞíÉ ÇáÊÑÎíÕ ÞÈá ÊäÕíÈ $(^NameDA). ÚäÏ ÇáãæÇÝÞÉ Úáì ÌãíÚ ÔÑæØ ÇáÅÊÝÇÞíÉ¡ ÅÖÛØ Úáì ãÑÈÚ ÇáãÄÔÑ ÇáÊÇáí. $_CLICK.
+Ø§Ù„Ø±Ø¬Ø§Ø¡ Ù…Ø±Ø§Ø¬Ø¹Ø© Ø¥ØªÙ�Ø§Ù‚ÙŠØ© Ø§Ù„ØªØ±Ø®ÙŠØµ Ù‚Ø¨Ù„ ØªÙ†ØµÙŠØ¨ $(^NameDA). Ø¹Ù†Ø¯ Ø§Ù„Ù…ÙˆØ§Ù�Ù‚Ø© Ø¹Ù„Ù‰ Ø¬Ù…ÙŠØ¹ Ø´Ø±ÙˆØ· Ø§Ù„Ø¥ØªÙ�Ø§Ù‚ÙŠØ©ØŒ Ø¥Ø¶ØºØ· Ø¹Ù„Ù‰ Ù…Ø±Ø¨Ø¹ Ø§Ù„Ù…Ø¤Ø´Ø± Ø§Ù„ØªØ§Ù„ÙŠ. $_CLICK.
 # ^LicenseTextRB
-ÇáÑÌÇÁ ãÑÇÌÚÉ ÅÊÝÇÞíÉ ÇáÊÑÎíÕ ÞÈá ÊäÕíÈ $(^NameDA). ÚäÏ ÇáãæÇÝÞÉ Úáì ÌãíÚ ÔÑæØ ÇáÅÊÝÇÞíÉ¡ ÅÎÊÑ ÇáÎíÇÑ ÇáÃæá ÇáÊÇáí. $_CLICK
+Ø§Ù„Ø±Ø¬Ø§Ø¡ Ù…Ø±Ø§Ø¬Ø¹Ø© Ø¥ØªÙ�Ø§Ù‚ÙŠØ© Ø§Ù„ØªØ±Ø®ÙŠØµ Ù‚Ø¨Ù„ ØªÙ†ØµÙŠØ¨ $(^NameDA). Ø¹Ù†Ø¯ Ø§Ù„Ù…ÙˆØ§Ù�Ù‚Ø© Ø¹Ù„Ù‰ Ø¬Ù…ÙŠØ¹ Ø´Ø±ÙˆØ· Ø§Ù„Ø¥ØªÙ�Ø§Ù‚ÙŠØ©ØŒ Ø¥Ø®ØªØ± Ø§Ù„Ø®ÙŠØ§Ø± Ø§Ù„Ø£ÙˆÙ„ Ø§Ù„ØªØ§Ù„ÙŠ. $_CLICK
 # ^UnLicenseText
-ÇáÑÌÇÁ ãÑÇÌÚÉ ÅÊÝÇÞíÉ ÇáÊÑÎíÕ ÞÈá ÅÒÇáÉ $(^NameDA). ÚäÏ ÇáãæÇÝÞÉ Úáì ÌãíÚ ÔÑæØ ÇáÅÊÝÇÞíÉ¡ ÅÖÛØ ãæÇÝÞ.
+Ø§Ù„Ø±Ø¬Ø§Ø¡ Ù…Ø±Ø§Ø¬Ø¹Ø© Ø¥ØªÙ�Ø§Ù‚ÙŠØ© Ø§Ù„ØªØ±Ø®ÙŠØµ Ù‚Ø¨Ù„ Ø¥Ø²Ø§Ù„Ø© $(^NameDA). Ø¹Ù†Ø¯ Ø§Ù„Ù…ÙˆØ§Ù�Ù‚Ø© Ø¹Ù„Ù‰ Ø¬Ù…ÙŠØ¹ Ø´Ø±ÙˆØ· Ø§Ù„Ø¥ØªÙ�Ø§Ù‚ÙŠØ©ØŒ Ø¥Ø¶ØºØ· Ù…ÙˆØ§Ù�Ù‚.
 # ^UnLicenseTextCB
-ÇáÑÌÇÁ ãÑÇÌÚÉ ÅÊÝÇÞíÉ ÇáÊÑÎíÕ ÞÈá ÅÒÇáÉ $(^NameDA). ÚäÏ ÇáãæÇÝÞÉ Úáì ÌãíÚ ÔÑæØ ÇáÅÊÝÇÞíÉ¡ ÇÖÛØ Úáì ãÑÈÚ ÇáãÄÔÑ ÇáÊÇáí. $_CLICK
+Ø§Ù„Ø±Ø¬Ø§Ø¡ Ù…Ø±Ø§Ø¬Ø¹Ø© Ø¥ØªÙ�Ø§Ù‚ÙŠØ© Ø§Ù„ØªØ±Ø®ÙŠØµ Ù‚Ø¨Ù„ Ø¥Ø²Ø§Ù„Ø© $(^NameDA). Ø¹Ù†Ø¯ Ø§Ù„Ù…ÙˆØ§Ù�Ù‚Ø© Ø¹Ù„Ù‰ Ø¬Ù…ÙŠØ¹ Ø´Ø±ÙˆØ· Ø§Ù„Ø¥ØªÙ�Ø§Ù‚ÙŠØ©ØŒ Ø§Ø¶ØºØ· Ø¹Ù„Ù‰ Ù…Ø±Ø¨Ø¹ Ø§Ù„Ù…Ø¤Ø´Ø± Ø§Ù„ØªØ§Ù„ÙŠ. $_CLICK
 # ^UnLicenseTextRB
-ÇáÑÌÇÁ ãÑÇÌÚÉ ÅÊÝÇÞíÉ ÇáÊÑÎíÕ ÞÈá ÅÒÇáÉ $(^NameDA). ÚäÏ ÇáãæÇÝÞÉ Úáì ÌãíÚ ÔÑæØ ÇáÅÊÝÇÞíÉ¡ ÅÎÊÑ ÇáÎíÇÑ ÇáÃæá ÇáÊÇáí. $_CLICK
+Ø§Ù„Ø±Ø¬Ø§Ø¡ Ù…Ø±Ø§Ø¬Ø¹Ø© Ø¥ØªÙ�Ø§Ù‚ÙŠØ© Ø§Ù„ØªØ±Ø®ÙŠØµ Ù‚Ø¨Ù„ Ø¥Ø²Ø§Ù„Ø© $(^NameDA). Ø¹Ù†Ø¯ Ø§Ù„Ù…ÙˆØ§Ù�Ù‚Ø© Ø¹Ù„Ù‰ Ø¬Ù…ÙŠØ¹ Ø´Ø±ÙˆØ· Ø§Ù„Ø¥ØªÙ�Ø§Ù‚ÙŠØ©ØŒ Ø¥Ø®ØªØ± Ø§Ù„Ø®ÙŠØ§Ø± Ø§Ù„Ø£ÙˆÙ„ Ø§Ù„ØªØ§Ù„ÙŠ. $_CLICK
 # ^Custom
-ÅÎÊíÇÑí
+Ø¥Ø®ØªÙŠØ§Ø±ÙŠ
 # ^ComponentsText
-Úáøã ÇáãßæäÇÊ ÇáãÑÇÏ ÊäÕíÈåÇ æÅÒá ÇáÚáÇãÉ Úä ÇáãßæäÇÊ ÇáÛíÑ ãÑÇÏ ÊäÕíÈåÇ. $_CLICK
+Ø¹Ù„Ù‘Ù… Ø§Ù„Ù…ÙƒÙˆÙ†Ø§Øª Ø§Ù„Ù…Ø±Ø§Ø¯ ØªÙ†ØµÙŠØ¨Ù‡Ø§ ÙˆØ¥Ø²Ù„ Ø§Ù„Ø¹Ù„Ø§Ù…Ø© Ø¹Ù† Ø§Ù„Ù…ÙƒÙˆÙ†Ø§Øª Ø§Ù„ØºÙŠØ± Ù…Ø±Ø§Ø¯ ØªÙ†ØµÙŠØ¨Ù‡Ø§. $_CLICK
 # ^ComponentsSubText1
-ÅÎÊÑ äæÚ ÇáÊäÕíÈ:
+Ø¥Ø®ØªØ± Ù†ÙˆØ¹ Ø§Ù„ØªÙ†ØµÙŠØ¨:
 # ^ComponentsSubText2_NoInstTypes
-ÅÎÊÑ ÇáãßæäÇÊ ááÊäÕíÈ:
+Ø¥Ø®ØªØ± Ø§Ù„Ù…ÙƒÙˆÙ†Ø§Øª Ù„Ù„ØªÙ†ØµÙŠØ¨:
 # ^ComponentsSubText2
-Ãæ¡ Þã ÈÅÎÊíÇÑ ÇáãßæäÇÊ ÇáÅÎÊíÇÑíÉ ÇáãÑÇÏ ÊäÕíÈåÇ:
+Ø£ÙˆØŒ Ù‚Ù… Ø¨Ø¥Ø®ØªÙŠØ§Ø± Ø§Ù„Ù…ÙƒÙˆÙ†Ø§Øª Ø§Ù„Ø¥Ø®ØªÙŠØ§Ø±ÙŠØ© Ø§Ù„Ù…Ø±Ø§Ø¯ ØªÙ†ØµÙŠØ¨Ù‡Ø§:
 # ^UnComponentsText
-Úáøã ÇáãßæäÇÊ ÇáãÑÇÏ ÅÒÇáÊåÇ æÃÒá ÇáÚáÇãÉ Úä ÇáãßæäÇÊ ÇáÛíÑ ãÑÇÏ ÅÒÇáÊåÇ. $_CLICK
+Ø¹Ù„Ù‘Ù… Ø§Ù„Ù…ÙƒÙˆÙ†Ø§Øª Ø§Ù„Ù…Ø±Ø§Ø¯ Ø¥Ø²Ø§Ù„ØªÙ‡Ø§ ÙˆØ£Ø²Ù„ Ø§Ù„Ø¹Ù„Ø§Ù…Ø© Ø¹Ù† Ø§Ù„Ù…ÙƒÙˆÙ†Ø§Øª Ø§Ù„ØºÙŠØ± Ù…Ø±Ø§Ø¯ Ø¥Ø²Ø§Ù„ØªÙ‡Ø§. $_CLICK
 # ^UnComponentsSubText1
-ÅÎÊÑ äæÚ ÇáÅÒÇáÉ:
+Ø¥Ø®ØªØ± Ù†ÙˆØ¹ Ø§Ù„Ø¥Ø²Ø§Ù„Ø©:
 # ^UnComponentsSubText2_NoInstTypes
-ÅÎÊÑ ÇáãßæäÇÊ ááÅÒÇáÉ:
+Ø¥Ø®ØªØ± Ø§Ù„Ù…ÙƒÙˆÙ†Ø§Øª Ù„Ù„Ø¥Ø²Ø§Ù„Ø©:
 # ^UnComponentsSubText2
-Ãæ¡ ÅÎÊÑ ÇáãßæäÇÊ ÇáÅÎÊíÇÑíÉ ÇáãÑÇÏ ÅÒÇáÊåÇ:
+Ø£ÙˆØŒ Ø¥Ø®ØªØ± Ø§Ù„Ù…ÙƒÙˆÙ†Ø§Øª Ø§Ù„Ø¥Ø®ØªÙŠØ§Ø±ÙŠØ© Ø§Ù„Ù…Ø±Ø§Ø¯ Ø¥Ø²Ø§Ù„ØªÙ‡Ø§:
 # ^DirText
-ÓíÊã ÊäÕíÈ $(^NameDA) Ýí ÇáãÌáÏ ÇáÊÇáí. ááÊäÕíÈ Ýí ãÌáÏ ÂÎÑ¡ ÅÖÛØ ÚÑÖ æÅÎÊÑ ãÌáÏ ÂÎÑ. $_CLICK
+Ø³ÙŠØªÙ… ØªÙ†ØµÙŠØ¨ $(^NameDA) Ù�ÙŠ Ø§Ù„Ù…Ø¬Ù„Ø¯ Ø§Ù„ØªØ§Ù„ÙŠ. Ù„Ù„ØªÙ†ØµÙŠØ¨ Ù�ÙŠ Ù…Ø¬Ù„Ø¯ Ø¢Ø®Ø±ØŒ Ø¥Ø¶ØºØ· Ø¹Ø±Ø¶ ÙˆØ¥Ø®ØªØ± Ù…Ø¬Ù„Ø¯ Ø¢Ø®Ø±. $_CLICK
 # ^DirSubText
-ãÌáÏ ÇáåÏÝ
+Ù…Ø¬Ù„Ø¯ Ø§Ù„Ù‡Ø¯Ù�
 # ^DirBrowseText
-ÅÎÊÑ ÇáãÌáÏ áÊäÕíÈ $(^NameDA) Ýíå:
+Ø¥Ø®ØªØ± Ø§Ù„Ù…Ø¬Ù„Ø¯ Ù„ØªÙ†ØµÙŠØ¨ $(^NameDA) Ù�ÙŠÙ‡:
 # ^UnDirText
-ÓíÊã ÅÒÇáÉ $(^NameDA) ãä ÇáãÌáÏ ÇáÊÇáí. ááÅÒÇáÉ ãä ãÌáÏ ÂÎÑ¡ ÅÖÛØ ÚÑÖ æÃÎÊÑ ãÌáÏ ÂÎÑ. $_CLICK
+Ø³ÙŠØªÙ… Ø¥Ø²Ø§Ù„Ø© $(^NameDA) Ù…Ù† Ø§Ù„Ù…Ø¬Ù„Ø¯ Ø§Ù„ØªØ§Ù„ÙŠ. Ù„Ù„Ø¥Ø²Ø§Ù„Ø© Ù…Ù† Ù…Ø¬Ù„Ø¯ Ø¢Ø®Ø±ØŒ Ø¥Ø¶ØºØ· Ø¹Ø±Ø¶ ÙˆØ£Ø®ØªØ± Ù…Ø¬Ù„Ø¯ Ø¢Ø®Ø±. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-ÅÎÊÑ ÇáãÌáÏ áÅÒÇáÉ $(^NameDA) ãäå:
+Ø¥Ø®ØªØ± Ø§Ù„Ù…Ø¬Ù„Ø¯ Ù„Ø¥Ø²Ø§Ù„Ø© $(^NameDA) Ù…Ù†Ù‡:
 # ^SpaceAvailable
-"ÇáãÓÇÍÉ ÇáãÊæÝÑÉ: "
+"Ø§Ù„Ù…Ø³Ø§Ø­Ø© Ø§Ù„Ù…ØªÙˆÙ�Ø±Ø©: "
 # ^SpaceRequired
-"ÇáãÓÇÍÉ ÇáãØáæÈÉ: "
+"Ø§Ù„Ù…Ø³Ø§Ø­Ø© Ø§Ù„Ù…Ø·Ù„ÙˆØ¨Ø©: "
 # ^UninstallingText
-ÓíÊã ÅÒÇáÉ $(^NameDA) ãä ÇáãÌáÏ ÇáÊÇáí. $_CLICK
+Ø³ÙŠØªÙ… Ø¥Ø²Ø§Ù„Ø© $(^NameDA) Ù…Ù† Ø§Ù„Ù…Ø¬Ù„Ø¯ Ø§Ù„ØªØ§Ù„ÙŠ. $_CLICK
 # ^UninstallingSubText
-ÅÒÇáÉ ãä:
+Ø¥Ø²Ø§Ù„Ø© Ù…Ù†:
 # ^FileError
-ÍÏË Îáá ÃËäÇÁ ÝÊÍ ãáÝ ááßÊÇÈÉ: \r\n\t\"$0\"\r\nÅÖÛØ ÅáÛÇÁ áÅáÛÇÁ ÇáÊäÕíÈ¡\r\nãÍÇæáÉ áÅÚÇÏÉ ãÍÇæáÉ ßÊÇÈÉ ÇáãáÝ¡\r\n ÊÌÇåá áÊÎØí ÇáãáÝ
+Ø­Ø¯Ø« Ø®Ù„Ù„ Ø£Ø«Ù†Ø§Ø¡ Ù�ØªØ­ Ù…Ù„Ù� Ù„Ù„ÙƒØªØ§Ø¨Ø©: \r\n\t\"$0\"\r\nØ¥Ø¶ØºØ· Ø¥Ù„ØºØ§Ø¡ Ù„Ø¥Ù„ØºØ§Ø¡ Ø§Ù„ØªÙ†ØµÙŠØ¨ØŒ\r\nÙ…Ø­Ø§ÙˆÙ„Ø© Ù„Ø¥Ø¹Ø§Ø¯Ø© Ù…Ø­Ø§ÙˆÙ„Ø© ÙƒØªØ§Ø¨Ø© Ø§Ù„Ù…Ù„Ù�ØŒ\r\n ØªØ¬Ø§Ù‡Ù„ Ù„ØªØ®Ø·ÙŠ Ø§Ù„Ù…Ù„Ù�
 # ^FileError_NoIgnore
-ÍÏË Îáá ÃËäÇÁ ÝÊÍ ãáÝ ááßÊÇÈÉ: \r\n\t\"$0\"\r\nÅÖÛØ ãÍÇæáÉ áÅÚÇÏÉ ãÍÇæáÉ ßÊÇÈÉ ÇáãáÝ¡ Ãæ\r\nÅáÛÇÁ áÅáÛÇÁ ÇáÊäÕíÈ
+Ø­Ø¯Ø« Ø®Ù„Ù„ Ø£Ø«Ù†Ø§Ø¡ Ù�ØªØ­ Ù…Ù„Ù� Ù„Ù„ÙƒØªØ§Ø¨Ø©: \r\n\t\"$0\"\r\nØ¥Ø¶ØºØ· Ù…Ø­Ø§ÙˆÙ„Ø© Ù„Ø¥Ø¹Ø§Ø¯Ø© Ù…Ø­Ø§ÙˆÙ„Ø© ÙƒØªØ§Ø¨Ø© Ø§Ù„Ù…Ù„Ù�ØŒ Ø£Ùˆ\r\nØ¥Ù„ØºØ§Ø¡ Ù„Ø¥Ù„ØºØ§Ø¡ Ø§Ù„ØªÙ†ØµÙŠØ¨
 # ^CantWrite
-"áÇ íÓÊØíÚ ÇáßÊÇÈÉ: "
+"Ù„Ø§ ÙŠØ³ØªØ·ÙŠØ¹ Ø§Ù„ÙƒØªØ§Ø¨Ø©: "
 # ^CopyFailed
-ÝÔá ÇáäÓÎ
+Ù�Ø´Ù„ Ø§Ù„Ù†Ø³Ø®
 # ^CopyTo
-"äÓÎ Åáì"
+"Ù†Ø³Ø® Ø¥Ù„Ù‰"
 # ^Registering
-"ÊÓÌíá: "
+"ØªØ³Ø¬ÙŠÙ„: "
 # ^Unregistering
-"ÅáÛÇÁ ÊÓÌíá: "
+"Ø¥Ù„ØºØ§Ø¡ ØªØ³Ø¬ÙŠÙ„: "
 # ^SymbolNotFound
-"áã íÊãßä ãä ÅíÌÇÏ ÇáÑãÒ :"
+"Ù„Ù… ÙŠØªÙ…ÙƒÙ† Ù…Ù† Ø¥ÙŠØ¬Ø§Ø¯ Ø§Ù„Ø±Ù…Ø² :"
 # ^CouldNotLoad
-"áã íÊãßä ãä ÊÍãíá :"
+"Ù„Ù… ÙŠØªÙ…ÙƒÙ† Ù…Ù† ØªØ­Ù…ÙŠÙ„ :"
 # ^CreateFolder
-"ÅäÔÇÁ ãÌáÏ"
+"Ø¥Ù†Ø´Ø§Ø¡ Ù…Ø¬Ù„Ø¯"
 # ^CreateShortcut
-"ÅäÔÇÁ ÅÎÊÕÇÑ: "
+"Ø¥Ù†Ø´Ø§Ø¡ Ø¥Ø®ØªØµØ§Ø±: "
 # ^CreatedUninstaller
-"ÅäÔÇÁ ãÒíá: "
+"Ø¥Ù†Ø´Ø§Ø¡ Ù…Ø²ÙŠÙ„: "
 # ^Delete
-"ÍÐÝ ãáÝ: "
+"Ø­Ø°Ù� Ù…Ù„Ù�: "
 # ^DeleteOnReboot
-"ÍÐÝ ÈÚÏ ÅÚÇÏÉ ÇáÊÔÛíá: "
+"Ø­Ø°Ù� Ø¨Ø¹Ø¯ Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù„ØªØ´ØºÙŠÙ„: "
 # ^ErrorCreatingShortcut
-"Îáá ÃËäÇÁ ÅäÔÇÁ ÅÎÊÕÇÑ: "
+"Ø®Ù„Ù„ Ø£Ø«Ù†Ø§Ø¡ Ø¥Ù†Ø´Ø§Ø¡ Ø¥Ø®ØªØµØ§Ø±: "
 # ^ErrorCreating
-"Îáá ÃËäÇÁ ÅäÔÇÁ :"
+"Ø®Ù„Ù„ Ø£Ø«Ù†Ø§Ø¡ Ø¥Ù†Ø´Ø§Ø¡ :"
 # ^ErrorDecompressing
-Îáá ÃËäÇÁ ÝÊÍ ÇáÈíÇäÇÊ ÇáãÖÛæØÉ! ãäÕÈ ÊÇáÝ¿
+Ø®Ù„Ù„ Ø£Ø«Ù†Ø§Ø¡ Ù�ØªØ­ Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„Ù…Ø¶ØºÙˆØ·Ø©! Ù…Ù†ØµØ¨ ØªØ§Ù„Ù�ØŸ
 # ^ErrorRegistering
-Îáá ÃËäÇÁ ÊÓÌíá DLL
+Ø®Ù„Ù„ Ø£Ø«Ù†Ø§Ø¡ ØªØ³Ø¬ÙŠÙ„ DLL
 # ^ExecShell
-"ÊäÝíÐ ExecShell:"
+"ØªÙ†Ù�ÙŠØ° ExecShell:"
 # ^Exec
-"ÊäÝíÐ: "
+"ØªÙ†Ù�ÙŠØ°: "
 # ^Extract
-"ÅÓÊÎÑÇÌ: "
+"Ø¥Ø³ØªØ®Ø±Ø§Ø¬: "
 # ^ErrorWriting
-"ÅÓÊÎÑÇÌ: Îáá ÃËäÇÁ ÇáßÊÇÈÉ Åáì ãáÝ "
+"Ø¥Ø³ØªØ®Ø±Ø§Ø¬: Ø®Ù„Ù„ Ø£Ø«Ù†Ø§Ø¡ Ø§Ù„ÙƒØªØ§Ø¨Ø© Ø¥Ù„Ù‰ Ù…Ù„Ù� "
 # ^InvalidOpcode
-ÇáãäÕøÈ ÊÇáÝ: ÔÝÑÉ ÛíÑ ÕÇáÍÉ
+Ø§Ù„Ù…Ù†ØµÙ‘Ø¨ ØªØ§Ù„Ù�: Ø´Ù�Ø±Ø© ØºÙŠØ± ØµØ§Ù„Ø­Ø©
 # ^NoOLE
-"áÇ ÊæÌÏ OLE áÜö: "
+"Ù„Ø§ ØªÙˆØ¬Ø¯ OLE Ù„Ù€Ù�: "
 # ^OutputFolder
-"ãÌáÏ ÇáÅÎÑÇÌ: "
+"Ù…Ø¬Ù„Ø¯ Ø§Ù„Ø¥Ø®Ø±Ø§Ø¬: "
 # ^RemoveFolder
-"ÅÒÇáÉ ãÌáÏ: "
+"Ø¥Ø²Ø§Ù„Ø© Ù…Ø¬Ù„Ø¯: "
 # ^RenameOnReboot
-"ÅÚÇÏÉ ÊÓãíÉ ÈÚÏ ÅÚÇÏÉ ÇáÊÔÛíá: "
+"Ø¥Ø¹Ø§Ø¯Ø© ØªØ³Ù…ÙŠØ© Ø¨Ø¹Ø¯ Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù„ØªØ´ØºÙŠÙ„: "
 # ^Rename
-"ÅÚÇÏÉ ÊÓãíÉ: "
+"Ø¥Ø¹Ø§Ø¯Ø© ØªØ³Ù…ÙŠØ©: "
 # ^Skipped
-"ÊÎØì: "
+"ØªØ®Ø·Ù‰: "
 # ^CopyDetails
-äÓÎ ÇáÊÝÇÕíá Åáì ÇáÐÇßÑÉ
+Ù†Ø³Ø® Ø§Ù„ØªÙ�Ø§ØµÙŠÙ„ Ø¥Ù„Ù‰ Ø§Ù„Ø°Ø§ÙƒØ±Ø©
 # ^LogInstall
-ÓÌøá ÚãáíÉ ÇáÊäÕíÈ
+Ø³Ø¬Ù‘Ù„ Ø¹Ù…Ù„ÙŠØ© Ø§Ù„ØªÙ†ØµÙŠØ¨
 # ^Byte
-ÈÇíÊ
+Ø¨Ø§ÙŠØª
 # ^Kilo
-ßíáæ
+ ÙƒÙŠÙ„Ùˆ
 # ^Mega
-ãíÛÇ
+ Ù…ÙŠØºØ§
 # ^Giga
-ÌíÛÇ
\ No newline at end of file
+ Ø¬ÙŠØºØ§
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Icelandic.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Icelandic.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Icelandic.nsh	(revision 2956)
@@ -1,121 +1,121 @@
-;Language: Icelandic (15)
+ï»¿;Language: Icelandic (15)
 ;By Gretar Orri Kristinsson
 
-!insertmacro LANGFILE "Icelandic" "Icelandic"
+!insertmacro LANGFILE "Icelandic" = "Ã�slenska" "Islenska"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Velkominn til $(^NameDA) uppsetningarhjálparinnar"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Þessi hjálp mun leiða þig í gegnum uppsetninguna á $(^NameDA).$\r$\n$\r$\nMælt er með því að þú lokir öllum öðrum forritum áður en uppsetningin hefst. Þetta mun gera uppsetningarforritinu kleyft að uppfæra kerfiskrár án þess að endurræsa tölvuna.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Velkominn til $(^NameDA) uppsetningarhjÃ¡lparinnar"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ãžessi hjÃ¡lp mun leiÃ°a Ã¾ig Ã­ gegnum uppsetninguna Ã¡ $(^NameDA).$\r$\n$\r$\nMÃ¦lt er meÃ° Ã¾vÃ­ aÃ° Ã¾Ãº lokir Ã¶llum Ã¶Ã°rum forritum Ã¡Ã°ur en uppsetningin hefst. Ãžetta mun gera uppsetningarforritinu kleyft aÃ° uppfÃ¦ra kerfiskrÃ¡r Ã¡n Ã¾ess aÃ° endurrÃ¦sa tÃ¶lvuna.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Velkomin(n) til $(^NameDA) fjarlægingarhjálparinnar"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Þessi hjálp mun leiða þig í gegnum fjarlæginguna á $(^NameDA).$\r$\n$\r$\nÁður en fjarlæging hefst skal ganga úr skugga um að $(^NameDA) sé ekki opið.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Velkomin(n) til $(^NameDA) fjarlÃ¦gingarhjÃ¡lparinnar"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ãžessi hjÃ¡lp mun leiÃ°a Ã¾ig Ã­ gegnum fjarlÃ¦ginguna Ã¡ $(^NameDA).$\r$\n$\r$\nÃ�Ã°ur en fjarlÃ¦ging hefst skal ganga Ãºr skugga um aÃ° $(^NameDA) sÃ© ekki opiÃ°.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
   ${LangFileString} MUI_TEXT_LICENSE_TITLE "Notandaleyfissamningur"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Vinsamlegast skoðaðu Notandaleyfissamninginn vel áður en uppsetning á $(^NameDA) hefst."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ef þú samþykkir skilmála samningsins, smelltu þá á 'Ég samþykki' til að halda áfram. Þú verður að samþykkja samninginn til þess að setja upp $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ef þú samþykkir skilmála samningsins, hakaðu þá í kassann hér að neðan. Þú verður að samþykkja samninginn til þess að setja upp $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ef þú samþykkir skilmála samningsins, veldu þá fyrsta valmöguleikann hér að neðan. Þú verður að samþykkja samninginn til þess að setja upp $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Vinsamlegast skoÃ°aÃ°u Notandaleyfissamninginn vel Ã¡Ã°ur en uppsetning Ã¡ $(^NameDA) hefst."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ef Ã¾Ãº samÃ¾ykkir skilmÃ¡la samningsins, smelltu Ã¾Ã¡ Ã¡ 'Ã‰g samÃ¾ykki' til aÃ° halda Ã¡fram. ÃžÃº verÃ°ur aÃ° samÃ¾ykkja samninginn til Ã¾ess aÃ° setja upp $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ef Ã¾Ãº samÃ¾ykkir skilmÃ¡la samningsins, hakaÃ°u Ã¾Ã¡ Ã­ kassann hÃ©r aÃ° neÃ°an. ÃžÃº verÃ°ur aÃ° samÃ¾ykkja samninginn til Ã¾ess aÃ° setja upp $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ef Ã¾Ãº samÃ¾ykkir skilmÃ¡la samningsins, veldu Ã¾Ã¡ fyrsta valmÃ¶guleikann hÃ©r aÃ° neÃ°an. ÃžÃº verÃ°ur aÃ° samÃ¾ykkja samninginn til Ã¾ess aÃ° setja upp $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
   ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Leyfissamningur"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Vinsamlegast skoðaðu leyfissamninginn vel áður en fjarlæging á $(^NameDA) hefst."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ef þú samþykkir skilmála samningsins, smelltu þá á 'Ég samþykki' til að halda áfram. Þú verður að samþykkja samninginn til þess að fjarlægja $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ef þú samþykkir skilmála samningsins, hakaðu þá í kassann hér að neðan. Þú verður að samþykkja samninginn til þess að fjarlægja $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ef þú samþykkir skilmála samningsins, veldu þá fyrsta valmöguleikann hér að neðan. Þú verður að samþykkja samninginn til þess að fjarlægja $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Vinsamlegast skoÃ°aÃ°u leyfissamninginn vel Ã¡Ã°ur en fjarlÃ¦ging Ã¡ $(^NameDA) hefst."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ef Ã¾Ãº samÃ¾ykkir skilmÃ¡la samningsins, smelltu Ã¾Ã¡ Ã¡ 'Ã‰g samÃ¾ykki' til aÃ° halda Ã¡fram. ÃžÃº verÃ°ur aÃ° samÃ¾ykkja samninginn til Ã¾ess aÃ° fjarlÃ¦gja $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ef Ã¾Ãº samÃ¾ykkir skilmÃ¡la samningsins, hakaÃ°u Ã¾Ã¡ Ã­ kassann hÃ©r aÃ° neÃ°an. ÃžÃº verÃ°ur aÃ° samÃ¾ykkja samninginn til Ã¾ess aÃ° fjarlÃ¦gja $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ef Ã¾Ãº samÃ¾ykkir skilmÃ¡la samningsins, veldu Ã¾Ã¡ fyrsta valmÃ¶guleikann hÃ©r aÃ° neÃ°an. ÃžÃº verÃ°ur aÃ° samÃ¾ykkja samninginn til Ã¾ess aÃ° fjarlÃ¦gja $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Smelltu á 'PageDown' takkann á lyklaborðinu til að sjá afganginn af samningnum."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Smelltu Ã¡ 'PageDown' takkann Ã¡ lyklaborÃ°inu til aÃ° sjÃ¡ afganginn af samningnum."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Velja íhluti"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Veldu hvaða $(^NameDA) íhluti þú vilt setja upp."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Velja Ã­hluti"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Veldu hvaÃ°a $(^NameDA) Ã­hluti Ã¾Ãº vilt setja upp."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Velja íhluti"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Velja hvaða $(^NameDA) íhluti þú vilt fjarlægja."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Velja Ã­hluti"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Velja hvaÃ°a $(^NameDA) Ã­hluti Ã¾Ãº vilt fjarlÃ¦gja."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Lýsing"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "LÃ½sing"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Færðu músina yfir íhlut til að fá lýsinguna á honum."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "FÃ¦rÃ°u mÃºsina yfir Ã­hlut til aÃ° fÃ¡ lÃ½singuna Ã¡ honum."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Færðu músina yfir íhlut til að fá lýsinguna á honum."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Veldu Ã­hlut til Ã¾ess aÃ° fÃ¡ lÃ½singuna Ã¡ honum."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Veldu uppsetningarskáarsafn"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Veldu það skráarsafn sem þú vilt setja $(^NameDA) upp í."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Veldu uppsetningarskÃ¡arsafn"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Veldu Ã¾aÃ° skrÃ¡arsafn sem Ã¾Ãº vilt setja $(^NameDA) upp Ã­."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Velja fjarlægingarskáarsafn"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Veldu það skráarsafn sem þú vilt fjarlægja $(^NameDA) úr."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Velja fjarlÃ¦gingarskÃ¡arsafn"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Veldu Ã¾aÃ° skrÃ¡arsafn sem Ã¾Ãº vilt fjarlÃ¦gja $(^NameDA) Ãºr."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Set upp"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Vinsamlegast dokaðu við meðan $(^NameDA) er sett upp."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Uppsetningu lokið"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Uppsetning tókst."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Hætt við uppsetningu"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Vinsamlegast dokaÃ°u viÃ° meÃ°an $(^NameDA) er sett upp."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Uppsetningu lokiÃ°"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Uppsetning tÃ³kst."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "HÃ¦tt viÃ° uppsetningu"
   ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Uppsetningu lauk ekki sem skildi."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Fjarlægi"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Vinsamlegast dokaðu við á meðan $(^NameDA) er fjarlægt."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Fjarlægingu lokið"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Fjarlæging tókst."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Hætt við fjarlægingu"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Fjarlægingu lauk ekki sem skildi."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "FjarlÃ¦gi"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Vinsamlegast dokaÃ°u viÃ° Ã¡ meÃ°an $(^NameDA) er fjarlÃ¦gt."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "FjarlÃ¦gingu lokiÃ°"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "FjarlÃ¦ging tÃ³kst."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "HÃ¦tt viÃ° fjarlÃ¦gingu"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "FjarlÃ¦gingu lauk ekki sem skildi."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Ljúka $(^NameDA) uppsetningarhjálpinni"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) er nú upp sett á tölvunni þinni.$\r$\n$\r$\nSmelltu á 'Ljúka' til að loka þessari hjálp."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Til að ljúka uppsetningunni á $(^NameDA) verður að endurræsa tölvuna. Viltu endurræsa núna?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "LjÃºka $(^NameDA) uppsetningarhjÃ¡lpinni"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) er nÃº upp sett Ã¡ tÃ¶lvunni Ã¾inni.$\r$\n$\r$\nSmelltu Ã¡ 'LjÃºka' til aÃ° loka Ã¾essari hjÃ¡lp."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Til aÃ° ljÃºka uppsetningunni Ã¡ $(^NameDA) verÃ°ur aÃ° endurrÃ¦sa tÃ¶lvuna. Viltu endurrÃ¦sa nÃºna?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Ljúka $(^NameDA) fjarlægingarhjálpinni"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) hefur nú verið fjarlægt úr tölvunni.$\r$\n$\r$\nSmelltu á 'Ljúka' til að loka þessari hjálp."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Til að ljúka fjarlægingunni á $(^NameDA) verður að endurræsa tölvuna. Viltu endurræsa núna?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "LjÃºka $(^NameDA) fjarlÃ¦gingarhjÃ¡lpinni"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) hefur nÃº veriÃ° fjarlÃ¦gt Ãºr tÃ¶lvunni.$\r$\n$\r$\nSmelltu Ã¡ 'LjÃºka' til aÃ° loka Ã¾essari hjÃ¡lp."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Til aÃ° ljÃºka fjarlÃ¦gingunni Ã¡ $(^NameDA) verÃ°ur aÃ° endurrÃ¦sa tÃ¶lvuna. Viltu endurrÃ¦sa nÃºna?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Endurræsa núna"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ég vil endurræsa seinna"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "EndurrÃ¦sa nÃºna"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ã‰g vil endurrÃ¦sa seinna"
   ${LangFileString} MUI_TEXT_FINISH_RUN "&Keyra $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Skoða LestuMig"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Ljúka"  
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&SkoÃ°a LestuMig"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&LjÃºka"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Velja skráarsafn 'Start' valmyndar"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Veldu skráarsafn $(^NameDA) flýtileiða fyrir 'Start' valmyndina."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Veldu skráarsafn flýtileiða forritsins fyrir 'Start' valmyndina. Þú getur einnig búið til nýtt skráarsafn með því að setja inn nýtt nafn."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ekki búa til flýtileiðir í 'Start' valmyndinni"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Velja skrÃ¡arsafn 'Start' valmyndar"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Veldu skrÃ¡arsafn $(^NameDA) flÃ½tileiÃ°a fyrir 'Start' valmyndina."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Veldu skrÃ¡arsafn flÃ½tileiÃ°a forritsins fyrir 'Start' valmyndina. ÃžÃº getur einnig bÃºiÃ° til nÃ½tt skrÃ¡arsafn meÃ° Ã¾vÃ­ aÃ° setja inn nÃ½tt nafn."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ekki bÃºa til flÃ½tileiÃ°ir Ã­ 'Start' valmyndinni"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Fjarlægja $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Fjarlægja $(^NameDA) úr tölvunni."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "FjarlÃ¦gja $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "FjarlÃ¦gja $(^NameDA) Ãºr tÃ¶lvunni."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Ertu viss um að þú viljir loka $(^Name) uppsetningarhjálpinni?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Ertu viss um aÃ° Ã¾Ãº viljir loka $(^Name) uppsetningarhjÃ¡lpinni?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ertu viss um að þú viljir loka $(^Name) fjarlægingarhjálpinni?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ertu viss um aÃ° Ã¾Ãº viljir loka $(^Name) fjarlÃ¦gingarhjÃ¡lpinni?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/NorwegianNynorsk.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/NorwegianNynorsk.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/NorwegianNynorsk.nsh	(revision 2956)
@@ -1,41 +1,41 @@
-;Language: Norwegian nynorsk (2068)
-;By Vebjoern Sture and Håvard Mork (www.firefox.no)
+ï»¿;Language: Norwegian nynorsk (2068)
+;By Vebjoern Sture and HÃ¥vard Mork (www.firefox.no)
 
-!insertmacro LANGFILE "NorwegianNynorsk" "Norwegian nynorsk"
+!insertmacro LANGFILE "NorwegianNynorsk" "Norwegian (Nynorsk)" "Norsk (nynorsk)" =
 
 !ifdef MUI_WELCOMEPAGE
   ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Velkommen til $(^NameDA) innstallasjonsvegvisar"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Denne vegvisaren vil leie deg gjennom installeringa av $(^NameDA).$\n$\nDet er tilrådd at du avsluttar alle andre program før du held fram. Dette vil la installeringsprogrammet oppdatera systemfiler utan at du må starta datamaskinen på nytt.$\n$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Denne vegvisaren vil leie deg gjennom installeringa av $(^NameDA).$\n$\nDet er tilrÃ¥dd at du avsluttar alle andre program fÃ¸r du held fram. Dette vil la installeringsprogrammet oppdatera systemfiler utan at du mÃ¥ starta datamaskinen pÃ¥ nytt.$\n$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
   ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Velkommen til avinstallering av $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Denne vegvisaren vil leie deg gjennom avinstalleringen av $(^NameDA).$\n$\nFør du fortsetter må du forsikre deg om at $(^NameDA) ikkje er opent.$\n$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Denne vegvisaren vil leie deg gjennom avinstalleringen av $(^NameDA).$\n$\nFÃ¸r du fortsetter mÃ¥ du forsikre deg om at $(^NameDA) ikkje er opent.$\n$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
   ${LangFileString} MUI_TEXT_LICENSE_TITLE "Lisensavtale"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Les gjennom lisensavtalen før du startar installeringa av $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Trykk på «Godta» dersom du godtar betingelsane i avtala. Du må godta avtala for å installere $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Trykk på avkryssingsboksen nedanfor nedanfor dersom du godtar betingelsane i avtala. Du må godta avtala for å installere $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Vel det første alternativet nedanfor dersom du godtek vilkåra i avtala. Du må godta avtala for å installera $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Les gjennom lisensavtalen fÃ¸r du startar installeringa av $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Trykk pÃ¥ Â«GodtaÂ» dersom du godtar betingelsane i avtala. Du mÃ¥ godta avtala for Ã¥ installere $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Trykk pÃ¥ avkryssingsboksen nedanfor nedanfor dersom du godtar betingelsane i avtala. Du mÃ¥ godta avtala for Ã¥ installere $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Vel det fÃ¸rste alternativet nedanfor dersom du godtek vilkÃ¥ra i avtala. Du mÃ¥ godta avtala for Ã¥ installera $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
   ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Lisensavtale"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Les gjennom lisensavtalen før du startar avinstalleringa av $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Trykk på «Godta» dersom du godtar betingelsane i avtala. Du må godta avtala for å avinstallera $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Trykk på avkryssingsboksen nedanfor nedanfor dersom du godtar betingelsane i avtala. Du må godta avtala for å avinstallera $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Vel det første alternativet nedanfor dersom du godtar betingelsane i avtala. Du må godta avtala for å avinstallera $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Les gjennom lisensavtalen fÃ¸r du startar avinstalleringa av $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Trykk pÃ¥ Â«GodtaÂ» dersom du godtar betingelsane i avtala. Du mÃ¥ godta avtala for Ã¥ avinstallera $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Trykk pÃ¥ avkryssingsboksen nedanfor nedanfor dersom du godtar betingelsane i avtala. Du mÃ¥ godta avtala for Ã¥ avinstallera $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Vel det fÃ¸rste alternativet nedanfor dersom du godtar betingelsane i avtala. Du mÃ¥ godta avtala for Ã¥ avinstallera $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Trykk Page Down-knappen for å sjå resten av lisensavtala."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Trykk Page Down-knappen for Ã¥ sjÃ¥ resten av lisensavtala."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
   ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Vel komponentar"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Vel kva delar av $(^NameDA) du ynskjer å installera."
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Vel kva delar av $(^NameDA) du ynskjer Ã¥ installera."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
@@ -46,9 +46,9 @@
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Beskriving"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Beveg musa over komponentene for å sjå beskrivinga."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Beveg musa over komponentene for Ã¥ sjÃ¥ beskrivinga."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Beveg musa over komponentene for å sjå beskrivinga."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Vel ein komponent for Ã¥ sjÃ¥ beskrivinga."
   !endif
 !endif
 
@@ -59,63 +59,71 @@
 
 !ifdef MUI_UNDIRECTORYPAGE
   ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Vel avinstalleringplassering"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Vel mappa du vil avinstallere $(^NameDA) frå."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Vel mappa du vil avinstallere $(^NameDA) frÃ¥."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Installerer"
   ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Vent mens $(^NameDA) blir installert."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Installeringa er fullført"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Installeringa vart fullført."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Installeringa er fullfÃ¸rt"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Installeringa vart fullfÃ¸rt."
   ${LangFileString} MUI_TEXT_ABORT_TITLE "Installeringa vart avbroten"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Installeringa vart ikkje fullført."
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Installeringa vart ikkje fullfÃ¸rt."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Avinstallerer"
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Vent medan $(^NameDA) vert avinstallert."
   ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Avinstallering ferdig"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Avinstallering ble utført uten feil."
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Avinstallering ble utfÃ¸rt uten feil."
   ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Avinstallering broten"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Avinstallering ble ikkje utført riktig."
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Avinstallering ble ikkje utfÃ¸rt riktig."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Installering fullført"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) er installert og klar til bruk.$\n$\nTrykk på «Fullfør» for å avslutte installeringa."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Du må starta datamaskinen på nytt for å fullføra installeringa av $(^NameDA). Vil du starta på nytt no?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Installering fullfÃ¸rt"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) er installert og klar til bruk.$\n$\nTrykk pÃ¥ Â«FullfÃ¸rÂ» for Ã¥ avslutte installeringa."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Du mÃ¥ starta datamaskinen pÃ¥ nytt for Ã¥ fullfÃ¸ra installeringa av $(^NameDA). Vil du starta pÃ¥ nytt no?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Fullfører avinstalleringa av $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) er no avinstallert frå datamaskina di.$\n$\nTrykk på «Fullfør» for å avslutta denne vegvisaren."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Datamaskinen må starta på nytt for å fullføra avinstalleringa av $(^NameDA). Vil du starta datamaskina på nytt no?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "FullfÃ¸rer avinstalleringa av $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) er no avinstallert frÃ¥ datamaskina di.$\n$\nTrykk pÃ¥ Â«FullfÃ¸rÂ» for Ã¥ avslutta denne vegvisaren."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Datamaskinen mÃ¥ starta pÃ¥ nytt for Ã¥ fullfÃ¸ra avinstalleringa av $(^NameDA). Vil du starta datamaskina pÃ¥ nytt no?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Start på nytt no"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Eg vil starta på nytt seinare"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "&Køyr $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Start pÃ¥ nytt no"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Eg vil starta pÃ¥ nytt seinare"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&KÃ¸yr $(^NameDA)"
   ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Syn lesmeg"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Fullfør"  
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&FullfÃ¸r"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Vel mappe på startmenyen"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Vel mappe pÃ¥ startmenyen"
   ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Vel kva mappe snarvegane til $(^NameDA) skal liggja i."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Vel mappa du vil oppretta snarvegane til programmet i. Du kan òg skriva inn eit nytt namn for å laga ei ny mappe."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Vel mappa du vil oppretta snarvegane til programmet i. Du kan Ã²g skriva inn eit nytt namn for Ã¥ laga ei ny mappe."
   ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ikkje opprett snarvegar"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
   ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Avinstaller $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Slett $(^NameDA) frå datamaskinen."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Slett $(^NameDA) frÃ¥ datamaskinen."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Er du viss på at du vil avslutta installeringa av $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Er du viss pÃ¥ at du vil avslutta installeringa av $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Er du viss på at du vil avbryta avinstalleringa av $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Er du viss pÃ¥ at du vil avbryta avinstalleringa av $(^Name)?"
 !endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Vel brukarar"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Vel kva brukarar du vil installere $(^NameDA) for."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Vel om du vil installere $(^NameDA) berre for deg, eller for alle som nyttar denne maskina. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Installer for alle som nyttar maskina"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Installer berre for me"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/TradChinese.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/TradChinese.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/TradChinese.nlf	(revision 2956)
@@ -1,190 +1,194 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1028
-# Font and size - dash (-) means default ¦r«¬¦WºÙ»P¤j¤p
-·s²Ó©úÅé
+# Font and size - dash (-) means default å­—åž‹å��ç¨±èˆ‡å¤§å°�
+æ–°ç´°æ˜Žé«”
 9
-# Codepage - dash (-) means ANSI code page ANSI ¦r½X­¶
+# Codepage - dash (-) means ASCII code page ASCII å­—ç¢¼é �
 950
-# RTL - anything else than RTL means LTR ¥Ñ¥k¦Ü¥ª®Ñ¼g
+# RTL - anything else than RTL means LTR ç”±å�³è‡³å·¦æ›¸å¯«
 -
-# Translator: Kii Ali <kiiali@cpatch.org>;Revision date: 2004-12-14
+# Revision date: 2017-03-17
+# Translators:
+## Kii Ali <kiiali@cpatch.org>, <kiiali@ms1.url.com.tw>, <kiiali@pchome.com.tw>
+## Walter Cheuk <wwycheuk@gamil.com>
+#
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-$(^Name) ¦w¸Ë
+$(^Name) å®‰è£�
 # ^UninstallCaption
-$(^Name) ¸Ñ°£¦w¸Ë
+$(^Name) è§£é™¤å®‰è£�
 # ^LicenseSubCaption
-: ±ÂÅv¨óÄ³
+: æŽˆæ¬Šå�”è­°
 # ^ComponentsSubCaption
-: ¦w¸Ë¿ï¶µ
+: å®‰è£�é�¸é …
 # ^DirSubCaption
-: ¦w¸Ë¸ê®Æ§¨
+: å®‰è£�è³‡æ–™å¤¾
 # ^InstallingSubCaption
-: ¥¿¦b¦w¸Ë
+: æ­£åœ¨å®‰è£�
 # ^CompletedSubCaption
-: ¤w§¹¦¨
+: å·²å®Œæˆ�
 # ^UnComponentsSubCaption
-: ¸Ñ°£¦w¸Ë¿ï¶µ
+: è§£é™¤å®‰è£�é�¸é …
 # ^UnDirSubCaption
-: ¸Ñ°£¦w¸Ë¸ê®Æ§¨
+: è§£é™¤å®‰è£�è³‡æ–™å¤¾
 # ^ConfirmSubCaption
-: ½T»{
+: ç¢ºèª�
 # ^UninstallingSubCaption
-: ¥¿¦b¸Ñ°£¦w¸Ë
+: æ­£åœ¨è§£é™¤å®‰è£�
 # ^UnCompletedSubCaption
-: §¹¦¨
+: å®Œæˆ�
 # ^BackBtn
-< ¤W¤@¨B(&P)
+< ä¸Šä¸€æ­¥(&B)
 # ^NextBtn
-¤U¤@¨B(&N) >
+ä¸‹ä¸€æ­¥(&N) >
 # ^AgreeBtn
-§Ú±µ¨ü(&I)
+æˆ‘å�Œæ„�(&A)
 # ^AcceptBtn
-§Ú±µ¨ü¡u±ÂÅv¨óÄ³¡v¤¤ªº±ø´Ú(&A)
+æˆ‘æŽ¥å�—ã€ŒæŽˆæ¬Šå�”è­°ã€�çš„æ¢�æ¬¾(&A)
 # ^DontAcceptBtn
-§Ú¤£±µ¨ü¡u±ÂÅv¨óÄ³¡v¤¤ªº±ø´Ú(&N)
+æˆ‘ä¸�æŽ¥å�—ã€ŒæŽˆæ¬Šå�”è­°ã€�çš„æ¢�æ¬¾(&D)
 # ^InstallBtn
-¦w¸Ë(&I)
+å®‰è£�(&I)
 # ^UninstallBtn
-²¾°£(&U)
+è§£é™¤å®‰è£�(&U)
 # ^CancelBtn
-¨ú®ø(&C)
+å�–æ¶ˆ
 # ^CloseBtn
-Ãö³¬(&L)
+é—œé–‰(&C)
 # ^BrowseBtn
-ÂsÄý(&B)...
+ç€�è¦½(&R)...
 # ^ShowDetailsBtn
-Åã¥Ü²Ó¸`(&D)
+é¡¯ç¤ºç´°ç¯€(&D)
 # ^ClickNext
-«ö¤@¤U [¤U¤@¨B(N)] Ä~Äò¡C
+æŒ‰ã€Œä¸‹ä¸€æ­¥(N)ã€�ç¹¼çºŒã€‚
 # ^ClickInstall
-«ö¤@¤U [¦w¸Ë(I)] ¶}©l¦w¸Ë¶iµ{¡C
+æŒ‰ã€Œå®‰è£�(I)ã€�é–‹å§‹å®‰è£�ã€‚
 # ^ClickUninstall
-«ö¤@¤U [¸Ñ°£¦w¸Ë(U)] ¶}©l¸Ñ°£¦w¸Ë¶iµ{¡C
+æŒ‰ã€Œè§£é™¤å®‰è£�(U)ã€�é–‹å§‹è§£é™¤å®‰è£�ã€‚
 # ^Name
-¦WºÙ
+å��ç¨±
 # ^Completed
-¤w§¹¦¨
+å·²å®Œæˆ�
 # ^LicenseText
-¦b¦w¸Ë $(^NameDA) ¤§«e½ÐÀË¾\±ÂÅv¨óÄ³¡C¦pªG§A±µ¨ü¨óÄ³¤¤©Ò¦³±ø´Ú¡A«ö¤@¤U [§Ú¦P·N(I)] ¡C
+åœ¨å®‰è£� $(^NameDA) ä¹‹å‰�è«‹æª¢é–±æŽˆæ¬Šå�”è­°ã€‚å¦‚æžœæŽ¥å�—å�”è­°æ‰€æœ‰æ¢�æ¬¾ï¼ŒæŒ‰ã€Œæˆ‘å�Œæ„�(A)ã€�ã€‚
 # ^LicenseTextCB
-¦b¦w¸Ë $(^NameDA) ¤§«e½ÐÀË¾\±ÂÅv¨óÄ³¡C¦pªG§A±µ¨ü¨óÄ³¤¤©Ò¦³±ø´Ú¡A«ö¤@¤U¤U¤èªº¤Ä¿ï®Ø¡C $_CLICK
+åœ¨å®‰è£� $(^NameDA) ä¹‹å‰�è«‹æª¢é–±æŽˆæ¬Šå�”è­°ã€‚å¦‚æžœæŽ¥å�—å�”è­°æ‰€æœ‰æ¢�æ¬¾ï¼ŒæŒ‰ä¸‹æ–¹çš„å‹¾é�¸æ¡†ã€‚ $_CLICK
 # ^LicenseTextRB
-¦b¦w¸Ë $(^NameDA) ¤§«e½ÐÀË¾\±ÂÅv¨óÄ³¡C¦pªG§A±µ¨ü¨óÄ³¤¤©Ò¦³±ø´Ú¡A¿ï¾Ü¤U¤èªº²Ä¤@­Ó¿ï¶µ¡C $_CLICK
+åœ¨å®‰è£� $(^NameDA) ä¹‹å‰�è«‹æª¢é–±æŽˆæ¬Šå�”è­°ã€‚å¦‚æžœæŽ¥å�—å�”è­°æ‰€æœ‰æ¢�æ¬¾ï¼Œé�¸æ“‡ä¸‹æ–¹çš„ç¬¬ä¸€å€‹é�¸é …ã€‚ $_CLICK
 # ^UnLicenseText
-¦b¸Ñ°£¦w¸Ë $(^NameDA) ¤§«e½ÐÀË¾\±ÂÅv¨óÄ³¡C¦pªG§A±µ¨ü¨óÄ³¤¤©Ò¦³±ø´Ú¡A«ö¤@¤U [§Ú¦P·N(I)] ¡C
+åœ¨è§£é™¤å®‰è£� $(^NameDA) ä¹‹å‰�è«‹æª¢é–±æŽˆæ¬Šå�”è­°ã€‚å¦‚æžœæŽ¥å�—å�”è­°ä¸­æ‰€æœ‰æ¢�æ¬¾ï¼ŒæŒ‰ã€Œæˆ‘å�Œæ„�(A)ã€�ã€‚
 # ^UnLicenseTextCB
-¦b¸Ñ°£¦w¸Ë $(^NameDA) ¤§«e½ÐÀË¾\±ÂÅv¨óÄ³¡C¦pªG§A±µ¨ü¨óÄ³¤¤©Ò¦³±ø´Ú¡A«ö¤@¤U¤U¤èªº¤Ä¿ï®Ø¡C $_CLICK
+åœ¨è§£é™¤å®‰è£� $(^NameDA) ä¹‹å‰�è«‹æª¢é–±æŽˆæ¬Šå�”è­°ã€‚å¦‚æžœæŽ¥å�—å�”è­°ä¸­æ‰€æœ‰æ¢�æ¬¾ï¼ŒæŒ‰ä¸‹æ–¹çš„å‹¾é�¸æ¡†ã€‚ $_CLICK
 # ^UnLicenseTextRB
-¦b¸Ñ°£¦w¸Ë $(^NameDA) ¤§«e½ÐÀË¾\±ÂÅv¨óÄ³¡C¦pªG§A±µ¨ü¨óÄ³¤¤©Ò¦³±ø´Ú¡A¿ï¾Ü¤U¤èªº²Ä¤@­Ó¿ï¶µ¡C $_CLICK
+åœ¨è§£é™¤å®‰è£� $(^NameDA) ä¹‹å‰�è«‹æª¢é–±æŽˆæ¬Šå�”è­°ã€‚å¦‚æžœæŽ¥å�—å�”è­°ä¸­æ‰€æœ‰æ¢�æ¬¾ï¼Œé�¸æ“‡çš„ç¬¬ä¸€å€‹é�¸é …ã€‚ $_CLICK
 # ^Custom
-¦Û­q
+è‡ªè¨‚
 # ^ComponentsText
-¤Ä¿ï§A·Q­n¦w¸Ëªº¤¸¥ó¡A¨Ã¸Ñ°£¤Ä¿ï§A¤£§Æ±æ¦w¸Ëªº¤¸¥ó¡C $_CLICK
+å‹¾é�¸æƒ³è¦�å®‰è£�çš„å…ƒä»¶ï¼Œä¸¦è§£é™¤å‹¾é�¸ä¸�æƒ³å®‰è£�çš„å…ƒä»¶ã€‚ $_CLICK
 # ^ComponentsSubText1
-¿ï¨ú¦w¸ËªºÃþ«¬: 
+é�¸å�–å®‰è£�çš„é¡žåž‹: 
 # ^ComponentsSubText2_NoInstTypes
-¿ï¨ú¦w¸Ëªº¤¸¥ó: 
+é�¸å�–å®‰è£�çš„å…ƒä»¶: 
 # ^ComponentsSubText2
-©ÎªÌ¡A¦Û­q¿ï¨ú·Q¦w¸Ëªº¤¸¥ó: 
+å�ˆæˆ–è€…ï¼Œè‡ªè¨‚é�¸å�–æƒ³å®‰è£�çš„å…ƒä»¶: 
 # ^UnComponentsText
-¤Ä¿ï§A·Q­n¸Ñ°£¦w¸Ëªº¤¸¥ó¡A¨Ã¸Ñ°£¤Ä¿ï§A¤£§Æ±æ¸Ñ°£¦w¸Ëªº¤¸¥ó¡C $_CLICK
+å‹¾é�¸æƒ³è¦�è§£é™¤å®‰è£�çš„å…ƒä»¶ï¼Œä¸¦è§£é™¤å‹¾é�¸ä¸�æƒ³è§£é™¤å®‰è£�çš„å…ƒä»¶ã€‚ $_CLICK
 # ^UnComponentsSubText1
-¿ï¾Ü¸Ñ°£¦w¸ËªºÃþ«¬: 
+é�¸å�–è§£é™¤å®‰è£�çš„é¡žåž‹: 
 # ^UnComponentsSubText2_NoInstTypes
-¿ï¾Ü­n¸Ñ°£¦w¸Ëªº¤¸¥ó: 
+é�¸å�–è¦�è§£é™¤å®‰è£�çš„å…ƒä»¶: 
 # ^UnComponentsSubText2
-©Î¬O¡A¿ï¾Ü·Q­n¸Ñ°£¦w¸Ëªº¥i¿ï¶µ¤¸¥ó: 
+å�ˆæˆ–è€…ï¼Œé�¸æ“‡æƒ³è¦�è§£é™¤å®‰è£�çš„å�¯é�¸é …å…ƒä»¶: 
 # ^DirText
-Setup ±N¦w¸Ë $(^NameDA) ¦b¤U¦C¸ê®Æ§¨¡C­n¦w¸Ë¨ì¤£¦P¸ê®Æ§¨¡A«ö¤@¤U [ÂsÄý(B)] ¨Ã¿ï¾Ü¨ä¥Lªº¸ê®Æ§¨¡C $_CLICK
+å®‰è£�ç¨‹å¼�æœƒå°‡ $(^NameDA) å®‰è£�åœ¨ä»¥ä¸‹è³‡æ–™å¤¾ã€‚è¦�å®‰è£�åˆ°ä¸�å�Œçš„è³‡æ–™å¤¾ï¼ŒæŒ‰ã€Œç€�è¦½(B)...ã€�ä¸¦é�¸æ“‡å…¶ä»–è³‡æ–™å¤¾ã€‚ $_CLICK
 # ^DirSubText
-¥Ø¼Ð¸ê®Æ§¨
+ç›®æ¨™è³‡æ–™å¤¾
 # ^DirBrowseText
-¿ï¾Ü­n¦w¸Ë $(^NameDA) ªº¸ê®Æ§¨¦ì¸m: 
+é�¸å�–è¦�å®‰è£� $(^NameDA) çš„è³‡æ–™å¤¾: 
 # ^UnDirText
-Setup ±N¸Ñ°£¦w¸Ë $(^NameDA) ¦b¤U¦C¸ê®Æ§¨¡C­n¸Ñ°£¦w¸Ë¨ì¤£¦P¸ê®Æ§¨¡A«ö¤@¤U [ÂsÄý(B)] ¨Ã¿ï¾Ü¨ä¥Lªº¸ê®Æ§¨¡C $_CLICK
+å®‰è£�ç¨‹å¼�æœƒè‡ªä»¥ä¸‹è³‡æ–™å¤¾è§£é™¤å®‰è£� $(^NameDA) ã€‚è¦�è§£é™¤å®‰è£�ä¸�å�Œçš„è³‡æ–™å¤¾ï¼ŒæŒ‰ã€Œç€�è¦½(B)...ã€�ä¸¦é�¸æ“‡å…¶ä»–è³‡æ–™å¤¾ã€‚ $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-¿ï¾Ü­n¸Ñ°£¦w¸Ë $(^NameDA) ªº¸ê®Æ§¨¦ì¸m: 
+é�¸å�–è¦�è§£é™¤å®‰è£� $(^NameDA) çš„è³‡æ–™å¤¾: 
 # ^SpaceAvailable
-"¥i¥ÎªÅ¶¡: "
+"å�¯ç”¨ç©ºé–“: "
 # ^SpaceRequired
-"©Ò»ÝªÅ¶¡: "
+"æ‰€éœ€ç©ºé–“: "
 # ^UninstallingText
-³o­ÓºëÆF±N±q§Aªº¹q¸£¸Ñ°£¦w¸Ë $(^NameDA) ¡C $_CLICK
+æœƒè‡ªä»¥ä¸‹è³‡æ–™å¤¾è§£é™¤å®‰è£� $(^NameDA) ã€‚ $_CLICK
 # ^UninstallingSubText
-¸Ñ°£¦w¸Ë¥Ø¿ý: 
+è§£é™¤å®‰è£�ç›®éŒ„: 
 # ^FileError
-µLªk¶}±Ò­n¼g¤JªºÀÉ®×: \r\n\t"$0"\r\n«ö¤@¤U [Abort] ©ñ±ó¦w¸Ë¡A\r\n [Retry] ­«·s¹Á¸Õ¼g¤JÀÉ®×¡A©Î\r\n [Ignore] ©¿²¤³o­ÓÀÉ®×¡C
+ç„¡æ³•é–‹å•Ÿè¦�å¯«å…¥çš„æª”æ¡ˆ: \r\n\t"$0"\r\næŒ‰ã€Œä¸­æ­¢ã€�å�œæ­¢å®‰è£�ï¼Œ\r\nã€Œé‡�è©¦ã€�é‡�æ–°å˜—è©¦å¯«å…¥æª”æ¡ˆï¼Œæˆ–\r\nã€Œå¿½ç•¥ã€�ç•¥é�Žæ­¤æª”æ¡ˆã€‚
 # ^FileError_NoIgnore
-µLªk¶}±Ò­n¼g¤JªºÀÉ®×: \r\n\t"$0"\r\n«ö¤@¤U [Retry] ­«·s¹Á¸Õ¼g¤JÀÉ®×¡A©Î\r\n [Cancel] ¨ú®ø¦w¸Ë¡C
+ç„¡æ³•é–‹å•Ÿè¦�å¯«å…¥çš„æª”æ¡ˆ: \r\n\t"$0"\r\næŒ‰ã€Œé‡�è©¦ã€�é‡�æ–°å˜—è©¦å¯«å…¥æª”æ¡ˆï¼Œæˆ–\r\nã€Œå�–æ¶ˆã€�å�œæ­¢å®‰è£�ã€‚
 # ^CantWrite
-"µLªk¼g¤J: "
+"ç„¡æ³•å¯«å…¥: "
 # ^CopyFailed
-"½Æ»s¥¢±Ñ "
+"è¤‡è£½å¤±æ•— "
 # ^CopyTo
-"½Æ»s¨ì: "
+"è¤‡è£½åˆ°: "
 # ^Registering
-"¥¿¦bµù¥U: "
+"æ­£åœ¨è¨»å†Š: "
 # ^Unregistering
-"¥¿¦b¸Ñ°£µù¥U: "
+"æ­£åœ¨è§£é™¤è¨»å†Š: "
 # ^SymbolNotFound
-"µLªk§ä¨ì²Å¸¹: "
+"ç„¡æ³•æ‰¾åˆ°ç¬¦è™Ÿ: "
 # ^CouldNotLoad
-"µLªk¸ü¤J: "
+"ç„¡æ³•è¼‰å…¥: "
 # ^CreateFolder
-"«Ø¥ß¸ê®Æ§¨: " 
+"å»ºç«‹è³‡æ–™å¤¾: " 
 # ^CreateShortcut
-"«Ø¥ß±¶®|: "
+"å»ºç«‹æ�·å¾‘: "
 # ^CreatedUninstaller
-"«Ø¥ß¸Ñ°£¦w¸Ëµ{¦¡: "
+"å»ºç«‹è§£é™¤å®‰è£�ç¨‹å¼�: "
 # ^Delete
-"§R°£ÀÉ®×: "
+"åˆªé™¤æª”æ¡ˆ: "
 # ^DeleteOnReboot
-"­«·s±Ò°Ê«á§R°£: "
+"é‡�æ–°é–‹æ©Ÿå¾Œåˆªé™¤: "
 # ^ErrorCreatingShortcut
-"¥¿¦b«Ø¥ß±¶®|®Éµo¥Í¿ù»~: "
+"å»ºç«‹æ�·å¾‘æ™‚ç™¼ç”ŸéŒ¯èª¤: "
 # ^ErrorCreating
-"¥¿¦b«Ø¥ß®Éµo¥Í¿ù»~: "
+"å»ºç«‹æ™‚ç™¼ç”ŸéŒ¯èª¤: "
 # ^ErrorDecompressing
-"¥¿¦b¸ÑÀ£ÁY¸ê®Æµo¥Í¿ù»~¡I¤w·lÃaªº¦w¸Ëµ{¦¡¡H"
+"è§£å£“ç¸®è³‡æ–™ç™¼ç”ŸéŒ¯èª¤ï¼�å®‰è£�ç¨‹å¼�æ˜¯å�¦å·²æ��å£žï¼Ÿ"
 # ^ErrorRegistering
-"¥¿¦bµù¥U DLL ®Éµo¥Í¿ù»~"
+"è¨»å†Š DLL æ™‚ç™¼ç”ŸéŒ¯èª¤"
 # ^ExecShell
-"°õ¦æ¥~³¡µ{¦¡: "
+"åŸ·è¡Œæ®¼å±¤ç¨‹å¼�: "
 # ^Exec
-"°õ¦æ: "
+"åŸ·è¡Œ: "
 # ^Extract
-"©â¨ú: "
+"æŠ½å�–: "
 # ^ErrorWriting
-"©â¨ú: µLªk¼g¤JÀÉ®× "
+"æŠ½å�–: ç„¡æ³•å¯«å…¥æª”æ¡ˆ "
 # ^InvalidOpcode
-"¦w¸Ë·l·´: µL®Äªº§@·~¥N½X "
+"å®‰è£�ç¨‹å¼�æ��æ¯€: ç„¡æ•ˆçš„ä½œæ¥­ä»£ç¢¼ "
 # ^NoOLE
-"¨S¦³ OLE ¥Î©ó: "
+"æ²’æœ‰ OLE ç”¨æ–¼: "
 # ^OutputFolder
-"¿é¥X¥Ø¿ý: "
+"è¼¸å‡ºè³‡æ–™å¤¾: "
 # ^RemoveFolder
-"²¾°£¥Ø¿ý: "
+"ç§»é™¤è³‡æ–™å¤¾: "
 # ^RenameOnReboot
-"­«·s±Ò°Ê«á­«·s©R¦W: "
+"é‡�æ–°é–‹æ©Ÿå¾Œé‡�æ–°å‘½å��: "
 # ^Rename
-"­«·s©R¦W: "
+"é‡�æ–°å‘½å��: "
 # ^Skipped
-"¤w²¤¹L: "
+"å·²ç•¥é�Ž: "
 # ^CopyDetails
-"½Æ»s²Ó¸`¨ì°Å¶KÃ¯ "
+"è¤‡è£½ç´°ç¯€åˆ°å‰ªè²¼ç°¿ "
 # ^LogInstall
-"¤é»x¦w¸Ë¶iµ{"
-# byte
+"å°‡å®‰è£�é€²ç¨‹è¨˜å…¥æ—¥èªŒ"
+# ^Byte
 B
-# kilo
-K
-# mega
-M
-# giga
-G
\ No newline at end of file
+# ^Kilo
+ K
+# ^Mega
+ M
+# ^Giga
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Norwegian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Norwegian.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Norwegian.nlf	(revision 2956)
@@ -1,15 +1,15 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1044
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
-# Translation by Jonas Lindstrøm (jonasc_88@hotmail.com). Reviewed and fixed by Jan Ivar Beddari <d0der at online.no>
+# Translation by Jonas LindstrÃ¸m (jonasc_88@hotmail.com). Reviewed and fixed by Jan Ivar Beddari <d0der at online.no>
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
@@ -43,9 +43,9 @@
 # ^AgreeBtn
 &Godta
 # ^AcceptBtn
-Jeg &godtar vilkårene i lisensavtalen
+Jeg &godtar vilkÃ¥rene i lisensavtalen
 # ^DontAcceptBtn
-Jeg godtar &ikke vilkårene i lisensavtalen
+Jeg godtar &ikke vilkÃ¥rene i lisensavtalen
 # ^InstallBtn
 &Installer
 # ^UninstallBtn
@@ -59,53 +59,53 @@
 # ^ShowDetailsBtn
 Vis &detaljer
 # ^ClickNext
-Trykk Neste for å fortsette.
+Trykk Neste for Ã¥ fortsette.
 # ^ClickInstall
-Trykk Installer for å starte installasjonen.
+Trykk Installer for Ã¥ starte installasjonen.
 # ^ClickUninstall
-Trykk Avinstaller for å starte avinstallasjonen.
+Trykk Avinstaller for Ã¥ starte avinstallasjonen.
 # ^Name
 Navn
 # ^Completed
 Ferdig
 # ^LicenseText
-Vennligst les gjennom lisensavtalen før du installerer $(^Name). Hvis du godtar vilkårene i avtalen, trykk på Godta.
+Vennligst les gjennom lisensavtalen fÃ¸r du installerer $(^Name). Hvis du godtar vilkÃ¥rene i avtalen, trykk pÃ¥ Godta.
 # ^LicenseTextCB
-Vennligst les gjennom lisensavtalen før du installerer $(^Name). Hvis du godtar vilkårene i avtalen, merk av under. $_CLICK
+Vennligst les gjennom lisensavtalen fÃ¸r du installerer $(^Name). Hvis du godtar vilkÃ¥rene i avtalen, merk av under. $_CLICK
 # ^LicenseTextRB
-Vennligst les gjennom lisensavtalen før du installerer $(^Name). Hvis du godtar vilkårene i avtalen, velg det første alternativet. $_CLICK
+Vennligst les gjennom lisensavtalen fÃ¸r du installerer $(^Name). Hvis du godtar vilkÃ¥rene i avtalen, velg det fÃ¸rste alternativet. $_CLICK
 # ^UnLicenseText
-Vennligst les gjennom lisensavtalen før du avinstallerer $(^Name). Hvis du godtar vilkårene i avtalen, trykk på Godta.
+Vennligst les gjennom lisensavtalen fÃ¸r du avinstallerer $(^Name). Hvis du godtar vilkÃ¥rene i avtalen, trykk pÃ¥ Godta.
 # ^UnLicenseTextCB
-Vennligst les gjennom lisensavtalen før du avinstallerer $(^Name). Hvis du godtar vilkårene i avtalen, merk av under. $_CLICK
+Vennligst les gjennom lisensavtalen fÃ¸r du avinstallerer $(^Name). Hvis du godtar vilkÃ¥rene i avtalen, merk av under. $_CLICK
 # ^UnLicenseTextRB
-Vennligst les gjennom lisensavtalen før du avinstallerer $(^Name). Hvis du godtar vilkårene i avtalen, velg det første alternativet. $_CLICK
+Vennligst les gjennom lisensavtalen fÃ¸r du avinstallerer $(^Name). Hvis du godtar vilkÃ¥rene i avtalen, velg det fÃ¸rste alternativet. $_CLICK
 # ^Custom
 Egendefinert
 # ^ComponentsText
 Merk komponentene du vil installere og fjern merkingen for de du ikke vil installere. $_CLICK
 # ^ComponentsSubText1
-Velg hvilken måte du vil installere på:
+Velg hvilken mÃ¥te du vil installere pÃ¥:
 # ^ComponentsSubText2_NoInstTypes
 Merk komponenter du vil installere:
 # ^ComponentsSubText2
-Eller merk de valgfrie komponentene du ønsker å installere:
+Eller merk de valgfrie komponentene du Ã¸nsker Ã¥ installere:
 # ^UnComponentsText
 Merk komponentene du vil avinstallere og fjern merkingen for de du vil beholde. $_CLICK
 # ^UnComponentsSubText1
-Velg hvilken måte du vil avinstallere på:
+Velg hvilken mÃ¥te du vil avinstallere pÃ¥:
 # ^UnComponentsSubText2_NoInstTypes
 Merk komponenter du vil avinstallere:
 # ^UnComponentsSubText2
-Eller merk de valgfrie komponentene du ønsker å avinstallere:
+Eller merk de valgfrie komponentene du Ã¸nsker Ã¥ avinstallere:
 # ^DirText
-$(^Name) vil bli installert i følgende mappe. For å velge en annen mappe, trykk Bla gjennom. $_CLICK
+$(^Name) vil bli installert i fÃ¸lgende mappe. For Ã¥ velge en annen mappe, trykk Bla gjennom. $_CLICK
 # ^DirSubText
-Målmappe
+MÃ¥lmappe
 # ^DirBrowseText
 Velg mappe du vil installere $(^Name) i:
 # ^UnDirText
-$(^Name) i følgende mappe vil bli avinstallert. For å velge en annen mappe, trykk Bla gjennom. $_CLICK
+$(^Name) i fÃ¸lgende mappe vil bli avinstallert. For Ã¥ velge en annen mappe, trykk Bla gjennom. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
@@ -113,15 +113,15 @@
 # ^SpaceAvailable
 "Ledig plass: "
 # ^SpaceRequired
-"Nødvendig plass: "
+"NÃ¸dvendig plass: "
 # ^UninstallingText
 Denne veiviseren vil avinstallere $(^Name) fra din datamaskin. $_CLICK
 # ^UninstallingSubText
 Avinstallerer fra:
 # ^FileError
-Feil under åpning av fil for skriving: \r\n\t\"$0\"\r\nTrykk Avbryt for å avbryte installasjonen,\r\nPrøv igjen for å prøve igjen, eller\r\nIgnorer for å hoppe over denne filen
+Feil under Ã¥pning av fil for skriving: \r\n\t\"$0\"\r\nTrykk Avbryt for Ã¥ avbryte installasjonen,\r\nPrÃ¸v igjen for Ã¥ prÃ¸ve igjen, eller\r\nIgnorer for Ã¥ hoppe over denne filen
 # ^FileError_NoIgnore
-Feil under åpning av fil for skriving: \r\n\t\"$0\"\r\nTrykk Prøv igjen for å prøve igjen, or\r\neller Avbryt for å avbryte installasjonen
+Feil under Ã¥pning av fil for skriving: \r\n\t\"$0\"\r\nTrykk PrÃ¸v igjen for Ã¥ prÃ¸ve igjen, or\r\neller Avbryt for Ã¥ avbryte installasjonen
 # ^CantWrite
 "Kan ikke skrive: "
 # ^CopyFailed
@@ -151,13 +151,13 @@
 # ^ErrorCreating
 "Feil under opprettelse av: "
 # ^ErrorDecompressing
-Feil under utpakking av data! Installasjonsprogrammet kan være skadet.
+Feil under utpakking av data! Installasjonsprogrammet kan vÃ¦re skadet.
 # ^ErrorRegistering
 Feil under registrering av DLL
 # ^ExecShell
 "ExecShell: "
 # ^Exec
-"Kjøre: "
+"KjÃ¸re: "
 # ^Extract
 "Pakk ut: "
 # ^ErrorWriting
@@ -179,12 +179,12 @@
 # ^CopyDetails
 Kopier detaljer til utklippstavlen
 # ^LogInstall
-Loggfør installasjonsprosessen
+LoggfÃ¸r installasjonsprosessen
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Georgian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Georgian.nlf	(revision 0)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Georgian.nlf	(revision 2956)
@@ -0,0 +1,190 @@
+ï»¿# Header, don't edit
+NLF v6
+# Language ID
+1079
+# Font and size - dash (-) means default
+-
+-
+# Codepage - dash (-) means ASCII code page
+1200
+# RTL - anything else than RTL means LTR
+-
+#Translation by David Huriev
+# ^Branding
+Nullsoft Install System %s
+# ^SetupCaption
+áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ� $(^Name)
+# ^UninstallCaption
+$(^Name)â€“áƒ˜áƒ¡ áƒ¬áƒ�áƒ¨áƒšáƒ�
+# ^LicenseSubCaption
+: áƒ¡áƒ�áƒšáƒ˜áƒªáƒ”áƒœáƒ–áƒ˜áƒ� áƒ¨áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ�
+# ^ComponentsSubCaption
+: áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡ áƒ›áƒ�áƒœáƒ�áƒªáƒ”áƒ›áƒ”áƒ‘áƒ˜
+# ^DirSubCaption
+: áƒ¡áƒ�áƒ˜áƒœáƒ¡áƒ¢áƒ�áƒšáƒ�áƒªáƒ˜áƒ� áƒ¤áƒ�áƒšáƒ“áƒ”áƒ áƒ˜
+# ^InstallingSubCaption
+: áƒ¤áƒ�áƒ˜áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ™áƒ�áƒžáƒ˜áƒ áƒ”áƒ‘áƒ�
+# ^CompletedSubCaption
+: áƒ�áƒžáƒ”áƒ áƒ�áƒªáƒ˜áƒ� áƒ“áƒ�áƒ¡áƒ áƒ£áƒšáƒ”áƒ‘áƒ£áƒšáƒ˜áƒ�
+# ^UnComponentsSubCaption
+: áƒ¬áƒ�áƒ¨áƒšáƒ˜áƒ¡ áƒ›áƒ�áƒœáƒ�áƒªáƒ”áƒ›áƒ”áƒ‘áƒ˜
+# ^UnDirSubCaption
+: áƒ¬áƒ�áƒ¨áƒšáƒ˜áƒ¡ áƒ¤áƒ�áƒ£áƒšáƒ“áƒ”áƒ áƒ˜
+# ^ConfirmSubCaption
+: áƒ—áƒ�áƒœáƒ®áƒ›áƒ�áƒ‘áƒ�
+# ^UninstallingSubCaption
+: áƒ¤áƒ�áƒ˜áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ¬áƒ�áƒ¨áƒšáƒ�
+# ^UnCompletedSubCaption
+: áƒ�áƒžáƒ”áƒ áƒ�áƒªáƒ˜áƒ� áƒ“áƒ�áƒ¡áƒ áƒ£áƒšáƒ”áƒ‘áƒ£áƒšáƒ˜áƒ�
+# ^BackBtn
+< &áƒ£áƒ™áƒ�áƒœ
+# ^NextBtn
+&áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’ >
+# ^AgreeBtn
+áƒ•áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”&áƒ‘áƒ˜
+# ^AcceptBtn
+&áƒ•áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ˜ áƒ¡áƒ�áƒšáƒ˜áƒªáƒ”áƒœáƒ–áƒ˜áƒ� áƒžáƒ˜áƒ áƒ�áƒ‘áƒ”áƒ‘áƒ¡
+# ^DontAcceptBtn
+&áƒ�áƒ  áƒ•áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ˜ áƒ¡áƒ�áƒšáƒ˜áƒªáƒ”áƒœáƒ–áƒ˜áƒ� áƒžáƒ˜áƒ áƒ�áƒ‘áƒ”áƒ‘áƒ¡
+# ^InstallBtn
+&áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ�
+# ^UninstallBtn
+áƒ¬áƒ�áƒ¨&áƒšáƒ�
+# ^CancelBtn
+áƒ£áƒ�áƒ áƒ˜
+# ^CloseBtn
+&áƒ“áƒ�áƒ®áƒ£áƒ áƒ•áƒ�
+# ^BrowseBtn
+áƒ“áƒ�áƒ—&áƒ•áƒ�áƒšáƒ˜áƒ”áƒ áƒ”áƒ‘áƒ�...
+# ^ShowDetailsBtn
+&áƒ“áƒ”áƒ¢áƒ�áƒšáƒ”áƒ‘áƒ˜...
+# ^ClickNext
+áƒ’áƒ�áƒ¡áƒ�áƒ’áƒ áƒ«áƒ”áƒšáƒ”áƒ‘áƒšáƒ�áƒ“ áƒ“áƒ�áƒ�áƒ¬áƒ™áƒ�áƒžáƒ£áƒœáƒ”áƒ— áƒ¦áƒ˜áƒšáƒ�áƒ™áƒ–áƒ” 'áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’'.
+# ^ClickInstall
+áƒ“áƒ�áƒ�áƒ¬áƒ™áƒ�áƒžáƒ£áƒœáƒ”áƒ— áƒ¦áƒ˜áƒšáƒ�áƒ™áƒ–áƒ” 'áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ�', áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ˜áƒ¡ áƒ©áƒ�áƒ¡áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ�áƒ“.
+# ^ClickUninstall
+áƒ“áƒ�áƒ�áƒ¬áƒ™áƒ�áƒžáƒ£áƒœáƒ”áƒ— áƒ¦áƒ˜áƒšáƒ�áƒ™áƒ–áƒ” 'áƒ¬áƒ�áƒ¨áƒšáƒ�', áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ˜áƒ¡ áƒ¬áƒ�áƒ¡áƒ�áƒ¨áƒšáƒ”áƒšáƒ�áƒ“.
+# ^Name
+áƒ¡áƒ�áƒ®áƒ”áƒšáƒ˜
+# ^Completed
+áƒ©áƒ�áƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ�
+# ^LicenseText
+áƒ¡áƒ�áƒœáƒ�áƒ› áƒ©áƒ�áƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ”áƒ‘áƒ� $(^NameDA) áƒ’áƒ�áƒ”áƒªáƒ�áƒœáƒ˜áƒ— áƒ¡áƒ�áƒšáƒ˜áƒªáƒ”áƒœáƒ–áƒ˜áƒ� áƒ®áƒ”áƒšáƒ¨áƒ”áƒ™áƒ áƒ£áƒšáƒ”áƒ‘áƒ�áƒ¡. áƒ—áƒ£ áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ˜áƒ— áƒžáƒ˜áƒ áƒ�áƒ‘áƒ”áƒ‘áƒ¡ áƒ“áƒ�áƒ�áƒ¬áƒ™áƒ�áƒžáƒ£áƒœáƒ”áƒ— áƒ¦áƒ˜áƒšáƒ�áƒ™áƒ–áƒ” 'áƒ—áƒ�áƒœáƒ®áƒ›áƒ�áƒ‘áƒ�'.
+# ^LicenseTextCB
+áƒ¡áƒ�áƒœáƒ�áƒ› áƒ©áƒ�áƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ”áƒ‘áƒ� $(^NameDA) áƒ’áƒ�áƒ”áƒªáƒ�áƒœáƒ˜áƒ— áƒ¡áƒ�áƒšáƒ˜áƒªáƒ”áƒœáƒ–áƒ˜áƒ� áƒ®áƒ”áƒšáƒ¨áƒ”áƒ™áƒ áƒ£áƒšáƒ”áƒ‘áƒ�áƒ¡. áƒ—áƒ£ áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ˜áƒ— áƒžáƒ˜áƒ áƒ�áƒ‘áƒ”áƒ‘áƒ¡ áƒ›áƒ�áƒœáƒ˜áƒ¨áƒœáƒ”áƒ— áƒ¤áƒ�áƒœáƒ¯áƒ�áƒ áƒ� áƒ¥áƒ•áƒ”áƒ›áƒ�áƒ—. $_CLICK
+# ^LicenseTextRB
+áƒ¡áƒ�áƒœáƒ�áƒ› áƒ©áƒ�áƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ”áƒ‘áƒ� $(^NameDA) áƒ’áƒ�áƒ”áƒªáƒ�áƒœáƒ˜áƒ— áƒ¡áƒ�áƒšáƒ˜áƒªáƒ”áƒœáƒ–áƒ˜áƒ� áƒ®áƒ”áƒšáƒ¨áƒ”áƒ™áƒ áƒ£áƒšáƒ”áƒ‘áƒ�áƒ¡. áƒ—áƒ£ áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ˜áƒ— áƒžáƒ˜áƒ áƒ�áƒ‘áƒ”áƒ‘áƒ¡ áƒ›áƒ�áƒœáƒ˜áƒ¨áƒœáƒ”áƒ— áƒ¥áƒ•áƒ”áƒ›áƒ�áƒ— áƒ›áƒ�áƒªáƒ”áƒ›áƒ£áƒšáƒ˜ áƒžáƒ˜áƒ áƒ•áƒ”áƒšáƒ˜ áƒ•áƒ�áƒ áƒ˜áƒ�áƒœáƒ¢áƒ˜. $_CLICK
+# ^UnLicenseText
+áƒ¡áƒ�áƒœáƒ�áƒ› áƒ¬áƒ�áƒ¨áƒšáƒ˜áƒ— $(^NameDA) áƒ’áƒ�áƒ”áƒªáƒ�áƒœáƒ˜áƒ— áƒ¡áƒ�áƒšáƒ˜áƒªáƒ”áƒœáƒ–áƒ˜áƒ� áƒ®áƒ”áƒšáƒ¨áƒ”áƒ™áƒ áƒ£áƒšáƒ”áƒ‘áƒ�áƒ¡. áƒ—áƒ£ áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ˜áƒ— áƒžáƒ˜áƒ áƒ�áƒ‘áƒ”áƒ‘áƒ¡ áƒ“áƒ�áƒ�áƒ¬áƒ™áƒ�áƒžáƒ£áƒœáƒ”áƒ— áƒ¦áƒ˜áƒšáƒ�áƒ™áƒ–áƒ” 'áƒ—áƒ�áƒœáƒ®áƒ›áƒ�áƒ‘áƒ�'.
+# ^UnLicenseTextCB
+áƒ¡áƒ�áƒœáƒ�áƒ› áƒ¬áƒ�áƒ¨áƒšáƒ˜áƒ— $(^NameDA) áƒ’áƒ�áƒ”áƒªáƒ�áƒœáƒ˜áƒ— áƒ¡áƒ�áƒšáƒ˜áƒªáƒ”áƒœáƒ–áƒ˜áƒ� áƒ®áƒ”áƒšáƒ¨áƒ”áƒ™áƒ áƒ£áƒšáƒ”áƒ‘áƒ�áƒ¡. áƒ—áƒ£ áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ˜áƒ— áƒžáƒ˜áƒ áƒ�áƒ‘áƒ”áƒ‘áƒ¡ áƒ›áƒ�áƒœáƒ˜áƒ¨áƒœáƒ”áƒ— áƒ¤áƒ�áƒœáƒ¯áƒ�áƒ áƒ� áƒ¥áƒ•áƒ”áƒ›áƒ�áƒ—. $_CLICK
+# ^UnLicenseTextRB
+áƒ¡áƒ�áƒœáƒ�áƒ› áƒ¬áƒ�áƒ¨áƒšáƒ˜áƒ— $(^NameDA) áƒ’áƒ�áƒ”áƒªáƒ�áƒœáƒ˜áƒ— áƒ¡áƒ�áƒšáƒ˜áƒªáƒ”áƒœáƒ–áƒ˜áƒ� áƒ®áƒ”áƒšáƒ¨áƒ”áƒ™áƒ áƒ£áƒšáƒ”áƒ‘áƒ�áƒ¡. áƒ—áƒ£ áƒ”áƒ—áƒ�áƒœáƒ®áƒ›áƒ”áƒ‘áƒ˜áƒ— áƒžáƒ˜áƒ áƒ�áƒ‘áƒ”áƒ‘áƒ¡ áƒ›áƒ�áƒœáƒ˜áƒ¨áƒœáƒ”áƒ— áƒ¥áƒ•áƒ”áƒ›áƒ�áƒ— áƒ›áƒ�áƒªáƒ”áƒ›áƒ£áƒšáƒ˜ áƒžáƒ˜áƒ áƒ•áƒ”áƒšáƒ˜ áƒ•áƒ�áƒ áƒ˜áƒ�áƒœáƒ¢áƒ˜. $_CLICK
+# ^Custom
+áƒ¡áƒ¢áƒ�áƒœáƒ“áƒ�áƒ áƒ¢áƒ£áƒšáƒ˜
+# ^ComponentsText
+áƒ�áƒ˜áƒ áƒ©áƒ˜áƒ”áƒ— áƒ˜áƒ¡ áƒ™áƒ�áƒ›áƒžáƒ�áƒœáƒ”áƒœáƒ¢áƒ”áƒ‘áƒ˜, áƒ áƒ�áƒ›áƒšáƒ˜áƒ¡ áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ�áƒª áƒ’áƒ¡áƒ£áƒ áƒ—. $_CLICK
+# ^ComponentsSubText1
+áƒ�áƒ˜áƒ áƒ©áƒ˜áƒ”áƒ— áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡ áƒ›áƒ”áƒ—áƒ�áƒ“áƒ˜:
+# ^ComponentsSubText2_NoInstTypes
+áƒ©áƒ�áƒ¡áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ�áƒ“ áƒ�áƒ˜áƒ áƒ©áƒ˜áƒ”áƒ— áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ˜áƒ¡ áƒ™áƒ�áƒ›áƒžáƒ�áƒœáƒ”áƒœáƒ¢áƒ”áƒ‘áƒ˜:
+# ^ComponentsSubText2
+áƒ�áƒœ áƒ©áƒ�áƒ¡áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ�áƒ“ áƒ�áƒ˜áƒ áƒ©áƒ˜áƒ”áƒ— áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ˜áƒ¡ áƒ“áƒ�áƒ›áƒ�áƒ¢áƒ”áƒ‘áƒ˜áƒ—áƒ˜ áƒ™áƒ�áƒ›áƒžáƒ�áƒœáƒ”áƒœáƒ¢áƒ”áƒ‘áƒ˜:
+# ^UnComponentsText
+áƒ�áƒ˜áƒ áƒ©áƒ˜áƒ”áƒ— áƒ˜áƒ¡ áƒ™áƒ�áƒ›áƒžáƒ�áƒœáƒ”áƒœáƒ¢áƒ”áƒ‘áƒ˜, áƒ áƒ�áƒ›áƒšáƒ˜áƒ¡ áƒ¬áƒ�áƒ¨áƒšáƒ�áƒª áƒ’áƒ¡áƒ£áƒ áƒ—. $_CLICK
+# ^UnComponentsSubText1
+áƒ�áƒ˜áƒ áƒ©áƒ˜áƒ”áƒ— áƒ¬áƒ�áƒ¨áƒšáƒ˜áƒ¡ áƒ›áƒ”áƒ—áƒ�áƒ“áƒ˜:
+# ^UnComponentsSubText2_NoInstTypes
+áƒ¬áƒ�áƒ¡áƒ�áƒ¨áƒšáƒ”áƒšáƒ�áƒ“ áƒ�áƒ˜áƒ áƒ©áƒ˜áƒ”áƒ— áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ˜áƒ¡ áƒ™áƒ�áƒ›áƒžáƒ�áƒœáƒ”áƒœáƒ¢áƒ”áƒ‘áƒ˜:
+# ^UnComponentsSubText2
+áƒ�áƒœ áƒ¬áƒ�áƒ¡áƒ�áƒ¨áƒšáƒ”áƒšáƒ�áƒ“ áƒ�áƒ˜áƒ áƒ©áƒ˜áƒ”áƒ— áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ˜áƒ¡ áƒ“áƒ�áƒ›áƒ�áƒ¢áƒ”áƒ‘áƒ˜áƒ—áƒ˜ áƒ™áƒ�áƒ›áƒžáƒ�áƒœáƒ”áƒœáƒ¢áƒ”áƒ‘áƒ˜:
+# ^DirText
+áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ� áƒ©áƒ�áƒ’áƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ�áƒ•áƒ— $(^NameDA)â€“áƒ˜áƒ¡ áƒ›áƒ˜áƒ—áƒ˜áƒ—áƒ”áƒ‘áƒ£áƒš áƒ¤áƒ�áƒšáƒ“áƒ”áƒ áƒ¨áƒ˜. áƒ¡áƒ®áƒ•áƒ� áƒ�áƒ“áƒ’áƒ˜áƒšáƒ–áƒ” áƒ©áƒ�áƒ¡áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ�áƒ“ áƒ“áƒ�áƒ�áƒ¬áƒ™áƒ�áƒžáƒ£áƒœáƒ”áƒ— áƒ¦áƒ˜áƒšáƒ�áƒ™áƒ–áƒ” 'áƒ“áƒ�áƒ—áƒ•áƒ�áƒšáƒ˜áƒ”áƒ áƒ”áƒ‘áƒ�' áƒ“áƒ� áƒ›áƒ˜áƒ£áƒ—áƒ˜áƒ—áƒ”áƒ— áƒ�áƒ“áƒ’áƒ˜áƒšáƒ˜. $_CLICK
+# ^DirSubText
+áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡ áƒ¤áƒ�áƒšáƒ“áƒ”áƒ áƒ˜
+# ^DirBrowseText
+áƒ›áƒ˜áƒ—áƒ˜áƒ—áƒ”áƒ— áƒ¤áƒ�áƒšáƒ“áƒ”áƒ áƒ˜ áƒ¡áƒ�áƒ“áƒ�áƒª áƒ£áƒœáƒ“áƒ� áƒ©áƒ�áƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ�áƒ¡ $(^NameDA):
+# ^UnDirText
+áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ� áƒ¬áƒ�áƒ¨áƒšáƒ˜áƒ¡ $(^NameDA)â€“áƒ˜áƒ¡ áƒ›áƒ˜áƒ—áƒ˜áƒ—áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ¤áƒ�áƒšáƒ“áƒ”áƒ áƒ˜áƒ“áƒ�áƒœ. áƒ¡áƒ®áƒ•áƒ� áƒ¤áƒ�áƒšáƒ“áƒ”áƒ áƒ˜áƒ“áƒ�áƒœ áƒ¬áƒ�áƒ¡áƒ�áƒ¨áƒšáƒ”áƒšáƒ�áƒ“ áƒ“áƒ�áƒ�áƒ¬áƒ™áƒ�áƒžáƒ£áƒœáƒ”áƒ— áƒ¦áƒ˜áƒšáƒ�áƒ™áƒ–áƒ” 'áƒ“áƒ�áƒ—áƒ•áƒ�áƒšáƒ˜áƒ”áƒ áƒ”áƒ‘áƒ�' áƒ“áƒ� áƒ›áƒ˜áƒ£áƒ—áƒ˜áƒ—áƒ”áƒ— áƒ�áƒ“áƒ’áƒ˜áƒšáƒ˜. $_CLICK
+# ^UnDirSubText
+""
+# ^UnDirBrowseText
+áƒ›áƒ˜áƒ£áƒ—áƒ˜áƒ—áƒ”áƒ— áƒ¤áƒ�áƒšáƒ“áƒ”áƒ áƒ˜ áƒ¡áƒ�áƒ˜áƒ“áƒ�áƒœáƒ�áƒª áƒ£áƒœáƒ“áƒ� áƒ¬áƒ�áƒ˜áƒ¨áƒ�áƒšáƒ�áƒ¡ $(^NameDA):
+# ^SpaceAvailable
+"Ð”Ð¾Ñ�Ñ‚ÑƒÐ¿Ð½Ð¾ Ð½Ð° Ð´Ð¸Ñ�ÐºÐµ: "
+# ^SpaceRequired
+"Ð¢Ñ€ÐµÐ±ÑƒÐµÑ‚Ñ�Ñ� Ð½Ð° Ð´Ð¸Ñ�ÐºÐµ: "
+# ^UninstallingText
+áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ� $(^NameDA) áƒ¬áƒ�áƒ˜áƒ¨áƒšáƒ”áƒ‘áƒ� áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ™áƒ�áƒ›áƒžáƒ˜áƒ£áƒ¢áƒ”áƒ áƒ˜áƒ“áƒ�áƒœ. $_CLICK
+# ^UninstallingSubText
+áƒ¬áƒ�áƒ¨áƒšáƒ�:
+# ^FileError
+áƒ�áƒ  áƒ˜áƒ®áƒ¡áƒœáƒ”áƒ‘áƒ� áƒ¤áƒ�áƒ˜áƒšáƒ”áƒ‘áƒ˜ áƒ©áƒ�áƒ¡áƒ�áƒ¬áƒ”áƒ áƒ�áƒ“: \r\n\t"$0"\r\n'áƒ¨áƒ”áƒ©áƒ”áƒ áƒ”áƒ‘áƒ�': áƒ¨áƒ”áƒ©áƒ”áƒ áƒ“áƒ”áƒ¡ áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ�;\r\n"áƒ’áƒ�áƒ›áƒ”áƒ�áƒ áƒ”áƒ‘áƒ�": áƒ›áƒªáƒ“áƒ”áƒšáƒ�áƒ‘áƒ˜áƒ¡ áƒ’áƒ�áƒ›áƒ”áƒ�áƒ áƒ”áƒ‘áƒ�;\r\n"áƒ’áƒ�áƒ›áƒ�áƒ¢áƒ�áƒ•áƒ”áƒ‘áƒ�": áƒ�áƒ› áƒ›áƒ�áƒ¥áƒ›áƒ”áƒ“áƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒ�áƒ›áƒ�áƒ¢áƒ�áƒ•áƒ”áƒ‘áƒ�.
+# ^FileError_NoIgnore
+áƒ�áƒ  áƒ˜áƒ®áƒ¡áƒœáƒ”áƒ‘áƒ� áƒ¤áƒ�áƒ˜áƒšáƒ”áƒ˜ áƒ©áƒ�áƒ¡áƒ�áƒ¬áƒ”áƒ áƒ�áƒ“: \r\n\t"$0"\r\n'áƒ’áƒ�áƒ›áƒ”áƒ�áƒ áƒ”áƒ‘áƒ�': áƒ›áƒªáƒ“áƒ”áƒšáƒ�áƒ‘áƒ˜áƒ¡ áƒ’áƒ�áƒ›áƒ”áƒ�áƒ áƒ”áƒ‘áƒ�;\r\n'áƒ£áƒ�áƒ áƒ˜': áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡ áƒžáƒ áƒ�áƒªáƒ”áƒ¡áƒ˜áƒ¡ áƒ¨áƒ”áƒ¬áƒ§áƒ•áƒ”áƒ¢áƒ�.
+# ^CantWrite
+"áƒ�áƒ  áƒ˜áƒ¬áƒ”áƒ áƒ”áƒ‘áƒ�: "
+# ^CopyFailed
+áƒ¨áƒ”áƒªáƒ“áƒ�áƒ›áƒ� áƒ©áƒ�áƒ¬áƒ”áƒ áƒ˜áƒ¡ áƒ“áƒ áƒ�áƒ¡
+# ^CopyTo
+"áƒ™áƒ�áƒžáƒ˜áƒ áƒ”áƒ‘áƒ�: "
+# ^Registering
+"áƒ áƒ”áƒ’áƒ˜áƒ¡áƒ¢áƒ áƒ˜áƒ áƒ”áƒ‘áƒ�: "
+# ^Unregistering
+"áƒ áƒ”áƒ’áƒ˜áƒ¡áƒ¢áƒ áƒ˜áƒ áƒ”áƒ‘áƒ˜áƒ“áƒ�áƒœ áƒ›áƒ�áƒ®áƒ¡áƒœáƒ�: "
+# ^SymbolNotFound
+"áƒ•áƒ”áƒ  áƒ›áƒ�áƒ˜áƒ«áƒ”áƒ‘áƒœáƒ� áƒ¡áƒ˜áƒ›áƒ‘áƒ�áƒšáƒ�: "
+# ^CouldNotLoad
+"áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ� áƒ¨áƒ”áƒ£áƒ«áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜áƒ�: "
+# ^CreateFolder
+"áƒ¤áƒ�áƒšáƒ“áƒ”áƒ áƒ˜áƒ¡ áƒ¨áƒ”áƒ¥áƒ›áƒœáƒ�: "
+# ^CreateShortcut
+"áƒ˜áƒ�áƒ áƒšáƒ˜áƒ§áƒ˜áƒ¡ áƒ¨áƒ”áƒ¥áƒ›áƒœáƒ�: "
+# ^CreatedUninstaller
+"áƒ¬áƒ�áƒ¨áƒšáƒ˜áƒ¡ áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ˜áƒ¡ áƒ¨áƒ”áƒ¥áƒ›áƒœáƒ�: "
+# ^Delete
+"áƒ¤áƒ�áƒ˜áƒšáƒ˜áƒ¡ áƒ¬áƒ�áƒ¨áƒšáƒ�: "
+# ^DeleteOnReboot
+"áƒ¬áƒ�áƒ˜áƒ¨áƒšáƒ”áƒ‘áƒ� áƒ™áƒ�áƒ›áƒžáƒ˜áƒ£áƒ¢áƒ”áƒ áƒ˜áƒ¡ áƒ’áƒ�áƒ“áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡ áƒ“áƒ áƒ�áƒ¡: "
+# ^ErrorCreatingShortcut
+"áƒ˜áƒ�áƒ áƒšáƒ˜áƒ§áƒ˜áƒ¡ áƒ¨áƒ”áƒ¥áƒ›áƒœáƒ˜áƒ¡áƒ�áƒ¡ áƒ“áƒ�áƒ¨áƒ•áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ� áƒ¨áƒ”áƒªáƒ“áƒ�áƒ›áƒ�: " 
+# ^ErrorCreating
+"áƒ¨áƒ”áƒ¥áƒ›áƒœáƒ˜áƒ¡áƒ�áƒ¡ áƒ“áƒ�áƒ¨áƒ•áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ� áƒ¨áƒ”áƒªáƒ“áƒ�áƒ›áƒ�: "
+# ^ErrorDecompressing
+áƒ¨áƒ”áƒªáƒ“áƒ�áƒ›áƒ� áƒ›áƒ�áƒœáƒ�áƒªáƒ”áƒ›áƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒ�áƒ®áƒ¡áƒœáƒ˜áƒ¡áƒ�áƒ¡! áƒ¨áƒ”áƒ¡áƒ�áƒ«áƒšáƒ�áƒ� áƒ¡áƒ�áƒ˜áƒœáƒ¡áƒ¢áƒ�áƒšáƒ�áƒªáƒ˜áƒ� áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ�áƒ� áƒ“áƒ�áƒ–áƒ˜áƒ�áƒœáƒ”áƒ‘áƒ£áƒšáƒ˜.
+# ^ErrorRegistering
+áƒ�áƒ  áƒ áƒ”áƒ’áƒ˜áƒ¡áƒ¢áƒ áƒ˜áƒ áƒ“áƒ”áƒ‘áƒ� (DLL)
+# ^ExecShell
+"ExecShell: " 
+# ^Exec
+"áƒ¨áƒ”áƒ¡áƒ áƒ£áƒšáƒ”áƒ‘áƒ�: "
+# ^Extract
+"áƒ�áƒ›áƒ�áƒœáƒ�áƒ¬áƒ”áƒ áƒ˜: "
+# ^ErrorWriting
+"áƒ�áƒ›áƒ�áƒœáƒ�áƒ¬áƒ”áƒ áƒ˜: áƒ¨áƒ”áƒªáƒ“áƒ�áƒ›áƒ�áƒ� áƒ“áƒ�áƒ¨áƒ•áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ¤áƒ�áƒ˜áƒšáƒ˜áƒ¡ áƒ©áƒ�áƒ¬áƒ”áƒ áƒ˜áƒ¡áƒ�áƒ¡ "
+# ^InvalidOpcode
+áƒ¡áƒ�áƒ˜áƒœáƒ¡áƒ¢áƒ�áƒšáƒ�áƒªáƒ˜áƒ� áƒžáƒ áƒ�áƒ’áƒ áƒ�áƒ›áƒ� áƒ“áƒ�áƒ–áƒ˜áƒ�áƒœáƒ”áƒ‘áƒ£áƒšáƒ˜áƒ�: áƒ™áƒ�áƒ“áƒ˜ áƒ�áƒ  áƒ�áƒ áƒ¡áƒ”áƒ‘áƒ�áƒ‘áƒ¡
+# ^NoOLE
+"OLE áƒ�áƒ  áƒ�áƒ áƒ˜áƒ¡: " 
+# ^OutputFolder
+"áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡ áƒ¤áƒ�áƒšáƒ“áƒ”áƒ áƒ˜: "
+# ^RemoveFolder
+"áƒ¤áƒ�áƒšáƒ“áƒ”áƒ áƒ˜áƒ¡ áƒ¬áƒ�áƒ¨áƒšáƒ�: "
+# ^RenameOnReboot
+"áƒ¡áƒ�áƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒªáƒ•áƒšáƒ� áƒ™áƒ�áƒ›áƒžáƒ˜áƒ£áƒ¢áƒ”áƒ áƒ˜áƒ¡ áƒ’áƒ�áƒ“áƒ�áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡áƒ�áƒ¡: "
+# ^Rename
+"áƒ¡áƒ�áƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒªáƒ•áƒšáƒ�: "
+# ^Skipped
+"áƒ’áƒ�áƒ›áƒ�áƒ¢áƒ�áƒ•áƒ�: "
+# ^CopyDetails
+áƒ›áƒ�áƒœáƒ�áƒªáƒ”áƒ›áƒ”áƒ‘áƒ˜áƒ¡ áƒ‘áƒ£áƒ¤áƒ”áƒ áƒ¨áƒ˜ áƒ™áƒ�áƒžáƒ˜áƒ áƒ”áƒ‘áƒ� 
+# ^LogInstall
+áƒ©áƒ�áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡ áƒ�áƒ¦áƒ¬áƒ”áƒ áƒ�
+# byte
+B
+# kilo
+ K
+# mega
+ M
+# giga
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Welsh.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Welsh.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Welsh.nsh	(revision 2956)
@@ -1,7 +1,7 @@
-;Language: Welsh (1106)
+ï»¿;Language: Welsh (1106)
 ;By Rhoslyn Prys, Meddal.com
 
-!insertmacro LANGFILE "Welsh" "Welsh"
+!insertmacro LANGFILE "Welsh" = "Cymraeg" =
 
 !ifdef MUI_WELCOMEPAGE
   ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Croeso i Ddewin Gosod $(^NameDA)"
@@ -48,7 +48,7 @@
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
     ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Gosod eich llygoden dros gydran i weld ei ddisgrifiad."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Gosod eich llygoden dros gydran i weld ei ddisgrifiad."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Dewis cydran i weld ei ddisgrifiad."
   !endif
 !endif
 
@@ -68,7 +68,7 @@
   ${LangFileString} MUI_TEXT_FINISH_TITLE "Cwblhawyd y Gosod"
   ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Mae'r Gosod wedi ei gwblhau'n llwyddiannus."
   ${LangFileString} MUI_TEXT_ABORT_TITLE "Ataliwyd y Gosod"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Methwyd â chwblhau'r gosod yn llwyddiannus."
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Methwyd Ã¢ chwblhau'r gosod yn llwyddiannus."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
@@ -77,7 +77,7 @@
   ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Cwblhawyd y Dadosod"
   ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Mae'r Dadosod wedi ei gwblhau'n llwyddiannus."
   ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Ataliwyd y Dadosod"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Methwyd â chwblhau'r dadosod yn llwyddiannus."
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Methwyd Ã¢ chwblhau'r dadosod yn llwyddiannus."
 !endif
 
 !ifdef MUI_FINISHPAGE
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Japanese.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Japanese.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Japanese.nsh	(revision 2956)
@@ -1,130 +1,130 @@
-;Language: Japanese (1041)
+ï»¿;Language: Japanese (1041)
 ;By Dnanako
 ;Translation updated by Takahiro Yoshimura <takahiro_y@monolithworks.co.jp>
 
-!insertmacro LANGFILE "Japanese" "Japanese"
+!insertmacro LANGFILE "Japanese" = "æ—¥æœ¬èªž" "Nihongo"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) ƒZƒbƒgƒAƒbƒv ƒEƒBƒU�[ƒh‚Ö‚æ‚¤‚±‚»"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "‚±‚ÌƒEƒBƒU�[ƒh‚Í�A$(^NameDA)‚ÌƒCƒ“ƒXƒg�[ƒ‹‚ðƒKƒCƒh‚µ‚Ä‚¢‚«‚Ü‚·�B$\r$\n$\r$\nƒZƒbƒgƒAƒbƒv‚ðŠJŽn‚·‚é‘O‚É�A‘¼‚Ì‚·‚×‚Ä‚ÌƒAƒvƒŠƒP�[ƒVƒ‡ƒ“‚ð�I—¹‚·‚é‚±‚Æ‚ð�„�§‚µ‚Ü‚·�B‚±‚ê‚É‚æ‚Á‚ÄƒZƒbƒgƒAƒbƒv‚ªƒRƒ“ƒsƒ…�[ƒ^‚ð�Ä‹N“®‚¹‚¸‚É�AƒVƒXƒeƒ€ ƒtƒ@ƒCƒ‹‚ð�X�V‚·‚é‚±‚Æ‚ª�o—ˆ‚é‚æ‚¤‚É‚È‚è‚Ü‚·�B$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ— ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã�¸ã‚ˆã�†ã�“ã��"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "ã�“ã�®ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã�¯ã€�$(^NameDA)ã�®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ã‚¬ã‚¤ãƒ‰ã�—ã�¦ã�„ã��ã�¾ã�™ã€‚$\r$\n$\r$\nã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—ã‚’é–‹å§‹ã�™ã‚‹å‰�ã�«ã€�ä»–ã�®ã�™ã�¹ã�¦ã�®ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã‚’çµ‚äº†ã�™ã‚‹ã�“ã�¨ã‚’æŽ¨å¥¨ã�—ã�¾ã�™ã€‚ã�“ã‚Œã�«ã‚ˆã�£ã�¦ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—ã�Œã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ã‚’å†�èµ·å‹•ã�›ã�šã�«ã€�ã‚·ã‚¹ãƒ†ãƒ  ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ›´æ–°ã�™ã‚‹ã�“ã�¨ã�Œå‡ºæ�¥ã‚‹ã‚ˆã�†ã�«ã�ªã‚Šã�¾ã�™ã€‚$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "$(^NameDA) ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹ ƒEƒBƒU�[ƒh‚Ö‚æ‚¤‚±‚»"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "‚±‚ÌƒEƒBƒU�[ƒh‚Í�A$(^NameDA)‚ÌƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚ðƒKƒCƒh‚µ‚Ä‚¢‚«‚Ü‚·�B$\r$\n$\r$\nƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚ðŠJŽn‚·‚é‘O‚É�A$(^NameDA)‚ª‹N“®‚µ‚Ä‚¢‚È‚¢‚±‚Æ‚ðŠm”F‚µ‚Ä‰º‚³‚¢�B$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "$(^NameDA) ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã�¸ã‚ˆã�†ã�“ã��"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "ã�“ã�®ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã�¯ã€�$(^NameDA)ã�®ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ã‚¬ã‚¤ãƒ‰ã�—ã�¦ã�„ã��ã�¾ã�™ã€‚$\r$\n$\r$\nã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’é–‹å§‹ã�™ã‚‹å‰�ã�«ã€�$(^NameDA)ã�Œèµ·å‹•ã�—ã�¦ã�„ã�ªã�„ã�“ã�¨ã‚’ç¢ºèª�ã�—ã�¦ä¸‹ã�•ã�„ã€‚$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "ƒ‰ƒCƒZƒ“ƒXŒ_–ñ�‘"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "$(^NameDA)‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚é‘O‚É�Aƒ‰ƒCƒZƒ“ƒX�ðŒ�‚ðŠm”F‚µ‚Ä‚­‚¾‚³‚¢�B"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Œ_–ñ�‘‚Ì‚·‚×‚Ä‚Ì�ðŒ�‚É“¯ˆÓ‚·‚é‚È‚ç‚Î�A[“¯ˆÓ‚·‚é] ‚ð‘I‚ñ‚ÅƒCƒ“ƒXƒg�[ƒ‹‚ð‘±‚¯‚Ä‚­‚¾‚³‚¢�B$(^NameDA) ‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚é‚É‚Í�AŒ_–ñ�‘‚É“¯ˆÓ‚·‚é•K—v‚ª‚ ‚è‚Ü‚·�B"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Œ_–ñ�‘‚Ì‚·‚×‚Ä‚Ì�ðŒ�‚É“¯ˆÓ‚·‚é‚È‚ç‚Î�A‰º‚Ìƒ`ƒFƒbƒNƒ{ƒbƒNƒX‚ðƒNƒŠƒbƒN‚µ‚Ä‚­‚¾‚³‚¢�B$(^NameDA) ‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚é‚É‚Í�AŒ_–ñ�‘‚É“¯ˆÓ‚·‚é•K—v‚ª‚ ‚è‚Ü‚·�B $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Œ_–ñ�‘‚Ì‚·‚×‚Ä‚Ì�ðŒ�‚É“¯ˆÓ‚·‚é‚È‚ç‚Î�A‰º‚É•\Ž¦‚³‚ê‚Ä‚¢‚éƒIƒvƒVƒ‡ƒ“‚Ì‚¤‚¿�A�Å�‰‚Ì‚à‚Ì‚ð‘I‚ñ‚Å‰º‚³‚¢�B$(^NameDA) ‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚é‚É‚Í�AŒ_–ñ�‘‚É“¯ˆÓ‚·‚é•K—v‚ª‚ ‚è‚Ü‚·�B $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "ãƒ©ã‚¤ã‚»ãƒ³ã‚¹å¥‘ç´„æ›¸"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "$(^NameDA)ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹å‰�ã�«ã€�ãƒ©ã‚¤ã‚»ãƒ³ã‚¹æ�¡ä»¶ã‚’ç¢ºèª�ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "å¥‘ç´„æ›¸ã�®ã�™ã�¹ã�¦ã�®æ�¡ä»¶ã�«å�Œæ„�ã�™ã‚‹ã�ªã‚‰ã�°ã€�[å�Œæ„�ã�™ã‚‹] ã‚’é�¸ã‚“ã�§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ç¶šã�‘ã�¦ã��ã� ã�•ã�„ã€‚$(^NameDA) ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹ã�«ã�¯ã€�å¥‘ç´„æ›¸ã�«å�Œæ„�ã�™ã‚‹å¿…è¦�ã�Œã�‚ã‚Šã�¾ã�™ã€‚"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "å¥‘ç´„æ›¸ã�®ã�™ã�¹ã�¦ã�®æ�¡ä»¶ã�«å�Œæ„�ã�™ã‚‹ã�ªã‚‰ã�°ã€�ä¸‹ã�®ãƒ�ã‚§ãƒƒã‚¯ãƒœãƒƒã‚¯ã‚¹ã‚’ã‚¯ãƒªãƒƒã‚¯ã�—ã�¦ã��ã� ã�•ã�„ã€‚$(^NameDA) ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹ã�«ã�¯ã€�å¥‘ç´„æ›¸ã�«å�Œæ„�ã�™ã‚‹å¿…è¦�ã�Œã�‚ã‚Šã�¾ã�™ã€‚ $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "å¥‘ç´„æ›¸ã�®ã�™ã�¹ã�¦ã�®æ�¡ä»¶ã�«å�Œæ„�ã�™ã‚‹ã�ªã‚‰ã�°ã€�ä¸‹ã�«è¡¨ç¤ºã�•ã‚Œã�¦ã�„ã‚‹ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã�®ã�†ã�¡ã€�æœ€åˆ�ã�®ã‚‚ã�®ã‚’é�¸ã‚“ã�§ä¸‹ã�•ã�„ã€‚$(^NameDA) ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹ã�«ã�¯ã€�å¥‘ç´„æ›¸ã�«å�Œæ„�ã�™ã‚‹å¿…è¦�ã�Œã�‚ã‚Šã�¾ã�™ã€‚ $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "ƒ‰ƒCƒZƒ“ƒXŒ_–ñ�‘"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "$(^NameDA)‚ðƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚·‚é‘O‚É�Aƒ‰ƒCƒZƒ“ƒX�ðŒ�‚ðŠm”F‚µ‚Ä‚­‚¾‚³‚¢�B"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Œ_–ñ�‘‚Ì‚·‚×‚Ä‚Ì�ðŒ�‚É“¯ˆÓ‚·‚é‚È‚ç‚Î�A[“¯ˆÓ‚·‚é] ‚ð‘I‚ñ‚ÅƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚ð‘±‚¯‚Ä‚­‚¾‚³‚¢�B$(^NameDA) ‚ðƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚·‚é‚É‚Í�AŒ_–ñ�‘‚É“¯ˆÓ‚·‚é•K—v‚ª‚ ‚è‚Ü‚·�B"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Œ_–ñ�‘‚Ì‚·‚×‚Ä‚Ì�ðŒ�‚É“¯ˆÓ‚·‚é‚È‚ç‚Î�A‰º‚Ìƒ`ƒFƒbƒNƒ{ƒbƒNƒX‚ðƒNƒŠƒbƒN‚µ‚Ä‚­‚¾‚³‚¢�B$(^NameDA) ‚ðƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚·‚é‚É‚Í�AŒ_–ñ�‘‚É“¯ˆÓ‚·‚é•K—v‚ª‚ ‚è‚Ü‚·�B $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Œ_–ñ�‘‚Ì‚·‚×‚Ä‚Ì�ðŒ�‚É“¯ˆÓ‚·‚é‚È‚ç‚Î�A‰º‚É•\Ž¦‚³‚ê‚Ä‚¢‚éƒIƒvƒVƒ‡ƒ“‚Ì‚¤‚¿�A�Å�‰‚Ì‚à‚Ì‚ð‘I‚ñ‚Å‰º‚³‚¢�B$(^NameDA) ‚ðƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚·‚é‚É‚Í�AŒ_–ñ�‘‚É“¯ˆÓ‚·‚é•K—v‚ª‚ ‚è‚Ü‚·�B $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "ãƒ©ã‚¤ã‚»ãƒ³ã‚¹å¥‘ç´„æ›¸"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "$(^NameDA)ã‚’ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹å‰�ã�«ã€�ãƒ©ã‚¤ã‚»ãƒ³ã‚¹æ�¡ä»¶ã‚’ç¢ºèª�ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "å¥‘ç´„æ›¸ã�®ã�™ã�¹ã�¦ã�®æ�¡ä»¶ã�«å�Œæ„�ã�™ã‚‹ã�ªã‚‰ã�°ã€�[å�Œæ„�ã�™ã‚‹] ã‚’é�¸ã‚“ã�§ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ç¶šã�‘ã�¦ã��ã� ã�•ã�„ã€‚$(^NameDA) ã‚’ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹ã�«ã�¯ã€�å¥‘ç´„æ›¸ã�«å�Œæ„�ã�™ã‚‹å¿…è¦�ã�Œã�‚ã‚Šã�¾ã�™ã€‚"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "å¥‘ç´„æ›¸ã�®ã�™ã�¹ã�¦ã�®æ�¡ä»¶ã�«å�Œæ„�ã�™ã‚‹ã�ªã‚‰ã�°ã€�ä¸‹ã�®ãƒ�ã‚§ãƒƒã‚¯ãƒœãƒƒã‚¯ã‚¹ã‚’ã‚¯ãƒªãƒƒã‚¯ã�—ã�¦ã��ã� ã�•ã�„ã€‚$(^NameDA) ã‚’ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹ã�«ã�¯ã€�å¥‘ç´„æ›¸ã�«å�Œæ„�ã�™ã‚‹å¿…è¦�ã�Œã�‚ã‚Šã�¾ã�™ã€‚ $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "å¥‘ç´„æ›¸ã�®ã�™ã�¹ã�¦ã�®æ�¡ä»¶ã�«å�Œæ„�ã�™ã‚‹ã�ªã‚‰ã�°ã€�ä¸‹ã�«è¡¨ç¤ºã�•ã‚Œã�¦ã�„ã‚‹ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã�®ã�†ã�¡ã€�æœ€åˆ�ã�®ã‚‚ã�®ã‚’é�¸ã‚“ã�§ä¸‹ã�•ã�„ã€‚$(^NameDA) ã‚’ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹ã�«ã�¯ã€�å¥‘ç´„æ›¸ã�«å�Œæ„�ã�™ã‚‹å¿…è¦�ã�Œã�‚ã‚Šã�¾ã�™ã€‚ $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "[Page Down]‚ð‰Ÿ‚µ‚ÄŒ_–ñ�‘‚ð‚·‚×‚Ä‚¨“Ç‚Ý‚­‚¾‚³‚¢�B"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "[Page Down]ã‚’æŠ¼ã�—ã�¦å¥‘ç´„æ›¸ã‚’ã�™ã�¹ã�¦ã�Šèª­ã�¿ã��ã� ã�•ã�„ã€‚"
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "ƒRƒ“ƒ|�[ƒlƒ“ƒg‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢�B"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "$(^NameDA)‚ÌƒCƒ“ƒXƒg�[ƒ‹ ƒIƒvƒVƒ‡ƒ“‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢�B"
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "ã‚³ãƒ³ãƒ�ãƒ¼ãƒ�ãƒ³ãƒˆã‚’é�¸ã‚“ã�§ã��ã� ã�•ã�„ã€‚"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "$(^NameDA)ã�®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’é�¸ã‚“ã�§ã��ã� ã�•ã�„ã€‚"
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "ƒRƒ“ƒ|�[ƒlƒ“ƒg‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢�B"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "$(^NameDA)‚ÌƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹ ƒIƒvƒVƒ‡ƒ“‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢�B"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "ã‚³ãƒ³ãƒ�ãƒ¼ãƒ�ãƒ³ãƒˆã‚’é�¸ã‚“ã�§ã��ã� ã�•ã�„ã€‚"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "$(^NameDA)ã�®ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’é�¸ã‚“ã�§ã��ã� ã�•ã�„ã€‚"
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "�à–¾"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "èª¬æ˜Ž"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ƒRƒ“ƒ|�[ƒlƒ“ƒg‚Ì�ã‚Éƒ}ƒEƒX ƒJ�[ƒ\ƒ‹‚ðˆÚ“®‚·‚é‚Æ�A‚±‚±‚É�à–¾‚ª•\Ž¦‚³‚ê‚Ü‚·�B"
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ã‚³ãƒ³ãƒ�ãƒ¼ãƒ�ãƒ³ãƒˆã�®ä¸Šã�«ãƒžã‚¦ã‚¹ ã‚«ãƒ¼ã‚½ãƒ«ã‚’ç§»å‹•ã�™ã‚‹ã�¨ã€�ã�“ã�“ã�«èª¬æ˜Žã�Œè¡¨ç¤ºã�•ã‚Œã�¾ã�™ã€‚"
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ƒRƒ“ƒ|�[ƒlƒ“ƒg‚Ì�ã‚Éƒ}ƒEƒX ƒJ�[ƒ\ƒ‹‚ðˆÚ“®‚·‚é‚Æ�A‚±‚±‚É�à–¾‚ª•\Ž¦‚³‚ê‚Ü‚·�B"
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ã‚³ãƒ³ãƒ�ãƒ¼ãƒ�ãƒ³ãƒˆã‚’é�¸æŠžã�™ã‚‹ã�¨ã€�ã�“ã�“ã�«èª¬æ˜Žã�Œè¡¨ç¤ºã�•ã‚Œã�¾ã�™ã€‚"
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "ƒCƒ“ƒXƒg�[ƒ‹�æ‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢�B"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "$(^NameDA)‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚éƒtƒHƒ‹ƒ_‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢�B"
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆã‚’é�¸ã‚“ã�§ã��ã� ã�•ã�„ã€‚"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "$(^NameDA)ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹ãƒ•ã‚©ãƒ«ãƒ€ã‚’é�¸ã‚“ã�§ã��ã� ã�•ã�„ã€‚"
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹Œ³‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢�B"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "$(^NameDA)‚ðƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚·‚éƒtƒHƒ‹ƒ_‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢�B"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ƒã‚’é�¸ã‚“ã�§ã��ã� ã�•ã�„ã€‚"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "$(^NameDA)ã‚’ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹ãƒ•ã‚©ãƒ«ãƒ€ã‚’é�¸ã‚“ã�§ã��ã� ã�•ã�„ã€‚"
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "ƒCƒ“ƒXƒg�[ƒ‹"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "$(^NameDA)‚ðƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ä‚¢‚Ü‚·�B‚µ‚Î‚ç‚­‚¨‘Ò‚¿‚­‚¾‚³‚¢�B"
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "ƒCƒ“ƒXƒg�[ƒ‹‚ÌŠ®—¹"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "ƒCƒ“ƒXƒg�[ƒ‹‚É�¬Œ÷‚µ‚Ü‚µ‚½�B"
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "ƒCƒ“ƒXƒg�[ƒ‹‚Ì’†Ž~"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "ƒZƒbƒgƒAƒbƒv‚Í�³�í‚ÉŠ®—¹‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½�B"
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "$(^NameDA)ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�—ã�¦ã�„ã�¾ã�™ã€‚ã�—ã�°ã‚‰ã��ã�Šå¾…ã�¡ã��ã� ã�•ã�„ã€‚"
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�®å®Œäº†"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�«æˆ�åŠŸã�—ã�¾ã�—ã�Ÿã€‚"
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�®ä¸­æ­¢"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—ã�¯æ­£å¸¸ã�«å®Œäº†ã�•ã‚Œã�¾ã�›ã‚“ã�§ã�—ã�Ÿã€‚"
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "$(^NameDA)‚ðƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ä‚¢‚Ü‚·�B‚µ‚Î‚ç‚­‚¨‘Ò‚¿‚­‚¾‚³‚¢�B"
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚ÌŠ®—¹"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚É�¬Œ÷‚µ‚Ü‚µ‚½�B"
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚Ì’†Ž~"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚Í�³�í‚ÉŠ®—¹‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½�B"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "$(^NameDA)ã‚’ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�—ã�¦ã�„ã�¾ã�™ã€‚ã�—ã�°ã‚‰ã��ã�Šå¾…ã�¡ã��ã� ã�•ã�„ã€‚"
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�®å®Œäº†"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�«æˆ�åŠŸã�—ã�¾ã�—ã�Ÿã€‚"
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�®ä¸­æ­¢"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�¯æ­£å¸¸ã�«å®Œäº†ã�•ã‚Œã�¾ã�›ã‚“ã�§ã�—ã�Ÿã€‚"
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "$(^NameDA) ƒZƒbƒgƒAƒbƒv ƒEƒBƒU�[ƒh‚ÍŠ®—¹‚µ‚Ü‚µ‚½�B"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA)‚Í�A‚±‚ÌƒRƒ“ƒsƒ…�[ƒ^‚ÉƒCƒ“ƒXƒg�[ƒ‹‚³‚ê‚Ü‚µ‚½�B$\r$\n$\r$\nƒEƒBƒU�[ƒh‚ð•Â‚¶‚é‚É‚Í [Š®—¹] ‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢�B"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "$(^NameDA) ‚ÌƒCƒ“ƒXƒg�[ƒ‹‚ðŠ®—¹‚·‚é‚É‚Í�A‚±‚ÌƒRƒ“ƒsƒ…�[ƒ^‚ð�Ä‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·�B�¡‚·‚®�Ä‹N“®‚µ‚Ü‚·‚©�H"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "$(^NameDA) ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ— ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã�¯å®Œäº†ã�—ã�¾ã�—ã�Ÿã€‚"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA)ã�¯ã€�ã�“ã�®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ã�«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�•ã‚Œã�¾ã�—ã�Ÿã€‚$\r$\n$\r$\nã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã‚’é–‰ã�˜ã‚‹ã�«ã�¯ [å®Œäº†] ã‚’æŠ¼ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "$(^NameDA) ã�®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’å®Œäº†ã�™ã‚‹ã�«ã�¯ã€�ã�“ã�®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ã‚’å†�èµ·å‹•ã�™ã‚‹å¿…è¦�ã�Œã�‚ã‚Šã�¾ã�™ã€‚ä»Šã�™ã��å†�èµ·å‹•ã�—ã�¾ã�™ã�‹ï¼Ÿ"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "$(^NameDA) ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹ ƒEƒBƒU�[ƒh‚ÍŠ®—¹‚µ‚Ü‚µ‚½�B"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA)‚Í�A‚±‚ÌƒRƒ“ƒsƒ…�[ƒ^‚©‚çƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚³‚ê‚Ü‚µ‚½�B$\r$\n$\r$\nƒEƒBƒU�[ƒh‚ð•Â‚¶‚é‚É‚Í [Š®—¹] ‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢�B"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "$(^NameDA) ‚ÌƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚ðŠ®—¹‚·‚é‚É‚Í�A‚±‚ÌƒRƒ“ƒsƒ…�[ƒ^‚ð�Ä‹N“®‚·‚é•K—v‚ª‚ ‚è‚Ü‚·�B�¡‚·‚®�Ä‹N“®‚µ‚Ü‚·‚©�H"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "$(^NameDA) ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã�¯å®Œäº†ã�—ã�¾ã�—ã�Ÿã€‚"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA)ã�¯ã€�ã�“ã�®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ã�‹ã‚‰ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�•ã‚Œã�¾ã�—ã�Ÿã€‚$\r$\n$\r$\nã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã‚’é–‰ã�˜ã‚‹ã�«ã�¯ [å®Œäº†] ã‚’æŠ¼ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "$(^NameDA) ã�®ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’å®Œäº†ã�™ã‚‹ã�«ã�¯ã€�ã�“ã�®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ã‚’å†�èµ·å‹•ã�™ã‚‹å¿…è¦�ã�Œã�‚ã‚Šã�¾ã�™ã€‚ä»Šã�™ã��å†�èµ·å‹•ã�—ã�¾ã�™ã�‹ï¼Ÿ"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "�¡‚·‚®�Ä‹N“®‚·‚é"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Œã‚ÅŽè“®‚Å�Ä‹N“®‚·‚é"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "$(^NameDA)‚ðŽÀ�s(&R)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Readme ‚ð•\Ž¦‚·‚é(&S)"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "Š®—¹(&F)"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "ä»Šã�™ã��å†�èµ·å‹•ã�™ã‚‹"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "å¾Œã�§æ‰‹å‹•ã�§å†�èµ·å‹•ã�™ã‚‹"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "$(^NameDA)ã‚’å®Ÿè¡Œ(&R)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Readme ã‚’è¡¨ç¤ºã�™ã‚‹(&S)"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "å®Œäº†(&F)"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "ƒXƒ^�[ƒgƒ�ƒjƒ…�[ ƒtƒHƒ‹ƒ_‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢�B"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "$(^NameDA)‚ÌƒVƒ‡�[ƒgƒJƒbƒg‚ð�ì�¬‚·‚éƒXƒ^�[ƒgƒ�ƒjƒ…�[ ƒtƒHƒ‹ƒ_‚ð‘I‚ñ‚Å‰º‚³‚¢�B"
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "‚±‚Ìƒvƒ�ƒOƒ‰ƒ€‚ÌƒVƒ‡�[ƒgƒJƒbƒg‚ð�ì�¬‚µ‚½‚¢ƒXƒ^�[ƒgƒ�ƒjƒ…�[ ƒtƒHƒ‹ƒ_‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢�B‚Ü‚½�A�ì�¬‚·‚é�V‚µ‚¢ƒtƒHƒ‹ƒ_‚É–¼‘O‚ð‚Â‚¯‚é‚±‚Æ‚à‚Å‚«‚Ü‚·�B"
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "ƒVƒ‡�[ƒgƒJƒbƒg‚ð�ì�¬‚µ‚È‚¢"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "ã‚¹ã‚¿ãƒ¼ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ¼ ãƒ•ã‚©ãƒ«ãƒ€ã‚’é�¸ã‚“ã�§ã��ã� ã�•ã�„ã€‚"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "$(^NameDA)ã�®ã‚·ãƒ§ãƒ¼ãƒˆã‚«ãƒƒãƒˆã‚’ä½œæˆ�ã�™ã‚‹ã‚¹ã‚¿ãƒ¼ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ¼ ãƒ•ã‚©ãƒ«ãƒ€ã‚’é�¸ã‚“ã�§ä¸‹ã�•ã�„ã€‚"
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "ã�“ã�®ãƒ—ãƒ­ã‚°ãƒ©ãƒ ã�®ã‚·ãƒ§ãƒ¼ãƒˆã‚«ãƒƒãƒˆã‚’ä½œæˆ�ã�—ã�Ÿã�„ã‚¹ã‚¿ãƒ¼ãƒˆãƒ¡ãƒ‹ãƒ¥ãƒ¼ ãƒ•ã‚©ãƒ«ãƒ€ã‚’é�¸æŠžã�—ã�¦ã��ã� ã�•ã�„ã€‚ã�¾ã�Ÿã€�ä½œæˆ�ã�™ã‚‹æ–°ã�—ã�„ãƒ•ã‚©ãƒ«ãƒ€ã�«å��å‰�ã‚’ã�¤ã�‘ã‚‹ã�“ã�¨ã‚‚ã�§ã��ã�¾ã�™ã€‚"
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "ã‚·ãƒ§ãƒ¼ãƒˆã‚«ãƒƒãƒˆã‚’ä½œæˆ�ã�—ã�ªã�„"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "$(^NameDA)‚ÌƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "$(^NameDA)‚ð‚±‚ÌƒRƒ“ƒsƒ…�[ƒ^‚©‚ç�í�œ‚µ‚Ü‚·�B"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "$(^NameDA)ã�®ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "$(^NameDA)ã‚’ã�“ã�®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ã�‹ã‚‰å‰Šé™¤ã�—ã�¾ã�™ã€‚"
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "$(^Name) ƒZƒbƒgƒAƒbƒv‚ð’†Ž~‚µ‚Ü‚·‚©�H"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "$(^Name) ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—ã‚’ä¸­æ­¢ã�—ã�¾ã�™ã�‹ï¼Ÿ"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "$(^Name) ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚ð’†Ž~‚µ‚Ü‚·‚©�H"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "$(^Name) ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ä¸­æ­¢ã�—ã�¾ã�™ã�‹ï¼Ÿ"
 !endif
 
 !ifdef MULTIUSER_INSTALLMODEPAGE
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "ƒ†�[ƒU�[‚ð‘I‘ð"
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "‚Ç‚Ìƒ†�[ƒU�[‚Ì‚½‚ß‚É$(^NameDA)‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚é‚©‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢�B"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "$(^NameDA)‚ðŽ©•ªŽ©�g‚Ì‚½‚ß‚¾‚¯‚ÉƒCƒ“ƒXƒg�[ƒ‹‚µ‚½‚¢‚Ì‚©�A‚±‚ÌƒRƒ“ƒsƒ…�[ƒ^�[‚Ì‘Sƒ†�[ƒU�[‚Ì‚½‚ß‚ÉƒCƒ“ƒXƒg�[ƒ‹‚µ‚½‚¢‚Ì‚©‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢�B$(^ClickNext)"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "‚±‚ÌƒRƒ“ƒsƒ…�[ƒ^�[‚ðŽg—p‚µ‚Ä‚¢‚é‘S‚Ä‚Ì�l—p‚ÉƒCƒ“ƒXƒg�[ƒ‹‚·‚é"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Ž©•ª�ê—p‚ÉƒCƒ“ƒXƒg�[ƒ‹‚·‚é"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’é�¸æŠž"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "ã�©ã�®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã�®ã�Ÿã‚�ã�«$(^NameDA)ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹ã�‹é�¸æŠžã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "$(^NameDA)ã‚’è‡ªåˆ†è‡ªèº«ã�®ã�Ÿã‚�ã� ã�‘ã�«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�—ã�Ÿã�„ã�®ã�‹ã€�ã�“ã�®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ãƒ¼ã�®å…¨ãƒ¦ãƒ¼ã‚¶ãƒ¼ã�®ã�Ÿã‚�ã�«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�—ã�Ÿã�„ã�®ã�‹ã‚’é�¸æŠžã�—ã�¦ã��ã� ã�•ã�„ã€‚$(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "ã�“ã�®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ãƒ¼ã‚’ä½¿ç”¨ã�—ã�¦ã�„ã‚‹å…¨ã�¦ã�®äººç”¨ã�«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "è‡ªåˆ†å°‚ç”¨ã�«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Bosnian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Bosnian.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Bosnian.nsh	(revision 2956)
@@ -1,31 +1,31 @@
-;Language: Bosnian (5146)
-;By Salih Èavkiæ, cavkic@skynet.be
+ï»¿;Language: Bosnian (5146)
+;By Salih ÄŒavkiÄ‡, cavkic@skynet.be
 
-!insertmacro LANGFILE "Bosnian" "Bosanski"
+!insertmacro LANGFILE "Bosnian" = "Bosanski" =
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Dobrodošli u program za instalaciju $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ovaj program æe instalirati $(^NameDA) na Vaš sistem. $\r$\n$\r$\nPreporuèujemo da neizostavno zatvorite sve druge otvorene programe prije nego što definitivno zapoènete sa instaliranjem. To æe omoguæiti bolju nadogradnju odreðenih sistemskih datoteka bez potrebe da Vaš raèunar ponovo startujete. Instaliranje programa možete prekinuti pritiskom na dugme 'Odustani'.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "DobrodoÅ¡li u program za instalaciju $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ovaj program Ä‡e instalirati $(^NameDA) na VaÅ¡ sistem. $\r$\n$\r$\nPreporuÄ�ujemo da neizostavno zatvorite sve druge otvorene programe prije nego Å¡to definitivno zapoÄ�nete sa instaliranjem. To Ä‡e omoguÄ‡iti bolju nadogradnju odreÄ‘enih sistemskih datoteka bez potrebe da VaÅ¡ raÄ�unar ponovo startujete. Instaliranje programa moÅ¾ete prekinuti pritiskom na dugme 'Odustani'.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Dobrodošli u postupak uklanjanja programa $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ovaj æe Vas vodiè provesti kroz postupak uklanjanja programa $(^NameDA).$\r$\n$\r$\nPrije samog poèetka, molim zatvorite program $(^NameDA) ukoliko je sluèajno otvoren.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "DobrodoÅ¡li u postupak uklanjanja programa $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ovaj Ä‡e Vas vodiÄ� provesti kroz postupak uklanjanja programa $(^NameDA).$\r$\n$\r$\nPrije samog poÄ�etka, molim zatvorite program $(^NameDA) ukoliko je sluÄ�ajno otvoren.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
   ${LangFileString} MUI_TEXT_LICENSE_TITLE "Licencni ugovor"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Molim proèitajte licencni ugovor $(^NameDA) prije instalacije programa."
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Molim proÄ�itajte licencni ugovor $(^NameDA) prije instalacije programa."
   ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ako prihvatate uslove licence, odaberite 'Prihvatam' za nastavak. Morate prihvatiti licencu za instalaciju programa $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ako prihvatate uslove licence, oznaèite donji kvadratiæ. Morate prihvatiti licencu za instalaciju programa $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ako prihvatate uslove licence, oznaÄ�ite donji kvadratiÄ‡. Morate prihvatiti licencu za instalaciju programa $(^NameDA). $_CLICK"
   ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ako prihvatate uslove licence, odaberite prvu donju opciju. Morate prihvatiti licencu za instalaciju programa $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Licencni ugovor o pravu korištenja"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Molim proèitajte licencu prije uklanjanja programa $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Licencni ugovor o pravu koriÅ¡tenja"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Molim proÄ�itajte licencu prije uklanjanja programa $(^NameDA)."
   ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ako prihvatate uslove licence, odaberite 'Prihvatam' za nastavak. Morate prihvatiti licencu za uklanjanje programa $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ako prihvatate uslove licence, oznaèite donji kvadratiæ. Morate prihvatiti licencu za uklanjanje programa $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ako prihvatate uslove licence, oznaÄ�ite donji kvadratiÄ‡. Morate prihvatiti licencu za uklanjanje programa $(^NameDA). $_CLICK"
   ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ako prihvatate uslove licence, odaberite prvu donju opciju. Morate prihvatiti licencu za uklanjanje programa $(^NameDA). $_CLICK"
 !endif
 
@@ -35,87 +35,87 @@
 
 !ifdef MUI_COMPONENTSPAGE
   ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Izbor komponenti za instalaciju"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Izaberite komponente programa $(^NameDA) koje želite instalirati."
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Izaberite komponente programa $(^NameDA) koje Å¾elite instalirati."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Izbor komponenti za uklanjanje"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Izaberite komponente programa $(^NameDA) koje želite ukloniti."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Izaberite komponente programa $(^NameDA) koje Å¾elite ukloniti."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Opis"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Postavite kursor od miša iznad komponente da biste vidjeli njezin opis."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Postavite kursor od miÅ¡a iznad komponente da biste vidjeli njezin opis."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Postavite kursor od miša iznad komponente da biste vidjeli njezin opis."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Selektirajte jednu komponentu da vidite njezin opis."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Odaberite odredište za instalaciju"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Odaberite mapu u koju želite instalirati program $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Odaberite odrediÅ¡te za instalaciju"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Odaberite mapu u koju Å¾elite instalirati program $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Izaberite polazište za uklanjanje"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Selektirajte mapu iz koje želite ukloniti program $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Izaberite polaziÅ¡te za uklanjanje"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Selektirajte mapu iz koje Å¾elite ukloniti program $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Instaliranje"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Molim prièekajte na završetak instalacije programa $(^NameDA)."
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Molim priÄ�ekajte na zavrÅ¡etak instalacije programa $(^NameDA)."
   ${LangFileString} MUI_TEXT_FINISH_TITLE "Kraj instalacije"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Instalacija je u potpunosti uspješno završila."
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Instalacija je u potpunosti uspjeÅ¡no zavrÅ¡ila."
   ${LangFileString} MUI_TEXT_ABORT_TITLE "Instalacija je prekinuta"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Instalacija nije završila uspješno."
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Instalacija nije zavrÅ¡ila uspjeÅ¡no."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Uklanjanje"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Molim Vas prièekajte da vodiè završi uklanjanje $(^NameDA) programa."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Uklanjanje je završeno"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Uklanjanje je u potpunosti završilo uspješno."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Molim Vas priÄ�ekajte da vodiÄ� zavrÅ¡i uklanjanje $(^NameDA) programa."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Uklanjanje je zavrÅ¡eno"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Uklanjanje je u potpunosti zavrÅ¡ilo uspjeÅ¡no."
   ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Uklanjanje je prekinuto"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Uklanjanje nije završilo uspješno."
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Uklanjanje nije zavrÅ¡ilo uspjeÅ¡no."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Dovršavanje instalacije programa $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Program $(^NameDA) je instaliran na Vaše raèunar.$\r$\n$\r$\nPritisnite dugme 'Kraj' za završetak."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Raèunar treba ponovno startovati za dovršavanje instalacije programa $(^NameDA). Želite li to uèiniti sada?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "DovrÅ¡avanje instalacije programa $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Program $(^NameDA) je instaliran na VaÅ¡e raÄ�unar.$\r$\n$\r$\nPritisnite dugme 'Kraj' za zavrÅ¡etak."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "RaÄ�unar treba ponovno startovati za dovrÅ¡avanje instalacije programa $(^NameDA). Å½elite li to uÄ�initi sada?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Završetak uklanjanja programa $(^NameDA) sa Vašeg sistema."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Program $(^NameDA) je uklonjen sa Vašeg raèunara.$\r$\n$\r$\nPritisnite dugme 'Kraj' za zatvaranje ovog prozora."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Vaš raèunar trebate ponovno startovati da dovršite uklanjanje programa $(^NameDA). Želite li da odmah sad ponovo startujete raèunar?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "ZavrÅ¡etak uklanjanja programa $(^NameDA) sa VaÅ¡eg sistema."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Program $(^NameDA) je uklonjen sa VaÅ¡eg raÄ�unara.$\r$\n$\r$\nPritisnite dugme 'Kraj' za zatvaranje ovog prozora."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "VaÅ¡ raÄ�unar trebate ponovno startovati da dovrÅ¡ite uklanjanje programa $(^NameDA). Å½elite li da odmah sad ponovo startujete raÄ�unar?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Startuj raèunar odmah sad"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ponovno æu pokrenuti raèunar kasnije"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Startuj raÄ�unar odmah sad"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ponovno Ä‡u pokrenuti raÄ�unar kasnije"
   ${LangFileString} MUI_TEXT_FINISH_RUN "&Pokreni program $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Prikaži datoteku &Readme"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "PrikaÅ¾i datoteku &Readme"
   ${LangFileString} MUI_BUTTONTEXT_FINISH "&Kraj"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
   ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Izbor mape u Start meniju"
   ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Izaberite ime za programsku mapu unutar Start menija."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Izaberite jednu mapu u Start meniju u kojoj želite da se kreiraju preèice programa. Možete takoðer unijeti ime za novu mapu ili selektirati veæ postojeæu."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Nemojte praviti preèice"
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Izaberite jednu mapu u Start meniju u kojoj Å¾elite da se kreiraju preÄ�ice programa. MoÅ¾ete takoÄ‘er unijeti ime za novu mapu ili selektirati veÄ‡ postojeÄ‡u."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Nemojte praviti preÄ�ice"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
   ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Uklanjanje programa $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Program $(^NameDA) æe biti uklonjen sa Vašeg raèunara."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Program $(^NameDA) Ä‡e biti uklonjen sa VaÅ¡eg raÄ�unara."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Jeste li sigurni da želite prekinuti instalaciju programa $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Jeste li sigurni da Å¾elite prekinuti instalaciju programa $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Jeste li sigurni da želite prekinuti uklanjanje $(^Name) programa?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Jeste li sigurni da Å¾elite prekinuti uklanjanje $(^Name) programa?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Turkish.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Turkish.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Turkish.nsh	(revision 2956)
@@ -1,122 +1,122 @@
-;Language: Turkish (1055)
-;By Çagatay Dilsiz(Chagy)
+ï»¿;Language: Turkish (1055)
+;By Ã‡agatay Dilsiz(Chagy)
 ;Updated by Fatih BOY (fatih_boy@yahoo.com)
 
-!insertmacro LANGFILE "Turkish" "Türkçe"
+!insertmacro LANGFILE "Turkish" = "TÃ¼rkÃ§e" "Turkce"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) Kurulum sihirbazýna hoþ geldiniz"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Bu sihirbaz size $(^NameDA) kurulumu boyunca rehberlik edecektir.$\r$\n$\r$\nKurulumu baþlatmadan önce çalýþan diðer programlari kapatmanýzý öneririz. Böylece bilgisayarýnýzý yeniden baþlatmadan bazý sistem dosyalarý sorunsuz kurulabilir.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) Kurulum sihirbazÄ±na hoÅŸ geldiniz"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Bu sihirbaz size $(^NameDA) kurulumu boyunca rehberlik edecektir.$\r$\n$\r$\nKurulumu baÅŸlatmadan Ã¶nce Ã§alÄ±ÅŸan diÄŸer programlari kapatmanÄ±zÄ± Ã¶neririz. BÃ¶ylece bilgisayarÄ±nÄ±zÄ± yeniden baÅŸlatmadan bazÄ± sistem dosyalarÄ± sorunsuz kurulabilir.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "$(^NameDA) Programýný Kaldýrma Sihirbazýna Hoþ Geldiniz"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Bu sihirbaz size $(^NameDA) programýnýn kadýrýlýmý boyunca rehberlik edecektir.$\r$\n$\r$\nKaldýrým iþlemeni baþlatmadan önce çalýþan diðer programlari kapatmanýzý öneririz. Böylece bilgisayarýnýzý yeniden baþlatmadan bazý sistem dosyalarý sorunsuz kaldýrýlabilir.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "$(^NameDA) ProgramÄ±nÄ± KaldÄ±rma SihirbazÄ±na HoÅŸ Geldiniz"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Bu sihirbaz size $(^NameDA) programÄ±nÄ±n kadÄ±rÄ±lÄ±mÄ± boyunca rehberlik edecektir.$\r$\n$\r$\nKaldÄ±rÄ±m iÅŸlemeni baÅŸlatmadan Ã¶nce Ã§alÄ±ÅŸan diÄŸer programlari kapatmanÄ±zÄ± Ã¶neririz. BÃ¶ylece bilgisayarÄ±nÄ±zÄ± yeniden baÅŸlatmadan bazÄ± sistem dosyalarÄ± sorunsuz kaldÄ±rÄ±labilir.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Lisans Sözleþmesi"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Lütfen $(^NameDA) programýný kurmadan önce sözleþmeyi okuyunuz."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Sözleþme koþullarýný kabul ediyorsanýz, 'Kabul Ediyorum'a basýnýz. $(^NameDA) programýný kurmak için sözleþme koþullarýný kabul etmelisiniz."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Sözleþme koþullarýný kabul ediyorsanýz, aþaðýdaki onay kutusunu doldurunuz. $(^NameDA) programýný kurmak için sözleþme koþullarýný kabul etmelisiniz. $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Sözleþme koþullarýný kabul ediyorsanýz, asagidaki onay düðmesini seçiniz. $(^NameDA) programýný kurmak için sözleþme koþullarýný kabul etmelisiniz. $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Lisans SÃ¶zleÅŸmesi"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "LÃ¼tfen $(^NameDA) programÄ±nÄ± kurmadan Ã¶nce sÃ¶zleÅŸmeyi okuyunuz."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "SÃ¶zleÅŸme koÅŸullarÄ±nÄ± kabul ediyorsanÄ±z, 'Kabul Ediyorum'a basÄ±nÄ±z. $(^NameDA) programÄ±nÄ± kurmak iÃ§in sÃ¶zleÅŸme koÅŸullarÄ±nÄ± kabul etmelisiniz."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "SÃ¶zleÅŸme koÅŸullarÄ±nÄ± kabul ediyorsanÄ±z, aÅŸaÄŸÄ±daki onay kutusunu doldurunuz. $(^NameDA) programÄ±nÄ± kurmak iÃ§in sÃ¶zleÅŸme koÅŸullarÄ±nÄ± kabul etmelisiniz. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "SÃ¶zleÅŸme koÅŸullarÄ±nÄ± kabul ediyorsanÄ±z, asagidaki onay dÃ¼ÄŸmesini seÃ§iniz. $(^NameDA) programÄ±nÄ± kurmak iÃ§in sÃ¶zleÅŸme koÅŸullarÄ±nÄ± kabul etmelisiniz. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Lisans Sözleþmesi"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Lütfen $(^NameDA) programýný sisteminizden kaldýrmadan önce sözleþmeyi okuyunuz."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Sözleþme koþullarýný kabul ediyorsanýz, 'Kabul Ediyorum'a basýnýz. $(^NameDA) programýný sisteminizden kaldýrmak için sözleþme koþullarýný kabul etmelisiniz."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Sözleþme koþullarýný kabul ediyorsanýz, aþaðýdaki onay kutusunu doldurunuz. $(^NameDA) programýný sisteminizden kaldýrmak için sözleþme koþullarýný kabul etmelisiniz. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Sözleþme koþullarýný kabul ediyorsanýz, asagidaki onay düðmesini seçiniz. $(^NameDA) programýný sisteminizden kaldýrmak için sözleþme koþullarýný kabul etmelisiniz. $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Lisans SÃ¶zleÅŸmesi"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "LÃ¼tfen $(^NameDA) programÄ±nÄ± sisteminizden kaldÄ±rmadan Ã¶nce sÃ¶zleÅŸmeyi okuyunuz."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "SÃ¶zleÅŸme koÅŸullarÄ±nÄ± kabul ediyorsanÄ±z, 'Kabul Ediyorum'a basÄ±nÄ±z. $(^NameDA) programÄ±nÄ± sisteminizden kaldÄ±rmak iÃ§in sÃ¶zleÅŸme koÅŸullarÄ±nÄ± kabul etmelisiniz."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "SÃ¶zleÅŸme koÅŸullarÄ±nÄ± kabul ediyorsanÄ±z, aÅŸaÄŸÄ±daki onay kutusunu doldurunuz. $(^NameDA) programÄ±nÄ± sisteminizden kaldÄ±rmak iÃ§in sÃ¶zleÅŸme koÅŸullarÄ±nÄ± kabul etmelisiniz. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "SÃ¶zleÅŸme koÅŸullarÄ±nÄ± kabul ediyorsanÄ±z, asagidaki onay dÃ¼ÄŸmesini seÃ§iniz. $(^NameDA) programÄ±nÄ± sisteminizden kaldÄ±rmak iÃ§in sÃ¶zleÅŸme koÅŸullarÄ±nÄ± kabul etmelisiniz. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Sözleþmenin geri kalanýný okumak için 'page down' tuþuna basabilirsiniz."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "SÃ¶zleÅŸmenin geri kalanÄ±nÄ± okumak iÃ§in 'page down' tuÅŸuna basabilirsiniz."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Bileþen seçimi"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Lütfen $(^NameDA) için kurmak istediginiz bileþenleri seçiniz."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "BileÅŸen seÃ§imi"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "LÃ¼tfen $(^NameDA) iÃ§in kurmak istediginiz bileÅŸenleri seÃ§iniz."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Bileþen Þeçimi"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Lütfen kaldýrmak istediðiniz $(^NameDA) program bileþenini seçiniz."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "BileÅŸen ÅžeÃ§imi"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "LÃ¼tfen kaldÄ±rmak istediÄŸiniz $(^NameDA) program bileÅŸenini seÃ§iniz."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Açýklama"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "AÃ§Ä±klama"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Bileþenlerin açýklamalarýný görmek için imleci bileþen üzerine götürün."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "BileÅŸenlerin aÃ§Ä±klamalarÄ±nÄ± gÃ¶rmek iÃ§in imleci bileÅŸen Ã¼zerine gÃ¶tÃ¼rÃ¼n."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Bileþenlerin açýklamalarýný görmek için imleci bileþen üzerine götürün."
+    #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO 
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Hedef dizini seçimi"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "$(^NameDA) programýný kurmak istediðiniz dizini þeçiniz."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Hedef dizini seÃ§imi"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "$(^NameDA) programÄ±nÄ± kurmak istediÄŸiniz dizini ÅŸeÃ§iniz."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Kaldýrýlýcak Dizin Seçimi"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "$(^NameDA) programýný kaldýrmak istediginiz dizini seçiniz."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "KaldÄ±rÄ±lÄ±cak Dizin SeÃ§imi"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "$(^NameDA) programÄ±nÄ± kaldÄ±rmak istediginiz dizini seÃ§iniz."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Kuruluyor"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Lütfen $(^NameDA) kurulurken bekleyiniz."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Kurulum Tamamlandý"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Kurulum baþarýyla tamamlandý."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Kurulum Ýptal Edildi"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Kurulum tam olarak tamamlanmadý."
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "LÃ¼tfen $(^NameDA) kurulurken bekleyiniz."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Kurulum TamamlandÄ±"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Kurulum baÅŸarÄ±yla tamamlandÄ±."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Kurulum Ä°ptal Edildi"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Kurulum tam olarak tamamlanmadÄ±."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Kaldýrýlýyor"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Litfen $(^NameDA) programý sisteminizden kaldýrýlýrken bekleyiniz."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Kaldýrma Ýþlemi Tamamlandýr"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Kaldýrma iþlemi baþarýyla tamamlandý."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Kaldýrma Ýþlemi Ýptal Edildi"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Kaldýrma Ýþlemi tamamlanamadý."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "KaldÄ±rÄ±lÄ±yor"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Litfen $(^NameDA) programÄ± sisteminizden kaldÄ±rÄ±lÄ±rken bekleyiniz."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "KaldÄ±rma Ä°ÅŸlemi TamamlandÄ±r"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "KaldÄ±rma iÅŸlemi baÅŸarÄ±yla tamamlandÄ±."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "KaldÄ±rma Ä°ÅŸlemi Ä°ptal Edildi"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "KaldÄ±rma Ä°ÅŸlemi tamamlanamadÄ±."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "$(^NameDA) Kurulum sihirbazý tamamlanýyor."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA)  bilgisayariniza yüklendi.$\r$\n$\r$\nLütfen 'Bitir'e basarak kurulumu sonlandýrýn."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "$(^NameDA) kurulumunun tamamlanmasý için bilgisayarýnýzý yeniden baþlatmanýz gerekiyor.Bilgisayarýnýzý yeniden baþlatmak istiyor musunuz?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "$(^NameDA) Kurulum sihirbazÄ± tamamlanÄ±yor."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA)  bilgisayariniza yÃ¼klendi.$\r$\n$\r$\nLÃ¼tfen 'Bitir'e basarak kurulumu sonlandÄ±rÄ±n."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "$(^NameDA) kurulumunun tamamlanmasÄ± iÃ§in bilgisayarÄ±nÄ±zÄ± yeniden baÅŸlatmanÄ±z gerekiyor.BilgisayarÄ±nÄ±zÄ± yeniden baÅŸlatmak istiyor musunuz?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "$(^NameDA) Programý Kaldýrma Sihirbazý Tamamlanýyor"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) programý sisteminizden kaldýrýldý.$\r$\n$\r$\nSihirbazý kapatmak için 'bitir'e basýnýz."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "$(^NameDA) programýný kaldýrma iþleminin tamamlanmasý için bilgisayarýnýzýn yeniden baþlatýlmasý gerekiyor. Bilgisayarýnýzýn þimdi yeniden baþlatýlmasýný ister misiniz?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "$(^NameDA) ProgramÄ± KaldÄ±rma SihirbazÄ± TamamlanÄ±yor"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) programÄ± sisteminizden kaldÄ±rÄ±ldÄ±.$\r$\n$\r$\nSihirbazÄ± kapatmak iÃ§in 'bitir'e basÄ±nÄ±z."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "$(^NameDA) programÄ±nÄ± kaldÄ±rma iÅŸleminin tamamlanmasÄ± iÃ§in bilgisayarÄ±nÄ±zÄ±n yeniden baÅŸlatÄ±lmasÄ± gerekiyor. BilgisayarÄ±nÄ±zÄ±n ÅŸimdi yeniden baÅŸlatÄ±lmasÄ±nÄ± ister misiniz?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Yeniden baþlat"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Bilgisayarýmý daha sonra baþlatacaðým."
-  ${LangFileString} MUI_TEXT_FINISH_RUN "$(^NameDA) programýný çalýþtýr"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "beni oku/readme dosyasýný &göster"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Yeniden baÅŸlat"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "BilgisayarÄ±mÄ± daha sonra baÅŸlatacaÄŸÄ±m."
+  ${LangFileString} MUI_TEXT_FINISH_RUN "$(^NameDA) programÄ±nÄ± Ã§alÄ±ÅŸtÄ±r"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "beni oku/readme dosyasÄ±nÄ± &gÃ¶ster"
   ${LangFileString} MUI_BUTTONTEXT_FINISH "&Bitir"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Baþlat Menüsü Klasör Seçimi"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "$(^NameDA) kýsayollarýnýn konulacagý baþlat menüsü klasörünü seçiniz."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Programýn kýsayollarýnýn konulacaðý baþlat menüsü klasörünü seçiniz. Farklý bir isim girerek yeni bir klasör yaratabilirsiniz."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Kýsayollarý oluþturmadan devam et"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "BaÅŸlat MenÃ¼sÃ¼ KlasÃ¶r SeÃ§imi"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "$(^NameDA) kÄ±sayollarÄ±nÄ±n konulacagÄ± baÅŸlat menÃ¼sÃ¼ klasÃ¶rÃ¼nÃ¼ seÃ§iniz."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "ProgramÄ±n kÄ±sayollarÄ±nÄ±n konulacaÄŸÄ± baÅŸlat menÃ¼sÃ¼ klasÃ¶rÃ¼nÃ¼ seÃ§iniz. FarklÄ± bir isim girerek yeni bir klasÃ¶r yaratabilirsiniz."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "KÄ±sayollarÄ± oluÅŸturmadan devam et"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "$(^NameDA) Programýný Kaldýr"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "$(^NameDA) programýný sisteminizden kaldýrma."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "$(^NameDA) ProgramÄ±nÄ± KaldÄ±r"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "$(^NameDA) programÄ±nÄ± sisteminizden kaldÄ±rma."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "$(^Name) kurulumundan çýkmak istediðinize emin misiniz?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "$(^Name) kurulumundan Ã§Ä±kmak istediÄŸinize emin misiniz?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "$(^Name) Programi Kaldýrma iþleminden çýkmak istediðinize emin misiniz?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "$(^Name) Programi KaldÄ±rma iÅŸleminden Ã§Ä±kmak istediÄŸinize emin misiniz?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Hindi.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Hindi.nsh	(revision 0)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Hindi.nsh	(revision 2956)
@@ -0,0 +1,129 @@
+ï»¿;Language: HindÄ« (Devanagari script) (1081)
+;By Ryan Pretorius
+
+!insertmacro LANGFILE "Hindi" = "à¤¹à¤¿à¤¨à¥�à¤¦à¥€" "Hindi"
+
+!ifdef MUI_WELCOMEPAGE
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) à¤¸à¥‡à¤Ÿà¤…à¤ª à¤®à¥‡à¤‚ à¤†à¤ªà¤•à¤¾ à¤¸à¥�à¤µà¤¾à¤—à¤¤ à¤¹à¥ˆ"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "à¤¸à¥‡à¤Ÿà¤…à¤ª $(^NameDA) à¤•à¥‡ à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤•à¥‡ à¤¦à¥Œà¤°à¤¾à¤¨ à¤†à¤ªà¤•à¤¾ à¤®à¤¾à¤°à¥�à¤—à¤¦à¤°à¥�à¤¶à¤¨ à¤•à¤°à¥‡à¤—à¤¾à¥¤$\r$\n$\r$\nà¤¯à¤¹ à¤¸à¤¿à¤«à¤¾à¤°à¤¿à¤¶ à¤•à¥€ à¤œà¤¾à¤¤à¥€ à¤¹à¥ˆ à¤•à¤¿ à¤¸à¥‡à¤Ÿà¤…à¤ª à¤¶à¥�à¤°à¥‚ à¤•à¤°à¤¨à¥‡ à¤¸à¥‡ à¤ªà¤¹à¤²à¥‡ à¤†à¤ª à¤…à¤¨à¥�à¤¯ à¤¸à¤­à¥€ à¤…à¤¨à¥�à¤ªà¥�à¤°à¤¯à¥‹à¤— à¤¬à¤‚à¤¦ à¤•à¤° à¤¦à¥‡à¤‚à¥¤ à¤‡à¤¸à¤¸à¥‡ à¤†à¤ªà¤•à¥‡ à¤•à¤‚à¤ªà¥�à¤¯à¥‚à¤Ÿà¤° à¤•à¥‹ à¤°à¥€à¤¬à¥‚à¤Ÿ à¤•à¤¿à¤� à¤¬à¤¿à¤¨à¤¾ à¤ªà¥�à¤°à¤¾à¤¸à¤‚à¤—à¤¿à¤• à¤¸à¤¿à¤¸à¥�à¤Ÿà¤® à¤«à¤¼à¤¾à¤‡à¤²à¥‹à¤‚ à¤•à¥‹ à¤…à¤ªà¤¡à¥‡à¤Ÿ à¤•à¤°à¤¨à¤¾ à¤¸à¤‚à¤­à¤µ à¤¹à¥‹ à¤œà¤¾à¤�à¤—à¤¾à¥¤$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_UNWELCOMEPAGE
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "$(^NameDA) à¤•à¥‡ à¤…à¤¨à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤®à¥‡à¤‚ à¤†à¤ªà¤•à¤¾ à¤¸à¥�à¤µà¤¾à¤—à¤¤ à¤¹à¥ˆ"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "à¤¸à¥‡à¤Ÿà¤…à¤ª $(^NameDA) à¤•à¥‡ à¤…à¤¨à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤•à¥‡ à¤¦à¥Œà¤°à¤¾à¤¨ à¤†à¤ªà¤•à¤¾ à¤®à¤¾à¤°à¥�à¤—à¤¦à¤°à¥�à¤¶à¤¨ à¤•à¤°à¥‡à¤—à¤¾à¥¤$\r$\n$\r$\nà¤…à¤¨à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤¶à¥�à¤°à¥‚ à¤•à¤°à¤¨à¥‡ à¤¸à¥‡ à¤ªà¤¹à¤²à¥‡ à¤¸à¥�à¤¨à¤¿à¤¶à¥�à¤šà¤¿à¤¤ à¤•à¤°à¥‡à¤‚ à¤•à¤¿ $(^NameDA) à¤šà¤² à¤¨ à¤°à¤¹à¤¾ à¤¹à¥‹à¥¤$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "à¤²à¤¾à¤‡à¤¸à¥‡à¤‚à¤¸ à¤¸à¤®à¤�à¥Œà¤¤à¤¾"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "$(^NameDA) à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤¸à¥‡ à¤ªà¤¹à¤²à¥‡ à¤²à¤¾à¤‡à¤¸à¥‡à¤‚à¤¸ à¤¶à¤°à¥�à¤¤à¥‹à¤‚ à¤•à¥€ à¤¸à¤®à¥€à¤•à¥�à¤·à¤¾ à¤•à¤°à¥‡à¤‚à¥¤"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "à¤¯à¤¦à¤¿ à¤†à¤ª à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¶à¤°à¥�à¤¤à¥‡ à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¤¤à¥‡ à¤¹à¥ˆà¤‚ à¤¤à¥‹ à¤œà¤¾à¤°à¥€ à¤°à¤–à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤®à¥ˆà¤‚ à¤¸à¤¹à¤®à¤¤ à¤¹à¥‚à¤� à¤ªà¤° à¤•à¥�à¤²à¤¿à¤• à¤•à¤°à¥‡à¤‚à¥¤ à¤†à¤ªà¤•à¥‹ $(^NameDA) à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥‹ à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¤¨à¤¾ à¤¹à¥‹à¤—à¤¾à¥¤"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "à¤¯à¤¦à¤¿ à¤†à¤ª à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¶à¤°à¥�à¤¤à¥‡ à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¤¤à¥‡ à¤¹à¥ˆà¤‚ à¤¤à¥‹ à¤¨à¥€à¤šà¥‡ à¤¦à¤¿à¤� à¤—à¤� à¤šà¥‡à¤• à¤¬à¥‰à¤•à¥�à¤¸ à¤ªà¤° à¤•à¥�à¤²à¤¿à¤• à¤•à¤°à¥‡à¤‚à¥¤ à¤†à¤ªà¤•à¥‹ $(^NameDA) à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥‹ à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¤¨à¤¾ à¤¹à¥‹à¤—à¤¾à¥¤ $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "à¤¯à¤¦à¤¿ à¤†à¤ª à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¶à¤°à¥�à¤¤à¥‡ à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¤¤à¥‡ à¤¹à¥ˆà¤‚ à¤¤à¥‹ à¤¨à¥€à¤šà¥‡ à¤¦à¤¿à¤� à¤—à¤� à¤ªà¤¹à¤²à¥‡ à¤µà¤¿à¤•à¤²à¥�à¤ª à¤•à¤¾ à¤šà¤¯à¤¨ à¤•à¤°à¥‡à¤‚à¥¤ à¤†à¤ªà¤•à¥‹ $(^NameDA) à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥‹ à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¤¨à¤¾ à¤¹à¥‹à¤—à¤¾à¥¤ $_CLICK"
+!endif
+
+!ifdef MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "à¤²à¤¾à¤‡à¤¸à¥‡à¤‚à¤¸ à¤¸à¤®à¤�à¥Œà¤¤à¤¾"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "$(^NameDA) à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤¸à¥‡ à¤ªà¤¹à¤²à¥‡ à¤²à¤¾à¤‡à¤¸à¥‡à¤‚à¤¸ à¤¶à¤°à¥�à¤¤à¥‹à¤‚ à¤•à¥€ à¤¸à¤®à¥€à¤•à¥�à¤·à¤¾ à¤•à¤°à¥‡à¤‚à¥¤"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "à¤¯à¤¦à¤¿ à¤†à¤ª à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¶à¤°à¥�à¤¤à¥‡ à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¤¤à¥‡ à¤¹à¥ˆà¤‚ à¤¤à¥‹ à¤œà¤¾à¤°à¥€ à¤°à¤–à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤®à¥ˆà¤‚ à¤¸à¤¹à¤®à¤¤ à¤¹à¥‚à¤� à¤ªà¤° à¤•à¥�à¤²à¤¿à¤• à¤•à¤°à¥‡à¤‚à¥¤ à¤†à¤ªà¤•à¥‹ $(^NameDA) à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥‹ à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¤¨à¤¾ à¤¹à¥‹à¤—à¤¾à¥¤"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "à¤¯à¤¦à¤¿ à¤†à¤ª à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¶à¤°à¥�à¤¤à¥‡ à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¤¤à¥‡ à¤¹à¥ˆà¤‚ à¤¤à¥‹ à¤¨à¥€à¤šà¥‡ à¤¦à¤¿à¤� à¤—à¤� à¤šà¥‡à¤• à¤¬à¥‰à¤•à¥�à¤¸ à¤ªà¤° à¤•à¥�à¤²à¤¿à¤• à¤•à¤°à¥‡à¤‚à¥¤ à¤†à¤ªà¤•à¥‹ $(^NameDA) à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥‹ à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¤¨à¤¾ à¤¹à¥‹à¤—à¤¾à¥¤ $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "à¤¯à¤¦à¤¿ à¤†à¤ª à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¶à¤°à¥�à¤¤à¥‡ à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¤¤à¥‡ à¤¹à¥ˆà¤‚ à¤¤à¥‹ à¤¨à¥€à¤šà¥‡ à¤¦à¤¿à¤� à¤—à¤� à¤ªà¤¹à¤²à¥‡ à¤µà¤¿à¤•à¤²à¥�à¤ª à¤•à¤¾ à¤šà¤¯à¤¨ à¤•à¤°à¥‡à¤‚à¥¤ à¤†à¤ªà¤•à¥‹ $(^NameDA) à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥‹ à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¤¨à¤¾ à¤¹à¥‹à¤—à¤¾à¥¤ $_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "à¤¶à¥‡à¤· à¤¸à¤®à¤�à¥Œà¤¤à¤¾ à¤¦à¥‡à¤–à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤ªà¥‡à¤œ à¤¨à¥€à¤šà¥‡ à¤•à¤°à¥‡à¤‚ à¤•à¥‹ à¤¦à¤¬à¤¾à¤�à¤‚à¥¤"
+!endif
+
+!ifdef MUI_COMPONENTSPAGE
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "à¤˜à¤Ÿà¤• à¤šà¥�à¤¨à¥‡à¤‚"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "$(^NameDA) à¤•à¥€ à¤µà¥‡ à¤µà¤¿à¤¶à¥‡à¤·à¤¤à¤¾à¤�à¤‚ à¤šà¥�à¤¨à¥‡à¤‚ à¤œà¥‹ à¤†à¤ª à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆà¤‚à¥¤"
+!endif
+
+!ifdef MUI_UNCOMPONENTSPAGE
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "à¤˜à¤Ÿà¤• à¤šà¥�à¤¨à¥‡à¤‚"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "$(^NameDA) à¤•à¥€ à¤µà¥‡ à¤µà¤¿à¤¶à¥‡à¤·à¤¤à¤¾à¤�à¤‚ à¤šà¥�à¤¨à¥‡à¤‚ à¤œà¥‹ à¤†à¤ª à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆà¤‚à¥¤"
+!endif
+
+!ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "à¤µà¤¿à¤µà¤°à¤£"
+  !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "à¤‰à¤¸ à¤˜à¤Ÿà¤• à¤ªà¤° à¤…à¤ªà¤¨à¤¾ à¤®à¤¾à¤‰à¤¸ à¤°à¤–à¥‡à¤‚ à¤œà¤¿à¤¸à¤•à¤¾ à¤†à¤ª à¤µà¤¿à¤µà¤°à¤£ à¤¦à¥‡à¤–à¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆà¤‚à¥¤"
+  !else
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "à¤‰à¤¸ à¤˜à¤Ÿà¤• à¤•à¤¾ à¤šà¤¯à¤¨ à¤•à¤°à¥‡à¤‚ à¤œà¤¿à¤¸à¤•à¤¾ à¤†à¤ª à¤µà¤¿à¤µà¤°à¤£ à¤¦à¥‡à¤–à¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆà¤‚à¥¤"
+  !endif
+!endif
+
+!ifdef MUI_DIRECTORYPAGE
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤•à¤¾ à¤¸à¥�à¤¥à¤¾à¤¨ à¤šà¥�à¤¨à¥‡à¤‚"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "à¤µà¤¹ à¤«à¥‹à¤²à¥�à¤¡à¤° à¤šà¥�à¤¨à¥‡à¤‚ à¤œà¤¿à¤¸à¤®à¥‡à¤‚ $(^NameDA) à¤•à¥‹ à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¤¾ à¤¹à¥ˆà¥¤"
+!endif
+
+!ifdef MUI_UNDIRECTORYPAGE
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤•à¤¾ à¤¸à¥�à¤¥à¤¾à¤¨ à¤šà¥�à¤¨à¥‡à¤‚"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "à¤µà¤¹ à¤«à¥‹à¤²à¥�à¤¡à¤° à¤šà¥�à¤¨à¥‡à¤‚ à¤œà¤¿à¤¸à¤¸à¥‡ $(^NameDA) à¤•à¥‹ à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¤¾ à¤¹à¥ˆà¥¤"
+!endif
+
+!ifdef MUI_INSTFILESPAGE
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤° à¤°à¤¹à¥‡ à¤¹à¥ˆà¤‚"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "$(^NameDA) à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤¹à¥‹à¤¨à¥‡ à¤¤à¤• à¤ªà¥�à¤°à¤¤à¥€à¤•à¥�à¤·à¤¾ à¤•à¤°à¥‡à¤‚à¥¤"
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤¸à¤®à¥�à¤ªà¤¨à¥�à¤¨"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "à¤¸à¥‡à¤Ÿà¤…à¤ª à¤¸à¤«à¤²à¤¤à¤¾à¤ªà¥‚à¤°à¥�à¤µà¤• à¤ªà¥‚à¤°à¥�à¤£ à¤¹à¥�à¤†à¥¤"
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤¨à¤¿à¤°à¤¸à¥�à¤¤ à¤•à¤¿à¤¯à¤¾ à¤—à¤¯à¤¾"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "à¤¸à¥‡à¤Ÿà¤…à¤ª à¤¸à¤«à¤²à¤¤à¤¾à¤ªà¥‚à¤°à¥�à¤µà¤• à¤ªà¥‚à¤°à¥�à¤£ à¤¨à¤¹à¥€à¤‚ à¤¹à¥�à¤†à¥¤"
+!endif
+
+!ifdef MUI_UNINSTFILESPAGE
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤° à¤°à¤¹à¥‡ à¤¹à¥ˆà¤‚"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "$(^NameDA) à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤¹à¥‹à¤¨à¥‡ à¤¤à¤• à¤ªà¥�à¤°à¤¤à¥€à¤•à¥�à¤·à¤¾ à¤•à¤°à¥‡à¤‚à¥¤"
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "à¤…à¤¨à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤¸à¤®à¥�à¤ªà¤¨à¥�à¤¨"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "à¤…à¤¨à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤¸à¤«à¤²à¤¤à¤¾à¤ªà¥‚à¤°à¥�à¤µà¤• à¤ªà¥‚à¤°à¥�à¤£ à¤¹à¥�à¤†à¥¤"
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "à¤…à¤¨à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤¨à¤¿à¤°à¤¸à¥�à¤¤ à¤•à¤¿à¤¯à¤¾ à¤—à¤¯à¤¾"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "à¤…à¤¨à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤¸à¤«à¤²à¤¤à¤¾à¤ªà¥‚à¤°à¥�à¤µà¤• à¤ªà¥‚à¤°à¥�à¤£ à¤¨à¤¹à¥€à¤‚ à¤¹à¥�à¤†à¥¤"
+!endif
+
+!ifdef MUI_FINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "$(^NameDA) à¤•à¤¾ à¤¸à¥‡à¤Ÿà¤…à¤ª à¤ªà¥‚à¤°à¤¾ à¤•à¤° à¤°à¤¹à¥‡ à¤¹à¥ˆà¤‚"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "à¤†à¤ªà¤•à¥‡ à¤•à¤‚à¤ªà¥�à¤¯à¥‚à¤Ÿà¤° à¤ªà¤° $(^NameDA) à¤•à¥‹ à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤° à¤¦à¤¿à¤¯à¤¾ à¤—à¤¯à¤¾ à¤¹à¥ˆà¥¤$\r$\n$\r$\nà¤¸à¥‡à¤Ÿà¤…à¤ª à¤¬à¤‚à¤¦ à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤¸à¤®à¤¾à¤ªà¥�à¤¤ à¤•à¤°à¥‡à¤‚ à¤ªà¤° à¤•à¥�à¤²à¤¿à¤• à¤•à¤°à¥‡à¤‚à¥¤"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "$(^NameDA) à¤•à¥‡ à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤•à¥‹ à¤ªà¥‚à¤°à¤¾ à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤†à¤ªà¤•à¥‡ à¤•à¤‚à¤ªà¥�à¤¯à¥‚à¤Ÿà¤° à¤•à¥‹ à¤«à¤¿à¤° à¤¸à¥‡ à¤¶à¥�à¤°à¥‚ à¤•à¤°à¤¨à¤¾ à¤¹à¥‹à¤—à¤¾à¥¤ à¤•à¥�à¤¯à¤¾ à¤†à¤ª à¤…à¤­à¥€ à¤°à¥€à¤¬à¥‚à¤Ÿ à¤•à¤°à¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆà¤‚?"
+!endif
+
+!ifdef MUI_UNFINISHPAGE
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "$(^NameDA) à¤•à¤¾ à¤…à¤¨à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤ªà¥‚à¤°à¤¾ à¤•à¤° à¤°à¤¹à¥‡ à¤¹à¥ˆà¤‚"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "à¤†à¤ªà¤•à¥‡ à¤•à¤‚à¤ªà¥�à¤¯à¥‚à¤Ÿà¤° à¤ªà¤° $(^NameDA) à¤•à¥‹ à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤° à¤¦à¤¿à¤¯à¤¾ à¤—à¤¯à¤¾ à¤¹à¥ˆà¥¤$\r$\n$\r$\nà¤¸à¥‡à¤Ÿà¤…à¤ª à¤¬à¤‚à¤¦ à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤¸à¤®à¤¾à¤ªà¥�à¤¤ à¤•à¤°à¥‡à¤‚ à¤ªà¤° à¤•à¥�à¤²à¤¿à¤• à¤•à¤°à¥‡à¤‚à¥¤"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "$(^NameDA) à¤•à¥‡ à¤…à¤¨à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤•à¥‹ à¤ªà¥‚à¤°à¤¾ à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤†à¤ªà¤•à¥‡ à¤•à¤‚à¤ªà¥�à¤¯à¥‚à¤Ÿà¤° à¤•à¥‹ à¤«à¤¿à¤° à¤¸à¥‡ à¤¶à¥�à¤°à¥‚ à¤•à¤°à¤¨à¤¾ à¤¹à¥‹à¤—à¤¾à¥¤ à¤•à¥�à¤¯à¤¾ à¤†à¤ª à¤…à¤­à¥€ à¤°à¥€à¤¬à¥‚à¤Ÿ à¤•à¤°à¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆà¤‚?"
+!endif
+
+!ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "à¤…à¤­à¥€ à¤°à¥€à¤¬à¥‚à¤Ÿ à¤•à¤°à¥‡à¤‚"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "à¤®à¥ˆà¤‚ à¤¬à¤¾à¤¦ à¤®à¥‡à¤‚ à¤®à¥ˆà¤¨à¥�à¤¯à¥�à¤…à¤²à¥€ à¤°à¥€à¤¬à¥‚à¤Ÿ à¤•à¤°à¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¤¾ à¤¹à¥‚à¤�"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "$(^NameDA) &à¤šà¤²à¤¾à¤�à¤‚"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "à¤°à¥€à¤¡à¤®à¥€ &à¤¦à¤¿à¤–à¤¾à¤�à¤‚"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&à¤¸à¤®à¤¾à¤ªà¥�à¤¤ à¤•à¤°à¥‡à¤‚"
+!endif
+
+!ifdef MUI_STARTMENUPAGE
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "à¤¸à¥�à¤Ÿà¤¾à¤°à¥�à¤Ÿ à¤®à¥‡à¤¨à¥‚ à¤«à¥‹à¤²à¥�à¤¡à¤° à¤šà¥�à¤¨à¥‡à¤‚"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "$(^NameDA) à¤•à¥‡ à¤¶à¥‰à¤°à¥�à¤Ÿà¤•à¤Ÿ à¤•à¥‡ à¤²à¤¿à¤� à¤¸à¥�à¤Ÿà¤¾à¤°à¥�à¤Ÿ à¤®à¥‡à¤¨à¥‚ à¤«à¥‹à¤²à¥�à¤¡à¤° à¤šà¥�à¤¨à¥‡à¤‚à¥¤"
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "à¤‰à¤¸ à¤¸à¥�à¤Ÿà¤¾à¤°à¥�à¤Ÿ à¤®à¥‡à¤¨à¥‚ à¤«à¥‹à¤²à¥�à¤¡à¤° à¤•à¤¾ à¤šà¤¯à¤¨ à¤•à¤°à¥‡à¤‚ à¤œà¤¿à¤¸à¤®à¥‡à¤‚ à¤†à¤ª à¤ªà¥�à¤°à¥‹à¤—à¥�à¤°à¤¾à¤® à¤•à¥‡ à¤¶à¥‰à¤°à¥�à¤Ÿà¤•à¤Ÿ à¤¬à¤¨à¤¾à¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆà¤‚à¥¤ à¤†à¤ª à¤¨à¤¯à¤¾ à¤«à¥‹à¤²à¥�à¤¡à¤° à¤¬à¤¨à¤¾à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤¨à¤¾à¤® à¤­à¥€ à¤ªà¥�à¤°à¤µà¤¿à¤·à¥�à¤Ÿ à¤•à¤° à¤¸à¤•à¤¤à¥‡ à¤¹à¥ˆà¤‚à¥¤"
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "à¤¶à¥‰à¤°à¥�à¤Ÿà¤•à¤Ÿ à¤¨ à¤¬à¤¨à¤¾à¤�à¤‚"
+!endif
+
+!ifdef MUI_UNCONFIRMPAGE
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "$(^NameDA) à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¥‡à¤‚"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "à¤…à¤ªà¤¨à¥‡ à¤•à¤‚à¤ªà¥�à¤¯à¥‚à¤Ÿà¤° à¤¸à¥‡ $(^NameDA) à¤¨à¤¿à¤•à¤¾à¤²à¥‡à¤‚à¥¤"
+!endif
+
+!ifdef MUI_ABORTWARNING
+  ${LangFileString} MUI_TEXT_ABORTWARNING "à¤•à¥�à¤¯à¤¾ à¤†à¤ª à¤µà¤¾à¤•à¤ˆ $(^Name) à¤•à¤¾ à¤¸à¥‡à¤Ÿà¤…à¤ª à¤›à¥‹à¥œà¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆà¤‚?"
+!endif
+
+!ifdef MUI_UNABORTWARNING
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "à¤•à¥�à¤¯à¤¾ à¤†à¤ª à¤µà¤¾à¤•à¤ˆ $(^Name) à¤•à¥‹ à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¤¾ à¤›à¥‹à¥œà¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆà¤‚?"
+!endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "à¤‰à¤ªà¤¯à¥‹à¤—à¤•à¤°à¥�à¤¤à¤¾ à¤šà¥�à¤¨à¥‡à¤‚"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "à¤µà¥‡ à¤‰à¤ªà¤¯à¥‹à¤—à¤•à¤°à¥�à¤¤à¤¾ à¤šà¥�à¤¨à¥‡à¤‚ à¤œà¤¿à¤¨à¤•à¥‡ à¤²à¤¿à¤� à¤†à¤ª $(^NameDA) à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆà¤‚à¥¤"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "à¤šà¤¯à¤¨ à¤•à¤°à¥‡à¤‚ à¤•à¤¿ à¤•à¥�à¤¯à¤¾ à¤†à¤ª $(^NameDA) à¤•à¥‹ à¤•à¥‡à¤µà¤² à¤…à¤ªà¤¨à¥‡ à¤²à¤¿à¤� à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆà¤‚ à¤¯à¤¾ à¤‡à¤¸ à¤•à¤‚à¤ªà¥�à¤¯à¥‚à¤Ÿà¤° à¤•à¥‡ à¤¸à¤­à¥€ à¤‰à¤ªà¤¯à¥‹à¤—à¤•à¤°à¥�à¤¤à¤¾à¤“à¤‚ à¤•à¥‡ à¤²à¤¿à¤�à¥¤ $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "à¤‡à¤¸ à¤•à¤‚à¤ªà¥�à¤¯à¥‚à¤Ÿà¤° à¤•à¤¾ à¤‰à¤ªà¤¯à¥‹à¤— à¤•à¤°à¤¨à¥‡ à¤µà¤¾à¤²à¥‡ à¤•à¤¿à¤¸à¥€ à¤­à¥€ à¤µà¥�à¤¯à¤•à¥�à¤¤à¤¿ à¤•à¥‡ à¤²à¤¿à¤� à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¥‡à¤‚"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "à¤•à¥‡à¤µà¤² à¤®à¥‡à¤°à¥‡ à¤²à¤¿à¤� à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¥‡à¤‚"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Czech.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Czech.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Czech.nsh	(revision 2956)
@@ -1,122 +1,129 @@
-;Language: Czech (1029)
-;By SELiCE (ls@selice.cz - http://ls.selice.cz)
-;Corrected by Ondøej Vaniš - http://www.vanis.cz/ondra
+ï»¿;Language: Czech (1029)
+;By VÃ¡clav PavlÃ­Ä�ek (v.pavlicek@centrum.cz), dÅ™Ã­ve SELiCE
 
-!insertmacro LANGFILE "Czech" "Cesky"
+!insertmacro LANGFILE "Czech" = "ÄŒeÅ¡tina" "Cestina"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Vítejte v prùvodci instalace programu $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Tento prùvodce Vás provede instalací $(^NameDA).$\r$\n$\r$\nPøed zaèátkem instalace je doporuèeno zavøít všechny ostatní aplikace. Toto umožní aktualizovat dùležité systémové soubory bez restartování Vašeho poèítaèe.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "VÃ­tejte v prÅ¯vodci instalace programu $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Tento prÅ¯vodce vÃ¡s provede instalacÃ­ programu $(^NameDA).$\r$\n$\r$\nPÅ™ed spuÅ¡tÄ›nÃ­m instalaÄ�nÃ­ho programu je doporuÄ�eno ukonÄ�it vÅ¡echny ostatnÃ­ aplikace. UmoÅ¾nÃ­ to aktualizovat souvisejÃ­cÃ­ systÃ©movÃ© soubory bez restartovÃ¡nÃ­ poÄ�Ã­taÄ�e.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Vítejte v $(^NameDA) odinstalaèním prùvodci"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Tento prùvodce Vás provede odinstalací $(^NameDA).$\r$\n$\r$\nPøed zaèátkem odinstalace, se pøesvìdète, že $(^NameDA) není spuštìn.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "VÃ­tejte v prÅ¯vodci odinstalace programu $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Tento prÅ¯vodce vÃ¡s provede odinstalacÃ­ programu $(^NameDA).$\r$\n$\r$\nPÅ™ed spuÅ¡tÄ›nÃ­m odinstalace se pÅ™esvÄ›dÄ�te, zda program $(^NameDA) nenÃ­ spuÅ¡tÄ›n.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Licenèní ujednání"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Pøed instalací programu $(^NameDA) si prosím prostudujte licenèní podmínky."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Jestliže souhlasíte se všemi podmínkami ujednání, zvolte 'Souhlasím' pro pokraèování. Pro instalaci programu $(^NameDA) je nutné souhlasit s licenèním ujednáním."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Jestliže souhlasíte se všemi podmínkami ujednání, zaškrtnìte níže uvedenou volbu. Pro instalaci programu $(^NameDA) je nutné souhlasit s licenèním ujednáním. $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Jestliže souhlasíte se všemi podmínkami ujednání, zvolte první z možností uvedených níže. Pro instalaci programu $(^NameDA) je nutné souhlasit s licenèním ujednáním. $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "LicenÄ�nÃ­ smlouva"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "PÅ™ed instalacÃ­ programu $(^NameDA) si prosÃ­m projdÄ›te licenÄ�nÃ­ podmÃ­nky."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "JestliÅ¾e souhlasÃ­te s podmÃ­nkami smlouvy, kliknÄ›te na tlaÄ�Ã­tko SouhlasÃ­m. Chcete-li nainstalovat program $(^NameDA), je nutnÃ© s touto smlouvou souhlasit."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "JestliÅ¾e souhlasÃ­te s podmÃ­nkami smlouvy, zaÅ¡krtnÄ›te polÃ­Ä�ko nÃ­Å¾e. Chcete-li nainstalovat program $(^NameDA), je nutnÃ© s touto smlouvou souhlasit. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "JestliÅ¾e souhlasÃ­te s podmÃ­nkami smlouvy, vyberte nÃ­Å¾e prvnÃ­ moÅ¾nost. Chcete-li nainstalovat program $(^NameDA), je nutnÃ© s touto smlouvou souhlasit. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Licenèní ujednání"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Pøed odinstalováním programu $(^NameDA) si prosím prostudujte licenèní podmínky."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Jestliže souhlasíte se všemi podmínkami ujednání, zvolte 'Souhlasím' pro pokraèování. Pro odinstalování programu $(^NameDA) je nutné souhlasit s licenèním ujednáním."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Jestliže souhlasíte se všemi podmínkami ujednání, zaškrtnìte níže uvedenou volbu. Pro odinstalování programu $(^NameDA) je nutné souhlasit s licenèním ujednáním. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Jestliže souhlasíte se všemi podmínkami ujednání, zvolte první z níže uvedených možností. Pro odinstalování programu $(^NameDA) je nutné souhlasit s licenèním ujednáním. $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "LicenÄ�nÃ­ smlouva"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "PÅ™ed odinstalacÃ­ programu $(^NameDA) si prosÃ­m projdÄ›te licenÄ�nÃ­ podmÃ­nky."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "JestliÅ¾e souhlasÃ­te s podmÃ­nkami smlouvy, kliknÄ›te na tlaÄ�Ã­tko SouhlasÃ­m. Chcete-li odinstalovat program $(^NameDA), je nutnÃ© s touto smlouvou souhlasit."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "JestliÅ¾e souhlasÃ­te s podmÃ­nkami smlouvy, zaÅ¡krtnÄ›te polÃ­Ä�ko nÃ­Å¾e. Chcete-li odinstalovat program $(^NameDA), je nutnÃ© s touto smlouvou souhlasit. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "JestliÅ¾e souhlasÃ­te s podmÃ­nkami smlouvy, vyberte nÃ­Å¾e prvnÃ­ moÅ¾nost. Chcete-li odinstalovat program $(^NameDA), je nutnÃ© s touto smlouvou souhlasit. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Stisknutím klávesy Page Down posunete text licenèního ujednání."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Zbytek textu zobrazÃ­te stisknutÃ­m klÃ¡vesy Page Down."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Volba souèástí"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Zvolte souèásti programu $(^NameDA), které chcete nainstalovat."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Volba souÄ�Ã¡stÃ­"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "VÃ½bÄ›r souÄ�Ã¡stÃ­ programu $(^NameDA) pro instalaci."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Volba souèástí"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Zvolte souèásti programu $(^NameDA), které chcete odinstalovat."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Volba souÄ�Ã¡stÃ­"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "VÃ½bÄ›r souÄ�Ã¡stÃ­ programu $(^NameDA) pro odinstalaci."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Popis"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Pøi pohybu myší nad instalátorem programu se zobrazí její popis."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Chcete-li zobrazit popis souÄ�Ã¡sti, umÃ­stÄ›te na nÃ­ ukazatel myÅ¡i."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Pøi pohybu myší nad instalátorem programu se zobrazí její popis."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Chcete-li zobrazit popis souÄ�Ã¡sti, vyberte ji."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Zvolte umístìní instalace"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Zvolte složku, do které bude program $(^NameDA) nainstalován."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Volba umÃ­stÄ›nÃ­ instalace"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "VÃ½bÄ›r instalaÄ�nÃ­ sloÅ¾ky programu $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Zvolte umístìní odinstalace"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Zvolte složku, ze které bude program $(^NameDA) odinstalován."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Volba umÃ­stÄ›nÃ­ odinstalace"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "VÃ½bÄ›r odinstalaÄ�nÃ­ sloÅ¾ky programu $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Instalace"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Vyèkejte, prosím, na dokonèení instalace programu $(^NameDA)."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Instalace dokonèena"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Instalace probìhla v poøádku."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Instalace pøerušena"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Instalace nebyla dokonèena."
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "PoÄ�kejte prosÃ­m na dokonÄ�enÃ­ instalace programu $(^NameDA)."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Instalace dokonÄ�ena"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Instalace byla ÃºspÄ›Å¡nÄ› dokonÄ�ena."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Instalace pÅ™eruÅ¡ena"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Instalace nebyla ÃºspÄ›Å¡nÄ› dokonÄ�ena."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Odinstalace"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Vyèkejte, prosím, na dokonèení odinstalace programu $(^NameDA)."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Odinstalace dokonèena"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Odinstalace probìhla v poøádku."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Odinstalace pøerušena"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Odinstalace nebyla dokonèena."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "PoÄ�kejte prosÃ­m na dokonÄ�enÃ­ odinstalace programu $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Odinstalace dokonÄ�ena"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Odinstalace byla ÃºspÄ›Å¡nÄ› dokonÄ�ena."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Odinstalace pÅ™eruÅ¡ena"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Odinstalace nebyla ÃºspÄ›Å¡nÄ› dokonÄ�ena."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Dokonèení prùvodce programu $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Program $(^NameDA) byl nainstalován na Váš poèítaè.$\r$\n$\r$\nKliknìte 'Dokonèit' pro ukonèení prùvodce."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Pro dokonèení instalace programu $(^NameDA) je nutno restartovat poèítaè. Chcete restatovat nyní?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "DokonÄ�enÃ­ instalace programu $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Program $(^NameDA) byl nainstalovÃ¡n do poÄ�Ã­taÄ�e.$\r$\n$\r$\nKliknutÃ­m na tlaÄ�Ã­tko DokonÄ�it ukonÄ�Ã­te tohoto prÅ¯vodce."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "K dokonÄ�enÃ­ instalace programu $(^NameDA) je nutnÃ© restartovat poÄ�Ã­taÄ�. Chcete jej restartovat nynÃ­?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Dokonèuji odinstalaèního prùvodce $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) byl odinstalován z Vašeho poèítaèe.$\r$\n$\r$\nKliknìte na 'Dokonèit' pro ukonèení tohoto prùvodce."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Pro dokonèení odinstalace $(^NameDA) musí být Váš poèítaè restartován. Chcete restartovat nyní?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "DokonÄ�enÃ­ odinstalace programu $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Program $(^NameDA) byl odinstalovÃ¡n z poÄ�Ã­taÄ�e.$\r$\n$\r$\nKliknutÃ­m na tlaÄ�Ã­tko DokonÄ�it ukonÄ�Ã­te tohoto prÅ¯vodce."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "K dokonÄ�enÃ­ odinstalace $(^NameDA) je nutnÃ© restartovat poÄ�Ã­taÄ�. Chcete jej restartovat nynÃ­?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Restartovat nyní"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Restartovat ruènì pozdìji"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Restartovat nynÃ­"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Restartovat pozdÄ›ji ruÄ�nÄ›"
   ${LangFileString} MUI_TEXT_FINISH_RUN "&Spustit program $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Zobrazit Èti-mne"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Dokonèit"  
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Zobrazit soubor Readme (ÄŒti mÄ›)"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&DokonÄ�it"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Zvolte složku v Nabídce Start"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Zvolte složku v Nabídce Start pro zástupce programu $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Zvolte složku v Nabídce Start, ve které chcete vytvoøit zástupce programu. Mùžete také zadat nové jméno pro vytvoøení nové složky."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Nevytváøet zástupce"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Volba sloÅ¾ky v NabÃ­dce Start"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "VÃ½bÄ›r sloÅ¾ky v NabÃ­dce Start pro zÃ¡stupce programu $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Vyberte sloÅ¾ku v NabÃ­dce Start, ve kterÃ© chcete vytvoÅ™it zÃ¡stupce programu. Chcete-li vytvoÅ™it novou sloÅ¾ku, zadejte jejÃ­ nÃ¡zev."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "NevytvoÅ™it zÃ¡stupce"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Odinstalovat program $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Odebrat program $(^NameDA) z Vašeho poèítaèe."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Odinstalace programu $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Odebere program $(^NameDA) z poÄ�Ã­taÄ�e."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Opravdu chcete ukonèit instalaci programu $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Opravdu chcete instalaci programu $(^Name) ukonÄ�it?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Skuteènì chcete ukonèit odinstalaci $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Opravdu chcete odinstalaci programu $(^Name) ukonÄ�it?"
 !endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Volba uÅ¾ivatelÅ¯"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "VÃ½bÄ›r uÅ¾ivatelÅ¯, kterÃ½m bude program $(^NameDA) nainstalovÃ¡n."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Vyberte, zda chcete program $(^NameDA) nainstalovat pouze pro sebe, nebo pro vÅ¡echny uÅ¾ivatele poÄ�Ã­taÄ�e. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Instalovat pro vÅ¡echny uÅ¾ivatele poÄ�Ã­taÄ�e"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Instalovat pouze pro sebe"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Luxembourgish.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Luxembourgish.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Luxembourgish.nsh	(revision 2956)
@@ -1,46 +1,46 @@
-;Language: Luxembourgish (1031)
+ï»¿;Language: Luxembourgish (1031)
 ;By Snowloard, changes by Philo
 
-!insertmacro LANGFILE "Luxembourgish" "Lëtzebuergesch"
+!insertmacro LANGFILE "Luxembourgish" = "LÃ«tzebuergesch" "Letzebuergesch"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Wëllkomm beim Installatiouns-$\r$\nAssistent vun $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Dësen Assistent wärt dech duech d'Installatioun vun $(^NameDA) begleeden.$\r$\n$\r$\nEt gëtt ugeroden alleguer d'Programmer di am Moment lafen zouzemaan, datt bestëmmt Systemdateien ouni Neistart ersat kënne ginn.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "WÃ«llkomm beim Installatiouns-$\r$\nAssistent vun $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "DÃ«sen Assistent wÃ¤rt dech duech d'Installatioun vun $(^NameDA) begleeden.$\r$\n$\r$\nEt gÃ«tt ugeroden alleguer d'Programmer di am Moment lafen zouzemaan, datt bestÃ«mmt Systemdateien ouni Neistart ersat kÃ«nne ginn.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Wëllkomm am Desinstallatiouns-$\r$\n\Assistent fir $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Desen Assistent begleet dech duech d'Desinstallatioun vun $(^NameDA).$\r$\n$\r$\nW.e.g. maach $(^NameDA) zu, ierts de mat der Desinstallatioun ufänks.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "WÃ«llkomm am Desinstallatiouns-$\r$\n\Assistent fir $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Desen Assistent begleet dech duech d'Desinstallatioun vun $(^NameDA).$\r$\n$\r$\nW.e.g. maach $(^NameDA) zu, ierts de mat der Desinstallatioun ufÃ¤nks.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
   ${LangFileString} MUI_TEXT_LICENSE_TITLE "Lizenzofkommes"
   ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "W.e.g. d'Lizenzoofkommes liesen, ierts de mat der Installatioun weiderfiers."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Wanns de alleguer d'Bedengungen vum Ofkommes akzeptéiers, klick op Unhuelen. Du muss alleguer d'Fuerderungen unerkennen, fir $(^NameDA) installéieren ze kënnen."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Wanns de alleguer d'Bedengungen vum Ofkommes akzeptéiers, aktivéier d'Këschtchen. Du muss alleguer d'Fuerderungen unerkennen, fir $(^NameDA) installéieren ze kënnen. $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Wanns de alleguer d'Bedengungen vum Ofkommes akzeptéiers, wiel ënnen di entspriechend Äntwert aus. Du muss alleguer d'Fuerderungen unerkennen, fir $(^NameDA) installéieren ze kënnen. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Wanns de alleguer d'Bedengungen vum Ofkommes akzeptÃ©iers, klick op Unhuelen. Du muss alleguer d'Fuerderungen unerkennen, fir $(^NameDA) installÃ©ieren ze kÃ«nnen."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Wanns de alleguer d'Bedengungen vum Ofkommes akzeptÃ©iers, aktivÃ©ier d'KÃ«schtchen. Du muss alleguer d'Fuerderungen unerkennen, fir $(^NameDA) installÃ©ieren ze kÃ«nnen. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Wanns de alleguer d'Bedengungen vum Ofkommes akzeptÃ©iers, wiel Ã«nnen di entspriechend Ã„ntwert aus. Du muss alleguer d'Fuerderungen unerkennen, fir $(^NameDA) installÃ©ieren ze kÃ«nnen. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
   ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Lizenzofkommes"
   ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "W.e.g. lies d'Lizenzofkommes duech ierts de mat der Desinstallatioun vun $(^NameDA) weiderfiers."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Wanns de d'Fuerderungen vum Ofkommes akzeptéiers, klick op unhuelen. Du muss d'Ofkommes akzeptéieren, fir $(^NameDA) kënnen ze desinstalléieren."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Wanns de d'Fuerderungen vum Ofkommes akzeptéiers, aktivéier d'Këschtchen. Du muss d'Ofkommes akzeptéieren, fir $(^NameDA) kënnen ze desinstalléieren. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Wanns de d'Fuerderungen vum Ofkommes akzeptéiers, wiel ënnen di entspriechend Optioun. Du muss d'Oofkommes akzeptéieren, fir $(^NameDA) kennen ze desinstalléieren. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Wanns de d'Fuerderungen vum Ofkommes akzeptÃ©iers, klick op unhuelen. Du muss d'Ofkommes akzeptÃ©ieren, fir $(^NameDA) kÃ«nnen ze desinstallÃ©ieren."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Wanns de d'Fuerderungen vum Ofkommes akzeptÃ©iers, aktivÃ©ier d'KÃ«schtchen. Du muss d'Ofkommes akzeptÃ©ieren, fir $(^NameDA) kÃ«nnen ze desinstallÃ©ieren. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Wanns de d'Fuerderungen vum Ofkommes akzeptÃ©iers, wiel Ã«nnen di entspriechend Optioun. Du muss d'Oofkommes akzeptÃ©ieren, fir $(^NameDA) kennen ze desinstallÃ©ieren. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Dréck d'PageDown-Tast fir den Rescht vum Ofkommes ze liesen."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "DrÃ©ck d'PageDown-Tast fir den Rescht vum Ofkommes ze liesen."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
   ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Komponenten auswielen"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Wiel d'Komponenten aus, déis de wëlls installéieren."
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Wiel d'Komponenten aus, dÃ©is de wÃ«lls installÃ©ieren."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Komponenten auswielen"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Wiel eng Komponent aus, déis de desinstalléieren wëlls."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Wiel eng Komponent aus, dÃ©is de desinstallÃ©ieren wÃ«lls."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
@@ -48,74 +48,74 @@
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
     ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Hal den Mausfeil iwwer eng Komponent, fir d'Beschreiwung dervun ze gesinn."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Hal den Mausfeil iwwer eng Komponent, fir d'Beschreiwung dervun ze gesinn."
+    #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO 
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
   ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Zielverzeechnes auswielen"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Wiel den Dossier aus, an deen $(^NameDA) installéiert soll ginn."
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Wiel den Dossier aus, an deen $(^NameDA) installÃ©iert soll ginn."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
   ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Dossier fir d'Desinstallatioun wielen"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Wiel den Dossier aus, aus dem $(^NameDA) desinstalléiert soll ginn."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Wiel den Dossier aus, aus dem $(^NameDA) desinstallÃ©iert soll ginn."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Installéieren..."
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Waard w.e.g während deem $(^NameDA) installéiert gëtt."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Installatioun färdeg"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "D'Installatioun ass feelerfräi oofgeschloss ginn."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "InstallÃ©ieren..."
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Waard w.e.g wÃ¤hrend deem $(^NameDA) installÃ©iert gÃ«tt."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Installatioun fÃ¤rdeg"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "D'Installatioun ass feelerfrÃ¤i oofgeschloss ginn."
   ${LangFileString} MUI_TEXT_ABORT_TITLE "Installatioun ofgebrach"
   ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "D'Installatioun ass net komplett ofgeschloss ginn."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Desinstalléieren..."
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "W.e.g. waard, während deems $(^NameDA) desinstalléiert gëtt."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "DesinstallÃ©ieren..."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "W.e.g. waard, wÃ¤hrend deems $(^NameDA) desinstallÃ©iert gÃ«tt."
   ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Desinstallatioun ofgeschloss"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "D'Desinstallatioun ass erfollegräich ofgeschloss ginn."
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "D'Desinstallatioun ass erfollegrÃ¤ich ofgeschloss ginn."
   ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Desinstallatioun oofbriechen"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Desinstallatioun ass net erfollegräich ofgeschloss ginn."
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Desinstallatioun ass net erfollegrÃ¤ich ofgeschloss ginn."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "D'Installatioun vun $(^NameDA) gëtt ofgeschloss."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) ass um Computer installéiert ginn.$\r$\n$\r$\nKlick op färdeg maan, fir den Installatiouns-Assistent zou ze maan.."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Den Windows muss nei gestart ginn, fir d'Installatioun vun $(^NameDA) ofzeschléissen. Wëlls de Windows lo néi starten?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "D'Installatioun vun $(^NameDA) gÃ«tt ofgeschloss."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) ass um Computer installÃ©iert ginn.$\r$\n$\r$\nKlick op fÃ¤rdeg maan, fir den Installatiouns-Assistent zou ze maan.."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Den Windows muss nei gestart ginn, fir d'Installatioun vun $(^NameDA) ofzeschlÃ©issen. WÃ«lls de Windows lo nÃ©i starten?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Desinstallatioun vun $(^NameDA) gëtt ofgeschloss"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) ass vum Computer desinstalléiert ginn.$\r$\n$\r$\nKlick op Ofschléissen fir den Assistent zou ze maan."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Windows muss néi gestart gin, fir d'Desinstallatioun vun $(^NameDA) ze vervollstännegen. Wëlls de Windows lo néi starten?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Desinstallatioun vun $(^NameDA) gÃ«tt ofgeschloss"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) ass vum Computer desinstallÃ©iert ginn.$\r$\n$\r$\nKlick op OfschlÃ©issen fir den Assistent zou ze maan."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Windows muss nÃ©i gestart gin, fir d'Desinstallatioun vun $(^NameDA) ze vervollstÃ¤nnegen. WÃ«lls de Windows lo nÃ©i starten?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Lo néi starten"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Spéider manuell néi starten"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Lo nÃ©i starten"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "SpÃ©ider manuell nÃ©i starten"
   ${LangFileString} MUI_TEXT_FINISH_RUN "$(^NameDA) op maan"
   ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Liesmech op maan"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Färdeg man"  
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&FÃ¤rdeg man"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Startmenü-Dossier bestëmmen"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Bestëmm een Startmanü-Dossier an deen d'Programmofkierzungen kommen."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Bestëmm een Startmanü-Dossier an deen d'Programmofkierzungen kommen. Wanns de een néien Dossier man wells, gëff deem säin zukünftegen Numm an."
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "StartmenÃ¼-Dossier bestÃ«mmen"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "BestÃ«mm een StartmanÃ¼-Dossier an deen d'Programmofkierzungen kommen."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "BestÃ«mm een StartmanÃ¼-Dossier an deen d'Programmofkierzungen kommen. Wanns de een nÃ©ien Dossier man wells, gÃ«ff deem sÃ¤in zukÃ¼nftegen Numm an."
   ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Keng Ofkierzungen man"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
   ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Desinstallatioun vun $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "$(^NameDA) gett vum Computer desinstalléiert."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "$(^NameDA) gett vum Computer desinstallÃ©iert."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Bass de sécher, dass de d'Installatioun vun $(^Name) ofbriechen wëlls?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Bass de sÃ©cher, dass de d'Installatioun vun $(^Name) ofbriechen wÃ«lls?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Bass de sécher, dass de d'Desinstallatioun vun $(^Name) ofbriechen wëlls?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Bass de sÃ©cher, dass de d'Desinstallatioun vun $(^Name) ofbriechen wÃ«lls?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Galician.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Galician.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Galician.nlf	(revision 2956)
@@ -1,4 +1,4 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Start editing here
 # Language ID
@@ -6,37 +6,37 @@
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
 # Translation v 1.0.0 by Ramon Flores <fa2ramon@usc.es>
 # ^Branding
-Sistema de Instalación Nullsoft %s
+Nullsoft Install System %s
 # ^SetupCaption
-Instalación de $(^Name)
+InstalaciÃ³n de $(^Name)
 # ^UninstallCaption
-Desinstalación de $(^Name)
+DesinstalaciÃ³n de $(^Name)
 # ^LicenseSubCaption
 : Contrato de licenza
 # ^ComponentsSubCaption
-: Opcións de instalación
+: OpciÃ³ns de instalaciÃ³n
 # ^DirSubCaption
-: Diretória de instalación
+: DiretÃ³ria de instalaciÃ³n
 # ^InstallingSubCaption
 : Instalando ficheiros
 # ^CompletedSubCaption
-: Concluído
+: ConcluÃ­do
 # ^UnComponentsSubCaption
-: Opcións de desinstalación
+: OpciÃ³ns de desinstalaciÃ³n
 # ^UnDirSubCaption
-: Cartafol de desinstalación
+: Cartafol de desinstalaciÃ³n
 # ^ConfirmSubCaption
-: Confirmación
+: ConfirmaciÃ³n
 # ^UninstallingSubCaption
 : Desinstalando
 # ^UnCompletedSubCaption
-: Concluído
+: ConcluÃ­do
 # ^BackBtn
 < &Anterior
 # ^NextBtn
@@ -62,31 +62,31 @@
 # ^ClickNext
 Clique en 'Seguinte' para continuar.
 # ^ClickInstall
-Clique en 'Instalar' para iniciar a instalación.
+Clique en 'Instalar' para iniciar a instalaciÃ³n.
 # ^ClickUninstall
-Clique en 'Desinstalar' para iniciar a desinstalación.
+Clique en 'Desinstalar' para iniciar a desinstalaciÃ³n.
 # ^Name
 Nome
 # ^Completed
-Concluído
+ConcluÃ­do
 # ^LicenseText
 Por favor revexa o acordo de licenza antes de instalar $(^NameDA). Se concordar con todos os termos da licenza, clique em 'Aceito'.
 # ^LicenseTextCB
-Por favor reveja o acordo de licenza antes de instalar $(^NameDA). Se concordar con todos os termos da licenza, clique na caixa de selección abaixo. $_CLICK
+Por favor reveja o acordo de licenza antes de instalar $(^NameDA). Se concordar con todos os termos da licenza, clique na caixa de selecciÃ³n abaixo. $_CLICK
 # ^LicenseTextRB
-Por favor revexa o acordo de licenza antes de instalar $(^NameDA). Se concordar con todos os termos da licenza, escolla a primeira opción abaixo. $_CLICK
+Por favor revexa o acordo de licenza antes de instalar $(^NameDA). Se concordar con todos os termos da licenza, escolla a primeira opciÃ³n abaixo. $_CLICK
 # ^UnLicenseText
 Por favor revexa o acordo de licenza antes de desinstalar $(^NameDA). Se concordar con todos os termos da licenza, clique em 'Aceito'.
 # ^UnLicenseTextCB
-Por favor reveja o acordo de licenza antes de desinstalar $(^NameDA). Se concordar con todos os termos da licenza, clique na caixa de selección abaixo. $_CLICK
+Por favor reveja o acordo de licenza antes de desinstalar $(^NameDA). Se concordar con todos os termos da licenza, clique na caixa de selecciÃ³n abaixo. $_CLICK
 # ^UnLicenseTextRB
-Por favor revexa o acordo de licenza antes de desinstalar $(^NameDA). Se concordar con todos os termos da licenza, escolla a primeira opción abaixo. $_CLICK
+Por favor revexa o acordo de licenza antes de desinstalar $(^NameDA). Se concordar con todos os termos da licenza, escolla a primeira opciÃ³n abaixo. $_CLICK
 # ^Custom
 Personalizado
 # ^ComponentsText
 Marque os componentes que desexa instalar e desmarque os componentes que non desexa instalar. $_CLICK
 # ^ComponentsSubText1
-Escolla o tipo de instalación:
+Escolla o tipo de instalaciÃ³n:
 # ^ComponentsSubText2_NoInstTypes
 Escolla os componentes para instalar:
 # ^ComponentsSubText2
@@ -94,37 +94,37 @@
 # ^UnComponentsText
 Marque os componentes que queira desinstalar e vice versa. $_CLICK
 # ^UnComponentsSubText1
-Escolla o tipo de desinstalación:
+Escolla o tipo de desinstalaciÃ³n:
 # ^UnComponentsSubText2_NoInstTypes
 Escolla os componentes para desinstalar:
 # ^UnComponentsSubText2
 Ou, escolla os componentes opcionais que queira desinstalar:
 # ^DirText
-O $(^NameDA) será instalado na seguinte directória. Para instalar nunha directória diferente, clique en 'Procurar...' e escolla outra directória. $_CLICK
+O $(^NameDA) serÃ¡ instalado na seguinte directÃ³ria. Para instalar nunha directÃ³ria diferente, clique en 'Procurar...' e escolla outra directÃ³ria. $_CLICK
 # ^DirSubText
-Directória de destino
+DirectÃ³ria de destino
 # ^DirBrowseText
-Escolla unha directória para instalar o $(^NameDA):
+Escolla unha directÃ³ria para instalar o $(^NameDA):
 # ^UnDirText
-O $(^NameDA) será desinstalado da seguinte directória. Para desinstalar dunha pasta diferente, clique en 'Procurar...' e escolla outra directória. $_CLICK
+O $(^NameDA) serÃ¡ desinstalado da seguinte directÃ³ria. Para desinstalar dunha pasta diferente, clique en 'Procurar...' e escolla outra directÃ³ria. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Escolla a directória de onde vai ser desinstalado o $(^NameDA):
+Escolla a directÃ³ria de onde vai ser desinstalado o $(^NameDA):
 # ^SpaceAvailable
-"Espazo disponíbel: "
+"Espazo disponÃ­bel: "
 # ^SpaceRequired
-"Espazo necesário: "
+"Espazo necesÃ¡rio: "
 # ^UninstallingText
-$(^NameDA) vai ser desinstalado da seguinte directória. $_CLICK
+$(^NameDA) vai ser desinstalado da seguinte directÃ³ria. $_CLICK
 # ^UninstallingSubText
 Desinstalando de:
 # ^FileError
-Erro ao abrir ficheiro para escrita: \r\n\t"$0"\r\nClique en Abortar para abortar a instalación,\r\nRepetir para tentar novamente a escrita do ficheiro, ou\r\nIgnorar para ignorar este ficheiro.
+Erro ao abrir ficheiro para escrita: \r\n\t"$0"\r\nClique en Abortar para abortar a instalaciÃ³n,\r\nRepetir para tentar novamente a escrita do ficheiro, ou\r\nIgnorar para ignorar este ficheiro.
 # ^FileError_NoIgnore
-Erro ao abrir ficheiro para escrita: \r\n\t"$0"\r\nClique en Repetir para tentar novamente a gravación do ficheiro, ou\r\nCancelar para abortar a instalación.
+Erro ao abrir ficheiro para escrita: \r\n\t"$0"\r\nClique en Repetir para tentar novamente a gravaciÃ³n do ficheiro, ou\r\nCancelar para abortar a instalaciÃ³n.
 # ^CantWrite
-"Non foi posíbel escreber: "
+"Non foi posÃ­bel escreber: "
 # ^CopyFailed
 Falla ao copiar
 # ^CopyTo
@@ -134,11 +134,11 @@
 # ^Unregistering
 "Desrexistando: "
 # ^SymbolNotFound
-"Símbolo non achado: "
+"SÃ­mbolo non achado: "
 # ^CouldNotLoad
-"Non foi posíbel carregar: "
+"Non foi posÃ­bel carregar: "
 # ^CreateFolder
-"Criando diretória: "
+"Criando diretÃ³ria: "
 # ^CreateShortcut
 "Criando atallo: "
 # ^CreatedUninstaller
@@ -164,7 +164,7 @@
 # ^ErrorWriting
 "Extraindo: erro ao escreber ficheiro "
 # ^InvalidOpcode
-Instalador corrompido: código de operación inválido
+Instalador corrompido: cÃ³digo de operaciÃ³n invÃ¡lido
 # ^NoOLE
 "Sen OLE para: "
 # ^OutputFolder
@@ -178,14 +178,14 @@
 # ^Skipped
 "Ignorado: "
 # ^CopyDetails
-Copiar detalles para a Área de transférencia
+Copiar detalles para a Ã�rea de transfÃ©rencia
 # ^LogInstall
-Rexistar proceso de instalación
+Rexistar proceso de instalaciÃ³n
 # ^Byte
 B
 # kilo
-K
+ K
 # mega
-M
+ M
 # giga
-G
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Dutch.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Dutch.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Dutch.nlf	(revision 2956)
@@ -1,4 +1,4 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Start editing here
 # Language ID
@@ -6,7 +6,7 @@
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
@@ -16,7 +16,7 @@
 # ^SetupCaption
 $(^Name)-installatie
 # ^UninstallCaption
-$(^Name)-deïnstallatie
+$(^Name)-deÃ¯nstallatie
 # ^LicenseSubCaption
 : Licentieovereenkomst
 # ^ComponentsSubCaption
@@ -64,7 +64,7 @@
 # ^ClickInstall
 Klik op Installeren om de installatie te beginnen.
 # ^ClickUninstall
-Klik op Verwijderen om de deïnstallatie te beginnen.
+Klik op Verwijderen om de deÃ¯nstallatie te beginnen.
 # ^Name
 Naam
 # ^Completed
@@ -88,9 +88,9 @@
 # ^ComponentsSubText1
 Selecteer het installatietype:
 # ^ComponentsSubText2_NoInstTypes
-Selecteer de onderdelen die moeten worden geïnstalleerd:
+Selecteer de onderdelen die moeten worden geÃ¯nstalleerd:
 # ^ComponentsSubText2
-Of selecteer de optionele onderdelen die moeten worden geïnstalleerd:
+Of selecteer de optionele onderdelen die moeten worden geÃ¯nstalleerd:
 # ^UnComponentsText
 Selecteer de onderdelen die u wilt verwijderen en deselecteer welke u niet wilt verwijderen. $_CLICK
 # ^UnComponentsSubText1
@@ -126,9 +126,9 @@
 # ^CantWrite
 "Kon niet schrijven: "
 # ^CopyFailed
-Kopiëren mislukt
+KopiÃ«ren mislukt
 # ^CopyTo
-"Kopiëren naar "
+"KopiÃ«ren naar "
 # ^Registering
 "Registreren: "
 # ^Unregistering
@@ -142,7 +142,7 @@
 # ^CreateShortcut
 "Snelkoppeling maken: "
 # ^CreatedUninstaller
-"Deïnstallatieprogramma gemaakt: "
+"DeÃ¯nstallatieprogramma gemaakt: "
 # ^Delete
 "Bestand verwijderen: "
 # ^DeleteOnReboot
@@ -178,14 +178,14 @@
 # ^Skipped
 "Overgeslagen: "
 # ^CopyDetails
-Details kopiëren naar klembord
+Details kopiÃ«ren naar klembord
 # ^LogInstall
 Gegevens over installatie bewaren
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Pashto.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Pashto.nsh	(revision 0)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Pashto.nsh	(revision 2956)
@@ -0,0 +1,121 @@
+ï»¿;Language: Pashto (1123)
+;By Pakhtosoft - www.pakhtosoft.com
+
+!insertmacro LANGFILE "Pashto" = "Ù¾ÚšØªÙˆ" "Pashto"
+
+!ifdef MUI_WELCOMEPAGE
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Ø§Ù…Ø³ØªÙ‡ Ø§Ø³Ø§Ù†Ú«Ø± ØªÙ‡ ÚšÙ‡ Ø±Ø§ØºÙ„Ø§Ø³Øª $(^NameDA) Ø¯ "
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT ".Ù„Ú«ÙˆÙ†Û� ØªÙ‡ ÙŠÙˆØ³ÙŠ $(^NameDA) Ø¯Ø§ Ø§Ø³Ø§Ù†Ú«Ø± Ø¨Ù‡ ØªØ§Ø³Û� Ø¯$\r$\n$\r$\n.Ø¯ Ø§Ù…Ø³ØªÛ� Ø¯ Ù¾Û�Ù„ÙˆÙ„Ùˆ Ù†Ù‡ Ù…Ø®Ú©ÚšÛ� Ø¯ Ù†ÙˆØ±Ùˆ Ø³Ø§ÙˆØªØ±Ùˆ Ø¯ Ø¨Ù†Ø¯ÙˆÙ„Ùˆ Ø³Ù¾Ø§Ø±ÚšØªÙ†Ù‡ Ú©ÙˆÙˆ. Ø¯ Ø¯Û� Ú©Ø§Ø± Ù¾Ù‡ Ú©ÙˆÙ„Ùˆ Ø³Ø±Ù‡ Ø¨Ù‡ Ø¯Ø§ Ø´ÙˆÙ†Ù‡ Ø´ÙŠ Ú†Û� Ù¾Ø±ØªÙ‡ Ù„Ù‡ Ú©Ù…Ù¾ÙŠÙˆÙ¼Ø± Ø¯ Ø¨ÙŠØ§Ù¾ÙŠÙ„Ø§ØªÙ‡ Ø§Ú“ÙŠÙ†Û� ØºÙˆÙ†Ú‰Ø§Ù„ Ø¯ÙˆØªÙ†Û� Ø§ÙˆØ³Ù…Ù‡Ø§Ù„Ù‡ Ø´ÙŠ$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_UNWELCOMEPAGE
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Ù†Ø§Ù„Ú«Ø§Ùˆ Ø§Ø³Ø§Ù†Ú«Ø± ØªÙ‡ ÚšÙ‡ Ø±Ø§ØºÙ„Ø§Ø³Øª $(^NameDA) Ø¯"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT ".Ù†Ø§Ù„Ú«ÙˆÙ†Û� ØªÙ‡ ÙŠÙˆØ³ÙŠ $(^NameDA) Ø¯Ø§ Ø§Ø³Ø§Ù†Ú«Ø± Ø¨Ù‡ ØªØ§Ø³Û� Ø¯$\r$\n$\r$\n.Ù†Ù‡ ÙˆÙŠ Ù¾Ø±Ø§Ù†ÙŠØ³ØªÙ„ Ø´ÙˆÛŒ $(^NameDA) Ø¯ Ù†Ø§Ù„Ú«Ø§Ùˆ Ø¯ Ù¾Û�Ù„ÙˆÙ„Ùˆ Ù†Ù‡ Ù…Ø®Ú©ÚšÛ�ØŒ Ú�Ø§Ù† Ú‰Ø§Ú‰Ù…Ù† Ú©Ú“ïº‰ Ú†Û�$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ù…Ù†ÚšØªÙ„ÙŠÚ© ØªÚ“ÙˆÙ†"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE ".Ù„Ú«ÙˆÙ„Ùˆ Ù†Ù‡ Ù…Ø®Ú©ÚšÛ� Ù…Ù†ÚšØªÙ„ÙŠÚ© ØªÙˆÚ©ÙŠ ÙˆÚ«ÙˆØ±ïº‰ $(^NameDA) Ø¯"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM ".Ø¯ Ù„Ú«Ø§ÙˆÙ†Û� Ù„Ù¾Ø§Ø±Ù‡ Ø¯ ØªÚ“ÙˆÙ† Ù…Ù†Ù„ Ø§Ú“ÙŠÙ† Ø¯ÙŠ $(^NameDA) Ú©Ù‡ Ú†Û�Ø±Û� ØªÚ“ÙˆÙ† ØªÙˆÚ©ÙŠ Ù…Ù†Ø¦ØŒ Ø²Ù‡ Ù…Ù†Ù… Ù¼Ú© ÙˆÙ‡Ø¦ Ú†Û� Ù…Ø®Ú©ÚšÛ� ÙˆÙ„Ø§Ú“ Ø´Ø¦. Ø¯"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX ".Ù„Ú«ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ø¯ ØªÚ“ÙˆÙ† Ù…Ù†Ù„ Ø§Ú“ÙŠÙ† Ø¯ÙŠ $(^NameDA) Ú©Ù‡ Ú†Û�Ø±Û� Ø¯ ØªÚ“ÙˆÙ† ØªÙˆÚ©ÙŠ Ù…Ù†Ø¦ØŒ Ù†Ùˆ Ù„Ø§Ù†Ø¯Û� Ø®ÙˆÚšØ¨Ú©Ø³ Ù¼Ú© ÙˆÙ‡Ø¦. Ø¯ $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS ".Ù„Ú«ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ø¯ ØªÚ“ÙˆÙ† Ù…Ù†Ù„ Ø§Ú“ÙŠÙ† Ø¯ÙŠ $(^NameDA) Ú©Ù‡ Ú†Û�Ø±Û� Ø¯ ØªÚ“ÙˆÙ† ØªÙˆÚ©ÙŠ Ù…Ù†Ø¦ØŒ Ù†Ùˆ Ù„Ø§Ù†Ø¯Û� Ù„Ù…Ú“ÛŒ ØºÙˆØ±Ø§ÙˆÛŒ Ù¼Ú© ÙˆÙ‡Ø¦. Ø¯ $_CLICK"
+!endif
+
+!ifdef MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ù…Ù†ÚšØªÙ„ÙŠÚ© ØªÚ“ÙˆÙ†"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE ".Ù†Ø§Ù„Ú«ÙˆÙ„Ùˆ Ù†Ù‡ Ù…Ø®Ú©ÚšÛ� Ø¯ Ù…Ù†ÚšØªÙ„ÙŠÚ© ØªÙˆÚ©ÙŠ ÙˆÚ«ÙˆØ±ïº‰ $(^NameDA) Ø¯"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM ".Ù†Ø§Ù„Ú«ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ø¯ ØªÚ“ÙˆÙ† Ù…Ù†Ù„ Ø§Ú“ÙŠÙ† Ø¯ÙŠ $(^NameDA) Ú©Ù‡ Ú†Û�Ø±Û� Ø¯ ØªÚ“ÙˆÙ† ØªÙˆÚ©ÙŠ Ù…Ù†Ø¦ØŒ Ø²Ù‡ Ù…Ù†Ù… Ù¼Ú© ÙˆÙ‡Ø¦ Ú†Û� Ù…Ø®Ú©ÚšÛ� ÙˆÙ„Ø§Ú“ Ø´Ø¦. Ø¯"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX ".Ù†Ø§Ù„Ú«ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ø¯ ØªÚ“ÙˆÙ† Ù…Ù†Ù„ Ø§Ú“ÙŠÙ† Ø¯ÙŠ $(^NameDA) Ú©Ù‡ Ú†Û�Ø±Û� Ø¯ ØªÚ“ÙˆÙ† ØªÙˆÚ©ÙŠ Ù…Ù†Ø¦ØŒ Ù†Ùˆ Ù„Ø§Ù†Ø¯Û� Ø®ÙˆÚšØ¨Ú©Ø³ Ù¼Ú© ÙˆÙ‡Ø¦. Ø¯ $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS ".Ù†Ø§Ù„Ú«ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ø¯ ØªÚ“ÙˆÙ† Ù…Ù†Ù„ Ø§Ú“ÙŠÙ† Ø¯ÙŠ $(^NameDA) Ú©Ù‡ Ú†Û�Ø±Û� Ø¯ ØªÚ“ÙˆÙ† ØªÙˆÚ©ÙŠ Ù…Ù†Ø¦ØŒ Ù†Ùˆ Ù„Ø§Ù†Ø¯Û� Ù„Ù…Ú“ÛŒ ØºÙˆØ±Ø§ÙˆÛŒ Ù¼Ú© ÙˆÙ‡Ø¦. Ø¯ $_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP ".Ø¯ ØªÚ“ÙˆÙ† Ø¯ Ù†ÙˆØ±Û� Ø¨Ø±Ø®Û� Ú©ØªÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ù¾Û�Ø¬ Ú‰Ø§ÙˆÙ† Ú©ÙŠÙ„Û� ÙˆÙˆÙ‡Ø¦"
+!endif
+
+!ifdef MUI_COMPONENTSPAGE
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Ø±ØºØªÙˆÚ©ÙŠ Ø®ÙˆÚš Ú©Ú“ïº‰"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE ".Ú©ÙˆÙ…Û� Ú�Ø§Ù†Ú«Ú“ØªÙŠØ§ÙˆÛ� Ú†Û� Ù„Ú«ÙˆÙ„ ØºÙˆØ§Ú“ïº‰ØŒ Ø®ÙˆÚš ÙŠÛ� Ú©Ú“ïº‰ $(^NameDA) Ø¯"
+!endif
+
+!ifdef MUI_UNCOMPONENTSPAGE
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Ø±ØºØªÙˆÚ©ÙŠ Ø®ÙˆÚš Ú©Ú“ïº‰"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE ".Ú©ÙˆÙ…Û� Ú�Ø§Ù†Ú«Ú“ØªÙŠØ§ÙˆÛ� Ú†Û� Ù†Ø§Ù„Ú«ÙˆÙ„ ØºÙˆØ§Ú“ïº‰ØŒ Ø®ÙˆÚš ÙŠÛ� Ú©Ú“ïº‰ $(^NameDA) Ø¯"
+!endif
+
+!ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Ø³Ù¾Ú“Ø§ÙˆÙŠ"
+  !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO ".Ø¯ Ø±ØºØªÙˆÚ©ÙŠ Ø³Ù¾Ú“Ø§ÙˆÙŠ Ú©ØªÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ù…ÙˆÚ–Ú© Ø¯ Ù‡ØºÛ� Ø¯Ù¾Ø§Ø³Ù‡ ÙˆØ¯Ø±Ùˆïº‰"
+  !else
+    #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO 
+  !endif
+!endif
+
+!ifdef MUI_DIRECTORYPAGE
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Ù„Ú«Ø§Ùˆ Ú�Ø§ÛŒ ÙˆÙ¼Ø§Ú©Ø¦"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE ".Ù„Ú«ÙˆÙ„ ØºÙˆØ§Ú“ïº‰ ÙˆÙŠÛ� Ù¼Ø§Ú©Ø¦ $(^NameDA) Ù¾Ù‡ Ú©ÙˆÙ…Ù‡ Ù¾ÙˆÚšÛ� Ú©ÚšÛ� Ú†Û�"
+!endif
+
+!ifdef MUI_UNDIRECTORYPAGE
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Ù†Ø§Ù„Ú«Ø§Ùˆ Ú�Ø§ÛŒ ÙˆÙ¼Ø§Ú©Ø¦"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE ".Ù†Ø§Ù„Ú«ÙˆÙ„ ØºÙˆØ§Ú“ïº‰ ÙˆÙŠÛ� Ù¼Ø§Ú©Ø¦ $(^NameDA) Ø¯ Ú©ÙˆÙ…Û� Ù¾ÙˆÚšÛ� Ù†Ù‡ Ú†Û�"
+!endif
+
+!ifdef MUI_INSTFILESPAGE
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Ù„Ú«ÙŠÚ–ÙŠ"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE ".Ù¾Ù‡ Ø¨Ø´Ù¾Ú“Ù‡ ØªÙˆÚ«Ù‡ ÙˆÙ„Ú«ÙˆÙ„ Ø´ÙŠ $(^NameDA) Ù…Ù‡Ø±Ø¨Ø§Ù†ÙŠ ÙˆÚ©Ú“ïº‰ Ù„Ú–Ù‡ ØªÙ…Ù‡ ÙˆÚ©Ú“ïº‰ ØªØ±Ú…Ùˆ"
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Ù„Ú«ÙˆÙ†Ù‡ Ø¨Ø´Ù¾Ú“Ù‡ Ø´ÙˆÙ‡"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE ".Ø§Ù…Ø³ØªÙ‡ Ù¾Ù‡ Ø¨Ø±ÙŠØ§Ù„ÙŠØªÙˆØ¨ Ø³Ø±ØªÙ‡ ÙˆØ±Ø³Û�Ø¯Ù‡"
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Ù„Ú«ÙˆÙ†Ù‡ Ø¨Ù†Ø¯Ù‡ Ø´ÙˆÙ‡"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE ".Ø§Ù…Ø³ØªÙ‡ Ù¾Ù‡ Ø¨Ø±ÙŠØ§Ù„ÙŠØªÙˆØ¨ Ø³Ø±ØªÙ‡ ÙˆÙ†Ù‡ Ø±Ø³Û�Ø¯Ù‡"
+!endif
+
+!ifdef MUI_UNINSTFILESPAGE
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Ù†Ø§Ù„Ú«ÙŠÚ–ÙŠ"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE ".Ù¾Ù‡ Ø¨Ø´Ù¾Ú“Ù‡ ØªÙˆÚ«Ù‡ ÙˆÙ†Ø§Ù„Ú«ÙˆÙ„ Ø´ÙŠ $(^NameDA) Ù…Ù‡Ø±Ø¨Ø§Ù†ÙŠ ÙˆÚ©Ú“ïº‰ Ù„Ú–Ù‡ ØªÙ…Ù‡ ÙˆÚ©Ú“ïº‰ ØªØ±Ú…Ùˆ"
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Ù†Ø§Ù„Ú«ÙˆÙ†Ù‡ Ø¨Ø´Ù¾Ú“Ù‡ Ø´ÙˆÙ‡"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE ".Ù†Ø§Ù„Ú«Ø§Ùˆ Ù¾Ù‡ Ø¨Ø±ÙŠØ§Ù„ÙŠØªÙˆØ¨ Ø³Ø±ØªÙ‡ ÙˆØ±Ø³Û�Ø¯Ùˆ"
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Ù†Ø§Ù„Ú«ÙˆÙ†Ù‡ Ø¨Ù†Ø¯Ù‡ Ø´ÙˆÙ‡"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE ".Ù†Ø§Ù„Ú«Ø§Ùˆ Ù¾Ù‡ Ø¨Ø±ÙŠØ§Ù„ÙŠØªÙˆØ¨ Ø³Ø±ØªÙ‡ ÙˆÙ†Ù‡ Ø±Ø³Û�Ø¯Ùˆ"
+!endif
+
+!ifdef MUI_FINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Ø§Ù…Ø³ØªÙ‡ Ø§Ø³Ø§Ù†Ú«Ø± Ø¨Ø´Ù¾Ú“ÙŠÚ–ÙŠ $(^NameDA) Ø¯"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT ".Ø³ØªØ§Ø³Û� Ù¾Ù‡ Ú©Ù…Ù¾ÙŠÙˆÙ¼Ø± Ú©ÚšÛ� ÙˆÙ„Ú«ÙˆÙ„ Ø´Ùˆ $(^NameDA)$\r$\n$\r$\nØ¯ Ø¯Û� Ø§Ø³Ø§Ù†Ú«Ø± Ø¯ Ø¨Ù†Ø¯ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ù¾Ø§ÛŒ ØªÙ‡ Ù¼Ú© ÙˆØ±Ú©Ú“ïº‰"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Ù„Ú«Ø§Ùˆ Ø¨Ø´Ù¾Ú“ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ø³ØªØ§Ø³Û� Ú©Ù…Ù¾ÙŠÙˆÙ¼Ø± Ø¨ÙŠØ§Ù¾Û�Ù„Ø§Øª ØªÙ‡ Ø§Ú“ØªÙŠØ§ Ù„Ø±ÙŠ. Ø§ÙŠØ§ Ø§ÙˆØ³ Ø¨ÙŠØ§Ù¾Û�Ù„ÙˆÙ† Ú©ÙˆÙ„ ØºÙˆØ§Ú“ïº‰ØŸ $(^NameDA) Ø¯"
+!endif
+
+!ifdef MUI_UNFINISHPAGE
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Ù†Ø§Ù„Ú«Ø§Ùˆ Ø§Ø³Ø§Ù†Ú«Ø± Ø¨Ø´Ù¾Ú“ÙŠÚ–ÙŠ $(^NameDA) Ø¯"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT ".Ø³ØªØ§Ø³Û� Ù„Ù‡ Ú©Ù…Ù¾ÙŠÙˆÙ¼Ø± Ù†Ù‡ ÙˆÙ†Ø§Ù„Ú«ÙˆÙ„ Ø´Ùˆ $(^NameDA)$\r$\n$\r$\nØ¯ Ø¯Û� Ø§Ø³Ø§Ù†Ú«Ø± Ø¯ Ø¨Ù†Ø¯ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ù¾Ø§ÛŒ ØªÙ‡ Ù¼Ú© ÙˆØ±Ú©Ú“ïº‰"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT " Ù†Ø§Ù„Ú«Ø§Ùˆ Ø¨Ø´Ù¾Ú“ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ø³ØªØ§Ø³Û� Ú©Ù…Ù¾ÙŠÙˆÙ¼Ø± Ø¨ÙŠØ§Ù¾Û�Ù„Ø§Øª ØªÙ‡ Ø§Ú“ØªÙŠØ§ Ù„Ø±ÙŠ. Ø§ÙŠØ§ Ø§ÙˆØ³ Ø¨ÙŠØ§Ù¾Û�Ù„ÙˆÙ† Ú©ÙˆÙ„ ØºÙˆØ§Ú“ïº‰ØŸ $(^NameDA) Ø¯"
+!endif
+
+!ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ø³Ù…Ø¯Ø³ØªÙŠ Ø¨ÙŠØ§Ù¾Û�Ù„ÙˆÙ†"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "ÙˆØ±ÙˆØ³ØªÙ‡ Ø²Ù‡ Ù¾Ø®Ù¾Ù„Ù‡ Ø¨ÙŠØ§Ù¾Û�Ù„ÙˆÙ† Ú©ÙˆÙ„ ØºÙˆØ§Ú“Ù…"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&Ù¾Ø±Ø§Ù†ÙŠØ³ØªÙ„ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Ù…Ø§ÙˆÙ„ÙˆÙ„Ù‡ ÚšÙˆØ¯Ù„"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Ù¾Ø§ÛŒ"
+!endif
+
+!ifdef MUI_STARTMENUPAGE
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Ù¾Û�Ù„ ØºÙˆØ±Ù†Û� Ù¾ÙˆÚšÛ� Ø®ÙˆÚšÙ‡ Ú©Ú“ïº‰"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Ø¯ Ù„Ù†Ú‰Ù„Ø§Ø±Ùˆ Ù„Ù¾Ø§Ø±Ù‡ ÙŠÙˆ Ù¾Û�Ù„ ØºÙˆØ±Ù†Û� Ù¾ÙˆÚšÛ� Ø®ÙˆÚšÙ‡ Ú©Ú“ïº‰ $(^NameDA) Ø¯"
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP ".Ø¯ Ù¾Û�Ù„ ØºÙˆØ±Ù†Û� Ù‡ØºÙ‡ Ù¾ÙˆÚšÛ� Ú†Û� Ø¯ Ø³Ø§ÙˆØªØ±ÙŠ Ù„Ù†Ú‰Ù„Ø§Ø±ÙŠ Ù¾Ú©ÚšÛ� Ø¬ÙˆÚ“ÙˆÙ„ ØºÙˆØ§Ú“ïº‰ Ø®ÙˆÚšÙ‡ Ú©Ú“ïº‰. Ù†ÙˆÛ� Ù¾ÙˆÚšÛ� Ø¬ÙˆÚ“ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ù†ÙˆÙ… Ù‡Ù… Ù„ÙŠÚ©Ù„ÛŒ Ø´Ø¦"
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ù„Ù†Ú‰Ù„Ø§Ø±ÙŠ Ù…Ù‡ Ø¬ÙˆÚ“ÙˆÙ‡"
+!endif
+
+!ifdef MUI_UNCONFIRMPAGE
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Ù†Ø§Ù„Ú«ÙˆÙ„ $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE ".Ø¯ Ø®Ù¾Ù„ Ú©Ù…Ù¾ÙŠÙˆÙ¼Ø± Ù†Ù‡ Ú“Ù†Ú«ÙˆÙ„ $(^NameDA)"
+!endif
+
+!ifdef MUI_ABORTWARNING
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Ø§Ù…Ø³ØªÙ‡ Ø¨Ù†Ø¯ÙˆÙ„ ØºÙˆØ§Ú“ïº‰ØŸ $(^Name) Ø§ÙŠØ§ Ù¾Ù‡ Ú‰Ø§Ú‰Ù…Ù†Ù‡ ØªÙˆÚ«Ù‡ Ø¯"
+!endif
+
+!ifdef MUI_UNABORTWARNING
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ù†Ø§Ù„Ú«Ø§Ùˆ Ø¨Ù†Ø¯ÙˆÙ„ ØºÙˆØ§Ú“ïº‰ØŸ $(^Name) Ø§ÙŠØ§ Ù¾Ù‡ Ú‰Ø§Ú‰Ù…Ù†Ù‡ ØªÙˆÚ«Ù‡ Ø¯"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Macedonian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Macedonian.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Macedonian.nsh	(revision 2956)
@@ -1,121 +1,121 @@
-;Language: Macedonian (1071)
+ï»¿;Language: Macedonian (1071)
 ;By Sasko Zdravkin [wingman2083@yahoo.com]
 
-!insertmacro LANGFILE "Macedonian" "Macedonian"
+!insertmacro LANGFILE "Macedonian" = "ÐœÐ°ÐºÐµÐ´Ð¾Ð½Ñ�ÐºÐ¸" "Makedonski"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Äîáðî äî¼äîâòå âî èíñòàëàöè¼àòà íà $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Îâî¼ ïðîãðàì �å âå âîäè íèç èíñòàëàöè¼àòà íà $(^NameDA).$\r$\n$\r$\nÏðåïîðà÷àíî å äà ãè çàòâîðèòå ñèòå ïðîãðàìè ïðåä äà èíñòàëèðàòå. Îâà �å äîçâîëè èíñòàëàöèîíèîò ïðîãðàì äà îáíîâè íåêîè ñèñòåìñêè äàòîòåêè áåç äà ãî ðåñòàðòèðà êîìï¼óòåðîò.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Ð”Ð¾Ð±Ñ€Ð¾ Ð´Ð¾Ñ˜Ð´Ð¾Ð²Ñ‚Ðµ Ð²Ð¾ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð° Ð½Ð° $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "ÐžÐ²Ð¾Ñ˜ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ ÑœÐµ Ð²Ðµ Ð²Ð¾Ð´Ð¸ Ð½Ð¸Ð· Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð° Ð½Ð° $(^NameDA).$\r$\n$\r$\nÐŸÑ€ÐµÐ¿Ð¾Ñ€Ð°Ñ‡Ð°Ð½Ð¾ Ðµ Ð´Ð° Ð³Ð¸ Ð·Ð°Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ðµ Ñ�Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸ Ð¿Ñ€ÐµÐ´ Ð´Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ. ÐžÐ²Ð° ÑœÐµ Ð´Ð¾Ð·Ð²Ð¾Ð»Ð¸ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ð¾Ð½Ð¸Ð¾Ñ‚ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ Ð´Ð° Ð¾Ð±Ð½Ð¾Ð²Ð¸ Ð½ÐµÐºÐ¾Ð¸ Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ñ�ÐºÐ¸ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸ Ð±ÐµÐ· Ð´Ð° Ð³Ð¾ Ñ€ÐµÑ�Ñ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð° ÐºÐ¾Ð¼Ð¿Ñ˜ÑƒÑ‚ÐµÑ€Ð¾Ñ‚.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Äîáðî äî¼äîâòå âî äåèíñòàëàöè¼àòà íà $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Îâî¼ ïðîãðàì �å âå âîäè íèç äåèíñòàëàöè¼àòà íà $(^NameDA).$\r$\n$\r$\nÏðåä äà ¼à ïî÷íåòå äåèíñòàëàöè¼àòà íà $(^NameDA) ïðîâåðåòå äàëè å èñêëó÷åíà ïðîãðàìàòà.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Ð”Ð¾Ð±Ñ€Ð¾ Ð´Ð¾Ñ˜Ð´Ð¾Ð²Ñ‚Ðµ Ð²Ð¾ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð° Ð½Ð° $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "ÐžÐ²Ð¾Ñ˜ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ ÑœÐµ Ð²Ðµ Ð²Ð¾Ð´Ð¸ Ð½Ð¸Ð· Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð° Ð½Ð° $(^NameDA).$\r$\n$\r$\nÐŸÑ€ÐµÐ´ Ð´Ð° Ñ˜Ð° Ð¿Ð¾Ñ‡Ð½ÐµÑ‚Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð° Ð½Ð° $(^NameDA) Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ Ð´Ð°Ð»Ð¸ Ðµ Ð¸Ñ�ÐºÐ»ÑƒÑ‡ÐµÐ½Ð° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð°Ñ‚Ð°.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ëèöåíöåí Äîãîâîð"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Âå ìîëèìå ïðîâåðåòå ãè ëèöåíöíèòå óñëîâè ïðåä äà ãî èíñòàëèðàòå $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Àêî ãè ïðèôà�àòå óñëîâèòå îä äîãîâîðîò, ïðèòèñíåòå 'Äà' çà äà ïðîäîëæèòå. Ìîðà äà ãî ïðèôàòèòå äîãîâîðîò çà äà ãî èíñòàëèðàòå $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Àêî ãè ïðèôà�àòå óñëîâèòå îä äîãîâîðîò, ÷åêèðà¼òå ãî check box-îò ïîäîëå. Ìîðà äà ãî ïðèôàòèòå äîãîâîðîò çà ãî èíñòàëèðàòå $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Àêî ãè ïðèôà�àòå óñëîâèòå îä äîãîâîðîò, îäáåðåòå ¼à ïðâàòà îïöè¼à ïîäîëå. Ìîðà äà ãî ïðèôàòèòå äîãîâîðîò çà ãî èíñòàëèðàòå $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ð›Ð¸Ñ†ÐµÐ½Ñ†ÐµÐ½ Ð”Ð¾Ð³Ð¾Ð²Ð¾Ñ€"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Ð’Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ Ð³Ð¸ Ð»Ð¸Ñ†ÐµÐ½Ñ†Ð½Ð¸Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸ Ð¿Ñ€ÐµÐ´ Ð´Ð° Ð³Ð¾ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ð�ÐºÐ¾ Ð³Ð¸ Ð¿Ñ€Ð¸Ñ„Ð°ÑœÐ°Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ‚Ðµ Ð¾Ð´ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð¾Ñ‚, Ð¿Ñ€Ð¸Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ 'Ð”Ð°' Ð·Ð° Ð´Ð° Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚Ðµ. ÐœÐ¾Ñ€Ð° Ð´Ð° Ð³Ð¾ Ð¿Ñ€Ð¸Ñ„Ð°Ñ‚Ð¸Ñ‚Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð¾Ñ‚ Ð·Ð° Ð´Ð° Ð³Ð¾ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ð�ÐºÐ¾ Ð³Ð¸ Ð¿Ñ€Ð¸Ñ„Ð°ÑœÐ°Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ‚Ðµ Ð¾Ð´ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð¾Ñ‚, Ñ‡ÐµÐºÐ¸Ñ€Ð°Ñ˜Ñ‚Ðµ Ð³Ð¾ check box-Ð¾Ñ‚ Ð¿Ð¾Ð´Ð¾Ð»Ðµ. ÐœÐ¾Ñ€Ð° Ð´Ð° Ð³Ð¾ Ð¿Ñ€Ð¸Ñ„Ð°Ñ‚Ð¸Ñ‚Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð¾Ñ‚ Ð·Ð° Ð³Ð¾ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ð�ÐºÐ¾ Ð³Ð¸ Ð¿Ñ€Ð¸Ñ„Ð°ÑœÐ°Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ‚Ðµ Ð¾Ð´ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð¾Ñ‚, Ð¾Ð´Ð±ÐµÑ€ÐµÑ‚Ðµ Ñ˜Ð° Ð¿Ñ€Ð²Ð°Ñ‚Ð° Ð¾Ð¿Ñ†Ð¸Ñ˜Ð° Ð¿Ð¾Ð´Ð¾Ð»Ðµ. ÐœÐ¾Ñ€Ð° Ð´Ð° Ð³Ð¾ Ð¿Ñ€Ð¸Ñ„Ð°Ñ‚Ð¸Ñ‚Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð¾Ñ‚ Ð·Ð° Ð³Ð¾ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ëèöåíöåí Äîãîâîð"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Âå ìîëèìå ïðîâåðåòå ãè ëèöåíöíèòå óñëîâè ïðåä äà ãî äåèíñòàëèðàòå $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Àêî ãè ïðèôà�àòå óñëîâèòå îä äîãîâîðîò, ïðèòèñíåòå 'Äà' çà äà ïðîäîëæèòå. Ìîðà äà ãî ïðèôàòèòå äîãîâîðîò çà äà ãî äåèíñòàëèðàòå $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Àêî ãè ïðèôà�àòå óñëîâèòå îä äîãîâîðîò, ÷åêèðà¼òå ãî check box-îò ïîäîëå. Ìîðà äà ãî ïðèôàòèòå äîãîâîðîò çà ãî äåèíñòàëèðàòå $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Àêî ãè ïðèôà�àòå óñëîâèòå îä äîãîâîðîò, îäáåðåòå ¼à ïðâàòà îïöè¼à ïîäîëå. Ìîðà äà ãî ïðèôàòèòå äîãîâîðîò çà ãî äåèíñòàëèðàòå $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ð›Ð¸Ñ†ÐµÐ½Ñ†ÐµÐ½ Ð”Ð¾Ð³Ð¾Ð²Ð¾Ñ€"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Ð’Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ Ð³Ð¸ Ð»Ð¸Ñ†ÐµÐ½Ñ†Ð½Ð¸Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸ Ð¿Ñ€ÐµÐ´ Ð´Ð° Ð³Ð¾ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ð�ÐºÐ¾ Ð³Ð¸ Ð¿Ñ€Ð¸Ñ„Ð°ÑœÐ°Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ‚Ðµ Ð¾Ð´ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð¾Ñ‚, Ð¿Ñ€Ð¸Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ 'Ð”Ð°' Ð·Ð° Ð´Ð° Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚Ðµ. ÐœÐ¾Ñ€Ð° Ð´Ð° Ð³Ð¾ Ð¿Ñ€Ð¸Ñ„Ð°Ñ‚Ð¸Ñ‚Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð¾Ñ‚ Ð·Ð° Ð´Ð° Ð³Ð¾ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ð�ÐºÐ¾ Ð³Ð¸ Ð¿Ñ€Ð¸Ñ„Ð°ÑœÐ°Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ‚Ðµ Ð¾Ð´ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð¾Ñ‚, Ñ‡ÐµÐºÐ¸Ñ€Ð°Ñ˜Ñ‚Ðµ Ð³Ð¾ check box-Ð¾Ñ‚ Ð¿Ð¾Ð´Ð¾Ð»Ðµ. ÐœÐ¾Ñ€Ð° Ð´Ð° Ð³Ð¾ Ð¿Ñ€Ð¸Ñ„Ð°Ñ‚Ð¸Ñ‚Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð¾Ñ‚ Ð·Ð° Ð³Ð¾ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ð�ÐºÐ¾ Ð³Ð¸ Ð¿Ñ€Ð¸Ñ„Ð°ÑœÐ°Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ‚Ðµ Ð¾Ð´ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð¾Ñ‚, Ð¾Ð´Ð±ÐµÑ€ÐµÑ‚Ðµ Ñ˜Ð° Ð¿Ñ€Ð²Ð°Ñ‚Ð° Ð¾Ð¿Ñ†Ð¸Ñ˜Ð° Ð¿Ð¾Ð´Ð¾Ð»Ðµ. ÐœÐ¾Ñ€Ð° Ð´Ð° Ð³Ð¾ Ð¿Ñ€Ð¸Ñ„Ð°Ñ‚Ð¸Ñ‚Ðµ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð¾Ñ‚ Ð·Ð° Ð³Ð¾ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Ïðèòèñíåòå 'Page Down' çà äà ãî âèäåòå îñòàíàòèîò äåë îä äîãîâîðîò."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "ÐŸÑ€Ð¸Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ 'Page Down' Ð·Ð° Ð´Ð° Ð³Ð¾ Ð²Ð¸Ð´ÐµÑ‚Ðµ Ð¾Ñ�Ñ‚Ð°Ð½Ð°Ñ‚Ð¸Ð¾Ñ‚ Ð´ÐµÐ» Ð¾Ð´ Ð´Ð¾Ð³Ð¾Ð²Ð¾Ñ€Ð¾Ñ‚."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Îäáåðåòå Êîìïîíåíòè"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Îäáåðåòå êîè ðàáîòè îä $(^NameDA) ñàêàòå äà ñå èíñòàëèðààò."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "ÐžÐ´Ð±ÐµÑ€ÐµÑ‚Ðµ ÐšÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "ÐžÐ´Ð±ÐµÑ€ÐµÑ‚Ðµ ÐºÐ¾Ð¸ Ñ€Ð°Ð±Ð¾Ñ‚Ð¸ Ð¾Ð´ $(^NameDA) Ñ�Ð°ÐºÐ°Ñ‚Ðµ Ð´Ð° Ñ�Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð°Ñ‚."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Îäáåðåòå Êîìïîíåíòè"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Îäáåðåòå êîè ðàáîòè îä $(^NameDA) ñàêàòå äà ñå äåèíñòàëèðààò."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "ÐžÐ´Ð±ÐµÑ€ÐµÑ‚Ðµ ÐšÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "ÐžÐ´Ð±ÐµÑ€ÐµÑ‚Ðµ ÐºÐ¾Ð¸ Ñ€Ð°Ð±Ð¾Ñ‚Ð¸ Ð¾Ð´ $(^NameDA) Ñ�Ð°ÐºÐ°Ñ‚Ðµ Ð´Ð° Ñ�Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð°Ñ‚."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Îá¼àñíåíèå"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "ÐžÐ±Ñ˜Ð°Ñ�Ð½ÐµÐ½Ð¸Ðµ"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Îäíåñåòå ãî êóðñîðîò äî êîìïîíåíòàòà çà äà ãî âèäåòå íå¼çèíîòî îá¼àñíåíèå."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ÐžÐ´Ð½ÐµÑ�ÐµÑ‚Ðµ Ð³Ð¾ ÐºÑƒÑ€Ñ�Ð¾Ñ€Ð¾Ñ‚ Ð´Ð¾ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð°Ñ‚Ð° Ð·Ð° Ð´Ð° Ð³Ð¾ Ð²Ð¸Ð´ÐµÑ‚Ðµ Ð½ÐµÑ˜Ð·Ð¸Ð½Ð¾Ñ‚Ð¾ Ð¾Ð±Ñ˜Ð°Ñ�Ð½ÐµÐ½Ð¸Ðµ."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Îäíåñåòå ãî êóðñîðîò äî êîìïîíåíòàòà çà äà ãî âèäåòå íå¼çèíîòî îá¼àñíåíèå."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ÐžÐ´Ð±ÐµÑ€ÐµÑ‚Ðµ Ñ˜Ð° ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð°Ñ‚Ð° Ð·Ð° Ð´Ð° Ð³Ð¾ Ð²Ð¸Ð´ÐµÑ‚Ðµ Ð½ÐµÑ˜Ð·Ð¸Ð½Ð¾Ñ‚Ð¾ Ð¾Ð±Ñ˜Ð°Ñ�Ð½ÐµÐ½Ð¸Ðµ."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Îäáåðåòå ¼à ëîêàöè¼àòà çà èíñòàëèðàœå"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Îäáåðåòå ãî äèðåêòîðèóìîò êàäå øòî ñàêàòå äà ñå èíñòàëèðà $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "ÐžÐ´Ð±ÐµÑ€ÐµÑ‚Ðµ Ñ˜Ð° Ð»Ð¾ÐºÐ°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð° Ð·Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°ÑšÐµ"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "ÐžÐ´Ð±ÐµÑ€ÐµÑ‚Ðµ Ð³Ð¾ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑƒÐ¼Ð¾Ñ‚ ÐºÐ°Ð´Ðµ ÑˆÑ‚Ð¾ Ñ�Ð°ÐºÐ°Ñ‚Ðµ Ð´Ð° Ñ�Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð° $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Îäáåðåòå ¼à ëîêàöè¼àòà çà äåèíñòàëèðàœå"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Îäáåðåòå ãî äèðåêòîðèóìîò îä êî¼ ñàêàòå äà ñå äåèíñòàëèðà $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "ÐžÐ´Ð±ÐµÑ€ÐµÑ‚Ðµ Ñ˜Ð° Ð»Ð¾ÐºÐ°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð° Ð·Ð° Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°ÑšÐµ"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "ÐžÐ´Ð±ÐµÑ€ÐµÑ‚Ðµ Ð³Ð¾ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑƒÐ¼Ð¾Ñ‚ Ð¾Ð´ ÐºÐ¾Ñ˜ Ñ�Ð°ÐºÐ°Ñ‚Ðµ Ð´Ð° Ñ�Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð° $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Èíñòàëèðà"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Âå ìîëèìå ïî÷åêà¼òå äîäåêà $(^NameDA) ñå èíñòàëèðà."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Èíñòàëàöè¼àòà å çàâðøåíà"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Èíñòàëèðàœåòî áåøå óñïåøíî."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Èíñòàëàöè¼àòà å îòêàæàíà"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Èíñòàëèðàœåòî íå áåøå óñïåøíî çàâðøåíî."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Ð’Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¿Ð¾Ñ‡ÐµÐºÐ°Ñ˜Ñ‚Ðµ Ð´Ð¾Ð´ÐµÐºÐ° $(^NameDA) Ñ�Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð° Ðµ Ð·Ð°Ð²Ñ€ÑˆÐµÐ½Ð°"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°ÑšÐµÑ‚Ð¾ Ð±ÐµÑˆÐµ ÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð° Ðµ Ð¾Ñ‚ÐºÐ°Ð¶Ð°Ð½Ð°"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°ÑšÐµÑ‚Ð¾ Ð½Ðµ Ð±ÐµÑˆÐµ ÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾ Ð·Ð°Ð²Ñ€ÑˆÐµÐ½Ð¾."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Äåèíñòàëèðà"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Âå ìîëèìå ïî÷åêà¼òå äîäåêà $(^NameDA) ñå äåèíñòàëèðà."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Äåèíñòàëàöè¼àòà å çàâðøåíà"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Äåèíñòàëèðàœåòî áåøå óñïåøíî."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Äåèíñòàëàöè¼àòà å îòêàæàíà"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Äåèíñòàëèðàœåòî íå áåøå óñïåøíî çàâðøåíî."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Ð’Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¿Ð¾Ñ‡ÐµÐºÐ°Ñ˜Ñ‚Ðµ Ð´Ð¾Ð´ÐµÐºÐ° $(^NameDA) Ñ�Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð° Ðµ Ð·Ð°Ð²Ñ€ÑˆÐµÐ½Ð°"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°ÑšÐµÑ‚Ð¾ Ð±ÐµÑˆÐµ ÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð° Ðµ Ð¾Ñ‚ÐºÐ°Ð¶Ð°Ð½Ð°"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°ÑšÐµÑ‚Ð¾ Ð½Ðµ Ð±ÐµÑˆÐµ ÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾ Ð·Ð°Ð²Ñ€ÑˆÐµÐ½Ð¾."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Çàâðøóâà èíñòàëèðàœåòî íà $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) å èíñòàëèðàí íà âàøèîò êîìï¼óòåð.$\r$\n$\r$\nÏðèòèñíåòå 'Êðà¼' çà äà ãî çàòâîðèòå èíñòàëàöèîíèîò ïðîãðàì."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Âàøèîò êîìï¼óòåð ìîðà äà ñå ðåñòàðòèðà çà äà çàâðøè èíñòàëàöè¼àòà íà $(^NameDA). Äàëè ñàêàòå äà ñå ðåñòàðòèðà ñåãà?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Ð—Ð°Ð²Ñ€ÑˆÑƒÐ²Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°ÑšÐµÑ‚Ð¾ Ð½Ð° $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ Ð½Ð° Ð²Ð°ÑˆÐ¸Ð¾Ñ‚ ÐºÐ¾Ð¼Ð¿Ñ˜ÑƒÑ‚ÐµÑ€.$\r$\n$\r$\nÐŸÑ€Ð¸Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ 'ÐšÑ€Ð°Ñ˜' Ð·Ð° Ð´Ð° Ð³Ð¾ Ð·Ð°Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ð¾Ð½Ð¸Ð¾Ñ‚ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Ð’Ð°ÑˆÐ¸Ð¾Ñ‚ ÐºÐ¾Ð¼Ð¿Ñ˜ÑƒÑ‚ÐµÑ€ Ð¼Ð¾Ñ€Ð° Ð´Ð° Ñ�Ðµ Ñ€ÐµÑ�Ñ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð° Ð·Ð° Ð´Ð° Ð·Ð°Ð²Ñ€ÑˆÐ¸ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð° Ð½Ð° $(^NameDA). Ð”Ð°Ð»Ð¸ Ñ�Ð°ÐºÐ°Ñ‚Ðµ Ð´Ð° Ñ�Ðµ Ñ€ÐµÑ�Ñ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð° Ñ�ÐµÐ³Ð°?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Çàâðøóâà äåèíñòàëèðàœåòî íà $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) å äåèíñòàëèðàí îä âàøèîò êîìï¼óòåð.$\r$\n$\r$\nÏðèòèñíåòå 'Êðà¼' çà äà ãî çàòâîðèòå äåèíñòàëàöèîíèîò ïðîãðàì."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Âàøèîò êîìï¼óòåð ìîðà äà ñå ðåñòàðòèðà çà äà çàâðøè äåèíñòàëàöè¼àòà íà $(^NameDA). Äàëè ñàêàòå äà ñå ðåñòàðòèðà ñåãà?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Ð—Ð°Ð²Ñ€ÑˆÑƒÐ²Ð° Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°ÑšÐµÑ‚Ð¾ Ð½Ð° $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ Ð¾Ð´ Ð²Ð°ÑˆÐ¸Ð¾Ñ‚ ÐºÐ¾Ð¼Ð¿Ñ˜ÑƒÑ‚ÐµÑ€.$\r$\n$\r$\nÐŸÑ€Ð¸Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ 'ÐšÑ€Ð°Ñ˜' Ð·Ð° Ð´Ð° Ð³Ð¾ Ð·Ð°Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ð¾Ð½Ð¸Ð¾Ñ‚ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Ð’Ð°ÑˆÐ¸Ð¾Ñ‚ ÐºÐ¾Ð¼Ð¿Ñ˜ÑƒÑ‚ÐµÑ€ Ð¼Ð¾Ñ€Ð° Ð´Ð° Ñ�Ðµ Ñ€ÐµÑ�Ñ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð° Ð·Ð° Ð´Ð° Ð·Ð°Ð²Ñ€ÑˆÐ¸ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð° Ð½Ð° $(^NameDA). Ð”Ð°Ð»Ð¸ Ñ�Ð°ÐºÐ°Ñ‚Ðµ Ð´Ð° Ñ�Ðµ Ñ€ÐµÑ�Ñ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð° Ñ�ÐµÐ³Ð°?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ðåñòàðòèðà¼ ñåãà"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Àêî ñàêàòå äà ãî ðåñòàðòèðàòå ïîäîöíà"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "Ïîê&ðåíè ãî $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Îòâîð&è 'Ïðî÷èòà¼ Ìå'"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Êðà¼"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ð ÐµÑ�Ñ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð°Ñ˜ Ñ�ÐµÐ³Ð°"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ð�ÐºÐ¾ Ñ�Ð°ÐºÐ°Ñ‚Ðµ Ð´Ð° Ð³Ð¾ Ñ€ÐµÑ�Ñ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð°Ñ‚Ðµ Ð¿Ð¾Ð´Ð¾Ñ†Ð½Ð°"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "ÐŸÐ¾Ðº&Ñ€ÐµÐ½Ð¸ Ð³Ð¾ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "ÐžÑ‚Ð²Ð¾Ñ€&Ð¸ 'ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ˜ ÐœÐµ'"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&ÐšÑ€Ð°Ñ˜"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Îäáåðåòå äèðåêòîðèóì çà Ñòàðò Ìåíèòî"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Îäáåðåòå äèðåêòîðèóì âî Ñòàðò Ìåíèòî çà êðåèðàœå ñêðàòåíèöà íà $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Îäáåðåòå ãî äèðåêòîðèóìîò âî Ñòàðò Ìåíèòî âî êî¼ ñàêàòå äà ñå êðåèðà ñêðàòåíèöà çà ïðîãðàìàòà. Èñòî òàêà ìîæåòå äà âíåñåòå äðóãî èìå çà äà ñå êðåèðà íîâ äèðåêòîðèóì."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Íå êðåèðà¼ ñêðàòåíèöà"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "ÐžÐ´Ð±ÐµÑ€ÐµÑ‚Ðµ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑƒÐ¼ Ð·Ð° Ð¡Ñ‚Ð°Ñ€Ñ‚ ÐœÐµÐ½Ð¸Ñ‚Ð¾"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "ÐžÐ´Ð±ÐµÑ€ÐµÑ‚Ðµ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑƒÐ¼ Ð²Ð¾ Ð¡Ñ‚Ð°Ñ€Ñ‚ ÐœÐµÐ½Ð¸Ñ‚Ð¾ Ð·Ð° ÐºÑ€ÐµÐ¸Ñ€Ð°ÑšÐµ Ñ�ÐºÑ€Ð°Ñ‚ÐµÐ½Ð¸Ñ†Ð° Ð½Ð° $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "ÐžÐ´Ð±ÐµÑ€ÐµÑ‚Ðµ Ð³Ð¾ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑƒÐ¼Ð¾Ñ‚ Ð²Ð¾ Ð¡Ñ‚Ð°Ñ€Ñ‚ ÐœÐµÐ½Ð¸Ñ‚Ð¾ Ð²Ð¾ ÐºÐ¾Ñ˜ Ñ�Ð°ÐºÐ°Ñ‚Ðµ Ð´Ð° Ñ�Ðµ ÐºÑ€ÐµÐ¸Ñ€Ð° Ñ�ÐºÑ€Ð°Ñ‚ÐµÐ½Ð¸Ñ†Ð° Ð·Ð° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð°Ñ‚Ð°. Ð˜Ñ�Ñ‚Ð¾ Ñ‚Ð°ÐºÐ° Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð´Ð° Ð²Ð½ÐµÑ�ÐµÑ‚Ðµ Ð´Ñ€ÑƒÐ³Ð¾ Ð¸Ð¼Ðµ Ð·Ð° Ð´Ð° Ñ�Ðµ ÐºÑ€ÐµÐ¸Ñ€Ð° Ð½Ð¾Ð² Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑƒÐ¼."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ð�Ðµ ÐºÑ€ÐµÐ¸Ñ€Ð°Ñ˜ Ñ�ÐºÑ€Ð°Ñ‚ÐµÐ½Ð¸Ñ†Ð°"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Äåèíñòàëèðà¼ ãî $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Îäñòðàíåòå ãî $(^NameDA) îä âàøèîò êîìï¼óòåð."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ˜ Ð³Ð¾ $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "ÐžÐ´Ñ�Ñ‚Ñ€Ð°Ð½ÐµÑ‚Ðµ Ð³Ð¾ $(^NameDA) Ð¾Ð´ Ð²Ð°ÑˆÐ¸Ð¾Ñ‚ ÐºÐ¾Ð¼Ð¿Ñ˜ÑƒÑ‚ÐµÑ€."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Ñèãóðíè ëè ñòå äåêà ñàêàòå äà ñå îòêàæåòå îä èíñòàëàöè¼àòà íà $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Ð¡Ð¸Ð³ÑƒÑ€Ð½Ð¸ Ð»Ð¸ Ñ�Ñ‚Ðµ Ð´ÐµÐºÐ° Ñ�Ð°ÐºÐ°Ñ‚Ðµ Ð´Ð° Ñ�Ðµ Ð¾Ñ‚ÐºÐ°Ð¶ÐµÑ‚Ðµ Ð¾Ð´ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð° Ð½Ð° $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ñèãóðíè ëè ñòå äåêà ñàêàòå äà ñå îòêàæåòå îä äåèíñòàëàöè¼àòà íà $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ð¡Ð¸Ð³ÑƒÑ€Ð½Ð¸ Ð»Ð¸ Ñ�Ñ‚Ðµ Ð´ÐµÐºÐ° Ñ�Ð°ÐºÐ°Ñ‚Ðµ Ð´Ð° Ñ�Ðµ Ð¾Ñ‚ÐºÐ°Ð¶ÐµÑ‚Ðµ Ð¾Ð´ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð° Ð½Ð° $(^Name)?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Croatian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Croatian.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Croatian.nsh	(revision 2956)
@@ -1,121 +1,121 @@
-;Language: Croatian (1050)
+ï»¿;Language: Croatian (1050)
 ;By Igor Ostriz
 
-!insertmacro LANGFILE "Croatian" "Hrvatski"
+!insertmacro LANGFILE "Croatian" = "Hrvatski" =
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Dobrodošli u instalaciju programa $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Instalacija programa $(^NameDA) na Vaše raèunalo sastoji se od nekoliko jednostavnih koraka kroz koje æe Vas provesti ovaj èarobnjak.$\r$\n$\r$\nPreporuèamo zatvaranje svih ostalih aplikacija prije samog poèetka instalacije. To æe omoguæiti nadogradnju nekih sistemskih datoteka bez potrebe za ponovnim pokretanjem Vašeg raèunala. U svakom trenutku instalaciju možete prekinuti pritiskom na 'Odustani'.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "DobrodoÅ¡li u instalaciju programa $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Instalacija programa $(^NameDA) na VaÅ¡e raÄ�unalo sastoji se od nekoliko jednostavnih koraka kroz koje Ä‡e Vas provesti ovaj Ä�arobnjak.$\r$\n$\r$\nPreporuÄ�amo zatvaranje svih ostalih aplikacija prije samog poÄ�etka instalacije. To Ä‡e omoguÄ‡iti nadogradnju nekih sistemskih datoteka bez potrebe za ponovnim pokretanjem VaÅ¡eg raÄ�unala. U svakom trenutku instalaciju moÅ¾ete prekinuti pritiskom na 'Odustani'.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Dobrodošli u postupak uklanjanja programa $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ovaj æe Vas èarobnjak provesti kroz postupak uklanjanja programa $(^NameDA).$\r$\n$\r$\nPrije samog poèetka, molim zatvorite program $(^NameDA) ukoliko je sluèajno otvoren.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "DobrodoÅ¡li u postupak uklanjanja programa $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ovaj Ä‡e Vas Ä�arobnjak provesti kroz postupak uklanjanja programa $(^NameDA).$\r$\n$\r$\nPrije samog poÄ�etka, molim zatvorite program $(^NameDA) ukoliko je sluÄ�ajno otvoren.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Licenèni ugovor"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Molim proèitajte licencu prije instalacije programa $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ukoliko prihvaæate uvjete licence, odaberite 'Prihvaæam' za nastavak. Morate prihvatiti licencu za instalaciju programa $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ukoliko prihvaæate uvjete licence, oznaèite donji kvadratiæ. Morate prihvatiti licencu za instalaciju programa $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ukoliko prihvaæate uvjete licence, odaberite prvu donju opciju. Morate prihvatiti licencu za instalaciju programa $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ugovor o licenci"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "ProÄ�itajte licencu prije instalacije programa $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ako prihvaÄ‡ate uvjete licence, pritisnite 'PrihvaÄ‡am' za nastavak. Da biste instalirali program $(^NameDA), morate prihvatiti licencu."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ukoliko prihvaÄ‡ate uvjete licence, oznaÄ�ite donji kvadratiÄ‡. Morate prihvatiti licencu za instalaciju programa $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ukoliko prihvaÄ‡ate uvjete licence, odaberite prvu donju opciju. Morate prihvatiti licencu za instalaciju programa $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Licenèni ugovor"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Molim proèitajte licencu prije uklanjanja programa $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ukoliko prihvaæate uvjete licence, odaberite 'Prihvaæam' za nastavak. Morate prihvatiti licencu za uklanjanje programa $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ukoliko prihvaæate uvjete licence, oznaèite donji kvadratiæ. Morate prihvatiti licencu za uklanjanje programa $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ukoliko prihvaæate uvjete licence, odaberite prvu donju opciju. Morate prihvatiti licencu za uklanjanje programa $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ugovor o licenci"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "ProÄ�itajte licencu prije uklanjanja programa $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ako prihvaÄ‡ate uvjete licence, pritisnite 'PrihvaÄ‡am' za nastavak. Da biste instalirali program $(^NameDA), morate prihvatiti licencu."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ukoliko prihvaÄ‡ate uvjete licence, oznaÄ�ite donji kvadratiÄ‡. Morate prihvatiti licencu za uklanjanje programa $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ukoliko prihvaÄ‡ate uvjete licence, odaberite prvu donju opciju. Morate prihvatiti licencu za uklanjanje programa $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "'Page Down' za ostatak licence."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "SluÅ¾ite se tipkom 'Page Down' da biste vidjeli ostatak licence."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
   ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Izbor komponenti"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Odaberite komponente programa $(^NameDA) koje želite instalirati."
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Odaberite komponente programa $(^NameDA) koje Å¾elite instalirati."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Izbor komponenti"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Odaberite koje komponente programa $(^NameDA) želite ukloniti."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Odaberite koje komponente programa $(^NameDA) Å¾elite ukloniti."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Opis"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Postavite pokazivaè iznad komponente za njezin opis."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Postavite pokazivaÄ� iznad komponente za njezin opis."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Postavite pokazivaè iznad komponente za njezin opis."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "OznaÄ�ite komponentu za njezin opis."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Odaberite odredište za instalaciju"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Odaberite mapu u koju želite instalirati program $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Odaberite odrediÅ¡te za instalaciju"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Odaberite mapu u koju Å¾elite instalirati program $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Odaberite polazište za uklanjanje"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Odaberite mapu iz koje želite ukloniti program $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Odaberite polaziÅ¡te za uklanjanje"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Odaberite mapu iz koje Å¾elite ukloniti program $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Instaliranje"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Molim prièekajte na završetak instalacije programa $(^NameDA)."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Instalacija u tijeku..."
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "PriÄ�ekajte zavrÅ¡etak instalacije programa $(^NameDA)."
   ${LangFileString} MUI_TEXT_FINISH_TITLE "Kraj instalacije"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Instalacija je u potpunosti završila uspješno."
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Instalacija je u potpunosti zavrÅ¡ila uspjeÅ¡no."
   ${LangFileString} MUI_TEXT_ABORT_TITLE "Instalacija je prekinuta"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Instalacija nije završila uspješno."
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Instalacija nije zavrÅ¡ila uspjeÅ¡no."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Uklanjanje"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Molim prièekajte na završetak uklanjanja programa $(^NameDA)."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Uklanjanje završeno"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Uklanjanje je u potpunosti završilo uspješno."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Uklanjanje u tijeku..."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "PriÄ�ekajte zavrÅ¡etak uklanjanja programa $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Uklanjanje zavrÅ¡eno"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Uklanjanje je u potpunosti zavrÅ¡ilo uspjeÅ¡no."
   ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Uklanjanje je prekinuto"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Uklanjanje nije završilo uspješno."
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Uklanjanje nije zavrÅ¡ilo uspjeÅ¡no."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Dovršenje instalacije programa $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Program $(^NameDA) je instaliran na Vaše raèunalo.$\r$\n$\r$\nOdaberite 'Kraj' za završetak."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Vaše raèunalo treba ponovno pokrenuti za dovršenje instalacije programa $(^NameDA). Želite li to uèiniti sada?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "DovrÅ¡etak instalacije programa $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Program $(^NameDA) upravo je instaliran.$\r$\n$\r$\nOdaberite 'Kraj' za zavrÅ¡etak."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Da bi se dovrÅ¡ila instalacija programa $(^NameDA), trebate ponovno pokrenuti raÄ�unalo. Å½elite li to uÄ�initi sada?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Završetak uklanjanja programa $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Program $(^NameDA) je uklonjen s Vašeg raèunala.$\r$\n$\r$\nOdaberite 'Kraj' za zatvaranje ovog èarobnjaka."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Vaše raèunalo treba ponovno pokrenuti za dovršenje postupka uklanjanja programa $(^NameDA). Želite li to uèiniti sada?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "ZavrÅ¡etak uklanjanja programa $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Program $(^NameDA) uklonjen je s VaÅ¡eg raÄ�unala.$\r$\n$\r$\nOdaberite 'Kraj' za zatvaranje ovog Ä�arobnjaka."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Da bi se dovrÅ¡io postupka uklanjanja programa $(^NameDA), trebate ponovno pokrenuti raÄ�unalo. Å½elite li to uÄ�initi sada?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ponovno pokreni raèunalo sada"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ponovno æu pokrenuti raèunalo kasnije"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ponovno pokreni raÄ�unalo sada"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ponovno Ä‡u pokrenuti raÄ�unalo kasnije"
   ${LangFileString} MUI_TEXT_FINISH_RUN "&Pokreni program $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Prikaži &Readme"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Otvori datoteku '&Readme'"
   ${LangFileString} MUI_BUTTONTEXT_FINISH "&Kraj"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Izbor mape u Start meniju"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Odaberite ime za programsku mapu unutar Start menija."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Program æe pripadati odabranoj programskoj mapi u Start meniju. Možete odrediti novo ime za mapu ili odabrati veæ postojeæu."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Nemoj napraviti preèace"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Izbor mape u izborniku 'Start'"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Odaberite ime za programsku mapu unutar izbornika 'Start'."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Program Ä‡e pripadati odabranoj programskoj mapi u izborniku 'Start'. MoÅ¾ete odrediti novo ime za mapu ili odabrati veÄ‡ postojeÄ‡u."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Nemoj napraviti preÄ�ace"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
   ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Uklanjanje programa $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Program $(^NameDA) æe biti uklonjen s Vašeg raèunala."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Program $(^NameDA) bit Ä‡e uklonjen s VaÅ¡eg raÄ�unala."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Jeste li sigurni da želite prekinuti instalaciju programa $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Jeste li sigurni da Å¾elite prekinuti instalaciju programa $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Jeste li sigurni da želite prekinuti uklanjanje programa $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Jeste li sigurni da Å¾elite prekinuti uklanjanje programa $(^Name)?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Esperanto.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Esperanto.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Esperanto.nsh	(revision 2956)
@@ -1,7 +1,7 @@
-;Language: Esperanto (0)
+ï»¿;Language: Esperanto (0)
 ;By Felipe Castro <fefcas@gmail.com>
 
-!insertmacro LANGFILE "Esperanto" "Esperanto"
+!insertmacro LANGFILE "Esperanto" = "Esperanto" =
 
 !ifdef MUI_WELCOMEPAGE
   ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bonvenon al la Gvidilo por Instalado de $(^NameDA)"
@@ -48,7 +48,7 @@
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
     ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Poziciu la muson sur konsistero por rigardi ties priskribon."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Poziciu la muson sur konsistero por rigardi ties priskribon."
+    #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO 
   !endif
 !endif
 
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Icelandic.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Icelandic.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Icelandic.nlf	(revision 2956)
@@ -1,12 +1,12 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Start editing here
 # Language ID
-15
+1039
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
@@ -16,176 +16,176 @@
 # ^SetupCaption
 $(^Name) Uppsetning
 # ^UninstallCaption
-$(^Name) Fjarlæging
+$(^Name) FjarlÃ¦ging
 # ^LicenseSubCaption
 : Notandaleyfissamningur
 # ^ComponentsSubCaption
-: Uppsetningarvalmöguleikar
+: UppsetningarvalmÃ¶guleikar
 # ^DirSubCaption
-: Uppsetningarskráarsafn
+: UppsetningarskrÃ¡arsafn
 # ^InstallingSubCaption
 : Set upp
 # ^CompletedSubCaption
-: Lokið
+: LokiÃ°
 # ^UnComponentsSubCaption
-: Fjarlægingarvalmöguleikar
+: FjarlÃ¦gingarvalmÃ¶guleikar
 # ^UnDirSubCaption
-: Fjarlægingarskráarsafn
+: FjarlÃ¦gingarskrÃ¡arsafn
 # ^ConfirmSubCaption
-: Staðfesting
+: StaÃ°festing
 # ^UninstallingSubCaption
-: Fjarlægi
+: FjarlÃ¦gi
 # ^UnCompletedSubCaption
-: Lokið
+: LokiÃ°
 # ^BackBtn
 < &Til baka
 # ^NextBtn
-&Áfram >
+&Ã�fram >
 # ^AgreeBtn
-Ég &Samþykki
+Ã‰g &SamÃ¾ykki
 # ^AcceptBtn
-Ég &samþykki skilmála leyfissamningsins
+Ã‰g &samÃ¾ykki skilmÃ¡la leyfissamningsins
 # ^DontAcceptBtn
-Ég samþykki &ekki skilmála leyfissamningsins
+Ã‰g samÃ¾ykki &ekki skilmÃ¡la leyfissamningsins
 # ^InstallBtn
 &Setja upp
 # ^UninstallBtn
-&Fjarlægja
+&FjarlÃ¦gja
 # ^CancelBtn
-Hætta við
+HÃ¦tta viÃ°
 # ^CloseBtn
 &Loka
 # ^BrowseBtn
 &Vafra...
 # ^ShowDetailsBtn
-Sýna &upplýsingar
+SÃ½na &upplÃ½singar
 # ^ClickNext
-Smelltu á 'Áfram' til að halda áfram.
+Smelltu Ã¡ 'Ã�fram' til aÃ° halda Ã¡fram.
 # ^ClickInstall
-Smelltu á 'Setja upp' til þess að hefja uppsetninguna.
+Smelltu Ã¡ 'Setja upp' til Ã¾ess aÃ° hefja uppsetninguna.
 # ^ClickUninstall
-Smelltu á 'Fjarlægja' til að hefja fjarlægingar ferlið.
+Smelltu Ã¡ 'FjarlÃ¦gja' til aÃ° hefja fjarlÃ¦gingar ferliÃ°.
 # ^Name
 Nafn
 # ^Completed
-Lokið
+LokiÃ°
 # ^LicenseText
-Vinsamlegast skoðaðu notandaleyfissamninginn vel áður en uppsetning á $(^NameDA) hefst. Ef þú samþykkir skilmála samningsins, smelltu þá á 'Ég samþykki'.
+Vinsamlegast skoÃ°aÃ°u notandaleyfissamninginn vel Ã¡Ã°ur en uppsetning Ã¡ $(^NameDA) hefst. Ef Ã¾Ãº samÃ¾ykkir skilmÃ¡la samningsins, smelltu Ã¾Ã¡ Ã¡ 'Ã‰g samÃ¾ykki'.
 # ^LicenseTextCB
-Vinsamlegast skoðaðu notandaleyfissamninginn vel áður en uppsetning á $(^NameDA) hefst. Ef þú samþykkir skilmála samningsins, hakaðu þá í kassann hér að neðan. $_CLICK
+Vinsamlegast skoÃ°aÃ°u notandaleyfissamninginn vel Ã¡Ã°ur en uppsetning Ã¡ $(^NameDA) hefst. Ef Ã¾Ãº samÃ¾ykkir skilmÃ¡la samningsins, hakaÃ°u Ã¾Ã¡ Ã­ kassann hÃ©r aÃ° neÃ°an. $_CLICK
 # ^LicenseTextRB
-Vinsamlegast skoðaðu notandaleyfissamninginn vel áður en uppsetning á $(^NameDA) hefst. Ef þú samþykkir skilmála samningsins, veldu þá fyrsta valmöguleikann hér að neðan. $_CLICK
+Vinsamlegast skoÃ°aÃ°u notandaleyfissamninginn vel Ã¡Ã°ur en uppsetning Ã¡ $(^NameDA) hefst. Ef Ã¾Ãº samÃ¾ykkir skilmÃ¡la samningsins, veldu Ã¾Ã¡ fyrsta valmÃ¶guleikann hÃ©r aÃ° neÃ°an. $_CLICK
 # ^UnLicenseText
-Vinsamlegast skoðaðu notandaleyfissamninginn vel áður en uppsetning á $(^NameDA) hefst. Ef þú samþykkir skilmála samningsins, smelltu þá á 'Ég samþykki'.
+Vinsamlegast skoÃ°aÃ°u notandaleyfissamninginn vel Ã¡Ã°ur en uppsetning Ã¡ $(^NameDA) hefst. Ef Ã¾Ãº samÃ¾ykkir skilmÃ¡la samningsins, smelltu Ã¾Ã¡ Ã¡ 'Ã‰g samÃ¾ykki'.
 # ^UnLicenseTextCB
-Vinsamlegast skoðaðu notandaleyfissamninginn vel áður en uppsetning á $(^NameDA) hefst. Ef þú samþykkir skilmála samningsins, hakaðu þá í kassann hér að neðan. $_CLICK
+Vinsamlegast skoÃ°aÃ°u notandaleyfissamninginn vel Ã¡Ã°ur en uppsetning Ã¡ $(^NameDA) hefst. Ef Ã¾Ãº samÃ¾ykkir skilmÃ¡la samningsins, hakaÃ°u Ã¾Ã¡ Ã­ kassann hÃ©r aÃ° neÃ°an. $_CLICK
 # ^UnLicenseTextRB
-Vinsamlegast skoðaðu notandaleyfissamninginn vel áður en uppsetning á $(^NameDA) hefst. Ef þú samþykkir skilmála samningsins, veldu þá fyrsta valmöguleikann hér að neðan. $_CLICK
+Vinsamlegast skoÃ°aÃ°u notandaleyfissamninginn vel Ã¡Ã°ur en uppsetning Ã¡ $(^NameDA) hefst. Ef Ã¾Ãº samÃ¾ykkir skilmÃ¡la samningsins, veldu Ã¾Ã¡ fyrsta valmÃ¶guleikann hÃ©r aÃ° neÃ°an. $_CLICK
 # ^Custom
-Sjálfval
+SjÃ¡lfval
 # ^ComponentsText
-Hakaðu við þá íhluti sem þú vilt setja upp og taktu hakið af þeim íhlutum sem þú vilt ekki setja upp. $_CLICK
+HakaÃ°u viÃ° Ã¾Ã¡ Ã­hluti sem Ã¾Ãº vilt setja upp og taktu hakiÃ° af Ã¾eim Ã­hlutum sem Ã¾Ãº vilt ekki setja upp. $_CLICK
 # ^ComponentsSubText1
 Veldu tegund uppsetningar:
 # ^ComponentsSubText2_NoInstTypes
-Veldu þá íhluti sem á að setja upp:
+Veldu Ã¾Ã¡ Ã­hluti sem Ã¡ aÃ° setja upp:
 # ^ComponentsSubText2
-Eða, veldu valfrjálsa íhluti á að setja upp:
+EÃ°a, veldu valfrjÃ¡lsa Ã­hluti Ã¡ aÃ° setja upp:
 # ^UnComponentsText
-Hakaðu við þá íhluti sem þú vilt fjarlægja og taktu hakið af þeim íhlutum sem þú vilt ekki fjarlægja. $_CLICK
+HakaÃ°u viÃ° Ã¾Ã¡ Ã­hluti sem Ã¾Ãº vilt fjarlÃ¦gja og taktu hakiÃ° af Ã¾eim Ã­hlutum sem Ã¾Ãº vilt ekki fjarlÃ¦gja. $_CLICK
 # ^UnComponentsSubText1
-Veldu tegund fjarlægingar:
+Veldu tegund fjarlÃ¦gingar:
 # ^UnComponentsSubText2_NoInstTypes
-Veldu íhluti sem á að fjarlægja:
+Veldu Ã­hluti sem Ã¡ aÃ° fjarlÃ¦gja:
 # ^UnComponentsSubText2
-Eða, veldu valfrjálsa íhluti sem á að fjarlægja:
+EÃ°a, veldu valfrjÃ¡lsa Ã­hluti sem Ã¡ aÃ° fjarlÃ¦gja:
 # ^DirText
-Uppsetningin mun setja $(^NameDA) upp í eftirfarandi skráarsafn. Til að setja forritið upp í annað skráarsafn, smelltu á 'Vafra...' og veldu annað skráarsafn. $_CLICK
+Uppsetningin mun setja $(^NameDA) upp Ã­ eftirfarandi skrÃ¡arsafn. Til aÃ° setja forritiÃ° upp Ã­ annaÃ° skrÃ¡arsafn, smelltu Ã¡ 'Vafra...' og veldu annaÃ° skrÃ¡arsafn. $_CLICK
 # ^DirSubText
-Uppsetningarskráarsafn
+UppsetningarskrÃ¡arsafn
 # ^DirBrowseText
-Veldu það skráarsafn sem þú vilt setja $(^NameDA) upp í:
+Veldu Ã¾aÃ° skrÃ¡arsafn sem Ã¾Ãº vilt setja $(^NameDA) upp Ã­:
 # ^UnDirText
-Uppsetningin mun fjarlægja $(^NameDA) úr eftirfarandi skráarsafni. Til að fjarlægja forritið úr öðru skráarsafni, smelltu á 'Vafra...' og veldu annað skráarsafn. $_CLICK
+Uppsetningin mun fjarlÃ¦gja $(^NameDA) Ãºr eftirfarandi skrÃ¡arsafni. Til aÃ° fjarlÃ¦gja forritiÃ° Ãºr Ã¶Ã°ru skrÃ¡arsafni, smelltu Ã¡ 'Vafra...' og veldu annaÃ° skrÃ¡arsafn. $_CLICK
 # ^UnDirSubText
-"Fjarlægingarskráarsafn"
+"FjarlÃ¦gingarskrÃ¡arsafn"
 # ^UnDirBrowseText
-Veldu það skráarsafn sem þú vilt fjarlægja $(^NameDA) úr:
+Veldu Ã¾aÃ° skrÃ¡arsafn sem Ã¾Ãº vilt fjarlÃ¦gja $(^NameDA) Ãºr:
 # ^SpaceAvailable
-"Tiltækt rými: "
+"TiltÃ¦kt rÃ½mi: "
 # ^SpaceRequired
-"Nauðsynlegt rými: "
+"NauÃ°synlegt rÃ½mi: "
 # ^UninstallingText
-$(^NameDA) verður fjarlægt úr eftirfarandi skráarsafni. $_CLICK
+$(^NameDA) verÃ°ur fjarlÃ¦gt Ãºr eftirfarandi skrÃ¡arsafni. $_CLICK
 # ^UninstallingSubText
-Fjarlægi úr:
+FjarlÃ¦gi Ãºr:
 # ^FileError
-Villa við að skrifa í skrá: \r\n\r\n$0\r\n\r\nSmelltu á 'Hætta við' til að stoppa uppsetninguna,\r\n'Reyna aftur' til að gera aðra tilraun, eða\r\n'Hunsa' til sleppa þessari skrá.
+Villa viÃ° aÃ° skrifa Ã­ skrÃ¡: \r\n\r\n$0\r\n\r\nSmelltu Ã¡ 'HÃ¦tta viÃ°' til aÃ° stoppa uppsetninguna,\r\n'Reyna aftur' til aÃ° gera aÃ°ra tilraun, eÃ°a\r\n'Hunsa' til sleppa Ã¾essari skrÃ¡.
 # ^FileError_NoIgnore
-Villa við að skrifa í skrá: \r\n\r\n$0\r\n\r\nSmelltu á 'Reyna aftur' til að gera aðra tilraun, eða\r\n'Hætta við' til að stoppa uppsetninguna.
+Villa viÃ° aÃ° skrifa Ã­ skrÃ¡: \r\n\r\n$0\r\n\r\nSmelltu Ã¡ 'Reyna aftur' til aÃ° gera aÃ°ra tilraun, eÃ°a\r\n'HÃ¦tta viÃ°' til aÃ° stoppa uppsetninguna.
 # ^CantWrite
-"Get ei skrifað: "
+"Get ei skrifaÃ°: "
 # ^CopyFailed
-Afritun mistókst
+Afritun mistÃ³kst
 # ^CopyTo
 "Afrita til "
 # ^Registering
-"Skrásetja: "
+"SkrÃ¡setja: "
 # ^Unregistering
-"Afskrá: "
+"AfskrÃ¡: "
 # ^SymbolNotFound
-"Fann ekki tákn: "
+"Fann ekki tÃ¡kn: "
 # ^CouldNotLoad
-"Gat ekki hlaðið inn: "
+"Gat ekki hlaÃ°iÃ° inn: "
 # ^CreateFolder
-"Búa til skráarsafn: "
+"BÃºa til skrÃ¡arsafn: "
 # ^CreateShortcut
-"Búa til flýtileið: "
+"BÃºa til flÃ½tileiÃ°: "
 # ^CreatedUninstaller
-"Bjó til fjarlægingarhjálp: "
+"BjÃ³ til fjarlÃ¦gingarhjÃ¡lp: "
 # ^Delete
-"Eyða skrá: "
+"EyÃ°a skrÃ¡: "
 # ^DeleteOnReboot
-"Eyða við endurræsingu: "
+"EyÃ°a viÃ° endurrÃ¦singu: "
 # ^ErrorCreatingShortcut
-"Villa við gerð flýtileiðar: "
+"Villa viÃ° gerÃ° flÃ½tileiÃ°ar: "
 # ^ErrorCreating
-"Villa við gerð: "
+"Villa viÃ° gerÃ°: "
 # ^ErrorDecompressing
-Villa við afþjöppun gagna! Biluð uppsetningarhjálp?
+Villa viÃ° afÃ¾jÃ¶ppun gagna! BiluÃ° uppsetningarhjÃ¡lp?
 # ^ErrorRegistering
-Villa við skrásetningu DLL
+Villa viÃ° skrÃ¡setningu DLL
 # ^ExecShell
 "Keyrslugluggi: "
 # ^Exec
 "Keyra: "
 # ^Extract
-"Færa út: "
+"FÃ¦ra Ãºt: "
 # ^ErrorWriting
-"Færa út: villa við að skrifa í skrá "
+"FÃ¦ra Ãºt: villa viÃ° aÃ° skrifa Ã­ skrÃ¡ "
 # ^InvalidOpcode
-Uppsetningarhjálp biluð: rangur stýrikóði
+UppsetningarhjÃ¡lp biluÃ°: rangur stÃ½rikÃ³Ã°i
 # ^NoOLE
 "Engin OLE fyrir: "
 # ^OutputFolder
-"Útskráarsafn: "
+"ÃštskrÃ¡arsafn: "
 # ^RemoveFolder
-"Fjarlægja skráarsafn: "
+"FjarlÃ¦gja skrÃ¡arsafn: "
 # ^RenameOnReboot
-"Endurskíra við endurræsingu: "
+"EndurskÃ­ra viÃ° endurrÃ¦singu: "
 # ^Rename
-"Endurskíra: "
+"EndurskÃ­ra: "
 # ^Skipped
 "Sleppt: "
 # ^CopyDetails
-Afrita upplýsingar til skrifbrettis
+Afrita upplÃ½singar til skrifbrettis
 # ^LogInstall
-Skrá uppsetningarferli
+SkrÃ¡ uppsetningarferli
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/NorwegianNynorsk.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/NorwegianNynorsk.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/NorwegianNynorsk.nlf	(revision 2956)
@@ -1,15 +1,15 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 2068
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
-# Translation by Vebjørn Sture, vsture gmail com
+# Translation by VebjÃ¸rn Sture, vsture gmail com
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
@@ -43,9 +43,9 @@
 # ^AgreeBtn
 &Godta
 # ^AcceptBtn
-Eg &godtek vilkåra i lisensavtalen
+Eg &godtek vilkÃ¥ra i lisensavtalen
 # ^DontAcceptBtn
-Eg godtek &ikkje vilkåra i lisensavtalen
+Eg godtek &ikkje vilkÃ¥ra i lisensavtalen
 # ^InstallBtn
 &Installer
 # ^UninstallBtn
@@ -59,69 +59,69 @@
 # ^ShowDetailsBtn
 Syn &detaljar
 # ^ClickNext
-Trykk Neste for å halda fram.
+Trykk Neste for Ã¥ halda fram.
 # ^ClickInstall
-Trykk Installer for å starta installasjonen.
+Trykk Installer for Ã¥ starta installasjonen.
 # ^ClickUninstall
-Trykk Avinstaller for å starta avinstallasjonen.
+Trykk Avinstaller for Ã¥ starta avinstallasjonen.
 # ^Name
 Namn
 # ^Completed
 Ferdig
 # ^LicenseText
-Ver grei og les gjennom lisensavtalen før du installerer $(^NameDA). Dersom du godtek vilkåra i avtalen, trykk på Godta.
+Ver grei og les gjennom lisensavtalen fÃ¸r du installerer $(^NameDA). Dersom du godtek vilkÃ¥ra i avtalen, trykk pÃ¥ Godta.
 # ^LicenseTextCB
-Ver grei og les gjennom lisensavtalen før du installerer $(^NameDA). Dersom du godtek vilkåra i avtalen, merk av under. $_CLICK
+Ver grei og les gjennom lisensavtalen fÃ¸r du installerer $(^NameDA). Dersom du godtek vilkÃ¥ra i avtalen, merk av under. $_CLICK
 # ^LicenseTextRB
-Ver grei og les gjennom lisensavtalen før du installerer $(^NameDA). Dersom du godtek vilkåra i avtalen, vel det fyrste alternativet. $_CLICK
+Ver grei og les gjennom lisensavtalen fÃ¸r du installerer $(^NameDA). Dersom du godtek vilkÃ¥ra i avtalen, vel det fyrste alternativet. $_CLICK
 # ^UnLicenseText
-Ver grei og les gjennom lisensavtalen før du avinstallerer $(^NameDA). Dersom du godtek vilkåra i avtalen, trykk på Godta.
+Ver grei og les gjennom lisensavtalen fÃ¸r du avinstallerer $(^NameDA). Dersom du godtek vilkÃ¥ra i avtalen, trykk pÃ¥ Godta.
 # ^UnLicenseTextCB
-Ver grei og les gjennom lisensavtalen før du avinstallerer $(^NameDA). Dersom du godtek vilkåra i avtalen, merk av under. $_CLICK
+Ver grei og les gjennom lisensavtalen fÃ¸r du avinstallerer $(^NameDA). Dersom du godtek vilkÃ¥ra i avtalen, merk av under. $_CLICK
 # ^UnLicenseTextRB
-Ver grei og les gjennom lisensavtalen før du avinstallerer $(^NameDA). Dersom du godtek vilkåra i avtalen, vel det fyrste alternativet. $_CLICK
+Ver grei og les gjennom lisensavtalen fÃ¸r du avinstallerer $(^NameDA). Dersom du godtek vilkÃ¥ra i avtalen, vel det fyrste alternativet. $_CLICK
 # ^Custom
 Eigendefinert
 # ^ComponentsText
 Merk komponentane du vil installera og fjern merkinga for dei du ikkje vil installera. $_CLICK
 # ^ComponentsSubText1
-Vel kva måte du vil installera på:
+Vel kva mÃ¥te du vil installera pÃ¥:
 # ^ComponentsSubText2_NoInstTypes
 Merk komponentar du vil installera:
 # ^ComponentsSubText2
-Eller merk dei valfrie komponentane du ynskjer å installera:
+Eller merk dei valfrie komponentane du ynskjer Ã¥ installera:
 # ^UnComponentsText
-Merk komponentane du vil avinstallera og fjern merkinga for dei du vil ta vare på. $_CLICK
+Merk komponentane du vil avinstallera og fjern merkinga for dei du vil ta vare pÃ¥. $_CLICK
 # ^UnComponentsSubText1
-Vel kva måte du vil avinstallera på:
+Vel kva mÃ¥te du vil avinstallera pÃ¥:
 # ^UnComponentsSubText2_NoInstTypes
 Merk komponentar du vil avinstallera:
 # ^UnComponentsSubText2
-Eller merk dei valfrie komponentane du ynskjer å avinstallera:
+Eller merk dei valfrie komponentane du ynskjer Ã¥ avinstallera:
 # ^DirText
-$(^NameDA) vil verta installert i fylgjande mappe. For å velja ei anna mappe, trykk Bla gjennom. $_CLICK
+$(^NameDA) vil verta installert i fylgjande mappe. For Ã¥ velja ei anna mappe, trykk Bla gjennom. $_CLICK
 # ^DirSubText
-Målmappe
+MÃ¥lmappe
 # ^DirBrowseText
 Vel mappe du vil installera $(^NameDA) i:
 # ^UnDirText
-$(^NameDA) i fylgjande mappe vil verta avinstallert. For å velja ei anna mappe, trykk Bla gjennom. $_CLICK
+$(^NameDA) i fylgjande mappe vil verta avinstallert. For Ã¥ velja ei anna mappe, trykk Bla gjennom. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Vel mappe du vil avinstallera $(^NameDA) frå:
+Vel mappe du vil avinstallera $(^NameDA) frÃ¥:
 # ^SpaceAvailable
 "Ledig plass: "
 # ^SpaceRequired
 "Naudsynt plass: "
 # ^UninstallingText
-Denne vegvisaren vil avinstallera $(^NameDA) frå din datamaskin. $_CLICK
+Denne vegvisaren vil avinstallera $(^NameDA) frÃ¥ din datamaskin. $_CLICK
 # ^UninstallingSubText
-Avinstallerer frå:
+Avinstallerer frÃ¥:
 # ^FileError
-Feil under opning av fil for skriving: \r\n\t\"$0\"\r\nTrykk Avbryt for å avbryta installasjonen,\r\nPrøv igjen for å prøva igjen, eller\r\nIgnorer for å hoppa over denne fila
+Feil under opning av fil for skriving: \r\n\t\"$0\"\r\nTrykk Avbryt for Ã¥ avbryta installasjonen,\r\nPrÃ¸v igjen for Ã¥ prÃ¸va igjen, eller\r\nIgnorer for Ã¥ hoppa over denne fila
 # ^FileError_NoIgnore
-Feil under opning av fil for skriving: \r\n\t\"$0\"\r\nTrykk Prøv igjen for å prøva igjen, or\r\neller Avbryt for å avbryta installasjonen
+Feil under opning av fil for skriving: \r\n\t\"$0\"\r\nTrykk PrÃ¸v igjen for Ã¥ prÃ¸va igjen, or\r\neller Avbryt for Ã¥ avbryta installasjonen
 # ^CantWrite
 "Kan ikkje skriva: "
 # ^CopyFailed
@@ -157,7 +157,7 @@
 # ^ExecShell
 "ExecShell: "
 # ^Exec
-"Køyra: "
+"KÃ¸yra: "
 # ^Extract
 "Pakk ut: "
 # ^ErrorWriting
@@ -179,13 +179,13 @@
 # ^CopyDetails
 Kopier detaljar til utklyppstavla
 # ^LogInstall
-Loggfør installasjonsprosessen
+LoggfÃ¸r installasjonsprosessen
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
+ G
 
Index: tmp/org.txm.setups/nsis/Contrib/Language files/SimpChinese.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/SimpChinese.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/SimpChinese.nsh	(revision 2956)
@@ -1,123 +1,130 @@
-;Language: 'Chinese (Simplified)' (2052)
-;Translator: Kii Ali <kiiali@cpatch.org>
-;Revision date: 2004-12-15
-;Verified by: QFox <qfox99@gmail.com>
+ï»¿;Language: 'Chinese (Simplified)' (2052)
+;Translator: Kii Ali <kiiali@cpatch.org>, <kiiali@ms1.url.com.tw>, <kiiali@pchome.com.tw>, Tyson Tan <tysontan@tysontan.com>
+;Revision date: 2020-06-03
 
-!insertmacro LANGFILE "SimpChinese" "Chinese (Simplified)"
+!insertmacro LANGFILE "SimpChinese" "Chinese (Simplified)" "ä¸­æ–‡(ç®€ä½“)" "Hanyu (Jiantizi)"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "»¶Ó­Ê¹ÓÃ¡°$(^NameDA)¡±°²×°Ïòµ¼"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Õâ¸öÏòµ¼½«Ö¸ÒýÄãÍê³É¡°$(^NameDA)¡±µÄ°²×°½ø³Ì¡£$\r$\n$\r$\nÔÚ¿ªÊ¼°²×°Ö®Ç°£¬½¨ÒéÏÈ¹Ø±ÕÆäËûËùÓÐÓ¦ÓÃ³ÌÐò¡£Õâ½«ÔÊÐí¡°°²×°³ÌÐò¡±¸üÐÂÖ¸¶¨µÄÏµÍ³ÎÄ¼þ£¬¶ø²»ÐèÒªÖØÐÂÆô¶¯ÄãµÄ¼ÆËã»ú¡£$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "æ¬¢è¿Žä½¿ç”¨ $(^NameDA) å®‰è£…ç¨‹åº�"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "æ­¤ç¨‹åº�å°†å¼•å¯¼ä½ å®Œæˆ� $(^NameDA) çš„å®‰è£…ã€‚$\r$\n$\r$\nåœ¨å®‰è£…ä¹‹å‰�ï¼Œè¯·å…ˆå…³é—­å…¶ä»–æ‰€æœ‰åº”ç”¨ç¨‹åº�ã€‚è¿™å°†ç¡®ä¿�å®‰è£…ç¨‹åº�èƒ½å¤Ÿæ›´æ–°æ‰€éœ€çš„ç³»ç»Ÿæ–‡ä»¶ï¼Œä»Žè€Œé�¿å…�åœ¨å®‰è£…å�Žé‡�æ–°å�¯åŠ¨è®¡ç®—æœºã€‚$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "»¶Ó­Ê¹ÓÃ¡°$(^NameDA)¡±Ð¶ÔØÏòµ¼"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Õâ¸öÏòµ¼½«È«³ÌÖ¸ÒýÄã¡°$(^NameDA)¡±µÄÐ¶ÔØ½ø³Ì¡£$\r$\n$\r$\nÔÚ¿ªÊ¼Ð¶ÔØÖ®Ç°£¬È·ÈÏ¡°$(^NameDA)¡±²¢Î´ÔËÐÐµ±ÖÐ¡£$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "æ¬¢è¿Žä½¿ç”¨ $(^NameDA) å�¸è½½ç¨‹åº�"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "æ­¤ç¨‹åº�å°†å¼•å¯¼ä½ å®Œæˆ� $(^NameDA) çš„å�¸è½½ã€‚$\r$\n$\r$\nåœ¨å�¸è½½ä¹‹å‰�ï¼Œè¯·ç¡®è®¤ $(^NameDA) å·²ç»�å…³é—­ã€‚$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ðí¿ÉÖ¤Ð­Òé"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "ÔÚ°²×°¡°$(^NameDA)¡±Ö®Ç°£¬ÇëÔÄ¶ÁÊÚÈ¨Ð­Òé¡£"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Èç¹ûÄã½ÓÊÜÐ­ÒéÖÐµÄÌõ¿î£¬µ¥»÷ [ÎÒ½ÓÊÜ(I)] ¼ÌÐø°²×°¡£Èç¹ûÄãÑ¡¶¨ [È¡Ïû(C)] £¬°²×°³ÌÐò½«»á¹Ø±Õ¡£±ØÐë½ÓÊÜÐ­Òé²ÅÄÜ°²×°¡°$(^NameDA)¡±¡£"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Èç¹ûÄã½ÓÊÜÐ­ÒéÖÐµÄÌõ¿î£¬µ¥»÷ÏÂ·½µÄ¹´Ñ¡¿ò¡£±ØÐëÒª½ÓÊÜÐ­Òé²ÅÄÜ°²×° $(^NameDA)¡£$_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Èç¹ûÄã½ÓÊÜÐ­ÒéÖÐµÄÌõ¿î£¬Ñ¡ÔñÏÂ·½µÚÒ»¸öÑ¡Ïî¡£±ØÐëÒª½ÓÊÜÐ­Òé²ÅÄÜ°²×° $(^NameDA)¡£$_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "è®¸å�¯è¯�å��è®®"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "åœ¨å®‰è£… $(^NameDA) ä¹‹å‰�ï¼Œè¯·é˜…è¯»è®¸å�¯è¯�æ�¡æ¬¾ã€‚"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "å¦‚æžœä½ æŽ¥å�—è®¸å�¯è¯�çš„æ�¡æ¬¾ï¼Œè¯·ç‚¹å‡» [æˆ‘å�Œæ„�(I)] ç»§ç»­å®‰è£…ã€‚ä½ å¿…é¡»åœ¨å�Œæ„�å�Žæ‰�èƒ½å®‰è£… $(^NameDA) ã€‚"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "å¦‚æžœä½ æŽ¥å�—è®¸å�¯è¯�çš„æ�¡æ¬¾ï¼Œè¯·ç‚¹å‡»å‹¾é€‰ä¸‹æ–¹çš„é€‰æ¡†ã€‚ä½ å¿…é¡»åœ¨å�Œæ„�å�Žæ‰�èƒ½å®‰è£… $(^NameDA)ã€‚$_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "å¦‚æžœä½ æŽ¥å�—è®¸å�¯è¯�çš„æ�¡æ¬¾ï¼Œè¯·é€‰æ‹©ä¸‹æ–¹ç¬¬ä¸€ä¸ªé€‰é¡¹ã€‚ä½ å¿…é¡»åœ¨å�Œæ„�å�Žæ‰�èƒ½å®‰è£… $(^NameDA)ã€‚$_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ðí¿ÉÖ¤Ð­Òé"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "ÔÚÐ¶ÔØ¡°$(^NameDA)¡±Ö®Ç°£¬Çë¼ìÔÄÊÚÈ¨Ìõ¿î¡£"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Èç¹ûÄã½ÓÊÜÐ­ÒéÖÐµÄÌõ¿î£¬µ¥»÷ [ÎÒ½ÓÊÜ(I)] ¼ÌÐøÐ¶ÔØ¡£Èç¹ûÄãÑ¡¶¨ [È¡Ïû(C)] £¬°²×°³ÌÐò½«»á¹Ø±Õ¡£±ØÐëÒª½ÓÊÜÐ­Òé²ÅÄÜÐ¶ÔØ¡°$(^NameDA)¡±¡£"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Èç¹ûÄã½ÓÊÜÐ­ÒéÖÐµÄÌõ¿î£¬µ¥»÷ÏÂ·½µÄ¹´Ñ¡¿ò¡£±ØÐëÒª½ÓÊÜÐ­Òé²ÅÄÜÐ¶ÔØ $(^NameDA)¡£$_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Èç¹ûÄã½ÓÊÜÐ­ÒéÖÐµÄÌõ¿î£¬Ñ¡ÔñÏÂ·½µÚÒ»¸öÑ¡Ïî¡£±ØÐëÒª½ÓÊÜÐ­Òé²ÅÄÜÐ¶ÔØ $(^NameDA)¡£$_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "è®¸å�¯è¯�å��è®®"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "åœ¨å�¸è½½ $(^NameDA) ä¹‹å‰�ï¼Œè¯·é˜…è¯»è®¸å�¯è¯�æ�¡æ¬¾ã€‚"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "å¦‚æžœä½ æŽ¥å�—è®¸å�¯è¯�çš„æ�¡æ¬¾ï¼Œè¯·ç‚¹å‡» [æˆ‘å�Œæ„�(I)] ç»§ç»­å�¸è½½ã€‚å¦‚æžœä½ ç‚¹å‡» [å�–æ¶ˆ(C)] ï¼Œå�¸è½½ç¨‹åº�å°†ä¼šå…³é—­ã€‚ä½ å¿…é¡»åœ¨å�Œæ„�å�Žæ‰�èƒ½å�¸è½½ $(^NameDA) ã€‚"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "å¦‚æžœä½ æŽ¥å�—è®¸å�¯è¯�çš„æ�¡æ¬¾ï¼Œç‚¹å‡»å‹¾é€‰ä¸‹æ–¹çš„é€‰æ¡†ã€‚ä½ å¿…é¡»åœ¨å�Œæ„�å�Žæ‰�èƒ½å�¸è½½ $(^NameDA)ã€‚$_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "å¦‚æžœä½ æŽ¥å�—è®¸å�¯è¯�çš„æ�¡æ¬¾ï¼Œè¯·é€‰æ‹©ä¸‹æ–¹ç¬¬ä¸€ä¸ªé€‰é¡¹ã€‚ä½ å¿…é¡»åœ¨å�Œæ„�å�Žæ‰�èƒ½å�¸è½½ $(^NameDA)ã€‚$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "°´ [PgDn] ÔÄ¶Á¡°ÊÚÈ¨Ð­Òé¡±µÄÆäÓà²¿·Ö¡£"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "è¦�é˜…è¯»å��è®®çš„å…¶ä½™éƒ¨åˆ†ï¼Œè¯·æŒ‰ [PgDn] é”®å�‘ä¸‹ç¿»é¡µã€‚"
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Ñ¡Ôñ×é¼þ"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Ñ¡ÔñÄãÏëÒª°²×°¡°$(^NameDA)¡±µÄÄÇÐ©¹¦ÄÜ¡£"
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "é€‰æ‹©ç»„ä»¶"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "é€‰æ‹©ä½ æƒ³å®‰è£…çš„ $(^NameDA) åŠŸèƒ½ç»„ä»¶ã€‚"
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Ñ¡¶¨×é¼þ"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Ñ¡¶¨¡°$(^NameDA)¡±µ±ÖÐÄãÏëÒªÐ¶ÔØµÄ¹¦ÄÜ¡£"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "é€‰æ‹©ç»„ä»¶"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "é€‰æ‹©ä½ æƒ³å�¸è½½çš„ $(^NameDA) åŠŸèƒ½ç»„ä»¶ã€‚"
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "ÃèÊö"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "ç»„ä»¶æ��è¿°"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ÒÆ¶¯ÄãµÄÊó±êÖ¸Õëµ½×é¼þÖ®ÉÏ£¬±ã¿É¼ûµ½ËüµÄÃèÊö¡£"
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "å°†å…‰æ ‡æ‚¬å�œåœ¨ç»„ä»¶å��ç§°ä¹‹ä¸Šï¼Œå�³å�¯æ˜¾ç¤ºå®ƒçš„åŠŸèƒ½æ��è¿°ã€‚"
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ÒÆ¶¯ÄãµÄÊó±êÖ¸Õëµ½×é¼þÖ®ÉÏ£¬±ã¿É¼ûµ½ËüµÄÃèÊö¡£"
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ç‚¹å‡»é€‰ä¸­ç»„ä»¶ï¼Œå�³å�¯æ˜¾ç¤ºå®ƒçš„åŠŸèƒ½æ��è¿°ã€‚"
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Ñ¡Ôñ°²×°Î»ÖÃ"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Ñ¡Ôñ¡°$(^NameDA)¡±µÄ°²×°ÎÄ¼þ¼Ð¡£"
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "é€‰æ‹©å®‰è£…ä½�ç½®"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "é€‰æ‹© $(^NameDA) çš„å®‰è£…æ–‡ä»¶å¤¹ã€‚"
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Ñ¡¶¨Ð¶ÔØÎ»ÖÃ"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Ñ¡¶¨¡°$(^NameDA)¡±ÒªÐ¶ÔØµÄÎÄ¼þ¼Ð¡£"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "é€‰æ‹©å�¸è½½ä½�ç½®"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "é€‰æ‹© $(^NameDA) çš„å�¸è½½æ–‡ä»¶å¤¹ã€‚"
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "ÕýÔÚ°²×°"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "¡°$(^NameDA)¡±ÕýÔÚ°²×°£¬ÇëµÈºò..."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "°²×°Íê³É"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "°²×°ÒÑ³É¹¦Íê³É¡£"
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "°²×°¼ºÖÐÖ¹"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "°²×°Ã»ÓÐ³É¹¦¡£"
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "æ­£åœ¨å®‰è£…"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "$(^NameDA) æ­£åœ¨å®‰è£…ï¼Œè¯·ç¨�å€™ã€‚"
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "å®‰è£…å®Œæˆ�"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "å®‰è£…ç¨‹åº�æˆ�åŠŸå®Œæˆ�å®‰è£…ã€‚"
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "å®‰è£…ä¸­æ­¢"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "å®‰è£…ç¨‹åº�æœªèƒ½å®Œæˆ�å®‰è£…ã€‚"
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "ÕýÔÚÐ¶ÔØ"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "¡°$(^NameDA)¡±ÕýÔÚÐ¶ÔØ£¬ÇëµÈºò..."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Ð¶ÔØÒÑÍê³É"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Ð¶ÔØÒÑ³É¹¦µØÍê³É¡£"
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Ð¶ÔØÒÑÖÐÖ¹"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Ð¶ÔØ³ÌÐò²¢Î´³É¹¦µØÍê³É¡£"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "æ­£åœ¨å�¸è½½"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "$(^NameDA) æ­£åœ¨å�¸è½½ï¼Œè¯·ç¨�å€™ã€‚"
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "å�¸è½½å®Œæˆ�"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "å�¸è½½ç¨‹åº�æˆ�åŠŸå®Œæˆ�å�¸è½½ã€‚"
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "å�¸è½½ä¸­æ­¢"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "å�¸è½½ç¨‹åº�æœªèƒ½å®Œæˆ�å�¸è½½ã€‚"
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "ÕýÔÚÍê³É¡°$(^NameDA)¡±°²×°Ïòµ¼"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "¡°$(^NameDA)¡±ÒÑ°²×°ÔÚÄãµÄÏµÍ³¡£$\r$\nµ¥»÷ [Íê³É(F)] ¹Ø±Õ´ËÏòµ¼¡£"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "ÄãµÄÏµÍ³ÐèÒªÖØÐÂÆô¶¯£¬ÒÔ±ãÍê³É¡°$(^NameDA)¡±µÄ°²×°¡£ÏÖÔÚÒªÖØÐÂÆô¶¯Âð£¿"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "$(^NameDA) å®‰è£…ç¨‹åº�ç»“æ�Ÿ"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) å·²ç»�æˆ�åŠŸå®‰è£…åˆ°æœ¬æœºã€‚$\r$\nç‚¹å‡» [å®Œæˆ�(F)] å…³é—­å®‰è£…ç¨‹åº�ã€‚"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "å¿…é¡»é‡�æ–°å�¯åŠ¨æœ¬æœºæ‰�èƒ½å®Œæˆ� $(^NameDA) çš„å®‰è£…ã€‚æ˜¯å�¦ç«‹å�³é‡�æ–°å�¯åŠ¨ï¼Ÿ"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "ÕýÔÚÍê³É¡°$(^NameDA)¡±Ð¶ÔØÏòµ¼"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "¡°$(^NameDA)¡±ÒÑ´ÓÄãµÄ¼ÆËã»úÐ¶ÔØ¡£$\r$\n$\r$\nµ¥»÷ [Íê³É] ¹Ø±ÕÕâ¸öÏòµ¼¡£"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "¼ÆËã»úÐèÒªÖØÐÂÆô¶¯£¬ÒÔ±ãÍê³É¡°$(^NameDA)¡±µÄÐ¶ÔØ¡£ÏÖÔÚÏëÒªÖØÐÂÆô¶¯Âð£¿"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "$(^NameDA) å�¸è½½ç¨‹åº�ç»“æ�Ÿ"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) å·²ç»�æˆ�åŠŸä»Žæœ¬æœºå�¸è½½ã€‚$\r$\n$\r$\nç‚¹å‡» [å®Œæˆ�] å…³é—­å�¸è½½ç¨‹åº�ã€‚"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "å¿…é¡»é‡�æ–°å�¯åŠ¨æœ¬æœºæ‰�èƒ½å®Œæˆ� $(^NameDA) çš„å�¸è½½ã€‚æ˜¯å�¦ç«‹å�³é‡�æ–°å�¯åŠ¨ï¼Ÿ"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "ÊÇ£¬ÏÖÔÚÖØÐÂÆô¶¯(&Y)"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "·ñ£¬ÎÒÉÔºóÔÙ×ÔÐÐÖØÐÂÆô¶¯(&N)"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "ÔËÐÐ $(^NameDA)(&R)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "ÏÔÊ¾¡°×ÔÊöÎÄ¼þ¡±(&M)"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "Íê³É(&F)"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "æ˜¯ï¼Œç«‹å�³é‡�æ–°å�¯åŠ¨(&Y)"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "å�¦ï¼Œæˆ‘ä¼šåœ¨ä¹‹å�Žé‡�æ–°å�¯åŠ¨(&N)"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "è¿�è¡Œ $(^NameDA)(&R)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "æ˜¾ç¤ºè‡ªè¿°æ–‡ä»¶(&M)"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "å®Œæˆ�(&F)"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Ñ¡Ôñ¡°¿ªÊ¼²Ëµ¥¡±ÎÄ¼þ¼Ð"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Ñ¡Ôñ¡°¿ªÊ¼²Ëµ¥¡±ÎÄ¼þ¼Ð£¬ÓÃÓÚ³ÌÐòµÄ¿ì½Ý·½Ê½¡£"
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Ñ¡Ôñ¡°¿ªÊ¼²Ëµ¥¡±ÎÄ¼þ¼Ð£¬ÒÔ±ã´´½¨³ÌÐòµÄ¿ì½Ý·½Ê½¡£ÄãÒ²¿ÉÒÔÊäÈëÃû³Æ£¬´´½¨ÐÂÎÄ¼þ¼Ð¡£"
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "²»Òª´´½¨¿ì½Ý·½Ê½(&N)"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "é€‰æ‹©å¼€å§‹è�œå�•æ–‡ä»¶å¤¹"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "é€‰æ‹©å¼€å§‹è�œå�•æ–‡ä»¶å¤¹ï¼Œç”¨äºŽåˆ›å»ºç¨‹åº�çš„å¿«æ�·æ–¹å¼�ã€‚"
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "é€‰æ‹©å¼€å§‹è�œå�•æ–‡ä»¶å¤¹ï¼Œç”¨äºŽåˆ›å»ºç¨‹åº�çš„å¿«æ�·æ–¹å¼�ã€‚ä½ ä¹Ÿå�¯ä»¥è¾“å…¥è‡ªå®šä¹‰å��ç§°ï¼Œåˆ›å»ºæ–°æ–‡ä»¶å¤¹ã€‚"
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "ä¸�è¦�åˆ›å»ºå¿«æ�·æ–¹å¼�(&N)"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Ð¶ÔØ $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "´ÓÄãµÄ¼ÆËã»úÐ¶ÔØ¡°$(^NameDA)¡±"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "å�¸è½½ $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "ä»Žæœ¬æœºå�¸è½½ $(^NameDA) ã€‚"
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "ÄãÈ·ÊµÒªÍË³ö¡°$(^Name)¡±°²×°³ÌÐò£¿"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "ç¡®å®šè¦�é€€å‡º $(^Name) å®‰è£…ç¨‹åº�å�—ï¼Ÿ"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "ÄãÈ·ÊµÒªÍË³ö¡°$(^Name)¡±Ð¶ÔØÂð£¿"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "ç¡®å®šè¦�é€€å‡º $(^Name) å�¸è½½ç¨‹åº�å�—ï¼Ÿ"
 !endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "é€‰æ‹©ç”¨æˆ·"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "é€‰æ‹©ä¸ºå“ªäº›ç”¨æˆ·å®‰è£… $(^NameDA) ã€‚"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "é€‰æ‹©å�ªä¸ºè‡ªå·±å®‰è£… $(^NameDA) ï¼Œè¿˜æ˜¯ä¸ºæœ¬æœºçš„æ‰€æœ‰ç”¨æˆ·å®‰è£…ã€‚ $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "ä¸ºæœ¬æœºæ‰€æœ‰ç”¨æˆ·å®‰è£…(&A)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "å�ªä¸ºæˆ‘è‡ªå·±å®‰è£…(&M)"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Welsh.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Welsh.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Welsh.nlf	(revision 2956)
@@ -1,13 +1,13 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Start editing here
 # Language ID
-1160
+1106
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
--
+# Codepage - dash (-) means ASCII code page
+1252
 # RTL - anything else than RTL means LTR
 -
 # Translation by Rhoslyn Prys, Meddal.com
@@ -38,7 +38,7 @@
 # ^UnCompletedSubCaption
 : Cwblhawyd
 # ^BackBtn
-< &Nôl
+< &NÃ´l
 # ^NextBtn
 &Nesaf >
 # ^AgreeBtn
@@ -126,9 +126,9 @@
 # ^CantWrite
 "Methu ysgrifennu: "
 # ^CopyFailed
-Methu Copïo
+Methu CopÃ¯o
 # ^CopyTo
-"Copïo i "
+"CopÃ¯o i "
 # ^Registering
 "Cofrestru: "
 # ^Unregistering
@@ -178,14 +178,14 @@
 # ^Skipped
 "Hepgor: "
 # ^CopyDetails
-Copïo Manylion i'r Clipfwrdd
+CopÃ¯o Manylion i'r Clipfwrdd
 # ^LogInstall
 Cofnodi'r brosed gosod
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Japanese.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Japanese.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Japanese.nlf	(revision 2956)
@@ -1,11 +1,11 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1041
 # Font and size - dash (-) means default
-‚l‚r ‚oƒSƒVƒbƒN
+ï¼­ï¼³ ï¼°ã‚´ã‚·ãƒƒã‚¯
 9
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 932
 # RTL - anything else than RTL means LTR
 -
@@ -13,178 +13,178 @@
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-$(^Name) ƒZƒbƒgƒAƒbƒv
+$(^Name) ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—
 # ^UninstallCaption
-$(^Name) ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹
+$(^Name) ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«
 # ^LicenseSubCaption
-�Fƒ‰ƒCƒZƒ“ƒXŒ_–ñ�‘
+ï¼šãƒ©ã‚¤ã‚»ãƒ³ã‚¹å¥‘ç´„æ›¸
 # ^ComponentsSubCaption
-�FƒCƒ“ƒXƒg�[ƒ‹ ƒIƒvƒVƒ‡ƒ“
+ï¼šã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« ã‚ªãƒ—ã‚·ãƒ§ãƒ³
 # ^DirSubCaption
-�FƒCƒ“ƒXƒg�[ƒ‹ ƒtƒHƒ‹ƒ_
+ï¼šã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« ãƒ•ã‚©ãƒ«ãƒ€
 # ^InstallingSubCaption
-�FƒCƒ“ƒXƒg�[ƒ‹
+ï¼šã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«
 # ^CompletedSubCaption
-�FŠ®—¹
+ï¼šå®Œäº†
 # ^UnComponentsSubCaption
-: ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹ ƒIƒvƒVƒ‡ƒ“
+: ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« ã‚ªãƒ—ã‚·ãƒ§ãƒ³
 # ^UnDirSubCaption
-: ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹ ƒtƒHƒ‹ƒ_
+: ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« ãƒ•ã‚©ãƒ«ãƒ€
 # ^ComfirmSubCaption
-�FŠm”F
+ï¼šç¢ºèª�
 # ^UninstallingSubCaption
-�FƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹
+ï¼šã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«
 # ^UnCompletedSubCaption
-�FŠ®—¹
+ï¼šå®Œäº†
 # ^BackBtn
-< –ß‚é(&B)
+< æˆ»ã‚‹(&B)
 # ^NextBtn
-ŽŸ‚Ö(&N) >
+æ¬¡ã�¸(&N) >
 # ^AgreeBtn
-“¯ˆÓ‚·‚é(&A)
+å�Œæ„�ã�™ã‚‹(&A)
 # ^AcceptBtn
-‚±‚Ìƒ‰ƒCƒZƒ“ƒXŒ_–ñ�‘‚É“¯ˆÓ‚µ‚Ü‚·(&A)
+ã�“ã�®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹å¥‘ç´„æ›¸ã�«å�Œæ„�ã�—ã�¾ã�™(&A)
 # ^DontAcceptBtn
-‚±‚Ìƒ‰ƒCƒZƒ“ƒXŒ_–ñ�‘‚É‚Í“¯ˆÓ‚Å‚«‚Ü‚¹‚ñ(&D)
+ã�“ã�®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹å¥‘ç´„æ›¸ã�«ã�¯å�Œæ„�ã�§ã��ã�¾ã�›ã‚“(&D)
 # ^InstallBtn
-ƒCƒ“ƒXƒg�[ƒ‹
+ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«
 # ^UninstallBtn
-±Ý²Ý½Ä°Ù(&U)
+ï½±ï¾�ï½²ï¾�ï½½ï¾„ï½°ï¾™(&U)
 # ^CancelBtn
-ƒLƒƒƒ“ƒZƒ‹
+ã‚­ãƒ£ãƒ³ã‚»ãƒ«
 # ^CloseBtn
-•Â‚¶‚é(&C)
+é–‰ã�˜ã‚‹(&C)
 # ^BrowseBtn
-ŽQ�Æ(&R)...
+å�‚ç…§(&R)...
 # ^ShowDetailsBtn
-�Ú�×‚ð•\Ž¦(&D)
+è©³ç´°ã‚’è¡¨ç¤º(&D)
 # ^ClickNext
-‘±‚¯‚é‚É‚Í [ŽŸ‚Ö] ‚ðƒNƒŠƒbƒN‚µ‚Ä‰º‚³‚¢�B
+ç¶šã�‘ã‚‹ã�«ã�¯ [æ¬¡ã�¸] ã‚’ã‚¯ãƒªãƒƒã‚¯ã�—ã�¦ä¸‹ã�•ã�„ã€‚
 # ^ClickInstall
-ƒCƒ“ƒXƒg�[ƒ‹‚ðŽn‚ß‚é‚É‚Í [ƒCƒ“ƒXƒg�[ƒ‹] ‚ðƒNƒŠƒbƒN‚µ‚Ä‰º‚³‚¢�B
+ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’å§‹ã‚�ã‚‹ã�«ã�¯ [ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«] ã‚’ã‚¯ãƒªãƒƒã‚¯ã�—ã�¦ä¸‹ã�•ã�„ã€‚
 # ^ClickUninstall
-ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚ðŽn‚ß‚é‚É‚Í [±Ý²Ý½Ä°Ù] ‚ðƒNƒŠƒbƒN‚µ‚Ä‰º‚³‚¢�B
+ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’å§‹ã‚�ã‚‹ã�«ã�¯ [ï½±ï¾�ï½²ï¾�ï½½ï¾„ï½°ï¾™] ã‚’ã‚¯ãƒªãƒƒã‚¯ã�—ã�¦ä¸‹ã�•ã�„ã€‚
 # ^Name
-ƒAƒvƒŠƒP�[ƒVƒ‡ƒ“
+ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³
 # ^Completed
-Š®—¹
+å®Œäº†
 # ^LicenseText
-$(^NameDA)‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚é‘O‚É�Aƒ‰ƒCƒZƒ“ƒXŒ_–ñ�‘‚ðŠm”F‚µ‚Ä‰º‚³‚¢�BŒ_–ñ�‘‚Ì‘S‚Ä‚Ì�ðŒ�‚É“¯ˆÓ‚·‚é‚È‚ç‚Î�A[“¯ˆÓ‚·‚é] ƒ{ƒ^ƒ“‚ðƒNƒŠƒbƒN‚µ‚Ä‰º‚³‚¢�B
+$(^NameDA)ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹å‰�ã�«ã€�ãƒ©ã‚¤ã‚»ãƒ³ã‚¹å¥‘ç´„æ›¸ã‚’ç¢ºèª�ã�—ã�¦ä¸‹ã�•ã�„ã€‚å¥‘ç´„æ›¸ã�®å…¨ã�¦ã�®æ�¡ä»¶ã�«å�Œæ„�ã�™ã‚‹ã�ªã‚‰ã�°ã€�[å�Œæ„�ã�™ã‚‹] ãƒœã‚¿ãƒ³ã‚’ã‚¯ãƒªãƒƒã‚¯ã�—ã�¦ä¸‹ã�•ã�„ã€‚
 # ^LicenseTextCB
-$(^NameDA)‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚é‘O‚É�Aƒ‰ƒCƒZƒ“ƒXŒ_–ñ�‘‚ðŠm”F‚µ‚Ä‰º‚³‚¢�BŒ_–ñ�‘‚Ì‘S‚Ä‚Ì�ðŒ�‚É“¯ˆÓ‚·‚é‚È‚ç‚Î�A‰º‚Ìƒ`ƒFƒbƒNƒ{ƒbƒNƒX‚ðƒNƒŠƒbƒN‚µ‚Ä‰º‚³‚¢�B $_CLICK
+$(^NameDA)ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹å‰�ã�«ã€�ãƒ©ã‚¤ã‚»ãƒ³ã‚¹å¥‘ç´„æ›¸ã‚’ç¢ºèª�ã�—ã�¦ä¸‹ã�•ã�„ã€‚å¥‘ç´„æ›¸ã�®å…¨ã�¦ã�®æ�¡ä»¶ã�«å�Œæ„�ã�™ã‚‹ã�ªã‚‰ã�°ã€�ä¸‹ã�®ãƒ�ã‚§ãƒƒã‚¯ãƒœãƒƒã‚¯ã‚¹ã‚’ã‚¯ãƒªãƒƒã‚¯ã�—ã�¦ä¸‹ã�•ã�„ã€‚ $_CLICK
 # ^LicenseTextRB
-$(^NameDA)‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚é‘O‚É�Aƒ‰ƒCƒZƒ“ƒXŒ_–ñ�‘‚ðŠm”F‚µ‚Ä‰º‚³‚¢�BŒ_–ñ�‘‚Ì‘S‚Ä‚Ì�ðŒ�‚É“¯ˆÓ‚·‚é‚È‚ç‚Î�A‰º‚É•\Ž¦‚³‚ê‚Ä‚¢‚éƒIƒvƒVƒ‡ƒ“‚Ì‚¤‚¿�A�Å�‰‚Ì‚à‚Ì‚ð‘I‚ñ‚Å‰º‚³‚¢�B $_CLICK
+$(^NameDA)ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹å‰�ã�«ã€�ãƒ©ã‚¤ã‚»ãƒ³ã‚¹å¥‘ç´„æ›¸ã‚’ç¢ºèª�ã�—ã�¦ä¸‹ã�•ã�„ã€‚å¥‘ç´„æ›¸ã�®å…¨ã�¦ã�®æ�¡ä»¶ã�«å�Œæ„�ã�™ã‚‹ã�ªã‚‰ã�°ã€�ä¸‹ã�«è¡¨ç¤ºã�•ã‚Œã�¦ã�„ã‚‹ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã�®ã�†ã�¡ã€�æœ€åˆ�ã�®ã‚‚ã�®ã‚’é�¸ã‚“ã�§ä¸‹ã�•ã�„ã€‚ $_CLICK
 # ^UnLicenseText
-$(^NameDA)‚ðƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚·‚é‘O‚É�Aƒ‰ƒCƒZƒ“ƒXŒ_–ñ�‘‚ðŠm”F‚µ‚Ä‰º‚³‚¢�BŒ_–ñ�‘‚Ì‘S‚Ä‚Ì�ðŒ�‚É“¯ˆÓ‚·‚é‚È‚ç‚Î�A[“¯ˆÓ‚·‚é] ƒ{ƒ^ƒ“‚ðƒNƒŠƒbƒN‚µ‚Ä‰º‚³‚¢�B
+$(^NameDA)ã‚’ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹å‰�ã�«ã€�ãƒ©ã‚¤ã‚»ãƒ³ã‚¹å¥‘ç´„æ›¸ã‚’ç¢ºèª�ã�—ã�¦ä¸‹ã�•ã�„ã€‚å¥‘ç´„æ›¸ã�®å…¨ã�¦ã�®æ�¡ä»¶ã�«å�Œæ„�ã�™ã‚‹ã�ªã‚‰ã�°ã€�[å�Œæ„�ã�™ã‚‹] ãƒœã‚¿ãƒ³ã‚’ã‚¯ãƒªãƒƒã‚¯ã�—ã�¦ä¸‹ã�•ã�„ã€‚
 # ^UnLicenseTextCB
-$(^NameDA)‚ðƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚·‚é‘O‚É�Aƒ‰ƒCƒZƒ“ƒXŒ_–ñ�‘‚ðŠm”F‚µ‚Ä‰º‚³‚¢�BŒ_–ñ�‘‚Ì‘S‚Ä‚Ì�ðŒ�‚É“¯ˆÓ‚·‚é‚È‚ç‚Î�A‰º‚Ìƒ`ƒFƒbƒNƒ{ƒbƒNƒX‚ðƒNƒŠƒbƒN‚µ‚Ä‰º‚³‚¢�B $_CLICK
+$(^NameDA)ã‚’ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹å‰�ã�«ã€�ãƒ©ã‚¤ã‚»ãƒ³ã‚¹å¥‘ç´„æ›¸ã‚’ç¢ºèª�ã�—ã�¦ä¸‹ã�•ã�„ã€‚å¥‘ç´„æ›¸ã�®å…¨ã�¦ã�®æ�¡ä»¶ã�«å�Œæ„�ã�™ã‚‹ã�ªã‚‰ã�°ã€�ä¸‹ã�®ãƒ�ã‚§ãƒƒã‚¯ãƒœãƒƒã‚¯ã‚¹ã‚’ã‚¯ãƒªãƒƒã‚¯ã�—ã�¦ä¸‹ã�•ã�„ã€‚ $_CLICK
 # ^UnLicenseTextRB
-$(^NameDA)‚ðƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚·‚é‘O‚É�Aƒ‰ƒCƒZƒ“ƒXŒ_–ñ�‘‚ðŠm”F‚µ‚Ä‰º‚³‚¢�BŒ_–ñ�‘‚Ì‘S‚Ä‚Ì�ðŒ�‚É“¯ˆÓ‚·‚é‚È‚ç‚Î�A‰º‚É•\Ž¦‚³‚ê‚Ä‚¢‚éƒIƒvƒVƒ‡ƒ“‚Ì‚¤‚¿�A�Å�‰‚Ì‚à‚Ì‚ð‘I‚ñ‚Å‰º‚³‚¢�B $_CLICK
+$(^NameDA)ã‚’ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹å‰�ã�«ã€�ãƒ©ã‚¤ã‚»ãƒ³ã‚¹å¥‘ç´„æ›¸ã‚’ç¢ºèª�ã�—ã�¦ä¸‹ã�•ã�„ã€‚å¥‘ç´„æ›¸ã�®å…¨ã�¦ã�®æ�¡ä»¶ã�«å�Œæ„�ã�™ã‚‹ã�ªã‚‰ã�°ã€�ä¸‹ã�«è¡¨ç¤ºã�•ã‚Œã�¦ã�„ã‚‹ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã�®ã�†ã�¡ã€�æœ€åˆ�ã�®ã‚‚ã�®ã‚’é�¸ã‚“ã�§ä¸‹ã�•ã�„ã€‚ $_CLICK
 # ^Custom
-ƒJƒXƒ^ƒ€
+ã‚«ã‚¹ã‚¿ãƒ 
 # ^ComponentsText
-ƒCƒ“ƒXƒg�[ƒ‹‚µ‚½‚¢ƒRƒ“ƒ|�[ƒlƒ“ƒg‚Éƒ`ƒFƒbƒN‚ð•t‚¯‚Ä‰º‚³‚¢�B•s—v‚È‚à‚Ì‚É‚Â‚¢‚Ä‚Í�Aƒ`ƒFƒbƒN‚ðŠO‚µ‚Ä‰º‚³‚¢�B $_CLICK
+ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�—ã�Ÿã�„ã‚³ãƒ³ãƒ�ãƒ¼ãƒ�ãƒ³ãƒˆã�«ãƒ�ã‚§ãƒƒã‚¯ã‚’ä»˜ã�‘ã�¦ä¸‹ã�•ã�„ã€‚ä¸�è¦�ã�ªã‚‚ã�®ã�«ã�¤ã�„ã�¦ã�¯ã€�ãƒ�ã‚§ãƒƒã‚¯ã‚’å¤–ã�—ã�¦ä¸‹ã�•ã�„ã€‚ $_CLICK
 # ^ComponentsSubText1
-ƒCƒ“ƒXƒg�[ƒ‹ ƒ^ƒCƒv‚ð‘I‘ð�F
+ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« ã‚¿ã‚¤ãƒ—ã‚’é�¸æŠžï¼š
 # ^ComponentsSubText2_NoInstTypes
-ƒCƒ“ƒXƒg�[ƒ‹ ƒRƒ“ƒ|�[ƒlƒ“ƒg‚ð‘I‘ð�F
+ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« ã‚³ãƒ³ãƒ�ãƒ¼ãƒ�ãƒ³ãƒˆã‚’é�¸æŠžï¼š
 # ^ComponentsSubText2
-‚Ü‚½‚Í�AƒCƒ“ƒXƒg�[ƒ‹ ƒIƒvƒVƒ‡ƒ“ ƒRƒ“ƒ|�[ƒlƒ“ƒg‚ð‘I‘ð�F
+ã�¾ã�Ÿã�¯ã€�ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« ã‚ªãƒ—ã‚·ãƒ§ãƒ³ ã‚³ãƒ³ãƒ�ãƒ¼ãƒ�ãƒ³ãƒˆã‚’é�¸æŠžï¼š
 # ^UnComponentsText
-ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚µ‚½‚¢ƒRƒ“ƒ|�[ƒlƒ“ƒg‚Éƒ`ƒFƒbƒN‚ð•t‚¯‚Ä‰º‚³‚¢�B‚»‚¤‚Å‚È‚¢‚à‚Ì‚É‚Â‚¢‚Ä‚Í�Aƒ`ƒFƒbƒN‚ðŠO‚µ‚Ä‰º‚³‚¢�B $_CLICK
+ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�—ã�Ÿã�„ã‚³ãƒ³ãƒ�ãƒ¼ãƒ�ãƒ³ãƒˆã�«ãƒ�ã‚§ãƒƒã‚¯ã‚’ä»˜ã�‘ã�¦ä¸‹ã�•ã�„ã€‚ã��ã�†ã�§ã�ªã�„ã‚‚ã�®ã�«ã�¤ã�„ã�¦ã�¯ã€�ãƒ�ã‚§ãƒƒã‚¯ã‚’å¤–ã�—ã�¦ä¸‹ã�•ã�„ã€‚ $_CLICK
 # ^UnComponentsSubText1
-ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹ ƒ^ƒCƒv‚ð‘I‘ð�F
+ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« ã‚¿ã‚¤ãƒ—ã‚’é�¸æŠžï¼š
 # ^UnComponentsSubText2_NoInstTypes
-ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹ ƒRƒ“ƒ|�[ƒlƒ“ƒg‚ð‘I‘ð�F
+ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« ã‚³ãƒ³ãƒ�ãƒ¼ãƒ�ãƒ³ãƒˆã‚’é�¸æŠžï¼š
 # ^UnComponentsSubText2
-‚Ü‚½‚Í�AƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹ ƒIƒvƒVƒ‡ƒ“ ƒRƒ“ƒ|�[ƒlƒ“ƒg‚ð‘I‘ð�F
+ã�¾ã�Ÿã�¯ã€�ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« ã‚ªãƒ—ã‚·ãƒ§ãƒ³ ã‚³ãƒ³ãƒ�ãƒ¼ãƒ�ãƒ³ãƒˆã‚’é�¸æŠžï¼š
 # ^DirText
-$(^NameDA)‚ðˆÈ‰º‚ÌƒtƒHƒ‹ƒ_‚ÉƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ü‚·�BˆÙ‚È‚Á‚½ƒtƒHƒ‹ƒ_‚ÉƒCƒ“ƒXƒg�[ƒ‹‚·‚é‚É‚Í�A[ŽQ�Æ] ‚ð‰Ÿ‚µ‚Ä�A•Ê‚ÌƒtƒHƒ‹ƒ_‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢�B $_CLICK
+$(^NameDA)ã‚’ä»¥ä¸‹ã�®ãƒ•ã‚©ãƒ«ãƒ€ã�«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�—ã�¾ã�™ã€‚ç•°ã�ªã�£ã�Ÿãƒ•ã‚©ãƒ«ãƒ€ã�«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹ã�«ã�¯ã€�[å�‚ç…§] ã‚’æŠ¼ã�—ã�¦ã€�åˆ¥ã�®ãƒ•ã‚©ãƒ«ãƒ€ã‚’é�¸æŠžã�—ã�¦ã��ã� ã�•ã�„ã€‚ $_CLICK
 # ^DirSubText
-ƒCƒ“ƒXƒg�[ƒ‹�æ ƒtƒHƒ‹ƒ_
+ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆ ãƒ•ã‚©ãƒ«ãƒ€
 # ^DirBrowseText
-$(^NameDA)‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚éƒtƒHƒ‹ƒ_‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢�F
+$(^NameDA)ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹ãƒ•ã‚©ãƒ«ãƒ€ã‚’é�¸æŠžã�—ã�¦ã��ã� ã�•ã�„ï¼š
 # ^UnDirText
-$(^NameDA)‚ðˆÈ‰º‚ÌƒtƒHƒ‹ƒ_‚©‚çƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ü‚·�BˆÙ‚È‚Á‚½ƒtƒHƒ‹ƒ_‚©‚çƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚·‚é‚É‚Í�A[ŽQ�Æ] ‚ð‰Ÿ‚µ‚Ä�A•Ê‚ÌƒtƒHƒ‹ƒ_‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢�B $_CLICK
+$(^NameDA)ã‚’ä»¥ä¸‹ã�®ãƒ•ã‚©ãƒ«ãƒ€ã�‹ã‚‰ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�—ã�¾ã�™ã€‚ç•°ã�ªã�£ã�Ÿãƒ•ã‚©ãƒ«ãƒ€ã�‹ã‚‰ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹ã�«ã�¯ã€�[å�‚ç…§] ã‚’æŠ¼ã�—ã�¦ã€�åˆ¥ã�®ãƒ•ã‚©ãƒ«ãƒ€ã‚’é�¸æŠžã�—ã�¦ã��ã� ã�•ã�„ã€‚ $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-$(^NameDA)‚ðƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚·‚éƒtƒHƒ‹ƒ_‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢�F
+$(^NameDA)ã‚’ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�™ã‚‹ãƒ•ã‚©ãƒ«ãƒ€ã‚’é�¸æŠžã�—ã�¦ã��ã� ã�•ã�„ï¼š
 # ^SpaceAvailable
-—˜—p‰Â”\‚ÈƒfƒBƒXƒNƒXƒy�[ƒX�F 
+åˆ©ç”¨å�¯èƒ½ã�ªãƒ‡ã‚£ã‚¹ã‚¯ã‚¹ãƒšãƒ¼ã‚¹ï¼š 
 # ^SpaceRequired
-•K—v‚ÈƒfƒBƒXƒNƒXƒy�[ƒX�F 
+å¿…è¦�ã�ªãƒ‡ã‚£ã‚¹ã‚¯ã‚¹ãƒšãƒ¼ã‚¹ï¼š 
 # ^UninstallingText
-$(^NameDA)‚Í�AˆÈ‰º‚ÌƒtƒHƒ‹ƒ_‚©‚çƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚³‚ê‚Ü‚·�B $_CLICK
+$(^NameDA)ã�¯ã€�ä»¥ä¸‹ã�®ãƒ•ã‚©ãƒ«ãƒ€ã�‹ã‚‰ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�•ã‚Œã�¾ã�™ã€‚ $_CLICK
 # ^UninstallingSubText
-ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹Œ³�F
+ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ƒï¼š
 # ^FileError
-�‰Šúƒtƒ@ƒCƒ‹‚Ì�ì�¬ƒGƒ‰�[�F\r\n\t"$0"\r\nƒCƒ“ƒXƒg�[ƒ‹‚ð’†Ž~‚·‚é‚É‚Í’†Ž~‚ð,\r\n�Ä‚Ñ‚±‚Ìƒtƒ@ƒCƒ‹‚Ì�ì�¬‚ðŽŽ‚Ý‚é‚É‚Í�ÄŽŽ�s‚ð, ‚Ü‚½\r\n‚±‚Ìƒtƒ@ƒCƒ‹‚ðƒXƒLƒbƒv‚µ‚Ä‘±‚¯‚é‚É‚Í–³Ž‹‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢
+åˆ�æœŸãƒ•ã‚¡ã‚¤ãƒ«ã�®ä½œæˆ�ã‚¨ãƒ©ãƒ¼ï¼š\r\n\t"$0"\r\nã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ä¸­æ­¢ã�™ã‚‹ã�«ã�¯ä¸­æ­¢ã‚’,\r\nå†�ã�³ã�“ã�®ãƒ•ã‚¡ã‚¤ãƒ«ã�®ä½œæˆ�ã‚’è©¦ã�¿ã‚‹ã�«ã�¯å†�è©¦è¡Œã‚’, ã�¾ã�Ÿ\r\nã�“ã�®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã‚¹ã‚­ãƒƒãƒ—ã�—ã�¦ç¶šã�‘ã‚‹ã�«ã�¯ç„¡è¦–ã‚’æŠ¼ã�—ã�¦ã��ã� ã�•ã�„
 # ^FileError_NoIgnore
-�‰Šúƒtƒ@ƒCƒ‹‚Ì�ì�¬ƒGƒ‰�[: \r\n\t"$0"\r\n�Ä‚Ñ‚±‚Ìƒtƒ@ƒCƒ‹‚Ì�ì�¬‚ðŽŽ‚Ý‚é‚É‚Í�ÄŽŽ�s‚ð, ‚Ü‚½\r\nƒCƒ“ƒXƒg�[ƒ‹‚ð’†Ž~‚·‚é‚É‚ÍƒLƒƒƒ“ƒZƒ‹‚ð‰Ÿ‚µ‚Ä‰º‚³‚¢
+åˆ�æœŸãƒ•ã‚¡ã‚¤ãƒ«ã�®ä½œæˆ�ã‚¨ãƒ©ãƒ¼: \r\n\t"$0"\r\nå†�ã�³ã�“ã�®ãƒ•ã‚¡ã‚¤ãƒ«ã�®ä½œæˆ�ã‚’è©¦ã�¿ã‚‹ã�«ã�¯å†�è©¦è¡Œã‚’, ã�¾ã�Ÿ\r\nã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ä¸­æ­¢ã�™ã‚‹ã�«ã�¯ã‚­ãƒ£ãƒ³ã‚»ãƒ«ã‚’æŠ¼ã�—ã�¦ä¸‹ã�•ã�„
 # ^CantWrite
-�ì�¬‚Å‚«‚Ü‚¹‚ñ�F
+ä½œæˆ�ã�§ã��ã�¾ã�›ã‚“ï¼š
 # ^CopyFailed
-ƒRƒs�[‚ÍŽ¸”s‚µ‚Ü‚µ‚½
+ã‚³ãƒ”ãƒ¼ã�¯å¤±æ•—ã�—ã�¾ã�—ã�Ÿ
 # ^CopyTo
-ƒRƒs�[‚µ‚Ü‚·
+ã‚³ãƒ”ãƒ¼ã�—ã�¾ã�™
 # ^Registering
-“o˜^’†:
+ç™»éŒ²ä¸­:
 # ^Unregistering
-“o˜^‰ð�œ’†:
+ç™»éŒ²è§£é™¤ä¸­:
 # ^SymbolNotFound
-ƒVƒ“ƒ{ƒ‹‚ðŒ©‚Â‚¯‚é‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ�F
+ã‚·ãƒ³ãƒœãƒ«ã‚’è¦‹ã�¤ã�‘ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�›ã‚“ï¼š
 # ^CouldNotLoad
-ƒ��[ƒh‚·‚é‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ�F
+ãƒ­ãƒ¼ãƒ‰ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�›ã‚“ï¼š
 # ^CreateFolder
-ƒtƒHƒ‹ƒ_‚Ì�ì�¬�F
+ãƒ•ã‚©ãƒ«ãƒ€ã�®ä½œæˆ�ï¼š
 # ^CreateShortcut
-ƒVƒ‡�[ƒgƒJƒbƒg‚Ì�ì�¬�F
+ã‚·ãƒ§ãƒ¼ãƒˆã‚«ãƒƒãƒˆã�®ä½œæˆ�ï¼š
 # ^CreatedUninstaller
-ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‰‚Ì�ì�¬�F
+ã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã�®ä½œæˆ�ï¼š
 # ^Delete
-ƒtƒ@ƒCƒ‹‚Ì�í�œ�F
+ãƒ•ã‚¡ã‚¤ãƒ«ã�®å‰Šé™¤ï¼š
 # ^DeleteOnReboot
-ƒŠƒu�[ƒgŽž‚É�í�œ�F
+ãƒªãƒ–ãƒ¼ãƒˆæ™‚ã�«å‰Šé™¤ï¼š
 # ^ErrorCreatingShortcut
-ƒVƒ‡�[ƒgƒJƒbƒg‚Ì�ì�¬ƒGƒ‰�[�F
+ã‚·ãƒ§ãƒ¼ãƒˆã‚«ãƒƒãƒˆã�®ä½œæˆ�ã‚¨ãƒ©ãƒ¼ï¼š
 # ^ErrorCreating
-�ì�¬ƒGƒ‰�[�F
+ä½œæˆ�ã‚¨ãƒ©ãƒ¼ï¼š
 # ^ErrorDecompressing
-ƒf�[ƒ^‚Ì’Š�oƒGƒ‰�[\r\n\r\nƒCƒ“ƒXƒg�[ƒ‰‚ª”j‘¹‚µ‚Ä‚¢‚Ü‚·�B
+ãƒ‡ãƒ¼ã‚¿ã�®æŠ½å‡ºã‚¨ãƒ©ãƒ¼\r\n\r\nã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã�Œç ´æ��ã�—ã�¦ã�„ã�¾ã�™ã€‚
 # ^ErrorRegistering
-DLL‚Ì“o˜^ƒGƒ‰�[
+DLLã�®ç™»éŒ²ã‚¨ãƒ©ãƒ¼
 # ^ExecShell
-Šg’£Žq‚ÌŠÖ˜A•t‚¯ŽÀ�s: 
+æ‹¡å¼µå­�ã�®é–¢é€£ä»˜ã�‘å®Ÿè¡Œ: 
 # ^Execute
-ŽÀ�s�F
+å®Ÿè¡Œï¼š
 # ^Extract
-’Š�o�F
+æŠ½å‡ºï¼š
 # ^ErrorWriting
-’Š�o�Fƒtƒ@ƒCƒ‹�ì�¬ƒGƒ‰�[
+æŠ½å‡ºï¼šãƒ•ã‚¡ã‚¤ãƒ«ä½œæˆ�ã‚¨ãƒ©ãƒ¼
 # ^InvalidOpcode
-ƒCƒ“ƒXƒg�[ƒ‹‚Ì•s�³�F–³Œø‚Èopcode
+ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�®ä¸�æ­£ï¼šç„¡åŠ¹ã�ªopcode
 # ^NoOLE
-OLE‚ª‚ ‚è‚Ü‚¹‚ñ�F
+OLEã�Œã�‚ã‚Šã�¾ã�›ã‚“ï¼š
 # ^OutputFolder
-�o—Í�æƒtƒHƒ‹ƒ_�F
+å‡ºåŠ›å…ˆãƒ•ã‚©ãƒ«ãƒ€ï¼š
 # ^RemoveFolder
-ƒtƒHƒ‹ƒ_‚Ì�í�œ�F
+ãƒ•ã‚©ãƒ«ãƒ€ã�®å‰Šé™¤ï¼š
 # ^RenameOnReboot
-ƒŠƒu�[ƒgŽž‚É–¼‘O‚Ì•Ï�X�F
+ãƒªãƒ–ãƒ¼ãƒˆæ™‚ã�«å��å‰�ã�®å¤‰æ›´ï¼š
 # ^Rename
-–¼‘O‚Ì•Ï�X�F
+å��å‰�ã�®å¤‰æ›´ï¼š
 # ^Skipped
-ƒXƒLƒbƒv�F
+ã‚¹ã‚­ãƒƒãƒ—ï¼š
 # ^CopyDetails
-ƒNƒŠƒbƒvƒ{�[ƒh‚Ö�Ú�×‚ðƒRƒs�[
+ã‚¯ãƒªãƒƒãƒ—ãƒœãƒ¼ãƒ‰ã�¸è©³ç´°ã‚’ã‚³ãƒ”ãƒ¼
 # ^LogInstall
-ƒCƒ“ƒXƒg�[ƒ‹ƒvƒ�ƒZƒX‚ðƒ�ƒOƒw‹L˜^
+ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãƒ—ãƒ­ã‚»ã‚¹ã‚’ãƒ­ã‚°ãƒ˜è¨˜éŒ²
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Irish.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Irish.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Irish.nsh	(revision 2956)
@@ -1,121 +1,121 @@
-;Language: Irish (2108)
+ï»¿;Language: Irish (2108)
 ;By Kevin P. Scannell < scannell at slu dot edu >
 
-!insertmacro LANGFILE "Irish" "Irish"
+!insertmacro LANGFILE "Irish" = "Gaeilge" =
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Fáilte go dtí Draoi Suiteála $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Déanfaidh an draoi seo treorú duit tríd an suiteáil de $(^NameDA).$\r$\n$\r$\nMoltar duit gach feidhmchlár eile a dhúnadh sula dtosaíonn tú an Suiteálaí. Cinnteoidh sé seo gur féidir na comhaid oiriúnacha a nuashonrú gan do ríomhaire a atosú.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "FÃ¡ilte go dtÃ­ Draoi SuiteÃ¡la $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "DÃ©anfaidh an draoi seo treorÃº duit trÃ­d an suiteÃ¡il de $(^NameDA).$\r$\n$\r$\nMoltar duit gach feidhmchlÃ¡r eile a dhÃºnadh sula dtosaÃ­onn tÃº an SuiteÃ¡laÃ­. Cinnteoidh sÃ© seo gur fÃ©idir na comhaid oiriÃºnacha a nuashonrÃº gan do rÃ­omhaire a atosÃº.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Fáilte go dtí Draoi Díshuiteála $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Déanfaidh an draoi seo treorú duit tríd an díshuiteáil de $(^NameDA).$\r$\n$\r$\nBí cinnte nach bhfuil $(^NameDA) ag rith sula dtosaíonn tú an díshuiteáil.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "FÃ¡ilte go dtÃ­ Draoi DÃ­shuiteÃ¡la $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "DÃ©anfaidh an draoi seo treorÃº duit trÃ­d an dÃ­shuiteÃ¡il de $(^NameDA).$\r$\n$\r$\nBÃ­ cinnte nach bhfuil $(^NameDA) ag rith sula dtosaÃ­onn tÃº an dÃ­shuiteÃ¡il.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Comhaontú um Cheadúnas"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Déan iniúchadh ar choinníollacha an cheadúnais sula suiteálann tú $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Má ghlacann tú le coinníollacha an chomhaontaithe, cliceáil $\"Glacaim Leis$\" chun leanúint ar aghaidh. Caithfidh tú glacadh leis an gcomhaontú chun $(^NameDA) a shuiteáil."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Má ghlacann tú le coinníollacha an chomhaontaithe, cliceáil an ticbhosca thíos. Caithfidh tú glacadh leis an gcomhaontú chun $(^NameDA) a shuiteáil. $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Má ghlacann tú le coinníollacha an chomhaontaithe, roghnaigh an chéad rogha thíos. Caithfidh tú glacadh leis an gcomhaontú chun $(^NameDA) a dhíshuiteáil. $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "ComhaontÃº um CheadÃºnas"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "DÃ©an iniÃºchadh ar choinnÃ­ollacha an cheadÃºnais sula suiteÃ¡lann tÃº $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "MÃ¡ ghlacann tÃº le coinnÃ­ollacha an chomhaontaithe, cliceÃ¡il $\"Glacaim Leis$\" chun leanÃºint ar aghaidh. Caithfidh tÃº glacadh leis an gcomhaontÃº chun $(^NameDA) a shuiteÃ¡il."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "MÃ¡ ghlacann tÃº le coinnÃ­ollacha an chomhaontaithe, cliceÃ¡il an ticbhosca thÃ­os. Caithfidh tÃº glacadh leis an gcomhaontÃº chun $(^NameDA) a shuiteÃ¡il. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "MÃ¡ ghlacann tÃº le coinnÃ­ollacha an chomhaontaithe, roghnaigh an chÃ©ad rogha thÃ­os. Caithfidh tÃº glacadh leis an gcomhaontÃº chun $(^NameDA) a dhÃ­shuiteÃ¡il. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Comhaontú um Cheadúnas"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Déan iniúchadh ar choinníollacha an cheadúnais sula ndíshuiteálann tú $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Má ghlacann tú le coinníollacha an chomhaontaithe, cliceáil $\"Glacaim Leis$\" chun leanúint ar aghaidh. Caithfidh tú glacadh leis an gcomhaontú chun $(^NameDA) a dhíshuiteáil."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Má ghlacann tú le coinníollacha an chomhaontaithe, cliceáil an ticbhosca thíos. Caithfidh tú glacadh leis an gcomhaontú chun $(^NameDA) a dhíshuiteáil. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Má ghlacann tú le coinníollacha an chomhaontaithe, roghnaigh an chéad rogha thíos. Caithfidh tú glacadh leis an gcomhaontú chun $(^NameDA) a dhíshuiteáil. $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "ComhaontÃº um CheadÃºnas"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "DÃ©an iniÃºchadh ar choinnÃ­ollacha an cheadÃºnais sula ndÃ­shuiteÃ¡lann tÃº $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "MÃ¡ ghlacann tÃº le coinnÃ­ollacha an chomhaontaithe, cliceÃ¡il $\"Glacaim Leis$\" chun leanÃºint ar aghaidh. Caithfidh tÃº glacadh leis an gcomhaontÃº chun $(^NameDA) a dhÃ­shuiteÃ¡il."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "MÃ¡ ghlacann tÃº le coinnÃ­ollacha an chomhaontaithe, cliceÃ¡il an ticbhosca thÃ­os. Caithfidh tÃº glacadh leis an gcomhaontÃº chun $(^NameDA) a dhÃ­shuiteÃ¡il. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "MÃ¡ ghlacann tÃº le coinnÃ­ollacha an chomhaontaithe, roghnaigh an chÃ©ad rogha thÃ­os. Caithfidh tÃº glacadh leis an gcomhaontÃº chun $(^NameDA) a dhÃ­shuiteÃ¡il. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Brúigh $\"Page Down$\" chun an chuid eile den cheadúnas a léamh."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "BrÃºigh $\"Page Down$\" chun an chuid eile den cheadÃºnas a lÃ©amh."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Roghnaigh Comhpháirteanna"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Roghnaigh na gnéithe $(^NameDA) ba mhaith leat suiteáil."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Roghnaigh ComhphÃ¡irteanna"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Roghnaigh na gnÃ©ithe $(^NameDA) ba mhaith leat suiteÃ¡il."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Roghnaigh Comhpháirteanna"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Roghnaigh na gnéithe $(^NameDA) ba mhaith leat díshuiteáil."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Roghnaigh ComhphÃ¡irteanna"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Roghnaigh na gnÃ©ithe $(^NameDA) ba mhaith leat dÃ­shuiteÃ¡il."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Cur Síos"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Cur SÃ­os"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Cuir do luch os cionn comhpháirte chun cur síos a fheiceáil."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Cuir do luch os cionn comhphÃ¡irte chun cur sÃ­os a fheiceÃ¡il."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Cuir do luch os cionn comhpháirte chun cur síos a fheiceáil."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Roghnaigh comhphÃ¡irt chun cur sÃ­os a fheiceÃ¡il."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Roghnaigh Suíomh na Suiteála"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Roghnaigh an fillteán inar mian leat $(^NameDA) a shuiteáil."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Roghnaigh SuÃ­omh na SuiteÃ¡la"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Roghnaigh an fillteÃ¡n inar mian leat $(^NameDA) a shuiteÃ¡il."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Roghnaigh Suíomh na Díshuiteála"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Roghnaigh an fillteán ar mian leat $(^NameDA) a dhíshuiteáil as."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Roghnaigh SuÃ­omh na DÃ­shuiteÃ¡la"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Roghnaigh an fillteÃ¡n ar mian leat $(^NameDA) a dhÃ­shuiteÃ¡il as."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Á Shuiteáil"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Fan go fóill; $(^NameDA) á shuiteáil."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Suiteáil Críochnaithe"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "D'éirigh leis an tsuiteáil."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Suiteáil Tobscortha"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Níor éirigh leis an tsuiteáil."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Ã� ShuiteÃ¡il"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Fan go fÃ³ill; $(^NameDA) Ã¡ shuiteÃ¡il."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "SuiteÃ¡il CrÃ­ochnaithe"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "D'Ã©irigh leis an tsuiteÃ¡il."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "SuiteÃ¡il Tobscortha"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "NÃ­or Ã©irigh leis an tsuiteÃ¡il."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Á Dhíshuiteáil"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Fan go fóill; $(^NameDA) á dhíshuiteáil."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Díshuiteáil Críochnaithe"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "D'éirigh leis an díshuiteáil."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Díshuiteáil Tobscortha"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Níor éirigh leis an díshuiteáil."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Ã� DhÃ­shuiteÃ¡il"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Fan go fÃ³ill; $(^NameDA) Ã¡ dhÃ­shuiteÃ¡il."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "DÃ­shuiteÃ¡il CrÃ­ochnaithe"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "D'Ã©irigh leis an dÃ­shuiteÃ¡il."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "DÃ­shuiteÃ¡il Tobscortha"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "NÃ­or Ã©irigh leis an dÃ­shuiteÃ¡il."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Draoi Suiteála $(^NameDA) á Chríochnú"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Suiteáladh $(^NameDA) ar do ríomhaire.$\r$\n$\r$\nCliceáil $\"Críochnaigh$\" chun an draoi seo a dhúnadh."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Ní mór duit do ríomhaire a atosú chun suiteáil $(^NameDA) a chur i gcrích. Ar mhaith leat atosú anois?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Draoi SuiteÃ¡la $(^NameDA) Ã¡ ChrÃ­ochnÃº"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "SuiteÃ¡ladh $(^NameDA) ar do rÃ­omhaire.$\r$\n$\r$\nCliceÃ¡il $\"CrÃ­ochnaigh$\" chun an draoi seo a dhÃºnadh."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "NÃ­ mÃ³r duit do rÃ­omhaire a atosÃº chun suiteÃ¡il $(^NameDA) a chur i gcrÃ­ch. Ar mhaith leat atosÃº anois?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Draoi Díshuiteála $(^NameDA) á Chríochnú"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Díshuiteáladh $(^NameDA) ó do ríomhaire.$\r$\n$\r$\nCliceáil $\"Críochnaigh$\" chun an draoi seo a dhúnadh."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Ní mór duit do ríomhaire a atosú chun díshuiteáil $(^NameDA) a chur i gcrích. Ar mhaith leat atosú anois?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Draoi DÃ­shuiteÃ¡la $(^NameDA) Ã¡ ChrÃ­ochnÃº"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "DÃ­shuiteÃ¡ladh $(^NameDA) Ã³ do rÃ­omhaire.$\r$\n$\r$\nCliceÃ¡il $\"CrÃ­ochnaigh$\" chun an draoi seo a dhÃºnadh."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "NÃ­ mÃ³r duit do rÃ­omhaire a atosÃº chun dÃ­shuiteÃ¡il $(^NameDA) a chur i gcrÃ­ch. Ar mhaith leat atosÃº anois?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
   ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Atosaigh anois"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Atosóidh mé de láimh níos déanaí"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "AtosÃ³idh mÃ© de lÃ¡imh nÃ­os dÃ©anaÃ­"
   ${LangFileString} MUI_TEXT_FINISH_RUN "&Rith $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Tai&speáin comhad README"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Críochnaigh"  
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Tai&speÃ¡in comhad README"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&CrÃ­ochnaigh"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Roghnaigh Fillteán sa Roghchlár Tosaigh"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Roghnaigh fillteán sa Roghchlár Tosaigh a gcuirfear aicearraí $(^NameDA) ann."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Roghnaigh an fillteán sa Roghchlár Tosaigh inar mian leat aicearraí an chláir a chruthú. Is féidir freisin fillteán nua a chruthú trí ainm nua a iontráil."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ná cruthaigh aicearraí"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Roghnaigh FillteÃ¡n sa RoghchlÃ¡r Tosaigh"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Roghnaigh fillteÃ¡n sa RoghchlÃ¡r Tosaigh a gcuirfear aicearraÃ­ $(^NameDA) ann."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Roghnaigh an fillteÃ¡n sa RoghchlÃ¡r Tosaigh inar mian leat aicearraÃ­ an chlÃ¡ir a chruthÃº. Is fÃ©idir freisin fillteÃ¡n nua a chruthÃº trÃ­ ainm nua a iontrÃ¡il."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "NÃ¡ cruthaigh aicearraÃ­"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Díshuiteáil $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Bain $(^NameDA) ó do ríomhaire."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "DÃ­shuiteÃ¡il $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Bain $(^NameDA) Ã³ do rÃ­omhaire."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "An bhfuil tú cinnte gur mian leat Suiteálaí $(^Name) a scor?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "An bhfuil tÃº cinnte gur mian leat SuiteÃ¡laÃ­ $(^Name) a scor?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "An bhfuil tú cinnte gur mian leat Díshuiteálaí $(^Name) a scor?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "An bhfuil tÃº cinnte gur mian leat DÃ­shuiteÃ¡laÃ­ $(^Name) a scor?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Bosnian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Bosnian.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Bosnian.nlf	(revision 2956)
@@ -1,11 +1,11 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 5146
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1250
 # RTL - anything else than RTL means LTR
 -
@@ -17,7 +17,7 @@
 # ^UninstallCaption
 $(^Name) Uklanjanje
 # ^LicenseSubCaption
-: Licencno pravo korištenja
+: Licencno pravo koriÅ¡tenja
 # ^ComponentsSubCaption
 : Opcije instalacije
 # ^DirSubCaption
@@ -25,7 +25,7 @@
 # ^InstallingSubCaption
 : Instaliranje
 # ^CompletedSubCaption
-: Završeno
+: ZavrÅ¡eno
 # ^UnComponentsSubCaption
 : Opcije uklanjanja
 # ^UnDirSubCaption
@@ -35,7 +35,7 @@
 # ^UninstallingSubCaption
 : Uklanjanje
 # ^UnCompletedSubCaption
-: Završeno uklanjanje
+: ZavrÅ¡eno uklanjanje
 # ^BackBtn
 < &Nazad
 # ^NextBtn
@@ -57,75 +57,75 @@
 # ^BrowseBtn
 &Pregledaj...
 # ^ShowDetailsBtn
-Prikaži &detalje
+PrikaÅ¾i &detalje
 # ^ClickNext
 Pritisnite dugme 'Dalje' za nastavak.
 # ^ClickInstall
-Pritisnite dugme 'Instaliraj' za poèetak instalacije.
+Pritisnite dugme 'Instaliraj' za poÄ�etak instalacije.
 # ^ClickUninstall
-Pritisnite dugme 'Ukloni' za poèetak uklanjanja.
+Pritisnite dugme 'Ukloni' za poÄ�etak uklanjanja.
 # ^Name
 Ime
 # ^Completed
-Završeno
+ZavrÅ¡eno
 # ^LicenseText
-Molim proèitajte licencu prije instaliranja programa $(^NameDA). Ukoliko prihvatate sve uvjete ugovora, odaberite 'Prihvatam'.
+Molim proÄ�itajte licencu prije instaliranja programa $(^NameDA). Ukoliko prihvatate sve uvjete ugovora, odaberite 'Prihvatam'.
 # ^LicenseTextCB
-Molim proèitajte licencu prije instaliranja programa $(^NameDA). Ukoliko prihvatate sve uvjete ugovora, oznaèite donji kvadratiæ. $_CLICK
+Molim proÄ�itajte licencu prije instaliranja programa $(^NameDA). Ukoliko prihvatate sve uvjete ugovora, oznaÄ�ite donji kvadratiÄ‡. $_CLICK
 # ^LicenseTextRB
-Molim proèitajte licencu prije instaliranja programa $(^NameDA). Ukoliko prihvatate sve uvjete ugovora, odaberite prvu donju opciju. $_CLICK
+Molim proÄ�itajte licencu prije instaliranja programa $(^NameDA). Ukoliko prihvatate sve uvjete ugovora, odaberite prvu donju opciju. $_CLICK
 # ^UnLicenseText
-Molim proèitajte licencu prije uklanjanja programa $(^NameDA). Ukoliko prihvatate sve uvjete ugovora, odaberite 'Prihvatam'.
+Molim proÄ�itajte licencu prije uklanjanja programa $(^NameDA). Ukoliko prihvatate sve uvjete ugovora, odaberite 'Prihvatam'.
 # ^UnLicenseTextCB
-Molim proèitajte licencu prije uklanjanja programa $(^NameDA). Ako prihvatate sve uvjete ugovora, obilježite donji kvadratiæ. $_CLICK
+Molim proÄ�itajte licencu prije uklanjanja programa $(^NameDA). Ako prihvatate sve uvjete ugovora, obiljeÅ¾ite donji kvadratiÄ‡. $_CLICK
 # ^UnLicenseTextRB
-Molim proèitajte licencu prije uklanjanja programa $(^NameDA). Ukoliko prihvatate sve uvjete ugovora, odaberite prvu opciju ispod. $_CLICK
+Molim proÄ�itajte licencu prije uklanjanja programa $(^NameDA). Ukoliko prihvatate sve uvjete ugovora, odaberite prvu opciju ispod. $_CLICK
 # ^Custom
-Podešavanje
+PodeÅ¡avanje
 # ^ComponentsText
-Oznaèite komponente koje želite instalirati. Instaliraju se samo oznaèene komponente. Uklonite oznaku sa onih koje ne želite instalirati. $_CLICK
+OznaÄ�ite komponente koje Å¾elite instalirati. Instaliraju se samo oznaÄ�ene komponente. Uklonite oznaku sa onih koje ne Å¾elite instalirati. $_CLICK
 # ^ComponentsSubText1
 Izaberite tip instalacije:
 # ^ComponentsSubText2_NoInstTypes
 Odaberite komponente za instalaciju:
 # ^ComponentsSubText2
-Ili po izboru oznaèite komponente koje želite instalirati:
+Ili po izboru oznaÄ�ite komponente koje Å¾elite instalirati:
 # ^UnComponentsText
-Oznaèite komponente koje želite ukloniti. Uklonite oznaku sa onih koje ne želite ukloniti. $_CLICK
+OznaÄ�ite komponente koje Å¾elite ukloniti. Uklonite oznaku sa onih koje ne Å¾elite ukloniti. $_CLICK
 # ^UnComponentsSubText1
 Izaberite tip uklanjanja:
 # ^UnComponentsSubText2_NoInstTypes
 Izaberite komponente za uklanjanje:
 # ^UnComponentsSubText2
-Ili po izboru odaberite komponente koje želite da uklonite:
+Ili po izboru odaberite komponente koje Å¾elite da uklonite:
 # ^DirText
-Program $(^NameDA) æe biti instaliran u sljedeæu mapu. Za instalaciju na neku drugu mapu odaberite 'Pregledaj...' i odaberite drugu mapu. $_CLICK
+Program $(^NameDA) Ä‡e biti instaliran u sljedeÄ‡u mapu. Za instalaciju na neku drugu mapu odaberite 'Pregledaj...' i odaberite drugu mapu. $_CLICK
 # ^DirSubText
-Odredišna mapa
+OdrediÅ¡na mapa
 # ^DirBrowseText
-Izaberite mapu u koju želite instalirati program $(^NameDA):
+Izaberite mapu u koju Å¾elite instalirati program $(^NameDA):
 # ^UnDirText
-Program $(^NameDA) æe biti uklonjen iz navedene mape. Za uklanjanje iz druge mape odaberite 'Pregledaj...' i oznaèite drugu mapu. $_CLICK
+Program $(^NameDA) Ä‡e biti uklonjen iz navedene mape. Za uklanjanje iz druge mape odaberite 'Pregledaj...' i oznaÄ�ite drugu mapu. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Izaberite mapu iz koje æete program $(^NameDA) ukloniti:
+Izaberite mapu iz koje Ä‡ete program $(^NameDA) ukloniti:
 # ^SpaceAvailable
 "Slobodno prostora na disku: "
 # ^SpaceRequired
 "Potrebno prostora na disku: "
 # ^UninstallingText
-Program $(^NameDA) æe biti uklonjen iz sljedeæe mape. $_CLICK
+Program $(^NameDA) Ä‡e biti uklonjen iz sljedeÄ‡e mape. $_CLICK
 # ^UninstallingSubText
 Uklanjanje iz:
 # ^FileError
-Greška prilikom otvaranja datoteke za upisivanje: \r\n\t"$0"\r\n\"Odustani\" za prekid instalacije,\r\n\"Ponovi\" za ponovni pokušaj upisivanja, ili\r\n\"Ignoriši\" za zanemarenje te datoteke
+GreÅ¡ka prilikom otvaranja datoteke za upisivanje: \r\n\t"$0"\r\n\"Odustani\" za prekid instalacije,\r\n\"Ponovi\" za ponovni pokuÅ¡aj upisivanja, ili\r\n\"IgnoriÅ¡i\" za zanemarenje te datoteke
 # ^FileError_NoIgnore
-Greška prilikom otvaranja datoteke za upisivanje: \r\n\t"$0"\r\n\"Ponovi\" za ponovni pokušaj zapisivanja, ili\r\n\"Odustani\" za prekid instalacije
+GreÅ¡ka prilikom otvaranja datoteke za upisivanje: \r\n\t"$0"\r\n\"Ponovi\" za ponovni pokuÅ¡aj zapisivanja, ili\r\n\"Odustani\" za prekid instalacije
 # ^CantWrite
-"Nemoguæe upisati: "
+"NemoguÄ‡e upisati: "
 # ^CopyFailed
-Greška prilikom kopiranja
+GreÅ¡ka prilikom kopiranja
 # ^CopyTo
 "Kopiraj u "
 # ^Registering
@@ -133,49 +133,49 @@
 # ^Unregistering
 "Odjava: "
 # ^SymbolNotFound
-"Nemoguæe naæi simbol: "
+"NemoguÄ‡e naÄ‡i simbol: "
 # ^CouldNotLoad
-"Nemoguæe uèitavanje: "
+"NemoguÄ‡e uÄ�itavanje: "
 # ^CreateFolder
 "Napravi mapu: "
 # ^CreateShortcut
-"Napravi preèicu: "
+"Napravi preÄ�icu: "
 # ^CreatedUninstaller
 "Program za uklanjanje: "
 # ^Delete
-"Obriši datoteku: "
+"ObriÅ¡i datoteku: "
 # ^DeleteOnReboot
-"Obriši prilikom ponovnog pokretanja: "
+"ObriÅ¡i prilikom ponovnog pokretanja: "
 # ^ErrorCreatingShortcut
-"Greška prilikom kreiranja preèica: "
+"GreÅ¡ka prilikom kreiranja preÄ�ica: "
 # ^ErrorCreating
-"Greška prilikom kreiranja: "
+"GreÅ¡ka prilikom kreiranja: "
 # ^ErrorDecompressing
-Greška prilikom otpakivanja podataka! Ošteæen instalacijski program?
+GreÅ¡ka prilikom otpakivanja podataka! OÅ¡teÄ‡en instalacijski program?
 # ^ErrorRegistering
-Greška prilikom prijavljivanja DLLa
+GreÅ¡ka prilikom prijavljivanja DLLa
 # ^ExecShell
 "ExecShell: "
 # ^Exec
-"Izvrši: "
+"IzvrÅ¡i: "
 # ^Extract
 "Otpakuj: "
 # ^ErrorWriting
-"Otpakivanje: greška upisivanja u datoteku "
+"Otpakivanje: greÅ¡ka upisivanja u datoteku "
 # ^InvalidOpcode
-Ošteæena instalacijska datoteka: neispravna opkoda
+OÅ¡teÄ‡ena instalacijska datoteka: neispravna opkoda
 # ^NoOLE
 "Nema OLE za: "
 # ^OutputFolder
 "Izlazna mapa: "
 # ^RemoveFolder
-"Obriši mapu: "
+"ObriÅ¡i mapu: "
 # ^RenameOnReboot
 "Preimenuj prilikom ponovnog startovanja: "
 # ^Rename
 "Preimenuj: "
 # ^Skipped
-"Preskoèeno: "
+"PreskoÄ�eno: "
 # ^CopyDetails
 Kopiraj detalje na Klembord
 # ^LogInstall
@@ -183,9 +183,9 @@
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
+ G
 
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Turkish.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Turkish.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Turkish.nlf	(revision 2956)
@@ -1,4 +1,4 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Start editing here
 # Language ID
@@ -6,187 +6,187 @@
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1254
 # RTL - anything else than RTL means LTR
 -
 # Translation by ?atay Dilsiz(chagy) (amigos_cagi@hotmail.com)
-# Corrections by Mozilla Türkiye Yerelleþtirme Topluluðu tarafýndan çevrilmiþtir. http://mozilla.org.tr
+# Corrections by Mozilla TÃ¼rkiye YerelleÅŸtirme TopluluÄŸu tarafÄ±ndan Ã§evrilmiÅŸtir. http://mozilla.org.tr
 # ^Branding
-Nullsoft Kurulum Sistemi %s
+Nullsoft Install System %s
 # ^SetupCaption
 $(^Name) Kurulumu
 # ^UninstallCaption
-$(^Name) Kaldýrma
+$(^Name) KaldÄ±rma
 # ^LicenseSubCaption
-: Lisans Sözleþmesi
+: Lisans SÃ¶zleÅŸmesi
 # ^ComponentsSubCaption
-: Kurulum Seçenekleri
+: Kurulum SeÃ§enekleri
 # ^DirSubCaption
 : Kurulum Dizini
 # ^InstallingSubCaption
 : Kuruluyor
 # ^CompletedSubCaption
-: Tamamlandý
+: TamamlandÄ±
 # ^UnComponentsSubCaption
-: Kaldýrma Seçenekleri
+: KaldÄ±rma SeÃ§enekleri
 # ^UnDirSubCaption
-: Kaldýrýlacak Dizin
+: KaldÄ±rÄ±lacak Dizin
 # ^ConfirmSubCaption
 : Onay
 # ^UninstallingSubCaption
-: Kaldýrýlýyor
+: KaldÄ±rÄ±lÄ±yor
 # ^UnCompletedSubCaption
-: Tamamlandý
+: TamamlandÄ±
 # ^BackBtn
 < &Geri
 # ^NextBtn
-Ý&leri >
+Ä°&leri >
 # ^AgreeBtn
-&Kabul Ediyorum
+&KatÄ±lÄ±yorum
 # ^AcceptBtn
-Lisans Sözleþmesi'nin koþullarýný &kabul ediyorum
+Lisans SÃ¶zleÅŸmesi'nin koÅŸullarÄ±nÄ± &kabul ediyorum
 # ^DontAcceptBtn
-Lisans Sözleþmesi'nin koþullarýný kabul et&miyorum
+Lisans SÃ¶zleÅŸmesi'nin koÅŸullarÄ±nÄ± kabul et&miyorum
 # ^InstallBtn
 &Kur
 # ^UninstallBtn
-&Kaldýr
+&KaldÄ±r
 # ^CancelBtn
-Vazgeç
+VazgeÃ§
 # ^CloseBtn
 &Kapat
 # ^BrowseBtn
-&Gözat...
+&GÃ¶zat...
 # ^ShowDetailsBtn
-&Ayrýntýlarý göster
+&AyrÄ±ntÄ±larÄ± gÃ¶ster
 # ^ClickNext
-Devam etmek için Ýleri düðmesine basýn.
+Devam etmek iÃ§in Ä°leri dÃ¼ÄŸmesine basÄ±n.
 # ^ClickInstall
-Kurulumu baþlatmak için Kur düðmesine basýn.
+Kurulumu baÅŸlatmak iÃ§in Kur dÃ¼ÄŸmesine basÄ±n.
 # ^ClickUninstall
-Kaldýrmayý baþlatmak için Kaldýr düðmesine basýn.
+KaldÄ±rmayÄ± baÅŸlatmak iÃ§in KaldÄ±r dÃ¼ÄŸmesine basÄ±n.
 # ^Name
 Ad
 # ^Completed
-Tamamlandý
+TamamlandÄ±
 # ^LicenseText
-Lütfen $(^NameDA) uygulamasýný kurmadan önce lisans sözleþmesini gözden geçirin. Sözleþmedeki bütün koþullarý kabul ediyorsanýz Kabul Ediyorum düðmesine basýn.
+LÃ¼tfen $(^NameDA) uygulamasÄ±nÄ± kurmadan Ã¶nce lisans sÃ¶zleÅŸmesini gÃ¶zden geÃ§irin. SÃ¶zleÅŸmedeki bÃ¼tÃ¼n koÅŸullarÄ± kabul ediyorsanÄ±z Kabul Ediyorum dÃ¼ÄŸmesine basÄ±n.
 # ^LicenseTextCB
-Lütfen $(^NameDA) uygulamasýný kurmadan önce lisans sözleþmesini gözden geçirin. Sözleþmedeki bütün koþullarý kabul ediyorsanýz aþaðýdaki kutuya iþaret koyun. $_CLICK
+LÃ¼tfen $(^NameDA) uygulamasÄ±nÄ± kurmadan Ã¶nce lisans sÃ¶zleÅŸmesini gÃ¶zden geÃ§irin. SÃ¶zleÅŸmedeki bÃ¼tÃ¼n koÅŸullarÄ± kabul ediyorsanÄ±z aÅŸaÄŸÄ±daki kutuya iÅŸaret koyun. $_CLICK
 # ^LicenseTextRB
-Lütfen $(^NameDA) uygulamasýný kurmadan önce lisans sözleþmesini gözden geçirin. Sözleþmedeki bütün koþullarý kabul ediyorsanýz aþaðýdaki ilk seçeneði seçin. $_CLICK
+LÃ¼tfen $(^NameDA) uygulamasÄ±nÄ± kurmadan Ã¶nce lisans sÃ¶zleÅŸmesini gÃ¶zden geÃ§irin. SÃ¶zleÅŸmedeki bÃ¼tÃ¼n koÅŸullarÄ± kabul ediyorsanÄ±z aÅŸaÄŸÄ±daki ilk seÃ§eneÄŸi seÃ§in. $_CLICK
 # ^UnLicenseText
-Lütfen $(^NameDA) uygulamasýný kaldýrmadan önce lisans sözleþmesini gözden geçirin. Sözleþmedeki bütün koþullarý kabul ediyorsanýz Kabul Ediyorum düðmesine basýn.
+LÃ¼tfen $(^NameDA) uygulamasÄ±nÄ± kaldÄ±rmadan Ã¶nce lisans sÃ¶zleÅŸmesini gÃ¶zden geÃ§irin. SÃ¶zleÅŸmedeki bÃ¼tÃ¼n koÅŸullarÄ± kabul ediyorsanÄ±z Kabul Ediyorum dÃ¼ÄŸmesine basÄ±n.
 # ^UnLicenseTextCB
-Lütfen $(^NameDA) uygulamasýný kaldýrmadan önce lisans sözleþmesini gözden geçirin. Sözleþmedeki bütün koþullarý kabul ediyorsanýz aþaðýdaki kutuya iþaret koyun. $_CLICK
+LÃ¼tfen $(^NameDA) uygulamasÄ±nÄ± kaldÄ±rmadan Ã¶nce lisans sÃ¶zleÅŸmesini gÃ¶zden geÃ§irin. SÃ¶zleÅŸmedeki bÃ¼tÃ¼n koÅŸullarÄ± kabul ediyorsanÄ±z aÅŸaÄŸÄ±daki kutuya iÅŸaret koyun. $_CLICK
 # ^UnLicenseTextRB
-Lütfen $(^NameDA) uygulamasýný kaldýrmadan önce lisans sözleþmesini gözden geçirin. Sözleþmedeki bütün koþullarý kabul ediyorsanýz aþaðýdaki ilk seçeneði seçin. $_CLICK
+LÃ¼tfen $(^NameDA) uygulamasÄ±nÄ± kaldÄ±rmadan Ã¶nce lisans sÃ¶zleÅŸmesini gÃ¶zden geÃ§irin. SÃ¶zleÅŸmedeki bÃ¼tÃ¼n koÅŸullarÄ± kabul ediyorsanÄ±z aÅŸaÄŸÄ±daki ilk seÃ§eneÄŸi seÃ§in. $_CLICK
 # ^Custom
-Özel
+Ã–zel
 # ^ComponentsText
-Kurmak istediðiniz bileþenleri iþaretleyip kurmak istemediklerinizi iþaretlemeden býrakýn. $_CLICK
+Kurmak istediÄŸiniz bileÅŸenleri iÅŸaretleyip kurmak istemediklerinizi iÅŸaretlemeden bÄ±rakÄ±n. $_CLICK
 # ^ComponentsSubText1
-Kurulum türünü seçin:
+Kurulum tÃ¼rÃ¼nÃ¼ seÃ§in:
 # ^ComponentsSubText2_NoInstTypes
-Kurulacak bileþenleri seçin:
+Kurulacak bileÅŸenleri seÃ§in:
 # ^ComponentsSubText2
-ya da isteðe baðlý olarak kurmak istediðiniz bileþenleri seçin:
+ya da isteÄŸe baÄŸlÄ± olarak kurmak istediÄŸiniz bileÅŸenleri seÃ§in:
 # ^UnComponentsText
-Kaldýrmak istediðiniz bileþenleri iþaretleyip kaldýrmak istemediklerinizi iþaretlemeden býrakýn. $_CLICK
+KaldÄ±rmak istediÄŸiniz bileÅŸenleri iÅŸaretleyip kaldÄ±rmak istemediklerinizi iÅŸaretlemeden bÄ±rakÄ±n. $_CLICK
 # ^UnComponentsSubText1
-Kaldýrma türünü seçin:
+KaldÄ±rma tÃ¼rÃ¼nÃ¼ seÃ§in:
 # ^UnComponentsSubText2_NoInstTypes
-Kaldýrýlacak bileþenleri seçin:
+KaldÄ±rÄ±lacak bileÅŸenleri seÃ§in:
 # ^UnComponentsSubText2
-ya da isteðe baðlý olarak kaldýrmak istediðiniz bileþenleri seçin:
+ya da isteÄŸe baÄŸlÄ± olarak kaldÄ±rmak istediÄŸiniz bileÅŸenleri seÃ§in:
 # ^DirText
-$(^NameDA) aþaðýdaki dizinde kurulacak. Farklý bir dizinde kurmak için Gözat düðmesine basýp baþka bir dizin seçin. $_CLICK
+$(^NameDA) aÅŸaÄŸÄ±daki dizinde kurulacak. FarklÄ± bir dizinde kurmak iÃ§in GÃ¶zat dÃ¼ÄŸmesine basÄ±p baÅŸka bir dizin seÃ§in. $_CLICK
 # ^DirSubText
 Hedef Dizin
 # ^DirBrowseText
-$(^NameDA) uygulamasýnýn kurulacaðý dizini seçin:
+$(^NameDA) uygulamasÄ±nÄ±n kurulacaÄŸÄ± dizini seÃ§in:
 # ^UnDirText
-$(^NameDA) aþaðýdaki dizinden kaldýrýlacak. Farklý bir dizinden kaldýrmak için Gözat düðmesine basýp baþka bir dizin seçin. $_CLICK
+$(^NameDA) aÅŸaÄŸÄ±daki dizinden kaldÄ±rÄ±lacak. FarklÄ± bir dizinden kaldÄ±rmak iÃ§in GÃ¶zat dÃ¼ÄŸmesine basÄ±p baÅŸka bir dizin seÃ§in. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-$(^NameDA) uygulamasýnýn kaldýrýlacaðý dizini seçin:
+$(^NameDA) uygulamasÄ±nÄ±n kaldÄ±rÄ±lacaÄŸÄ± dizini seÃ§in:
 # ^SpaceAvailable
-"Kullanýlabilir boþ alan: "
+"KullanÄ±labilir boÅŸ alan: "
 # ^SpaceRequired
-"Gereken boþ alan: "
+"Gereken boÅŸ alan: "
 # ^UninstallingText
-$(^NameDA) aþaðýdaki dizinden kaldýrýlacak. $_CLICK
+$(^NameDA) aÅŸaÄŸÄ±daki dizinden kaldÄ±rÄ±lacak. $_CLICK
 # ^UninstallingSubText
-Kaldýrýlan yer:
+KaldÄ±rÄ±lan yer:
 # ^FileError
-Dosya yazmak için açýlýrken hata meydana geldi: \r\n\r\n$0\r\n\r\nKurulumu durdurmak için Dur düðmesine,\r\nyeniden denemek için Yeniden Dene düðmesine,\r\nbu dosyayý atlamak için Yoksay düðmesine basýn.
+Dosya yazmak iÃ§in aÃ§Ä±lÄ±rken hata meydana geldi: \r\n\r\n$0\r\n\r\nKurulumu durdurmak iÃ§in Dur dÃ¼ÄŸmesine,\r\nyeniden denemek iÃ§in Yeniden Dene dÃ¼ÄŸmesine,\r\nbu dosyayÄ± atlamak iÃ§in Yoksay dÃ¼ÄŸmesine basÄ±n.
 # ^FileError_NoIgnore
-Dosya yazmak için açýlýrken hata meydana geldi: \r\n\r\n$0\r\n\r\nYeniden denemek için Yeniden Dene düðmesine,\r\nkurulumu durdurmak için Vazgeç düðmesine basýn.
+Dosya yazmak iÃ§in aÃ§Ä±lÄ±rken hata meydana geldi: \r\n\r\n$0\r\n\r\nYeniden denemek iÃ§in Yeniden Dene dÃ¼ÄŸmesine,\r\nkurulumu durdurmak iÃ§in VazgeÃ§ dÃ¼ÄŸmesine basÄ±n.
 # ^CantWrite
-"Yazýlamadý: "
+"YazÄ±lamadÄ±: "
 # ^CopyFailed
-Kopyalama baþarýsýz oldu
+Kopyalama baÅŸarÄ±sÄ±z oldu
 # ^CopyTo
-"Kayýt: "
+"KayÄ±t: "
 # ^Registering
 "Kaydediliyor: "
 # ^Unregistering
-"Kayýt siliniyor: "
+"KayÄ±t siliniyor: "
 # ^SymbolNotFound
-"Simge bulunamadý: "
+"Simge bulunamadÄ±: "
 # ^CouldNotLoad
-"Yüklenemedi: "
+"YÃ¼klenemedi: "
 # ^CreateFolder
-"Dizin oluþtur: "
+"Dizin oluÅŸtur: "
 # ^CreateShortcut
-"Kýsayol oluþtur: "
+"KÄ±sayol oluÅŸtur: "
 # ^CreatedUninstaller
-"Kaldýrma uygulamasý oluþtur: "
+"KaldÄ±rma uygulamasÄ± oluÅŸtur: "
 # ^Delete
 "Dosya sil: "
 # ^DeleteOnReboot
-"Açýlýþta sil: "
+"AÃ§Ä±lÄ±ÅŸta sil: "
 # ^ErrorCreatingShortcut
-"Kýsayol oluþturulurken hata meydana geldi: "
+"KÄ±sayol oluÅŸturulurken hata meydana geldi: "
 # ^ErrorCreating
-"Oluþturma hatasý: "
+"OluÅŸturma hatasÄ±: "
 # ^ErrorDecompressing
-Veriyi açarken hata meydana geldi! Acaba kurulum uygulamasý mý bozuk?
+Veriyi aÃ§arken hata meydana geldi! Acaba kurulum uygulamasÄ± mÄ± bozuk?
 # ^ErrorRegistering
 DLL kaydedilirken hata meydana geldi
 # ^ExecShell
 "ExecShell: "
 # ^Exec
-"Çalýþtýr: "
+"Ã‡alÄ±ÅŸtÄ±r: "
 # ^Extract
-"Aç: "
+"AÃ§: "
 # ^ErrorWriting
-"Açma: Dosyaya yazarken hata meydana geldi "
+"AÃ§ma: Dosyaya yazarken hata meydana geldi "
 # ^InvalidOpcode
-Kurulum bozuk: Geçersiz kod
+Kurulum bozuk: GeÃ§ersiz kod
 # ^NoOLE
 "OLE yok: "
 # ^OutputFolder
-"Çýktý dizini: "
+"Ã‡Ä±ktÄ± dizini: "
 # ^RemoveFolder
 "Dizini sil: "
 # ^RenameOnReboot
-"Açýlýþta adýný deðiþtir: "
+"AÃ§Ä±lÄ±ÅŸta adÄ±nÄ± deÄŸiÅŸtir: "
 # ^Rename
-"Ad deðiþtir: "
+"Ad deÄŸiÅŸtir: "
 # ^Skipped
-"Atlandý: "
+"AtlandÄ±: "
 # ^CopyDetails
-Ayrýntýlarý panoya kopyala
+AyrÄ±ntÄ±larÄ± panoya kopyala
 # ^LogInstall
-Kurulum sürecinin kaydýný tut
+Kurulum sÃ¼recinin kaydÄ±nÄ± tut
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Hindi.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Hindi.nlf	(revision 0)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Hindi.nlf	(revision 2956)
@@ -0,0 +1,190 @@
+ï»¿# Header, don't edit
+NLF v6
+# Language ID
+1081
+# Font and size - dash (-) means default
+-
+-
+# Codepage - dash (-) means ASCII code page
+1200
+# RTL - anything else than RTL means LTR
+-
+# Translation by Ryan Pretorius
+# ^Branding
+Nullsoft Install System %s
+# ^SetupCaption
+$(^Name) à¤¸à¥‡à¤Ÿà¤…à¤ª
+# ^UninstallCaption
+$(^Name) à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¥‡à¤‚
+# ^LicenseSubCaption
+: à¤²à¤¾à¤‡à¤¸à¥‡à¤‚à¤¸ à¤¸à¤®à¤�à¥Œà¤¤à¤¾
+# ^ComponentsSubCaption
+: à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤•à¥‡ à¤µà¤¿à¤•à¤²à¥�à¤ª
+# ^DirSubCaption
+: à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤«à¥‹à¤²à¥�à¤¡à¤°
+# ^InstallingSubCaption
+: à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤° à¤°à¤¹à¥‡ à¤¹à¥ˆà¤‚
+# ^CompletedSubCaption
+: à¤¸à¤‚à¤ªà¤¨à¥�à¤¨
+# ^UnComponentsSubCaption
+: à¤…à¤¨à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤•à¥‡ à¤µà¤¿à¤•à¤²à¥�à¤ª
+# ^UnDirSubCaption
+: à¤…à¤¨à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤«à¥‹à¤²à¥�à¤¡à¤°
+# ^ConfirmSubCaption
+: à¤ªà¥�à¤·à¥�à¤Ÿà¤¿à¤•à¤°à¤£
+# ^UninstallingSubCaption
+: à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤° à¤°à¤¹à¥‡ à¤¹à¥ˆà¤‚
+# ^UnCompletedSubCaption
+: à¤¸à¤®à¥�à¤ªà¤¨à¥�à¤¨
+# ^BackBtn
+< &à¤ªà¥€à¤›à¥‡
+# ^NextBtn
+&à¤†à¤—à¥‡ >
+# ^AgreeBtn
+à¤®à¥ˆà¤‚ &à¤¸à¤¹à¤®à¤¤ à¤¹à¥‚à¤�
+# ^AcceptBtn
+à¤®à¥ˆà¤‚ à¤²à¤¾à¤‡à¤¸à¥‡à¤‚à¤¸ à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¶à¤°à¥�à¤¤à¥‡à¤‚ &à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¤¤à¤¾ à¤¹à¥‚à¤�
+# ^DontAcceptBtn
+à¤®à¥ˆà¤‚ à¤²à¤¾à¤‡à¤¸à¥‡à¤‚à¤¸ à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¶à¤°à¥�à¤¤à¥‡à¤‚ à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤¨à¤¹à¥€à¤‚ &à¤•à¤°à¤¤à¤¾ à¤¹à¥‚à¤�
+# ^InstallBtn
+&à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¥‡à¤‚
+# ^UninstallBtn
+&à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¥‡à¤‚
+# ^CancelBtn
+à¤°à¤¦à¥�à¤¦ à¤•à¤°à¥‡à¤‚
+# ^CloseBtn
+&à¤¬à¤‚à¤¦ à¤•à¤°à¥‡à¤‚
+# ^BrowseBtn
+à¤¬à¥�à¤°à¤¾&à¤‰à¤œ à¤•à¤°à¥‡à¤‚...
+# ^ShowDetailsBtn
+&à¤µà¤¿à¤µà¤°à¤£ à¤¦à¤¿à¤–à¤¾à¤�à¤‚
+# ^ClickNext
+à¤œà¤¾à¤°à¥€ à¤°à¤–à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤†à¤—à¥‡ à¤ªà¤° à¤•à¥�à¤²à¤¿à¤• à¤•à¤°à¥‡à¤‚à¥¤
+# ^ClickInstall
+à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤¶à¥�à¤°à¥‚ à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¥‡à¤‚ à¤ªà¤° à¤•à¥�à¤²à¤¿à¤• à¤•à¤°à¥‡à¤‚à¥¤
+# ^ClickUninstall
+à¤…à¤¨à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤¶à¥�à¤°à¥‚ à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¥‡à¤‚ à¤ªà¤° à¤•à¥�à¤²à¤¿à¤• à¤•à¤°à¥‡à¤‚à¥¤
+# ^Name
+à¤®
+# ^Completed
+à¤¸à¤®à¥�à¤ªà¤¨à¥�à¤¨
+# ^LicenseText
+$(^NameDA) à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤¸à¥‡ à¤ªà¤¹à¤²à¥‡ à¤²à¤¾à¤‡à¤¸à¥‡à¤‚à¤¸ à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¸à¤®à¥€à¤•à¥�à¤·à¤¾ à¤•à¤°à¥‡à¤‚à¥¤ à¤¯à¤¦à¤¿ à¤†à¤ª à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¸à¤­à¥€ à¤¶à¤°à¥�à¤¤à¥‡à¤‚ à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¤¤à¥‡ à¤¹à¥ˆà¤‚ à¤¤à¥‹ à¤®à¥ˆà¤‚ à¤¸à¤¹à¤®à¤¤ à¤¹à¥‚à¤� à¤ªà¤° à¤•à¥�à¤²à¤¿à¤• à¤•à¤°à¥‡à¤‚à¥¤
+# ^LicenseTextCB
+$(^NameDA) à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤¸à¥‡ à¤ªà¤¹à¤²à¥‡ à¤²à¤¾à¤‡à¤¸à¥‡à¤‚à¤¸ à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¸à¤®à¥€à¤•à¥�à¤·à¤¾ à¤•à¤°à¥‡à¤‚à¥¤ à¤¯à¤¦à¤¿ à¤†à¤ª à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¸à¤­à¥€ à¤¶à¤°à¥�à¤¤à¥‡à¤‚ à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¤¤à¥‡ à¤¹à¥ˆà¤‚ à¤¤à¥‹ à¤¨à¥€à¤šà¥‡ à¤¦à¤¿à¤� à¤—à¤� à¤šà¥‡à¤• à¤¬à¥‰à¤•à¥�à¤¸ à¤ªà¤° à¤•à¥�à¤²à¤¿à¤• à¤•à¤°à¥‡à¤‚à¥¤ $_CLICK
+# ^LicenseTextRB
+$(^NameDA) à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤¸à¥‡ à¤ªà¤¹à¤²à¥‡ à¤²à¤¾à¤‡à¤¸à¥‡à¤‚à¤¸ à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¸à¤®à¥€à¤•à¥�à¤·à¤¾ à¤•à¤°à¥‡à¤‚à¥¤ à¤¯à¤¦à¤¿ à¤†à¤ª à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¸à¤­à¥€ à¤¶à¤°à¥�à¤¤à¥‡à¤‚ à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¤¤à¥‡ à¤¹à¥ˆà¤‚ à¤¤à¥‹ à¤¨à¥€à¤šà¥‡ à¤¦à¤¿à¤� à¤—à¤� à¤ªà¤¹à¤²à¥‡ à¤µà¤¿à¤•à¤²à¥�à¤ª à¤•à¤¾ à¤šà¤¯à¤¨ à¤•à¤°à¥‡à¤‚à¥¤ $_CLICK
+# ^UnLicenseText
+$(^NameDA) à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤¸à¥‡ à¤ªà¤¹à¤²à¥‡ à¤²à¤¾à¤‡à¤¸à¥‡à¤‚à¤¸ à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¸à¤®à¥€à¤•à¥�à¤·à¤¾ à¤•à¤°à¥‡à¤‚à¥¤ à¤¯à¤¦à¤¿ à¤†à¤ª à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¸à¤­à¥€ à¤¶à¤°à¥�à¤¤à¥‡à¤‚ à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¤¤à¥‡ à¤¹à¥ˆà¤‚ à¤¤à¥‹ à¤®à¥ˆà¤‚ à¤¸à¤¹à¤®à¤¤ à¤¹à¥‚à¤� à¤ªà¤° à¤•à¥�à¤²à¤¿à¤• à¤•à¤°à¥‡à¤‚à¥¤
+# ^UnLicenseTextCB
+$(^NameDA) à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤¸à¥‡ à¤ªà¤¹à¤²à¥‡ à¤²à¤¾à¤‡à¤¸à¥‡à¤‚à¤¸ à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¸à¤®à¥€à¤•à¥�à¤·à¤¾ à¤•à¤°à¥‡à¤‚à¥¤ à¤¯à¤¦à¤¿ à¤†à¤ª à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¸à¤­à¥€ à¤¶à¤°à¥�à¤¤à¥‡à¤‚ à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¤¤à¥‡ à¤¹à¥ˆà¤‚ à¤¤à¥‹ à¤¨à¥€à¤šà¥‡ à¤¦à¤¿à¤� à¤—à¤� à¤šà¥‡à¤• à¤¬à¥‰à¤•à¥�à¤¸ à¤ªà¤° à¤•à¥�à¤²à¤¿à¤• à¤•à¤°à¥‡à¤‚à¥¤ $_CLICK
+# ^UnLicenseTextRB
+$(^NameDA) à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤¸à¥‡ à¤ªà¤¹à¤²à¥‡ à¤²à¤¾à¤‡à¤¸à¥‡à¤‚à¤¸ à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¸à¤®à¥€à¤•à¥�à¤·à¤¾ à¤•à¤°à¥‡à¤‚à¥¤ à¤¯à¤¦à¤¿ à¤†à¤ª à¤¸à¤®à¤�à¥Œà¤¤à¥‡ à¤•à¥€ à¤¸à¤­à¥€ à¤¶à¤°à¥�à¤¤à¥‡à¤‚ à¤¸à¥�à¤µà¥€à¤•à¤¾à¤° à¤•à¤°à¤¤à¥‡ à¤¹à¥ˆà¤‚ à¤¤à¥‹ à¤¨à¥€à¤šà¥‡ à¤¦à¤¿à¤� à¤—à¤� à¤ªà¤¹à¤²à¥‡ à¤µà¤¿à¤•à¤²à¥�à¤ª à¤•à¤¾ à¤šà¤¯à¤¨ à¤•à¤°à¥‡à¤‚à¥¤ $_CLICK
+# ^Custom
+à¤•à¤¸à¥�à¤Ÿà¤®
+# ^ComponentsText
+à¤†à¤ª à¤œà¥‹ à¤˜à¤Ÿà¤• à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆà¤‚ à¤‰à¤¨à¥�à¤¹à¥‡à¤‚ à¤šà¥‡à¤• à¤•à¤°à¥‡à¤‚ à¤”à¤° à¤†à¤ª à¤œà¥‹ à¤˜à¤Ÿà¤• à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤¨à¤¹à¥€à¤‚ à¤•à¤°à¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆà¤‚ à¤‰à¤¨à¥�à¤¹à¥‡à¤‚ à¤…à¤¨à¤šà¥‡à¤• à¤•à¤°à¥‡à¤‚à¥¤ $_CLICK
+# ^ComponentsSubText1
+à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¥‡ à¤ªà¥�à¤°à¤•à¤¾à¤° à¤•à¤¾ à¤šà¤¯à¤¨ à¤•à¤°à¥‡à¤‚:
+# ^ComponentsSubText2_NoInstTypes
+à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤˜à¤Ÿà¤•à¥‹à¤‚ à¤•à¤¾ à¤šà¤¯à¤¨ à¤•à¤°à¥‡à¤‚:
+# ^ComponentsSubText2
+à¤¯à¤¾ à¤‰à¤¨ à¤µà¥ˆà¤•à¤²à¥�à¤ªà¤¿à¤• à¤˜à¤Ÿà¤•à¥‹à¤‚ à¤•à¤¾ à¤šà¤¯à¤¨ à¤•à¤°à¥‡à¤‚ à¤œà¤¿à¤¨à¥�à¤¹à¥‡à¤‚ à¤†à¤ª à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆà¤‚:
+# ^UnComponentsText
+à¤†à¤ª à¤œà¥‹ à¤˜à¤Ÿà¤• à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆà¤‚ à¤‰à¤¨à¥�à¤¹à¥‡à¤‚ à¤šà¥‡à¤• à¤•à¤°à¥‡à¤‚ à¤”à¤° à¤†à¤ª à¤œà¥‹ à¤˜à¤Ÿà¤• à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤¨à¤¹à¥€à¤‚ à¤•à¤°à¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆà¤‚ à¤‰à¤¨à¥�à¤¹à¥‡à¤‚ à¤…à¤¨à¤šà¥‡à¤• à¤•à¤°à¥‡à¤‚à¥¤ $_CLICK
+# ^UnComponentsSubText1
+à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¥‡ à¤ªà¥�à¤°à¤•à¤¾à¤° à¤•à¤¾ à¤šà¤¯à¤¨ à¤•à¤°à¥‡à¤‚:
+# ^UnComponentsSubText2_NoInstTypes
+à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤˜à¤Ÿà¤•à¥‹à¤‚ à¤•à¤¾ à¤šà¤¯à¤¨ à¤•à¤°à¥‡à¤‚:
+# ^UnComponentsSubText2
+à¤¯à¤¾ à¤‰à¤¨ à¤µà¥ˆà¤•à¤²à¥�à¤ªà¤¿à¤• à¤˜à¤Ÿà¤•à¥‹à¤‚ à¤•à¤¾ à¤šà¤¯à¤¨ à¤•à¤°à¥‡à¤‚ à¤œà¤¿à¤¨à¥�à¤¹à¥‡à¤‚ à¤†à¤ª à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¤¾ à¤šà¤¾à¤¹à¤¤à¥‡ à¤¹à¥ˆà¤‚:
+# ^DirText
+à¤¸à¥‡à¤Ÿà¤…à¤ª $(^NameDA) à¤•à¥‹ à¤¨à¤¿à¤®à¥�à¤¨à¤²à¤¿à¤–à¤¿à¤¤ à¤«à¥‹à¤²à¥�à¤¡à¤° à¤®à¥‡à¤‚ à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¥‡à¤—à¤¾à¥¤ à¤•à¤¿à¤¸à¥€ à¤­à¤¿à¤¨à¥�à¤¨ à¤«à¥‹à¤²à¥�à¤¡à¤° à¤®à¥‡à¤‚ à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤¬à¥�à¤°à¤¾à¤‰à¤œ à¤•à¤°à¥‡à¤‚ à¤ªà¤° à¤•à¥�à¤²à¤¿à¤• à¤•à¤°à¥‡à¤‚ à¤”à¤° à¤•à¤¿à¤¸à¥€ à¤…à¤¨à¥�à¤¯ à¤«à¥‹à¤²à¥�à¤¡à¤° à¤•à¤¾ à¤šà¤¯à¤¨ à¤•à¤°à¥‡à¤‚à¥¤ $_CLICK
+# ^DirSubText
+à¤—à¤‚à¤¤à¤µà¥�à¤¯ à¤«à¥‹à¤²à¥�à¤¡à¤°
+# ^DirBrowseText
+$(^NameDA) à¤•à¥‹ à¤œà¤¿à¤¸ à¤«à¥‹à¤²à¥�à¤¡à¤° à¤®à¥‡à¤‚ à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¤¾ à¤¹à¥ˆ à¤‰à¤¸à¤•à¤¾ à¤šà¤¯à¤¨ à¤•à¤°à¥‡à¤‚:
+# ^UnDirText
+à¤¸à¥‡à¤Ÿà¤…à¤ª $(^NameDA) à¤•à¥‹ à¤¨à¤¿à¤®à¥�à¤¨à¤²à¤¿à¤–à¤¿à¤¤ à¤«à¥‹à¤²à¥�à¤¡à¤° à¤¸à¥‡ à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¥‡à¤—à¤¾à¥¤ à¤•à¤¿à¤¸à¥€ à¤­à¤¿à¤¨à¥�à¤¨ à¤«à¥‹à¤²à¥�à¤¡à¤° à¤¸à¥‡ à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤¬à¥�à¤°à¤¾à¤‰à¤œ à¤•à¤°à¥‡à¤‚ à¤ªà¤° à¤•à¥�à¤²à¤¿à¤• à¤•à¤°à¥‡à¤‚ à¤”à¤° à¤•à¤¿à¤¸à¥€ à¤…à¤¨à¥�à¤¯ à¤«à¥‹à¤²à¥�à¤¡à¤° à¤•à¤¾ à¤šà¤¯à¤¨ à¤•à¤°à¥‡à¤‚à¥¤ $_CLICK
+# ^UnDirSubText
+""
+# ^UnDirBrowseText
+$(^NameDA) à¤•à¥‹ à¤œà¤¿à¤¸ à¤«à¥‹à¤²à¥�à¤¡à¤° à¤¸à¥‡ à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤°à¤¨à¤¾ à¤¹à¥ˆ à¤‰à¤¸à¤•à¤¾ à¤šà¤¯à¤¨ à¤•à¤°à¥‡à¤‚:
+# ^SpaceAvailable
+"à¤‰à¤ªà¤²à¤¬à¥�à¤§ à¤œà¤—à¤¹: "
+# ^SpaceRequired
+"à¤…à¤ªà¥‡à¤•à¥�à¤·à¤¿à¤¤ à¤œà¤—à¤¹: "
+# ^UninstallingText
+$(^NameDA) à¤•à¥‹ à¤¨à¤¿à¤®à¥�à¤¨à¤²à¤¿à¤–à¤¿à¤¤ à¤«à¥‹à¤²à¥�à¤¡à¤° à¤¸à¥‡ à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤¿à¤¯à¤¾ à¤œà¤¾à¤�à¤—à¤¾à¥¤ $_CLICK
+# ^UninstallingSubText
+à¤‡à¤¸ à¤¸à¥‡ à¤…à¤¨à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤•à¤° à¤°à¤¹à¥‡ à¤¹à¥ˆà¤‚:
+# ^FileError
+à¤²à¤¿à¤–à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¥žà¤¾à¤‡à¤² à¤–à¥‹à¤²à¤¨à¥‡ à¤®à¥‡à¤‚ à¤¤à¥�à¤°à¥�à¤Ÿà¤¿: \r\n\r\n$0\r\n\r\nà¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤°à¥‹à¤•à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤¨à¤¿à¤°à¤¸à¥�à¤¤ à¤•à¤°à¥‡à¤‚ à¤ªà¤° à¤•à¥�à¤²à¤¿à¤• à¤•à¤°à¥‡à¤‚,\r\nà¤«à¤¿à¤° à¤¸à¥‡ à¤ªà¥�à¤°à¤¯à¤¾à¤¸ à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤ªà¥�à¤¨à¤ƒ à¤ªà¥�à¤°à¤¯à¤¾à¤¸ à¤•à¤°à¥‡à¤‚, à¤¯à¤¾\r\nà¤‡à¤¸ à¤«à¤¾à¤‡à¤² à¤•à¥‹ à¤›à¥‹à¥œà¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤¨à¤œà¤°à¤‚à¤¦à¤¾à¤œ à¤•à¤°à¥‡à¤‚à¥¤
+# ^FileError_NoIgnore
+à¤²à¤¿à¤–à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¥žà¤¾à¤‡à¤² à¤–à¥‹à¤²à¤¨à¥‡ à¤®à¥‡à¤‚ à¤¤à¥�à¤°à¥�à¤Ÿà¤¿: \r\n\r\n$0\r\n\r\nà¤«à¤¿à¤° à¤¸à¥‡ à¤ªà¥�à¤°à¤¯à¤¾à¤¸ à¤•à¤°à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤ªà¥�à¤¨à¤ƒ à¤ªà¥�à¤°à¤¯à¤¾à¤¸ à¤•à¤°à¥‡à¤‚ à¤ªà¤° à¤•à¥�à¤²à¤¿à¤• à¤•à¤°à¥‡à¤‚, à¤¯à¤¾\r\nà¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¥‡à¤¶à¤¨ à¤°à¥‹à¤•à¤¨à¥‡ à¤•à¥‡ à¤²à¤¿à¤� à¤°à¤¦à¥�à¤¦ à¤•à¤°à¥‡à¤‚à¥¤
+# ^CantWrite
+"à¤¨à¤¹à¥€à¤‚ à¤²à¤¿à¤– à¤¸à¤•à¤¤à¥‡: "
+# ^CopyFailed"
+à¤•à¥‰à¤ªà¥€ à¤•à¤°à¤¨à¤¾ à¤µà¤¿à¤«à¤² à¤°à¤¹à¤¾
+# ^CopyTo"
+"à¤®à¥‡à¤‚ à¤•à¥‰à¤ªà¥€ à¤•à¤°à¥‡à¤‚ "
+# ^Registering
+"à¤ªà¤‚à¤œà¥€à¤•à¥ƒà¤¤ à¤•à¤° à¤°à¤¹à¥‡ à¤¹à¥ˆà¤‚: "
+# ^Unregistering
+"à¤ªà¤‚à¤œà¥€à¤•à¤°à¤£ à¤°à¤¦à¥�à¤¦ à¤•à¤° à¤°à¤¹à¥‡ à¤¹à¥ˆà¤‚: "
+# ^SymbolNotFound
+"à¤ªà¥�à¤°à¤¤à¥€à¤• à¤¨à¤¹à¥€à¤‚ à¤¢à¥‚à¤‚à¤¢ à¤¸à¤•à¥‡: "
+# ^CouldNotLoad
+"à¤²à¥‹à¤¡ à¤¨à¤¹à¥€à¤‚ à¤•à¤° à¤¸à¤•à¥‡: "
+# ^CreateFolder
+"à¤«à¥‹à¤²à¥�à¤¡à¤° à¤¬à¤¨à¤¾à¤�à¤‚: "
+# ^CreateShortcut
+"à¤¶à¥‰à¤°à¥�à¤Ÿà¤•à¤Ÿ à¤¬à¤¨à¤¾à¤�à¤‚: "
+# ^CreatedUninstaller
+"à¤…à¤¨à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¤° à¤¬à¤¨à¤¾à¤¯à¤¾: "
+# ^Delete
+"à¤«à¤¾à¤‡à¤² à¤¹à¤Ÿà¤¾à¤�à¤‚: "
+# ^DeleteOnReboot"
+"à¤°à¥€à¤¬à¥‚à¤Ÿ à¤•à¤°à¤¨à¥‡ à¤ªà¤° à¤¹à¤Ÿà¤¾à¤�à¤‚: "
+# ^ErrorCreatingShortcut
+"à¤¶à¥‰à¤°à¥�à¤Ÿà¤•à¤Ÿ à¤¬à¤¨à¤¾à¤¨à¥‡ à¤®à¥‡à¤‚ à¤¤à¥�à¤°à¥�à¤Ÿà¤¿: "
+# ^ErrorCreating
+"à¤¬à¤¨à¤¾à¤¨à¥‡ à¤®à¥‡à¤‚ à¤¤à¥�à¤°à¥�à¤Ÿà¤¿: "
+# ^ErrorDecompressing
+à¤¡à¥‡à¤Ÿà¤¾ à¤…à¤¸à¤‚à¤ªà¥€à¥œà¤¿à¤¤ à¤•à¤°à¤¨à¥‡ à¤ªà¤° à¤¤à¥�à¤°à¥�à¤Ÿà¤¿! à¤¦à¥‚à¤·à¤¿à¤¤ à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¤°?
+# ^ErrorRegistering
+DLL à¤ªà¤‚à¤œà¥€à¤•à¥ƒà¤¤ à¤•à¤°à¤¨à¥‡ à¤ªà¤° à¤¤à¥�à¤°à¥�à¤Ÿà¤¿
+# ^ExecShell
+"à¤¶à¥‡à¤² à¤¨à¤¿à¤·à¥�à¤ªà¤¾à¤¦à¤¿à¤¤ à¤•à¤°à¥‡à¤‚: "
+# ^Exec
+à¤¨à¤¿à¤·à¥�à¤ªà¤¾à¤¦à¤¿à¤¤ à¤•à¤°à¥‡à¤‚: "
+# ^Extract
+"à¤¨à¤¿à¤•à¤¾à¤²à¥‡à¤‚: "
+# ^ErrorWriting
+"à¤¨à¤¿à¤•à¤¾à¤²à¥‡à¤‚: à¤«à¤¾à¤‡à¤² à¤®à¥‡à¤‚ à¤²à¤¿à¤–à¤¤à¥‡ à¤¸à¤®à¤¯ à¤¤à¥�à¤°à¥�à¤Ÿà¤¿ "
+# ^InvalidOpcode
+à¤‡à¤‚à¤¸à¥�à¤Ÿà¤¾à¤²à¤° à¤¦à¥‚à¤·à¤¿à¤¤: à¤…à¤µà¥ˆà¤§ à¤‘à¤ªà¤•à¥‹à¤¡
+# ^NoOLE
+"à¤‡à¤¸à¤•à¥‡ à¤²à¤¿à¤� à¤•à¥‹à¤ˆ OLE à¤¨à¤¹à¥€à¤‚: "
+# ^OutputFolder
+"à¤†à¤‰à¤Ÿà¤ªà¥�à¤Ÿ à¤«à¥‹à¤²à¥�à¤¡à¤°: "
+# ^RemoveFolder
+"à¤«à¥‹à¤²à¥�à¤¡à¤° à¤¨à¤¿à¤•à¤¾à¤²à¥‡à¤‚: "
+# ^RenameOnReboot
+"à¤°à¥€à¤¬à¥‚à¤Ÿ à¤•à¤°à¤¨à¥‡ à¤ªà¤° à¤¨à¤¾à¤® à¤¬à¤¦à¤²à¥‡à¤‚: "
+# ^Rename
+"à¤¨à¤¾à¤® à¤¬à¤¦à¤²à¥‡à¤‚: "
+# ^Skipped
+"à¤›à¥‹à¥œà¤¾ à¤—à¤¯à¤¾: "
+# ^CopyDetails
+à¤•à¥�à¤²à¤¿à¤ªà¤¬à¥‹à¤°à¥�à¤¡ à¤ªà¤° à¤µà¤¿à¤µà¤°à¤£ à¤•à¥‰à¤ªà¥€ à¤•à¤°à¥‡à¤‚
+# ^LogInstall
+à¤²à¥‰à¤— à¤‡à¤¨à¤¸à¥�à¤Ÿà¥‰à¤² à¤ªà¥�à¤°à¤•à¥�à¤°à¤¿à¤¯à¤¾
+# ^Byte
+B
+# ^Kilo
+ K
+# ^Mega
+ M
+# ^Giga
+ G
\ No newline at end of file
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Czech.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Czech.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Czech.nlf	(revision 2956)
@@ -1,51 +1,52 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
+# Start editing here
 # Language ID
 1029
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1250
 # RTL - anything else than RTL means LTR
 -
-# Translation by SELiCE (ls@selice.cz - http://ls.selice.cz)
+# Translation by VÃ¡clav PavlÃ­Ä�ek (v.pavlicek@centrum.cz), dÅ™Ã­ve SELiCE
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-Instalovat $(^Name)
+Instalace $(^Name)
 # ^UninstallCaption
-Odinstalovat $(^Name)
+Odinstalace $(^Name)
 # ^LicenseSubCaption
-: Licenèní ujednání
+: LicenÄ�nÃ­ smlouva
 # ^ComponentsSubCaption
-: Možnosti instalace
+: MoÅ¾nosti instalace
 # ^DirSubCaption
-: Umístìní instalace
+: InstalaÄ�nÃ­ sloÅ¾ka
 # ^InstallingSubCaption
-: Instaluje se
+: Instalace
 # ^CompletedSubCaption
-: Dokonèeno
+: DokonÄ�eno
 # ^UnComponentsSubCaption
-: Možnosti odinstalace
+: MoÅ¾nosti odinstalace
 # ^UnDirSubCaption
-: Odinstalovat adresáø
+: OdinstalaÄ�nÃ­ sloÅ¾ka
 # ^ConfirmSubCaption
-: Potvrzení
+: PotvrzenÃ­
 # ^UninstallingSubCaption
-: Odinstalování
+: Odinstalace
 # ^UnCompletedSubCaption
-: Dokonèeno
+: DokonÄ�eno
 # ^BackBtn
-< &Zpìt
+< &ZpÄ›t
 # ^NextBtn
-&Další >
+&DalÅ¡Ã­ >
 # ^AgreeBtn
-Souhl&asím
+Souhl&asÃ­m
 # ^AcceptBtn
-Souhl&asím s podmínkami Licenèního ujednání
+Souhl&asÃ­m s podmÃ­nkami licenÄ�nÃ­ smlouvy
 # ^DontAcceptBtn
-&Nesouhlasím s podmínkami Licenèního ujednání
+&NesouhlasÃ­m s podmÃ­nkami licenÄ�nÃ­ smlouvy
 # ^InstallBtn
 &Instalovat
 # ^UninstallBtn
@@ -53,138 +54,138 @@
 # ^CancelBtn
 Storno
 # ^CloseBtn
-&Zavøít
+&ZavÅ™Ã­t
 # ^BrowseBtn
-P&rocházet...
+P&rochÃ¡zet...
 # ^ShowDetailsBtn
-Zobrazit &detaily
+&Podrobnosti
 # ^ClickNext
-Pro pokraèování kliknìte na 'Další'.
+PokraÄ�ujte kliknutÃ­m na tlaÄ�Ã­tko DalÅ¡Ã­.
 # ^ClickInstall
-Kliknìte na 'Instalovat' pro zahájení instalace.
+Instalaci spustÃ­te kliknutÃ­m na tlaÄ�Ã­tko Instalovat.
 # ^ClickUninstall
-Kliknìte na 'Odinstalovat' pro zahájení odinstalace.
+Odinstalaci spustÃ­te kliknutÃ­m na tlaÄ�Ã­tko Odinstalovat.
 # ^Name
-Název
+NÃ¡zev
 # ^Completed
-Dokonèeno
+DokonÄ�eno
 # ^LicenseText
-Pøed instalací $(^NameDA) si prosím pøeètìte licenèní ujednání. Jestliže souhlasíte se všema podmínkama ujednání, kliknìte 'Souhlasím'.
+PÅ™ed instalacÃ­ programu $(^NameDA) si prosÃ­m pÅ™eÄ�tÄ›te licenÄ�nÃ­ smlouvu. JestliÅ¾e souhlasÃ­te s podmÃ­nkami tÃ©to smlouvy, kliknÄ›te na tlaÄ�Ã­tko SouhlasÃ­m.
 # ^LicenseTextCB
-Pøed instalací $(^NameDA) si prosím pøeètìte licenèní ujednání. Jestliže souhlasíte se všema podmínkama ujednání, zaškrtnìte políèko dole. $_CLICK
+PÅ™ed instalacÃ­ programu $(^NameDA) si prosÃ­m pÅ™eÄ�tÄ›te licenÄ�nÃ­ smlouvu. JestliÅ¾e souhlasÃ­te s podmÃ­nkami tÃ©to smlouvy, zaÅ¡krtnÄ›te polÃ­Ä�ko nÃ­Å¾e. $_CLICK
 # ^LicenseTextRB
-Pøed instalací $(^NameDA) si prosím pøeètìte licenèní ujednání. Jestliže souhlasíte se všema podmínkama ujednání, zaškrtnìte níže první možnost. $_CLICK
+PÅ™ed instalacÃ­ programu $(^NameDA) si prosÃ­m pÅ™eÄ�tÄ›te licenÄ�nÃ­ smlouvu. JestliÅ¾e souhlasÃ­te s podmÃ­nkami tÃ©to smlouvy, vyberte nÃ­Å¾e prvnÃ­ moÅ¾nost. $_CLICK
 # ^UnLicenseText
-Pøed odinstalování $(^NameDA) si prosím pøeètìte licenèní ujednání. Jestliže souhlasíte se všema podmínkama ujednání, kliknìte 'Souhlasím'.
+PÅ™ed odinstalacÃ­ programu $(^NameDA) si prosÃ­m pÅ™eÄ�tÄ›te licenÄ�nÃ­ smlouvu. JestliÅ¾e souhlasÃ­te s podmÃ­nkami tÃ©to smlouvy, kliknÄ›te na tlaÄ�Ã­tko SouhlasÃ­m.
 # ^UnLicenseTextCB
-Pøed odinstalování $(^NameDA) si prosím pøeètìte licenèní ujednání. Jestliže souhlasíte se všema podmínkama ujednání, zaškrtnìte políèko dole. $_CLICK
+PÅ™ed odinstalacÃ­ programu $(^NameDA) si prosÃ­m pÅ™eÄ�tÄ›te licenÄ�nÃ­ smlouvu. JestliÅ¾e souhlasÃ­te s podmÃ­nkami tÃ©to smlouvy, zaÅ¡krtnÄ›te polÃ­Ä�ko nÃ­Å¾e. $_CLICK
 # ^UnLicenseTextRB
-Pøed odinstalování $(^NameDA) si prosím pøeètìte licenèní ujednání. Jestliže souhlasíte se všema podmínkama ujednání, zaškrtnìte níže první možnost. $_CLICK
+PÅ™ed odinstalacÃ­ programu $(^NameDA) si prosÃ­m pÅ™eÄ�tÄ›te licenÄ�nÃ­ smlouvu. JestliÅ¾e souhlasÃ­te s podmÃ­nkami tÃ©to smlouvy, vyberte nÃ­Å¾e prvnÃ­ moÅ¾nost. $_CLICK
 # ^Custom
-Vlastní
+VlastnÃ­
 # ^ComponentsText
-Zvolte souèásti, které chcete nainstalovat a nezatrhnìte souèásti, které instalovat nechcete. $_CLICK
+ZaÅ¡krtnÄ›te souÄ�Ã¡sti, kterÃ© chcete nainstalovat a zruÅ¡te zaÅ¡krtnutÃ­ souÄ�Ã¡stÃ­, kterÃ© nechcete nainstalovat. $_CLICK
 # ^ComponentsSubText1
-Zvolte zpùsob instalace:
+Zvolte zpÅ¯sob instalace:
 # ^ComponentsSubText2_NoInstTypes
-Zvolte souèásti k instalaci:
+Vyberte souÄ�Ã¡sti, kterÃ© chcete nainstalovat.
 # ^ComponentsSubText2
-Nebo zvolte volitelné souèásti, které chcete nainstalovat:
+Nebo vyberte volitelnÃ© souÄ�Ã¡sti, kterÃ© chcete nainstalovat.
 # ^UnComponentsText
-Zatrhnìte souèásti, které chcete odinstalovat a nezatrhnìte souèásti, které odinstalovat nechcete. $_CLICK
+ZaÅ¡krtnÄ›te souÄ�Ã¡sti, kterÃ© chcete odinstalovat a zruÅ¡te zaÅ¡krtnutÃ­ souÄ�Ã¡stÃ­, kterÃ© nechcete odinstalovat. $_CLICK
 # ^UnComponentsSubText1
-Zvolte zpùsob odinstalace:
+Zvolte zpÅ¯sob odinstalace:
 # ^UnComponentsSubText2_NoInstTypes
-Zvolte souèásti pro odinstalaci:
+Vyberte souÄ�Ã¡sti, kterÃ© chcete odinstalovat.
 # ^UnComponentsSubText2
-Nebo zvolte jednotlivé souèásti, které chcete odinstalovat:
+Nebo vyberte volitelnÃ© souÄ�Ã¡sti, kterÃ© chcete odinstalovat.
 # ^DirText
-Setup nyní nainstaluje program $(^NameDA) do následující složky. Pro instalaci do jiné složky zvolte 'Procházet' a vyberte jinou složku. $_CLICK
+InstalaÄ�nÃ­ program nainstaluje program $(^NameDA) do nÃ¡sledujÃ­cÃ­ sloÅ¾ky. Chcete-li instalovat do jinÃ© sloÅ¾ky, kliknÄ›te na tlaÄ�Ã­tko ProchÃ¡zet a vyberte jinou sloÅ¾ku. $_CLICK
 # ^DirSubText
-Cílová složka
+CÃ­lovÃ¡ sloÅ¾ka
 # ^DirBrowseText
-Zvolte složku kam instalovat program $(^NameDA):
+VÃ½bÄ›r instalaÄ�nÃ­ sloÅ¾ky programu $(^NameDA).
 # ^UnDirText
-Setup nyní odinstaluje program $(^NameDA) z následující složky. Pro odinstalaci z jiné složky zvolte 'Procházet' a vyberte jinou složku. $_CLICK
+OdinstalaÄ�nÃ­ program odinstaluje program $(^NameDA) z nÃ¡sledujÃ­cÃ­ sloÅ¾ky. Chcete-li odinstalovat z jinÃ© sloÅ¾ky, kliknÄ›te na tlaÄ�Ã­tko ProchÃ¡zet a vyberte jinou sloÅ¾ku. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Zvolte adresáø pro odinstalaci $(^NameDA) z:
+Vyberte odinstalaÄ�nÃ­ sloÅ¾ku programu $(^NameDA):
 # ^SpaceAvailable
-"Volné místo: "
+"VolnÃ© mÃ­sto: "
 # ^SpaceRequired
-"Potøebné místo: "
+"PoÅ¾adovanÃ© mÃ­sto: "
 # ^UninstallingText
-Tento prùvodce z Vašeho poèítaèe odinstaluje $(^NameDA). $_CLICK
+Program $(^NameDA) bude odinstalovÃ¡n z nÃ¡sledujÃ­cÃ­ sloÅ¾ky. $_CLICK
 # ^UninstallingSubText
 Odinstalovat z:
 # ^FileError
-Nelze otevøít soubor pro zápis: \r\n\t"$0"\r\nStisknìte 'Pøerušit' pro ukonèení instalace\r\nnebo 'Znovu' pro další pokus nebo\r\n'Ignorovat' pro pøeskoèení souboru
+Soubor nelze otevÅ™Ã­t pro zÃ¡pis: \r\n\t"$0"\r\nKliknÄ›te na tlaÄ�Ã­tko PÅ™eruÅ¡it k ukonÄ�enÃ­ instalace,\r\nnebo na tlaÄ�Ã­tko Opakovat k zopakovÃ¡nÃ­ akce, nebo\r\n na tlaÄ�Ã­tko Ignorovat k pÅ™eskoÄ�enÃ­ souboru.
 # ^FileError_NoIgnore
-Nelze otevøít soubor pro zápis: \r\n\t"$0"\r\nStisknìte 'Znovu' pro další pokus nebo\r\n*Storno* pro ukonèení instalace
+Soubor nelze otevÅ™Ã­t pro zÃ¡pis: \r\n\t"$0"\r\nKliknÄ›te na tlaÄ�Ã­tko Opakovat k zopakovÃ¡nÃ­ akce, nebo\r\n na tlaÄ�Ã­tko Storno k ukonÄ�enÃ­ instalace.
 # ^CantWrite
 "Nelze zapsat: "
 # ^CopyFailed
-Kopírování selhalo
+KopÃ­rovÃ¡nÃ­ se nezdaÅ™ilo.
 # ^CopyTo
-"Zkopírovat do "
+"KopÃ­rovÃ¡nÃ­ do "
 # ^Registering
-"Registrování: "
+"Registrace: "
 # ^Unregistering
-"Odregistrování: "
+"RuÅ¡enÃ­ registrace: "
 # ^SymbolNotFound
-"Nelze najít znak: "
+"Nelze najÃ­t symbol: "
 # ^CouldNotLoad
-"Nelze naèíst: "
+"Nelze naÄ�Ã­st: "
 # ^CreateFolder
-"Vytvoøen adresáø: "
+"VytvÃ¡Å™enÃ­ sloÅ¾ky: "
 # ^CreateShortcut
-"Vytvoøen zástupce: "
+"VytvÃ¡Å™enÃ­ zÃ¡stupce: "
 # ^CreatedUninstaller
-"Vytvoøen odinstalátor: "
+"VytvÃ¡Å™enÃ­ odinstalaÄ�nÃ­ho programu: "
 # ^Delete
-"Smazat soubor: "
+"OdstraÅˆovÃ¡nÃ­ souboru: "
 # ^DeleteOnReboot
-"Smazat po restartu: "
+"Odstranit pÅ™i restartovÃ¡nÃ­: "
 # ^ErrorCreatingShortcut
-"Chyba pøi vytváøení zástupce: "
+"PÅ™i vytvÃ¡Å™enÃ­ zÃ¡stupce doÅ¡lo k chybÄ›: "
 # ^ErrorCreating
-"Chyba pøi vytváøení: "
+"PÅ™i vytvÃ¡Å™enÃ­ doÅ¡lo k chybÄ›: "
 # ^ErrorDecompressing
-Chyba pøi rozbalování dat! Poškozený instalátor?
+PÅ™i dekompresi dat doÅ¡lo k chybÄ›. Byl poÅ¡kozen instalaÄ�nÃ­ program?
 # ^ErrorRegistering
-Chyba pøi registrování DLL
+PÅ™i registraci souborÅ¯ DLL doÅ¡lo k chybÄ›.
 # ^ExecShell
-"Spustit shell: "
+"SpouÅ¡tÄ›nÃ­ prostÅ™edÃ­: "
 # ^Exec
-"Spustit: "
+"SpouÅ¡tÄ›nÃ­: "
 # ^Extract
-"Rozbalit: "
+"ExtrahovÃ¡nÃ­: "
 # ^ErrorWriting
-"Rozbalit: chyba pøi zápisu do souboru "
+"Extrakce: PÅ™i zÃ¡pisu souboru doÅ¡lo k chybÄ› "
 # ^InvalidOpcode
-Instalátor je poškozen: nesprávný kontrolní kód
+InstalaÄ�nÃ­ program byl poÅ¡kozen: neplatnÃ½ operaÄ�nÃ­ kÃ³d.
 # ^NoOLE
-"Nedostupné OLE pro: "
+"NedostupnÃ© OLE pro: "
 # ^OutputFolder
-"Výstupní složka: "
+"VÃ½stupnÃ­ sloÅ¾ka: "
 # ^RemoveFolder
-"Odstranit složku: "
+"OdstraÅˆovÃ¡nÃ­ sloÅ¾ky: "
 # ^RenameOnReboot
-"Pøejmenovat pøi restartu: "
+"PÅ™ejmenovat pÅ™i restartovÃ¡nÃ­: "
 # ^Rename
-"Pøejmenováno: "
+"PÅ™ejmenovÃ¡no: "
 # ^Skipped
-"Pøeskoèeno: "
+"PÅ™eskoÄ�eno: "
 # ^CopyDetails
-Zkopírovat podrobnosti do schránky
+ZkopÃ­rovat podrobnosti do schrÃ¡nky
 # ^LogInstall
-Zaznamenat prùbìh instalace
+Protokolovat proces instalace
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Luxembourgish.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Luxembourgish.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Luxembourgish.nlf	(revision 2956)
@@ -1,11 +1,11 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 4103
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
@@ -23,21 +23,21 @@
 # ^DirSubCaption
 : Zielverzeechnis
 # ^InstallingSubCaption
-: Installéieren
+: InstallÃ©ieren
 # ^CompletedSubCaption
-: Färdeg
+: FÃ¤rdeg
 # ^UnComponentsSubCaption
 : Desinstallatiuons-Optiounen
 # ^UnDirSubCaption
 : Quellverzeechnes
 # ^ConfirmSubCaption
-: Bestätegung
+: BestÃ¤tegung
 # ^UninstallingSubCaption
-: Läschen
+: LÃ¤schen
 # ^UnCompletedSubCaption
-: Färdeg
+: FÃ¤rdeg
 # ^BackBtn
-< &Zréck
+< &ZrÃ©ck
 # ^NextBtn
 &Weider >
 # ^AgreeBtn
@@ -47,9 +47,9 @@
 # ^DontAcceptBtn
 Ech &lehnen d'Lizenzofkommes of.
 # ^InstallBtn
-&Installéieren
+&InstallÃ©ieren
 # ^UninstallBtn
-&Desinstalléieren
+&DesinstallÃ©ieren
 # ^CancelBtn
 Ofbriechen
 # ^CloseBtn
@@ -61,77 +61,77 @@
 # ^ClickNext
 Klick op weider fir weiderzefueren
 # ^ClickInstall
-Klick op Installéieren, fir d'Installatioun unzefänken.
+Klick op InstallÃ©ieren, fir d'Installatioun unzefÃ¤nken.
 # ^ClickUninstall
-Klick op Desinstalléieren, fir d'Desinstallatioun unzefänken.
+Klick op DesinstallÃ©ieren, fir d'Desinstallatioun unzefÃ¤nken.
 # ^Name
 Numm
 # ^Completed
-Färdeg
+FÃ¤rdeg
 # ^LicenseText
-W.e.g. d'Lizenzofkommes liesen, ierts de $(^NameDA) installéiers. Wanns de all Bedengungen vum Ofkommes akzeptéiers, klick op Unhuelen.
+W.e.g. d'Lizenzofkommes liesen, ierts de $(^NameDA) installÃ©iers. Wanns de all Bedengungen vum Ofkommes akzeptÃ©iers, klick op Unhuelen.
 # ^LicenseTextCB
-W.e.g. d'Lizenzofkommes liesen, ierts de $(^NameDA) installéiers. Wanns de all Bedengungen vum Ofkommes akzeptéiers, aktivéier d'Kontrollkeschtchen. $_CLICK
+W.e.g. d'Lizenzofkommes liesen, ierts de $(^NameDA) installÃ©iers. Wanns de all Bedengungen vum Ofkommes akzeptÃ©iers, aktivÃ©ier d'Kontrollkeschtchen. $_CLICK
 # ^LicenseTextRB
-W.e.g. d'Lizenzofkommes liesen, ierts de $(^NameDA) installéiers. Wanns de all Bedengungen vum Ofkommes akzeptéiers, wiel d'entsprichend Optioun. $_CLICK
+W.e.g. d'Lizenzofkommes liesen, ierts de $(^NameDA) installÃ©iers. Wanns de all Bedengungen vum Ofkommes akzeptÃ©iers, wiel d'entsprichend Optioun. $_CLICK
 # ^UnLicenseText
-W.e.g. d'Lizenzofkommes liesen, ierts de $(^NameDA) desinstalléiers. Wanns de all Bedengungen vum Ofkommes akzeptéiers, klick op Unhuelen.
+W.e.g. d'Lizenzofkommes liesen, ierts de $(^NameDA) desinstallÃ©iers. Wanns de all Bedengungen vum Ofkommes akzeptÃ©iers, klick op Unhuelen.
 # ^UnLicenseTextCB
-W.e.g. d'Lizenzofkommes liesen, ierts de $(^NameDA) desinstalléiers. Wanns de all Bedengungen vum Ofkommes akzeptéiers, aktivéier d'Kontrollkeschtchen. $_CLICK
+W.e.g. d'Lizenzofkommes liesen, ierts de $(^NameDA) desinstallÃ©iers. Wanns de all Bedengungen vum Ofkommes akzeptÃ©iers, aktivÃ©ier d'Kontrollkeschtchen. $_CLICK
 # ^UnLicenseTextRB
-W.e.g. d'Lizenzoofkommes liesen, ierts de $(^NameDA) desinstalléiers. Wanns de all Bedengungen vum Oofkommes akzeptéiers, wiel d'entspriechend Optioun. $_CLICK
+W.e.g. d'Lizenzoofkommes liesen, ierts de $(^NameDA) desinstallÃ©iers. Wanns de all Bedengungen vum Oofkommes akzeptÃ©iers, wiel d'entspriechend Optioun. $_CLICK
 # ^Custom
 Benutzerdefiniert
 # ^ComponentsText
-Wiel d'Komponenten aus, déis de wëlls installéieren an wiel déijéineg of, déis de net installéieren wëlls. $_CLICK
+Wiel d'Komponenten aus, dÃ©is de wÃ«lls installÃ©ieren an wiel dÃ©ijÃ©ineg of, dÃ©is de net installÃ©ieren wÃ«lls. $_CLICK
 # ^ComponentsSubText1
-Installatiouns-Typ bestëmmen:
+Installatiouns-Typ bestÃ«mmen:
 # ^ComponentsSubText2_NoInstTypes
-Wiel d'Komponenten aus, déis de installéieren wëlls:
+Wiel d'Komponenten aus, dÃ©is de installÃ©ieren wÃ«lls:
 # ^ComponentsSubText2
-oder wiel zousätzlech Komponenten aus déis de installéieren wëlls:
+oder wiel zousÃ¤tzlech Komponenten aus dÃ©is de installÃ©ieren wÃ«lls:
 # ^UnComponentsText
-Wiel d'Komponenten aus déis de desinstalléieren wëlls an wiel déijéineg of, déis de net desinstalléieren wëlls. $_CLICK
+Wiel d'Komponenten aus dÃ©is de desinstallÃ©ieren wÃ«lls an wiel dÃ©ijÃ©ineg of, dÃ©is de net desinstallÃ©ieren wÃ«lls. $_CLICK
 # ^UnComponentsSubText1
-Deinstallatiouns-Typ bestëmmen:
+Deinstallatiouns-Typ bestÃ«mmen:
 # ^UnComponentsSubText2_NoInstTypes
-Wiel d'Komponenten aus, déis de desinstalléieren wëlls:
+Wiel d'Komponenten aus, dÃ©is de desinstallÃ©ieren wÃ«lls:
 # ^UnComponentsSubText2
-oder wiel zusätzlech Komponenten aus, déis de desinstalléieren wëlls:
+oder wiel zusÃ¤tzlech Komponenten aus, dÃ©is de desinstallÃ©ieren wÃ«lls:
 # ^DirText
-$(^NameDA) gëtt an den Dossier installéiert deen fierginn gouf. Wanns de et an een aneren Dossier installéieren wëlls, klick op Duechsichen an wiel een aneren Dossier aus. $_CLICK
+$(^NameDA) gÃ«tt an den Dossier installÃ©iert deen fierginn gouf. Wanns de et an een aneren Dossier installÃ©ieren wÃ«lls, klick op Duechsichen an wiel een aneren Dossier aus. $_CLICK
 # ^DirSubText
 Zielverzeechnes
 # ^DirBrowseText
-Wiel en Dossier aus wuers de $(^NameDA) installéieren wëlls:
+Wiel en Dossier aus wuers de $(^NameDA) installÃ©ieren wÃ«lls:
 # ^UnDirText
-$(^NameDA) gëtt an deem Dossier desinstalléiert, deen uginn gouf. Wann $(^NameDA) an engem aneren Dossier ass, klick op Duechsichen an wiel een aneren Dossier aus. $_CLICK
+$(^NameDA) gÃ«tt an deem Dossier desinstallÃ©iert, deen uginn gouf. Wann $(^NameDA) an engem aneren Dossier ass, klick op Duechsichen an wiel een aneren Dossier aus. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Wiel den Dossier aus wou $(^NameDA) dran installéiert ass:
+Wiel den Dossier aus wou $(^NameDA) dran installÃ©iert ass:
 # ^SpaceAvailable
-"Verfügbaren Späicher: "
+"VerfÃ¼gbaren SpÃ¤icher: "
 # ^SpaceRequired
-"Gebrauchten Späicher: "
+"Gebrauchten SpÃ¤icher: "
 # ^UninstallingText
-$(^NameDA) gëtt aus dem ausgewielten Dossier desinstalléiert. $_CLICK
+$(^NameDA) gÃ«tt aus dem ausgewielten Dossier desinstallÃ©iert. $_CLICK
 # ^UninstallingSubText
-Desinstalléieren aus:
+DesinstallÃ©ieren aus:
 # ^FileError
-Fehler beim Iwwerschreiwen vun der Datei: \r\n\t"$0"\r\nKlick op ofbriechen fir den Setup ze verloossen,\r\nop Widderhuelen fir den Setup nach eng Kéier duechzeféieren\r\n oder op Ignoréieren fir des Datei ze iwwersprengen an weiderzefueren.
+Fehler beim Iwwerschreiwen vun der Datei: \r\n\t"$0"\r\nKlick op ofbriechen fir den Setup ze verloossen,\r\nop Widderhuelen fir den Setup nach eng KÃ©ier duechzefÃ©ieren\r\n oder op IgnorÃ©ieren fir des Datei ze iwwersprengen an weiderzefueren.
 # ^FileError_NoIgnore
-Fehler beim Iwwerschreiwen vun der Datei: \r\n\t"$0"\r\nKlick op Widderhuelen fir den Setup nach eng Kéier duechzeféieren,\r\noder op ofbriechen fir den Setup ze verloossen.
+Fehler beim Iwwerschreiwen vun der Datei: \r\n\t"$0"\r\nKlick op Widderhuelen fir den Setup nach eng KÃ©ier duechzefÃ©ieren,\r\noder op ofbriechen fir den Setup ze verloossen.
 # ^CantWrite
 "Fehler beim Schreiwen: "
 # ^CopyFailed
-Kopéieren fehlgeschloen
+KopÃ©ieren fehlgeschloen
 # ^CopyTo
-"Kopéiere an "
+"KopÃ©iere an "
 # ^Registering
-"Registréieren: "
+"RegistrÃ©ieren: "
 # ^Unregistering
-"Deregistréieren: "
+"DeregistrÃ©ieren: "
 # ^SymbolNotFound
 "Symbol ass net do: "
 # ^CouldNotLoad
@@ -143,33 +143,33 @@
 # ^CreatedUninstaller
 "Man Desinstallatiouns-Programm: "
 # ^Delete
-"Läschen Datei: "
+"LÃ¤schen Datei: "
 # ^DeleteOnReboot
-"Läschen Datei no engem Neistart: "
+"LÃ¤schen Datei no engem Neistart: "
 # ^ErrorCreatingShortcut
 "Fehler beim man vun enger Oofkierzung: "
 # ^ErrorCreating
 "Fehler beim maan: "
 # ^ErrorDecompressing
-Fehler beim Dekompriméieren. Installations-Programm beschiedegt?
+Fehler beim DekomprimÃ©ieren. Installations-Programm beschiedegt?
 # ^ErrorRegistering
-Fehler beim Registréieren vun der DLL
+Fehler beim RegistrÃ©ieren vun der DLL
 # ^ExecShell
 "ExecShell: "
 # ^Exec
 "Starten: "
 # ^Extract
-"Dekompriméieren: "
+"DekomprimÃ©ieren: "
 # ^ErrorWriting
-"Dekompriméierung: Fehler beim Schreiwen vun der Datei "
+"DekomprimÃ©ierung: Fehler beim Schreiwen vun der Datei "
 # ^InvalidOpcode
-Installations-Programm Beschiedegt: net zoulässegen Befehlscode
+Installations-Programm Beschiedegt: net zoulÃ¤ssegen Befehlscode
 # ^NoOLE
 "Keen OLE fier: "
 # ^OutputFolder
 "Zieldossier: "
 # ^RemoveFolder
-"Läschen Dossier: "
+"LÃ¤schen Dossier: "
 # ^RenameOnReboot
 "Gett no Neistart embenannt: "
 # ^Rename
@@ -177,14 +177,14 @@
 # ^Skipped
 "Iwwersprongen: "
 # ^CopyDetails
-Detailler an d'Zwëschenooflag kopéieren
+Detailler an d'ZwÃ«schenooflag kopÃ©ieren
 # ^LogInstall
-Installatioun protokolléieren
+Installatioun protokollÃ©ieren
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Pashto.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Pashto.nlf	(revision 0)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Pashto.nlf	(revision 2956)
@@ -0,0 +1,191 @@
+ï»¿# Header, don't edit
+NLF v6
+# Start editing here
+# Language ID
+1123
+# Font and size - dash (-) means default
+-
+-
+# Codepage - dash (-) means ASCII code page
+1256
+# RTL - anything else than RTL means LTR
+RTL
+# Translation by Pakhtosoft (www.pakhtosoft.com)
+# ^Branding
+Nullsoft Install System %s
+# ^SetupCaption
+Ø§Ù…Ø³ØªÙ‡ $(^Name)
+# ^UninstallCaption
+Ù†Ø§Ù„Ú«Ø§Ùˆ $(^Name)
+# ^LicenseSubCaption
+: Ù…Ù†ÚšØªÙ„ÙŠÚ© ØªÚ“ÙˆÙ†
+# ^ComponentsSubCaption
+: Ù„Ú«Ø§Ùˆ ØºÙˆØ±Ø§ÙˆÙŠ
+# ^DirSubCaption
+: Ù„Ú«Ø§Ùˆ Ù¾ÙˆÚšÛ�
+# ^InstallingSubCaption
+: Ù„Ú«ÙŠÚ–ÙŠ
+# ^CompletedSubCaption
+: Ø¨Ø´Ù¾Ú“
+# ^UnComponentsSubCaption
+: Ù†Ø§Ù„Ú«Ø§Ùˆ ØºÙˆØ±Ø§ÙˆÙŠ
+# ^UnDirSubCaption
+: Ù†Ø§Ù„Ú«Ø§Ùˆ Ù¾ÙˆÚšÛ�
+# ^ConfirmSubCaption
+: Ø¨Ø§ÙˆØ±ÙˆÙ„
+# ^UninstallingSubCaption
+: Ù†Ø§Ù„Ú«ÙŠÚ–ÙŠ
+# ^UnCompletedSubCaption
+: Ø¨Ø´Ù¾Ú“
+# ^BackBtn
+< &ÙˆØ±ÙˆØ³ØªÙ‡
+# ^NextBtn
+&Ù…Ø®Ú©ÚšÛ� >
+# ^AgreeBtn
+Ø²Ù‡ &Ù…Ù†Ù…
+# ^AcceptBtn
+Ø²Ù‡ &Ø¯ Ù…Ù†ÚšØªÙ„ÙŠÚ© ØªÙˆÚ©ÙŠ Ù…Ù†Ù…
+# ^DontAcceptBtn
+Ø²Ù‡ &Ø¯ Ù…Ù†ÚšØªÙ„ÙŠÚ© ØªÙˆÚ©ÙŠ Ù†Ù‡ Ù…Ù†Ù…
+# ^InstallBtn
+&Ù„Ú«ÙˆÙ„
+# ^UninstallBtn
+&Ù†Ø§Ù„Ú«ÙˆÙ„
+# ^CancelBtn
+Ø¨Ù†Ø¯ÙˆÙ„
+# ^CloseBtn
+&Ø¨Ù†Ø¯ÙˆÙ„
+# ^BrowseBtn
+...Ú†&Ú¼Ù„
+# ^ShowDetailsBtn
+Ø®Ø¨Ø±ØªÙŠØ§ÙˆÛ� &ÚšÙˆØ¯Ù„
+# ^ClickNext
+.Ù…Ø®Ú©ÚšÛ� ØªÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ù…Ø®Ú©ÚšÛ� Ù¼Ú© ÙˆÙ‡Ø¦
+# ^ClickInstall
+.Ù„Ú«Ø§Ùˆ Ù¾Û�Ù„ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ù„Ú«ÙˆÙ„ Ù¼Ú© ÙˆÙ‡Ø¦
+# ^ClickUninstall
+.Ù†Ø§Ù„Ú«Ø§Ùˆ Ù¾Û�Ù„ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ù†Ø§Ù„Ú«ÙˆÙ„ Ù¼Ú© ÙˆÙ‡Ø¦
+# ^Name
+Ù†ÙˆÙ…
+# ^Completed
+Ø¨Ø´Ù¾Ú“
+# ^LicenseText
+.Ø¯ Ù„Ú«ÙˆÙ„Ùˆ Ù†Ù‡ Ù…Ø®Ú©ÚšÛ� Ù…Ù†ÚšØªÙ„ÙŠÚ© ÙˆÚ«ÙˆØ±Ø¦. Ú©Ù‡ Ú†Û�Ø±Û� ØªØ§Ø³Û� Ø¯ Ù…Ù†ÚšØªÙ„ÙŠÚ© Ù¼ÙˆÙ„ ØªÙˆÚ©ÙŠ Ù…Ù†Ø¦ØŒ Ø²Ù‡ Ù…Ù†Ù… Ù¼Ú© ÙˆÙ‡Ø¦ $(^NameDA) Ø¯
+# ^LicenseTextCB
+$_CLICK .Ø¯ Ù„Ú«ÙˆÙ„Ùˆ Ù†Ù‡ Ù…Ø®Ú©ÚšÛ� Ù…Ù†ÚšØªÙ„ÙŠÚ© ÙˆÚ«ÙˆØ±Ø¦. Ú©Ù‡ Ú†Û�Ø±Û� ØªØ§Ø³Û� Ø¯ Ù…Ù†ÚšØªÙ„ÙŠÚ© Ù¼ÙˆÙ„ ØªÙˆÚ©ÙŠ Ù…Ù†Ø¦ØŒ Ù„Ø§Ù†Ø¯Û� Ø®ÙˆÚšØ¨Ú©Ø³ Ù¼Ú© ÙˆÙ‡Ø¦ $(^NameDA) Ø¯
+# ^LicenseTextRB
+$_CLICK .Ø¯ Ù„Ú«ÙˆÙ„Ùˆ Ù†Ù‡ Ù…Ø®Ú©ÚšÛ� Ù…Ù†ÚšØªÙ„ÙŠÚ© ÙˆÚ«ÙˆØ±Ø¦. Ú©Ù‡ Ú†Û�Ø±Û� ØªØ§Ø³Û� Ø¯ Ù…Ù†ÚšØªÙ„ÙŠÚ© Ù¼ÙˆÙ„ ØªÙˆÚ©ÙŠ Ù…Ù†Ø¦ØŒ Ù„Ø§Ù†Ø¯Û� Ù„Ù…Ú“ÛŒ ØºÙˆØ±Ø§ÙˆÛŒ Ø®ÙˆÚš Ú©Ú“Ø¦ $(^NameDA) Ø¯
+# ^UnLicenseText
+.Ø¯ Ù†Ø§Ù„Ú«Ø§Ùˆ Ù†Ù‡ Ù…Ø®Ú©ÚšÛ� Ù…Ù†ÚšØªÙ„ÙŠÚ© ÙˆÚ«ÙˆØ±Ø¦. Ú©Ù‡ Ú†Û�Ø±Û� ØªØ§Ø³Û� Ø¯ Ù…Ù†ÚšØªÙ„ÙŠÚ© Ù¼ÙˆÙ„ ØªÙˆÚ©ÙŠ Ù…Ù†Ø¦ØŒ Ø²Ù‡ Ù…Ù†Ù… Ù¼Ú© ÙˆÙ‡Ø¦ $(^NameDA) Ø¯
+# ^UnLicenseTextCB
+$_CLICK .Ø¯ Ù†Ø§Ù„Ú«Ø§Ùˆ Ù†Ù‡ Ù…Ø®Ú©ÚšÛ� Ù…Ù†ÚšØªÙ„ÙŠÚ© ÙˆÚ«ÙˆØ±Ø¦. Ú©Ù‡ Ú†Û�Ø±Û� ØªØ§Ø³Û� Ø¯ Ù…Ù†ÚšØªÙ„ÙŠÚ© Ù¼ÙˆÙ„ ØªÙˆÚ©ÙŠ Ù…Ù†Ø¦ØŒ Ù„Ø§Ù†Ø¯Û� Ø®ÙˆÚšØ¨Ú©Ø³ Ù¼Ú© ÙˆÙ‡Ø¦ $(^NameDA) Ø¯
+# ^UnLicenseTextRB
+$_CLICK .Ø¯ Ù†Ø§Ù„Ú«Ø§Ùˆ Ù†Ù‡ Ù…Ø®Ú©ÚšÛ� Ù…Ù†ÚšØªÙ„ÙŠÚ© ÙˆÚ«ÙˆØ±Ø¦. Ú©Ù‡ Ú†Û�Ø±Û� ØªØ§Ø³Û� Ø¯ Ù…Ù†ÚšØªÙ„ÙŠÚ© Ù¼ÙˆÙ„ ØªÙˆÚ©ÙŠ Ù…Ù†Ø¦ØŒ Ù„Ø§Ù†Ø¯Û� Ù„Ù…Ú“ÛŒ ØºÙˆØ±Ø§ÙˆÙŠ Ø®ÙˆÚš Ú©Ú“Ø¦ $(^NameDA) Ø¯
+# ^Custom
+Ø¯ÙˆØ¯ÙŠØ²
+# ^ComponentsText
+$_CLICK .Ú©ÙˆÙ… Ø±ØºØªÙˆÚ©ÙŠ Ú†Û� Ù„Ú«ÙˆÙ„ ØºÙˆØ§Ú“Ø¦ Ø®ÙˆÚš ÙŠÛ� Ú©Ú“Ø¦ Ø§Ùˆ Ú©ÙˆÙ… Ø±ØºØªÙˆÚ©ÙŠ Ú†Û� Ù†Ù‡ ØºÙˆØ§Ú“Ø¦ ÙˆÙŠÛ� Ù„Ú«ÙˆØ¦ Ù…Ù‡ ÙŠÛ� Ø®ÙˆÚšÙˆØ¦
+# ^ComponentsSubText1
+:Ø¯ Ù„Ú«Ø§Ùˆ Ú‰ÙˆÙ„ ÙˆÙ¼Ø§Ú©Ø¦
+# ^ComponentsSubText2_NoInstTypes
+:Ø¯ Ù„Ú«ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ø±ØºØªÙˆÚ©ÙŠ Ø®ÙˆÚš Ú©Ú“Ø¦
+# ^ComponentsSubText2
+:ÙŠØ§ØŒ Ù‡ØºÙ‡ ØºÙˆØ±Ø§ÙˆÙŠØ² Ø±ØºØªÙˆÚ©ÙŠ Ú†Û� Ù„Ú«ÙˆÙ„ ÙŠÛ� ØºÙˆØ§Ú“Ø¦ ÙˆÙ¼Ø§Ú©Ø¦
+# ^UnComponentsText
+$_CLICK .Ú©ÙˆÙ… Ø±ØºØªÙˆÚ©ÙŠ Ú†Û� Ù†Ø§Ù„Ú«ÙˆÙ„ ØºÙˆØ§Ú“Ø¦ Ø®ÙˆÚš ÙŠÛ� Ú©Ú“Ø¦ Ø§Ùˆ Ú©ÙˆÙ… Ø±ØºØªÙˆÚ©ÙŠ Ú†Û� Ù†Ù‡ ØºÙˆØ§Ú“Ø¦ ÙˆÙŠÛ� Ù†Ø§Ù„Ú«ÙˆØ¦ Ù…Ù‡ ÙŠÛ� Ø®ÙˆÚšÙˆØ¦
+# ^UnComponentsSubText1
+:Ø¯ Ù†Ø§Ù„Ú«Ø§Ùˆ Ú‰ÙˆÙ„ ÙˆÙ¼Ø§Ú©Ø¦
+# ^UnComponentsSubText2_NoInstTypes
+:Ø¯ Ù†Ø§Ù„Ú«ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ø±ØºØªÙˆÚ©ÙŠ ÙˆÙ¼Ø§Ú©Ø¦
+# ^UnComponentsSubText2
+:ÙŠØ§ØŒ Ù‡ØºÙ‡ ØºÙˆØ±Ø§ÙˆÙŠØ² Ø±ØºØªÙˆÚ©ÙŠ Ú†Û� Ù†Ø§Ù„Ú«ÙˆÙ„ ÙŠÛ� ØºÙˆØ§Ú“Ø¦ ÙˆÙ¼Ø§Ú©Ø¦
+# ^DirText
+$_CLICK .Ù¾Ù‡ Ù„Ø§Ù†Ø¯Û� Ù¾ÙˆÚšÛ� Ú©ÚšÛ� ÙˆÙ„Ú«ÙˆÙŠ. Ù¾Ù‡ Ø¨Ù„Û� Ù¾ÙˆÚšÛ� Ú©ÚšÛ� ÙŠÛ� Ø¯ Ù„Ú«ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ØŒ Ú†Ú¼Ù„ Ù¼Ú© ÙˆÙ‡Ø¦ Ø§Ùˆ Ø¨Ù„Ù‡ Ù¾ÙˆÚšÛ� ÙˆÙ¼Ø§Ú©Ø¦ $(^NameDA) Ø§Ù…Ø³ØªÙ‡ Ø¨Ù‡
+# ^DirSubText
+Ù…ÙˆØ®Ù‡ Ù¾ÙˆÚšÛ�
+# ^DirBrowseText
+:Ù¾Ú©ÚšÛ� Ù„Ú«ÙˆÙ„ ØºÙˆØ§Ú“Ø¦ ÙˆÙ¼Ø§Ú©Ø¦ $(^NameDA) Ù‡ØºÙ‡ Ù¾ÙˆÚšÛ� Ú†Û�
+# ^UnDirText
+$_CLICK .Ø¯ Ù„Ø§Ù†Ø¯Û� Ù¾ÙˆÚšÛ� Ù†Ù‡ ÙˆÙ†Ø§Ù„Ú«ÙˆÙŠ. Ø¯ Ø¨Ù„Û� Ù¾ÙˆÚšÛ� Ù†Û� Ø¯ Ù†Ø§Ù„Ú«ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ØŒ Ú†Ú¼Ù„ Ù¼Ú© ÙˆÙ‡Ø¦ Ø§Ùˆ Ø¨Ù„Ù‡ Ù¾ÙˆÚšÛ� ÙˆÙ¼Ø§Ú©Ø¦ $(^NameDA) Ø§Ù…Ø³ØªÙ‡ Ø¨Ù‡
+# ^UnDirSubText
+""
+# ^UnDirBrowseText
+:ØªØ±Û� Ù†Ø§Ù„Ú«ÙˆÙ„ ØºÙˆØ§Ú“Ø¦ ÙˆÙ¼Ø§Ú©Ø¦ $(^NameDA) Ù‡ØºÙ‡ Ù¾ÙˆÚšÛ� Ú†Û�
+# ^SpaceAvailable
+" :Ø´ØªÙ‡ ØªØ´Ù‡"
+# ^SpaceRequired
+" :Ø§Ú“ÙŠÙ†Ù‡ ØªØ´Ù‡"
+# ^UninstallingText
+$_CLICK .Ø¨Ù‡ Ø¯ Ù„Ø§Ù†Ø¯Û� Ù¾ÙˆÚšÛ� Ù†Ù‡ ÙˆÙ†Ø§Ù„Ú«ÙˆÙ„ Ø´ÙŠ $(^NameDA)
+# ^UninstallingSubText
+:Ù†Ø§Ù„Ú«ÙŠÚ–ÙŠ Ù„Ù‡
+# ^FileError
+:Ø¯ Ù„ÙŠÚ©Ù„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ø¯ Ø¯ÙˆØªÙ†Û� Ù¾Ø±Ø§Ù†ÙŠØ³ØªÙ„Ùˆ Ú©ÚšÛ� Ø³ØªÙˆÙ†Ø²Ù‡ \r\n\r\n$0\r\n\r\nØŒØ¯ Ù„Ú«Ø§Ùˆ Ø¯ Ø¨Ù†Ø¯ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ø¨Ù†Ø¯ÙˆÙ„ Ù¼Ú© ÙˆÙ‡Ø¦\r\nØ¨ÙŠØ§Ù‡Ú…Ù‡ Ø¯ Ø¨ÙŠØ§ Ù‡Ú…Û� Ú©ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ØŒ ÙŠØ§\r\n.Ù¾Ø±Û�Ú–Ø¯Ù‡ Ø¯ Ø¯Û� Ø¯ÙˆØªÙ†Û� Ù¾Ø±Û�ÚšÙˆØ¯Ù„Ùˆ Ù„Ù¾Ø§Ø±Ù‡
+# ^FileError_NoIgnore
+:Ø¯ Ù„ÙŠÚ©Ù„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ø¯ Ø¯ÙˆØªÙ†Û� Ù¾Ø±Ø§Ù†ÙŠØ³ØªÙ„Ùˆ Ú©ÚšÛ� Ø³ØªÙˆÙ†Ø²Ù‡ \r\n\r\n$0\r\n\r\nØ¯ Ø¨ÙŠØ§ Ù‡Ú…Û� Ú©ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡ Ø¨ÙŠØ§Ù‡Ú…Ù‡ Ù¼Ú© ÙˆÙ‡Ø¦ØŒ ÙŠØ§\r\n.Ø¨Ù†Ø¯ÙˆÙ„ Ø¯ Ù„Ú«Ø§Ùˆ Ø¯ Ø¨Ù†Ø¯ÙˆÙ„Ùˆ Ù„Ù¾Ø§Ø±Ù‡
+# ^CantWrite
+" :Ù†Ø´ÙŠ Ù„ÙŠÚ©Ù„ÛŒ"
+# ^CopyFailed
+Ù„Ù…Û�Ø³Ù„Ùˆ Ù¾Ø§ØªÛ�ÙŠÙ†Ù‡
+# ^CopyTo
+"ØªÙ‡ Ù„Ù…Û�Ø³Ù„ "
+# ^Registering
+" :Ù†ÙˆÙ…Ú©ÚšÙ„ÙŠÚ–ÙŠ"
+# ^Unregistering
+" :Ù†Ø§Ù†ÙˆÙ…Ú©ÚšÙ„ÙŠÚ–ÙŠ"
+# ^SymbolNotFound
+" :Ù¾Û�Ù„Ø§Ù… Ù†Ø´ÙŠ Ù¾Û�Ø¯Ø§ Ú©ÙˆÙ„ÛŒ"
+# ^CouldNotLoad
+" :Ù†Ø´ÙŠ Ø±Ø§ÙˆØ³ØªÙ„ÛŒ"
+# ^CreateFolder
+" :Ù¾ÙˆÚšÛ� Ø¬ÙˆÚ“ÙˆÙ„"
+# ^CreateShortcut
+" :Ù„Ù†Ú‰Ù„Ø§Ø±ÛŒ Ø¬ÙˆÚ“ÙˆÙ„"
+# ^CreatedUninstaller
+" :Ø¬ÙˆÚ“ Ø´ÙˆÛŒ Ù†Ø§Ù„Ú«Ø§Ù†Ø¯"
+# ^Delete
+" :Ø¯ÙˆØªÙ†Û� Ú“Ù†Ú«ÙˆÙ„"
+# ^DeleteOnReboot
+" :Ù¾Ø± Ø¨ÙŠØ§Ù¾Û�Ù„Ø§Øª Ú“Ù†Ú«ÙˆÙ„"
+# ^ErrorCreatingShortcut
+" :Ø¯ Ù„Ù†Ú‰Ø§Ø±ÙŠ Ø¬ÙˆÚ“ÙˆÙ„Ùˆ Ø³ØªÙˆÙ†Ø²Ù‡"
+# ^ErrorCreating
+" :Ø¬ÙˆÚ“ÙˆÙ„Ùˆ Ø³ØªÙˆÙ†Ø²Ù‡"
+# ^ErrorDecompressing
+Ø§ÙˆÙ…ØªÙˆÚ© Ù†Ø§Ø²Û�Ø±Ù„Ùˆ Ø³ØªÙˆÙ†Ø²Ù‡! Ø§Ù†Ø¯Ø±ØºÙ„ Ù„Ú«Ø§Ù†Ø¯ØŸ
+# ^ErrorRegistering
+Ø¯ Ú‰Ù„Ù„ Ù†ÙˆÙ…Ú©ÚšÙ„Ùˆ Ø³ØªÙˆÙ†Ø²Ù‡
+# ^ExecShell
+" :Ø§Ú©Ø²Ú© Ø´Ù„"
+# ^Exec
+" :Ù¾Û�Ù„ÙˆÙ„"
+# ^Extract
+" :ÙˆÛ�Ø³ØªÙ„"
+# ^ErrorWriting
+"ÙˆÛ�Ø³ØªÙ„: Ø¯ÙˆØªÙ†Û� Ú©ÚšÛ� Ù„ÙŠÚ©Ù„Ùˆ Ø³ØªÙˆÙ†Ø²Ù‡ "
+# ^InvalidOpcode
+Ø§Ù†Ø¯Ø±ØºÙ„ Ù„Ú«Ø§Ù†Ø¯: Ù†Ø§Ø³Ù… Ø§Ù¾Ú©ÙˆÚ‰
+# ^NoOLE
+"No OLE for: "
+# ^OutputFolder
+" :ÙˆØªÙ†Û� Ù¾ÙˆÚšÛ�"
+# ^RemoveFolder
+" :Ù¾ÙˆÚšÛ� Ú“Ù†Ú«ÙˆÙ„"
+# ^RenameOnReboot
+" :Ù¾Ø± Ø¨ÙŠØ§Ù¾Û�Ù„Ø§Øª Ø¨ÙŠØ§Ù†ÙˆÙ…ÙˆÙ„"
+# ^Rename
+" :Ø¨ÙŠØ§Ù†ÙˆÙ…ÙˆÙ„"
+# ^Skipped
+" :Ù¾Ø±Û�ÚšÙˆØ¯Ù„ÙŠ"
+# ^CopyDetails
+Ø®Ø¨Ø±ØªÙŠØ§ÙˆÛ� Ù¼ÙˆÙ¼Û� Ú‰Ú“Û� ØªÙ‡ Ù„Ù…Û�Ø³Ù„
+# ^LogInstall
+Ø¯ Ù„Ú«Ø§Ùˆ Ø¨Ù‡ÙŠØ± Ø®Ø¨Ø±Ø§Ù„ÙˆÙ„
+# ^Byte
+Ø¨
+# ^Kilo
+ Ú©
+# ^Mega
+ Ù…
+# ^Giga
+ Ú«
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Macedonian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Macedonian.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Macedonian.nlf	(revision 2956)
@@ -1,4 +1,4 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Start editing here
 # Language ID
@@ -6,7 +6,7 @@
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1251
 # RTL - anything else than RTL means LTR
 -
@@ -14,178 +14,178 @@
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-Èíñòàëèðàœå íà $(^Name)
+Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°ÑšÐµ Ð½Ð° $(^Name)
 # ^UninstallCaption
-Äåèíñòàëèðàœå íà $(^Name)
+Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°ÑšÐµ Ð½Ð° $(^Name)
 # ^LicenseSubCaption
-: Ëèöåíöåí Äîãîâîð
+: Ð›Ð¸Ñ†ÐµÐ½Ñ†ÐµÐ½ Ð”Ð¾Ð³Ð¾Ð²Ð¾Ñ€
 # ^ComponentsSubCaption
-: Èíñòàëàöèîíè Îïöèè
+: Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ð¾Ð½Ð¸ ÐžÐ¿Ñ†Ð¸Ð¸
 # ^DirSubCaption
-: Èíñòàëàöèîíåí Äèðåêòîðèóì
+: Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ð¾Ð½ÐµÐ½ Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑƒÐ¼
 # ^InstallingSubCaption
-: Èíñòàëèðà
+: Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°
 # ^CompletedSubCaption
-: Çàâðøåíî
+: Ð—Ð°Ð²Ñ€ÑˆÐµÐ½Ð¾
 # ^UnComponentsSubCaption
-: Äåèíñòàëàöèîíè Îïöèè
+: Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ð¾Ð½Ð¸ ÐžÐ¿Ñ†Ð¸Ð¸
 # ^UnDirSubCaption
-: Äåèíñòàëàöèîíåí Äèðåêòîðèóì
+: Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ð¾Ð½ÐµÐ½ Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑƒÐ¼
 # ^ConfirmSubCaption
-: Ïîòâðäà
+: ÐŸÐ¾Ñ‚Ð²Ñ€Ð´Ð°
 # ^UninstallingSubCaption
-: Äåèíñòàëèðà
+: Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°
 # ^UnCompletedSubCaption
-: Çàâðøåíî
+: Ð—Ð°Ð²Ñ€ÑˆÐµÐ½Ð¾
 # ^BackBtn
-< &Íàçàä
+< &Ð�Ð°Ð·Ð°Ð´
 # ^NextBtn
-Í&àïðåä >
+Ð�&Ð°Ð¿Ñ€ÐµÐ´ >
 # ^AgreeBtn
-&Äà
+&Ð”Ð°
 # ^AcceptBtn
-&Ãè ïðèôà�àì óñëîâèòå îä Ëèöåíöíèîò Äîãîâîð
+&Ð“Ð¸ Ð¿Ñ€Ð¸Ñ„Ð°ÑœÐ°Ð¼ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ‚Ðµ Ð¾Ð´ Ð›Ð¸Ñ†ÐµÐ½Ñ†Ð½Ð¸Ð¾Ñ‚ Ð”Ð¾Ð³Ð¾Ð²Ð¾Ñ€
 # ^DontAcceptBtn
-Í&å ãè ïðèôà�àì óñëîâèòå îä Ëèöåíöíèîò Äîãîâîð
+Ð�&Ðµ Ð³Ð¸ Ð¿Ñ€Ð¸Ñ„Ð°ÑœÐ°Ð¼ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ‚Ðµ Ð¾Ð´ Ð›Ð¸Ñ†ÐµÐ½Ñ†Ð½Ð¸Ð¾Ñ‚ Ð”Ð¾Ð³Ð¾Ð²Ð¾Ñ€
 # ^InstallBtn
-&Èíñòàëèðà¼
+&Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ˜
 # ^UninstallBtn
-&Äåèíñòàëèðà¼
+&Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ˜
 # ^CancelBtn
-Îòêàæè
+ÐžÑ‚ÐºÐ°Ð¶Ð¸
 # ^CloseBtn
-&Çàòâîðè
+&Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸
 # ^BrowseBtn
-&Ïðåáàðóâà¼...
+&ÐŸÑ€ÐµÐ±Ð°Ñ€ÑƒÐ²Ð°Ñ˜...
 # ^ShowDetailsBtn
-Ï&îêàæè Äåòàëè
+ÐŸ&Ð¾ÐºÐ°Ð¶Ð¸ Ð”ÐµÑ‚Ð°Ð»Ð¸
 # ^ClickNext
-Ïðèòèñíåòå 'Íàïðåä' çà äà ïðîäîëæèòå.
+ÐŸÑ€Ð¸Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ 'Ð�Ð°Ð¿Ñ€ÐµÐ´' Ð·Ð° Ð´Ð° Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚Ðµ.
 # ^ClickInstall
-Ïðèòèñíåòå 'Èíñòàëèðà¼' çà äà ñå èíñòàëèðà.
+ÐŸÑ€Ð¸Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ 'Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ˜' Ð·Ð° Ð´Ð° Ñ�Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°.
 # ^ClickUninstall
-Ïðèòèñíåòå 'Äåèíñòàëèðà¼' çà äà ñå äåèíñòàëèðà.
+ÐŸÑ€Ð¸Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ 'Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ˜' Ð·Ð° Ð´Ð° Ñ�Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°.
 # ^Name
-Èìå
+Ð˜Ð¼Ðµ
 # ^Completed
-Çàâðøåíî
+Ð—Ð°Ð²Ñ€ÑˆÐµÐ½Ð¾
 # ^LicenseText
-Âå ìîëèìå ïðî÷èòà¼òå ãî Ëèöåíöíèîò Äîãîâîð ïðåä äà ñå èíñòàëèðà $(^NameDA). Àêî ãè ïðèôà�àòå ñèòå óñëîâè, ïðèòèñíåòå 'Äà'.
+Ð’Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ˜Ñ‚Ðµ Ð³Ð¾ Ð›Ð¸Ñ†ÐµÐ½Ñ†Ð½Ð¸Ð¾Ñ‚ Ð”Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð¿Ñ€ÐµÐ´ Ð´Ð° Ñ�Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð° $(^NameDA). Ð�ÐºÐ¾ Ð³Ð¸ Ð¿Ñ€Ð¸Ñ„Ð°ÑœÐ°Ñ‚Ðµ Ñ�Ð¸Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸, Ð¿Ñ€Ð¸Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ 'Ð”Ð°'.
 # ^LicenseTextCB
-Âå ìîëèìå ïðî÷èòà¼òå ãî Ëèöåíöíèîò Äîãîâîð ïðåä äà ñå èíñòàëèðà $(^NameDA). Àêî ãè ïðèôà�àòå ñèòå óñëîâè, ïðèòèñíåòå ãî Check box-îò ïîäîëå. $_CLICK
+Ð’Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ˜Ñ‚Ðµ Ð³Ð¾ Ð›Ð¸Ñ†ÐµÐ½Ñ†Ð½Ð¸Ð¾Ñ‚ Ð”Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð¿Ñ€ÐµÐ´ Ð´Ð° Ñ�Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð° $(^NameDA). Ð�ÐºÐ¾ Ð³Ð¸ Ð¿Ñ€Ð¸Ñ„Ð°ÑœÐ°Ñ‚Ðµ Ñ�Ð¸Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸, Ð¿Ñ€Ð¸Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ Ð³Ð¾ Check box-Ð¾Ñ‚ Ð¿Ð¾Ð´Ð¾Ð»Ðµ. $_CLICK
 # ^LicenseTextRB
-Âå ìîëèìå ïðî÷èòà¼òå ãî Ëèöåíöíèîò Äîãîâîð ïðåä äà ñå èíñòàëèðà $(^NameDA). Àêî ãè ïðèôà�àòå ñèòå óñëîâè, îäáåðåòå ¼à ïðâàòà îïöè¼à ïîäîëå. $_CLICK
+Ð’Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ˜Ñ‚Ðµ Ð³Ð¾ Ð›Ð¸Ñ†ÐµÐ½Ñ†Ð½Ð¸Ð¾Ñ‚ Ð”Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð¿Ñ€ÐµÐ´ Ð´Ð° Ñ�Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð° $(^NameDA). Ð�ÐºÐ¾ Ð³Ð¸ Ð¿Ñ€Ð¸Ñ„Ð°ÑœÐ°Ñ‚Ðµ Ñ�Ð¸Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸, Ð¾Ð´Ð±ÐµÑ€ÐµÑ‚Ðµ Ñ˜Ð° Ð¿Ñ€Ð²Ð°Ñ‚Ð° Ð¾Ð¿Ñ†Ð¸Ñ˜Ð° Ð¿Ð¾Ð´Ð¾Ð»Ðµ. $_CLICK
 # ^UnLicenseText
-Âå ìîëèìå ïðî÷èòà¼òå ãî Ëèöåíöíèîò Äîãîâîð ïðåä äà ñå äåèíñòàëèðà $(^NameDA). Àêî ãè ïðèôà�àòå ñèòå óñëîâè, ïðèòèñíåòå 'Äà'.
+Ð’Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ˜Ñ‚Ðµ Ð³Ð¾ Ð›Ð¸Ñ†ÐµÐ½Ñ†Ð½Ð¸Ð¾Ñ‚ Ð”Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð¿Ñ€ÐµÐ´ Ð´Ð° Ñ�Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð° $(^NameDA). Ð�ÐºÐ¾ Ð³Ð¸ Ð¿Ñ€Ð¸Ñ„Ð°ÑœÐ°Ñ‚Ðµ Ñ�Ð¸Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸, Ð¿Ñ€Ð¸Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ 'Ð”Ð°'.
 # ^UnLicenseTextCB
-Âå ìîëèìå ïðî÷èòà¼òå ãî Ëèöåíöíèîò Äîãîâîð ïðåä äà ñå äåèíñòàëèðà $(^NameDA). Àêî ãè ïðèôà�àòå ñèòå óñëîâè, ïðèòèñíåòå ãî Check box-îò ïîäîëå. $_CLICK
+Ð’Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ˜Ñ‚Ðµ Ð³Ð¾ Ð›Ð¸Ñ†ÐµÐ½Ñ†Ð½Ð¸Ð¾Ñ‚ Ð”Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð¿Ñ€ÐµÐ´ Ð´Ð° Ñ�Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð° $(^NameDA). Ð�ÐºÐ¾ Ð³Ð¸ Ð¿Ñ€Ð¸Ñ„Ð°ÑœÐ°Ñ‚Ðµ Ñ�Ð¸Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸, Ð¿Ñ€Ð¸Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ Ð³Ð¾ Check box-Ð¾Ñ‚ Ð¿Ð¾Ð´Ð¾Ð»Ðµ. $_CLICK
 # ^UnLicenseTextRB
-Âå ìîëèìå ïðî÷èòà¼òå ãî Ëèöåíöíèîò Äîãîâîð ïðåä äà ñå äåèíñòàëèðà $(^NameDA). Àêî ãè ïðèôà�àòå ñèòå óñëîâè, îäáåðåòå ¼à ïðâàòà îïöè¼à ïîäîëå. $_CLICK
+Ð’Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ˜Ñ‚Ðµ Ð³Ð¾ Ð›Ð¸Ñ†ÐµÐ½Ñ†Ð½Ð¸Ð¾Ñ‚ Ð”Ð¾Ð³Ð¾Ð²Ð¾Ñ€ Ð¿Ñ€ÐµÐ´ Ð´Ð° Ñ�Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð° $(^NameDA). Ð�ÐºÐ¾ Ð³Ð¸ Ð¿Ñ€Ð¸Ñ„Ð°ÑœÐ°Ñ‚Ðµ Ñ�Ð¸Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸, Ð¾Ð´Ð±ÐµÑ€ÐµÑ‚Ðµ Ñ˜Ð° Ð¿Ñ€Ð²Ð°Ñ‚Ð° Ð¾Ð¿Ñ†Ð¸Ñ˜Ð° Ð¿Ð¾Ð´Ð¾Ð»Ðµ. $_CLICK
 # ^Custom
-Ïîäåñåíî
+ÐŸÐ¾Ð´ÐµÑ�ÐµÐ½Ð¾
 # ^ComponentsText
-×åêèðà¼òå ãè êîìïîíåíòèòå øòî ñàêàòå äà ñå èíñòàëèðààò èëè äå÷åêèðà¼òå ãè òèå øòî íå ñàêàòå äà ñå èíñòàëèðààò. $_CLICK 
+Ð§ÐµÐºÐ¸Ñ€Ð°Ñ˜Ñ‚Ðµ Ð³Ð¸ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸Ñ‚Ðµ ÑˆÑ‚Ð¾ Ñ�Ð°ÐºÐ°Ñ‚Ðµ Ð´Ð° Ñ�Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð°Ñ‚ Ð¸Ð»Ð¸ Ð´ÐµÑ‡ÐµÐºÐ¸Ñ€Ð°Ñ˜Ñ‚Ðµ Ð³Ð¸ Ñ‚Ð¸Ðµ ÑˆÑ‚Ð¾ Ð½Ðµ Ñ�Ð°ÐºÐ°Ñ‚Ðµ Ð´Ð° Ñ�Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð°Ñ‚. $_CLICK 
 # ^ComponentsSubText1
-Îäáåðåòå âèä íà èíñòàëàöè¼à:
+ÐžÐ´Ð±ÐµÑ€ÐµÑ‚Ðµ Ð²Ð¸Ð´ Ð½Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°:
 # ^ComponentsSubText2_NoInstTypes
-Îäáåðåòå ãè êîìïîíåíòèòå øòî �å ñå èíñòàëèðààò:
+ÐžÐ´Ð±ÐµÑ€ÐµÑ‚Ðµ Ð³Ð¸ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸Ñ‚Ðµ ÑˆÑ‚Ð¾ ÑœÐµ Ñ�Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð°Ñ‚:
 # ^ComponentsSubText2
-èëè, îäáåðåòå äðóãè êîìïîíåíòè øòî ñàêàòå äà ñå èíñòàëèðààò:
+Ð¸Ð»Ð¸, Ð¾Ð´Ð±ÐµÑ€ÐµÑ‚Ðµ Ð´Ñ€ÑƒÐ³Ð¸ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸ ÑˆÑ‚Ð¾ Ñ�Ð°ÐºÐ°Ñ‚Ðµ Ð´Ð° Ñ�Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð°Ñ‚:
 # ^UnComponentsText
-×åêèðà¼òå ãè êîìïîíåíòèòå øòî ñàêàòå äà ñå äåèíñòàëèðààò èëè äå÷åêèðà¼òå ãè òèå øòî íå ñàêàòå äà ñå äåèíñòàëèðààò. $_CLICK
+Ð§ÐµÐºÐ¸Ñ€Ð°Ñ˜Ñ‚Ðµ Ð³Ð¸ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸Ñ‚Ðµ ÑˆÑ‚Ð¾ Ñ�Ð°ÐºÐ°Ñ‚Ðµ Ð´Ð° Ñ�Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð°Ñ‚ Ð¸Ð»Ð¸ Ð´ÐµÑ‡ÐµÐºÐ¸Ñ€Ð°Ñ˜Ñ‚Ðµ Ð³Ð¸ Ñ‚Ð¸Ðµ ÑˆÑ‚Ð¾ Ð½Ðµ Ñ�Ð°ÐºÐ°Ñ‚Ðµ Ð´Ð° Ñ�Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð°Ñ‚. $_CLICK
 # ^UnComponentsSubText1
-Îäáåðåòå ãî âèäîò íà äåèíñòàëàöè¼àòà:
+ÐžÐ´Ð±ÐµÑ€ÐµÑ‚Ðµ Ð³Ð¾ Ð²Ð¸Ð´Ð¾Ñ‚ Ð½Ð° Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð°:
 # ^UnComponentsSubText2_NoInstTypes
-Îäáåðåòå ãè êîìïîíåíòèòå øòî �å ñå äåèíñòàëèðààò:
+ÐžÐ´Ð±ÐµÑ€ÐµÑ‚Ðµ Ð³Ð¸ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸Ñ‚Ðµ ÑˆÑ‚Ð¾ ÑœÐµ Ñ�Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð°Ñ‚:
 # ^UnComponentsSubText2
-èëè, îäáåðåòå äðóãè êîìïîíåíòè øòî ñàêàòå äà ñå äåèíñòàëèðààò:
+Ð¸Ð»Ð¸, Ð¾Ð´Ð±ÐµÑ€ÐµÑ‚Ðµ Ð´Ñ€ÑƒÐ³Ð¸ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸ ÑˆÑ‚Ð¾ Ñ�Ð°ÐºÐ°Ñ‚Ðµ Ð´Ð° Ñ�Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð°Ñ‚:
 # ^DirText
-Èíñòàëàöèîíèîò ïðîãðàì �å ãî èíñòàëèðà $(^NameDA) âî ñëåäíèîâ äèðåêòîðèóì. Çà äà èíñòàëèðàòå âî äðóã, ïðèòèñíåòå 'Ïðåáàðóâà¼' è îäáåðåòå äðóã äèðåêòîðèóì. $_CLICK
+Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ð¾Ð½Ð¸Ð¾Ñ‚ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ ÑœÐµ Ð³Ð¾ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð° $(^NameDA) Ð²Ð¾ Ñ�Ð»ÐµÐ´Ð½Ð¸Ð¾Ð² Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑƒÐ¼. Ð—Ð° Ð´Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ Ð²Ð¾ Ð´Ñ€ÑƒÐ³, Ð¿Ñ€Ð¸Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ 'ÐŸÑ€ÐµÐ±Ð°Ñ€ÑƒÐ²Ð°Ñ˜' Ð¸ Ð¾Ð´Ð±ÐµÑ€ÐµÑ‚Ðµ Ð´Ñ€ÑƒÐ³ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑƒÐ¼. $_CLICK
 # ^DirSubText
-Äèðåêòîðèóì êàäå øòî �å ñå èíñòàëèðà
+Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑƒÐ¼ ÐºÐ°Ð´Ðµ ÑˆÑ‚Ð¾ ÑœÐµ Ñ�Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°
 # ^DirBrowseText
-Îäáåðåòå äèðåêòîðèóì çà èíñòàëèðàœå íà $(^NameDA):
+ÐžÐ´Ð±ÐµÑ€ÐµÑ‚Ðµ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑƒÐ¼ Ð·Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°ÑšÐµ Ð½Ð° $(^NameDA):
 # ^UnDirText
-Èíñòàëàöèîíèîò ïðîãðàì �å ãî äåèíñòàëèðà $(^NameDA) îä ñëåäíèîâ äèðåêòîðèóì. Çà äà äåèíñòàëèðàòå îä äðóã, ïðèòèñíåòå 'Ïðåáàðóâà¼' è îäáåðåòå äðóã äèðåêòîðèóì. $_CLICK
+Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ð¾Ð½Ð¸Ð¾Ñ‚ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ ÑœÐµ Ð³Ð¾ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð° $(^NameDA) Ð¾Ð´ Ñ�Ð»ÐµÐ´Ð½Ð¸Ð¾Ð² Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑƒÐ¼. Ð—Ð° Ð´Ð° Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ Ð¾Ð´ Ð´Ñ€ÑƒÐ³, Ð¿Ñ€Ð¸Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ 'ÐŸÑ€ÐµÐ±Ð°Ñ€ÑƒÐ²Ð°Ñ˜' Ð¸ Ð¾Ð´Ð±ÐµÑ€ÐµÑ‚Ðµ Ð´Ñ€ÑƒÐ³ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑƒÐ¼. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Îäáåðåòå ãî äèðåêòîðèóìîò çà äåèíñòàëèðàœå íà $(^NameDA):
+ÐžÐ´Ð±ÐµÑ€ÐµÑ‚Ðµ Ð³Ð¾ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑƒÐ¼Ð¾Ñ‚ Ð·Ð° Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°ÑšÐµ Ð½Ð° $(^NameDA):
 # ^SpaceAvailable
-"Ñëîáîäåí ïðîñòîð: "
+"Ð¡Ð»Ð¾Ð±Ð¾Ð´ÐµÐ½ Ð¿Ñ€Ð¾Ñ�Ñ‚Ð¾Ñ€: "
 # ^SpaceRequired
-"Ïîòðåáåí ïðîñòîð: "
+"ÐŸÐ¾Ñ‚Ñ€ÐµÐ±ÐµÐ½ Ð¿Ñ€Ð¾Ñ�Ñ‚Ð¾Ñ€: "
 # ^UninstallingText
-$(^NameDA) �å áèäå äåèíñòàëèðàí îä ñëåäíèîâ äèðåêòîðèóì. $_CLICK
+$(^NameDA) ÑœÐµ Ð±Ð¸Ð´Ðµ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ Ð¾Ð´ Ñ�Ð»ÐµÐ´Ð½Ð¸Ð¾Ð² Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑƒÐ¼. $_CLICK
 # ^UninstallingSubText
-Äåèíñòàëèðà îä:
+Ð”ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð° Ð¾Ð´:
 # ^FileError
-Ãðåøêà ïðè îòâàðàœåòî íà äàòîòåêàòà çà çàïèøóâàœå: \r\n\t"$0"\r\nÏðèòèñíåòå 'Îòêàæè' çà äà ¼à îòêàæåòå èíñòàëàöè¼àòà,\r\n'Ïðîáà¼' çà äà ïðîáà äà ¼à çàïèøå äàòîòåêàòà, èëè\r\n'Èãíîðèðà¼' çà äà ¼à ïðåðèïà äàòîòåêàòà
+Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚Ð²Ð°Ñ€Ð°ÑšÐµÑ‚Ð¾ Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°Ñ‚Ð° Ð·Ð° Ð·Ð°Ð¿Ð¸ÑˆÑƒÐ²Ð°ÑšÐµ: \r\n\t"$0"\r\nÐŸÑ€Ð¸Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ 'ÐžÑ‚ÐºÐ°Ð¶Ð¸' Ð·Ð° Ð´Ð° Ñ˜Ð° Ð¾Ñ‚ÐºÐ°Ð¶ÐµÑ‚Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð°,\r\n'ÐŸÑ€Ð¾Ð±Ð°Ñ˜' Ð·Ð° Ð´Ð° Ð¿Ñ€Ð¾Ð±Ð° Ð´Ð° Ñ˜Ð° Ð·Ð°Ð¿Ð¸ÑˆÐµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°Ñ‚Ð°, Ð¸Ð»Ð¸\r\n'Ð˜Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð°Ñ˜' Ð·Ð° Ð´Ð° Ñ˜Ð° Ð¿Ñ€ÐµÑ€Ð¸Ð¿Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°Ñ‚Ð°
 # ^FileError_NoIgnore
-Ãðåøêà ïðè îòâàðàœåòî íà äàòîòåêàòà çà çàïèøóâàœå: \r\n\t"$0"\r\nÏðèòèñíåòå 'Ïðîáà¼' çà äà ïðîáà äà ¼à çàïèøå äàòîòåêàòà, èëè\r\n'Îòêàæè' çà äà ¼à îòêàæå èíñòàëàöè¼àòà
+Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚Ð²Ð°Ñ€Ð°ÑšÐµÑ‚Ð¾ Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°Ñ‚Ð° Ð·Ð° Ð·Ð°Ð¿Ð¸ÑˆÑƒÐ²Ð°ÑšÐµ: \r\n\t"$0"\r\nÐŸÑ€Ð¸Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ 'ÐŸÑ€Ð¾Ð±Ð°Ñ˜' Ð·Ð° Ð´Ð° Ð¿Ñ€Ð¾Ð±Ð° Ð´Ð° Ñ˜Ð° Ð·Ð°Ð¿Ð¸ÑˆÐµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°Ñ‚Ð°, Ð¸Ð»Ð¸\r\n'ÐžÑ‚ÐºÐ°Ð¶Ð¸' Ð·Ð° Ð´Ð° Ñ˜Ð° Ð¾Ñ‚ÐºÐ°Ð¶Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð°
 # ^CantWrite
-"Íå ìîæå äà çàïèøå: "
+"Ð�Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð·Ð°Ð¿Ð¸ÑˆÐµ: "
 # ^CopyFailed
-Êîïèðàœåòî íå óñïåà
+ÐšÐ¾Ð¿Ð¸Ñ€Ð°ÑšÐµÑ‚Ð¾ Ð½Ðµ ÑƒÑ�Ð¿ÐµÐ°
 # ^CopyTo
-"Êîïèðà¼ äî "
+"ÐšÐ¾Ð¿Ð¸Ñ€Ð°Ñ˜ Ð´Ð¾ "
 # ^Registering
-"Ðåãèñòðèðà: "
+"Ð ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ð¸Ñ€Ð°: "
 # ^Unregistering
-"Äåðåãèñòðèðà: "
+"Ð”ÐµÑ€ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ð¸Ñ€Ð°: "
 # ^SymbolNotFound
-"Íå ìîæå äà ãî íà¼äå ñèìáîëîò: "
+"Ð�Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð³Ð¾ Ð½Ð°Ñ˜Ð´Ðµ Ñ�Ð¸Ð¼Ð±Ð¾Ð»Ð¾Ñ‚: "
 # ^CouldNotLoad
-"Íå ìîæå äà ëîàäèðà: "
+"Ð�Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð»Ð¾Ð°Ð´Ð¸Ñ€Ð°: "
 # ^CreateFolder
-"Ñîçäàäè äèðåêòîðèóì: "
+"Ð¡Ð¾Ð·Ð´Ð°Ð´Ð¸ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑƒÐ¼: "
 # ^CreateShortcut
-"Ñîçäàäè êðàòåíèöà: "
+"Ð¡Ð¾Ð·Ð´Ð°Ð´Ð¸ ÐºÑ€Ð°Ñ‚ÐµÐ½Ð¸Ñ†Ð°: "
 # ^CreatedUninstaller
-"Ñîçäàäåí äåèíñòàëàòîð: "
+"Ð¡Ð¾Ð·Ð´Ð°Ð´ÐµÐ½ Ð´ÐµÐ¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ‚Ð¾Ñ€: "
 # ^Delete
-"Èçáðèøàíà äàòîòåêà: "
+"Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ°Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°: "
 # ^DeleteOnReboot
-"Èçáðèøè ïîñëå ðåñòàðòèðàœå: "
+"Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ¸ Ð¿Ð¾Ñ�Ð»Ðµ Ñ€ÐµÑ�Ñ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð°ÑšÐµ: "
 # ^ErrorCreatingShortcut
-"Ãðåøêà ïðè ñîçäàâàœåòî íà ñêðàòåíèöàòà: "
+"Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ñ�Ð¾Ð·Ð´Ð°Ð²Ð°ÑšÐµÑ‚Ð¾ Ð½Ð° Ñ�ÐºÑ€Ð°Ñ‚ÐµÐ½Ð¸Ñ†Ð°Ñ‚Ð°: "
 # ^ErrorCreating
-"Ãðåøêà ïðè ñîçäàâàœåòî: "
+"Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ñ�Ð¾Ð·Ð´Ð°Ð²Ð°ÑšÐµÑ‚Ð¾: "
 # ^ErrorDecompressing
-Ãðåøêà ïðè îòïàêóâàœåòî íà ïîäàòîöèòå! Ðàñèïàí èíñòàëàöèîíåí ïðîãðàì?
+Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚Ð¿Ð°ÐºÑƒÐ²Ð°ÑšÐµÑ‚Ð¾ Ð½Ð° Ð¿Ð¾Ð´Ð°Ñ‚Ð¾Ñ†Ð¸Ñ‚Ðµ! Ð Ð°Ñ�Ð¸Ð¿Ð°Ð½ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ð¾Ð½ÐµÐ½ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼?
 # ^ErrorRegistering
-Ãðåøêà ïðè ðåãèñòðèðàœåòî íà DLL
+Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ñ€ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ð¸Ñ€Ð°ÑšÐµÑ‚Ð¾ Ð½Ð° DLL
 # ^ExecShell
 "ExecShell: "
 # ^Exec
-"Ïîêðåíè: "
+"ÐŸÐ¾ÐºÑ€ÐµÐ½Ð¸: "
 # ^Extract
-"Îòïàêóâàíî: "
+"ÐžÑ‚Ð¿Ð°ÐºÑƒÐ²Ð°Ð½Ð¾: "
 # ^ErrorWriting
-"Îòïàêóâà¼: ãðåøêà ïðè ñíèìàœåòî âî äàòîòåêàòà "
+"ÐžÑ‚Ð¿Ð°ÐºÑƒÐ²Ð°Ñ˜: Ð³Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ñ�Ð½Ð¸Ð¼Ð°ÑšÐµÑ‚Ð¾ Ð²Ð¾ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°Ñ‚Ð° "
 # ^InvalidOpcode
-Ðàñèïàí èíñòàëàöèîíåí ïðîãðàì: ïîãðåøåí êîä
+Ð Ð°Ñ�Ð¸Ð¿Ð°Ð½ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ð¾Ð½ÐµÐ½ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼: Ð¿Ð¾Ð³Ñ€ÐµÑˆÐµÐ½ ÐºÐ¾Ð´
 # ^NoOLE
-"Íåìà OLE çà: "
+"Ð�ÐµÐ¼Ð° OLE Ð·Ð°: "
 # ^OutputFolder
-"Èíñòàëàöèîíåí äèðåêòîðèóì: "
+"Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ð¾Ð½ÐµÐ½ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑƒÐ¼: "
 # ^RemoveFolder
-"Èçáðèøàí äèðåêòîðèóì: "
+"Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ°Ð½ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÑƒÐ¼: "
 # ^RenameOnReboot
-"Ïðåèìåíóâà¼ ïîñëå ðåñòàðòèðàœå: "
+"ÐŸÑ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ˜ Ð¿Ð¾Ñ�Ð»Ðµ Ñ€ÐµÑ�Ñ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð°ÑšÐµ: "
 # ^Rename
-"Ïðåèìåíóâà¼: "
+"ÐŸÑ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ˜: "
 # ^Skipped
-"Ïðåðèïàíî: "
+"ÐŸÑ€ÐµÑ€Ð¸Ð¿Ð°Ð½Ð¾: "
 # ^CopyDetails
-Êîïèðà¼ ãè Äåòàëèòå âî Clipboard-îò
+ÐšÐ¾Ð¿Ð¸Ñ€Ð°Ñ˜ Ð³Ð¸ Ð”ÐµÑ‚Ð°Ð»Ð¸Ñ‚Ðµ Ð²Ð¾ Clipboard-Ð¾Ñ‚
 # ^LogInstall
-Ñíèìè ëîã çà èíñòàëàöèîíèòå ïðîöåñè
+Ð¡Ð½Ð¸Ð¼Ð¸ Ð»Ð¾Ð³ Ð·Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ð¾Ð½Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¾Ñ†ÐµÑ�Ð¸
 # ^Byte
-á
+Ð±
 # ^Kilo
-Ê
+ Ðš
 # ^Mega
-Ì
+ Ðœ
 # ^Giga
-Ã
\ No newline at end of file
+ Ð“
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Esperanto.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Esperanto.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Esperanto.nlf	(revision 2956)
@@ -1,18 +1,18 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Start editing here
-# Language ID (none exists for Kurdish at the moment)
+# Language ID (none exists for Esperanto at the moment)
 9998
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 -
 # RTL - anything else than RTL means LTR
 -
 # Translation v4.0.3 by Felipe Castro <fefcas@gmail.com>
 # ^Branding
-Instalada Sistemo de Nullsoft %s
+Nullsoft Install System %s
 # ^SetupCaption
 Instalado de $(^Name)
 # ^UninstallCaption
@@ -184,8 +184,8 @@
 # ^Byte
 B
 # ^Kilo
-k
+ k
 # ^Mega
-M
+ M
 # ^Giga
-G
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Croatian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Croatian.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Croatian.nlf	(revision 2956)
@@ -1,11 +1,11 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1050
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1250
 # RTL - anything else than RTL means LTR
 -
@@ -13,11 +13,11 @@
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-$(^Name) Instalacija
+Instalacija programa $(^Name)
 # ^UninstallCaption
-$(^Name) Uklanjanje
+Uklanjanje programa $(^Name)
 # ^LicenseSubCaption
-: Licenenèni uvjeti
+: Uvjeti Ugovora o licenci
 # ^ComponentsSubCaption
 : Instalacijske opcije
 # ^DirSubCaption
@@ -25,7 +25,7 @@
 # ^InstallingSubCaption
 : Instaliranje
 # ^CompletedSubCaption
-: Završeno
+: ZavrÅ¡eno
 # ^UnComponentsSubCaption
 : Opcije uklanjanja
 # ^UnDirSubCaption
@@ -35,17 +35,17 @@
 # ^UninstallingSubCaption
 : Uklanjanje
 # ^UnCompletedSubCaption
-: Završeno
+: ZavrÅ¡eno
 # ^BackBtn
-< &Nazad
+< &Natrag
 # ^NextBtn
 &Dalje >
 # ^AgreeBtn
-&Prihvaæam
+&PrihvaÄ‡am
 # ^AcceptBtn
-&Prihvaæam uvjete licenènog ugovora
+&PrihvaÄ‡am uvjete Ugovora o licenci
 # ^DontAcceptBtn
-&Ne prihvaæam uvjete licenènog ugovora
+&Ne prihvaÄ‡am uvjete Ugovora o licenci
 # ^InstallBtn
 &Instaliraj
 # ^UninstallBtn
@@ -57,75 +57,75 @@
 # ^BrowseBtn
 &Pregledaj...
 # ^ShowDetailsBtn
-Prikaži &detalje
+PrikaÅ¾i &detalje
 # ^ClickNext
 Za nastavak odaberite 'Dalje'.
 # ^ClickInstall
-Za poèetak instalacije odaberite 'Instaliraj'.
+Za poÄ�etak instalacije odaberite 'Instaliraj'.
 # ^ClickUninstall
-Za poèetak uklanjanja odaberite 'Ukloni'.
+Za poÄ�etak uklanjanja odaberite 'Ukloni'.
 # ^Name
 Ime
 # ^Completed
-Završeno
+ZavrÅ¡eno
 # ^LicenseText
-Molim proèitajte licencu prije instalacije programa $(^NameDA). Ukoliko prihvaæate sve uvjete ugovora, odaberite 'Prihvaæam'.
+ProÄ�itajte licencu prije instalacije programa $(^NameDA). Ukoliko prihvaÄ‡ate sve uvjete ugovora, odaberite 'PrihvaÄ‡am'.
 # ^LicenseTextCB
-Molim proèitajte licencu prije instalacije programa $(^NameDA). Ukoliko prihvaæate sve uvjete ugovora, oznaèite donji kvadratiæ. $_CLICK
+ProÄ�itajte licencu prije instalacije programa $(^NameDA). Ukoliko prihvaÄ‡ate sve uvjete ugovora, oznaÄ�ite donji kvadratiÄ‡. $_CLICK
 # ^LicenseTextRB
-Molim proèitajte licencu prije instalacije programa $(^NameDA). Ukoliko prihvaæate sve uvjete ugovora, odaberite prvu donju opciju. $_CLICK
+ProÄ�itajte licencu prije instalacije programa $(^NameDA). Ukoliko prihvaÄ‡ate sve uvjete ugovora, odaberite prvu donju opciju. $_CLICK
 # ^UnLicenseText
-Molim proèitajte licencu prije uklanjanja programa $(^NameDA). Ukoliko prihvaæate sve uvjete ugovora, odaberite 'Prihvaæam'.
+ProÄ�itajte licencu prije uklanjanja programa $(^NameDA). Ukoliko prihvaÄ‡ate sve uvjete ugovora, odaberite 'PrihvaÄ‡am'.
 # ^UnLicenseTextCB
-Molim proèitajte licencu prije uklanjanja programa $(^NameDA). Ukoliko prihvaæate sve uvjete ugovora, oznaèite donji kvadratiæ. $_CLICK
+ProÄ�itajte licencu prije uklanjanja programa $(^NameDA). Ukoliko prihvaÄ‡ate sve uvjete ugovora, oznaÄ�ite donji kvadratiÄ‡. $_CLICK
 # ^UnLicenseTextRB
-Molim proèitajte licencu prije uklanjanja programa $(^NameDA). Ukoliko prihvaæate sve uvjete ugovora, odaberite prvu donju opciju. $_CLICK
+ProÄ�itajte licencu prije uklanjanja programa $(^NameDA). Ukoliko prihvaÄ‡ate sve uvjete ugovora, odaberite prvu donju opciju. $_CLICK
 # ^Custom
 Posebna
 # ^ComponentsText
-Oznaèite komponente koje želite instalirati i uklonite oznaku s onih koje ne želite instalirati. $_CLICK
+OznaÄ�ite komponente koje Å¾elite instalirati i uklonite oznaku s onih koje ne Å¾elite instalirati. $_CLICK
 # ^ComponentsSubText1
 Izaberite tip instalacije:
 # ^ComponentsSubText2_NoInstTypes
 Odaberite komponente za instalaciju:
 # ^ComponentsSubText2
-Ili po izboru oznaèite komponente koje želite instalirati:
+Ili po izboru oznaÄ�ite komponente koje Å¾elite instalirati:
 # ^UnComponentsText
-Oznaèite komponente koje želite ukloniti i uklonite oznaku s onih koje ne želite ukloniti. $_CLICK
+OznaÄ�ite komponente koje Å¾elite ukloniti i uklonite oznaku s onih koje ne Å¾elite ukloniti. $_CLICK
 # ^UnComponentsSubText1
 Izaberite tip uklanjanja:
 # ^UnComponentsSubText2_NoInstTypes
 Odaberite komponente za uklanjanje:
 # ^UnComponentsSubText2
-Ili po izboru oznaèite komponente koje želite ukloniti:
+Ili po izboru oznaÄ�ite komponente koje Å¾elite ukloniti:
 # ^DirText
-Program $(^NameDA) æe biti instaliran u slijedeæu mapu. Za instalaciju na drugo odredište odaberite 'Pregledaj' i oznaèite drugu mapu. $_CLICK
+Program $(^NameDA) bit Ä‡e instaliran u sljedeÄ‡u mapu. Ako Å¾elite promijeniti odrediÅ¡te, pritisnite dugme za traÅ¾enje mape i oznaÄ�ite drugu mapu. $_CLICK
 # ^DirSubText
-Odredišna mapa
+OdrediÅ¡na mapa
 # ^DirBrowseText
-Odaberite mapu u koju želite instalirati program $(^NameDA):
+Odaberite mapu u koju Å¾elite instalirati program $(^NameDA):
 # ^UnDirText
-Program $(^NameDA) æe biti uklonjen iz slijedeæe mape. Za uklanjanje s drugog mjesta odaberite 'Pregledaj' i oznaèite drugu mapu. $_CLICK
+Program $(^NameDA) bit Ä‡e uklonjen iz sljedeÄ‡e mape. Za uklanjanje s drugog mjesta odaberite 'Pregledaj' i oznaÄ�ite drugu mapu. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Mapa iz koje æe program $(^NameDA) biti uklonjen:
+Mapa iz koje Ä‡e program $(^NameDA) biti uklonjen:
 # ^SpaceAvailable
 "Slobodno prostora na disku: "
 # ^SpaceRequired
 "Potrebno prostora na disku: "
 # ^UninstallingText
-Program $(^NameDA) æe biti uklonjen iz slijedeæe mape. $_CLICK
+Program $(^NameDA) bit Ä‡e uklonjen iz sljedeÄ‡e mape. $_CLICK
 # ^UninstallingSubText
 Uklanjam iz:
 # ^FileError
-Greška prilikom otvaranja datoteke za zapisivanje: \r\n\t"$0"\r\n\"Abort\" za prekid instalacije,\r\n\"Retry\" za ponovni pokušaj zapisivanja, ili\r\n\"Ignore\" za zanemarenje te datoteke
+GreÅ¡ka prilikom otvaranja datoteke za zapisivanje: \r\n\r\n$0\r\n\r\nPritisnite "Abort" ako Å¾elite prekinuti instalaciju,\r\n"Retry" ako Å¾elite pokuÅ¡ati ponovno, ili\r\n"Ignore" ako Å¾elite zanemariti tu datoteku
 # ^FileError_NoIgnore
-Greška prilikom otvaranja datoteke za zapisivanje: \r\n\t"$0"\r\n\"Retry\" za ponovni pokušaj zapisivanja, ili\r\n\"Cancel\" za prekid instalacije
+GreÅ¡ka prilikom otvaranja datoteke za zapisivanje: \r\n\r\n$0\r\n\r\nPritisnite "Retry" za ponovni pokuÅ¡aj zapisivanja, ili\r\n"Cancel" za prekid instalacije
 # ^CantWrite
 "Ne mogu zapisati: "
 # ^CopyFailed
-Greška prilikom kopiranja
+GreÅ¡ka prilikom kopiranja
 # ^CopyTo
 "Kopiraj u "
 # ^Registering
@@ -133,58 +133,58 @@
 # ^Unregistering
 "Odjava: "
 # ^SymbolNotFound
-"Ne mogu naæi simbol: "
+"Ne mogu naÄ‡i simbol: "
 # ^CouldNotLoad
-"Ne mogu uèitati: "
+"Ne mogu uÄ�itati: "
 # ^CreateFolder
 "Stvori mapu: "
 # ^CreateShortcut
-"Stvori preèac: "
+"Stvori preÄ�ac: "
 # ^CreatedUninstaller
 "Program za uklanjanje: "
 # ^Delete
-"Obriši datoteku: "
+"IzbriÅ¡i datoteku: "
 # ^DeleteOnReboot
-"Obriši prilikom ponovnog pokretanja: "
+"IzbriÅ¡i prilikom ponovnog pokretanja: "
 # ^ErrorCreatingShortcut
-"Greška prilikom stvaranja preèaca: "
+"GreÅ¡ka prilikom stvaranja preÄ�aca: "
 # ^ErrorCreating
-"Greška prilikom stvaranja: "
+"GreÅ¡ka prilikom stvaranja: "
 # ^ErrorDecompressing
-Greška dekompresije podataka! Ošteæena instalacijska datoteka?
+GreÅ¡ka dekompresije podataka! OÅ¡teÄ‡ena instalacijska datoteka?
 # ^ErrorRegistering
-Greška prilikom prijavljivanja DLLa
+GreÅ¡ka prilikom prijavljivanja DLL-a
 # ^ExecShell
 "ExecShell: "
 # ^Exec
-"Izvrši: "
+"IzvrÅ¡i: "
 # ^Extract
 "Otpakiraj: "
 # ^ErrorWriting
-"Otpakiranje: greška zapisivanja u datoteku "
+"Otpakiranje: greÅ¡ka zapisivanja u datoteku "
 # ^InvalidOpcode
-Ošteæena instalacijska datoteka: neispravni opkod
+OÅ¡teÄ‡ena instalacijska datoteka: neispravan opkod
 # ^NoOLE
 "Nema OLE za: "
 # ^OutputFolder
 "Izlazna mapa: "
 # ^RemoveFolder
-"Obriši mapu: "
+"IzbriÅ¡i mapu: "
 # ^RenameOnReboot
 "Preimenuj prilikom ponovnog pokretanja: "
 # ^Rename
 "Preimenuj: "
 # ^Skipped
-"Preskoèeno: "
+"PreskoÄ�eno: "
 # ^CopyDetails
-Kopiraj detalje u Clipboard
+Kopiraj detalje u meÄ‘uspremnik
 # ^LogInstall
 Logiraj instalacijski proces
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/English.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/English.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/English.nsh	(revision 2956)
@@ -1,16 +1,16 @@
-;Language: English (1033)
+ï»¿;Language: English (1033)
 ;By Joost Verburg
 
-!insertmacro LANGFILE "English" "English"
+!insertmacro LANGFILE "English" "English" "English" "English" ; See \Include\LangFile.nsh for a description of these parameters
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Welcome to the $(^NameDA) Setup Wizard"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "This wizard will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all other applications before starting Setup. This will make it possible to update relevant system files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Welcome to $(^NameDA) Setup"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all other applications before starting Setup. This will make it possible to update relevant system files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Welcome to the $(^NameDA) Uninstall Wizard"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "This wizard will guide you through the uninstallation of $(^NameDA).$\r$\n$\r$\nBefore starting the uninstallation, make sure $(^NameDA) is not running.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Welcome to $(^NameDA) Uninstall"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Setup will guide you through the uninstallation of $(^NameDA).$\r$\n$\r$\nBefore starting the uninstallation, make sure $(^NameDA) is not running.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
@@ -48,7 +48,7 @@
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
     ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Position your mouse over a component to see its description."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Position your mouse over a component to see its description."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Select a component to see its description."
   !endif
 !endif
 
@@ -81,14 +81,14 @@
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Completing the $(^NameDA) Setup Wizard"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) has been installed on your computer.$\r$\n$\r$\nClick Finish to close this wizard."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Completing $(^NameDA) Setup"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) has been installed on your computer.$\r$\n$\r$\nClick Finish to close Setup."
   ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Your computer must be restarted in order to complete the installation of $(^NameDA). Do you want to reboot now?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Completing the $(^NameDA) Uninstall Wizard"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) has been uninstalled from your computer.$\r$\n$\r$\nClick Finish to close this wizard."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Completing $(^NameDA) Uninstall"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) has been uninstalled from your computer.$\r$\n$\r$\nClick Finish to close Setup."
   ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Your computer must be restarted in order to complete the uninstallation of $(^NameDA). Do you want to reboot now?"
 !endif
 
@@ -123,7 +123,7 @@
 !ifdef MULTIUSER_INSTALLMODEPAGE
   ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Choose Users"
   ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Choose for which users you want to install $(^NameDA)."
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Select whether you want to install $(^NameDA) for yourself only or for all users of this computer. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Select whether you want to install $(^NameDA) only for yourself or for all users of this computer. $(^ClickNext)"
   ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Install for anyone using this computer"
   ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Install just for me"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/SimpChinese.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/SimpChinese.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/SimpChinese.nlf	(revision 2956)
@@ -1,190 +1,192 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
+# Start editing here
 # Language ID
 2052
-# Font and size - dash (-) means default ×ÖÌåÃû³ÆÓë´óÐ¡
-ËÎÌå
+# Font and size - dash (-) means default å­—ä½“å��ç§°ä¸Žå¤§å°�
+å®‹ä½“
 9
-# Codepage - dash (-) means ANSI code page ANSI ×ÖÂëÒ³
+# Codepage - dash (-) means ASCII code page ASCII å­—ç �é¡µ
 936
-# RTL - anything else than RTL means LTR ÓÉÓÒÖÁ×óÊéÐ´
+# RTL - anything else than RTL means LTR ç”±å�³è‡³å·¦ä¹¦å†™
 -
-# Translator: Kii Ali <kiiali@cpatch.org>;Revision date: 2004-12-15
+# Revision date: 2020-06-03
+# Translator: Kii Ali <kiiali@cpatch.org>, <kiiali@ms1.url.com.tw>, <kiiali@pchome.com.tw>, Tyson Tan <tysontan@tysontan.com>
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-$(^Name) °²×°
+$(^Name) å®‰è£…
 # ^UninstallCaption
-$(^Name) Ð¶ÔØ
+$(^Name) å�¸è½½
 # ^LicenseSubCaption
-: Ðí¿ÉÖ¤Ð­Òé
+: è®¸å�¯è¯�å��è®®
 # ^ComponentsSubCaption
-: °²×°Ñ¡Ïî
+: å®‰è£…é€‰é¡¹
 # ^DirSubCaption
-: °²×°ÎÄ¼þ¼Ð
+: å®‰è£…ç›®å½•
 # ^InstallingSubCaption
-: ÕýÔÚ°²×°
+: æ­£åœ¨å®‰è£…
 # ^CompletedSubCaption
-: ÒÑÍê³É
+: å·²å®Œæˆ�
 # ^UnComponentsSubCaption
-: Ð¶ÔØÑ¡Ïî
+: å�¸è½½é€‰é¡¹
 # ^UnDirSubCaption
-: Ð¶ÔØÎÄ¼þ¼Ð
+: å�¸è½½æ–‡ä»¶å¤¹
 # ^ConfirmSubCaption
-: È·ÈÏ
+: ç¡®è®¤
 # ^UninstallingSubCaption
-: ÕýÔÚÐ¶ÔØ
+: æ­£åœ¨å�¸è½½
 # ^UnCompletedSubCaption
-: Íê³É
+: å®Œæˆ�
 # ^BackBtn
-< ÉÏÒ»²½(&P)
+< ä¸Šä¸€æ­¥(&P)
 # ^NextBtn
-ÏÂÒ»²½(&N) >
+ä¸‹ä¸€æ­¥(&N) >
 # ^AgreeBtn
-ÎÒ½ÓÊÜ(&I)
+æˆ‘æŽ¥å�—(&I)
 # ^AcceptBtn
-ÎÒ½ÓÊÜ¡°Ðí¿ÉÖ¤Ð­Òé¡±ÖÐµÄÌõ¿î(&A)
+æˆ‘æŽ¥å�—è®¸å�¯è¯�å��è®®ä¸­çš„æ�¡æ¬¾(&A)
 # ^DontAcceptBtn
-ÎÒ²»½ÓÊÜ¡°Ðí¿ÉÖ¤Ð­Òé¡±ÖÐµÄÌõ¿î(&N)
+æˆ‘ä¸�æŽ¥å�—è®¸å�¯è¯�å��è®®ä¸­çš„æ�¡æ¬¾(&N)
 # ^InstallBtn
-°²×°(&I)
+å®‰è£…(&I)
 # ^UninstallBtn
-Ð¶ÔØ(&U)
+å�¸è½½(&U)
 # ^CancelBtn
-È¡Ïû(&C)
+å�–æ¶ˆ(&C)
 # ^CloseBtn
-¹Ø±Õ(&L)
+å…³é—­(&L)
 # ^BrowseBtn
-ä¯ÀÀ(&B)...
+æµ�è§ˆ(&B)...
 # ^ShowDetailsBtn
-ÏÔÊ¾Ï¸½Ú(&D)
+æ˜¾ç¤ºè¯¦æƒ…(&D)
 # ^ClickNext
-µ¥»÷ [ÏÂÒ»²½(N)] ¼ÌÐø¡£
+ç‚¹å‡» [ä¸‹ä¸€æ­¥(N)] ç»§ç»­ã€‚
 # ^ClickInstall
-µ¥»÷ [°²×°(I)] ¿ªÊ¼°²×°½ø³Ì¡£
+ç‚¹å‡» [å®‰è£…(I)] å¼€å§‹å®‰è£…ã€‚
 # ^ClickUninstall
-µ¥»÷ [Ð¶ÔØ(U)] ¿ªÊ¼½â³ý°²×°½ø³Ì¡£
+ç‚¹å‡» [å�¸è½½(U)] å¼€å§‹å�¸è½½ã€‚
 # ^Name
-Ãû³Æ
+å��ç§°
 # ^Completed
-ÒÑÍê³É
+å·²å®Œæˆ�
 # ^LicenseText
-ÔÚ°²×° $(^NameDA) Ö®Ç°Çë¼ìÔÄÐí¿ÉÖ¤Ð­Òé¡£Èç¹ûÄã½ÓÊÜÐ­ÒéÖÐËùÓÐÌõ¿î£¬µ¥»÷ [ÎÒ½ÓÊÜ(I)] ¡£
+è¯·åœ¨å®‰è£… $(^NameDA) ä¹‹å‰�é˜…è¯»è®¸å�¯è¯�å��è®®ã€‚å¦‚æžœä½ æŽ¥å�—å��è®®ä¸­æ‰€æœ‰æ�¡æ¬¾ï¼Œç‚¹å‡» [æˆ‘å�Œæ„�(I)] ã€‚
 # ^LicenseTextCB
-ÔÚ°²×° $(^NameDA) Ö®Ç°Çë¼ìÔÄÐí¿ÉÖ¤Ð­Òé¡£Èç¹ûÄã½ÓÊÜÐ­ÒéÖÐËùÓÐÌõ¿î£¬µ¥»÷ÏÂ·½µÄ¹´Ñ¡¿ò¡£ $_CLICK
+è¯·åœ¨å®‰è£… $(^NameDA) ä¹‹å‰�é˜…è¯»è®¸å�¯è¯�å��è®®ã€‚å¦‚æžœä½ æŽ¥å�—å��è®®ä¸­æ‰€æœ‰æ�¡æ¬¾ï¼Œç‚¹å‡»ä¸‹æ–¹çš„é€‰æ¡†ã€‚ $_CLICK
 # ^LicenseTextRB
-ÔÚ°²×° $(^NameDA) Ö®Ç°Çë¼ìÔÄÐí¿ÉÖ¤Ð­Òé¡£Èç¹ûÄã½ÓÊÜÐ­ÒéÖÐËùÓÐÌõ¿î£¬Ñ¡ÔñÏÂ·½µÄµÚÒ»¸öÑ¡Ïî¡£ $_CLICK
+è¯·åœ¨å®‰è£… $(^NameDA) ä¹‹å‰�é˜…è¯»è®¸å�¯è¯�å��è®®ã€‚å¦‚æžœä½ æŽ¥å�—å��è®®ä¸­æ‰€æœ‰æ�¡æ¬¾ï¼Œé€‰æ‹©ä¸‹æ–¹çš„ç¬¬ä¸€ä¸ªé€‰é¡¹ã€‚ $_CLICK
 # ^UnLicenseText
-ÔÚÐ¶ÔØ $(^NameDA) Ö®Ç°Çë¼ìÔÄÐí¿ÉÖ¤Ð­Òé¡£Èç¹ûÄã½ÓÊÜÐ­ÒéÖÐËùÓÐÌõ¿î£¬µ¥»÷ [ÎÒ½ÓÊÜ(I)] ¡£
+è¯·åœ¨å�¸è½½ $(^NameDA) ä¹‹å‰�é˜…è¯»è®¸å�¯è¯�å��è®®ã€‚å¦‚æžœä½ æŽ¥å�—å��è®®ä¸­æ‰€æœ‰æ�¡æ¬¾ï¼Œç‚¹å‡» [æˆ‘å�Œæ„�(I)] ã€‚
 # ^UnLicenseTextCB
-ÔÚÐ¶ÔØ $(^NameDA) Ö®Ç°Çë¼ìÔÄÐí¿ÉÖ¤Ð­Òé¡£Èç¹ûÄã½ÓÊÜÐ­ÒéÖÐËùÓÐÌõ¿î£¬µ¥»÷ÏÂ·½µÄ¹´Ñ¡¿ò¡£ $_CLICK
+è¯·åœ¨å�¸è½½ $(^NameDA) ä¹‹å‰�é˜…è¯»è®¸å�¯è¯�å��è®®ã€‚å¦‚æžœä½ æŽ¥å�—å��è®®ä¸­æ‰€æœ‰æ�¡æ¬¾ï¼Œç‚¹å‡»ä¸‹æ–¹çš„é€‰æ¡†ã€‚ $_CLICK
 # ^UnLicenseTextRB
-ÔÚÐ¶ÔØ $(^NameDA) Ö®Ç°Çë¼ìÔÄÐí¿ÉÖ¤Ð­Òé¡£Èç¹ûÄã½ÓÊÜÐ­ÒéÖÐËùÓÐÌõ¿î£¬Ñ¡ÔñÏÂ·½µÄµÚÒ»¸öÑ¡Ïî¡£ $_CLICK
+è¯·åœ¨å�¸è½½ $(^NameDA) ä¹‹å‰�é˜…è¯»è®¸å�¯è¯�å��è®®ã€‚å¦‚æžœä½ æŽ¥å�—å��è®®ä¸­æ‰€æœ‰æ�¡æ¬¾ï¼Œé€‰æ‹©ä¸‹æ–¹çš„ç¬¬ä¸€ä¸ªé€‰é¡¹ã€‚ $_CLICK
 # ^Custom
-×Ô¶¨Òå
+è‡ªå®šä¹‰
 # ^ComponentsText
-¹´Ñ¡ÄãÏëÒª°²×°µÄ×é¼þ£¬²¢½â³ý¹´Ñ¡Äã²»Ï£Íû°²×°µÄ×é¼þ¡£ $_CLICK
+è¯·å‹¾é€‰ä½ æƒ³å®‰è£…çš„ç»„ä»¶ï¼Œå¹¶å�–æ¶ˆå‹¾é€‰ä½ ä¸�æƒ³å®‰è£…çš„ç»„ä»¶ã€‚ $_CLICK
 # ^ComponentsSubText1
-Ñ¡¶¨°²×°µÄÀàÐÍ: 
+é€‰å®šçš„å®‰è£…çš„ç±»åž‹: 
 # ^ComponentsSubText2_NoInstTypes
-Ñ¡¶¨°²×°µÄ×é¼þ: 
+é€‰å®šå®‰è£…çš„ç»„ä»¶: 
 # ^ComponentsSubText2
-»òÕß£¬×Ô¶¨ÒåÑ¡¶¨Ïë°²×°µÄ×é¼þ: 
+æˆ–è€…ï¼Œè‡ªå®šä¹‰é€‰å®šæƒ³å®‰è£…çš„ç»„ä»¶: 
 # ^UnComponentsText
-¹´Ñ¡ÄãÏëÒªÐ¶ÔØµÄ×é¼þ£¬²¢½â³ý¹´Ñ¡Äã²»Ï£ÍûÐ¶ÔØµÄ×é¼þ¡£ $_CLICK
+è¯·å‹¾é€‰ä½ æƒ³å�¸è½½çš„ç»„ä»¶ï¼Œå¹¶å�–æ¶ˆå‹¾é€‰ä½ ä¸�æƒ³å�¸è½½çš„ç»„ä»¶ã€‚ $_CLICK
 # ^UnComponentsSubText1
-Ñ¡ÔñÐ¶ÔØµÄÀàÐÍ: 
+é€‰æ‹©å�¸è½½çš„ç±»åž‹: 
 # ^UnComponentsSubText2_NoInstTypes
-Ñ¡ÔñÒªÐ¶ÔØµÄ×é¼þ: 
+é€‰æ‹©è¦�å�¸è½½çš„ç»„ä»¶: 
 # ^UnComponentsSubText2
-»òÊÇ£¬Ñ¡ÔñÏëÒªÐ¶ÔØµÄ¿ÉÑ¡Ïî×é¼þ: 
+æˆ–æ˜¯ï¼Œé€‰æ‹©æƒ³è¦�è§£é™¤å®‰è£…çš„å�¯é€‰é¡¹ç»„ä»¶: 
 # ^DirText
-Setup ½«°²×° $(^NameDA) ÔÚÏÂÁÐÎÄ¼þ¼Ð¡£Òª°²×°µ½²»Í¬ÎÄ¼þ¼Ð£¬µ¥»÷ [ä¯ÀÀ(B)] ²¢Ñ¡ÔñÆäËûµÄÎÄ¼þ¼Ð¡£ $_CLICK
+å®‰è£…ç¨‹åº�å°†æŠŠ $(^NameDA) å®‰è£…åˆ°ä»¥ä¸‹ç›®å½•ã€‚è¦�å®‰è£…åˆ°å�¦ä¸€ä¸ªç›®å½•ï¼Œè¯·ç‚¹å‡» [æµ�è§ˆ(B)...] å¹¶é€‰æ‹©å…¶ä»–çš„æ–‡ä»¶å¤¹ã€‚ $_CLICK
 # ^DirSubText
-Ä¿±êÎÄ¼þ¼Ð
+å®‰è£…ç›®å½•
 # ^DirBrowseText
-Ñ¡ÔñÒª°²×° $(^NameDA) µÄÎÄ¼þ¼ÐÎ»ÖÃ: 
+é€‰æ‹©å®‰è£…æ­¤è½¯ä»¶çš„ $(^NameDA) çš„ä½�ç½®: 
 # ^UnDirText
-Setup ½«Ð¶ÔØ $(^NameDA) ÔÚÏÂÁÐÎÄ¼þ¼Ð¡£ÒªÐ¶ÔØµ½²»Í¬ÎÄ¼þ¼Ð£¬µ¥»÷ [ä¯ÀÀ(B)] ²¢Ñ¡ÔñÆäËûµÄÎÄ¼þ¼Ð¡£ $_CLICK
+å®‰è£…ç¨‹åº�å°†æŠŠ $(^NameDA) ä»Žä»¥ä¸‹ç›®å½•å�¸è½½ã€‚è¦�ä»Žå�¦ä¸€ä¸ªç›®å½•å�¸è½½ï¼Œç‚¹å‡» [æµ�è§ˆ(B)...] å¹¶é€‰æ‹©å…¶ä»–ç›®å½•ã€‚ $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Ñ¡ÔñÒªÐ¶ÔØ $(^NameDA) µÄÎÄ¼þ¼ÐÎ»ÖÃ: 
+é€‰æ‹©è¦�å�¸è½½ $(^NameDA) çš„ç›®å½•: 
 # ^SpaceAvailable
-"¿ÉÓÃ¿Õ¼ä: "
+"å�¯ç”¨ç©ºé—´: "
 # ^SpaceRequired
-"ËùÐè¿Õ¼ä: "
+"æ‰€éœ€ç©ºé—´: "
 # ^UninstallingText
-Õâ¸öÏòµ¼½«´ÓÄãµÄ¼ÆËã»úÐ¶ÔØ $(^NameDA) ¡£ $_CLICK
+æ­¤å�‘å¯¼å°†ä»Žæœ¬æœºå�¸è½½ $(^NameDA) ã€‚ $_CLICK
 # ^UninstallingSubText
-Ð¶ÔØÄ¿Â¼: 
+å�¸è½½ç›®å½•: 
 # ^FileError
-²»ÄÜ´ò¿ªÒªÐ´ÈëµÄÎÄ¼þ: \r\n\t"$0"\r\nµ¥»÷ [Abort] ·ÅÆú°²×°£¬\r\n [Retry] ÖØÐÂ³¢ÊÔÐ´ÈëÎÄ¼þ£¬»ò\r\n [Ignore] ºöÂÔÕâ¸öÎÄ¼þ¡£
+æ— æ³•æ‰“å¼€è¦�å†™å…¥çš„æ–‡ä»¶: \r\n\t"$0"\r\nç‚¹å‡» [Abort] å�œæ­¢å®‰è£…ï¼Œ\r\n [Retry] é‡�æ–°å°�è¯•å†™å…¥æ–‡ä»¶ï¼Œæˆ–è€…\r\n [Ignore] å¿½ç•¥è¿™ä¸ªæ–‡ä»¶ã€‚
 # ^FileError_NoIgnore
-²»ÄÜ´ò¿ªÒªÐ´ÈëµÄÎÄ¼þ: \r\n\t"$0"\r\nµ¥»÷ [Retry] ÖØÐÂ³¢ÊÔÐ´ÈëÎÄ¼þ£¬»ò\r\n [Cancel] È¡Ïû°²×°¡£
+æ— æ³•æ‰“å¼€è¦�å†™å…¥çš„æ–‡ä»¶: \r\n\t"$0"\r\nç‚¹å‡» [Retry] é‡�æ–°å°�è¯•å†™å…¥æ–‡ä»¶ï¼Œæˆ–è€…\r\n [Cancel] å�œæ­¢å®‰è£…ã€‚
 # ^CantWrite
-"ÎÞ·¨Ð´Èë: "
+"æ— æ³•å†™å…¥: "
 # ^CopyFailed
-"¸´ÖÆÊ§°Ü "
+"å¤�åˆ¶å¤±è´¥ "
 # ^CopyTo
-"¸´ÖÆµ½: "
+"å¤�åˆ¶åˆ°: "
 # ^Registering
-"ÕýÔÚ×¢²á: "
+"æ­£åœ¨æ³¨å†Œ: "
 # ^Unregistering
-"ÕýÔÚ½â³ý×¢²á: "
+"æ­£åœ¨å�–æ¶ˆæ³¨å†Œ: "
 # ^SymbolNotFound
-"ÎÞ·¨ÕÒµ½·ûºÅ: "
+"æ— æ³•æ‰¾åˆ°ç¬¦å�·: "
 # ^CouldNotLoad
-"ÎÞ·¨¼ÓÔØ: "
+"æ— æ³•åŠ è½½: "
 # ^CreateFolder
-"´´½¨ÎÄ¼þ¼Ð: " 
+"åˆ›å»ºæ–‡ä»¶å¤¹: " 
 # ^CreateShortcut
-"´´½¨¿ì½Ý·½Ê½: "
+"åˆ›å»ºå¿«æ�·æ–¹å¼�: "
 # ^CreatedUninstaller
-"´´½¨Ð¶ÔØ³ÌÐò: "
+"åˆ›å»ºå�¸è½½ç¨‹åº�: "
 # ^Delete
-"É¾³ýÎÄ¼þ: "
+"åˆ é™¤æ–‡ä»¶: "
 # ^DeleteOnReboot
-"ÖØÐÂÆô¶¯ºóÉ¾³ý: "
+"é‡�æ–°å�¯åŠ¨å�Žåˆ é™¤: "
 # ^ErrorCreatingShortcut
-"ÕýÔÚ´´½¨¿ì½Ý·½Ê½Ê±·¢Éú´íÎó: "
+"åˆ›å»ºå¿«æ�·æ–¹å¼�æ—¶å�‘ç”Ÿé”™è¯¯: "
 # ^ErrorCreating
-"ÕýÔÚ´´½¨Ê±·¢Éú´íÎó: "
+"åˆ›å»ºæ—¶å�‘ç”Ÿé”™è¯¯: "
 # ^ErrorDecompressing
-"ÕýÔÚ½âÑ¹ËõÊý¾Ý·¢Éú´íÎó£¡ÒÑËð»µµÄ°²×°³ÌÐò£¿"
+"è§£åŽ‹ç¼©æ•°æ�®æ—¶å�‘ç”Ÿé”™è¯¯ï¼�è¯·æ£€æŸ¥å®‰è£…ç¨‹åº�æ˜¯å�¦æ�Ÿå��ã€‚"
 # ^ErrorRegistering
-"ÕýÔÚ×¢²á DLL Ê±·¢Éú´íÎó"
+"æ³¨å†Œ DLL æ—¶å�‘ç”Ÿé”™è¯¯"
 # ^ExecShell
-"ÔËÐÐÍâ²¿³ÌÐò: "
+"æ‰§è¡Œå¤–å£³ç¨‹åº�: "
 # ^Exec
-"ÔËÐÐ: "
+"æ‰§è¡Œ: "
 # ^Extract
-"³éÈ¡: "
+"è§£åŽ‹ç¼©: "
 # ^ErrorWriting
-"³éÈ¡: ÎÞ·¨Ð´ÈëÎÄ¼þ "
+"æŠ½å�–: æ— æ³•å†™å…¥æ–‡ä»¶ "
 # ^InvalidOpcode
-"°²×°Ëð»Ù: ÎÞÐ§µÄ²Ù×÷´úÂë "
+"å®‰è£…ç¨‹åº�æ�Ÿå��: æ— æ•ˆçš„æ“�ä½œä»£ç � "
 # ^NoOLE
-"Ã»ÓÐ OLE ÓÃÓÚ: "
+"æ²¡æœ‰ OLE ç”¨äºŽ: "
 # ^OutputFolder
-"Êä³öÄ¿Â¼: "
+"è¾“å‡ºç›®å½•: "
 # ^RemoveFolder
-"ÒÆ³ýÄ¿Â¼: "
+"åˆ é™¤ç›®å½•: "
 # ^RenameOnReboot
-"ÖØÐÂÆô¶¯ºóÖØÃüÃû: "
+"é‡�æ–°å�¯åŠ¨ä¹‹å�Žé‡�å‘½å��: "
 # ^Rename
-"ÖØÃüÃû: "
+"é‡�å‘½å��: "
 # ^Skipped
-"ÒÑÌø¹ý: "
+"å·²è·³è¿‡: "
 # ^CopyDetails
-"¸´ÖÆÏ¸½Úµ½¼ôÌù°å "
+"å¤�åˆ¶è¯¦æƒ…åˆ°å‰ªè´´æ�¿ "
 # ^LogInstall
-"ÈÕÖ¾°²×°½ø³Ì"
+"è®°å½•å®‰è£…è¿‡ç¨‹åˆ°æ—¥å¿—"
 # byte
 B
 # kilo
-K
+ K
 # mega
-M
+ M
 # giga
-G
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Bulgarian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Bulgarian.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Bulgarian.nsh	(revision 2956)
@@ -1,124 +1,124 @@
-;Language: Bulgarian (1026)
+ï»¿;Language: Bulgarian (1026)
 ;Translated by Asparouh Kalyandjiev [acnapyx@sbline.net]
 ;Review and update from v1.63 to v1.68 by Plamen Penkov [plamen71@hotmail.com]
-;Updated by Êèðèë Êèðèëîâ (DumpeR) [dumper@data.bg]
+;Updated by ÐšÐ¸Ñ€Ð¸Ð» ÐšÐ¸Ñ€Ð¸Ð»Ð¾Ð² (DumpeR) [dumper@data.bg]
 ;
 
-!insertmacro LANGFILE "Bulgarian" "Bulgarian"
+!insertmacro LANGFILE "Bulgarian" = "Ð‘ÑŠÐ»Ð³Ð°Ñ€Ñ�ÐºÐ¸" "Balgarski"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Äîáðå äîøëè â Ñúâåòíèêà çà èíñòàëèðàíå íà $(^NameDA)!"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Òîé ùå èíñòàëèðà $(^NameDA) íà âàøèÿ êîìïþòúð.$\r$\n$\r$\nÏðåïîðú÷âà ñå äà çàòâîðèòå âñè÷êè äðóãè ïðèëîæåíèÿ, ïðåäè äà ïðîäúëæèòå. Òîâà ùå ïîçâîëè íà ïðîãðàìàòà äà îáíîâè íÿêîè ñèñòåìíè ôàéëîâå, áåç äà ñå ðåñòàðòèðà êîìïþòúðà.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Ð”Ð¾Ð±Ñ€Ðµ Ð´Ð¾ÑˆÐ»Ð¸ Ð² Ð¡ÑŠÐ²ÐµÑ‚Ð½Ð¸ÐºÐ° Ð·Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ðµ Ð½Ð° $(^NameDA)!"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ð¢Ð¾Ð¹ Ñ‰Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð° $(^NameDA) Ð½Ð° Ð²Ð°ÑˆÐ¸Ñ� ÐºÐ¾Ð¼Ð¿ÑŽÑ‚ÑŠÑ€.$\r$\n$\r$\nÐŸÑ€ÐµÐ¿Ð¾Ñ€ÑŠÑ‡Ð²Ð° Ñ�Ðµ Ð´Ð° Ð·Ð°Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ðµ Ð²Ñ�Ð¸Ñ‡ÐºÐ¸ Ð´Ñ€ÑƒÐ³Ð¸ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ�, Ð¿Ñ€ÐµÐ´Ð¸ Ð´Ð° Ð¿Ñ€Ð¾Ð´ÑŠÐ»Ð¶Ð¸Ñ‚Ðµ. Ð¢Ð¾Ð²Ð° Ñ‰Ðµ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ð¸ Ð½Ð° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð°Ñ‚Ð° Ð´Ð° Ð¾Ð±Ð½Ð¾Ð²Ð¸ Ð½Ñ�ÐºÐ¾Ð¸ Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ð½Ð¸ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ðµ, Ð±ÐµÐ· Ð´Ð° Ñ�Ðµ Ñ€ÐµÑ�Ñ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð° ÐºÐ¾Ð¼Ð¿ÑŽÑ‚ÑŠÑ€Ð°.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Äîáðå äîøëè â Ñúâåòíèêà çà èçòðèâàíå íà $(^NameDA)!"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Òîé ùå âè ïîìîãíå äà èçòðèåòå $(^NameDA) îò âàøèÿ êîìïþòúð.$\r$\n$\r$\nÏðåäè äà ïðîäúëæèòå, óâåðåòå ñå ÷å $(^NameDA) íå å ñòàðòèðàíà â ìîìåíòà.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Ð”Ð¾Ð±Ñ€Ðµ Ð´Ð¾ÑˆÐ»Ð¸ Ð² Ð¡ÑŠÐ²ÐµÑ‚Ð½Ð¸ÐºÐ° Ð·Ð° Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° $(^NameDA)!"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ð¢Ð¾Ð¹ Ñ‰Ðµ Ð²Ð¸ Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ðµ Ð´Ð° Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ $(^NameDA) Ð¾Ñ‚ Ð²Ð°ÑˆÐ¸Ñ� ÐºÐ¾Ð¼Ð¿ÑŽÑ‚ÑŠÑ€.$\r$\n$\r$\nÐŸÑ€ÐµÐ´Ð¸ Ð´Ð° Ð¿Ñ€Ð¾Ð´ÑŠÐ»Ð¶Ð¸Ñ‚Ðµ, ÑƒÐ²ÐµÑ€ÐµÑ‚Ðµ Ñ�Ðµ Ñ‡Ðµ $(^NameDA) Ð½Ðµ Ðµ Ñ�Ñ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð°Ð½Ð° Ð² Ð¼Ð¾Ð¼ÐµÐ½Ñ‚Ð°.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ëèöåíçèîííî ñïîðàçóìåíèå"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Ìîëÿ çàïîçíàéòå ñå Ëèöåíçèîííîòî ñïîðàçóìåíèå ïðåäè äà ïðîäúëæèòå."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Àêî ïðèåìàòå óñëîâèÿòà íà ñïîðàçóìåíèåòî, íàòèñíåòå $\"Ñúãëàñåí$\", çà äà ïðîäúëæèòå. Òðÿáâà äà ïðèåìåòå ñïîðàçóìåíèåòî, çà äà èíñòàëèðàòå $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Àêî ïðèåìàòå óñëîâèÿòà íà ñïîðàçóìåíèåòî, ñëîæåòå îòìåòêà â ïîëåòî ïî-äîëó. Òðÿáâà äà ïðèåìåòå ñïîðàçóìåíèåòî, çà äà èíñòàëèðàòå $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Àêî ïðèåìàòå óñëîâèÿòà íà ñïîðàçóìåíèåòî, èçáåðåòå ïúðâàòà îïöèÿ ïî-äîëó. Òðÿáâà äà ïðèåìåòå ñïîðàçóìåíèåòî, çà äà èíñòàëèðàòå $(^NameDA) $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾ Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸Ðµ"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "ÐœÐ¾Ð»Ñ� Ð·Ð°Ð¿Ð¾Ð·Ð½Ð°Ð¹Ñ‚Ðµ Ñ�Ðµ Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ñ‚Ð¾ Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸Ðµ Ð¿Ñ€ÐµÐ´Ð¸ Ð´Ð° Ð¿Ñ€Ð¾Ð´ÑŠÐ»Ð¶Ð¸Ñ‚Ðµ."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ð�ÐºÐ¾ Ð¿Ñ€Ð¸ÐµÐ¼Ð°Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ�Ñ‚Ð° Ð½Ð° Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸ÐµÑ‚Ð¾, Ð½Ð°Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ $\"Ð¡ÑŠÐ³Ð»Ð°Ñ�ÐµÐ½$\", Ð·Ð° Ð´Ð° Ð¿Ñ€Ð¾Ð´ÑŠÐ»Ð¶Ð¸Ñ‚Ðµ. Ð¢Ñ€Ñ�Ð±Ð²Ð° Ð´Ð° Ð¿Ñ€Ð¸ÐµÐ¼ÐµÑ‚Ðµ Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸ÐµÑ‚Ð¾, Ð·Ð° Ð´Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ð�ÐºÐ¾ Ð¿Ñ€Ð¸ÐµÐ¼Ð°Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ�Ñ‚Ð° Ð½Ð° Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸ÐµÑ‚Ð¾, Ñ�Ð»Ð¾Ð¶ÐµÑ‚Ðµ Ð¾Ñ‚Ð¼ÐµÑ‚ÐºÐ° Ð² Ð¿Ð¾Ð»ÐµÑ‚Ð¾ Ð¿Ð¾-Ð´Ð¾Ð»Ñƒ. Ð¢Ñ€Ñ�Ð±Ð²Ð° Ð´Ð° Ð¿Ñ€Ð¸ÐµÐ¼ÐµÑ‚Ðµ Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸ÐµÑ‚Ð¾, Ð·Ð° Ð´Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ð�ÐºÐ¾ Ð¿Ñ€Ð¸ÐµÐ¼Ð°Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ�Ñ‚Ð° Ð½Ð° Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸ÐµÑ‚Ð¾, Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Ð¿ÑŠÑ€Ð²Ð°Ñ‚Ð° Ð¾Ð¿Ñ†Ð¸Ñ� Ð¿Ð¾-Ð´Ð¾Ð»Ñƒ. Ð¢Ñ€Ñ�Ð±Ð²Ð° Ð´Ð° Ð¿Ñ€Ð¸ÐµÐ¼ÐµÑ‚Ðµ Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸ÐµÑ‚Ð¾, Ð·Ð° Ð´Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ $(^NameDA) $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ëèöåíçèîííî ñïîðàçóìåíèå"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Ìîëÿ çàïîçíàéòå ñå ëèöåíçèîííèòå óñëîâèÿ ïðåäè äà èçòðèåòå $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Àêî ïðèåìàòå óñëîâèÿòà íà ñïîðàçóìåíèòî, íàòèñíåòå $\"Ñúãëàñåí$\" çà äà ïðîäúëæèòå. Òðÿáâà äà ïðèåìåòå ñïîðàçóìåíèåòî, çà äà èçòðèåòå $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Àêî ïðèåìàòå óñëîâèÿòà íà ñïîðàçóìåíèåòî, ñëîæåòå îòìåòêà â ïîëåòî ïî-äîëó. Òðÿáâà äà ïðèåìåòå ñïîðàçóìåíèåòî, çà äà èçòðèåòå $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Àêî ïðèåìàòå óñëîâèÿòà íà ñïîðàçóìåíèòî, èçáåðåòå ïúðâàòà îïöèÿ ïî-äîëó. Òðÿáâà äà ïðèåìåòå ñïîðàçóìåíèåòî, çà äà èçòðèåòå $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾ Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸Ðµ"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "ÐœÐ¾Ð»Ñ� Ð·Ð°Ð¿Ð¾Ð·Ð½Ð°Ð¹Ñ‚Ðµ Ñ�Ðµ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¸Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ð¿Ñ€ÐµÐ´Ð¸ Ð´Ð° Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ð�ÐºÐ¾ Ð¿Ñ€Ð¸ÐµÐ¼Ð°Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ�Ñ‚Ð° Ð½Ð° Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸Ñ‚Ð¾, Ð½Ð°Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ $\"Ð¡ÑŠÐ³Ð»Ð°Ñ�ÐµÐ½$\" Ð·Ð° Ð´Ð° Ð¿Ñ€Ð¾Ð´ÑŠÐ»Ð¶Ð¸Ñ‚Ðµ. Ð¢Ñ€Ñ�Ð±Ð²Ð° Ð´Ð° Ð¿Ñ€Ð¸ÐµÐ¼ÐµÑ‚Ðµ Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸ÐµÑ‚Ð¾, Ð·Ð° Ð´Ð° Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ð�ÐºÐ¾ Ð¿Ñ€Ð¸ÐµÐ¼Ð°Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ�Ñ‚Ð° Ð½Ð° Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸ÐµÑ‚Ð¾, Ñ�Ð»Ð¾Ð¶ÐµÑ‚Ðµ Ð¾Ñ‚Ð¼ÐµÑ‚ÐºÐ° Ð² Ð¿Ð¾Ð»ÐµÑ‚Ð¾ Ð¿Ð¾-Ð´Ð¾Ð»Ñƒ. Ð¢Ñ€Ñ�Ð±Ð²Ð° Ð´Ð° Ð¿Ñ€Ð¸ÐµÐ¼ÐµÑ‚Ðµ Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸ÐµÑ‚Ð¾, Ð·Ð° Ð´Ð° Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ð�ÐºÐ¾ Ð¿Ñ€Ð¸ÐµÐ¼Ð°Ñ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ�Ñ‚Ð° Ð½Ð° Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸Ñ‚Ð¾, Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Ð¿ÑŠÑ€Ð²Ð°Ñ‚Ð° Ð¾Ð¿Ñ†Ð¸Ñ� Ð¿Ð¾-Ð´Ð¾Ð»Ñƒ. Ð¢Ñ€Ñ�Ð±Ð²Ð° Ð´Ð° Ð¿Ñ€Ð¸ÐµÐ¼ÐµÑ‚Ðµ Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸ÐµÑ‚Ð¾, Ð·Ð° Ð´Ð° Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Íàòèñíåòå êëàâèøà $\"Page Down$\", çà äà âèäèòå îñòàíàëàòà ÷àñò îò ñïîðàçóìåíèåòî."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Ð�Ð°Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ° $\"Page Down$\", Ð·Ð° Ð´Ð° Ð²Ð¸Ð´Ð¸Ñ‚Ðµ Ð¾Ñ�Ñ‚Ð°Ð½Ð°Ð»Ð°Ñ‚Ð° Ñ‡Ð°Ñ�Ñ‚ Ð¾Ñ‚ Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸ÐµÑ‚Ð¾."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Èçáîð íà êîìïîíåíòè"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Èçáåðåòå êîè êîìïîíåíòè íà $(^NameDA) èñêàòå äà èíñòàëèðàòå."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Ð˜Ð·Ð±Ð¾Ñ€ Ð½Ð° ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Ð˜Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ ÐºÐ¾Ð¸ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸ Ð½Ð° $(^NameDA) Ð¸Ñ�ÐºÐ°Ñ‚Ðµ Ð´Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Èçáîð íà êîìïîíåíòè"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Èçáåðåòå êîè êîìïîíåíòè íà $(^NameDA) èñêàòå äà èçòðèåòå."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Ð˜Ð·Ð±Ð¾Ñ€ Ð½Ð° ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Ð˜Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ ÐºÐ¾Ð¸ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸ Ð½Ð° $(^NameDA) Ð¸Ñ�ÐºÐ°Ñ‚Ðµ Ð´Ð° Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Îïèñàíèå"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "ÐžÐ¿Ð¸Ñ�Ð°Ð½Ð¸Ðµ"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ïðåìèíåòå ñ ìèøêàòà íàä îïðåäåëåí êîìïîíåíò, çà äà âèäèòå îïèñàíèåòî ìó."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ÐŸÑ€ÐµÐ¼Ð¸Ð½ÐµÑ‚Ðµ Ñ� Ð¼Ð¸ÑˆÐºÐ°Ñ‚Ð° Ð½Ð°Ð´ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚, Ð·Ð° Ð´Ð° Ð²Ð¸Ð´Ð¸Ñ‚Ðµ Ð¾Ð¿Ð¸Ñ�Ð°Ð½Ð¸ÐµÑ‚Ð¾ Ð¼Ñƒ."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ïðåìèíåòå ñ ìèøêàòà íàä îïðåäåëåí êîìïîíåíò, çà äà âèäèòå îïèñàíèåòî ìó."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ð˜Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚, Ð·Ð° Ð´Ð° Ð²Ð¸Ð´Ð¸Ñ‚Ðµ Ð¾Ð¿Ð¸Ñ�Ð°Ð½Ð¸ÐµÑ‚Ð¾ Ð¼Ñƒ."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Èçáîð íà ïàïêà çà èíñòàëèðàíå"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Èçáåðåòå ïàïêàòà, â êîÿòî äà ñå èíñòàëèðà $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Ð˜Ð·Ð±Ð¾Ñ€ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ° Ð·Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ðµ"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Ð˜Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Ð¿Ð°Ð¿ÐºÐ°Ñ‚Ð°, Ð² ÐºÐ¾Ñ�Ñ‚Ð¾ Ð´Ð° Ñ�Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð° $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Èçáîð íà ïàïêà çà èçòðèâàíå"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Èçáåðåòå ïàïêàòà, îò êîÿòî äà ñå èçòðèå $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Ð˜Ð·Ð±Ð¾Ñ€ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ° Ð·Ð° Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Ð˜Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Ð¿Ð°Ð¿ÐºÐ°Ñ‚Ð°, Ð¾Ñ‚ ÐºÐ¾Ñ�Ñ‚Ð¾ Ð´Ð° Ñ�Ðµ Ð¸Ð·Ñ‚Ñ€Ð¸Ðµ $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Èíñòàëèðàíå"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Èç÷àêàéòå, èíñòàëèðàò ñå ôàéëîâåòå íà $(^NameDA)..."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Èíñòàëèðàíåòî çàâúðøè."
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Èíñòàëèðàíåòî çàâúðøè óñïåøíî."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Èíñòàëèðàíåòî ïðåêðàòåíî."
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Èíñòàëèðàíåòî íå çàâúðøè óñïåøíî."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ðµ"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Ð˜Ð·Ñ‡Ð°ÐºÐ°Ð¹Ñ‚Ðµ, Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚ Ñ�Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÐµÑ‚Ðµ Ð½Ð° $(^NameDA)..."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ Ð·Ð°Ð²ÑŠÑ€ÑˆÐ¸."
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ Ð·Ð°Ð²ÑŠÑ€ÑˆÐ¸ ÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ Ð¿Ñ€ÐµÐºÑ€Ð°Ñ‚ÐµÐ½Ð¾."
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ Ð½Ðµ Ð·Ð°Ð²ÑŠÑ€ÑˆÐ¸ ÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Èçòðèâàíå"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Èç÷àêàéòå, èçòðèâàò ñå ôàéëîâåòå íà $(^NameDA)..."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Êðàé"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Èçòðèâàíåòî çàâúðøè óñïåøíî."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Èçòðèâàíåòî ïðåêðàòåíî."
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Èçòðèâàíåòî íå çàâúðøè íàïúëíî."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Ð˜Ð·Ñ‡Ð°ÐºÐ°Ð¹Ñ‚Ðµ, Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ñ‚ Ñ�Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÐµÑ‚Ðµ Ð½Ð° $(^NameDA)..."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "ÐšÑ€Ð°Ð¹"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½ÐµÑ‚Ð¾ Ð·Ð°Ð²ÑŠÑ€ÑˆÐ¸ ÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½ÐµÑ‚Ð¾ Ð¿Ñ€ÐµÐºÑ€Ð°Ñ‚ÐµÐ½Ð¾."
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½ÐµÑ‚Ð¾ Ð½Ðµ Ð·Ð°Ð²ÑŠÑ€ÑˆÐ¸ Ð½Ð°Ð¿ÑŠÐ»Ð½Ð¾."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Ïðèêëþ÷âàíå íà Ñúâåòíèêà çà èíñòàëèðàíå íà $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Èíñòàëèðàíåòî íà $(^NameDA) å çàâúðøåíî.$\r$\n$\r$\nÍàòèñíåòå áóòîíà $\"Êðàé$\", çà äà çàòâîðèòå Ñúâåòíèêà."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Êîìïþòúðúò òðÿáâà äà áúäå ðåñòàðòèðàí, çà äà çàâúðøè èíñòàëèðàíåòî íà $(^NameDA). Èñêàòå ëè äà ðåñòàðòèðàòå ñåãà?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "ÐŸÑ€Ð¸ÐºÐ»ÑŽÑ‡Ð²Ð°Ð½Ðµ Ð½Ð° Ð¡ÑŠÐ²ÐµÑ‚Ð½Ð¸ÐºÐ° Ð·Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ðµ Ð½Ð° $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ Ð½Ð° $(^NameDA) Ðµ Ð·Ð°Ð²ÑŠÑ€ÑˆÐµÐ½Ð¾.$\r$\n$\r$\nÐ�Ð°Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ Ð±ÑƒÑ‚Ð¾Ð½Ð° $\"ÐšÑ€Ð°Ð¹$\", Ð·Ð° Ð´Ð° Ð·Ð°Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ðµ Ð¡ÑŠÐ²ÐµÑ‚Ð½Ð¸ÐºÐ°."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "ÐšÐ¾Ð¼Ð¿ÑŽÑ‚ÑŠÑ€ÑŠÑ‚ Ñ‚Ñ€Ñ�Ð±Ð²Ð° Ð´Ð° Ð±ÑŠÐ´Ðµ Ñ€ÐµÑ�Ñ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð°Ð½, Ð·Ð° Ð´Ð° Ð·Ð°Ð²ÑŠÑ€ÑˆÐ¸ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ Ð½Ð° $(^NameDA). Ð˜Ñ�ÐºÐ°Ñ‚Ðµ Ð»Ð¸ Ð´Ð° Ñ€ÐµÑ�Ñ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð°Ñ‚Ðµ Ñ�ÐµÐ³Ð°?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Ïðèêëþ÷âàíå íà Ñúâåòíèêà çà èçòðèâàíå íà $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Ïðîãðàìàòà $(^NameDA) áåøå èçòðèòà îò âàøèÿ êîìïþòúð.$\r$\n$\r$\nÍàòèñíåòå $\"Êðàé$\" çà äà çàòâîðèòå òîçè Ñúâåòíèê."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Êîìïþòúðúò âè òðÿáâà äà ñå ðåñòàðòèðà, çà äà ïðèêëþ÷è óñïåøíî èçòðèâàíåòî íà $(^NameDA). Èñêàòå ëè äà ðåñòàðòèðàòå ñåãà?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "ÐŸÑ€Ð¸ÐºÐ»ÑŽÑ‡Ð²Ð°Ð½Ðµ Ð½Ð° Ð¡ÑŠÐ²ÐµÑ‚Ð½Ð¸ÐºÐ° Ð·Ð° Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð°Ñ‚Ð° $(^NameDA) Ð±ÐµÑˆÐµ Ð¸Ð·Ñ‚Ñ€Ð¸Ñ‚Ð° Ð¾Ñ‚ Ð²Ð°ÑˆÐ¸Ñ� ÐºÐ¾Ð¼Ð¿ÑŽÑ‚ÑŠÑ€.$\r$\n$\r$\nÐ�Ð°Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ $\"ÐšÑ€Ð°Ð¹$\" Ð·Ð° Ð´Ð° Ð·Ð°Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ðµ Ñ‚Ð¾Ð·Ð¸ Ð¡ÑŠÐ²ÐµÑ‚Ð½Ð¸Ðº."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "ÐšÐ¾Ð¼Ð¿ÑŽÑ‚ÑŠÑ€ÑŠÑ‚ Ð²Ð¸ Ñ‚Ñ€Ñ�Ð±Ð²Ð° Ð´Ð° Ñ�Ðµ Ñ€ÐµÑ�Ñ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð°, Ð·Ð° Ð´Ð° Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡Ð¸ ÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾ Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½ÐµÑ‚Ð¾ Ð½Ð° $(^NameDA). Ð˜Ñ�ÐºÐ°Ñ‚Ðµ Ð»Ð¸ Ð´Ð° Ñ€ÐµÑ�Ñ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð°Ñ‚Ðµ Ñ�ÐµÐ³Ð°?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Äà, ðåñòàðòèðàé ñåãà"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Íå, ùå ðåñòàðòèðàì ïî-êúñíî"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "Ñòàðòèðàé $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Ïîêàæè ôàéëà $\"ReadMe$\""
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Êðàé"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ð”Ð°, Ñ€ÐµÑ�Ñ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð°Ð¹ Ñ�ÐµÐ³Ð°"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ð�Ðµ, Ñ‰Ðµ Ñ€ÐµÑ�Ñ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð°Ð¼ Ð¿Ð¾-ÐºÑŠÑ�Ð½Ð¾"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "Ð¡Ñ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð°Ð¹ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "ÐŸÐ¾ÐºÐ°Ð¶Ð¸ Ñ„Ð°Ð¹Ð»Ð° $\"ReadMe$\""
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&ÐšÑ€Ð°Ð¹"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Èçáîð íà ïàïêà â ìåíþòî $\"Ñòàðò$\""
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Èçáåðåòå ïàïêà â ìåíþòî $\"Ñòàðò$\" çà ïðåêè ïúòèùà êúì ïðîãðàìàòà."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Èçáåðåòå ïàïêà â ìåíþòî $\"Ñòàðò$\", â êîÿòî èñêàòå äà ñúçäàäåòå ïðåêè ïúòèùà êúì ïðîãðàìàòà. Ìîæåòå ñúùî òàêà äà âúâåäåòå èìå, çà äà ñúçäàäåòå íîâà ïàïêà."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Íå ñúçäàâàé ïðåêè ïúòèùà"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Ð˜Ð·Ð±Ð¾Ñ€ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ° Ð² Ð¼ÐµÐ½ÑŽÑ‚Ð¾ $\"Ð¡Ñ‚Ð°Ñ€Ñ‚$\""
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Ð˜Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Ð¿Ð°Ð¿ÐºÐ° Ð² Ð¼ÐµÐ½ÑŽÑ‚Ð¾ $\"Ð¡Ñ‚Ð°Ñ€Ñ‚$\" Ð·Ð° Ð¿Ñ€ÐµÐºÐ¸ Ð¿ÑŠÑ‚Ð¸Ñ‰Ð° ÐºÑŠÐ¼ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð°Ñ‚Ð°."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Ð˜Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Ð¿Ð°Ð¿ÐºÐ° Ð² Ð¼ÐµÐ½ÑŽÑ‚Ð¾ $\"Ð¡Ñ‚Ð°Ñ€Ñ‚$\", Ð² ÐºÐ¾Ñ�Ñ‚Ð¾ Ð¸Ñ�ÐºÐ°Ñ‚Ðµ Ð´Ð° Ñ�ÑŠÐ·Ð´Ð°Ð´ÐµÑ‚Ðµ Ð¿Ñ€ÐµÐºÐ¸ Ð¿ÑŠÑ‚Ð¸Ñ‰Ð° ÐºÑŠÐ¼ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð°Ñ‚Ð°. ÐœÐ¾Ð¶ÐµÑ‚Ðµ Ñ�ÑŠÑ‰Ð¾ Ñ‚Ð°ÐºÐ° Ð´Ð° Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ Ð¸Ð¼Ðµ, Ð·Ð° Ð´Ð° Ñ�ÑŠÐ·Ð´Ð°Ð´ÐµÑ‚Ðµ Ð½Ð¾Ð²Ð° Ð¿Ð°Ð¿ÐºÐ°."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ð�Ðµ Ñ�ÑŠÐ·Ð´Ð°Ð²Ð°Ð¹ Ð¿Ñ€ÐµÐºÐ¸ Ð¿ÑŠÑ‚Ð¸Ñ‰Ð°"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Èçòðèâàíå íà $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Èçòðèâàíå íà $(^NameDA) îò âàøèÿ êîìïþòúð."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° $(^NameDA) Ð¾Ñ‚ Ð²Ð°ÑˆÐ¸Ñ� ÐºÐ¾Ð¼Ð¿ÑŽÑ‚ÑŠÑ€."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Ñèãóðíè ëè ñòå, ÷å èñêàòå äà ïðåêðàòèòå èíñòàëèðàíåòî íà $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Ð¡Ð¸Ð³ÑƒÑ€Ð½Ð¸ Ð»Ð¸ Ñ�Ñ‚Ðµ, Ñ‡Ðµ Ð¸Ñ�ÐºÐ°Ñ‚Ðµ Ð´Ð° Ð¿Ñ€ÐµÐºÑ€Ð°Ñ‚Ð¸Ñ‚Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ Ð½Ð° $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ñèãóðíè ëè ñòå, ÷å èñêàòå äà ïðåêðàòèòå èçòðèâàíåòî íà $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ð¡Ð¸Ð³ÑƒÑ€Ð½Ð¸ Ð»Ð¸ Ñ�Ñ‚Ðµ, Ñ‡Ðµ Ð¸Ñ�ÐºÐ°Ñ‚Ðµ Ð´Ð° Ð¿Ñ€ÐµÐºÑ€Ð°Ñ‚Ð¸Ñ‚Ðµ Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½ÐµÑ‚Ð¾ Ð½Ð° $(^Name)?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Irish.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Irish.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Irish.nlf	(revision 2956)
@@ -1,4 +1,4 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Start editing here
 # Language ID
@@ -6,37 +6,37 @@
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
 # Translation by Kevin P. Scannell < scannell at slu dot edu >
 # ^Branding
-Córas Suiteála Nullsoft %s
+Nullsoft Install System %s
 # ^SetupCaption
-Socrú $(^Name)
+SocrÃº $(^Name)
 # ^UninstallCaption
-Díshuiteáil $(^Name)
+DÃ­shuiteÃ¡il $(^Name)
 # ^LicenseSubCaption
-: Comhaontú um Cheadúnas
+: ComhaontÃº um CheadÃºnas
 # ^ComponentsSubCaption
-: Roghanna Suiteála
+: Roghanna SuiteÃ¡la
 # ^DirSubCaption
-: Fillteán Suiteála
+: FillteÃ¡n SuiteÃ¡la
 # ^InstallingSubCaption
-: Suiteáil
+: SuiteÃ¡il
 # ^CompletedSubCaption
-: Críochnaithe
+: CrÃ­ochnaithe
 # ^UnComponentsSubCaption
-: Roghanna Díshuiteála
+: Roghanna DÃ­shuiteÃ¡la
 # ^UnDirSubCaption
-: Fillteán Díshuiteála
+: FillteÃ¡n DÃ­shuiteÃ¡la
 # ^ConfirmSubCaption
-: Deimhniú
+: DeimhniÃº
 # ^UninstallingSubCaption
-: Díshuiteáil
+: DÃ­shuiteÃ¡il
 # ^UnCompletedSubCaption
-: Críochnaithe
+: CrÃ­ochnaithe
 # ^BackBtn
 < Ar Ai&s
 # ^NextBtn
@@ -44,117 +44,117 @@
 # ^AgreeBtn
 Gl&acaim Leis
 # ^AcceptBtn
-Táim toilteanach &glacadh le coinníollacha an Chomhaontú um Cheadúnas
+TÃ¡im toilteanach &glacadh le coinnÃ­ollacha an ChomhaontÃº um CheadÃºnas
 # ^DontAcceptBtn
-Nílim &toilteanach glacadh le coinníollacha an Chomhaontú um Cheadúnas
+NÃ­lim &toilteanach glacadh le coinnÃ­ollacha an ChomhaontÃº um CheadÃºnas
 # ^InstallBtn
-&Suiteáil
+&SuiteÃ¡il
 # ^UninstallBtn
-&Díshuiteáil
+&DÃ­shuiteÃ¡il
 # ^CancelBtn
 Cealaigh
 # ^CloseBtn
-&Dún
+&DÃºn
 # ^BrowseBtn
-B&rabhsáil...
+B&rabhsÃ¡il...
 # ^ShowDetailsBtn
-Taispeáin &sonraí
+TaispeÃ¡in &sonraÃ­
 # ^ClickNext
-Cliceáil "Ar Aghaidh" chun leanúint ar aghaidh.
+CliceÃ¡il "Ar Aghaidh" chun leanÃºint ar aghaidh.
 # ^ClickInstall
-Cliceáil "Suiteáil" chun tosú.
+CliceÃ¡il "SuiteÃ¡il" chun tosÃº.
 # ^ClickUninstall
-Cliceáil "Díshuiteáil" chun tosú.
+CliceÃ¡il "DÃ­shuiteÃ¡il" chun tosÃº.
 # ^Name
 Ainm
 # ^Completed
-Críochnaithe
+CrÃ­ochnaithe
 # ^LicenseText
-Déan iniúchadh ar an gComhaontú um Cheadúnas sula suiteálann tú $(^NameDA). Má ghlacann tú le gach coinníoll den chomhaontú, cliceáil "Glacaim Leis".
+DÃ©an iniÃºchadh ar an gComhaontÃº um CheadÃºnas sula suiteÃ¡lann tÃº $(^NameDA). MÃ¡ ghlacann tÃº le gach coinnÃ­oll den chomhaontÃº, cliceÃ¡il "Glacaim Leis".
 # ^LicenseTextCB
-Déan iniúchadh ar an gComhaontú um Cheadúnas sula suiteálann tú $(^NameDA). Má ghlacann tú le gach coinníoll den chomhaontú, cliceáil an ticbhosca thíos. $_CLICK
+DÃ©an iniÃºchadh ar an gComhaontÃº um CheadÃºnas sula suiteÃ¡lann tÃº $(^NameDA). MÃ¡ ghlacann tÃº le gach coinnÃ­oll den chomhaontÃº, cliceÃ¡il an ticbhosca thÃ­os. $_CLICK
 # ^LicenseTextRB
-Déan iniúchadh ar an gComhaontú um Cheadúnas sula suiteálann tú $(^NameDA). Má ghlacann tú le gach coinníoll den chomhaontú, roghnaigh an chéad rogha thíos. $_CLICK
+DÃ©an iniÃºchadh ar an gComhaontÃº um CheadÃºnas sula suiteÃ¡lann tÃº $(^NameDA). MÃ¡ ghlacann tÃº le gach coinnÃ­oll den chomhaontÃº, roghnaigh an chÃ©ad rogha thÃ­os. $_CLICK
 # ^UnLicenseText
-Déan iniúchadh ar an gComhaontú um Cheadúnas sula ndíshuiteálann tú $(^NameDA). Má ghlacann tú le gach coinníoll den chomhaontú, cliceáil "Glacaim Leis".
+DÃ©an iniÃºchadh ar an gComhaontÃº um CheadÃºnas sula ndÃ­shuiteÃ¡lann tÃº $(^NameDA). MÃ¡ ghlacann tÃº le gach coinnÃ­oll den chomhaontÃº, cliceÃ¡il "Glacaim Leis".
 # ^UnLicenseTextCB
-Déan iniúchadh ar an gComhaontú um Cheadúnas sula ndíshuiteálann tú $(^NameDA). Má ghlacann tú le gach coinníoll den chomhaontú, cliceáil an ticbhosca thíos. $_CLICK
+DÃ©an iniÃºchadh ar an gComhaontÃº um CheadÃºnas sula ndÃ­shuiteÃ¡lann tÃº $(^NameDA). MÃ¡ ghlacann tÃº le gach coinnÃ­oll den chomhaontÃº, cliceÃ¡il an ticbhosca thÃ­os. $_CLICK
 # ^UnLicenseTextRB
-Déan iniúchadh ar an gComhaontú um Cheadúnas sula ndíshuiteálann tú $(^NameDA). Má ghlacann tú le gach coinníoll den chomhaontú, roghnaigh an chéad rogha thíos. $_CLICK
+DÃ©an iniÃºchadh ar an gComhaontÃº um CheadÃºnas sula ndÃ­shuiteÃ¡lann tÃº $(^NameDA). MÃ¡ ghlacann tÃº le gach coinnÃ­oll den chomhaontÃº, roghnaigh an chÃ©ad rogha thÃ­os. $_CLICK
 # ^Custom
 Saincheaptha
 # ^ComponentsText
-Roghnaigh na comhpháirteanna is mian leat a shuiteáil, agus díroghnaigh na comhpháirteanna nach mian leat a shuiteáil. $_CLICK
+Roghnaigh na comhphÃ¡irteanna is mian leat a shuiteÃ¡il, agus dÃ­roghnaigh na comhphÃ¡irteanna nach mian leat a shuiteÃ¡il. $_CLICK
 # ^ComponentsSubText1
-Roghnaigh cineál na suiteála:
+Roghnaigh cineÃ¡l na suiteÃ¡la:
 # ^ComponentsSubText2_NoInstTypes
-Roghnaigh na comhpháirteanna is mian leat a shuiteáil:
+Roghnaigh na comhphÃ¡irteanna is mian leat a shuiteÃ¡il:
 # ^ComponentsSubText2
-Nó, roghnaigh na comhpháirteanna roghnacha is mian leat a shuiteáil:
+NÃ³, roghnaigh na comhphÃ¡irteanna roghnacha is mian leat a shuiteÃ¡il:
 # ^UnComponentsText
-Roghnaigh na comhpháirteanna is mian leat a dhíshuiteáil, agus díroghnaigh na comhpháirteanna nach mian leat a dhíshuiteáil. $_CLICK
+Roghnaigh na comhphÃ¡irteanna is mian leat a dhÃ­shuiteÃ¡il, agus dÃ­roghnaigh na comhphÃ¡irteanna nach mian leat a dhÃ­shuiteÃ¡il. $_CLICK
 # ^UnComponentsSubText1
-Roghnaigh cineál na díshuiteála:
+Roghnaigh cineÃ¡l na dÃ­shuiteÃ¡la:
 # ^UnComponentsSubText2_NoInstTypes
-Roghnaigh comhpháirteanna le díshuiteáil:
+Roghnaigh comhphÃ¡irteanna le dÃ­shuiteÃ¡il:
 # ^UnComponentsSubText2
-Nó, roghnaigh na comhpháirteanna roghnacha is mian leat a dhíshuiteáil:
+NÃ³, roghnaigh na comhphÃ¡irteanna roghnacha is mian leat a dhÃ­shuiteÃ¡il:
 # ^DirText
-Cuirfidh an Suiteálaí $(^NameDA) san fhillteán seo a leanas. Más mian leat suiteáil i bhfillteán difriúil, cliceáil "Brabhsáil" agus roghnaigh fillteán eile. $_CLICK
+Cuirfidh an SuiteÃ¡laÃ­ $(^NameDA) san fhillteÃ¡n seo a leanas. MÃ¡s mian leat suiteÃ¡il i bhfillteÃ¡n difriÃºil, cliceÃ¡il "BrabhsÃ¡il" agus roghnaigh fillteÃ¡n eile. $_CLICK
 # ^DirSubText
-Sprioc-Fhillteán
+Sprioc-FhillteÃ¡n
 # ^DirBrowseText
-Roghnaigh an fillteán inar mian leat $(^NameDA) a shuiteáil:
+Roghnaigh an fillteÃ¡n inar mian leat $(^NameDA) a shuiteÃ¡il:
 # ^UnDirText
-Bainfidh an Suiteálaí $(^NameDA) amach as an bhfillteán seo a leanas. Más mian leat é a dhíshuiteáil ó fhillteán difriúil, cliceáil "Brabhsáil" agus roghnaigh fillteán eile. $_CLICK
+Bainfidh an SuiteÃ¡laÃ­ $(^NameDA) amach as an bhfillteÃ¡n seo a leanas. MÃ¡s mian leat Ã© a dhÃ­shuiteÃ¡il Ã³ fhillteÃ¡n difriÃºil, cliceÃ¡il "BrabhsÃ¡il" agus roghnaigh fillteÃ¡n eile. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Roghnaigh an fillteán ar mian leat $(^NameDA) a dhíshuiteáil as:
+Roghnaigh an fillteÃ¡n ar mian leat $(^NameDA) a dhÃ­shuiteÃ¡il as:
 # ^SpaceAvailable
-"Spás le fáil: "
+"SpÃ¡s le fÃ¡il: "
 # ^SpaceRequired
-"Spás de dhíth: "
+"SpÃ¡s de dhÃ­th: "
 # ^UninstallingText
-Díshuiteálfar $(^NameDA) ón fhillteán seo a leanas. $_CLICK
+DÃ­shuiteÃ¡lfar $(^NameDA) Ã³n fhillteÃ¡n seo a leanas. $_CLICK
 # ^UninstallingSubText
-Á dhíshuiteáil ó:
+Ã� dhÃ­shuiteÃ¡il Ã³:
 # ^FileError
-Earráid agus comhad á scríobh: \r\n\r\n$0\r\n\r\nCliceáil "Abort" chun an tsuiteáil a stopadh,\r\n"Retry" chun iarracht eile a dhéanamh, nó\r\n"Ignore" chun neamhaird a dhéanamh den chomhad seo.
+EarrÃ¡id agus comhad Ã¡ scrÃ­obh: \r\n\r\n$0\r\n\r\nCliceÃ¡il "Abort" chun an tsuiteÃ¡il a stopadh,\r\n"Retry" chun iarracht eile a dhÃ©anamh, nÃ³\r\n"Ignore" chun neamhaird a dhÃ©anamh den chomhad seo.
 # ^FileError_NoIgnore
-Earráid agus comhad á scríobh: \r\n\r\n$0\r\n\r\nCliceáil "Retry" chun iarracht eile a dhéanamh, nó\r\n"Cancel" chun an tsuiteáil a stopadh.
+EarrÃ¡id agus comhad Ã¡ scrÃ­obh: \r\n\r\n$0\r\n\r\nCliceÃ¡il "Retry" chun iarracht eile a dhÃ©anamh, nÃ³\r\n"Cancel" chun an tsuiteÃ¡il a stopadh.
 # ^CantWrite
-"Ní féidir scríobh: "
+"NÃ­ fÃ©idir scrÃ­obh: "
 # ^CopyFailed
-Theip ar an gcóipeáil
+Theip ar an gcÃ³ipeÃ¡il
 # ^CopyTo
-"Cóipeáil go "
+"CÃ³ipeÃ¡il go "
 # ^Registering
-"Clárú: "
+"ClÃ¡rÃº: "
 # ^Unregistering
-"Díchlárú: "
+"DÃ­chlÃ¡rÃº: "
 # ^SymbolNotFound
-"Níorbh fhéidir siombail a aimsiú: "
+"NÃ­orbh fhÃ©idir siombail a aimsiÃº: "
 # ^CouldNotLoad
-"Níorbh fhéidir luchtú: "
+"NÃ­orbh fhÃ©idir luchtÃº: "
 # ^CreateFolder
-"Cruthaigh fillteán: "
+"Cruthaigh fillteÃ¡n: "
 # ^CreateShortcut
 "Cruthaigh aicearra: "
 # ^CreatedUninstaller
-"Cruthaíodh díshuiteálaí: "
+"CruthaÃ­odh dÃ­shuiteÃ¡laÃ­: "
 # ^Delete
 "Scrios comhad: "
 # ^DeleteOnReboot
 "Scrios ag am atosaithe: "
 # ^ErrorCreatingShortcut
-"Earráid agus aicearra á chruthú: "
+"EarrÃ¡id agus aicearra Ã¡ chruthÃº: "
 # ^ErrorCreating
-"Earráid le linn cruthaithe: "
+"EarrÃ¡id le linn cruthaithe: "
 # ^ErrorDecompressing
-Earráid agus sonraí á ndíchomhbhrú! Suiteálaí truaillithe?
+EarrÃ¡id agus sonraÃ­ Ã¡ ndÃ­chomhbhrÃº! SuiteÃ¡laÃ­ truaillithe?
 # ^ErrorRegistering
-Earráid agus DLL á chlárú
+EarrÃ¡id agus DLL Ã¡ chlÃ¡rÃº
 # ^ExecShell
 "Blaosc: "
 # ^Exec
@@ -162,30 +162,30 @@
 # ^Extract
 "Bain Amach: "
 # ^ErrorWriting
-"Extract: earráid le linn scríofa "
+"Extract: earrÃ¡id le linn scrÃ­ofa "
 # ^InvalidOpcode
-Díshuiteálaí truaillithe: cód neamhbhailí oibríochta
+DÃ­shuiteÃ¡laÃ­ truaillithe: cÃ³d neamhbhailÃ­ oibrÃ­ochta
 # ^NoOLE
 "Gan OLE le haghaidh: "
 # ^OutputFolder
-"Fillteán aschurtha: "
+"FillteÃ¡n aschurtha: "
 # ^RemoveFolder
-"Bain fillteán: "
+"Bain fillteÃ¡n: "
 # ^RenameOnReboot
 "Athainmnigh ag am atosaithe: "
 # ^Rename
 "Athainmnigh: "
 # ^Skipped
-"Neamhaird déanta de: "
+"Neamhaird dÃ©anta de: "
 # ^CopyDetails
-Cóipeáil Sonraí go dtí an Ghearrthaisce
+CÃ³ipeÃ¡il SonraÃ­ go dtÃ­ an Ghearrthaisce
 # ^LogInstall
-Logáil an próiseas suiteála
+LogÃ¡il an prÃ³iseas suiteÃ¡la
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Tatar.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Tatar.nsh	(revision 0)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Tatar.nsh	(revision 2956)
@@ -0,0 +1,129 @@
+ï»¿;Language: Tatar (1092)
+;Translation by Bulat Azat uly [bulat_ibrahim@mail.ru]
+
+!insertmacro LANGFILE "Tatar" = "Ð¢Ð°Ñ‚Ð°Ñ€Ñ‡Ð°" "Tatarcha"
+
+!ifdef MUI_WELCOMEPAGE
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€ÑƒÑ‡Ñ‹Ð³Ð° Ñ€Ó™Ñ…Ð¸Ð¼ Ð¸Ñ‚ÐµÐ³ÐµÐ·"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ð‘Ñƒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° $(^NameDA) Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°Ñ�Ñ‹Ð½ Ñ�Ð°Ð½Ð°Ð³Ñ‹Ð³Ñ‹Ð·Ð³Ð° ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñ‹Ñ€.$\r$\n$\r$\nÐ£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ð°Ð»Ð´Ñ‹Ð½Ð½Ð°Ð½ Ð±Ó©Ñ‚ÐµÐ½ Ð°Ñ‡Ñ‹Ðº ÐºÑƒÑˆÑ‹Ð¼Ñ‚Ð°Ð»Ð°Ñ€Ð½Ñ‹ Ñ�Ð±Ð°Ñ€Ð³Ð° Ñ‚Ó™ÐºÑŠÐ´Ð¸Ð¼ Ð¸Ñ‚ÐµÐ»Ó™. Ð‘Ñƒ ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°Ñ�Ñ‹Ð½Ð° Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ð° Ñ„Ð°Ð¹Ð»Ð»Ð°Ñ€Ñ‹Ð½ Ñ�Ð°Ð½Ð°ÐºÐ½Ñ‹ Ñ�Ò¯Ð½Ð´ÐµÑ€ÐµÐ¿ ÐºÐ°Ð±Ñ‹Ð·Ð¼Ñ‹Ð¹Ñ‡Ð° Ñ�Ò£Ð°Ñ€Ñ‚Ñ‹Ñ€Ð³Ð° Ð¼Ó©Ð¼ÐºÐ¸Ð½Ð»ÐµÐº Ð±Ð¸Ñ€Ó™.$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_UNWELCOMEPAGE
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "$(^NameDA) Ð±ÐµÑ‚ÐµÑ€Ò¯Ñ‡ÐµÐ³Ó™ Ñ€Ó™Ñ…Ð¸Ð¼ Ð¸Ñ‚ÐµÐ³ÐµÐ·"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ð‘Ñƒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° $(^NameDA) Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°Ñ�Ñ‹Ð½ Ñ�Ð°Ð½Ð°Ð³Ñ‹Ð³Ñ‹Ð·Ð´Ð°Ð½ Ð±ÐµÑ‚ÐµÑ€ÐµÑ€.$\r$\n$\r$\nÐ”Ó™Ð²Ð°Ð¼ Ð¸Ñ‚Ò¯ Ð°Ð»Ð´Ñ‹Ð½Ð½Ð°Ð½ $(^NameDA) Ò—Ð¸Ð±Ó™Ñ€ÐµÐ»Ð¼Ó™Ð³Ó™Ð½Ð»ÐµÐ³ÐµÐ½ Ñ‚Ð¸ÐºÑˆÐµÑ€ÐµÐ³ÐµÐ·.$\r$\n$\r$\n$_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ� ÐºÐ¸Ð»ÐµÑˆÒ¯Ðµ"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "$(^NameDA) ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ð°Ð»Ð´Ñ‹Ð½Ð½Ð°Ð½ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ� ÐºÐ¸Ð»ÐµÑˆÒ¯Ðµ Ð±ÐµÐ»Ó™Ð½ Ñ‚Ð°Ð½Ñ‹ÑˆÑ‹Ð³Ñ‹Ð·."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "ÐšÐ¸Ð»ÐµÑˆÒ¯ ÑˆÐ°Ñ€Ñ‚Ð»Ð°Ñ€Ñ‹Ð½ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ñ�Ó™Ð³ÐµÐ·, $\"ÐšÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ó™Ð¼$\" Ñ‚Ó©Ð¹Ð¼Ó™Ñ�ÐµÐ½Ó™ Ð±Ð°Ñ�Ñ‹Ð³Ñ‹Ð·. $(^NameDA) ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ó©Ñ‡ÐµÐ½, ÐºÐ¸Ð»ÐµÑˆÒ¯Ð½Ðµ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ó™Ñ€Ð³Ó™ ÐºÐ¸Ñ€Ó™Ðº."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "ÐšÐ¸Ð»ÐµÑˆÒ¯ ÑˆÐ°Ñ€Ñ‚Ð»Ð°Ñ€Ñ‹Ð½ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ñ�Ó™Ð³ÐµÐ·, Ñ‚Ò¯Ð±Ó™Ð½Ð´Ó™ Ð±Ð¸Ð»Ð³Ðµ ÐºÑƒÐµÐ³Ñ‹Ð·. $(^NameDA) ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ó©Ñ‡ÐµÐ½, ÐºÐ¸Ð»ÐµÑˆÒ¯Ð½Ðµ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ó™Ñ€Ð³Ó™ ÐºÐ¸Ñ€Ó™Ðº. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ÐšÐ¸Ð»ÐµÑˆÒ¯ ÑˆÐ°Ñ€Ñ‚Ð»Ð°Ñ€Ñ‹Ð½ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ñ�Ó™Ð³ÐµÐ·, Ñ‚Ò¯Ð±Ó™Ð½Ð´Ó™Ð³Ðµ Ð²Ð°Ñ€Ð¸Ð°Ð½Ñ‚Ð»Ð°Ñ€Ð´Ð°Ð½ Ð±ÐµÑ€ÐµÐ½Ñ‡ÐµÑ�ÐµÐ½ Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·. $(^NameDA) ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ó©Ñ‡ÐµÐ½, ÐºÐ¸Ð»ÐµÑˆÒ¯Ð½Ðµ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ó™Ñ€Ð³Ó™ ÐºÐ¸Ñ€Ó™Ðº. $_CLICK"
+!endif
+
+!ifdef MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ� ÐºÐ¸Ð»ÐµÑˆÒ¯Ðµ"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "$(^NameDA) Ð±ÐµÑ‚ÐµÑ€Ò¯ Ð°Ð»Ð´Ñ‹Ð½Ð½Ð°Ð½ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ� ÐºÐ¸Ð»ÐµÑˆÒ¯Ðµ Ð±ÐµÐ»Ó™Ð½ Ñ‚Ð°Ð½Ñ‹ÑˆÑ‹Ð³Ñ‹Ð·."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "ÐšÐ¸Ð»ÐµÑˆÒ¯ ÑˆÐ°Ñ€Ñ‚Ð»Ð°Ñ€Ñ‹Ð½ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ñ�Ó™Ð³ÐµÐ·, $\"ÐšÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ó™Ð¼$\" Ñ‚Ó©Ð¹Ð¼Ó™Ñ�ÐµÐ½Ó™ Ð±Ð°Ñ�Ñ‹Ð³Ñ‹Ð·. $(^NameDA) Ð±ÐµÑ‚ÐµÑ€Ò¯ Ó©Ñ‡ÐµÐ½, ÐºÐ¸Ð»ÐµÑˆÒ¯Ð½Ðµ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ó™Ñ€Ð³Ó™ ÐºÐ¸Ñ€Ó™Ðº."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "ÐšÐ¸Ð»ÐµÑˆÒ¯ ÑˆÐ°Ñ€Ñ‚Ð»Ð°Ñ€Ñ‹Ð½ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ñ�Ó™Ð³ÐµÐ·, Ñ‚Ò¯Ð±Ó™Ð½Ð´Ó™ Ð±Ð¸Ð»Ð³Ðµ ÐºÑƒÐµÐ³Ñ‹Ð·. $(^NameDA) Ð±ÐµÑ‚ÐµÑ€Ò¯ Ó©Ñ‡ÐµÐ½, ÐºÐ¸Ð»ÐµÑˆÒ¯Ð½Ðµ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ó™Ñ€Ð³Ó™ ÐºÐ¸Ñ€Ó™Ðº. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ÐšÐ¸Ð»ÐµÑˆÒ¯ ÑˆÐ°Ñ€Ñ‚Ð»Ð°Ñ€Ñ‹Ð½ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ñ�Ó™Ð³ÐµÐ·, Ñ‚Ò¯Ð±Ó™Ð½Ð´Ó™Ð³Ðµ Ð²Ð°Ñ€Ð¸Ð°Ð½Ñ‚Ð»Ð°Ñ€Ð´Ð°Ð½ Ð±ÐµÑ€ÐµÐ½Ñ‡ÐµÑ�ÐµÐ½ Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·. $(^NameDA) Ð±ÐµÑ‚ÐµÑ€Ò¯ Ó©Ñ‡ÐµÐ½, ÐºÐ¸Ð»ÐµÑˆÒ¯Ð½Ðµ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ó™Ñ€Ð³Ó™ ÐºÐ¸Ñ€Ó™Ðº. $_CLICK"
+!endif
+
+!ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Ð¢ÐµÐºÑ�Ñ‚ Ð±ÑƒÐµÐ½Ñ‡Ð° ÐºÒ¯Ñ‡Ò¯ Ó©Ñ‡ÐµÐ½, $\"PageUp$\" Ò»Ó™Ð¼ $\"PageDown$\" Ñ‚Ó©Ð¹Ð¼Ó™Ð»Ó™Ñ€ÐµÐ½Ó™ Ð±Ð°Ñ�Ñ‹Ð³Ñ‹Ð·."
+!endif
+
+!ifdef MUI_COMPONENTSPAGE
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñ‹Ð»ÑƒÑ‡Ñ‹ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°Ð½Ñ‹Ò£ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð»Ð°Ñ€Ñ‹"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñ‹Ñ€Ð³Ð° Ñ‚ÐµÐ»Ó™Ð³Ó™Ð½ $(^NameDA) ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð»Ð°Ñ€Ñ‹Ð½ Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·."
+!endif
+
+!ifdef MUI_UNCOMPONENTSPAGE
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð»Ð°Ñ€Ñ‹"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Ð‘ÐµÑ‚ÐµÑ€ÐµÑ€Ð³Ó™ Ñ‚ÐµÐ»Ó™Ð³Ó™Ð½ $(^NameDA) ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð»Ð°Ñ€Ñ‹Ð½ Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·."
+!endif
+
+!ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Ð¢Ð°Ñ�Ð²Ð¸Ñ€Ð»Ð°Ð¼Ð°"
+  !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ÐšÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð½Ñ‹Ò£ Ñ‚Ð°Ñ�Ð²Ð¸Ñ€Ð»Ð°Ð¼Ð°Ñ�Ñ‹Ð½ ÑƒÐºÑƒ Ó©Ñ‡ÐµÐ½, Ð°Ð½Ñ‹Ò£ Ð¸Ñ�ÐµÐ¼ÐµÐ½Ó™ Ñ‚Ñ‹Ñ‡ÐºÐ°Ð½ ÐºÑƒÑ€Ñ�Ð¾Ñ€Ñ‹Ð½ ÐºÐ¸Ñ‚ÐµÑ€ÐµÐ³ÐµÐ·."
+  !else
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ÐšÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð½Ñ‹Ò£ Ñ‚Ð°Ñ�Ð²Ð¸Ñ€Ð»Ð°Ð¼Ð°Ñ�Ñ‹Ð½ ÑƒÐºÑƒ Ó©Ñ‡ÐµÐ½, Ð°Ð½Ñ‹ Ð±Ð¸Ð»Ð³ÐµÐ»Ó™Ð³ÐµÐ·."
+  !endif
+!endif
+
+!ifdef MUI_DIRECTORYPAGE
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ð¿Ð°Ð¿ÐºÐ°Ñ�Ñ‹Ð½ Ñ�Ð°Ð¹Ð»Ð°Ñƒ"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "$(^NameDA) ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ó©Ñ‡ÐµÐ½ Ð¿Ð°Ð¿ÐºÐ° Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·."
+!endif
+
+!ifdef MUI_UNDIRECTORYPAGE
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Ð‘ÐµÑ‚ÐµÑ€Ò¯ Ð¿Ð°Ð¿ÐºÐ°Ñ�Ñ‹Ð½ Ñ�Ð°Ð¹Ð»Ð°Ñƒ"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "$(^NameDA) Ð±ÐµÑ‚ÐµÑ€ÐµÑ€Ð³Ó™ ÐºÐ¸Ñ€Ó™Ðº Ð±ÑƒÐ»Ð³Ð°Ð½ Ð¿Ð°Ð¿ÐºÐ°Ð½Ñ‹ Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·."
+!endif
+
+!ifdef MUI_INSTFILESPAGE
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Ð¤Ð°Ð¹Ð»Ð»Ð°Ñ€Ð½Ñ‹ ÐºÒ¯Ñ‡ÐµÑ€Ð¼Ó™Ð»Ó™Ò¯"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "$(^NameDA) Ñ„Ð°Ð¹Ð»Ð»Ð°Ñ€Ñ‹ ÐºÒ¯Ñ‡ÐµÑ€Ð¼Ó™Ð»Ó™Ð½Ó™, ÐºÓ©Ñ‚ÐµÐ³ÐµÐ·..."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ñ‚Ó™Ð¼Ð°Ð¼Ð»Ð°Ð½Ð´Ñ‹"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ ÑƒÒ£Ñ‹ÑˆÐ»Ñ‹ Ñ‚Ó™Ð¼Ð°Ð¼Ð»Ð°Ð½Ð´Ñ‹."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ñ‚ÑƒÐºÑ‚Ð°Ñ‚Ñ‹Ð»Ð´Ñ‹"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ ÑƒÒ£Ñ‹ÑˆÑ�Ñ‹Ð· Ñ‚Ó™Ð¼Ð°Ð¼Ð»Ð°Ð½Ð´Ñ‹."
+!endif
+
+!ifdef MUI_UNINSTFILESPAGE
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Ð‘ÐµÑ‚ÐµÑ€Ò¯"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "$(^NameDA) Ñ„Ð°Ð¹Ð»Ð»Ð°Ñ€Ñ‹ Ð±ÐµÑ‚ÐµÑ€ÐµÐ»Ó™, ÐºÓ©Ñ‚ÐµÐ³ÐµÐ·..."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Ð‘ÐµÑ‚ÐµÑ€Ò¯ Ñ‚Ó™Ð¼Ð°Ð¼Ð»Ð°Ð½Ð´Ñ‹"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°Ð½Ñ‹ Ð±ÐµÑ‚ÐµÑ€Ò¯ ÑƒÒ£Ñ‹ÑˆÐ»Ñ‹ Ñ‚Ó™Ð¼Ð°Ð¼Ð»Ð°Ð½Ð´Ñ‹."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Ð‘ÐµÑ‚ÐµÑ€Ò¯ Ñ‚ÑƒÐºÑ‚Ð°Ñ‚Ñ‹Ð»Ð´Ñ‹"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Ð‘ÐµÑ‚ÐµÑ€Ò¯ Ñ‚ÑƒÐ»Ñ‹Ñ�Ñ‹Ð½Ñ‡Ð° Ð±Ð°ÑˆÐºÐ°Ñ€Ñ‹Ð»Ð¼Ð°Ð´Ñ‹."
+!endif
+
+!ifdef MUI_FINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "$(^NameDA) ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€ÑƒÑ‡Ñ‹ Ñ�ÑˆÐµÐ½ Ñ‚Ó™Ð¼Ð°Ð¼Ð»Ð°Ñƒ"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) Ñ�Ð°Ð½Ð°Ð³Ñ‹Ð³Ñ‹Ð·Ð³Ð° ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñ‹Ð»Ð´Ñ‹.$\r$\n$\r$\nÐ£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°Ñ�Ñ‹Ð½Ð½Ð°Ð½ Ñ‡Ñ‹Ð³Ñƒ Ó©Ñ‡ÐµÐ½ $\"Ð¢Ó™Ð¼Ð°Ð¼$\" Ñ‚Ó©Ð¹Ð¼Ó™Ñ�ÐµÐ½Ó™ Ð±Ð°Ñ�Ñ‹Ð³Ñ‹Ð·."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "$(^NameDA) ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€ÑƒÑ‹Ð½ Ñ‚Ó™Ð¼Ð°Ð¼Ð»Ð°Ñƒ Ó©Ñ‡ÐµÐ½, Ñ�Ð°Ð½Ð°ÐºÐ½Ñ‹ Ñ�Ò¯Ð½Ð´ÐµÑ€ÐµÐ¿ ÐºÐ°Ð±Ñ‹Ð·Ñ‹Ñ€Ð³Ð° ÐºÐ¸Ñ€Ó™Ðº. Ð�Ð½Ñ‹ Ñ…Ó™Ð·ÐµÑ€ Ð±Ð°ÑˆÐºÐ°Ñ€Ñ‹Ñ€Ð³Ð°Ð¼Ñ‹?"
+!endif
+
+!ifdef MUI_UNFINISHPAGE
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "$(^NameDA) Ð±ÐµÑ‚ÐµÑ€Ò¯Ñ‡Ðµ Ñ�ÑˆÐµÐ½ Ñ‚Ó™Ð¼Ð°Ð¼Ð»Ð°Ñƒ"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) Ñ�Ð°Ð½Ð°Ð³Ñ‹Ð³Ñ‹Ð·Ð´Ð°Ð½ Ð±ÐµÑ‚ÐµÑ€ÐµÐ»Ð´Ðµ.$\r$\n$\r$\nÐ‘ÐµÑ‚ÐµÑ€Ò¯ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°Ñ�Ñ‹Ð½Ð½Ð°Ð½ Ñ‡Ñ‹Ð³Ñƒ Ó©Ñ‡ÐµÐ½ $\"Ð¢Ó™Ð¼Ð°Ð¼$\" Ñ‚Ó©Ð¹Ð¼Ó™Ñ�ÐµÐ½Ó™ Ð±Ð°Ñ�Ñ‹Ð³Ñ‹Ð·."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "$(^NameDA) Ð±ÐµÑ‚ÐµÑ€Ò¯ÐµÐ½ Ñ‚Ó™Ð¼Ð°Ð¼Ð»Ð°Ñƒ Ó©Ñ‡ÐµÐ½, Ñ�Ð°Ð½Ð°ÐºÐ½Ñ‹ Ñ�Ò¯Ð½Ð´ÐµÑ€ÐµÐ¿ ÐºÐ°Ð±Ñ‹Ð·Ñ‹Ñ€Ð³Ð° ÐºÐ¸Ñ€Ó™Ðº. Ð�Ð½Ñ‹ Ñ…Ó™Ð·ÐµÑ€ Ð±Ð°ÑˆÐºÐ°Ñ€Ñ‹Ñ€Ð³Ð°Ð¼Ñ‹?"
+!endif
+
+!ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ó˜Ð¹Ðµ, Ñ�Ð°Ð½Ð°ÐºÐ½Ñ‹ Ñ…Ó™Ð·ÐµÑ€ Ñ�Ò¯Ð½Ð´ÐµÑ€ÐµÐ¿ ÐºÐ°Ð±Ñ‹Ð·Ñ‹Ñ€Ð³Ð°"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ð®Ðº, Ð¼Ð¸Ð½ Ñ�Ð¾Ò£Ñ€Ð°Ðº Ñ�Ò¯Ð½Ð´ÐµÑ€ÐµÐ¿ ÐºÐ°Ð±Ñ‹Ð·Ñ‹Ñ€Ð¼Ñ‹Ð½"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "$(^NameDA) Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°Ñ�Ñ‹Ð½ Ò—Ð¸Ð±Ó™Ñ€&ÐµÑ€Ð³Ó™"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&ReadMe Ñ„Ð°Ð¹Ð»Ñ‹Ð½ ÐºÒ¯Ñ€Ñ�Ó™Ñ‚ÐµÑ€Ð³Ó™"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Ð¢Ó™Ð¼Ð°Ð¼"  
+!endif
+
+!ifdef MUI_STARTMENUPAGE
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "$\"Ð‘Ð°ÑˆÐ»Ð°Ñƒ$\" Ð¼ÐµÐ½ÑŽÑ�Ñ‹Ð½Ð´Ð° Ð¿Ð°Ð¿ÐºÐ°"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "$\"Ð‘Ð°ÑˆÐ»Ð°Ñƒ$\" Ð¼ÐµÐ½ÑŽÑ�Ñ‹Ð½Ð´Ð° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° Ñ�Ñ‹Ð»Ñ‚Ð°Ð¼Ð°Ð»Ð°Ñ€Ñ‹Ð½ ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ó©Ñ‡ÐµÐ½ Ð¿Ð°Ð¿ÐºÐ° Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "$\"Ð‘Ð°ÑˆÐ»Ð°Ñƒ$\" Ð¼ÐµÐ½ÑŽÑ�Ñ‹Ð½Ð´Ð° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° Ñ�Ñ‹Ð»Ñ‚Ð°Ð¼Ð°Ð»Ð°Ñ€Ñ‹ ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñ‹Ð»Ð°Ñ‡Ð°Ðº Ð¿Ð°Ð¿ÐºÐ°Ð½Ñ‹ Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·. Ð¨ÑƒÐ»Ð°Ð¹ ÑƒÐº Ð¿Ð°Ð¿ÐºÐ°Ð³Ð° Ð±Ð°ÑˆÐºÐ° Ð¸Ñ�ÐµÐ¼ Ð±Ð¸Ñ€Ó™ Ð°Ð»Ð°Ñ�Ñ‹Ð·."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ð¡Ñ‹Ð»Ñ‚Ð°Ð¼Ð°Ð»Ð°Ñ€ Ñ�Ñ�Ð°Ð¼Ð°Ñ�ÐºÐ°"
+!endif
+
+!ifdef MUI_UNCONFIRMPAGE
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "$(^NameDA) Ð±ÐµÑ‚ÐµÑ€Ò¯"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Ð¡Ð°Ð½Ð°ÐºÑ‚Ð°Ð½ $(^NameDA) Ð±ÐµÑ‚ÐµÑ€Ò¯."
+!endif
+
+!ifdef MUI_ABORTWARNING
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Ð§Ñ‹Ð½Ð½Ð°Ð½ Ð´Ð° $(^Name) ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€ÑƒÑ‹Ð½ Ñ‚ÑƒÐºÑ‚Ð°Ñ‚Ñ‹Ñ€Ð³Ð°Ð¼Ñ‹?"
+!endif
+
+!ifdef MUI_UNABORTWARNING
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ð§Ñ‹Ð½Ð½Ð°Ð½ Ð´Ð° $(^Name) Ð±ÐµÑ‚ÐµÑ€Ò¯ÐµÐ½ Ñ‚ÑƒÐºÑ‚Ð°Ñ‚Ñ‹Ñ€Ð³Ð°Ð¼Ñ‹?"
+!endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ñ€ÐµÐ¶Ð¸Ð¼Ñ‹"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "ÐšÐ°Ð¹Ñ�Ñ‹ ÐºÑƒÐ»Ð»Ð°Ð½ÑƒÑ‡Ñ‹Ð»Ð°Ñ€ Ó©Ñ‡ÐµÐ½ $(^NameDA) ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñ‹Ñ€Ð³Ð° Ñ‚ÐµÐ»Ð¸Ñ�ÐµÐ·, Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "$(^NameDA) Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°Ñ�Ñ‹Ð½ Ò¯Ð·ÐµÐ³ÐµÐ·Ð³Ó™ Ð³ÐµÐ½Ó™ Ñ�ÐºÐ¸ Ð±Ó©Ñ‚ÐµÐ½ ÐºÑƒÐ»Ð»Ð°Ð½ÑƒÑ‡Ñ‹Ð»Ð°Ñ€ Ó©Ñ‡ÐµÐ½ Ð´Ó™ ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ð°Ñ‡Ð°Ð³Ñ‹Ð³Ñ‹Ð·Ð½Ñ‹ Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Ð‘Ó©Ñ‚ÐµÐ½ ÐºÑƒÐ»Ð»Ð°Ð½ÑƒÑ‡Ñ‹Ð»Ð°Ñ€ Ó©Ñ‡ÐµÐ½ ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñ‹Ñ€Ð³Ð°"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "ÐœÐ¸Ð½ÐµÐ¼ Ó©Ñ‡ÐµÐ½ Ð³ÐµÐ½Ó™ ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñ‹Ñ€Ð³Ð°"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Hebrew.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Hebrew.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Hebrew.nsh	(revision 2956)
@@ -1,129 +1,129 @@
-;Language: Hebrew (1037)
+ï»¿;Language: Hebrew (1037)
 ;By Yaron Shahrabani
 
-!insertmacro LANGFILE "Hebrew" "Hebrew"
+!insertmacro LANGFILE "Hebrew" = "×¢×‘×¨×™×ª" "Ivrit"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "áøåëéí äáàéí ìàùó ääú÷ðä ùì $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "àùó æä éðçä àúëí áîäìê ääú÷ðä ùì $(^NameDA).$\r$\n$\r$\nîåîìõ ìñâåø ëì úåëðéú àçøú ìôðé äúçìú ääú÷ðä. ôòåìä æå úàôùø ìàùó ìòãëï ÷áöé îòøëú ììà àéúçåì äîçùá.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "×‘×¨×•×›×™×� ×”×‘×�×™×� ×œ×�×©×£ ×”×”×ª×§× ×” ×©×œ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "×�×©×£ ×–×” ×™× ×—×” ×�×ª×›×� ×‘×ž×”×œ×š ×”×”×ª×§× ×” ×©×œ $(^NameDA).$\r$\n$\r$\n×ž×•×ž×œ×¥ ×œ×¡×’×•×¨ ×›×œ ×ª×•×›× ×™×ª ×�×—×¨×ª ×œ×¤× ×™ ×”×ª×—×œ×ª ×”×”×ª×§× ×”. ×¤×¢×•×œ×” ×–×• ×ª×�×¤×©×¨ ×œ×�×©×£ ×œ×¢×“×›×Ÿ ×§×‘×¦×™ ×ž×¢×¨×›×ª ×œ×œ×� ×�×™×ª×—×•×œ ×”×ž×—×©×‘.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "áøåëéí äáàéí ìàùó ääñøä ùì $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "àùó æä éðçä àúëí áîäìê ääñøä ùì $(^NameDA).$\r$\n$\r$\nîåîìõ ìñâåø ëì úåëðéú àçøú ìôðé äúçìú ääñøä. ôòåìä æå úàôùø ìàùó ìòãëï ÷áöé îòøëú ììà àéúçåì äîçùá.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "×‘×¨×•×›×™×� ×”×‘×�×™×� ×œ×�×©×£ ×”×”×¡×¨×” ×©×œ $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "×�×©×£ ×–×” ×™× ×—×” ×�×ª×›×� ×‘×ž×”×œ×š ×”×”×¡×¨×” ×©×œ $(^NameDA).$\r$\n$\r$\n×ž×•×ž×œ×¥ ×œ×¡×’×•×¨ ×›×œ ×ª×•×›× ×™×ª ×�×—×¨×ª ×œ×¤× ×™ ×”×ª×—×œ×ª ×”×”×¡×¨×”. ×¤×¢×•×œ×” ×–×• ×ª×�×¤×©×¨ ×œ×�×©×£ ×œ×¢×“×›×Ÿ ×§×‘×¦×™ ×ž×¢×¨×›×ª ×œ×œ×� ×�×™×ª×—×•×œ ×”×ž×—×©×‘.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "äñëí øéùåé"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "ðà òééï áúðàé äñëí äøéùåé ìôðé äú÷ðú $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "àí àúä î÷áì àú úðàé ääñëí, ìçõ òì 'àðé îñëéí' ëãé ìäîùéê. àí ìà úñëéí ìúðàé ääñëí ìà úåëì ìäú÷éï àú $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "àí àúä î÷áì àú úðàé ääñëí, ñîï àú úéáú äáçéøä ùìäìï. òìééê ì÷áì àú úðàé ääñëí áëãé ìäú÷éï àú $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "àí àúä î÷áì àú úðàé ääñëí, áçø áàôùøåú äøàùåðä ùìäìï. òìééê ì÷áì àú ääñëí ëãé ìäú÷éï àú $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "×”×¡×›×� ×¨×™×©×•×™"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "× ×� ×¢×™×™×Ÿ ×‘×ª× ×�×™ ×”×¡×›×� ×”×¨×™×©×•×™ ×œ×¤× ×™ ×”×ª×§× ×ª $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "×�×� ×�×ª×” ×ž×§×‘×œ ×�×ª ×ª× ×�×™ ×”×”×¡×›×�, ×œ×—×¥ ×¢×œ '×�× ×™ ×ž×¡×›×™×�' ×›×“×™ ×œ×”×ž×©×™×š. ×�×� ×œ×� ×ª×¡×›×™×� ×œ×ª× ×�×™ ×”×”×¡×›×� ×œ×� ×ª×•×›×œ ×œ×”×ª×§×™×Ÿ ×�×ª $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "×�×� ×�×ª×” ×ž×§×‘×œ ×�×ª ×ª× ×�×™ ×”×”×¡×›×�, ×¡×ž×Ÿ ×�×ª ×ª×™×‘×ª ×”×‘×—×™×¨×” ×©×œ×”×œ×Ÿ. ×¢×œ×™×™×š ×œ×§×‘×œ ×�×ª ×ª× ×�×™ ×”×”×¡×›×� ×‘×›×“×™ ×œ×”×ª×§×™×Ÿ ×�×ª $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "×�×� ×�×ª×” ×ž×§×‘×œ ×�×ª ×ª× ×�×™ ×”×”×¡×›×�, ×‘×—×¨ ×‘×�×¤×©×¨×•×ª ×”×¨×�×©×•× ×” ×©×œ×”×œ×Ÿ. ×¢×œ×™×™×š ×œ×§×‘×œ ×�×ª ×”×”×¡×›×� ×›×“×™ ×œ×”×ª×§×™×Ÿ ×�×ª $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "äñëí øéùåé"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "ðà òééï áúðàé äñëí äøéùåé ìôðé äñøú $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "àí àúä î÷áì àú úðàé ääñëí, ìçõ òì 'àðé îñëéí' ëãé ìäîùéê. àí ìà ú÷áì àú úðàé ääñëí ìà úåëì ìäñéø àú $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "àí àúä î÷áì àú úðàé ääñëí, ñîï àú úéáú äáçéøä ùìäìï. òìééê ì÷áì àú úðàé ääñëí ëãé ìäñéø àú $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "àí àúä î÷áì àú úðàé ääñëí, áçø áàôùøåú äøàùåðä ùìäìï. òìééê ì÷áì àú ääñëí ëãé ìäñéø àú $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "×”×¡×›×� ×¨×™×©×•×™"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "× ×� ×¢×™×™×Ÿ ×‘×ª× ×�×™ ×”×¡×›×� ×”×¨×™×©×•×™ ×œ×¤× ×™ ×”×¡×¨×ª $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "×�×� ×�×ª×” ×ž×§×‘×œ ×�×ª ×ª× ×�×™ ×”×”×¡×›×�, ×œ×—×¥ ×¢×œ '×�× ×™ ×ž×¡×›×™×�' ×›×“×™ ×œ×”×ž×©×™×š. ×�×� ×œ×� ×ª×§×‘×œ ×�×ª ×ª× ×�×™ ×”×”×¡×›×� ×œ×� ×ª×•×›×œ ×œ×”×¡×™×¨ ×�×ª $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "×�×� ×�×ª×” ×ž×§×‘×œ ×�×ª ×ª× ×�×™ ×”×”×¡×›×�, ×¡×ž×Ÿ ×�×ª ×ª×™×‘×ª ×”×‘×—×™×¨×” ×©×œ×”×œ×Ÿ. ×¢×œ×™×™×š ×œ×§×‘×œ ×�×ª ×ª× ×�×™ ×”×”×¡×›×� ×›×“×™ ×œ×”×¡×™×¨ ×�×ª $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "×�×� ×�×ª×” ×ž×§×‘×œ ×�×ª ×ª× ×�×™ ×”×”×¡×›×�, ×‘×—×¨ ×‘×�×¤×©×¨×•×ª ×”×¨×�×©×•× ×” ×©×œ×”×œ×Ÿ. ×¢×œ×™×™×š ×œ×§×‘×œ ×�×ª ×”×”×¡×›×� ×›×“×™ ×œ×”×¡×™×¨ ×�×ª $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "ëãé ìöôåú áùàø äñëí äøéùåé ìçõ òì Page Down."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "×›×“×™ ×œ×¦×¤×•×ª ×‘×©×�×¨ ×”×¡×›×� ×”×¨×™×©×•×™ ×œ×—×¥ ×¢×œ Page Down."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "áçø øëéáéí"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "áçø àéìå øëéáéí ùì $(^NameDA) áøöåðê ìäú÷éï."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "×‘×—×¨ ×¨×›×™×‘×™×�"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "×‘×—×¨ ×�×™×œ×• ×¨×›×™×‘×™×� ×©×œ $(^NameDA) ×‘×¨×¦×•× ×š ×œ×”×ª×§×™×Ÿ."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "áçø øëéáéí"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "áçø àéìå úëåðåú ùì $(^NameDA) áøöåðê ìäñéø."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "×‘×—×¨ ×¨×›×™×‘×™×�"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "×‘×—×¨ ×�×™×œ×• ×ª×›×•× ×•×ª ×©×œ $(^NameDA) ×‘×¨×¦×•× ×š ×œ×”×¡×™×¨."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "úéàåø"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "×ª×™×�×•×¨"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "äòáø àú äòëáø îòì øëéá ëìùäå áëãé ìöôåú áúéàåøå."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "×”×¢×‘×¨ ×�×ª ×”×¢×›×‘×¨ ×ž×¢×œ ×¨×›×™×‘ ×›×œ×©×”×• ×‘×›×“×™ ×œ×¦×¤×•×ª ×‘×ª×™×�×•×¨×•."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "äòáø àú äòëáø îòì øëéá ëìùäå áëãé ìöôåú áúéàåøå."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "×‘×—×¨ ×¨×›×™×‘ ×›×œ×©×”×• ×‘×›×“×™ ×œ×¦×¤×•×ª ×‘×ª×™×�×•×¨×•."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "áçø îé÷åí ìäú÷ðä"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "áçø àú äúé÷ééä áä àúä îòåðééï ìäú÷éï àú $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "×‘×—×¨ ×ž×™×§×•×� ×œ×”×ª×§× ×”"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "×‘×—×¨ ×�×ª ×”×ª×™×§×™×™×” ×‘×” ×�×ª×” ×ž×¢×•× ×™×™×Ÿ ×œ×”×ª×§×™×Ÿ ×�×ª $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "áçø îé÷åí ìäñøä"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "áçø àú äúé÷ééä îîðä àúä îòåðééï ìäñéø àú $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "×‘×—×¨ ×ž×™×§×•×� ×œ×”×¡×¨×”"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "×‘×—×¨ ×�×ª ×”×ª×™×§×™×™×” ×ž×ž× ×” ×�×ª×” ×ž×¢×•× ×™×™×Ÿ ×œ×”×¡×™×¨ ×�×ª $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "îú÷éï"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "àðà äîúï áæîï ù-$(^NameDA) îåú÷ï."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "ääú÷ðä äåùìîä"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "ääú÷ðä äåùìîä áîìåàä."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "ääú÷ðä áåèìä"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "ääú÷ðä ìà äåùìîä äîìåàä."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "×ž×ª×§×™×Ÿ"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "×�× ×� ×”×ž×ª×Ÿ ×‘×–×ž×Ÿ ×©-$(^NameDA) ×ž×•×ª×§×Ÿ."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "×”×”×ª×§× ×” ×”×•×©×œ×ž×”"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "×”×”×ª×§× ×” ×”×•×©×œ×ž×” ×‘×ž×œ×•×�×”."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "×”×”×ª×§× ×” ×‘×•×˜×œ×”"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "×”×”×ª×§× ×” ×œ×� ×”×•×©×œ×ž×” ×”×ž×œ×•×�×”."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "îñéø"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "àðà äîúï áæîï ù-$(^NameDA) îåñø îäîçùá."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "ääñøä äåùìîä"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "ääñøä äåùìîä áîìåàä."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "ääñøä áåèìä"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "ääñøä ìà äåùìîä áîìåàä."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "×ž×¡×™×¨"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "×�× ×� ×”×ž×ª×Ÿ ×‘×–×ž×Ÿ ×©-$(^NameDA) ×ž×•×¡×¨ ×ž×”×ž×—×©×‘."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "×”×”×¡×¨×” ×”×•×©×œ×ž×”"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "×”×”×¡×¨×” ×”×•×©×œ×ž×” ×‘×ž×œ×•×�×”."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "×”×”×¡×¨×” ×‘×•×˜×œ×”"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "×”×”×¡×¨×” ×œ×� ×”×•×©×œ×ž×” ×‘×ž×œ×•×�×”."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "îùìéí àú àùó ääú÷ðä ùì $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) äåú÷ï áäöìçä.$\r$\n$\r$\nìçõ òì ñéåí ëãé ìñâåø àú äàùó."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "òìééê ìàúçì àú äîçùá ëãé ìñééí àú äú÷ðú $(^NameDA). äàí áøöåðê ìàúçì ëòú?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "×ž×©×œ×™×� ×�×ª ×�×©×£ ×”×”×ª×§× ×” ×©×œ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) ×”×•×ª×§×Ÿ ×‘×”×¦×œ×—×”.$\r$\n$\r$\n×œ×—×¥ ×¢×œ ×¡×™×•×� ×›×“×™ ×œ×¡×’×•×¨ ×�×ª ×”×�×©×£."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "×¢×œ×™×™×š ×œ×�×ª×—×œ ×�×ª ×”×ž×—×©×‘ ×›×“×™ ×œ×¡×™×™×� ×�×ª ×”×ª×§× ×ª $(^NameDA). ×”×�×� ×‘×¨×¦×•× ×š ×œ×�×ª×—×œ ×›×¢×ª?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "îùìéí àú àùó ääñøä ùì $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) äåñø áäöìçä.$\r$\n$\r$\nìçõ òì ñéåí ëãé ìñâåø àú äàùó."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "òìééê ìàúçì àú äîçùá ëãé ìñééí àú äñøú $(^NameDA). äàí áøöåðê ìàúçì ëòú?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "×ž×©×œ×™×� ×�×ª ×�×©×£ ×”×”×¡×¨×” ×©×œ $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) ×”×•×¡×¨ ×‘×”×¦×œ×—×”.$\r$\n$\r$\n×œ×—×¥ ×¢×œ ×¡×™×•×� ×›×“×™ ×œ×¡×’×•×¨ ×�×ª ×”×�×©×£."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "×¢×œ×™×™×š ×œ×�×ª×—×œ ×�×ª ×”×ž×—×©×‘ ×›×“×™ ×œ×¡×™×™×� ×�×ª ×”×¡×¨×ª $(^NameDA). ×”×�×� ×‘×¨×¦×•× ×š ×œ×�×ª×—×œ ×›×¢×ª?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "àúçì ëòú"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "áøöåðé ìàúçì éãðéú îàåçø éåúø"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "&äøõ àú $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&äöâ îñîê '÷øà àåúé'"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&ñééí"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "×�×ª×—×œ ×›×¢×ª"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "×‘×¨×¦×•× ×™ ×œ×�×ª×—×œ ×™×“× ×™×ª ×ž×�×•×—×¨ ×™×•×ª×¨"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&×”×¨×¥ ×�×ª $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&×”×¦×’ ×ž×¡×ž×š '×§×¨×� ×�×•×ª×™'"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&×¡×™×™×�"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "áçø úé÷ééä áúôøéè ääúçìä"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "áçø áúé÷ééú úôøéè ääúçìä áä éååöøå ÷éöåøé äãøê ùì äúåëðéú."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "áçø áúé÷ééä îúôøéè ääúçìä áä áøöåðê ìéöåø àú ÷éöåøé äãøê òáåø äúåëðéú. áàôùøåúê âí ìä÷ìéã àú ùí äúé÷ééä ëãé ìéöåø úé÷ééä çãùä."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "àì úéöåø ÷éöåøé ãøê"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "×‘×—×¨ ×ª×™×§×™×™×” ×‘×ª×¤×¨×™×˜ ×”×”×ª×—×œ×”"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "×‘×—×¨ ×‘×ª×™×§×™×™×ª ×ª×¤×¨×™×˜ ×”×”×ª×—×œ×” ×‘×” ×™×•×•×¦×¨×• ×§×™×¦×•×¨×™ ×”×“×¨×š ×©×œ ×”×ª×•×›× ×™×ª."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "×‘×—×¨ ×‘×ª×™×§×™×™×” ×ž×ª×¤×¨×™×˜ ×”×”×ª×—×œ×” ×‘×” ×‘×¨×¦×•× ×š ×œ×™×¦×•×¨ ×�×ª ×§×™×¦×•×¨×™ ×”×“×¨×š ×¢×‘×•×¨ ×”×ª×•×›× ×™×ª. ×‘×�×¤×©×¨×•×ª×š ×’×� ×œ×”×§×œ×™×“ ×�×ª ×©×� ×”×ª×™×§×™×™×” ×›×“×™ ×œ×™×¦×•×¨ ×ª×™×§×™×™×” ×—×“×©×”."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "×�×œ ×ª×™×¦×•×¨ ×§×™×¦×•×¨×™ ×“×¨×š"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "äñø àú $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "äñø àú $(^NameDA) îäîçùá."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "×”×¡×¨ ×�×ª $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "×”×¡×¨ ×�×ª $(^NameDA) ×ž×”×ž×—×©×‘."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "äàí àúä áèåç ùáøöåðê ìöàú îäú÷ðú $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "×”×�×� ×�×ª×” ×‘×˜×•×— ×©×‘×¨×¦×•× ×š ×œ×¦×�×ª ×ž×”×ª×§× ×ª $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "äàí àúä áèåç ùáøöåðê ìöàú îäñøú $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "×”×�×� ×�×ª×” ×‘×˜×•×— ×©×‘×¨×¦×•× ×š ×œ×¦×�×ª ×ž×”×¡×¨×ª $(^Name)?"
 !endif
 
 !ifdef MULTIUSER_INSTALLMODEPAGE
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "áçø îùúîùéí"
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "áçø ìàéìå îùúîùéí ìäú÷éï àú $(^NameDA)."
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "áçø äàí ìäú÷éï àú $(^NameDA) ìòöîê àå ìëì äîùúîùéí ùì äîçùá. $(^ClickNext)"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "äú÷ï ìëì îùúîùé äîçùá"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "äú÷ï ø÷ ìîùúîù ùìé"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "×‘×—×¨ ×ž×©×ª×ž×©×™×�"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "×‘×—×¨ ×œ×�×™×œ×• ×ž×©×ª×ž×©×™×� ×œ×”×ª×§×™×Ÿ ×�×ª $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "×‘×—×¨ ×”×�×� ×œ×”×ª×§×™×Ÿ ×�×ª $(^NameDA) ×œ×¢×¦×ž×š ×�×• ×œ×›×œ ×”×ž×©×ª×ž×©×™×� ×©×œ ×”×ž×—×©×‘. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "×”×ª×§×Ÿ ×œ×›×œ ×ž×©×ª×ž×©×™ ×”×ž×—×©×‘"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "×”×ª×§×Ÿ ×¨×§ ×œ×ž×©×ª×ž×© ×©×œ×™"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/English.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/English.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/English.nlf	(revision 2956)
@@ -1,4 +1,4 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Start editing here
 # Language ID
@@ -6,7 +6,7 @@
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 -
 # RTL - anything else than RTL means LTR
 -
@@ -184,8 +184,8 @@
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
\ No newline at end of file
+ G
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Ukrainian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Ukrainian.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Ukrainian.nsh	(revision 2956)
@@ -1,122 +1,130 @@
-;Language: Ukrainian (1058)
+ï»¿;Language: Ukrainian (1058)
 ;By Yuri Holubow, http://www.Nash-Soft.com
 ;Correct by Osidach Vitaly (Vit_Os2)
 
-!insertmacro LANGFILE "Ukrainian" "Ukrainian"
+!insertmacro LANGFILE "Ukrainian" = "Ð£ÐºÑ€Ð°Ñ—Ð½Ñ�ÑŒÐºÐ°" "Ukrayins'ka"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Ëàñêàâî ïðîñèìî äî Ìàéñòðà Âñòàíîâëåííÿ $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Äàíà ïðîãðàìà âñòàíîâèòü $(^NameDA) íà Âàø êîìï'þòåð.$\r$\n$\r$\nÐåêîìåíäîâàíî çàêðèòè âñ³ ïðîãðàìè ïåðåä ïî÷àòêîì ³íñòàëÿö³¿. Öå äîçâîëèòü ïðîãðàì³ âñòàíîâëåííÿ îíîâèòè ñèñòåìí³ ôàéëè áåç ïåðåçàâàíòàæåííÿ ñèñòåìè.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Ð›Ð°Ñ�ÐºÐ°Ð²Ð¾ Ð¿Ñ€Ð¾Ñ�Ð¸Ð¼Ð¾ Ð´Ð¾ ÐœÐ°Ð¹Ñ�Ñ‚Ñ€Ð° Ð’Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ� $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ð”Ð°Ð½Ð° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ $(^NameDA) Ð½Ð° Ð’Ð°Ñˆ ÐºÐ¾Ð¼Ð¿'ÑŽÑ‚ÐµÑ€.$\r$\n$\r$\nÐ ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¾ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ð²Ñ�Ñ– Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸ Ð¿ÐµÑ€ÐµÐ´ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÐ¾Ð¼ Ñ–Ð½Ñ�Ñ‚Ð°Ð»Ñ�Ñ†Ñ–Ñ—. Ð¦Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ñ– Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ� Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ð½Ñ– Ñ„Ð°Ð¹Ð»Ð¸ Ð±ÐµÐ· Ð¿ÐµÑ€ÐµÐ·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ� Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ð¸.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Ëàñêàâî ïðîñèìî äî Ìàéñòðà Âèäàëåííÿ $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Äàíèé ìàéñòåð äîìîæå âèäàëèòè $(^NameDA).$\r$\n$\r$\nÏåðåä ïî÷àòêîì âèäàëåííÿ, ïåðåâ³ðòå, ÷è íå çàïóùåíî $(^NameDA).$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Ð›Ð°Ñ�ÐºÐ°Ð²Ð¾ Ð¿Ñ€Ð¾Ñ�Ð¸Ð¼Ð¾ Ð´Ð¾ ÐœÐ°Ð¹Ñ�Ñ‚Ñ€Ð° Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ð”Ð°Ð½Ð¸Ð¹ Ð¼Ð°Ð¹Ñ�Ñ‚ÐµÑ€ Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð¶Ðµ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ $(^NameDA).$\r$\n$\r$\nÐŸÐµÑ€ÐµÐ´ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÐ¾Ð¼ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ�, Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ñ‚Ðµ, Ñ‡Ð¸ Ð½Ðµ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½Ð¾ $(^NameDA).$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ë³öåíç³éíà Óãîäà"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Áóäü-ëàñêà ïåðåãëÿíüòå ë³öåíç³þ ïåðåä âñòàíîâëåííÿì $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "ßêùî Âè ïðèéìàºòå âñi óìîâè Óãîäè, íàòèñíiòü íà êíîïêó Çãîäåí. Âè ïîâèííi ïðèéíÿòè óìîâè Óãîäè äëÿ âñòàíîâëåííÿ $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "ßêùî Âè ïðèéìàºòå âñ³ óìîâè Óãîäè, âñòàíîâ³òü â³äì³òêó ó êâàäðàòèêó íèæ÷å. Âè ïîâèíí³ ïðèéíÿòè óìîâè Óãîäè äëÿ âñòàíîâëåííÿ $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ßêùî Âè ïðèéìàºòå âñ³ óìîâè Óãîäè, âèáåð³òü ïåðøèé âàð³àíò ç òèõ ùî íèæ÷å. Âè ïîâèíí³ ïðèéíÿòè óìîâè Óãîäè äëÿ âñòàíîâëåííÿ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ð¹Ð½Ð° Ð£Ð³Ð¾Ð´Ð°"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "ÐŸÐµÑ€ÐµÐ³Ð»Ñ�Ð½ÑŒÑ‚Ðµ Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–ÑŽ Ð¿ÐµÑ€ÐµÐ´ Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ�Ð¼ $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð¿Ñ€Ð¸Ð¹Ð¼Ð°Ñ”Ñ‚Ðµ Ð²Ñ�Ñ– ÑƒÐ¼Ð¾Ð²Ð¸ Ð£Ð³Ð¾Ð´Ð¸, Ð½Ð°Ñ‚Ð¸Ñ�Ð½Ñ–Ñ‚ÑŒ Ð½Ð° ÐºÐ½Ð¾Ð¿ÐºÑƒ Ð—Ð³Ð¾Ð´ÐµÐ½. Ð’Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– Ð¿Ñ€Ð¸Ð¹Ð½Ñ�Ñ‚Ð¸ ÑƒÐ¼Ð¾Ð²Ð¸ Ð£Ð³Ð¾Ð´Ð¸ Ð´Ð»Ñ� Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ� $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð¿Ñ€Ð¸Ð¹Ð¼Ð°Ñ”Ñ‚Ðµ Ð²Ñ�Ñ– ÑƒÐ¼Ð¾Ð²Ð¸ Ð£Ð³Ð¾Ð´Ð¸, Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ñ–Ñ‚ÑŒ Ð²Ñ–Ð´Ð¼Ñ–Ñ‚ÐºÑƒ Ñƒ ÐºÐ²Ð°Ð´Ñ€Ð°Ñ‚Ð¸ÐºÑƒ Ð½Ð¸Ð¶Ñ‡Ðµ. Ð’Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– Ð¿Ñ€Ð¸Ð¹Ð½Ñ�Ñ‚Ð¸ ÑƒÐ¼Ð¾Ð²Ð¸ Ð£Ð³Ð¾Ð´Ð¸ Ð´Ð»Ñ� Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ� $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð¿Ñ€Ð¸Ð¹Ð¼Ð°Ñ”Ñ‚Ðµ Ð²Ñ�Ñ– ÑƒÐ¼Ð¾Ð²Ð¸ Ð£Ð³Ð¾Ð´Ð¸, Ð²Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ Ð¿ÐµÑ€ÑˆÐ¸Ð¹ Ð²Ð°Ñ€Ñ–Ð°Ð½Ñ‚ Ð· Ñ‚Ð¸Ñ… Ñ‰Ð¾ Ð½Ð¸Ð¶Ñ‡Ðµ. Ð’Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– Ð¿Ñ€Ð¸Ð¹Ð½Ñ�Ñ‚Ð¸ ÑƒÐ¼Ð¾Ð²Ð¸ Ð£Ð³Ð¾Ð´Ð¸ Ð´Ð»Ñ� Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ� $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ë³öåíç³éíà óãîäà"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Ïðî÷èòàéòå óìîâè ë³öåíç³éíî¿ óãîäè ïåðåä âèäàëåííÿì $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "ßêùî Âè ïðèéìàºòå âñi óìîâè Óãîäè, íàòèñíiòü íà êíîïêó Çãîäåí. Âè ïîâèííi ïðèéíÿòè óìîâè Óãîäè äëÿ âèäàëåííÿ $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "ßêùî Âè ïðèéìàºòå âñ³ óìîâè Óãîäè, âñòàíîâ³òü â³äì³òêó ó êâàäðàòèêó íèæ÷å. Âè ïîâèíí³ ïðèéíÿòè óìîâè Óãîäè äëÿ âèäàëåííÿ $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ßêùî Âè ïðèéìàºòå âñ³ óìîâè Óãîäè, âèáåð³òü ïåðøèé âàð³àíò ç òèõ, ùî íèæ÷å. Âè ïîâèíí³ ïðèéíÿòè óìîâè Óãîäè äëÿ âèäàëåííÿ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ð¹Ð½Ð° ÑƒÐ³Ð¾Ð´Ð°"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ ÑƒÐ¼Ð¾Ð²Ð¸ Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ð¹Ð½Ð¾Ñ— ÑƒÐ³Ð¾Ð´Ð¸ Ð¿ÐµÑ€ÐµÐ´ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ�Ð¼ $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð¿Ñ€Ð¸Ð¹Ð¼Ð°Ñ”Ñ‚Ðµ Ð²Ñ�Ñ– ÑƒÐ¼Ð¾Ð²Ð¸ Ð£Ð³Ð¾Ð´Ð¸, Ð½Ð°Ñ‚Ð¸Ñ�Ð½Ñ–Ñ‚ÑŒ Ð½Ð° ÐºÐ½Ð¾Ð¿ÐºÑƒ Ð—Ð³Ð¾Ð´ÐµÐ½. Ð’Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– Ð¿Ñ€Ð¸Ð¹Ð½Ñ�Ñ‚Ð¸ ÑƒÐ¼Ð¾Ð²Ð¸ Ð£Ð³Ð¾Ð´Ð¸ Ð´Ð»Ñ� Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð¿Ñ€Ð¸Ð¹Ð¼Ð°Ñ”Ñ‚Ðµ Ð²Ñ�Ñ– ÑƒÐ¼Ð¾Ð²Ð¸ Ð£Ð³Ð¾Ð´Ð¸, Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ñ–Ñ‚ÑŒ Ð²Ñ–Ð´Ð¼Ñ–Ñ‚ÐºÑƒ Ñƒ ÐºÐ²Ð°Ð´Ñ€Ð°Ñ‚Ð¸ÐºÑƒ Ð½Ð¸Ð¶Ñ‡Ðµ. Ð’Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– Ð¿Ñ€Ð¸Ð¹Ð½Ñ�Ñ‚Ð¸ ÑƒÐ¼Ð¾Ð²Ð¸ Ð£Ð³Ð¾Ð´Ð¸ Ð´Ð»Ñ� Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð¿Ñ€Ð¸Ð¹Ð¼Ð°Ñ”Ñ‚Ðµ Ð²Ñ�Ñ– ÑƒÐ¼Ð¾Ð²Ð¸ Ð£Ð³Ð¾Ð´Ð¸, Ð²Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ Ð¿ÐµÑ€ÑˆÐ¸Ð¹ Ð²Ð°Ñ€Ñ–Ð°Ð½Ñ‚ Ð· Ñ‚Ð¸Ñ…, Ñ‰Ð¾ Ð½Ð¸Ð¶Ñ‡Ðµ. Ð’Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– Ð¿Ñ€Ð¸Ð¹Ð½Ñ�Ñ‚Ð¸ ÑƒÐ¼Ð¾Ð²Ð¸ Ð£Ð³Ð¾Ð´Ð¸ Ð´Ð»Ñ� Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Íàòèñíiòü PageDown ùîá ïåðåì³ñòèòèñü âíèç óãîäè."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Ð�Ð°Ñ‚Ð¸Ñ�Ð½Ñ–Ñ‚ÑŒ PageDown Ñ‰Ð¾Ð± Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñ�Ñ‚Ð¸Ñ‚Ð¸Ñ�ÑŒ Ð²Ð½Ð¸Ð· ÑƒÐ³Ð¾Ð´Ð¸."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Îáåð³òü êîìïîíåíòè"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Îáåð³òü êîìïîíåíòè $(^NameDA) ÿêi Âè áàæàºòå âñòàíîâèòè."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "ÐžÐ±ÐµÑ€Ñ–Ñ‚ÑŒ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "ÐžÐ±ÐµÑ€Ñ–Ñ‚ÑŒ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸ $(^NameDA) Ñ�ÐºÑ– Ð’Ð¸ Ð±Ð°Ð¶Ð°Ñ”Ñ‚Ðµ Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Êîìïîíåíòè ïðîãðàìè"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Îáåð³òü ÿê³ êîìïîíåíòè $(^NameDA) Âè áàæàºòå âèäàëèòè."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "ÐšÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "ÐžÐ±ÐµÑ€Ñ–Ñ‚ÑŒ Ñ�ÐºÑ– ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸ $(^NameDA) Ð’Ð¸ Ð±Ð°Ð¶Ð°Ñ”Ñ‚Ðµ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Îïèñ"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "ÐžÐ¿Ð¸Ñ�"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ïiäâåäiòü âàøó ìèøêó äî êîìïîíåíòà, ùîá ïîáà÷èòè éîãî îïèñ."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ÐŸÑ–Ð´Ð²ÐµÐ´Ñ–Ñ‚ÑŒ Ð²Ð°ÑˆÑƒ Ð¼Ð¸ÑˆÐºÑƒ Ð´Ð¾ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð°, Ñ‰Ð¾Ð± Ð¿Ð¾Ð±Ð°Ñ‡Ð¸Ñ‚Ð¸ Ð¹Ð¾Ð³Ð¾ Ð¾Ð¿Ð¸Ñ�."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ïiäâåäiòü âàøó ìèøêó äî êîìïîíåíòà, ùîá ïîáà÷èòè éîãî îïèñ."
+    #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO 
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Îáåðiòü òåêó âñòàíîâëåííÿ"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Îáåðiòü òåêó äëÿ âñòàíîâëåííÿ $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "ÐžÐ±ÐµÑ€Ñ–Ñ‚ÑŒ Ñ‚ÐµÐºÑƒ Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ�"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "ÐžÐ±ÐµÑ€Ñ–Ñ‚ÑŒ Ñ‚ÐµÐºÑƒ Ð´Ð»Ñ� Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ� $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Âèá³ð òåêè äëÿ âèäàëåííÿ"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Îáåð³òü òåêó, ç ÿêî¿ Âè áàæàºòå âèäàëèòè $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Ð’Ð¸Ð±Ñ–Ñ€ Ñ‚ÐµÐºÐ¸ Ð´Ð»Ñ� Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ�"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "ÐžÐ±ÐµÑ€Ñ–Ñ‚ÑŒ Ñ‚ÐµÐºÑƒ, Ð· Ñ�ÐºÐ¾Ñ— Ð’Ð¸ Ð±Ð°Ð¶Ð°Ñ”Ñ‚Ðµ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Êîï³þâàííÿ ôàéë³â"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Áóäü-ëàñêà çà÷åêàéòå, äîêè ïðîãðàìà âñòàíîâëåííÿ ñêîï³þº âñ³ íåîáõ³äí³ ôàéëè $(^NameDA)."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Âñòàíîâëåííÿ çàâåðøåíî"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Âñòàíîâëåííÿ óñïiøíî çàâåðøåíî."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Âñòàíîâëåííÿ ïåðåðâàíà"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Âñòàíîâëåííÿ íå áóëî óñïiøíî çàâåðøåíî."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "ÐšÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ� Ñ„Ð°Ð¹Ð»Ñ–Ð²"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Ð—Ð°Ñ‡ÐµÐºÐ°Ð¹Ñ‚Ðµ, Ð´Ð¾ÐºÐ¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ� Ñ�ÐºÐ¾Ð¿Ñ–ÑŽÑ” Ð²Ñ�Ñ– Ð½ÐµÐ¾Ð±Ñ…Ñ–Ð´Ð½Ñ– Ñ„Ð°Ð¹Ð»Ð¸ $(^NameDA)."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Ð’Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ� Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Ð’Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ� ÑƒÑ�Ð¿Ñ–ÑˆÐ½Ð¾ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Ð’Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ� Ð¿ÐµÑ€ÐµÑ€Ð²Ð°Ð½Ð°"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Ð’Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ� Ð½Ðµ Ð±ÑƒÐ»Ð¾ ÑƒÑ�Ð¿Ñ–ÑˆÐ½Ð¾ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Âèäàëåííÿ"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Áóäü-ëàñêà çà÷åêàéòå, éäå âèäàëåííÿ ôàéë³â $(^NameDA)."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Âèäàëåííÿ çàâåðøåíî"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Âèäàëåííÿ ïðîãðàìè áóëî óñï³øíî çàâåðøåíî."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Âèäàëåííÿ ïåðåðâàíî"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Âèäàëåííÿ íå áóëî âèêîíàíî ïîâí³ñòþ."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ�"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Ð—Ð°Ñ‡ÐµÐºÐ°Ð¹Ñ‚Ðµ, Ð¹Ð´Ðµ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� Ñ„Ð°Ð¹Ð»Ñ–Ð² $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸ Ð±ÑƒÐ»Ð¾ ÑƒÑ�Ð¿Ñ–ÑˆÐ½Ð¾ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� Ð¿ÐµÑ€ÐµÑ€Ð²Ð°Ð½Ð¾"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� Ð½Ðµ Ð±ÑƒÐ»Ð¾ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð¾ Ð¿Ð¾Ð²Ð½Ñ–Ñ�Ñ‚ÑŽ."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Çàâåðøåííÿ ìàéñòðà âñòàíîâëåííÿ $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) âñòàíîâëåíî íà âàø êîìï'þòåð.$\r$\n$\r$\nÍàòèñí³òü Ê³íåöü äëÿ âèõîäó."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Äëÿ òîãî, ùîá çàâåðøèòè âñòàíîâëåííÿ $(^NameDA) Âàø êîìï'þòåð ïîâèíåí ïåðåçàâàíòàæèòèñÿ. Çðîáèòè öå çàðàç?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ� Ð¼Ð°Ð¹Ñ�Ñ‚Ñ€Ð° Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ� $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ð½Ð° Ð²Ð°Ñˆ ÐºÐ¾Ð¼Ð¿'ÑŽÑ‚ÐµÑ€.$\r$\n$\r$\nÐ�Ð°Ñ‚Ð¸Ñ�Ð½Ñ–Ñ‚ÑŒ ÐšÑ–Ð½ÐµÑ†ÑŒ Ð´Ð»Ñ� Ð²Ð¸Ñ…Ð¾Ð´Ñƒ."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Ð”Ð»Ñ� Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚Ð¸ Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ� $(^NameDA) Ð’Ð°Ñˆ ÐºÐ¾Ð¼Ð¿'ÑŽÑ‚ÐµÑ€ Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ Ð¿ÐµÑ€ÐµÐ·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸Ñ�Ñ�. Ð—Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ Ñ†Ðµ Ð·Ð°Ñ€Ð°Ð·?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Çàâåðøåííÿ Ìàéñòðà Âèäàëåííÿ $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) âèäàëåíèé ç âàøîãî êîìï'þòåðà.$\r$\n$\r$\nÍàòèñí³òü Âèõ³ä, ùîá çàêðèòè Ìàéñòðà."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Äëÿ òîãî, ùîá çàê³í÷èòè âèäàëåííÿ $(^NameDA) âàø êîìï'þòåð ïîâèíåí ïåðåçàâàíòàæèòèñÿ. Âè áàæàºòå çðîáèòè öå çàðàç?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ� ÐœÐ°Ð¹Ñ�Ñ‚Ñ€Ð° Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¸Ð¹ Ð· Ð²Ð°ÑˆÐ¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿'ÑŽÑ‚ÐµÑ€Ð°.$\r$\n$\r$\nÐ�Ð°Ñ‚Ð¸Ñ�Ð½Ñ–Ñ‚ÑŒ Ð’Ð¸Ñ…Ñ–Ð´, Ñ‰Ð¾Ð± Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ ÐœÐ°Ð¹Ñ�Ñ‚Ñ€Ð°."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Ð”Ð»Ñ� Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð·Ð°ÐºÑ–Ð½Ñ‡Ð¸Ñ‚Ð¸ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� $(^NameDA) Ð²Ð°Ñˆ ÐºÐ¾Ð¼Ð¿'ÑŽÑ‚ÐµÑ€ Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ Ð¿ÐµÑ€ÐµÐ·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸Ñ�Ñ�. Ð’Ð¸ Ð±Ð°Ð¶Ð°Ñ”Ñ‚Ðµ Ð·Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ Ñ†Ðµ Ð·Ð°Ñ€Ð°Ð·?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ïåðåçàâàíòàæèòèñÿ çàðàç"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "ß õî÷ó ïåðåçàâàíòàæèòèñÿ âëàñíîðó÷ ï³çí³øå"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "&Çàïóñòèòè $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Ïîêàçàòè ³íôîðìàö³þ ïðî ïðîãðàìó"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Ê³íåöü"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "ÐŸÐµÑ€ÐµÐ·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸Ñ�Ñ� Ð·Ð°Ñ€Ð°Ð·"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ð¯ Ñ…Ð¾Ñ‡Ñƒ Ð¿ÐµÑ€ÐµÐ·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸Ñ�Ñ� Ð²Ð»Ð°Ñ�Ð½Ð¾Ñ€ÑƒÑ‡ Ð¿Ñ–Ð·Ð½Ñ–ÑˆÐµ"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&Ð—Ð°Ð¿ÑƒÑ�Ñ‚Ð¸Ñ‚Ð¸ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–ÑŽ Ð¿Ñ€Ð¾ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ñƒ"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&ÐšÑ–Ð½ÐµÑ†ÑŒ"
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Òåêà â ìåíþ Ïóñê"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Îáåð³òü òåêó â ìåíþ Ïóñê äëÿ ÿðëèê³â ïðîãðàìè."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Îáåð³òü òåêó â ìåíþ Ïóñê â ÿêó áóäóòü ïîì³ùåí³ ÿðëèêè äëÿ âñòàíîâëåíî¿ ïðîãðàìè. Âè òàêîæ ìîæåòå ââåñòè ³íøå ³ì'ÿ äëÿ ñòâîðåííÿ íîâî¿ òåêè."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Íå ñòâîðþâàòè ÿðëèêè"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Ð¢ÐµÐºÐ° Ð² Ð¼ÐµÐ½ÑŽ ÐŸÑƒÑ�Ðº"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "ÐžÐ±ÐµÑ€Ñ–Ñ‚ÑŒ Ñ‚ÐµÐºÑƒ Ð² Ð¼ÐµÐ½ÑŽ ÐŸÑƒÑ�Ðº Ð´Ð»Ñ� Ñ�Ñ€Ð»Ð¸ÐºÑ–Ð² Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "ÐžÐ±ÐµÑ€Ñ–Ñ‚ÑŒ Ñ‚ÐµÐºÑƒ Ð² Ð¼ÐµÐ½ÑŽ ÐŸÑƒÑ�Ðº Ð² Ñ�ÐºÑƒ Ð±ÑƒÐ´ÑƒÑ‚ÑŒ Ð¿Ð¾Ð¼Ñ–Ñ‰ÐµÐ½Ñ– Ñ�Ñ€Ð»Ð¸ÐºÐ¸ Ð´Ð»Ñ� Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾Ñ— Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸. Ð’Ð¸ Ñ‚Ð°ÐºÐ¾Ð¶ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²Ð²ÐµÑ�Ñ‚Ð¸ Ñ–Ð½ÑˆÐµ Ñ–Ð¼'Ñ� Ð´Ð»Ñ� Ñ�Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ� Ð½Ð¾Ð²Ð¾Ñ— Ñ‚ÐµÐºÐ¸."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ð�Ðµ Ñ�Ñ‚Ð²Ð¾Ñ€ÑŽÐ²Ð°Ñ‚Ð¸ Ñ�Ñ€Ð»Ð¸ÐºÐ¸"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Âèäàëåííÿ $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Âèäàëåííÿ $(^NameDA) ç âàøîãî êîìï'þòåðà."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� $(^NameDA) Ð· Ð²Ð°ÑˆÐ¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿'ÑŽÑ‚ÐµÑ€Ð°."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Âè âïåâíåííi, ùî áàæàºòå ïîêèíóòè âñòàíîâëåííÿ $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Ð’Ð¸ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ–, Ñ‰Ð¾ Ð±Ð°Ð¶Ð°Ñ”Ñ‚Ðµ Ð¿Ð¾ÐºÐ¸Ð½ÑƒÑ‚Ð¸ Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ� $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Âè âïåâíåíí³ ùî áàæàºòå ïîêèíóòè Ìàéñòð Âèäàëåííÿ $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ð’Ð¸ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ– Ñ‰Ð¾ Ð±Ð°Ð¶Ð°Ñ”Ñ‚Ðµ Ð¿Ð¾ÐºÐ¸Ð½ÑƒÑ‚Ð¸ ÐœÐ°Ð¹Ñ�Ñ‚ÐµÑ€ Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� $(^Name)?"
 !endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Ð’Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð²"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Ð’Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð², Ð´Ð»Ñ� Ñ�ÐºÐ¸Ñ… Ñ�Ð»Ñ–Ð´ Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Ð’Ð¸Ð·Ð½Ð°Ñ‡Ñ‚ÐµÑ�Ñ�, Ñ�Ð»Ñ–Ð´ Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ $(^NameDA) Ð»Ð¸ÑˆÐµ Ð´Ð»Ñ� Ð²Ð°ÑˆÐ¾Ð³Ð¾ ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚ÑƒÐ²Ð°Ñ‡Ð°, Ñ‡Ð¸ Ð´Ð»Ñ� ÑƒÑ�Ñ–Ñ… ÐºÐ¾Ñ€Ð¸Ñ�Ñ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð² Ñ†Ñ–Ñ”Ñ— Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ð¹Ð½Ð¾Ñ— Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ð¸. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Ð’Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð´Ð»Ñ� ÑƒÑ�Ñ–Ñ… Ñƒ Ñ†Ñ–Ð¹ Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ñ–"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Ð’Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð»Ð¸ÑˆÐµ Ð´Ð»Ñ� Ð²Ð°Ñ�"
+!endif
\ No newline at end of file
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Russian.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Russian.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Russian.nsh	(revision 2956)
@@ -1,121 +1,129 @@
-;Language: Russian (1049)
+ï»¿;Language: Russian (1049)
 ;Translation updated by Dmitry Yerokhin [erodim@mail.ru] (050424)
 
-!insertmacro LANGFILE "Russian" "Russian"
+!insertmacro LANGFILE "Russian" = "Ð ÑƒÑ�Ñ�ÐºÐ¸Ð¹" "Russkij"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Âàñ ïðèâåòñòâóåò ìàñòåð óñòàíîâêè $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ýòà ïðîãðàììà óñòàíîâèò $(^NameDA) íà âàø êîìïüþòåð.$\r$\n$\r$\nÏåðåä íà÷àëîì óñòàíîâêè ðåêîìåíäóåòñÿ çàêðûòü âñå ðàáîòàþùèå ïðèëîæåíèÿ. Ýòî ïîçâîëèò ïðîãðàììå óñòàíîâêè îáíîâèòü ñèñòåìíûå ôàéëû áåç ïåðåçàãðóçêè êîìïüþòåðà.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Ð’Ð°Ñ� Ð¿Ñ€Ð¸Ð²ÐµÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ Ð¼Ð°Ñ�Ñ‚ÐµÑ€ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Ð­Ñ‚Ð° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ $(^NameDA) Ð½Ð° Ð²Ð°Ñˆ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€.$\r$\n$\r$\nÐŸÐµÑ€ÐµÐ´ Ð½Ð°Ñ‡Ð°Ð»Ð¾Ð¼ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚Ñ�Ñ� Ð·Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ Ð²Ñ�Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÑŽÑ‰Ð¸Ðµ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ�. Ð­Ñ‚Ð¾ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ðµ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ñ�Ð¸Ñ�Ñ‚ÐµÐ¼Ð½Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹ Ð±ÐµÐ· Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð°.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Âàñ ïðèâåòñòâóåò ìàñòåð óäàëåíèÿ $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ýòà ïðîãðàììà óäàëèò $(^NameDA) èç âàøåãî êîìïüþòåðà.$\r$\n$\r$\nÏåðåä íà÷àëîì óäàëåíèÿ óáåäèòåñü, ÷òî ïðîãðàììà $(^NameDA) íå çàïóùåíà.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Ð’Ð°Ñ� Ð¿Ñ€Ð¸Ð²ÐµÑ‚Ñ�Ñ‚Ð²ÑƒÐµÑ‚ Ð¼Ð°Ñ�Ñ‚ÐµÑ€ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ� $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Ð­Ñ‚Ð° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° ÑƒÐ´Ð°Ð»Ð¸Ñ‚ $(^NameDA) Ð¸Ð· Ð²Ð°ÑˆÐµÐ³Ð¾ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð°.$\r$\n$\r$\nÐŸÐµÑ€ÐµÐ´ Ð½Ð°Ñ‡Ð°Ð»Ð¾Ð¼ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ� ÑƒÐ±ÐµÐ´Ð¸Ñ‚ÐµÑ�ÑŒ, Ñ‡Ñ‚Ð¾ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° $(^NameDA) Ð½Ðµ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½Ð°.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ëèöåíçèîííîå ñîãëàøåíèå"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Ïåðåä óñòàíîâêîé $(^NameDA) îçíàêîìüòåñü ñ ëèöåíçèîííûì ñîãëàøåíèåì."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Åñëè âû ïðèíèìàåòå óñëîâèÿ ñîãëàøåíèÿ, íàæìèòå êíîïêó $\"Ïðèíèìàþ$\". ×òîáû óñòàíîâèòü ïðîãðàììó, íåîáõîäèìî ïðèíÿòü ñîãëàøåíèå."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Åñëè âû ïðèíèìàåòå óñëîâèÿ ñîãëàøåíèÿ, óñòàíîâèòå ôëàæîê íèæå. ×òîáû óñòàíîâèòü ïðîãðàììó, íåîáõîäèìî ïðèíÿòü ñîãëàøåíèå. $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Åñëè âû ïðèíèìàåòå óñëîâèÿ ñîãëàøåíèÿ, âûáåðèòå ïåðâûé âàðèàíò èç ïðåäëîæåííûõ íèæå. ×òîáû óñòàíîâèòü ïðîãðàììó, íåîáõîäèìî ïðèíÿòü ñîãëàøåíèå. $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ðµ Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ðµ"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "ÐŸÐµÑ€ÐµÐ´ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¾Ð¹ $(^NameDA) Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼ÑŒÑ‚ÐµÑ�ÑŒ Ñ� Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ‹Ð¼ Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸ÐµÐ¼."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Ð•Ñ�Ð»Ð¸ Ð²Ñ‹ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ�, Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ $\"ÐŸÑ€Ð¸Ð½Ð¸Ð¼Ð°ÑŽ$\". Ð§Ñ‚Ð¾Ð±Ñ‹ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñƒ, Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ð¿Ñ€Ð¸Ð½Ñ�Ñ‚ÑŒ Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ðµ."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ð•Ñ�Ð»Ð¸ Ð²Ñ‹ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ�, ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ðµ Ñ„Ð»Ð°Ð¶Ð¾Ðº Ð½Ð¸Ð¶Ðµ. Ð§Ñ‚Ð¾Ð±Ñ‹ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñƒ, Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ð¿Ñ€Ð¸Ð½Ñ�Ñ‚ÑŒ Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ðµ. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ð•Ñ�Ð»Ð¸ Ð²Ñ‹ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ�, Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿ÐµÑ€Ð²Ñ‹Ð¹ Ð²Ð°Ñ€Ð¸Ð°Ð½Ñ‚ Ð¸Ð· Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð½Ñ‹Ñ… Ð½Ð¸Ð¶Ðµ. Ð§Ñ‚Ð¾Ð±Ñ‹ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñƒ, Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ð¿Ñ€Ð¸Ð½Ñ�Ñ‚ÑŒ Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ðµ. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ëèöåíçèîííîå ñîãëàøåíèå"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Ïåðåä óäàëåíèåì $(^NameDA) îçíàêîìüòåñü ñ ëèöåíçèîííûì ñîãëàøåíèåì."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Åñëè âû ïðèíèìàåòå óñëîâèÿ ñîãëàøåíèÿ, íàæìèòå êíîïêó $\"Ïðèíèìàþ$\". Äëÿ óäàëåíèÿ íåîáõîäèìî ïðèíÿòü ñîãëàøåíèå. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Åñëè âû ïðèíèìàåòå óñëîâèÿ ñîãëàøåíèÿ, óñòàíîâèòå ôëàæîê íèæå. Äëÿ óäàëåíèÿ íåîáõîäèìî ïðèíÿòü ñîãëàøåíèå. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Åñëè âû ïðèíèìàåòå óñëîâèÿ ñîãëàøåíèÿ, âûáåðèòå ïåðâûé âàðèàíò èç ïðåäëîæåííûõ íèæå. Äëÿ óäàëåíèÿ íåîáõîäèìî ïðèíÿòü ñîãëàøåíèå. $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ðµ Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ðµ"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "ÐŸÐµÑ€ÐµÐ´ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸ÐµÐ¼ $(^NameDA) Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼ÑŒÑ‚ÐµÑ�ÑŒ Ñ� Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ‹Ð¼ Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸ÐµÐ¼."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Ð•Ñ�Ð»Ð¸ Ð²Ñ‹ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ�, Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ $\"ÐŸÑ€Ð¸Ð½Ð¸Ð¼Ð°ÑŽ$\". Ð”Ð»Ñ� ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ� Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ð¿Ñ€Ð¸Ð½Ñ�Ñ‚ÑŒ Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ðµ. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Ð•Ñ�Ð»Ð¸ Ð²Ñ‹ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ�, ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ðµ Ñ„Ð»Ð°Ð¶Ð¾Ðº Ð½Ð¸Ð¶Ðµ. Ð”Ð»Ñ� ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ� Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ð¿Ñ€Ð¸Ð½Ñ�Ñ‚ÑŒ Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ðµ. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Ð•Ñ�Ð»Ð¸ Ð²Ñ‹ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ�, Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿ÐµÑ€Ð²Ñ‹Ð¹ Ð²Ð°Ñ€Ð¸Ð°Ð½Ñ‚ Ð¸Ð· Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð½Ñ‹Ñ… Ð½Ð¸Ð¶Ðµ. Ð”Ð»Ñ� ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ� Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ð¿Ñ€Ð¸Ð½Ñ�Ñ‚ÑŒ Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ðµ. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Äëÿ ïåðåìåùåíèÿ ïî òåêñòó èñïîëüçóéòå êëàâèøè $\"PageUp$\" è $\"PageDown$\"."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Ð”Ð»Ñ� Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ� Ð¿Ð¾ Ñ‚ÐµÐºÑ�Ñ‚Ñƒ Ð¸Ñ�Ð¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ¸ $\"PageUp$\" Ð¸ $\"PageDown$\"."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Êîìïîíåíòû óñòàíàâëèâàåìîé ïðîãðàììû"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Âûáåðèòå êîìïîíåíòû $(^NameDA), êîòîðûå âû õîòèòå óñòàíîâèòü."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "ÐšÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñ‹ ÑƒÑ�Ñ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð¹ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñ‹ $(^NameDA), ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Êîìïîíåíòû ïðîãðàììû"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Âûáåðèòå êîìïîíåíòû $(^NameDA), êîòîðûå âû õîòèòå óäàëèòü."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "ÐšÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñ‹ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñ‹ $(^NameDA), ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Îïèñàíèå"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "ÐžÐ¿Ð¸Ñ�Ð°Ð½Ð¸Ðµ"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Íàâåäèòå êóðñîð ìûøè íà íàçâàíèå êîìïîíåíòà, ÷òîáû ïðî÷åñòü åãî îïèñàíèå."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ð�Ð°Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÐºÑƒÑ€Ñ�Ð¾Ñ€ Ð¼Ñ‹ÑˆÐ¸ Ð½Ð° Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð°, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€Ð¾Ñ‡ÐµÑ�Ñ‚ÑŒ ÐµÐ³Ð¾ Ð¾Ð¿Ð¸Ñ�Ð°Ð½Ð¸Ðµ."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Íàâåäèòå êóðñîð ìûøè íà íàçâàíèå êîìïîíåíòà, ÷òîáû ïðî÷åñòü åãî îïèñàíèå."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑƒÐ²Ð¸Ð´ÐµÑ‚ÑŒ ÐµÐ³Ð¾ Ð¾Ð¿Ð¸Ñ�Ð°Ð½Ð¸Ðµ."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Âûáîð ïàïêè óñòàíîâêè"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Âûáåðèòå ïàïêó äëÿ óñòàíîâêè $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Ð’Ñ‹Ð±Ð¾Ñ€ Ð¿Ð°Ð¿ÐºÐ¸ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿Ð°Ð¿ÐºÑƒ Ð´Ð»Ñ� ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Âûáîð ïàïêè äëÿ óäàëåíèÿ"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Óêàæèòå ïàïêó, èç êîòîðîé íóæíî óäàëèòü $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Ð’Ñ‹Ð±Ð¾Ñ€ Ð¿Ð°Ð¿ÐºÐ¸ Ð´Ð»Ñ� ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ�"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ Ð¿Ð°Ð¿ÐºÑƒ, Ð¸Ð· ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð½ÑƒÐ¶Ð½Ð¾ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Êîïèðîâàíèå ôàéëîâ"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Ïîäîæäèòå, èäåò êîïèðîâàíèå ôàéëîâ $(^NameDA)..."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Óñòàíîâêà çàâåðøåíà"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Óñòàíîâêà óñïåøíî çàâåðøåíà."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Óñòàíîâêà ïðåðâàíà"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Óñòàíîâêà íå çàâåðøåíà."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "ÐŸÐ¾Ð´Ð¾Ð¶Ð´Ð¸Ñ‚Ðµ, Ð¸Ð´ÐµÑ‚ ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð² $(^NameDA)..."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Ð£Ñ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð°"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Ð£Ñ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ° ÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð°."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Ð£Ñ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð¿Ñ€ÐµÑ€Ð²Ð°Ð½Ð°"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Ð£Ñ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ° Ð½Ðµ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð°."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Óäàëåíèå"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Ïîäîæäèòå, èäåò óäàëåíèå ôàéëîâ $(^NameDA)..."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Óäàëåíèå çàâåðøåíî"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Óäàëåíèå ïðîãðàììû óñïåøíî çàâåðøåíî."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Óäàëåíèå ïðåðâàíî"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Óäàëåíèå ïðîèçâåäåíî íå ïîëíîñòüþ."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "ÐŸÐ¾Ð´Ð¾Ð¶Ð´Ð¸Ñ‚Ðµ, Ð¸Ð´ÐµÑ‚ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð² $(^NameDA)..."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿Ñ€ÐµÑ€Ð²Ð°Ð½Ð¾"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¾ Ð½Ðµ Ð¿Ð¾Ð»Ð½Ð¾Ñ�Ñ‚ÑŒÑŽ."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Çàâåðøåíèå ðàáîòû ìàñòåðà óñòàíîâêè $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Óñòàíîâêà $(^NameDA) âûïîëíåíà.$\r$\n$\r$\nÍàæìèòå êíîïêó $\"Ãîòîâî$\" äëÿ âûõîäà èç ïðîãðàììû óñòàíîâêè."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Äëÿ çàâåðøåíèÿ óñòàíîâêè $(^NameDA) íåîáõîäèìî ïåðåçàãðóçèòü êîìïüþòåð. Õîòèòå ñäåëàòü ýòî ñåé÷àñ?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ Ð¼Ð°Ñ�Ñ‚ÐµÑ€Ð° ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Ð£Ñ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ° $(^NameDA) Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð°.$\r$\n$\r$\nÐ�Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ $\"Ð“Ð¾Ñ‚Ð¾Ð²Ð¾$\" Ð´Ð»Ñ� Ð²Ñ‹Ñ…Ð¾Ð´Ð° Ð¸Ð· Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Ð”Ð»Ñ� Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ� ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ $(^NameDA) Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€. Ð¥Ð¾Ñ‚Ð¸Ñ‚Ðµ Ñ�Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ñ�Ñ‚Ð¾ Ñ�ÐµÐ¹Ñ‡Ð°Ñ�?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Çàâåðøåíèå ðàáîòû ìàñòåðà óäàëåíèÿ $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Ïðîãðàììà $(^NameDA) óäàëåíà èç âàøåãî êîìïüþòåðà.$\r$\n$\r$\nÍàæìèòå êíîïêó $\"Ãîòîâî$\"äëÿ âûõîäà èç ïðîãðàììû óäàëåíèÿ."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Äëÿ çàâåðøåíèÿ óäàëåíèÿ $(^NameDA) íóæíî ïåðåçàãðóçèòü êîìïüþòåð. Õîòèòå ñäåëàòü ýòî ñåé÷àñ?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ Ð¼Ð°Ñ�Ñ‚ÐµÑ€Ð° ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ� $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° $(^NameDA) ÑƒÐ´Ð°Ð»ÐµÐ½Ð° Ð¸Ð· Ð²Ð°ÑˆÐµÐ³Ð¾ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð°.$\r$\n$\r$\nÐ�Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ $\"Ð“Ð¾Ñ‚Ð¾Ð²Ð¾$\"Ð´Ð»Ñ� Ð²Ñ‹Ñ…Ð¾Ð´Ð° Ð¸Ð· Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ�."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Ð”Ð»Ñ� Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ� ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ� $(^NameDA) Ð½ÑƒÐ¶Ð½Ð¾ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€. Ð¥Ð¾Ñ‚Ð¸Ñ‚Ðµ Ñ�Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ñ�Ñ‚Ð¾ Ñ�ÐµÐ¹Ñ‡Ð°Ñ�?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Äà, ïåðåçàãðóçèòü ÏÊ ñåé÷àñ"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Íåò, ÿ ïåðåçàãðóæó ÏÊ ïîçæå"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "&Çàïóñòèòü $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Ïîêàçàòü ôàéë ReadMe"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Ãîòîâî"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Ð”Ð°, Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÐŸÐš Ñ�ÐµÐ¹Ñ‡Ð°Ñ�"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Ð�ÐµÑ‚, Ñ� Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ¶Ñƒ ÐŸÐš Ð¿Ð¾Ð·Ð¶Ðµ"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&Ð—Ð°Ð¿ÑƒÑ�Ñ‚Ð¸Ñ‚ÑŒ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» ReadMe"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Ð“Ð¾Ñ‚Ð¾Ð²Ð¾"
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Ïàïêà â ìåíþ $\"Ïóñê$\""
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Âûáåðèòå ïàïêó â ìåíþ $\"Ïóñê$\" äëÿ ðàçìåùåíèÿ ÿðëûêîâ ïðîãðàììû."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Âûáåðèòå ïàïêó â ìåíþ $\"Ïóñê$\", êóäà áóäóò ïîìåùåíû ÿðëûêè ïðîãðàììû. Âû òàêæå ìîæåòå ââåñòè äðóãîå èìÿ ïàïêè."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Íå ñîçäàâàòü ÿðëûêè"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "ÐŸÐ°Ð¿ÐºÐ° Ð² Ð¼ÐµÐ½ÑŽ $\"ÐŸÑƒÑ�Ðº$\""
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿Ð°Ð¿ÐºÑƒ Ð² Ð¼ÐµÐ½ÑŽ $\"ÐŸÑƒÑ�Ðº$\" Ð´Ð»Ñ� Ñ€Ð°Ð·Ð¼ÐµÑ‰ÐµÐ½Ð¸Ñ� Ñ�Ñ€Ð»Ñ‹ÐºÐ¾Ð² Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿Ð°Ð¿ÐºÑƒ Ð² Ð¼ÐµÐ½ÑŽ $\"ÐŸÑƒÑ�Ðº$\", ÐºÑƒÐ´Ð° Ð±ÑƒÐ´ÑƒÑ‚ Ð¿Ð¾Ð¼ÐµÑ‰ÐµÐ½Ñ‹ Ñ�Ñ€Ð»Ñ‹ÐºÐ¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹. Ð’Ñ‹ Ñ‚Ð°ÐºÐ¶Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²Ð²ÐµÑ�Ñ‚Ð¸ Ð´Ñ€ÑƒÐ³Ð¾Ðµ Ð¸Ð¼Ñ� Ð¿Ð°Ð¿ÐºÐ¸."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Ð�Ðµ Ñ�Ð¾Ð·Ð´Ð°Ð²Ð°Ñ‚ÑŒ Ñ�Ñ€Ð»Ñ‹ÐºÐ¸"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Óäàëåíèå $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Óäàëåíèå $(^NameDA) èç êîìïüþòåðà."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ $(^NameDA) Ð¸Ð· ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð°."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Âû äåéñòâèòåëüíî õîòèòå îòìåíèòü óñòàíîâêó $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Ð’Ñ‹ Ð´ÐµÐ¹Ñ�Ñ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÑƒ $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Âû äåéñòâèòåëüíî õîòèòå îòìåíèòü óäàëåíèå $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ð’Ñ‹ Ð´ÐµÐ¹Ñ�Ñ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ $(^Name)?"
 !endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Ð ÐµÐ¶Ð¸Ð¼ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ, Ð´Ð»Ñ� ÐºÐ°ÐºÐ¸Ñ… Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ $(^NameDA)."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ, Ð±ÑƒÐ´ÐµÑ‚Ðµ Ð»Ð¸ Ð²Ñ‹ ÑƒÑ�Ñ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ñ‚ÑŒ $(^NameDA) Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ� Ñ�ÐµÐ±Ñ� Ð¸Ð»Ð¸ Ð´Ð»Ñ� Ð²Ñ�ÐµÑ… Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð°. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Ð£Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð´Ð»Ñ� Ð²Ñ�ÐµÑ… Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Ð£Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ� Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ�"
+!endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Bulgarian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Bulgarian.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Bulgarian.nlf	(revision 2956)
@@ -1,4 +1,4 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Start editing here
 # Language ID
@@ -6,189 +6,189 @@
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1251
 # RTL - anything else than RTL means LTR
 -
 # Translation by Asparouh Kalyandjiev <acnapyx@computers.bg>
 # Updated v2 to v6 by Plamen Penkov <plamen71@hotmail.com>
-# Updated by Êèðèë Êèðèëîâ (DumpeR)<dumper@data.bg>
+# Updated by ÐšÐ¸Ñ€Ð¸Ð» ÐšÐ¸Ñ€Ð¸Ð»Ð¾Ð² (DumpeR)<dumper@data.bg>
 # 
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-Èíñòàëèðàíå íà $(^Name) 
+Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ðµ Ð½Ð° $(^Name) 
 # ^UninstallCaption
-Èçòðèâàíå íà $(^Name) 
+Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° $(^Name) 
 #^LicenseSubCaption
-: Ëèöåíçèîííî ñïîðàçóìåíèå
+: Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾ Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸Ðµ
 #^ComponentsSubCaption
-: Îïöèè çà èíñòàëèðàíå
+: ÐžÐ¿Ñ†Ð¸Ð¸ Ð·Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ðµ
 # ^DirSubCaption
-: Èíñòàëèðàíå â ïàïêà
+: Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ðµ Ð² Ð¿Ð°Ð¿ÐºÐ°
 #^InstallingSubCaption
-: Èíñòàëèðàíå
+: Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ðµ
 #^CompletedSubCaption
-: Çàâúðøâàíå
+: Ð—Ð°Ð²ÑŠÑ€ÑˆÐ²Ð°Ð½Ðµ
 # ^UnComponentsSubCaption
-: Îïöèè çà èçòðèâàíå
+: ÐžÐ¿Ñ†Ð¸Ð¸ Ð·Ð° Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ
 # ^UnDirSubCaption
-: Èçòðèâàíå îò ïàïêà
+: Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð¾Ñ‚ Ð¿Ð°Ð¿ÐºÐ°
 # ^ConfirmSubCaption
-: Ïîòâúðæäåíèå
+: ÐŸÐ¾Ñ‚Ð²ÑŠÑ€Ð¶Ð´ÐµÐ½Ð¸Ðµ
 #^UninstallingSubCaption
-: Èçòðèâàíå
+: Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ
 #^UnCompletedSubCaption
-: Çàâúðøâàíå
+: Ð—Ð°Ð²ÑŠÑ€ÑˆÐ²Ð°Ð½Ðµ
 # ^BackBtn
-< &Íàçàä
+< &Ð�Ð°Ð·Ð°Ð´
 #^NextBtn
-Í&àïðåä >
+Ð�&Ð°Ð¿Ñ€ÐµÐ´ >
 # ^AgreeBtn
-&Ñúãëàñåí
+&Ð¡ÑŠÐ³Ð»Ð°Ñ�ÐµÐ½
 # ^AcceptBtn
-&Ñúãëàñåí ñúì ñ óñëîâèÿòà íà Ëèöåíçèîííîòî ñïîðàçóìåíèå.
+&Ð¡ÑŠÐ³Ð»Ð°Ñ�ÐµÐ½ Ñ�ÑŠÐ¼ Ñ� ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ�Ñ‚Ð° Ð½Ð° Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ñ‚Ð¾ Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸Ðµ.
 # ^DontAcceptBtn
-&Íå ñúì ñúãëàñåí ñ óñëîâèÿòà íà Ëèöåíçèîííîòî ñïîðàçóìåíèå.
+&Ð�Ðµ Ñ�ÑŠÐ¼ Ñ�ÑŠÐ³Ð»Ð°Ñ�ÐµÐ½ Ñ� ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ�Ñ‚Ð° Ð½Ð° Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ñ‚Ð¾ Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸Ðµ.
 # ^InstallBtn
-&Èíñòàëèðàé
+&Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð¹
 #^UninstallBtn
-&Èçòðèé
+&Ð˜Ð·Ñ‚Ñ€Ð¸Ð¹
 # ^CancelBtn
-&Îòêàç
+&ÐžÑ‚ÐºÐ°Ð·
 #^CloseBtn
-&Çàòâîðè
+&Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸
 #^BrowseBtn
-Ï&ðåãëåä...
+ÐŸ&Ñ€ÐµÐ³Ð»ÐµÐ´...
 #^ShowDetailsBtn
-&Äåòàéëè
+&Ð”ÐµÑ‚Ð°Ð¹Ð»Ð¸
 # ^ClickNext
-Íàòèñíåòå "Íàïðåä", çà äà ïðîäúëæèòå.
+Ð�Ð°Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ "Ð�Ð°Ð¿Ñ€ÐµÐ´", Ð·Ð° Ð´Ð° Ð¿Ñ€Ð¾Ð´ÑŠÐ»Ð¶Ð¸Ñ‚Ðµ.
 # ^ClickInstall
-Íàòèñíåòå "Èíñòàëèðàé", çà äà çàïî÷íå èíñòàëèðàíåòî.
+Ð�Ð°Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ "Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð¹", Ð·Ð° Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ‡Ð½Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾.
 # ^ClickUninstall
-Íàòèñíåòå "Èçòðèé", çà äà çàïî÷íå èçòðèâàíåòî.
+Ð�Ð°Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ "Ð˜Ð·Ñ‚Ñ€Ð¸Ð¹", Ð·Ð° Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ‡Ð½Ðµ Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½ÐµÑ‚Ð¾.
 # ^Name
-Èìå
+Ð˜Ð¼Ðµ
 #^Completed
-Êðàé
+ÐšÑ€Ð°Ð¹
 # ^LicenseText
-Ìîëÿ ïðî÷åòåòå Ëèöåíçèîííîòî ñïîðàçóìåíèå ïðåäè äà èíñòàëèðàòå $(^NameDA). Àêî ïðèåìàòå âñè÷êè óñëîâèÿ íà ñïîðàçóìåíèåòî, íàòèñíåòå "Ñúãëàñåí".
+ÐœÐ¾Ð»Ñ� Ð¿Ñ€Ð¾Ñ‡ÐµÑ‚ÐµÑ‚Ðµ Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ñ‚Ð¾ Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸Ðµ Ð¿Ñ€ÐµÐ´Ð¸ Ð´Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ $(^NameDA). Ð�ÐºÐ¾ Ð¿Ñ€Ð¸ÐµÐ¼Ð°Ñ‚Ðµ Ð²Ñ�Ð¸Ñ‡ÐºÐ¸ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ð½Ð° Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸ÐµÑ‚Ð¾, Ð½Ð°Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ "Ð¡ÑŠÐ³Ð»Ð°Ñ�ÐµÐ½".
 # ^LicenseTextCB
-Ìîëÿ ïðî÷åòåòå Ëèöåíçèîííîòî ñïîðàçóìåíèå ïðåäè äà èíñòàëèðàòå $(^NameDA). Àêî ïðèåìàòå âñè÷êè óñëîâèÿ íà ñïîðàçóìåíèåòî, ñëîæåòå îòìåòêà â ïîëåòî ïî-äîëó. $_CLICK
+ÐœÐ¾Ð»Ñ� Ð¿Ñ€Ð¾Ñ‡ÐµÑ‚ÐµÑ‚Ðµ Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ñ‚Ð¾ Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸Ðµ Ð¿Ñ€ÐµÐ´Ð¸ Ð´Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ $(^NameDA). Ð�ÐºÐ¾ Ð¿Ñ€Ð¸ÐµÐ¼Ð°Ñ‚Ðµ Ð²Ñ�Ð¸Ñ‡ÐºÐ¸ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ð½Ð° Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸ÐµÑ‚Ð¾, Ñ�Ð»Ð¾Ð¶ÐµÑ‚Ðµ Ð¾Ñ‚Ð¼ÐµÑ‚ÐºÐ° Ð² Ð¿Ð¾Ð»ÐµÑ‚Ð¾ Ð¿Ð¾-Ð´Ð¾Ð»Ñƒ. $_CLICK
 # ^LicenseTextRB
-Ìîëÿ ïðî÷åòåòå Ëèöåíçèîííîòî ñïîðàçóìåíèå ïðåäè äà èíñòàëèðàòå $(^NameDA). Àêî ïðèåìàòå âñè÷êè óñëîâèÿ íà ñïîðàçóìåíèåòî, èçáåðåòå ïúðâàòà îïöèÿ ïî-äîëó. $_CLICK
+ÐœÐ¾Ð»Ñ� Ð¿Ñ€Ð¾Ñ‡ÐµÑ‚ÐµÑ‚Ðµ Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ñ‚Ð¾ Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸Ðµ Ð¿Ñ€ÐµÐ´Ð¸ Ð´Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ $(^NameDA). Ð�ÐºÐ¾ Ð¿Ñ€Ð¸ÐµÐ¼Ð°Ñ‚Ðµ Ð²Ñ�Ð¸Ñ‡ÐºÐ¸ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ð½Ð° Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸ÐµÑ‚Ð¾, Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Ð¿ÑŠÑ€Ð²Ð°Ñ‚Ð° Ð¾Ð¿Ñ†Ð¸Ñ� Ð¿Ð¾-Ð´Ð¾Ð»Ñƒ. $_CLICK
 # ^UnLicenseText
-Ìîëÿ ïðî÷åòåòå Ëèöåíçèîííîòî ñïîðàçóìåíèå ïðåäè äà èçòðèåòå $(^NameDA). Àêî ïðèåìàòå âñè÷êè óñëîâèÿ íà ñïîðàçóìåíèåòî, íàòèñíåòå "Ñúãëàñåí".
+ÐœÐ¾Ð»Ñ� Ð¿Ñ€Ð¾Ñ‡ÐµÑ‚ÐµÑ‚Ðµ Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ñ‚Ð¾ Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸Ðµ Ð¿Ñ€ÐµÐ´Ð¸ Ð´Ð° Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ $(^NameDA). Ð�ÐºÐ¾ Ð¿Ñ€Ð¸ÐµÐ¼Ð°Ñ‚Ðµ Ð²Ñ�Ð¸Ñ‡ÐºÐ¸ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ð½Ð° Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸ÐµÑ‚Ð¾, Ð½Ð°Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ "Ð¡ÑŠÐ³Ð»Ð°Ñ�ÐµÐ½".
 # ^UnLicenseTextCB
-Ìîëÿ ïðî÷åòåòå Ëèöåíçèîííîòî ñïîðàçóìåíèå ïðåäè äà èçòðèåòå $(^NameDA). Àêî ïðèåìàòå âñè÷êè óñëîâèÿ íà ñïîðàçóìåíèåòî, ñëîæåòå îòìåòêà â ïîëåòî ïî-äîëó. $_CLICK
+ÐœÐ¾Ð»Ñ� Ð¿Ñ€Ð¾Ñ‡ÐµÑ‚ÐµÑ‚Ðµ Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ñ‚Ð¾ Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸Ðµ Ð¿Ñ€ÐµÐ´Ð¸ Ð´Ð° Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ $(^NameDA). Ð�ÐºÐ¾ Ð¿Ñ€Ð¸ÐµÐ¼Ð°Ñ‚Ðµ Ð²Ñ�Ð¸Ñ‡ÐºÐ¸ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ð½Ð° Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸ÐµÑ‚Ð¾, Ñ�Ð»Ð¾Ð¶ÐµÑ‚Ðµ Ð¾Ñ‚Ð¼ÐµÑ‚ÐºÐ° Ð² Ð¿Ð¾Ð»ÐµÑ‚Ð¾ Ð¿Ð¾-Ð´Ð¾Ð»Ñƒ. $_CLICK
 # ^UnLicenseTextRB
-Ìîëÿ ïðî÷åòåòå Ëèöåíçèîííîòî ñïîðàçóìåíèå ïðåäè äà èçòðèåòå $(^NameDA). Àêî ïðèåìàòå âñè÷êè óñëîâèÿ íà ñïîðàçóìåíèåòî, èçáåðåòå ïúðâàòà îïöèÿ ïî-äîëó. $_CLICK
+ÐœÐ¾Ð»Ñ� Ð¿Ñ€Ð¾Ñ‡ÐµÑ‚ÐµÑ‚Ðµ Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ñ‚Ð¾ Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸Ðµ Ð¿Ñ€ÐµÐ´Ð¸ Ð´Ð° Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ $(^NameDA). Ð�ÐºÐ¾ Ð¿Ñ€Ð¸ÐµÐ¼Ð°Ñ‚Ðµ Ð²Ñ�Ð¸Ñ‡ÐºÐ¸ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ð½Ð° Ñ�Ð¿Ð¾Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ½Ð¸ÐµÑ‚Ð¾, Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Ð¿ÑŠÑ€Ð²Ð°Ñ‚Ð° Ð¾Ð¿Ñ†Ð¸Ñ� Ð¿Ð¾-Ð´Ð¾Ð»Ñƒ. $_CLICK
 # ^Custom
-Èíñòàëèðàíå ïî èçáîð
+Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ðµ Ð¿Ð¾ Ð¸Ð·Ð±Ð¾Ñ€
 #^ComponentsText
-Èçáåðåòå êîìïîíåíòèòå, êîèòî èñêàòå äà áúäàò èíñòàëèðàíè. $_CLICK
+Ð˜Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸Ñ‚Ðµ, ÐºÐ¾Ð¸Ñ‚Ð¾ Ð¸Ñ�ÐºÐ°Ñ‚Ðµ Ð´Ð° Ð±ÑŠÐ´Ð°Ñ‚ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ð¸. $_CLICK
 #^ComponentsSubText1
-Èçáåðåòå òèï èíñòàëèðàíå:
+Ð˜Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Ñ‚Ð¸Ð¿ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ðµ:
 #^ComponentsSubText2_NoInstTypes
-Èçáåðåòå êîìïîíåíòè:
+Ð˜Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸:
 #^ComponentsSubText2
-Èëè èçáåðåòå êîìïîíåíòèòå, êîèòî èñêàòå äà áúäàò èíñòàëèðàíè:
+Ð˜Ð»Ð¸ Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸Ñ‚Ðµ, ÐºÐ¾Ð¸Ñ‚Ð¾ Ð¸Ñ�ÐºÐ°Ñ‚Ðµ Ð´Ð° Ð±ÑŠÐ´Ð°Ñ‚ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ð¸:
 # ^UnComponentsText
-Ñëîæåòå îòìåòêà ïðåä êîìïîíåíòèòå, êîèòî èñêàòå äà èçòðèåòå, à òåçè êîèòî íå èñêàòå äà èçòðèåòå îñòàâåòå áåç îòìåòêà. $_CLICK
+Ð¡Ð»Ð¾Ð¶ÐµÑ‚Ðµ Ð¾Ñ‚Ð¼ÐµÑ‚ÐºÐ° Ð¿Ñ€ÐµÐ´ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸Ñ‚Ðµ, ÐºÐ¾Ð¸Ñ‚Ð¾ Ð¸Ñ�ÐºÐ°Ñ‚Ðµ Ð´Ð° Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ, Ð° Ñ‚ÐµÐ·Ð¸ ÐºÐ¾Ð¸Ñ‚Ð¾ Ð½Ðµ Ð¸Ñ�ÐºÐ°Ñ‚Ðµ Ð´Ð° Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ Ð¾Ñ�Ñ‚Ð°Ð²ÐµÑ‚Ðµ Ð±ÐµÐ· Ð¾Ñ‚Ð¼ÐµÑ‚ÐºÐ°. $_CLICK
 # ^UnComponentsSubText1
-Èçáåðåòå òèïà íà èçòðèâàíå:
+Ð˜Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Ñ‚Ð¸Ð¿Ð° Ð½Ð° Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ:
 # ^UnComponentsSubText2_NoInstTypes
-Èçáåðåòå êîìïîíåíòèòå çà èçòðèâàíå:
+Ð˜Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸Ñ‚Ðµ Ð·Ð° Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ:
 # ^UnComponentsSubText2
-Èëè, èçáåðåòå äîïúëíèòåëíè êîìïîíåíòè çà èçòðèâàíå:
+Ð˜Ð»Ð¸, Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Ð´Ð¾Ð¿ÑŠÐ»Ð½Ð¸Ñ‚ÐµÐ»Ð½Ð¸ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸ Ð·Ð° Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ:
 # ^DirText
-Ïðîãðàìàòà ùå èíñòàëèðà $(^NameDA) â ïîñî÷åíàòà ïàïêà. Çà äà èíñòàëèðàòå â äðóãà ïàïêà, íàòèñíåòå "Ïðåãëåä" è èçáåðåòå äðóãà ïàïêà. $_CLICK
+ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð°Ñ‚Ð° Ñ‰Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð° $(^NameDA) Ð² Ð¿Ð¾Ñ�Ð¾Ñ‡ÐµÐ½Ð°Ñ‚Ð° Ð¿Ð°Ð¿ÐºÐ°. Ð—Ð° Ð´Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ñ‚Ðµ Ð² Ð´Ñ€ÑƒÐ³Ð° Ð¿Ð°Ð¿ÐºÐ°, Ð½Ð°Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ "ÐŸÑ€ÐµÐ³Ð»ÐµÐ´" Ð¸ Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Ð´Ñ€ÑƒÐ³Ð° Ð¿Ð°Ð¿ÐºÐ°. $_CLICK
 # ^DirSubText
-Öåëåâà ïàïêà
+Ð¦ÐµÐ»ÐµÐ²Ð° Ð¿Ð°Ð¿ÐºÐ°
 # ^DirBrowseText
-Èçáåðåòå ïàïêà, â êîÿòî äà ñå èíñòàëèðà $(^NameDA):
+Ð˜Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Ð¿Ð°Ð¿ÐºÐ°, Ð² ÐºÐ¾Ñ�Ñ‚Ð¾ Ð´Ð° Ñ�Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð° $(^NameDA):
 # ^UnDirText
-Ïðîãðàìàòà ùå èçòðèå $(^NameDA) îò ñëåäíàòà ïàïêà. Çà äà èçòðèåòå îò äðóãà ïàïêà, íàòèñíåòå "Ïðåãëåä" è èçáåðåòå äðóãà ïàïêà. $_CLICK
+ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð°Ñ‚Ð° Ñ‰Ðµ Ð¸Ð·Ñ‚Ñ€Ð¸Ðµ $(^NameDA) Ð¾Ñ‚ Ñ�Ð»ÐµÐ´Ð½Ð°Ñ‚Ð° Ð¿Ð°Ð¿ÐºÐ°. Ð—Ð° Ð´Ð° Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ Ð¾Ñ‚ Ð´Ñ€ÑƒÐ³Ð° Ð¿Ð°Ð¿ÐºÐ°, Ð½Ð°Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ "ÐŸÑ€ÐµÐ³Ð»ÐµÐ´" Ð¸ Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Ð´Ñ€ÑƒÐ³Ð° Ð¿Ð°Ð¿ÐºÐ°. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Èçáåðåòå ïàïêàòà îò êîÿòî äà ñå èçòðèå $(^NameDA):
+Ð˜Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Ð¿Ð°Ð¿ÐºÐ°Ñ‚Ð° Ð¾Ñ‚ ÐºÐ¾Ñ�Ñ‚Ð¾ Ð´Ð° Ñ�Ðµ Ð¸Ð·Ñ‚Ñ€Ð¸Ðµ $(^NameDA):
 # ^SpaceAvailable
-"Ñâîáîäíî ïðîñòðàíñòâî: "
+"Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð¾ Ð¿Ñ€Ð¾Ñ�Ñ‚Ñ€Ð°Ð½Ñ�Ñ‚Ð²Ð¾: "
 #^SpaceRequired
-"Íåîáõîäèìî ïðîñòðàíñòâî: "
+"Ð�ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ð¿Ñ€Ð¾Ñ�Ñ‚Ñ€Ð°Ð½Ñ�Ñ‚Ð²Ð¾: "
 # ^UninstallingText
-$(^NameDA) ùå áúäå èçòðèòà îò ñëåäíàòà ïàïêà. $_CLICK
+$(^NameDA) Ñ‰Ðµ Ð±ÑŠÐ´Ðµ Ð¸Ð·Ñ‚Ñ€Ð¸Ñ‚Ð° Ð¾Ñ‚ Ñ�Ð»ÐµÐ´Ð½Ð°Ñ‚Ð° Ð¿Ð°Ð¿ÐºÐ°. $_CLICK
 # ^UninstallingSubText
-Èçòðèâàíå îò:
+Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð¾Ñ‚:
 # ^FileError
-Ãðåøêà ïðè îòâàðÿíå íà ôàéëà çà çàïèñ: \r\n\t"$0"\r\nÍàòèñíåòå "Ïðåêðàòè", çà äà ïðåêðàòèòå èíñòàëèðàíåòî, "Ïîâòîðè", çà äà îïèòàòå îòíîâî èëè "Èãíîðèðàé", çà äà ïðîïóñíåòå òîçè ôàéë
+Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚Ð²Ð°Ñ€Ñ�Ð½Ðµ Ð½Ð° Ñ„Ð°Ð¹Ð»Ð° Ð·Ð° Ð·Ð°Ð¿Ð¸Ñ�: \r\n\t"$0"\r\nÐ�Ð°Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ "ÐŸÑ€ÐµÐºÑ€Ð°Ñ‚Ð¸", Ð·Ð° Ð´Ð° Ð¿Ñ€ÐµÐºÑ€Ð°Ñ‚Ð¸Ñ‚Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾, "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸", Ð·Ð° Ð´Ð° Ð¾Ð¿Ð¸Ñ‚Ð°Ñ‚Ðµ Ð¾Ñ‚Ð½Ð¾Ð²Ð¾ Ð¸Ð»Ð¸ "Ð˜Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð°Ð¹", Ð·Ð° Ð´Ð° Ð¿Ñ€Ð¾Ð¿ÑƒÑ�Ð½ÐµÑ‚Ðµ Ñ‚Ð¾Ð·Ð¸ Ñ„Ð°Ð¹Ð»
 # ^FileError_NoIgnore
-Ãðåøêà ïðè îòâàðÿíå íà ôàéëà çà çàïèñ: \r\n\t"$0"\r\nÍàòèñíåòå "Ïîâòîðè", çà äà îïèòàòå îòíîâî èëè "Ïðåêðàòè", çà äà ïðåêðàòèòå èíñòàëèðàíåòî.
+Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚Ð²Ð°Ñ€Ñ�Ð½Ðµ Ð½Ð° Ñ„Ð°Ð¹Ð»Ð° Ð·Ð° Ð·Ð°Ð¿Ð¸Ñ�: \r\n\t"$0"\r\nÐ�Ð°Ñ‚Ð¸Ñ�Ð½ÐµÑ‚Ðµ "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸", Ð·Ð° Ð´Ð° Ð¾Ð¿Ð¸Ñ‚Ð°Ñ‚Ðµ Ð¾Ñ‚Ð½Ð¾Ð²Ð¾ Ð¸Ð»Ð¸ "ÐŸÑ€ÐµÐºÑ€Ð°Ñ‚Ð¸", Ð·Ð° Ð´Ð° Ð¿Ñ€ÐµÐºÑ€Ð°Ñ‚Ð¸Ñ‚Ðµ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾.
 # ^CantWrite
-"Íåóñïåøíî çàïèñâàíå íà: "
+"Ð�ÐµÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾ Ð·Ð°Ð¿Ð¸Ñ�Ð²Ð°Ð½Ðµ Ð½Ð°: "
 #^CopyFailed
-Êîïèðàíåòî íåóñïåøíî
+ÐšÐ¾Ð¿Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ Ð½ÐµÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾
 # ^CopyTo
-"Êîïèðàíå íà "
+"ÐšÐ¾Ð¿Ð¸Ñ€Ð°Ð½Ðµ Ð½Ð° "
 # ^Registering
-"Ðåãèñòðèðàíå íà: "
+"Ð ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ð¸Ñ€Ð°Ð½Ðµ Ð½Ð°: "
 # ^Unregistering
-"Äåðåãèñòðèðàíå íà: "
+"Ð”ÐµÑ€ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ð¸Ñ€Ð°Ð½Ðµ Ð½Ð°: "
 #^SymbolNotFound
-"Ñèìâîëúò íå å íàìåðåí: "
+"Ð¡Ð¸Ð¼Ð²Ð¾Ð»ÑŠÑ‚ Ð½Ðµ Ðµ Ð½Ð°Ð¼ÐµÑ€ÐµÐ½: "
 # ^CouldNotLoad
-"Íåóñïåøíî çàðåæäàíå íà: "
+"Ð�ÐµÑƒÑ�Ð¿ÐµÑˆÐ½Ð¾ Ð·Ð°Ñ€ÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð°: "
 # ^CreateFolder
-"Ñúçäàâàíå íà ïàïêà: "
+"Ð¡ÑŠÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°: "
 # ^CreateShortcut
-"Ñúçäàâàíå íà ïðÿê ïúò: "
+"Ð¡ÑŠÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ñ€Ñ�Ðº Ð¿ÑŠÑ‚: "
 #^CreatedUninstaller
-"Ñúçäàâàíå íà ïðîãðàìà çà èçòðèâàíå: "
+"Ð¡ÑŠÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° Ð·Ð° Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ: "
 # ^Delete
-"Èçòðèâàíå íà: "
+"Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð½Ð°: "
 #^DeleteOnReboot
-"Èçòðèâàíå ñëåä ðåñòàðò: "
+"Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ñ�Ð»ÐµÐ´ Ñ€ÐµÑ�Ñ‚Ð°Ñ€Ñ‚: "
 #^ErrorCreatingShortcut
-"Ãðåøêà ïðè ñúçäàâàíå íà ïðåêèÿ ïúò: "
+"Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ñ�ÑŠÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ñ€ÐµÐºÐ¸Ñ� Ð¿ÑŠÑ‚: "
 #^ErrorCreating
-"Ãðåøêà ïðè ñúçäàâàíå íà: "
+"Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ñ�ÑŠÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð°: "
 # ^ErrorDecompressing
-Ãðåøêà ïðè äåêîìïðåñèðàíå íà äàííèòå! Âåðîÿòíî èíñòàëàöèîííèÿ ïàêåò å ïîâðåäåí.
+Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð´ÐµÐºÐ¾Ð¼Ð¿Ñ€ÐµÑ�Ð¸Ñ€Ð°Ð½Ðµ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸Ñ‚Ðµ! Ð’ÐµÑ€Ð¾Ñ�Ñ‚Ð½Ð¾ Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¸Ñ� Ð¿Ð°ÐºÐµÑ‚ Ðµ Ð¿Ð¾Ð²Ñ€ÐµÐ´ÐµÐ½.
 # ^ErrorRegistering
-Ãðåøêà ïðè ðåãèñòðèðàíå íà DLL
+Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ñ€ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ð¸Ñ€Ð°Ð½Ðµ Ð½Ð° DLL
 #^ExecShell
 "ExecShell: "
 #^Exec
-"Èçïúëíåíèå íà: "
+"Ð˜Ð·Ð¿ÑŠÐ»Ð½ÐµÐ½Ð¸Ðµ Ð½Ð°: "
 #^Extract
-"Èçâëè÷àíå íà: "
+"Ð˜Ð·Ð²Ð»Ð¸Ñ‡Ð°Ð½Ðµ Ð½Ð°: "
 #^ErrorWriting
-"Èçâëè÷àíå íà: ãðåøêà ïðè çàïèñ âúâ ôàéë "
+"Ð˜Ð·Ð²Ð»Ð¸Ñ‡Ð°Ð½Ðµ Ð½Ð°: Ð³Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°Ð¿Ð¸Ñ� Ð²ÑŠÐ² Ñ„Ð°Ð¹Ð» "
 #^InvalidOpcode
-Ïàêåòà å ïîâðåäåí: ãðåøåí êîä íà îïåðàöèÿ
+ÐŸÐ°ÐºÐµÑ‚Ð° Ðµ Ð¿Ð¾Ð²Ñ€ÐµÐ´ÐµÐ½: Ð³Ñ€ÐµÑˆÐµÐ½ ÐºÐ¾Ð´ Ð½Ð° Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ�
 # ^NoOLE
-"Íÿìà OLE çà: "
+"Ð�Ñ�Ð¼Ð° OLE Ð·Ð°: "
 #^OutputFolder
-"Èíñòàëèðàíå â ïàïêà: "
+"Ð˜Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ðµ Ð² Ð¿Ð°Ð¿ÐºÐ°: "
 #^RemoveFolder
-"Èçòðèâàíå íà ïàïêà: "
+"Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°: "
 #^RenameOnReboot
-"Ïðåèìåíóâàíå ïðè ðåñòàðò: "
+"ÐŸÑ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ðµ Ð¿Ñ€Ð¸ Ñ€ÐµÑ�Ñ‚Ð°Ñ€Ñ‚: "
 # ^Rename
-"Ïðåèìåíóâàíå íà: "
+"ÐŸÑ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ðµ Ð½Ð°: "
 #^Skipped
-"Ïðîïóñêàíå íà: "
+"ÐŸÑ€Ð¾Ð¿ÑƒÑ�ÐºÐ°Ð½Ðµ Ð½Ð°: "
 # ^CopyDetails
-Êîïèðàíå íà äàííèòå â áóôåðà
+ÐšÐ¾Ð¿Ð¸Ñ€Ð°Ð½Ðµ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸Ñ‚Ðµ Ð² Ð±ÑƒÑ„ÐµÑ€Ð°
 # ^LogInstall
-Çàïèñâàíå íà îò÷åò çà èíñòàëèðàíåòî
+Ð—Ð°Ð¿Ð¸Ñ�Ð²Ð°Ð½Ðµ Ð½Ð° Ð¾Ñ‚Ñ‡ÐµÑ‚ Ð·Ð° Ð¸Ð½Ñ�Ñ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾
 # ^Byte
-Á
+Ð‘
 # ^Kilo
- Ê
+ Ðš
 # ^Mega
- Ì
+ Ðœ
 # ^Giga
- Ã 
\ No newline at end of file
+ Ð“ 
\ No newline at end of file
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Tatar.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Tatar.nlf	(revision 0)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Tatar.nlf	(revision 2956)
@@ -0,0 +1,190 @@
+ï»¿# Header, don't edit
+NLF v6
+# Language ID
+1092
+# Font and size - dash (-) means default
+-
+-
+# Codepage - dash (-) means ASCII code page
+1251
+# RTL - anything else than RTL means LTR
+-
+# Translation by Bulat Azat uly [ bulat_ibrahim@mail.ru ]
+# ^Branding
+Nullsoft Install System %s
+# ^SetupCaption
+Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ $(^Name)
+# ^UninstallCaption
+Ð‘ÐµÑ‚ÐµÑ€Ò¯ $(^Name)
+# ^LicenseSubCaption
+: Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ� ÐºÐ¸Ð»ÐµÑˆÒ¯Ðµ
+# ^ComponentsSubCaption
+: Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ ÑˆÐ°Ñ€Ñ‚Ð»Ð°Ñ€Ñ‹
+# ^DirSubCaption
+: Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ð¿Ð°Ð¿ÐºÐ°Ñ�Ñ‹
+# ^InstallingSubCaption
+: Ð¤Ð°Ð¹Ð»Ð»Ð°Ñ€Ð½Ñ‹ ÐºÒ¯Ñ‡ÐµÑ€Ð¼Ó™Ð»Ó™Ò¯
+# ^CompletedSubCaption
+: Ð“Ð°Ð¼Ó™Ð» Ñ‚Ó™Ð¼Ð°Ð¼Ð»Ð°Ð½Ð´Ñ‹
+# ^UnComponentsSubCaption
+: Ð‘ÐµÑ‚ÐµÑ€Ò¯ ÑˆÐ°Ñ€Ñ‚Ð»Ð°Ñ€Ñ‹
+# ^UnDirSubCaption
+: Ð‘ÐµÑ‚ÐµÑ€Ò¯ Ð¿Ð°Ð¿ÐºÐ°Ñ�Ñ‹
+# ^ConfirmSubCaption
+: Ð Ð°Ñ�Ð»Ð°Ñƒ
+# ^UninstallingSubCaption
+: Ð¤Ð°Ð¹Ð»Ð»Ð°Ñ€Ð½Ñ‹ Ð±ÐµÑ‚ÐµÑ€Ò¯
+# ^UnCompletedSubCaption
+: Ð“Ð°Ð¼Ó™Ð» Ñ‚Ó™Ð¼Ð°Ð¼Ð»Ð°Ð½Ð´Ñ‹
+# ^BackBtn
+< &Ð�Ñ€Ñ‚ÐºÐ°
+# ^NextBtn
+&Ð�Ð»Ð³Ð° >
+# ^AgreeBtn
+ÐšÐ°Ð±ÑƒÐ» Ð¸Ñ‚&Ó™Ð¼
+# ^AcceptBtn
+ÐœÐ¸Ð½ &ÐºÐ¸Ð»ÐµÑˆÒ¯ ÑˆÐ°Ñ€Ñ‚Ð»Ð°Ñ€Ñ‹Ð½ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ó™Ð¼
+# ^DontAcceptBtn
+ÐœÐ¸Ð½ &ÐºÐ¸Ð»ÐµÑˆÒ¯ ÑˆÐ°Ñ€Ñ‚Ð»Ð°Ñ€Ñ‹Ð½ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ð¸Ð¼Ð¸
+# ^InstallBtn
+&Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñ‹Ñ€Ð³Ð°
+# ^UninstallBtn
+Ð‘Ðµ&Ñ‚ÐµÑ€ÐµÑ€Ð³Ó™
+# ^CancelBtn
+Ð‘Ð°Ñˆ Ñ‚Ð°Ñ€Ñ‚Ñƒ
+# ^CloseBtn
+&Ð¯Ð±Ð°Ñ€Ð³Ð°
+# ^BrowseBtn
+Ðš&Ð°Ñ€Ð°Ñ€Ð³Ð°...
+# ^ShowDetailsBtn
+&Ð¢ÑƒÐ»Ñ‹Ñ€Ð°Ðº...
+# ^ClickNext
+Ð”Ó™Ð²Ð°Ð¼ Ð¸Ñ‚Ò¯ Ó©Ñ‡ÐµÐ½ 'Ð�Ð»Ð³Ð°' Ñ‚Ó©Ð¹Ð¼Ó™Ñ�ÐµÐ½Ó™ Ð±Ð°Ñ�Ñ‹Ð³Ñ‹Ð·.
+# ^ClickInstall
+ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°Ð½Ñ‹ ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ó©Ñ‡ÐµÐ½ 'Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñ‹Ñ€Ð³Ð°' Ñ‚Ó©Ð¹Ð¼Ó™Ñ�ÐµÐ½Ó™ Ð±Ð°Ñ�Ñ‹Ð³Ñ‹Ð·.
+# ^ClickUninstall
+ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°Ð½Ñ‹ Ð±ÐµÑ‚ÐµÑ€Ò¯ Ó©Ñ‡ÐµÐ½ 'Ð‘ÐµÑ‚ÐµÑ€ÐµÑ€Ð³Ó™' Ñ‚Ó©Ð¹Ð¼Ó™Ñ�ÐµÐ½Ó™ Ð±Ð°Ñ�Ñ‹Ð³Ñ‹Ð·.
+# ^Name
+Ð˜Ñ�ÐµÐ¼
+# ^Completed
+Ó˜Ð·ÐµÑ€
+# ^LicenseText
+$(^NameDA) ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ð°Ð»Ð´Ñ‹Ð½Ð½Ð°Ð½ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ� ÐºÐ¸Ð»ÐµÑˆÒ¯Ðµ Ð±ÐµÐ»Ó™Ð½ Ñ‚Ð°Ð½Ñ‹ÑˆÑ‹Ð³Ñ‹Ð·. ÐšÐ¸Ð»ÐµÑˆÒ¯ ÑˆÐ°Ñ€Ñ‚Ð»Ð°Ñ€Ñ‹Ð½ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ñ�Ó™Ð³ÐµÐ·, 'ÐšÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ó™Ð¼' Ñ‚Ó©Ð¹Ð¼Ó™Ñ�ÐµÐ½Ó™ Ð±Ð°Ñ�Ñ‹Ð³Ñ‹Ð·.
+# ^LicenseTextCB
+$(^NameDA) ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ð°Ð»Ð´Ñ‹Ð½Ð½Ð°Ð½ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ� ÐºÐ¸Ð»ÐµÑˆÒ¯Ðµ Ð±ÐµÐ»Ó™Ð½ Ñ‚Ð°Ð½Ñ‹ÑˆÑ‹Ð³Ñ‹Ð·. ÐšÐ¸Ð»ÐµÑˆÒ¯ ÑˆÐ°Ñ€Ñ‚Ð»Ð°Ñ€Ñ‹Ð½ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ñ�Ó™Ð³ÐµÐ·, Ñ‚Ò¯Ð±Ó™Ð½Ð´Ó™ Ð±Ð¸Ð»Ð³Ðµ ÐºÑƒÐµÐ³Ñ‹Ð·. $_CLICK
+# ^LicenseTextRB
+$(^NameDA) ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ð°Ð»Ð´Ñ‹Ð½Ð½Ð°Ð½ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ� ÐºÐ¸Ð»ÐµÑˆÒ¯Ðµ Ð±ÐµÐ»Ó™Ð½ Ñ‚Ð°Ð½Ñ‹ÑˆÑ‹Ð³Ñ‹Ð·. ÐšÐ¸Ð»ÐµÑˆÒ¯ ÑˆÐ°Ñ€Ñ‚Ð»Ð°Ñ€Ñ‹Ð½ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ñ�Ó™Ð³ÐµÐ·, Ñ‚Ò¯Ð±Ó™Ð½Ð´Ó™Ð³Ðµ Ð²Ð°Ñ€Ð¸Ð°Ð½Ñ‚Ð»Ð°Ñ€Ð´Ð°Ð½ Ð±ÐµÑ€ÐµÐ½Ñ‡ÐµÑ�ÐµÐ½ Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·. $_CLICK
+# ^UnLicenseText
+$(^NameDA) ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ð°Ð»Ð´Ñ‹Ð½Ð½Ð°Ð½ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ� ÐºÐ¸Ð»ÐµÑˆÒ¯Ðµ Ð±ÐµÐ»Ó™Ð½ Ñ‚Ð°Ð½Ñ‹ÑˆÑ‹Ð³Ñ‹Ð·. ÐšÐ¸Ð»ÐµÑˆÒ¯ ÑˆÐ°Ñ€Ñ‚Ð»Ð°Ñ€Ñ‹Ð½ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ñ�Ó™Ð³ÐµÐ·, 'ÐšÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ó™Ð¼' Ñ‚Ó©Ð¹Ð¼Ó™Ñ�ÐµÐ½Ó™ Ð±Ð°Ñ�Ñ‹Ð³Ñ‹Ð·.
+# ^UnLicenseTextCB
+$(^NameDA) ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ð°Ð»Ð´Ñ‹Ð½Ð½Ð°Ð½ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ� ÐºÐ¸Ð»ÐµÑˆÒ¯Ðµ Ð±ÐµÐ»Ó™Ð½ Ñ‚Ð°Ð½Ñ‹ÑˆÑ‹Ð³Ñ‹Ð·. ÐšÐ¸Ð»ÐµÑˆÒ¯ ÑˆÐ°Ñ€Ñ‚Ð»Ð°Ñ€Ñ‹Ð½ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ñ�Ó™Ð³ÐµÐ·, Ñ‚Ò¯Ð±Ó™Ð½Ð´Ó™ Ð±Ð¸Ð»Ð³Ðµ ÐºÑƒÐµÐ³Ñ‹Ð·. $_CLICK
+# ^UnLicenseTextRB
+$(^NameDA) ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ð°Ð»Ð´Ñ‹Ð½Ð½Ð°Ð½ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ� ÐºÐ¸Ð»ÐµÑˆÒ¯Ðµ Ð±ÐµÐ»Ó™Ð½ Ñ‚Ð°Ð½Ñ‹ÑˆÑ‹Ð³Ñ‹Ð·. ÐšÐ¸Ð»ÐµÑˆÒ¯ ÑˆÐ°Ñ€Ñ‚Ð»Ð°Ñ€Ñ‹Ð½ ÐºÐ°Ð±ÑƒÐ» Ð¸Ñ‚Ñ�Ó™Ð³ÐµÐ·, Ñ‚Ò¯Ð±Ó™Ð½Ð´Ó™Ð³Ðµ Ð²Ð°Ñ€Ð¸Ð°Ð½Ñ‚Ð»Ð°Ñ€Ð´Ð°Ð½ Ð±ÐµÑ€ÐµÐ½Ñ‡ÐµÑ�ÐµÐ½ Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·. $_CLICK
+# ^Custom
+Ð¡Ð°Ð¹Ð»Ð°Ð¿ ÐºÑ‹Ð½Ð°
+# ^ComponentsText
+ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°Ð½Ñ‹Ò£ ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñ‹Ñ€Ð³Ð° Ñ‚ÐµÐ»Ó™Ð³Ó™Ð½ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð»Ð°Ñ€Ñ‹Ð½ Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·. $_CLICK
+# ^ComponentsSubText1
+Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ñ‚Ó©Ñ€ÐµÐ½ Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·:
+# ^ComponentsSubText2_NoInstTypes
+Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ó©Ñ‡ÐµÐ½ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°Ð½Ñ‹Ò£ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð»Ð°Ñ€Ñ‹Ð½ Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·:
+# ^ComponentsSubText2
+Ñ�ÐºÐ¸ ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ó©Ñ‡ÐµÐ½ Ó©Ñ�Ñ‚Ó™Ð¼Ó™ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð»Ð°Ñ€ Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·:
+# ^UnComponentsText
+Ð‘ÐµÑ‚ÐµÑ€ÐµÑ€Ð³Ó™ Ñ‚ÐµÐ»Ó™Ð³Ó™Ð½ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð»Ð°Ñ€Ð½Ñ‹ Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·. $_CLICK
+# ^UnComponentsSubText1
+Ð‘ÐµÑ‚ÐµÑ€Ò¯ Ñ‚Ó©Ñ€ÐµÐ½ Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·:
+# ^UnComponentsSubText2_NoInstTypes
+Ð‘ÐµÑ‚ÐµÑ€Ò¯ Ó©Ñ‡ÐµÐ½ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð»Ð°Ñ€Ð½Ñ‹ Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·:
+# ^UnComponentsSubText2
+Ñ�ÐºÐ¸ Ð±ÐµÑ‚ÐµÑ€Ò¯ Ó©Ñ‡ÐµÐ½ Ó©Ñ�Ñ‚Ó™Ð¼Ó™ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð»Ð°Ñ€Ð½Ñ‹ Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·:
+# ^DirText
+ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° $(^NameDA) Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°Ñ�Ñ‹Ð½ ÐºÒ¯Ñ€Ñ�Ó™Ñ‚ÐµÑ€Ð»Ó™Ð½ Ð¿Ð°Ð¿ÐºÐ°Ð³Ð° ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ð°Ñ‡Ð°Ðº. Ð‘Ð°ÑˆÐºÐ° Ð¿Ð°Ð¿ÐºÐ°Ð³Ð° ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ó©Ñ‡ÐµÐ½, 'ÐšÐ°Ñ€Ð°Ñ€Ð³Ð°' Ñ‚Ó©Ð¹Ð¼Ó™Ñ�ÐµÐ½Ó™ Ð±Ð°Ñ�Ñ‹Ð³Ñ‹Ð· Ò»Ó™Ð¼ ÑƒÑ€Ñ‹Ð½ ÐºÒ¯Ñ€Ñ�Ó™Ñ‚ÐµÐ³ÐµÐ·. $_CLICK
+# ^DirSubText
+Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ð¿Ð°Ð¿ÐºÐ°Ñ�Ñ‹
+# ^DirBrowseText
+$(^NameDA) ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ó©Ñ‡ÐµÐ½ Ð¿Ð°Ð¿ÐºÐ° Ñ�Ð°Ð¹Ð»Ð°Ð³Ñ‹Ð·:
+# ^UnDirText
+ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° $(^NameDA) Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°Ñ�Ñ‹Ð½ ÐºÒ¯Ñ€Ñ�Ó™Ñ‚ÐµÐ»Ð³Ó™Ð½ Ð¿Ð°Ð¿ÐºÐ°Ð´Ð°Ð½ Ð±ÐµÑ‚ÐµÑ€Ó™Ñ‡Ó™Ðº. Ð‘Ð°ÑˆÐºÐ° Ð¿Ð°Ð¿ÐºÐ°Ð´Ð°Ð½ Ð±ÐµÑ‚ÐµÑ€Ò¯ Ó©Ñ‡ÐµÐ½, 'ÐšÐ°Ñ€Ð°Ñ€Ð³Ð°' Ñ‚Ó©Ð¹Ð¼Ó™Ñ�ÐµÐ½Ó™ Ð±Ð°Ñ�Ñ‹Ð³Ñ‹Ð· Ò»Ó™Ð¼ ÑƒÑ€Ñ‹Ð½ ÐºÒ¯Ñ€Ñ�Ó™Ñ‚ÐµÐ³ÐµÐ·. $_CLICK
+# ^UnDirSubText
+""
+# ^UnDirBrowseText
+$(^NameDA) Ð±ÐµÑ‚ÐµÑ€ÐµÑ€Ð³Ó™ ÐºÐ¸Ñ€Ó™Ðº Ð±ÑƒÐ»Ð³Ð°Ð½ Ð¿Ð°Ð¿ÐºÐ°Ð½Ñ‹ ÐºÒ¯Ñ€Ñ�Ó™Ñ‚ÐµÐ³ÐµÐ·:
+# ^SpaceAvailable
+"Ð”Ð¸Ñ�ÐºÑ‚Ð° Ð±ÑƒÑˆ ÑƒÑ€Ñ‹Ð½: "
+# ^SpaceRequired
+"Ð”Ð¸Ñ�ÐºÑ‚Ð° ÐºÐ¸Ñ€Ó™Ðº ÑƒÑ€Ñ‹Ð½: "
+# ^UninstallingText
+$(^NameDA) Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°Ñ�Ñ‹ Ñ�Ð°Ð½Ð°Ð³Ñ‹Ð³Ñ‹Ð·Ð´Ð°Ð½ Ð±ÐµÑ‚ÐµÑ€ÐµÐ»Ó™Ñ‡Ó™Ðº. $_CLICK
+# ^UninstallingSubText
+ÐœÐ¾Ð½Ð½Ð°Ð½ Ð±ÐµÑ‚ÐµÑ€Ò¯:
+# ^FileError
+Ð¯Ð·Ð´Ñ‹Ñ€Ñƒ Ó©Ñ‡ÐµÐ½ Ñ„Ð°Ð¹Ð»Ð½Ñ‹ Ð°Ñ‡Ñ‹Ð¿ Ð±ÑƒÐ»Ð¼Ñ‹Ð¹: \r\n\t"$0"\r\n'Ð¢ÑƒÐºÑ‚Ð°Ñ‚Ñƒ': ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€ÑƒÐ½Ñ‹ Ñ‚ÑƒÐºÑ‚Ð°Ñ‚Ñ‹Ñ€Ð³Ð°;\r\n"ÐšÐ°Ð±Ð°Ñ‚Ð»Ð°Ñƒ": Ð¾Ð¼Ñ‚Ñ‹Ð»Ñ‹ÑˆÐ½Ñ‹ ÐºÐ°Ð±Ð°Ñ‚Ð»Ð°Ñ€Ð³Ð°;\r\n"ÐšÐ°Ð»Ð´Ñ‹Ñ€Ñƒ": Ð±Ñƒ Ð³Ð°Ð¼Ó™Ð»Ð½Ðµ Ñ‚Ó©ÑˆÐµÑ€ÐµÐ¿ ÐºÐ°Ð»Ð´Ñ‹Ñ€Ñ‹Ñ€Ð³Ð°.
+# ^FileError_NoIgnore
+Ð¯Ð·Ð´Ñ‹Ñ€Ñƒ Ó©Ñ‡ÐµÐ½ Ñ„Ð°Ð¹Ð»Ð½Ñ‹ Ð°Ñ‡Ñ‹Ð¿ Ð±ÑƒÐ»Ð¼Ñ‹Ð¹: \r\n\t"$0"\r\n'ÐšÐ°Ð±Ð°Ñ‚Ð»Ð°Ñƒ': Ð¾Ð¼Ñ‚Ñ‹Ð»Ñ‹ÑˆÐ½Ñ‹ ÐºÐ°Ð±Ð°Ñ‚Ð»Ð°Ñ€Ð³Ð°;\r\n'Ð‘Ð°Ñˆ Ñ‚Ð°Ñ€Ñ‚Ñƒ': ÑƒÑ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ð±Ð°Ñ€Ñ‹ÑˆÑ‹Ð½ Ñ‚ÑƒÐºÑ‚Ð°Ñ‚Ñ‹Ñ€Ð³Ð°.
+# ^CantWrite
+"Ð¯Ð·Ð´Ñ‹Ñ€Ñ‹Ð¿ Ð±ÑƒÐ»Ð¼Ñ‹Ð¹: "
+# ^CopyFailed
+ÐšÒ¯Ñ‡ÐµÑ€Ð¼Ó™ Ñ�Ñ�Ð°ÑƒÐ´Ð° Ñ…Ð°Ñ‚Ð°
+# ^CopyTo
+"ÐœÐ¾Ð½Ð´Ð° ÐºÒ¯Ñ‡ÐµÑ€Ð¼Ó™Ð»Ó™Ò¯: "
+# ^Registering
+"Ð¢ÐµÑ€ÐºÓ™Ð»Ò¯: "
+# ^Unregistering
+"Ð¢ÐµÑ€ÐºÓ™Ò¯Ð´Ó™Ð½ Ð±Ð°Ñˆ Ñ‚Ð°Ñ€Ñ‚Ñƒ: "
+# ^SymbolNotFound
+"Ð¡Ð¸Ð¼Ð²Ð¾Ð»Ð½Ñ‹ Ñ‚Ð°Ð±Ñ‹Ð¿ Ð±ÑƒÐ»Ð¼Ñ‹Ð¹: "
+# ^CouldNotLoad
+"Ð™Ó©ÐºÐ»Ó™Ð¿ Ð±ÑƒÐ»Ð¼Ñ‹Ð¹: "
+# ^CreateFolder
+"ÐŸÐ°Ð¿ÐºÐ° Ñ�Ñ�Ð°Ñƒ: "
+# ^CreateShortcut
+"Ð¡Ñ‹Ð»Ñ‚Ð°Ð¼Ð° Ñ�Ñ�Ð°Ñƒ: "
+# ^CreatedUninstaller
+"Ð‘ÐµÑ‚ÐµÑ€Ò¯ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°Ñ�Ñ‹Ð½ Ñ�Ñ�Ð°Ñƒ: "
+# ^Delete
+"Ð¤Ð°Ð¹Ð»Ð½Ñ‹ Ð±ÐµÑ‚ÐµÑ€Ò¯: "
+# ^DeleteOnReboot
+"Ð¡Ð°Ð½Ð°Ðº Ñ�Ò¯Ð½Ð´ÐµÑ€ÐµÐ¿ ÐºÐ°Ð±Ñ‹Ð·Ñ‹Ð»Ð³Ð°Ð½Ð´Ð° Ð±ÐµÑ‚ÐµÑ€Ò¯: "
+# ^ErrorCreatingShortcut
+"Ð¡Ñ‹Ð»Ñ‚Ð°Ð¼Ð° Ñ�Ñ�Ð°ÑƒÐ´Ð° Ñ…Ð°Ñ‚Ð°: " 
+# ^ErrorCreating
+"Ð¯Ñ�Ð°ÑƒÐ´Ð° Ñ…Ð°Ñ‚Ð°: "
+# ^ErrorDecompressing
+ÐœÓ™Ð³ÑŠÐ»Ò¯Ð¼Ð°Ñ‚Ð»Ð°Ñ€Ð½Ñ‹ Ñ‡Ñ‹Ð³Ð°Ñ€ÑƒÐ´Ð° Ñ…Ð°Ñ‚Ð°! Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€ÑƒÑ‡Ñ‹ Ð±Ð¾Ð·Ñ‹Ðº Ð±ÑƒÐ»ÑƒÑ‹ Ð¼Ó©Ð¼ÐºÐ¸Ð½.
+# ^ErrorRegistering
+DLL Ñ‚ÐµÑ€ÐºÓ™Ò¯Ð´Ó™ Ñ…Ð°Ñ‚Ð°
+# ^ExecShell
+"Ð¢Ñ‹ÑˆÑ‡Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ�Ñ‹Ð½ Ð±Ð°ÑˆÐºÐ°Ñ€Ñƒ: " 
+# ^Exec
+"Ð‘Ð°ÑˆÐºÐ°Ñ€Ñƒ: "
+# ^Extract
+"Ð§Ñ‹Ð³Ð°Ñ€Ñƒ: "
+# ^ErrorWriting
+"Ð§Ñ‹Ð³Ð°Ñ€Ñƒ: Ñ„Ð°Ð¹Ð» Ñ�Ð·Ð´Ñ‹Ñ€ÑƒÐ´Ð° Ñ…Ð°Ñ‚Ð° "
+# ^InvalidOpcode
+Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€ÑƒÑ‡Ñ‹ Ð±Ð¾Ð·Ñ‹Ð»Ð³Ð°Ð½: Ð¼Ó©Ð¼ÐºÐ¸Ð½ Ð±ÑƒÐ»Ð¼Ð°Ð³Ð°Ð½ ÐºÐ¾Ð´
+# ^NoOLE
+"OLE Ð¼Ð¾Ð½Ñ‹Ò£ Ó©Ñ‡ÐµÐ½ ÑŽÐº: " 
+# ^OutputFolder
+"Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ð¿Ð°Ð¿ÐºÐ°Ñ�Ñ‹: "
+# ^RemoveFolder
+"ÐŸÐ°Ð¿ÐºÐ°Ð½Ñ‹ Ð±ÐµÑ‚ÐµÑ€Ò¯: "
+# ^RenameOnReboot
+"Ð¡Ð°Ð½Ð°Ðº Ñ�Ò¯Ð½Ð´ÐµÑ€ÐµÐ¿ ÐºÐ°Ð±Ñ‹Ð·Ñ‹Ð»Ð³Ð°Ð½Ð´Ð° Ð¸Ñ�ÐµÐ¼ÐµÐ½ Ò¯Ð·Ð³Ó™Ñ€Ñ‚Ò¯: "
+# ^Rename
+"Ð˜Ñ�ÐµÐ¼ÐµÐ½ Ò¯Ð·Ð³Ó™Ñ€Ñ‚Ò¯: "
+# ^Skipped
+"ÐšÐ°Ð»Ð´Ñ‹Ñ€Ñƒ: "
+# ^CopyDetails
+ÐœÓ™Ð³ÑŠÐ»Ò¯Ð¼Ð°Ñ‚Ð»Ð°Ñ€Ð½Ñ‹ Ð°Ð»Ð¼Ð°ÑˆÑ‹Ð½Ñƒ Ð±ÑƒÑ„ÐµÑ€Ñ‹Ð½Ð° ÐºÒ¯Ñ‡ÐµÑ€Ð¼Ó™Ð»Ó™Ñ€Ð³Ó™
+# ^LogInstall
+Ð£Ñ€Ð½Ð°ÑˆÑ‚Ñ‹Ñ€Ñƒ Ñ…Ð¸Ñ�Ð°Ð±Ñ‹Ð½ Ð°Ð»Ñ‹Ð¿ Ð±Ð°Ñ€Ñ‹Ñ€Ð³Ð°
+# byte (Ð±Ð°Ð¹Ñ‚)
+Ð±
+# kilo
+ Ðš
+# mega
+ Ðœ
+# giga
+ Ð“
\ No newline at end of file
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Catalan.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Catalan.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Catalan.nsh	(revision 2956)
@@ -1,121 +1,121 @@
-;Language: Catalan (1027)
+ï»¿;Language: Catalan (1027)
 ;By falanko, corrections by Toni Hermoso Pulido
 
-!insertmacro LANGFILE "Catalan" "Català"
+!insertmacro LANGFILE "Catalan" = "CatalÃ " "Catala"
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Benvinguts a l'auxiliar d'instal·lació de l'aplicació $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Aquest auxiliar us guiarà durant el procés d'instal·lació de l'aplicació $(^NameDA).$\r$\n$\r$\nEs recomana tancar la resta d'aplicacions abans de començar la instal·lació. Això permetrà al programa d'instal·ació actualitzar fitxers del sistema rellevants sense haver de reiniciar l'ordinador.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Benvinguts a l'auxiliar d'instalÂ·laciÃ³ de l'aplicaciÃ³ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Aquest auxiliar us guiarÃ  durant el procÃ©s d'instalÂ·laciÃ³ de l'aplicaciÃ³ $(^NameDA).$\r$\n$\r$\nEs recomana tancar la resta d'aplicacions abans de comenÃ§ar la instalÂ·laciÃ³. AixÃ² permetrÃ  al programa d'instalÂ·aciÃ³ actualitzar fitxers del sistema rellevants sense haver de reiniciar l'ordinador.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Benvinguts a l'auxiliar de desinstal·lació de l'aplicació $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Aquest auxiliar us guiarà a través de la desinstal·lació de l'aplicació $(^NameDA).$\r$\n\rAbans de començar la desinstal·lació, assegureu-vos que l'aplicació $(^NameDA) no s'està executant.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Benvinguts a l'auxiliar de desinstalÂ·laciÃ³ de l'aplicaciÃ³ $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Aquest auxiliar us guiarÃ  a travÃ©s de la desinstalÂ·laciÃ³ de l'aplicaciÃ³ $(^NameDA).$\r$\n\rAbans de comenÃ§ar la desinstalÂ·laciÃ³, assegureu-vos que l'aplicaciÃ³ $(^NameDA) no s'estÃ  executant.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Acord de Llicència"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Reviseu els termes de la llicència abans d'instal·lar l'aplicació $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Si accepteu tots els termes de l'acord, premeu Hi estic d'acord per a continuar. Heu d'acceptar l'acord per a poder instal·lar l'aplicació $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Si accepteu tots els termes de l'acord, activeu la casella de sota. Heu d'acceptar l'acord per poder instal·lar l'aplicació $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Si accepteu tots els termes de l'acord, seleccioneu la primera opció de sota. Heu d'acceptar l'acord per a poder instal·lar $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Acord de LlicÃ¨ncia"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Reviseu els termes de la llicÃ¨ncia abans d'instalÂ·lar l'aplicaciÃ³ $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Si accepteu tots els termes de l'acord, premeu Hi estic d'acord per a continuar. Heu d'acceptar l'acord per a poder instalÂ·lar l'aplicaciÃ³ $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Si accepteu tots els termes de l'acord, activeu la casella de sota. Heu d'acceptar l'acord per poder instalÂ·lar l'aplicaciÃ³ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Si accepteu tots els termes de l'acord, seleccioneu la primera opciÃ³ de sota. Heu d'acceptar l'acord per a poder instalÂ·lar $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Acord de llicència"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Reviseu els termes de la llicència abans de desinstal·lar l'aplicació $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Si accepteu tots els termes de l'acord, premeu Hi estic d'Acord per a continuar. Heu d'acceptar l'acord per a poder desinstal·lar l'aplicació $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Si accepteu tots els termes de l'acord, activeu la casella de sota. Heu d'acceptar l'acord per a poder desinstal·lar l'aplicació $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Si accepteu tots els termes de l'acord, seleccioneu la primera opció de sota. Heu d'acceptar l'acord per a poder desinstal·lar l'aplicació $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Acord de llicÃ¨ncia"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Reviseu els termes de la llicÃ¨ncia abans de desinstalÂ·lar l'aplicaciÃ³ $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Si accepteu tots els termes de l'acord, premeu Hi estic d'Acord per a continuar. Heu d'acceptar l'acord per a poder desinstalÂ·lar l'aplicaciÃ³ $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Si accepteu tots els termes de l'acord, activeu la casella de sota. Heu d'acceptar l'acord per a poder desinstalÂ·lar l'aplicaciÃ³ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Si accepteu tots els termes de l'acord, seleccioneu la primera opciÃ³ de sota. Heu d'acceptar l'acord per a poder desinstalÂ·lar l'aplicaciÃ³ $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Premeu AvPàg per a veure la resta de l'acord."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Premeu AvPÃ g per a veure la resta de l'acord."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Selecció de components"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Seleccioneu quines característiques de l'aplicació $(^NameDA) desitgeu instal·lar."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "SelecciÃ³ de components"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Seleccioneu quines caracterÃ­stiques de l'aplicaciÃ³ $(^NameDA) desitgeu instalÂ·lar."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Selecció de components"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Seleccioneu quines característiques de l'aplicació $(^NameDA) desitgeu desinstal·lar."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "SelecciÃ³ de components"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Seleccioneu quines caracterÃ­stiques de l'aplicaciÃ³ $(^NameDA) desitgeu desinstalÂ·lar."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Descripció"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "DescripciÃ³"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Situeu el ratolí damunt d'un component per a veure'n la descripció."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Situeu el ratolÃ­ damunt d'un component per a veure'n la descripciÃ³."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Situeu el ratolí damunt d'un component per a veure'n la descripció."
+    #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Trieu una ubicació d'instal·lació"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Trieu la carpeta on instal·lar-hi l'aplicació $(^NameDA)."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Trieu una ubicaciÃ³ d'instalÂ·laciÃ³"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Trieu la carpeta on instalÂ·lar-hi l'aplicaciÃ³ $(^NameDA)."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Trieu la ubicació de desinstal·lació"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Trieu la carpeta d'on desinstal·lar l'aplicació $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Trieu la ubicaciÃ³ de desinstalÂ·laciÃ³"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Trieu la carpeta d'on desinstalÂ·lar l'aplicaciÃ³ $(^NameDA)."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "S'està instal·lant"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Si us plau, espereu mentre l'aplicació $(^NameDA) s'instal·la."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "S'ha acabat la instal·lació"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "La instal·lació ha acabat correctament."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "S'ha abandonat la instal·lació"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "La instal·lació no ha acabat correctament."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "S'estÃ  instalÂ·lant"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Si us plau, espereu mentre l'aplicaciÃ³ $(^NameDA) s'instalÂ·la."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "S'ha acabat la instalÂ·laciÃ³"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "La instalÂ·laciÃ³ ha acabat correctament."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "S'ha abandonat la instalÂ·laciÃ³"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "La instalÂ·laciÃ³ no ha acabat correctament."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "S'està desinstal·lant"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Si us plau, espereu mentre l'aplicació $(^NameDA) es desinstal·la."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "S'ha acabat la desinstal·lació"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "La desinstal·lació s'ha realitzat correctament."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "S'ha abandonat la desinstal·lació"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "La desinstal·lació no ha acabat correctament."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "S'estÃ  desinstalÂ·lant"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Si us plau, espereu mentre l'aplicaciÃ³ $(^NameDA) es desinstalÂ·la."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "S'ha acabat la desinstalÂ·laciÃ³"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "La desinstalÂ·laciÃ³ s'ha realitzat correctament."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "S'ha abandonat la desinstalÂ·laciÃ³"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "La desinstalÂ·laciÃ³ no ha acabat correctament."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "S'està acabant l'auxiliar d'instal·lació de l'aplicació $(^NameDA)"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "L'aplicació $(^NameDA) s'ha instal·lat a l'ordinador.$\r$\n$\r$\nFeu clic a Finalitza per a tancar aquest auxiliar."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Cal reiniciar l'ordinador perquè pugui acabar-se la instal·lació de l'aplicació $(^NameDA). Voleu reiniciar-lo ara?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "S'estÃ  acabant l'auxiliar d'instalÂ·laciÃ³ de l'aplicaciÃ³ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "L'aplicaciÃ³ $(^NameDA) s'ha instalÂ·lat a l'ordinador.$\r$\n$\r$\nFeu clic a Finalitza per a tancar aquest auxiliar."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Cal reiniciar l'ordinador perquÃ¨ pugui acabar-se la instalÂ·laciÃ³ de l'aplicaciÃ³ $(^NameDA). Voleu reiniciar-lo ara?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "S'està acabant l'auxiliar de desinstal·lació de l'aplicació $(^NameDA)."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "L'aplicació $(^NameDA) s'ha desinstal·lat de l'ordinador.$\r$\n$\r$\nFeu clic a Finalitza per a tancar aquest auxiliar."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Cal reiniciar l'ordinador perquè pugui acabar-se la desinstal·lació de l'aplicació $(^NameDA). Voleu reiniciar-lo ara?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "S'estÃ  acabant l'auxiliar de desinstalÂ·laciÃ³ de l'aplicaciÃ³ $(^NameDA)."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "L'aplicaciÃ³ $(^NameDA) s'ha desinstalÂ·lat de l'ordinador.$\r$\n$\r$\nFeu clic a Finalitza per a tancar aquest auxiliar."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Cal reiniciar l'ordinador perquÃ¨ pugui acabar-se la desinstalÂ·laciÃ³ de l'aplicaciÃ³ $(^NameDA). Voleu reiniciar-lo ara?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
   ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Reinicia ara"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Reinicia més tard manualment"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "Executa l'aplicació $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Reinicia mÃ©s tard manualment"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "Executa l'aplicaciÃ³ $(^NameDA)"
   ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Mostra el Llegeix-me"
   ${LangFileString} MUI_BUTTONTEXT_FINISH "&Finalitza"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Tria la carpeta del menú Inicia"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Tria una carpeta del menú Inicia per a les dreceres de l'aplicació $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Seleccioneu la carpeta del Menú Inicia en la que hi vulgueu crear les dreceres del programa. Podeu introduir-hi un altre nom si voleu crear una carpeta nova."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "No creïs les dreceres"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Tria la carpeta del menÃº Inicia"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Tria una carpeta del menÃº Inicia per a les dreceres de l'aplicaciÃ³ $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Seleccioneu la carpeta del MenÃº Inicia en la que hi vulgueu crear les dreceres del programa. Podeu introduir-hi un altre nom si voleu crear una carpeta nova."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "No creÃ¯s les dreceres"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Desinstal·la l'aplicació $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Suprimeix l'aplicació $(^NameDA) de l'ordinador."
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "DesinstalÂ·la l'aplicaciÃ³ $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Suprimeix l'aplicaciÃ³ $(^NameDA) de l'ordinador."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Esteu segur que voleu sortir del programa d'instal·lació de l'aplicació $(^Name)?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Esteu segur que voleu sortir del programa d'instalÂ·laciÃ³ de l'aplicaciÃ³ $(^Name)?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Esteu segur que voleu sortir del programa de desinstal·lació de l'aplicació $(^Name)?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Esteu segur que voleu sortir del programa de desinstalÂ·laciÃ³ de l'aplicaciÃ³ $(^Name)?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Hebrew.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Hebrew.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Hebrew.nlf	(revision 2956)
@@ -1,11 +1,11 @@
-# Hebrew NSIS language file
+ï»¿# Hebrew NSIS language file
 NLF v6
 # Language ID
 1037
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1255
 # RTL - anything else than RTL means LTR
 RTL
@@ -13,178 +13,178 @@
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-äú÷ðú $(^Name)
+×”×ª×§× ×ª $(^Name)
 # ^UninstallCaption
-äñøú $(^Name)
+×”×¡×¨×ª $(^Name)
 # ^LicenseSubCaption
-: äñëí øéùåé
+: ×”×¡×›×� ×¨×™×©×•×™
 # ^ComponentsSubCaption
-: àôùøåéåú äú÷ðä
+: ×�×¤×©×¨×•×™×•×ª ×”×ª×§× ×”
 # ^DirSubCaption
-: úé÷ééú äú÷ðä
+: ×ª×™×§×™×™×ª ×”×ª×§× ×”
 # ^InstallingSubCaption
-: îú÷éï
+: ×ž×ª×§×™×Ÿ
 # ^CompletedSubCaption
-: ääú÷ðä äåùìîä
+: ×”×”×ª×§× ×” ×”×•×©×œ×ž×”
 # ^UnComponentsSubCaption
-: àôùøåéåú äñøä
+: ×�×¤×©×¨×•×™×•×ª ×”×¡×¨×”
 # ^UnDirSubCaption
-: úé÷ééä ìäñøä
+: ×ª×™×§×™×™×” ×œ×”×¡×¨×”
 # ^ConfirmSubCaption
-: àéùåø äñøä
+: ×�×™×©×•×¨ ×”×¡×¨×”
 # ^UninstallingSubCaption
-: îñéø
+: ×ž×¡×™×¨
 # ^UnCompletedSubCaption
-: ääñøä äåùìîä
+: ×”×”×¡×¨×” ×”×•×©×œ×ž×”
 # ^BackBtn
-< ä&÷åãí
+< ×”&×§×•×“×�
 # ^NextBtn
-ä&áà >
+×”&×‘×� >
 # ^AgreeBtn
-àðé &îñëéí
+×�× ×™ &×ž×¡×›×™×�
 # ^AcceptBtn
-àðé &îñëéí ìúðàé äñëí äøéùåé
+×�× ×™ &×ž×¡×›×™×� ×œ×ª× ×�×™ ×”×¡×›×� ×”×¨×™×©×•×™
 # ^DontAcceptBtn
-àðé &ìà îñëéí ìúðàé äñëí äøéùåé
+×�× ×™ &×œ×� ×ž×¡×›×™×� ×œ×ª× ×�×™ ×”×¡×›×� ×”×¨×™×©×•×™
 # ^InstallBtn
-&äú÷ï
+&×”×ª×§×Ÿ
 # ^UninstallBtn
-&äñø
+&×”×¡×¨
 # ^CancelBtn
-áéèåì
+×‘×™×˜×•×œ
 # ^CloseBtn
-ñâåø&
+×¡×’×•×¨&
 # ^BrowseBtn
-&òééï...
+&×¢×™×™×Ÿ...
 # ^ShowDetailsBtn
-ä&öâ ôøèéí
+×”&×¦×’ ×¤×¨×˜×™×�
 # ^ClickNext
-ìçõ òì äáà ëãé ìäîùéê.
+×œ×—×¥ ×¢×œ ×”×‘×� ×›×“×™ ×œ×”×ž×©×™×š.
 # ^ClickInstall
-ìçõ òì äú÷ï ëãé ìäúçéì àú ääú÷ðä.
+×œ×—×¥ ×¢×œ ×”×ª×§×Ÿ ×›×“×™ ×œ×”×ª×—×™×œ ×�×ª ×”×”×ª×§× ×”.
 # ^ClickUninstall
-ìçõ òì äñø ëãé ìäúçéì àú ääñøä.
+×œ×—×¥ ×¢×œ ×”×¡×¨ ×›×“×™ ×œ×”×ª×—×™×œ ×�×ª ×”×”×¡×¨×”.
 # ^Name
-ùí
+×©×�
 # ^Completed
-äôòåìä äåùìîä
+×”×¤×¢×•×œ×” ×”×•×©×œ×ž×”
 # ^LicenseText
-àðà ñ÷åø àú äñëí äøéùåé ìôðé äú÷ðú $(^NameDA). àí äéðê î÷áì àú ëì úðàé ääñëí, ìçõ 'àðé îñëéí'.
+×�× ×� ×¡×§×•×¨ ×�×ª ×”×¡×›×� ×”×¨×™×©×•×™ ×œ×¤× ×™ ×”×ª×§× ×ª $(^NameDA). ×�×� ×”×™× ×š ×ž×§×‘×œ ×�×ª ×›×œ ×ª× ×�×™ ×”×”×¡×›×�, ×œ×—×¥ '×�× ×™ ×ž×¡×›×™×�'.
 # ^LicenseTextCB
-àðà ñ÷åø àú äñëí äøéùåé ìôðé äú÷ðú $(^NameDA). àí äéðê î÷áì àú ëì úðàé ääñëí, ñîï àú úéáú äñéîåï ùìäìï. $_CLICK
+×�× ×� ×¡×§×•×¨ ×�×ª ×”×¡×›×� ×”×¨×™×©×•×™ ×œ×¤× ×™ ×”×ª×§× ×ª $(^NameDA). ×�×� ×”×™× ×š ×ž×§×‘×œ ×�×ª ×›×œ ×ª× ×�×™ ×”×”×¡×›×�, ×¡×ž×Ÿ ×�×ª ×ª×™×‘×ª ×”×¡×™×ž×•×Ÿ ×©×œ×”×œ×Ÿ. $_CLICK
 # ^LicenseTextRB
-àðà ñ÷åø àú äñëí äøéùåé ìôðé äú÷ðú $(^NameDA). àí äéðê î÷áì àú ëì úðàé ääñëí, áçø áàôùøåú äøàùåðä ùìäìï. $_CLICK
+×�× ×� ×¡×§×•×¨ ×�×ª ×”×¡×›×� ×”×¨×™×©×•×™ ×œ×¤× ×™ ×”×ª×§× ×ª $(^NameDA). ×�×� ×”×™× ×š ×ž×§×‘×œ ×�×ª ×›×œ ×ª× ×�×™ ×”×”×¡×›×�, ×‘×—×¨ ×‘×�×¤×©×¨×•×ª ×”×¨×�×©×•× ×” ×©×œ×”×œ×Ÿ. $_CLICK
 # ^UnLicenseText
-àðà ñ÷åø àú äñëí äøéùåé ìôðé äñøú $(^NameDA). àí äéðê îñëéí ìëì úðàé ääñëí, ìçõ 'àðé îñëéí'.
+×�× ×� ×¡×§×•×¨ ×�×ª ×”×¡×›×� ×”×¨×™×©×•×™ ×œ×¤× ×™ ×”×¡×¨×ª $(^NameDA). ×�×� ×”×™× ×š ×ž×¡×›×™×� ×œ×›×œ ×ª× ×�×™ ×”×”×¡×›×�, ×œ×—×¥ '×�× ×™ ×ž×¡×›×™×�'.
 # ^UnLicenseTextCB
-àðà ñ÷åø àú äñëí äøéùåé ìôðé äñøú $(^NameDA). àí äéðê îñëéí ìëì úðàé ääñëí, ñîï àú úéáú äñéîåï ùìäìï. $_CLICK
+×�× ×� ×¡×§×•×¨ ×�×ª ×”×¡×›×� ×”×¨×™×©×•×™ ×œ×¤× ×™ ×”×¡×¨×ª $(^NameDA). ×�×� ×”×™× ×š ×ž×¡×›×™×� ×œ×›×œ ×ª× ×�×™ ×”×”×¡×›×�, ×¡×ž×Ÿ ×�×ª ×ª×™×‘×ª ×”×¡×™×ž×•×Ÿ ×©×œ×”×œ×Ÿ. $_CLICK
 # ^UnLicenseTextRB
-àðà ñ÷åø àú äñëí äøéùåé ìôðé äñøú $(^NameDA). àí äéðê îñëéí ìëì úðàé ääñëí, áçø áàôùøåú äøàùåðä ùìäìï. $_CLICK
+×�× ×� ×¡×§×•×¨ ×�×ª ×”×¡×›×� ×”×¨×™×©×•×™ ×œ×¤× ×™ ×”×¡×¨×ª $(^NameDA). ×�×� ×”×™× ×š ×ž×¡×›×™×� ×œ×›×œ ×ª× ×�×™ ×”×”×¡×›×�, ×‘×—×¨ ×‘×�×¤×©×¨×•×ª ×”×¨×�×©×•× ×” ×©×œ×”×œ×Ÿ. $_CLICK
 # ^Custom
-îåúàí àéùéú
+×ž×•×ª×�×� ×�×™×©×™×ª
 # ^ComponentsText
-ñîï àú äøëéáéí ùáøöåðê ìäú÷éï åáèì àú äñéîåï ùì øëéáéí ùàéï áøöåðê ìäú÷éï. $_CLICK
+×¡×ž×Ÿ ×�×ª ×”×¨×›×™×‘×™×� ×©×‘×¨×¦×•× ×š ×œ×”×ª×§×™×Ÿ ×•×‘×˜×œ ×�×ª ×”×¡×™×ž×•×Ÿ ×©×œ ×¨×›×™×‘×™×� ×©×�×™×Ÿ ×‘×¨×¦×•× ×š ×œ×”×ª×§×™×Ÿ. $_CLICK
 # ^ComponentsSubText1
-áçø ñåâ äú÷ðä:
+×‘×—×¨ ×¡×•×’ ×”×ª×§× ×”:
 # ^ComponentsSubText2_NoInstTypes
-áçø øëéáéí ìäú÷ðä:
+×‘×—×¨ ×¨×›×™×‘×™×� ×œ×”×ª×§× ×”:
 # ^ComponentsSubText2
-àå, áçø øëéáé øùåú ìäú÷ðä:
+×�×•, ×‘×—×¨ ×¨×›×™×‘×™ ×¨×©×•×ª ×œ×”×ª×§× ×”:
 # ^UnComponentsText
-ñîï àú äøëéáéí ùáøöåðê ìäñéø åáèì àú äñéîåï ùì øëéáéí ùàéï áøöåðê ìäñéø. $_CLICK
+×¡×ž×Ÿ ×�×ª ×”×¨×›×™×‘×™×� ×©×‘×¨×¦×•× ×š ×œ×”×¡×™×¨ ×•×‘×˜×œ ×�×ª ×”×¡×™×ž×•×Ÿ ×©×œ ×¨×›×™×‘×™×� ×©×�×™×Ÿ ×‘×¨×¦×•× ×š ×œ×”×¡×™×¨. $_CLICK
 # ^UnComponentsSubText1
-áçø ñåâ äñøä:
+×‘×—×¨ ×¡×•×’ ×”×¡×¨×”:
 # ^UnComponentsSubText2_NoInstTypes
-áçø øëéáéí ìäñøä:
+×‘×—×¨ ×¨×›×™×‘×™×� ×œ×”×¡×¨×”:
 # ^UnComponentsSubText2
-àå, áçø øëéáé øùåú ìäñøä:
+×�×•, ×‘×—×¨ ×¨×›×™×‘×™ ×¨×©×•×ª ×œ×”×¡×¨×”:
 # ^DirText
-úåëðéú æå úú÷éï àú $(^NameDA) ìúé÷ééä ùìäìï. ëãé ìäú÷éï ìúé÷ééä àçøú, ìçõ òì 'òééï' åáçø úé÷ééä àçøú. $_CLICK
+×ª×•×›× ×™×ª ×–×• ×ª×ª×§×™×Ÿ ×�×ª $(^NameDA) ×œ×ª×™×§×™×™×” ×©×œ×”×œ×Ÿ. ×›×“×™ ×œ×”×ª×§×™×Ÿ ×œ×ª×™×§×™×™×” ×�×—×¨×ª, ×œ×—×¥ ×¢×œ '×¢×™×™×Ÿ' ×•×‘×—×¨ ×ª×™×§×™×™×” ×�×—×¨×ª. $_CLICK
 # ^DirSubText
-úé÷ééú éòã
+×ª×™×§×™×™×ª ×™×¢×“
 # ^DirBrowseText
-áçø úé÷ééä ìäú÷ðú $(^NameDA):
+×‘×—×¨ ×ª×™×§×™×™×” ×œ×”×ª×§× ×ª $(^NameDA):
 # ^UnDirText
-úåëðéú æå úñéø àú $(^NameDA) îäúé÷ééä ùìäìï. ëãé ìäñéø îúé÷ééä àçøú, ìçõ òì 'òééï' åáçø úé÷ééä àçøú. $_CLICK
+×ª×•×›× ×™×ª ×–×• ×ª×¡×™×¨ ×�×ª $(^NameDA) ×ž×”×ª×™×§×™×™×” ×©×œ×”×œ×Ÿ. ×›×“×™ ×œ×”×¡×™×¨ ×ž×ª×™×§×™×™×” ×�×—×¨×ª, ×œ×—×¥ ×¢×œ '×¢×™×™×Ÿ' ×•×‘×—×¨ ×ª×™×§×™×™×” ×�×—×¨×ª. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-áçø úé÷ééä îîðä úåñø $(^NameDA):
+×‘×—×¨ ×ª×™×§×™×™×” ×ž×ž× ×” ×ª×•×¡×¨ $(^NameDA):
 # ^SpaceAvailable
-"î÷åí ôðåé: "
+"×ž×§×•×� ×¤× ×•×™: "
 # ^SpaceRequired
-"î÷åí ãøåù: "
+"×ž×§×•×� ×“×¨×•×©: "
 # ^UninstallingText
-äñøú $(^NameDA) úúáöò îäúé÷ééä ùìäìï. $_CLICK
+×”×¡×¨×ª $(^NameDA) ×ª×ª×‘×¦×¢ ×ž×”×ª×™×§×™×™×” ×©×œ×”×œ×Ÿ. $_CLICK
 # ^UninstallingSubText
-îñéø î:
+×ž×¡×™×¨ ×ž:
 # ^FileError
-àøòä ùâéàä áòú ôúéçú ÷åáõ ìëúéáä:\r\n\t"$0"\r\nìçõ òì áéèåì ëãé ìáèì àú ääú÷ðä,\r\nðñä ùðéú ëãé ìðñåú ìôúåç àú ä÷åáõ ùåá, àå\r\näúòìí ëãé ìãìâ òì ä÷åáõ
+×�×¨×¢×” ×©×’×™×�×” ×‘×¢×ª ×¤×ª×™×—×ª ×§×•×‘×¥ ×œ×›×ª×™×‘×”:\r\n\t"$0"\r\n×œ×—×¥ ×¢×œ ×‘×™×˜×•×œ ×›×“×™ ×œ×‘×˜×œ ×�×ª ×”×”×ª×§× ×”,\r\n× ×¡×” ×©× ×™×ª ×›×“×™ ×œ× ×¡×•×ª ×œ×¤×ª×•×— ×�×ª ×”×§×•×‘×¥ ×©×•×‘, ×�×•\r\n×”×ª×¢×œ×� ×›×“×™ ×œ×“×œ×’ ×¢×œ ×”×§×•×‘×¥
 # ^FileError_NoIgnore
-àøòä ùâéàä áòú ôúéçú ÷åáõ ìëúéáä:\r\n\t"$0"\r\nìçõ òì ðñä ùðéú ëãé ìðñåú ìôúåç àú ä÷åáõ  ùåá, àå\r\náéèåì ëãé ìáèì àú äúú÷ðä
+×�×¨×¢×” ×©×’×™×�×” ×‘×¢×ª ×¤×ª×™×—×ª ×§×•×‘×¥ ×œ×›×ª×™×‘×”:\r\n\t"$0"\r\n×œ×—×¥ ×¢×œ × ×¡×” ×©× ×™×ª ×›×“×™ ×œ× ×¡×•×ª ×œ×¤×ª×•×— ×�×ª ×”×§×•×‘×¥  ×©×•×‘, ×�×•\r\n×‘×™×˜×•×œ ×›×“×™ ×œ×‘×˜×œ ×�×ª ×”×ª×ª×§× ×”
 # ^CantWrite
-"ìà ðéúï ìëúåá: "
+"×œ×� × ×™×ª×Ÿ ×œ×›×ª×•×‘: "
 # ^CopyFailed
-ääòú÷ä ðëùìä
+×”×”×¢×ª×§×” × ×›×©×œ×”
 # ^CopyTo
-äòú÷ ì-
+×”×¢×ª×§ ×œ-
 # ^Registering
-"øåùí: "
+"×¨×•×©×�: "
 # ^Unregistering
-"áéèåì øéùåí: "
+"×‘×™×˜×•×œ ×¨×™×©×•×�: "
 # ^SymbolNotFound
-"ñîì ìà ðîöà: "
+"×¡×ž×œ ×œ×� × ×ž×¦×�: "
 # ^CouldNotLoad
-"ìà ðéúï ìèòåï: "
+"×œ×� × ×™×ª×Ÿ ×œ×˜×¢×•×Ÿ: "
 # ^CreateFolder
-"öåø úé÷ééä: "
+"×¦×•×¨ ×ª×™×§×™×™×”: "
 # ^CreateShortcut
-"öåø ÷éöåø ãøê: "
+"×¦×•×¨ ×§×™×¦×•×¨ ×“×¨×š: "
 # ^CreatedUninstaller
-"îñéø äú÷ðä ðåöø: "
+"×ž×¡×™×¨ ×”×ª×§× ×” × ×•×¦×¨: "
 # ^Delete
-"îç÷ ÷åáõ: "
+"×ž×—×§ ×§×•×‘×¥: "
 # ^DeleteOnReboot
-"îç÷ àçøé àúçåì: "
+"×ž×—×§ ×�×—×¨×™ ×�×ª×—×•×œ: "
 # ^ErrorCreatingShortcut
-"ùâéàä áòú éöéøú ÷éöåø ãøê: "
+"×©×’×™×�×” ×‘×¢×ª ×™×¦×™×¨×ª ×§×™×¦×•×¨ ×“×¨×š: "
 # ^ErrorCreating
-"ùâéàä áòú éöéøú: "
+"×©×’×™×�×” ×‘×¢×ª ×™×¦×™×¨×ª: "
 # ^ErrorDecompressing
-ùâéàä áòú ôøéùú îéãò! äú÷ðä ôâåîä?
+×©×’×™×�×” ×‘×¢×ª ×¤×¨×™×©×ª ×ž×™×“×¢! ×”×ª×§× ×” ×¤×’×•×ž×”?
 # ^ErrorRegistering
-ùâéàä áòú øéùåí DLL
+×©×’×™×�×” ×‘×¢×ª ×¨×™×©×•×� DLL
 # ^ExecShell
-"áöò ôòåìú-÷åáõ: "
+"×‘×¦×¢ ×¤×¢×•×œ×ª-×§×•×‘×¥: "
 # ^Exec
-"áöò: "
+"×‘×¦×¢: "
 # ^Extract
-"ôøåù: "
+"×¤×¨×•×©: "
 # ^ErrorWriting
-"ôøåù: ùâéàä áòú ëúéáä ì÷åáõ "
+"×¤×¨×•×©: ×©×’×™×�×” ×‘×¢×ª ×›×ª×™×‘×” ×œ×§×•×‘×¥ "
 # ^InvalidOpcode
-äú÷ðä ôâåîä! ô÷åãú áéöåò ùâåéä
+×”×ª×§× ×” ×¤×’×•×ž×”! ×¤×§×•×“×ª ×‘×™×¦×•×¢ ×©×’×•×™×”
 # ^NoOLE
-"àéï OLE ì: "
+"×�×™×Ÿ OLE ×œ: "
 # ^OutputFolder
-"úé÷ééú ôìè: "
+"×ª×™×§×™×™×ª ×¤×œ×˜: "
 # ^RemoveFolder
-"äñø úé÷ééä: "
+"×”×¡×¨ ×ª×™×§×™×™×”: "
 # ^RenameOnReboot
-"ùðä ùí ìàçø àúçåì: "
+"×©× ×” ×©×� ×œ×�×—×¨ ×�×ª×—×•×œ: "
 # ^Rename
-"ùðä ùí: "
+"×©× ×” ×©×�: "
 # ^Skipped
-"ãìâ: "
+"×“×œ×’: "
 # ^CopyDetails
-äòú÷ ôøèéí ììåç
+×”×¢×ª×§ ×¤×¨×˜×™×� ×œ×œ×•×—
 # ^LogInstall
-ùîåø øéùåí ôòéìåéåú ääú÷ðä
+×©×ž×•×¨ ×¨×™×©×•×� ×¤×¢×™×œ×•×™×•×ª ×”×”×ª×§× ×”
 # ^Byte
-"á
+"×‘
 # ^Kilo
-" ÷"
+" ×§"
 # ^Mega
-" î"
+" ×ž"
 # ^Giga
-" â"
\ No newline at end of file
+" ×’"
\ No newline at end of file
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Ukrainian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Ukrainian.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Ukrainian.nlf	(revision 2956)
@@ -1,11 +1,11 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1058
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1251
 # RTL - anything else than RTL means LTR
 -
@@ -15,178 +15,178 @@
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-$(^Name) Âñòàíîâëåííÿ
+$(^Name) Ð’Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ�
 # ^UninstallCaption
-$(^Name) Âèäàëåííÿ
+$(^Name) Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ�
 # ^LicenseSubCaption
-: Ë³öåíç³éíà óãîäà
+: Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ð¹Ð½Ð° ÑƒÐ³Ð¾Ð´Ð°
 # ^ComponentsSubCaption
-: Îïö³¿ âñòàíîâëåííÿ
+: ÐžÐ¿Ñ†Ñ–Ñ— Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ�
 # ^DirSubCaption
-: Òåêà âñòàíîâëåííÿ
+: Ð¢ÐµÐºÐ° Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ�
 # ^InstallingSubCaption
-: Êîï³þâàííÿ ôàéë³â
+: ÐšÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ� Ñ„Ð°Ð¹Ð»Ñ–Ð²
 # ^CompletedSubCaption
-: Çàâåðøåíî
+: Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾
 # ^UnComponentsSubCaption
-: Îïö³¿ âèäàëåííÿ
+: ÐžÐ¿Ñ†Ñ–Ñ— Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ�
 # ^UnDirSubCaption
-: Òåêà âèäàëåííÿ
+: Ð¢ÐµÐºÐ° Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ�
 # ^ConfirmSubCaption
-: Ï³äòâåðæäåííÿ
+: ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð½Ñ�
 # ^UninstallingSubCaption
-: Âèäàëåííÿ ôàéë³â
+: Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� Ñ„Ð°Ð¹Ð»Ñ–Ð²
 # ^UnCompletedSubCaption
-: Çàâåðøåíî
+: Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾
 # ^BackBtn
-< &Íàçàä
+< &Ð�Ð°Ð·Ð°Ð´
 # ^NextBtn
-&Äàë³ >
+&Ð”Ð°Ð»Ñ– >
 # ^AgreeBtn
-&Çãîäåí
+&Ð—Ð³Ð¾Ð´ÐµÐ½
 # ^AcceptBtn
-ß &ïðèéìàþ óìîâè Ë³öåíç³éíî¿ óãîäè
+Ð¯ &Ð¿Ñ€Ð¸Ð¹Ð¼Ð°ÑŽ ÑƒÐ¼Ð¾Ð²Ð¸ Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ð¹Ð½Ð¾Ñ— ÑƒÐ³Ð¾Ð´Ð¸
 # ^DontAcceptBtn
-ß &íå ïðèéìàþ óìîâè Ë³öåíç³éíî¿ óãîäè
+Ð¯ &Ð½Ðµ Ð¿Ñ€Ð¸Ð¹Ð¼Ð°ÑŽ ÑƒÐ¼Ð¾Ð²Ð¸ Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ð¹Ð½Ð¾Ñ— ÑƒÐ³Ð¾Ð´Ð¸
 # ^InstallBtn
-&Âñòàíîâèòè
+&Ð’Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸
 # ^UninstallBtn
-Âèäàëèòè
+Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸
 # ^CancelBtn
-Ñêàñóâàòè
+Ð¡ÐºÐ°Ñ�ÑƒÐ²Ð°Ñ‚Ð¸
 # ^CloseBtn
-&Çàêðèòè
+&Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¸
 # ^BrowseBtn
-Î&ãëÿä...
+Ðž&Ð³Ð»Ñ�Ð´...
 # ^ShowDetailsBtn
-Ïîäðîáèö³
+ÐŸÐ¾Ð´Ñ€Ð¾Ð±Ð¸Ñ†Ñ–
 # ^ClickNext
-Íàòèñí³òü Äàë³ ùîá ïðîäîâæèòè
+Ð�Ð°Ñ‚Ð¸Ñ�Ð½Ñ–Ñ‚ÑŒ Ð”Ð°Ð»Ñ– Ñ‰Ð¾Ð± Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶Ð¸Ñ‚Ð¸
 # ^ClickInstall
-Íàòèñí³òü Âñòàíîâèòè äëÿ ïî÷àòêó ïðîöåññó âñòàíîâëåííÿ
+Ð�Ð°Ñ‚Ð¸Ñ�Ð½Ñ–Ñ‚ÑŒ Ð’Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð´Ð»Ñ� Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ Ð¿Ñ€Ð¾Ñ†ÐµÑ�Ñ�Ñƒ Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ�
 # ^ClickUninstall
-Íàòèñí³òü Âèäàëèòü äëÿ ïî÷àòêó ïðîöåññó âèäàëåííÿ
+Ð�Ð°Ñ‚Ð¸Ñ�Ð½Ñ–Ñ‚ÑŒ Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð´Ð»Ñ� Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ Ð¿Ñ€Ð¾Ñ†ÐµÑ�Ñ�Ñƒ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ�
 # ^Name
-²ì'ÿ
+Ð†Ð¼'Ñ�
 # ^Completed
-Çàâåðøåíî
+Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾
 # ^LicenseText
-Ïðî÷èòàéòå óìîâè ë³öåíç³éíî¿ óãîäè ïåðåä âñòàíîâëåííÿì $(^NameDA). ßêùî Âè ïðèéìàºòå óìîâè óãîäè, íàòèñí³òü íà êíîïêó Çãîäåí.
+ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ ÑƒÐ¼Ð¾Ð²Ð¸ Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ð¹Ð½Ð¾Ñ— ÑƒÐ³Ð¾Ð´Ð¸ Ð¿ÐµÑ€ÐµÐ´ Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ�Ð¼ $(^NameDA). Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð¿Ñ€Ð¸Ð¹Ð¼Ð°Ñ”Ñ‚Ðµ ÑƒÐ¼Ð¾Ð²Ð¸ ÑƒÐ³Ð¾Ð´Ð¸, Ð½Ð°Ñ‚Ð¸Ñ�Ð½Ñ–Ñ‚ÑŒ Ð½Ð° ÐºÐ½Ð¾Ð¿ÐºÑƒ Ð—Ð³Ð¾Ð´ÐµÐ½.
 # ^LicenseTextCB
-Ïðî÷èòàéòå óìîâè ë³öåíç³éíî¿ óãîäè ïåðåä âñòàíîâëåííÿì $(^NameDA). ßêùî Âè ïðèéìàºòå óìîâè óãîäè, âñòàíîâ³òü â³äì³òêó ó êâàäðàòèêó íèæ÷å. $_CLICK
+ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ ÑƒÐ¼Ð¾Ð²Ð¸ Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ð¹Ð½Ð¾Ñ— ÑƒÐ³Ð¾Ð´Ð¸ Ð¿ÐµÑ€ÐµÐ´ Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ�Ð¼ $(^NameDA). Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð¿Ñ€Ð¸Ð¹Ð¼Ð°Ñ”Ñ‚Ðµ ÑƒÐ¼Ð¾Ð²Ð¸ ÑƒÐ³Ð¾Ð´Ð¸, Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ñ–Ñ‚ÑŒ Ð²Ñ–Ð´Ð¼Ñ–Ñ‚ÐºÑƒ Ñƒ ÐºÐ²Ð°Ð´Ñ€Ð°Ñ‚Ð¸ÐºÑƒ Ð½Ð¸Ð¶Ñ‡Ðµ. $_CLICK
 # ^LicenseTextRB
-Ïðî÷èòàéòå óìîâè ë³öåíç³éíî¿ óãîäè ïåðåä âñòàíîâëåííÿì $(^NameDA). ßêùî Âè ïðèéìàºòå óìîâè óãîäè, âèáåð³òü ïåðøèé âàð³àíò. $_CLICK
+ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ ÑƒÐ¼Ð¾Ð²Ð¸ Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ð¹Ð½Ð¾Ñ— ÑƒÐ³Ð¾Ð´Ð¸ Ð¿ÐµÑ€ÐµÐ´ Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ�Ð¼ $(^NameDA). Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð¿Ñ€Ð¸Ð¹Ð¼Ð°Ñ”Ñ‚Ðµ ÑƒÐ¼Ð¾Ð²Ð¸ ÑƒÐ³Ð¾Ð´Ð¸, Ð²Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ Ð¿ÐµÑ€ÑˆÐ¸Ð¹ Ð²Ð°Ñ€Ñ–Ð°Ð½Ñ‚. $_CLICK
 # ^UnLicenseText
-Ïðî÷èòàéòå óìîâè ë³öåíç³éíî¿ óãîäè ïåðåä âñòàíîâëåííÿì $(^NameDA). ßêùî Âè ïðèéìàºòå óìîâè ë³öåíç³éíî¿ óãîäè, íàòèñí³òü íà êíîïêó Çãîäåí.
+ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ ÑƒÐ¼Ð¾Ð²Ð¸ Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ð¹Ð½Ð¾Ñ— ÑƒÐ³Ð¾Ð´Ð¸ Ð¿ÐµÑ€ÐµÐ´ Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ�Ð¼ $(^NameDA). Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð¿Ñ€Ð¸Ð¹Ð¼Ð°Ñ”Ñ‚Ðµ ÑƒÐ¼Ð¾Ð²Ð¸ Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ð¹Ð½Ð¾Ñ— ÑƒÐ³Ð¾Ð´Ð¸, Ð½Ð°Ñ‚Ð¸Ñ�Ð½Ñ–Ñ‚ÑŒ Ð½Ð° ÐºÐ½Ð¾Ð¿ÐºÑƒ Ð—Ð³Ð¾Ð´ÐµÐ½.
 # ^UnLicenseTextCB
-Ïðî÷èòàéòå óìîâè ë³öåíç³éíî¿ óãîäè ïåðåä âñòàíîâëåííÿì $(^NameDA). ßêùî Âè ïðèéìàºòå óìîâè óãîäè, âñòàíîâ³òü â³äì³òêó ó êâàäðàòèêó íèæ÷å. $_CLICK
+ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ ÑƒÐ¼Ð¾Ð²Ð¸ Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ð¹Ð½Ð¾Ñ— ÑƒÐ³Ð¾Ð´Ð¸ Ð¿ÐµÑ€ÐµÐ´ Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ�Ð¼ $(^NameDA). Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð¿Ñ€Ð¸Ð¹Ð¼Ð°Ñ”Ñ‚Ðµ ÑƒÐ¼Ð¾Ð²Ð¸ ÑƒÐ³Ð¾Ð´Ð¸, Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ñ–Ñ‚ÑŒ Ð²Ñ–Ð´Ð¼Ñ–Ñ‚ÐºÑƒ Ñƒ ÐºÐ²Ð°Ð´Ñ€Ð°Ñ‚Ð¸ÐºÑƒ Ð½Ð¸Ð¶Ñ‡Ðµ. $_CLICK
 # ^UnLicenseTextRB
-Ïðî÷èòàéòå óìîâè ë³öåíç³éíî¿ óãîäè ïåðåä âèäàëåííÿì $(^NameDA). ßêùî Âè ïðèéìàºòå óìîâè óãîäè, âèáåð³òü ïåðøèé âàð³àíò. $_CLICK
+ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ ÑƒÐ¼Ð¾Ð²Ð¸ Ð»Ñ–Ñ†ÐµÐ½Ð·Ñ–Ð¹Ð½Ð¾Ñ— ÑƒÐ³Ð¾Ð´Ð¸ Ð¿ÐµÑ€ÐµÐ´ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ�Ð¼ $(^NameDA). Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð¿Ñ€Ð¸Ð¹Ð¼Ð°Ñ”Ñ‚Ðµ ÑƒÐ¼Ð¾Ð²Ð¸ ÑƒÐ³Ð¾Ð´Ð¸, Ð²Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ Ð¿ÐµÑ€ÑˆÐ¸Ð¹ Ð²Ð°Ñ€Ñ–Ð°Ð½Ñ‚. $_CLICK
 # ^Custom
-Ïî âèáîðó
+ÐŸÐ¾ Ð²Ð¸Ð±Ð¾Ñ€Ñƒ
 # ^ComponentsText
-Âèáåð³òü ÿê³ êîìïîíåíòè ïðîãðàìè Âè áàæàºòå âñòàíîâèòè. $_CLICK
+Ð’Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ Ñ�ÐºÑ– ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸ Ð’Ð¸ Ð±Ð°Ð¶Ð°Ñ”Ñ‚Ðµ Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸. $_CLICK
 # ^ComponentsSubText1
-Âèáåð³òü òèï âñòàíîâëåííÿ:
+Ð’Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ Ñ‚Ð¸Ð¿ Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ�:
 # ^ComponentsSubText2_NoInstTypes
-Âèáåð³òü êîìïîíåíòè äëÿ âñòàíîâëåííÿ:
+Ð’Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸ Ð´Ð»Ñ� Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ�:
 # ^ComponentsSubText2
-×è, âèáåð³òü âðó÷íó êîìïîíåíòè, ÿê³ Âè õî÷åòå âñòàíîâèòè:
+Ð§Ð¸, Ð²Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ Ð²Ñ€ÑƒÑ‡Ð½Ñƒ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸, Ñ�ÐºÑ– Ð’Ð¸ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸:
 # ^UnComponentsText
-Âèáåð³òü ÿê³ êîìïîíåíòè Âè áàæàºòå âèäàëèòè. Â³äì³òüòå êîìïîíåíòè äëÿ âèäàëåííÿ ³ çí³ì³òü â³äì³òêó ç òèõ, ÿê³ Âè âèäàëÿòè íå áàæàºòå. $_CLICK
+Ð’Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ Ñ�ÐºÑ– ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸ Ð’Ð¸ Ð±Ð°Ð¶Ð°Ñ”Ñ‚Ðµ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸. Ð’Ñ–Ð´Ð¼Ñ–Ñ‚ÑŒÑ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸ Ð´Ð»Ñ� Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� Ñ– Ð·Ð½Ñ–Ð¼Ñ–Ñ‚ÑŒ Ð²Ñ–Ð´Ð¼Ñ–Ñ‚ÐºÑƒ Ð· Ñ‚Ð¸Ñ…, Ñ�ÐºÑ– Ð’Ð¸ Ð²Ð¸Ð´Ð°Ð»Ñ�Ñ‚Ð¸ Ð½Ðµ Ð±Ð°Ð¶Ð°Ñ”Ñ‚Ðµ. $_CLICK
 # ^UnComponentsSubText1
-Âèáåð³òü òèï âèäàëåííÿ:
+Ð’Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ Ñ‚Ð¸Ð¿ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ�:
 # ^UnComponentsSubText2_NoInstTypes
-Âèá³ð êîìïîíåíò³â äëÿ âèäàëåííÿ:
+Ð’Ð¸Ð±Ñ–Ñ€ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñ–Ð² Ð´Ð»Ñ� Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ�:
 # ^UnComponentsSubText2
-×è âèáåð³òü êîìïîíåíòè ïðîãðàìè äëÿ âèäàëåííÿ ïî ñâîºìó áàæàíí³:
+Ð§Ð¸ Ð²Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸ Ð´Ð»Ñ� Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� Ð¿Ð¾ Ñ�Ð²Ð¾Ñ”Ð¼Ñƒ Ð±Ð°Ð¶Ð°Ð½Ð½Ñ–:
 # ^DirText
-Ïðîãðàììà âñòàíîâèòü $(^NameDA) ó âêàçàíó òåêó. Äëÿ òîãî, ùîá âñòàíîâèòè ïðîãðàììó â ³íøó òåêó, íàòèñí³òü Îãëÿä ³ âêàæ³òü ïîòð³áíó òåêó. $_CLICK
+ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ $(^NameDA) Ñƒ Ð²ÐºÐ°Ð·Ð°Ð½Ñƒ Ñ‚ÐµÐºÑƒ. Ð”Ð»Ñ� Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñƒ Ð² Ñ–Ð½ÑˆÑƒ Ñ‚ÐµÐºÑƒ, Ð½Ð°Ñ‚Ð¸Ñ�Ð½Ñ–Ñ‚ÑŒ ÐžÐ³Ð»Ñ�Ð´ Ñ– Ð²ÐºÐ°Ð¶Ñ–Ñ‚ÑŒ Ð¿Ð¾Ñ‚Ñ€Ñ–Ð±Ð½Ñƒ Ñ‚ÐµÐºÑƒ. $_CLICK
 # ^DirSubText
-Òåêà ïðèçíà÷åííÿ
+ÐšÐ°Ñ‚Ð°Ð»Ð¾Ð³ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ�
 # ^DirBrowseText
-Âèáåð³òü òåêó äëÿ âñòàíîâëåííÿ $(^NameDA):
+Ð’Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ Ñ‚ÐµÐºÑƒ Ð´Ð»Ñ� Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ� $(^NameDA):
 # ^UnDirText
-Ïðîãðàììà âñòàíîâëåííÿ âèäàëèòü $(^NameDA) ³ç âêàçàííî¿ òåêè. Äëÿ òîãî, ùîá ïðîâåñòè âèäàëåííÿ ç ³íøî¿ òåêè, íàòèñí³òü Îãëÿä ³ âêàæ³òü ïîòð³áíó òåêó. $_CLICK
+ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ� Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚ÑŒ $(^NameDA) Ñ–Ð· Ð²ÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ñ— Ñ‚ÐµÐºÐ¸. Ð”Ð»Ñ� Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð¿Ñ€Ð¾Ð²ÐµÑ�Ñ‚Ð¸ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� Ð· Ñ–Ð½ÑˆÐ¾Ñ— Ñ‚ÐµÐºÐ¸, Ð½Ð°Ñ‚Ð¸Ñ�Ð½Ñ–Ñ‚ÑŒ ÐžÐ³Ð»Ñ�Ð´ Ñ– Ð²ÐºÐ°Ð¶Ñ–Ñ‚ÑŒ Ð¿Ð¾Ñ‚Ñ€Ñ–Ð±Ð½Ñƒ Ñ‚ÐµÐºÑƒ. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Âèáåð³òü òåêó, ç ÿêî¿ Âè áàæàºòå âèäàëèòè $(^NameDA):
+Ð’Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ Ñ‚ÐµÐºÑƒ, Ð· Ñ�ÐºÐ¾Ñ— Ð’Ð¸ Ð±Ð°Ð¶Ð°Ñ”Ñ‚Ðµ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ $(^NameDA):
 # ^SpaceAvailable
-"Äîñòóïíî ì³ñöÿ: "
+"Ð”Ð¾Ñ�Ñ‚ÑƒÐ¿Ð½Ð¾ Ð¼Ñ–Ñ�Ñ†Ñ�: "
 # ^SpaceRequired
-"Íåîáõ³äíî ì³ñöÿ: "
+"Ð�ÐµÐ¾Ð±Ñ…Ñ–Ð´Ð½Ð¾ Ð¼Ñ–Ñ�Ñ†Ñ�: "
 # ^UninstallingText
-Ìàéñòåð âñòàíîâëåííÿ äîïîìîæå Âàì âèäàëèòè $(^NameDA) ç Âàøîãî êîìï'þòåðà. $_CLICK
+$(^NameDA) Ð±ÑƒÐ´Ðµ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ð¾ Ð· Ð²ÐºÐ°Ð·Ð°Ð½Ð¾Ð³Ð¾ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ñƒ. $_CLICK
 # ^UninstallingSubText
-Âèäàëåííÿ ç:
+Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� Ð·:
 # ^FileError
-Íåìîæëèâî â³äêðèòè ôàéë äëÿ çàïèñó: \r\n\t"$0"\r\nÍàòèñí³òü Ïåðåðâàòè äëÿ òîãî, ùîá ïåðåðâàòè âñòàíîâëåííÿ,\r\nÏîâòîðèòè äëÿ òîãî, ùîá ïîâòîðèòè ñïðîáó çàïèñó ó ôàéë, ÷è\r\n²ãíîðóâàòè äëÿ òîãî, ùîá ïðîïóñòèòè öþ ä³þ
+Ð�ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ð´Ð»Ñ� Ð·Ð°Ð¿Ð¸Ñ�Ñƒ: \r\n\t"$0"\r\nÐ�Ð°Ñ‚Ð¸Ñ�Ð½Ñ–Ñ‚ÑŒ ÐŸÐµÑ€ÐµÑ€Ð²Ð°Ñ‚Ð¸ Ð´Ð»Ñ� Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð¿ÐµÑ€ÐµÑ€Ð²Ð°Ñ‚Ð¸ Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ�,\r\nÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ð¸ Ð´Ð»Ñ� Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ð¸ Ñ�Ð¿Ñ€Ð¾Ð±Ñƒ Ð·Ð°Ð¿Ð¸Ñ�Ñƒ Ñƒ Ñ„Ð°Ð¹Ð», Ñ‡Ð¸\r\nÐ†Ð³Ð½Ð¾Ñ€ÑƒÐ²Ð°Ñ‚Ð¸ Ð´Ð»Ñ� Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð¿Ñ€Ð¾Ð¿ÑƒÑ�Ñ‚Ð¸Ñ‚Ð¸ Ñ†ÑŽ Ð´Ñ–ÑŽ
 # ^FileError_NoIgnore
-Íåìîæëèâî â³äêðèòè ôàéë äëÿ çàïèñó: \r\n\t"$0"\r\nÍàòèñí³òü Ïîâòîðèòè äëÿ òîãî, ùîá ïîâòîðèòè ñïðîáó çàïèñó ó ôàéë, ÷è\r\nÑêàñóâàòè äëÿ òîãî, ùîá ïåðåðâàòè âñòàíîâëåííÿ
+Ð�ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ð´Ð»Ñ� Ð·Ð°Ð¿Ð¸Ñ�Ñƒ: \r\n\t"$0"\r\nÐ�Ð°Ñ‚Ð¸Ñ�Ð½Ñ–Ñ‚ÑŒ ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ð¸ Ð´Ð»Ñ� Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ð¸ Ñ�Ð¿Ñ€Ð¾Ð±Ñƒ Ð·Ð°Ð¿Ð¸Ñ�Ñƒ Ñƒ Ñ„Ð°Ð¹Ð», Ñ‡Ð¸\r\nÐ¡ÐºÐ°Ñ�ÑƒÐ²Ð°Ñ‚Ð¸ Ð´Ð»Ñ� Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð¿ÐµÑ€ÐµÑ€Ð²Ð°Ñ‚Ð¸ Ð²Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ�
 # ^CantWrite
-"Íåìîæëèâî çàïèñàòè: "
+"Ð�ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð°Ð¿Ð¸Ñ�Ð°Ñ‚Ð¸: "
 # ^CopyFailed
-Êîï³þâàííÿ íåâä³ëå
+Ð�Ðµ Ð²Ð´Ð°Ð»Ð¾Ñ�Ñ� ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ñ‚Ð¸
 # ^CopyTo
-"Êîï³þâàííÿ â "
+"ÐšÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ� Ð² "
 # ^Registering
-"Ðåºñòðàö³ÿ: "
+"Ð ÐµÑ”Ñ�Ñ‚Ñ€Ð°Ñ†Ñ–Ñ�: "
 # ^Unregistering
-"Âèäàëåííÿ ðåºñòðàö³¿: "
+"Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� Ñ€ÐµÑ”Ñ�Ñ‚Ñ€Ð°Ñ†Ñ–Ñ—: "
 # ^SymbolNotFound
-"Íåìîæëèâî çíàéòè ñèìâîë: "
+"Ð�ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ñ�Ð¸Ð¼Ð²Ð¾Ð»: "
 # ^CouldNotLoad
-"Íåìîæëèâî çàâàíòàæèòè: "
+"Ð�ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸: "
 # ^CreateFolder
-"Ñòâîðåííÿ òåêè: "
+"Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ� Ñ‚ÐµÐºÐ¸: "
 # ^CreateShortcut
-"Ñòâîðåííÿ ÿðëèêà: "
+"Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ� Ñ�Ñ€Ð»Ð¸ÐºÐ°: "
 # ^CreatedUninstaller
-"Ñòâîðåííÿ ïðîãðàìè âèäàëåííÿ: "
+"Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ� Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ�: "
 # ^Delete
-"Âèäàëåííÿ ôàéëó: "
+"Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� Ñ„Ð°Ð¹Ð»Ñƒ: "
 # ^DeleteOnReboot
-"Âèäàëåííÿ ï³ñëÿ ïåðåçàâàíòàæåííÿ: "
+"Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� Ð¿Ñ–Ñ�Ð»Ñ� Ð¿ÐµÑ€ÐµÐ·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ�: "
 # ^ErrorCreatingShortcut
-"Ïîìèëêà ñòâîðåííÿ ÿðëèêà: " 
+"ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ñ�Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ� Ñ�Ñ€Ð»Ð¸ÐºÐ°: "
 # ^ErrorCreating
-"Ïîìèëêà ñòâîðåííÿ: "
+"ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ñ�Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ�: "
 # ^ErrorDecompressing
-Íåìîæëèâî âèòÿãíóòè äàí³. Ìîæëèâî ïîøêîäæåíèé äèñòðèáóòèâ.
+Ð�ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ð¸Ñ‚Ñ�Ð³Ð½ÑƒÑ‚Ð¸ Ð´Ð°Ð½Ñ–. ÐœÐ¾Ð¶Ð»Ð¸Ð²Ð¾ Ð¿Ð¾ÑˆÐºÐ¾Ð´Ð¶ÐµÐ½Ð¸Ð¹ Ð´Ð¸Ñ�Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð¸Ð².
 # ^ErrorRegistering
-Íåìîæëèâî çàðåºñòðóâàòè á³áë³îòåêó (DLL)
+Ð�ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð°Ñ€ÐµÑ”Ñ�Ñ‚Ñ€ÑƒÐ²Ð°Ñ‚Ð¸ Ð±Ñ–Ð±Ð»Ñ–Ð¾Ñ‚ÐµÐºÑƒ (DLL)
 # ^ExecShell
-"Âèêîíàííÿ êîìàíäè îáîëîíêè: " 
+"Ð’Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ� ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ Ð¾Ð±Ð¾Ð»Ð¾Ð½ÐºÐ¸: "
 # ^Exec
-"Âèêîíàííÿ: "
+"Ð’Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ�: "
 # ^Extract
-"Âèòÿãíåííÿ: "
+"Ð’Ð¸Ñ‚Ñ�Ð³Ð½ÐµÐ½Ð½Ñ�: "
 # ^ErrorWriting
-"Âèòÿãíåííÿ: ïîìèëêà çàïèñó ôàéëà"
+"Ð’Ð¸Ñ‚Ñ�Ð³Ð½ÐµÐ½Ð½Ñ�: Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð·Ð°Ð¿Ð¸Ñ�Ñƒ Ñ„Ð°Ð¹Ð»Ð°"
 # ^InvalidOpcode
-Äèñòðèáóòèâ ïîøêîäæåíèé: ïîìèëêîâèé êîä â³äïîâ³ä³
+Ð”Ð¸Ñ�Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð¸Ð² Ð¿Ð¾ÑˆÐºÐ¾Ð´Ð¶ÐµÐ½Ð¸Ð¹: Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð¸Ð¹ ÐºÐ¾Ð´ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ñ–
 # ^NoOLE
-"Íåìàº OLE äëÿ: " 
+"Ð�ÐµÐ¼Ð°Ñ” OLE Ð´Ð»Ñ�: "
 # ^OutputFolder
-"Òåêà ïðèçíà÷åííÿ: "
+"Ð¢ÐµÐºÐ° Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ�: "
 # ^RemoveFolder
-"Âèäàëåííÿ òåêè: "
+"Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ� Ñ‚ÐµÐºÐ¸: "
 # ^RenameOnReboot
-"Ïåðå³ìåíóâàííÿ ï³ñëÿ ïåðåçàâàíàæåííÿ: "
+"ÐŸÐµÑ€ÐµÑ–Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ� Ð¿Ñ–Ñ�Ð»Ñ� Ð¿ÐµÑ€ÐµÐ·Ð°Ð²Ð°Ð½Ð°Ð¶ÐµÐ½Ð½Ñ�: "
 # ^Rename
-"Ïåðåéìåíóâàííÿ: "
+"ÐŸÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ�: "
 # ^Skipped
-"Ïðîïóùåíî: "
+"ÐŸÑ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ð¾: "
 # ^CopyDetails
-Êîï³þâàòè äåòàë³ ó áóôåð îáì³íó 
+ÐšÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ñ‚Ð¸ Ð´ÐµÑ‚Ð°Ð»Ñ– Ñƒ Ð±ÑƒÑ„ÐµÑ€ Ð¾Ð±Ð¼Ñ–Ð½Ñƒ
 # ^LogInstall
-Çàïèñóâàòè â ëîã ïðîöåñ âñòíîâëåííÿ
+Ð—Ð°Ð¿Ð¸Ñ�ÑƒÐ²Ð°Ñ‚Ð¸ Ð² Ð»Ð¾Ð³ Ð¿Ñ€Ð¾Ñ†ÐµÑ� Ð²Ñ�Ñ‚Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ�
 # byte
-á
+Ð±
 # kilo
-Ê
+ Ðš
 # mega
-Ì
+ Ðœ
 # giga
-Ã
+ Ð“
Index: tmp/org.txm.setups/nsis/Contrib/Language files/German.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/German.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/German.nsh	(revision 2956)
@@ -1,110 +1,110 @@
-;Language: German (1031)
-;By L.King, changes by K. Windszus & R. Bisswanger & M. Simmack & D. Weiß
+ï»¿;Language: German (1031)
+;By L.King, changes by K. Windszus, R. Bisswanger, M. Simmack, D. WeiÃŸ, Frederik Schwarzer & S. Stange
 
-!insertmacro LANGFILE "German" "Deutsch"
+!insertmacro LANGFILE "German" = "Deutsch" =
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Willkommen beim Installations-$\r$\nAssistenten für $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Dieser Assistent wird Sie durch die Installation von $(^NameDA) begleiten.$\r$\n$\r$\nEs 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} MUI_TEXT_WELCOME_INFO_TITLE "Willkommen zur Installation$\r$\nvon $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Dieser Assistent wird Sie durch die Installation von $(^NameDA) begleiten.$\r$\n$\r$\nEs 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"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Willkommen beim Deinstallations-$\r$\nAssistenten für $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Willkommen zur Deinstallation$\r$\nvon $(^NameDA)"
   ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Dieser Assistent wird Sie durch die Deinstallation von $(^NameDA) begleiten.$\r$\n$\r$\nBitte beenden Sie $(^NameDA), bevor Sie mit der Deinstallation fortfahren.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
   ${LangFileString} MUI_TEXT_LICENSE_TITLE "Lizenzabkommen"
   ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Bitte lesen Sie die Lizenzbedingungen durch, bevor Sie mit der Installation fortfahren."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Falls Sie alle Bedingungen des Abkommens akzeptieren, klicken Sie auf Annehmen. Sie müssen die Lizenzvereinbarungen anerkennen, um $(^NameDA) installieren zu können."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Falls Sie alle Bedingungen des Abkommens akzeptieren, aktivieren Sie das Kästchen. Sie müssen die Lizenzvereinbarungen anerkennen, um $(^NameDA) installieren zu können. $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Falls Sie alle Bedingungen des Abkommens akzeptieren, wählen Sie unten die entsprechende Option. Sie müssen die Lizenzvereinbarungen anerkennen, um $(^NameDA) installieren zu können. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Falls Sie alle Bedingungen des Abkommens akzeptieren, klicken Sie auf Annehmen. Sie mÃ¼ssen die Lizenzvereinbarungen anerkennen, um $(^NameDA) installieren zu kÃ¶nnen."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Falls Sie alle Bedingungen des Abkommens akzeptieren, aktivieren Sie das KÃ¤stchen. Sie mÃ¼ssen die Lizenzvereinbarungen anerkennen, um $(^NameDA) installieren zu kÃ¶nnen. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Falls Sie alle Bedingungen des Abkommens akzeptieren, wÃ¤hlen Sie unten die entsprechende Option. Sie mÃ¼ssen die Lizenzvereinbarungen anerkennen, um $(^NameDA) installieren zu kÃ¶nnen. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
   ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Lizenzabkommen"
   ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Bitte lesen Sie die Lizenzbedingungen durch, bevor Sie mit der Deinstallation von $(^NameDA) fortfahren."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Falls Sie alle Bedingungen des Abkommens akzeptieren, klicken Sie auf Annehmen. Sie müssen die Lizenzvereinbarungen anerkennen, um $(^NameDA) deinstallieren zu können."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Falls Sie alle Bedingungen des Abkommens akzeptieren, aktivieren Sie das Kästchen. Sie müssen die Lizenzvereinbarungen anerkennen, um $(^NameDA) deinstallieren zu können. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Falls Sie alle Bedingungen des Abkommens akzeptieren, wählen Sie unten die entsprechende Option. Sie müssen die Lizenzvereinbarungen anerkennen, um $(^NameDA) deinstallieren zu können. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Falls Sie alle Bedingungen des Abkommens akzeptieren, klicken Sie auf Annehmen. Sie mÃ¼ssen die Lizenzvereinbarungen anerkennen, um $(^NameDA) deinstallieren zu kÃ¶nnen."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Falls Sie alle Bedingungen des Abkommens akzeptieren, aktivieren Sie das KÃ¤stchen. Sie mÃ¼ssen die Lizenzvereinbarungen anerkennen, um $(^NameDA) deinstallieren zu kÃ¶nnen. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Falls Sie alle Bedingungen des Abkommens akzeptieren, wÃ¤hlen Sie unten die entsprechende Option. Sie mÃ¼ssen die Lizenzvereinbarungen anerkennen, um $(^NameDA) deinstallieren zu kÃ¶nnen. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Drücken Sie die Bild-nach-unten Taste, um den Rest des Abkommens zu sehen."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "DrÃ¼cken Sie die BILD-AB-Taste, um den Rest des Abkommens zu lesen."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Komponenten auswählen"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Wählen Sie die Komponenten aus, die Sie installieren möchten."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Komponenten auswÃ¤hlen"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "WÃ¤hlen Sie die Komponenten aus, die Sie installieren mÃ¶chten."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Komponenten auswählen"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Wählen Sie die Komponenten aus, die Sie entfernen möchten."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Komponenten auswÃ¤hlen"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "WÃ¤hlen Sie die Komponenten aus, die Sie entfernen mÃ¶chten."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Beschreibung"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Bewegen Sie den Mauszeiger über eine Komponente, um ihre Beschreibung zu sehen."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Bewegen Sie den Mauszeiger Ã¼ber eine Komponente, um die Beschreibung zu lesen."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Bewegen Sie den Mauszeiger über eine Komponente, um ihre Beschreibung zu sehen."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "WÃ¤hlen Sie eine Komponente, um die Beschreibung zu lesen."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Zielverzeichnis auswählen"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Wählen Sie das Verzeichnis aus, in das $(^NameDA) installiert werden soll."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Zielverzeichnis auswÃ¤hlen"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "WÃ¤hlen Sie das Verzeichnis aus, in das $(^NameDA) installiert werden soll."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Verzeichnis für Deinstallation auswählen"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Wählen Sie das Verzeichnis aus, aus dem $(^NameDA) entfernt werden soll."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Verzeichnis fÃ¼r Deinstallation auswÃ¤hlen"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "WÃ¤hlen Sie das Verzeichnis aus, aus dem $(^NameDA) entfernt werden soll."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Installiere..."
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Bitte warten Sie, während $(^NameDA) installiert wird."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Die Installation ist vollständig"
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Wird installiert ..."
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Bitte warten Sie, wÃ¤hrend $(^NameDA) installiert wird."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Die Installation ist vollstÃ¤ndig"
   ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Die Installation wurde erfolgreich abgeschlossen."
   ${LangFileString} MUI_TEXT_ABORT_TITLE "Abbruch der Installation"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Die Installation wurde nicht vollständig abgeschlossen."
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Die Installation wurde nicht vollstÃ¤ndig abgeschlossen."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Deinstalliere..."
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Bitte warten Sie, während $(^NameDA) entfernt wird."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Die Deinstallation ist vollständig"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Wird deinstalliert ..."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Bitte warten Sie, wÃ¤hrend $(^NameDA) entfernt wird."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Die Deinstallation ist vollstÃ¤ndig"
   ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Die Deinstallation wurde erfolgreich abgeschlossen."
   ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Abbruch der Deinstallation"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Die Deinstallation wurde nicht vollständig abgeschlossen."
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Die Deinstallation wurde nicht vollstÃ¤ndig abgeschlossen."
 !endif
 
 !ifdef MUI_FINISHPAGE
   ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Die Installation von $(^NameDA) wird abgeschlossen"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) wurde auf Ihrem Computer installiert.$\r$\n$\r$\nKlicken Sie auf Fertig stellen, um den Installations-Assistenten zu schließen."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Windows muss neu gestartet werden, um die Installation von $(^NameDA) zu vervollständigen. Möchten Sie Windows jetzt neu starten?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) wurde auf Ihrem Computer installiert.$\r$\n$\r$\nKlicken Sie auf Fertigstellen, um den Installationsassistenten zu schlieÃŸen."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Windows muss neu gestartet werden, um die Installation von $(^NameDA) zu vervollstÃ¤ndigen. MÃ¶chten Sie Windows jetzt neu starten?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
   ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Die Deinstallation von $(^NameDA) wird abgeschlossen"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) ist von Ihrem Computer entfernt worden.$\r$\n$\r$\nKlicken Sie auf Fertig stellen, um den Assistenten zu schließen."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Windows muss neu gestartet werden, um die Deinstallation von $(^NameDA) zu vervollständigen. Möchten Sie Windows jetzt neu starten?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) ist von Ihrem Computer entfernt worden.$\r$\n$\r$\nKlicken Sie auf Fertigstellen, um den Assistenten zu schlieÃŸen."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Windows muss neu gestartet werden, um die Deinstallation von $(^NameDA) zu vervollstÃ¤ndigen. MÃ¶chten Sie Windows jetzt neu starten?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
   ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Jetzt neu starten"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Windows später selbst neu starten"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "$(^NameDA) ausführen"
-  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Liesmich anzeigen"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Fertig stellen"  
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Windows spÃ¤ter selbst neu starten"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "$(^NameDA) ausfÃ¼hren"
+  ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "Liesmich-Datei anzeigen"
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Fertigstellen"
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Startmenü-Ordner bestimmen"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Bestimmen Sie einen Startmenü-Ordner für die Programmverknüpfungen."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Wählen Sie den Startmenü-Ordner für die Programmverknüpfungen aus. Falls Sie einen neuen Ordner erstellen möchten, geben Sie dessen Namen ein."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Keine Verknüpfungen erstellen"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "StartmenÃ¼-Ordner bestimmen"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Bestimmen Sie einen StartmenÃ¼-Ordner fÃ¼r die ProgrammverknÃ¼pfungen."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "WÃ¤hlen Sie den StartmenÃ¼-Ordner fÃ¼r die ProgrammverknÃ¼pfungen aus. Falls Sie einen neuen Ordner erstellen mÃ¶chten, geben Sie dessen Namen ein."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Keine VerknÃ¼pfungen erstellen"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
@@ -113,17 +113,17 @@
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Sind Sie sicher, dass Sie die Installation von $(^Name) abbrechen wollen?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Sind Sie sicher, dass Sie die Installation von $(^Name) abbrechen mÃ¶chten?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Sind Sie sicher, dass Sie die Deinstallation von $(^Name) abbrechen möchten?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Sind Sie sicher, dass Sie die Deinstallation von $(^Name) abbrechen mÃ¶chten?"
 !endif
 
 !ifdef MULTIUSER_INSTALLMODEPAGE
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Benutzer auswählen"
-  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Wählen Sie die Benutzer aus, für die Sie $(^NameDA) installieren wollen."
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Wählen Sie aus, ob Sie $(^NameDA) nur für den eigenen Gebrauch oder für die Nutzung durch alle Benutzer dieses Systems installieren möchten. $(^ClickNext)"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Installation für alle Benutzer dieses Computers"
-  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Installation nur für mich"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Benutzer auswÃ¤hlen"
+  ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "WÃ¤hlen Sie die Benutzer aus, fÃ¼r die Sie $(^NameDA) installieren mÃ¶chten."
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "WÃ¤hlen Sie aus, ob Sie $(^NameDA) nur fÃ¼r den eigenen Gebrauch oder fÃ¼r die Nutzung durch alle Benutzer dieses Systems installieren mÃ¶chten. $(^ClickNext)"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Installation fÃ¼r alle Benutzer dieses Computers"
+  ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Installation nur fÃ¼r mich"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Russian.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Russian.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Russian.nlf	(revision 2956)
@@ -1,191 +1,192 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1049
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1251
 # RTL - anything else than RTL means LTR
 -
 # Translation by Timon [ timon@front.ru ] + 20030919
-# Translation updated by Dmitry Yerokhin [erodim@mail.ru] (050424)
+# Translation updated by Dmitry Yerokhin [erodim@mail.ru] (20050424)
+# Minor updates by Oleksandr Gavenko (20100514 - patch #226)
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-Óñòàíîâêà $(^Name)
+Ð£Ñ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ° $(^Name)
 # ^UninstallCaption
-Óäàëåíèå $(^Name)
+Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ $(^Name)
 # ^LicenseSubCaption
-: Ëèöåíçèîííîå ñîãëàøåíèå
+: Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ðµ Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ðµ
 # ^ComponentsSubCaption
-: Ïàðàìåòðû óñòàíîâêè
+: ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸
 # ^DirSubCaption
-: Ïàïêà óñòàíîâêè
+: ÐŸÐ°Ð¿ÐºÐ° ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸
 # ^InstallingSubCaption
-: Êîïèðîâàíèå ôàéëîâ
+: ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²
 # ^CompletedSubCaption
-: Îïåðàöèÿ çàâåðøåíà
+: ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ� Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð°
 # ^UnComponentsSubCaption
-: Ïàðàìåòðû óäàëåíèÿ
+: ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ�
 # ^UnDirSubCaption
-: Ïàïêà óäàëåíèÿ
+: ÐŸÐ°Ð¿ÐºÐ° ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ�
 # ^ConfirmSubCaption
-: Ïîäòâåðæäåíèå
+: ÐŸÐ¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ðµ
 # ^UninstallingSubCaption
-: Óäàëåíèå ôàéëîâ
+: Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²
 # ^UnCompletedSubCaption
-: Îïåðàöèÿ çàâåðøåíà
+: ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ� Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð°
 # ^BackBtn
-< &Íàçàä
+< &Ð�Ð°Ð·Ð°Ð´
 # ^NextBtn
-&Äàëåå >
+&Ð”Ð°Ð»ÐµÐµ >
 # ^AgreeBtn
-Ïðèíèìà&þ
+ÐŸÑ€Ð¸Ð½Ð¸Ð¼Ð°&ÑŽ
 # ^AcceptBtn
-ß &ïðèíèìàþ óñëîâèÿ ñîãëàøåíèÿ
+Ð¯ &Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÑŽ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ�
 # ^DontAcceptBtn
-ß &íå ïðèíèìàþ óñëîâèÿ ñîãëàøåíèÿ
+Ð¯ &Ð½Ðµ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÑŽ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ�
 # ^InstallBtn
-&Óñòàíîâèòü
+&Ð£Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ
 # ^UninstallBtn
-Óä&àëèòü
+Ð£Ð´&Ð°Ð»Ð¸Ñ‚ÑŒ
 # ^CancelBtn
-Îòìåíà
+ÐžÑ‚Ð¼ÐµÐ½Ð°
 # ^CloseBtn
-&Çàêðûòü
+&Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ
 # ^BrowseBtn
-Î&áçîð ...
+Ðž&Ð±Ð·Ð¾Ñ€ ...
 # ^ShowDetailsBtn
-&Äåòàëè...
+&Ð”ÐµÑ‚Ð°Ð»Ð¸...
 # ^ClickNext
-Íàæìèòå êíîïêó 'Äàëåå' äëÿ ïðîäîëæåíèÿ.
+Ð�Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ "Ð”Ð°Ð»ÐµÐµ" Ð´Ð»Ñ� Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ�.
 # ^ClickInstall
-Íàæìèòå êíîïêó 'Óñòàíîâèòü', ÷òîáû óñòàíîâèòü ïðîãðàììó.
+Ð�Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ "Ð£Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ", Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñƒ.
 # ^ClickUninstall
-Íàæìèòå êíîïêó 'Óäàëèòü', ÷òîáû óäàëèòü ïðîãðàììó.
+Ð�Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ", Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñƒ.
 # ^Name
-Èìÿ
+Ð˜Ð¼Ñ�
 # ^Completed
-Ãîòîâî
+Ð“Ð¾Ñ‚Ð¾Ð²Ð¾
 # ^LicenseText
-Ïåðåä óñòàíîâêîé $(^NameDA) îçíàêîìüòåñü ñ ëèöåíçèîííûì ñîãëàøåíèåì. Åñëè âû ïðèíèìàåòå óñëîâèÿ ñîãëàøåíèÿ, íàæìèòå êíîïêó 'Ïðèíèìàþ'.
+ÐŸÐµÑ€ÐµÐ´ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¾Ð¹ $(^NameDA) Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼ÑŒÑ‚ÐµÑ�ÑŒ Ñ� Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ‹Ð¼ Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸ÐµÐ¼. Ð•Ñ�Ð»Ð¸ Ð²Ñ‹ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ�, Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ "ÐŸÑ€Ð¸Ð½Ð¸Ð¼Ð°ÑŽ".
 # ^LicenseTextCB
-Ïåðåä óñòàíîâêîé $(^NameDA) îçíàêîìüòåñü ñ ëèöåíçèîííûì ñîãëàøåíèåì. Åñëè âû ïðèíèìàåòå óñëîâèÿ ñîãëàøåíèÿ, óñòàíîâèòå ôëàæîê íèæå. $_CLICK
+ÐŸÐµÑ€ÐµÐ´ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¾Ð¹ $(^NameDA) Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼ÑŒÑ‚ÐµÑ�ÑŒ Ñ� Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ‹Ð¼ Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸ÐµÐ¼. Ð•Ñ�Ð»Ð¸ Ð²Ñ‹ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ�, ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ðµ Ñ„Ð»Ð°Ð¶Ð¾Ðº Ð½Ð¸Ð¶Ðµ. $_CLICK
 # ^LicenseTextRB
-Ïåðåä óñòàíîâêîé $(^NameDA) îçíàêîìüòåñü ñ ëèöåíçèîííûì ñîãëàøåíèåì. Åñëè âû ïðèíèìàåòå óñëîâèÿ ñîãëàøåíèÿ, âûáåðèòå ïåðâûé âàðèàíò èç ïðåäëîæåííûõ íèæå. $_CLICK
+ÐŸÐµÑ€ÐµÐ´ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¾Ð¹ $(^NameDA) Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼ÑŒÑ‚ÐµÑ�ÑŒ Ñ� Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ‹Ð¼ Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸ÐµÐ¼. Ð•Ñ�Ð»Ð¸ Ð²Ñ‹ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ�, Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿ÐµÑ€Ð²Ñ‹Ð¹ Ð²Ð°Ñ€Ð¸Ð°Ð½Ñ‚ Ð¸Ð· Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð½Ñ‹Ñ… Ð½Ð¸Ð¶Ðµ. $_CLICK
 # ^UnLicenseText
-Ïåðåä óñòàíîâêîé $(^NameDA) îçíàêîìüòåñü ñ ëèöåíçèîííûì ñîãëàøåíèåì. Åñëè âû ïðèíèìàåòå óñëîâèÿ ñîãëàøåíèÿ, íàæìèòå êíîïêó 'Ïðèíèìàþ'.
+ÐŸÐµÑ€ÐµÐ´ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¾Ð¹ $(^NameDA) Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼ÑŒÑ‚ÐµÑ�ÑŒ Ñ� Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ‹Ð¼ Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸ÐµÐ¼. Ð•Ñ�Ð»Ð¸ Ð²Ñ‹ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ�, Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ "ÐŸÑ€Ð¸Ð½Ð¸Ð¼Ð°ÑŽ".
 # ^UnLicenseTextCB
-Ïåðåä óñòàíîâêîé $(^NameDA) îçíàêîìüòåñü ñ ëèöåíçèîííûì ñîãëàøåíèåì. Åñëè âû ïðèíèìàåòå óñëîâèÿ ñîãëàøåíèÿ, óñòàíîâèòå ôëàæîê íèæå. $_CLICK
+ÐŸÐµÑ€ÐµÐ´ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¾Ð¹ $(^NameDA) Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼ÑŒÑ‚ÐµÑ�ÑŒ Ñ� Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ‹Ð¼ Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸ÐµÐ¼. Ð•Ñ�Ð»Ð¸ Ð²Ñ‹ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ�, ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ðµ Ñ„Ð»Ð°Ð¶Ð¾Ðº Ð½Ð¸Ð¶Ðµ. $_CLICK
 # ^UnLicenseTextRB
-Ïåðåä óñòàíîâêîé $(^NameDA) îçíàêîìüòåñü ñ ëèöåíçèîííûì ñîãëàøåíèåì. Åñëè âû ïðèíèìàåòå óñëîâèÿ ñîãëàøåíèÿ, âûáåðèòå ïåðâûé âàðèàíò èç ïðåäëîæåííûõ íèæå. $_CLICK
+ÐŸÐµÑ€ÐµÐ´ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¾Ð¹ $(^NameDA) Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼ÑŒÑ‚ÐµÑ�ÑŒ Ñ� Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ñ‹Ð¼ Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸ÐµÐ¼. Ð•Ñ�Ð»Ð¸ Ð²Ñ‹ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ‚Ðµ ÑƒÑ�Ð»Ð¾Ð²Ð¸Ñ� Ñ�Ð¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ�, Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿ÐµÑ€Ð²Ñ‹Ð¹ Ð²Ð°Ñ€Ð¸Ð°Ð½Ñ‚ Ð¸Ð· Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð½Ñ‹Ñ… Ð½Ð¸Ð¶Ðµ. $_CLICK
 # ^Custom
-Ïî âûáîðó
+ÐŸÐ¾ Ð²Ñ‹Ð±Ð¾Ñ€Ñƒ
 # ^ComponentsText
-Âûáåðèòå êîìïîíåíòû ïðîãðàììû, êîòîðûå âû õîòèòå óñòàíîâèòü. $_CLICK
+Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñ‹ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ. $_CLICK
 # ^ComponentsSubText1
-Âûáåðèòå òèï óñòàíîâêè:
+Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ‚Ð¸Ð¿ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸:
 # ^ComponentsSubText2_NoInstTypes
-Âûáåðèòå êîìïîíåíòû ïðîãðàììû äëÿ óñòàíîâêè:
+Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñ‹ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ Ð´Ð»Ñ� ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸:
 # ^ComponentsSubText2
-èëè âûáåðèòå äîïîëíèòåëüíûå êîìïîíåíòû äëÿ óñòàíîâêè:
+Ð¸Ð»Ð¸ Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñ‹ Ð´Ð»Ñ� ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸:
 # ^UnComponentsText
-Âûáåðèòå êîìïîíåíòû, êîòîðûå âû õîòèòå óäàëèòü. $_CLICK
+Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñ‹, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ. $_CLICK
 # ^UnComponentsSubText1
-Âûáåðèòå òèï óäàëåíèÿ:
+Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ‚Ð¸Ð¿ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ�:
 # ^UnComponentsSubText2_NoInstTypes
-Âûáåðèòå êîìïîíåíòû äëÿ óäàëåíèÿ:
+Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñ‹ Ð´Ð»Ñ� ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ�:
 # ^UnComponentsSubText2
-èëè âûáåðèòå äîïîëíèòåëüíûå êîìïîíåíòû äëÿ óäàëåíèÿ:
+Ð¸Ð»Ð¸ Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñ‹ Ð´Ð»Ñ� ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ�:
 # ^DirText
-Ïðîãðàììà óñòàíîâèò $(^NameDA) â óêàçàííóþ ïàïêó. ×òîáû óñòàíîâèòü ïðèëîæåíèå â äðóãóþ ïàïêó, íàæìèòå êíîïêó 'Îáçîð' è óêàæèòå åå. $_CLICK
+ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ $(^NameDA) Ð² ÑƒÐºÐ°Ð·Ð°Ð½Ð½ÑƒÑŽ Ð¿Ð°Ð¿ÐºÑƒ. Ð§Ñ‚Ð¾Ð±Ñ‹ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð² Ð´Ñ€ÑƒÐ³ÑƒÑŽ Ð¿Ð°Ð¿ÐºÑƒ, Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ "ÐžÐ±Ð·Ð¾Ñ€" Ð¸ ÑƒÐºÐ°Ð¶Ð¸Ñ‚Ðµ ÐµÐµ. $_CLICK
 # ^DirSubText
-Ïàïêà óñòàíîâêè
+ÐŸÐ°Ð¿ÐºÐ° ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸
 # ^DirBrowseText
-Óêàæèòå ïàïêó äëÿ óñòàíîâêè $(^NameDA):
+Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ Ð¿Ð°Ð¿ÐºÑƒ Ð´Ð»Ñ� ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ $(^NameDA):
 # ^UnDirText
-Ïðîãðàììà óäàëèò $(^NameDA) èç óêàçàííîé ïàïêè. ×òîáû âûïîëíèòü óäàëåíèå èç äðóãîé ïàïêè, íàæìèòå êíîïêó 'Îáçîð' è óêàæèòå åå. $_CLICK
+ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° ÑƒÐ´Ð°Ð»Ð¸Ñ‚ $(^NameDA) Ð¸Ð· ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ Ð¿Ð°Ð¿ÐºÐ¸. Ð§Ñ‚Ð¾Ð±Ñ‹ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¸Ð· Ð´Ñ€ÑƒÐ³Ð¾Ð¹ Ð¿Ð°Ð¿ÐºÐ¸, Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ "ÐžÐ±Ð·Ð¾Ñ€" Ð¸ ÑƒÐºÐ°Ð¶Ð¸Ñ‚Ðµ ÐµÐµ. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Óêàæèòå ïàïêó, èç êîòîðîé íóæíî óäàëèòü $(^NameDA):
+Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ Ð¿Ð°Ð¿ÐºÑƒ, Ð¸Ð· ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð½ÑƒÐ¶Ð½Ð¾ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ $(^NameDA):
 # ^SpaceAvailable
-"Äîñòóïíî íà äèñêå: "
+"Ð”Ð¾Ñ�Ñ‚ÑƒÐ¿Ð½Ð¾ Ð½Ð° Ð´Ð¸Ñ�ÐºÐµ: "
 # ^SpaceRequired
-"Òðåáóåòñÿ íà äèñêå: "
+"Ð¢Ñ€ÐµÐ±ÑƒÐµÑ‚Ñ�Ñ� Ð½Ð° Ð´Ð¸Ñ�ÐºÐµ: "
 # ^UninstallingText
-Ïðîãðàììà $(^NameDA) áóäåò óäàëåíà èç âàøåãî ÏÊ. $_CLICK
+ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° $(^NameDA) Ð±ÑƒÐ´ÐµÑ‚ ÑƒÐ´Ð°Ð»ÐµÐ½Ð° Ð¸Ð· Ð²Ð°ÑˆÐµÐ³Ð¾ ÐŸÐš. $_CLICK
 # ^UninstallingSubText
-Óäàëåíèå èç:
+Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¸Ð·:
 # ^FileError
-Íåâîçìîæíî îòêðûòü ôàéë äëÿ çàïèñè: \r\n\t"$0"\r\n'Ïðåðâàòü': îñòàíîâèòü óñòàíîâêó;\r\n"Ïîâòîð": ïîâòîðèòü ïîïûòêó;\r\n"Ïðîïóñê": ïðîïóñòèòü ýòî äåéñòâèå.
+Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» Ð´Ð»Ñ� Ð·Ð°Ð¿Ð¸Ñ�Ð¸: \r\n\t"$0"\r\n"ÐŸÑ€ÐµÑ€Ð²Ð°Ñ‚ÑŒ": Ð¾Ñ�Ñ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÑƒ;\r\n"ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€": Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÑƒ;\r\n"ÐŸÑ€Ð¾Ð¿ÑƒÑ�Ðº": Ð¿Ñ€Ð¾Ð¿ÑƒÑ�Ñ‚Ð¸Ñ‚ÑŒ Ñ�Ñ‚Ð¾ Ð´ÐµÐ¹Ñ�Ñ‚Ð²Ð¸Ðµ.
 # ^FileError_NoIgnore
-Íåâîçìîæíî îòêðûòü ôàéë äëÿ çàïèñè: \r\n\t"$0"\r\n'Ïîâòîð': ïîâòîðèòü ïîïûòêó;\r\n'Îòìåíà': ïðåðâàòü ïðîöåññ óñòàíîâêè.
+Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» Ð´Ð»Ñ� Ð·Ð°Ð¿Ð¸Ñ�Ð¸: \r\n\t"$0"\r\n"ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€": Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÑƒ;\r\n"ÐžÑ‚Ð¼ÐµÐ½Ð°": Ð¿Ñ€ÐµÑ€Ð²Ð°Ñ‚ÑŒ Ð¿Ñ€Ð¾Ñ†ÐµÑ�Ñ� ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸.
 # ^CantWrite
-"Íåâîçìîæíî çàïèñàòü: "
+"Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð°Ð¿Ð¸Ñ�Ð°Ñ‚ÑŒ: "
 # ^CopyFailed
-Îøèáêà ïðè êîïèðîâàíèè
+ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ð¸
 # ^CopyTo
-"Êîïèðîâàíèå â "
+"ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð² "
 # ^Registering
-"Ðåãèñòðàöèÿ: "
+"Ð ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ð°Ñ†Ð¸Ñ�: "
 # ^Unregistering
-"Äå-ðåãèñòðàöèÿ: "
+"Ð”Ðµ-Ñ€ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ð°Ñ†Ð¸Ñ�: "
 # ^SymbolNotFound
-"Íåâîçìîæíî íàéòè ñèìâîë: "
+"Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ‚Ð¸ Ñ�Ð¸Ð¼Ð²Ð¾Ð»: "
 # ^CouldNotLoad
-"Íåâîçìîæíî çàãðóçèòü: "
+"Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ: "
 # ^CreateFolder
-"Ñîçäàíèå ïàïêè: "
+"Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ð¿Ð°Ð¿ÐºÐ¸: "
 # ^CreateShortcut
-"Ñîçäàíèå ÿðëûêà: "
+"Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ñ�Ñ€Ð»Ñ‹ÐºÐ°: "
 # ^CreatedUninstaller
-"Ñîçäàíèå ïðîãðàììû óäàëåíèÿ: "
+"Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ�: "
 # ^Delete
-"Óäàëåíèå ôàéëà: "
+"Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð°: "
 # ^DeleteOnReboot
-"Óäàëåíèå ïðè ïåðåçàãðóçêå ÏÊ: "
+"Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿Ñ€Ð¸ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐµ ÐŸÐš: "
 # ^ErrorCreatingShortcut
-"Îøèáêà ñîçäàíèÿ ÿðëûêà: " 
+"ÐžÑˆÐ¸Ð±ÐºÐ° Ñ�Ð¾Ð·Ð´Ð°Ð½Ð¸Ñ� Ñ�Ñ€Ð»Ñ‹ÐºÐ°: "
 # ^ErrorCreating
-"Îøèáêà ñîçäàíèÿ: "
+"ÐžÑˆÐ¸Ð±ÐºÐ° Ñ�Ð¾Ð·Ð´Ð°Ð½Ð¸Ñ�: "
 # ^ErrorDecompressing
-Îøèáêà ðàñïàêîâêè äàííûõ! Âîçìîæíî, ïîâðåæä¸í äèñòðèáóòèâ.
+ÐžÑˆÐ¸Ð±ÐºÐ° Ñ€Ð°Ñ�Ð¿Ð°ÐºÐ¾Ð²ÐºÐ¸ Ð´Ð°Ð½Ð½Ñ‹Ñ…! Ð’Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð¿Ð¾Ð²Ñ€ÐµÐ¶Ð´Ñ‘Ð½ Ð´Ð¸Ñ�Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð¸Ð².
 # ^ErrorRegistering
-Íåâîçìîæíî çàðåãèñòðèðîâàòü áèáëèîòåêó (DLL)
+Ð�ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð°Ñ€ÐµÐ³Ð¸Ñ�Ñ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð±Ð¸Ð±Ð»Ð¸Ð¾Ñ‚ÐµÐºÑƒ (DLL)
 # ^ExecShell
-"Âûïîëíåíèå êîìàíäû îáîëî÷êè: " 
+"Ð’Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹ Ð¾Ð±Ð¾Ð»Ð¾Ñ‡ÐºÐ¸: "
 # ^Exec
-"Âûïîëíåíèå: "
+"Ð’Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ: "
 # ^Extract
-"Èçâëå÷åíèå: "
+"Ð˜Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ðµ: "
 # ^ErrorWriting
-"Èçâëå÷åíèå: îøèáêà çàïèñè ôàéëà "
+"Ð˜Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ðµ: Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿Ð¸Ñ�Ð¸ Ñ„Ð°Ð¹Ð»Ð° "
 # ^InvalidOpcode
-Äèñòðèáóòèâ ïîâðåæäåí: íåäîïóñòèìûé êîä
+Ð”Ð¸Ñ�Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð¸Ð² Ð¿Ð¾Ð²Ñ€ÐµÐ¶Ð´ÐµÐ½: Ð½ÐµÐ´Ð¾Ð¿ÑƒÑ�Ñ‚Ð¸Ð¼Ñ‹Ð¹ ÐºÐ¾Ð´
 # ^NoOLE
-"Íåò OLE äëÿ: " 
+"Ð�ÐµÑ‚ OLE Ð´Ð»Ñ�: "
 # ^OutputFolder
-"Ïàïêà óñòàíîâêè: "
+"ÐŸÐ°Ð¿ÐºÐ° ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸: "
 # ^RemoveFolder
-"Óäàëåíèå ïàïêè: "
+"Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð°Ð¿ÐºÐ¸: "
 # ^RenameOnReboot
-"Ïåðåèìåíîâàíèå ïðè ïåðåçàãðóçêå ÏÊ: "
+"ÐŸÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¿Ñ€Ð¸ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐµ ÐŸÐš: "
 # ^Rename
-"Ïåðåèìåíîâàíèå: "
+"ÐŸÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ðµ: "
 # ^Skipped
-"Ïðîïóñê: "
+"ÐŸÑ€Ð¾Ð¿ÑƒÑ�Ðº: "
 # ^CopyDetails
-Êîïèðîâàòü ñâåäåíèÿ â áóôåð îáìåíà 
+ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ�Ð²ÐµÐ´ÐµÐ½Ð¸Ñ� Ð² Ð±ÑƒÑ„ÐµÑ€ Ð¾Ð±Ð¼ÐµÐ½Ð°
 # ^LogInstall
-Âåñòè îò÷åò óñòàíîâêè
+Ð’ÐµÑ�Ñ‚Ð¸ Ð¾Ñ‚Ñ‡ÐµÑ‚ ÑƒÑ�Ñ‚Ð°Ð½Ð¾Ð²ÐºÐ¸
 # byte
-áàéò
+Ð±Ð°Ð¹Ñ‚
 # kilo
- Ê
+ Ðš
 # mega
- Ì
+ Ðœ
 # giga
- Ã
\ No newline at end of file
+ Ð“
\ No newline at end of file
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Breton.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Breton.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Breton.nsh	(revision 2956)
@@ -1,46 +1,46 @@
-;Language: Breton (1150)
-;By KAD-Korvigelloù An Drouizig
+ï»¿;Language: Breton (1150)
+;By KAD-KorvigelloÃ¹ An Drouizig
 
-!insertmacro LANGFILE "Breton" "Brezhoneg"
+!insertmacro LANGFILE "Breton" = "Brezhoneg" =
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Degemer mat e skoazeller staliañ $(^NameDA)"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Sturiet e viot gant ar skoazeller-mañ evit staliañ $(^NameDA).$\r$\n$\r$\nGwelloc'h eo serriñ pep arload oberiant er reizhiad a-raok mont pelloc'h gant ar skoazeller-mañ. Evel-se e c'heller nevesaat ar restroù reizhiad hep rankout adloc'hañ hoc'h urzhiataer.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Degemer mat e skoazeller staliaÃ± $(^NameDA)"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Sturiet e viot gant ar skoazeller-maÃ± evit staliaÃ± $(^NameDA).$\r$\n$\r$\nGwelloc'h eo serriÃ± pep arload oberiant er reizhiad a-raok mont pelloc'h gant ar skoazeller-maÃ±. Evel-se e c'heller nevesaat ar restroÃ¹ reizhiad hep rankout adloc'haÃ± hoc'h urzhiataer.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Degemer mat er skoazeller distaliañ $(^NameDA)"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Sturiet e viot gant ar skoazeller-mañ a-benn distaliañ $(^NameDA).$\r$\n$\r$\nEn em asurit n'eo ket lañset $(^NameDA) a-raok mont pelloc'h gant an distaliañ.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Degemer mat er skoazeller distaliaÃ± $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Sturiet e viot gant ar skoazeller-maÃ± a-benn distaliaÃ± $(^NameDA).$\r$\n$\r$\nEn em asurit n'eo ket laÃ±set $(^NameDA) a-raok mont pelloc'h gant an distaliaÃ±.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
-  ${LangFileString} MUI_TEXT_LICENSE_TITLE "Lañvaz emglev"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Bezit aketus en ur lenn pep term eus al lañvaz a-raok staliañ $(^NameDA), mar plij."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Mar degemerit pep term eus al lañvaz, klikit war « War-lerc'h ». Ret eo deoc'h degemer al lañvaz evit staliañ $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Mar degemerit pep term eus al lañvaz, klikit war al log a-zindan. Ret eo deoc'h degemer al lañvaz a-benn staliañ $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Mar degemerit pep term eus al lañvaz, diuzit an dibab kentañ a-zindan. Ret eo deoc'h degemer al lañvaz a-benn staliañ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_TITLE "LaÃ±vaz emglev"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Bezit aketus en ur lenn pep term eus al laÃ±vaz a-raok staliaÃ± $(^NameDA), mar plij."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Mar degemerit pep term eus al laÃ±vaz, klikit war Â« War-lerc'h Â». Ret eo deoc'h degemer al laÃ±vaz evit staliaÃ± $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Mar degemerit pep term eus al laÃ±vaz, klikit war al log a-zindan. Ret eo deoc'h degemer al laÃ±vaz a-benn staliaÃ± $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Mar degemerit pep term eus al laÃ±vaz, diuzit an dibab kentaÃ± a-zindan. Ret eo deoc'h degemer al laÃ±vaz a-benn staliaÃ± $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Lañvaz emglev"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Trugarez da lenn al lañvaz a-raok distaliañ $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Mar degemerit pep term eus al lañvaz, klikit war « A-du emaon » evit kenderc'hel. Ret eo deoc'h degemer al lañvaz evit distaliañ $(^NameDA)."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Mar degemerit pep term eus al lañvaz, klikit war al log a-zindan. Ret eo deoc'h degemer al lañvaz evit distaliañ $(^NameDA). $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Mar degemerit pep term eus al lañvaz, dizuit an dibab kentañ a-zindan. Ret eo deoc'h degemer al lañvaz evit distaliañ $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "LaÃ±vaz emglev"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Trugarez da lenn al laÃ±vaz a-raok distaliaÃ± $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Mar degemerit pep term eus al laÃ±vaz, klikit war Â« A-du emaon Â» evit kenderc'hel. Ret eo deoc'h degemer al laÃ±vaz evit distaliaÃ± $(^NameDA)."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Mar degemerit pep term eus al laÃ±vaz, klikit war al log a-zindan. Ret eo deoc'h degemer al laÃ±vaz evit distaliaÃ± $(^NameDA). $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Mar degemerit pep term eus al laÃ±vaz, dizuit an dibab kentaÃ± a-zindan. Ret eo deoc'h degemer al laÃ±vaz evit distaliaÃ± $(^NameDA). $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Pouezit war « Pajenn a-raok » evit lenn ar pajennoù eus al lañvaz da-heul."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Pouezit war Â« Pajenn a-raok Â» evit lenn ar pajennoÃ¹ eus al laÃ±vaz da-heul."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
-  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Dibab elfennoù"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Dibabit pe elfenn(où) $(^NameDA) a fell deoc'h staliañ."
+  ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Dibab elfennoÃ¹"
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Dibabit pe elfenn(oÃ¹) $(^NameDA) a fell deoc'h staliaÃ±."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Dibabit elfennoù"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Dibabit pe elfenn(où) $(^NameDA) a fell deoc'h distaliañ."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Dibabit elfennoÃ¹"
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Dibabit pe elfenn(oÃ¹) $(^NameDA) a fell deoc'h distaliaÃ±."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
@@ -48,74 +48,74 @@
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
     ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Lakait ho logodenn a-zioc'h an elfenn evit gwelout he deskrivadenn."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Lakait ho logodenn a-zioc'h an elfenn evit gwelout he deskrivadenn."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Diuzuit an elfenn evit gwelout he deskrivadenn."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
-  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Dibabit al lec'hiadur staliañ"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Dibabit ar c'havlec'h ma vo lakaet $(^NameDA) ennañ."
+  ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Dibabit al lec'hiadur staliaÃ±"
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Dibabit ar c'havlec'h ma vo lakaet $(^NameDA) ennaÃ±."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Dibabit al lec'hiadur distaliañ"
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Dibabit ar c'havlec'h e vo dilamet $(^NameDA) dioutañ."
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Dibabit al lec'hiadur distaliaÃ±"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Dibabit ar c'havlec'h e vo dilamet $(^NameDA) dioutaÃ±."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
-  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "O staliañ"
-  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Gortozit mar plij, emañ $(^NameDA) o vezañ staliet."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Echu eo gant ar staliañ"
-  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Kaset eo bet da benn mat ar staliañ."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Staliañ paouezet"
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "N'eo ket bet kaset da benn mat ar staliañ."
+  ${LangFileString} MUI_TEXT_INSTALLING_TITLE "O staliaÃ±"
+  ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Gortozit mar plij, emaÃ± $(^NameDA) o vezaÃ± staliet."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Echu eo gant ar staliaÃ±"
+  ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Kaset eo bet da benn mat ar staliaÃ±."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "StaliaÃ± paouezet"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "N'eo ket bet kaset da benn mat ar staliaÃ±."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "O tistaliañ"
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Gortozit mar plij, emañ $(^NameDA) o vezañ distaliet."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Echu eo gant an distaliañ"
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Gant berzh eo bet kaset da benn an distaliañ."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Distaliañ paouezet"
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "N'eo ket bet kaset da benn mat an distaliañ."
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "O tistaliaÃ±"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Gortozit mar plij, emaÃ± $(^NameDA) o vezaÃ± distaliet."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Echu eo gant an distaliaÃ±"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Gant berzh eo bet kaset da benn an distaliaÃ±."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "DistaliaÃ± paouezet"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "N'eo ket bet kaset da benn mat an distaliaÃ±."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Oc'h echuiñ staliañ $(^NameDA) gant ar skoazeller"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Staliet eo bet $(^NameDA) war hoc'h urzhiataer.$\r$\n$\r$\nKlikit war « Echuiñ » evit serriñ ar skoazeller-mañ."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Ret eo hoc'h urzhiataer bezañ adloc'het evit ma vez kaset da benn staliañ $(^NameDA). Ha fellout a ra deoc'h adloc'hañ diouzhtu ?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Oc'h echuiÃ± staliaÃ± $(^NameDA) gant ar skoazeller"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "Staliet eo bet $(^NameDA) war hoc'h urzhiataer.$\r$\n$\r$\nKlikit war Â« EchuiÃ± Â» evit serriÃ± ar skoazeller-maÃ±."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Ret eo hoc'h urzhiataer bezaÃ± adloc'het evit ma vez kaset da benn staliaÃ± $(^NameDA). Ha fellout a ra deoc'h adloc'haÃ± diouzhtu ?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Oc'h echuiñ distaliañ $(^NameDA) gant ar skoazeller"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Distaliet eo bet $(^NameDA) diouzh hoc'h urzhiataer.$\r$\n$\r$\nKlikit war « Echuiñ » evit serriñ ar skoazeller-mañ."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Ret eo hoc'h urzhiataer bezañ adloc'het evit ma vez kaset da benn distaliañ $(^NameDA). Ha fellout a ra deoc'h adloc'hañ diouzhtu ?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Oc'h echuiÃ± distaliaÃ± $(^NameDA) gant ar skoazeller"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "Distaliet eo bet $(^NameDA) diouzh hoc'h urzhiataer.$\r$\n$\r$\nKlikit war Â« EchuiÃ± Â» evit serriÃ± ar skoazeller-maÃ±."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Ret eo hoc'h urzhiataer bezaÃ± adloc'het evit ma vez kaset da benn distaliaÃ± $(^NameDA). Ha fellout a ra deoc'h adloc'haÃ± diouzhtu ?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Adloc'hañ diouzhtu"
-  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Fellout a ra din adloc'hañ diwezatoc'h dre zorn"
-  ${LangFileString} MUI_TEXT_FINISH_RUN "&Lañsañ $(^NameDA)"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Adloc'haÃ± diouzhtu"
+  ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Fellout a ra din adloc'haÃ± diwezatoc'h dre zorn"
+  ${LangFileString} MUI_TEXT_FINISH_RUN "&LaÃ±saÃ± $(^NameDA)"
   ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Diskouez ar restr Malennit"
-  ${LangFileString} MUI_BUTTONTEXT_FINISH "&Echuiñ"  
+  ${LangFileString} MUI_BUTTONTEXT_FINISH "&EchuiÃ±"  
 !endif
 
 !ifdef MUI_STARTMENUPAGE
-  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Diskouez kavlec'h al Lañser loc'hañ"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Dibabit ur c'havlec'h Lañser loc'hañ evit berradennoù $(^NameDA)."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Diuzit ar c'havlec'h Lañser loc'hañ e vo savet ennañ berradennoù ar goulevioù. Gallout a rit ingal reiñ un anv evit sevel ur c'havlec'h nevez."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Chom hep sevel berradennoù"
+  ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Diskouez kavlec'h al LaÃ±ser loc'haÃ±"
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Dibabit ur c'havlec'h LaÃ±ser loc'haÃ± evit berradennoÃ¹ $(^NameDA)."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Diuzit ar c'havlec'h LaÃ±ser loc'haÃ± e vo savet ennaÃ± berradennoÃ¹ ar goulevioÃ¹. Gallout a rit ingal reiÃ± un anv evit sevel ur c'havlec'h nevez."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Chom hep sevel berradennoÃ¹"
 !endif
 
 !ifdef MUI_UNCONFIRMPAGE
-  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "Distaliañ $(^NameDA)"
+  ${LangFileString} MUI_UNTEXT_CONFIRM_TITLE "DistaliaÃ± $(^NameDA)"
   ${LangFileString} MUI_UNTEXT_CONFIRM_SUBTITLE "Dilemel $(^NameDA) adalek hoc'h urzhiataer."
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Ha sur oc'h e fell deoc'h kuitaat staliañ $(^Name) ?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Ha sur oc'h e fell deoc'h kuitaat staliaÃ± $(^Name) ?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ha sur oc'h e fell deoc'h kuitaat distaliañ $(^Name) ?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Ha sur oc'h e fell deoc'h kuitaat distaliaÃ± $(^Name) ?"
 !endif
Index: tmp/org.txm.setups/nsis/Contrib/Language files/Catalan.nlf
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/Language files/Catalan.nlf	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/Language files/Catalan.nlf	(revision 2956)
@@ -1,40 +1,40 @@
-# Header, don't edit
+ï»¿# Header, don't edit
 NLF v6
 # Language ID
 1027
 # Font and size - dash (-) means default
 -
 -
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
 1252
 # RTL - anything else than RTL means LTR
 -
 # Translation by falanko
 # Corrections by Toni Hermoso Pulido
 # ^Branding
-Sistema d'instal·lació de Nullsoft %s
+Nullsoft Install System %s
 # ^SetupCaption
-Instal·lació de l'aplicació $(^Name)
+InstalÂ·laciÃ³ de l'aplicaciÃ³ $(^Name)
 # ^UninstallCaption
-Desinstal·lació de l'aplicació $(^Name)
+DesinstalÂ·laciÃ³ de l'aplicaciÃ³ $(^Name)
 # ^LicenseSubCaption
-: Acord de llicència
+: Acord de llicÃ¨ncia
 # ^ComponentsSubCaption
-: Opcions d'instal·lació
+: Opcions d'instalÂ·laciÃ³
 # ^DirSubCaption
-: Carpeta d'instal·lació
+: Carpeta d'instalÂ·laciÃ³
 # ^InstallingSubCaption
-: S'està instal·lant
+: S'estÃ  instalÂ·lant
 # ^CompletedSubCaption
 : S'ha acabat
 # ^UnComponentsSubCaption
-: Opcions de desinstal·lació
+: Opcions de desinstalÂ·laciÃ³
 # ^UnDirSubCaption
-: Carpeta de desinstal·lació
+: Carpeta de desinstalÂ·laciÃ³
 # ^ConfirmSubCaption
-: Confirmació
+: ConfirmaciÃ³
 # ^UninstallingSubCaption
-: S'està desinstal·lant
+: S'estÃ  desinstalÂ·lant
 # ^UnCompletedSubCaption
 : No s'ha acabat
 # ^BackBtn
@@ -44,15 +44,15 @@
 # ^AgreeBtn
 Hi estic d'a&cord
 # ^AcceptBtn
-&Accepto els termes de l'acord de llicència
+&Accepto els termes de l'acord de llicÃ¨ncia
 # ^DontAcceptBtn
-&No accepto els termes de l'acord de llicència
+&No accepto els termes de l'acord de llicÃ¨ncia
 # ^InstallBtn
-&Instal·la
+&InstalÂ·la
 # ^UninstallBtn
-&Desinstal·la
+&DesinstalÂ·la
 # ^CancelBtn
-&Cancel·la
+&CancelÂ·la
 # ^CloseBtn
 &Tanca
 # ^BrowseBtn
@@ -62,79 +62,79 @@
 # ^ClickNext
 Feu clic a Endavant per a continuar.
 # ^ClickInstall
-Feu clic a Instal·la per a iniciar la instal·lació.
+Feu clic a InstalÂ·la per a iniciar la instalÂ·laciÃ³.
 # ^ClickUninstall
-Feu clic a Desinstal·la per a iniciar la desinstal·lació.
+Feu clic a DesinstalÂ·la per a iniciar la desinstalÂ·laciÃ³.
 # ^Name
 Nom
 # ^Completed
 S'ha acabat
 # ^LicenseText
-Reviseu l'acord de llicència abans d'instal·lar l'aplicació $(^NameDA). Si accepteu tots els termes de l'acord, feu clic a Hi estic d'acord.
+Reviseu l'acord de llicÃ¨ncia abans d'instalÂ·lar l'aplicaciÃ³ $(^NameDA). Si accepteu tots els termes de l'acord, feu clic a Hi estic d'acord.
 # ^LicenseTextCB
-Reviseu l'acord de llicència abans d'instal·lar l'aplicació $(^NameDA). Si accepteu tots els termes de l'acord, activeu la casella de sota. $_CLICK
+Reviseu l'acord de llicÃ¨ncia abans d'instalÂ·lar l'aplicaciÃ³ $(^NameDA). Si accepteu tots els termes de l'acord, activeu la casella de sota. $_CLICK
 # ^LicesnseTextRB
-Reviseu l'acord de llicència abans d'instal·lar l'aplicació $(^NameDA). Si accepteu tots els termes de l'acord, seleccioneu la primera opció de sota. $_CLICK
+Reviseu l'acord de llicÃ¨ncia abans d'instalÂ·lar l'aplicaciÃ³ $(^NameDA). Si accepteu tots els termes de l'acord, seleccioneu la primera opciÃ³ de sota. $_CLICK
 # ^UnLicenseText
-Reviseu l'acord de llicència abans de desinstal·lar l'aplicació $(^NameDA). Si accepteu tots els termes de l'acord, feu clic a Hi estic d'acord.
+Reviseu l'acord de llicÃ¨ncia abans de desinstalÂ·lar l'aplicaciÃ³ $(^NameDA). Si accepteu tots els termes de l'acord, feu clic a Hi estic d'acord.
 # ^UnLicenseTextCB
-Reviseu l'acord de llicència abans de desinstal·lar l'aplicació $(^NameDA). Si accepteu tots els termes de l'acord, activeu la la casella de sota. $_CLICK
+Reviseu l'acord de llicÃ¨ncia abans de desinstalÂ·lar l'aplicaciÃ³ $(^NameDA). Si accepteu tots els termes de l'acord, activeu la la casella de sota. $_CLICK
 # ^UnLicesnseTextRB
-Reviseu l'acord de llicència abans de desinstal·lar l'aplicació $(^NameDA). Si accepteu tots els termes de l'acord, seleccioneu la primera opció de sota. $_CLICK
+Reviseu l'acord de llicÃ¨ncia abans de desinstalÂ·lar l'aplicaciÃ³ $(^NameDA). Si accepteu tots els termes de l'acord, seleccioneu la primera opciÃ³ de sota. $_CLICK
 # ^Custom
 Personalitzada
 # ^ComponentsText
-Activeu els components que voleu instal·lar i desactiveu els que no. $_CLICK
+Activeu els components que voleu instalÂ·lar i desactiveu els que no. $_CLICK
 # ^ComponentsSubText1
-Seleccioneu el tipus d'instal·lació:
+Seleccioneu el tipus d'instalÂ·laciÃ³:
 # ^ComponentsSubText2_NoInstTypes
-Seleccioneu els components per instal·lar:
+Seleccioneu els components per instalÂ·lar:
 # ^ComponentsSubText2
-O bé, seleccioneu els components opcionals que desitgéssiu instal·lar:
+O bÃ©, seleccioneu els components opcionals que desitgÃ©ssiu instalÂ·lar:
 # ^UnComponentsText
-Activeu els components que voleu desinstal·lar i desactiveu els que no. $_CLICK
+Activeu els components que voleu desinstalÂ·lar i desactiveu els que no. $_CLICK
 # ^UnComponentsSubText1
-Seleccioneu el tipus de desinstal·lació:
+Seleccioneu el tipus de desinstalÂ·laciÃ³:
 # ^UnComponentsSubText2_NoInstTypes
-Seleccioneu els components per desinstal·lar:
+Seleccioneu els components per desinstalÂ·lar:
 # ^UnComponentsSubText2
-O bé, seleccioneu els components opcionals per desinstal·lar:
+O bÃ©, seleccioneu els components opcionals per desinstalÂ·lar:
 # ^DirText
-El programa d'instal·lació instal·larà l'aplicació $(^NameDA) en la següent carpeta. Per a instal·lar-lo en una carpeta diferent, feu clic a Navega i seleccioneu-ne una altra. $_CLICK
+El programa d'instalÂ·laciÃ³ instalÂ·larÃ  l'aplicaciÃ³ $(^NameDA) en la segÃ¼ent carpeta. Per a instalÂ·lar-lo en una carpeta diferent, feu clic a Navega i seleccioneu-ne una altra. $_CLICK
 # ^DirSubText
-Carpeta de destinació
+Carpeta de destinaciÃ³
 # ^DirBrowseText
-Seleccioneu la carpeta on s'instal·larà l'aplicació $(^NameDA):
+Seleccioneu la carpeta on s'instalÂ·larÃ  l'aplicaciÃ³ $(^NameDA):
 # ^UnDirText
-El programa d'instal·lació desinstal·larà l'aplicació $(^NameDA) de la següent carpeta. Per a desinstal·lar-lo d'una carpeta diferent, feu clic a Navega i seleccioneu-ne una altra. $_CLICK
+El programa d'instalÂ·laciÃ³ desinstalÂ·larÃ  l'aplicaciÃ³ $(^NameDA) de la segÃ¼ent carpeta. Per a desinstalÂ·lar-lo d'una carpeta diferent, feu clic a Navega i seleccioneu-ne una altra. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Seleccioneu la carpeta des d'on es desinstal·larà l'aplicació $(^NameDA):
+Seleccioneu la carpeta des d'on es desinstalÂ·larÃ  l'aplicaciÃ³ $(^NameDA):
 # ^SpaceAvailable
 "Espai lliure: "
 # ^SpaceRequired
 "Espai necessari: "
 # ^UninstallingText
-Es desinstal·larà l'aplicació $(^NameDA) de la següent carpeta. $_CLICK
+Es desinstalÂ·larÃ  l'aplicaciÃ³ $(^NameDA) de la segÃ¼ent carpeta. $_CLICK
 # ^UninstallingSubTex
-S'està desinstal·lant de:
+S'estÃ  desinstalÂ·lant de:
 # ^FileError
-S'ha produït un error en obrir el fitxer en mode d'escriptura: \r\n\t"$0"\r\nFeu clic a Abandona per a aturar la instal·lació,\r\nReintenta per a tornar-ho a provar, o\r\Ignora per a ometre aquest fitxer.
+S'ha produÃ¯t un error en obrir el fitxer en mode d'escriptura: \r\n\t"$0"\r\nFeu clic a Abandona per a aturar la instalÂ·laciÃ³,\r\nReintenta per a tornar-ho a provar, o\r\Ignora per a ometre aquest fitxer.
 # ^FileError_NoIgnore
-S'ha produït un error en obrir el fitxer en mode d'escriptura: \r\n\t"$0"\r\nFeu clic a Reintenta per a tornar-ho a provar, o\r\Cancel·la per a aturar la instal·lació.
+S'ha produÃ¯t un error en obrir el fitxer en mode d'escriptura: \r\n\t"$0"\r\nFeu clic a Reintenta per a tornar-ho a provar, o\r\CancelÂ·la per a aturar la instalÂ·laciÃ³.
 # ^CantWrite
 "No s'ha pogut escriure: "
 # ^CopyFailed
-Ha fallat la còpia
+Ha fallat la cÃ²pia
 # ^CopyTo
 "Copia a "
 # ^Registering
 "S'esta registrant:"
 # ^Unregistering
-"S'està suprimint el registre: "
+"S'estÃ  suprimint el registre: "
 # ^SymbolNotFound
-"No s'ha trobat el símbol: "
+"No s'ha trobat el sÃ­mbol: "
 # ^CouldNotLoad
 "No s'ha pogut carregar: "
 # ^CreateFolder
@@ -142,19 +142,19 @@
 # ^CreateShortcut
 "Crea la drecera: "
 # ^CreatedUninstaller
-"S'ha creat el desinstal·lador: "
+"S'ha creat el desinstalÂ·lador: "
 # ^Delete
 "S'ha suprimit el fitxer: "
 # ^DeleteOnReboot
 "Suprimeix en reiniciar: "
 # ^ErrorCreatingShortcut
-"S'ha produït un error en crear la drecera: "
+"S'ha produÃ¯t un error en crear la drecera: "
 # ^ErrorCreating
-S'ha produït un error en crear:
+S'ha produÃ¯t un error en crear:
 # ^ErrorDecompressing
-S'ha produït un error en descomprimir les dades! L'instal·lador està corrupte?
+S'ha produÃ¯t un error en descomprimir les dades! L'instalÂ·lador estÃ  corrupte?
 # ^ErrorRegistering
-S'ha produït un error en registrar una DLL
+S'ha produÃ¯t un error en registrar una DLL
 # ^ExecShell
 "Executa l'ordre: "
 # ^Exec
@@ -162,9 +162,9 @@
 # ^Extract
 "Extreu: "
 # ^ErrorWriting
-"Extreu: s'ha produït un error en escriure el fitxer "
+"Extreu: s'ha produÃ¯t un error en escriure el fitxer "
 # ^InvalidOpcode
-L'instal·lador està corrupte: el codi d'operació no és vàlid
+L'instalÂ·lador estÃ  corrupte: el codi d'operaciÃ³ no Ã©s vÃ lid
 # ^NoOLE
 "No hi ha OLE per a: "
 # ^OutputFolder
@@ -176,16 +176,16 @@
 # ^Rename
 "Reanomena: "
 # ^Skipped
-"S'ha omès: "
+"S'ha omÃ¨s: "
 # ^CopyDetails
 Copia els detalls al porta-retalls
 # ^LogInstall
-Registra el procés d'instal·lació
+Registra el procÃ©s d'instalÂ·laciÃ³
 # ^Byte
 B
 # ^Kilo
-K
+ K
 # ^Mega
-M
+ M
 # ^Giga
-G
+ G
Index: tmp/org.txm.setups/nsis/Contrib/zip2exe/Modern.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Contrib/zip2exe/Modern.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Contrib/zip2exe/Modern.nsh	(revision 2956)
@@ -1,6 +1,6 @@
 ;Change this file to customize zip2exe generated installers with a modern interface
 
-!include "MUI.nsh"
+!include "MUI2.nsh"
 
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
Index: tmp/org.txm.setups/nsis/Stubs/bzip2_solid-x86-unicode
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Stubs/bzip2_solid-x86-unicode
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Stubs/bzip2_solid-x86-ansi
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Stubs/bzip2_solid-x86-ansi
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Stubs/bzip2-x86-unicode
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Stubs/bzip2-x86-unicode
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Stubs/bzip2-x86-ansi
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Stubs/bzip2-x86-ansi
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Stubs/zlib_solid-x86-unicode
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Stubs/zlib_solid-x86-unicode
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Stubs/lzma_solid-x86-unicode
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Stubs/lzma_solid-x86-unicode
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Stubs/zlib_solid-x86-ansi
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Stubs/zlib_solid-x86-ansi
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Stubs/zlib-x86-unicode
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Stubs/zlib-x86-unicode
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Stubs/lzma_solid-x86-ansi
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Stubs/lzma_solid-x86-ansi
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Stubs/lzma-x86-unicode
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Stubs/lzma-x86-unicode
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Stubs/zlib-x86-ansi
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Stubs/zlib-x86-ansi
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Stubs/lzma-x86-ansi
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Stubs/lzma-x86-ansi
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/makensisw.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.setups/nsis/NSIS.chm
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.setups/nsis/Include/Win/COM.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/Win/COM.nsh	(revision 0)
+++ tmp/org.txm.setups/nsis/Include/Win/COM.nsh	(revision 2956)
@@ -0,0 +1,333 @@
+/*
+-------------
+   COM.nsh
+-------------
+
+COM defines and helper macros
+
+; Example usage:
+!include LogicLib.nsh
+!include Win\COM.nsh
+!include Win\Propkey.nsh
+!insertmacro ComHlpr_CreateInProcInstance ${CLSID_ShellLink} ${IID_IShellLink} r0 ""
+${If} $0 P<> 0
+	${IShellLink::SetPath} $0 '("%COMSPEC%").r1'
+	${IShellLink::SetArguments} $0 '("/k echo HelloWorld").r2'
+	${If} $1 = 0
+	${AndIf} $2 = 0
+		${IUnknown::QueryInterface} $0 '("${IID_IPropertyStore}",.r1)'
+		${If} $1 P<> 0
+			System::Call '*${SYSSTRUCT_PROPERTYKEY}(${PKEY_AppUserModel_StartPinOption})p.r2'
+			System::Call '*${SYSSTRUCT_PROPVARIANT}(${VT_UI4},,&i4 ${APPUSERMODEL_STARTPINOPTION_NOPINONINSTALL})p.r3'
+			${IPropertyStore::SetValue} $1 '($2,$3)'
+
+			; Reuse the PROPERTYKEY & PROPVARIANT buffers to set another property
+			System::Call '*$2${SYSSTRUCT_PROPERTYKEY}(${PKEY_AppUserModel_ExcludeFromShowInNewInstall})'
+			System::Call '*$3${SYSSTRUCT_PROPVARIANT}(${VT_BOOL},,&i2 ${VARIANT_TRUE})'
+			${IPropertyStore::SetValue} $1 '($2,$3)'
+
+			System::Free $2
+			System::Free $3
+			${IPropertyStore::Commit} $1 ""
+			${IUnknown::Release} $1 ""
+		${EndIf}
+		${IUnknown::QueryInterface} $0 '("${IID_IPersistFile}",.r1)'
+		${If} $1 P<> 0
+			${IPersistFile::Save} $1 '("$SMPrograms\nsis_test.lnk",1)'
+			${IUnknown::Release} $1 ""
+		${EndIf}
+	${EndIf}
+	${IUnknown::Release} $0 ""
+${EndIf}
+
+*/
+
+
+!ifndef __WIN_COM__INC
+!define __WIN_COM__INC ${NSIS_CHAR_SIZE}
+!verbose push
+!verbose 3
+
+!define /ifndef STGM_READ 0
+!define /ifndef STGM_WRITE 1
+!define /ifndef STGM_READWRITE 2
+!define /ifndef STGM_SHARE_DENY_NONE  0x00000040
+!define /ifndef STGM_SHARE_DENY_READ  0x00000030
+!define /ifndef STGM_SHARE_DENY_WRITE 0x00000020
+!define /ifndef STGM_SHARE_EXCLUSIVE  0x00000010
+!define /ifndef STGM_PRIORITY         0x00040000
+!define /ifndef STGM_CREATE      0x00001000
+!define /ifndef STGM_CONVERT     0x00020000
+!define /ifndef STGM_FAILIFTHERE 0
+!define /ifndef STGM_DELETEONRELEASE 0x04000000
+
+!define /ifndef CLSCTX_INPROC_SERVER 0x1
+!define /ifndef CLSCTX_INPROC_HANDLER 0x2
+!define /ifndef CLSCTX_LOCAL_SERVER 0x4
+!define /ifndef CLSCTX_REMOTE_SERVER 0x10
+!define /ifndef CLSCTX_ACTIVATE_32_BIT_SERVER 0x40000
+!define /ifndef CLSCTX_ACTIVATE_64_BIT_SERVER 0x80000
+!define /ifndef CLSCTX_ENABLE_CLOAKING 0x100000
+
+!define NSISCOMCALL "!insertmacro NSISCOMCALL "
+!macro NSISCOMCALL vtblidx decl ptr params
+!if ${NSIS_CHAR_SIZE} <> ${__WIN_COM__INC}
+; Warn if QueryInterface() for IID_IShellLink etc will return the wrong interface
+!warning "NSIS_CHAR_SIZE changed, existing defines and macros might not work correctly!"
+!endif
+System::Call `${ptr}->${vtblidx}${decl}${params}`
+!macroend
+!define NSISCOMIFACEDECL "!insertmacro NSISCOMIFACEDECL "
+!macro NSISCOMIFACEDECL iface method vtblidx decl
+!define ${iface}::${method} `${NSISCOMCALL} ${vtblidx} ${decl} `
+!macroend
+
+!macro ComHlpr_CreateInstance clsid iid sysoutvarIFacePtr sysret
+System::Call 'OLE32::CoCreateInstance(g"${clsid}",i0,i23,g"${iid}",*p.${sysoutvarIFacePtr})i${sysret}'
+!macroend
+!macro ComHlpr_CreateInProcInstance clsid iid sysoutvarIFacePtr sysret
+System::Call 'OLE32::CoCreateInstance(g"${clsid}",i0,i${CLSCTX_INPROC_SERVER},g"${iid}",*p.${sysoutvarIFacePtr})i${sysret}'
+!macroend
+
+!macro ComHlpr_SafeRelease _p
+${If} ${_p} P<> 0
+	${IUnknown::Release} ${_p} ""
+${EndIf}
+!macroend
+!macro ComHlpr_SafeReleaseAndNull _p
+${If} ${_p} P<> 0
+	${IUnknown::Release} ${_p} ""
+	StrCpy ${_p} 0
+${EndIf}
+!macroend
+
+
+!ifndef IID_IUnknown
+!define IID_IUnknown {00000000-0000-0000-C000-000000000046}
+${NSISCOMIFACEDECL}IUnknown QueryInterface 0 (g,*p)i
+${NSISCOMIFACEDECL}IUnknown AddRef 1 ()i
+${NSISCOMIFACEDECL}IUnknown Release 2 ()i
+!endif
+
+!ifndef IID_IPersist
+!define IID_IPersist {0000010c-0000-0000-C000-000000000046}
+${NSISCOMIFACEDECL}IPersist GetClassID 3 (g)i
+!endif
+
+!ifndef IID_IPersistStream
+!define IID_IPersistStream {00000109-0000-0000-C000-000000000046} ; IPersist>
+${NSISCOMIFACEDECL}IPersistStream IsDirty 4 ()i
+${NSISCOMIFACEDECL}IPersistStream Load 5 (p,i)i
+${NSISCOMIFACEDECL}IPersistStream Save 6 (p,i)i
+${NSISCOMIFACEDECL}IPersistStream GetSizeMax 7 (*l)i
+!endif
+!ifndef IID_IPersistStreamInit
+!define IID_IPersistStreamInit {7FD52380-4E07-101B-AE2D-08002B2EC713} ; IPersist>
+${NSISCOMIFACEDECL}IPersistStreamInit IsDirty 4 ()i
+${NSISCOMIFACEDECL}IPersistStreamInit Load 5 (p,i)i
+${NSISCOMIFACEDECL}IPersistStreamInit Save 6 (p,i)i
+${NSISCOMIFACEDECL}IPersistStreamInit GetSizeMax 7 (*l)i
+${NSISCOMIFACEDECL}IPersistStreamInit InitNew 8 ()i
+!endif
+
+!ifndef IID_IPersistFile
+!define IID_IPersistFile {0000010b-0000-0000-C000-000000000046} ; IPersist>
+${NSISCOMIFACEDECL}IPersistFile IsDirty 4 ()i
+${NSISCOMIFACEDECL}IPersistFile Load 5 (w,i)i
+${NSISCOMIFACEDECL}IPersistFile Save 6 (w,i)i
+${NSISCOMIFACEDECL}IPersistFile SaveCompleted 7 (w)i
+${NSISCOMIFACEDECL}IPersistFile GetCurFile 8 (*w)i
+!endif
+
+!ifndef CLSID_ShellLink
+!define CLSID_ShellLink {00021401-0000-0000-c000-000000000046}
+!endif
+!ifndef IID_IShellLink
+!define IID_IShellLinkA {000214ee-0000-0000-c000-000000000046}
+!define IID_IShellLinkW {000214f9-0000-0000-c000-000000000046}
+!ifdef NSIS_UNICODE
+!define IID_IShellLink ${IID_IShellLinkW}
+!else
+!define IID_IShellLink ${IID_IShellLinkA}
+!endif
+${NSISCOMIFACEDECL}IShellLink GetPath 3 (t,i,p,i)i
+${NSISCOMIFACEDECL}IShellLink GetIDList 4 (*p)i
+${NSISCOMIFACEDECL}IShellLink SetIDList 5 (p)i
+${NSISCOMIFACEDECL}IShellLink GetDescription 6 (t,i)i
+${NSISCOMIFACEDECL}IShellLink SetDescription 7 (t)i
+${NSISCOMIFACEDECL}IShellLink GetWorkingDirectory 8 (t,i)i
+${NSISCOMIFACEDECL}IShellLink SetWorkingDirectory 9 (t)i
+${NSISCOMIFACEDECL}IShellLink GetArguments 10 (t,i)i
+${NSISCOMIFACEDECL}IShellLink SetArguments 11 (t)i
+${NSISCOMIFACEDECL}IShellLink GetHotkey 12 (*i0)i
+${NSISCOMIFACEDECL}IShellLink SetHotkey 13 (&i2)i
+${NSISCOMIFACEDECL}IShellLink GetShowCmd 14 (*i)i
+${NSISCOMIFACEDECL}IShellLink SetShowCmd 15 (i)i
+${NSISCOMIFACEDECL}IShellLink GetIconLocation 16 (t,i,*i)i
+${NSISCOMIFACEDECL}IShellLink SetIconLocation 17 (t,i)i
+${NSISCOMIFACEDECL}IShellLink SetRelativePath 18 (t,i)i
+${NSISCOMIFACEDECL}IShellLink Resolve 19 (p,i)i
+${NSISCOMIFACEDECL}IShellLink SetPath 20 (t)i
+!endif
+
+!ifndef IID_IShellLinkDataList
+!define IID_IShellLinkDataList {45e2b4ae-b1c3-11d0-b92f-00a0c90312e1}
+${NSISCOMIFACEDECL}IShellLinkDataList AddDataBlock 3 (p)i
+${NSISCOMIFACEDECL}IShellLinkDataList CopyDataBlock 4 (i,*p)i
+${NSISCOMIFACEDECL}IShellLinkDataList RemoveDataBlock 5 (i)i
+${NSISCOMIFACEDECL}IShellLinkDataList GetFlags 6 (*i)i
+${NSISCOMIFACEDECL}IShellLinkDataList SetFlags 7 (i)i
+!endif
+!define /ifndef EXP_SZ_LINK_SIG         0xA0000001
+!define /ifndef NT_CONSOLE_PROPS_SIG    0xA0000002
+!define /ifndef NT_FE_CONSOLE_PROPS_SIG 0xA0000004
+!define /ifndef EXP_SPECIAL_FOLDER_SIG  0xA0000005
+!define /ifndef EXP_DARWIN_ID_SIG       0xA0000006
+!define /ifndef EXP_SZ_ICON_SIG         0xA0000007
+!define /ifndef EXP_PROPERTYSTORAGE_SIG 0xA0000009
+;SHELL_LINK_DATA_FLAGS
+!define /ifndef SLDF_HAS_ID_LIST                           0x00000001
+!define /ifndef SLDF_HAS_LINK_INFO                         0x00000002
+!define /ifndef SLDF_HAS_NAME                              0x00000004
+!define /ifndef SLDF_HAS_RELPATH                           0x00000008
+!define /ifndef SLDF_HAS_WORKINGDIR                        0x00000010
+!define /ifndef SLDF_HAS_ARGS                              0x00000020
+!define /ifndef SLDF_HAS_ICONLOCATION                      0x00000040
+!define /ifndef SLDF_UNICODE                               0x00000080
+!define /ifndef SLDF_FORCE_NO_LINKINFO                     0x00000100
+!define /ifndef SLDF_HAS_EXP_SZ                            0x00000200
+!define /ifndef SLDF_RUN_IN_SEPARATE                       0x00000400
+!define /ifndef SLDF_HAS_LOGO3ID                           0x00000800
+!define /ifndef SLDF_HAS_DARWINID                          0x00001000
+!define /ifndef SLDF_RUNAS_USER                            0x00002000
+!define /ifndef SLDF_HAS_EXP_ICON_SZ                       0x00004000
+!define /ifndef SLDF_NO_PIDL_ALIAS                         0x00008000
+!define /ifndef SLDF_FORCE_UNCNAME                         0x00010000
+!define /ifndef SLDF_RUN_WITH_SHIMLAYER                    0x00020000
+!define /ifndef SLDF_FORCE_NO_LINKTRACK                    0x00040000 ;[Vista+]
+!define /ifndef SLDF_ENABLE_TARGET_METADATA                0x00080000
+!define /ifndef SLDF_DISABLE_LINK_PATH_TRACKING            0x00100000 ;[Seven+]
+!define /ifndef SLDF_DISABLE_KNOWNFOLDER_RELATIVE_TRACKING 0x00200000
+!define /ifndef SLDF_NO_KF_ALIAS                           0x00400000
+!define /ifndef SLDF_ALLOW_LINK_TO_LINK                    0x00800000
+!define /ifndef SLDF_UNALIAS_ON_SAVE                       0x01000000
+!define /ifndef SLDF_PREFER_ENVIRONMENT_PATH               0x02000000
+!define /ifndef SLDF_KEEP_LOCAL_IDLIST_FOR_UNC_TARGET      0x04000000
+!define /ifndef SLDF_PERSIST_VOLUME_ID_RELATIVE            0x08000000 ;[Eight+]
+
+!ifndef IID_IShellItem
+!define IID_IShellItem {43826d1e-e718-42ee-bc55-a1e261c37bfe}
+${NSISCOMIFACEDECL}IShellItem BindToHandler 3 (p,g,g,*p)i
+${NSISCOMIFACEDECL}IShellItem GetParent 4 (*p)i
+${NSISCOMIFACEDECL}IShellItem GetDisplayName 5 (i,*p)i
+${NSISCOMIFACEDECL}IShellItem GetAttributes 6 (i,*i)i
+${NSISCOMIFACEDECL}IShellItem Compare 7 (p,i,*i)i
+!endif
+
+!ifndef CLSID_StartMenuPin
+!define CLSID_StartMenuPin {a2a9545d-a0c2-42b4-9708-a0b2badd77c8}
+!endif
+!ifndef IID_IStartMenuPinnedList
+!define IID_IStartMenuPinnedList {4CD19ADA-25A5-4A32-B3B7-347BEE5BE36B}
+${NSISCOMIFACEDECL}IStartMenuPinnedList RemoveFromList 3 (p)i
+!endif
+
+!ifndef IID_IPropertyStore
+!define IID_IPropertyStore {886D8EEB-8CF2-4446-8D02-CDBA1DBDCF99}
+${NSISCOMIFACEDECL}IPropertyStore GetCount 3 (*i)i
+${NSISCOMIFACEDECL}IPropertyStore GetAt 4 (i,p)i
+${NSISCOMIFACEDECL}IPropertyStore GetValue 5 (p,p)i
+${NSISCOMIFACEDECL}IPropertyStore SetValue 6 (p,p)i
+${NSISCOMIFACEDECL}IPropertyStore Commit 7 ()i
+!endif
+
+!ifndef IID_IPropertyStorage
+!define IID_IPropertyStorage {00000138-0000-0000-C000-000000000046}
+${NSISCOMIFACEDECL}IPropertyStorage ReadMultiple 3 (i,p,p)i
+${NSISCOMIFACEDECL}IPropertyStorage WriteMultiple 4 (i,p,p,i)i
+${NSISCOMIFACEDECL}IPropertyStorage DeleteMultiple 5 (i,p)i
+${NSISCOMIFACEDECL}IPropertyStorage ReadPropertyNames 6 (p,p)i
+${NSISCOMIFACEDECL}IPropertyStorage WritePropertyNames 7 (i,p,p)i
+${NSISCOMIFACEDECL}IPropertyStorage DeletePropertyNames 8 (i,p)i
+${NSISCOMIFACEDECL}IPropertyStorage Commit 9 (i)i ; Note: Some implementations might return E_NOTIMPL
+${NSISCOMIFACEDECL}IPropertyStorage Revert 10 ()i
+${NSISCOMIFACEDECL}IPropertyStorage Enum 11 (*p)i
+${NSISCOMIFACEDECL}IPropertyStorage SetTimes 12 (p,p,p)i
+${NSISCOMIFACEDECL}IPropertyStorage SetClass 13 (g)i
+${NSISCOMIFACEDECL}IPropertyStorage Stat 14 (p)i
+!endif
+
+!ifndef IID_IPropertySetStorage
+!define IID_IPropertySetStorage {0000013A-0000-0000-C000-000000000046}
+${NSISCOMIFACEDECL}IPropertySetStorage Create 3 (g,g,i,i,*p)i
+${NSISCOMIFACEDECL}IPropertySetStorage Open 4 (g,i,*p)i
+${NSISCOMIFACEDECL}IPropertySetStorage Delete 5 (g)i
+${NSISCOMIFACEDECL}IPropertySetStorage Enum 6 (*p)i
+!endif
+
+!ifndef CLSID_ApplicationAssociationRegistration
+!define CLSID_ApplicationAssociationRegistration {591209c7-767b-42b2-9fba-44ee4615f2c7}
+!endif
+!ifndef IID_IApplicationAssociationRegistration
+!define IID_IApplicationAssociationRegistration {4e530b0a-e611-4c77-a3ac-9031d022281b} ;[Vista+]
+${NSISCOMIFACEDECL}IApplicationAssociationRegistration QueryCurrentDefault 3 (w,i,i,*p)i
+${NSISCOMIFACEDECL}IApplicationAssociationRegistration QueryAppIsDefault 4 (w,i,i,w,*i)i
+${NSISCOMIFACEDECL}IApplicationAssociationRegistration QueryAppIsDefaultAll 5 (i,w,*i)i
+${NSISCOMIFACEDECL}IApplicationAssociationRegistration SetAppAsDefault 6 (w,w,i)i
+${NSISCOMIFACEDECL}IApplicationAssociationRegistration SetAppAsDefaultAll 7 (w)i
+${NSISCOMIFACEDECL}IApplicationAssociationRegistration ClearUserAssociations 8 ()i
+!endif
+!ifndef CLSID_ApplicationAssociationRegistrationUI
+!define CLSID_ApplicationAssociationRegistrationUI {1968106d-f3b5-44cf-890e-116fcb9ecef1}
+!endif
+!ifndef IID_IApplicationAssociationRegistrationUI
+!define IID_IApplicationAssociationRegistrationUI {1f76a169-f994-40ac-8fc8-0959e8874710} ;[Vista+]
+${NSISCOMIFACEDECL}IApplicationAssociationRegistrationUI LaunchAdvancedAssociationUI 3 (w)i
+!endif
+
+!ifndef CLSID_GameExplorer
+!define CLSID_GameExplorer {9A5EA990-3034-4D6F-9128-01F3C61022BC}
+!endif
+!ifndef IID_IGameExplorer
+!define IID_IGameExplorer {E7B2FB72-D728-49B3-A5F2-18EBF5F1349E} ;[Vista+]
+${NSISCOMIFACEDECL}IGameExplorer AddGame 3 (p,p,i,g)i
+${NSISCOMIFACEDECL}IGameExplorer RemoveGame 4 (i,i,i,i)i ; The parameter is a GUID, not REFGUID so the 'g' type cannot be used!
+${NSISCOMIFACEDECL}IGameExplorer UpdateGame 5 (i,i,i,i)i
+${NSISCOMIFACEDECL}IGameExplorer VerifyAccess 6 (p,*i)i
+!endif
+!define /ifndef GIS_NOT_INSTALLED 1
+!define /ifndef GIS_CURRENT_USER 2
+!define /ifndef GIS_ALL_USERS 3
+!ifndef IID_IGameExplorer2
+!define IID_IGameExplorer2 {86874AA7-A1ED-450d-A7EB-B89E20B2FFF3} ;[Seven+]
+${NSISCOMIFACEDECL}IGameExplorer2 InstallGame 3 (w,w,i)i
+${NSISCOMIFACEDECL}IGameExplorer2 UninstallGame 4 (w)i
+${NSISCOMIFACEDECL}IGameExplorer2 CheckAccess 5 (w,*i)i
+!endif
+!ifndef CLSID_GameStatistics
+!define CLSID_GameStatistics {DBC85A2C-C0DC-4961-B6E2-D28B62C11AD4}
+!endif
+!ifndef IID_IGameStatisticsMgr
+!define IID_IGameStatisticsMgr {AFF3EA11-E70E-407d-95DD-35E612C41CE2} ;[Seven+]
+${NSISCOMIFACEDECL}IGameStatisticsMgr GetGameStatistics 3 (w,i,*i,*p)i
+${NSISCOMIFACEDECL}IGameStatisticsMgr RemoveGameStatistics 4 (w)i
+!endif
+
+!ifndef CLSID_InternetShortcut
+!define CLSID_InternetShortcut {FBF23B40-E3F0-101B-8488-00AA003E56F8}
+!endif
+!ifndef IID_IUniformResourceLocator
+!define IID_IUniformResourceLocatorA {FBF23B80-E3F0-101B-8488-00AA003E56F8}
+!define IID_IUniformResourceLocatorW {CABB0DA0-DA57-11CF-9974-0020AFD79762}
+!ifdef NSIS_UNICODE
+!define IID_IUniformResourceLocator ${IID_IUniformResourceLocatorW}
+!else
+!define IID_IUniformResourceLocator ${IID_IUniformResourceLocatorA}
+!endif
+${NSISCOMIFACEDECL}IUniformResourceLocator SetURL 3 (t,i)i
+${NSISCOMIFACEDECL}IUniformResourceLocator GetURL 4 (*p)i
+${NSISCOMIFACEDECL}IUniformResourceLocator InvokeCommand 5 (p)i
+!endif
+
+!verbose pop
+!endif /* __WIN_COM__INC */
Index: tmp/org.txm.setups/nsis/Include/Win/WinNT.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/Win/WinNT.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/Win/WinNT.nsh	(revision 2956)
@@ -132,25 +132,25 @@
 !define TOKEN_WRITE      0x200E0 ;(STANDARD_RIGHTS_WRITE|TOKEN_ADJUST_PRIVILEGES|TOKEN_ADJUST_GROUPS|TOKEN_ADJUST_DEFAULT)
 !define TOKEN_EXECUTE    ${STANDARD_RIGHTS_EXECUTE}
 
-!define PROCESS_TERMINATE         0x0001  
-!define PROCESS_CREATE_THREAD     0x0002  
-!define PROCESS_SET_SESSIONID     0x0004  
-!define PROCESS_VM_OPERATION      0x0008  
-!define PROCESS_VM_READ           0x0010  
-!define PROCESS_VM_WRITE          0x0020  
-!define PROCESS_DUP_HANDLE        0x0040  
-!define PROCESS_CREATE_PROCESS    0x0080  
-!define PROCESS_SET_QUOTA         0x0100  
-!define PROCESS_SET_INFORMATION   0x0200  
-!define PROCESS_QUERY_INFORMATION 0x0400  
-!define PROCESS_SUSPEND_RESUME    0x0800  
+!define PROCESS_TERMINATE         0x0001
+!define PROCESS_CREATE_THREAD     0x0002
+!define PROCESS_SET_SESSIONID     0x0004
+!define PROCESS_VM_OPERATION      0x0008
+!define PROCESS_VM_READ           0x0010
+!define PROCESS_VM_WRITE          0x0020
+!define PROCESS_DUP_HANDLE        0x0040
+!define PROCESS_CREATE_PROCESS    0x0080
+!define PROCESS_SET_QUOTA         0x0100
+!define PROCESS_SET_INFORMATION   0x0200
+!define PROCESS_QUERY_INFORMATION 0x0400
+!define PROCESS_SUSPEND_RESUME    0x0800
 !define PROCESS_ALL_ACCESS      0x1F0FFF ;(STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xFFF)
-!define THREAD_TERMINATE               0x0001  
-!define THREAD_SUSPEND_RESUME          0x0002  
-!define THREAD_GET_CONTEXT             0x0008  
-!define THREAD_SET_CONTEXT             0x0010  
-!define THREAD_SET_INFORMATION         0x0020  
-!define THREAD_QUERY_INFORMATION       0x0040  
+!define THREAD_TERMINATE               0x0001
+!define THREAD_SUSPEND_RESUME          0x0002
+!define THREAD_GET_CONTEXT             0x0008
+!define THREAD_SET_CONTEXT             0x0010
+!define THREAD_SET_INFORMATION         0x0020
+!define THREAD_QUERY_INFORMATION       0x0040
 !define THREAD_SET_THREAD_TOKEN        0x0080
 !define THREAD_IMPERSONATE             0x0100
 !define THREAD_DIRECT_IMPERSONATION    0x0200
@@ -166,30 +166,30 @@
 !define MUTANT_QUERY_STATE      0x0001
 !define MUTANT_ALL_ACCESS 0x1F0001 ;(STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|MUTANT_QUERY_STATE)
 
-!define FILE_SHARE_READ   0x00000001  
-!define FILE_SHARE_WRITE  0x00000002  
-!define FILE_SHARE_DELETE 0x00000004  
-!define FILE_ATTRIBUTE_READONLY             0x00000001  
-!define FILE_ATTRIBUTE_HIDDEN               0x00000002  
-!define FILE_ATTRIBUTE_SYSTEM               0x00000004  
-!define FILE_ATTRIBUTE_DIRECTORY            0x00000010  
-!define FILE_ATTRIBUTE_ARCHIVE              0x00000020  
-!define FILE_ATTRIBUTE_DEVICE               0x00000040  
-!define FILE_ATTRIBUTE_NORMAL               0x00000080  
-!define FILE_ATTRIBUTE_TEMPORARY            0x00000100  
-!define FILE_ATTRIBUTE_SPARSE_FILE          0x00000200  
-!define FILE_ATTRIBUTE_REPARSE_POINT        0x00000400  
-!define FILE_ATTRIBUTE_COMPRESSED           0x00000800  
-!define FILE_ATTRIBUTE_OFFLINE              0x00001000  
-!define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED  0x00002000  
-!define FILE_ATTRIBUTE_ENCRYPTED            0x00004000  
+!define FILE_SHARE_READ   0x00000001
+!define FILE_SHARE_WRITE  0x00000002
+!define FILE_SHARE_DELETE 0x00000004
+!define FILE_ATTRIBUTE_READONLY             0x00000001
+!define FILE_ATTRIBUTE_HIDDEN               0x00000002
+!define FILE_ATTRIBUTE_SYSTEM               0x00000004
+!define FILE_ATTRIBUTE_DIRECTORY            0x00000010
+!define FILE_ATTRIBUTE_ARCHIVE              0x00000020
+!define FILE_ATTRIBUTE_DEVICE               0x00000040
+!define FILE_ATTRIBUTE_NORMAL               0x00000080
+!define FILE_ATTRIBUTE_TEMPORARY            0x00000100
+!define FILE_ATTRIBUTE_SPARSE_FILE          0x00000200
+!define FILE_ATTRIBUTE_REPARSE_POINT        0x00000400
+!define FILE_ATTRIBUTE_COMPRESSED           0x00000800
+!define FILE_ATTRIBUTE_OFFLINE              0x00001000
+!define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED  0x00002000
+!define FILE_ATTRIBUTE_ENCRYPTED            0x00004000
 
-!define DUPLICATE_CLOSE_SOURCE 0x00000001  
-!define DUPLICATE_SAME_ACCESS  0x00000002  
+!define DUPLICATE_CLOSE_SOURCE 0x00000001
+!define DUPLICATE_SAME_ACCESS  0x00000002
 
-!define VER_PLATFORM_WIN32s             0
-!define VER_PLATFORM_WIN32_WINDOWS      1
-!define VER_PLATFORM_WIN32_NT           2
+!define /ifndef VER_PLATFORM_WIN32s         0
+!define /ifndef VER_PLATFORM_WIN32_WINDOWS  1
+!define /ifndef VER_PLATFORM_WIN32_NT       2
 
 !ifndef REG_SZ & NSIS_WINDOWS__NO_REGTYPES
 !define REG_NONE                 0
@@ -203,7 +203,22 @@
 !define REG_MULTI_SZ             7
 !endif
 
+!define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF
+!define PROCESSOR_ARCHITECTURE_INTEL          0 ; x86
+!define PROCESSOR_ARCHITECTURE_ARM            5
+!define PROCESSOR_ARCHITECTURE_IA64           6 ; Itanium
+!define PROCESSOR_ARCHITECTURE_AMD64          9 ; x86-64/x64
+!define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64  10
+!define PROCESSOR_ARCHITECTURE_ARM64          12
+!define PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64 13
 
+!define IMAGE_FILE_MACHINE_UNKNOWN 0
+!define IMAGE_FILE_MACHINE_I386  332   ; x86
+!define IMAGE_FILE_MACHINE_ARMNT 452
+!define IMAGE_FILE_MACHINE_IA64  512   ; Itanium
+!define IMAGE_FILE_MACHINE_AMD64 34404 ; x86-64/x64
+!define IMAGE_FILE_MACHINE_ARM64 43620
+
 !endif /* __WIN_NOINC_WINNT */
 !verbose pop
 !endif /* __WIN_WINNT__INC */
\ No newline at end of file
Index: tmp/org.txm.setups/nsis/Include/Win/Propkey.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/Win/Propkey.nsh	(revision 0)
+++ tmp/org.txm.setups/nsis/Include/Win/Propkey.nsh	(revision 2956)
@@ -0,0 +1,216 @@
+!ifndef __WIN_PROPKEY__INC
+!define __WIN_PROPKEY__INC
+!verbose push
+!verbose 3 
+
+
+/**************************************************
+WTypes.h
+**************************************************/
+;NOTE: This list is incomplete
+!define VT_EMPTY     0
+!define VT_NULL      1
+!define VT_I2        2
+!define VT_I4        3
+!define VT_BSTR      8
+!define VT_BOOL      11
+!define VT_I1        16
+!define VT_UI1       17
+!define VT_UI2       18
+!define VT_UI4       19
+!define VT_I8        20
+!define VT_UI8       21
+!define VT_INT       22
+!define VT_UINT      23
+!define VT_HRESULT   25
+!define VT_PTR       26
+!define VT_SAFEARRAY 27
+!define VT_LPSTR     30 ; SHStrDupA
+!define VT_LPWSTR    31 ; SHStrDupW
+!define VT_FILETIME  64
+!define VT_STREAM    66
+!define VT_CLSID     72 ; Pointer to CoTaskMem allocated GUID
+!define VT_TYPEMASK 0xFFF
+!define VT_VECTOR  0x1000
+!define VT_ARRAY   0x2000
+!define VT_BYREF   0x4000
+
+!define /ifndef VARIANT_TRUE -1
+!define /ifndef VARIANT_FALSE 0
+
+!define SYSSIZEOF_PROPERTYKEY 20
+!define SYSSTRUCT_PROPERTYKEY (&g16,&i4) ;System.dll is buggy when it comes to g and forces us to specify the size
+
+!define STGC_DEFAULT 0
+!define STGC_OVERWRITE 1
+!define STGC_ONLYIFCURRENT 2
+!define STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE 4
+!define STGC_CONSOLIDATE 8
+
+
+/**************************************************
+OAIdl.h
+**************************************************/
+!if "${NSIS_PTR_SIZE}" > 4
+!define SYSSIZEOF_VARIANT 24
+!define SYSSTRUCT_VARIANT (&i2,&i6,&i8,&i8)
+!else
+!define SYSSIZEOF_VARIANT 16
+!define SYSSTRUCT_VARIANT (&i2,&i6,&i8)
+!endif
+
+
+/**************************************************
+PropIdl.h
+**************************************************/
+!if "${NSIS_PTR_SIZE}" > 4
+!define SYSSIZEOF_PROPVARIANT 24
+!define SYSSTRUCT_PROPVARIANT (&i2,&i6,&i8,&i8)
+!else
+!define SYSSIZEOF_PROPVARIANT 16
+!define SYSSTRUCT_PROPVARIANT (&i2,&i6,&i8)
+!endif
+
+!define PRSPEC_LPWSTR 0
+!define PRSPEC_PROPID 1
+!define SYSSTRUCT_PROPSPEC (p,p)
+
+
+/**************************************************
+Propkey.h
+**************************************************/
+!define PKEY_AppUserModel_RelaunchCommand             '"{9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}",2' ; VT_LPWSTR (SHGetPropertyStoreForWindow)
+!define PKEY_AppUserModel_RelaunchIconResource        '"{9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}",3' ; VT_LPWSTR (SHGetPropertyStoreForWindow, optional. Path to icon or module, with resource ID or index.)
+!define PKEY_AppUserModel_RelaunchDisplayNameResource '"{9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}",4' ; VT_LPWSTR (SHGetPropertyStoreForWindow. @ style indirect resource string or a plain string.)
+!define PKEY_AppUserModel_ID                          '"{9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}",5' ; VT_LPWSTR
+!define PKEY_AppUserModel_IsDestListSeparator         '"{9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}",6' ; VT_BOOL
+!define PKEY_AppUserModel_ExcludeFromShowInNewInstall '"{9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}",8' ; VT_BOOL
+!define PKEY_AppUserModel_PreventPinning              '"{9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}",9' ; VT_BOOL
+!define PKEY_AppUserModel_IsDualMode '"{9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}",11' ; [Eight+] VT_BOOL
+!define APPUSERMODEL_STARTPINOPTION_NOPINONINSTALL 1
+!define APPUSERMODEL_STARTPINOPTION_USERPINNED 2
+!define PKEY_AppUserModel_StartPinOption '"{9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}",12' ; [Eight+] VT_UI4
+!define PKEY_AppUserModel_ToastActivatorCLSID '"{9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}",26' ; [10FU1507+] VT_CLSID
+!define PKEY_EdgeGesture_DisableTouchWhenFullscreen '"{32CE38B2-2C9A-41B1-9BC5-B3784394AA44}",2' ; [Eight+] VT_BOOL (SHGetPropertyStoreForWindow)
+
+
+/**************************************************
+ShlGuid.h & ShlObj.h
+**************************************************/
+!define FMTID_Intshcut {000214A0-0000-0000-C000-000000000046}
+!define PID_IS_URL 2 ; VT_LPWSTR
+!define PID_IS_HOTKEY 6 ; VT_UI2
+!define PID_IS_ICONINDEX 8 ; VT_I4
+!define PID_IS_ICONFILE 9 ; VT_LPWSTR
+!define PKEY_Intshcut_Url '"${FMTID_Intshcut}",${PID_IS_URL}' ; Undocumented
+!define FMTID_InternetSite {000214A1-0000-0000-C000-000000000046}
+!define PID_INTSITE_LASTVISIT 4 ; VT_FILETIME
+!define PID_INTSITE_VISITCOUNT 6 ; VT_UI4
+
+
+/**************************************************
+Helper macros
+**************************************************/
+!define V_GetVT '!insertmacro V_GetVT '
+!macro V_GetVT pPV sysdst
+System::Call '*${pPV}(&i2.${sysdst})'
+!macroend
+!define V_SetVT '!insertmacro V_SetVT '
+!macro V_SetVT pPV syssrc
+System::Call '*${pPV}(&i2 ${syssrc})'
+!macroend
+!macro V_GetHelper sysvaltyp pPV sysdst
+System::Call '*${pPV}(l,${sysvaltyp}.${sysdst})'
+!macroend
+!macro V_GenericSetHelper sysvaltyp pPV VT syssrc
+!if "${VT}" != "" ; Setting the VT is optional
+  System::Call '*${pPV}(&i2 ${VT},&i6,${sysvaltyp}${syssrc})'
+!else
+  System::Call '*${pPV}(l,${sysvaltyp}${syssrc})'
+!endif
+!macroend
+!macro V_SpecificSetHelper VT sysvaltyp pPV syssrc
+System::Call '*${pPV}(&i2 ${VT},&i6,${sysvaltyp}${syssrc})'
+!macroend
+!macro Make_V_GetterSetter name sysvaltyp setsep
+!define V_Get${name} '!insertmacro V_GetHelper "${sysvaltyp}" '
+!ifdef VT_${name}
+  !define V_Set${name} '!insertmacro V_SpecificSetHelper ${VT_${name}} "${sysvaltyp}${setsep}" '
+!else
+  !define V_Set${name} '!insertmacro V_GenericSetHelper "${sysvaltyp}${setsep}" '
+!endif
+!macroend
+!insertmacro Make_V_GetterSetter Int8 "&i1" " "  ; Generic
+!insertmacro Make_V_GetterSetter Int16 "&i2" " " ; Generic
+!insertmacro Make_V_GetterSetter Int32 "i" ""    ; Generic
+!insertmacro Make_V_GetterSetter Int64 "l" ""    ; Generic
+!insertmacro Make_V_GetterSetter Pointer "p" ""  ; Generic
+!insertmacro Make_V_GetterSetter I4 "i" " "
+!insertmacro Make_V_GetterSetter BOOL "&i2" " "
+!insertmacro Make_V_GetterSetter FILETIME "l" ""
+
+!macro VariantInit pV
+${V_SetVT} ${pV} ${VT_EMPTY}
+!macroend
+!macro VariantClear pV
+System::Call 'OLEAUT32::#9(p${pV})'
+!macroend
+!macro VariantCopy pDstV pSrcV sysretHR
+System::Call 'OLEAUT32::#10(p${pDstV},p${pSrcV})i.${sysretHR}' ; (Frees the destination variant before it copies the source)
+!macroend
+!macro VariantCopyInd pDstV pSrcV sysretHR
+System::Call 'OLEAUT32::#11(p${pDstV},p${pSrcV})i.${sysretHR}' ; (Frees the destination variant before it copies the source)
+!macroend
+!macro VariantChangeType pDstV pSrcV Flags VT sysretHR
+System::Call 'OLEAUT32::#12(p${pDstV},p${pSrcV},i${Flags},i${VT})i.${sysretHR}' ; (Might free the destination on success)
+!macroend
+
+
+!macro PropVariantClear pPV
+System::Call 'OLE32::PropVariantClear(p${pPV})' ; WinNT4.SP0+, Win98+, IE4+
+!macroend
+!macro PropVariantCopy pDstPV pSrcPV sysretHR
+System::Call 'OLE32::PropVariantCopy(p${pDstPV},p${pSrcPV})i.${sysretHR}' ; WinNT4.SP0+, Win98+, IE4+ (Does NOT free the destination before it copies the source)
+!macroend
+!macro PropVariantChangeType pDstPV pSrcPV VT sysretHR
+!ifdef NSIS_ARM | NSIS_ARM32 | NSIS_ARMNT | NSIS_ARM64
+  System::Call 'PROPSYS::PropVariantChangeType(p${pDstPV},p${pSrcPV},i0,i${VT})i.${sysretHR}'
+!else
+  Push "${VT}"
+  Push ${pSrcPV}
+  Push ${pDstPV}
+  !include Util.nsh
+  ${CallArtificialFunction} TryPropVariantChangeType
+  System::Call 'KERNEL32::SetLastError(is${sysretHR})' ; A hack to move the result from the stack to somewhere with System variable syntax
+!endif
+!macroend
+!macro TryPropVariantChangeType
+System::Store S
+System::Call 'PROPSYS::PropVariantChangeType(psr1,psr2,i0,isr3)i.r0' ; Vista+ (Source and destination cannot be the same address)
+StrCmp $0 error "" done
+System::Call 'OLE32::PropVariantChangeType(pr1,pr2,i0,i0,ir3})i.r0' ; 2000+ (Source and destination cannot be the same address)
+!if ${NSIS_PTR_SIZE} < 8
+  StrCmp $0 error "" done
+  !insertmacro VariantChangeType $1 $2 0 $3 r0 ; This is not really correct but there is no PROPVARIANT support on these platforms. Might free the destination!
+!endif
+done:
+Push $0
+System::Store L
+!macroend
+
+
+!macro IPropertyStorage_ReadPropById pPS ID pPV sysoutHR
+System::Call '*(p${PRSPEC_PROPID},p${ID})p.s'
+${IPropertyStorage::ReadMultiple} ${pPS} '(1,pss,p${pPV})${sysoutHR}'
+System::Free
+!macroend
+
+!macro IPropertyStorage_WritePropById pPS ID pPV sysoutHR
+System::Call '*(p${PRSPEC_PROPID},p${ID})p.s'
+${IPropertyStorage::WriteMultiple} ${pPS} '(1,pss,p${pPV},2)${sysoutHR}'
+System::Free
+!macroend
+
+
+!verbose pop
+!endif /* __WIN_PROPKEY__INC */
Index: tmp/org.txm.setups/nsis/Include/Win/WinDef.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/Win/WinDef.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/Win/WinDef.nsh	(revision 2956)
@@ -5,9 +5,7 @@
 !ifndef __WIN_NOINC_WINDEF
 
 
-!ifndef MAX_PATH
-!define MAX_PATH 260
-!endif
+!define /ifndef MAX_PATH 260
 #define NULL 0
 
 
@@ -41,8 +39,7 @@
 !define LOWORD "!insertmacro _Win_LOWORD "
 
 !macro _Win_HIWORD _outvar _in
-IntOp ${outvar} "${_in}" >> 16 ;sign extended :(
-${LOWORD} ${_outvar} ${outvar} ;make sure we strip off the upper word
+IntOp ${_outvar} "${_in}" >>> 16
 !macroend
 !define HIWORD "!insertmacro _Win_HIWORD "
 
@@ -60,13 +57,9 @@
 IntOp ${_outvar} ${_outvar} | ${_tmpvar}
 !macroend
 !define MAKELONG "!insertmacro _Win_MAKELONG32 "
-!if "${__WIN_PTRSIZE}" <= 4
 !define MAKEWPARAM "${MAKELONG}"
 !define MAKELPARAM "${MAKELONG}"
 !define MAKELRESULT "${MAKELONG}"
-!else
-!error "Missing 64bit imp!"
-!endif
 
 
 !endif /* __WIN_NOINC_WINDEF */
Index: tmp/org.txm.setups/nsis/Include/Win/WinUser.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/Win/WinUser.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/Win/WinUser.nsh	(revision 2956)
@@ -87,17 +87,16 @@
 !endif
 
 !ifndef __WIN_MS_NOWINOFFSETS
-/* in nsDialogs.nsh...
-!define GWL_STYLE           -16
-!define GWL_EXSTYLE         -20 */
-!define GWLP_WNDPROC        -4
-!define GWLP_HINSTANCE      -6
-!define GWLP_HWNDPARENT     -8
-!define GWLP_USERDATA       -21
-!define GWLP_ID             -12
+!define /ifndef GWL_STYLE       -16
+!define /ifndef GWL_EXSTYLE     -20
+!define /ifndef GWLP_WNDPROC    -4
+!define /ifndef GWLP_HINSTANCE  -6
+!define /ifndef GWLP_HWNDPARENT -8
+!define /ifndef GWLP_USERDATA   -21
+!define /ifndef GWLP_ID         -12
 !define DWLP_MSGRESULT  0
-!define /math DWLP_DLGPROC    ${DWLP_MSGRESULT} + ${__WIN_PTRSIZE} ;DWLP_MSGRESULT + sizeof(LRESULT) 
-!define /math DWLP_USER       ${DWLP_DLGPROC} + ${__WIN_PTRSIZE} ;DWLP_DLGPROC + sizeof(DLGPROC)
+!define /math DWLP_DLGPROC ${DWLP_MSGRESULT} + ${NSIS_PTR_SIZE} ;DWLP_MSGRESULT + sizeof(LRESULT) 
+!define /math DWLP_USER    ${DWLP_DLGPROC} + ${NSIS_PTR_SIZE} ;DWLP_DLGPROC + sizeof(DLGPROC)
 !endif
 
 !ifndef __WIN_MS_NONCMESSAGES
@@ -155,40 +154,41 @@
 !define SC_SEPARATOR    0xF00F
 !endif
 
-!define IDC_ARROW       32512
-!define IDC_IBEAM       32513
-!define IDC_WAIT        32514
-!define IDC_CROSS       32515
-!define IDC_UPARROW     32516
-!define IDC_SIZENWSE    32642
-!define IDC_SIZENESW    32643
-!define IDC_SIZEWE      32644
-!define IDC_SIZENS      32645
-!define IDC_SIZEALL     32646
-!define IDC_NO          32648 
-!define IDC_HAND        32649
-!define IDC_APPSTARTING 32650 
-!define IDC_HELP        32651
+!define /ifndef IDC_ARROW       32512
+!define /ifndef IDC_IBEAM       32513
+!define /ifndef IDC_WAIT        32514
+!define /ifndef IDC_CROSS       32515
+!define /ifndef IDC_UPARROW     32516
+!define /ifndef IDC_SIZE        32640
+!define /ifndef IDC_ICON        32641
+!define /ifndef IDC_SIZENWSE    32642
+!define /ifndef IDC_SIZENESW    32643
+!define /ifndef IDC_SIZEWE      32644
+!define /ifndef IDC_SIZENS      32645
+!define /ifndef IDC_SIZEALL     32646
+!define /ifndef IDC_NO          32648 
+!define /ifndef IDC_HAND        32649
+!define /ifndef IDC_APPSTARTING 32650 
+!define /ifndef IDC_HELP        32651
 
-/* in nsDialogs.nsh...
-!define IMAGE_BITMAP 0
-!define IMAGE_ICON   1
-!define IMAGE_CURSOR 2*/
+!define /ifndef IMAGE_BITMAP        0
+!define /ifndef IMAGE_ICON          1
+!define /ifndef IMAGE_CURSOR        2
+!define /ifndef IMAGE_ENHMETAFILE   3
 
-/* in nsDialogs.nsh...
-!define LR_DEFAULTCOLOR     0x0000
-!define LR_MONOCHROME       0x0001
-!define LR_COLOR            0x0002
-!define LR_COPYRETURNORG    0x0004
-!define LR_COPYDELETEORG    0x0008
-!define LR_LOADFROMFILE     0x0010
-!define LR_LOADTRANSPARENT  0x0020
-!define LR_DEFAULTSIZE      0x0040
-!define LR_VGACOLOR         0x0080
-!define LR_LOADMAP3DCOLORS  0x1000
-!define LR_CREATEDIBSECTION 0x2000
-!define LR_COPYFROMRESOURCE 0x4000
-!define LR_SHARED           0x8000*/
+!define /ifndef LR_DEFAULTCOLOR     0x0000
+!define /ifndef LR_MONOCHROME       0x0001
+!define /ifndef LR_COLOR            0x0002
+!define /ifndef LR_COPYRETURNORG    0x0004
+!define /ifndef LR_COPYDELETEORG    0x0008
+!define /ifndef LR_LOADFROMFILE     0x0010
+!define /ifndef LR_LOADTRANSPARENT  0x0020
+!define /ifndef LR_DEFAULTSIZE      0x0040
+!define /ifndef LR_VGACOLOR         0x0080
+!define /ifndef LR_LOADMAP3DCOLORS  0x1000
+!define /ifndef LR_CREATEDIBSECTION 0x2000
+!define /ifndef LR_COPYFROMRESOURCE 0x4000
+!define /ifndef LR_SHARED           0x8000
 
 !define GA_PARENT    1
 !define GA_ROOT      2
Index: tmp/org.txm.setups/nsis/Include/WinCore.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/WinCore.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/WinCore.nsh	(revision 2956)
@@ -13,9 +13,7 @@
 !verbose 3
 
 
-!define __WIN_PTRSIZE 4 ;will we ever see a 64 bit version?
 
-
 !include Win\WinDef.nsh
 !include Win\WinError.nsh
 !include Win\WinNT.nsh
@@ -33,10 +31,10 @@
 WinBase.h
 **************************************************/
 !ifndef __WIN_NOINC_WINBASE
-!define INVALID_HANDLE_VALUE -1
-!define INVALID_FILE_SIZE 0xFFFFFFFF
-!define INVALID_SET_FILE_POINTER -1
-!define INVALID_FILE_ATTRIBUTES -1
+!define /ifndef INVALID_HANDLE_VALUE -1
+!define /ifndef INVALID_FILE_SIZE 0xFFFFFFFF
+!define /ifndef INVALID_SET_FILE_POINTER -1
+!define /ifndef INVALID_FILE_ATTRIBUTES -1
 
 !define WAIT_FAILED 0xFFFFFFFF
 !define WAIT_OBJECT_0       0 ;((STATUS_WAIT_0 ) + 0 )
@@ -210,5 +208,56 @@
 
 
 
+
+/**************************************************
+Shobjidl.h
+**************************************************/
+!ifndef __WIN_NOINC_SHOBJIDL
+; ASSOCIATIONLEVEL
+!define AL_MACHINE 0
+!define AL_EFFECTIVE 1
+!define AL_USER 2
+
+; ASSOCIATIONTYPE
+!define AT_FILEEXTENSION 0
+!define AT_URLPROTOCOL 1
+!define AT_STARTMENUCLIENT 2
+!define AT_MIMETYPE 3
+!endif /* __WIN_NOINC_SHOBJIDL */
+
+
+
+
+
+/**************************************************
+ShlGuid.h
+**************************************************/
+!ifndef __WIN_NOINC_SHLGUID
+!define FOLDERID_Public {DFDF76A2-C82A-4D63-906A-5644AC457385} ; Vista+ Fixed=%SystemDrive%\Users\Public
+!define FOLDERID_Games {CAC52C1A-B53D-4edc-92D7-6B2E8AC19434} ; Vista+ && < 10 (1803) Virtual
+!define FOLDERID_SavedGames {4C5C32FF-BB9D-43b0-B5B4-2D72E54EAAA4} ; Vista+ PerUser=%USERPROFILE%\Saved Games
+!define FOLDERID_GameTasks {054FAE61-4DD8-4787-80B6-090220C4B700} ; Vista+ PerUser=%LOCALAPPDATA%\Microsoft\Windows\GameExplorer
+!define FOLDERID_PublicGameTasks {DEBF2536-E1A8-4c59-B6A2-414586476AEA} ; Vista+ Common=%ALLUSERSPROFILE%\Microsoft\Windows\GameExplorer
+!define FOLDERID_Contacts {56784854-C6CB-462b-8169-88E350ACB882} ; Vista+ PerUser=%USERPROFILE%\Contacts
+!define FOLDERID_Downloads {374DE290-123F-4565-9164-39C4925E467B} ; Vista+ PerUser=%USERPROFILE%\Downloads
+!define FOLDERID_PublicDownloads {3D644C9B-1FB8-4f30-9B45-F670235F79C0} ; Vista+ Common=%PUBLIC%\Downloads
+!define FOLDERID_UserProfiles {0762D272-C50A-4BB0-A382-697DCD729B80} ; Vista+ Fixed=%SystemDrive%\Users
+!define FOLDERID_UserProgramFiles {5CD7AEE2-2219-4A67-B85D-6C9CE15660CB} ; 7+ PerUser=%LOCALAPPDATA%\Programs
+!define FOLDERID_UserProgramFilesCommon {BCBD3057-CA5C-4622-B42D-BC56DB0AE516} ; 7+ PerUser=%LOCALAPPDATA%\Programs\Common
+!define FOLDERID_PublicLibraries {48DAF80B-E6CF-4F4E-B800-0E69D84EE384} ; 7+ Common=%ALLUSERSPROFILE%\Microsoft\Windows\Libraries
+!define FOLDERID_UserPinned {9E3995AB-1F9C-4F13-B827-48B24B6C7174} ; 7+ PerUser=%APPDATA%\Microsoft\Internet Explorer\Quick Launch\User Pinned
+!define FOLDERID_ImplicitAppShortcuts {BCB5256F-79F6-4CEE-B725-DC34E402FD46} ; 7+ PerUser=%APPDATA%\Microsoft\Internet Explorer\Quick Launch\User Pinned\ImplicitAppShortcuts
+!define FOLDERID_DeviceMetadataStore {5CE4A5E9-E4EB-479D-B89F-130C02886155} ; 7+ Common=%ALLUSERSPROFILE%\Microsoft\Windows\DeviceMetadataStore
+!define FOLDERID_ApplicationShortcuts {A3918781-E5F2-4890-B3D9-A7E54332328C} ; 8.0+ PerUser=%LOCALAPPDATA%\Microsoft\Windows\Application Shortcuts
+!define FOLDERID_RoamingTiles {00BCFC5A-ED94-4e48-96A1-3F6217F21990} ; 8.0+ PerUser=%LOCALAPPDATA%\Microsoft\Windows\RoamingTiles
+!define FOLDERID_RoamedTileImages {AAA8D5A5-F1D6-4259-BAA8-78E7EF60835E} ; 8.0+ PerUser=%LOCALAPPDATA%\Microsoft\Windows\RoamedTileImages
+!define FOLDERID_PublicUserTiles {0482af6c-08f1-4c34-8c90-e17ec98b1e17} ; 8.0+ Common=%PUBLIC%\AccountPictures
+!define FOLDERID_AccountPictures {008ca0b1-55b4-4c56-b8a8-4de4b299d3be} ; 8.0+ PerUser=%APPDATA%\Microsoft\Windows\AccountPictures
+!define FOLDERID_Screenshots {b7bede81-df94-4682-a7d8-57a52620b86f} ; 8.0+ PerUser=%USERPROFILE%\Pictures\Screenshots
+!define FOLDERID_SkyDrive {A52BBA46-E9E1-435f-B3D9-28DAA648C0F6} ; 8.1+ PerUser=%USERPROFILE%\OneDrive
+!define FOLDERID_AppDataProgramData {559D40A3-A036-40FA-AF61-84CB430A4D34} ; 10 (1709)+ PerUser=%LOCALAPPDATA%\ProgramData
+!endif /* __WIN_NOINC_SHLGUID */
+
+
 !verbose pop
 !endif /* __WIN_WINDOWS__INC */
\ No newline at end of file
Index: tmp/org.txm.setups/nsis/Include/WinVer.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/WinVer.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/WinVer.nsh	(revision 2956)
@@ -12,11 +12,15 @@
 ;     DetailPrint "Not running on NT. Installing ANSI application."
 ;   ${EndIf}
 ;
-; IsServer checks if the installer is running on a server version of Windows (NT4, 2003, 2008, etc.)
+; IsServerOS checks if the installer is running on a server version of Windows (2000, 2003, 2008, etc.)
+; IsDomainController checks if the server is a domain controller
 ;
 ; AtLeastWin<version> checks if the installer is running on Windows version at least as specified.
 ; IsWin<version> checks if the installer is running on Windows version exactly as specified.
 ; AtMostWin<version> checks if the installer is running on Windows version at most as specified.
+; AtLeastBuild <number> checks if the installer is running on a Windows version with a minimum build number.
+; AtMostBuild <number> checks if the installer is running on a Windows version with a maximum build number.
+; AtLeastWaaS <name> and AtMostWaaS <name> checks Windows 10 "friendly names" against the build number.
 ;
 ; <version> can be replaced with the following values:
 ;
@@ -34,7 +38,12 @@
 ;   2008R2
 ;   8
 ;   2012
+;   8.1
+;   2012R2
+;   10
 ;
+;   Note: Windows 8.1 and later will be detected as Windows 8 unless ManifestSupportedOS is set correctly!
+;
 ; AtLeastServicePack checks if the installer is running on Windows service pack version at least as specified.
 ; IsServicePack checks if the installer is running on Windows service pack version exactly as specified.
 ; AtMostServicePack checks if the installer is running on Windows service version pack at most as specified.
@@ -73,7 +82,7 @@
 ;   check if running on the NT family.
 ;
 ;     ${If} ${AtLeastWin95}
-;     ${And} ${AtMostWinME}
+;     ${AndIf} ${AtMostWinME}
 ;       DetailPrint "Running 95, 98 or ME."
 ;       DetailPrint "Actually, maybe it's NT4?"
 ;       ${If} ${IsNT}
@@ -103,16 +112,16 @@
 
 # masks for our variables
 
-!define _WINVER_VERXBIT  0x00000001
-!define _WINVER_MASKVMAJ 0x7F000000
-!define _WINVER_MASKVMIN 0x00FF0000
+!define _WINVER_VERXBIT  0x00000001 ; Used to boost $__WINVERV
+!define _WINVER_MASKVMAJ 0x7F000000 ; $__WINVERV mask
+!define _WINVER_MASKVMIN 0x00FF0000 ; $__WINVERV mask
+!define _WINVER_NTMASK   0x7FFFFFFF ; $__WINVERV mask used by AtMost/AtLeast
+!define _WINVER_NTBIT    0x80000000 ; $__WINVERV bit used by Is and $__WINVERSP bit used by IsNT
+!define _WINVER_NTSRVBIT 0x40000000 ; $__WINVERSP bit for !VER_NT_WORKSTATION
+!define _WINVER_NTDCBIT  0x20000000 ; $__WINVERSP bit for VER_NT_DOMAIN_CONTROLLER
+!define _WINVER_MASKVBLD 0x0000FFFF ; $__WINVERSP mask for OS build number
+!define _WINVER_MASKSP   0x000F0000 ; $__WINVERSP mask for OS service pack
 
-!define _WINVER_NTBIT    0x80000000
-!define _WINVER_NTMASK   0x7FFFFFFF
-!define _WINVER_NTSRVBIT 0x40000000
-!define _WINVER_MASKVBLD 0x0000FFFF
-!define _WINVER_MASKSP   0x000F0000
-
 # possible variable values for different versions
 
 !define WINVER_95_NT     0x04000000 ;4.00.0950
@@ -122,7 +131,7 @@
 ;define WINVER_98SE      0x040a0000 ;4.10.2222
 !define WINVER_ME_NT     0x045a0000 ;4.90.3000
 !define WINVER_ME        0x045a0000 ;4.90.3000
-;define WINVER_NT3d51               ;3.51.1057
+;define WINVER_NT3.51               ;3.51.1057
 !define WINVER_NT4_NT    0x84000000 ;4.00.1381
 !define WINVER_NT4       0x04000000 ;4.00.1381
 !define WINVER_2000_NT   0x85000000 ;5.00.2195
@@ -144,23 +153,32 @@
 !define WINVER_8         0x06020000 ;6.02.9200
 !define WINVER_2012_NT   0x86020001 ;6.02.9200
 !define WINVER_2012      0x06020001 ;6.02.9200
+!define WINVER_8.1_NT    0x86030000 ;6.03.9600
+!define WINVER_8.1       0x06030000 ;6.03.9600
+!define WINVER_2012R2_NT 0x86030001 ;6.03.9600
+!define WINVER_2012R2    0x06030001 ;6.03.9600
+!define WINVER_10_NT     0x8A000000 ;10.0.10240
+!define WINVER_10        0x0A000000 ;10.0.10240
+!define WINVER_2016_NT   0x8A000001 ;10.0.14393
+!define WINVER_2016      0x0A000001 ;10.0.14393
 
 
 # use this to make all nt > 9x
 
 !ifdef WINVER_NT4_OVER_W95
-  !define __WINVERTMP ${WINVER_NT4}
-  !undef WINVER_NT4
-  !define /math WINVER_NT4 ${__WINVERTMP} | ${_WINVER_VERXBIT}
-  !undef __WINVERTMP
+  !define /redef /math WINVER_NT4 ${WINVER_NT4} | ${_WINVER_VERXBIT}
 !endif
 
 # some definitions from header files
 
+!define OSVERSIONINFOW_SIZE   276
+!define OSVERSIONINFOEXW_SIZE 284
 !define OSVERSIONINFOA_SIZE   148
 !define OSVERSIONINFOEXA_SIZE 156
-!define VER_PLATFORM_WIN32_NT 2
-!define VER_NT_WORKSTATION    1
+!define /ifndef VER_PLATFORM_WIN32_NT 2
+!define /ifndef VER_NT_WORKSTATION       1
+!define /ifndef VER_NT_DOMAIN_CONTROLLER 2
+!define /ifndef VER_NT_SERVER            3
 
 !define SM_TABLETPC    86
 !define SM_MEDIACENTER 87
@@ -189,7 +207,7 @@
   !macro __WinVer_Call_GetVersionEx STRUCT_SIZE
 
     System::Call '*$0(i ${STRUCT_SIZE})'
-    System::Call kernel32::GetVersionEx(ir0)i.r3
+    System::Call kernel32::GetVersionEx(pr0)i.r3
 
   !macroend
 
@@ -211,16 +229,24 @@
   Push $3 ;bld
   Push $R0 ;temp
 
+  # a plugin call will lock the Unicode mode, it is now safe to set the struct size
+  !ifdef NSIS_UNICODE
+  !define /redef OSVERSIONINFO_SIZE ${OSVERSIONINFOW_SIZE}
+  !define /redef OSVERSIONINFOEX_SIZE ${OSVERSIONINFOEXW_SIZE}
+  !else
+  !define /redef OSVERSIONINFO_SIZE ${OSVERSIONINFOA_SIZE}
+  !define /redef OSVERSIONINFOEX_SIZE ${OSVERSIONINFOEXA_SIZE}
+  !endif
+
   # allocate memory
-  System::Alloc ${OSVERSIONINFOEXA_SIZE}
-  Pop $0
+  System::Call '*(&i${OSVERSIONINFOEX_SIZE})p.r0'
 
   # use OSVERSIONINFOEX
-  !insertmacro __WinVer_Call_GetVersionEx ${OSVERSIONINFOEXA_SIZE}
+  !insertmacro __WinVer_Call_GetVersionEx ${OSVERSIONINFOEX_SIZE}
 
   IntCmp $3 0 "" _winver_ex _winver_ex
     # OSVERSIONINFOEX not allowed (Win9x or NT4 w/SP < 6), use OSVERSIONINFO
-    !insertmacro __WinVer_Call_GetVersionEx ${OSVERSIONINFOA_SIZE}
+    !insertmacro __WinVer_Call_GetVersionEx ${OSVERSIONINFO_SIZE}
   _winver_ex:
 
   # get results from struct
@@ -243,7 +269,8 @@
     IntOp $__WINVERSP $__WINVERSP | ${_WINVER_NTBIT}
     IntOp $__WINVERV  $__WINVERV  | ${_WINVER_NTBIT}
   _winver_notnt:
-
+!ifndef NSIS_UNICODE
+!if "${NSIS_PTR_SIZE}" <= 4
   # get service pack information
   IntCmp $0 ${VER_PLATFORM_WIN32_NT} _winver_nt "" _winver_nt  # win9x
 
@@ -271,9 +298,10 @@
     Goto _winver_sp_done
 
   _winver_nt: # nt
+!endif #~ 32-bit
+!endif #~ ANSI
+    IntCmp $R0 ${OSVERSIONINFOEX_SIZE} "" _winver_sp_noex _winver_sp_noex
 
-    IntCmp $R0 ${OSVERSIONINFOEXA_SIZE} "" _winver_sp_noex _winver_sp_noex
-
       # discard szCSDVersion
       Pop $0
 
@@ -282,9 +310,12 @@
       Pop $0
 
       # is server?
-      IntCmp $0 ${VER_NT_WORKSTATION} _winver_noserver _winver_noserver ""
+      IntCmp $0 ${VER_NT_WORKSTATION} _winver_nt_notsrv
         IntOp $__WINVERSP $__WINVERSP | ${_WINVER_NTSRVBIT}
-      _winver_noserver:
+        IntCmp $0 ${VER_NT_DOMAIN_CONTROLLER} "" _winver_nt_notdc _winver_nt_notdc
+          IntOp $__WINVERSP $__WINVERSP | ${_WINVER_NTDCBIT}
+        _winver_nt_notdc:
+      _winver_nt_notsrv:
 
       # get wServicePackMajor
       Pop $0
@@ -295,7 +326,7 @@
     _winver_sp_noex: # OSVERSIONINFO, not OSVERSIONINFOEX
 
       ####  TODO
-      ## For IsServer to support < NT4SP6, we need to check the registry
+      ## For IsServerOS to support < NT4SP6, we need to check the registry
       ## here to see if we are a server and/or DC
 
       # get szCSDVersion
@@ -313,7 +344,7 @@
         StrCpy $0 0 # no service pack
 
 !ifdef WINVER_NT4_OVER_W95
-      IntOp $__WINVERV $__WINVERV | ${_WINVER_VERXBIT}
+      IntOp $__WINVERV $__WINVERV | ${_WINVER_VERXBIT} ; change NT 4.0.reserved.0 to 4.0.reserved.1
 !endif
 
   _winver_sp_done:
@@ -395,6 +426,10 @@
   !insertmacro __WinVer_DefineOSTest ${Test} 2008R2 '${Suffix}'
   !insertmacro __WinVer_DefineOSTest ${Test} 8      '${Suffix}'
   !insertmacro __WinVer_DefineOSTest ${Test} 2012   '${Suffix}'
+  !insertmacro __WinVer_DefineOSTest ${Test} 8.1    '${Suffix}'
+  !insertmacro __WinVer_DefineOSTest ${Test} 2012R2 '${Suffix}'
+  !insertmacro __WinVer_DefineOSTest ${Test} 10     '${Suffix}'
+  !insertmacro __WinVer_DefineOSTest ${Test} 2016   '${Suffix}'
 !macroend
 
 !insertmacro __WinVer_DefineOSTests AtLeast ""
@@ -403,21 +438,16 @@
 
 # version feature LogicLib macros
 
-!macro _IsNT _a _b _t _f
+!macro __WinVer_LL_IsBitSet _v _b _t _f
   !insertmacro _LOGICLIB_TEMP
   ${CallArtificialFunction} __WinVer_InitVars
-  IntOp $_LOGICLIB_TEMP $__WINVERSP & ${_WINVER_NTBIT}
+  IntOp $_LOGICLIB_TEMP ${_v} & ${_b}
   !insertmacro _!= $_LOGICLIB_TEMP 0 `${_t}` `${_f}`
 !macroend
-!define IsNT `"" IsNT ""`
 
-!macro _IsServerOS _a _b _t _f
-  !insertmacro _LOGICLIB_TEMP
-  ${CallArtificialFunction} __WinVer_InitVars
-  IntOp $_LOGICLIB_TEMP $__WINVERSP & ${_WINVER_NTSRVBIT}
-  !insertmacro _!= $_LOGICLIB_TEMP 0 `${_t}` `${_f}`
-!macroend
-!define IsServerOS `"" IsServerOS ""`
+!define IsNT `$__WINVERSP _WinVer_LL_IsBitSet ${_WINVER_NTBIT}`
+!define IsServerOS `$__WINVERSP _WinVer_LL_IsBitSet ${_WINVER_NTSRVBIT}`
+!define IsDomainController `$__WINVERSP _WinVer_LL_IsBitSet ${_WINVER_NTDCBIT}`
 
 # service pack macros
 
@@ -481,8 +511,51 @@
 !define WinVerGetMinor '!insertmacro __WinVer_GetVer $__WINVERV  16 ${_WINVER_MASKVMIN}'
 !define WinVerGetBuild '!insertmacro __WinVer_GetVer $__WINVERSP "" ${_WINVER_MASKVBLD}'
 
-# done
+!macro _WinVer_BuildNumCheck op num _t _f
+  !insertmacro _LOGICLIB_TEMP
+  ${WinVerGetBuild} $_LOGICLIB_TEMP
+  !insertmacro _${op} $_LOGICLIB_TEMP ${num} `${_t}` `${_f}`
+!macroend
+!define AtLeastBuild `U>= WinVer_BuildNumCheck `
+!define AtMostBuild `U<= WinVer_BuildNumCheck `
 
+# Windows as a Service macros
+
+!macro WinVer_WaaS id build fu codename marketingname
+  !if "${id}" == ${fu}
+    !define WinVer_WaaS_Build ${build}
+  !else if "${id}" == "${codename}"
+    !define WinVer_WaaS_Build ${build}
+  !else if "${id}" == "${marketingname}"
+    !define WinVer_WaaS_Build ${build}
+  !endif
+!macroend
+
+!macro _WinVer_WaaS op id _t _f
+  !insertmacro WinVer_WaaS "${id}" 10240 1507 "Threshold"   "RTM" ; 10240.16384
+  !insertmacro WinVer_WaaS "${id}" 10586 1511 "Threshold 2" "November Update" ; 10586.0?
+  !insertmacro WinVer_WaaS "${id}" 14393 1607 "Redstone"    "Anniversary Update" ; 14393.10
+  !insertmacro WinVer_WaaS "${id}" 15063 1703 "Redstone 2"  "Creators Update" ; 15063.13
+  !insertmacro WinVer_WaaS "${id}" 16299 1709 "Redstone 3"  "Fall Creators Update" ; 16299.19
+  !insertmacro WinVer_WaaS "${id}" 17134 1803 "Redstone 4"  "April 2018 Update" ; 17134.1
+  !insertmacro WinVer_WaaS "${id}" 17763 1809 "Redstone 5"  "October 2018 Update" ; 17763.1
+  !insertmacro WinVer_WaaS "${id}" 18362 1903 "19H1"        "May 2019 Update" ; 18362.116
+  !insertmacro WinVer_WaaS "${id}" 18363 1909 "19H2"        "November 2019 Update" ; 18363.418
+  !insertmacro WinVer_WaaS "${id}" 19041 2004 "20H1"        "May 2020 Update" ; 19041.264?
+  !ifmacrodef WinVerExternal_WaaS_MapToBuild
+    !insertmacro WinVerExternal_WaaS_MapToBuild ${op} "${id}" WinVer_WaaS_Build
+  !endif
+  !define /IfNDef WinVer_WaaS_Build 0
+  !if "${WinVer_WaaS_Build}" <= 9600
+    !error 'WinVer: Unknown WaaS name: ${id}'
+  !endif
+  !insertmacro _WinVer_BuildNumCheck ${op} ${WinVer_WaaS_Build} `${_t}` `${_f}`
+  !undef WinVer_WaaS_Build
+!macroend
+
+!define AtLeastWaaS `U>= WinVer_WaaS `
+!define AtMostWaaS `U<= WinVer_WaaS `
+
 !endif # !___WINVER__NSH___
 
 !verbose pop
Index: tmp/org.txm.setups/nsis/Include/Util.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/Util.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/Util.nsh	(revision 2956)
@@ -4,53 +4,181 @@
 ;
 ; Voodoo macros to make end-user usage easier. This may be documented someday.
 
-!verbose push
-!verbose 3
-
+!verbose push 3
 !ifndef ___UTIL__NSH___
 !define ___UTIL__NSH___
 
-# see WinVer.nsh and *Func.nsh for usage examples
-!macro CallArtificialFunction NAME
-  !ifndef __UNINSTALL__
-    !define CallArtificialFunction_TYPE inst
-  !else
-    !define CallArtificialFunction_TYPE uninst
-  !endif
-  Call :.${NAME}${CallArtificialFunction_TYPE}
-  !ifndef ${NAME}${CallArtificialFunction_TYPE}_DEFINED
-    Goto ${NAME}${CallArtificialFunction_TYPE}_DONE
-    !define ${NAME}${CallArtificialFunction_TYPE}_DEFINED
-    .${NAME}${CallArtificialFunction_TYPE}:
+# CallArtificialFunction, see WinVer.nsh and *Func.nsh for usage examples
+!macro CallArtificialFunctionHelper TYPE NAME
+  !verbose pop
+  Call :.${NAME}${TYPE}
+  !ifndef ${NAME}${TYPE}_DEFINED
+    !verbose push 2
+    Goto ${NAME}${TYPE}_DONE
+    !define ${NAME}${TYPE}_DEFINED
+    !verbose pop
+    .${NAME}${TYPE}:
       !insertmacro ${NAME}
-    Return
-    ${NAME}${CallArtificialFunction_TYPE}_DONE:
+      Return
+    ${NAME}${TYPE}_DONE:
   !endif
-  !undef CallArtificialFunction_TYPE
+  !verbose push 2
 !macroend
-!define CallArtificialFunction `!insertmacro CallArtificialFunction`
 
-# for usage of artificial functions inside artificial functions
-# macro recursion is prohibited
-!macro CallArtificialFunction2 NAME
-  !ifndef __UNINSTALL__
-    !define CallArtificialFunction2_TYPE inst
+!macro CallArtificialFunction NAME
+  !verbose push 2
+  !ifdef __UNINSTALL__
+    !insertmacro CallArtificialFunctionHelper uninst ${NAME}
   !else
-    !define CallArtificialFunction2_TYPE uninst
+    !insertmacro CallArtificialFunctionHelper inst ${NAME}
   !endif
-  Call :.${NAME}${CallArtificialFunction2_TYPE}
-  !ifndef ${NAME}${CallArtificialFunction2_TYPE}_DEFINED
-    Goto ${NAME}${CallArtificialFunction2_TYPE}_DONE
-    !define ${NAME}${CallArtificialFunction2_TYPE}_DEFINED
-    .${NAME}${CallArtificialFunction2_TYPE}:
-      !insertmacro ${NAME}
-    Return
-    ${NAME}${CallArtificialFunction2_TYPE}_DONE:
-  !endif
-  !undef CallArtificialFunction2_TYPE
+  !verbose pop
 !macroend
-!define CallArtificialFunction2 `!insertmacro CallArtificialFunction2`
+!define CallArtificialFunction `!insertmacro CallArtificialFunction`
 
-!endif # !___UTIL__NSH___
+!macro CallArtificialFunction2 NAME ; Retained for v2.4x..v3.0b0 compatibility
+  ${CallArtificialFunction} ${NAME}
+!macroend
+!define CallArtificialFunction2 `!insertmacro CallArtificialFunction`
 
+
+!define Int32Op '!insertmacro Int32Op '
+!define Int64Op '!insertmacro Int64Op '
+!define IntPtrOp '!insertmacro IntPtrOp '
+!macro Int32Op r a o b
+IntOp `${r}` `${a}` `${o}` ${b}
+!macroend
+!macro Int64Op r a o b
+!echo "Int64Op ${r}=${a}${o}${b}"
+!verbose push 2
+System::Int64Op `${a}` `${o}` ${b}
+Pop ${r}
 !verbose pop
+!macroend
+!macro IntPtrOp r a o b
+IntPtrOp `${r}` `${a}` `${o}` `${b}`
+!macroend
+
+!define Int32Cmp '!insertmacro Int32Cmp '
+!define Int64Cmp '!insertmacro Int64Cmp '
+!define IntPtrCmp '!insertmacro IntPtrCmp '
+!macro Int32Cmp a b jeek jles jgtr
+IntCmp `${a}` `${b}` `${jeek}` `${jles}` `${jgtr}`
+!macroend
+!macro Int64Cmp a b jeek jles jgtr
+!if ${NSIS_PTR_SIZE} <= 4
+!ifmacrondef _LOGICLIB_TEMP
+!include LogicLib.nsh
+!endif
+!echo "Int64Cmp ${a}:${b} =${jeek}, <${jles}, >${jgtr}"
+!verbose push 2
+${IfThen} ${a} L= ${b} ${|} Goto ${jeek} ${|}
+!insertmacro _L< ${a} ${b} `${jles}` `${jgtr}`
+!verbose pop
+!else
+Int64Cmp `${a}` `${b}` `${jeek}` `${jles}` `${jgtr}`
+!endif
+!macroend
+!macro IntPtrCmp a b jeek jles jgtr
+IntPtrCmp `${a}` `${b}` `${jeek}` `${jles}` `${jgtr}`
+!macroend
+
+!define Int32CmpU '!insertmacro Int32CmpU '
+!define Int64CmpU '!insertmacro Int64CmpU '
+!define IntPtrCmpU '!insertmacro IntPtrCmpU '
+!macro Int32CmpU a b jeek jles jgtr
+IntCmpU `${a}` `${b}` `${jeek}` `${jles}` `${jgtr}`
+!macroend
+!macro Int64CmpUHelper
+; This macro performs "$_LOGICLIB_TEMP = a < b ? -1 : a > b ? 1 : 0" but System::Int64Op does not support unsigned operations so we have to perform multiple steps
+!ifmacrondef _LOGICLIB_TEMP
+!include LogicLib.nsh
+!endif
+!insertmacro _LOGICLIB_TEMP
+Exch $2 ; b
+Exch
+Exch $1 ; a
+; if (a == b) return 0;
+; if (a < 0)
+; {
+;   if (b >= 0) return 1
+; }
+; else
+; {
+;   if (b < 0) return -1
+; }
+; return a < b ? -1 : 1
+System::Int64Op $1 ^ $2 ; Using xor so $_LOGICLIB_TEMP ends up as 0 when they are equal
+Pop $_LOGICLIB_TEMP
+StrCmp $_LOGICLIB_TEMP 0 ret ; NOTE: Must use StrCmp, IntCmp fails on "0x8000000000000001 Z> 1"
+System::Int64Op $1 < 0
+Pop $_LOGICLIB_TEMP
+StrCmp $_LOGICLIB_TEMP 0 checkNegOther
+System::Int64Op $2 < 0 ; System::Int64Op does not support the >= operator so we invert the operation
+Pop $_LOGICLIB_TEMP
+StrCmp $_LOGICLIB_TEMP 0 retPos finalCmp
+retPos:
+StrCpy $_LOGICLIB_TEMP "1"
+Goto ret
+checkNegOther:
+System::Int64Op $2 < 0
+Pop $_LOGICLIB_TEMP
+StrCmp $_LOGICLIB_TEMP 0 finalCmp retNeg
+retNeg:
+StrCpy $_LOGICLIB_TEMP "-1"
+Goto ret
+finalCmp:
+System::Int64Op $1 < $2
+Pop $_LOGICLIB_TEMP
+StrCmp $_LOGICLIB_TEMP 0 retPos retNeg
+ret:
+Pop $1
+Pop $2
+!macroend
+!macro Int64CmpU a b jeek jles jgtr
+!if ${NSIS_PTR_SIZE} <= 4
+!echo "Int64CmpU ${a}:${b} =${jeek}, <${jles}, >${jgtr}"
+!verbose push 2
+Push `${a}`
+Push `${b}`
+!insertmacro CallArtificialFunction Int64CmpUHelper
+IntCmp $_LOGICLIB_TEMP 0 `${jeek}` `${jles}` `${jgtr}`
+!verbose pop
+!else
+Int64CmpU `${a}` `${b}` `${jeek}` `${jles}` `${jgtr}`
+!endif
+!macroend
+!macro IntPtrCmpU a b jeek jles jgtr
+IntPtrCmpU `${a}` `${b}` `${jeek}` `${jles}` `${jgtr}`
+!macroend
+
+
+!define MakeARPInstallDate "!insertmacro MakeARPInstallDate "
+!macro MakeARPInstallDate _outvar
+System::Call 'KERNEL32::GetDateFormat(i0x409,i0,p0,t"yyyyMMdd",t.s,i${NSIS_MAX_STRLEN})'
+Pop ${_outvar}
+!macroend
+
+
+!define /IfNDef SPI_GETHIGHCONTRAST 0x42
+!define /IfNDef HCF_HIGHCONTRASTON 0x01
+!define /IfNDef /math SYSSIZEOF_HIGHCONTRAST 8 + ${NSIS_PTR_SIZE}
+!define IsHighContrastModeActive '"" IsHighContrastModeActive ""'
+!macro _IsHighContrastModeActive _lhs _rhs _t _f
+!ifmacrondef _LOGICLIB_TEMP
+!include LogicLib.nsh
+!endif
+!insertmacro _LOGICLIB_TEMP
+Push $1
+System::Call '*(i${SYSSIZEOF_HIGHCONTRAST},i0,p)p.r1'
+System::Call 'USER32::SystemParametersInfo(i${SPI_GETHIGHCONTRAST},i${SYSSIZEOF_HIGHCONTRAST},pr1,i0)'
+System::Call '*$1(i,i.s)'
+Pop $_LOGICLIB_TEMP
+System::Free $1
+Pop $1
+!insertmacro _& $_LOGICLIB_TEMP ${HCF_HIGHCONTRASTON} `${_t}` `${_f}`
+!macroend
+
+
+!endif # !___UTIL__NSH___
+!verbose pop
Index: tmp/org.txm.setups/nsis/Include/x64.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/x64.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/x64.nsh	(revision 2956)
@@ -4,20 +4,42 @@
 ;
 ; A few simple macros to handle installations on x64 machines.
 ;
-; RunningX64 checks if the installer is running on x64.
+; RunningX64 checks if the installer is running on a 64-bit OS.
+; IsWow64 checks if the installer is a 32-bit application running on a 64-bit OS.
 ;
 ;   ${If} ${RunningX64}
-;     MessageBox MB_OK "running on x64"
+;     MessageBox MB_OK "Running on 64-bit Windows"
 ;   ${EndIf}
 ;
+; IsNative* checks the OS native CPU architecture.
+;
+;   ${If} ${IsNativeAMD64}
+;     ; Install AMD64 64-bit driver/library
+;   ${ElseIf} ${IsNativeARM64}
+;     ; Install ARM64 64-bit driver/library
+;   ${ElseIf} ${IsNativeIA32}
+;     ; Install i386 32-bit driver/library
+;   ${Else}
+;     Abort "Unsupported CPU architecture!"
+;   ${EndIf}
+;
+;   ${If} ${IsNativeAMD64}
+;       File "amd64\myapp.exe"
+;   ${ElseIf} ${IsNativeIA32}
+;   ${OrIf} ${IsWow64}
+;       File "x86\myapp.exe"
+;   ${Else}
+;       Abort "Unsupported CPU architecture!"
+;   ${EndIf}
+;
 ; DisableX64FSRedirection disables file system redirection.
 ; EnableX64FSRedirection enables file system redirection.
 ;
 ;   SetOutPath $SYSDIR
 ;   ${DisableX64FSRedirection}
-;   File some.dll # extracts to C:\Windows\System32
+;   File something.bin # extracts to C:\Windows\System32
 ;   ${EnableX64FSRedirection}
-;   File some.dll # extracts to C:\Windows\SysWOW64
+;   File something.bin # extracts to C:\Windows\SysWOW64
 ;
 
 !ifndef ___X64__NSH___
@@ -25,30 +47,74 @@
 
 !include LogicLib.nsh
 
-!macro _RunningX64 _a _b _t _f
+
+!define IsWow64 `"" IsWow64 ""`
+!macro _IsWow64 _a _b _t _f
   !insertmacro _LOGICLIB_TEMP
-  System::Call kernel32::GetCurrentProcess()i.s
-  System::Call kernel32::IsWow64Process(is,*i.s)
+  System::Call kernel32::GetCurrentProcess()p.s
+  System::Call kernel32::IsWow64Process2(ps,*i0s,*i) ; [Win10.1511+] 0 if not WOW64
+  Push |
+  System::Call kernel32::IsWow64Process(p-1,*i0s) ; [WinXP+] FALSE for a 32-bit application on ARM64!
+  System::Int64Op
   Pop $_LOGICLIB_TEMP
   !insertmacro _!= $_LOGICLIB_TEMP 0 `${_t}` `${_f}`
 !macroend
 
+
 !define RunningX64 `"" RunningX64 ""`
+!macro _RunningX64 _a _b _t _f 
+  !if ${NSIS_PTR_SIZE} > 4
+    !insertmacro LogicLib_JumpToBranch `${_t}` `${_f}`
+  !else
+    !insertmacro _IsWow64 `${_a}` `${_b}` `${_t}` `${_f}`
+  !endif
+!macroend
 
-!macro DisableX64FSRedirection
 
-  System::Call kernel32::Wow64EnableWow64FsRedirection(i0)
+!define GetNativeMachineArchitecture "!insertmacro GetNativeMachineArchitecture "
+!macro GetNativeMachineArchitecture outvar
+  !define GetNativeMachineArchitecture_lbl lbl_GNMA_${__COUNTER__}
+  System::Call kernel32::GetCurrentProcess()p.s
+  System::Call kernel32::IsWow64Process2(ps,*i,*i0s)
+  Pop ${outvar}
+  IntCmp ${outvar} 0 "" ${GetNativeMachineArchitecture_lbl}_done ${GetNativeMachineArchitecture_lbl}_done
+    !if "${NSIS_PTR_SIZE}" <= 4
+    !if "${NSIS_CHAR_SIZE}" <= 1
+    System::Call 'USER32::CharNextW(w"")p.s'
+    Pop ${outvar}
+    IntPtrCmpU ${outvar} 0 "" ${GetNativeMachineArchitecture_lbl}_oldnt ${GetNativeMachineArchitecture_lbl}_oldnt
+      StrCpy ${outvar} 332 ; Always IMAGE_FILE_MACHINE_I386 on Win9x
+      Goto ${GetNativeMachineArchitecture_lbl}_done
+    ${GetNativeMachineArchitecture_lbl}_oldnt:
+    !endif
+    !endif
+    System::Call '*0x7FFE002E(&i2.s)'
+    Pop ${outvar}
+  ${GetNativeMachineArchitecture_lbl}_done:
+  !undef GetNativeMachineArchitecture_lbl
+!macroend
 
+!macro _IsNativeMachineArchitecture _ignore _arc _t _f
+  !insertmacro _LOGICLIB_TEMP
+  ${GetNativeMachineArchitecture} $_LOGICLIB_TEMP
+  !insertmacro _= $_LOGICLIB_TEMP ${_arc} `${_t}` `${_f}`
 !macroend
 
+!define IsNativeMachineArchitecture `"" IsNativeMachineArchitecture `
+!define IsNativeIA32 '${IsNativeMachineArchitecture} 332' ; Intel x86
+!define IsNativeAMD64 '${IsNativeMachineArchitecture} 34404' ; x86-64/x64
+!define IsNativeARM64 '${IsNativeMachineArchitecture} 43620'
+
+
 !define DisableX64FSRedirection "!insertmacro DisableX64FSRedirection"
+!macro DisableX64FSRedirection
+  System::Call kernel32::Wow64EnableWow64FsRedirection(i0)
+!macroend
 
+!define EnableX64FSRedirection "!insertmacro EnableX64FSRedirection"
 !macro EnableX64FSRedirection
-
   System::Call kernel32::Wow64EnableWow64FsRedirection(i1)
-
 !macroend
 
-!define EnableX64FSRedirection "!insertmacro EnableX64FSRedirection"
 
 !endif # !___X64__NSH___
Index: tmp/org.txm.setups/nsis/Include/LangFile.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/LangFile.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/LangFile.nsh	(revision 2956)
@@ -2,27 +2,50 @@
 
 LangFile.nsh
 
-Header file to create langauge files that can be
+Header file to create language files that can be
 included with a single command.
 
-Copyright 2008-2015 Joost Verburg
+Copyright 2008-2020 Joost Verburg, Anders Kjersem
 
 * Either LANGFILE_INCLUDE or LANGFILE_INCLUDE_WITHDEFAULT
-  can be called from the script to include a language
-  file.
+  can be called from the script to include a language file.
 
   - LANGFILE_INCLUDE takes the language file name as parameter.
   - LANGFILE_INCLUDE_WITHDEFAULT takes as additional second
-    parameter the default language file to load missing strings
-    from.
+    parameter, the default language file to load missing strings from.
 
-* A language file start with:
-  !insertmacro LANGFILE_EXT "English"
-  using the same name as the standard NSIS language file.
-
 * Language strings in the language file have the format:
   ${LangFileString} LANGSTRING_NAME "Text"
 
+* There are two types of language header files:
+
+  - NSIS multi-lang support; these must start with the LANGFILE macro and 
+    provide strings for features like MUI and MultiUser. If you are adding 
+    support for a new language to NSIS you should make a copy of English.nsh 
+    and translate this .nsh along with the .nlf.
+  - Custom installer strings; these must start with the LANGFILE_EXT macro and 
+    contain translated versions of 
+    custom strings used in a particular installer.
+    This is useful if you want to put the translations for each language in 
+    their own separate file.
+
+* Example:
+
+  ; Setup.nsi
+  !include "MUI.nsh"
+  !insertmacro MUI_PAGE_INSTFILES
+  !insertmacro MUI_LANGUAGE "Danish"
+  !insertmacro LANGFILE_INCLUDE "DanishExtra.nsh"
+  !insertmacro MUI_LANGUAGE "Swedish"
+  !insertmacro LANGFILE_INCLUDE "SwedishExtra.nsh"
+  Section
+  MessageBox MB_OK "$(myCustomString)"
+  SectionEnd
+
+  ; SwedishExtra.nsh
+  !insertmacro LANGFILE_EXT Swedish
+  ${LangFileString} myCustomString "Bork bork"
+
 */
 
 !ifndef LANGFILE_INCLUDED
@@ -30,7 +53,7 @@
 
 !macro LANGFILE_INCLUDE FILENAME
 
-  ;Called from script: include a langauge file
+  ;Called from script: include a language file
 
   !ifdef LangFileString
     !undef LangFileString
@@ -43,16 +66,14 @@
   !undef LANGFILE_SETNAMES
 
   ;Create language strings
-
-  !undef LangFileString
-  !define LangFileString "!insertmacro LANGFILE_LANGSTRING"
+  !define /redef LangFileString "!insertmacro LANGFILE_LANGSTRING"
   !include "${FILENAME}"
 
 !macroend
 
 !macro LANGFILE_INCLUDE_WITHDEFAULT FILENAME FILENAME_DEFAULT
 
-  ;Called from script: include a langauge file
+  ;Called from script: include a language file
   ;Obtains missing strings from a default file
 
   !ifdef LangFileString
@@ -66,31 +87,65 @@
   !undef LANGFILE_SETNAMES
 
   ;Include default language for missing strings
+  !define LANGFILE_PRIV_INCLUDEISFALLBACK "${FILENAME_DEFAULT}"
   !include "${FILENAME_DEFAULT}"
-  
+  !undef LANGFILE_PRIV_INCLUDEISFALLBACK
+
   ;Create language strings
-  !undef LangFileString
-  !define LangFileString "!insertmacro LANGFILE_LANGSTRING"
+  !define /redef LangFileString "!insertmacro LANGFILE_LANGSTRING"
   !include "${FILENAME_DEFAULT}"
 
 !macroend
 
-!macro LANGFILE IDNAME NAME
+!macro LANGFILE NLFID ENGNAME NATIVENAME NATIVEASCIINAME
 
   ;Start of standard NSIS language file
 
+  ; NLFID: Must match the name of the .nlf file
+  ; ENGNAME: English name of language, "=" if it is the same as NLFID
+  ; NATIVENAME: Native name of language. (In Unicode)
+  ; NATIVEASCIINAME: Native name of language using only ASCII, "=" if it is the same as NATIVENAME
+
+  ; Example: LANGFILE "Swedish" = "Svenska" = (This is the same as LANGFILE "Swedish" "Swedish" "Svenska" "Svenska")
+  ; For more examples, see French.nsh, Greek.nsh and PortugueseBR.nsh
+
   !ifdef LANGFILE_SETNAMES
 
     !ifdef LANGFILE_IDNAME
       !undef LANGFILE_IDNAME
     !endif
 
-    !define LANGFILE_IDNAME "${IDNAME}"
+    !define LANGFILE_IDNAME "${NLFID}"
 
-    !ifndef "LANGFILE_${IDNAME}_NAME"
-      !define "LANGFILE_${IDNAME}_NAME" "${NAME}"
+    ; ModernUI or the .nsi can change LANGFILE_LANGDLL_FMT if desired
+    !ifndef LANGFILE_LANGDLL_FMT
+      !ifndef NSIS_UNICODE
+        !define LANGFILE_LANGDLL_FMT "%ENGNAME% / %NATIVEASCIINAME%"
+      !endif
+      !define /ifndef LANGFILE_LANGDLL_FMT "%NATIVENAME%"
     !endif
 
+    !ifndef "LANGFILE_${NLFID}_NAME"
+      !if "${ENGNAME}" == "="
+        !define /redef ENGNAME "${NLFID}"
+      !endif
+      !if "${NATIVEASCIINAME}" == "="
+        !define /redef NATIVEASCIINAME "${NATIVENAME}"
+      !endif
+
+      !define "LANGFILE_${NLFID}_ENGLISHNAME" "${ENGNAME}"
+      !ifdef NSIS_UNICODE
+        !define "LANGFILE_${NLFID}_NAME" "${NATIVENAME}"
+      !else
+        !define "LANGFILE_${NLFID}_NAME" "${NATIVEASCIINAME}"
+      !endif
+
+      !searchreplace LANGFILE_${NLFID}_LANGDLL "${LANGFILE_LANGDLL_FMT}" %NATIVEASCIINAME% "${NATIVEASCIINAME}"
+      !searchreplace LANGFILE_${NLFID}_LANGDLL "${LANGFILE_${NLFID}_LANGDLL}" %NATIVENAME% "${NATIVENAME}"
+      !searchreplace LANGFILE_${NLFID}_LANGDLL "${LANGFILE_${NLFID}_LANGDLL}" %ENGNAME% "${ENGNAME}"
+
+    !endif
+
   !endif
 
 !macroend
@@ -117,6 +172,9 @@
 
   !ifndef ${NAME}
     !define "${NAME}" "${VALUE}"
+    !ifdef LANGFILE_PRIV_INCLUDEISFALLBACK
+      !warning 'LangString "${NAME}" for language ${LANGFILE_IDNAME} is missing, using fallback from "${LANGFILE_PRIV_INCLUDEISFALLBACK}"'
+    !endif
   !endif
 
 !macroend
Index: tmp/org.txm.setups/nsis/Include/InstallOptions.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/InstallOptions.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/InstallOptions.nsh	(revision 2956)
@@ -125,16 +125,20 @@
 
   InitPluginsDir
   File "/oname=$PLUGINSDIR\${FILE}" "${FILE}"
+!ifdef NSIS_UNICODE
+  InstallOptions::make_unicode "$PLUGINSDIR\${FILE}"
+!endif
   !insertmacro INSTALLOPTIONS_WRITE "${FILE}" "Settings" "RTL" "$(^RTL)"
 
-  !verbose pop
-
 !macroend
 
 !macro INSTALLOPTIONS_EXTRACT_AS FILE FILENAME
 
   InitPluginsDir
   File "/oname=$PLUGINSDIR\${FILENAME}" "${FILE}"
+!ifdef NSIS_UNICODE
+  InstallOptions::make_unicode "$PLUGINSDIR\${FILENAME}"
+!endif
   !insertmacro INSTALLOPTIONS_WRITE "${FILENAME}" "Settings" "RTL" "$(^RTL)"
 
 !macroend
Index: tmp/org.txm.setups/nsis/Include/nsDialogs.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/nsDialogs.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/nsDialogs.nsh	(revision 2956)
@@ -6,43 +6,43 @@
 */
 
 !ifndef NSDIALOGS_INCLUDED
+!verbose push 2
 !define NSDIALOGS_INCLUDED
-!verbose push
 !verbose 3
 
 !include LogicLib.nsh
 !include WinMessages.nsh
 
-!define WS_EX_DLGMODALFRAME  0x00000001
-!define WS_EX_NOPARENTNOTIFY 0x00000004
-!define WS_EX_TOPMOST        0x00000008
-!define WS_EX_ACCEPTFILES    0x00000010
-!define WS_EX_TRANSPARENT    0x00000020
-!define WS_EX_MDICHILD       0x00000040
-!define WS_EX_TOOLWINDOW     0x00000080
-!define WS_EX_WINDOWEDGE     0x00000100
-!define WS_EX_CLIENTEDGE     0x00000200
-!define WS_EX_CONTEXTHELP    0x00000400
-!define WS_EX_RIGHT          0x00001000
-!define WS_EX_LEFT           0x00000000
-!define WS_EX_RTLREADING     0x00002000
-!define WS_EX_LTRREADING     0x00000000
-!define WS_EX_LEFTSCROLLBAR  0x00004000
-!define WS_EX_RIGHTSCROLLBAR 0x00000000
-!define WS_EX_CONTROLPARENT  0x00010000
-!define WS_EX_STATICEDGE     0x00020000
-!define WS_EX_APPWINDOW      0x00040000
+!define /ifndef WS_EX_DLGMODALFRAME  0x00000001
+!define /ifndef WS_EX_NOPARENTNOTIFY 0x00000004
+!define /ifndef WS_EX_TOPMOST        0x00000008
+!define /ifndef WS_EX_ACCEPTFILES    0x00000010
+!define /ifndef WS_EX_TRANSPARENT    0x00000020
+!define /ifndef WS_EX_MDICHILD       0x00000040
+!define /ifndef WS_EX_TOOLWINDOW     0x00000080
+!define /ifndef WS_EX_WINDOWEDGE     0x00000100
+!define /ifndef WS_EX_CLIENTEDGE     0x00000200
+!define /ifndef WS_EX_CONTEXTHELP    0x00000400
+!define /ifndef WS_EX_RIGHT          0x00001000
+!define /ifndef WS_EX_LEFT           0x00000000
+!define /ifndef WS_EX_RTLREADING     0x00002000
+!define /ifndef WS_EX_LTRREADING     0x00000000
+!define /ifndef WS_EX_LEFTSCROLLBAR  0x00004000
+!define /ifndef WS_EX_RIGHTSCROLLBAR 0x00000000
+!define /ifndef WS_EX_CONTROLPARENT  0x00010000
+!define /ifndef WS_EX_STATICEDGE     0x00020000
+!define /ifndef WS_EX_APPWINDOW      0x00040000
 
-!define WS_CHILD             0x40000000
-!define WS_VISIBLE           0x10000000
-!define WS_DISABLED          0x08000000
-!define WS_CLIPSIBLINGS      0x04000000
-!define WS_CLIPCHILDREN      0x02000000
-!define WS_MAXIMIZE          0x01000000
-!define WS_VSCROLL           0x00200000
-!define WS_HSCROLL           0x00100000
-!define WS_GROUP             0x00020000
-!define WS_TABSTOP           0x00010000
+!define /ifndef WS_CHILD             0x40000000
+!define /ifndef WS_VISIBLE           0x10000000
+!define /ifndef WS_DISABLED          0x08000000
+!define /ifndef WS_CLIPSIBLINGS      0x04000000
+!define /ifndef WS_CLIPCHILDREN      0x02000000
+!define /ifndef WS_MAXIMIZE          0x01000000
+!define /ifndef WS_VSCROLL           0x00200000
+!define /ifndef WS_HSCROLL           0x00100000
+!define /ifndef WS_GROUP             0x00020000
+!define /ifndef WS_TABSTOP           0x00010000
 
 !define ES_LEFT              0x00000000
 !define ES_CENTER            0x00000001
@@ -58,6 +58,7 @@
 !define ES_READONLY          0x00000800
 !define ES_WANTRETURN        0x00001000
 !define ES_NUMBER            0x00002000
+!define ES_SAVESEL           0x00008000
 
 !define SS_LEFT              0x00000000
 !define SS_CENTER            0x00000001
@@ -152,28 +153,98 @@
 !define LBS_NOSEL             0x4000
 !define LBS_COMBOBOX          0x8000
 
-!define LR_DEFAULTCOLOR     0x0000
-!define LR_MONOCHROME       0x0001
-!define LR_COLOR            0x0002
-!define LR_COPYRETURNORG    0x0004
-!define LR_COPYDELETEORG    0x0008
-!define LR_LOADFROMFILE     0x0010
-!define LR_LOADTRANSPARENT  0x0020
-!define LR_DEFAULTSIZE      0x0040
-!define LR_VGACOLOR         0x0080
-!define LR_LOADMAP3DCOLORS  0x1000
-!define LR_CREATEDIBSECTION 0x2000
-!define LR_COPYFROMRESOURCE 0x4000
-!define LR_SHARED           0x8000
+!define ACS_CENTER      0x0001
+!define ACS_TRANSPARENT 0x0002 ;  The parent of the animation control must not have the WS_CLIPCHILDREN style
+!define ACS_AUTOPLAY    0x0004
+!define ACS_TIMER       0x0008 ; < CC6
 
-!define IMAGE_BITMAP        0
-!define IMAGE_ICON          1
-!define IMAGE_CURSOR        2
-!define IMAGE_ENHMETAFILE   3
+!define TBS_AUTOTICKS        0x0001
+!define TBS_VERT             0x0002
+!define TBS_HORZ             0x0000
+!define TBS_TOP              0x0004
+!define TBS_BOTTOM           0x0000
+!define TBS_LEFT             0x0004
+!define TBS_RIGHT            0x0000
+!define TBS_BOTH             0x0008
+!define TBS_NOTICKS          0x0010
+!define TBS_ENABLESELRANGE   0x0020
+!define TBS_FIXEDLENGTH      0x0040
+!define TBS_NOTHUMB          0x0080
+!define TBS_TOOLTIPS         0x0100 ; IE3
+!define TBS_REVERSED         0x0200 ; IE5
+!define TBS_DOWNISLEFT       0x0400 ; _WIN32_IE >= 0x0501
+!define TBS_NOTIFYBEFOREMOVE 0x0800 ; IE6?
+!define TBS_TRANSPARENTBKGND 0x1000 ; Vista
 
-!define GWL_STYLE           -16
-!define GWL_EXSTYLE         -20
+!define UDS_WRAP        0x0001
+!define UDS_SETBUDDYINT 0x0002
+!define UDS_ALIGNRIGHT  0x0004
+!define UDS_ALIGNLEFT   0x0008
+!define UDS_AUTOBUDDY   0x0010
+!define UDS_ARROWKEYS   0x0020
+!define UDS_HORZ        0x0040
+!define UDS_NOTHOUSANDS 0x0080
+!define UDS_HOTTRACK    0x0100 ; 98+
 
+!define MCS_DAYSTATE        0x0001
+!define MCS_MULTISELECT     0x0002
+!define MCS_WEEKNUMBERS     0x0004
+!define MCS_NOTODAYCIRCLE   0x0008
+!define MCS_NOTODAY         0x0010 ; IE4+?
+!define MCS_NOTRAILINGDATES  0x0040 ; Vista+
+!define MCS_SHORTDAYSOFWEEK  0x0080 ; Vista+
+!define MCS_NOSELCHANGEONNAV 0x0100 ; Vista+
+
+!define DTS_UPDOWN          0x01
+!define DTS_SHOWNONE        0x02
+!define DTS_SHORTDATEFORMAT 0x00
+!define DTS_LONGDATEFORMAT  0x04
+!define DTS_SHORTDATECENTURYFORMAT 0x0C
+!define DTS_TIMEFORMAT      0x09
+!define DTS_APPCANPARSE     0x10
+!define DTS_RIGHTALIGN      0x20
+
+!define /ifndef LR_DEFAULTCOLOR     0x0000
+!define /ifndef LR_MONOCHROME       0x0001
+!define /ifndef LR_COLOR            0x0002
+!define /ifndef LR_COPYRETURNORG    0x0004
+!define /ifndef LR_COPYDELETEORG    0x0008
+!define /ifndef LR_LOADFROMFILE     0x0010
+!define /ifndef LR_LOADTRANSPARENT  0x0020
+!define /ifndef LR_DEFAULTSIZE      0x0040
+!define /ifndef LR_VGACOLOR         0x0080
+!define /ifndef LR_LOADMAP3DCOLORS  0x1000
+!define /ifndef LR_CREATEDIBSECTION 0x2000
+!define /ifndef LR_COPYFROMRESOURCE 0x4000
+!define /ifndef LR_SHARED           0x8000
+
+!define /ifndef IMAGE_BITMAP        0
+!define /ifndef IMAGE_ICON          1
+!define /ifndef IMAGE_CURSOR        2
+!define /ifndef IMAGE_ENHMETAFILE   3
+
+!define /ifndef GWL_STYLE           -16
+!define /ifndef GWL_EXSTYLE         -20
+
+#define /ifndef ICC_LISTVIEW_CLASSES 0x0001 ; SysListView32 and SysHeader32
+#define /ifndef ICC_TREEVIEW_CLASSES 0x0002 ; SysTabControl32 and tooltips_class32
+#define /ifndef ICC_BAR_CLASSES      0x0004 ; ToolbarWindow32, msctls_statusbar32, msctls_trackbar32 and tooltips_class32
+#define /ifndef ICC_TAB_CLASSES      0x0008 ; SysTabControl32 and tooltips_class32
+#define /ifndef ICC_UPDOWN_CLASS     0x0010 ; msctls_updown32
+#define /ifndef ICC_PROGRESS_CLASS   0x0020 ; msctls_progress32
+#define /ifndef ICC_HOTKEY_CLASS     0x0040 ; msctls_hotkey32
+#define /ifndef ICC_ANIMATE_CLASS    0x0080 ; SysAnimate32
+#define /ifndef ICC_WIN95_CLASSES    0x00FF
+!define /ifndef ICC_DATE_CLASSES     0x0100 ; CC4.70+ (NT4+/IE3.1+/Win95 OSR2) SysDateTimePick32, SysMonthCal32 and CC6.10+(Vista+) DropDown
+!define /ifndef ICC_USEREX_CLASSES   0x0200 ; CC4.??+ (NT4+/IE3.?+/Win95 OSR2) ComboBoxEx32
+!define /ifndef ICC_COOL_CLASSES     0x0400 ; CC4.70+ (NT4+/IE3.1+/Win95 OSR2) ReBarWindow32
+!define /ifndef ICC_INTERNET_CLASSES 0x0800 ; CC4.71+ (IE4+) SysIPAddress32
+!define /ifndef ICC_PAGESCROLLER_CLASS 0x1000 ; CC4.71+ (IE4+) SysPager
+!define /ifndef ICC_NATIVEFNTCTL_CLASS 0x2000 ; CC4.71+ (IE4+) NativeFontCtl
+!define /ifndef ICC_STANDARD_CLASSES 0x4000 ; WinXP+ Button, Static, Edit, ListBox, ComboBox, ComboLBox, ScrollBar and ReaderModeCtl
+!define /ifndef ICC_LINK_CLASS       0x8000 ; WinXP+ SysLink
+
+
 !define DEFAULT_STYLES ${WS_CHILD}|${WS_VISIBLE}|${WS_CLIPSIBLINGS}
 
 !define __NSD_HLine_CLASS STATIC
@@ -224,6 +295,10 @@
 !define __NSD_Text_STYLE ${DEFAULT_STYLES}|${WS_TABSTOP}|${ES_AUTOHSCROLL}
 !define __NSD_Text_EXSTYLE ${WS_EX_WINDOWEDGE}|${WS_EX_CLIENTEDGE}
 
+!define __NSD_MLText_CLASS EDIT
+!define __NSD_MLText_STYLE ${DEFAULT_STYLES}|${WS_TABSTOP}|${ES_AUTOHSCROLL}|${ES_AUTOVSCROLL}|${ES_MULTILINE}|${ES_WANTRETURN}|${WS_HSCROLL}|${WS_VSCROLL}
+!define __NSD_MLText_EXSTYLE ${WS_EX_WINDOWEDGE}|${WS_EX_CLIENTEDGE}
+
 !define __NSD_Password_CLASS EDIT
 !define __NSD_Password_STYLE ${DEFAULT_STYLES}|${WS_TABSTOP}|${ES_AUTOHSCROLL}|${ES_PASSWORD}
 !define __NSD_Password_EXSTYLE ${WS_EX_WINDOWEDGE}|${WS_EX_CLIENTEDGE}
@@ -240,6 +315,18 @@
 !define __NSD_DirRequest_STYLE ${DEFAULT_STYLES}|${WS_TABSTOP}|${ES_AUTOHSCROLL}
 !define __NSD_DirRequest_EXSTYLE ${WS_EX_WINDOWEDGE}|${WS_EX_CLIENTEDGE}
 
+!define __NSD_RichEdit_CLASS_10  "RICHEDIT"    ; 1.0 (Riched32.dll) Win95/NT4
+!define __NSD_RichEdit_CLASS_20A "RICHEDIT20A" ; 2.0 (Riched20.dll) Win98/NT4 (NSIS makes sure this is registered even on Windows 95)
+!define __NSD_RichEdit_CLASS_20W "RICHEDIT20W"
+!define __NSD_RichEdit_CLASS_41W "RICHEDIT50W" ; 4.1 (MsftEdit.DLL) WinXP.SP1
+!ifdef NSIS_UNICODE
+!define /ifndef __NSD_RichEdit_CLASS ${__NSD_RichEdit_CLASS_20W}
+!else
+!define /ifndef __NSD_RichEdit_CLASS ${__NSD_RichEdit_CLASS_20A}
+!endif
+!define __NSD_RichEdit_STYLE ${DEFAULT_STYLES}|${WS_TABSTOP}|${ES_AUTOHSCROLL}|${ES_AUTOVSCROLL}|${ES_MULTILINE}|${ES_WANTRETURN}|${ES_SAVESEL}|${WS_HSCROLL}|${WS_VSCROLL}
+!define __NSD_RichEdit_EXSTYLE ${WS_EX_WINDOWEDGE}|${WS_EX_CLIENTEDGE}
+
 !define __NSD_ComboBox_CLASS COMBOBOX
 !define __NSD_ComboBox_STYLE ${DEFAULT_STYLES}|${WS_TABSTOP}|${WS_VSCROLL}|${WS_CLIPCHILDREN}|${CBS_AUTOHSCROLL}|${CBS_HASSTRINGS}|${CBS_DROPDOWN}
 !define __NSD_ComboBox_EXSTYLE ${WS_EX_WINDOWEDGE}|${WS_EX_CLIENTEDGE}
@@ -252,16 +339,62 @@
 !define __NSD_ListBox_STYLE ${DEFAULT_STYLES}|${WS_TABSTOP}|${WS_VSCROLL}|${LBS_DISABLENOSCROLL}|${LBS_HASSTRINGS}|${LBS_NOINTEGRALHEIGHT}|${LBS_NOTIFY}
 !define __NSD_ListBox_EXSTYLE ${WS_EX_WINDOWEDGE}|${WS_EX_CLIENTEDGE}
 
+!define __NSD_SortedListBox_CLASS LISTBOX
+!define __NSD_SortedListBox_STYLE ${__NSD_ListBox_STYLE}|${LBS_SORT}
+!define __NSD_SortedListBox_EXSTYLE ${__NSD_ListBox_EXSTYLE}
+
 !define __NSD_ProgressBar_CLASS msctls_progress32
 !define __NSD_ProgressBar_STYLE ${DEFAULT_STYLES}
 !define __NSD_ProgressBar_EXSTYLE ${WS_EX_WINDOWEDGE}|${WS_EX_CLIENTEDGE}
 
+!define __NSD_Animation_CLASS SysAnimate32
+!define __NSD_Animation_STYLE ${DEFAULT_STYLES}|${ACS_TRANSPARENT}|${ACS_AUTOPLAY}
+!define __NSD_Animation_EXSTYLE 0
+
+!define __NSD_HTrackBar_CLASS msctls_trackbar32
+!define __NSD_HTrackBar_STYLE ${DEFAULT_STYLES}|${TBS_HORZ}|${TBS_AUTOTICKS}|${TBS_TOOLTIPS}
+!define __NSD_HTrackBar_EXSTYLE 0
+
+!define __NSD_VTrackBar_CLASS msctls_trackbar32
+!define __NSD_VTrackBar_STYLE ${DEFAULT_STYLES}|${TBS_VERT}|${TBS_AUTOTICKS}|${TBS_TOOLTIPS}
+!define __NSD_VTrackBar_EXSTYLE 0
+
+!define __NSD_UpDown_CLASS msctls_updown32
+!define __NSD_UpDown_STYLE ${DEFAULT_STYLES}|${UDS_SETBUDDYINT}|${UDS_ARROWKEYS}|${UDS_NOTHOUSANDS}|${UDS_ALIGNRIGHT}
+!define __NSD_UpDown_EXSTYLE 0
+
+!define __NSD_AutoUpDown_CLASS msctls_updown32
+!define __NSD_AutoUpDown_STYLE ${__NSD_UpDown_STYLE}|${UDS_AUTOBUDDY}
+!define __NSD_AutoUpDown_EXSTYLE ${__NSD_UpDown_EXSTYLE}
+
+!define __NSD_HotKey_CLASS msctls_hotkey32
+!define __NSD_HotKey_STYLE ${DEFAULT_STYLES}
+!define __NSD_HotKey_EXSTYLE ${WS_EX_WINDOWEDGE}|${WS_EX_CLIENTEDGE}
+
+!define __NSD_Calendar_CLASS SysMonthCal32
+!define __NSD_Calendar_STYLE ${DEFAULT_STYLES}|${WS_TABSTOP}
+!define __NSD_Calendar_EXSTYLE 0
+
+!define __NSD_DatePicker_CLASS SysDateTimePick32
+!define __NSD_DatePicker_STYLE ${DEFAULT_STYLES}|${WS_TABSTOP}
+!define __NSD_DatePicker_EXSTYLE ${WS_EX_WINDOWEDGE}|${WS_EX_CLIENTEDGE}
+
+!define __NSD_TimePicker_CLASS SysDateTimePick32
+!define __NSD_TimePicker_STYLE ${DEFAULT_STYLES}|${WS_TABSTOP}|${DTS_TIMEFORMAT}
+!define __NSD_TimePicker_EXSTYLE ${WS_EX_WINDOWEDGE}|${WS_EX_CLIENTEDGE}
+
+!define __NSD_IPAddress_CLASS SysIPAddress32 ; IE4+/CC4.71+
+!define __NSD_IPAddress_STYLE ${DEFAULT_STYLES}|${WS_TABSTOP}
+!define __NSD_IPAddress_EXSTYLE 0
+
+!define __NSD_NetAddress_CLASS msctls_netaddress ; Vista+
+!define __NSD_NetAddress_STYLE ${DEFAULT_STYLES}|${WS_TABSTOP}
+!define __NSD_NetAddress_EXSTYLE ${WS_EX_WINDOWEDGE}|${WS_EX_CLIENTEDGE}
+
+
 !macro __NSD_DefineControl NAME
-
 	!define NSD_Create${NAME} "nsDialogs::CreateControl ${__NSD_${Name}_CLASS} ${__NSD_${Name}_STYLE} ${__NSD_${Name}_EXSTYLE}"
-
 !macroend
-
 !insertmacro __NSD_DefineControl HLine
 !insertmacro __NSD_DefineControl VLine
 !insertmacro __NSD_DefineControl Label
@@ -274,17 +407,31 @@
 !insertmacro __NSD_DefineControl CheckBox
 !insertmacro __NSD_DefineControl RadioButton
 !insertmacro __NSD_DefineControl Text
+!insertmacro __NSD_DefineControl MLText
 !insertmacro __NSD_DefineControl Password
 !insertmacro __NSD_DefineControl Number
 !insertmacro __NSD_DefineControl FileRequest
 !insertmacro __NSD_DefineControl DirRequest
+!insertmacro __NSD_DefineControl RichEdit
 !insertmacro __NSD_DefineControl ComboBox
 !insertmacro __NSD_DefineControl DropList
 !insertmacro __NSD_DefineControl ListBox
+!insertmacro __NSD_DefineControl SortedListBox
 !insertmacro __NSD_DefineControl ProgressBar
+!insertmacro __NSD_DefineControl Animation
+!insertmacro __NSD_DefineControl HTrackBar
+!insertmacro __NSD_DefineControl VTrackBar
+!insertmacro __NSD_DefineControl UpDown
+!insertmacro __NSD_DefineControl AutoUpDown
+!insertmacro __NSD_DefineControl HotKey
+!insertmacro __NSD_DefineControl Calendar
+!insertmacro __NSD_DefineControl DatePicker
+!insertmacro __NSD_DefineControl TimePicker
+!insertmacro __NSD_DefineControl IPAddress
+!insertmacro __NSD_DefineControl NetAddress
 
+
 !macro __NSD_OnControlEvent EVENT HWND FUNCTION
-
 	Push $0
 	Push $1
 
@@ -295,358 +442,587 @@
 
 	Pop $1
 	Pop $0
-
 !macroend
 
 !macro __NSD_DefineControlCallback EVENT
-
-	!define NSD_On${EVENT} `!insertmacro __NSD_OnControlEvent ${EVENT}`
-
+	!define NSD_On${EVENT} `!insertmacro __NSD_OnControlEvent ${EVENT} `
 !macroend
 
 !macro __NSD_OnDialogEvent EVENT FUNCTION
-
 	Push $0
 
 	GetFunctionAddress $0 "${FUNCTION}"
 	nsDialogs::On${EVENT} $0
 
 	Pop $0
-
 !macroend
 
 !macro __NSD_DefineDialogCallback EVENT
-
-	!define NSD_On${EVENT} `!insertmacro __NSD_OnDialogEvent ${EVENT}`
-
+	!define NSD_On${EVENT} `!insertmacro __NSD_OnDialogEvent ${EVENT} `
 !macroend
-
 !insertmacro __NSD_DefineControlCallback Click
 !insertmacro __NSD_DefineControlCallback Change
 !insertmacro __NSD_DefineControlCallback Notify
 !insertmacro __NSD_DefineDialogCallback Back
 
+!define NSD_Return "!insertmacro NSD_Return "
+!macro NSD_Return val
+StrCpy $_OUTDIR ${val}
+SetSilent silent
+Return
+!macroend
+
+
+!define __NSD_MkCtlCmd "!insertmacro __NSD_MkCtlCmd "
+!macro __NSD_MkCtlCmd msg wp lp hCtl
+SendMessage ${hCtl} ${${msg}} ${wp} ${lp}
+!macroend
+!define __NSD_MkCtlCmd_WP "!insertmacro __NSD_MkCtlCmd_WP "
+!macro __NSD_MkCtlCmd_WP msg lp hCtl wp
+SendMessage ${hCtl} ${${msg}} ${wp} ${lp}
+!macroend
+!define __NSD_MkCtlCmd_LP "!insertmacro __NSD_MkCtlCmd_LP "
+!macro __NSD_MkCtlCmd_LP msg wp hCtl lp
+SendMessage ${hCtl} ${${msg}} ${wp} ${lp}
+!macroend
+!define __NSD_MkCtlCmd_WPLP "!insertmacro __NSD_MkCtlCmd_WPLP "
+!macro __NSD_MkCtlCmd_WPLP msg hCtl wp lp
+SendMessage ${hCtl} ${${msg}} ${wp} ${lp}
+!macroend
+!define __NSD_MkCtlCmd_RV "!insertmacro __NSD_MkCtlCmd_RV "
+!macro __NSD_MkCtlCmd_RV msg wp lp hCtl VAR
+SendMessage ${hCtl} ${${msg}} ${wp} ${lp} ${VAR}
+!macroend
+
+
+!define NSD_InitCommonControlsEx "!insertmacro __NSD_InitCommonControlsEx "
+!macro __NSD_InitCommonControlsEx ICC
+!pragma warning push
+!pragma warning disable 7070 ; Invalid number
+!if ${ICC} <> 0
+!define /ReDef /IntFmt NSD_InitCommonControlsEx_TEMP "0x%X" ${ICC}
+System::Call 'COMCTL32::InitCommonControlsEx(*l${NSD_InitCommonControlsEx_TEMP}00000008)'
+!undef NSD_InitCommonControlsEx_TEMP
+!else
+System::Int64Op ${ICC} << 32
+System::Int64Op 8 | 
+System::Call 'COMCTL32::InitCommonControlsEx(*ls)' ; INITCOMMONCONTROLSEX as UINT64
+!endif
+!pragma warning pop
+!macroend
+!define NSD_InitCommonControl_IPAddress `${NSD_InitCommonControlsEx} ${ICC_INTERNET_CLASSES}`
+!define NSD_InitCommonControl_NetAddress `System::Call SHELL32::InitNetworkAddressControl()i`
+!define NSD_InitCommonControl_SysLink `${NSD_InitCommonControlsEx} ${ICC_LINK_CLASS}`
+
+
+!define NSD_CreateTimer `!insertmacro _NSD_CreateTimer `
 !macro _NSD_CreateTimer FUNCTION INTERVAL
-
 	Push $0
 
 	GetFunctionAddress $0 "${FUNCTION}"
 	nsDialogs::CreateTimer $0 "${INTERVAL}"
 
 	Pop $0
-
 !macroend
 
-!define NSD_CreateTimer `!insertmacro _NSD_CreateTimer`
 
+!define NSD_KillTimer `!insertmacro _NSD_KillTimer `
 !macro _NSD_KillTimer FUNCTION
-
 	Push $0
 
 	GetFunctionAddress $0 "${FUNCTION}"
 	nsDialogs::KillTimer $0
 
 	Pop $0
+!macroend
 
+
+!define NSD_AddStyle "!insertmacro _NSD_GWLAddFlags ${GWL_STYLE} "
+!define NSD_AddExStyle "!insertmacro _NSD_GWLAddFlags ${GWL_EXSTYLE} "
+!macro _NSD_GWLAddFlags GWL HWND DATA
+	System::Call "user32::GetWindowLong(p${HWND},i${GWL})p.s"
+	System::Int64Op "${DATA}" |
+	System::Call "user32::SetWindowLong(p${HWND},p${GWL},ps)"
 !macroend
 
-!define NSD_KillTimer `!insertmacro _NSD_KillTimer`
+!define NSD_RemoveStyle "!insertmacro _NSD_GWLRemoveFlags ${GWL_STYLE} " 
+!define NSD_RemoveExStyle "!insertmacro _NSD_GWLRemoveFlags ${GWL_EXSTYLE} "
+!macro _NSD_GWLRemoveFlags GWL HWND DATA
+System::Call "user32::GetWindowLong(p${HWND},i${GWL})p.s"
+System::Int64Op "${DATA}" ~ & ; Perform ~ and prepare the stack for &
+System::Int64Op ; Perform &
+System::Call "user32::SetWindowLong(p${HWND},i${GWL},ps)"
+!macroend 
 
-!macro _NSD_AddStyle CONTROL STYLE
+!define NSD_GetStyle "!insertmacro _NSD_GWLGetFlags ${GWL_STYLE} "
+!define NSD_GetExStyle "!insertmacro _NSD_GWLGetFlags ${GWL_EXSTYLE} "
+!macro _NSD_GWLGetFlags GWL HWND RET
+System::Call "user32::GetWindowLong(p${HWND},i${GWL})p.s"
+Pop ${RET}
+!macroend
 
-	Push $0
+!macro __NSD_GetStyleBit GWL BIT HWND RET
+!insertmacro _NSD_GWLGetFlags ${GWL} ${HWND} ${RET}
+IntOp ${RET} ${RET} & ${BIT}
+!macroend
 
-	System::Call "user32::GetWindowLong(i ${CONTROL}, i ${GWL_STYLE}) i .r0"
-	System::Call "user32::SetWindowLong(i ${CONTROL}, i ${GWL_STYLE}, i $0|${STYLE})"
 
-	Pop $0
+!define NSD_SetFocus `!insertmacro __NSD_SetFocus `
+!macro __NSD_SetFocus HWND
+	System::Call "user32::SetFocus(p${HWND})"
+!macroend
 
+
+!define NSD_GetText "!insertmacro __NSD_GetText "
+!macro __NSD_GetText CONTROL VAR
+	System::Call user32::GetWindowText(p${CONTROL},t.s,i${NSIS_MAX_STRLEN})
+	Pop ${VAR}
 !macroend
 
-!define NSD_AddStyle "!insertmacro _NSD_AddStyle"
 
-!macro _NSD_AddExStyle CONTROL EXSTYLE
+!define NSD_SetText "!insertmacro __NSD_SetText "
+!macro __NSD_SetText CONTROL TEXT
+	SendMessage ${CONTROL} ${WM_SETTEXT} 0 `STR:${TEXT}`
+!macroend
 
-	Push $0
 
-	System::Call "user32::GetWindowLong(i ${CONTROL}, i ${GWL_EXSTYLE}) i .r0"
-	System::Call "user32::SetWindowLong(i ${CONTROL}, i ${GWL_EXSTYLE}, i $0|${EXSTYLE})"
+### Edit ###
 
-	Pop $0
+!define NSD_Edit_GetTextLimit `${__NSD_MkCtlCmd_RV} EM_GETLIMITTEXT 0 0 `
+!define NSD_Edit_SetTextLimit `${__NSD_MkCtlCmd_WP} EM_SETLIMITTEXT 0 `
+!define NSD_Edit_SetPasswordChar `${__NSD_MkCtlCmd_WP} EM_SETPASSWORDCHAR 0 `
+!define NSD_Edit_GetReadOnly `!insertmacro __NSD_GetStyleBit ${GWL_STYLE} ${ES_READONLY} ` ; Non-zero if read-only
+!define NSD_Edit_SetReadOnly `${__NSD_MkCtlCmd_WP} EM_SETREADONLY 0 ` ; Toggles the ES_READONLY style
+!define NSD_Edit_GetModify `${__NSD_MkCtlCmd_RV} EM_GETMODIFY 0 0 `
+!define NSD_Edit_SetModify `${__NSD_MkCtlCmd_WP} EM_SETMODIFY 0 `
+!define NSD_Edit_EmptyUndoBuffer `${__NSD_MkCtlCmd} EM_EMPTYUNDOBUFFER 0 0 `
+!define NSD_Edit_CanUndo `${__NSD_MkCtlCmd_RV} EM_CANUNDO 0 0 `
+!define NSD_Edit_ScrollCaret `${__NSD_MkCtlCmd} EM_SCROLLCARET 0 0 `
+!define NSD_Edit_LineScroll `${__NSD_MkCtlCmd_WPLP} EM_LINESCROLL `
+!define NSD_Edit_SetSel `${__NSD_MkCtlCmd_WPLP} EM_SETSEL ` ; WP:Start LP:End
 
+!define NSD_Edit_SetCueBannerText "!insertmacro __NSD_Edit_SetCueBannerText " ; CC6+
+!macro __NSD_Edit_SetCueBannerText CONTROL SHOWWHENFOCUSED TEXT
+!if ${NSIS_CHAR_SIZE} > 1
+	SendMessage ${CONTROL} ${EM_SETCUEBANNER} ${SHOWWHENFOCUSED} `STR:${TEXT}`
+!else
+	System::Call 'USER32::SendMessage(p${CONTROL},i${EM_SETCUEBANNER},p${SHOWWHENFOCUSED},ws)' `${TEXT}` ; Must be PWSTR
+!endif
 !macroend
 
-!define NSD_AddExStyle "!insertmacro _NSD_AddExStyle"
+!define NSD_Edit_GetLineCount `${__NSD_MkCtlCmd_RV} EM_GETLINECOUNT 0 0 `
+!define NSD_Edit_GetLine "!insertmacro __NSD_Edit_GetLine "
+!macro __NSD_Edit_GetLine CONTROL LINEINDEX OUTPUT
+	System::Call '*(&i2 ${NSIS_MAX_STRLEN},&t${NSIS_MAX_STRLEN})p.s'
+	System::Call 'USER32::SendMessage(p${CONTROL},i${EM_GETLINE},p${LINEINDEX},pss)'
+	System::Call 'KERNEL32::lstrcpyn(t.s,pss,i${NSIS_MAX_STRLEN})'
+	Pop ${OUTPUT}
+	System::Free
+!macroend
 
-!macro __NSD_GetText CONTROL VAR
+!define NSD_SetTextLimit `${NSD_Edit_SetTextLimit} ` ; Legacy alias
 
-	System::Call user32::GetWindowText(i${CONTROL},t.s,i${NSIS_MAX_STRLEN})
-	Pop ${VAR}
 
-!macroend
+### RichEdit ###
 
-!define NSD_GetText `!insertmacro __NSD_GetText`
+!define NSD_RichEd_SetTextLimit `${__NSD_MkCtlCmd_LP} EM_EXLIMITTEXT 0 `
+!define NSD_RichEd_GetEventMask `${__NSD_MkCtlCmd_RV} EM_GETEVENTMASK 0 0 `
+!define NSD_RichEd_SetEventMask `${__NSD_MkCtlCmd_LP} EM_SETEVENTMASK 0 ` ; LP:ENM_*
+!define NSD_RichEd_SetSystemBackgroundColor `${__NSD_MkCtlCmd} EM_SETBKGNDCOLOR 1 0 ` ; COLOR_WINDOW
+!define NSD_RichEd_SetCustomBackgroundColor `${__NSD_MkCtlCmd_LP} EM_SETBKGNDCOLOR 0 ` ; LP:COLORREF
+!define NSD_RichEd_SetHideSelection `${__NSD_MkCtlCmd_WP} EM_HIDESELECTION 0 ` ; WP(BOOL):HideSelWithoutFocus (Toggles ES_NOHIDESEL & TXTBIT_HIDESELECTION)
 
-!macro __NSD_SetText CONTROL TEXT
 
-	SendMessage ${CONTROL} ${WM_SETTEXT} 0 `STR:${TEXT}`
+### CheckBox ###
 
+!define NSD_GetState `!insertmacro __NSD_GetState `
+!macro __NSD_GetState CONTROL VAR
+	SendMessage ${CONTROL} ${BM_GETCHECK} 0 0 ${VAR}
 !macroend
 
-!define NSD_SetText `!insertmacro __NSD_SetText`
 
-!macro _NSD_SetTextLimit CONTROL LIMIT
+!define NSD_SetState `!insertmacro __NSD_SetState `
+!macro __NSD_SetState CONTROL STATE
+	SendMessage ${CONTROL} ${BM_SETCHECK} ${STATE} 0
+!macroend
 
-	SendMessage ${CONTROL} ${EM_SETLIMITTEXT} ${LIMIT} 0
+!define NSD_Check `!insertmacro __NSD_Check `
+!macro __NSD_Check CONTROL
+	${NSD_SetState} ${CONTROL} ${BST_CHECKED}
+!macroend
 
+
+!define NSD_Uncheck `!insertmacro __NSD_Uncheck `
+!macro __NSD_Uncheck CONTROL
+	${NSD_SetState} ${CONTROL} ${BST_UNCHECKED}
 !macroend
 
-!define NSD_SetTextLimit "!insertmacro _NSD_SetTextLimit"
+!define NSD_GetChecked `!insertmacro __NSD_GetState `
+!define NSD_SetChecked `!insertmacro __NSD_SetState `
 
-!macro __NSD_GetState CONTROL VAR
 
-	SendMessage ${CONTROL} ${BM_GETCHECK} 0 0 ${VAR}
+### ComboBox ###
 
+!define NSD_CB_AddString "!insertmacro _NSD_CB_AddString "
+!macro _NSD_CB_AddString CONTROL STRING
+	SendMessage ${CONTROL} ${CB_ADDSTRING} 0 `STR:${STRING}`
 !macroend
 
-!define NSD_GetState `!insertmacro __NSD_GetState`
 
-!macro __NSD_SetState CONTROL STATE
+!define NSD_CB_InsertString "!insertmacro _NSD_CB_InsertString "
+!macro _NSD_CB_InsertString CONTROL INDEX STRING
+SendMessage ${CONTROL} ${CB_INSERTSTRING} ${INDEX} `STR:${STRING}`
+!macroend
 
-	SendMessage ${CONTROL} ${BM_SETCHECK} ${STATE} 0
+!define NSD_CB_PrependString "!insertmacro _NSD_CB_PrependString "
+!macro _NSD_CB_PrependString CONTROL STRING
+SendMessage ${CONTROL} ${CB_INSERTSTRING} 0 `STR:${STRING}`
+!macroend
 
+!define NSD_CB_AppendString "!insertmacro _NSD_CB_AppendString "
+!macro _NSD_CB_AppendString CONTROL STRING
+SendMessage ${CONTROL} ${CB_INSERTSTRING} -1 `STR:${STRING}`
 !macroend
 
-!define NSD_SetState `!insertmacro __NSD_SetState`
 
-!macro __NSD_Check CONTROL
+!define NSD_CB_SelectString "!insertmacro _NSD_CB_SelectString "
+!macro _NSD_CB_SelectString CONTROL STRING
+	SendMessage ${CONTROL} ${CB_SELECTSTRING} -1 `STR:${STRING}`
+!macroend
 
-	${NSD_SetState} ${CONTROL} ${BST_CHECKED}
 
+!define NSD_CB_GetSelectionIndex `!insertmacro __NSD_CB_GetSelectionIndex `
+!macro __NSD_CB_GetSelectionIndex CONTROL VAR
+	SendMessage ${CONTROL} ${CB_GETCURSEL} 0 0 ${VAR}
 !macroend
 
-!define NSD_Check `!insertmacro __NSD_Check`
 
-!macro __NSD_Uncheck CONTROL
+!define NSD_CB_SetSelectionIndex `!insertmacro __NSD_CB_SetSelectionIndex `
+!macro __NSD_CB_SetSelectionIndex CONTROL INDEX
+	SendMessage ${CONTROL} ${CB_SETCURSEL} ${INDEX} 0
+!macroend
 
-	${NSD_SetState} ${CONTROL} ${BST_UNCHECKED}
 
+!define NSD_CB_GetItemData `!insertmacro __NSD_CB_GetItemData `
+!macro __NSD_CB_GetItemData CONTROL INDEX VAR
+SendMessage ${CONTROL} ${CB_GETITEMDATA} ${INDEX} 0 ${VAR}
 !macroend
+!define NSD_CB_SetItemData `${__NSD_MkCtlCmd_WPLP} CB_SETITEMDATA ` ; Index Data
 
-!define NSD_Uncheck `!insertmacro __NSD_Uncheck`
 
-!macro __NSD_SetFocus HWND
+!define NSD_CB_DelItem `${__NSD_MkCtlCmd_WP} CB_DELETESTRING 0 `
+!define NSD_CB_LimitText `${__NSD_MkCtlCmd_WP} CB_LIMITTEXT 0 `
+!define /IfNDef NSD_CB_Clear `${__NSD_MkCtlCmd} CB_RESETCONTENT 0 0 `
+!define /IfNDef NSD_CB_GetCount `${__NSD_MkCtlCmd_RV} CB_GETCOUNT 0 0 `
+!ifndef NSD_CB_DelString
+!define NSD_CB_DelString `!insertmacro __NSD_CB_DelString `
+!macro __NSD_CB_DelString CONTROL STRING
+	System::Call 'USER32::SendMessage(p${CONTROL},i${CB_FINDSTRINGEXACT},p-1,ts)p.s' `${STRING}`
+	System::Call 'USER32::SendMessage(p${CONTROL},i${CB_DELETESTRING},ps,p0)'
+!macroend
+!endif
+;define /IfNDef NSD_CB_GetSelection
 
-	System::Call "user32::SetFocus(i${HWND})"
-  
+
+### ListBox ###
+
+!define NSD_LB_AddString "!insertmacro _NSD_LB_AddString "
+!macro _NSD_LB_AddString CONTROL STRING
+	SendMessage ${CONTROL} ${LB_ADDSTRING} 0 `STR:${STRING}`
 !macroend
 
-!define NSD_SetFocus `!insertmacro __NSD_SetFocus`
 
-!macro _NSD_CB_AddString CONTROL STRING
+!define NSD_LB_InsertString "!insertmacro _NSD_LB_InsertString "
+!macro _NSD_LB_InsertString CONTROL INDEX STRING
+SendMessage ${CONTROL} ${LB_INSERTSTRING} ${INDEX} `STR:${STRING}`
+!macroend
 
-	SendMessage ${CONTROL} ${CB_ADDSTRING} 0 `STR:${STRING}`
+!define NSD_LB_PrependString "!insertmacro _NSD_LB_PrependString "
+!macro _NSD_LB_PrependString CONTROL STRING
+SendMessage ${CONTROL} ${LB_INSERTSTRING} 0 `STR:${STRING}`
+!macroend
 
+!define NSD_LB_AppendString "!insertmacro _NSD_LB_AppendString "
+!macro _NSD_LB_AppendString CONTROL STRING
+SendMessage ${CONTROL} ${LB_INSERTSTRING} -1 `STR:${STRING}`
 !macroend
 
-!define NSD_CB_AddString "!insertmacro _NSD_CB_AddString"
 
-!macro _NSD_CB_SelectString CONTROL STRING
+!define NSD_LB_DelString `!insertmacro __NSD_LB_DelString `
+!macro __NSD_LB_DelString CONTROL STRING
+	System::Call 'USER32::SendMessage(p${CONTROL},i${LB_FINDSTRINGEXACT},p-1,ts)p.s' `${STRING}`
+	System::Call 'USER32::SendMessage(p${CONTROL},i${LB_DELETESTRING},ps,p0)'
+!macroend
 
-	SendMessage ${CONTROL} ${CB_SELECTSTRING} -1 `STR:${STRING}`
 
+!define NSD_LB_DelItem "!insertmacro __NSD_LB_DelItem "
+!macro __NSD_LB_DelItem CONTROL INDEX
+	SendMessage ${CONTROL} ${LB_DELETESTRING} ${INDEX} 0
 !macroend
 
-!define NSD_CB_SelectString "!insertmacro _NSD_CB_SelectString"
 
-!macro _NSD_LB_AddString CONTROL STRING
+!define NSD_LB_Clear `${__NSD_MkCtlCmd} LB_RESETCONTENT 0 0 `
 
-	SendMessage ${CONTROL} ${LB_ADDSTRING} 0 `STR:${STRING}`
 
+!define NSD_LB_GetCount `!insertmacro __NSD_LB_GetCount `
+!macro __NSD_LB_GetCount CONTROL VAR
+	SendMessage ${CONTROL} ${LB_GETCOUNT} 0 0 ${VAR}
 !macroend
 
-!define NSD_LB_AddString "!insertmacro _NSD_LB_AddString"
 
-!macro __NSD_LB_DelString CONTROL STRING
+!define NSD_LB_SelectString "!insertmacro _NSD_LB_SelectString "
+!macro _NSD_LB_SelectString CONTROL STRING
+	SendMessage ${CONTROL} ${LB_SELECTSTRING} -1 `STR:${STRING}`
+!macroend
 
-	SendMessage ${CONTROL} ${LB_DELETESTRING} 0 `STR:${STRING}`
 
+!define NSD_LB_GetSelection `!insertmacro __NSD_LB_GetSelection `
+!macro __NSD_LB_GetSelection CONTROL VAR
+	SendMessage ${CONTROL} ${LB_GETCURSEL} 0 0 ${VAR}
+	System::Call 'user32::SendMessage(p ${CONTROL}, i ${LB_GETTEXT}, p ${VAR}, t .s)'
+	Pop ${VAR}
 !macroend
 
-!define NSD_LB_DelString `!insertmacro __NSD_LB_DelString`
 
-!macro __NSD_LB_Clear CONTROL VAR
+!define NSD_LB_GetSelectionIndex `!insertmacro __NSD_LB_GetSelectionIndex `
+!macro __NSD_LB_GetSelectionIndex CONTROL VAR
+	SendMessage ${CONTROL} ${LB_GETCURSEL} 0 0 ${VAR}
+!macroend
 
-	SendMessage ${CONTROL} ${LB_RESETCONTENT} 0 0 ${VAR}
 
+!define NSD_LB_SetSelectionIndex `!insertmacro __NSD_LB_SetSelectionIndex `
+!macro __NSD_LB_SetSelectionIndex CONTROL INDEX
+	SendMessage ${CONTROL} ${LB_SETCURSEL} ${INDEX} 0
 !macroend
 
-!define NSD_LB_Clear `!insertmacro __NSD_LB_Clear`
 
-!macro __NSD_LB_GetCount CONTROL VAR
+!define NSD_LB_GetSelectionCount `!insertmacro __NSD_LB_GetSelectionCount `
+!macro __NSD_LB_GetSelectionCount CONTROL VAR
+	SendMessage ${CONTROL} ${LB_GETSELCOUNT} 0 0 ${VAR}
+!macroend
 
-	SendMessage ${CONTROL} ${LB_GETCOUNT} 0 0 ${VAR}
 
+!define NSD_LB_GetItemText `!insertmacro __NSD_LB_GetItemText `
+!macro __NSD_LB_GetItemText CONTROL INDEX VAR
+	System::Call 'user32::SendMessage(p${CONTROL}, i${LB_GETTEXT}, p${INDEX}, t.s)'
+	Pop ${VAR}
 !macroend
 
-!define NSD_LB_GetCount `!insertmacro __NSD_LB_GetCount`
 
-!macro _NSD_LB_SelectString CONTROL STRING
+!define NSD_LB_GetItemData `!insertmacro __NSD_LB_GetItemData `
+!macro __NSD_LB_GetItemData CONTROL INDEX VAR
+SendMessage ${CONTROL} ${LB_GETITEMDATA} ${INDEX} 0 ${VAR}
+!macroend
+!define NSD_LB_SetItemData `${__NSD_MkCtlCmd_WPLP} LB_SETITEMDATA ` ; Index Data
 
-	SendMessage ${CONTROL} ${LB_SELECTSTRING} -1 `STR:${STRING}`
 
+!define NSD_LB_FindStringPrefix `!insertmacro __NSD_LB_FindStringPrefix `
+!macro __NSD_LB_FindStringPrefix CONTROL STRING VAR
+	SendMessage ${CONTROL} ${LB_FINDSTRING} -1 `STR:${STRING}` ${VAR}
 !macroend
 
-!define NSD_LB_SelectString "!insertmacro _NSD_LB_SelectString"
 
-!macro __NSD_LB_GetSelection CONTROL VAR
+!define NSD_LB_FindStringExact `!insertmacro __NSD_LB_FindStringExact `
+!macro __NSD_LB_FindStringExact CONTROL STRING VAR
+	SendMessage ${CONTROL} ${LB_FINDSTRINGEXACT} -1 `STR:${STRING}` ${VAR}
+!macroend
 
-	SendMessage ${CONTROL} ${LB_GETCURSEL} 0 0 ${VAR}
-	System::Call 'user32::SendMessage(i ${CONTROL}, i ${LB_GETTEXT}, i ${VAR}, t .s)'
-	Pop ${VAR}
 
+### ProgressBar ###
+
+!define NSD_ProgressBar_SetPos `${__NSD_MkCtlCmd_WP} PBM_SETPOS 0 `
+!define NSD_ProgressBar_SetStep `${__NSD_MkCtlCmd_WP} PBM_SETSTEP 0 `
+!define NSD_ProgressBar_StepIt `${__NSD_MkCtlCmd} PBM_STEPIT 0 0 `
+!define NSD_ProgressBar_AdvanceBy `${__NSD_MkCtlCmd_WP} PBM_DELTAPOS 0 `
+!define NSD_ProgressBar_SetPackedRange `${__NSD_MkCtlCmd_LP} PBM_SETRANGE 0 ` ; LP(DWORD):MAKELONG(min,max)
+!define NSD_ProgressBar_SetRange32 `${__NSD_MkCtlCmd_WPLP} PBM_SETRANGE32 ` ; [IE3+] WP:min LP:max
+!define NSD_ProgressBar_GetPos `${__NSD_MkCtlCmd_RV} PBM_GETPOS 0 0 ` ; [IE3+]
+
+
+### Animation ###
+
+!define NSD_Anim_Close `${__NSD_MkCtlCmd} ACM_OPEN 0 0 `
+!define NSD_Anim_Play `${__NSD_MkCtlCmd} ACM_PLAY -1 0xFFFF0000 `
+!define NSD_Anim_PlayLoops `${__NSD_MkCtlCmd_WP} ACM_PLAY 0xFFFF0000 ` ; WP(UINT16):LoopCount
+!define NSD_Anim_Stop `${__NSD_MkCtlCmd} ACM_STOP 0 0 `
+!define NSD_Anim_IsPlaying `${__NSD_MkCtlCmd_RV} ACM_ISPLAYING 0 0 `
+
+!define NSD_Anim_OpenFile `!insertmacro __NSD_Anim_OpenFile `
+!macro __NSD_Anim_OpenFile CONTROL PATH
+	SendMessage ${CONTROL} ${ACM_OPEN} 0 "STR:${PATH}"
 !macroend
 
-!define NSD_LB_GetSelection `!insertmacro __NSD_LB_GetSelection`
+!define NSD_Anim_OpenResource `!insertmacro __NSD_Anim_OpenResource `
+!macro __NSD_Anim_OpenResource CONTROL HINSTANCE_CC471 RESID
+	SendMessage ${CONTROL} ${ACM_OPEN} "${HINSTANCE_CC471}" "${RESID}"
+!macroend
 
 
-!macro __NSD_LoadAndSetImage _LIHINSTMODE _IMGTYPE _LIHINSTSRC _LIFLAGS CONTROL IMAGE HANDLE
-	
-	Push $0
-	Push $R0
+### TrackBar ###
 
-	StrCpy $R0 ${CONTROL} # in case ${CONTROL} is $0
-	
-	!if "${_LIHINSTMODE}" == "exeresource"
-		System::Call 'kernel32::GetModuleHandle(i0) i.r0'
-		!undef _LIHINSTSRC
-		!define _LIHINSTSRC r0
-	!endif
-	
-	System::Call 'user32::LoadImage(i ${_LIHINSTSRC}, ts, i ${_IMGTYPE}, i0, i0, i${_LIFLAGS}) i.r0' "${IMAGE}"
-	SendMessage $R0 ${STM_SETIMAGE} ${_IMGTYPE} $0
+!define NSD_TrackBar_GetPos `${__NSD_MkCtlCmd_RV} TBM_GETPOS 0 0 `
+!define NSD_TrackBar_SetPos `${__NSD_MkCtlCmd_LP} TBM_SETPOS 1 `
+!define NSD_TrackBar_SetRangeMin `${__NSD_MkCtlCmd_LP} TBM_SETRANGEMIN 1 `
+!define NSD_TrackBar_SetRangeMax `${__NSD_MkCtlCmd_LP} TBM_SETRANGEMAX 1 `
+!define NSD_TrackBar_GetLineSize `${__NSD_MkCtlCmd_RV} TBM_GETLINESIZE 0 0 `
+!define NSD_TrackBar_SetLineSize `${__NSD_MkCtlCmd_LP} TBM_SETLINESIZE 0 `
+!define NSD_TrackBar_GetPageSize `${__NSD_MkCtlCmd_RV} TBM_GETPAGESIZE 0 0 `
+!define NSD_TrackBar_SetPageSize `${__NSD_MkCtlCmd_LP} TBM_SETPAGESIZE 0 `
+!define NSD_TrackBar_ClearTics `${__NSD_MkCtlCmd} TBM_CLEARTICS 0 0 `
+!define NSD_TrackBar_GetNumTics `${__NSD_MkCtlCmd_RV} TBM_GETNUMTICS 0 0 `
+!define NSD_TrackBar_SetTic `${__NSD_MkCtlCmd_LP} TBM_SETTIC 0 `
+!define NSD_TrackBar_SetTicFreq `${__NSD_MkCtlCmd_WP} TBM_SETTICFREQ 0 `
+!define NSD_TrackBar_GetThumbLength `${__NSD_MkCtlCmd_RV} TBM_GETTHUMBLENGTH 0 0 `
+!define NSD_TrackBar_SetBuddy `${__NSD_MkCtlCmd_WPLP} TBM_SETBUDDY ` ; WP(BOOL):Left/Right LP:HWND
 
-	Pop $R0
-	Exch $0
 
-	Pop ${HANDLE}
+### UpDown ###
 
-!macroend
+!define NSD_UD_SetBuddy `${__NSD_MkCtlCmd_WP} UDM_SETBUDDY 0 `
+!define NSD_UD_GetPos `${__NSD_MkCtlCmd_RV} UDM_GETPOS 0 0 `
+!define NSD_UD_SetPos `${__NSD_MkCtlCmd_LP} UDM_SETPOS 0 `
+!define NSD_UD_GetPackedRange `${__NSD_MkCtlCmd_RV} UDM_GETRANGE 0 0 `
+!define NSD_UD_SetPackedRange `${__NSD_MkCtlCmd_LP} UDM_SETRANGE 0 ` ; LP(DWORD):MAKELONG(min,max)
+!define NSD_UD_GetPos32 `${__NSD_MkCtlCmd_RV} UDM_GETPOS32 0 0 `
+!define NSD_UD_SetPos32 `${__NSD_MkCtlCmd_LP} UDM_SETPOS32 0 `
+!define NSD_UD_SetRange32 `${__NSD_MkCtlCmd_WPLP} UDM_SETRANGE32 ` ; WP(INT32):min LP(INT32):max
 
-!macro __NSD_SetIconFromExeResource CONTROL IMAGE HANDLE
-	!insertmacro __NSD_LoadAndSetImage exeresource ${IMAGE_ICON} 0 ${LR_DEFAULTSIZE} "${CONTROL}" "${IMAGE}" ${HANDLE}
+!define NSD_UD_GetRange32 `!insertmacro __NSD_UD_GetRange32 `
+!macro __NSD_UD_GetRange32 CONTROL OUTLO OUTHI
+	System::Call 'USER32::SendMessage(p${CONTROL},i${UDM_GETRANGE32},*i.s,*i.s)'
+	Pop ${OUTLO}
+	Pop ${OUTHI}
 !macroend
 
-!macro __NSD_SetIconFromInstaller CONTROL HANDLE
-	!insertmacro __NSD_SetIconFromExeResource "${CONTROL}" "#103" ${HANDLE}
+!define NSD_UD_SetStaticRange `!insertmacro __NSD_UD_SetStaticRange `
+!macro __NSD_UD_SetStaticRange CONTROL MI MA
+	!define /redef /math MI ${MI} << 16
+	!define /redef /math MA ${MA} & 0xffff
+	!define /redef /math MA ${MI} | ${MA}
+	SendMessage ${CONTROL} ${UDM_SETRANGE} 0 ${MA}
 !macroend
 
-!define NSD_SetImage `!insertmacro __NSD_LoadAndSetImage file ${IMAGE_BITMAP} 0 "${LR_LOADFROMFILE}"`
-!define NSD_SetBitmap `${NSD_SetImage}`
 
-!define NSD_SetIcon `!insertmacro __NSD_LoadAndSetImage file ${IMAGE_ICON} 0 "${LR_LOADFROMFILE}|${LR_DEFAULTSIZE}"`
-!define NSD_SetIconFromExeResource `!insertmacro __NSD_SetIconFromExeResource`
-!define NSD_SetIconFromInstaller `!insertmacro __NSD_SetIconFromInstaller`
+### HotKey ###
 
+!define NSD_HK_GetHotKey `${__NSD_MkCtlCmd_RV} HKM_GETHOTKEY 0 0 ` ; RV(WORD):MAKEWORD(VK,HOTKEYF)
+!define NSD_HK_SetHotKey `${__NSD_MkCtlCmd_WP} HKM_SETHOTKEY 0 `
+!define NSD_HK_SetRules `${__NSD_MkCtlCmd_WPLP} HKM_SETRULES `
 
-!macro __NSD_SetStretchedImage CONTROL IMAGE HANDLE
 
-	Push $0
-	Push $1
-	Push $2
-	Push $R0
+### IP Address ###
 
-	StrCpy $R0 ${CONTROL} # in case ${CONTROL} is $0
+!define NSD_IPAddress_Clear `${__NSD_MkCtlCmd} IPM_CLEARADDRESS 0 0 `
+!define NSD_IPAddress_SetPackedIPv4 `${__NSD_MkCtlCmd_LP} IPM_SETADDRESS 0 `
+!define NSD_IPAddress_IsBlank `${__NSD_MkCtlCmd_RV} IPM_ISBLANK 0 0 `
 
-	StrCpy $1 ""
-	StrCpy $2 ""
+!define NSD_IPAddress_GetPackedIPv4 `!insertmacro __NSD_IPAddress_GetPackedIPv4 `
+!macro __NSD_IPAddress_GetPackedIPv4 CONTROL VAR
+System::Call 'USER32::SendMessage(p${CONTROL},i${IPM_GETADDRESS},p0,*i0s)'
+Pop ${VAR}
+!macroend
 
-	System::Call '*(i, i, i, i) i.s'
-	Pop $0
 
-	${If} $0 <> 0
-	
-		System::Call 'user32::GetClientRect(iR0, ir0)'
-		System::Call '*$0(i, i, i .s, i .s)'
-		System::Free $0
-		Pop $1
-		Pop $2
+### Date ###
+!define NSD_Date_GetDateFields `!insertmacro __NSD_Date_GetDateFields `
+!macro __NSD_Date_GetDateFields CONTROL
+Push $0
+System::Call 'USER32::SendMessage(p${CONTROL},i${DTM_GETSYSTEMTIME},p0,@r0)'
+System::Call '*$0(&i2.s,&i2.s,&i2,&i2.s)'
+Exch 3
+Pop $0
+!macroend
 
-	${EndIf}
+!define NSD_Time_GetTimeFields `!insertmacro __NSD_Time_GetTimeFields `
+!macro __NSD_Time_GetTimeFields CONTROL
+Push $0
+System::Call 'USER32::SendMessage(p${CONTROL},i${DTM_GETSYSTEMTIME},p0,@r0)'
+System::Call '*$0(&i2,&i2,&i2,&i2,&i2.s,&i2.s,&i2.s)'
+Exch 3
+Pop $0
+Exch
+!macroend
 
-	System::Call 'user32::LoadImage(i0, ts, i ${IMAGE_BITMAP}, ir1, ir2, i${LR_LOADFROMFILE}) i.s' "${IMAGE}"
-	Pop $0
-    SendMessage $R0 ${STM_SETIMAGE} ${IMAGE_BITMAP} $0
 
-	Pop $R0
-	Pop $2
-	Pop $1
-	Exch $0
+### Static ###
 
-	Pop ${HANDLE}
+!macro __NSD_LoadAndSetImage _LIHINSTMODE _IMGTYPE _LIHINSTSRC _LIFLAGS CONTROL IMAGE HANDLE
+	!if "${_LIHINSTMODE}" == "exeresource"
+		LoadAndSetImage /EXERESOURCE /STRINGID "${CONTROL}" ${_IMGTYPE} ${_LIFLAGS} "${IMAGE}" ${HANDLE}
+	!else #if "${_LIHINSTMODE}" == "file"
+		LoadAndSetImage /STRINGID "${CONTROL}" ${_IMGTYPE} ${_LIFLAGS} "${IMAGE}" ${HANDLE}
+	!endif
+!macroend
 
+!macro __NSD_SetIconFromExeResource CONTROL IMAGE HANDLE
+	LoadAndSetImage /EXERESOURCE /STRINGID "${CONTROL}" ${IMAGE_ICON} ${LR_DEFAULTSIZE} "${IMAGE}" ${HANDLE}
 !macroend
 
-!define NSD_SetStretchedImage `!insertmacro __NSD_SetStretchedImage`
+!macro __NSD_SetIconFromInstaller CONTROL HANDLE
+	LoadAndSetImage /EXERESOURCE "${CONTROL}" ${IMAGE_ICON} ${LR_DEFAULTSIZE} 103 ${HANDLE}
+!macroend
 
-!macro __NSD_FreeImage IMAGE
+!define NSD_SetImage `!insertmacro __NSD_LoadAndSetImage file ${IMAGE_BITMAP} 0 "${LR_LOADFROMFILE}" `
+!define NSD_SetBitmap `${NSD_SetImage} `
 
-	${If} ${IMAGE} <> 0
+!define NSD_SetIcon `!insertmacro __NSD_LoadAndSetImage file ${IMAGE_ICON} 0 "${LR_LOADFROMFILE}|${LR_DEFAULTSIZE}" `
+!define NSD_SetIconFromExeResource `!insertmacro __NSD_SetIconFromExeResource `
+!define NSD_SetIconFromInstaller `!insertmacro __NSD_SetIconFromInstaller `
 
-		System::Call gdi32::DeleteObject(is) ${IMAGE}
 
+!define NSD_SetStretchedImage `!insertmacro __NSD_SetStretchedImage `
+!define NSD_SetStretchedBitmap `!insertmacro __NSD_SetStretchedImage `
+!macro __NSD_SetStretchedImage CONTROL IMAGE HANDLE
+	LoadAndSetImage /STRINGID /RESIZETOFIT "${CONTROL}" ${IMAGE_BITMAP} ${LR_LOADFROMFILE} "${IMAGE}" ${HANDLE}
+!macroend
+
+
+!define NSD_FreeImage `!insertmacro __NSD_FreeImage `
+!define NSD_FreeBitmap `${NSD_FreeImage} `
+!macro __NSD_FreeImage IMAGE
+	${If} ${IMAGE} P<> 0
+		System::Call gdi32::DeleteObject(ps) ${IMAGE}
 	${EndIf}
-
 !macroend
 
-!define NSD_FreeImage `!insertmacro __NSD_FreeImage`
-!define NSD_FreeBitmap `${NSD_FreeImage}`
 
+!define NSD_FreeIcon `!insertmacro __NSD_FreeIcon `
 !macro __NSD_FreeIcon IMAGE
-	System::Call user32::DestroyIcon(is) ${IMAGE}
+	System::Call user32::DestroyIcon(ps) ${IMAGE}
 !macroend
 
-!define NSD_FreeIcon `!insertmacro __NSD_FreeIcon`
 
+!define NSD_ClearImage `!insertmacro __NSD_ClearImage ${IMAGE_BITMAP} `
+!define NSD_ClearBitmap `${NSD_ClearImage} `
+!define NSD_ClearIcon  `!insertmacro __NSD_ClearImage ${IMAGE_ICON } `
 !macro __NSD_ClearImage _IMGTYPE CONTROL
-
 	SendMessage ${CONTROL} ${STM_SETIMAGE} ${_IMGTYPE} 0
-
 !macroend
 
-!define NSD_ClearImage `!insertmacro __NSD_ClearImage ${IMAGE_BITMAP}`
-!define NSD_ClearIcon  `!insertmacro __NSD_ClearImage ${IMAGE_ICON}`
 
+### INI ###
 
-!define DEBUG `System::Call kernel32::OutputDebugString(ts)`
+!define /IfNDef NSD_Debug `System::Call kernel32::OutputDebugString(ts)`
 
 !macro __NSD_ControlCase TYPE
-
 	${Case} ${TYPE}
 		${NSD_Create${TYPE}} $R3u $R4u $R5u $R6u $R7
 		Pop $R9
 		${Break}
-
 !macroend
 
 !macro __NSD_ControlCaseEx TYPE
-
 	${Case} ${TYPE}
 		Call ${TYPE}
 		${Break}
-
 !macroend
 
 !macro NSD_FUNCTION_INIFILE
-
 	!insertmacro NSD_INIFILE ""
-
 !macroend
 
 !macro NSD_UNFUNCTION_INIFILE
-
 	!insertmacro NSD_INIFILE un.
-
 !macroend
 
 !macro NSD_INIFILE UNINSTALLER_FUNCPREFIX
@@ -670,26 +1046,26 @@
 
 		ReadINIStr $R0 $0 Settings NumFields
 
-		${DEBUG} "NumFields = $R0"
+		${NSD_Debug} "NumFields = $R0"
 
 		${For} $R1 1 $R0
-			${DEBUG} "Creating field $R1"
+			${NSD_Debug} "Creating field $R1"
 			ReadINIStr $R2 $0 "Field $R1" Type
-			${DEBUG} "  Type = $R2"
+			${NSD_Debug} "  Type = $R2"
 			ReadINIStr $R3 $0 "Field $R1" Left
-			${DEBUG} "  Left = $R3"
+			${NSD_Debug} "  Left = $R3"
 			ReadINIStr $R4 $0 "Field $R1" Top
-			${DEBUG} "  Top = $R4"
+			${NSD_Debug} "  Top = $R4"
 			ReadINIStr $R5 $0 "Field $R1" Right
-			${DEBUG} "  Right = $R5"
+			${NSD_Debug} "  Right = $R5"
 			ReadINIStr $R6 $0 "Field $R1" Bottom
-			${DEBUG} "  Bottom = $R6"
+			${NSD_Debug} "  Bottom = $R6"
 			IntOp $R5 $R5 - $R3
-			${DEBUG} "  Width = $R5"
+			${NSD_Debug} "  Width = $R5"
 			IntOp $R6 $R6 - $R4
-			${DEBUG} "  Height = $R6"
+			${NSD_Debug} "  Height = $R6"
 			ReadINIStr $R7 $0 "Field $R1" Text
-			${DEBUG} "  Text = $R7"
+			${NSD_Debug} "  Text = $R7"
 			${Switch} $R2
 				!insertmacro __NSD_ControlCase   HLine
 				!insertmacro __NSD_ControlCase   VLine
@@ -719,11 +1095,11 @@
 
 	Function ${UNINSTALLER_FUNCPREFIX}UpdateINIState
 
-		${DEBUG} "Updating INI state"
+		${NSD_Debug} "Updating INI state"
 
 		ReadINIStr $R0 $0 Settings NumFields
 
-		${DEBUG} "NumField = $R0"
+		${NSD_Debug} "NumField = $R0"
 
 		${For} $R1 1 $R0
 			ReadINIStr $R2 $0 "Field $R1" HWND
@@ -731,14 +1107,14 @@
 			${Switch} $R3
 				${Case} "CheckBox"
 				${Case} "RadioButton"
-					${DEBUG} "  HWND = $R2"
+					${NSD_Debug} "  HWND = $R2"
 					${NSD_GetState} $R2 $R2
-					${DEBUG} "  Window selection = $R2"
+					${NSD_Debug} "  Window selection = $R2"
 				${Break}
 				${CaseElse}
-					${DEBUG} "  HWND = $R2"
+					${NSD_Debug} "  HWND = $R2"
 					${NSD_GetText} $R2 $R2
-					${DEBUG} "  Window text = $R2"
+					${NSD_Debug} "  Window text = $R2"
 				${Break}
 			${EndSwitch}
 			WriteINIStr $0 "Field $R1" STATE $R2
Index: tmp/org.txm.setups/nsis/Include/Integration.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/Integration.nsh	(revision 0)
+++ tmp/org.txm.setups/nsis/Include/Integration.nsh	(revision 2956)
@@ -0,0 +1,44 @@
+!verbose push 3
+!ifndef INTEGRATION_INCLUDED
+!define INTEGRATION_INCLUDED 1
+
+!include "Util.nsh"
+
+
+!define NotifyShell_AssocChanged `System::Call 'SHELL32::SHChangeNotify(i0x8000000,i0,p0,p0)'` ; Notify the shell with SHCNE_ASSOCCHANGED
+
+
+!define UnpinShortcut "!insertmacro UnpinShortcut "
+!macro UnpinShortcut lnkpath
+Push "${lnkpath}"
+${CallArtificialFunction} UnpinShortcut_Implementation
+!macroend
+!macro UnpinShortcut_Implementation
+!include "LogicLib.nsh"
+!include "Win\COM.nsh"
+Exch $0
+Push $1
+!insertmacro ComHlpr_CreateInProcInstance ${CLSID_StartMenuPin} ${IID_IStartMenuPinnedList} r1 ""
+${If} $1 P<> 0
+    System::Call 'SHELL32::SHCreateItemFromParsingName(wr0,p0,g"${IID_IShellItem}",*p0r0)'
+    ${If} $0 P<> 0
+        ${IStartMenuPinnedList::RemoveFromList} $1 '(r0)'
+        ${IUnknown::Release} $0 ""
+    ${EndIf}
+    ${IUnknown::Release} $1 ""
+!ifdef NSIS_IX86 | NSIS_AMD64
+${Else}
+  !insertmacro ComHlpr_CreateInProcInstance ${CLSID_StartMenuPin} "{ec35e37a-6579-4f3c-93cd-6e62c4ef7636}" r1 ""
+  ${If} $1 P<> 0
+    ExecShellWait /INVOKEIDLIST "unpin" $0 ; WinXP
+    ${IUnknown::Release} $1 ""
+  ${EndIf}
+!endif
+${EndIf}
+Pop $1
+Pop $0
+!macroend
+
+
+!endif #!INCLUDED
+!verbose pop
Index: tmp/org.txm.setups/nsis/Include/UpgradeDLL.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/UpgradeDLL.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/UpgradeDLL.nsh	(revision 2956)
@@ -60,26 +60,30 @@
   ;Advance counter
 
   StrCpy $R0 0
-  ReadRegDWORD $R0 HKLM "Software\NSIS.Library.RegTool.v2\UpgradeDLLSession" "count"
+  ReadRegDWORD $R0 HKLM "Software\NSIS.Library.RegTool.v3\UpgradeDLLSession" "count"
   IntOp $R0 $R0 + 1
-  WriteRegDWORD HKLM "Software\NSIS.Library.RegTool.v2\UpgradeDLLSession" "count" "$R0"
+  WriteRegDWORD HKLM "Software\NSIS.Library.RegTool.v3\UpgradeDLLSession" "count" "$R0"
 
   ;------------------------
   ;Setup RegTool
 
-  ReadRegStr $R3 HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" "NSIS.Library.RegTool.v2"
+  !if ! /FileExists "${NSISDIR}\Bin\RegTool-${NSIS_CPU}.bin"
+    !error "Missing RegTool for ${NSIS_CPU}!"
+  !endif
+
+  ReadRegStr $R3 HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" "NSIS.Library.RegTool.v3"
   StrCpy $R3 $R3 -4 1
   IfFileExists $R3 +3
 
-    File /oname=$R2\NSIS.Library.RegTool.v2.$HWNDPARENT.exe "${NSISDIR}\Bin\RegTool.bin"
+    File /oname=$R2\NSIS.Library.RegTool.v3.$HWNDPARENT.exe "${NSISDIR}\Bin\RegTool-${NSIS_CPU}.bin"
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" \
-      "NSIS.Library.RegTool.v2" '"$R2\NSIS.Library.RegTool.v2.$HWNDPARENT.exe" /S'
+      "NSIS.Library.RegTool.v3" '"$R2\NSIS.Library.RegTool.v3.$HWNDPARENT.exe" /S'
 
   ;------------------------
   ;Add RegTool entry
 
-  WriteRegStr HKLM "Software\NSIS.Library.RegTool.v2\UpgradeDLLSession" "$R0.file" "$R1"
-  WriteRegStr HKLM "Software\NSIS.Library.RegTool.v2\UpgradeDLLSession" "$R0.mode" "${mode}"
+  WriteRegStr HKLM "Software\NSIS.Library.RegTool.v3\UpgradeDLLSession" "$R0.file" "$R1"
+  WriteRegStr HKLM "Software\NSIS.Library.RegTool.v3\UpgradeDLLSession" "$R0.mode" "${mode}"
 
   Pop $R3
   Pop $R2
@@ -102,8 +106,8 @@
   SetOverwrite try
 
   ;------------------------
-  ;Copy the parameters used on run-time to a variable
-  ;This allows the usage of variables as paramter
+  ;Copy the macro parameters to a run-time to a variable, 
+  ;this allows the usage of variables as parameter
 
   StrCpy $R4 "${DESTFILE}"
   StrCpy $R5 "${TEMPBASEDIR}"
Index: tmp/org.txm.setups/nsis/Include/LogicLib.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/LogicLib.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/LogicLib.nsh	(revision 2956)
@@ -47,7 +47,7 @@
 ;       Case-sensitive string tests:
 ;         a S== b; a S!= b
 ;       Standard (built-in) signed integer tests:
-;         a = b; a <> b; a < b; a >= b; a > b; a <= b
+;         a = b; a <> b; a < b; a >= b; a > b; a <= b; a & b
 ;       Standard (built-in) unsigned integer tests:
 ;         a U< b; a U>= b; a U> b; a U<= b
 ;       64-bit integer tests (using System.dll):
@@ -57,7 +57,8 @@
 ;       size_t integer tests
 ;         a Z= b; a Z<> b; a Z< b; a Z>= b; a Z> b; a Z<= b
 ;       Built-in NSIS flag tests:
-;         ${Abort}; ${Errors}; ${RebootFlag}; ${Silent}
+;         ${Abort}; ${Errors}; ${RebootFlag}; ${Silent}; ${RtlLanguage};
+;         ${ShellVarContextAll}
 ;       Built-in NSIS other tests:
 ;         ${FileExists} a
 ;       Any conditional NSIS instruction test:
@@ -67,6 +68,8 @@
 ;         ${SectionIsSectionGroupEnd} a; ${SectionIsBold} a;
 ;         ${SectionIsReadOnly} a; ${SectionIsExpanded} a;
 ;         ${SectionIsPartiallySelected} a
+;       Additional tests:
+;         HK RegKeyIsEmpty SubKey
 ;
 ; Examples:
 ;   See LogicLib.nsi in the Examples folder for lots of example usage.
@@ -95,11 +98,14 @@
     !endif
   !macroend
 
+  !macro LogicLib_JumpToBranch _Jump _Skip
+    !if `${_Jump}` != ``
+      StrCmp "" "" `${_Jump}` ${_Skip}
+    !endif
+  !macroend
+
   !macro _IncreaseCounter
-    !define _LOGICLIB_COUNTER ${LOGICLIB_COUNTER}
-    !undef LOGICLIB_COUNTER
-    !define /math LOGICLIB_COUNTER ${_LOGICLIB_COUNTER} + 1
-    !undef _LOGICLIB_COUNTER
+    !define /redef /math LOGICLIB_COUNTER `${LOGICLIB_COUNTER}` + 1
   !macroend
 
   !macro _PushLogic
@@ -159,7 +165,7 @@
   ; Extra string tests (cannot do these case-sensitively - I tried and lstrcmp still ignored the case)
   !macro _StrCmpI _a _b _e _l _m
     !insertmacro _LOGICLIB_TEMP
-    System::Call `kernel32::lstrcmpiA(ts, ts) i.s` `${_a}` `${_b}`
+    System::Call `kernel32::lstrcmpi(ts, ts) i.s` `${_a}` `${_b}`
     Pop $_LOGICLIB_TEMP
     IntCmp $_LOGICLIB_TEMP 0 `${_e}` `${_l}` `${_m}`
   !macroend
@@ -205,6 +211,12 @@
     !insertmacro _> `${_a}` `${_b}` `${_f}` `${_t}`
   !macroend
 
+  !macro _& _a _b _t _f
+    !insertmacro _LOGICLIB_TEMP
+    IntOp $_LOGICLIB_TEMP `${_a}` & `${_b}`
+    !insertmacro _<> $_LOGICLIB_TEMP 0 `${_t}` `${_f}`
+  !macroend
+
   ; Unsigned integer tests (NB: no need for extra equality tests)
   !macro _U< _a _b _t _f
     IntCmpU `${_a}` `${_b}` `${_f}` `${_t}` `${_f}`
@@ -255,41 +267,49 @@
   !macroend
 
   ; ptrdiff_t & size_t tests
+  !macro LogicLib_PtrDiffTest _o _a _b _t _f
+    !if "${NSIS_PTR_SIZE}" <= 4
+      !insertmacro _${_o} `${_a}` `${_b}` `${_t}` `${_f}`
+    !else
+      !insertmacro _L${_o} `${_a}` `${_b}` `${_t}` `${_f}`
+    !endif
+  !macroend
   !macro _P= _a _b _t _f
-    !insertmacro _= `${_a}` `${_b}` `${_t}` `${_f}`
+    !insertmacro LogicLib_PtrDiffTest = `${_a}` `${_b}` `${_t}` `${_f}`
   !macroend
   !macro _P<> _a _b _t _f
-    !insertmacro _<> `${_a}` `${_b}` `${_t}` `${_f}`
+    !insertmacro LogicLib_PtrDiffTest <> `${_a}` `${_b}` `${_t}` `${_f}`
   !macroend
   !macro _P< _a _b _t _f
-    !insertmacro _< `${_a}` `${_b}` `${_t}` `${_f}`
+    !insertmacro LogicLib_PtrDiffTest < `${_a}` `${_b}` `${_t}` `${_f}`
   !macroend
   !macro _P>= _a _b _t _f
-    !insertmacro _>= `${_a}` `${_b}` `${_t}` `${_f}`
+    !insertmacro LogicLib_PtrDiffTest >= `${_a}` `${_b}` `${_t}` `${_f}`
   !macroend
   !macro _P> _a _b _t _f
-    !insertmacro _> `${_a}` `${_b}` `${_t}` `${_f}`
+    !insertmacro LogicLib_PtrDiffTest > `${_a}` `${_b}` `${_t}` `${_f}`
   !macroend
   !macro _P<= _a _b _t _f
-    !insertmacro _<= `${_a}` `${_b}` `${_t}` `${_f}`
+    !insertmacro LogicLib_PtrDiffTest <= `${_a}` `${_b}` `${_t}` `${_f}`
   !macroend
+  !include Util.nsh
   !macro _Z= _a _b _t _f
-    !insertmacro _= `${_a}` `${_b}` `${_t}` `${_f}`
+    !insertmacro LogicLib_PtrDiffTest = `${_a}` `${_b}` `${_t}` `${_f}`
   !macroend
   !macro _Z<> _a _b _t _f
-    !insertmacro _<> `${_a}` `${_b}` `${_t}` `${_f}`
+    !insertmacro LogicLib_PtrDiffTest <> `${_a}` `${_b}` `${_t}` `${_f}`
   !macroend
   !macro _Z< _a _b _t _f
-    !insertmacro _U< `${_a}` `${_b}` `${_t}` `${_f}`
+    !insertmacro IntPtrCmpU `${_a}` `${_b}` `${_f}` `${_t}` `${_f}`
   !macroend
   !macro _Z>= _a _b _t _f
-    !insertmacro _U>= `${_a}` `${_b}` `${_t}` `${_f}`
+    !insertmacro IntPtrCmpU `${_a}` `${_b}` `${_t}` `${_f}` `${_t}`
   !macroend
   !macro _Z> _a _b _t _f
-    !insertmacro _U> `${_a}` `${_b}` `${_t}` `${_f}`
+    !insertmacro IntPtrCmpU `${_a}` `${_b}` `${_f}` `${_f}` `${_t}`
   !macroend
   !macro _Z<= _a _b _t _f
-    !insertmacro _U<= `${_a}` `${_b}` `${_t}` `${_f}`
+    !insertmacro IntPtrCmpU `${_a}` `${_b}` `${_t}` `${_t}` `${_f}`
   !macroend
 
   ; Flag tests
@@ -318,6 +338,37 @@
   !macroend
   !define Silent `"" Silent ""`
 
+  !macro _ShellVarContextAll _a _b _t _f
+    IfShellVarContextAll `${_t}` `${_f}`
+  !macroend
+  !define ShellVarContextAll `"" ShellVarContextAll ""`
+
+  !macro _RtlLanguage _a _b _t _f
+    IfRtlLanguage `${_t}` `${_f}`
+  !macroend
+  !define RtlLanguage `"" RtlLanguage ""`
+
+  !macro _AltRegView _a _b _t _f
+    IfAltRegView `${_t}` `${_f}`
+  !macroend
+  !define AltRegView `"" AltRegView ""`
+
+  !macro _RegKeyIsEmpty _a _b _t _f
+    !insertmacro _LOGICLIB_TEMP
+    ClearErrors
+    EnumRegValue $_LOGICLIB_TEMP ${_a} `${_b}` ""
+    !if `${_f}` != ``
+    IfErrors "" `${_f}` ; Skip calls to EnumRegKey and _== if possible
+    !else
+    IfErrors +3
+    StrCpy $_LOGICLIB_TEMP "1" ; The default value is also named "", make sure we don't mistake it as empty
+    Goto +2
+    !endif
+    EnumRegKey $_LOGICLIB_TEMP ${_a} `${_b}` ""
+    !insertmacro _== $_LOGICLIB_TEMP "" `${_t}` `${_f}`
+  !macroend
+  !define RegKeyIsEmpty `RegKeyIsEmpty`
+
   ; "Any instruction" test
   !macro _Cmd _a _b _t _f
     !define _t=${_t}
@@ -365,7 +416,7 @@
     !verbose ${LOGICLIB_VERBOSITY}
     !insertmacro _PushLogic
     !define ${_Logic}If
-    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the Else
+    !define ${_Logic}Else _LogicLib_ElseLabel_${LOGICLIB_COUNTER} ; Get a label for the Else
     !insertmacro _IncreaseCounter
     !define _c=${_c}
     !ifdef _c=true                                        ; If is true
@@ -411,12 +462,12 @@
     !ifndef ${_Logic}Else
       !error "Cannot use Or following an Else"
     !endif
-    !define _label _LogicLib_Label_${LOGICLIB_COUNTER}                           ; Skip this test as we already
+    !define _label _LogicLib_Label_${LOGICLIB_COUNTER}    ; Skip this test as we already
     !insertmacro _IncreaseCounter
     Goto ${_label}                                        ; have a successful result
     ${${_Logic}Else}:                                     ; Place the Else label
     !undef ${_Logic}Else                                  ; and remove it
-    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new If
+    !define ${_Logic}Else _LogicLib_ElseLabel_${LOGICLIB_COUNTER} ; Get a label for the next Else and perform the new If
     !insertmacro _IncreaseCounter
     !define _c=${_c}
     !ifdef _c=true                                        ; If is true
@@ -443,7 +494,7 @@
       !error "Cannot use Else following an Else"
     !endif
     !ifndef ${_Logic}EndIf                                ; First Else for this If?
-      !define ${_Logic}EndIf _LogicLib_Label_${LOGICLIB_COUNTER}                 ; Get a label for the EndIf
+      !define ${_Logic}EndIf _LogicLib_EndIfLabel_${LOGICLIB_COUNTER} ; Get a label for the EndIf
       !insertmacro _IncreaseCounter
     !endif
     Goto ${${_Logic}EndIf}                                ; Go to the EndIf
@@ -457,7 +508,7 @@
     !verbose push
     !verbose ${LOGICLIB_VERBOSITY}
     ${Else}                                               ; Perform the Else
-    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new If
+    !define ${_Logic}Else _LogicLib_ElseLabel_${LOGICLIB_COUNTER} ; Get a label for the next Else and perform the new If
     !insertmacro _IncreaseCounter
     !define _c=${_c}
     !ifdef _c=true                                        ; If is true
@@ -556,10 +607,10 @@
     !verbose push
     !verbose ${LOGICLIB_VERBOSITY}
     !insertmacro _PushLogic
-    !define ${_Logic}${_n} _LogicLib_Label_${LOGICLIB_COUNTER}                   ; Get a label for the start of the loop
+    !define ${_Logic}${_n} _LogicLib_Label_${LOGICLIB_COUNTER} ; Get a label for the start of the loop
     !insertmacro _IncreaseCounter
     ${${_Logic}${_n}}:
-    !insertmacro _PushScope Exit${_n} _LogicLib_Label_${LOGICLIB_COUNTER}        ; Get a label for the end of the loop
+    !insertmacro _PushScope Exit${_n} _LogicLib_Label_${LOGICLIB_COUNTER} ; Get a label for the end of the loop
     !insertmacro _IncreaseCounter
     !insertmacro _PushScope Break ${_Exit${_n}}           ; Break goes to the end of the loop
     !ifdef _DoLoopExpression
@@ -568,7 +619,7 @@
     !endif
     !define _c=${_c}
     !ifdef _c=                                            ; No starting condition
-      !insertmacro _PushScope Continue _LogicLib_Label_${LOGICLIB_COUNTER}       ; Get a label for Continue at the end of the loop
+      !insertmacro _PushScope Continue _LogicLib_Label_${LOGICLIB_COUNTER} ; Get a label for Continue at the end of the loop
       !insertmacro _IncreaseCounter
     !else
       !insertmacro _PushScope Continue ${${_Logic}${_n}}  ; Continue goes to the start of the loop
@@ -618,7 +669,7 @@
     !endif
     !undef _c=${_c}
     Goto ${_Continue}                                     ; Just to ensure it is referenced at least once
-	Goto ${_Exit${_n}}                                    ; Just to ensure it is referenced at least once
+    Goto ${_Exit${_n}}                                    ; Just to ensure it is referenced at least once
     ${_Exit${_n}}:                                        ; Place the loop exit point
     !undef ${_Logic}Condition
     !insertmacro _PopScope Continue
@@ -654,11 +705,12 @@
       !ifndef ${_Logic}Else
         !error "Cannot use Case following a CaseElse"
       !endif
-      Goto ${${_Logic}EndSelect}                          ; Go to the EndSelect
+      Goto ${${_Logic}EndSelect}                          ; Go to EndSelect (Ends the previous Case)
+      !define /IfNDef _LogicLib_EndSelectLabelUsed_${_Logic}
       ${${_Logic}Else}:                                   ; Place the Else label
       !undef ${_Logic}Else                                ; and remove it
     !else
-      !define ${_Logic}EndSelect _LogicLib_Label_${LOGICLIB_COUNTER}             ; Get a label for the EndSelect
+      !define ${_Logic}EndSelect _LogicLib_EndSelectLabel_${LOGICLIB_COUNTER} ; Get a label for the EndSelect
       !insertmacro _IncreaseCounter
     !endif
     !verbose pop
@@ -671,7 +723,7 @@
     !verbose push
     !verbose ${LOGICLIB_VERBOSITY}
     ${CaseElse}                                           ; Perform the CaseElse
-    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new Case
+    !define ${_Logic}Else _LogicLib_NextSelectCaseLabel_${LOGICLIB_COUNTER} ; Get a label for the next Else and perform the new Case
     !insertmacro _IncreaseCounter
     !insertmacro _== `${${_Logic}Select}` `${_a}` "" ${${_Logic}Else}
     !verbose pop
@@ -682,7 +734,7 @@
     !verbose push
     !verbose ${LOGICLIB_VERBOSITY}
     ${CaseElse}                                           ; Perform the CaseElse
-    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new Case
+    !define ${_Logic}Else _LogicLib_NextSelectCaseLabel_${LOGICLIB_COUNTER} ; Get a label for the next Else and perform the new Case
     !insertmacro _IncreaseCounter
     !insertmacro _== `${${_Logic}Select}` `${_a}` +2 ""
     !insertmacro _== `${${_Logic}Select}` `${_b}` "" ${${_Logic}Else}
@@ -694,7 +746,7 @@
     !verbose push
     !verbose ${LOGICLIB_VERBOSITY}
     ${CaseElse}                                           ; Perform the CaseElse
-    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new Case
+    !define ${_Logic}Else _LogicLib_NextSelectCaseLabel_${LOGICLIB_COUNTER} ; Get a label for the next Else and perform the new Case
     !insertmacro _IncreaseCounter
     !insertmacro _== `${${_Logic}Select}` `${_a}` +3 ""
     !insertmacro _== `${${_Logic}Select}` `${_b}` +2 ""
@@ -707,7 +759,7 @@
     !verbose push
     !verbose ${LOGICLIB_VERBOSITY}
     ${CaseElse}                                           ; Perform the CaseElse
-    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new Case
+    !define ${_Logic}Else _LogicLib_NextSelectCaseLabel_${LOGICLIB_COUNTER} ; Get a label for the next Else and perform the new Case
     !insertmacro _IncreaseCounter
     !insertmacro _== `${${_Logic}Select}` `${_a}` +4 ""
     !insertmacro _== `${${_Logic}Select}` `${_b}` +3 ""
@@ -721,7 +773,7 @@
     !verbose push
     !verbose ${LOGICLIB_VERBOSITY}
     ${CaseElse}                                           ; Perform the CaseElse
-    !define ${_Logic}Else _LogicLib_Label_${LOGICLIB_COUNTER}                    ; Get a label for the next Else and perform the new Case
+    !define ${_Logic}Else _LogicLib_NextSelectCaseLabel_${LOGICLIB_COUNTER} ; Get a label for the next Else and perform the new Case
     !insertmacro _IncreaseCounter
     !insertmacro _== `${${_Logic}Select}` `${_a}` +5 ""
     !insertmacro _== `${${_Logic}Select}` `${_b}` +4 ""
@@ -743,7 +795,10 @@
       !undef ${_Logic}Else                                ; and remove it
     !endif
     !ifdef ${_Logic}EndSelect                             ; This won't be set if there weren't any cases
-      ${${_Logic}EndSelect}:                              ; Place the EndSelect
+      !ifdef _LogicLib_EndSelectLabelUsed_${_Logic}                 ; There is no jump to ${${_Logic}EndSelect}: if there is only one Case
+        ${${_Logic}EndSelect}:                            ; Place the EndSelect
+        !undef _LogicLib_EndSelectLabelUsed_${_Logic}
+      !endif
       !undef ${_Logic}EndSelect                           ; and remove it
     !endif
     !undef ${_Logic}Select
@@ -757,11 +812,11 @@
     !verbose ${LOGICLIB_VERBOSITY}
     !insertmacro _PushLogic
     !insertmacro _PushScope Switch ${_Logic}              ; Keep a separate stack for switch data
-    !insertmacro _PushScope Break _LogicLib_Label_${LOGICLIB_COUNTER}            ; Get a lable for beyond the end of the switch
+    !insertmacro _PushScope Break _LogicLib_Label_${LOGICLIB_COUNTER} ; Get a lable for beyond the end of the switch
     !insertmacro _IncreaseCounter
     !define ${_Switch}Var `${_a}`                         ; Remember the left hand side of the comparison
     !tempfile ${_Switch}Tmp                               ; Create a temporary file
-    !define ${_Logic}Switch _LogicLib_Label_${LOGICLIB_COUNTER}                  ; Get a label for the end of the switch
+    !define ${_Logic}Switch _LogicLib_Label_${LOGICLIB_COUNTER} ; Get a label for the end of the switch
     !insertmacro _IncreaseCounter
     Goto ${${_Logic}Switch}                               ; and go there
     !verbose pop
@@ -776,7 +831,7 @@
     !else ifndef _Switch                                  ; If not then check for an active Switch
       !error "Cannot use Case without a preceding Select or Switch"
     !else
-      !define _label _LogicLib_Label_${LOGICLIB_COUNTER}                         ; Get a label for this case,
+      !define _label _LogicLib_Label_${LOGICLIB_COUNTER}  ; Get a label for this case,
       !insertmacro _IncreaseCounter
       ${_label}:                                          ; place it and add it's check to the temp file
       !appendfile "${${_Switch}Tmp}" `!insertmacro _== $\`${${_Switch}Var}$\` $\`${_a}$\` ${_label} ""$\n`
@@ -795,7 +850,7 @@
     !else ifdef ${_Switch}Else                            ; Already had a default case?
       !error "Cannot use CaseElse following a CaseElse"
     !else
-      !define ${_Switch}Else _LogicLib_Label_${LOGICLIB_COUNTER}                 ; Get a label for the default case,
+      !define ${_Switch}Else _LogicLib_Label_${LOGICLIB_COUNTER} ; Get a label for the default case,
       !insertmacro _IncreaseCounter
       ${${_Switch}Else}:                                  ; and place it
     !endif
Index: tmp/org.txm.setups/nsis/Include/StrFunc.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/StrFunc.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/StrFunc.nsh	(revision 2956)
@@ -1,6 +1,6 @@
 /*
 o-----------------------------------------------------------------------------o
-|String Functions Header File 1.09                                            |
+|String Functions Header File 1.10                                            |
 (-----------------------------------------------------------------------------)
 | By deguix                                     / A Header file for NSIS 2.01 |
 | <cevo_deguix@yahoo.com.br>                   -------------------------------|
@@ -9,12 +9,10 @@
 o-----------------------------------------------------------------------------o
 */
 
-!verbose push
-!verbose 3
-!ifndef STRFUNC_VERBOSITY
-  !define STRFUNC_VERBOSITY 3
-!endif
-!define _STRFUNC_VERBOSITY ${STRFUNC_VERBOSITY}
+!verbose push 3
+!define /IfNDef STRFUNC_VERBOSITY 3
+!define /IfNDef _STRFUNC_VERBOSITY ${STRFUNC_VERBOSITY}
+!define /IfNDef _STRFUNC_CREDITVERBOSITY ${STRFUNC_VERBOSITY}
 !undef STRFUNC_VERBOSITY
 !verbose ${_STRFUNC_VERBOSITY}
 
@@ -22,19 +20,19 @@
 
 !ifndef STRFUNC
 
-  !define FALSE 0
-  !define TRUE 1
+  !define /IfNDef FALSE 0
+  !define /IfNDef TRUE 1
 
   ;Header File Identification
 
   !define STRFUNC `String Functions Header File`
-  !define STRFUNC_SHORT `StrFunc`
+  ;define STRFUNC_SHORT `StrFunc`
   !define STRFUNC_CREDITS `2004 Diego Pedroso`
 
   ;Header File Version
 
   !define STRFUNC_VERMAJ 1
-  !define STRFUNC_VERMED 09
+  !define STRFUNC_VERMED 10
  ;!define STRFUNC_VERMIN 0
  ;!define STRFUNC_VERBLD 0
 
@@ -47,154 +45,104 @@
 
   ;Header File Init Message
 
-  !verbose push
-  !verbose 4
+  !verbose push ${_STRFUNC_CREDITVERBOSITY}
   !echo `${STRFUNC_INITMSGPRE}NSIS ${STRFUNC} ${STRFUNC_VER} - Copyright ${STRFUNC_CREDITS}${STRFUNC_INITMSGPOST}`
   !verbose pop
 
-  ;Header File Function Init Message Prefix and Postfix
-
-  !define STRFUNC_FUNCMSGPRE ``
-  !define STRFUNC_FUNCMSGPOST ``
-  
   ;Header File Function Macros
 
+  !ifdef STRFUNC_USECALLARTIFICIALFUNCTION
+    !include Util.nsh
+  !endif
+
+  !define "Using:StrFunc" `!insertmacro STRFUNC_USING `
+  !macro STRFUNC_USING Name
+    !if "${STRFUNC_VERBOSITY}" > 4
+      !verbose push 4
+    !endif
+    !ifndef ${Name}_INCLUDED
+      ${${Name}} ; Invoke !insertmacro STRFUNC_MAKEFUNC
+    !endif
+    !if "${STRFUNC_VERBOSITY}" > 4
+      !verbose pop
+    !endif
+  !macroend
+
   !macro STRFUNC_FUNCLIST_INSERT Name
     !ifdef StrFunc_List
-      !define StrFunc_List2 `${StrFunc_List}`
-      !undef StrFunc_List
-      !define StrFunc_List `${StrFunc_List2}|${Name}`
-      !undef StrFunc_List2
+      !define /ReDef StrFunc_List `${StrFunc_List}|${Name}`
     !else
       !define StrFunc_List `${Name}`
     !endif
   !macroend
 
-  !macro STRFUNC_DEFFUNC Name
+  !macro STRFUNC_DEFFUNC Name List TypeList
     !insertmacro STRFUNC_FUNCLIST_INSERT ${Name}
-  
-    !define `${Name}` `!insertmacro FUNCTION_STRING_${Name}`
-    !define `Un${Name}` `!insertmacro FUNCTION_STRING_Un${Name}`
-  !macroend
-  
-  !macro STRFUNC_FUNC ShortName Credits
-    !verbose push
-    !verbose 4
-
-    !ifndef `Un${ShortName}`
-      !echo `${STRFUNC_FUNCMSGPRE}$ {Un${ShortName}} - Copyright ${Credits}${STRFUNC_FUNCMSGPOST}`
-      !verbose pop
-      !define `Un${ShortName}` `!insertmacro FUNCTION_STRING_Un${ShortName}_Call`
-      !define `Un${ShortName}_INCLUDED`
-      Function `un.${ShortName}`
+    !define `${Name}_List` `${List}`
+    !define `${Name}_TypeList` `${TypeList}`
+    !ifdef STRFUNC_USECALLARTIFICIALFUNCTION
+      !define `${Name}` `!insertmacro STRFUNC_CALL_${Name} "${un}" `
+      !define `Un${Name}` `!insertmacro STRFUNC_CALL_${Name} "${un}" `
     !else
-      !echo `${STRFUNC_FUNCMSGPRE}$ {${ShortName}} - Copyright ${Credits}${STRFUNC_FUNCMSGPOST}`
-      !verbose pop
-      !undef `${ShortName}`
-      !define `${ShortName}` `!insertmacro FUNCTION_STRING_${ShortName}_Call`
-      !define `${ShortName}_INCLUDED`
-      Function `${ShortName}`
+      !define `${Name}` `!insertmacro STRFUNC_MAKEFUNC ${Name} ""`
+      !define `Un${Name}` `!insertmacro STRFUNC_MAKEFUNC ${Name} Un`
     !endif
   !macroend
 
-  ;Function Names Startup Definition
-
-  !insertmacro STRFUNC_DEFFUNC StrCase
-  !define StrCase_List `ResultVar|String|Type`
-  !define StrCase_TypeList `Output|Text|Option  U L T S <>`
-  !macro `FUNCTION_STRING_UnStrCase`
-    !undef UnStrCase
-    !insertmacro FUNCTION_STRING_StrCase
+  !macro STRFUNC_MAKEFUNC basename un
+    !insertmacro STRFUNC_MAKEFUNC_${basename}
   !macroend
-  
-  !insertmacro STRFUNC_DEFFUNC StrClb
-  !define StrClb_List `ResultVar|String|Action`
-  !define StrClb_TypeList `Output|Text|Option  > < <>`
-  !macro `FUNCTION_STRING_UnStrClb`
-    !undef UnStrClb
-    !insertmacro FUNCTION_STRING_StrClb
-  !macroend
 
-  !insertmacro STRFUNC_DEFFUNC StrIOToNSIS
-  !define StrIOToNSIS_List `ResultVar|String`
-  !define StrIOToNSIS_TypeList `Output|Text`
-  !macro `FUNCTION_STRING_UnStrIOToNSIS`
-    !undef UnStrIOToNSIS
-    !insertmacro FUNCTION_STRING_StrIOToNSIS
+  !macro STRFUNC_BEGINFUNC basename un credits
+    !verbose push ${_STRFUNC_CREDITVERBOSITY}
+    !echo `${U+24}{${un}${basename}} - Copyright ${credits}`
+    !verbose pop
+    !define ${un}${basename}_INCLUDED
+    !ifndef STRFUNC_USECALLARTIFICIALFUNCTION
+      !define /ReDef ${un}${basename} `!insertmacro STRFUNC_CALL_${basename} "${un}" `
+      !if "${un}" != ""
+        Function un.${basename}
+      !else
+        Function ${basename}
+      !endif
+    !endif
   !macroend
-
-  !insertmacro STRFUNC_DEFFUNC StrLoc
-  !define StrLoc_List `ResultVar|String|StrToSearchFor|CounterDirection`
-  !define StrLoc_TypeList `Output|Text|Text|Option > <`
-  !macro `FUNCTION_STRING_UnStrLoc`
-    !undef UnStrLoc
-    !insertmacro FUNCTION_STRING_StrLoc
+  !macro STRFUNC_ENDFUNC
+    !ifndef STRFUNC_USECALLARTIFICIALFUNCTION
+      FunctionEnd
+    !endif
   !macroend
 
-  !insertmacro STRFUNC_DEFFUNC StrNSISToIO
-  !define StrNSISToIO_List `ResultVar|String`
-  !define StrNSISToIO_TypeList `Output|Text`
-  !macro `FUNCTION_STRING_UnStrNSISToIO`
-    !undef UnStrNSISToIO
-    !insertmacro FUNCTION_STRING_StrNSISToIO
+  !macro STRFUNC_CALL basename un
+    !ifdef STRFUNC_USECALLARTIFICIALFUNCTION
+      ${CallArtificialFunction} STRFUNC_MAKEFUNC_${basename}
+    !else
+      !if "${un}" != ""
+        Call un.${basename}
+      !else
+        Call ${basename}
+      !endif
+    !endif
   !macroend
 
-  !insertmacro STRFUNC_DEFFUNC StrRep
-  !define StrRep_List `ResultVar|String|StrToReplace|ReplacementString`
-  !define StrRep_TypeList `Output|Text|Text|Text`
-  !macro `FUNCTION_STRING_UnStrRep`
-    !undef UnStrRep
-    !insertmacro FUNCTION_STRING_StrRep
-  !macroend
 
-  !insertmacro STRFUNC_DEFFUNC StrSort
-  !define StrSort_List `ResultVar|String|LeftStr|CenterStr|RightStr|IncludeLeftStr|IncludeCenterStr|IncludeRightStr`
-  !define StrSort_TypeList `Output|Text|Text|Text|Text|Option 1 0|Option 1 0|Option 1 0`
-  !macro `FUNCTION_STRING_UnStrSort`
-    !undef UnStrSort
-    !insertmacro FUNCTION_STRING_StrSort
-  !macroend
+  ############################################################################  
+  # StrCase
+  !insertmacro STRFUNC_DEFFUNC StrCase `ResultVar|String|Type` `Output|Text|Option  U L T S <>`
 
-  !insertmacro STRFUNC_DEFFUNC StrStr
-  !define StrStr_List `ResultVar|String|StrToSearchFor`
-  !define StrStr_TypeList `Output|Text|Text`
-  !macro `FUNCTION_STRING_UnStrStr`
-    !undef UnStrStr
-    !insertmacro FUNCTION_STRING_StrStr
+  !macro STRFUNC_CALL_StrCase un ResultVar String Type
+    !verbose push ${STRFUNC_VERBOSITY}
+    !echo `${U+24}{${un}StrCase} "${ResultVar}" "${String}" "${Type}"`
+    !verbose 2
+    Push `${String}`
+    Push `${Type}`
+    !insertmacro STRFUNC_CALL StrCase "${un}"
+    Pop ${ResultVar}
+    !verbose pop
   !macroend
 
-  !insertmacro STRFUNC_DEFFUNC StrStrAdv
-  !define StrStrAdv_List `ResultVar|String|StrToSearchFor|SearchDirection|ResultStrDirection|DisplayStrToSearch|Loops|CaseSensitive`
-  !define StrStrAdv_TypeList `Output|Text|Text|Option > <|Option > <|Option 1 0|Text|Option 0 1`
-  !macro `FUNCTION_STRING_UnStrStrAdv`
-    !undef UnStrStrAdv
-    !insertmacro FUNCTION_STRING_StrStrAdv
-  !macroend
-
-  !insertmacro STRFUNC_DEFFUNC StrTok
-  !define StrTok_List `ResultVar|String|Separators|ResultPart|SkipEmptyParts`
-  !define StrTok_TypeList `Output|Text|Text|Mixed L|Option 1 0`
-  !macro `FUNCTION_STRING_UnStrTok`
-    !undef UnStrTok
-    !insertmacro FUNCTION_STRING_StrTok
-  !macroend
-
-  !insertmacro STRFUNC_DEFFUNC StrTrimNewLines
-  !define StrTrimNewLines_List `ResultVar|String`
-  !define StrTrimNewLines_TypeList `Output|Text`
-  !macro `FUNCTION_STRING_UnStrTrimNewLines`
-    !undef UnStrTrimNewLines
-    !insertmacro FUNCTION_STRING_StrTrimNewLines
-  !macroend
-
-  ;Function Codes for Install and Uninstall
-
-  # Function StrCase
-  ################
-
-  !macro FUNCTION_STRING_StrCase
-    !insertmacro STRFUNC_FUNC `StrCase` `2004 Diego Pedroso - Based on functions by Dave Laundon`
-
+  !macro STRFUNC_MAKEFUNC_StrCase
+    !insertmacro STRFUNC_BEGINFUNC ${basename} `${un}` `2004 Diego Pedroso - Based on functions by Dave Laundon`
     /*After this point:
       ------------------------------------------
        $0 = String (input)
@@ -285,7 +233,7 @@
           ; Else convert to lower case.
 
           ;Use "IsCharAlpha" for the job
-          System::Call "*(&t1 r7) i .r8"
+          System::Call "*(&t1 r7) p .r8"
           System::Call "*$8(&i1 .r7)"
           System::Free $8
           System::Call "user32::IsCharAlpha(i r7) i .r8"
@@ -325,7 +273,7 @@
           ; Switch all characters cases to their inverse case.
 
           ;Use "IsCharUpper" for the job
-          System::Call "*(&t1 r6) i .r8"
+          System::Call "*(&t1 r6) p .r8"
           System::Call "*$8(&i1 .r7)"
           System::Free $8
           System::Call "user32::IsCharUpper(i r7) i .r8"
@@ -365,13 +313,28 @@
       Pop $2
       Pop $1
       Exch $0
-    FunctionEnd
+    !insertmacro STRFUNC_ENDFUNC
 
   !macroend
 
-  !macro FUNCTION_STRING_StrClb
-    !insertmacro STRFUNC_FUNC `StrClb` `2004 Diego Pedroso - Based on functions by Nik Medved`
+  ############################################################################  
+  # StrClb
+  !insertmacro STRFUNC_DEFFUNC StrClb `ResultVar|String|Action` `Output|Text|Option  > < <>`
 
+  !macro STRFUNC_CALL_StrClb un ResultVar String Action
+    !verbose push ${STRFUNC_VERBOSITY}
+    !echo `${U+24}{${un}StrClb} "${ResultVar}" "${String}" "${Action}"`
+    !verbose 2
+    Push `${String}`
+    Push `${Action}`
+    !insertmacro STRFUNC_CALL StrClb "${un}"
+    Pop ${ResultVar}
+    !verbose pop
+  !macroend
+
+  !macro STRFUNC_MAKEFUNC_StrClb
+    !insertmacro STRFUNC_BEGINFUNC ${basename} `${un}` `2004 Diego Pedroso - Based on functions by Nik Medved`
+
     /*After this point:
       ------------------------------------------
        $0 = String (input)
@@ -395,7 +358,7 @@
       StrCpy $4 ""
 
       ;Open the clipboard to do the operations the user chose (kichik's fix)
-      System::Call 'user32::OpenClipboard(i $HWNDPARENT)'
+      System::Call 'user32::OpenClipboard(p $HWNDPARENT)'
 
       ${If} $1 == ">" ;Set
 
@@ -405,43 +368,44 @@
         ;Step 2: Allocate global heap
         StrLen $2 $0
         IntOp $2 $2 + 1
-        System::Call 'kernel32::GlobalAlloc(i 2, i r2) i.r2'
+        IntOp $2 $2 * ${NSIS_CHAR_SIZE}
+        System::Call 'kernel32::GlobalAlloc(i 2, i r2) p.r2'
 
         ;Step 3: Lock the handle
-        System::Call 'kernel32::GlobalLock(i r2) i.r3'
+        System::Call 'kernel32::GlobalLock(p r2) i.r3'
 
         ;Step 4: Copy the text to locked clipboard buffer
-        System::Call 'kernel32::lstrcpyA(i r3, t r0)'
+        System::Call 'kernel32::lstrcpy(p r3, t r0)'
 
         ;Step 5: Unlock the handle again
-        System::Call 'kernel32::GlobalUnlock(i r2)'
+        System::Call 'kernel32::GlobalUnlock(p r2)'
 
         ;Step 6: Set the information to the clipboard
-        System::Call 'user32::SetClipboardData(i 1, i r2)'
+        System::Call 'user32::SetClipboardData(i 1, p r2)'
 
         StrCpy $0 ""
 
       ${ElseIf} $1 == "<" ;Get
 
         ;Step 1: Get clipboard data
-        System::Call 'user32::GetClipboardData(i 1) i .r2'
+        System::Call 'user32::GetClipboardData(i 1) p .r2'
 
         ;Step 2: Lock and copy data (kichik's fix)
-        System::Call 'kernel32::GlobalLock(i r2) t .r0'
+        System::Call 'kernel32::GlobalLock(p r2) t .r0'
 
         ;Step 3: Unlock (kichik's fix)
-        System::Call 'kernel32::GlobalUnlock(i r2)'
+        System::Call 'kernel32::GlobalUnlock(p r2)'
 
       ${ElseIf} $1 == "<>" ;Swap
 
         ;Step 1: Get clipboard data
-        System::Call 'user32::GetClipboardData(i 1) i .r2'
+        System::Call 'user32::GetClipboardData(i 1) p .r2'
 
         ;Step 2: Lock and copy data (kichik's fix)
-        System::Call 'kernel32::GlobalLock(i r2) t .r4'
+        System::Call 'kernel32::GlobalLock(p r2) t .r4'
 
         ;Step 3: Unlock (kichik's fix)
-        System::Call 'kernel32::GlobalUnlock(i r2)'
+        System::Call 'kernel32::GlobalUnlock(p r2)'
 
         ;Step 4: Clear the clipboard
         System::Call 'user32::EmptyClipboard()'
@@ -449,19 +413,20 @@
         ;Step 5: Allocate global heap
         StrLen $2 $0
         IntOp $2 $2 + 1
-        System::Call 'kernel32::GlobalAlloc(i 2, i r2) i.r2'
+        IntOp $2 $2 * ${NSIS_CHAR_SIZE}
+        System::Call 'kernel32::GlobalAlloc(i 2, i r2) p.r2'
 
         ;Step 6: Lock the handle
-        System::Call 'kernel32::GlobalLock(i r2) i.r3'
+        System::Call 'kernel32::GlobalLock(p r2) i.r3'
 
         ;Step 7: Copy the text to locked clipboard buffer
-        System::Call 'kernel32::lstrcpyA(i r3, t r0)'
+        System::Call 'kernel32::lstrcpy(p r3, t r0)'
 
         ;Step 8: Unlock the handle again
-        System::Call 'kernel32::GlobalUnlock(i r2)'
+        System::Call 'kernel32::GlobalUnlock(p r2)'
 
         ;Step 9: Set the information to the clipboard
-        System::Call 'user32::SetClipboardData(i 1, i r2)'
+        System::Call 'user32::SetClipboardData(i 1, p r2)'
         
         StrCpy $0 $4
       ${Else} ;Clear
@@ -485,16 +450,27 @@
       Pop $2
       Pop $1
       Exch $0
-    FunctionEnd
+    !insertmacro STRFUNC_ENDFUNC
 
   !macroend
 
-  # Function StrIOToNSIS
-  ####################
+  ############################################################################  
+  # StrIOToNSIS
+  !insertmacro STRFUNC_DEFFUNC StrIOToNSIS `ResultVar|String` `Output|Text`
 
-  !macro FUNCTION_STRING_StrIOToNSIS
-    !insertmacro STRFUNC_FUNC `StrIOToNSIS` `2004 "bluenet" - Based on functions by Amir Szekely, Joost Verburg, Dave Laundon and Diego Pedroso`
+  !macro STRFUNC_CALL_StrIOToNSIS un ResultVar String
+    !verbose push ${STRFUNC_VERBOSITY}
+    !echo `${U+24}{${un}StrIOToNSIS} "${ResultVar}" "${String}"`
+    !verbose 2
+    Push `${String}`
+    !insertmacro STRFUNC_CALL StrIOToNSIS "${un}"
+    Pop ${ResultVar}
+    !verbose pop
+  !macroend
 
+  !macro STRFUNC_MAKEFUNC_StrIOToNSIS
+    !insertmacro STRFUNC_BEGINFUNC ${basename} `${un}` `2004 "bluenet" - Based on functions by Amir Szekely, Joost Verburg, Dave Laundon and Diego Pedroso`
+
     /*After this point:
       ------------------------------------------
        $R0 = String (input/output)
@@ -547,15 +523,28 @@
       Pop $R2
       Pop $R1
       Exch $R0
-    FunctionEnd
+    !insertmacro STRFUNC_ENDFUNC
   !macroend
 
-  # Function StrLoc
-  ###############
+  ############################################################################  
+  # StrLoc
+  !insertmacro STRFUNC_DEFFUNC StrLoc `ResultVar|String|StrToSearchFor|CounterDirection` `Output|Text|Text|Option > <`
 
-  !macro FUNCTION_STRING_StrLoc
-    !insertmacro STRFUNC_FUNC `StrLoc` `2004 Diego Pedroso - Based on functions by Ximon Eighteen`
+  !macro STRFUNC_CALL_StrLoc un ResultVar String StrToSearchFor OffsetDirection
+    !verbose push ${STRFUNC_VERBOSITY}
+    !echo `${U+24}{${un}StrLoc} "${ResultVar}" "${String}" "${StrToSearchFor}" "${OffsetDirection}"`
+    !verbose 2
+    Push `${String}`
+    Push `${StrToSearchFor}`
+    Push `${OffsetDirection}`
+    !insertmacro STRFUNC_CALL StrLoc "${un}"
+    Pop ${ResultVar}
+    !verbose pop
+  !macroend
 
+  !macro STRFUNC_MAKEFUNC_StrLoc
+    !insertmacro STRFUNC_BEGINFUNC ${basename} `${un}` `2004 Diego Pedroso - Based on functions by Ximon Eighteen`
+
     /*After this point:
       ------------------------------------------
        $R0 = OffsetDirection (input)
@@ -616,16 +605,27 @@
       Exch
       Pop $R1
       Exch $R0
-    FunctionEnd
+    !insertmacro STRFUNC_ENDFUNC
 
   !macroend
 
-  # Function StrNSISToIO
-  ####################
+  ############################################################################  
+  # StrNSISToIO
+  !insertmacro STRFUNC_DEFFUNC StrNSISToIO `ResultVar|String` `Output|Text`
 
-  !macro FUNCTION_STRING_StrNSISToIO
-    !insertmacro STRFUNC_FUNC `StrNSISToIO` `2004 "bluenet" - Based on functions by Amir Szekely, Joost Verburg, Dave Laundon and Diego Pedroso`
+  !macro STRFUNC_CALL_StrNSISToIO un ResultVar String
+    !verbose push ${STRFUNC_VERBOSITY}
+    !echo `${U+24}{${un}StrNSISToIO} "${ResultVar}" "${String}"`
+    !verbose 2
+    Push `${String}`
+    !insertmacro STRFUNC_CALL StrNSISToIO "${un}"
+    Pop ${ResultVar}
+    !verbose pop
+  !macroend
 
+  !macro STRFUNC_MAKEFUNC_StrNSISToIO
+    !insertmacro STRFUNC_BEGINFUNC ${basename} `${un}` `2004 "bluenet" - Based on functions by Amir Szekely, Joost Verburg, Dave Laundon and Diego Pedroso`
+
     /*After this point:
       ------------------------------------------
        $R0 = String (input/output)
@@ -679,15 +679,28 @@
       Pop $R2
       Pop $R1
       Exch $R0
-    FunctionEnd
+    !insertmacro STRFUNC_ENDFUNC
   !macroend
 
-  # Function StrRep
-  ###############
+  ############################################################################  
+  # StrRep
+  !insertmacro STRFUNC_DEFFUNC StrRep `ResultVar|String|StrToReplace|ReplacementString` `Output|Text|Text|Text`
 
-  !macro FUNCTION_STRING_StrRep
-    !insertmacro STRFUNC_FUNC `StrRep` `2004 Diego Pedroso - Based on functions by Hendri Adriaens`
+  !macro STRFUNC_CALL_StrRep un ResultVar String StringToReplace ReplacementString
+    !verbose push ${STRFUNC_VERBOSITY}
+    !echo `${U+24}{${un}StrRep} "${ResultVar}" "${String}" "${StringToReplace}" "${ReplacementString}"`
+    !verbose 2
+    Push `${String}`
+    Push `${StringToReplace}`
+    Push `${ReplacementString}`
+    !insertmacro STRFUNC_CALL StrRep "${un}"
+    Pop ${ResultVar}
+    !verbose pop
+  !macroend
 
+  !macro STRFUNC_MAKEFUNC_StrRep
+    !insertmacro STRFUNC_BEGINFUNC ${basename} `${un}` `2004 Diego Pedroso - Based on functions by Hendri Adriaens`
+
     /*After this point:
       ------------------------------------------
        $R0 = ReplacementString (input)
@@ -770,16 +783,33 @@
       Pop $R2
       Pop $R1
       Exch $R0
-    FunctionEnd
+    !insertmacro STRFUNC_ENDFUNC
 
   !macroend
 
-  # Function StrSort
-  ################
+  ############################################################################  
+  # StrSort
+  !insertmacro STRFUNC_DEFFUNC StrSort `ResultVar|String|CenterStr|LeftStr|RightStr|IncludeLeftStr|IncludeCenterStr|IncludeRightStr` `Output|Text|Text|Text|Text|Option 1 0|Option 1 0|Option 1 0`
 
-  !macro FUNCTION_STRING_StrSort
-    !insertmacro STRFUNC_FUNC `StrSort` `2004 Diego Pedroso - Based on functions by Stuart Welch`
+  !macro STRFUNC_CALL_StrSort un ResultVar String CenterStr LeftStr RightStr IncludeCenterStr IncludeLeftStr IncludeRightStr
+    !verbose push ${STRFUNC_VERBOSITY}
+    !echo `${U+24}{${un}StrSort} "${ResultVar}" "${String}" "${CenterStr}" "${LeftStr}" "${RightStr}" "${IncludeCenterStr}" "${IncludeLeftStr}" "${IncludeRightStr}"`
+    !verbose 2
+    Push `${String}`
+    Push `${CenterStr}`
+    Push `${LeftStr}`
+    Push `${RightStr}`
+    Push `${IncludeCenterStr}`
+    Push `${IncludeLeftStr}`
+    Push `${IncludeRightStr}`
+    !insertmacro STRFUNC_CALL StrSort "${un}"
+    Pop ${ResultVar}
+    !verbose pop
+  !macroend
 
+  !macro STRFUNC_MAKEFUNC_StrSort
+    !insertmacro STRFUNC_BEGINFUNC ${basename} `${un}` `2004 Diego Pedroso - Based on functions by Stuart Welch`
+
     /*After this point:
       ------------------------------------------
        $R0 = String (input)
@@ -977,16 +1007,28 @@
       Pop $R2
       Pop $R1
       Exch $R0
-    FunctionEnd
+    !insertmacro STRFUNC_ENDFUNC
 
   !macroend
-  
-  # Function StrStr
-  ###############
 
-  !macro FUNCTION_STRING_StrStr
-    !insertmacro STRFUNC_FUNC `StrStr` `2004 Diego Pedroso - Based on functions by Ximon Eighteen`
+  ############################################################################  
+  # StrStr
+  !insertmacro STRFUNC_DEFFUNC StrStr `ResultVar|String|StrToSearchFor` `Output|Text|Text`
 
+  !macro STRFUNC_CALL_StrStr un ResultVar String StrToSearchFor
+    !verbose push ${STRFUNC_VERBOSITY}
+    !echo `${U+24}{${un}StrStr} "${ResultVar}" "${String}" "${StrToSearchFor}"`
+    !verbose 2
+    Push `${String}`
+    Push `${StrToSearchFor}`
+    !insertmacro STRFUNC_CALL StrStr "${un}"
+    Pop ${ResultVar}
+    !verbose pop
+  !macroend
+
+  !macro STRFUNC_MAKEFUNC_StrStr
+    !insertmacro STRFUNC_BEGINFUNC ${basename} `${un}` `2004 Diego Pedroso - Based on functions by Ximon Eighteen`
+
     /*After this point:
       ------------------------------------------
        $R0 = StrToSearch (input)
@@ -1038,16 +1080,33 @@
       Pop $R2
       Pop $R1
       Exch $R0
-    FunctionEnd
+    !insertmacro STRFUNC_ENDFUNC
 
   !macroend
 
-  # Function StrStrAdv
-  ##################
+  ############################################################################  
+  # StrStrAdv
+  !insertmacro STRFUNC_DEFFUNC StrStrAdv `ResultVar|String|StrToSearchFor|SearchDirection|ResultStrDirection|DisplayStrToSearch|Loops|CaseSensitive` `Output|Text|Text|Option > <|Option > <|Option 1 0|Text|Option 0 1`
 
-  !macro FUNCTION_STRING_StrStrAdv
-    !insertmacro STRFUNC_FUNC `StrStrAdv` `2003-2004 Diego Pedroso`
+  !macro STRFUNC_CALL_StrStrAdv un ResultVar String StrToSearchFor SearchDirection ResultStrDirection DisplayStrToSearch Loops CaseSensitive
+    !verbose push ${STRFUNC_VERBOSITY}
+    !echo `${U+24}{${un}StrStrAdv} "${ResultVar}" "${String}" "${StrToSearchFor}" "${SearchDirection}" "${ResultStrDirection}" "${DisplayStrToSearch}" "${Loops}" "${CaseSensitive}"`
+    !verbose 2
+    Push `${String}`
+    Push `${StrToSearchFor}`
+    Push `${SearchDirection}`
+    Push `${ResultStrDirection}`
+    Push `${DisplayStrToSearch}`
+    Push `${Loops}`
+    Push `${CaseSensitive}`
+    !insertmacro STRFUNC_CALL StrStrAdv "${un}"
+    Pop ${ResultVar}
+    !verbose pop
+  !macroend
 
+  !macro STRFUNC_MAKEFUNC_StrStrAdv
+    !insertmacro STRFUNC_BEGINFUNC ${basename} `${un}` `2003-2004 Diego Pedroso`
+
     /*After this point:
       ------------------------------------------
        $0 = String (input)
@@ -1192,7 +1251,7 @@
         ; variable because it won't be used anymore
 
         ${If} $6 == 1
-          System::Call `kernel32::lstrcmpA(ts, ts) i.s` `$R3` `$1`
+          System::Call `kernel32::lstrcmp(ts, ts) i.s` `$R3` `$1`
           Pop $R3
           ${If} $R3 = 0
             StrCpy $R3 1 ; Continue
@@ -1301,15 +1360,29 @@
       Exch
       Pop $0
 
-    FunctionEnd
+    !insertmacro STRFUNC_ENDFUNC
 
   !macroend
 
-  # Function StrTok
-  ###############
+  ############################################################################  
+  # StrTok
+  !insertmacro STRFUNC_DEFFUNC StrTok `ResultVar|String|Separators|ResultPart|SkipEmptyParts` `Output|Text|Text|Mixed L|Option 1 0`
 
-  !macro FUNCTION_STRING_StrTok
-    !insertmacro STRFUNC_FUNC `StrTok` `2004 Diego Pedroso - Based on functions by "bigmac666"`
+  !macro STRFUNC_CALL_StrTok un ResultVar String Separators ResultPart SkipEmptyParts
+    !verbose push ${STRFUNC_VERBOSITY}
+    !echo `${U+24}{${un}StrTok} "${ResultVar}" "${String}" "${Separators}" "${ResultPart}" "${SkipEmptyParts}"`
+    !verbose 2
+    Push `${String}`
+    Push `${Separators}`
+    Push `${ResultPart}`
+    Push `${SkipEmptyParts}`
+    !insertmacro STRFUNC_CALL StrTok "${un}"
+    Pop ${ResultVar}
+    !verbose pop
+  !macroend
+
+  !macro STRFUNC_MAKEFUNC_StrTok
+    !insertmacro STRFUNC_BEGINFUNC ${basename} `${un}` `2004 Diego Pedroso - Based on functions by "bigmac666"`
     /*After this point:
       ------------------------------------------
        $0 = SkipEmptyParts (input)
@@ -1447,16 +1520,27 @@
       Pop $1
       Pop $2
       Exch $3
-    FunctionEnd
+    !insertmacro STRFUNC_ENDFUNC
 
   !macroend
 
-  # Function StrTrimNewLines
-  ########################
+  ############################################################################  
+  # StrTrimNewLines
+  !insertmacro STRFUNC_DEFFUNC StrTrimNewLines `ResultVar|String` `Output|Text`
 
-  !macro FUNCTION_STRING_StrTrimNewLines
-    !insertmacro STRFUNC_FUNC `StrTrimNewLines` `2004 Diego Pedroso - Based on functions by Ximon Eighteen`
+  !macro STRFUNC_CALL_StrTrimNewLines un ResultVar String
+    !verbose push ${STRFUNC_VERBOSITY}
+    !echo `${U+24}{${un}StrTrimNewLines} "${ResultVar}" "${String}"`
+    !verbose 2
+    Push `${String}`
+    !insertmacro STRFUNC_CALL StrTrimNewLines "${un}"
+    Pop ${ResultVar}
+    !verbose pop
+  !macroend
 
+  !macro STRFUNC_MAKEFUNC_StrTrimNewLines
+    !insertmacro STRFUNC_BEGINFUNC ${basename} `${un}` `2004 Diego Pedroso - Based on functions by Ximon Eighteen`
+
     /*After this point:
       ------------------------------------------
        $R0 = String (input)
@@ -1496,287 +1580,12 @@
       Pop $R2
       Pop $R1
       Exch $R0
-    FunctionEnd
+    !insertmacro STRFUNC_ENDFUNC
 
   !macroend
 
-  ;Function Calls for Install and Uninstall
+  ############################################################################  
 
-  !macro FUNCTION_STRING_StrCase_Call ResultVar String Type
-    !verbose push
-    !verbose 4
-    !echo `$ {StrCase} "${ResultVar}" "${String}" "${Type}"`
-    !verbose pop
-
-    Push `${String}`
-    Push `${Type}`
-    Call StrCase
-    Pop `${ResultVar}`
-  !macroend
-  !macro FUNCTION_STRING_UnStrCase_Call ResultVar String Type
-    !verbose push
-    !verbose 4
-    !echo `$ {UnStrCase} "${ResultVar}" "${String}" "${Type}"`
-    !verbose pop
-
-    Push `${String}`
-    Push `${Type}`
-    Call un.StrCase
-    Pop `${ResultVar}`
-  !macroend
-
-  !macro FUNCTION_STRING_StrClb_Call ResultVar String Action
-    !verbose push
-    !verbose 4
-    !echo `$ {StrClb} "${ResultVar}" "${String}" "${Action}"`
-    !verbose pop
-
-    Push `${String}`
-    Push `${Action}`
-    Call StrClb
-    Pop `${ResultVar}`
-  !macroend
-  !macro FUNCTION_STRING_UnStrClb_Call ResultVar String Action
-    !verbose push
-    !verbose 4
-    !echo `$ {UnStrClb} "${ResultVar}" "${String}" "${Action}"`
-    !verbose pop
-
-    Push `${String}`
-    Push `${Action}`
-    Call un.StrClb
-    Pop `${ResultVar}`
-  !macroend
-
-  !macro FUNCTION_STRING_StrIOToNSIS_Call ResultVar String
-    !verbose push
-    !verbose 4
-    !echo `$ {StrIOToNSIS} "${ResultVar}" "${String}"`
-    !verbose pop
-
-    Push `${String}`
-    Call StrIOToNSIS
-    Pop `${ResultVar}`
-  !macroend
-  !macro FUNCTION_STRING_UnStrIOToNSIS_Call ResultVar String
-    !verbose push
-    !verbose 4
-    !echo `$ {UnStrIOToNSIS} "${ResultVar}" "${String}"`
-    !verbose pop
-
-    Push `${String}`
-    Call un.StrIOToNSIS
-    Pop `${ResultVar}`
-  !macroend
-
-  !macro FUNCTION_STRING_StrLoc_Call ResultVar String StrToSearchFor OffsetDirection
-    !verbose push
-    !verbose 4
-    !echo `$ {StrLoc} "${ResultVar}" "${String}" "${StrToSearchFor}" "${OffsetDirection}"`
-    !verbose pop
-
-    Push `${String}`
-    Push `${StrToSearchFor}`
-    Push `${OffsetDirection}`
-    Call StrLoc
-    Pop `${ResultVar}`
-  !macroend
-  !macro FUNCTION_STRING_UnStrLoc_Call ResultVar String StrToSearchFor OffsetDirection
-    !verbose push
-    !verbose 4
-    !echo `$ {UnStrLoc} "${ResultVar}" "${String}" "${StrToSearchFor}" "${OffsetDirection}"`
-    !verbose pop
-
-    Push `${String}`
-    Push `${StrToSearchFor}`
-    Push `${OffsetDirection}`
-    Call un.StrLoc
-    Pop `${ResultVar}`
-  !macroend
-
-  !macro FUNCTION_STRING_StrNSISToIO_Call ResultVar String
-    !verbose push
-    !verbose 4
-    !echo `$ {StrNSISToIO} "${ResultVar}" "${String}"`
-    !verbose pop
-
-    Push `${String}`
-    Call StrNSISToIO
-    Pop `${ResultVar}`
-  !macroend
-  !macro FUNCTION_STRING_UnStrNSISToIO_Call ResultVar String
-    !verbose push
-    !verbose 4
-    !echo `$ {UnStrNSISToIO} "${ResultVar}" "${String}"`
-    !verbose pop
-
-    Push `${String}`
-    Call un.StrNSISToIO
-    Pop `${ResultVar}`
-  !macroend
-
-  !macro FUNCTION_STRING_StrRep_Call ResultVar String StringToReplace ReplacementString
-    !verbose push
-    !verbose 4
-    !echo `$ {StrRep} "${ResultVar}" "${String}" "${StringToReplace}" "${ReplacementString}"`
-    !verbose pop
-
-    Push `${String}`
-    Push `${StringToReplace}`
-    Push `${ReplacementString}`
-    Call StrRep
-    Pop `${ResultVar}`
-  !macroend
-  !macro FUNCTION_STRING_UnStrRep_Call ResultVar String StringToReplace ReplacementString
-    !verbose push
-    !verbose 4
-    !echo `$ {UnStrRep} "${ResultVar}" "${String}" "${StringToReplace}" "${ReplacementString}"`
-    !verbose pop
-
-    Push `${String}`
-    Push `${StringToReplace}`
-    Push `${ReplacementString}`
-    Call un.StrRep
-    Pop `${ResultVar}`
-  !macroend
-
-  !macro FUNCTION_STRING_StrSort_Call ResultVar String CenterStr LeftStr RightStr IncludeCenterStr IncludeLeftStr IncludeRightStr
-    !verbose push
-    !verbose 4
-    !echo `$ {StrSort} "${ResultVar}" "${String}" "${CenterStr}" "${LeftStr}" "${RightStr}" "${IncludeCenterStr}" "${IncludeLeftStr}" "${IncludeRightStr}"`
-    !verbose pop
-
-    Push `${String}`
-    Push `${CenterStr}`
-    Push `${LeftStr}`
-    Push `${RightStr}`
-    Push `${IncludeCenterStr}`
-    Push `${IncludeLeftStr}`
-    Push `${IncludeRightStr}`
-    Call StrSort
-    Pop `${ResultVar}`
-  !macroend
-  !macro FUNCTION_STRING_UnStrSort_Call ResultVar String CenterStr LeftStr RightStr IncludeCenterStr IncludeLeftStr IncludeRightStr
-    !verbose push
-    !verbose 4
-    !echo `$ {UnStrSort} "${ResultVar}" "${String}" "${CenterStr}" "${LeftStr}" "${RightStr}" "${IncludeCenterStr}" "${IncludeLeftStr}" "${IncludeRightStr}"`
-    !verbose pop
-
-    Push `${String}`
-    Push `${CenterStr}`
-    Push `${LeftStr}`
-    Push `${RightStr}`
-    Push `${IncludeCenterStr}`
-    Push `${IncludeLeftStr}`
-    Push `${IncludeRightStr}`
-    Call un.StrSort
-    Pop `${ResultVar}`
-  !macroend
-
-  !macro FUNCTION_STRING_StrStr_Call ResultVar String StrToSearchFor
-    !verbose push
-    !verbose 4
-    !echo `$ {StrStr} "${ResultVar}" "${String}" "${StrToSearchFor}"`
-    !verbose pop
-
-    Push `${String}`
-    Push `${StrToSearchFor}`
-    Call StrStr
-    Pop `${ResultVar}`
-  !macroend
-  !macro FUNCTION_STRING_UnStrStr_Call ResultVar String StrToSearchFor
-    !verbose push
-    !verbose 4
-    !echo `$ {UnStrStr} "${ResultVar}" "${String}" "${StrToSearchFor}"`
-    !verbose pop
-
-    Push `${String}`
-    Push `${StrToSearchFor}`
-    Call un.StrStr
-    Pop `${ResultVar}`
-  !macroend
-
-  !macro FUNCTION_STRING_StrStrAdv_Call ResultVar String StrToSearchFor SearchDirection ResultStrDirection DisplayStrToSearch Loops CaseSensitive
-    !verbose push
-    !verbose 4
-    !echo `$ {StrStrAdv} "${ResultVar}" "${String}" "${StrToSearchFor}" "${SearchDirection}" "${ResultStrDirection}" "${DisplayStrToSearch}" "${Loops}" "${CaseSensitive}"`
-    !verbose pop
-
-    Push `${String}`
-    Push `${StrToSearchFor}`
-    Push `${SearchDirection}`
-    Push `${ResultStrDirection}`
-    Push `${DisplayStrToSearch}`
-    Push `${Loops}`
-    Push `${CaseSensitive}`
-    Call StrStrAdv
-    Pop `${ResultVar}`
-  !macroend
-  !macro FUNCTION_STRING_UnStrStrAdv_Call ResultVar String StrToSearchFor SearchDirection ResultStrDirection DisplayStrToSearch Loops CaseSensitive
-    !verbose push
-    !verbose 4
-    !echo `$ {UnStrStrAdv} "${ResultVar}" "${String}" "${StrToSearchFor}" "${SearchDirection}" "${ResultStrDirection}" "${DisplayStrToSearch}" "${Loops}" "${CaseSensitive}"`
-    !verbose pop
-
-    Push `${String}`
-    Push `${StrToSearchFor}`
-    Push `${SearchDirection}`
-    Push `${ResultStrDirection}`
-    Push `${DisplayStrToSearch}`
-    Push `${Loops}`
-    Push `${CaseSensitive}`
-    Call un.StrStrAdv
-    Pop `${ResultVar}`
-  !macroend
-
-  !macro FUNCTION_STRING_StrTok_Call ResultVar String Separators ResultPart SkipEmptyParts
-    !verbose push
-    !verbose 4
-    !echo `$ {StrTok} "${ResultVar}" "${String}" "${Separators}" "${ResultPart}" "${SkipEmptyParts}"`
-    !verbose pop
-
-    Push `${String}`
-    Push `${Separators}`
-    Push `${ResultPart}`
-    Push `${SkipEmptyParts}`
-    Call StrTok
-    Pop `${ResultVar}`
-  !macroend
-  !macro FUNCTION_STRING_UnStrTok_Call ResultVar String Separators ResultPart SkipEmptyParts
-    !verbose push
-    !verbose 4
-    !echo `$ {UnStrTok} "${ResultVar}" "${String}" "${Separators}" "${ResultPart}" "${SkipEmptyParts}"`
-    !verbose pop
-
-    Push `${String}`
-    Push `${Separators}`
-    Push `${ResultPart}`
-    Push `${SkipEmptyParts}`
-    Call un.StrTok
-    Pop `${ResultVar}`
-  !macroend
-
-  !macro FUNCTION_STRING_StrTrimNewLines_Call ResultVar String
-    !verbose push
-    !verbose 4
-    !echo `$ {StrTrimNewLines} "${ResultVar}" "${String}"`
-    !verbose pop
-
-    Push `${String}`
-    Call StrTrimNewLines
-    Pop `${ResultVar}`
-  !macroend
-  !macro FUNCTION_STRING_UnStrTrimNewLines_Call ResultVar String
-    !verbose push
-    !verbose 4
-    !echo `$ {UnStrTrimNewLines} "${ResultVar}" "${String}"`
-    !verbose pop
-
-    Push `${String}`
-    Call un.StrTrimNewLines
-    Pop `${ResultVar}`
-  !macroend
-
 !endif
 !verbose 3
 !define STRFUNC_VERBOSITY ${_STRFUNC_VERBOSITY}
Index: tmp/org.txm.setups/nsis/Include/WinMessages.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/WinMessages.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/WinMessages.nsh	(revision 2956)
@@ -25,6 +25,7 @@
 Prefix  Message category
 -------------------------
 SW      ShowWindow Commands
+CCM     Generic Common Control
 BM      Button control
 CB      Combo box control
 EM      Edit control
@@ -40,6 +41,12 @@
 STM     Static control
 TCM     Tab control
 PBM     Progress bar
+ACM     Animation control
+TBM     Track bar
+UDM     Up-down control
+HKM     Hot key control
+IPM     IP address control
+NCM     Network address control
 -----------------------------------
 
 NOT included messages (WM_USER + X)
@@ -47,18 +54,12 @@
 CBEM    Extended combo box control
 CDM     Common dialog box
 DL      Drag list box
-DTM     Date and time picker control
-HKM     Hot key control
-IPM     IP address control
-MCM     Month calendar control
 PGM     Pager control
 PSM     Property sheet
 RB      Rebar control
 TB      Toolbar
-TBM     Trackbar
 TTM     Tooltip control
 TVM     Tree-view control
-UDM     Up-down control
 -----------------------------------
 */
 
@@ -68,6 +69,15 @@
 !verbose push
 !verbose 3
 
+!define _NSIS_DEFAW '!insertmacro _NSIS_DEFAW '
+!macro _NSIS_DEFAW d
+!ifdef NSIS_UNICODE
+!define ${d} "${${d}W}"
+!else
+!define ${d} "${${d}A}"
+!endif
+!macroend
+
 !define HWND_BROADCAST      0xFFFF
 
 #ShowWindow Commands#
@@ -87,6 +97,25 @@
 !define SW_FORCEMINIMIZE    11
 !define SW_MAX              11
 
+#Generic Common Control Messages#
+!define CCM_FIRST 0x2000
+!define /math CCM_SETBKCOLOR       ${CCM_FIRST} + 0x1 ; IE4
+!define /math CCM_SETUNICODEFORMAT ${CCM_FIRST} + 0x5 
+!define /math CCM_GETUNICODEFORMAT ${CCM_FIRST} + 0x6
+!define /math CCM_SETVERSION       ${CCM_FIRST} + 0x7 ; IE5
+!define /math CCM_GETVERSION       ${CCM_FIRST} + 0x8
+!define /math CCM_SETWINDOWTHEME   ${CCM_FIRST} + 0xB ; WinXP
+!define /math CCM_DPISCALE         ${CCM_FIRST} + 0xC
+!define WM_USER 0x400
+
+!define CCS_TOP 1
+!define CCS_BOTTOM 3
+!define CCS_NODIVIDER 64
+!define CCS_LEFT 129
+!define CCS_RIGHT 131
+
+!define I_IMAGENONE -2
+
 #Button Control Messages#
 !define BM_CLICK           0x00F5
 !define BM_GETCHECK        0x00F0
@@ -96,6 +125,7 @@
 !define BM_SETIMAGE        0x00F7
 !define BM_SETSTATE        0x00F3
 !define BM_SETSTYLE        0x00F4
+!define BCM_SETSHIELD      0x160C ; WinVista + ComCtl32 v6
 
 !define BST_UNCHECKED      0
 !define BST_CHECKED        1
@@ -140,6 +170,11 @@
 !define CB_SETLOCALE                0x0159
 !define CB_SETTOPINDEX              0x015c
 !define CB_SHOWDROPDOWN             0x014F
+!define CBM_FIRST                   0x1700 ; Vista+
+!define /math CB_SETMINVISIBLE ${CBM_FIRST} + 1
+!define /math CB_GETMINVISIBLE ${CBM_FIRST} + 2
+!define /math CB_SETCUEBANNER  ${CBM_FIRST} + 3
+!define /math CB_GETCUEBANNER  ${CBM_FIRST} + 4
 
 !define CB_ERR                      -1
 
@@ -147,7 +182,6 @@
 !define EM_CANUNDO              0x00C6
 !define EM_CHARFROMPOS          0x00D7
 !define EM_EMPTYUNDOBUFFER      0x00CD
-!define EM_EXLIMITTEXT          0x0435
 !define EM_FMTLINES             0x00C8
 !define EM_GETFIRSTVISIBLELINE  0x00CE
 !define EM_GETHANDLE            0x00BD
@@ -184,7 +218,43 @@
 !define EM_SETTABSTOPS          0x00CB
 !define EM_SETWORDBREAKPROC     0x00D0
 !define EM_UNDO                 0x00C7
+!define ECM_FIRST               0x1500 ; CC6+
+!define /math EM_SETCUEBANNER ${ECM_FIRST} + 1
 
+#RichEdit Messages#
+!define /math EM_EXGETSEL        ${WM_USER} + 52
+!define /math EM_EXLIMITTEXT     ${WM_USER} + 53
+!define /math EM_EXLINEFROMCHAR  ${WM_USER} + 54
+!define /math EM_GETEVENTMASK    ${WM_USER} + 59
+!define /math EM_GETOLEINTERFACE ${WM_USER} + 60
+!define /math EM_HIDESELECTION   ${WM_USER} + 63
+!define /math EM_SETBKGNDCOLOR   ${WM_USER} + 67
+!define /math EM_SETEVENTMASK    ${WM_USER} + 69
+!define /math EM_STREAMIN        ${WM_USER} + 73
+!define /math EM_STREAMOUT       ${WM_USER} + 74
+!define /math EM_GETTEXTRANGE    ${WM_USER} + 75
+!define /math EM_SETOPTIONS      ${WM_USER} + 77
+!define /math EM_GETOPTIONS      ${WM_USER} + 78
+!define /math EM_SETUNDOLIMIT    ${WM_USER} + 82 ; v2+
+!define /math EM_AUTOURLDETECT   ${WM_USER} + 91
+!define /Math EM_SETTEXTEX       ${WM_USER} + 97 ; v3+
+!define /math EM_SETEDITSTYLE    ${WM_USER} + 204
+!define /math EM_SETFONTSIZE     ${WM_USER} + 223
+
+!define EN_MSGFILTER 0x0700
+!define EN_SELCHANGE 0x0702
+!define EN_LINK      0x070b
+
+!define ENM_NONE         0x00000000
+!define ENM_CHANGE       0x00000001
+!define ENM_UPDATE       0x00000002
+!define ENM_SCROLL       0x00000004
+!define ENM_SCROLLEVENTS 0x00000008
+!define ENM_KEYEVENTS    0x00010000
+!define ENM_MOUSEEVENTS  0x00020000
+!define ENM_SELCHANGE    0x00080000
+!define ENM_LINK         0x04000000 ; v2+
+
 #Listbox Messages#
 !define LB_ADDFILE              0x0196
 !define LB_ADDSTRING            0x0180
@@ -444,7 +514,6 @@
 !define WM_UNICHAR                      0x0109
 !define WM_UNINITMENUPOPUP              0x0125
 !define WM_UPDATEUISTATE                0x0128
-!define WM_USER                         0x400
 !define WM_USERCHANGED                  0x0054
 !define WM_VKEYTOITEM                   0x002E
 !define WM_VSCROLL                      0x0115
@@ -544,16 +613,74 @@
 !define HDM_FIRST           0x1200
 
 #List view control#
-!define LVM_FIRST           0x1000
+!define LVS_SINGLESEL           4
+!define LVS_SHOWSELALWAYS       8
+!define LVS_SORTASCENDING    0x10
+!define LVS_SORTDESCENDING   0x20
+!define LVS_SHAREIMAGELISTS  0x40
+!define LVS_EDITLABELS      0x200
+!define LVS_NOSCROLL       0x2000
+!define LVS_NOCOLUMNHEADER 0x4000
+!define LVS_NOSORTHEADER   0x8000
+!define LVS_ICON      0
+!define LVS_REPORT    1
+!define LVS_SMALLICON 2
+!define LVS_LIST      3
+!define LVS_EX_CHECKBOXES         4
+!define LVS_EX_FULLROWSELECT   0x20
+!define LVS_EX_INFOTIP        0x400
+!define LVS_EX_LABELTIP      0x4000
+!define LVS_EX_DOUBLEBUFFER 0x10000
+!define LVIF_TEXT  1
+!define LVIF_IMAGE 2
+!define LVIF_PARAM 4
+!define LVIF_STATE 8
+!define LVIS_STATEIMAGEMASK 0xF000
+!define LVCF_FMT     1
+!define LVCF_WIDTH   2
+!define LVCF_TEXT    4
+!define LVCF_SUBITEM 8
+!define SYSSTRUCT_LVITEM_V1 (i,i,i,i,&i${NSIS_PTR_SIZE},t,i,i,p)
+!define SYSSTRUCT_LVITEM_V2 (i,i,i,i,&i${NSIS_PTR_SIZE},t,i,i,p,i)           ; IE3
+!define SYSSTRUCT_LVITEM_V3 (i,i,i,i,&i${NSIS_PTR_SIZE},t,i,i,p,i,i,i,i)     ; WinXP + ComCtl32 v6
+!define SYSSTRUCT_LVITEM_V4 (i,i,i,i,&i${NSIS_PTR_SIZE},t,i,i,p,i,i,i,i,i,i) ; WinVista + ComCtl32 v6
+!define LVSCW_AUTOSIZE -1
+!define LVSCW_AUTOSIZE_USEHEADER -2
+!define LVM_FIRST                          0x00001000
+!define /math LVM_GETIMAGELIST             ${LVM_FIRST} +  2
+!define /math LVM_SETIMAGELIST             ${LVM_FIRST} +  3
+!define /math LVM_GETITEMCOUNT             ${LVM_FIRST} +  4
+!define /math LVM_GETITEMA                 ${LVM_FIRST} +  5
+!define /math LVM_SETITEMA                 ${LVM_FIRST} +  6
+!define /math LVM_INSERTITEMA              ${LVM_FIRST} +  7
+!define /math LVM_DELETEITEM               ${LVM_FIRST} +  8
+!define /math LVM_DELETEALLITEMS           ${LVM_FIRST} +  9
+!define /math LVM_INSERTCOLUMNA            ${LVM_FIRST} + 27
+!define /math LVM_SETCOLUMNWIDTH           ${LVM_FIRST} + 30
+!define /math LVM_SETITEMSTATE             ${LVM_FIRST} + 43
+!define /math LVM_GETITEMSTATE             ${LVM_FIRST} + 44
+!define /math LVM_GETITEMTEXTA             ${LVM_FIRST} + 45
+!define /math LVM_SETITEMTEXTA             ${LVM_FIRST} + 46
+!define /math LVM_SETITEMCOUNT             ${LVM_FIRST} + 47
+!define /math LVM_SORTITEMS                ${LVM_FIRST} + 48
+!define /math LVM_SETEXTENDEDLISTVIEWSTYLE ${LVM_FIRST} + 54
+!define /math LVM_GETEXTENDEDLISTVIEWSTYLE ${LVM_FIRST} + 55
+!define /math LVM_GETITEMW                 ${LVM_FIRST} + 75
+!define /math LVM_SETITEMW                 ${LVM_FIRST} + 76
+!define /math LVM_INSERTITEMW              ${LVM_FIRST} + 77
+!define /math LVM_INSERTCOLUMNW            ${LVM_FIRST} + 97
+!define /math LVM_GETITEMTEXTW             ${LVM_FIRST} + 115
+!define /math LVM_SETITEMTEXTW             ${LVM_FIRST} + 116
+!define /math LVM_SETSELECTEDCOLUMN        ${LVM_FIRST} + 140
+${_NSIS_DEFAW} LVM_GETITEM
+${_NSIS_DEFAW} LVM_SETITEM
+${_NSIS_DEFAW} LVM_INSERTITEM
+${_NSIS_DEFAW} LVM_INSERTCOLUMN
+${_NSIS_DEFAW} LVM_GETITEMTEXT
+${_NSIS_DEFAW} LVM_SETITEMTEXT
 
 #Status bar window#
-!define SB_CONST_ALPHA      0x00000001
-!define SB_GRAD_RECT        0x00000010
-!define SB_GRAD_TRI         0x00000020
-!define SB_NONE             0x00000000
-!define SB_PIXEL_ALPHA      0x00000002
-!define SB_PREMULT_ALPHA    0x00000004
-!define SB_SIMPLEID         0x00ff
+!define SB_SIMPLEID 0x00ff
 
 #Scroll bar control#
 !define SBM_ENABLE_ARROWS           0x00E4  # Not in win3.1
@@ -566,27 +693,198 @@
 !define SBM_SETSCROLLINFO           0x00E9
 
 #Static control#
+!define STM_SETICON                 0x0170
 !define STM_GETICON                 0x0171
+!define STM_SETIMAGE                0x0172
 !define STM_GETIMAGE                0x0173
 !define STM_MSGMAX                  0x0174
-!define STM_ONLY_THIS_INTERFACE     0x00000001
-!define STM_ONLY_THIS_NAME          0x00000008
-!define STM_ONLY_THIS_PROTOCOL      0x00000002
-!define STM_ONLY_THIS_TYPE          0x00000004
-!define STM_SETICON                 0x0170
-!define STM_SETIMAGE                0x0172
 
 #Tab control#
-!define TCM_FIRST                   0x1300
+!define TCS_SCROLLOPPOSITE 0x0001
+!define TCIF_TEXT  1
+!define TCIF_PARAM 8
+!define SYSSTRUCT_TCITEM (i,i,&i${NSIS_PTR_SIZE},t,i,i,p)
+!define TCM_FIRST             0x1300
+!define /math TCM_INSERTITEMA ${TCM_FIRST} + 7
+!define /math TCM_GETCURSEL   ${TCM_FIRST} + 11
+!define /math TCM_ADJUSTRECT  ${TCM_FIRST} + 40
+!define /math TCM_INSERTITEMW ${TCM_FIRST} + 62
+!define TCN_SELCHANGE   -551
+!define TCN_SELCHANGING -552
+${_NSIS_DEFAW} TCM_INSERTITEM
 
 #Progress bar control#
-!define PBM_SETRANGE   0x0401
-!define PBM_SETPOS     0x0402
-!define PBM_DELTAPOS   0x0403
-!define PBM_SETSTEP    0x0404
-!define PBM_STEPIT     0x0405
-!define PBM_GETPOS     0x0408
-!define PBM_SETMARQUEE 0x040a
+!define PBM_SETRANGE    0x401
+!define PBM_SETPOS      0x402
+!define PBM_DELTAPOS    0x403
+!define PBM_SETSTEP     0x404
+!define PBM_STEPIT      0x405
+!define PBM_SETRANGE32  0x406 ; IE3 + ComCtl32 v4.70
+!define PBM_GETRANGE    0x407
+!define PBM_GETPOS      0x408
+!define PBM_SETBARCOLOR 0x409 ; IE4 + ComCtl32 v4.71
+!define PBM_SETBKCOLOR  ${CCM_SETBKCOLOR}
+!define PBM_SETMARQUEE  0x40A ; WinXP + ComCtl32 v6
+!define PBM_GETSTEP     0x40D ; WinVista
+!define PBM_GETBKCOLOR  0x40E
+!define PBM_GETBARCOLOR 0x40F
+!define PBM_SETSTATE    0x410
+!define PBM_GETSTATE    0x411
 
+!define PBST_NORMAL 1
+!define PBST_ERROR  2
+!define PBST_PAUSED 3
+
+#Animation control#
+!define /math ACM_OPENA ${WM_USER} + 100
+!define /math ACM_PLAY  ${WM_USER} + 101
+!define /math ACM_STOP  ${WM_USER} + 102
+!define /math ACM_OPENW ${WM_USER} + 103
+${_NSIS_DEFAW} ACM_OPEN
+
+#TrackBar control#
+!define /math TBM_GETPOS         ${WM_USER} + 0
+!define /math TBM_GETRANGEMIN    ${WM_USER} + 1
+!define /math TBM_GETRANGEMAX    ${WM_USER} + 2
+!define /math TBM_GETTIC         ${WM_USER} + 3
+!define /math TBM_SETTIC         ${WM_USER} + 4
+!define /math TBM_SETPOS         ${WM_USER} + 5
+!define /math TBM_SETRANGE       ${WM_USER} + 6
+!define /math TBM_SETRANGEMIN    ${WM_USER} + 7
+!define /math TBM_SETRANGEMAX    ${WM_USER} + 8
+!define /math TBM_CLEARTICS      ${WM_USER} + 9
+!define /math TBM_SETSEL         ${WM_USER} + 10
+!define /math TBM_SETSELSTART    ${WM_USER} + 11
+!define /math TBM_SETSELEND      ${WM_USER} + 12
+!define /math TBM_GETPTICS       ${WM_USER} + 14
+!define /math TBM_GETTICPOS      ${WM_USER} + 15
+!define /math TBM_GETNUMTICS     ${WM_USER} + 16
+!define /math TBM_GETSELSTART    ${WM_USER} + 17
+!define /math TBM_GETSELEND      ${WM_USER} + 18
+!define /math TBM_CLEARSEL       ${WM_USER} + 19
+!define /math TBM_SETTICFREQ     ${WM_USER} + 20 ; TBS_AUTOTICKS required
+!define /math TBM_SETPAGESIZE    ${WM_USER} + 21
+!define /math TBM_GETPAGESIZE    ${WM_USER} + 22
+!define /math TBM_SETLINESIZE    ${WM_USER} + 23
+!define /math TBM_GETLINESIZE    ${WM_USER} + 24
+!define /math TBM_GETTHUMBRECT   ${WM_USER} + 25
+!define /math TBM_GETCHANNELRECT ${WM_USER} + 26
+!define /math TBM_SETTHUMBLENGTH ${WM_USER} + 27
+!define /math TBM_GETTHUMBLENGTH ${WM_USER} + 28
+!define /math TBM_SETTOOLTIPS    ${WM_USER} + 29 ; IE3
+!define /math TBM_GETTOOLTIPS    ${WM_USER} + 30 ; IE3
+!define /math TBM_SETTIPSIDE     ${WM_USER} + 31 ; IE3
+!define /math TBM_SETBUDDY       ${WM_USER} + 32 ; IE3
+!define /math TBM_GETBUDDY       ${WM_USER} + 33 ; IE3
+!define TBM_SETUNICODEFORMAT     ${CCM_SETUNICODEFORMAT} ; IE4
+!define TBM_GETUNICODEFORMAT     ${CCM_GETUNICODEFORMAT} ; IE4
+!define /math TBM_SETPOSNOTIFY   ${WM_USER} + 34 ; 7?
+
+#UpDown controls#
+!define /math UDM_SETRANGE   ${WM_USER} + 101
+!define /math UDM_GETRANGE   ${WM_USER} + 102
+!define /math UDM_SETPOS     ${WM_USER} + 103
+!define /math UDM_GETPOS     ${WM_USER} + 104
+!define /math UDM_SETBUDDY   ${WM_USER} + 105
+!define /math UDM_GETBUDDY   ${WM_USER} + 106
+!define /math UDM_SETACCEL   ${WM_USER} + 107
+!define /math UDM_GETACCEL   ${WM_USER} + 108
+!define /math UDM_SETBASE    ${WM_USER} + 109
+!define /math UDM_GETBASE    ${WM_USER} + 110
+!define /math UDM_SETRANGE32 ${WM_USER} + 111 ; IE4
+!define /math UDM_GETRANGE32 ${WM_USER} + 112 ; IE4
+!define UDM_SETUNICODEFORMAT ${CCM_SETUNICODEFORMAT} ; IE4
+!define UDM_GETUNICODEFORMAT ${CCM_GETUNICODEFORMAT} ; IE4
+!define /math UDM_SETPOS32   ${WM_USER} + 113 ; IE5
+!define /math UDM_GETPOS32   ${WM_USER} + 114 ; IE5
+
+#HotKey control#
+!define /math HKM_SETHOTKEY ${WM_USER} + 1
+!define /math HKM_GETHOTKEY ${WM_USER} + 2
+!define /math HKM_SETRULES  ${WM_USER} + 3
+!define /IfNDef HOTKEYF_SHIFT   0x01
+!define /IfNDef HOTKEYF_CONTROL 0x02
+!define /IfNDef HOTKEYF_ALT     0x04
+!define /IfNDef HOTKEYF_EXT     0x08
+!define HKCOMB_NONE 0x01
+!define HKCOMB_S    0x02
+!define HKCOMB_C    0x04
+!define HKCOMB_A    0x08
+!define HKCOMB_SC   0x10
+!define HKCOMB_SA   0x20
+!define HKCOMB_CA   0x40
+!define HKCOMB_SCA  0x80
+
+#IPAddress control#
+!define /math IPM_CLEARADDRESS ${WM_USER} + 100
+!define /math IPM_SETADDRESS   ${WM_USER} + 101
+!define /math IPM_GETADDRESS   ${WM_USER} + 102
+!define /math IPM_SETRANGE     ${WM_USER} + 103
+!define /math IPM_SETFOCUS     ${WM_USER} + 104
+!define /math IPM_ISBLANK      ${WM_USER} + 105
+
+#NetworkAddress control#
+!define /math NCM_GETADDRESS ${WM_USER} + 1 ; Vista+
+!define /math NCM_SETALLOWTYPE ${WM_USER} + 2
+!define /math NCM_GETALLOWTYPE ${WM_USER} + 3
+!define /math NCM_DISPLAYERRORTIP ${WM_USER} + 4
+
+#Month calendar control#
+!define MCM_FIRST 0x1000
+!define /math MCM_GETCURSEL       ${MCM_FIRST} + 1
+!define /math MCM_SETCURSEL       ${MCM_FIRST} + 2
+!define /math MCM_GETMAXSELCOUNT  ${MCM_FIRST} + 3
+!define /math MCM_SETMAXSELCOUNT  ${MCM_FIRST} + 4
+!define /math MCM_GETSELRANGE     ${MCM_FIRST} + 5
+!define /math MCM_SETSELRANGE     ${MCM_FIRST} + 6
+!define /math MCM_GETMONTHRANGE   ${MCM_FIRST} + 7
+!define /math MCM_SETDAYSTATE     ${MCM_FIRST} + 8
+!define /math MCM_GETMINREQRECT   ${MCM_FIRST} + 9
+!define /math MCM_SETCOLOR            ${MCM_FIRST} + 10
+!define /math MCM_GETCOLOR            ${MCM_FIRST} + 11
+!define /math MCM_SETTODAY    ${MCM_FIRST} + 12
+!define /math MCM_GETTODAY    ${MCM_FIRST} + 13
+!define /math MCM_HITTEST          ${MCM_FIRST} + 14
+!define /math MCM_SETFIRSTDAYOFWEEK ${MCM_FIRST} + 15
+!define /math MCM_GETFIRSTDAYOFWEEK ${MCM_FIRST} + 16
+!define /math MCM_GETRANGE ${MCM_FIRST} + 17
+!define /math MCM_SETRANGE ${MCM_FIRST} + 18
+!define /math MCM_GETMONTHDELTA ${MCM_FIRST} + 19
+!define /math MCM_SETMONTHDELTA ${MCM_FIRST} + 20
+!define /math MCM_GETMAXTODAYWIDTH ${MCM_FIRST} + 21
+!define MCM_SETUNICODEFORMAT ${CCM_SETUNICODEFORMAT} ; IE4+
+!define MCM_GETUNICODEFORMAT ${CCM_SETUNICODEFORMAT} ; IE4+
+!define /math MCM_GETCURRENTVIEW ${MCM_FIRST} + 22 ; Vista+
+!define /math MCM_GETCALENDARCOUNT ${MCM_FIRST} + 23
+!define /math MCM_GETCALENDARGRIDINFO ${MCM_FIRST} + 24
+!define /math MCM_GETCALID ${MCM_FIRST} + 27
+!define /math MCM_SETCALID ${MCM_FIRST} + 28
+!define /math MCM_SIZERECTTOMIN ${MCM_FIRST} + 29
+!define /math MCM_SETCALENDARBORDER ${MCM_FIRST} + 30
+!define /math MCM_GETCALENDARBORDER ${MCM_FIRST} + 31
+!define /math MCM_SETCURRENTVIEW ${MCM_FIRST} + 32
+!define MCN_SELCHANGE   -749
+!define MCN_GETDAYSTATE -747
+!define MCN_SELECT      -746
+!define MCN_VIEWCHANGE  -750 ; Vista+?
+
+#DateTime control#
+!define DTM_FIRST 0x1000
+!define /math DTM_GETSYSTEMTIME ${DTM_FIRST} + 1
+!define /math DTM_SETSYSTEMTIME ${DTM_FIRST} + 2
+!define /math DTM_SETFORMATA ${DTM_FIRST} + 5
+!define /math DTM_SETFORMATW ${DTM_FIRST} + 50
+${_NSIS_DEFAW} DTM_SETFORMAT
+!define /math DTM_GETMONTHCAL ${DTM_FIRST} + 8
+!define /math DTM_SETMCFONT ${DTM_FIRST} + 9 ; IE4+?
+!define /math DTM_GETMCFONT ${DTM_FIRST} + 10 ; IE4+?
+!define /math DTM_SETMCSTYLE ${DTM_FIRST} + 11 ; Vista+?
+!define /math DTM_GETMCSTYLE ${DTM_FIRST} + 12 ; Vista+?
+!define /math DTM_CLOSEMONTHCAL ${DTM_FIRST} + 13 ; Vista+?
+!define DTN_DATETIMECHANGE -759
+!define /IfNDef GDT_ERROR -1
+!define /IfNDef GDT_VALID 0
+!define /IfNDef GDT_NONE 1
+
 !verbose pop
-!endif
\ No newline at end of file
+!endif
Index: tmp/org.txm.setups/nsis/Include/WordFunc.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/WordFunc.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/WordFunc.nsh	(revision 2956)
@@ -50,24 +50,20 @@
 ; ${WORDFUNC_VERBOSE} 3   # no script
 
 !ifndef WORDFUNC_INCLUDED
+
+!verbose push 3
+!define /IfNDef _WORDFUNC_VERBOSE 3
+!verbose ${_WORDFUNC_VERBOSE}
+!define WORDFUNC_VERBOSE `!insertmacro WORDFUNC_VERBOSE`
+
 !define WORDFUNC_INCLUDED
 
 !include Util.nsh
 
-!verbose push
-!verbose 3
-!ifndef _WORDFUNC_VERBOSE
-	!define _WORDFUNC_VERBOSE 3
-!endif
-!verbose ${_WORDFUNC_VERBOSE}
-!define WORDFUNC_VERBOSE `!insertmacro WORDFUNC_VERBOSE`
-!verbose pop
 
 !macro WORDFUNC_VERBOSE _VERBOSE
-	!verbose push
-	!verbose 3
-	!undef _WORDFUNC_VERBOSE
-	!define _WORDFUNC_VERBOSE ${_VERBOSE}
+	!verbose push 3
+	!define /ReDef _WORDFUNC_VERBOSE ${_VERBOSE}
 	!verbose pop
 !macroend
 
@@ -1800,4 +1796,5 @@
 	!verbose pop
 !macroend
 
+!verbose pop
 !endif
Index: tmp/org.txm.setups/nsis/Include/Sections.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/Sections.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/Sections.nsh	(revision 2956)
@@ -148,9 +148,9 @@
 ;
 ; Written by Robert Kehl
 ;
-; For details, see http://nsis.sourceforge.net/wiki/SetSectionInInstType%2C_ClearSectionInInstType
+; For details, see https://nsis.sourceforge.io/wiki/SetSectionInInstType%2C_ClearSectionInInstType
 ;
-; Use the defines below for the WANTED_INSTTYPE paramter.
+; Use the defines below for the WANTED_INSTTYPE parameter.
 
 !define INSTTYPE_1 1
 !define INSTTYPE_2 2
@@ -270,4 +270,41 @@
 
 ;--------------------------------
 
+; Removes a section by unselecting and hiding it
+
+!macro RemoveSection SECTION
+
+  Push $R0
+  Push $R1
+    StrCpy $R1 `${SECTION}`
+    SectionGetFlags $R1 $R0
+    IntOp $R0 $R0 & ${SECTION_OFF}
+    SectionSetFlags $R1 $R0
+    SectionSetText $R1 ``
+  Pop $R1
+  Pop $R0
+
+!macroend
+
+; Undoes the RemoveSection action
+
+!macro UnremoveSection SECTION SECTION_TEXT
+
+  Push $R0
+  Push $R1
+  Push $R2
+    StrCpy $R1 `${SECTION}`
+    StrCpy $R2 `${SECTION_TEXT}`
+    SectionGetFlags $R1 $R0
+    IntOp $R0 $R0 | ${SF_SELECTED}
+    SectionSetFlags $R1 $R0
+    SectionSetText $R1 $R2
+  Pop $R2
+  Pop $R1
+  Pop $R0
+
+!macroend
+
+;--------------------------------
+
 !endif
\ No newline at end of file
Index: tmp/org.txm.setups/nsis/Include/MultiUser.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/MultiUser.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/MultiUser.nsh	(revision 2956)
@@ -4,25 +4,29 @@
 
 Installer configuration for multi-user Windows environments
 
-Copyright 2008-2015 Joost Verburg
+Copyright 2008-2020 Joost Verburg
 
 */
 
 !ifndef MULTIUSER_INCLUDED
-!define MULTIUSER_INCLUDED
-!verbose push
-!verbose 3
+!define MULTIUSER_INCLUDED 20200319
+!verbose push 3
 
 ;Standard NSIS header files
 
 !ifdef MULTIUSER_MUI
   !include MUI2.nsh
 !endif
-!include nsDialogs.nsh
 !include LogicLib.nsh
 !include WinVer.nsh
 !include FileFunc.nsh
 
+!if ${NSIS_PTR_SIZE} > 4
+!define /IfNDef MULTIUSER_MINWIN 0x501
+!else
+!define /IfNDef MULTIUSER_MINWIN 0x400
+!endif
+
 ;Variables
 
 Var MultiUser.Privileges
@@ -68,6 +72,9 @@
   !define MULTIUSER_EXECUTIONLEVEL_ALLUSERS
 !else
   RequestExecutionLevel user
+  !ifndef MULTIUSER_EXECUTIONLEVEL
+    !warning "MULTIUSER_EXECUTIONLEVEL not set!"
+  !endif
 !endif
 
 /*
@@ -91,7 +98,11 @@
     !if "${UNINSTALLER_PREFIX}" != UN
       ;Set default installation location for installer
       !ifdef MULTIUSER_INSTALLMODE_INSTDIR
-        StrCpy $INSTDIR "$PROGRAMFILES\${MULTIUSER_INSTALLMODE_INSTDIR}"
+        !ifdef MULTIUSER_USE_PROGRAMFILES64
+          StrCpy $INSTDIR "$PROGRAMFILES64\${MULTIUSER_INSTALLMODE_INSTDIR}"
+        !else
+          StrCpy $INSTDIR "$PROGRAMFILES\${MULTIUSER_INSTALLMODE_INSTDIR}"
+        !endif
       !endif
     !endif
   
@@ -116,39 +127,46 @@
 !macro MULTIUSER_INSTALLMODE_CURRENTUSER UNINSTALLER_PREFIX UNINSTALLER_FUNCPREFIX
 
   ;Install mode initialization - per-user
-  
-  ${if} ${IsNT}  
-  
+
+  !if ${MULTIUSER_MINWIN} < 0x500
+  ${if} ${IsNT}
+  !endif
+
     StrCpy $MultiUser.InstallMode CurrentUser
-    
     SetShellVarContext current
   
     !if "${UNINSTALLER_PREFIX}" != UN
       ;Set default installation location for installer  
       !ifdef MULTIUSER_INSTALLMODE_INSTDIR
+        !if ${MULTIUSER_MINWIN} < 0x490
         ${if} ${AtLeastWin2000}
-          StrCpy $INSTDIR "$LOCALAPPDATA\${MULTIUSER_INSTALLMODE_INSTDIR}"
+        !endif
+          GetKnownFolderPath $INSTDIR {5CD7AEE2-2219-4A67-B85D-6C9CE15660CB} ; FOLDERID_UserProgramFiles
+          StrCmp $INSTDIR "" 0 +2
+          StrCpy $INSTDIR "$LocalAppData\Programs" ; Fallback directory
+          StrCpy $INSTDIR "$INSTDIR\${MULTIUSER_INSTALLMODE_INSTDIR}"
+        !if ${MULTIUSER_MINWIN} < 0x490
         ${else}
           StrCpy $INSTDIR "$PROGRAMFILES\${MULTIUSER_INSTALLMODE_INSTDIR}"
         ${endif}
+        !endif
       !endif
     !endif
   
     !ifdef MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY & MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME
-  
       ReadRegStr $MultiUser.InstDir HKCU "${MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY}" "${MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME}"
-  
       ${if} $MultiUser.InstDir != ""
         StrCpy $INSTDIR $MultiUser.InstDir
       ${endif}
-  
     !endif
-  
+
     !ifdef MULTIUSER_INSTALLMODE_${UNINSTALLER_PREFIX}FUNCTION
       Call "${MULTIUSER_INSTALLMODE_${UNINSTALLER_PREFIX}FUNCTION}"
     !endif
-  
+
+  !if ${MULTIUSER_MINWIN} < 0x500
   ${endif}
+  !endif
 
 !macroend
 
@@ -181,26 +199,26 @@
 !macro MULTIUSER_INIT_QUIT UNINSTALLER_FUNCPREFIX
 
   !ifdef MULTIUSER_INIT_${UNINSTALLER_FUNCPREFIX}FUNCTIONQUIT
-    Call "${MULTIUSER_INIT_${UNINSTALLER_FUNCPREFIX}FUCTIONQUIT}
+    Call "${MULTIUSER_INIT_${UNINSTALLER_FUNCPREFIX}FUNCTIONQUIT}"
   !else
     Quit
   !endif
 
 !macroend
 
-!macro MULTIUSER_INIT_TEXTS
+!macro MULTIUSER_INIT_TEXTS UNINSTALLER_PREFIX
 
-  !ifndef MULTIUSER_INIT_TEXT_ADMINREQUIRED
-    !define MULTIUSER_INIT_TEXT_ADMINREQUIRED "$(^Caption) requires administrator priviledges."
+  !if "${UNINSTALLER_PREFIX}" == ""
+    !define /ReDef MULTIUSER_TMPSTR_CAPTION "$(^SetupCaption)"
+  !else
+    !define /ReDef MULTIUSER_TMPSTR_CAPTION "$(^Name)"
   !endif
 
-  !ifndef MULTIUSER_INIT_TEXT_POWERREQUIRED
-    !define MULTIUSER_INIT_TEXT_POWERREQUIRED "$(^Caption) requires at least Power User priviledges."
-  !endif
+  !define /IfNDef MULTIUSER_INIT_TEXT_ADMINREQUIRED "${MULTIUSER_TMPSTR_CAPTION} requires administrator privileges."
+  !define /IfNDef MULTIUSER_INIT_TEXT_POWERREQUIRED "${MULTIUSER_TMPSTR_CAPTION} requires at least Power User privileges."
+  !define /IfNDef MULTIUSER_INIT_TEXT_ALLUSERSNOTPOSSIBLE "Your user account does not have sufficient privileges to install $(^Name) for all users of this computer."
 
-  !ifndef MULTIUSER_INIT_TEXT_ALLUSERSNOTPOSSIBLE
-    !define MULTIUSER_INIT_TEXT_ALLUSERSNOTPOSSIBLE "Your user account does not have sufficient privileges to install $(^Name) for all users of this compuetr."
-  !endif
+  !undef MULTIUSER_TMPSTR_CAPTION
 
 !macroend
 
@@ -208,12 +226,14 @@
 
   ;Installer initialization - check privileges and set install mode
 
-  !insertmacro MULTIUSER_INIT_TEXTS
+  !insertmacro MULTIUSER_INIT_TEXTS "${UNINSTALLER_PREFIX}"
 
   UserInfo::GetAccountType
   Pop $MultiUser.Privileges
   
+  !if ${MULTIUSER_MINWIN} < 0x500
   ${if} ${IsNT}
+  !endif
   
     ;Check privileges
   
@@ -308,46 +328,51 @@
       ${endif}
   
     !endif
-    
+
+  !if ${MULTIUSER_MINWIN} < 0x500
   ${else}
   
     ;Not running Windows NT, per-user installation not supported
-    
     Call ${UNINSTALLER_FUNCPREFIX}MultiUser.InstallMode.AllUsers
-  
+
   ${endif}
+  !endif
 
 !macroend
 
 !macro MULTIUSER_INIT
-  !verbose push
-  !verbose 3
-  
-  !insertmacro MULTIUSER_INIT_CHECKS "" ""
-  
+  !verbose push 3
+  !ifdef __UNINSTALL__
+    !insertmacro MULTIUSER_UNINIT
+  !else
+    !insertmacro MULTIUSER_INIT_CHECKS "" ""
+  !endif
   !verbose pop 
 !macroend
 
 !ifndef MULTIUSER_NOUNINSTALL
-
 !macro MULTIUSER_UNINIT
-  !verbose push
-  !verbose 3
-  
+  !verbose push 3
   !insertmacro MULTIUSER_INIT_CHECKS Un un.
-  
   !verbose pop 
 !macroend
-
 !endif
 
 /*
 
-Modern UI 2 page
+Mode selection page
 
 */
 
-!ifdef MULTIUSER_MUI
+!macro MULTIUSER_PAGE_FUNCTION_CUSTOM TYPE
+  !ifmacrodef MUI_PAGE_FUNCTION_CUSTOM
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM "${TYPE}"
+  !endif
+  !ifdef MULTIUSER_PAGE_CUSTOMFUNCTION_${TYPE}
+    Call "${MULTIUSER_PAGE_CUSTOMFUNCTION_${TYPE}}"
+    !undef MULTIUSER_PAGE_CUSTOMFUNCTION_${TYPE}
+  !endif
+!macroend
 
 !macro MULTIUSER_INSTALLMODEPAGE_INTERFACE
 
@@ -359,30 +384,30 @@
     
     Var MultiUser.InstallModePage.AllUsers
     Var MultiUser.InstallModePage.CurrentUser
-    
-    Var MultiUser.InstallModePage.ReturnValue
+
   !endif
 
 !macroend
 
-!macro MULTIUSER_PAGEDECLARATION_INSTALLMODE
+!macro MULTIUSER_PAGEDECLARATION_INSTALLMODE UNPREFIX UNIQUEID
 
-  !insertmacro MUI_SET MULTIUSER_${MUI_PAGE_UNINSTALLER_PREFIX}INSTALLMODEPAGE ""
+  !define /ReDef MULTIUSER_${UNPREFIX}INSTALLMODEPAGE "" ; Unlock strings in the language file(s)
   !insertmacro MULTIUSER_INSTALLMODEPAGE_INTERFACE
 
-  !insertmacro MUI_DEFAULT MULTIUSER_INSTALLMODEPAGE_TEXT_TOP "$(MULTIUSER_INNERTEXT_INSTALLMODE_TOP)"
-  !insertmacro MUI_DEFAULT MULTIUSER_INSTALLMODEPAGE_TEXT_ALLUSERS "$(MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS)"
-  !insertmacro MUI_DEFAULT MULTIUSER_INSTALLMODEPAGE_TEXT_CURRENTUSER "$(MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER)"  
+  !define /IfNDef MULTIUSER_INSTALLMODEPAGE_TEXT_TOP "$(MULTIUSER_INNERTEXT_INSTALLMODE_TOP)"
+  !define /IfNDef MULTIUSER_INSTALLMODEPAGE_TEXT_ALLUSERS "$(MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS)"
+  !define /IfNDef MULTIUSER_INSTALLMODEPAGE_TEXT_CURRENTUSER "$(MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER)"  
 
   PageEx custom
 
-    PageCallbacks MultiUser.InstallModePre_${MUI_UNIQUEID} MultiUser.InstallModeLeave_${MUI_UNIQUEID}
+    PageCallbacks MultiUser.InstallModePre_${UNIQUEID} MultiUser.InstallModeLeave_${UNIQUEID}
 
-    Caption " "
+    !define /IfNDef MULTIUSER_INSTALLMODEPAGE_CAPTION " "
+    Caption "${MULTIUSER_INSTALLMODEPAGE_CAPTION}"
 
   PageExEnd
 
-  !insertmacro MULTIUSER_FUNCTION_INSTALLMODEPAGE MultiUser.InstallModePre_${MUI_UNIQUEID} MultiUser.InstallModeLeave_${MUI_UNIQUEID}
+  !insertmacro MULTIUSER_FUNCTION_INSTALLMODEPAGE MultiUser.InstallModePre_${UNIQUEID} MultiUser.InstallModeLeave_${UNIQUEID}
 
   !undef MULTIUSER_INSTALLMODEPAGE_TEXT_TOP
   !undef MULTIUSER_INSTALLMODEPAGE_TEXT_ALLUSERS
@@ -392,78 +417,92 @@
 
 !macro MULTIUSER_PAGE_INSTALLMODE
 
-  ;Modern UI page for install mode
-
-  !verbose push
-  !verbose 3
+  !verbose push 3
   
   !ifndef MULTIUSER_EXECUTIONLEVEL_ALLUSERS
     !error "A mixed-mode installation requires MULTIUSER_EXECUTIONLEVEL to be set to Admin, Power or Highest."
   !endif
+
+  !ifmacrodef MUI_PAGE_INIT
+    !insertmacro MUI_PAGE_INIT
+  !endif
+  !insertmacro MULTIUSER_PAGEDECLARATION_INSTALLMODE "" ${__COUNTER__}
   
-  !insertmacro MUI_PAGE_INIT
-  !insertmacro MULTIUSER_PAGEDECLARATION_INSTALLMODE
-  
   !verbose pop
 
 !macroend
 
 !macro MULTIUSER_FUNCTION_INSTALLMODEPAGE PRE LEAVE
 
-  ;Page functions of Modern UI page
+  !include nsDialogs.nsh
 
   Function "${PRE}"
-  
+
+    !if ${MULTIUSER_MINWIN} < 0x500
     ${ifnot} ${IsNT}
       Abort
     ${endif}
-  
+    !endif
+
     ${if} $MultiUser.Privileges != "Power"
       ${andif} $MultiUser.Privileges != "Admin"
       Abort
     ${endif}
-    
-    !insertmacro MUI_PAGE_FUNCTION_CUSTOM PRE
-    !insertmacro MUI_HEADER_TEXT_PAGE $(MULTIUSER_TEXT_INSTALLMODE_TITLE) $(MULTIUSER_TEXT_INSTALLMODE_SUBTITLE)
-    
+
+    !insertmacro MULTIUSER_PAGE_FUNCTION_CUSTOM PRE
+    !ifmacrodef MUI_HEADER_TEXT_PAGE
+      !insertmacro MUI_HEADER_TEXT_PAGE $(MULTIUSER_TEXT_INSTALLMODE_TITLE) $(MULTIUSER_TEXT_INSTALLMODE_SUBTITLE)
+    !endif
+
     nsDialogs::Create 1018
     Pop $MultiUser.InstallModePage
 
-    ${NSD_CreateLabel} 0u 0u 300u 20u "${MULTIUSER_INSTALLMODEPAGE_TEXT_TOP}"
+    ${NSD_CreateLabel} 0 2u 100% 42u "${MULTIUSER_INSTALLMODEPAGE_TEXT_TOP}"
     Pop $MultiUser.InstallModePage.Text
 
-    ${NSD_CreateRadioButton} 20u 50u 280u 10u "${MULTIUSER_INSTALLMODEPAGE_TEXT_ALLUSERS}"
+    ${NSD_CreateRadioButton} 15u 50u -15u 10u "${MULTIUSER_INSTALLMODEPAGE_TEXT_ALLUSERS}"
     Pop $MultiUser.InstallModePage.AllUsers
-    
-    ${NSD_CreateRadioButton} 20u 70u 280u 10u "${MULTIUSER_INSTALLMODEPAGE_TEXT_CURRENTUSER}"
+
+    !ifdef MULTIUSER_INSTALLMODEPAGE_SHOWUSERNAME
+    !ifdef NOSYSTEMCALLS
+    ReadEnvStr $0 USERNAME
+    !else
+    System::Call 'ADVAPI32::GetUserName(t""r0,*i${NSIS_MAX_STRLEN})'
+    !endif
+    StrCmp $0 "" +2
+      StrCpy $0 " ($0)"
+    ${NSD_CreateRadioButton} 15u 70u -15u 10u "${MULTIUSER_INSTALLMODEPAGE_TEXT_CURRENTUSER}$0"
+    !else
+    ${NSD_CreateRadioButton} 15u 70u -15u 10u "${MULTIUSER_INSTALLMODEPAGE_TEXT_CURRENTUSER}"
+    !endif
     Pop $MultiUser.InstallModePage.CurrentUser
-    
+
     ${if} $MultiUser.InstallMode == "AllUsers"
       SendMessage $MultiUser.InstallModePage.AllUsers ${BM_SETCHECK} ${BST_CHECKED} 0
     ${else}
       SendMessage $MultiUser.InstallModePage.CurrentUser ${BM_SETCHECK} ${BST_CHECKED} 0
     ${endif}
     
-    !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW
+    !insertmacro MULTIUSER_PAGE_FUNCTION_CUSTOM SHOW
     nsDialogs::Show
+    !insertmacro MULTIUSER_PAGE_FUNCTION_CUSTOM DESTROYED
     
   FunctionEnd
 
   Function "${LEAVE}"
-     SendMessage $MultiUser.InstallModePage.AllUsers ${BM_GETCHECK} 0 0 $MultiUser.InstallModePage.ReturnValue
+     SendMessage $MultiUser.InstallModePage.AllUsers ${BM_GETCHECK} 0 0 $0
      
-     ${if} $MultiUser.InstallModePage.ReturnValue = ${BST_CHECKED}
+     ${if} $0 = ${BST_CHECKED}
         Call MultiUser.InstallMode.AllUsers
      ${else}
         Call MultiUser.InstallMode.CurrentUser
      ${endif}
   
-    !insertmacro MUI_PAGE_FUNCTION_CUSTOM LEAVE
+    !insertmacro MULTIUSER_PAGE_FUNCTION_CUSTOM LEAVE
   FunctionEnd
 
 !macroend
 
-!endif
 
 !verbose pop
 !endif
Index: tmp/org.txm.setups/nsis/Include/FileFunc.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/FileFunc.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/FileFunc.nsh	(revision 2956)
@@ -67,24 +67,20 @@
 ; ${FILEFUNC_VERBOSE} 3   # no script
 
 !ifndef FILEFUNC_INCLUDED
+
+!verbose push 3
+!define /IfNDef _FILEFUNC_VERBOSE 3
+!verbose ${_FILEFUNC_VERBOSE}
+!define FILEFUNC_VERBOSE `!insertmacro FILEFUNC_VERBOSE`
+
 !define FILEFUNC_INCLUDED
 
 !include Util.nsh
 
-!verbose push
-!verbose 3
-!ifndef _FILEFUNC_VERBOSE
-	!define _FILEFUNC_VERBOSE 3
-!endif
-!verbose ${_FILEFUNC_VERBOSE}
-!define FILEFUNC_VERBOSE `!insertmacro FILEFUNC_VERBOSE`
-!verbose pop
 
 !macro FILEFUNC_VERBOSE _VERBOSE
-	!verbose push
-	!verbose 3
-	!undef _FILEFUNC_VERBOSE
-	!define _FILEFUNC_VERBOSE ${_VERBOSE}
+	!verbose push 3
+	!define /ReDef _FILEFUNC_VERBOSE ${_VERBOSE}
 	!verbose pop
 !macroend
 
@@ -910,7 +906,7 @@
 	StrCpy $6 1073741824
 
 	FileFunc_DriveSpace_getspace:
-	System::Call 'kernel32::GetDiskFreeSpaceExA(t, *l, *l, *l)i(r0,.r2,.r3,.)'
+	System::Call 'kernel32::GetDiskFreeSpaceEx(t, *l, *l, *l)i(r0,.r2,.r3,.)'
 
 	StrCmp $5 T 0 +3
 	StrCpy $0 $3
@@ -968,9 +964,9 @@
 	Push $8
 	Push $9
 
-	System::Alloc 1024
+	System::StrAlloc 1024
 	Pop $2
-	System::Call 'kernel32::GetLogicalDriveStringsA(i,i) i(1024, r2)'
+	System::Call 'kernel32::GetLogicalDriveStrings(i,i) i(1024, r2)'
 
 	StrCmp $0 ALL FileFunc_GetDrives_drivestring
 	StrCmp $0 '' 0 FileFunc_GetDrives_typeset
@@ -1007,10 +1003,10 @@
 	StrCpy $3 $2
 
 	FileFunc_GetDrives_enumok:
-	System::Call 'kernel32::lstrlenA(t) i(i r3) .r4'
+	System::Call 'kernel32::lstrlen(t) i(i r3) .r4'
 	StrCmp $4$0 '0ALL' FileFunc_GetDrives_enumex
 	StrCmp $4 0 FileFunc_GetDrives_typeset
-	System::Call 'kernel32::GetDriveTypeA(t) i(i r3) .r5'
+	System::Call 'kernel32::GetDriveType(t) i(i r3) .r5'
 
 	StrCmp $0 ALL +2
 	StrCmp $5 $6 FileFunc_GetDrives_letter FileFunc_GetDrives_enumnext
@@ -1053,8 +1049,9 @@
 	StrCmp $9 'StopGetDrives' FileFunc_GetDrives_enumex
 
 	FileFunc_GetDrives_enumnext:
+	IntOp $4 $4 * ${NSIS_CHAR_SIZE}
 	IntOp $3 $3 + $4
-	IntOp $3 $3 + 1
+	IntOp $3 $3 + ${NSIS_CHAR_SIZE}
 	goto FileFunc_GetDrives_enumok
 
 	FileFunc_GetDrives_enumex:
@@ -1110,22 +1107,22 @@
 
 	FileFunc_GetTime_getfile:
 	IfFileExists $0 0 FileFunc_GetTime_error
-	System::Call '*(i,l,l,l,i,i,i,i,&t260,&t14) i .r6'
-	System::Call 'kernel32::FindFirstFileA(t,i)i(r0,r6) .r2'
+	System::Call '*(i,l,l,l,i,i,i,i,&t260,&t14) p .r6'
+	System::Call 'kernel32::FindFirstFile(t,p)p(r0,r6) .r2'
 	System::Call 'kernel32::FindClose(i)i(r2)'
 
 	FileFunc_GetTime_gettime:
-	System::Call '*(&i2,&i2,&i2,&i2,&i2,&i2,&i2,&i2) i .r7'
+	System::Call '*(&i2,&i2,&i2,&i2,&i2,&i2,&i2,&i2) p .r7'
 	StrCmp $1 'L' 0 FileFunc_GetTime_systemtime
-	System::Call 'kernel32::GetLocalTime(i)i(r7)'
+	System::Call 'kernel32::GetLocalTime(p)i(r7)'
 	goto FileFunc_GetTime_convert
 	FileFunc_GetTime_systemtime:
 	StrCmp $1 'LS' 0 FileFunc_GetTime_filetime
-	System::Call 'kernel32::GetSystemTime(i)i(r7)'
+	System::Call 'kernel32::GetSystemTime(p)i(r7)'
 	goto FileFunc_GetTime_convert
 
 	FileFunc_GetTime_filetime:
-	System::Call '*$6(i,l,l,l,i,i,i,i,&t260,&t14)i(,.r4,.r3,.r2)'
+	System::Call '*$6(i,l,l,l,i,i,i,i,&t260,&t14)p(,.r4,.r3,.r2)'
 	System::Free $6
 	StrCmp $1 'A' 0 +3
 	StrCpy $2 $3
@@ -1149,7 +1146,7 @@
 	System::Call 'kernel32::FileTimeToSystemTime(*l,i)i(r3,r7)'
 
 	FileFunc_GetTime_convert:
-	System::Call '*$7(&i2,&i2,&i2,&i2,&i2,&i2,&i2,&i2)i(.r5,.r6,.r4,.r0,.r3,.r2,.r1,)'
+	System::Call '*$7(&i2,&i2,&i2,&i2,&i2,&i2,&i2,&i2)p(.r5,.r6,.r4,.r0,.r3,.r2,.r1,)'
 	System::Free $7
 
 	IntCmp $0 9 0 0 +2
@@ -1401,8 +1398,8 @@
 	Push $0
 	Push $1
 	Push $2
-	System::Call 'kernel32::GetModuleFileNameA(i 0, t .r0, i 1024)'
-	System::Call 'kernel32::GetLongPathNameA(t r0, t .r1, i 1024)i .r2'
+	System::Call 'kernel32::GetModuleFileName(p 0, t .r0, i 1024)'
+	System::Call 'kernel32::GetLongPathName(t r0, t .r1, i 1024)i .r2'
 	StrCmp $2 error +2
 	StrCpy $0 $1
 	Pop $2
@@ -1429,7 +1426,7 @@
 	Push $1
 	Push $2
 	StrCpy $0 $EXEDIR
-	System::Call 'kernel32::GetLongPathNameA(t r0, t .r1, i 1024)i .r2'
+	System::Call 'kernel32::GetLongPathName(t r0, t .r1, i 1024)i .r2'
 	StrCmp $2 error +2
 	StrCpy $0 $1
 	Pop $2
@@ -2014,4 +2011,5 @@
 	!verbose pop
 !macroend
 
+!verbose pop
 !endif
Index: tmp/org.txm.setups/nsis/Include/TextFunc.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/TextFunc.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/TextFunc.nsh	(revision 2956)
@@ -54,25 +54,21 @@
 ; ${TEXTFUNC_VERBOSE} 3   # no script
 
 !ifndef TEXTFUNC_INCLUDED
+
+!verbose push 3
+!define /IfNDef _TEXTFUNC_VERBOSE 3
+!verbose ${_TEXTFUNC_VERBOSE}
+!define TEXTFUNC_VERBOSE `!insertmacro TEXTFUNC_VERBOSE`
+
 !define TEXTFUNC_INCLUDED
 
 !include FileFunc.nsh
 !include Util.nsh
 
-!verbose push
-!verbose 3
-!ifndef _TEXTFUNC_VERBOSE
-	!define _TEXTFUNC_VERBOSE 3
-!endif
-!verbose ${_TEXTFUNC_VERBOSE}
-!define TEXTFUNC_VERBOSE `!insertmacro TEXTFUNC_VERBOSE`
-!verbose pop
 
 !macro TEXTFUNC_VERBOSE _VERBOSE
-	!verbose push
-	!verbose 3
-	!undef _TEXTFUNC_VERBOSE
-	!define _TEXTFUNC_VERBOSE ${_VERBOSE}
+	!verbose push 3
+	!define /ReDef _TEXTFUNC_VERBOSE ${_VERBOSE}
 	!verbose pop
 !macroend
 
@@ -1047,12 +1043,12 @@
 	System::Alloc $6
 	Pop $0
 	FileSeek $3 $5 SET
-	System::Call 'kernel32::ReadFile(i r3, i r0, i $6, t.,)'
+	System::Call 'kernel32::ReadFile(p r3, p r0, i $6, t.,)'
 	FileSeek $3 $4 SET
 	StrCmp${_TEXTFUNC_S} $2 '' +2
 	FileWrite $3 '$1$2$\r$\n'
-	System::Call 'kernel32::WriteFile(i r3, i r0, i $6, t.,)'
-	System::Call 'kernel32::SetEndOfFile(i r3)'
+	System::Call 'kernel32::WriteFile(p r3, p r0, i $6, t.,)'
+	System::Call 'kernel32::SetEndOfFile(p r3)'
 	System::Free $0
 	StrCmp${_TEXTFUNC_S} $2 '' +3
 	StrCpy $0 CHANGED
@@ -1157,10 +1153,10 @@
 	System::Alloc $3
 	Pop $4
 	FileSeek $2 0 SET
-	System::Call 'kernel32::ReadFile(i r2, i r4, i $3, t.,)'
-	System::Call 'user32::$1Buff(i r4, i r4, i $3)'
+	System::Call 'kernel32::ReadFile(p r2, p r4, i $3, t.,)'
+	System::Call 'user32::$1Buff(p r4, p r4, i $3)'
 	FileSeek $2 0 SET
-	System::Call 'kernel32::WriteFile(i r2, i r4, i $3, t.,)'
+	System::Call 'kernel32::WriteFile(p r2, p r4, i $3, t.,)'
 	System::Free $4
 	FileClose $2
 	goto TextFunc_FileRecode_end
@@ -1211,4 +1207,5 @@
 	!verbose pop
 !macroend
 
+!verbose pop
 !endif
Index: tmp/org.txm.setups/nsis/Include/VB6RunTime.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/VB6RunTime.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/VB6RunTime.nsh	(revision 2956)
@@ -4,10 +4,10 @@
 
 Setup of Visual Basic 6.0 run-time files, including the Oleaut32.dll security update
 
-Copyright 2008-2015 Joost Verburg
+Copyright 2008-2020 Joost Verburg
 
 To obtain the run-time files, download and extract
-http://nsis.sourceforge.net/vb6runtime.zip
+https://nsis.sourceforge.io/vb6runtime.zip
 
 Script code for installation:
 
Index: tmp/org.txm.setups/nsis/Include/Library.nsh
===================================================================
--- tmp/org.txm.setups/nsis/Include/Library.nsh	(revision 2955)
+++ tmp/org.txm.setups/nsis/Include/Library.nsh	(revision 2956)
@@ -121,11 +121,15 @@
   ;------------------------
   ;Setup RegTool
 
+  !if ! /FileExists "${NSISDIR}\Bin\RegTool-${NSIS_CPU}.bin"
+    !error "Missing RegTool for ${NSIS_CPU}!"
+  !endif
+
   ReadRegStr $R3 HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" "${REGTOOL_KEY}"
   StrCpy $R3 $R3 -4 1
   IfFileExists $R3 +3
 
-    File /oname=$R2\${REGTOOL_KEY}.$__INSTALLLLIB_SESSIONGUID.exe "${NSISDIR}\Bin\RegTool.bin"
+    File /oname=$R2\${REGTOOL_KEY}.$__INSTALLLLIB_SESSIONGUID.exe "${NSISDIR}\Bin\RegTool-${NSIS_CPU}.bin"
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce" \
       "${REGTOOL_KEY}" '"$R2\${REGTOOL_KEY}.$__INSTALLLLIB_SESSIONGUID.exe" /S'
 
@@ -142,31 +146,31 @@
 
 !macroend
 
-### Get library version
-!macro __InstallLib_Helper_GetVersion TYPE FILE
+!macro __InstallLib_Helper_CmpPackedVer64 oldhi oldlo newhi newlo jeq jle jgt
 
-  !tempfile LIBRARY_TEMP_NSH
+  IntCmpU ${oldhi} ${newhi} "0"      "${jle}" "${jgt}"
+  IntCmpU ${oldlo} ${newlo} "${jeq}" "${jle}" "${jgt}"
 
-  !ifdef NSIS_WIN32_MAKENSIS
+!macroend
 
-    !execute '"${NSISDIR}\Bin\LibraryLocal.exe" "${TYPE}" "${FILE}" "${LIBRARY_TEMP_NSH}"'
+### Get library version
+!macro __InstallLib_Helper_GetVersion TYPE FILE
 
-  !else
+  !if "${TYPE}" == "D"
+   !getdllversion /NoErrors /Packed "${FILE}" LIBRARY_VERSION_
+  !else if "${TYPE}" == "T"
+    !gettlbversion /NoErrors /Packed "${FILE}" LIBRARY_VERSION_
+  !endif
 
-    !execute 'LibraryLocal "${TYPE}" "${FILE}" "${LIBRARY_TEMP_NSH}"'
-
-    !if ${TYPE} == 'T'
-
-      !warning "LibraryLocal currently supports TypeLibs version detection on Windows only"
-
-    !endif
-
+  ; Emulate the old LibraryLocal defines
+  !ifndef LIBRARY_VERSION_HIGH
+    !define LIBRARY_VERSION_FILENOTFOUND
+  !else if "${LIBRARY_VERSION_HIGH}" == ""
+    !define LIBRARY_VERSION_NONE
+    !undef LIBRARY_VERSION_HIGH
+    !undef LIBRARY_VERSION_LOW
   !endif
 
-  !include "${LIBRARY_TEMP_NSH}"
-  !delfile "${LIBRARY_TEMP_NSH}"
-  !undef LIBRARY_TEMP_NSH
-
 !macroend
 
 ### Install library
@@ -300,9 +304,13 @@
 
       !ifndef INSTALLLIB_LIBTYPE_TLB & INSTALLLIB_LIBTYPE_REGDLLTLB
 
-        IntCmpU $R0 $R2 0 "installlib.register_${INSTALLLIB_UNIQUE}" "installlib.upgrade_${INSTALLLIB_UNIQUE}"
-        IntCmpU $R1 $R3 "installlib.register_${INSTALLLIB_UNIQUE}" "installlib.register_${INSTALLLIB_UNIQUE}" \
-          "installlib.upgrade_${INSTALLLIB_UNIQUE}"
+        !ifdef LIBRARY_INSTALL_EQUAL_VERSION
+          !insertmacro __InstallLib_Helper_CmpPackedVer64 $R0 $R1 $R2 $R3 "installlib.upgrade_${INSTALLLIB_UNIQUE}" \
+            "installlib.register_${INSTALLLIB_UNIQUE}" "installlib.upgrade_${INSTALLLIB_UNIQUE}"
+        !else
+          !insertmacro __InstallLib_Helper_CmpPackedVer64 $R0 $R1 $R2 $R3 "installlib.register_${INSTALLLIB_UNIQUE}" \
+            "installlib.register_${INSTALLLIB_UNIQUE}" "installlib.upgrade_${INSTALLLIB_UNIQUE}"
+        !endif
 
       !else
 
@@ -314,15 +322,18 @@
 
         !ifndef LIBRARY_VERSION_NONE
 
-          IntCmpU $R0 $R2 0 "installlib.register_${INSTALLLIB_UNIQUE}" "installlib.upgrade_${INSTALLLIB_UNIQUE}"
-          IntCmpU $R1 $R3 0 "installlib.register_${INSTALLLIB_UNIQUE}" \
-            "installlib.upgrade_${INSTALLLIB_UNIQUE}"
+          !insertmacro __InstallLib_Helper_CmpPackedVer64 $R0 $R1 $R2 $R3 0 \
+            "installlib.register_${INSTALLLIB_UNIQUE}" "installlib.upgrade_${INSTALLLIB_UNIQUE}"
 
         !else
 
-          IntCmpU $R0 $R2 0 "installlib.register_${INSTALLLIB_UNIQUE}" "installlib.upgrade_${INSTALLLIB_UNIQUE}"
-          IntCmpU $R1 $R3 "installlib.register_${INSTALLLIB_UNIQUE}" "installlib.register_${INSTALLLIB_UNIQUE}" \
-            "installlib.upgrade_${INSTALLLIB_UNIQUE}"
+          !ifdef LIBRARY_INSTALL_EQUAL_VERSION
+            !insertmacro __InstallLib_Helper_CmpPackedVer64 $R0 $R1 $R2 $R3 "installlib.upgrade_${INSTALLLIB_UNIQUE}" \
+              "installlib.register_${INSTALLLIB_UNIQUE}" "installlib.upgrade_${INSTALLLIB_UNIQUE}"
+          !else
+            !insertmacro __InstallLib_Helper_CmpPackedVer64 $R0 $R1 $R2 $R3 "installlib.register_${INSTALLLIB_UNIQUE}" \
+              "installlib.register_${INSTALLLIB_UNIQUE}" "installlib.upgrade_${INSTALLLIB_UNIQUE}"
+          !endif
 
         !endif
 
@@ -363,9 +374,13 @@
         Pop $R3
         Pop $R2
 
-        IntCmpU $R0 $R2 0 "installlib.register_${INSTALLLIB_UNIQUE}" "installlib.upgrade_${INSTALLLIB_UNIQUE}"
-        IntCmpU $R1 $R3 "installlib.register_${INSTALLLIB_UNIQUE}" "installlib.register_${INSTALLLIB_UNIQUE}" \
-          "installlib.upgrade_${INSTALLLIB_UNIQUE}"
+        !ifdef LIBRARY_INSTALL_EQUAL_VERSION
+          !insertmacro __InstallLib_Helper_CmpPackedVer64 $R0 $R1 $R2 $R3 "installlib.upgrade_${INSTALLLIB_UNIQUE}" \
+            "installlib.register_${INSTALLLIB_UNIQUE}" "installlib.upgrade_${INSTALLLIB_UNIQUE}"
+        !else
+          !insertmacro __InstallLib_Helper_CmpPackedVer64 $R0 $R1 $R2 $R3 "installlib.register_${INSTALLLIB_UNIQUE}" \
+            "installlib.register_${INSTALLLIB_UNIQUE}" "installlib.upgrade_${INSTALLLIB_UNIQUE}"
+        !endif
 
         !undef LIBRARY_VERSION_HIGH
         !undef LIBRARY_VERSION_LOW
@@ -378,7 +393,7 @@
 
     !endif
 
-  !endif
+  !endif ;~LIBRARY_IGNORE_VERSION
 
   ;------------------------
   ;Upgrade
Index: tmp/org.txm.setups/nsis/Bin/RegTool-x86.bin
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Bin/RegTool-x86.bin
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Bin/zip2exe.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.setups/nsis/Bin/makensis.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Bin/makensis.exe
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Bin/zlib1.dll
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.setups/nsis/Bin/zlib1.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.setups/nsis/Bin/MakeLangId.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.setups/nsis/Bin/GenPat.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.setups/nsis/COPYING
===================================================================
--- tmp/org.txm.setups/nsis/COPYING	(revision 2955)
+++ tmp/org.txm.setups/nsis/COPYING	(revision 2956)
@@ -1,7 +1,7 @@
 COPYRIGHT
 ---------
 
-Copyright (C) 1995-2015 Contributors
+Copyright (C) 1999-2020 Contributors
 
 More detailed copyright information can be found in the individual source code files.
 
Index: tmp/org.txm.setups/nsis/Docs/Math/Math.txt
===================================================================
--- tmp/org.txm.setups/nsis/Docs/Math/Math.txt	(revision 2955)
+++ tmp/org.txm.setups/nsis/Docs/Math/Math.txt	(revision 2956)
@@ -16,7 +16,7 @@
         Strcpy $0 "Brainsucker"
         Math::Script "a = 'Math'; B = 'Script'; r0 += ' wants to use ' + a + '::' + b +'!'"
         DetailPrint "$0"
-That string will fill r0 with some shit. 
+That string will fill r0 with some stuff. 
 
 Here are some other samples:
         10! (factorial, r0 will contain '10! = 362880'):
@@ -103,7 +103,7 @@
 and the result of the last one of these sub-exprs gives you the result of 
 expression.
 
-All the shit (like variables and functions) will be saved between calls.
+All the stuff (like variables and functions) will be saved between calls.
 
 Functions:
         type conversions:
Index: tmp/org.txm.setups/nsis/Docs/MultiUser/Readme.html
===================================================================
--- tmp/org.txm.setups/nsis/Docs/MultiUser/Readme.html	(revision 2955)
+++ tmp/org.txm.setups/nsis/Docs/MultiUser/Readme.html	(revision 2956)
@@ -4,6 +4,9 @@
     <title>Multi-User Header File (MultiUser.nsh)</title>
     <meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
     <style type="text/css">
+        body { background-color: #fefefe; color: #050505; }
+        code { background-color: #f6f6f6; }
+        pre { background-color: inherit; }
         td
         {
             padding: 5px;
@@ -107,7 +110,7 @@
         Insert the MULTIUSER_INIT and MULTIUSER_UNINT macros in the .onInit and un.onInit
         function to verify these privileges. If no uninstaller is created in the script,
         set MULTIUSER_NOUNINSTALL.</p>
-    <blockquote>
+    <code>
         <pre>!define MULTIUSER_EXECUTIONLEVEL Highest
 ;!define MULTIUSER_NOUNINSTALL ;Uncomment if no uninstaller is created
 !include MultiUser.nsh
@@ -121,7 +124,7 @@
 Function un.onInit
   !insertmacro MULTIUSER_UNINIT
 FunctionEnd</pre>
-    </blockquote>
+    </code>
     <p>
         Whether the required privileges can be obtained depends on the user that starts
         the installer:</p>
@@ -181,6 +184,14 @@
         </tr>
         <tr>
             <td>
+                MULTIUSER_USE_PROGRAMFILES64
+            </td>
+            <td>
+                Use $PROGRAMFILES64 instead of $PROGRAMFILES as the default all users directory.
+            </td>
+        </tr>
+        <tr>
+            <td>
                 MULTIUSER_INIT_FUNCTIONQUIT<br />
                 MULTIUSER_INIT_UNFUNCTIONQUIT
             </td>
@@ -252,7 +263,7 @@
             installation mode. To use this page, define MULTIUSER_MUI before including User.nsh.
             Then, the MULTIUSER_PAGE_INSTALLMODE macro can be used just like a normal Modern
             UI page (this page will automatically be skipped when running Windows 95/98/Me):</p>
-        <pre>!define MULTIUSER_EXECUTIONLEVEL Highest
+        <code><pre>!define MULTIUSER_EXECUTIONLEVEL Highest
 <b>!define MULTIUSER_MUI</b>
 !define MULTIUSER_INSTALLMODE_COMMANDLINE
 !include MultiUser.nsh
@@ -273,7 +284,7 @@
 Function un.onInit
   !insertmacro MULTIUSER_UNINIT
 FunctionEnd
-</pre>
+</pre></code>
         <p>
             The MULTIUSER_INSTALLMODE_COMMANDLINE setting that also appears in this example
             enables the installation mode to be set using the /AllUsers or /CurrentUser command
@@ -283,37 +294,25 @@
             to the general Modern UI page settings):</p>
         <table>
             <tr>
-                <td>
-                    <b>Setting</b>
-                </td>
-                <td>
-                    <b>Description</b>
-                </td>
+                <td><b>Setting</b></td>
+                <td><b>Description</b></td>
             </tr>
             <tr>
-                <td>
-                    MULTIUSER_INSTALLMODEPAGE_TEXT_TOP
-                </td>
-                <td>
-                    Text to display on the top of the page.
-                </td>
+                <td>MULTIUSER_INSTALLMODEPAGE_TEXT_TOP</td>
+                <td>Text to display on the top of the page.</td>
             </tr>
             <tr>
-                <td>
-                    MULTIUSER_INSTALLMODEPAGE_TEXT_ALLUSERS
-                </td>
-                <td>
-                    Text to display on the combo button for a per-machine installation.
-                </td>
+                <td>MULTIUSER_INSTALLMODEPAGE_TEXT_ALLUSERS</td>
+                <td>Text to display on the radio button for a per-machine installation.</td>
             </tr>
             <tr>
-                <td>
-                    MULTIUSER_INSTALLMODEPAGE_TEXT_CURRENTUSER
-                </td>
-                <td>
-                    Text to display on the combo button for a per-user installation.
-                </td>
+                <td>MULTIUSER_INSTALLMODEPAGE_TEXT_CURRENTUSER</td>
+                <td>Text to display on the radio button for a per-user installation.</td>
             </tr>
+            <tr>
+                <td>MULTIUSER_INSTALLMODEPAGE_SHOWUSERNAME</td>
+                <td>Append the username to the per-user radio button.</td>
+            </tr>
         </table>
         <h3>
             Installation Mode Initalization</h3>
@@ -357,7 +356,7 @@
                     MULTIUSER_INSTALLMODE_UNFUNCTION
                 </td>
                 <td>
-                    A custom fuction to be called during the initialization of the installation mode
+                    A custom function to be called during the initialization of the installation mode
                     to set additional installer settings that depend on the mode
                 </td>
         </table>
Index: tmp/org.txm.setups/nsis/Docs/Splash/splash.txt
===================================================================
--- tmp/org.txm.setups/nsis/Docs/Splash/splash.txt	(revision 2955)
+++ tmp/org.txm.setups/nsis/Docs/Splash/splash.txt	(revision 2956)
@@ -15,7 +15,7 @@
   File /oname=spltmp.bmp "my_splash.bmp"
 
 ; optional
-; File /oname=spltmp.wav "my_splashshit.wav"
+; File /oname=spltmp.wav "my_splashsound.wav"
 
   splash::show 1000 $TEMP\spltmp
 
Index: tmp/org.txm.setups/nsis/Docs/NSISdl/ReadMe.txt
===================================================================
--- tmp/org.txm.setups/nsis/Docs/NSISdl/ReadMe.txt	(revision 2955)
+++ tmp/org.txm.setups/nsis/Docs/NSISdl/ReadMe.txt	(revision 2956)
@@ -3,7 +3,8 @@
 
 Copyright (C) 2001-2002 Yaroslav Faybishenko & Justin Frankel
 
-This plugin can be used from NSIS to download files via http.
+This plugin can be used from NSIS to download files via HTTP.
+Note: HTTPS is not supported, only plain HTTP!
 
 To connect to the internet, use the Dialer plugin.
 
Index: tmp/org.txm.setups/nsis/Docs/makensisw/Readme.txt
===================================================================
--- tmp/org.txm.setups/nsis/Docs/makensisw/Readme.txt	(revision 2955)
+++ tmp/org.txm.setups/nsis/Docs/makensisw/Readme.txt	(revision 2956)
@@ -191,11 +191,31 @@
 
 2.3.1
 - Fixed broken command line parameter handling
- 
+
+2.3.2
+- The size gripper can be used to resize the window
+
+2.3.3
+- Update check switched from JNetLib to WinInet
+- New file type icons
+
+2.3.4
+- Added Window Info/Spy feature
+- System DPI aware
+- New toolbar images
+
+2.3.5
+- Added log window colors
+- Basic AppEvents custom sound support for BuildComplete, BuildWarning and BuildError
+
+2.3.6
+- Added GUID generator tool
+
 Copyright Information
 ---------------------
 Copyright (c) 2002 Robert Rainwater
-Contributors: Justin Frankel, Fritz Elfert, Amir Szekely, Sunil Kamath, Joost Verburg
+Contributors: Justin Frankel, Fritz Elfert, Amir Szekely, 
+              Sunil Kamath, Joost Verburg, Anders Kjersem.
 
 This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any damages
Index: tmp/org.txm.setups/nsis/Docs/Modern UI 2/License.txt
===================================================================
--- tmp/org.txm.setups/nsis/Docs/Modern UI 2/License.txt	(revision 2955)
+++ tmp/org.txm.setups/nsis/Docs/Modern UI 2/License.txt	(revision 2956)
@@ -1,4 +1,4 @@
-Copyright © 2002-2015 Joost Verburg
+Copyright © 2002-2020 Joost Verburg
 
 This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
 
Index: tmp/org.txm.setups/nsis/Docs/Modern UI 2/Readme.html
===================================================================
--- tmp/org.txm.setups/nsis/Docs/Modern UI 2/Readme.html	(revision 2955)
+++ tmp/org.txm.setups/nsis/Docs/Modern UI 2/Readme.html	(revision 2956)
@@ -80,7 +80,7 @@
         }
         .toggle
         {
-            display: none;
+            display: block;
         }
         .options
         {
@@ -98,33 +98,25 @@
    image_open.src = "images/open.gif";
    var image_closed = new Image();
    image_closed.src = "images/closed.gif";
-   
+
+   function GEBY(d, i) { return d.getElementById ? d.getElementById(i) : document.all ? document.all[i] : 0 }
+
    function toggle(image, section) {
-   
-      if(document.all) {
-        if(document.all[section].style.display == "block") {
-           document.all[section].style.display = "none";
-           document.all[image].src = image_closed.src;
-        }
-        else
-        {              
-           document.all[section].style.display = "block";
-           document.all[image].src = image_open.src;
-        }
-      }
-      else
+
+      if (section = GEBY(document, section))
       {
-      if(document.getElementById(section).style.display == "block") {
-         document.getElementById(section).style.display = "none";
-         document.getElementById(image).src = image_closed.src;
+         image = GEBY(document, image);
+         if (section.style.display != "none")
+         {
+            section.style.display = "none";
+            image.src = image_closed.src;
          }
-      else
-         {              
-         document.getElementById(section).style.display = "block";
-         document.getElementById(image).src = image_open.src;
+         else
+         {
+            section.style.display = "block";
+            image.src = image_open.src;
          }
       }
-   
    }
 
    function expandall() {
@@ -151,11 +143,17 @@
 
    }
 
+   function onDocLoad() {
+
+      toggle('trigger_scr', 'toggle_scr');
+      toggle('trigger_lic', 'toggle_lic');
+   }
+
 //]]>
     </script>
 
 </head>
-<body>
+<body onLoad="onDocLoad()">
     <table width="750" class="maintable" cellspacing="0" cellpadding="0" align="center">
         <tr>
             <td>
@@ -180,18 +178,16 @@
                             the setup wizard is closed (for example, whether the application should be started
                             immediately). A finish page can also be used to ask for a system restart is necessary.</p>
                         <h3>
-                            <img class="trigger" alt="Open/Close section" id="trigger_scr" src="images/closed.gif"
+                            <img class="trigger" alt="Open/Close section" id="trigger_scr" src="images/open.gif"
                                 onclick="toggle('trigger_scr', 'toggle_scr');" />
                             Screenshots</h3>
                         <div class="toggle" id="toggle_scr">
-                            <p>
-                                <img src="images/screen1.png" width="503" height="393" alt="" /></p>
-                            <p>
-                                <img src="images/screen2.png" width="503" height="393" alt="" /></p>
+                            <p><img src="images/screen1.png" width="503" height="393" alt="" /></p>
+                            <p><img src="images/screen2.png" width="503" height="393" alt="" /></p>
                         </div>
                     </div>
                     <h1>
-                        Modern UI 2.0</h1>
+                        Modern UI 2.1</h1>
                     <div>
                         <p>
                             This new version makes it easier to customize pages, because the same method can
@@ -254,12 +250,12 @@
 !define MUI_INSTFILESPAGE_COLORS &quot;FFFFFF 000000&quot; ;Two colors
 </pre>
                                 <h3>
-                                    <img class="trigger" alt="Open/Close section" id="trigger_in" src="images/closed.gif"
+                                    <img class="trigger" alt="Open/Close section" id="trigger_in" src="images/open.gif"
                                         onclick="toggle('trigger_in', 'toggle_in');" />
                                     Interface settings</h3>
                                 <div class="toggle" id="toggle_in">
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_ingen" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_ingen" src="images/open.gif"
                                             onclick="toggle('trigger_ingen', 'toggle_ingen');" />
                                         Page header</h3>
                                     <div class="toggle" id="toggle_ingen">
@@ -282,11 +278,23 @@
                                                 <em>Default: ${NSISDIR}\Contrib\Graphics\Header\nsis.bmp</em></p>
                                             <div class="settings">
                                                 <p>
-                                                    <strong>MUI_HEADERIMAGE_BITMAP_NOSTRETCH</strong><br />
-                                                    Do not stretch the installer header bitmap to fit the size of the field. Use this
-                                                    option only if you have an image that does not use the whole space. If you have
-                                                    a full size bitmap that fits exactly, you should not use this option because the
-                                                    size of the field will be different if the user has a custom DPI setting.</p>
+                                                    <strong>MUI_HEADERIMAGE_BITMAP_STRETCH</strong> <span class="parameter">mode</span><br />
+                                                    <ul>
+                                                    <li><p><strong>FitControl</strong> (Default)<br />
+                                                    Stretch the image to fit the image control.</p>
+                                                    <li><p><strong>NoStretchNoCropNoAlign</strong><br />
+                                                    Do not stretch the image to fit the size of the image control.
+                                                    You should not use this option if you have a full size bitmap that fits exactly because
+                                                    the size of the field will be different if the user has a custom DPI setting or
+                                                    if the installer is using a CJK language.</p>
+                                                    <li><p><strong>NoStretchNoCrop</strong><br />
+                                                    This is similar to NoStretchNoCropNoAlign but will align the image to the right edge when 
+                                                    using a RTL language or if MUI_HEADERIMAGE_RIGHT is defined.</p>
+                                                    <li><p><strong>AspectFitHeight</strong><br />
+                                                    Scale the image up or down until it is the same height as the image control while 
+                                                    maintaining the image aspect ratio.</p>
+                                                    </ul>
+                                                </p>
                                                 <p>
                                                     <strong>MUI_HEADERIMAGE_BITMAP_RTL</strong> <span class="parameter">bmp_file</span><br />
                                                     Bitmap image to display on the header of installers pages when using a RTL language
@@ -294,12 +302,8 @@
                                                     <em>Default: Non-RTL bitmap</em></p>
                                                 <div class="settings">
                                                     <p>
-                                                        <strong>MUI_HEADERIMAGE_BITMAP_RTL_NOSTRETCH</strong><br />
-                                                        Do not stretch the installer header bitmap when using a RTL language to fit the
-                                                        size of the field. Use this option only if you have an image that does not use the
-                                                        whole space. If you have a full size bitmap that fits exactly, you should not use
-                                                        this option because the size of the field will be different if the user has a custom
-                                                        DPI setting.</p>
+                                                        <strong>MUI_HEADERIMAGE_BITMAP_RTL_STRETCH</strong> <span class="parameter">mode</span><br />
+                                                        See MUI_HEADERIMAGE_BITMAP_STRETCH for a list of the available stretch modes.</p>
                                                 </div>
                                             </div>
                                             <p>
@@ -309,11 +313,8 @@
                                                 <em>Default: Installer header bitmap</em></p>
                                             <div class="settings">
                                                 <p>
-                                                    <strong>MUI_HEADERIMAGE_UNBITMAP_NOSTRETCH</strong><br />
-                                                    Do not stretch the uninstaller header bitmap to fit the size of the field. Use this
-                                                    option only if you have an image that does not use the whole space. If you have
-                                                    a full size bitmap that fits exactly, you should not use this option because the
-                                                    size of the field will be different if the user has a custom DPI setting.</p>
+                                                    <strong>MUI_HEADERIMAGE_UNBITMAP_STRETCH</strong> <span class="parameter">mode</span><br />
+                                                    See MUI_HEADERIMAGE_BITMAP_STRETCH for a list of the available stretch modes.</p>
                                                 <p>
                                                     <strong>MUI_HEADERIMAGE_UNBITMAP_RTL</strong> <span class="parameter">bmp_file</span><br />
                                                     Bitmap image to display on the header of uninstallers pages when using a RTL language
@@ -321,12 +322,8 @@
                                                     <em>Default: Installer RTL header bitmap</em></p>
                                                 <div class="settings">
                                                     <p>
-                                                        <strong>MUI_HEADERIMAGE_UNBITMAP_RTL_NOSTRETCH</strong><br />
-                                                        Do not stretch the uninstaller header bitmap when using a RTL language to fit the
-                                                        size of the field. Use this option only if you have an image that does not use the
-                                                        whole space. If you have a full size bitmap that fits exactly, you should not use
-                                                        this option because the size of the field will be different if the user has a custom
-                                                        DPI setting.</p>
+                                                        <strong>MUI_HEADERIMAGE_UNBITMAP_RTL_STRETCH</strong> <span class="parameter">mode</span><br />
+                                                        See MUI_HEADERIMAGE_BITMAP_STRETCH for a list of the available stretch modes.</p>
                                                 </div>
                                             </div>
                                             <p>
@@ -342,9 +339,13 @@
                                             <strong>MUI_HEADER_TRANSPARENT_TEXT</strong><br />
                                             Set a transparent background for the header's label controls. Useful for custom
                                             user interfaces that set a bigger header image.</p>
+                                        <p>
+                                            <strong>MUI_TEXTCOLOR</strong> <span class="parameter">(color: RRGGBBR hexadecimal)</span><br />
+                                            Text color for the header, the Welcome page and the Finish page.<br />
+                                            <em>Default: 000000</em></p>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_inres" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_inres" src="images/open.gif"
                                             onclick="toggle('trigger_inres', 'toggle_inres');" />
                                         Interface resources</h3>
                                     <div class="toggle" id="toggle_inres">
@@ -375,7 +376,7 @@
                                             <em>Default: ${NSISDIR}\Contrib\UIs\modern_nodesc.exe</em></p>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_inwf" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_inwf" src="images/open.gif"
                                             onclick="toggle('trigger_inwf', 'toggle_inwf');" />
                                         Installer welcome/finish page</h3>
                                     <div class="toggle" id="toggle_inwf">
@@ -385,15 +386,12 @@
                                             <em>Default: ${NSISDIR}\Contrib\Graphics\Wizard\win.bmp</em></p>
                                         <div class="settings">
                                             <p>
-                                                <strong>MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH</strong><br />
-                                                Do not stretch the bitmap for the Welcome and Finish page to fit the size of the
-                                                field. Use this option only if you have an image that does not use the whole space.
-                                                If you have a full size bitmap that fits exactly, you should not use this option
-                                                because the size of the field will be different if the user has a custom DPI setting.</p>
+                                                <strong>MUI_WELCOMEFINISHPAGE_BITMAP_STRETCH</strong> <span class="parameter">mode</span><br />
+                                                See MUI_HEADERIMAGE_BITMAP_STRETCH for a list of the available stretch modes.</p>
                                         </div>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_inuwf" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_inuwf" src="images/open.gif"
                                             onclick="toggle('trigger_inuwf', 'toggle_inuwf');" />
                                         Uninstaller welcome/finish page</h3>
                                     <div class="toggle" id="toggle_inuwf">
@@ -403,15 +401,12 @@
                                             <em>Default: ${NSISDIR}\Contrib\Graphics\Wizard\win.bmp</em></p>
                                         <div class="settings">
                                             <p>
-                                                <strong>MUI_UNWELCOMEFINISHPAGE_BITMAP_NOSTRETCH</strong><br />
-                                                Do not stretch the bitmap for the Welcome and Finish page to fit the size of the
-                                                field. Use this option only if you have an image that does not use the whole space.
-                                                If you have a full size bitmap that fits exactly, you should not use this option
-                                                because the size of the field will be different if the user has a custom DPI setting.</p>
+                                                <strong>MUI_UNWELCOMEFINISHPAGE_BITMAP_STRETCH</strong> <span class="parameter">mode</span><br />
+                                                See MUI_HEADERIMAGE_BITMAP_STRETCH for a list of the available stretch modes.</p>
                                         </div>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_inl" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_inl" src="images/open.gif"
                                             onclick="toggle('trigger_inl', 'toggle_inl');" />
                                         License page</h3>
                                     <div class="toggle" id="toggle_inl">
@@ -424,7 +419,7 @@
                                             <em>Default: /windows</em></p>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_inc" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_inc" src="images/open.gif"
                                             onclick="toggle('trigger_inc', 'toggle_inc');" />
                                         Components page</h3>
                                     <div class="toggle" id="toggle_inc">
@@ -441,7 +436,7 @@
                                             No description area.</p>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_ind" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_ind" src="images/open.gif"
                                             onclick="toggle('trigger_ind', 'toggle_ind');" />
                                         Directory page</h3>
                                     <div class="toggle" id="toggle_ind">
@@ -450,7 +445,7 @@
                                             The background color for the directory textbox.</p>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_ins" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_ins" src="images/open.gif"
                                             onclick="toggle('trigger_ins', 'toggle_ins');" />
                                         Start Menu folder page</h3>
                                     <div class="toggle" id="toggle_ins">
@@ -459,7 +454,7 @@
                                             The background color for the startmenu directory list and textbox.</p>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_ini" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_ini" src="images/open.gif"
                                             onclick="toggle('trigger_ini', 'toggle_ini');" />
                                         Installation page</h3>
                                     <div class="toggle" id="toggle_ini">
@@ -475,7 +470,7 @@
                                             <em>Default: smooth</em></p>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_inf" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_inf" src="images/open.gif"
                                             onclick="toggle('trigger_inf', 'toggle_inf');" />
                                         Installer finish page</h3>
                                     <div class="toggle" id="toggle_inf">
@@ -485,7 +480,7 @@
                                             log.</p>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_uinf" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_uinf" src="images/open.gif"
                                             onclick="toggle('trigger_uinf', 'toggle_uinf');" />
                                         Uninstaller finish page</h3>
                                     <div class="toggle" id="toggle_uinf">
@@ -495,7 +490,7 @@
                                             log.</p>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_inaw" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_inaw" src="images/open.gif"
                                             onclick="toggle('trigger_inaw', 'toggle_inaw');" />
                                         Abort warning</h3>
                                     <div class="toggle" id="toggle_inaw">
@@ -512,7 +507,7 @@
                                         </div>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_inuaw" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_inuaw" src="images/open.gif"
                                             onclick="toggle('trigger_inuaw', 'toggle_inuaw');" />
                                         Uninstaller abort warning</h3>
                                     <div class="toggle" id="toggle_inuaw">
@@ -571,7 +566,7 @@
                             MUI_UNPAGE_INSTFILES<br />
                             MUI_UNPAGE_FINISH</p>
                         <h3>
-                            <img class="trigger" alt="Open/Close section" id="trigger_pg" src="images/closed.gif"
+                            <img class="trigger" alt="Open/Close section" id="trigger_pg" src="images/open.gif"
                                 onclick="toggle('trigger_pg', 'toggle_pg');" />
                             Page settings</h3>
                         <div class="toggle" id="toggle_pg">
@@ -601,7 +596,7 @@
                                     In all text settings, the doublequote character (&quot;) should be escaped in the
                                     following form: $\&quot;</p>
                                 <h3>
-                                    <img class="trigger" alt="Open/Close section" id="trigger_pgg" src="images/closed.gif"
+                                    <img class="trigger" alt="Open/Close section" id="trigger_pgg" src="images/open.gif"
                                         onclick="toggle('trigger_pgg', 'toggle_pgg');" />
                                     General page settings</h3>
                                 <div class="toggle" id="toggle_pgg">
@@ -613,7 +608,7 @@
                                         Subtext to display on the header of the page.</p>
                                 </div>
                                 <h3>
-                                    <img class="trigger" alt="Open/Close section" id="trigger_pgw" src="images/closed.gif"
+                                    <img class="trigger" alt="Open/Close section" id="trigger_pgw" src="images/open.gif"
                                         onclick="toggle('trigger_pgw', 'toggle_pgw');" />
                                     Welcome page settings</h3>
                                 <div class="toggle" id="toggle_pgw">
@@ -628,7 +623,7 @@
                                         Text to display on the page.</p>
                                 </div>
                                 <h3>
-                                    <img class="trigger" alt="Open/Close section" id="trigger_pgl" src="images/closed.gif"
+                                    <img class="trigger" alt="Open/Close section" id="trigger_pgl" src="images/open.gif"
                                         onclick="toggle('trigger_pgl', 'toggle_pgl');" />
                                     License page settings</h3>
                                 <div class="toggle" id="toggle_pgl">
@@ -663,7 +658,7 @@
                                     </div>
                                 </div>
                                 <h3>
-                                    <img class="trigger" alt="Open/Close section" id="trigger_pgc" src="images/closed.gif"
+                                    <img class="trigger" alt="Open/Close section" id="trigger_pgc" src="images/open.gif"
                                         onclick="toggle('trigger_pgc', 'toggle_pgc');" />
                                     Components page settings</h3>
                                 <div class="toggle" id="toggle_pgc">
@@ -684,7 +679,7 @@
                                         Text to display inside the description box when no section is selected.</p>
                                 </div>
                                 <h3>
-                                    <img class="trigger" alt="Open/Close section" id="trigger_pgd" src="images/closed.gif"
+                                    <img class="trigger" alt="Open/Close section" id="trigger_pgd" src="images/open.gif"
                                         onclick="toggle('trigger_pgd', 'toggle_pgd');" />
                                     Directory page settings</h3>
                                 <div class="toggle" id="toggle_pgd">
@@ -704,7 +699,7 @@
                                         GetInstDirError in the leave function to handle an invalid folder.</p>
                                 </div>
                                 <h3>
-                                    <img class="trigger" alt="Open/Close section" id="trigger_pgs" src="images/closed.gif"
+                                    <img class="trigger" alt="Open/Close section" id="trigger_pgs" src="images/open.gif"
                                         onclick="toggle('trigger_pgs', 'toggle_pgs');" />
                                     Start Menu folder page settings</h3>
                                 <div class="toggle" id="toggle_pgs">
@@ -736,7 +731,7 @@
 </pre>
                                 </div>
                                 <h3>
-                                    <img class="trigger" alt="Open/Close section" id="trigger_pgi" src="images/closed.gif"
+                                    <img class="trigger" alt="Open/Close section" id="trigger_pgi" src="images/open.gif"
                                         onclick="toggle('trigger_pgi', 'toggle_pgi');" />
                                     Installation page settings</h3>
                                 <div class="toggle" id="toggle_pgi">
@@ -758,7 +753,7 @@
                                         been aborted.</p>
                                 </div>
                                 <h3>
-                                    <img class="trigger" alt="Open/Close section" id="trigger_pgf" src="images/closed.gif"
+                                    <img class="trigger" alt="Open/Close section" id="trigger_pgf" src="images/open.gif"
                                         onclick="toggle('trigger_pgf', 'toggle_pgf');" />
                                     Finish page settings</h3>
                                 <div class="toggle" id="toggle_pgf">
@@ -850,7 +845,7 @@
                                         this option to save some space if you are not using the /REBOOTOK flag or SetRebootFlag.</p>
                                 </div>
                                 <h3>
-                                    <img class="trigger" alt="Open/Close section" id="trigger_pgu" src="images/closed.gif"
+                                    <img class="trigger" alt="Open/Close section" id="trigger_pgu" src="images/open.gif"
                                         onclick="toggle('trigger_pgu', 'toggle_pgu');" />
                                     Uninstall confirm page settings</h3>
                                 <div class="toggle" id="toggle_pgu">
@@ -860,6 +855,10 @@
                                     <p>
                                         <strong>MUI_UNCONFIRMPAGE_TEXT_LOCATION</strong> <span class="parameter">text</span><br />
                                         Text to display next to the uninstall location text box.</p>
+                                    <p>
+                                        <strong>MUI_UNCONFIRMPAGE_VARIABLE</strong> <span class="parameter">variable</span><br />
+                                        Variable in which to store the uninstall source folder.<br />
+                                        <em>Default: $INSTDIR</em></p>
                                 </div>
                         </div>
                     </div>
@@ -884,7 +883,7 @@
                             start faster. Include reserve file commands for such files before your sections
                             and functions:</p>
                         <pre>
-ReserveFile MyPlugin.dll
+ReserveFile /plugin MyPlugin.dll
 !insertmacro MUI_RESERVEFILE_LANGDLL ;Language selection dialog
 ...
 </pre>
@@ -962,7 +961,7 @@
                         <p>
                             This macro can also be used in the un.onInit function.</p>
                         <h3>
-                            <img class="trigger" alt="Open/Close section" id="trigger_lss" src="images/closed.gif"
+                            <img class="trigger" alt="Open/Close section" id="trigger_lss" src="images/open.gif"
                                 onclick="toggle('trigger_lss', 'toggle_lss');" />
                             Settings for registry storage of selected language</h3>
                         <div class="toggle" id="toggle_lss">
@@ -988,7 +987,7 @@
 </pre>
                         </div>
                         <h3>
-                            <img class="trigger" alt="Open/Close section" id="trigger_lsin" src="images/closed.gif"
+                            <img class="trigger" alt="Open/Close section" id="trigger_lsin" src="images/open.gif"
                                 onclick="toggle('trigger_lsin', 'toggle_lsin');" />
                             Interface settings for selection dialog</h3>
                         <div class="toggle" id="toggle_lsin">
@@ -1033,9 +1032,10 @@
 LangString PAGE_SUBTITLE ${LANG_ENGLISH} &quot;Subtitle&quot;
 
 Function CustomPageFunction
-  !insermacro MUI_HEADER_TEXT $(PAGE_TITLE) $(PAGE_SUBTITLE)
+  !insertmacro MUI_HEADER_TEXT $(PAGE_TITLE) $(PAGE_SUBTITLE)
+  nsDialogs::...
   ...
-FuctionEnd
+FunctionEnd
 </pre>
                     </div>
                     <h1>
@@ -1058,7 +1058,7 @@
                         <p>
                             Modern UI pages can also customized using custom functions.</p>
                         <h3>
-                            <img class="trigger" alt="Open/Close section" id="trigger_cfg" src="images/closed.gif"
+                            <img class="trigger" alt="Open/Close section" id="trigger_cfg" src="images/open.gif"
                                 onclick="toggle('trigger_cfg', 'toggle_cfg');" />
                             General Custom Functions</h3>
                         <div class="toggle" id="toggle_cfg">
@@ -1077,7 +1077,7 @@
 								used, regular .onMouseOverSection and un.onMouseOverSection must be used.</p>
                         </div>
                         <h3>
-                            <img class="trigger" alt="Open/Close section" id="trigger_cfpg" src="images/closed.gif"
+                            <img class="trigger" alt="Open/Close section" id="trigger_cfpg" src="images/open.gif"
                                 onclick="toggle('trigger_cfpg', 'toggle_cfpg');" />
                             Page Custom Functions</h3>
                         <div class="toggle" id="toggle_cfpg">
@@ -1087,17 +1087,20 @@
                                 <strong>MUI_PAGE_CUSTOMFUNCTION_PRE</strong> <span class="parameter">function</span><br />
                                 <strong>MUI_PAGE_CUSTOMFUNCTION_SHOW</strong> <span class="parameter">function</span><br />
                                 <strong>MUI_PAGE_CUSTOMFUNCTION_LEAVE</strong> <span class="parameter">function</span><br />
+                                <strong>MUI_PAGE_CUSTOMFUNCTION_DESTROYED</strong> <span class="parameter">function</span><br />
                             </p>
                             <p>
                                 The pre function is called first and allows you to initalize variables or decide
                                 whether the page should be skipped. Then, the show function is called, which can
                                 be used to customize the interface. Finally, the user input can be validated in the
-								leave function. The NSIS Users Manual provides more information about these functions.</p>
+                                leave function. The NSIS Users Manual provides more information about these functions.</p>
                             <p>
                                 In the show function, the window handles of all controls on the page can be retrieved
                                 from a Modern UI variable. A list of the variables names is not yet available. For
-                                now, refer to the source files of the Modern UI 2.0. The variable declarations can
+                                now, refer to the source files of the Modern UI 2. The variable declarations can
                                 be found in the first lines of the header file for a certain page.</p>
+                            <p>
+                                The destroyed function is called after a external/plug-in page has been destroyed.
                         </div>
                     </div>
                     <h1>
@@ -1124,12 +1127,12 @@
                         <p>
                             The zlib/libpng license applies to the Modern UI.</p>
                         <h3>
-                            <img class="trigger" alt="Open/Close section" id="trigger_lic" src="images/closed.gif"
+                            <img class="trigger" alt="Open/Close section" id="trigger_lic" src="images/open.gif"
                                 onclick="toggle('trigger_lic', 'toggle_lic');" />
                             License Terms</h3>
                         <div class="toggle" id="toggle_lic">
                             <pre>
-Copyright &copy; 2002-2015 Joost Verburg
+Copyright &copy; 2002-2020 Joost Verburg
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
Index: tmp/org.txm.setups/nsis/Docs/InstallOptions/Readme.html
===================================================================
--- tmp/org.txm.setups/nsis/Docs/InstallOptions/Readme.html	(revision 2955)
+++ tmp/org.txm.setups/nsis/Docs/InstallOptions/Readme.html	(revision 2956)
@@ -105,7 +105,7 @@
                         use the new nsDialogs plug-in instead.</p>
                 </div>
                 <div>
-                    <h2>
+                    <h2 id="intro">
                         Introduction</h2>
                     <div>
                         <p>
@@ -114,12 +114,12 @@
                         <p>
                             The dialogs created by InstallOptions are based on INI files which define the controls
                             on the dialog and their properties. These INI files can be modified from the script
-                            to adjust the dialogs on runtime.</p>
+                            to adjust the dialogs at runtime.</p>
                         <p>
                             The format of INI files is described in a <a href="http://en.wikipedia.org/wiki/Ini_file">
                                 Wikipedia article</a>.</p>
                     </div>
-                    <h2>
+                    <h2 id="ini">
                         INI file structure</h2>
                     <div>
                         <p>
@@ -649,7 +649,7 @@
         </tr>
     </table>
     </div>
-    <h2>
+    <h2 id="nsh">
         Header file</h2>
     <div>
         <p>
@@ -659,10 +659,10 @@
 !include InstallOptions.nsh
 </pre>
     </div>
-    <h2>
+    <h2 id="dialog">
         Creating dialogs</h2>
     <div>
-        <h3>
+        <h3 id="extract">
             Extracting the INI file</h3>
         <div>
             <p>
@@ -685,7 +685,7 @@
 FunctionEnd
 </pre>
         </div>
-        <h3>
+        <h3 id="display">
             Displaying the dialog</h3>
         <div>
             <p>
@@ -702,7 +702,7 @@
 </pre>
         </div>
     </div>
-    <h2>
+    <h2 id="input">
         User input</h2>
     <div>
         <p>
@@ -712,17 +712,17 @@
 !insertmacro INSTALLOPTIONS_READ $VAR &quot;ioFile.ini&quot; &quot;Field #&quot; &quot;Name&quot;
 </pre>
     </div>
-    <h2>
+    <h2 id="writing">
         Writing to INI files</h2>
     <div>
         <p>
             The INSTALLOPTIONS_WRITE macro allows you to write values to the INI file to change
-            texts or control settings on runtime:
+            texts or control settings at runtime:
             <pre>
 !insertmacro INSTALLOPTIONS_WRITE &quot;ioFile.ini&quot; &quot;Field #&quot; &quot;Name&quot; &quot;Value&quot;
 </pre>
     </div>
-    <h2>
+    <h2 id="escape">
         Escaped values</h2>
     <div>
         <p>
@@ -780,7 +780,7 @@
   !insertmacro INSTALLOPTIONS_UNFUNCTION_WRITE_CONVERT
 </pre>
     </div>
-    <h2>
+    <h2 id="validate">
         Input validation</h2>
     <div>
         <p>
@@ -798,7 +798,7 @@
 FunctionEnd
 </pre>
     </div>
-    <h2>
+    <h2 id="dialogreturn">
         Return value</h2>
     <div>
         After a dialog is created (using display or show), a return value is available:</p>
@@ -816,7 +816,7 @@
             macro. The return value will be added to the stack, so you can use the Pop command
             to get it.</p>
     </div>
-    <h2>
+    <h2 id="reserve">
         Reserve files</h2>
     <div>
         <p>
@@ -828,7 +828,7 @@
             the INI files before all sections and functions:</p>
         <pre>
 ReserveFile &quot;test.ini&quot;
-ReserveFile &quot;${NSISDIR}\Plugins\InstallOptions.dll&quot;
+ReserveFile /plugin InstallOptions.dll
 </pre>
     </div>
     <h2>
@@ -868,7 +868,7 @@
 FunctionEnd
 </pre>
     </div>
-    <h2>
+    <h2 id="credits">
         Credits</h2>
     <div>
         <p>
@@ -877,13 +877,13 @@
             DLL version 2 by Amir Szekely, ORTIM, Joost Verburg<br />
             New documentation by Joost Verburg</p>
     </div>
-    <h2>
+    <h2 id="license">
         License</h2>
     <div>
         <pre>
 Original version Copyright &copy; 2001 Michael Bishop
 DLL version 1 Copyright &copy; 2001-2002 Nullsoft, Inc., ORTIM
-DLL version 2 Copyright &copy; 2003-2015 Amir Szekely, Joost Verburg, Dave Laundon
+DLL version 2 Copyright &copy; 2003-2020 Amir Szekely, Joost Verburg, Dave Laundon
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
Index: tmp/org.txm.setups/nsis/Docs/Modern UI/Changelog.txt
===================================================================
--- tmp/org.txm.setups/nsis/Docs/Modern UI/Changelog.txt	(revision 2955)
+++ tmp/org.txm.setups/nsis/Docs/Modern UI/Changelog.txt	(revision 2956)
@@ -1,6 +1,11 @@
 NSIS Modern User Interface
 Version History
 
+1.81
+* Added MUI_TEXTCOLOR (2018-09-09)
+* Added MUI_PAGE_CUSTOMFUNCTION_DESTROYED (2017-04-03)
+* Added support for MUI_UNCONFIRMPAGE_VARIABLE (RFE #511) (2016-12-30)
+
 1.8 - August 9, 2007
 * Uses the new language files
 * Updated documentation
Index: tmp/org.txm.setups/nsis/Docs/Modern UI/License.txt
===================================================================
--- tmp/org.txm.setups/nsis/Docs/Modern UI/License.txt	(revision 2955)
+++ tmp/org.txm.setups/nsis/Docs/Modern UI/License.txt	(revision 2956)
@@ -1,4 +1,4 @@
-Copyright 2002-2015 Joost Verburg
+Copyright 2002-2020 Joost Verburg
 
 This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
 
Index: tmp/org.txm.setups/nsis/Docs/Modern UI/Readme.html
===================================================================
--- tmp/org.txm.setups/nsis/Docs/Modern UI/Readme.html	(revision 2955)
+++ tmp/org.txm.setups/nsis/Docs/Modern UI/Readme.html	(revision 2956)
@@ -80,7 +80,7 @@
         }
         .toggle
         {
-            display: none;
+            display: block;
         }
         .options
         {
@@ -98,33 +98,25 @@
    image_open.src = "images/open.gif";
    var image_closed = new Image();
    image_closed.src = "images/closed.gif";
-   
+
+   function GEBY(d, i) { return d.getElementById ? d.getElementById(i) : document.all ? document.all[i] : 0 }
+
    function toggle(image, section) {
-   
-      if(document.all) {
-        if(document.all[section].style.display == "block") {
-           document.all[section].style.display = "none";
-           document.all[image].src = image_closed.src;
-        }
-        else
-        {              
-           document.all[section].style.display = "block";
-           document.all[image].src = image_open.src;
-        }
-      }
-      else
+
+      if (section = GEBY(document, section))
       {
-      if(document.getElementById(section).style.display == "block") {
-         document.getElementById(section).style.display = "none";
-         document.getElementById(image).src = image_closed.src;
+         image = GEBY(document, image);
+         if (section.style.display != "none")
+         {
+            section.style.display = "none";
+            image.src = image_closed.src;
          }
-      else
-         {              
-         document.getElementById(section).style.display = "block";
-         document.getElementById(image).src = image_open.src;
+         else
+         {
+            section.style.display = "block";
+            image.src = image_open.src;
          }
       }
-   
    }
 
    function expandall() {
@@ -151,11 +143,17 @@
 
    }
 
+   function onDocLoad() {
+
+      toggle('trigger_scr', 'toggle_scr');
+      toggle('trigger_lic', 'toggle_lic');
+   }
+
 //]]>
     </script>
 
 </head>
-<body>
+<body onLoad="onDocLoad()">
     <table width="750" class="maintable" cellspacing="0" cellpadding="0" align="center">
         <tr>
             <td>
@@ -180,14 +178,12 @@
                             the setup wizard is closed (for example, whether the application should be started
                             immediately). A finish page can also be used to ask for a system restart is necessary.</p>
                         <h3>
-                            <img class="trigger" alt="Open/Close section" id="trigger_scr" src="images/closed.gif"
+                            <img class="trigger" alt="Open/Close section" id="trigger_scr" src="images/open.gif"
                                 onclick="toggle('trigger_scr', 'toggle_scr');" />
                             Screenshots</h3>
                         <div class="toggle" id="toggle_scr">
-                            <p>
-                                <img src="images/screen1.png" width="503" height="393" alt="" /></p>
-                            <p>
-                                <img src="images/screen2.png" width="503" height="393" alt="" /></p>
+                            <p><img src="images/screen1.png" width="503" height="393" alt="" /></p>
+                            <p><img src="images/screen2.png" width="503" height="393" alt="" /></p>
                         </div>
                     </div>
                     <h1>
@@ -227,12 +223,12 @@
 !define MUI_INSTFILESPAGE_COLORS &quot;FFFFFF 000000&quot; ;Two colors
 </pre>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_in" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_in" src="images/open.gif"
                                             onclick="toggle('trigger_in', 'toggle_in');" />
                                         Interface settings</h3>
                                     <div class="toggle" id="toggle_in">
                                         <h3>
-                                            <img class="trigger" alt="Open/Close section" id="trigger_ingen" src="images/closed.gif"
+                                            <img class="trigger" alt="Open/Close section" id="trigger_ingen" src="images/open.gif"
                                                 onclick="toggle('trigger_ingen', 'toggle_ingen');" />
                                             Page header</h3>
                                         <div class="toggle" id="toggle_ingen">
@@ -315,9 +311,13 @@
                                                 <strong>MUI_HEADER_TRANSPARENT_TEXT</strong><br />
                                                 Set a transparent background for the header's label controls. Useful for custom
                                                 user interfaces that set a bigger header image.</p>
+                                            <p>
+                                                <strong>MUI_TEXTCOLOR</strong> <span class="parameter">(color: RRGGBBR hexadecimal)</span><br />
+                                                Text color for the header, the Welcome page and the Finish page.<br />
+                                                <em>Default: 000000</em></p>
                                         </div>
                                         <h3>
-                                            <img class="trigger" alt="Open/Close section" id="trigger_inres" src="images/closed.gif"
+                                            <img class="trigger" alt="Open/Close section" id="trigger_inres" src="images/open.gif"
                                                 onclick="toggle('trigger_inres', 'toggle_inres');" />
                                             Interface resources</h3>
                                         <div class="toggle" id="toggle_inres">
@@ -348,7 +348,7 @@
                                                 <em>Default: ${NSISDIR}\Contrib\UIs\modern_nodesc.exe</em></p>
                                         </div>
                                         <h3>
-                                            <img class="trigger" alt="Open/Close section" id="trigger_inwf" src="images/closed.gif"
+                                            <img class="trigger" alt="Open/Close section" id="trigger_inwf" src="images/open.gif"
                                                 onclick="toggle('trigger_inwf', 'toggle_inwf');" />
                                             Installer welcome/finish page</h3>
                                         <div class="toggle" id="toggle_inwf">
@@ -370,7 +370,7 @@
                                                 <em>Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial.ini</em></p>
                                         </div>
                                         <h3>
-                                            <img class="trigger" alt="Open/Close section" id="trigger_inuwf" src="images/closed.gif"
+                                            <img class="trigger" alt="Open/Close section" id="trigger_inuwf" src="images/open.gif"
                                                 onclick="toggle('trigger_inuwf', 'toggle_inuwf');" />
                                             Uninstaller welcome/finish page</h3>
                                         <div class="toggle" id="toggle_inuwf">
@@ -392,7 +392,7 @@
                                                 <em>Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial.ini</em></p>
                                         </div>
                                         <h3>
-                                            <img class="trigger" alt="Open/Close section" id="trigger_inl" src="images/closed.gif"
+                                            <img class="trigger" alt="Open/Close section" id="trigger_inl" src="images/open.gif"
                                                 onclick="toggle('trigger_inl', 'toggle_inl');" />
                                             License page</h3>
                                         <div class="toggle" id="toggle_inl">
@@ -405,7 +405,7 @@
                                                 <em>Default: /windows</em></p>
                                         </div>
                                         <h3>
-                                            <img class="trigger" alt="Open/Close section" id="trigger_inc" src="images/closed.gif"
+                                            <img class="trigger" alt="Open/Close section" id="trigger_inc" src="images/open.gif"
                                                 onclick="toggle('trigger_inc', 'toggle_inc');" />
                                             Components page</h3>
                                         <div class="toggle" id="toggle_inc">
@@ -422,7 +422,7 @@
                                                 No description area.</p>
                                         </div>
                                         <h3>
-                                            <img class="trigger" alt="Open/Close section" id="trigger_ind" src="images/closed.gif"
+                                            <img class="trigger" alt="Open/Close section" id="trigger_ind" src="images/open.gif"
                                                 onclick="toggle('trigger_ind', 'toggle_ind');" />
                                             Directory page</h3>
                                         <div class="toggle" id="toggle_ind">
@@ -431,7 +431,7 @@
                                                 The background color for the directory textbox.</p>
                                         </div>
                                         <h3>
-                                            <img class="trigger" alt="Open/Close section" id="trigger_ins" src="images/closed.gif"
+                                            <img class="trigger" alt="Open/Close section" id="trigger_ins" src="images/open.gif"
                                                 onclick="toggle('trigger_ins', 'toggle_ins');" />
                                             Start Menu folder page</h3>
                                         <div class="toggle" id="toggle_ins">
@@ -440,7 +440,7 @@
                                                 The background color for the startmenu directory list and textbox.</p>
                                         </div>
                                         <h3>
-                                            <img class="trigger" alt="Open/Close section" id="trigger_ini" src="images/closed.gif"
+                                            <img class="trigger" alt="Open/Close section" id="trigger_ini" src="images/open.gif"
                                                 onclick="toggle('trigger_ini', 'toggle_ini');" />
                                             Installation page</h3>
                                         <div class="toggle" id="toggle_ini">
@@ -456,7 +456,7 @@
                                                 <em>Default: smooth</em></p>
                                         </div>
                                         <h3>
-                                            <img class="trigger" alt="Open/Close section" id="trigger_inf" src="images/closed.gif"
+                                            <img class="trigger" alt="Open/Close section" id="trigger_inf" src="images/open.gif"
                                                 onclick="toggle('trigger_inf', 'toggle_inf');" />
                                             Installer finish page</h3>
                                         <div class="toggle" id="toggle_inf">
@@ -466,7 +466,7 @@
                                                 log.</p>
                                         </div>
                                         <h3>
-                                            <img class="trigger" alt="Open/Close section" id="trigger_uinf" src="images/closed.gif"
+                                            <img class="trigger" alt="Open/Close section" id="trigger_uinf" src="images/open.gif"
                                                 onclick="toggle('trigger_uinf', 'toggle_uinf');" />
                                             Uninstaller finish page</h3>
                                         <div class="toggle" id="toggle_uinf">
@@ -476,7 +476,7 @@
                                                 log.</p>
                                         </div>
                                         <h3>
-                                            <img class="trigger" alt="Open/Close section" id="trigger_inaw" src="images/closed.gif"
+                                            <img class="trigger" alt="Open/Close section" id="trigger_inaw" src="images/open.gif"
                                                 onclick="toggle('trigger_inaw', 'toggle_inaw');" />
                                             Abort warning</h3>
                                         <div class="toggle" id="toggle_inaw">
@@ -493,7 +493,7 @@
                                             </div>
                                         </div>
                                         <h3>
-                                            <img class="trigger" alt="Open/Close section" id="trigger_inuaw" src="images/closed.gif"
+                                            <img class="trigger" alt="Open/Close section" id="trigger_inuaw" src="images/open.gif"
                                                 onclick="toggle('trigger_inuaw', 'toggle_inuaw');" />
                                             Uninstaller abort warning</h3>
                                         <div class="toggle" id="toggle_inuaw">
@@ -552,7 +552,7 @@
                                 MUI_UNPAGE_INSTFILES<br />
                                 MUI_UNPAGE_FINISH</p>
                             <h3>
-                                <img class="trigger" alt="Open/Close section" id="trigger_pg" src="images/closed.gif"
+                                <img class="trigger" alt="Open/Close section" id="trigger_pg" src="images/open.gif"
                                     onclick="toggle('trigger_pg', 'toggle_pg');" />
                                 Page settings</h3>
                             <div class="toggle" id="toggle_pg">
@@ -582,7 +582,7 @@
                                         In all text settings, the doublequote character (&quot;) should be escaped in the
                                         following form: $\&quot;</p>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_pgg" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_pgg" src="images/open.gif"
                                             onclick="toggle('trigger_pgg', 'toggle_pgg');" />
                                         General page settings</h3>
                                     <div class="toggle" id="toggle_pgg">
@@ -594,7 +594,7 @@
                                             Subtext to display on the header of the page.</p>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_pgw" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_pgw" src="images/open.gif"
                                             onclick="toggle('trigger_pgw', 'toggle_pgw');" />
                                         Welcome page settings</h3>
                                     <div class="toggle" id="toggle_pgw">
@@ -611,7 +611,7 @@
                                             Text to display on the page.</p>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_pgl" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_pgl" src="images/open.gif"
                                             onclick="toggle('trigger_pgl', 'toggle_pgl');" />
                                         License page settings</h3>
                                     <div class="toggle" id="toggle_pgl">
@@ -646,7 +646,7 @@
                                         </div>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_pgc" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_pgc" src="images/open.gif"
                                             onclick="toggle('trigger_pgc', 'toggle_pgc');" />
                                         Components page settings</h3>
                                     <div class="toggle" id="toggle_pgc">
@@ -667,7 +667,7 @@
                                             Text to display inside the description box when no section is selected.</p>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_pgd" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_pgd" src="images/open.gif"
                                             onclick="toggle('trigger_pgd', 'toggle_pgd');" />
                                         Directory page settings</h3>
                                     <div class="toggle" id="toggle_pgd">
@@ -687,7 +687,7 @@
                                             GetInstDirError in the leave function to handle an invalid folder.</p>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_pgs" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_pgs" src="images/open.gif"
                                             onclick="toggle('trigger_pgs', 'toggle_pgs');" />
                                         Start Menu folder page settings</h3>
                                     <div class="toggle" id="toggle_pgs">
@@ -719,7 +719,7 @@
 </pre>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_pgi" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_pgi" src="images/open.gif"
                                             onclick="toggle('trigger_pgi', 'toggle_pgi');" />
                                         Installation page settings</h3>
                                     <div class="toggle" id="toggle_pgi">
@@ -741,7 +741,7 @@
                                             been aborted.</p>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_pgf" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_pgf" src="images/open.gif"
                                             onclick="toggle('trigger_pgf', 'toggle_pgf');" />
                                         Finish page settings</h3>
                                     <div class="toggle" id="toggle_pgf">
@@ -835,7 +835,7 @@
                                             this option to save some space if you are not using the /REBOOTOK flag or SetRebootFlag.</p>
                                     </div>
                                     <h3>
-                                        <img class="trigger" alt="Open/Close section" id="trigger_pgu" src="images/closed.gif"
+                                        <img class="trigger" alt="Open/Close section" id="trigger_pgu" src="images/open.gif"
                                             onclick="toggle('trigger_pgu', 'toggle_pgu');" />
                                         Uninstall confirm page settings</h3>
                                     <div class="toggle" id="toggle_pgu">
@@ -845,6 +845,10 @@
                                         <p>
                                             <strong>MUI_UNCONFIRMPAGE_TEXT_LOCATION</strong> <span class="parameter">text</span><br />
                                             Text to display next to the uninstall location text box.</p>
+                                        <p>
+                                            <strong>MUI_UNCONFIRMPAGE_VARIABLE</strong> <span class="parameter">variable</span><br />
+                                        Variable in which to store the uninstall source folder.<br />
+                                        <em>Default: $INSTDIR</em></p>
                                     </div>
                             </div>
                         </div>
@@ -948,7 +952,7 @@
                         <p>
                             This macro can also be used in the un.onInit function.</p>
                         <h3>
-                            <img class="trigger" alt="Open/Close section" id="trigger_lss" src="images/closed.gif"
+                            <img class="trigger" alt="Open/Close section" id="trigger_lss" src="images/open.gif"
                                 onclick="toggle('trigger_lss', 'toggle_lss');" />
                             Settings for registry storage of selected language</h3>
                         <div class="toggle" id="toggle_lss">
@@ -974,7 +978,7 @@
 </pre>
                         </div>
                         <h3>
-                            <img class="trigger" alt="Open/Close section" id="trigger_lsin" src="images/closed.gif"
+                            <img class="trigger" alt="Open/Close section" id="trigger_lsin" src="images/open.gif"
                                 onclick="toggle('trigger_lsin', 'toggle_lsin');" />
                             Interface settings for selection dialog</h3>
                         <div class="toggle" id="toggle_lsin">
@@ -1022,7 +1026,7 @@
 Function CustomPageFunction
   !insertmacro MUI_HEADER_TEXT $(PAGE_TITLE) $(PAGE_SUBTITLE)
   !insertmacro MUI_INSTALLOPTIONS_DISPLAY &quot;ioFile.ini&quot;
-FuctionEnd
+FunctionEnd
 </pre>
                     </div>
                     <h1>
@@ -1044,7 +1048,7 @@
 FunctionEnd
 </pre>
                         <h3>
-                            <img class="trigger" alt="Open/Close section" id="trigger_cfg" src="images/closed.gif"
+                            <img class="trigger" alt="Open/Close section" id="trigger_cfg" src="images/open.gif"
                                 onclick="toggle('trigger_cfg', 'toggle_cfg');" />
                             General Custom Functions</h3>
                         <div class="toggle" id="toggle_cfg">
@@ -1063,7 +1067,7 @@
 								used, regular .onMouseOverSection and un.onMouseOverSection must be used.</p>
                         </div>
                         <h3>
-                            <img class="trigger" alt="Open/Close section" id="trigger_cfpg" src="images/closed.gif"
+                            <img class="trigger" alt="Open/Close section" id="trigger_cfpg" src="images/open.gif"
                                 onclick="toggle('trigger_cfpg', 'toggle_cfpg');" />
                             Page Custom Functions</h3>
                         <div class="toggle" id="toggle_cfpg">
@@ -1083,7 +1087,7 @@
                             </ul>
                         </div>
                         <h3>
-                            <img class="trigger" alt="Open/Close section" id="trigger_cfwf" src="images/closed.gif"
+                            <img class="trigger" alt="Open/Close section" id="trigger_cfwf" src="images/open.gif"
                                 onclick="toggle('trigger_cfwf', 'toggle_cfwf');" />
                             Welcome/Finish Page Custom Functions</h3>
                         <div class="toggle" id="toggle_cfwf">
@@ -1104,7 +1108,7 @@
                             Welcome/Finish page: <a href="../../Examples/Modern%20UI/WelcomeFinish.nsi">WelcomeFinish.nsi</a><br />
                             Multiple languages: <a href="../../Examples/Modern%20UI/MultiLanguage.nsi">MultiLanguage.nsi</a><br />
                             Header image: <a href="../../Examples/Modern%20UI/HeaderBitmap.nsi">HeaderBitmap.nsi</a><br />
-                            Custom pages: <a href="../../Examples/Modern%20UI/InstallOptions.nsi">InstallOptions.nsi</a><br />
+                            Custom pages: <strike><a href="../../Examples/Modern%20UI/InstallOptions.nsi">InstallOptions.nsi</a></strike><br />
                             Start Menu Folder page: <a href="../../Examples/Modern%20UI/StartMenu.nsi">StartMenu.nsi</a></p>
                     </div>
                     <h1>
@@ -1121,12 +1125,12 @@
                         <p>
                             The zlib/libpng license applies to the Modern UI.</p>
                         <h3>
-                            <img class="trigger" alt="Open/Close section" id="trigger_lic" src="images/closed.gif"
+                            <img class="trigger" alt="Open/Close section" id="trigger_lic" src="images/open.gif"
                                 onclick="toggle('trigger_lic', 'toggle_lic');" />
                             License Terms</h3>
                         <div class="toggle" id="toggle_lic">
                             <pre>
-Copyright &copy; 2002-2015 Joost Verburg
+Copyright &copy; 2002-2020 Joost Verburg
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
Index: tmp/org.txm.setups/nsis/Docs/nsDialogs/Readme.html
===================================================================
--- tmp/org.txm.setups/nsis/Docs/nsDialogs/Readme.html	(revision 2955)
+++ tmp/org.txm.setups/nsis/Docs/nsDialogs/Readme.html	(revision 2956)
@@ -4,16 +4,12 @@
 <title>nsDialogs</title>
 <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
 <style type="text/css">
-b
-{
-	color: red;
-}
-code
-{
-	margin-left: 20px;
-	padding: 7px;
-	background-color: rgb(240,240,240);
-}
+body { color: #000000; background-color: #ffffff; }
+b { color: red; }
+code { margin-left: 1.2em; padding: 0.5em; background-color: #f0f0f0; display:inline-block; font-size:95%; }
+span.inlcod i { padding: 0px 0.2em; color: #222222; font-family: monospace; font-style: normal; }
+blockquote pre { background-color: #fcfcfc; font-family: monospace; }
+abbr { font-variant: none; cursor: help; }
 </style>
 </head>
 <body>
@@ -28,10 +24,7 @@
 <li>
 <a href="#step">Step-by-Step Tutorial</a>
 <ul>
-<li><a href="#step-basic">Basic Script</a></li>
 <li><a href="#step-page">Custom Page</a></li>
-<li><a href="#step-create">Creating Page</a></li>
-<li><a href="#step-show">Showing Page</a></li>
 <li><a href="#step-add">Adding Controls</a></li>
 <li><a href="#step-state">Control State</a></li>
 <li><a href="#step-notify">Real-time Notification</a></li>
@@ -61,38 +54,82 @@
 <a href="#mref">Macro Reference</a>
 <ul>
 <li><a href="#mref-create">NSD_Create*</a></li>
-<li><a href="#mref-onback">NSD_OnBack</a></li>
-<li><a href="#mref-onchange">NSD_OnChange</a></li>
-<li><a href="#mref-onclick">NSD_OnClick</a></li>
-<li><a href="#mref-onnotify">NSD_OnNotify</a></li>
-<li><a href="#mref-createtimer">NSD_CreateTimer</a></li>
-<li><a href="#mref-killtimer">NSD_KillTimer</a></li>
-<li><a href="#mref-addstyle">NSD_AddStyle</a></li>
-<li><a href="#mref-addexstyle">NSD_AddExStyle</a></li>
-<li><a href="#mref-gettext">NSD_GetText</a></li>
-<li><a href="#mref-settext">NSD_SetText</a></li>
-<li><a href="#mref-settextlimit">NSD_SetTextLimit</a></li>
-<li><a href="#mref-getstate">NSD_GetState</a></li>
-<li><a href="#mref-setstate">NSD_SetState</a></li>
-<li><a href="#mref-check">NSD_Check</a></li>
-<li><a href="#mref-uncheck">NSD_Uncheck</a></li>
-<li><a href="#mref-cbaddstring">NSD_CB_AddString</a></li>
-<li><a href="#mref-cbselectstring">NSD_CB_SelectString</a></li>
-<li><a href="#mref-lbaddstring">NSD_LB_AddString</a></li>
-<li><a href="#mref-lbdelstring">NSD_LB_DelString</a></li>
-<li><a href="#mref-lbclear">NSD_LB_Clear</a></li>
-<li><a href="#mref-lbgetcount">NSD_LB_GetCount</a></li>
-<li><a href="#mref-lbselectstring">NSD_LB_SelectString</a></li>
-<li><a href="#mref-lbgetselection">NSD_LB_GetSelection</a></li>
+<li><a href="#mref-onback">NSD_OnBack</a>, <a href="#mref-onchange">NSD_OnChange</a>, <a href="#mref-onclick">NSD_OnClick</a>, <a href="#mref-onnotify">NSD_OnNotify</a></li>
 <li><a href="#mref-setfocus">NSD_SetFocus</a></li>
-<li><a href="#mref-setimage">NSD_SetImage</a></li>
-<li><a href="#mref-setsimage">NSD_SetStretchedImage</a></li>
-<li><a href="#mref-seticon">NSD_SetIcon</a></li>
-<li><a href="#mref-seticonfrominstaller">NSD_SetIconFromInstaller</a></li>
-<li><a href="#mref-clearimage">NSD_ClearImage</a></li>
-<li><a href="#mref-clearicon">NSD_ClearIcon</a></li>
-<li><a href="#mref-freeimage">NSD_FreeImage</a></li>
-<li><a href="#mref-freeicon">NSD_FreeIcon</a></li>
+<li><a href="#mref-createtimer">NSD_CreateTimer</a>, <a href="#mref-killtimer">NSD_KillTimer</a></li>
+<li><a href="#mref-addstyle">NSD_AddStyle</a>, <a href="#mref-addexstyle">NSD_AddExStyle</a>, <a href="#mref-removestyle">NSD_RemoveStyle</a>, <a href="#mref-removeexstyle">NSD_RemoveExStyle</a></li>
+<li><a href="#mref-gettext">NSD_GetText</a>, <a href="#mref-settext">NSD_SetText</a></li>
+<li>Text, Password &amp; Number: 
+<a href="#mref-settextlimit">NSD_Edit_SetTextLimit</a>, 
+<a href="#mref-edsetro">NSD_Edit_SetReadOnly</a>,
+<a href="#mref-edsetcuebanner">NSD_Edit_SetCueBannerText</a>
+</li>
+<li>RichEdit: 
+<a href="#mref-richsettextlimit">NSD_RichEd_SetTextLimit</a>, 
+<a href="#mref-richseteventmask">NSD_RichEd_SetEventMask</a>, 
+<a href="#mref-richsetbkclr">NSD_RichEd_SetCustomBackgroundColor</a>
+</li>
+<li>CheckBox &amp; RadioButton: 
+<a href="#mref-getstate">NSD_GetState</a>, 
+<a href="#mref-setstate">NSD_SetState</a>, 
+<a href="#mref-check">NSD_Check</a>, 
+<a href="#mref-uncheck">NSD_Uncheck</a>
+</li>
+<li>ComboBox &amp; DropList: 
+<a href="#mref-cbaddstring">NSD_CB_AddString</a>, 
+<a href="#mref-cbinsstring">NSD_CB_PrependString, NSD_CB_AppendString, NSD_CB_InsertString</a>, 
+NSD_CB_DelString, 
+NSD_CB_DelItem, 
+NSD_CB_Clear, 
+<a href="#mref-cbgetcount">NSD_CB_GetCount</a>, 
+<a href="#mref-cbselectstring">NSD_CB_SelectString</a>
+</li>
+<li>ListBox: 
+<a href="#mref-lbaddstring">NSD_LB_AddString</a>, 
+<a href="#mref-lbinsstring">NSD_LB_PrependString, NSD_LB_AppendString, NSD_LB_InsertString</a>, 
+<a href="#mref-lbdelstring">NSD_LB_DelString</a>, 
+<a href="#mref-lbdelitem">NSD_LB_DelItem</a>, 
+<a href="#mref-lbclear">NSD_LB_Clear</a>, 
+<a href="#mref-lbgetcount">NSD_LB_GetCount</a>, 
+<a href="#mref-lbselectstring">NSD_LB_SelectString</a>, 
+<a href="#mref-lbgetselection">NSD_LB_GetSelection</a>
+</li>
+<li>Animation: 
+<a href="#mref-animopenfile">NSD_Anim_OpenFile</a>, 
+<a href="#mref-animplay">NSD_Anim_Play</a>, 
+<a href="#mref-animstop">NSD_Anim_Stop</a>
+</li>
+<li>HTrackBar &amp; VTrackBar: 
+<a href="#mref-trackgetpos">NSD_TrackBar_GetPos</a>, 
+<a href="#mref-tracksetpos">NSD_TrackBar_SetPos</a>, 
+<a href="#mref-tracksetrmin">NSD_TrackBar_SetRangeMin</a>, 
+<a href="#mref-tracksetrmax">NSD_TrackBar_SetRangeMax</a>, 
+<a href="#mref-tracksetticfr">NSD_TrackBar_SetTicFreq</a>
+</li>
+<li>UpDown: 
+<a href="#mref-udsetbuddy">NSD_UD_SetBuddy</a>, 
+<a href="#mref-udgetpos">NSD_UD_GetPos</a>, 
+<a href="#mref-udsetpos">NSD_UD_SetPos</a>,
+<a href="#mref-udsetpackedrange">NSD_UD_SetPackedRange</a>
+</li>
+<li>HotKey: 
+<a href="#mref-hkgethk">NSD_HK_GetHotKey</a>, <a href="#mref-hksethk">NSD_HK_SetHotKey</a>
+</li>
+<li>DatePicker: 
+<a href="#mref-dategetdatefields">NSD_Date_GetDateFields</a>
+</li>
+<li>Bitmap: 
+<a href="#mref-setbitmap">NSD_SetBitmap</a>, 
+<a href="#mref-setsbitmap">NSD_SetStretchedBitmap</a>, 
+<a href="#mref-clearbitmap">NSD_ClearBitmap</a>, 
+<a href="#mref-freebitmap">NSD_FreeBitmap</a>
+</li>
+<li>Icon: 
+<a href="#mref-seticon">NSD_SetIcon</a>, 
+<a href="#mref-seticonfrominstaller">NSD_SetIconFromInstaller</a>, 
+<a href="#mref-clearicon">NSD_ClearIcon</a>, 
+<a href="#mref-freeicon">NSD_FreeIcon</a>
+</li>
 </ul>
 </li>
 <li><a href="#faq">FAQ</a></li>
@@ -102,135 +139,63 @@
 
 <p>nsDialogs allows creation of custom pages in the installer. On top of the built-in pages, nsDialogs can create pages with any type of controls in any order and arrangement. It can create everything from a simple page with one label to form which reacts to user's actions. <a href="../Modern UI 2/Readme.html">Modern UI 2</a>, for example, uses nsDialogs to create the welcome and finish pages.</p>
 
-<p>nsDialogs is a new NSIS plug-in, introduced in version 2.29 as a replacement for <a href="../InstallOptions/Readme.html">InstallOptions</a>. nsDialogs doesn't use INI files, so it's way faster than InstallOptions. Integration with the script is tighter and more natural - creating controls is done using plug-in functions and notification is done by directly calling a function in the script. Unlike InstallOptions, there isn't a predefined set of available control type and by providing a lower level access to Windows API, every type of control can be created and pages can be more customizable.</p>
+<p>nsDialogs is a NSIS plug-in, introduced in version 2.29 as a replacement for <a href="../InstallOptions/Readme.html">InstallOptions</a>. nsDialogs doesn't use INI files, so it's way faster than InstallOptions. Integration with the script is tighter and more natural - creating controls is done using plug-in functions and notification is done by directly calling a function in the script. Unlike InstallOptions, there isn't a predefined set of available control type and by providing a lower level access to Windows API, every type of control can be created and pages can be more customizable.</p>
 
-<p>The same thing that makes nsDialogs more flexible can also make it more complicated for users with no knowledge of Win32 API. This is solved by creating a library of predefined functions, defined in script, that allow creation and handling of controls. This way, novices get easy access to the flexibility, while advanced users still get access to the core functionality by modifying the library or simply avoid using it.</p>
+<p>The same thing that makes nsDialogs more flexible can also make it more complicated for users with no knowledge of Win32 API. This is solved by creating a library of predefined functions, defined in script, that allow creation and handling of controls. This way, novices get easy access to the flexibility, while advanced users still get access to the <a href="http://msdn.microsoft.com/en-us/library/bb773169">core functionality</a> by modifying the library or simply avoid using it.</p>
 
 <h2><a name="step"></a>Step-by-Step Tutorial</h2>
 
-<h3><a name="step-basic"></a>Basic Script</h3>
-
-<p>Before using nsDialogs, lets first create a basic script as our skeleton.</p>
-
-<blockquote><pre>Name nsDialogs
-OutFile nsDialogs.exe
-
-XPStyle on
-
-Page instfiles
-
-Section
-
-	DetailPrint "hello world"
-
-SectionEnd</pre></blockquote>
-
 <h3><a name="step-page"></a>Custom Page</h3>
 
-<p>Next, we'll add a custom page where we can use nsDialogs. nsDialogs cannot be used in sections or any other function but a custom page's function.</p>
+<p>Before you can start adding controls you need to create a nsDialogs custom page. nsDialogs pages can only be created in a custom page's creator function, not in sections nor regular functions. Lets create a basic script with a empty nsDialogs page as our skeleton:</p>
 
-<blockquote><pre>Name nsDialogs
-OutFile nsDialogs.exe
-
-XPStyle on
-
-<b>Page custom nsDialogsPage</b>
-Page instfiles
-
-<b>Function nsDialogsPage
-FunctionEnd</b>
-
-Section
-
-	DetailPrint "hello world"
-
-SectionEnd</pre></blockquote>
-
-<h3><a name="step-create"></a>Creating Page</h3>
-
-<p>Now that the foundations are laid, it's time to use nsDialogs. The first call must always be to nsDialogs::Create. It will create a new dialog in the page and return its <i>HWND</i> on the stack. The result must be popped from the stack to prevent stack corruption. If the result is <i>error</i>, the dialog couldn't be created.</p>
-
-<p>nsDialogs::Create accepts one parameter. It has a very specific function, but to keep things simple for this tutorial, it must always be 1018.</p>
-
-<p><i>HWND</i> is a number that uniquely identifies the dialog and can be used with SendMessage, SetCtlColors and Win32 API.</p>
-
 <blockquote><pre><b>!include LogicLib.nsh</b>
 
 Name nsDialogs
 OutFile nsDialogs.exe
-
 XPStyle on
 
-<b>Var Dialog</b>
-
-Page custom nsDialogsPage
-Page instfiles
-
-Function nsDialogsPage
 <b>
-	nsDialogs::Create 1018
-	Pop $Dialog
-
-	${If} $Dialog == error
-		Abort
-	${EndIf}
-</b>
-FunctionEnd
-
-Section
-
-	DetailPrint "hello world"
-
-SectionEnd</pre></blockquote>
-
-<h3><a name="step-show"></a>Showing Page</h3>
-
-<p>Now that the page is created, it's time to show it. This is done with nsDialogs::Show. This function will not return until the user clicks Next, Back or Cancel.</p>
-
-<blockquote><pre>!include LogicLib.nsh
-
-Name nsDialogs
-OutFile nsDialogs.exe
-
-XPStyle on
-
 Var Dialog
 
-Page custom nsDialogsPage
+Page custom nsDialogsPage</b>
 Page instfiles
 
-Function nsDialogsPage
+<b>Function nsDialogsPage
 	nsDialogs::Create 1018
 	Pop $Dialog
 
 	${If} $Dialog == error
 		Abort
 	${EndIf}
-<b>
+
 	nsDialogs::Show
-</b>
-FunctionEnd
+FunctionEnd</b>
 
 Section
-
-	DetailPrint "hello world"
-
 SectionEnd</pre></blockquote>
+<span class="inlcod">
+<p>The first call must always be to <i>nsDialogs::Create</i>. It will create a new dialog in the page and return its <i>HWND</i> on the stack. The result must be popped from the stack to prevent stack corruption. If the result is <i>error</i>, the dialog couldn't be created and the page must be aborted!</p>
+<p><i>nsDialogs::Create</i> accepts one parameter. It has a very specific function, but to keep things simple for this tutorial, it must always be 1018.</p>
+<p><i>HWND</i> is a number that uniquely identifies the dialog and can be used with <i>SendMessage</i>, <i>SetCtlColors</i> and Win32 API functions.</p>
+<p>The dialog is not fully constructed at this point and you can make modifications to it before it is displayed. To finalize and display the dialog you must call <i>nsDialogs::Show</i>. This function will not return until the user clicks Next, Back or Cancel.</p>
+</span>
 
+
 <h3><a name="step-add"></a>Adding Controls</h3>
 
-<p>Compiling the last script and running it results in an empty page which is not very useful. So now we'll add some controls to it to. To do so, we'll use <a href="#mref-create">${NSD_Create*}</a> macros from nsDialogs.nsh. Each of those macros takes 5 parameters - x, y, width, height and text. Each macro also returns one value on the stack, which is the new control's HWND. Like the dialogs HWND, it must be popped from the stack and saved.</p>
+<span class="inlcod">
+<p>Compiling the last script and running it results in an empty page which is not very useful. So now we'll add some controls to it to. To do so, we'll use <a href="#mref-create">${NSD_Create*}</a> macros from nsDialogs.nsh. Each of those macros takes 5 parameters - x, y, width, height and text. Each macro also returns one value on the stack, which is the new control's <i>HWND</i>. Like the dialogs <i>HWND</i>, it must be popped from the stack and saved.</p>
 
 <p>Each of the measurements that the macros take can use one of three unit types - pixels, dialog units or percentage of the dialog's size. It can also be negative to indicate it should be measured from the end. To use dialog units, the measurement must be suffixed with the letter <i>u</i>. To use percentage, the measurement must be suffixed with the percentage sign - <i>%</i>. Any other suffix, or no suffix, means pixels.</p>
 
-<p>Dialog units allow creation of dialogs that scale well when different fonts or DPI is used. Its size in pixels is determined on runtime based on the font and the DPI. For example, standard pages in the classic NSIS user interface are 266 dialog units wide and 130 dialog units high. Pages in Modern UI are 300 dialogs units wide and 140 dialog units high. In different resolutions, using different fonts or DPI settings, the dialogs will always have the same size in dialog units, but different size in pixels.</p>
-
+<p>Dialog units allow creation of dialogs that scale well when different fonts or <abbr title="Dots per Inch">DPI</abbr> is used. Its size in pixels is determined at runtime based on the font and the DPI. For example, standard pages in the classic NSIS user interface are 266 dialog units wide and 130 dialog units high. Pages in Modern UI are 300 dialogs units wide and 140 dialog units high. In different resolutions, using different fonts or DPI settings, the dialogs will always have the same size in dialog units, but different size in pixels.</p>
+</span>
 <blockquote><pre><b>!include nsDialogs.nsh</b>
 !include LogicLib.nsh
 
 Name nsDialogs
 OutFile nsDialogs.exe
-
 XPStyle on
 
 Var Dialog
@@ -260,48 +225,54 @@
 FunctionEnd
 
 Section
-
-	DetailPrint "hello world"
-
 SectionEnd</pre></blockquote>
 
-<p>Available control types that can be created with <a href="#mref-create">${NSD_Create*}</a> are:</p>
+<p>Available control types that can be created with <a href="#mref-create">${NSD_Create*}</a> are: 
+HLine, 
+VLine, 
+Label, 
+Icon, 
+Bitmap, 
+BrowseButton, 
+Link, 
+Button, 
+GroupBox, 
+CheckBox, 
+RadioButton, 
+Text, 
+MLText, 
+Password, 
+Number, 
+FileRequest, 
+DirRequest, 
+RichEdit, 
+ComboBox, 
+DropList, 
+ListBox, 
+SortedListBox, 
+ProgressBar, 
+Animation, 
+HTrackBar, 
+VTrackBar, 
+UpDown, 
+HotKey, 
+DatePicker, 
+IPAddress, 
+NetAddress.
+</p>
 
-<ul>
-<li>HLine</li>
-<li>VLine</li>
-<li>Label</li>
-<li>Icon</li>
-<li>Bitmap</li>
-<li>BrowseButton</li>
-<li>Link</li>
-<li>Button</li>
-<li>GroupBox</li>
-<li>CheckBox</li>
-<li>RadioButton</li>
-<li>Text</li>
-<li>Password</li>
-<li>Number</li>
-<li>FileRequest</li>
-<li>DirRequest</li>
-<li>ComboBox</li>
-<li>DropList</li>
-<li>ListBox</li>
-<li>ProgressBar</li>
-</ul>
-
 <h3><a name="step-state"></a>Control State</h3>
 
-<p>Now that we have some controls that the user can interact with, it's time to see what the user actually does with them. For that, we'll first add a <i>leave callback</i> function to our page. In that function, we'll query the state of the text control we've created and display it to the user. To do so, we'll use the <a href="#mref-gettext">${NSD_GetText}</a> macro. Use the <a href="#mref-getstate">${NSD_GetState}</a> macro for RadioButton and CheckBox controls.</p>
+<span class="inlcod">
+<p>Now that we have some controls that the user can interact with, it's time to see what the user actually does with them. For that, we'll first add a "leave callback function" to our page. In that function, we'll query the state of the text control we've created and display it to the user. To do so, we'll use the <a href="#mref-gettext">${NSD_GetText}</a> macro. Use the <a href="#mref-getstate">${NSD_GetState}</a> macro for RadioButton and CheckBox controls.</p>
 
 <p>Note that not all controls support <a href="#mref-gettext">${NSD_GetText}</a> and some require special handling with specific messages defined in WinMessages.nsh. For example, the ListBox control requires usage of <i>LB_GETCURSEL</i> and <i>LB_GETTEXT</i>. With time, the library of macros in nsDialogs.nsh will fill with more and more macros that'll handle more cases like this.</p>
-
+</span>
 <blockquote><pre>!include nsDialogs.nsh
 !include LogicLib.nsh
 
 Name nsDialogs
 OutFile nsDialogs.exe
-
 XPStyle on
 
 Var Dialog
@@ -338,25 +309,22 @@
 FunctionEnd</b>
 
 Section
-
-	DetailPrint "hello world"
-
 SectionEnd</pre></blockquote>
 
 <h3><a name="step-notify"></a>Real-time Notification</h3>
 
+<span class="inlcod">
 <p>One of the more exciting new features of nsDialogs is callback function notification of changes to the dialog. nsDialogs can call a function defined in a script in response to a user action such as changing of a text field or click of a button. To make nsDialogs notify us of events, we'll use <a href="#mref-onclick">${NSD_OnClick}</a> and <a href="#mref-onchange">${NSD_OnChange}</a>. Not every control supports both of the events. For example, there is nothing to notify about label changes, only clicks.</p>
 
-<p>When the callback function is called, the control's HWND will be waiting on the stack and must be popped to prevent stack corruption. In this simple example, this is not so useful. But in case of a bigger script where several controls are associated with the same callback function, the HWND can shed some light on which control originated the event.</p>
+<p>When the callback function is called, the control's <i>HWND</i> will be waiting on the stack and must be popped to prevent stack corruption. In this simple example, this is not so useful. But in case of a bigger script where several controls are associated with the same callback function, the <i>HWND</i> can shed some light on which control originated the event.</p>
 
-<p>The new example will respond to the user type <i>hello</i> in the text box.</p>
-
+<p>The new example will respond to the user typing "hello" in the text box.</p>
+</span>
 <blockquote><pre>!include nsDialogs.nsh
 !include LogicLib.nsh
 
 Name nsDialogs
 OutFile nsDialogs.exe
-
 XPStyle on
 
 Var Dialog
@@ -408,9 +376,6 @@
 FunctionEnd</b>
 
 Section
-
-	DetailPrint "hello world"
-
 SectionEnd</pre></blockquote>
 
 <h3><a name="step-memory"></a>Memory</h3>
@@ -424,7 +389,6 @@
 
 Name nsDialogs
 OutFile nsDialogs.exe
-
 XPStyle on
 
 Var Dialog
@@ -481,149 +445,99 @@
 FunctionEnd
 
 Section
-
-	DetailPrint "hello world"
-
 SectionEnd</pre></blockquote>
 
 <h2><a name="ref"></a>Function Reference</h2>
 
 <h3><a name="ref-create"></a>Create</h3>
-
 <p><code>nsDialogs::Create <i>rect</i></code></p>
-
-<p>Creates a new dialog. <i>rect</i> specific the identifier of the control whose location will be mimiced. This should usually be 1018, which is control mimiced for creation of built-in pages. The Modern UI also has control 1040 for the welcome and the finish page.</p>
-
+<p>Creates a new dialog. <i>rect</i> specific the identifier of the control whose location will be mimiced. This should usually be 1018, which is control mimiced for creation of built-in pages. The Modern UI also has control 1044 for the welcome and the finish page.</p>
 <p>Returns the new dialog's HWND on the stack or <i>error</i>.</p>
 
 <h3><a name="ref-createcontrol"></a>CreateControl</h3>
-
 <p><code>nsDialogs::CreateControl <i>class</i> <i>style</i> <i>extended_style</i> <i>x</i> <i>y</i> <i>width</i> <i>height</i> <i>text</i></code></p>
-
 <p>Create a new control in the current dialog. A dialog must exist for this to work, so nsDialogs::Create must be called prior to this function.</p>
+<p>Returns the new control's HWND on the stack or <i>error</i>.</p>
 
-<p>Returns the new dialog's HWND on the stack or <i>error</i>.</p>
-
 <h3><a name="ref-show"></a>Show</h3>
-
 <p><code>nsDialogs::Show</code></p>
-
 <p>Displays the page. Call this once finished with nsDialogs::Create, nsDialogs::CreateControl and the rest.</p>
-
 <p>Returns nothing.</p>
 
 <h3><a name="ref-selectfiledialog"></a>SelectFileDialog</h3>
-
 <p><code>nsDialogs::SelectFileDialog <i>mode</i> <i>initial_selection</i> <i>filter</i></code></p>
-
-<p>Displays a file selection dialog to the user. If <i>mode</i> is set to <i>save</i>, displays a file save dialog. If <i>mode</i> is set to <i>open</i>, displays a file open dialog. <i>filter</i> is a list of available file filters separated by pipes. If an empty string is passed, the default is used - <i>All Files|*.*</i>.</p>
-
+<p>Displays a file selection dialog to the user. If <i>mode</i> is set to <i>save</i>, displays a file save dialog. If <i>mode</i> is set to <i>open</i>, displays a file open dialog.
 <p><i>initial_selection</i> can be used to provide the user with a default file to look for and/or a default folder to look in. If <i>initial_selection</i> is empty no default filename will be provided for the user and the dialog will start in the current working directory. If <i>initial_selection</i> specifies just a filename, for example "test.exe", the dialog will be set up to look for a file called test.exe in the current working directory. If <i>initial_selection</i> specifies just a directory, for example "C:\Program Files", the dialog starts in the provided directory with no file name provided. If <i>initial_selection</i> specifies a directory and a filename, for example "C:\Windows\System32\calc.exe", the dialog will be set up to look for a file called calc.exe in the directory C:\Windows\System32.</p>
-
+<i>filter</i> is a list of available file filter pairs separated by pipes. A filter pair consists of a display string and a <a href="https://blogs.msdn.microsoft.com/jeremykuhne/2017/06/04/wildcards-in-windows/">DOS-style wildcard pattern</a>. If an empty string is passed, the default is used (<i>"All Files|*.*"</i>).</p>
 <p>Returns the selected file on the stack or an empty string if the user canceled the operation.</p>
+<blockquote><pre>
+nsDialogs::SelectFileDialog open "$DOCUMENTS\Config.ini" ".ini files|*.ini|All Files|*.*"
+Pop $0
+StrCmp $0 "" ...
+</pre></blockquote>
 
 <h3><a name="ref-selectfolderdialog"></a>SelectFolderDialog</h3>
-
 <p><code>nsDialogs::SelectFolderDialog <i>title</i> <i>initial_selection</i></code></p>
-
 <p>Displays a directory selection dialog to the user.</p>
-
 <p>Returns the selected directory on the stack or "error" in case the user canceled the operation or an error occured.</p>
 
 <h3><a name="ref-setrtl"></a>SetRTL</h3>
-
 <p><code>nsDialogs::SetRTL <i>rtl_setting</i></code></p>
-
 <p>Sets right-to-left mode on or off. If <i>rtl_setting</i> is 0, it's set to off. If <i>rtl_setting</i> is 1, it's set to on. This function must be called before any calls to nsDialogs::CreateControl.</p>
-
 <p>Returns nothing.</p>
 
 <h3><a name="ref-getuserdata"></a>GetUserData</h3>
-
 <p><code>nsDialogs::GetUserData <i>control_HWND</i></code></p>
-
 <p>Returns user data associated with the control on the stack.  Use nsDialogs::SetUserData to set this data.</p>
 
 <h3><a name="ref-setuserdata"></a>SetUserData</h3>
-
 <p><code>nsDialogs::SetUserData <i>control_HWND</i> <i>data</i></code></p>
-
 <p>Associates <i>data</i> with the control. Use nsDialogs::GetUserData to get this data.</p>
-
 <p>Returns nothing.</p>
 
 <h3><a name="ref-onback"></a>OnBack</h3>
-
 <p><code>nsDialogs::OnBack <i>function_address</i></code></p>
-
 <p>Sets the callback function for the Back button. This function will be called when the user clicks the back button. Call Abort in this function to prevent the user from going back to the last page.</p>
-
 <p>Use GetFunctionAddress to get the address of the desired callback function.</p>
-
 <p>Returns nothing.</p>
 
 <h3><a name="ref-onchange"></a>OnChange</h3>
-
 <p><code>nsDialogs::OnChange <i>control_HWND</i> <i>function_address</i></code></p>
-
 <p>Sets a change notification callback function for the given control. Whenever the control changes, the function will be called and the control's HWND will be waiting on its stack.</p>
-
 <p>Use GetFunctionAddress to get the address of the desired callback function.</p>
-
 <p>Returns nothing.</p>
 
 <h3><a name="ref-onclick"></a>OnClick</h3>
-
 <p><code>nsDialogs::OnClick <i>control_HWND</i> <i>function_address</i></code></p>
-
 <p>Sets a click notification callback function for the given control. Whenever the control is clicked, the function will be called and the control's HWND will be waiting on its stack.</p>
-
 <p>Use GetFunctionAddress to get the address of the desired callback function.</p>
-
 <p>Returns nothing.</p>
 
 <h3><a name="ref-onnotify"></a>OnNotify</h3>
-
 <p><code>nsDialogs::OnNotify <i>control_HWND</i> <i>function_address</i></code></p>
-
-<p>Sets a notification callback function for the given control. Whenever the control receives the WM_NOTIFY message, the function will be called and the control's HWND, notification code and a pointer to the MNHDR structure will be waiting on its stack.</p>
-
+<p>Sets a notification callback function for the given control. Whenever the control receives the WM_NOTIFY message, the function will be called and the control's HWND, notification code and a pointer to the NMHDR structure will be waiting on its stack. Use ${NSD_Return} to return a value.</p>
 <p>Use GetFunctionAddress to get the address of the desired callback function.</p>
-
 <p>Returns nothing.</p>
 
 <h3><a name="ref-createtimer"></a>CreateTimer</h3>
-
 <p><code>nsDialogs::CreateTimer <i>function_address</i> <i>timer_interval</i></code></p>
-
 <p>Sets a timer that'd call the callback function for the given control every in a constant interval. Interval times are specified in milliseconds.</p>
-
 <p>Use GetFunctionAddress to get the address of the desired callback function.</p>
-
 <p>Returns nothing.</p>
 
 <h3><a name="ref-killtimer"></a>KillTimer</h3>
-
 <p><code>nsDialogs::KillTimer <i>function_address</i></code></p>
-
 <p>Kills a previously set timer.</p>
-
 <p>Use GetFunctionAddress to get the address of the desired callback function.</p>
-
 <p>Returns nothing.</p>
 
 <h2><a name="mref"></a>Macro Reference</h2>
-
 <p>nsDialogs.nsh contains a lot of macros that can make nsDialogs usage a lot easier. Below is a description of each of those macros including purpose, syntax, input and output.</p>
 
 <h3><a name="mref-create"></a>NSD_Create*</h3>
-
 <p><code>${NSD_Create*} <i>x</i> <i>y</i> <i>width</i> <i>height</i> <i>text</i></code></p>
-
 <p>Create a new control in the current dialog. A dialog must exist for this to work, so nsDialogs::Create must be called prior to this function.</p>
-
 <p>Available variants:</p>
-
 <ul>
 <li>${NSD_CreateHLine}</li>
 <li>${NSD_CreateVLine}</li>
@@ -637,209 +551,254 @@
 <li>${NSD_CreateCheckBox}</li>
 <li>${NSD_CreateRadioButton}</li>
 <li>${NSD_CreateText}</li>
+<li>${NSD_CreateMLText}</li>
 <li>${NSD_CreatePassword}</li>
 <li>${NSD_CreateNumber}</li>
 <li>${NSD_CreateFileRequest}</li>
 <li>${NSD_CreateDirRequest}</li>
+<li>${NSD_CreateRichEdit}</li>
 <li>${NSD_CreateComboBox}</li>
 <li>${NSD_CreateDropList}</li>
 <li>${NSD_CreateListBox}</li>
+<li>${NSD_CreateSortedListBox}</li>
 <li>${NSD_CreateProgressBar}</li>
+<li>${NSD_CreateAnimation}</li>
+<li>${NSD_CreateHTrackBar}</li>
+<li>${NSD_CreateVTrackBar}</li>
+<li>${NSD_CreateUpDown}</li>
+<li>${NSD_CreateHotKey}</li>
+<li>${NSD_CreateDatePicker} <small>(Requires <abbr title="Internet Explorer">IE</abbr> 3.1 and <span class="inlcod"><i>${NSD_InitCommonControlsEx}</i></span>)</small></li>
+<li>${NSD_CreateIPAddress} <small>(Requires <abbr title="Internet Explorer">IE</abbr> 4 and <span class="inlcod"><i>${NSD_InitCommonControl_IPAddress}</i></span>)</small></li>
+<li>${NSD_CreateNetAddress} <small>(Requires Vista and <span class="inlcod"><i>${NSD_InitCommonControl_NetAddress}</i></span>)</small></li>
 </ul>
+<p>Returns the new control's HWND on the stack or <i>error</i></p>
 
-<p>Returns the new dialog's HWND on the stack or error.</p>
-
 <h3><a name="mref-onback"></a>NSD_OnBack</h3>
-
-<p><code>${NSD_OnBack} <i>function_address</i></code></p>
-
+<p><code>${NSD_OnBack} <i>function_name</i></code></p>
 <p>See <a href="#ref-onback">OnBack</a> for more details.</p>
 
-<p></p>
-
 <h3><a name="mref-onchange"></a>NSD_OnChange</h3>
-
-<p><code>${NSD_OnChange} <i>control_HWND</i> <i>function_address</i></code></p>
-
+<p><code>${NSD_OnChange} <i>control_HWND</i> <i>function_name</i></code></p>
 <p>See <a href="#ref-onchange">OnChange</a> for more details.</p>
-
 <p>See <a href="#step-notify">Real-time Notification</a> for usage example.</p>
 
 <h3><a name="mref-onclick"></a>NSD_OnClick</h3>
-
-<p><code>${NSD_OnClick} <i>control_HWND</i> <i>function_address</i></code></p>
-
+<p><code>${NSD_OnClick} <i>control_HWND</i> <i>function_name</i></code></p>
 <p>See <a href="#ref-onclick">OnClick</a> for more details.</p>
 
 <h3><a name="mref-onnotify"></a>NSD_OnNotify</h3>
-
-<p><code>${NSD_OnNotify} <i>control_HWND</i> <i>function_address</i></code></p>
-
+<p><code>${NSD_OnNotify} <i>control_HWND</i> <i>function_name</i></code></p>
 <p>See <a href="#ref-onnotify">OnNotify</a> for more details.</p>
 
-<h3><a name="mref-createtimer"></a>NSD_CreateTimer</h3>
+<h3><a name="mref-return"></a>NSD_Return</h3>
+<p><code>${NSD_Return} <i>value</i></code></p>
+<p>Used to return a value back to Windows from a OnNotify callback.</p>
 
-<p><code>${NSD_CreateTimer} <i>function_address</i> <i>timer_interval</i></code></p>
+<h3><a name="mref-setfocus"></a>NSD_SetFocus</h3>
+<p><code>${NSD_SetFocus} <i>control_HWND</i></code></p>
+<p>Sets focus to a control.</p>
 
+<h3><a name="mref-createtimer"></a>NSD_CreateTimer</h3>
+<p><code>${NSD_CreateTimer} <i>function_name</i> <i>timer_interval</i></code></p>
 <p>See <a href="#ref-createtimer">CreateTimer</a> for more details.</p>
 
 <h3><a name="mref-killtimer"></a>NSD_KillTimer</h3>
-
-<p><code>${NSD_KillTimer} <i>function_address</i></code></p>
-
+<p><code>${NSD_KillTimer} <i>function_name</i></code></p>
 <p>See <a href="#ref-killtimer">KillTimer</a> for more details.</p>
 
 <h3><a name="mref-addstyle"></a>NSD_AddStyle</h3>
-
 <p><code>${NSD_AddStyle} <i>control_HWND</i> <i>style</i></code></p>
+<p>Adds one or more window styles to a control. Multiple styles should be separated with pipes `|'.</p>
+<p>See MSDN for shared and per-control style descriptions.</p>
 
-<p>Adds one or more window style to a control. Multiple styles should be separated with pipes `|'.</p>
-
-<p>See MSDN for style description.</p>
-
 <h3><a name="mref-addexstyle"></a>NSD_AddExStyle</h3>
-
 <p><code>${NSD_AddExStyle} <i>control_HWND</i> <i>style</i></code></p>
+<p>Adds one or more extended window styles to a control. Multiple styles should be separated with pipes `|'.</p>
+<p>See <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/ff700543">MSDN</a> for style descriptions.</p>
 
-<p>Adds one or more extended window style to a control. Multiple styles should be separated with pipes `|'.</p>
+<h3><a name="mref-removestyle"></a>NSD_RemoveStyle</h3>
+<p><code>${NSD_RemoveStyle} <i>control_HWND</i> <i>style</i></code></p>
+<p>Removes one or more window styles from a control.</p>
 
-<p>See MSDN for style description.</p>
+<h3><a name="mref-removeexstyle"></a>NSD_RemoveExStyle</h3>
+<p><code>${NSD_RemoveExStyle} <i>control_HWND</i> <i>style</i></code></p>
+<p>Removes one or more extended window styles from a control.</p>
 
 <h3><a name="mref-gettext"></a>NSD_GetText</h3>
-
-<p><code>${NSD_GetText} <i>control_HWND</i> <i>output_variable</i></code></p>
-
+<p><code>${NSD_GetText} <i>control_HWND</i> <i>$output_variable</i></code></p>
 <p>Retrieves the text of a control and stores it into <i>output_variable</i>. Especially useful for textual controls.</p>
-
 <p>See <a href="#step-state">Control State</a> for usage example.</p>
 
 <h3><a name="mref-settext"></a>NSD_SetText</h3>
-
 <p><code>${NSD_SetText} <i>control_HWND</i> <i>text</i></code></p>
-
 <p>Sets the text of a control.</p>
 
-<h3><a name="mref-settextlimit"></a>NSD_SetTextLimit</h3>
+<h3><a name="mref-settextlimit"></a>NSD_Edit_SetTextLimit</h3>
+<p><code>${NSD_Edit_SetTextLimit} <i>control_HWND</i> <i>limit</i></code></p>
+<p>Sets the input length limit for a text control.</p>
 
-<p><code>${NSD_SetTextLimit} <i>control_HWND</i> <i>limit</i></code></p>
+<h3><a name="mref-edsetro"></a>NSD_Edit_SetReadOnly</h3>
+<p><code>${NSD_Edit_SetReadOnly} <i>control_HWND</i> <i>readonly</i></code></p>
+<p>1 to make the text control read-only or 0 to allow the user to input data.</p>
 
-<p>Sets input size limit for a text control.</p>
+<h3><a name="mref-edsetcuebanner"></a>NSD_Edit_SetCueBannerText</h3>
+<p><code>${NSD_Edit_SetCueBannerText} <i>control_HWND</i> <i>displaywhenfocused</i> <i>text</i></code></p>
+<p>Set a text hint displayed when the control is empty. The text is only visible on WinXP and later. Requires <i>XPStyle on</i>.</p>
 
-<h3><a name="mref-getstate"></a>NSD_GetState</h3>
+<h3><a name="mref-richsettextlimit"></a>NSD_RichEd_SetTextLimit</h3>
+<p><code>${NSD_RichEd_SetTextLimit} <i>control_HWND</i> <i>limit</i></code></p>
+<p>Sets the input length limit.</p>
 
-<p><code>${NSD_GetState} <i>control_HWND</i> <i>output_variable</i></code></p>
+<h3><a name="mref-richseteventmask"></a>NSD_RichEd_SetEventMask</h3>
+<p><code>${NSD_RichEd_SetEventMask} <i>control_HWND</i> <i>eventmask</i></code></p>
 
-<p>Retrieves the state of a check box or a radio button control. Possible outputs are ${BST_CHECKED} and ${BST_UNCHECKED}.</p>
+<h3><a name="mref-richsetbkclr"></a>NSD_RichEd_SetCustomBackgroundColor</h3>
+<p><code>${NSD_RichEd_SetCustomBackgroundColor} <i>control_HWND</i> <i>COLORREF</i></code></p>
 
+<h3><a name="mref-getstate"></a>NSD_GetState</h3>
+<p><code>${NSD_GetState} <i>control_HWND</i> <i>$output_variable</i></code></p>
+<p>Retrieves the state of a check box or a radio button control. Possible outputs are ${BST_CHECKED} and ${BST_UNCHECKED}.</p>
 <p>See <a href="#step-memory">Memory</a> for usage example.</p>
 
 <h3><a name="mref-setstate"></a>NSD_SetState</h3>
-
 <p><code>${NSD_SetState} <i>control_HWND</i> <i>state</i></code></p>
-
 <p>Sets the state of a check box or a radio button control. Possible values for <i>state</i> are ${BST_CHECKED} and ${BST_UNCHECKED}.</p>
-
 <p>See <a href="#step-memory">Memory</a> for usage example.</p>
 
 <h3><a name="mref-check"></a>NSD_Check</h3>
-
 <p><code>${NSD_Check} <i>control_HWND</i></code></p>
-
 <p>Checks a check box or a radio button control. Same as calling ${NSD_SetState} with ${BST_CHECKED}.</p>
 
 <h3><a name="mref-uncheck"></a>NSD_Uncheck</h3>
-
 <p><code>${NSD_Uncheck} <i>control_HWND</i></code></p>
-
 <p>Unchecks a check box or a radio button control. Same as calling ${NSD_SetState} with ${BST_UNCHECKED}.</p>
-
 <p>See <a href="#step-memory">Memory</a> for usage example.</p>
 
 <h3><a name="mref-cbaddstring"></a>NSD_CB_AddString</h3>
-
 <p><code>${NSD_CB_AddString} <i>combo_HWND</i> <i>string</i></code></p>
-
 <p>Adds a string to a combo box.</p>
 
-<h3><a name="mref-cbselectstring"></a>NSD_CB_SelectString</h3>
+<h3><a name="mref-cbinsstring"></a>NSD_CB_InsertString</h3>
+<p><code>${NSD_CB_InsertString} <i>combo_HWND</i> <i>index</i> <i>string</i></code></p>
+<p><code>${NSD_CB_PrependString} <i>combo_HWND</i> <i>string</i></code></p>
+<p><code>${NSD_CB_AppendString} <i>combo_HWND</i> <i>string</i></code></p>
+<p>Insert a string in a specified position in a combo box.</p>
 
+<h3><a name="mref-cbselectstring"></a>NSD_CB_SelectString</h3>
 <p><code>${NSD_CB_SelectString} <i>combo_HWND</i> <i>string</i></code></p>
-
 <p>Selects a string in a combo box.</p>
 
-<h3><a name="mref-lbaddstring"></a>NSD_LB_AddString</h3>
+<h3><a name="mref-cbgetcount">NSD_CB_GetCount</a></h3>
+<p><code>${NSD_CB_GetCount} <i>combo_HWND</i> <i>$output_variable</i></code></p>
 
+<h3><a name="mref-lbaddstring"></a>NSD_LB_AddString</h3>
 <p><code>${NSD_LB_AddString} <i>listbox_HWND</i> <i>string</i></code></p>
-
 <p>Adds a string to a list box.</p>
 
-<h3><a name="mref-lbdelstring"></a>NSD_LB_DelString</h3>
+<h3><a name="mref-lbinsstring"></a>NSD_LB_InsertString</h3>
+<p><code>${NSD_LB_InsertString} <i>listbox_HWND</i> <i>index</i> <i>string</i></code></p>
+<p><code>${NSD_LB_PrependString} <i>listbox_HWND</i> <i>string</i></code></p>
+<p><code>${NSD_LB_AppendString} <i>listbox_HWND</i> <i>string</i></code></p>
+<p>Insert a string in a specified position in a list box.</p>
 
+<h3><a name="mref-lbdelstring"></a>NSD_LB_DelString</h3>
 <p><code>${NSD_LB_DelString} <i>listbox_HWND</i> <i>string</i></code></p>
+<p>Deletes a string from a list box.</p>
 
+<h3><a name="mref-lbdelitem"></a>NSD_LB_DelItem</h3>
+<p><code>${NSD_LB_DelItem} <i>listbox_HWND</i> <i>itemindex</i></code></p>
 <p>Deletes a string from a list box.</p>
 
-<h3><a name="mref-lbcleqar">NSD_LB_Clear</a></h3>
-
+<h3><a name="mref-lbclear">NSD_LB_Clear</a></h3>
 <p><code>${NSD_LB_Clear} <i>listbox_HWND</i></code></p>
-
 <p>Deletes all strings from a list box.</p>
 
 <h3><a name="mref-lbgetcount">NSD_LB_GetCount</a></h3>
-
-<p><code>${NSD_LB_GetCount} <i>listbox_HWND</i> <i>output_variable</i></code></p>
-
+<p><code>${NSD_LB_GetCount} <i>listbox_HWND</i> <i>$output_variable</i></code></p>
 <p>Retrieves the number of strings from a list box.</p>
 
 <h3><a name="mref-lbselectstring"></a>NSD_LB_SelectString</h3>
-
 <p><code>${NSD_LB_SelectString} <i>listbox_HWND</i> <i>string</i></code></p>
-
 <p>Selects a string in a list box.</p>
 
 <h3><a name="mref-lbgetselection">NSD_LB_GetSelection</a></h3>
+<p><code>${NSD_LB_GetSelection} <i>listbox_HWND</i> <i>$output_variable</i></code></p>
+<p>Retrieves the selected string from a list box. Returns an empty string if no string is selected.</p>
 
-<p><code>${NSD_LB_GetSelection} <i>listbox_HWND</i> <i>output_variable</i></code></p>
+<h3><a name="mref-animopenfile">NSD_Anim_OpenFile</a></h3>
+<p><code>${NSD_Anim_OpenFile} <i>anim_HWND</i> <i>avi_path</i></code></p>
+<p>Opens the specified (silent) .AVI movie clip.</p>
 
-<p>Retrieves the selected stringed from a list box. Returns an empty string if no string is selected.</p>
+<h3><a name="mref-animplay">NSD_Anim_Play</a></h3>
+<p><code>${NSD_Anim_Play} <i>anim_HWND</i></code></p>
+<p>Plays the movie clip repeatedly.</p>
 
-<h3><a name="mref-setfocus"></a>NSD_SetFocus</h3>
+<h3><a name="mref-animstop">NSD_Anim_Stop</a></h3>
+<p><code>${NSD_Anim_Stop} <i>anim_HWND</i></code></p>
+<p>Stops playback.</p>
 
-<p><code>${NSD_SetFocus} <i>control_HWND</i></code></p>
+<h3><a name="mref-trackgetpos">NSD_TrackBar_GetPos</a></h3>
+<p><code>${NSD_TrackBar_GetPos} <i>track_HWND</i> <i>$output</i></code></p>
 
-<p>Sets focus to a control.</p>
+<h3><a name="mref-tracksetpos">NSD_TrackBar_SetPos</a></h3>
+<p><code>${NSD_TrackBar_SetPos} <i>track_HWND</i> <i>pos</i></code></p>
 
-<h3><a name="mref-setimage"></a>NSD_SetImage</h3>
+<h3><a name="mref-tracksetrmin">NSD_TrackBar_SetRangeMin</a></h3>
+<p><code>${NSD_TrackBar_SetRangeMin} <i>track_HWND</i> <i>minpos</i></code></p>
 
-<p><code>${NSD_SetImage} <i>control_HWND</i> <i>image_path</i> <i>output_variable</i></code></p>
+<h3><a name="mref-tracksetrmax">NSD_TrackBar_SetRangeMax</a></h3>
+<p><code>${NSD_TrackBar_SetRangeMax} <i>track_HWND</i> <i>maxpos</i></code></p>
 
-<p>Loads a bitmap from <i>image_path</i> and displays it on <i>control_HWND</i> created by <a href="#mref-create">${NSD_CreateBitmap}</a>. The image handle is stored in <i>output_variable</i> and should be freed using <a href="#mref-freeimage">${NSD_FreeImage}</a> once no longer necessary.</p>
+<h3><a name="mref-tracksetticfr">NSD_TrackBar_SetTicFreq</a></h3>
+<p><code>${NSD_TrackBar_SetTicFreq} <i>track_HWND</i> <i>frequency</i></code></p>
+<p>Sets the interval frequency for tick marks.</p>
 
-<p>The image must be extracted to the user's computer prior to calling this macro. A good place to extract images is $PLUGINSDIR.</p>
+<h3><a name="mref-udsetbuddy">NSD_UD_SetBuddy</a></h3>
+<p><code>${NSD_UD_SetBuddy} <i>ud_HWND</i> <i>buddy_HWND</i></code></p>
 
+<h3><a name="mref-udgetpos">NSD_UD_GetPos</a></h3>
+<p><code>${NSD_UD_GetPos} <i>ud_HWND</i> <i>$output</i></code></p>
+
+<h3><a name="mref-udsetpos">NSD_UD_SetPos</a></h3>
+<p><code>${NSD_UD_SetPos} <i>ud_HWND</i> <i>pos</i></code></p>
+
+<h3><a name="mref-udsetpackedrange">NSD_UD_SetPackedRange</a></h3>
+<p><code>${NSD_UD_SetPackedRange} <i>ud_HWND</i> <i>packedrange</i></code></p>
+<p>Sets the min-max range. Two signed 16-bit numbers packed into 32-bits.</p>
+
+<h3><a name="mref-hkgethk">NSD_HK_GetHotKey</a></h3>
+<p><code>${NSD_HK_GetHotKey} <i>hk_HWND</i> <i>$output</i></code></p>
+<p>Bits 0..7 specify the virtual key code and bits 8..15 specify the HOTKEYF modifier flags.</p>
+
+<h3><a name="mref-hksethk">NSD_HK_SetHotKey</a></h3>
+<p><code>${NSD_HK_SetHotKey} <i>hk_HWND</i> <i>packedhotkey</i></code></p>
+
+<h3><a name="mref-dategetdatefields">NSD_Date_GetDateFields</a></h3>
+<p><code>${NSD_Date_GetDateFields} <i>HWND</i></code></p>
+<p>Returns the month, day and year on the stack.</p>
+
+<h3><a name="mref-setbitmap"></a><a name="mref-setimage"></a>NSD_SetBitmap</h3>
+<p><code>${NSD_SetBitmap} <i>control_HWND</i> <i>image_path</i> <i>$output_variable</i></code></p>
+<p>Loads a bitmap from <i>image_path</i> and displays it on <i>control_HWND</i> created by <a href="#mref-create">${NSD_CreateBitmap}</a>. The image handle is stored in <i>output_variable</i> and should be freed using <a href="#mref-freebitmap">${NSD_FreeBitmap}</a> once no longer necessary.</p>
+<p>The image must be extracted to the user's computer prior to calling this macro. A good place to extract images is $PLUGINSDIR.</p>
 <blockquote><pre>!include nsDialogs.nsh
 
 Name nsDialogs
 OutFile nsDialogs.exe
 
-XPStyle on
-
 Page custom nsDialogsImage
 Page instfiles
 
 Var Dialog
-Var Image
-Var ImageHandle
+Var ImageCtrl
+Var BmpHandle
 
 Function .onInit
-
 	InitPluginsDir
 	File /oname=$PLUGINSDIR\image.bmp "${NSISDIR}\Contrib\Graphics\Header\nsis-r.bmp"
-
 FunctionEnd
 
 Function nsDialogsImage
-
 	nsDialogs::Create 1018
 	Pop $Dialog
 
@@ -848,58 +807,43 @@
 	${EndIf}
 
 	${NSD_CreateBitmap} 0 0 100% 100% ""
-	Pop $Image
-	${NSD_SetImage} $Image $PLUGINSDIR\image.bmp $ImageHandle
+	Pop $ImageCtrl
+	${NSD_SetBitmap} $ImageCtrl $PLUGINSDIR\image.bmp $BmpHandle
 
 	nsDialogs::Show
 
-	${NSD_FreeImage} $ImageHandle
-
+	${NSD_FreeBitmap} $BmpHandle
 FunctionEnd
 
 Section
 SectionEnd</pre></blockquote>
 
-<h3><a name="mref-setsimage"></a>NSD_SetStretchedImage</h3>
+<h3><a name="mref-setsbitmap"></a><a name="mref-setsimage"></a>NSD_SetStretchedBitmap</h3>
+<p><code>${NSD_SetStretchedBitmap} <i>control_HWND</i> <i>image_path</i> <i>$output_variable</i></code></p>
+<p>Loads and displays a bitmap just like <a href="#mref-setbitmap">${NSD_SetImage}</a> but stretches the image to fit the control.</p>
 
-<p><code>${NSD_SetStretchedImage} <i>control_HWND</i> <i>image_path</i> <i>output_variable</i></code></p>
+<h3><a name="mref-clearbitmap"></a><a name="mref-clearimage"></a>NSD_ClearBitmap</h3>
+<p><code>${NSD_ClearBitmap} <i>control_HWND</i></code></p>
+<p>Clears a bitmap from a image control.</p>
 
-<p>Loads and displays a bitmap just like <a href="#mref-setimage">${NSD_SetImage}</a>, but stretched the image to fit the control.</p>
+<h3><a name="mref-freebitmap"></a><a name="mref-freeimage"></a>NSD_FreeBitmap</h3>
+<p><code>${NSD_FreeImage} <i>image_handle</i></code></p>
+<p>Frees an image handle previously loaded with <a href="#mref-setbitmap">${NSD_SetImage}</a> or <a href="#mref-setsbitmap">${NSD_SetStretchedBitmap}</a>.</p>
 
 <h3><a name="mref-seticon"></a>NSD_SetIcon</h3>
-
-<p><code>${NSD_SetIcon} <i>control_HWND</i> <i>image_path</i> <i>output_variable</i></code></p>
-
+<p><code>${NSD_SetIcon} <i>control_HWND</i> <i>image_path</i> <i>$output_variable</i></code></p>
 <p>Same as <a href="#mref-setimage">${NSD_SetImage}</a>, but used for loading and setting an icon in a control created by <a href="#mref-create">${NSD_CreateIcon}</a>. The image handle is stored in <i>output_variable</i> and should be freed using <a href="#mref-freeicon">${NSD_FreeIcon}</a> once no longer necessary.</p>
 
 <h3><a name="mref-seticonfrominstaller"></a>NSD_SetIconFromInstaller</h3>
+<p><code>${NSD_SetIconFromInstaller} <i>control_HWND</i> <i>$output_variable</i></code></p>
+<p>Loads the icon used in the installer and displays it on <i>control_HWND</i> created by <a href="#mref-create">${NSD_CreateIcon}</a>. The image handle is stored in <i>output_variable</i> and should be freed using <a href="#mref-freeicon">${NSD_FreeIcon}</a> once no longer necessary.</p>
 
-<p><code>${NSD_SetIconFromInstaller} <i>control_HWND</i> <i>output_variable</i></code></p>
-
-<p>Loads the icon used in the isntaller and displays it on <i>control_HWND</i> created by <a href="#mref-create">${NSD_CreateIcon}</a>. The image handle is stored in <i>output_variable</i> and should be freed using <a href="#mref-freeicon">${NSD_FreeIcon}</a> once no longer necessary.</p>
-
-<h3><a name="mref-clearimage"></a>NSD_ClearImage</h3>
-
-<p><code>${NSD_ClearImage} <i>control_HWND</i></code></p>
-
-<p>Clears an image from a control.</p>
-
 <h3><a name="mref-clearicon"></a>NSD_ClearIcon</h3>
-
 <p><code>${NSD_ClearIcon} <i>control_HWND</i></code></p>
-
 <p>Clears an icon from a control.</p>
 
-<h3><a name="mref-freeimage"></a>NSD_FreeImage</h3>
-
-<p><code>${NSD_FreeImage} <i>image_handle</i></code></p>
-
-<p>Frees an image handle previously loaded with <a href="#mref-setimage">${NSD_SetImage}</a> or <a href="#mref-setsimage">${NSD_SetStretchedImage}</a>.</p>
-
 <h3><a name="mref-freeicon"></a>NSD_FreeIcon</h3>
-
 <p><code>${NSD_FreeIcon} <i>icon_handle</i></code></p>
-
 <p>Frees an icon handle previously loaded with <a href="#mref-seticon">${NSD_SetIcon}</a> or <a href="#mref-seticonfrominstaller">${NSD_SetIconFromInstaller}</a>.</p>
 
 
@@ -912,7 +856,7 @@
 <li>
 <b>Q:</b> Can nsDialogs handle InstallOptions INI files?
 <blockquote>
-<p><b>A:</b> nsDialogs.nsh contains a function called <i>CreateDialogFromINI</i> that can create nsDialogs' dialog from an INI file. It can handle every type of control InstallOptions supports, but doesn't handle the flags or notification yet. <i>Examples\nsDialogs\InstallOptions.nsi</i> shows a usage example of this function.</p><p>In the future there'll also be a function that creates the script itself.
+<p><b>A:</b> nsDialogs.nsh contains a function called <i>CreateDialogFromINI</i> that can create nsDialogs' dialog from an INI file. It can handle every type of control InstallOptions supports, but doesn't handle the flags or notifications. <i>Examples\nsDialogs\InstallOptions.nsi</i> shows a usage example of this function.</p>
 </blockquote>
 </li>
 
Index: tmp/org.txm.setups/nsis/Docs/StrFunc/StrFunc.txt
===================================================================
--- tmp/org.txm.setups/nsis/Docs/StrFunc/StrFunc.txt	(revision 2955)
+++ tmp/org.txm.setups/nsis/Docs/StrFunc/StrFunc.txt	(revision 2956)
@@ -32,7 +32,7 @@
 
     !include "StrFunc.nsh"
 
-    StrFunc.nsh has to be inside Include directory, so you don't have to
+    StrFunc.nsh is inside the Include directory, so you don't have to
     specify a path.
 
     You have to put this command before any command used in this header file.
@@ -93,25 +93,25 @@
     3.1 How To Use Commands In Install Sections and Functions
     ---------------------------------------------------------
 
-    Every command used in install sections and functions have to be called
-    first before and out of any sections and functions, and without
+    Every command used in install sections and functions have to be declared
+    before (and outside of) any sections and functions, and without
     parameters.
 
     Example:
     --------
 
-    ${StrStr}
+    ${UsingStrFunc} StrStr
     
     3.2 How To Use Commands In Uninstall Sections and Functions
     -----------------------------------------------------------
 
-    Commands with Uninstall Sections and Functions support have "Un" before
-    the words inside curly brackets "{}".
+    Commands for uninstall sections and functions have "Un" before
+    the name.
 
     Example:
     --------
     
-    ${UnStrStr}
+    ${UsingStrFunc} UnStrStr
 
     A complete example with both Install and Uninstall Commands:
     ------------------------------------------------------------
@@ -119,9 +119,9 @@
 
     !include "StrFunc.nsh"
 
-    ${StrStr} # Supportable for Install Sections and Functions
+    ${UsingStrFunc} StrStr # Supportable for Install Sections and Functions
 
-    ${UnStrStr} # Supportable for Uninstall Sections and Functions
+    ${UsingStrFunc} UnStrStr # Supportable for Uninstall Sections and Functions
 
     Section
 
@@ -328,7 +328,7 @@
     =========================================================================
     ***                                                            ${StrSort}
     -------------------------------------------------------------------------
-    ResultVar String LeftStr CenterStr RightStr IncludeLeftStr(1|0)
+    ResultVar String CenterStr LeftStr RightStr IncludeLeftStr(1|0)
     IncludeCenterStr(1|0) IncludeRightStr(1|0)
     =========================================================================
     Searches for "CenterStr" in "String", and returns only the value
@@ -344,14 +344,14 @@
       String
       String where to search "CenterStr".
 
+      CenterStr
+      String to search in "String".
+
       LeftStr
       The first occurrence of "LeftStr" on the left of "CenterStr".
       If it is an empty value, or was not found, will return
       everything on the left of "CenterStr".
 
-      CenterStr
-      String to search in "String".
-
       RightStr
       The first occurrence of "RightStr" on the right of "CenterStr".
       If it is an empty value, or was not found, will return
Index: tmp/org.txm.setups/nsis/Docs/System/System.html
===================================================================
--- tmp/org.txm.setups/nsis/Docs/System/System.html	(revision 2955)
+++ tmp/org.txm.setups/nsis/Docs/System/System.html	(revision 2956)
@@ -6,7 +6,9 @@
 </head>
 <body>
 <h1>NSIS System Plug-in</h1>
-<p><i>&copy; brainsucker (Nik Medved), 2002</i></p>
+<p>
+<i>Copyright &copy; 2002 brainsucker (Nik Medved)</i><br><i>Copyright &copy; 2002-2020 NSIS Contributors</i>
+</p>
 
 <h2>Table of Contents</h2>
 
@@ -25,23 +27,21 @@
 
 <h2><a name="intro"></a>Introduction</h2>
 
-<p>The System plug-in gives developers the ability to call any exported function from any DLL. For example, you can use it to call <a href="http://msdn.microsoft.com/library/en-us/fileio/base/getlogicaldrivestrings.asp">GetLogicalDriveStrings</a> to get a list of available drives on the user's computer.</p>
+<p>The System plug-in gives developers the ability to call any exported function from any DLL. For example, you can use it to call <a href="https://msdn.microsoft.com/en-us/library/aa364975">GetLogicalDriveStrings</a> to get a list of available drives on the user's computer.</p>
 
 <p>The System plug-in also allows the developer to allocate, free and copy memory; interact with COM objects and perform mathematical operations on 64-bit integers.</p>
 
 <p>Programming knowledge is highly recommended for good understanding of the System plug-in.</p>
 
-<p>The most useful System plug-in functions (Call, Get and Debug) are not available when compiling with GCC. To work around this, either download a MSVC-compiled version or write your own plugin that calls the functions you need.</p>
-
 <h4>Usage Examples From The Wiki</h4>
 
 <ul>
-<li><a href="http://nsis.sourceforge.net/wiki/Get_Local_Time">Get local time</a></li>
-<li><a href="http://nsis.sourceforge.net/wiki/Registering_a_Palm_Com_Conduit">Register conduits with Palm HotSync</a></li>
-<li><a href="http://nsis.sourceforge.net/wiki/Determining_free_memory_using_the_System_plugin">Get free memory</a></li>
-<li><a href="http://nsis.sourceforge.net/wiki/REG_MULTI_SZ_Reader">Read REG_MULTI_SZ</a></li>
-<li><a href="http://nsis.sourceforge.net/wiki/Get_Disk_Volume_Serial_Number">Get disk serial number</a></li>
-<li><i><a href="http://nsis.sourceforge.net/Special:Search?search=System%3A%3ACall">Search all...</a></i></li>
+<li><a href="https://nsis.sourceforge.io/wiki/Get_Local_Time">Get local time</a></li>
+<li><a href="https://nsis.sourceforge.io/wiki/Registering_a_Palm_Com_Conduit">Register conduits with Palm HotSync</a></li>
+<li><a href="https://nsis.sourceforge.io/wiki/Determining_free_memory_using_the_System_plugin">Get free memory</a></li>
+<li><a href="https://nsis.sourceforge.io/wiki/REG_MULTI_SZ_Reader">Read REG_MULTI_SZ</a></li>
+<li><a href="https://nsis.sourceforge.io/wiki/Get_Disk_Volume_Serial_Number">Get disk serial number</a></li>
+<li><i><a href="https://nsis.sourceforge.io/Special:Search?search=System%3A%3ACall">Search all...</a></i></li>
 </ul>
 
 <h2><a name="funcs"></a>Available Functions</h2>
@@ -64,15 +64,27 @@
 </pre></blockquote>
 </blockquote>
 </li>
-
 <li>
+<b>StrAlloc</b> <i>SIZE</i>
+<blockquote>
+<p>Allocates a string buffer for <i>SIZE</i> <b>TCHARs</b> and returns a memory address on the stack.  This is extremely useful if you want to write an NSI script that will work for both ANSI and Unicode NSIS.</p>
+<h4>Usage Example</h4>
+<blockquote><pre>
+System::<b>StrAlloc</b> 64 ; String buffer for 63 characters and \0 termination.
+Pop $0
+DetailPrint "A string buffer for 64 characters allocated at $0"
+System::Free $0
+</pre></blockquote>
+</blockquote>
+</li>
+<li>
 <b>Copy</b> [/<i>SIZE</i>] <i>DESTINATION</i> <i>SOURCE</i>
 <blockquote>
 <p>Copies <i>SIZE</i> bytes from <i>SOURCE</i> to <i>DESTINATION</i>. If <i>SIZE</i> is not specified, <i>SOURCE</i>'s size will queried using GlobalSize. This means that if you don't allocate <i>SOURCE</i> using System::Alloc, System::Call or GlobalAlloc, you must specify <i>SIZE</i>. If <i>DESTINATION</i> is zero it will be allocated and its address will be pushed on the stack.</p>
 <h4>Usage example</h4>
 <blockquote><pre>
 # allocate a buffer and put 'test string' and an int in it
-System::Call "*(&amp;t1024 'test string', i 5) i .s"
+System::Call "*(&amp;t1024 'test string', i 5) p .s"
 Pop $0
 # copy to an automatically created buffer
 System::<b>Copy</b> 0 $0
@@ -175,7 +187,7 @@
 
 <p><i>PARAMS</i>, <i>RETURN</i> and <i>OPTIONS</i> can be repeated many times in one Get/Call line. When repeating, a lot can be omitted, and only what you wish to change can be used. <i>Type</i>, <i>source</i> and/or <i>destination</i> can be omitted for each parameter, even the return value. Options can be added or removed. This allows you to define function prototypes and save on some typing. The <a href="#repeat">last two examples</a> show this.</p>
 
-<p><i>PROC</i> can also be repeated but must be prefixed with a hash sign (`#').</p>
+<p><i>PROC</i> can also be <a href="#repeatproc">repeated</a> but it must be prefixed with a hash sign (`#') except if the hash sign is preceded by a double colon (<code>shell32::#18</code>) in which case it is interpreted as a function ordinal.</p>
 
 <h4>Possible <i>PROC</i> Values and Meanings</h4>
 
@@ -242,12 +254,20 @@
 <td>pointer (and other pointer sized types like handles and HWNDs)</td>
 </tr>
 <tr>
+<th>b</th>
+<td>int8, byte</td>
+</tr>
+<tr>
+<th>h</th>
+<td>int16, short</td>
+</tr>
+<tr>
 <th>i</th>
-<td>int (includes char, byte, short and so on)</td>
+<td>int32 (includes char, byte, short and so on when used as a pointer)</td>
 </tr>
 <tr>
 <th>l</th>
-<td>large integer, int64</td>
+<td>int64, large integer</td>
 </tr>
 <tr>
 <th>m</th>
@@ -269,7 +289,11 @@
 <th>k</th>
 <td>callback</td>
 </tr>
+<th>@</th>
+<td>Direct register memory access (Buffer is limited to <code>(NSIS_MAX_STRLEN - 24) * NSIS_CHAR_SIZE</code> bytes)</td>
+</tr>
 <tr>
+<tr>
 <th>&amp;v<i>N</i></th>
 <td><i>N</i> bytes padding (structures only)</td>
 </tr>
@@ -283,18 +307,22 @@
 </tr>
 <tr>
 <th>&amp;t<i>N</i></th>
-<td><i>N</i> bytes of text (structures only)</td>
+<td>array of <i>N</i> TCHAR text characters (structures only)</td>
 </tr>
 <tr>
+<th>&amp;m<i>N</i></th>
+<td>array of <i>N</i> CHAR ANSI characters (structures only)</td>
+</tr>
+<tr>
 <th>&amp;w<i>N</i></th>
-<td><i>N</i> bytes of Unicode text (structures only)</td>
+<td>array of <i>N</i> WCHAR Unicode characters (structures only)</td>
 </tr>
 <tr>
-<th>&amp;g<i>N</i></th>
-<td><i>N</i> bytes of GUID (structures only)</td>
+<th>&amp;g<i>16</i></th>
+<td><i>16</i> bytes of GUID (structures only)</td>
 </tr>
 </table>
-<p>Additionally, each type can be prefixed with an asterisk to denote a pointer. When using an asterisk, the System plug-in still expects the value of the parameter, rather than the pointer's address. To pass a direct address, use `i' with no asterisk. A <a href="#pointer">usage example</a> is available. <a href="#memfuncs">Alloc</a> returns addresses and its return value should therefore be used with `i', without an asterisk.</p>
+<p>Additionally, each type (except <i>b</i>, <i>h</i>, <i>k</i> and <i>@</i>) can be prefixed with an asterisk to denote a pointer. When using an asterisk, the System plug-in still expects the value of the parameter, rather than the pointer's address. To pass a direct address, use `p' with no asterisk. A <a href="#pointer">usage example</a> is available. <a href="#memfuncs">Alloc</a> returns addresses and its return value should therefore be used with `p', without an asterisk.</p>
 </blockquote>
 
 <h4>Available Sources and Destinations</h4>
@@ -355,12 +383,13 @@
 <td>null for source, no output required for destination</td>
 </tr>
 </table>
+<p>Source is required when using the @ type and must be a register. When the call returns the source register already contains the memory address in string form so using destination is usually <a href="#directvarmemparam">not necessary</a>.
 </blockquote>
 
 <h4>Callbacks</h4>
 
 <blockquote>
-<p>Callback functions are simply functions which are passed to a function and called back by it. They are frequently used to pass a possibly large set of data item by item. For example, <a href="http://msdn.microsoft.com/library/en-us/winui/WinUI/WindowsUserInterface/Windowing/Windows/WindowReference/WindowFunctions/EnumChildWindows.asp">EnumChildWindows</a> uses a <a href="http://msdn.microsoft.com/library/en-us/winui/WinUI/WindowsUserInterface/Windowing/Windows/WindowReference/WindowFunctions/EnumChildProc.asp">callback function</a>. As NSIS functions are not quite regular functions, the System plug-in provides its own mechanism to support callback functions. It allows you to create callback functions and notifies you each time a callback function was called.</p>
+<p>Callback functions are simply functions which are passed to a function and called back by it. They are frequently used to pass a possibly large set of data item by item. For example, <a href="https://msdn.microsoft.com/en-us/library/ms633494">EnumChildWindows</a> uses a <a href="https://msdn.microsoft.com/en-us/library/ms633493">callback function</a>. As NSIS functions are not quite regular functions, the System plug-in provides its own mechanism to support callback functions. It allows you to create callback functions and notifies you each time a callback function was called.</p>
 
 <p>Creation of callback functions is done using <a href="#callfuncs">Get</a> and the callback creation syntax. As you will not call the callbacks yourself, the source of the parameters should be omitted using a dot. When the callback is called, the destination of the parameters will be filled with the values passed on to the callback. The value the callback will return is set by the source of the return "parameter". The destination of the return "parameter" should always be set as that's where System will notify you the callback was called.</p>
 
@@ -405,8 +434,9 @@
 
 <blockquote>
 <ul>
-<li>To find out the index of a member in a COM interface, you need to search for the definition of this COM interface in the header files that come with Visual C/C++ or the Platform SDK. Remember the index is zero based.</li>
-<li>If a function can't be found, an `A' will be appended to its name and it will be looked up again. This is done because a lot of Windows API functions have two versions, one for ANSI strings and one for Unicode strings. The ANSI version of the function is marked with `A' and the Unicode version is marked with `W'. For example: lstrcpyA and lstrcpyW.</li>
+<li>To find out the index of a member in a COM interface, you need to search for the definition of this COM interface in the header files that come with Visual C/C++ or the Platform SDK. The index is zero based.</li>
+<li>If a function can't be found or the <code>t</code> parameter type was used, an `A' or `W' will be appended to its name and it will be looked up again. This is done because a lot of Windows API functions have two versions, one for ANSI strings and one for Unicode strings. The ANSI version of the function is marked with `A' and the Unicode version is marked with `W'. For example: lstrcpyA and lstrcpyW.</li>
+<li>Libraries in the system32 directory can be loaded without a path. All other libraries should be loaded with a <a href="#funcqpath">quoted full path</a>.</li>
 </ul>
 </blockquote>
 
@@ -420,7 +450,7 @@
 </tr>
 <tr>
 <th>c</th>
-<td>cdecl calling convention (the stack restored by caller). By default stdcall calling convention is used (the stack restored by callee).</td>
+<td>cdecl calling convention (the stack restored by caller). By default stdcall calling convention is used on x86 (the stack restored by callee).</td>
 <td></td>
 </tr>
 <tr>
@@ -443,26 +473,38 @@
 <th>u</th>
 <td>Unload DLL after call (using FreeLibrary, so you'll be able to delete it for example).</td>
 </tr>
+<tr>
+<th>2</th>
+<td>Experimental v2 syntax</td>
+</tr>
 </table>
 </blockquote>
 
+<h4>Experimental v2 syntax</h4>
+
+<ul>
+<li>Struct types in <a href="#v2typealign">uppercase are aligned</a> to their natural alignment. Lowercased types are packed without alignment.
+<li><a href="#v2callback">Callback id</a> based on the allocated callback
+</ul>
+
 <h4>Usage Examples</h4>
 
 <blockquote><pre>
-<a name="func"></a>System::<b>Call</b> "user32::MessageBox(i $HWNDPARENT, t 'NSIS System Plug-in', t 'Test', i 0)"
+<a name="func"></a>System::<b>Call</b> 'user32::MessageBox(p $HWNDPARENT, t "NSIS System Plug-in", t "Test", i 0)'
+<a name="funcqpath"></a>System::<b>Call</b> '"$SysDir\MyLibrary.dll"::MyFunction(i 42)'
 </pre></blockquote>
 <blockquote><pre>
-<a name="funcaddr"></a>System::<b>Call</b> "kernel32::GetModuleHandle(t 'user32.dll') i .s"
-System::<b>Call</b> "kernel32::GetProcAddress(i s, t 'MessageBoxA') i .r0"
-System::<b>Call</b> "::$0(i $HWNDPARENT, t 'GetProcAddress test', t 'NSIS System Plug-in', i 0)"
+<a name="funcaddr"></a>System::<b>Call</b> "kernel32::GetModuleHandle(t 'user32.dll') p .s"
+System::<b>Call</b> "kernel32::GetProcAddress(p s, m 'MessageBoxA') p .r0"
+System::<b>Call</b> "::$0(p $HWNDPARENT, m 'GetProcAddress test', m 'NSIS System Plug-in', i 0)"
 </pre></blockquote>
 <blockquote><pre>
-<a name="get"></a>System::<b>Get</b> "user32::MessageBox(i $HWNDPARENT, t 'This is a default text', t 'Default', i 0)"
+<a name="get"></a>System::<b>Get</b> "user32::MessageBox(p $HWNDPARENT, t 'This is a default text', t 'Default', i 0)"
 Pop $0
 System::<b>Call</b> "$0"
 </pre></blockquote>
 <blockquote><pre>
-System::<b>Get</b> "user32::MessageBox(i $HWNDPARENT, t 'This is a default text', \
+System::<b>Get</b> "user32::MessageBox(p $HWNDPARENT, t 'This is a default text', \
 	t 'Default', i 0x1|0x10)"
 Pop $0
 System::<b>Call</b> "$0(, 'This is a System::Get test', 'NSIS System Plug-in',)"
@@ -476,25 +518,45 @@
 <blockquote><pre>
 <a name="structaddr"></a>System::Alloc 4
 Pop $0
-System::<b>Call</b> "*$0(i 5)"
-System::<b>Call</b> "*$0(i .r1)"
+System::<b>Call</b> "*$0(i 5)" ; Write
+System::<b>Call</b> "*$0(i .r1)" ; Read
+System::Free $0
 DetailPrint $1
 </pre></blockquote>
 <blockquote><pre>
-<a name="newstruct"></a>System::<b>Call</b> "*(i 5) i .r0"
+<a name="newstruct"></a>System::<b>Call</b> "*(i 5) p .r0"
 System::<b>Call</b> "*$0(i .r1)"
+System::Free $0
 DetailPrint $1
 </pre></blockquote>
+<a name="structsize"></a><blockquote><pre>
+System::Call '*0(p, <b>&amp;l.r2,</b> &amp;t2)' ; &amp;l. is not part of the struct
+DetailPrint "Struct size=$2" 
+</pre></blockquote>
+<a name="structsizemember"></a><blockquote><pre>
+System::Call '*(<b>&amp;l4</b>,i,i,i,i,&amp;t128)p.r1' ; Fills dwOSVersionInfoSize with the struct size as a int32
+${If} $1 Z&lt;&gt; 0
+	System::Call 'kernel32::GetVersionEx(pr1)i.r0'
+	System::Call '*$1(i,i.R1,i.R2,i.R3)'
+	System::Free $1
+	${IfThen} $0 &lt;&gt; 0 ${|} DetailPrint "v$R1.$R2.$R3" ${|}
+${EndIf}
+</pre></blockquote>
 <blockquote><pre>
+<a name="directvarmemparam"></a>System::<b>Call</b> "user32::GetClientRect(p $hwndparent, @ r0)"
+System::<b>Call</b> "*$0(i,i,i.r1,i.r2)"
+DetailPrint ClientRect=$1x$2
+</pre></blockquote>
+<blockquote><pre>
 <a name="com"></a># defines
 !define CLSCTX_INPROC_SERVER 1
 !define CLSID_ActiveDesktop {75048700-EF1F-11D0-9888-006097DEACF9}
 !define IID_IActiveDesktop {F490EB00-1240-11D1-9888-006097DEACF9}
 # create IActiveDesktop interface
 System::<b>Call</b> "ole32::CoCreateInstance( \
-	g '${CLSID_ActiveDesktop}', i 0, \
+	g '${CLSID_ActiveDesktop}', p 0, \
 	i ${CLSCTX_INPROC_SERVER}, \
-	g '${IID_IActiveDesktop}', *i .r0) i.r1"
+	g '${IID_IActiveDesktop}', *p .r0) i.r1"
 StrCmp $1 0 0 end
 # call IActiveDesktop->GetWallpaper
 System::<b>Call</b> "$0->4(w .r2, i ${NSIS_MAX_STRLEN}, i 0)"
@@ -506,20 +568,22 @@
 </pre></blockquote>
 <blockquote><pre>
 InitPluginsDir
-SetOutPath $PLUGINSDIR
-File MyDLL.dll
-System::<b>Call</b> "MyDLL::MyFunc(i 5) ? u"
+File "/oname=$PLUGINSDIR\MyDLL.dll" MyDLL.dll
+System::<b>Call</b> 'KERNEL32::AddDllDirectory(w "$PLUGINSDIR")'
+System::<b>Call</b> 'KERNEL32::LoadLibrary(t "$PLUGINSDIR\MyDLL.dll")p.r1'
+System::<b>Call</b> 'MyDLL::MyFunc(i 5) ? u'
+System::<b>Call</b> 'KERNEL32::FreeLibrary(pr1)'
 Delete $PLUGINSDIR\MyDLL.dll
 </pre></blockquote>
 <blockquote><pre>
-<a name="callback"></a>System::<b>Get</b> "(i.r1, i) iss"
+<a name="callback"></a>System::<b>Get</b> "(p.r1, p) iss"
 Pop $R0
-System::<b>Call</b> "user32::EnumChildWindows(i $HWNDPARENT, k R0, i) i.s"
+System::<b>Call</b> "user32::EnumChildWindows(p $HWNDPARENT, k R0, p) i.s"
 loop:
 	Pop $0
 	StrCmp $0 "callback1" 0 done
-	System::<b>Call</b> "user32::GetWindowText(ir1,t.r2,i${NSIS_MAX_STRLEN})"
-	System::<b>Call</b> "user32::GetClassName(ir1,t.r3,i${NSIS_MAX_STRLEN})"
+	System::<b>Call</b> "user32::GetWindowText(pr1,t.r2,i${NSIS_MAX_STRLEN})"
+	System::<b>Call</b> "user32::GetClassName(pr1,t.r3,i${NSIS_MAX_STRLEN})"
 	IntFmt $1 "0x%X" $1
 	DetailPrint "$1 - [$3] $2"
 	Push 1 # callback's return value
@@ -527,15 +591,39 @@
 	Goto loop
 done:
 System::Free $R0
+DetailPrint "EnumChildWindows returned $0"
 </pre></blockquote>
+<a name="v2callback"></a><blockquote><pre>
+System::Get '(m.r1)ir2r0 <b>?2</b>' ; v2 syntax
+Pop $9
+System::Call 'kernel32::EnumSystemLocalesA(k r9, i 0)'
+loop:
+	StrCmp <b>$0 "callback$9"</b> 0 done
+	DetailPrint "Locale: $1"
+	StrCpy $2 1 ; EnumLocalesProc return value
+	System::Call $9 ; return from EnumLocalesProc
+	Goto loop
+done:
+System::Free $9
+</pre></blockquote>
+<a name="v2typealign"></a><blockquote><pre>
+System::Call '*(&amp;t50 "!")p.r2' ; DecimalSep
+System::Call '*(&amp;t50 "`")p.r3' ; ThousandSep
+System::Call '*(i 2, i 0, i 3, <b>P r2, P r3</b>, i 1)p.r1 <b>?2</b>'
+System::Call 'kernel32::GetNumberFormat(i 0, i 0, t "1337.666" r4, p r1, t.r5, i ${NSIS_MAX_STRLEN})'
+DetailPrint "Custom formated $4: $5"
+System::Free $3
+System::Free $2
+System::Free $1
+</pre></blockquote>
 <blockquote><pre>
-<a name="repeat"></a>!define MB "user32::MessageBox(i$HWNDPARENT,t,t'NSIS System Plug-in',i0)"
+<a name="repeat"></a>!define MB "user32::MessageBox(p$HWNDPARENT,t,t'NSIS System Plug-in',i0)"
 System::<b>Call</b> "${MB}(,'my message',,)"
 System::<b>Call</b> "${MB}(,'another message',,) i.r0"
 MessageBox MB_OK "last call returned $0"
 </pre></blockquote>
 <blockquote><pre>
-System::<b>Call</b> "user32::SendMessage(i $HWNDPARENT, t 'test', t 'test', i 0) i.s ? \
+<a name="repeatproc"></a>System::<b>Call</b> "user32::SendMessage(p $HWNDPARENT, t 'test', t 'test', p 0) p.s ? \
 	e (,t'test replacement',,) i.r0 ? !e #user32::MessageBox"
 DetailPrint $0
 ClearErrors
@@ -557,7 +645,7 @@
 <ul>
 
 <li>
-<b>Int64Op</b> <i>ARG1</i> <i>OP</i> [<i>ARG2</i>]
+<b id="Int64Op">Int64Op</b> <i>ARG1</i> <i>OP</i> [<i>ARG2</i>]
 <blockquote>
 <p>Performs <i>OP</i> on <i>ARG1</i> and optionally <i>ARG2</i> and returns the result on the stack. Both <i>ARG1</i> and <i>ARG2</i> are 64-bit integers. This means they can range between -2^63 and 2^63 - 1.</p>
 <h4>Available Operations</h4>
@@ -567,18 +655,19 @@
 <li>Multiplication -- <b>*</b></li>
 <li>Division -- <b>/</b></li>
 <li>Modulo -- <b>%</b></li>
-<li>Shift right -- <b>&gt;&gt;</b></li>
 <li>Shift left -- <b>&lt;&lt;</b></li>
+<li>Arithmetic shift right -- <b>&gt;&gt;</b></li>
+<li>Logical shift right -- <b>&gt;&gt;&gt;</b></li>
 <li>Bitwise or -- <b>|</b></li>
 <li>Bitwise and -- <b>&amp;</b></li>
 <li>Bitwise xor -- <b>^</b></li>
+<li>Bitwise not (one argument) -- <b>~</b></li>
+<li>Logical not (one argument) -- <b>!</b></li>
 <li>Logical or -- <b>||</b></li>
 <li>Logical and -- <b>&amp;&amp;</b></li>
 <li>Less than -- <b>&lt;</b></li>
 <li>Equals -- <b>=</b></li>
 <li>Greater than -- <b>&gt;</b></li>
-<li>Bitwise not (one argument) -- <b>~</b></li>
-<li>Logical not (one argument) -- <b>!</b></li>
 </ul>
 
 <h4>Usage Examples</h4>
@@ -589,11 +678,6 @@
 DetailPrint "5 + 5 = $0" # 10
 </pre></blockquote>
 <blockquote><pre>
-System::<b>Int64Op</b> 64 - 25
-Pop $0
-DetailPrint "64 - 25 = $0" # 39
-</pre></blockquote>
-<blockquote><pre>
 System::<b>Int64Op</b> 526355 * 1565487
 Pop $0
 DetailPrint "526355 * 1565487 = $0" # 824001909885
@@ -617,13 +701,14 @@
 System::<b>Int64Op</b> 0x4000000000000000 &gt;&gt; 62
 Pop $0
 DetailPrint "0x4000000000000000 &gt;&gt; 62 = $0" # 1
-</pre></blockquote>
-<blockquote><pre>
-System::<b>Int64Op</b> 0xF0F0F0F | 0xF0F0FFF
+
+System::<b>Int64Op</b> 0x8000000000000000 &gt;&gt; 1
 Pop $0
-# IntFmt is 32-bit, this is just for the example
-IntFmt $0 "0x%X" $0
-DetailPrint "0xF0F0F0F | 0xF0F0FFF = $0" # 0xF0F0FFF
+DetailPrint "0x8000000000000000 &gt;&gt; 1 = $0" # -4611686018427387904 (0xC000000000000000)
+
+System::<b>Int64Op</b> 0x8000000000000000 &gt;&gt;&gt; 1
+Pop $0
+DetailPrint "0x8000000000000000 &gt;&gt;&gt; 1 = $0" # 4611686018427387904 (0x4000000000000000)
 </pre></blockquote>
 <blockquote><pre>
 System::<b>Int64Op</b> 0x12345678 &amp; 0xF0F0F0F0
@@ -665,7 +750,7 @@
 <blockquote><pre>
 System::<b>Int64Op</b> 156545668489 ~
 Pop $0
-DetailPrint "1 ~ = $0" # -156545668490
+DetailPrint "156545668489 ~ = $0" # -156545668490
 </pre></blockquote>
 <blockquote><pre>
 System::<b>Int64Op</b> 1 !
@@ -699,7 +784,7 @@
 </pre></blockquote>
 
 <blockquote><pre>
-System::Call "*(i, i, i, t)i.s"
+System::Call "*(i, i, i, t)p.s"
 </pre></blockquote>
 
 </blockquote>
@@ -709,7 +794,7 @@
 <blockquote><p>Setting data can be done using <a href="#callfuncs">Call</a>. It can be done in the allocation stage, or in another stage using the struct handling syntax.</p>
 
 <blockquote><pre>
-System::Call "*(i 5, i 2, i 513, t 'test')i.s"
+System::Call "*(i 5, i 2, i 513, t 'test')p.s"
 </pre></blockquote>
 
 <blockquote><pre>
@@ -725,7 +810,7 @@
 
 <blockquote><pre>
 # assuming the struct's memory address is kept in $0
-System::Call "dll::func(i r0)"
+System::Call "dll::func(p r0)"
 </pre></blockquote>
 
 </blockquote>
@@ -760,12 +845,11 @@
 
 <blockquote><pre>
 # allocate
-System::Alloc 32
-Pop $1
+System::Call "*(i,i,p,p,p,p,p,p)p.r1"
 # call
-System::Call "Kernel32::GlobalMemoryStatus(i r1)"
+System::Call "Kernel32::GlobalMemoryStatus(p r1)"
 # get
-System::Call "*$1(i.r2, i.r3, i.r4, i.r5, i.r6, i.r7, i.r8, i.r9)"
+System::Call "*$1(i.r2, i.r3, p.r4, p.r5, p.r6, p.r7, p.r8, p.r9)"
 # free
 System::Free $1
 # print
Index: tmp/org.txm.setups/nsis/Docs/nsExec/nsExec.txt
===================================================================
--- tmp/org.txm.setups/nsis/Docs/nsExec/nsExec.txt	(revision 2955)
+++ tmp/org.txm.setups/nsis/Docs/nsExec/nsExec.txt	(revision 2956)
@@ -7,14 +7,18 @@
 Usage
 -----
 nsExec::Exec [/OEM] [/TIMEOUT=x] path
+Pop $0
 
 -or-
 
 nsExec::ExecToLog [/OEM] [/TIMEOUT=x] path
+Pop $0
 
 -or-
 
 nsExec::ExecToStack [/OEM] [/TIMEOUT=x] path
+Pop $0 ; Return
+Pop $1 ; Output
 
 All functions are the same except ExecToLog will print the output
 to the log window and ExecToStack will push up to ${NSIS_MAX_STRLEN}
Index: tmp/org.txm.setups/nsis/Docs/AdvSplash/advsplash.txt
===================================================================
--- tmp/org.txm.setups/nsis/Docs/AdvSplash/advsplash.txt	(revision 2955)
+++ tmp/org.txm.setups/nsis/Docs/AdvSplash/advsplash.txt	(revision 2956)
@@ -1,28 +1,26 @@
 AdvSplash.dll - small (5.5k), simple plugin that lets you throw 
-up a splash screen in NSIS installers with cool fading effects (win2k/xp)
-and transparency.
+up a splash screen in NSIS installers with cool 
+fading effects (Win2000+) and transparency.
 
 To use:
 
 Create a .BMP file of your splash screen.
-(optional) Create a .WAV file to play while your splash screen shows.
+Create a .WAV file to play while your splash screen shows. (optional)
 
 Add the following lines to your .NSI file:
 
 Function .onInit
-  SetOutPath $TEMP
-  File /oname=spltmp.bmp "my_splash.bmp"
+  InitPluginsDir
+  File "/oname=$PluginsDir\spltmp.bmp" "${NSISDIR}\Contrib\Graphics\Wizard\llama.bmp"
 
 ; optional
-; File /oname=spltmp.wav "my_splashshit.wav"
+; File /oname=$PluginsDir\spltmp.wav "my_splashsound.wav"
 
-  advsplash::show 1000 600 400 -1 $TEMP\spltmp
+  advsplash::show 1000 600 400 -1 $PluginsDir\spltmp
 
   Pop $0 ; $0 has '1' if the user closed the splash screen early,
          ; '0' if everything closed normally, and '-1' if some error occurred.
 
-  Delete $TEMP\spltmp.bmp
-;  Delete $TEMP\spltmp.wav
 FunctionEnd
 
 Calling format
@@ -33,7 +31,7 @@
 FadeOut - length to show the fadeout scene (in ms) (not included in Delay)
 KeyColor - color used for transparency, could be any RGB value 
         (for ex. R=255 G=100 B=16 -> KeyColor=0xFF6410), 
-        use KeyColor=-1 if there is no transparent color at your image.
+        use KeyColor=-1 if there is no transparent color in your image.
 FileName - splash bitmap filename (without the .bmp). The BMP file used will be 
         this parameter.bmp, and the wave file used (if present) will be this 
         parameter.wav.
Index: tmp/org.txm.setups/nsis/makensis.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.setups/nsis/NSIS.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
