Updated installer UI and language files

Build/Installer/Installer.nsi

@@ -22,6 +22,7 @@ BrandingText " "
 SetCompressor /SOLID lzma
 RequestExecutionLevel user
 InstallDirRegKey HKLM "SOFTWARE\Rainmeter" ""
+ShowInstDetails nevershow
 XPStyle on
 OutFile "..\${OUTFILE}"
 ReserveFile "${NSISDIR}\Plugins\LangDLL.dll"
@@ -36,7 +37,10 @@ ReserveFile ".\UAC.dll"
 !include "WinVer.nsh"
 !include "UAC.nsh"
 
+; Additional Windows definitions
 !define BCM_SETSHIELD 0x0000160c
+!define PF_XMMI_INSTRUCTIONS_AVAILABLE 6
+!define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10
 
 !define MUI_HEADERIMAGE
 !define MUI_ICON ".\Icon.ico"
@@ -46,13 +50,10 @@ ReserveFile ".\UAC.dll"
 !define MUI_WELCOMEFINISHPAGE_BITMAP ".\Wizard.bmp"
 !define MUI_FINISHPAGE_RUN
 !define MUI_FINISHPAGE_RUN_FUNCTION FinishRun
+!define MUI_WELCOMEPAGE ; For language strings
 
-!define MUI_PAGE_CUSTOMFUNCTION_SHOW PageWelcomeOnShow
+Page custom PageWelcome PageWelcomeOnLeave
-!insertmacro MUI_PAGE_WELCOME
 Page custom PageOptions PageOptionsOnLeave
-!define MUI_PAGE_CUSTOMFUNCTION_SHOW PageDirectoryOnShow
-!define MUI_PAGE_CUSTOMFUNCTION_LEAVE PageDirectoryOnLeave
-!insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_PAGE_FINISH
 
@@ -102,18 +103,11 @@ UninstPage custom un.PageOptions un.GetOptions
 !define ERROR_NOVCREDIST	6
 !define ERROR_CLOSEFAIL		7
 
-Var ctlDesktop
+Var NonDefaultLanguage
-Var ctlStartup
+Var AutoStartup
-Var ctlAllUsers
+Var Install64Bit
-Var ctlDelete
+Var InstallPortable
-Var ctlStandard
+Var un.DeleteAll
-Var ctlPortable
-Var ctlBit32
-Var ctlBit64
-Var instArc
-Var instType
-Var defLang
-
 
 ; Install
 ; --------------------------------------
@@ -148,78 +142,67 @@ Function .onInit
 			Quit
 		${EndIf}
 
-		StrCpy $R0 $LANGUAGE
-		StrCpy $defLang "0"
-		ReadRegDWORD $0 HKLM "SOFTWARE\Rainmeter" "NonDefault"
-		${If} $0 == 1
-			; Rainmeter already installed and user selected non-default language last time
 		ReadRegStr $0 HKLM "SOFTWARE\Rainmeter" "Language"
-			${If} $0 != ""
+		ReadRegDWORD $NonDefaultLanguage HKLM "SOFTWARE\Rainmeter" "NonDefault"
-				StrCpy $LANGUAGE $0
-			${EndIf}
-		${EndIf}
 
 		${IfNot} ${Silent}
+			${If} $0 == ""
+			${OrIf} $0 != $LANGUAGE
+			${AndIf} $NonDefaultLanguage != 1
+				; New install or better match
 				LangDLL::LangDialog "$(^SetupCaption)" "Please select the installer language.$\n$(SELECTLANGUAGE)" AC ${MUI_LANGDLL_LANGUAGES_CP} ""
-			Pop $LANGUAGE
+				Pop $0
-			${If} $LANGUAGE == "cancel"
+				${If} $0 == "cancel"
 					Abort
 				${EndIf}
 
-			${If} $LANGUAGE == $R0
+				${If} $0 != $LANGUAGE
-				; User selected default language
+					; User selected non-default language
-				StrCpy $defLang "1"
+					StrCpy $NonDefaultLanguage 1
 				${EndIf}
+			${EndIf}
+
+			StrCpy $LANGUAGE $0
 		${Else}
+			${If} $0 != ""
+				StrCpy $LANGUAGE $0
+			${EndIf}
+
 			${GetParameters} $R1
 
 			ClearErrors
 			${GetOptions} $R1 "/LANGUAGE=" $0
 			${IfNot} ${Errors}
-				StrCpy $LANGUAGE $0
+				${If} $LANGUAGE != $0
-			${EndIf}
+					StrCpy $NonDefaultLanguage 1
-			${If} $LANGUAGE == $R0
-				; User selected default language
-				StrCpy $defLang "1"
 				${EndIf}
 
-			${GetOptions} $R1 "/DESKTOPSHORTCUT=" $0
+				StrCpy $LANGUAGE $0
-			${If} $0 = 1
-				StrCpy $ctlDesktop "1"
 			${EndIf}
 
 			${GetOptions} $R1 "/STARTUP=" $0
 			${If} $0 = 1
-				StrCpy $ctlStartup "1"
+				StrCpy $AutoStartup 1
-			${EndIf}
-
-			${GetOptions} $R1 "/ALLUSERS=" $0
-			${If} $0 = 1
-				StrCpy $ctlAllUsers "1"
 			${EndIf}
 
 			${GetOptions} $R1 "/PORTABLE=" $0
 			${If} $0 = 1
-				StrCpy $instType "P"
+				StrCpy $InstallPortable 1
 			${Else}
 				${IfNot} ${UAC_IsAdmin}
 					SetErrorLevel ${ERROR_NOTADMIN}
 					Quit
 				${EndIf}
-
-				StrCpy $instType "S"
 			${EndIf}
 
 			${GetOptions} $R1 "/VERSION=" $0
 			${If} $0 = 64
-				StrCpy $instArc "x64"
+				StrCpy $Install64Bit 1
 
 				${If} $INSTDIR == ""
 					StrCpy $INSTDIR "$PROGRAMFILES64\Rainmeter"
 				${EndIf}
 			${Else}
-				StrCpy $instArc "x86"
-
 				${If} $INSTDIR == ""
 					StrCpy $INSTDIR "$PROGRAMFILES\Rainmeter"
 				${EndIf}
@@ -236,178 +219,243 @@ Function .onInit
 			${EndIf}
 		${EndIf}
 	${Else}
-		; Sync variables with user instance
+		; Exchange settings with user instance
-		!insertmacro UAC_AsUser_Call Function ExchangeVars ${UAC_SYNCREGISTERS}
+		!insertmacro UAC_AsUser_Call Function ExchangeSettings ${UAC_SYNCREGISTERS}
-		StrCpy $instType "S"
+		StrCpy $AutoStartup $1
-		StrCpy $ctlDesktop $0
+		StrCpy $Install64Bit $2
-		StrCpy $ctlStartup $1
+		StrCpy $NonDefaultLanguage $3
-		StrCpy $ctlAllUsers $2
+		StrCpy $LANGUAGE $4
-		StrCpy $instArc $3
-		StrCpy $defLang $4
-		StrCpy $LANGUAGE $5
 	${EndIf}
 FunctionEnd
 
-Function ExchangeVars
+Function ExchangeSettings
-	StrCpy $0 $ctlDesktop
+	StrCpy $1 $AutoStartup
-	StrCpy $1 $ctlStartup
+	StrCpy $2 $Install64Bit
-	StrCpy $2 $ctlAllUsers
+	StrCpy $3 $NonDefaultLanguage
-	StrCpy $3 $instArc
+	StrCpy $4 $LANGUAGE
-	StrCpy $4 $defLang
-	StrCpy $5 $LANGUAGE
 	HideWindow
 FunctionEnd
 
-Function PageWelcomeOnShow
+Function PageWelcome
-	; Skip to the directory page if we're the elevated process
 	${If} ${UAC_IsInnerInstance}
 		${If} ${UAC_IsAdmin}
-			SendMessage $HWNDPARENT "0x408" "2" ""
+			; Skip page
+			Abort
 		${Else}
 			MessageBox MB_OK|MB_ICONSTOP "$(ADMINERROR) (Inner)"
 			Quit
 		${EndIf}
 	${EndIf}
+
+	!insertmacro MUI_HEADER_TEXT "$(INSTALLOPTIONS)" "$(^ComponentsSubText1)"
+	nsDialogs::Create 1044
+	Pop $0
+	nsDialogs::SetRTL $(^RTL)
+	SetCtlColors $0 "" "${MUI_BGCOLOR}"
+
+	${NSD_CreateBitmap} 0u 0u 109u 193u ""
+	Pop $0
+	${NSD_SetImage} $0 $PLUGINSDIR\modern-wizard.bmp $R0
+
+	${NSD_CreateLabel} 120u 10u 195u 38u "$(MUI_TEXT_WELCOME_INFO_TITLE)"
+	Pop $0
+	SetCtlColors $0 "" "${MUI_BGCOLOR}"
+	CreateFont $1 "$(^Font)" "12" "700"
+	SendMessage $0 ${WM_SETFONT} $1 0
+
+	${NSD_CreateLabel} 120u 55u 195u 12u "$(^ComponentsSubText1)"
+	Pop $0
+	SetCtlColors $0 "" "${MUI_BGCOLOR}"
+
+	${NSD_CreateRadioButton} 120u 70u 205u 12u "$(STANDARDINST)"
+	Pop $R0
+	SetCtlColors $R0 "" "${MUI_BGCOLOR}"
+	${NSD_AddStyle} $R0 ${WS_GROUP}
+	SendMessage $R0 ${WM_SETFONT} $mui.Header.Text.Font 0
+
+	${NSD_CreateLabel} 132u 82u 185u 24u "$(STANDARDINSTDESC)"
+	Pop $0
+	SetCtlColors $0 "" "${MUI_BGCOLOR}"
+
+	${NSD_CreateRadioButton} 120u 106u 310u 12u "$(PORTABLEINST)"
+	Pop $R1
+	SetCtlColors $R1 "" "${MUI_BGCOLOR}"
+	${NSD_AddStyle} $R1 ${WS_TABSTOP}
+	SendMessage $R1 ${WM_SETFONT} $mui.Header.Text.Font 0
+
+	${NSD_CreateLabel} 132u 118u 185u 52u "$(PORTABLEINSTDESC)"
+	Pop $0
+	SetCtlColors $0 "" "${MUI_BGCOLOR}"
+
+	${If} $InstallPortable == 1
+		${NSD_Check} $R1
+	${Else}
+		${NSD_Check} $R0
+	${EndIf}
+
+	Call muiPageLoadFullWindow
+
+	nsDialogs::Show
+	${NSD_FreeImage} $R0
+FunctionEnd
+
+Function PageWelcomeOnLeave
+	${NSD_GetState} $R1 $InstallPortable
+	Call muiPageUnloadFullWindow
 FunctionEnd
 
 Function PageOptions
+	${If} ${UAC_IsInnerInstance}
+	${AndIf} ${UAC_IsAdmin}
+		; Skip page
+		Abort
+	${EndIf}
+
 	!insertmacro MUI_HEADER_TEXT "$(INSTALLOPTIONS)" "$(INSTALLOPTIONSDESC)"
 	nsDialogs::Create 1018
 	nsDialogs::SetRTL $(^RTL)
 
-	${NSD_CreateRadioButton} 0 0u 310u 12u "$(STANDARDINST)"
+	${NSD_CreateGroupBox} 0 0u -1u 36u "$(^DirSubText)"
-	Pop $ctlStandard
-	${NSD_AddStyle} $ctlStandard ${WS_GROUP}
-	SendMessage $ctlStandard ${WM_SETFONT} $mui.Header.Text.Font 0
-	${NSD_OnClick} $ctlStandard setStandard
 
-	${NSD_CreateLabel} 12u 12u 285u 12u "$(STANDARDINSTDESC)"
+	${NSD_CreateDirRequest} 6u 14u 232u 14u ""
+	Pop $R0
+	SendMessage $R0 ${EM_SETREADONLY} 1 0
+	${NSD_OnChange} $R0 PageOptionsDirectoryOnChange
 
-	${NSD_CreateRadioButton} 0 24u 310u 12u "$(PORTABLEINST)"
+	${NSD_CreateBrowseButton} 242u 14u 50u 14u "$(^BrowseBtn)"
-	Pop $ctlPortable
+	Pop $R1
-	${NSD_AddStyle} $ctlPortable ${WS_TABSTOP}
+	${NSD_OnClick} $R1 PageOptionsBrowseOnClick
-	SendMessage $ctlPortable ${WM_SETFONT} $mui.Header.Text.Font 0
-	${NSD_OnClick} $ctlPortable setPortable
 
-	${NSD_CreateLabel} 12u 36u 285u 32u "$(PORTABLEINSTDESC)"
+	; Set default directory
+	${If} $InstallPortable == 1
+		${GetRoot} "$WINDIR" $0
+		${NSD_SetText} $R0 "$0\Rainmeter"
+	${ElseIf} $INSTDIR != ""
+		; Disable Browse button if already installed
+		EnableWindow $R1 0
+		${NSD_SetText} $R0 "$INSTDIR"
+	${Else}
+		; Fresh install
+		${If} ${RunningX64}
+			${NSD_SetText} $R0 "$PROGRAMFILES64\Rainmeter"
+			${NSD_Check} $R2
+		${Else}
+			${NSD_SetText} $R0 "$PROGRAMFILES\Rainmeter"
+		${EndIf}
+	${EndIf}
 
-	${NSD_CreateGroupBox} 0 72u 200u 54u "$(ADDITIONALOPTIONS)"
+	StrCpy $1 0
 
-	Push $ctlDesktop
+	${If} ${RunningX64}
-	${NSD_CreateCheckbox} 6u 84u 190u 12u "$(DESKTOPSHORTCUT)"
+	${AndIf} $InstallPortable == 1
-	Pop $ctlDesktop
+	${OrIf} $INSTDIR == ""
-	Pop $0
+		${NSD_CreateCheckBox} 6u 54u 285u 12u "$(INSTALL64BIT)"
-	StrCmp $0 "1" 0 +2
+		Pop $R2
-		${NSD_Check} $ctlDesktop
+		StrCpy $1 30u
+	${Else}
+		StrCpy $R2 0
+	${EndIf}
 
-	Push $ctlAllUsers
+	${If} $InstallPortable != 1
-	${NSD_CreateCheckbox} 6u 96u 190u 12u "$(ALLUSERSSHORTCUT)"
+		${If} $1 == 0
-	Pop $ctlAllUsers
+			StrCpy $0 54u
-	Pop $0
+			StrCpy $1 30u
-	StrCmp $0 "1" 0 +2
+		${Else}
-		${NSD_Check} $ctlAllUsers
+			StrCpy $0 66u
+			StrCpy $1 42u
+		${EndIf}
 
-	Push $ctlStartup
+		${NSD_CreateCheckbox} 6u $0 285u 12u "$(AUTOSTARTUP)"
-	${NSD_CreateCheckbox} 6u 108u 190u 12u "$(AUTOSTARTUP)"
+		Pop $R3
-	Pop $ctlStartup
-	Pop $0
-	StrCmp $0 "1" 0 +2
-		${NSD_Check} $ctlStartup
 
-	${NSD_CreateGroupBox} 205u 72u 94u 40u "$(RAINMETERVERSION)"
+		${If} $INSTDIR == ""
-
+			${NSD_Check} $R3
-	${NSD_CreateRadioButton} 211u 82u 80u 12u "$(32BIT)"
-	Pop $ctlBit32
-	${NSD_AddStyle} $ctlBit32 ${WS_GROUP}
-
-	${NSD_CreateRadioButton} 211u 94u 80u 12u "$(64BIT)"
-	Pop $ctlBit64
-
-	ReadRegStr $0 HKLM "Software\Rainmeter" ""
-	${If} $0 == ""
-		${NSD_Check} $ctlStartup
-		${NSD_Check} $ctlAllUsers
 		${Else}
 			SetShellVarContext all
-		Call GetEnvPaths
+			${If} ${FileExists} "$SMSTARTUP\Rainmeter.lnk"
-		StrCpy $R1 $1
+				${NSD_Check} $R3
-		StrCpy $R2 $2
+			${EndIf}
-		StrCpy $R3 $3
+
 			SetShellVarContext current
-		!insertmacro UAC_AsUser_Call Function GetEnvPaths ${UAC_SYNCREGISTERS}
+			${If} ${FileExists} "$SMSTARTUP\Rainmeter.lnk"
-
+				${NSD_Check} $R3
-		${If} ${FileExists} "$R1\Rainmeter\Rainmeter.lnk"
-			${NSD_Check} $ctlAllUsers
-		${EndIf}
-		${If} ${FileExists} "$R2\Rainmeter.lnk"
-		${OrIf} ${FileExists} "$2\Rainmeter.lnk"
-			${NSD_Check} $ctlStartup
-		${EndIf}
-		${If} ${FileExists} "$R3\Rainmeter.lnk"
-		${OrIf} ${FileExists} "$3\Rainmeter.lnk"
-			${NSD_Check} $ctlDesktop
 			${EndIf}
 		${EndIf}
-
-	${If} $instType == "P"
-		${NSD_Check} $ctlPortable
-		Call SetPortable
 	${Else}
-		Call SetStandard
+		StrCpy $R3 0
-		${NSD_Check} $ctlStandard
+	${EndIf}
+
+	${If} $1 != 0
+		${NSD_CreateGroupBox} 0 42u -1u $1 "$(ADDITIONALOPTIONS)"
+	${EndIf}
+
+	; Change 'Next' to 'Install' if directory page will be skipped
+	GetDlgItem $0 $HWNDPARENT 1
+	${If} $INSTDIR != ""
+		${NSD_SetText} $0 "$(^InstallBtn)"
+	${EndIf}
+
+	; Show UAC shield on Install button if required
+	${If} $InstallPortable == 1
+		SendMessage $0 ${BCM_SETSHIELD} 0 0
+	${Else}
+		SendMessage $0 ${BCM_SETSHIELD} 0 1
+
+		; Hide Back button
+		GetDlgItem $0 $HWNDPARENT 3
+		ShowWindow $0 ${SW_HIDE}
 	${EndIf}
 
 	nsDialogs::Show
 FunctionEnd
 
-Function SetStandard
+Function PageOptionsDirectoryOnChange
-	EnableWindow $ctlDesktop 1
+	${NSD_GetText} $R0 $0
-	EnableWindow $ctlAllUsers 1
-	EnableWindow $ctlStartup 1
 
+	StrCpy $Install64Bit 0
 	${If} ${RunningX64}
-		${If} ${FileExists} "$INSTDIR\Rainmeter.exe"
+		${If} ${FileExists} "$0\Rainmeter.exe"
-			MoreInfo::GetProductVersion "$INSTDIR\Rainmeter.exe"
+			MoreInfo::GetProductVersion "$0\Rainmeter.exe"
 			Pop $0
 			StrCpy $0 $0 2 -7
-
+			${If} $0 == 64
-			${If} $0 == "32"
+				StrCpy $Install64Bit 1
-				${NSD_Check} $ctlBit32
-				${NSD_UnCheck} $ctlBit64
-				EnableWindow $ctlBit64 0
-			${Else}
-				${NSD_Check} $ctlBit64
-				${NSD_UnCheck} $ctlBit32
-				EnableWindow $ctlBit32 0
-			${EndIf}
-		${Else}
-			${NSD_Check} $ctlBit64
-		${EndIf}
-	${Else}
-		${NSD_Check} $ctlBit32
-		${NSD_UnCheck} $ctlBit64
-		EnableWindow $ctlBit64 0
 			${EndIf}
 
-	${IfNot} ${UAC_IsAdmin}
+			${If} $InstallPortable == 1
-		GetDlgItem $0 $HWNDPARENT 1
+				${NSD_SetState} $R3 $Install64Bit
-		SendMessage $0 ${BCM_SETSHIELD} 0 1
+				EnableWindow $R3 0
+			${EndIf}
+		${Else}
+			${If} $InstallPortable == 1
+				EnableWindow $R3 1
+			${EndIf}
+		${EndIf}
 	${EndIf}
 FunctionEnd
 
-Function SetPortable
+Function PageOptionsBrowseOnClick
-	EnableWindow $ctlDesktop 0
+	${NSD_GetText} $R0 $0
-	EnableWindow $ctlAllUsers 0
+	nsDialogs::SelectFolderDialog "$(^DirBrowseText)" $0
-	EnableWindow $ctlStartup 0
+	Pop $1
-	EnableWindow $ctlBit32 1
 
-	${If} ${RunningX64}
+	${If} $1 != error
-		EnableWindow $ctlBit64 1
+		${If} $InstallPortable == 1
-	${Endif}
+			ClearErrors
+			CreateDirectory "$1"
+			WriteINIStr "$1\writetest~.rm" "1" "1" "1"
 
-	${IfNot} ${UAC_IsAdmin}
+			${If} ${Errors}
-		GetDlgItem $0 $HWNDPARENT 1
+				MessageBox MB_OK|MB_ICONEXCLAMATION "$(WRITEERROR)"
-		SendMessage $0 ${BCM_SETSHIELD} 0 0
+			${Else}
+				${NSD_SetText} $R0 $1
+			${EndIf}
+
+			Delete "$0\writetest~.rm"
+			RMDir "$0"
+		${Else}
+			${NSD_SetText} $R0 $1
+		${EndIf}
 	${EndIf}
 FunctionEnd
 
@@ -415,25 +463,17 @@ Function PageOptionsOnLeave
 	GetDlgItem $0 $HWNDPARENT 1
 	EnableWindow $0 0
 
-	${NSD_GetState} $ctlDesktop $ctlDesktop
+	${If} $R2 != 0
-	${NSD_GetState} $ctlStartup $ctlStartup
+		${NSD_GetState} $R2 $Install64Bit
-	${NSD_GetState} $ctlAllUsers $ctlAllUsers
-
-	${NSD_GetState} $ctlStandard $0
-	${If} $0 == ${BST_CHECKED}
-		StrCpy $instType "S"
-	${Else}
-		StrCpy $instType "P"
 	${EndIf}
 
-	${NSD_GetState} $ctlBit32 $0
+	${If} $R3 != 0
-	${If} $0 == ${BST_CHECKED}
+		${NSD_GetState} $R3 $AutoStartup
-		StrCpy $instArc "x86"
-	${Else}
-		StrCpy $instArc "x64"
 	${EndIf}
 
-	${If} $instType == "S"
+	${NSD_GetText} $R0 $INSTDIR
+
+	${If} $InstallPortable != 1
 		${IfNot} ${UAC_IsAdmin}
 			; UAC_IsAdmin seems to return incorrect result sometimes. Recheck with UserInfo::GetAccountType to be sure.
 			UserInfo::GetAccountType
@@ -462,49 +502,6 @@ UAC_TryAgain:
 	${EndIf}
 FunctionEnd
 
-Function PageDirectoryOnShow
-	${If} $instType == "P"
-		${GetRoot} "$WINDIR" $0
-		${NSD_SetText} $mui.DirectoryPage.Directory "$0\Rainmeter"
-	${Else}
-		${If} $INSTDIR == ""
-			; Fresh install
-			${If} $instArc == "x86"
-				${If} ${RunningX64}
-					${NSD_SetText} $mui.DirectoryPage.Directory "$PROGRAMFILES32\Rainmeter"
-				${Else}
-					${NSD_SetText} $mui.DirectoryPage.Directory "$PROGRAMFILES\Rainmeter"
-				${EndIf}
-			${Else}
-				${NSD_SetText} $mui.DirectoryPage.Directory "$PROGRAMFILES64\Rainmeter"
-			${EndIf}
-		${Else}
-			; Upgrade install
-			EnableWindow $mui.DirectoryPage.Directory 0
-			EnableWindow $mui.DirectoryPage.BrowseButton 0
-
-			; Set focus on the Install button
-			GetDlgItem $0 $HWNDPARENT 1
-			System::Call "user32::SetFocus(i$0)"
-		${EndIf}
-	${EndIf}
-FunctionEnd
-
-Function PageDirectoryOnLeave
-	${If} $instType == "P"
-		ClearErrors
-		CreateDirectory "$INSTDIR"
-		WriteINIStr "$INSTDIR\_rainmeter_writetest.tmp" "1" "1" "1"
-
-		${If} ${Errors}
-			MessageBox MB_OK|MB_ICONEXCLAMATION "$(WRITEERROR)"
-			Abort
-		${EndIf}
-
-		Delete "$INSTDIR\_rainmeter_writetest.tmp"
-	${EndIf}
-FunctionEnd
-
 !macro InstallFiles DIR
 	File "..\..\TestBench\${DIR}\Release\Rainmeter.exe"
 	File "..\..\TestBench\${DIR}\Release\Rainmeter.dll"
@@ -514,33 +511,37 @@ FunctionEnd
 	File /x *Example*.dll "..\..\TestBench\${DIR}\Release\Plugins\*.dll"
 !macroend
 
-!macro RemoveShortcuts
+!macro RemoveStartMenuShortcuts STARTMENUPATH
-	; $1=$SMPROGRAMS, $2=$SMSTARTUP, $3=$DESKTOP
+	Delete "${STARTMENUPATH}\Rainmeter.lnk"
-	Delete "$1\Rainmeter\Rainmeter.lnk"
+	Delete "${STARTMENUPATH}\Rainmeter Help.lnk"
-	Delete "$1\Rainmeter\Rainmeter Help.lnk"
+	Delete "${STARTMENUPATH}\Rainmeter Help.URL"
-	Delete "$1\Rainmeter\Rainmeter Help.URL"
+	Delete "${STARTMENUPATH}\Remove Rainmeter.lnk"
-	Delete "$1\Rainmeter\Remove Rainmeter.lnk"
+	Delete "${STARTMENUPATH}\RainThemes.lnk"
-	Delete "$1\Rainmeter\RainThemes.lnk"
+	Delete "${STARTMENUPATH}\RainThemes Help.lnk"
-	Delete "$1\Rainmeter\RainThemes Help.lnk"
+	Delete "${STARTMENUPATH}\RainBrowser.lnk"
-	Delete "$1\Rainmeter\RainBrowser.lnk"
+	Delete "${STARTMENUPATH}\RainBackup.lnk"
-	Delete "$1\Rainmeter\RainBackup.lnk"
+	Delete "${STARTMENUPATH}\Rainstaller.lnk"
-	Delete "$1\Rainmeter\Rainstaller.lnk"
+	Delete "${STARTMENUPATH}\Skin Installer.lnk"
-	Delete "$1\Rainmeter\Skin Installer.lnk"
+	Delete "${STARTMENUPATH}\Rainstaller Help.lnk"
-	Delete "$1\Rainmeter\Rainstaller Help.lnk"
+	RMDir "${STARTMENUPATH}"
-	RMDir "$1\Rainmeter"
-	Delete "$2\Rainmeter.lnk"
-	Delete "$3\Rainmeter.lnk"
 !macroend
 
 Section
 	SetOutPath "$PLUGINSDIR"
 	SetShellVarContext current
 
-	${If} $instType == "S"
+	Var /GLOBAL InstArc
-		ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\$instArc" "Bld"
+	${If} $Install64Bit == 1
+		StrCpy $InstArc "x64"
+	${Else}
+		StrCpy $InstArc "x86"
+	${EndIf}
+
+	${If} $InstallPortable != 1
+		ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\$InstArc" "Bld"
 		${VersionCompare} "$0" "40219" $1
 
-		ReadRegDWORD $2 HKLM "SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\$instArc" "Installed"
+		ReadRegDWORD $2 HKLM "SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\$InstArc" "Installed"
 
 		; Download and install VC++ redist if required
 		${If} $1 == "2"
@@ -550,7 +551,7 @@ Section
 				Quit
 			${EndIf}
 
-			${If} $instArc == "x86"
+			${If} $Install64Bit != 1
 				NSISdl::download /TIMEOUT=30000 "http://download.microsoft.com/download/C/6/D/C6D0FD4E-9E53-4897-9B91-836EBA2AACD3/vcredist_x86.exe" "$PLUGINSDIR\vcredist.exe"
 				Pop $0
 			${Else}
@@ -563,7 +564,7 @@ Section
 				; download from MS failed, try from rainmter.net
 				Delete "$PLUGINSDIR\vcredist.exe"
 
-				${If} $instArc == "x86"
+				${If} $Install64Bit != 1
 					NSISdl::download /TIMEOUT=30000 "http://rainmeter.net/redist/vc10SP1redist_x86.exe" "$PLUGINSDIR\vcredist.exe"
 					Pop $0
 				${Else}
@@ -593,7 +594,7 @@ Section
 		; Download and install .NET if required
 		ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v2.0.50727" "Install"
 		${If} $0 != "1"
-			${If} $instArc == "x86"
+			${If} $Install64Bit != 1
 				NSISdl::download /TIMEOUT=30000 "http://download.microsoft.com/download/5/6/7/567758a3-759e-473e-bf8f-52154438565a/dotnetfx.exe" "$PLUGINSDIR\dotnetfx.exe"
 			${Else}
 				NSISdl::download /TIMEOUT=30000 "http://download.microsoft.com/download/a/3/f/a3f1bf98-18f3-4036-9b68-8e6de530ce0a/NetFx64.exe" "$PLUGINSDIR\dotnetfx.exe"
@@ -605,7 +606,7 @@ Section
 			${AndIf} $0 != "success"
 				Delete "$PLUGINSDIR\dotnetfx.exe"
 
-				${If} $instArc == "x86"
+				${If} $Install64Bit != 1
 					NSISdl::download /TIMEOUT=30000 "http://rainmeter.net/redist/dotnetfx.exe" "$PLUGINSDIR\dotnetfx.exe"
 				${Else}
 					NSISdl::download /TIMEOUT=30000 "http://rainmeter.net/redist/NetFx64.exe" "$PLUGINSDIR\dotnetfx.exe"
@@ -661,7 +662,7 @@ Section
 	; if the installation folder is in Program Files
 	${IfNot} ${Silent}
 	${AndIf} ${FileExists} "$INSTDIR\Rainmeter.ini"
-		${If} $instType == "S"
+		${If} $InstallPortable != 1
 			!ifdef X64
 				StrCmp $INSTDIR "$PROGRAMFILES64\Rainmeter" 0 RainmeterIniDoesntExistLabel
 			!else
@@ -703,22 +704,18 @@ RainmeterIniDoesntExistLabel:
 	SetOutPath "$INSTDIR\Skins"
 	RMDir /r "$INSTDIR\Skins\illustro"
 	Delete "$INSTDIR\Skins\*.txt"
-	File /r /x .svn "..\Skins\*.*"
+	File /r /x "..\Skins\*.*"
 
 	SetOutPath "$INSTDIR\Themes"
-	File /r /x .svn "..\Themes\*.*"
+	File /r /x "..\Themes\*.*"
 
 	SetOutPath "$INSTDIR"
 
-	${If} $instType == "S"
+	${If} $InstallPortable != 1
 		ReadRegStr $0 HKLM "SOFTWARE\Rainmeter" ""
 		WriteRegStr HKLM "SOFTWARE\Rainmeter" "" "$INSTDIR"
 		WriteRegStr HKLM "SOFTWARE\Rainmeter" "Language" "$LANGUAGE"
-		${If} $defLang == "1"
+		WriteRegDWORD HKLM "SOFTWARE\Rainmeter" "NonDefault" $NonDefaultLanguage
-			DeleteRegValue HKLM "SOFTWARE\Rainmeter" "NonDefault"
-		${Else}
-			WriteRegDWORD HKLM "SOFTWARE\Rainmeter" "NonDefault" 1
-		${EndIf}
 
 		WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Rainmeter" "DisplayName" "Rainmeter"
 		WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Rainmeter" "DisplayIcon" "$INSTDIR\Rainmeter.exe,0"
@@ -741,42 +738,23 @@ RainmeterIniDoesntExistLabel:
 
 		; Refresh shell icons if new install
 		${If} $0 == ""
-			System::Call 'Shell32::SHChangeNotify(i 0x8000000, i 0, i 0, i 0)'
+			${RefreshShellIcons}
 		${EndIf}
 
-		; Remove all shortcuts
+		; Remove all start menu shortcuts
-		${If} $ctlAllUsers == "1"
-			SetShellVarContext current
-			Call GetEnvPaths
-			!insertmacro RemoveShortcuts
-			!insertmacro UAC_AsUser_Call Function GetEnvPaths ${UAC_SYNCREGISTERS}
-			!insertmacro RemoveShortcuts
 		SetShellVarContext all
-			Call GetEnvPaths
+		Call RemoveStartMenuShortcuts
-			!insertmacro RemoveShortcuts
+
-		${Else}
+		CreateShortcut "$SMPROGRAMS\Rainmeter.lnk" "$INSTDIR\Rainmeter.exe" "" "$INSTDIR\Rainmeter.exe" 0
-			SetShellVarContext all
+
-			Call GetEnvPaths
-			!insertmacro RemoveShortcuts
 		SetShellVarContext current
-			Call GetEnvPaths
+		Call RemoveStartMenuShortcuts
-			!insertmacro RemoveShortcuts
+
-			!insertmacro UAC_AsUser_Call Function GetEnvPaths ${UAC_SYNCREGISTERS}
+		${If} $AutoStartup == 1
-			!insertmacro RemoveShortcuts
+			!insertmacro UAC_AsUser_Call Function CreateStartupShortcut ${UAC_SYNCREGISTERS}
 		${EndIf}
 
-		; Create shortcuts ($1=$SMPROGRAMS, $2=$SMSTARTUP, $3=$DESKTOP)
+		!insertmacro UAC_AsUser_Call Function RemoveStartMenuShortcuts ${UAC_SYNCREGISTERS}
-		CreateDirectory "$1\Rainmeter"
-		CreateShortCut "$1\Rainmeter\Rainmeter.lnk" "$INSTDIR\Rainmeter.exe" "" "$INSTDIR\Rainmeter.exe" 0
-
-		SetOutPath "$INSTDIR"
-		${If} $ctlStartup == "1"
-			CreateShortCut  "$2\Rainmeter.lnk" "$INSTDIR\Rainmeter.exe" "" "$INSTDIR\Rainmeter.exe" 0
-		${EndIf}
-
-		${If} $ctlDesktop == "1"
-			CreateShortCut  "$3\Rainmeter.lnk" "$INSTDIR\Rainmeter.exe" "" "$INSTDIR\Rainmeter.exe" 0
-		${EndIf}
 
 		WriteUninstaller "$INSTDIR\uninst.exe"
 	${Else}
@@ -788,10 +766,12 @@ RainmeterIniDoesntExistLabel:
 	${EndIf}
 SectionEnd
 
-Function GetEnvPaths
+Function RemoveStartMenuShortcuts
-	StrCpy $1 $SMPROGRAMS
+	!insertmacro RemoveStartMenuShortcuts "$SMPROGRAMS\Rainmeter"
-	StrCpy $2 $SMSTARTUP
+FunctionEnd
-	StrCpy $3 $DESKTOP
+
+Function CreateStartupShortcut
+	CreateShortcut  "$SMSTARTUP\Rainmeter.lnk" "$INSTDIR\Rainmeter.exe" "" "$INSTDIR\Rainmeter.exe" 0
 FunctionEnd
 
 Function FinishRun
@@ -839,7 +819,7 @@ Function un.PageOptions
 	${NSD_Check} $0
 
 	${NSD_CreateCheckbox} 0 15u 70% 12u "$(UNSTALLSETTINGS)"
-	Pop $ctlDelete
+	Pop $R0
 
 	${NSD_CreateLabel} 16 26u 95% 12u "$(UNSTALLSETTINGSDESC)"
 
@@ -847,7 +827,7 @@ Function un.PageOptions
 FunctionEnd
 
 Function un.GetOptions
-	${NSD_GetState} $ctlDelete $ctlDelete
+	${NSD_GetState} $R0 $un.DeleteAll
 FunctionEnd
 
 Section Uninstall
@@ -894,7 +874,7 @@ Section Uninstall
 	RMDir /r "$INSTDIR\Themes"
 	Delete "$INSTDIR\*.*"
 
-	${If} $ctlDelete == "1"
+	${If} $un.DeleteAll == 1
 		RMDir /r "$INSTDIR\Skins"
 		RMDir /r "$INSTDIR\Addons"
 		RMDir /r "$INSTDIR\Plugins"
@@ -907,36 +887,34 @@ Section Uninstall
 	RMDir /r "$APPDATA\Rainstaller"
 
 	SetShellVarContext current
-	Call un.GetEnvPaths
+	Call un.RemoveShortcuts
-	!insertmacro RemoveShortcuts
+	${If} $un.DeleteAll == 1
-	${If} $ctlDelete == "1"
 		RMDir /r "$APPDATA\Rainmeter"
 		RMDir /r "$DOCUMENTS\Rainmeter\Skins"
 		RMDir "$DOCUMENTS\Rainmeter"
 		RMDir /r "$1\Rainmeter"
 	${EndIf}
 	
-	!insertmacro UAC_AsUser_Call Function un.GetEnvPaths ${UAC_SYNCREGISTERS}
+	!insertmacro UAC_AsUser_Call Function un.RemoveShortcuts ${UAC_SYNCREGISTERS}
-	!insertmacro RemoveShortcuts
+	${If} $un.DeleteAll == 1
-	${If} $ctlDelete == "1"
 		RMDir /r "$APPDATA\Rainmeter"
 		RMDir /r "$DOCUMENTS\Rainmeter\Skins"
 		RMDir "$DOCUMENTS\Rainmeter"
 	${EndIf}
 
 	SetShellVarContext all
-	Call un.GetEnvPaths
+	Call un.RemoveShortcuts
-	!insertmacro RemoveShortcuts
+	Delete "$SMPROGRAMS\Rainmeter.lnk"
 
 	DeleteRegKey HKLM "SOFTWARE\Rainmeter"
 	DeleteRegKey HKCR ".rmskin"
 	DeleteRegKey HKCR "Rainmeter skin"
 	DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Rainmeter"
-	System::Call 'Shell32::SHChangeNotify(i 0x8000000, i 0, i 0, i 0)'
+	${RefreshShellIcons}
 SectionEnd
 
-Function un.GetEnvPaths
+Function un.RemoveShortcuts
-	StrCpy $1 $SMPROGRAMS
+	!insertmacro RemoveStartMenuShortcuts "$SMPROGRAMS\Rainmeter"
-	StrCpy $2 $SMSTARTUP
+	Delete "$SMSTARTUP\Rainmeter.lnk"
-	StrCpy $3 $DESKTOP
+	Delete "$DESKTOP\Rainmeter.lnk"
 FunctionEnd

Language/Arabic.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "تثبيت قياسي (مستحسن)"
 ${LangFileString} STANDARDINSTDESC        "تثبيت البرنامج و تنزيل المكتبات المطلوبة."
 ${LangFileString} PORTABLEINST            "تثبيت محمول"
 ${LangFileString} PORTABLEINSTDESC        "لا تختر هذا إلا إذا كنت تعرف ماذا تفعل. لن يتم عمل اختصارات .rmskin و لن يتم تسجيل امتداد الأنماط. و قد تحتاج إلى تنزيل المكتبات التالية تلقائياً  Visual C++ 2010 و .NET 2.0."
-${LangFileString} DESKTOPSHORTCUT         "عمل اختصار على سطح المكتب"
-${LangFileString} ALLUSERSSHORTCUT        "عمل اختصار لكل المستخدمين"
 ${LangFileString} AUTOSTARTUP             "تشغيل البرنامج عند بدء التشغيل"
-${LangFileString} INSTALLDOTNET           "مستحسن .NET 2.0 framework تثبيت"
 ${LangFileString} ADDITIONALOPTIONS       "خيارات إضافية"
-${LangFileString} RAINMETERVERSION        "Rainmeter إصدار"
+${LangFileString} INSTALL64BIT            "64-بت"
-${LangFileString} 32BIT                   "32-بت"
-${LangFileString} 64BIT                   "64-بت"
 ${LangFileString} UNSTALLOPTIONS          "خيارات إلغاء التثبيت"
 ${LangFileString} UNSTALLOPTIONSDESC      "تحديد أي خيارات إضافية"
 ${LangFileString} UNSTALLRAINMETER        "إزالة Rainmeter"

Language/Bulgarian.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Стандартна инсталац
 ${LangFileString} STANDARDINSTDESC        "Инсталирай Rainmeter и свали нужните библиотеки."
 ${LangFileString} PORTABLEINST            "Портативна инсталация"
 ${LangFileString} PORTABLEINSTDESC        "Не използвайте тази опция ако не знаете какво означава. Няма да бъдат създадени връзки в Старт менюто, нито асоциации за .rmskin разширенията. Възможно е библиотеките на Visual C++ 2010 и .NET 2.0 да трябва да се инсталират ръчно."
-${LangFileString} DESKTOPSHORTCUT         "Добави връзка на работния плот"
-${LangFileString} ALLUSERSSHORTCUT        "Добави връзки за всички потребители"
 ${LangFileString} AUTOSTARTUP             "Стартирай Rainmeter с Windows"
-${LangFileString} INSTALLDOTNET           "Инсталирай .NET 2.0 framework (препоръчително)"
 ${LangFileString} ADDITIONALOPTIONS       "Допълнителни опции"
-${LangFileString} RAINMETERVERSION        "Rainmeter версия"
+${LangFileString} INSTALL64BIT            "64-битова"
-${LangFileString} 32BIT                   "32-битова"
-${LangFileString} 64BIT                   "64-битова"
 ${LangFileString} UNSTALLOPTIONS          "Опции за деинсталация"
 ${LangFileString} UNSTALLOPTIONSDESC      "Посочете допълнителни опции"
 ${LangFileString} UNSTALLRAINMETER        "Деинсталирай Rainmeter"

Language/ChineseSimplified.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "标准安装(推荐)"
 ${LangFileString} STANDARDINSTDESC        "安装Rainmeter并下载所需的运行库。"
 ${LangFileString} PORTABLEINST            "便携式安装"
 ${LangFileString} PORTABLEINSTDESC        "如果你不了解该项，请不要选择。便携式安装不会创建快捷方式、也不会与rmskin文件关联。您可能还需要手动下载安装Visual C++ 2010和.NET 2.0运行库。"
-${LangFileString} DESKTOPSHORTCUT         "创建桌面快捷方式"
-${LangFileString} ALLUSERSSHORTCUT        "为所有用户创建快捷方式"
 ${LangFileString} AUTOSTARTUP             "开机运行Rainmeter"
-${LangFileString} INSTALLDOTNET           "安装.NET 2.0 framework (推荐)"
 ${LangFileString} ADDITIONALOPTIONS       "附加选项"
-${LangFileString} RAINMETERVERSION        "选择Rainmeter版本"
+${LangFileString} INSTALL64BIT            "64位"
-${LangFileString} 32BIT                   "32位"
-${LangFileString} 64BIT                   "64位"
 ${LangFileString} UNSTALLOPTIONS          "卸载选项"
 ${LangFileString} UNSTALLOPTIONSDESC      "选择所有附加项"
 ${LangFileString} UNSTALLRAINMETER        "卸载 Rainmeter"

Language/ChineseTraditional.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "標準安裝(建議)"
 ${LangFileString} STANDARDINSTDESC        "安裝 Rainmeter 並下載所需的組件庫。"
 ${LangFileString} PORTABLEINST            "便攜式安裝"
 ${LangFileString} PORTABLEINSTDESC        "如果你不了解該選項，請不要選擇。便攜式安裝不會建立快捷方式、也不會與 rmskin 檔案關聯。你可能還需要手動下載安裝 Visual C++ 2010 和 .NET 2.0 組件庫。"
-${LangFileString} DESKTOPSHORTCUT         "建立桌面快捷方式"
-${LangFileString} ALLUSERSSHORTCUT        "為所有使用者建立快捷方式"
 ${LangFileString} AUTOSTARTUP             "開機時執行 Rainmeter"
-${LangFileString} INSTALLDOTNET           "安裝 .NET 2.0 framework (建議)"
 ${LangFileString} ADDITIONALOPTIONS       "附加選項"
-${LangFileString} RAINMETERVERSION        "選擇 Rainmeter 版本"
+${LangFileString} INSTALL64BIT            "64位元"
-${LangFileString} 32BIT                   "32位元"
-${LangFileString} 64BIT                   "64位元"
 ${LangFileString} UNSTALLOPTIONS          "移除選項"
 ${LangFileString} UNSTALLOPTIONSDESC      "選擇所有附加選項"
 ${LangFileString} UNSTALLRAINMETER        "移除 Rainmeter"

Language/Croatian.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Standardna instalacija (preporučeno)
 ${LangFileString} STANDARDINSTDESC        "Instalira Rainmeter i skida potrebne biblioteke."
 ${LangFileString} PORTABLEINST            "Prijenosna instalacija"
 ${LangFileString} PORTABLEINSTDESC        "Nemojte izabrati ovu opciju osim ako točno znate što radite. Prečice neće biti kreirane i .rmskin ekstenzija neće biti registrirana. Možda će biti potrebno ručno instalirati Visual C++ 2010 i .NET 2.0 biblioteke."
-${LangFileString} DESKTOPSHORTCUT         "Dodaj prečicu na radnu povrsinu"
-${LangFileString} ALLUSERSSHORTCUT        "Dodaj prečice za sve korisnike"
 ${LangFileString} AUTOSTARTUP             "Pokreni Rainmeter na pokretanje računala"
-${LangFileString} INSTALLDOTNET           "Instaliraj .NET 2.0 framework (preporučeno)"
 ${LangFileString} ADDITIONALOPTIONS       "Dodatne opcije"
-${LangFileString} RAINMETERVERSION        "Rainmeter Verzija"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Deinstalacijske mogućnosti"
 ${LangFileString} UNSTALLOPTIONSDESC      "Izaberite dodatne mogućnosti"
 ${LangFileString} UNSTALLRAINMETER        "Deinstaliraj Rainmeter"

Language/Czech.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Standardní instalace (doporučeno)"
 ${LangFileString} STANDARDINSTDESC        "Instalace Rainmeteru a stažení požadovaných knihoven."
 ${LangFileString} PORTABLEINST            "Přenosná instalace"
 ${LangFileString} PORTABLEINSTDESC        "Nevybírejte tuto možnost, pokud nevíte, co děláte. Zástupci nebudou vytvořeny a přípona .rmskin nebude registrována. VC++ 2010 a .NET 2.0 bude možná potřeba nainstalovat ručně."
-${LangFileString} DESKTOPSHORTCUT         "Přidat zástupce na plochu"
-${LangFileString} ALLUSERSSHORTCUT        "Přidat zástupce pro všechny uživatele"
 ${LangFileString} AUTOSTARTUP             "Spustit Rainmeter po startu"
-${LangFileString} INSTALLDOTNET           "Instalovat .NET 2.0 framework (doporučeno)"
 ${LangFileString} ADDITIONALOPTIONS       "Další možnosti"
-${LangFileString} RAINMETERVERSION        "Verze Rainmeteru"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Možnosti odinstalace"
 ${LangFileString} UNSTALLOPTIONSDESC      "Vyberte další možnosti"
 ${LangFileString} UNSTALLRAINMETER        "Odinstalovat Rainmeter"

Language/Danish.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Standard installation (anbefales)"
 ${LangFileString} STANDARDINSTDESC        "Installerer Rainmeter og henter manglende biblioteker."
 ${LangFileString} PORTABLEINST            "Portabel installation"
 ${LangFileString} PORTABLEINSTDESC        "Vælg ikke dette med mindre du ved hvad du laver. Der oprettes ingen genveje og .rmskin-filtypen vil ikke blive associeret. Visual C++ 2010 og .NET 2.0 bibliotekerne skal muligvis installeres manuelt."
-${LangFileString} DESKTOPSHORTCUT         "Tilføj skrivebordsgenvej"
-${LangFileString} ALLUSERSSHORTCUT        "Tilføj genveje til alle brugere"
 ${LangFileString} AUTOSTARTUP             "Start Rainmeter ved opstart"
-${LangFileString} INSTALLDOTNET           "Installer .NET 2.0-framework (anbefales)"
 ${LangFileString} ADDITIONALOPTIONS       "Yderligere indstillinger"
-${LangFileString} RAINMETERVERSION        "Rainmeter Version"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Uninstaller-indstillinger"
 ${LangFileString} UNSTALLOPTIONSDESC      "Vælg yderligere indstillinger"
 ${LangFileString} UNSTALLRAINMETER        "Afinstaller Rainmeter"

Language/Dutch.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Normale installatie (Aangeraden)"
 ${LangFileString} STANDARDINSTDESC        "Installeert Rainmeter en downloadt noodzakelijke bibliotheken."
 ${LangFileString} PORTABLEINST            "Draagbare installatie"
 ${LangFileString} PORTABLEINSTDESC        "Selecteer dit niet tenzij u weet wat u doet. Snelkoppelingen zullen niet gecreëerd worden .rmskin Uitbreiding zal niet ingeschreven worden. De Visual C++ 2010 en .NET 2.0 bibliotheken kan handmatig nodig hebben om geïnstalleerd te worden."
-${LangFileString} DESKTOPSHORTCUT         "Voeg Deskop snelkoppeling Toe"
-${LangFileString} ALLUSERSSHORTCUT        "Voeg snelkoppelingen voor alle gebruikers"
 ${LangFileString} AUTOSTARTUP             "Lanceer Rainmeter bij opstart Windows"
-${LangFileString} INSTALLDOTNET           "Installeer de .NET 2.0 framework (Aangeraden)"
 ${LangFileString} ADDITIONALOPTIONS       "Additional Options"
-${LangFileString} RAINMETERVERSION        "Rainmeter Versie"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Verwijder opties"
 ${LangFileString} UNSTALLOPTIONSDESC      "Selecteer bijkomende optiess"
 ${LangFileString} UNSTALLRAINMETER        "Verwijder Rainmeter"

Language/English.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Standard installation (recommended)"
 ${LangFileString} STANDARDINSTDESC        "Installs Rainmeter and downloads required libraries."
 ${LangFileString} PORTABLEINST            "Portable installation"
 ${LangFileString} PORTABLEINSTDESC        "Do not select this unless you know what you're doing. Shortcuts will not be created and the .rmskin extension will not be registered. The Visual C++ 2010 and .NET 2.0 libraries may need to be manually installed."
-${LangFileString} DESKTOPSHORTCUT         "Add desktop shortcut"
-${LangFileString} ALLUSERSSHORTCUT        "Add shortcuts for all users"
 ${LangFileString} AUTOSTARTUP             "Launch Rainmeter on startup"
-${LangFileString} INSTALLDOTNET           "Install the .NET 2.0 framework (recommended)"
 ${LangFileString} ADDITIONALOPTIONS       "Additional Options"
-${LangFileString} RAINMETERVERSION        "Rainmeter Version"
+${LangFileString} INSTALL64BIT            "Install 64-bit version"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Uninstall options"
 ${LangFileString} UNSTALLOPTIONSDESC      "Select any additional options"
 ${LangFileString} UNSTALLRAINMETER        "Uninstall Rainmeter"

Language/Finnish.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Oletusasennus (suositeltu)"
 ${LangFileString} STANDARDINSTDESC        "Asentaa Rainmeter ohjelman ja lataa tarvittavat kirjastot."
 ${LangFileString} PORTABLEINST            "Siirrettävä asennus"
 ${LangFileString} PORTABLEINSTDESC        "Jätä tämä valitsematta ellet ole varma toimistasi. Pikakuvakkeita ei luoda eikä .rmskin tiedostopäätettä rekisteröidä. Saatat joutua asentamaan Visual C++ 2010 ja .NET 2.0 -kirjastot käsin."
-${LangFileString} DESKTOPSHORTCUT         "Lisää pikakuvake työpöydälle"
-${LangFileString} ALLUSERSSHORTCUT        "Lisää pikakuvakkeet kaikille käyttäjille"
 ${LangFileString} AUTOSTARTUP             "Aloita Rainmeter käynnistyksessä"
-${LangFileString} INSTALLDOTNET           "Asenna .NET 2.0 framework (suositeltu)"
 ${LangFileString} ADDITIONALOPTIONS       "Lisäasetukset"
-${LangFileString} RAINMETERVERSION        "Rainmeter -versio"
+${LangFileString} INSTALL64BIT            "Asenna 64-bittinen versio"
-${LangFileString} 32BIT                   "32-bittinen"
-${LangFileString} 64BIT                   "64-bittinen"
 ${LangFileString} UNSTALLOPTIONS          "Poista asetukset"
 ${LangFileString} UNSTALLOPTIONSDESC      "Valitse lisäasetukset"
 ${LangFileString} UNSTALLRAINMETER        "Poista Rainmeter"

Language/French.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Installation normale (recommandé)"
 ${LangFileString} STANDARDINSTDESC        "Installer Rainmeter et télécharger les librairies requises."
 ${LangFileString} PORTABLEINST            "Installation portable"
 ${LangFileString} PORTABLEINSTDESC        "Ne sélectionnez pas ceci à moins que vous sachiez ce que vous faites. Le raccourci ne sera pas créé et les fichiers .rmskin ne seront pas enregistrés . Visual C++ 2010 et .NET 2.0 devront être installés manuellement."
-${LangFileString} DESKTOPSHORTCUT         "Raccourci sur le bureau"
-${LangFileString} ALLUSERSSHORTCUT        "Raccourci pour tous les utilisateurs"
 ${LangFileString} AUTOSTARTUP             "Démarrer automatiquement avec Windows"
-${LangFileString} INSTALLDOTNET           "Installer le .NET Framework 2.0 (recommandé)"
 ${LangFileString} ADDITIONALOPTIONS       "Options additionnelles"
-${LangFileString} RAINMETERVERSION        "Version de Rainmeter"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Options de désinstallation"
 ${LangFileString} UNSTALLOPTIONSDESC      "Sélectionner une option additionnelle"
 ${LangFileString} UNSTALLRAINMETER        "Désinstaller Rainmeter"

Language/German.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Standardinstallation (empfohlen)"
 ${LangFileString} STANDARDINSTDESC        "Installiert Rainmeter und lädt benötigte Bibliotheken nach."
 ${LangFileString} PORTABLEINST            "Portable Installation"
 ${LangFileString} PORTABLEINSTDESC        "Nicht auswählen, es sei denn, Sie wissen was Sie tun. Verknüpfungen werden nicht angelegt und die .rmskin Erweiterung wird nicht registriert. Die Visual C++ 2010 und .NET 2.0 Bibliotheken müssen ggf. manuell installiert werden."
-${LangFileString} DESKTOPSHORTCUT         "Verknüpfung auf dem Desktop anlegen"
-${LangFileString} ALLUSERSSHORTCUT        "Verknüpfungen für alle Benutzer anlegen"
 ${LangFileString} AUTOSTARTUP             "Rainmeter mit Windows starten"
-${LangFileString} INSTALLDOTNET           "NET 2.0 Framework installieren (empfohlen)"
 ${LangFileString} ADDITIONALOPTIONS       "Zusätzliche Optionen"
-${LangFileString} RAINMETERVERSION        "Rainmeter Version"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Deinstallationsoptionen"
 ${LangFileString} UNSTALLOPTIONSDESC      "Zusätzliche Optionen auswählen"
 ${LangFileString} UNSTALLRAINMETER        "Rainmeter deinstallieren"

Language/Greek.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Κανονική εγκατάστασ
 ${LangFileString} STANDARDINSTDESC        "Εγκατάσταση του Rainmeter και αυτόματο κατέβασμα των απαιτούμενων βιβλιοθηκών."
 ${LangFileString} PORTABLEINST            "Εγκατάσταση Portable έκδοσης."
 ${LangFileString} PORTABLEINSTDESC        "Μην το επιλέγετε αν δεν ξέρετε τί κάνει. Δεν θα δημιουργηθούν συντομεύσεις και η προέκταση .rmskin δεν θα εγγραφεί στο μητρώο. Οι βιβλιοθήκες Visual C++ 2010 και .NET 2.0 ίσως να χρειαστεί να εγκατασταθούν χειροκίνητα."
-${LangFileString} DESKTOPSHORTCUT         "Προσθήκη συντόμευσης στην επιφάνεια εργασίας."
-${LangFileString} ALLUSERSSHORTCUT        "Προσθήκη συντόμευσης για όλους τους χρήστες."
 ${LangFileString} AUTOSTARTUP             "Εκκίνηση του Rainmeter κατά την εκκίνηση του υπολογιστή."
-${LangFileString} INSTALLDOTNET           "Εγκαταστήστε το .NET 2.0 framework (συνιστάται)"
 ${LangFileString} ADDITIONALOPTIONS       "Επιπλέον επιλογές."
-${LangFileString} RAINMETERVERSION        "Έκδοση του Rainmeter"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Επιλογές απεγκατάστασης."
 ${LangFileString} UNSTALLOPTIONSDESC      "Επιλέξτε επιπλέον επιλογές."
 ${LangFileString} UNSTALLRAINMETER        "Απεγκατάσταση του Rainmeter"

Language/Hungarian.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Szabványos telepítés (ajánlott)"
 ${LangFileString} STANDARDINSTDESC        "Telepíti a Rainmetert és letölti a szükséges csomagokat."
 ${LangFileString} PORTABLEINST            "Hordozható telepítés"
 ${LangFileString} PORTABLEINSTDESC        "Ne válaszd ki, csak ha tudod mit csinálsz. Nem lesznek létrehozva parancsikonok és az .rmskin kiterjesztés nem lesz társítva. A Visual C++ 2010 és a .NET 2.0 csomagok manuális telepítésére is szükség lehet."
-${LangFileString} DESKTOPSHORTCUT         "Parancsikon létrehozása az asztalon"
-${LangFileString} ALLUSERSSHORTCUT        "Parancsikon létrehozása minden felhasználó részére"
 ${LangFileString} AUTOSTARTUP             "Rainmeter indítása a Windowssal"
-${LangFileString} INSTALLDOTNET           "A .NET 2.0 keretrendszer telepítése (ajánlott)"
 ${LangFileString} ADDITIONALOPTIONS       "További beállítások"
-${LangFileString} RAINMETERVERSION        "Verziószám"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Eltávolítási beállítások"
 ${LangFileString} UNSTALLOPTIONSDESC      "További beállítások kiválasztása"
 ${LangFileString} UNSTALLRAINMETER        "Rainmeter eltávolítása"

Language/Indonesian.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Instalasi tandar (dianjurkan)"
 ${LangFileString} STANDARDINSTDESC        "Instal Rainmeter dan unduh pustaka yang dibutuhkan."
 ${LangFileString} PORTABLEINST            "Instalasi portabel"
 ${LangFileString} PORTABLEINSTDESC        "Jangan pilih ini kecuali Anda tahu yang sedang Anda lakukan. Shortcuts takan dibuat dan .rmskin extension takan di-registered. Pustaka Visual C++ 2010 dan .NET 2.0 mungkin harus di instal secara manual."
-${LangFileString} DESKTOPSHORTCUT         "Tambahkan desktop shortcut"
-${LangFileString} ALLUSERSSHORTCUT        "Tambahkan shortcut-shortcut untuk semua user"
 ${LangFileString} AUTOSTARTUP             "Jalankan Rainmeter saat startup"
-${LangFileString} INSTALLDOTNET           "Instal .NET 2.0 framework (dianjurkan)"
 ${LangFileString} ADDITIONALOPTIONS       "Opsi-opsi tambahan"
-${LangFileString} RAINMETERVERSION        " Versi Rainmeter"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Opsi-opsi penidakpasangan"
 ${LangFileString} UNSTALLOPTIONSDESC      "Pilih opsi-opsi tambahan lainnya"
 ${LangFileString} UNSTALLRAINMETER        "Penidakpasang Rainmeter"

Language/Italian.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Installazione standard (raccomandato)
 ${LangFileString} STANDARDINSTDESC        "Installa Rainmeter e scarica le librerie richieste."
 ${LangFileString} PORTABLEINST            "Installazione portable"
 ${LangFileString} PORTABLEINSTDESC        "Non selezionare a meno che non sai quel che stai facendo. I collegamenti non saranno creati e l'estensione .rmskin non sarà registrata. Le librerie Visual C++ 2010 e .NET 2.0 potrebbero dover essere installate manualmente."
-${LangFileString} DESKTOPSHORTCUT         "Aggiungi collegamento al desktop"
-${LangFileString} ALLUSERSSHORTCUT        "Aggiungi collegamento a tutti gli utenti"
 ${LangFileString} AUTOSTARTUP             "Lancia Rainmeter all'avvio"
-${LangFileString} INSTALLDOTNET           "Installare .NET 2.0 framework (raccomandato)"
 ${LangFileString} ADDITIONALOPTIONS       "Opzioni aggiuntive"
-${LangFileString} RAINMETERVERSION        "Versione Rainmeter"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Opzioni di disinstallazione"
 ${LangFileString} UNSTALLOPTIONSDESC      "Selezionare opzioni aggiuntive"
 ${LangFileString} UNSTALLRAINMETER        "Disinstalla Rainmeter"

Language/Japanese.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "通常インストール (推奨)"
 ${LangFileString} STANDARDINSTDESC        "Rainmeterのインストールと必要なライブラリのダウンロードが行われます。"
 ${LangFileString} PORTABLEINST            "ポータブル版のインストール"
 ${LangFileString} PORTABLEINSTDESC        "この項目を理解している場合のみこちらを選択してください。ショートカットの作成やrmskinファイルの関連付けは一切行われません。Visual C++ 2010及び、.NET 2.0ライブラリを手動でインストールする必要があるかもしれません。"
-${LangFileString} DESKTOPSHORTCUT         "デスクトップにショートカットを追加"
-${LangFileString} ALLUSERSSHORTCUT        "すべてのユーザーにショートカットを追加"
 ${LangFileString} AUTOSTARTUP             "Windowsの起動時にRainmeterを起動する"
-${LangFileString} INSTALLDOTNET           ".NET 2.0 frameworkをインストールする (推奨)"
 ${LangFileString} ADDITIONALOPTIONS       "追加の設定"
-${LangFileString} RAINMETERVERSION        "Rainmeterのバージョン"
+${LangFileString} INSTALL64BIT            "64ビット"
-${LangFileString} 32BIT                   "32ビット"
-${LangFileString} 64BIT                   "64ビット"
 ${LangFileString} UNSTALLOPTIONS          "アンインストールの設定"
 ${LangFileString} UNSTALLOPTIONSDESC      "追加の設定を選択"
 ${LangFileString} UNSTALLRAINMETER        "Rainmeterをアンインストール"

Language/Korean.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "일반 설치 (권장)"
 ${LangFileString} STANDARDINSTDESC        "레인미터를 설치하고 필요한 라이브러리들을 다운로드 합니다."
 ${LangFileString} PORTABLEINST            "포터블 설치"
 ${LangFileString} PORTABLEINSTDESC        "이 항목을 알지 못한다면 선택하지 마십시오. 바로 가기가 설치되지 않고 .rmskin 파일 연결이 되지 않습니다. Visual C++ 2010과 .NET 2.0 라이브러리를 수동으로 설치해야 할 수도 있습니다."
-${LangFileString} DESKTOPSHORTCUT         "바탕 화면에 바로 가기 설치"
-${LangFileString} ALLUSERSSHORTCUT        "모든 사용자에 바로 가기 설치"
 ${LangFileString} AUTOSTARTUP             "Windows를 시작 시 레인미터 실행"
-${LangFileString} INSTALLDOTNET           ".NET 2.0 framework 설치 (권장)"
 ${LangFileString} ADDITIONALOPTIONS       "추가 옵션"
-${LangFileString} RAINMETERVERSION        "레인미터 버전"
+${LangFileString} INSTALL64BIT            "64 비트"
-${LangFileString} 32BIT                   "32 비트"
-${LangFileString} 64BIT                   "64 비트"
 ${LangFileString} UNSTALLOPTIONS          "제거 옵션"
 ${LangFileString} UNSTALLOPTIONSDESC      "다른 추가 옵션을 선택하세요"
 ${LangFileString} UNSTALLRAINMETER        "레인미터 제거"

Language/Latvian.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Standarta instalācija (rekomendējam
 ${LangFileString} STANDARDINSTDESC        "Instalē programu Rainmeter un lejuplādē nepieciešamos failus."
 ${LangFileString} PORTABLEINST            "Mobīlā instalēcija"
 ${LangFileString} PORTABLEINSTDESC        "Neizvēlieties šo, ja jūs nezinat ko jūs darat. Īsceļi netiks izveidoti un .rmskin extension netiks reģistrēts. Visual C++ 2010 un .NET 2.0 faili nepieciešams instalēt manuāli."
-${LangFileString} DESKTOPSHORTCUT         "Izveidot darba virsmas īsceļu"
-${LangFileString} ALLUSERSSHORTCUT        "Izveidot Isceļus visiem lietotājiem"
 ${LangFileString} AUTOSTARTUP             "Palaist Rainmeter līdz ar sistēmas ieslēgšanu"
-${LangFileString} INSTALLDOTNET           "Instalēt .NET 2.0 framework (rekomendējam)"
 ${LangFileString} ADDITIONALOPTIONS       "Papildu opcijas"
-${LangFileString} RAINMETERVERSION        "Rainmeter programas versija"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Atinstalēšanas opcijas"
 ${LangFileString} UNSTALLOPTIONSDESC      "Izvēlieties jebkuras papildu opcijas"
 ${LangFileString} UNSTALLRAINMETER        "Atinstalēt Rainmeter programu"

Language/Lithuanian.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Standartinis įdiegimas (rekomenduoja
 ${LangFileString} STANDARDINSTDESC        "Įdiegia 'Rainmeter' ir atsisiunčia reikalingas bibliotekas."
 ${LangFileString} PORTABLEINST            "Įdiegti kilnojamą"
 ${LangFileString} PORTABLEINSTDESC        "Nežymėkite, nebent žinote ką darote. Nebus sukurtos nuorodos ir .rmskin failo išplėtimas nebus registruotas. 'Visual C++ 2010' ir '.NET 2.0' bibliotekas gali tekti įdiegti rankiniu būdu."
-${LangFileString} DESKTOPSHORTCUT         "Pridėti darbastalio nuorodą"
-${LangFileString} ALLUSERSSHORTCUT        "Pridėti nuorodas visiems vartotojams"
 ${LangFileString} AUTOSTARTUP             "Įkelti 'Rainmeter' paleidus operacinę sistemą"
-${LangFileString} INSTALLDOTNET           "Įdiegti '.NET 2.0 framework' (rekomenduojama)"
 ${LangFileString} ADDITIONALOPTIONS       "Papildomi parametrai"
-${LangFileString} RAINMETERVERSION        "'Rainmeter' versija"
+${LangFileString} INSTALL64BIT            "64-bitų"
-${LangFileString} 32BIT                   "32-bitų"
-${LangFileString} 64BIT                   "64-bitų"
 ${LangFileString} UNSTALLOPTIONS          "Pašalinimo parametrai"
 ${LangFileString} UNSTALLOPTIONSDESC      "Pasirinkite bet kokius papildomus parametrus"
 ${LangFileString} UNSTALLRAINMETER        "Pašalinti 'Rainmeter'"

Language/NorwegianBokmal.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Standard installasjon (anbefalt)"
 ${LangFileString} STANDARDINSTDESC        "Installerer Rainmeter og laster ned påkrevde biblioteker."
 ${LangFileString} PORTABLEINST            "Portabel installasjon"
 ${LangFileString} PORTABLEINSTDESC        "Ikke velg denne dersom du ikke er helt sikker på hva du gjør. Snarveier blir ikke opprettet og filtypen .rmskin blir ikke registrert. Visual C++ 2010 og .NET 2.0 bibliotek må installeres manuelt."
-${LangFileString} DESKTOPSHORTCUT         "Legg til snarvei på skrivebordet"
-${LangFileString} ALLUSERSSHORTCUT        "Legg til snarvei for alle brukere"
 ${LangFileString} AUTOSTARTUP             "Kjør Rainmeter ved oppstart"
-${LangFileString} INSTALLDOTNET           "Installer .NET 2.0 rammeverk (anbefalt)"
 ${LangFileString} ADDITIONALOPTIONS       "Flere innstillinger"
-${LangFileString} RAINMETERVERSION        "Rainmeter versjon"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Innstillinger for avinstallering"
 ${LangFileString} UNSTALLOPTIONSDESC      "Velg flere innstillinger"
 ${LangFileString} UNSTALLRAINMETER        "Avinstaller Rainmeter"

Language/Polish.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Standardowa instalacja (zalecane)"
 ${LangFileString} STANDARDINSTDESC        "Instaluje Rainmeter i pobiera wymagane biblioteki."
 ${LangFileString} PORTABLEINST            "Instalacja przenośna"
 ${LangFileString} PORTABLEINSTDESC        "Nie zaznaczaj tego jeżeli nie wiesz co robisz. Skróty nie zostaną utworzone a rozszerzenie .rmskin nie będzie zarejestrowane. Może być konieczne ręczne zainstalowanie bibliotek Visual C++ 2010 oraz .NET 2.0."
-${LangFileString} DESKTOPSHORTCUT         "Dodaj srót na Pulpicie"
-${LangFileString} ALLUSERSSHORTCUT        "Dodaj skrót dla wszystkich użytkowników"
 ${LangFileString} AUTOSTARTUP             "Automatycznie uruchamiaj Rainmeter wraz z Windows"
-${LangFileString} INSTALLDOTNET           "Zainstaluj .NET 2.0 framework (zalecane)"
 ${LangFileString} ADDITIONALOPTIONS       "Dodatkowe opcje"
-${LangFileString} RAINMETERVERSION        "Wersja Rainmeter"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Opcje odinstalowania"
 ${LangFileString} UNSTALLOPTIONSDESC      "Wybierz dodatkowe opcje"
 ${LangFileString} UNSTALLRAINMETER        "Odinstaluj Rainmeter"

Language/PortugueseBrazil.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Instalação padrão (recomendável)"
 ${LangFileString} STANDARDINSTDESC        "Instala o Rainmeter e baixa bibliotecas necessárias."
 ${LangFileString} PORTABLEINST            "Instalação Portable"
 ${LangFileString} PORTABLEINSTDESC        "Não selecione se não souber o que está fazendo. Atalhos não serão criados e a extensão .rmskin não será registrada. As bibliotecas Visual C++ 2010 e .NET 2.0 provavelmente terão de ser instaladas manualmente."
-${LangFileString} DESKTOPSHORTCUT         "Adicionar atalho na área de trabalho"
-${LangFileString} ALLUSERSSHORTCUT        "Adicionar atalhos para todos os usuários"
 ${LangFileString} AUTOSTARTUP             "Iniciar com o Windows"
-${LangFileString} INSTALLDOTNET           "Instalar .NET Framework  2.0 (recomendável)"
 ${LangFileString} ADDITIONALOPTIONS       "Opções Adicionais"
-${LangFileString} RAINMETERVERSION        "Versão do Rainmeter"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Opções de desinstalação"
 ${LangFileString} UNSTALLOPTIONSDESC      "Selecione opções adcionais"
 ${LangFileString} UNSTALLRAINMETER       "Desistalar o Rainmeter"

Language/PortuguesePortugal.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Instalação normal (recomendado)"
 ${LangFileString} STANDARDINSTDESC        "Instala o Rainmeter e faz download das bases de dados necessárias."
 ${LangFileString} PORTABLEINST            "Instalação portátil"
 ${LangFileString} PORTABLEINSTDESC        "Não seleciones isto a não ser que saibas o que estás a fazer. Os talhos não serão criados e a extensão .rmskin não vai será registada. As bases de dados Visual C++ 2010 e .NET 2.0 terão de ser manualmente instaladas."
-${LangFileString} DESKTOPSHORTCUT         "Adicionar atalho ao ambiente de trabalho"
-${LangFileString} ALLUSERSSHORTCUT        "Adicionar atalhos para todos os utilizadores"
 ${LangFileString} AUTOSTARTUP             "Ligar o Rainmeter ao ligar o computador"
-${LangFileString} INSTALLDOTNET           "Instalar o .NET 2.0 Framework (recomendado)"
 ${LangFileString} ADDITIONALOPTIONS       "Opções adicionais"
-${LangFileString} RAINMETERVERSION        "Versão do Rainmeteter"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Opções de desinstalação"
 ${LangFileString} UNSTALLOPTIONSDESC      "Selecionar opções adicionais"
 ${LangFileString} UNSTALLRAINMETER        "Desinstalar Rainmeter"

Language/Romanian.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Instalare standard (recomandat)"
 ${LangFileString} STANDARDINSTDESC        "Instalarea Rainmeter şi descărcarea pachetelor necesare."
 ${LangFileString} PORTABLEINST            "Instalare portabilă"
 ${LangFileString} PORTABLEINSTDESC        "Nu selectaţi această opţiune până nu sunteţi sigur de ceea ce faceţi. Comenzile rapide nu vor fi create şi extensia .rmskin nu va fi înregistrată. Poate fi necesară instalarea manuală a Visual C++ 2010 şi .NET 2.0."
-${LangFileString} DESKTOPSHORTCUT         "Creare comandă rapidă pe desktop"
-${LangFileString} ALLUSERSSHORTCUT        "Creare comenzi pentru toţi utilizatorii"
 ${LangFileString} AUTOSTARTUP             "Lansare Rainmeter după pornire"
-${LangFileString} INSTALLDOTNET           "Instalare .NET 2.0 framework (recomandat)"
 ${LangFileString} ADDITIONALOPTIONS       "Opţiuni adiţionale"
-${LangFileString} RAINMETERVERSION        "Versiune Rainmeter"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Opţiuni dezinstalare"
 ${LangFileString} UNSTALLOPTIONSDESC      "Selectaţi opţiunile adiţionale"
 ${LangFileString} UNSTALLRAINMETER        "Dezinstalare Rainmeter"

Language/Russian.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Стандартная установ
 ${LangFileString} STANDARDINSTDESC        "Установить Rainmeter и загрузить необходимые библиотеки."
 ${LangFileString} PORTABLEINST            "Портативная установка"
 ${LangFileString} PORTABLEINSTDESC        "Не выбирайте это, если вы не знаете, что вы делаете. Ярлыки не создадуться и .rmskin расширение будет не зарегистрировано. Может потребоваться вручную установить sVisual C++ 2010 и .NET 2.0 библиотеки."
-${LangFileString} DESKTOPSHORTCUT         "Добавить ярлык на рабочий стол"
-${LangFileString} ALLUSERSSHORTCUT        "Добавить ярлыки для всех пользователей"
 ${LangFileString} AUTOSTARTUP             "Запускать Rainmeter при старте системы"
-${LangFileString} INSTALLDOTNET           "Установить .NET 2.0 framework (рекомендуеться)"
 ${LangFileString} ADDITIONALOPTIONS       "Дополнительные настройки"
-${LangFileString} RAINMETERVERSION        "Версия Rainmeter"
+${LangFileString} INSTALL64BIT            "64-бит"
-${LangFileString} 32BIT                   "32-бит"
-${LangFileString} 64BIT                   "64-бит"
 ${LangFileString} UNSTALLOPTIONS          "Настройки Удаления"
 ${LangFileString} UNSTALLOPTIONSDESC      "Выберите любые дополнительные опции"
 ${LangFileString} UNSTALLRAINMETER        "Удалить Rainmeter"

Language/SerbianCyrillic.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Стандардна инсталац
 ${LangFileString} STANDARDINSTDESC        "Rainmeter ће се инсталирати и преузеће се потребне библиотеке."
 ${LangFileString} PORTABLEINST            "Преносива инсталација"
 ${LangFileString} PORTABLEINSTDESC        "Одаберите ову опцију само ако знате шта радите. Пречице неће бити направљене и тип датотеке .rmskin неће бити регистрован. Можда ће бити потребно да ручно инсталирате библиотеке Visual C++ 2010 и .NET 2.0."
-${LangFileString} DESKTOPSHORTCUT         "Додај пречицу на радну површину"
-${LangFileString} ALLUSERSSHORTCUT        "Додај пречице за све кориснике"
 ${LangFileString} AUTOSTARTUP             "Покрени Rainmeter заједно са системом"
-${LangFileString} INSTALLDOTNET           "Инсталирај .NET 2.0 framework (препоручује се)"
 ${LangFileString} ADDITIONALOPTIONS       "Додатне опције"
-${LangFileString} RAINMETERVERSION        "Верзија Rainmeter-а"
+${LangFileString} INSTALL64BIT            "64-битна"
-${LangFileString} 32BIT                   "32-битна"
-${LangFileString} 64BIT                   "64-битна"
 ${LangFileString} UNSTALLOPTIONS          "Опције деинсталације"
 ${LangFileString} UNSTALLOPTIONSDESC      "Одаберите додатне опције"
 ${LangFileString} UNSTALLRAINMETER        "Деинсталирај Rainmeter"

Language/SerbianLatin.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Standardna instalacija (preporučuje
 ${LangFileString} STANDARDINSTDESC        "Rainmeter će se instalirati i preuzeće se potrebne biblioteke."
 ${LangFileString} PORTABLEINST            "Prenosiva instalacija"
 ${LangFileString} PORTABLEINSTDESC        "Odaberite ovu opciju samo ako znate šta radite. Prečice neće biti napravljene i tip datoteke .rmskin neće biti registrovan. Možda će biti potrebno da ručno instalirate biblioteke Visual C++ 2010 i .NET 2.0."
-${LangFileString} DESKTOPSHORTCUT         "Dodaj prečicu na radnu površinu"
-${LangFileString} ALLUSERSSHORTCUT        "Dodaj prečice za sve korisnike"
 ${LangFileString} AUTOSTARTUP             "Pokreni Rainmeter zajedno sa sistemom"
-${LangFileString} INSTALLDOTNET           "Instaliraj .NET 2.0 framework (preporučuje se)"
 ${LangFileString} ADDITIONALOPTIONS       "Dodatne opcije"
-${LangFileString} RAINMETERVERSION        "Verzija Rainmeter-a"
+${LangFileString} INSTALL64BIT            "64-bitna"
-${LangFileString} 32BIT                   "32-bitna"
-${LangFileString} 64BIT                   "64-bitna"
 ${LangFileString} UNSTALLOPTIONS          "Opcije deinstalacije"
 ${LangFileString} UNSTALLOPTIONSDESC      "Odaberite dodatne opcije"
 ${LangFileString} UNSTALLRAINMETER        "Deinstaliraj Rainmeter"

Language/Slovak.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Štandardná inštalácia (doporučen
 ${LangFileString} STANDARDINSTDESC        "Nainštaluje Rainmeter do Vášho počítača a stiahne požadované knižnice."
 ${LangFileString} PORTABLEINST            "Portable inštalácia"
 ${LangFileString} PORTABLEINSTDESC        "Nevyberajte túto možnosť pokiaľ neviete, čo robíte. Nebudú vytvorené odkazy a rozšírenie .rmskin nebude zaregistrované. Knižnice Visual C++ 2010 a .NET 2.0 bude možno potrebné nainštalovať manuálne."
-${LangFileString} DESKTOPSHORTCUT         "Pridať odkaz na plochu"
-${LangFileString} ALLUSERSSHORTCUT        "Pridať odkazy pre všetkých používateľov"
 ${LangFileString} AUTOSTARTUP             "Spustiť Rainmeter pri štarte Windowsu"
-${LangFileString} INSTALLDOTNET           "Nainštalovať .NET 2.0 framework (doporučené)"
 ${LangFileString} ADDITIONALOPTIONS       "Ďalšie možnosti"
-${LangFileString} RAINMETERVERSION        "Rainmeter verzia"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Možnosti odinštalácie"
 ${LangFileString} UNSTALLOPTIONSDESC      "Zvoľte ďalšie možnosti"
 ${LangFileString} UNSTALLRAINMETER        "Odinštalovať Rainmeter"

Language/Slovenian.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Standardna namestitev (priporočena)"
 ${LangFileString} STANDARDINSTDESC        "Namesti Rainmeter in posname potrebne knjižnice."
 ${LangFileString} PORTABLEINST            "Prenosna namestitev"
 ${LangFileString} PORTABLEINSTDESC        "Ne izberite te opcije, razen če veste, kaj počnete. Namestitev ne bo ustvarila bližnjic in registrirala končnice .rmskin. Knjižnice  Visual C++ 2010 in .NET 2.0 libraries bo verjetno potrebno namestiti ročno."
-${LangFileString} DESKTOPSHORTCUT         "Dodaj bližnjico nanamizje"
-${LangFileString} ALLUSERSSHORTCUT        "Dodaj bližnjice za vse uporabnike"
 ${LangFileString} AUTOSTARTUP             "Poženi Rainmeter ob zagonu"
-${LangFileString} INSTALLDOTNET           "Namesti .NET 2.0 framework (priporočeno)"
 ${LangFileString} ADDITIONALOPTIONS       "Dodatne možnosti"
-${LangFileString} RAINMETERVERSION        "Različica programa Rainmeter"
+${LangFileString} INSTALL64BIT            "64-bitna"
-${LangFileString} 32BIT                   "32-bitna"
-${LangFileString} 64BIT                   "64-bitna"
 ${LangFileString} UNSTALLOPTIONS          "Možnosti odstranitve"
 ${LangFileString} UNSTALLOPTIONSDESC      "Izberi dodatne možnosti"
 ${LangFileString} UNSTALLRAINMETER        "Odstrani Rainmeter"

Language/SpanishModern.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Instalación estandar (recomendado)"
 ${LangFileString} STANDARDINSTDESC        "Instala Rainmeter y descarga las librerias necesarias."
 ${LangFileString} PORTABLEINST            "Instalación Portable"
 ${LangFileString} PORTABLEINSTDESC        "No seleccione esto a menos que sepa lo que está haciendo. Los accesos directos no se crearán y la extensión .rmskin no será registrada. Las librerias Visual C++ 2010 y .NET 2.0 puede que necesiten ser instaladas manualmente."
-${LangFileString} DESKTOPSHORTCUT         "Añade acceso directo al Escritorio"
-${LangFileString} ALLUSERSSHORTCUT        "Añade accesos directos para todos los usuarios"
 ${LangFileString} AUTOSTARTUP             "Ejecuta Rainmeter al iniciar windows"
-${LangFileString} INSTALLDOTNET           "Instala .NET 2.0 framework (recomendado)"
 ${LangFileString} ADDITIONALOPTIONS       "Opciones Adicionales"
-${LangFileString} RAINMETERVERSION        "Versión de Rainmeter"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Desinstalar opciones"
 ${LangFileString} UNSTALLOPTIONSDESC      "Selecciona cualquier otra opción adicional"
 ${LangFileString} UNSTALLRAINMETER        "Desinstalar Rainmeter"

Language/Swedish.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Standard installation (rekommenderas)
 ${LangFileString} STANDARDINSTDESC        "Installerar Rainmeter och hämtar nödvändiga bibliotek."
 ${LangFileString} PORTABLEINST            "Portabel installation"
 ${LangFileString} PORTABLEINSTDESC        "Välj inte detta om du inte vet vad du gör. Genvägar kommer inte att skapas samt .rmskin kommer inte att registeras. Visual C++ 2010 och .NET 2.0 biblioteken kan behövas att installeras självständigt."
-${LangFileString} DESKTOPSHORTCUT         "Lägg till genväg på skrivbordet"
-${LangFileString} ALLUSERSSHORTCUT        "Lägg till genvägar till alla användare"
 ${LangFileString} AUTOSTARTUP             "Starta Rainmeter vid systemstart"
-${LangFileString} INSTALLDOTNET           "Installera .NET 2.0 framework (rekommenderas)"
 ${LangFileString} ADDITIONALOPTIONS       "Fler alternativ"
-${LangFileString} RAINMETERVERSION        "Rainmeter Version"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Avinstallations alternativ"
 ${LangFileString} UNSTALLOPTIONSDESC      "Välj andra alternativ"
 ${LangFileString} UNSTALLRAINMETER        "Avinstallera Rainmeter"

Language/Turkish.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Standart Kurulum (Önerilen)"
 ${LangFileString} STANDARDINSTDESC        "Rainmeter'i kurar ve gerekli kütüphaneleri indirir."
 ${LangFileString} PORTABLEINST            "Taşınabilir Kurulum"
 ${LangFileString} PORTABLEINSTDESC        "Eğer ne yaptığınızı tam olarak bilmiyorsanız bunu seçmeyin. Kısayollar yaratılmayacak ve .rmskin uzantısı kayıt anahtarına eklenmeyecek. Visual C++ 2010 ve .NET 2.0 kütüphanelerinin elle yüklenmesi gerekebilir."
-${LangFileString} DESKTOPSHORTCUT         "Masaüstü kısayolu ekle"
-${LangFileString} ALLUSERSSHORTCUT        "Kısayolları tüm kullanıcılar için ekle"
 ${LangFileString} AUTOSTARTUP             "Rainmeter'ı başlangıçta çalıştır"
-${LangFileString} INSTALLDOTNET           ".NET 2.0 yükle (Önerilen)"
 ${LangFileString} ADDITIONALOPTIONS       "Ek Seçenekler"
-${LangFileString} RAINMETERVERSION        "Rainmeter Sürümü"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Kaldırma seçenekleri"
 ${LangFileString} UNSTALLOPTIONSDESC      "Herhangi bir ek seçeneği seçin"
 ${LangFileString} UNSTALLRAINMETER        "Rainmeter'ı kaldır"

Language/Ukrainian.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Стандартна установк
 ${LangFileString} STANDARDINSTDESC        "Встановити Rainmeter і завантажити необхідні бібліотеки."
 ${LangFileString} PORTABLEINST            "Портативна установка"
 ${LangFileString} PORTABLEINSTDESC        "Не вибирайте це, якщо ви не знаєте, що ви робите. Ярлики не будуть створені і. rmskin розширення буде не зареєстровано. Може знадобитися вручну встановити Visual C++ 2010 і .NET 2.0 бібліотеки."
-${LangFileString} DESKTOPSHORTCUT         "Додати ярлик на робочий стіл"
-${LangFileString} ALLUSERSSHORTCUT        "Додати ярлики для всіх користувачів"
 ${LangFileString} AUTOSTARTUP             "Запускати Rainmeter при старті системи"
-${LangFileString} INSTALLDOTNET           "Встановити .NET 2.0 framework (рекомендується)"
 ${LangFileString} ADDITIONALOPTIONS       "Додаткові налаштування"
-${LangFileString} RAINMETERVERSION        "Версія Rainmeter"
+${LangFileString} INSTALL64BIT            "64-біт"
-${LangFileString} 32BIT                   "32-біт"
-${LangFileString} 64BIT                   "64-біт"
 ${LangFileString} UNSTALLOPTIONS          "Настройки Видалення"
 ${LangFileString} UNSTALLOPTIONSDESC      "Виберіть будь-які додаткові опції"
 ${LangFileString} UNSTALLRAINMETER        "Видалити Rainmeter"

Language/Vietnamese.nsh

@@ -17,14 +17,9 @@ ${LangFileString} STANDARDINST            "Cài đặt thông thường (khuyế
 ${LangFileString} STANDARDINSTDESC        "Cài đặt Rainmeter và tải về dữ liệu được yêu cầu."
 ${LangFileString} PORTABLEINST            "Bản cài đặt Portable"
 ${LangFileString} PORTABLEINSTDESC        "Không chọn nếu như bạn không biết mình đang làm gì. Sẽ không có shortcut nào được tạo và phần đuôi .rmskin sẽ không được nhận diện. Thư viện Visual C++ 2010 và .NET 2.0 sẽ phải tự cài bằng tay."
-${LangFileString} DESKTOPSHORTCUT         "Tạo lối tắt ở màn hình nền"
-${LangFileString} ALLUSERSSHORTCUT        "Thêm lối tắt cho tất cả người dùng"
 ${LangFileString} AUTOSTARTUP             "Chạy Rainmeter cùng window"
-${LangFileString} INSTALLDOTNET           "Cài đặt .NET 2.0 framework (khuyến nghị)"
 ${LangFileString} ADDITIONALOPTIONS       "Lựa chọn bổ sung"
-${LangFileString} RAINMETERVERSION        "Phiên bản Rainmeter"
+${LangFileString} INSTALL64BIT            "64-bit"
-${LangFileString} 32BIT                   "32-bit"
-${LangFileString} 64BIT                   "64-bit"
 ${LangFileString} UNSTALLOPTIONS          "Tùy chọn gỡ cài đặt"
 ${LangFileString} UNSTALLOPTIONSDESC      "Chọn và thêm các lựa chọn bổ sung"
 ${LangFileString} UNSTALLRAINMETER        "Gỡ cài đặt Rainmeter"