Account: Fix cert save/restore from settings. #2160

Without this fix, the section in the config file uses the wrong name,
leading to re-configuration of the client needed.

.gitattributes

@@ -2,4 +2,3 @@
 .gitignore              export-ignore
 .gitattributes          export-ignore
 .commit-template        export-ignore
-binary/                 export-ignore

.gitignore

@@ -2,11 +2,13 @@
 *build*/
 *flymake*
 CMakeLists.txt.user*
+*.patch
 *~
 *.autosave
 doc/_build/*
 *.kate-swp
 *.kdev4
+win/
 admin/win/nsi/l10n/pofiles/*.po
 *.swp
 *~$
@@ -14,153 +16,3 @@ build*
 cscope.*
 tags
 t1.cfg
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-build/
-bld/
-[Bb]in/
-[Oo]bj/
-
-# Roslyn cache directories
-*.ide/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-#NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Mac OS X specific
-shell_integration/MacOSX/*.xcworkspace/xcuserdata/
-**/.DS_Store
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.cachefile
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# TFS 2012 Local Workspace
-$tf/
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-## TODO: Comment the next line if you want to checkin your
-## web deploy settings but do note that will include unencrypted
-## passwords
-*.pubxml
-
-# NuGet Packages
-packages/*
-*.nupkg
-## TODO: If the tool you use requires repositories.config
-## uncomment the next line
-#!packages/repositories.config
-
-# Enable "build/" folder in the NuGet Packages folder since
-# NuGet packages use it for MSBuild targets.
-# This line needs to be after the ignore of the build folder
-# (and the packages folder if the line above has been uncommented)
-!packages/build/
-
-# Windows Store app package directory
-AppPackages/
-
-# Others
-sql/
-*.Cache
-ClientBin/
-[Ss]tyle[Cc]op.*
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.pfx
-*.publishsettings
-node_modules/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Microsoft Fakes
-FakesAssemblies/
-

.gitmodules

@@ -3,13 +3,4 @@
 	url = https://github.com/owncloud/documentation
 [submodule "src/3rdparty/qtmacgoodies"]
 	path = src/3rdparty/qtmacgoodies
-	url = https://github.com/guruz/qtmacgoodies.git
-[submodule "binary"]
-	path = binary
-	url = git://github.com/owncloud/owncloud-client-binary.git
-[submodule "src/3rdparty/libcrashreporter-qt"]
-	path = src/3rdparty/libcrashreporter-qt
-	url = git://github.com/dschmidt/libcrashreporter-qt.git
-[submodule "src/3rdparty/qtkeychain"]
-	path = src/3rdparty/qtkeychain
-	url = https://github.com/frankosterfeld/qtkeychain.git
+	url = git://github.com/guruz/qtmacgoodies.git

.travis.yml

@@ -1,37 +0,0 @@
-sudo: required
-
-language: cpp
-
-services:
-  - docker
-
-branches:
-  only:
-  - coverity_scan 
-
-before_install:
-- sudo sh -c "echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_14.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
-- sudo sh -c "echo 'deb-src http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_14.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
-- wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/Ubuntu_14.04/Release.key
-- sudo apt-key add - < Release.key
-- sudo apt-get update
-- sudo apt-get -y build-dep owncloud-client
-- checkout=$(git show-ref --head --hash head)
-- cd ../
-- wget https://scan.coverity.com/download/linux-64 --post-data "token=$token&project=owncloud%2Fmirall" -O coverity_tool.tgz
-- mkdir coverity
-- tar -xvf coverity_tool.tgz -C coverity --strip-components=1
-- export PATH=$PATH:$PWD/coverity/bin/
-- cd $TRAVIS_BUILD_DIR
-
-install:
-- cd ../
-- mkdir client-build
-- cd client-build
-- cmake -DCMAKE_BUILD_TYPE="Debug" $TRAVIS_BUILD_DIR
-- cov-build --dir cov-int make
-- tar czvf client.tgz cov-int 
-- curl --form token=$token --form email=lukas@statuscode.ch --form file=@$PWD/client.tgz --form version="$checkout" --form description="$checkout" https://scan.coverity.com/builds?project=owncloud%2Fmirall
-
-# Hack to stop processing
-script: true

CMakeLists.txt

@@ -1,13 +1,10 @@
 
 cmake_minimum_required(VERSION 2.6)
-cmake_policy(VERSION 2.8.0)
-if(POLICY CMP0020)
-  cmake_policy(SET CMP0020 NEW)
-endif()
+project(mirall)
+set(PACKAGE "mirall")
+set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
 
-project(client)
-
-set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+include(Warnings)
 
 set(OEM_THEME_DIR "" CACHE STRING "Define directory containing a custom theme")
 if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake )
@@ -15,42 +12,14 @@ if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake )
 else ()
      include ( ${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake )
 endif()
-# need this logic to not mess with re/uninstallations via macosx.pkgproj
-if(${APPLICATION_REV_DOMAIN} STREQUAL "com.owncloud.desktopclient")
-    set(APPLICATION_REV_DOMAIN_INSTALLER "com.ownCloud.client")
-else()
-    set(APPLICATION_REV_DOMAIN_INSTALLER ${APPLICATION_REV_DOMAIN})
-endif()
 
 if (NOT DEFINED APPLICATION_SHORTNAME)
      set ( APPLICATION_SHORTNAME ${APPLICATION_NAME} )
 endif()
 
-# For usage in XML files we preprocess
-string(REPLACE "&" "&" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME}")
-string(REPLACE "<" "&lt;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME_XML_ESCAPED}")
-string(REPLACE ">" "&gt;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME_XML_ESCAPED}")
-
-set(PACKAGE "${APPLICATION_SHORTNAME}-client")
-set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
-
-if(NOT CRASHREPORTER_EXECUTABLE)
-    set(CRASHREPORTER_EXECUTABLE "${APPLICATION_EXECUTABLE}_crash_reporter")
-endif()
-
-include(Warnings)
-
 include(${CMAKE_SOURCE_DIR}/VERSION.cmake)
-include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
-
-# disable the crashreporter if libcrashreporter-qt is not available or we're building for ARM
-if( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/libcrashreporter-qt/CMakeLists.txt")
-    set( WITH_CRASHREPORTER OFF )
-endif()
-
-if(NOT WITH_CRASHREPORTER)
-    message(STATUS "Build of crashreporter disabled.")
-endif()
+configure_file( ${CMAKE_SOURCE_DIR}/src/mirall/version.h.in "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/version.h" )
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/")
 
 #####
 ## handle DBUS for Fdo notifications
@@ -62,16 +31,18 @@ endif()
 
 include(GNUInstallDirs)
 include(DefineInstallationPaths)
-include(GenerateExportHeader)
+include(QtVersionAbstraction)
+
+setup_qt()
 
 include(GetGitRevisionDescription)
-
 get_git_head_revision(GIT_REFSPEC GIT_SHA1)
 
 # if we cannot get it from git, directly try .tag (packages)
 # this will work if the tar balls have been properly created
 # via git-archive.
-if ("${GIT_SHA1}" STREQUAL "GITDIR-NOTFOUND")
+if (GIT_SHA1)
+if (${GIT_SHA1} STREQUAL "GITDIR-NOTFOUND")
     file(READ ${CMAKE_SOURCE_DIR}/.tag sha1_candidate)
     string(REPLACE "\n" "" sha1_candidate ${sha1_candidate})
     if (NOT ${sha1_candidate} STREQUAL "$Format:%H$")
@@ -79,14 +50,10 @@ if ("${GIT_SHA1}" STREQUAL "GITDIR-NOTFOUND")
         set (GIT_SHA1 "${sha1_candidate}")
     endif()
 endif()
-message(STATUS "GIT_SHA1 ${GIT_SHA1}")
+endif()
 
 set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
 set(DATADIR ${DATA_INSTALL_DIR})
-if(WIN32)
-set(DATADIR "share")
-endif(WIN32)
-set(SHAREDIR ${DATADIR})
 
 #####
 ## handle BUILD_OWNCLOUD_OSX_BUNDLE
@@ -115,50 +82,33 @@ if(TOKEN_AUTH_ONLY)
    add_definitions(-DTOKEN_AUTH_ONLY=1)
 endif()
 
-option(NO_MSG_HANDLER "Don't redirect QDebug outputs to the log window/file" OFF)
-if(NO_MSG_HANDLER)
-   add_definitions(-DNO_MSG_HANDLER=1)
-endif()
-
 # this option creates only libocsync and libowncloudsync
 option(BUILD_LIBRARIES_ONLY "BUILD_LIBRARIES_ONLY" OFF)
 
-# When this option is enabled, 5xx errors are not added to the blacklist
-# Normally you don't want to enable this option because if a particular file
-# triggers a bug on the server, you want the file to be blacklisted.
+# When this option is enabled, 5xx errors are not added to the clacklist
+# Normaly you don't want to enable this option because if a particular file
+# trigger a bug on the server, you want the file to be blacklisted.
 option(OWNCLOUD_5XX_NO_BLACKLIST "OWNCLOUD_5XX_NO_BLACKLIST" OFF)
 if(OWNCLOUD_5XX_NO_BLACKLIST)
     add_definitions(-DOWNCLOUD_5XX_NO_BLACKLIST=1)
 endif()
 
-# When this option is enabled, a rename that is not allowed will be renamed back
-# do the original as a restoration step.  Withut this option, the restoration will
-# re-download the file instead.
-# The default is off because we don't want to rename the files back behind the user's back
-# Added for IL issue #550
-option(OWNCLOUD_RESTORE_RENAME "OWNCLOUD_RESTORE_RENAME" OFF)
-if(OWNCLOUD_RESTORE_RENAME)
-    add_definitions(-DOWNCLOUD_RESTORE_RENAME=1)
+#### find libs
+#find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtTest QtWebkit REQUIRED )
+#if( UNIX AND NOT APPLE ) # Fdo notifications
+#    find_package(Qt4 4.7.0 COMPONENTS QtDBus REQUIRED )
+#endif()
+find_package(Neon REQUIRED)
+
+if(NOT TOKEN_AUTH_ONLY)
+    if (Qt5Core_DIR)
+    find_package(Qt5Keychain REQUIRED)
+    else()
+    find_package(QtKeychain REQUIRED)
+    endif()
 endif()
 
-# Disable shibboleth.
-# So the client can be built without QtWebKit
-option(NO_SHIBBOLETH "Build without Shibboleth support. Allow to build the client without QtWebKit" OFF)
-if(NO_SHIBBOLETH)
-   message("Compiling without shibboleth")
-   add_definitions(-DNO_SHIBBOLETH=1)
-endif()
-
-if(APPLE)
-  set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
-endif()
-
-find_package(OpenSSL 1.0.0 REQUIRED)
-
-if(APPLE)
-  find_package(Sparkle)
-endif(APPLE)
-
+Find_package(Sparkle)
 if(UNIX)
   find_package(INotify REQUIRED)
 else()
@@ -167,16 +117,7 @@ endif()
 find_package(Sphinx)
 find_package(PdfLatex)
 
-find_package(SQLite3 3.8.0 REQUIRED)
-# On some OS, we want to use our own, not the system sqlite
-if (USE_OUR_OWN_SQLITE3)
-    include_directories(BEFORE ${SQLITE3_INCLUDE_DIR})
-    if (WIN32)
-        add_definitions(-DSQLITE_API=__declspec\(dllimport\))
-    endif()
-endif()
 
-find_package(ZLIB)
 
 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
@@ -188,21 +129,15 @@ add_definitions(-DUNICODE)
 add_definitions(-D_UNICODE)
 if( WIN32 )
 add_definitions( -D__USE_MINGW_ANSI_STDIO=1 )
-add_definitions( -DNOMINMAX )
 endif( WIN32 )
 
-# Handle Translations, pick all client_* files from trans directory.
-file( GLOB TRANS_FILES ${CMAKE_SOURCE_DIR}/translations/client_*.ts)
+# Handle Translations, pick all mirall_* files from trans directory.
+file( GLOB TRANS_FILES ${CMAKE_SOURCE_DIR}/translations/mirall_*.ts)
 set(TRANSLATIONS ${TRANS_FILES})
 
 add_subdirectory(csync)
 add_subdirectory(src)
-if(NOT BUILD_LIBRARIES_ONLY)
-add_subdirectory(shell_integration)
 add_subdirectory(doc)
-add_subdirectory(doc/dev)
-add_subdirectory(admin)
-endif(NOT BUILD_LIBRARIES_ONLY)
 
 if(UNIT_TESTING)
     include(CTest)
@@ -211,9 +146,7 @@ if(UNIT_TESTING)
 endif(UNIT_TESTING)
 
 if(BUILD_OWNCLOUD_OSX_BUNDLE)
-    install(FILES sync-exclude.lst DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
-    configure_file(sync-exclude.lst bin/${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
+    configure_file(sync-exclude.lst ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
 else()
     install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
-    configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
 endif()

CONTRIBUTING.md

@@ -5,11 +5,10 @@ direct these to the [mailing list][mailinglist] or our [forum][forum].
 We are also available on [IRC][irc].
 
 ### Bug Reporting Guidelines
-* __Important__: Report the issue using our [template][template], it includes all the
-  information we need to track down the issue.  
-* __SECURITY__: Report any potential security bug to security@owncloud.com following our [security policy](https://owncloud.org/security/) instead of filing an issue in our bug tracker
+* Important: Report the issue using our [template][template], it includes all the
+  informations we need to track down the issue.  
 * This repository is *only* for issues within the ownCloud desktop client. 
-  Issues in other components should be reported in their own repositores: 
+  Issues in other compontents should be reported in their own repositores: 
   - [ownCloud server](https://github.com/owncloud/core/issues)
   - [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar,
     Contacts...)
@@ -23,7 +22,7 @@ If your issue appears to be a bug, and hasn't been reported, open a new issue.
 Help us to maximize the effort we can spend fixing issues and adding new
 features, by not reporting duplicate issues.
 
-[template]: https://raw.github.com/owncloud/client/master/issue_template.md
+[template]: https://raw.github.com/owncloud/mirall/master/issue_template.md
 [mailinglist]: https://mail.kde.org/mailman/listinfo/owncloud
 [forum]: http://forum.owncloud.org/
 [irc]: http://webchat.freenode.net/?channels=owncloud&uio=d4
@@ -32,16 +31,16 @@ features, by not reporting duplicate issues.
 
 Thanks for wanting to contribute source code to ownCloud. That's great!
 
-Before we're able to merge your code to ownCloud Desktop Client, you need to sign
+Before we're able to merge your code to mirall, you need to sign
 our [Contributor Agreement][agreement].
 
-Please read the [Desktop Client Manual][desktopman] and the [Developer
-Manuals][devmanual] to get useful info like how to create your first
+Please read the [Desktop Client Manual][mirallman] and the [Developer
+Manuals][devmanual] to get useful infos like how to create your first
 application or how to test the ownCloud code with phpunit.
 
 [agreement]: http://owncloud.org/about/contributor-agreement/
-[devmanual]: http://owncloud.org/dev
-[desktopman]: http://doc.owncloud.org/desktop
+[devmanual]: http://owncloud.org/dev/
+[mirallman]: http://doc.owncloud.org/desktop/1.1/
 
 ## Translations
 Please submit translations via [Transifex][transifex].

CPackOptions.cmake.in

@@ -17,10 +17,8 @@ else ()
      include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" )
 endif()
 
-set( CRASHREPORTER_EXECUTABLE @CRASHREPORTER_EXECUTABLE@)
-
 set( BUILD_OWNCLOUD_OSX_BUNDLE @BUILD_OWNCLOUD_OSX_BUNDLE@)
 if(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE)
-    message( FATAL_ERROR "You're trying to build a bundle although you haven't built the client in bundle mode.\n Add -DBUILD_OWNCLOUD_OSX_BUNDLE=ON")
+    message( FATAL_ERROR "You're trying to build a bundle although you haven't built mirall in bundle mode.\n Add -DBUILD_OWNCLOUD_OSX_BUNDLE=ON")
 endif()
 

ChangeLog

@@ -1,472 +1,12 @@
 ChangeLog
 =========
-
-version 2.3.2 (2017-05-08)
-* Fix more crashes (thanks to everyone submitting to our crash reporter!)
-* Improve compatibility with server 10.0 (#5691, X-OC-Total-Size)
-* Share dialog: UI improvements, Bring to front on tray click
-* owncloudcmd: Align process return value with sync return value (#3936)
-* Fix disk free check on Windows when opening the local DB
-
-version 2.3.1 (2017-03-21)
-* Fix several crashes (thanks to everyone submitting to our crash reporter!)
-* Improve HTTP redirect handling (#5555)
-* Blacklist: Escalate repeated soft error to normal error (#5500)
-* NTFS: Do not attempt to upload two existing files with similar casing (#5544)
-* Fix URL for linking to application password generation for ownCloud 10.0 (#5605)
-
-version 2.3.0 (2017-03-03)
-* Decreased memory usage during sync
-* Overlay icons: Lower CPU usage
-* Allow to not sync the server's external storages by default
-* Switch Windows and OS X build to Qt 5.6.2
-* Switch to new ownCloud server WebDAV endpoint
-* Chunking NG: New file upload chunking algorithmn for ownCloud server 9.2
-* Allow to sync a folder to multiple different servers (Filename change from .csync_journal.db to _sync_$HASH.db)
-* Conflicts: Use the local mtime for the conflict file name (#5273)
-* "Sync now" menu item
-* SSL Client certificate support improved (Show UI, Store keys in keychain)
-* Propagator: Upload more small files in parallel
-* Sync Engine: Read data-fingerprint property to detect backups (#2325)
-* GUI: Show link to ceate an app password/token for syncing
-* Share dialog: Add 'Mail link' button
-* Caja file manager plugin
-* Make "backup detected" message to not trigger in wrong cases
-* SyncEngine: Fix renaming of folder when file are changed (#5192)
-* Fix reconnect bug if status.php intermittently returns wrong data (#5188)
-* Improve sync scheduling (#5317)
-* Overlay icons: Improvements in correctnes
-* Tray menu: Only update on demand to fix Linux desktop integration glitches
-* Progress: Better time/bandwidth estimations
-* Network: Follow certain HTTP redirects (#2791)
-* Network: Remove all cookies (including load balancers etc) when logging out
-* Discovery thread: Low priority
-* owncloudsync.log: Write during propagation
-* Better error message for files with trailing spaces on Windows
-* Excludes: Consider files in hidden folders excluded (#5163)
-* Allow sync directory to be a symlinked directory
-* Add manifest file on Windows to make the application UAC aware
-* macOS: Improve monochrome tray icons
-* Shibboleth bugfixes
-* Fixes with regards to low disk space
-* A ton of other bugfixes
-* Refactorings
-* Improved documentation
-* Crash fixes
-
-version 2.2.4 (release 2016-09-27)
-* Dolphin Plugin: Use the Application name for the socket path (#5172)
-* SyncEngine: Fix renaming of folder when file are changed (#5195)
-* Selective Sync: Fix HTTP request loop and show error in view (#5154)
-* ConnectionValidator: properly handle error in status.php request (#5188)
-* Discovery: Set thread priority to low (#5017)
-* ExcludeFiles: Fix when the folder casing is not the same in the settings and in the FS
-* ShareLink: Ensure the password line edit is enabled (#5117)
-
-version 2.2.3 (release 2016-08-08)
-* SyncEngine: Fix detection of backup (#5104)
-* Fix bug with overriding URL in config (#5016)
-* Sharing: Fix bug with file names containing percent encodes (#5042, #5043)
-* Sharing: Permissions for federated shares on servers >=9.1 (#4996, #5001)
-* Overlays: Fix issues with file name casing on OS X and Windows
-* Windows: Skip symlinks and junctions again (#5019)
-* Only accept notification API Capability if endpoint is OCS-enabled (#5034)
-* Fix windows HiDPI (#4994)
-* SocketAPI: Use different pipe name to avoid unusual delay (#4977)
-* Tray: Add minimal mode as workaround and testing tool for Linux issues (#4985, #4990)
-* owncloudcmd: Fix --exclude regression #4979
-* Small memleak: Use the full file stat destructors (#4992)
-* Fix small QAction memleak (#5008)
-* Fix crash on shutting down during propagation (#4979)
-* Decrease memory usage during sync #4979
-* Setup csync logging earlier to get all log output (#4991)
-* Enable Shibboleth debug view with OWNCLOUD_SHIBBOLETH_DEBUG env
-
-version 2.2.2 (release 2016-06-21)
-* Excludes: Don't redundantly add the same exclude files (memleak) (#4967, #4988)
-* Excludes: Only log if the pattern was really logged. (#4989)
-
-version 2.2.1 (release 2016-06-06)
- * Fix out of memory error when too many uploads happen (#4611)
- * Fix display errors in progress display (#4803 #4856)
- * LockWatcher: Remember to upload files after they become unlocked (#4865) 
- * Fix overlay icons for files with umlauts (#4884)
- * Certs: Re-ask for different cert after rejection (#4898, #4911)
- * Progress: Don't count items without propagation jobs (#4856, #4910)
- * Utility: Fix for the translation of minutes, second (#4855)
- * SyncEngine: invalid the blacklist entry when the rename destination change
-
-version 2.2.0 (release 2016-05-12)
- * Overlay icons: Refactoring - mainly for performance improvements
- * Improved error handling with Sync Journal on USB storages (#4632)
- * Sharing Completion: Improved UI of completion in sharing from desktop. (#3737)
- * Show server notifications on the client (#3733)
- * Improved Speed with small files by dynamic parallel request count (#4529)
- * LockWatcher: Make sure to sync files after apps released exclusive locks on Windows.
- * Improved handling of Win32 file locks and network files
- * Workaround Ubuntu 16.04 tray icon bug (#4693)
- * Removed the Alias field from the folder definition (#4695)
- * Improved netrc parser (#4691)
- * Improved user notifications about ignored files and conflicts (#4761, #3222)
- * Add warnings for old server versions (#4523)
- * Enable tranportation checksums if the server supports based on server capabilities (#3735)
-
- * Default Chunk-size changed to 10MB (#4354)
- * Documentation Improvements, ie. about overlay icons
- * Translation fixes
- * Countless other bugfixes
- * Sqlite Update to recent version
- * Update of QtKeyChain to support Windows credential store
- * Packaging of dolphin overlay icon module for bleeding edge distros
-
-version 2.1.1 (release 2016-02-10)
- * UI improvements for HiDPI screens, error messages, RTL languages
- * Fix occurences of "Connection Closed" when a new unauthenticated TCP socket is used
- * Fix undeliberate WiFi scanning done by Qt Network classes
- * Several fixes/improvements to the sharing dialog
- * Several fixes/improvements to the server activity tab
- * Create the directory when using --confdir and it does not exist
- * Windows Overlay icons: Fix DLL and icon oddities
- * Mac Overlay icons: Don't install legacy Finder plugin on >= 10.10
- * Linux Overlay icons: Nemo plugin
- * Overlay icons: Fix several wrong icon state computations
- * Allow changeable upload chunk size in owncloud.cfg
- * Crash fixes on account deletion
- * Forget password on explicit sign-out
- * OS X: Fix the file system watcher ignoring unicode paths (#4424)
- * Windows Installer: Update to NSIS 2.50, fixes possible DLL injection
- * Sync Engine: .lnk files
- * Sync Engine: symlinked syn directories
- * Sync Engine: Windows: Fix deleting and replacing of read-only files (#4308, #4277)
- * Sync Engine: Fixes for files becoming directories and vice versa (#4302)
- * Misc other fixes/improvements
-
-version 2.1 (release 2015-12-03)
- * GUI: Added a display of server activities
- * GUI: Added a separate view for not synced items, ignores, errors
- * GUI: Improved upload/download progress UI (#3403, #3569)
- * Allowed sharing with ownCloud internal users and groups from Desktop
- * Changed files starting in .* to be considered hidden on all platforms (#4023)
- * Reflect read-only permissions in filesystem (#3244)  
- * Blacklist: Clear on successful chunk upload (#3934)
- * Improved reconnecting after network change/disconnect (#4167 #3969 ...)
- * Improved performance in Windows file system discovery
- * Removed libneon-based propagator. As a consequence, The client can no
-   longer provide bandwith limiting on Linux-distributions where it is
-   using Qt < 5.4
- * Performance improvements in the logging functions
- * Ensured that local disk space problems are handled gracefully (#2939)
- * Improved handling of checksums: transport validation, db (#3735)
- * For *eml-files don't reupload if size and checksum are unchanged (#3235)
- * Ensured 403 reply code is handled properly (File Firewall) (#3490)
- * Reduced number of PROPFIND requests to server(#3964)
- * GUI: Added Account toolbox widget to keep account actions (#4139)
- * Tray Menu: Added fixes for Recent Activity menu (#4093, #3969)
- * FolderMan: Fixed infinite wait on pause (#4093)
- * Renamed env variables to include unit (#2939)
- * FolderStatusModel: Attempt to detect removed undecided files (#3612)
- * SyncEngine: Don't whipe the white list if the sync was aborted (#4018)
- * Quota: Handle special negative value for the quota (#3940)
- * State app name in update notification (#4020)
- * PropagateUpload: Fixed double-emission of finished (#3844)
- * GUI: Ensured folder names which are excluded from sync can be clicked
- * Shell Integration: Dolphin support, requires KF 5.16 and KDE Application 15.12
- * FolderStatusModel: Ensured reset also if a folder was renamed (#4011)
- * GUI: Fixed accessiblity of remaing items in full settings toolbar (#3795)
- * Introduced the term "folder sync connection" in more places (#3757)
- * AccountSettings: Don't disable pause when offline (#4010)
- * Fixed handling of hidden files (#3980)
- * Handle download errors while resuming as soft errors (#4000)
- * SocketAPI: Ensured that the command isn't trimmed (#3297)
- * Shutdown socket API before removing the db (#3824)
- * GUI: Made "Keep" default in the delete-all dialog (#3824)
- * owncloudcmd: Introduced return code 0 for --version and --help
- * owncloudcmd: Added --max-sync-retries (#4037)
- * owncloudcmd: Don't do a check that file are older than 2s (#4160)
- * Fixed getting size for selective sync (#3986)
- * Re-added close button in the settings window (#3713)
- * Added abililty to handle storage limitations gracefully (#3736)
- * Updated 3rdparty dependencies: sqlite version 3.9.1
- * Organized patches to our base Qt version into admin/qt/patches
- * Plus: A lot of unmentioned improvements and fixes
-
-version 2.0.2 (release 2015-10-21)
-  * csync_file_stat_s: Save a bit of memory
-  * Shibboleth: Add our base user agent to WebKit
-  * SelectiveSync: Increase folder list timeout to 60
-  * Propagation: Try another sync on 423 Locked (#3387)
-  * Propagation: Make 423 Locked a soft error (#3387)
-  * Propagation: Reset upload blacklist if a chunk succeeds
-  * Application: Fix crash on early shutdown (#3898)
-  * Linux: Don't show settings dialog always when launched twice (#3273, #3771, #3485)
-  * win32 vio: Add the OPEN_REPARSE_POINTS flag to the CreateFileW call. (#3813)
-  * AccountSettings: only expand root elements on single click.
-  * AccountSettings: Do not allow to expand the folder list when disconnected.
-  * Use application SHORT name for the name of the MacOSX pkg file (ownBrander).
-  * FolderMan: Fix for removing a syncing folder (#3843)
-  * ConnectionMethodDialog: Don't be insecure on close (#3863)
-  * Updater: Ensure folders are not removed (#3747)
-  * Folder settings: Ensure path is cleaned (#3811)
-  * Propagator: Simplify sub job finished counting (#3844)
-  * Share dialog: Hide settings dialog before showing (#3783)
-  * UI: Only expand 1 level in folder list (#3585)
-  * UI: Allow folder expanding from button click (#3585)
-  * UI: Expand folder treeview on single click (#3585)
-  * GUI: Change tray menu order (#3657)
-  * GUI: Replace term "sign in" with "Log in" and friends.
-  * SetupPage: Fix crash caused by uninitialized Account object.
-  * Use a themable WebDAV path all over.
-  * Units: Back to the "usual" mix units (JEDEC standard).
-  * csync io: Full UNC path support on Win (#3748)
-  * Tray: Don't use the tray workaround with the KDE theme (#3706, #3765)
-  * ShareDialog: Fix folder display (#3659)
-  * AccountSettings: Restore from legacy only once (#3565)
-  * SSL Certificate Error Dialog: show account name (#3729)
-  * Tray notification: Don't show a message about modified folder (#3613) 
-  * PropagateLocalRemove:  remove entries from the DB even if there was an error.
-  * Settings UI improvements (eg. #3713, #3721, #3619 and others)
-  * Folder: Do not create the sync folder if it does not exist (#3692)
-  * Shell integration: don't show share menu item for top level folders
-  * Tray: Hide while modifying menus (#3656, #3672)
-  * AddFolder: Improve remote path selection error handling (#3573)
-  * csync_update: Use excluded_traversal() to improve performance (#3638)
-  * csync_excluded: Add fast _traversal() function (#3638)
-  * csync_exclude: Speed up significantly (#3638)
-  * AccountSettings: Adjust quota info design (#3644, #3651)
-  * Adjust buttons on remove folder/account questions (#3654)
-
-version 2.0.1 (release 2015-09-01)
-  * AccountWizard: fix when the theme specify a override URL (#3699)
-
-version 2.0.0 (release 2015-08-25)
-  * Add support for multiple accounts (#3084)
-  * Do not sync down new big folders from server without users consent (#3148)
-  * Integrate Selective Sync into the default UI
-  * OS X: Support native finder integration for 10.10 Yosemite (#2340)
-  * Fix situation where client would not reconnect after timeout (#2321)
-  * Use SI units for the file sizes
-  * Improve progress reporting during sync (better estimations, show all files, show all bandwidth)
-  * Windows: Support paths >255 characters (#57) by using Windows API instead of POSIX API
-  * Windows, OS X: Allow to not sync hidden files (#2086)
-  * OS X: Show file name in UI if file has invalid UTF-8 in file name
-  * Sharing: Make use of Capability API (#3439)
-  * Sharing: Do not allow sharing the root folder (#3495)
-  * Sharing: Show thumbnail
-  * Client Updater: Check for updates periodically, not only once per run (#3044)
-  * Windows: Remove misleading option to remove sync data (#3461)
-  * Windows: Do not provoke AD account locking if password changes (#2186)
-  * Windows: Fix installer when installing unprivileged (#2616, #2568)
-  * Quota: Only refresh from server when UI is shown
-  * SSL Button: Show more information
-  * owncloudcmd: Fix --httpproxy (#3465)
-  * System proxy: Ask user for credentials if needed
-  * Several fixes and performance improvements in the sync engine
-  * Network: Try to use SSL session tickets/identifiers. Check the SSL button to see if they are used.
-  * Bandwidth Throttling: Provide automatic limit setting for downloads (#3084)
-  * Systray: Workaround for issue with Qt 5.5.0 #3656
-
-version 1.8.4 (release 2015-07-13)
-  * Release to ship a security release of openSSL. No source changes of the ownCloud Client code.
-
-version 1.8.3 (release 2015-06-23)
-  * Fix a bug in the Windows Installer that could crash explorer (#3320)
-  * Reduce 'Connection closed' errors (#3318, #3313, #3298)
-  * Ignores: Force a remote discovery after ignore list change (#3172)
-  * Shibboleth: Avoid crash by letting the webview use its own QNAM (#3359)
-  * System Ignores: Removed *.tmp from system ignore again. If a user
-    wants to ignore *.tmp, it needs to be added to the user ignore list.
-
-version 1.8.2 (release 2015-06-08)
- * Improve reporting of server error messages (#3220)
- * Discovery: Ignore folders with any 503 (#3113)
- * Wizard: Show server error message if possible (#3220)
- * QNAM: Fix handling of mitm cert changes (#3283)
- * Win32: Installer translations added (#3277)
- * Win32: Allow concurrent OEM (un-)installers (#3272)
- * Win32: Make Setup/Update Mutex theme-unique (#3272)
- * HTTP: Add the branding name to the UserAgent string
- * ConnectonValidator: Always run with new credentials (#3266)
- * Recall Feature: Admins can trigger an upload of a file from
-   client to server again (#3246)
- * Propagator: Add 'Content-Length: 0' header to MKCOL request (#3256)
- * Switch on checksum verification through branding or config
- * Add ability for checksum verification of up and download
- * Fix opening external links for some labels (#3135)
- * AccountState: Run only a single validator, allow error message
-   overriding (#3236, #3153)
- * SyncJournalDB: Minor fixes and simplificatons
- * SyncEngine: Force re-read of folder Etags for upgrades from
-   1.8.0 and 1.8.1
- * Propagator: Limit length of temporary file name (#2789)
- * ShareDialog: Password ui fixes (#3189)
- * Fix startup hang by removing QSettings lock file (#3175)
- * Wizard: Allow SSL cert dialog to show twice (#3168)
- * ProtocolWidget: Fix rename message (#3210)
- * Discovery: Test better, treat invalid hrefs as error (#3176)
- * Propagator: Overwrite local data only if unchanged (#3156)
- * ShareDialog: Improve error reporting for share API fails
- * OSX Updater: Only allow updates only if in /Applications (#2931)
- * Wizard: Fix lock icon (#1447)
- * Fix compilation with GCC 5
- * Treat any 503 error as temporary (#3113)
- * Work around for the Qt PUT corruption bug (#2425)
- * OSX Shell integration: Optimizations
- * Windows Shell integration: Optimizations
- .. more than 250 commits since 1.8.1
-
-version 1.8.1 (release 2015-05-07)
- * Make "operation canceled" error a soft error
- * Do not throw an error for files that are scheduled to be removed,
-   but can not be found on the server. #2919
- * Windows: Reset QNAM to proper function after hibernation. #2899 #2895 #2973
- * Fix argument verification of --confdir #2453
- * Fix a crash when accessing a dangling UploadDevice pointer #2984
- * Add-folder wizard: Make sure there is a scrollbar if folder names
-   are too long #2962
- * Add-folder Wizard: Select the newly created folder
- * Activity: Correctly restore column sizes #3005
- * SSL Button: do not crash on empty certificate chain
- * SSL Button: Make menu creation lazy #3007 #2990
- * Lookup system proxy async to avoid hangs #2993 #2802
- * ShareDialog: Some GUI refinements
- * ShareDialog: On creation of a share always retrieve the share
-   This makes sure that if a default expiration date is set this is reflected
-   in the dialog. #2889
- * ShareDialog: Only show share dialog if we are connected.
- * HttpCreds: Fill pw dialog with previous password. #2848 #2879
- * HttpCreds: Delete password from old location. #2186
- * Do not store Session Cookies in the client cookie storage
- * CookieJar: Don't accidentally overwrite cookies. #2808
- * ProtocolWidget: Always add seconds to the DateTime locale. #2535
- * Updater: Give context as to which app is about to be updated #3040
- * Windows: Add version information for owncloud.exe. This should help us know
-   what version or build number a crash report was generated with.
- * Fix a crash on shutdown in ~SocketApi #3057
- * SyncEngine: Show more timing measurements #3064
- * Discovery: Add warning if returned etag is 0
- * Fix a crash caused by an invalid DiscoveryDirectoryResult::iterator #3051
- * Sync: Fix sync of deletions during 503. #2894
- * Handle redirect of auth request. #3082
- * Discovery: Fix parsing of broken XML replies, which fixes local file disappearing #3102
- * Migration: Silently restore files that were deleted locally by bug #3102
- * Sort folder sizes SelectiveSyncTreeView numerically #3112
- * Sync: PropagateDownload: Read the mtime from the file system after writing it #3103
- * Sync: Propagate download: Fix restoring files for which the conflict file exists #3106
- * Use identical User Agents and version for csync and the Qt parts
- * Prevent another crash in ~SocketApi #3118
- * Windows: Fix rename of finished file. #3073
- * AccountWizard: Fix auth error handling. #3155
- * Documentation fixes
- * Infrastructure/build fixes
- * Win32/OS X: Apply patch from OpenSSL to handle oudated intermediates gracefully #3087
-
-version 1.8.0 (release 2015-03-17)
- * Mac OS: HIDPI support
- * Support Sharing from desktop: Added a share dialog that can be
-   opened by context menu in the file managers (Win, Mac, Nautilus)
-   Supports public links with password enforcement
- * Enhanced usage of parallel HTTP requests for ownCloud 8 servers
- * Renamed github repository from mirall to client.
- * Mac OS: Use native notification support
- * Selective Sync: allow to enforce selective sync in brandings.
- * Added ability to build on Windows utilizing MingGW
- * SQLite database fixes if running on FAT filesystems
- * Improved detection of changing files to upload from local
- * Preparations for the multi-account feature
- * Fixed experience for Window manager without system tray
- * Build with Qt 5.4
- * Dropped libneon dependency if Qt 5.4 is available
- * Keep files open very short, that avoid lock problems on Windows
-   especially with office software but also others.
- * Merged some NetBSD patches
- * Selective sync support for owncloudcmd
- * Reorganize the source repository
- * Prepared direct download
- * Added Crashreporter feature to be switched on on demand
- * A huge amount of bug fixes in all areas of the client.
- * almost 700 commits since 1.7.1
-
-version 1.7.1 (release 2014-12-18)
- * Documentation fixes and updates
- * Nautilus Python plugin fixed for Python 3
- * GUI wording fixes plus improved log messages
- * Fix hidning of the database files in the sync directories
- * Compare http download size with the header value to avoid broken
-   downloads, bug #2528
- * Avoid initial ETag fetch job at startup, which is not needed.
- * Add chunk size http header to PUT requests
- * Fixed deteteCookie method of our CookieJar, fix for Shibboleth
- * Added fallback for distros where XDG_RUNTIME_DIR is undefined
- * Fix the setup wizard, bug #1989, #2264
- * Fix scheduling of ETag check jobs, bug #2553
- * Fix to avoid syncing more than one folder at a time, bug #2407
- * Use fife minutes timeout for all network jobs
- * Cleanup for Folderwizard wording
- * Improve journal check: Remove corrupted journal files, bug #2547
- * Fix item count in progress dialog for deletes, bug #1132
- * Display correct file count on deletion (#1132)
- * Fix reinitializing the folder using the wizard in certain cases (#2606)
- * Mac OS: Fixed branding of the pkg file
- * Mac OS: Fix display of overlay icons in certain situations (#1132)
- * Mac OS: Use a bundled version of OpenSSL (#764, #2600, #2510)
- * Win32: improved filesystem watcher
- * Win32: Improve threading with shell integration
- * Win32: Upgraded to OpenSSL 1.0.1j
- * Win32: Improve reliability of Installer, fix removal of Shell Extensions
-
-version 1.7.0 (release 2014-11-07)
-
- * oC7 Sharing: Handle new sharing options of ownCloud 7 correctly.
- * Added Selective sync: Ability to unselect server folders which are
-   excluded from syncing, plus GUI and setup GUI
- * Added overlay icons for Windows Explorer, Mac OS Finder and GNOME Nautilus.
-   Information is provided by the client via a local socket / named pipe API
-   which provides information about the sync status of files.
- * Improved local change detection: consider file size, detect files
-   with ongoing changes and do not upload immediately
- * Improved HTTP request timeout handler: all successful requests reset
-   the timeout counter
- * Improvements for syncing command line tool: netrc support, improved
-   SSL support, non interactive mode
- * Permission system: ownCloud 7 delivers file and folder permissions,
-   added ability to deal with it for shared folders and more.
- * Ignore handling: Do not recurse into ignored or excluded directories
- * Major sync journal database improvements for more stability and performance
- * New library interface to sqlite3
- * Improve "resync handling" if errors occur
- * Blacklist improvements
- * Improved logging: more useful meta info, removed noise
- * Updated to latest Qt5 versions on Windows and OS X
- * Fixed data loss when renaming a download temporary fails and there was
-   a conflict at the same time.
- * Fixed missing warnings about reusing a sync folder when the back button
-   was used in the advanced folder setup wizard.
- * The 'Retry Sync' button now also restarts all downloads.
- * Clean up temporary downloads and some extra database files when wiping a
-   folder.
- * OS X: Sparkle update to provide pkg format properly
- * OS X: Change distribution format from dmg to pkg with new installer.
- * Windows: Fix handling of filenames with trailing dot or space
- * Windows: Don't use the wrong way to get file mtimes in the legacy propagator.
-
-version 1.6.4 (release 2014-10-22)
- * Fix startup logic, fixes bug #1989
- * Fix raise dialog on X11
- * Win32: fix overflow when computing the size of file > 4GiB
- * Use a fixed function to get files modification time, the
-   original one was broken for certain timezone issues, see
-   core bug #9781 for details
- * Added some missing copyright headers
- * Avoid data corruption due to wrong error handling, bug #2280
- * Do improved request timeout handling to reduce the number of
-   timed out jobs, bug #2155
-   version 1.6.3 (release 2014-09-03)
+version 1.6.3 (release 2014-09-03)
  * Fixed updater on OS X
  * Fixed memory leak in SSL button that could lead to quick memory draining
  * Fixed upload problem with files >4 GB
  * MacOSX, Linux: Bring Settings window to front properly
  * Branded clients: If no configuration is detected, try to import the data
-    from a previously configured community edition.
+   from a previously configured community edition.
 
 version 1.6.2 (release 2014-07-28 )
  * Limit the HTTP buffer size when downloading to limit memory consumption.
@@ -521,7 +61,7 @@ version 1.6.0 (release 2014-05-30 )
  * Improve Cookie support (e.g. for cookie-based load-balancers)
  * Introduce a general timeout of 300s for network operations
  * Improve error handling, blacklisting
- * Job-based change propagation, enables faster parallel up/downloads
+ * Job-based change propagation, enables faster parallel up/downloads 
    (right now only if no bandwidth limit is set and no proxy is used)
  * Significantly reduced CPU load when checking for local and remote changes
  * Speed up file stat code on Windows
@@ -534,7 +74,7 @@ version 1.6.0 (release 2014-05-30 )
    Qt 5.2 or later
  * Forward server exception messages to client error messages
  * Mac OS X: Support Notification Center in OS X 10.8+
- * Mac OS X: Use native settings dialog
+ * Mac OS X: Use native settings dialog 
  * Mac OS X: Fix UI inconsistencies on Mavericks
  * Shibboleth: Warn if authenticating with a different user
  * Remove vio abstraction in csync
@@ -569,7 +109,7 @@ version 1.5.2 (release 2014-02-26 )
   * Shibboleth: Proper invalidation if timeout during sync
   * Shibboleth: Do not pop up IdP login immediately when modifying account
   * Shibboleth: Avoid auth on restart by storing cookies in the wallet
-  * Fix license headers
+  * Fix license headers 
 
 version 1.5.1 (release 2014-02-13 )
   * Added an auto updater that updates the client if a
@@ -654,7 +194,7 @@ version 1.4.2 (release 2013-10-18 ), csync 0.90.4 required
 version 1.4.1 (release 2013-09-24 ), csync 0.90.1 required
 
   * Translation and documentation fixes.
-  * Fixed error display in settings/status dialog, displays multi
+  * Fixed error display in settings/status dialog, displays multi 
     line error messages now correctly.
   * Wait up to 30 secs before complaining about missing systray
     Fixes bug #949
@@ -735,7 +275,7 @@ version 1.3.0 (release 2013-06-25 ), csync 0.80.0 required
 version 1.2.5 (release 2013-04-23 ), csync 0.70.7 required
   * [Fixes] NSIS installer fixes
   * [Fixes] Fix crash race by making certificateChain() thread safe
-  * [Fixes] Build with older CMake versions (CentOS/RHEL 6)
+  * [Fixes] Build with older CMake versions (CentOS/RHEL 6) 
   * [Fixes] Wording in GUI
   * [Fixes] Silently ignore "installed = true" status.php
   * Set log verbosity before calling csync_init.
@@ -745,7 +285,7 @@ version 1.2.5 (release 2013-04-23 ), csync 0.70.7 required
 version 1.2.4 (release 2013-04-11 ), csync 0.70.6 required
   * [Fixes] Clarify string in folder wizard
   * [Fixes] Fixed some valgrind warnings
-  * [Fixes] Ensure that only one sync thread can ever run
+  * [Fixes] Ensure that only one sync thread can ever run 
   * [Fixes] Fix default config storage path
   * [Fixes] Skip folders with no absolute path
   * [Fixes] Allow setting the configuration directory on command line

Jenkinsfile

@@ -1,58 +0,0 @@
-#!groovy
-
-node('CLIENT') {
-    stage 'Checkout'
-        checkout scm
-        sh '''git submodule update --init'''
-
-    stage 'Qt4'
-        sh '''rm -rf build
-		mkdir build
-		cd build
-		cmake -DUNIT_TESTING=1 -DBUILD_WITH_QT4=ON ..
-		make
-		ctest --output-on-failure'''
-
-    stage 'Qt4 - clang'
-        sh '''rm -rf build
-		mkdir build
-		cd build
-		cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUNIT_TESTING=1 -DBUILD_WITH_QT4=ON ..
-		make
-		ctest --output-on-failure'''
-
-    stage 'Qt5'
-        sh '''rm -rf build
-		mkdir build
-		cd build
-		cmake -DUNIT_TESTING=1 -DBUILD_WITH_QT4=OFF ..
-		make
-		ctest --output-on-failure'''
-
-    stage 'Qt5 - clang'
-        sh '''rm -rf build
-		mkdir build
-		cd build
-		cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUNIT_TESTING=1 -DBUILD_WITH_QT4=OFF ..
-		make
-		ctest --output-on-failure'''
-
-
-    stage 'Win32'
-	def win32 = docker.image('guruz/docker-owncloud-client-win32:latest')
-	win32.pull() // make sure we have the latest available from Docker Hub
-	win32.inside {
-		sh '''
-		rm -rf build-win32
-		mkdir build-win32
-		cd build-win32
-		../admin/win/download_runtimes.sh
-		cmake .. -DCMAKE_TOOLCHAIN_FILE=../admin/win/Toolchain-mingw32-openSUSE.cmake -DWITH_CRASHREPORTER=ON
-		make -j4
-		make package
-		ctest .
-		'''
-	}
-}
-
-

OWNCLOUD.cmake

@@ -1,4 +1,5 @@
 set( APPLICATION_NAME       "ownCloud" )
+#set( APPLICATION_SHORTNAME  ${APPLICATION_NAME} )
 set( APPLICATION_EXECUTABLE "owncloud" )
 set( APPLICATION_DOMAIN     "owncloud.com" )
 set( APPLICATION_VENDOR     "ownCloud" )
@@ -7,12 +8,5 @@ set( APPLICATION_UPDATE_URL "https://updates.owncloud.com/client/" CACHE string
 set( THEME_CLASS            "ownCloudTheme" )
 set( APPLICATION_REV_DOMAIN "com.owncloud.desktopclient" )
 set( WIN_SETUP_BITMAP_PATH  "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
-
-set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-background.png" CACHE STRING "The MacOSX installer background image")
-
 # set( THEME_INCLUDE          "${OEM_THEME_DIR}/mytheme.h" )
 # set( APPLICATION_LICENSE    "${OEM_THEME_DIR}/license.txt )
-
-option( WITH_CRASHREPORTER "Build crashreporter" OFF )
-set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE string "URL for crash reporter" )
-set( CRASHREPORTER_ICON ":/owncloud-icon.png" )

OwnCloudCPack.cmake

@@ -18,14 +18,14 @@ set( CPACK_PACKAGE_VERSION  ${MIRALL_VERSION_FULL}${MIRALL_VERSION_SUFFIX} )
 if(APPLE)
     set( CPACK_GENERATOR "DragNDrop" )
     set( CPACK_SOURCE_GENERATOR "")
-    set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_SHORTNAME}-${CPACK_PACKAGE_VERSION} )
-    set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/ownCloud.icns)
+    set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_NAME}-${CPACK_PACKAGE_VERSION} )
+    set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/ownCloud.icns)
 
     set( CPACK_DMG_DS_STORE "${CMAKE_SOURCE_DIR}/admin/osx/DS_Store.in")
 #    set( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/admin/osx/DMGBackground.png" )
 
     set( CPACK_DMG_FORMAT "UDBZ" )
-    set( CPACK_DMG_VOLUME_NAME "${APPLICATION_SHORTNAME}")
+    set( CPACK_DMG_VOLUME_NAME "${APPLICATION_NAME}")
 
     # did not work with cmake 2.8.7, so we override MacOSXBundleInfo.plist.in
     #set( CPACK_BUNDLE_PLIST ${CMAKE_SOURCE_DIR}/admin/osx/Info.plist )
@@ -48,8 +48,8 @@ if(WIN32)
     set( CPACK_PACKAGE_DESCRIPTION_FILE  "${CMAKE_SOURCE_DIR}/README.md" ) # File used as a description of a project     /path/to/project/ReadMe.txt
     set( CPACK_PACKAGE_DESCRIPTION_SUMMARY  "${APPLICATION_NAME} Syncing Client" ) #  Description summary of a project
     # CPACK_PACKAGE_EXECUTABLES   List of pairs of executables and labels. Used by the NSIS generator to create Start Menu shortcuts.     ccmake;CMake
-    set( CPACK_PACKAGE_INSTALL_DIRECTORY  ${APPLICATION_SHORTNAME} )     # Installation directory on the target system -> C:\Program Files\fellody
-    set( CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${APPLICATION_SHORTNAME} )  # Registry key used when installing this project  CMake 2.5.0
+    set( CPACK_PACKAGE_INSTALL_DIRECTORY  ${APPLICATION_NAME} )     # Installation directory on the target system -> C:\Program Files\fellody
+    set( CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${APPLICATION_NAME} )  # Registry key used when installing this project  CMake 2.5.0
     set( CPACK_PACKAGE_NAME  ${APPLICATION_NAME} ) # Package name, defaults to the project name
     set( CPACK_PACKAGE_VENDOR  "http://${APPLICATION_DOMAIN}" )   # Package vendor name
 endif()

README.md

@@ -1,63 +1,31 @@
-# ownCloud Desktop Client
-
-| Job                               | State                                                                                                                                                             |
-|-----------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| client-build-matrix               | [![Build Status](https://ci.owncloud.org/job/client-build-matrix-linux/badge/icon)](https://ci.owncloud.org/job/client-build-matrix-linux/)                       |
-| client-test-matrix-linux-no-build | [![Build Status](https://ci.owncloud.org/buildStatus/icon?job=client-test-matrix-linux-no-build)](https://ci.owncloud.org/job/client-test-matrix-linux-no-build/) |
-| coverity_scan | [![Build Status](https://img.shields.io/coverity/scan/2482.svg)](https://scan.coverity.com/projects/owncloud-mirall)
+# Mirall
 
 ## Introduction
 
-The ownCloud Desktop Client is a tool to synchronize files from ownCloud Server
-with your computer.
+Mirall is a tool to synchronize files from ownCloud Server with your computer.
+It uses OCSync as its syncing backend.
 
 ## Download
 
 ### Binary packages
 
-* Refer to the download page https://owncloud.org/install/#install-clients
+* Refer to the download page http://owncloud.org/sync-clients/
 
 ### Source code
 
-The ownCloud Desktop Client is developed in Git. Since Git makes it easy to
-fork and improve the source code and to adapt it to your need, many copies
-can be found on the Internet, in particular on GitHub. However, the
-authoritative repository maintained by the developers is located at
-https://github.com/owncloud/client.
+* https://github.com/owncloud/mirall
 
 ## Building the source code
 
-[Building the Client](http://doc.owncloud.org/desktop/2.2/building.html)
-in the ownCloud Desktop Client manual.
+Please refer to doc/building.rst, or
+[Building the Client](http://doc.owncloud.org/desktop/1.5/building.html)
+in the ownCloud client manual.
 
-## Maintainers and Contributors
-
-The maintainers of this repository are:
+## Authors
 
+* Duncan Mac-Vicar P. <duncan@kde.org> (original Mirall author)
 * Klaas Freitag <freitag@owncloud.com>
 * Daniel Molkentin <danimo@owncloud.com>
-* Markus Goetz <guruz@owncloud.com>
-* Olivier Goffart <ogoffart@owncloud.com>
-
-ownCloud Desktop Client is developed by the ownCloud community and receives
-patches from a variety of authors.
-
-## Reporting issues and contributing
-
-If you find any bugs or have any suggestion for improvement, please
-file an issue at https://github.com/owncloud/client/issues. Do not
-contact the authors directly by mail, as this increases the chance
-of your report being lost.
-
-If you created a patch, please submit a [Pull
-Request](https://github.com/owncloud/client/pulls). For non-trivial
-patches, we need you to sign the [Contributor
-Agreement](https://owncloud.org/contribute/agreement) before
-we can accept your patch.
-
-If you want to contact us, e.g. before starting a more complex feature,
-you can join us at
-[#owncloud-client-dev](irc://irc.freenode.net/#owncloud-client-dev).
 
 ## License
 

VERSION.cmake

@@ -1,11 +1,10 @@
-set( MIRALL_VERSION_MAJOR 2 )
-set( MIRALL_VERSION_MINOR 3 )
-set( MIRALL_VERSION_PATCH 2 )
-set( MIRALL_VERSION_YEAR  2017 )
+set( MIRALL_VERSION_MAJOR 1 )
+set( MIRALL_VERSION_MINOR 6 )
+set( MIRALL_VERSION_PATCH 3 )
 set( MIRALL_SOVERSION 0 )
 
 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "") #e.g. beta1, beta2, rc1
+	set( MIRALL_VERSION_SUFFIX "") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
 
 if( NOT DEFINED MIRALL_VERSION_BUILD )

admin/CMakeLists.txt

@@ -1,2 +0,0 @@
-# traverse into osx subdirectory to install and patch the create-pack script
-add_subdirectory(osx)

admin/osx/CMakeLists.txt

@@ -1,17 +0,0 @@
-
-# Check if varialbe MAC_INSTALLER_BACKGROUND_FILE is defined. That might come
-# from the OEM.cmake for branded clients or from OWNCLOUD.cmake for the non
-# branded client.
-# Make sure that the MAC_INSTALLER_BACKGROUND_FILE contains the full path, ie.
-# includes CMAKE_SOURCE_DIR or so.
-
-if (DEFINED MAC_INSTALLER_BACKGROUND_FILE )
-  set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "1")
-else()
-  set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "0")
-endif()
-
-configure_file(create_mac_pkg.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
-configure_file(macosx.pkgproj ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
-configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)
-configure_file(post_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/post_install.sh)

admin/osx/create_mac_pkg.sh.cmake

@@ -1,74 +0,0 @@
-#!/bin/bash
-
-# Script to create the Mac installer using the packages tool from
-# http://s.sudre.free.fr/Software/Packages/about.html
-#
-
-[ "$#" -lt 2 ] && echo "Usage: create_mac_pkg.sh <CMAKE_INSTALL_DIR> <build dir> <installer sign identity>" && exit
-
-# the path of installation must be given as parameter
-if [ -z "$1" ]; then
-  echo "ERROR: Provide the path to CMAKE_INSTALL_DIR to this script as first parameter."
-  exit 1
-fi
-
-if [ -z "$2" ]; then
-  echo "ERROR: Provide the path to build directory as second parameter."
-  exit 1
-fi
-
-install_path="$1"
-build_path="$2"
-identity="$3"
-prjfile=$build_path/admin/osx/macosx.pkgproj
-
-# The name of the installer package
-installer="@APPLICATION_SHORTNAME@-@MIRALL_VERSION_FULL@@MIRALL_VERSION_SUFFIX@"
-installer_file="$installer.pkg"
-installer_file_tar="$installer.pkg.tar"
-installer_file_tar_bz2="$installer.pkg.tar.bz2"
-installer_file_tbz="$installer.pkg.tbz"
-
-# set the installer name to the copied prj config file
-/usr/local/bin/packagesutil --file $prjfile set project name "$installer"
-
-# The command line tool of the "Packages" tool, see link above.
-pkgbuild=/usr/local/bin/packagesbuild
-
-$pkgbuild -F $install_path $prjfile
-rc=$?
-
-if [ $rc == 0 ]; then
-  echo "Successfully created $installer_file"
-else
-  echo "Failed to create $installer_file"
-  exit 3
-fi
-
-# Sign the finished package if desired.
-if [ ! -z "$identity" ]; then
-	echo "Will try to sign the installer"
-	pushd $install_path
-	productsign --sign "$identity" "$installer_file" "$installer_file.new"
-	mv "$installer_file".new "$installer_file"
-	popd
-else
-	echo "No certificate given, will not sign the pkg"
-fi
-
-# FIXME: OEMs?
-# they will need to do their own signing..
-
-
-# Sparkle wants a tbz, it cannot install raw pkg
-cd $install_path
-tar cf "$installer_file_tar" "$installer_file"
-bzip2 -9 "$installer_file_tar"
-mv "$installer_file_tar_bz2" "$installer_file_tbz"
-rc=$?
-if [ $rc == 0 ]; then
-  echo "Successfully created $installer_file"
-else
-  echo "Failed to create $installer_file"
-  exit 3
-fi

admin/osx/gen_sym_files.py

@@ -1,77 +0,0 @@
-#!/usr/bin/env python
-
-import logging, os, re, subprocess, sys
-import os.path
-import pdb, pprint
-
-if len(sys.argv) < 4:
-    print("Usage:")
-    print("\tgen_sym_files.py <path to breakpad's dump_syms> <path to owncloud.app> <symbol output dir>")
-    print("")
-    print("Symbols will be created in './symbols'")
-    sys.exit(1)
-
-dump_symsPath = sys.argv[1]
-bundlePath = sys.argv[2]
-outPath = sys.argv[3]
-macOsDir = os.path.join(bundlePath, 'Contents', 'MacOS')
-pluginsDir = os.path.join(bundlePath, 'Contents', 'PlugIns')
-
-def resolvePath(input):
-    resolved = re.sub(r'@\w+', macOsDir, input)
-    return os.path.normpath(resolved)
-
-def extractDeps(macho):
-    deps = [macho]
-    otool = subprocess.Popen(['otool', '-L', macho], stdout=subprocess.PIPE)
-    for l in otool.communicate()[0].splitlines():
-        if 'is not an object file' in l:
-            return []
-        m = re.search(r'@[^\s]+', l)
-        if m:
-            path = resolvePath(m.group(0))
-            if not os.path.exists(path):
-                logging.warning("Non-existant file found in dependencies, ignoring: [%s]", path)
-                continue
-            deps.append(path)
-    return deps
-
-def findDeps():
-    deps = []
-    for f in os.listdir(macOsDir):
-        path = os.path.join(macOsDir, f)
-        if not os.path.islink(path):
-            deps += extractDeps(path)
-    for root, dirs, files in os.walk(pluginsDir):
-        for f in files:
-            path = os.path.join(root, f)
-            deps += extractDeps(path)
-    return sorted(set(deps))
-
-def dumpSyms(deps):
-    for dep in deps:
-        print("Generating symbols for [%s]" % dep)
-        with open('temp.sym', 'w') as temp:
-            subprocess.check_call([dump_symsPath, dep], stdout=temp)
-        with open('temp.sym', 'r') as temp:
-            header = temp.readline()
-            fields = header.split()
-            key, name = fields[3:5]
-        destDir = '%s/%s/%s/' % (outPath, name, key)
-        destPath = destDir + name + '.sym'
-        if os.path.exists(destPath):
-            logging.warning("Symbols already exist: [%s]", destPath)
-            continue
-        if not os.path.exists(destDir):
-            os.makedirs(destDir)
-        os.rename('temp.sym', destPath)
-
-def strip(deps):
-    for dep in deps:
-        print("Stripping symbols off [%s]" % dep)
-        subprocess.check_call(['strip', '-S', dep])
-
-print('=== Generating symbols for [%s] in [%s]' % (bundlePath, outPath))
-deps = findDeps()
-dumpSyms(deps)
-strip(deps)

admin/osx/installer-background.svg

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   enable-background="new 0 0 595.275 311.111"
-   xml:space="preserve"
-   height="200"
-   width="320"
-   version="1.1"
-   y="0px"
-   x="0px"
-   viewBox="0 0 35 0"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="installer-background.svg"><metadata
-     id="metadata12"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs10" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1002"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="0.734375"
-     inkscape:cx="-49.141255"
-     inkscape:cy="236.17459"
-     inkscape:window-x="0"
-     inkscape:window-y="34"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" /><path
-     style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#ffffff;fill-opacity:1;enable-background:accumulate"
-     d="m 75.63384,28.421489 c -29.36582,0 -53.09172,23.724901 -53.09172,53.091701 0,12.1047 4.03087,23.2455 10.82647,32.1667 14.74225,-17.0631 36.50138,-27.8988 60.79508,-27.8988 11.88546,0 23.15644,2.6467 33.31219,7.2871 0.82221,-3.7185 1.24924,-7.5856 1.24924,-11.555 0,-29.3658 -23.72491,-53.091701 -53.09172,-53.091701 z M 6.30358,52.98809 c -15.29297,0 -27.58645,12.3977 -27.58645,27.6906 0,4.9515 1.27738,9.6301 3.53933,13.6373 9.22826,-5.206 19.89756,-8.2239 31.23002,-8.2239 1.09366,0 2.14708,0.039 3.22713,0.1052 -0.12231,-1.5502 -0.20806,-3.103 -0.20806,-4.6844 0,-8.5178 1.85002,-16.6223 5.10106,-23.9429 -4.37708,-2.9351 -9.62115,-4.5803 -15.30284,-4.5803 z m 130.95716,19.0502 c -1.12983,0 -2.21885,0.1381 -3.33122,0.2078 0.48121,3.0338 0.83274,6.097 0.83274,9.2651 0,4.9298 -0.62692,9.6869 -1.7697,14.2616 13.39754,7.4144 24.52385,18.5084 31.8547,31.9586 7.60342,-3.9586 16.08566,-6.4754 25.08804,-7.0787 -2.32015,-27.2093 -24.86184,-48.6137 -52.67416,-48.6137 z m -43.09675,19.7789 c -41.09117,0 -74.32775,33.2333 -74.32775,74.3278 0,41.0911 33.23329,74.3277 74.32775,74.3277 41.09447,0 74.32775,-33.2366 74.32775,-74.3277 0,-41.0945 -33.23657,-74.3278 -74.32775,-74.3278 z m -80.67652,0.3117 c -31.87937,0 -57.67166,25.792 -57.67166,57.6717 0,18.7668 8.94156,35.3802 22.79774,45.9078 5.84147,-11.2667 17.57406,-18.9461 31.1258,-18.9461 1.63789,0 3.21,0.1986 4.78871,0.4169 -0.49554,-3.6054 -0.72871,-7.2937 -0.72871,-11.0346 0,-17.8847 5.82174,-34.4234 15.71907,-47.7819 -5.92466,-7.4133 -10.1643,-16.321 -11.97162,-26.025 -1.33935,-0.092 -2.69673,-0.2078 -4.05979,-0.2078 z m 180.71831,34.3544 c -9.68,0 -18.74781,2.4714 -26.75364,6.6625 4.54607,10.0696 7.07867,21.2422 7.07867,32.9998 0,22.0146 -8.85114,42.0052 -23.21431,56.5275 10.5516,11.7145 25.861,19.0503 42.88961,19.0503 31.87937,0 57.67165,-25.7916 57.67165,-57.6717 0,-31.8793 -25.79195,-57.5664 -57.67165,-57.5664 z m -244.00885,7.5998 c -29.3701,0 -53.19693,23.6164 -53.19693,52.9832 0,29.3669 23.82815,53.1937 53.19364,53.1937 11.17727,0 21.53161,-3.4825 30.08487,-9.369 -3.5344,-5.492 -5.62151,-12.0581 -5.62151,-19.0503 0,-3.6291 0.53552,-7.1158 1.56148,-10.4099 -16.01267,-11.5721 -26.44131,-30.4034 -26.44131,-51.6319 0,-5.394 0.71083,-10.6098 1.97792,-15.6152 -0.52591,-0.013 -1.03171,-0.1052 -1.56152,-0.1052 z m 312.19495,45.5955 c -1.56661,0 -3.08252,0.1789 -4.58026,0.4169 0.0829,1.3242 0.1039,2.6108 0.1039,3.9559 0,16.9326 -6.68118,32.3015 -17.4889,43.7214 5.31706,6.1831 13.12695,10.0976 21.96526,10.0976 16.09849,0 29.14785,-12.9451 29.14785,-29.0439 0,-16.0985 -13.04936,-29.1479 -29.14785,-29.1479 z m -252.64924,3.1229 c -16.09783,0 -29.04395,12.9461 -29.04395,29.044 0,16.0978 12.94612,29.1478 29.04395,29.1478 12.33919,0 22.81287,-7.6994 27.06599,-18.5298 -10.378,-10.57 -17.83675,-24.0544 -21.13213,-39.0363 -1.92854,-0.3985 -3.88588,-0.6247 -5.93386,-0.6247 z"
-     id="path6"
-     inkscape:connector-curvature="0" /></svg>

admin/osx/macdeployqt.py

@@ -1,349 +0,0 @@
-#!/usr/bin/python
-#  This file is part of ownCloud.
-#  It was inspired in large part by the macdeploy script in Clementine
-#  and Tomahawk
-#
-#  ownCloud is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  ownCLoud is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with ownCloud.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-import re
-import subprocess
-import commands
-import sys
-from glob import glob
-
-def QueryQMake(attrib):
-    return subprocess.check_output([qmake_path, '-query', attrib]).rstrip('\n')
-
-FRAMEWORK_SEARCH_PATH=[
-    '/Library/Frameworks',
-    os.path.join(os.environ['HOME'], 'Library/Frameworks')
-]
-
-LIBRARY_SEARCH_PATH=['/usr/local/lib', '.']
-
-QT_PLUGINS = [
-    'sqldrivers/libqsqlite.dylib',
-    'platforms/libqcocoa.dylib',
-    'imageformats/libqgif.dylib',
-    'imageformats/libqico.dylib',
-    'imageformats/libqjpeg.dylib',
-    'imageformats/libqsvg.dylib',
-]
-
-QT_PLUGINS_SEARCH_PATH=[
-#    os.path.join(os.environ['QTDIR'], 'plugins'),
-    '/usr/local/Cellar/qt/5.2.1/plugins',
-]
-
-
-class Error(Exception):
-  pass
-
-
-class CouldNotFindQtPluginErrorFindFrameworkError(Error):
-  pass
-
-
-class InstallNameToolError(Error):
-  pass
-
-
-class CouldNotFindQtPluginError(Error):
-  pass
-
-
-class CouldNotFindScriptPluginError(Error):
-  pass
-
-class CouldNotFindFrameworkError(Error):
-  pass
-
-if len(sys.argv) < 3:
-  print 'Usage: %s <bundle.app> <path-to-qmake>' % sys.argv[0]
-  exit()
-
-def is_exe(fpath):
-  return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
-
-bundle_dir = sys.argv[1]
-qmake_path = sys.argv[2]
-
-bundle_name = os.path.basename(bundle_dir).split('.')[0]
-
-commands = []
-
-binary_dir = os.path.join(bundle_dir, 'Contents', 'MacOS')
-frameworks_dir = os.path.join(bundle_dir, 'Contents', 'Frameworks')
-commands.append(['mkdir', '-p', frameworks_dir])
-resources_dir = os.path.join(bundle_dir, 'Contents', 'Resources')
-commands.append(['mkdir', '-p', resources_dir])
-plugins_dir = os.path.join(bundle_dir, 'Contents', 'PlugIns')
-binaries = [i for i in glob(os.path.join(bundle_dir, 'Contents', 'MacOS', "*")) if is_exe(i)];
-
-
-fixed_libraries = []
-fixed_frameworks = []
-
-def WriteQtConf():
-  print "Writing qt.conf..."
-  with open(os.path.join(resources_dir, 'qt.conf'), 'w') as f:
-    f.write("[Paths]\nPlugins = PlugIns\n");
-    f.close()
-
-def GetBrokenLibraries(binary):
-  #print "Checking libs for binary: %s" % binary
-  output = subprocess.Popen(['otool', '-L', binary], stdout=subprocess.PIPE).communicate()[0]
-  broken_libs = {
-      'frameworks': [],
-      'libs': []}
-  for line in [x.split(' ')[0].lstrip() for x in output.split('\n')[1:]]:
-    #print "Checking line: %s" % line
-    if not line:  # skip empty lines
-      continue
-    if os.path.basename(binary) == os.path.basename(line):
-      #print "mnope %s-%s" % (os.path.basename(binary), os.path.basename(line))
-      continue
-    if re.match(r'^\s*/System/', line):
-      continue  # System framework
-    elif re.match(r'^\s*/usr/lib/', line):
-      #print "unix style system lib"
-      continue  # unix style system library
-    elif re.match(r'Breakpad', line):
-      continue  # Manually added by cmake.
-    elif re.match(r'^\s*@executable_path', line) or re.match(r'^\s*@loader_path', line):
-      # Potentially already fixed library
-      if '.framework' in line:
-        relative_path = os.path.join(*line.split('/')[3:])
-        if not os.path.exists(os.path.join(frameworks_dir, relative_path)):
-          broken_libs['frameworks'].append(relative_path)
-      else:
-        relative_path = os.path.join(*line.split('/')[1:])
-        #print "RELPATH %s %s" % (relative_path, os.path.join(binary_dir, relative_path))
-        if not os.path.exists(os.path.join(binary_dir, relative_path)):
-          broken_libs['libs'].append(relative_path)
-    elif re.search(r'\w+\.framework', line):
-      broken_libs['frameworks'].append(line)
-    else:
-      broken_libs['libs'].append(line)
-
-  return broken_libs
-
-def FindFramework(path):
-  search_pathes = FRAMEWORK_SEARCH_PATH
-  search_pathes.insert(0, QueryQMake('QT_INSTALL_LIBS'))
-  for search_path in search_pathes:
-    # The following two lines are needed for a custom built Qt from version 5.5 on, possibly not for the one from the Qt SDK.
-    # Looks like the upstream macdeployqt also had an issue there https://bugreports.qt.io/browse/QTBUG-47868
-    if path.find( "\@rpath/"):
-      path = path.replace("@rpath/", "")
-    abs_path = os.path.join(search_path, path)
-    if os.path.exists(abs_path):
-      return abs_path
-
-  raise CouldNotFindFrameworkError(path)
-
-def FindLibrary(path):
-  if os.path.exists(path):
-    return path
-  search_pathes = LIBRARY_SEARCH_PATH
-  search_pathes.insert(0, QueryQMake('QT_INSTALL_LIBS'))
-  for search_path in search_pathes:
-    abs_path = os.path.join(search_path, path)
-    if os.path.exists(abs_path):
-      return abs_path
-    else: # try harder---look for lib name in library folders
-      newpath = os.path.join(search_path,os.path.basename(path))
-      if os.path.exists(newpath):
-        return newpath
-
-  return ""
-  #raise CouldNotFindFrameworkError(path)
-
-def FixAllLibraries(broken_libs):
-  for framework in broken_libs['frameworks']:
-    FixFramework(framework)
-  for lib in broken_libs['libs']:
-    FixLibrary(lib)
-
-def FixFramework(path):
-  if path in fixed_libraries:
-    return
-  else:
-    fixed_libraries.append(path)
-  abs_path = FindFramework(path)
-  broken_libs = GetBrokenLibraries(abs_path)
-  FixAllLibraries(broken_libs)
-
-  new_path = CopyFramework(abs_path)
-  id = os.sep.join(new_path.split(os.sep)[3:])
-  FixFrameworkId(new_path, id)
-  for framework in broken_libs['frameworks']:
-    FixFrameworkInstallPath(framework, new_path)
-  for library in broken_libs['libs']:
-    FixLibraryInstallPath(library, new_path)
-
-def FixLibrary(path):
-  if path in fixed_libraries or FindSystemLibrary(os.path.basename(path)) is not None:
-    return
-  else:
-    fixed_libraries.append(path)
-  abs_path = FindLibrary(path)
-  if abs_path == "":
-    print "Could not resolve %s, not fixing!" % path
-    return
-  broken_libs = GetBrokenLibraries(abs_path)
-  FixAllLibraries(broken_libs)
-
-  new_path = CopyLibrary(abs_path)
-  FixLibraryId(new_path)
-  for framework in broken_libs['frameworks']:
-    FixFrameworkInstallPath(framework, new_path)
-  for library in broken_libs['libs']:
-    FixLibraryInstallPath(library, new_path)
-
-def FixPlugin(abs_path, subdir):
-  broken_libs = GetBrokenLibraries(abs_path)
-  FixAllLibraries(broken_libs)
-
-  new_path = CopyPlugin(abs_path, subdir)
-  for framework in broken_libs['frameworks']:
-    FixFrameworkInstallPath(framework, new_path)
-  for library in broken_libs['libs']:
-    FixLibraryInstallPath(library, new_path)
-
-def FixBinary(path):
-  broken_libs = GetBrokenLibraries(path)
-  FixAllLibraries(broken_libs)
-  for framework in broken_libs['frameworks']:
-    FixFrameworkInstallPath(framework, path)
-  for library in broken_libs['libs']:
-    FixLibraryInstallPath(library, path)
-
-def CopyLibrary(path):
-  new_path = os.path.join(binary_dir, os.path.basename(path))
-  args = ['ditto', '--arch=x86_64', path, new_path]
-  commands.append(args)
-  args = ['chmod', 'u+w', new_path]
-  commands.append(args)
-  return new_path
-
-def CopyPlugin(path, subdir):
-  new_path = os.path.join(plugins_dir, subdir, os.path.basename(path))
-  args = ['mkdir', '-p', os.path.dirname(new_path)]
-  commands.append(args)
-  args = ['ditto', '--arch=x86_64', path, new_path]
-  commands.append(args)
-  args = ['chmod', 'u+w', new_path]
-  commands.append(args)
-  return new_path
-
-def CopyFramework(source_dylib):
-  parts = source_dylib.split(os.sep)
-  print "CopyFramework:", source_dylib
-  for i, part in enumerate(parts):
-    matchObj = re.match(r'(\w+\.framework)', part)
-    if matchObj:
-      framework = matchObj.group(1)
-      dylib_name = parts[-1]
-      source_path = os.path.join('/', *parts[:i+1])
-      dest_path = os.path.join(frameworks_dir, framework)
-      dest_dylib_path = os.path.join(frameworks_dir, *parts[i:-1])
-      break
-  if os.path.exists(dest_path):
-    print dest_path, "already exists, skipping copy..."
-    return os.path.join(dest_dylib_path, dylib_name)
-
-  args = ['mkdir', '-p', dest_dylib_path]
-  commands.append(args)
-  args = ['ditto', '--arch=x86_64', source_dylib, dest_dylib_path]
-  commands.append(args)
-  args = ['chmod', 'u+w', os.path.join(dest_dylib_path, parts[-1])]
-  commands.append(args)
-  args = ['ln', '-s', '5', os.path.join(dest_path, 'Versions', 'Current')]
-  commands.append(args)
-  args = ['ln', '-s', os.path.join('Versions', 'Current', dylib_name), os.path.join(dest_path, dylib_name)]
-  commands.append(args)
-  args = ['ln', '-s', os.path.join('Versions', 'Current', 'Resources'), os.path.join(dest_path, 'Resources')]
-  commands.append(args)
-  args = ['cp', '-r', os.path.join(source_path, 'Versions', '5', 'Resources'), os.path.join(dest_path, 'Versions', '5')]
-  commands.append(args)
-
-  return os.path.join(dest_dylib_path, dylib_name)
-
-def FixId(path, library_name):
-  id = '@executable_path/../Frameworks/%s' % library_name
-  args = ['install_name_tool', '-id', id, path]
-  commands.append(args)
-
-def FixLibraryId(path):
-  library_name = os.path.basename(path)
-  FixId(path, library_name)
-
-def FixFrameworkId(path, id):
-  FixId(path, id)
-
-def FixInstallPath(library_path, library, new_path):
-  args = ['install_name_tool', '-change', library_path, new_path, library]
-  commands.append(args)
-
-def FindSystemLibrary(library_name):
-  for path in ['/lib', '/usr/lib']:
-    full_path = os.path.join(path, library_name)
-    if os.path.exists(full_path):
-      return full_path
-  return None
-
-def FixLibraryInstallPath(library_path, library):
-  system_library = FindSystemLibrary(os.path.basename(library_path))
-  if system_library is None:
-    new_path = '@executable_path/../MacOS/%s' % os.path.basename(library_path)
-    FixInstallPath(library_path, library, new_path)
-  else:
-    FixInstallPath(library_path, library, system_library)
-
-def FixFrameworkInstallPath(library_path, library):
-  parts = library_path.split(os.sep)
-  for i, part in enumerate(parts):
-    if re.match(r'\w+\.framework', part):
-      full_path = os.path.join(*parts[i:])
-      break
-  new_path = '@executable_path/../Frameworks/%s' % full_path
-  FixInstallPath(library_path, library, new_path)
-
-def FindQtPlugin(name):
-  search_path = QT_PLUGINS_SEARCH_PATH
-  search_path.insert(0, QueryQMake('QT_INSTALL_PLUGINS'))
-  for path in search_path:
-    if os.path.exists(path):
-      if os.path.exists(os.path.join(path, name)):
-        return os.path.join(path, name)
-  raise CouldNotFindQtPluginError(name)
-
-for binary in binaries:
-  FixBinary(binary)
-
-for plugin in QT_PLUGINS:
-  FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
-
-if len(sys.argv) <= 2:
-  print 'Will run %d commands:' % len(commands)
-  for command in commands:
-    print ' '.join(command)
-
-for command in commands:
-  p = subprocess.Popen(command)
-  os.waitpid(p.pid, 0)
-
-WriteQtConf()

admin/osx/post_install.sh.cmake

@@ -1,21 +0,0 @@
-#!/bin/sh
-
-osascript << EOF
-tell application "Finder"
-   activate
-   select the last Finder window
-	reveal POSIX file "/Applications/@APPLICATION_EXECUTABLE@.app"
-end tell
-EOF
-
-# Always enable the new 10.10 finder plugin if available
-if [ -x "$(command -v pluginkit)" ]; then
-    # add it to DB. This happens automatically too but we try to push it a bit harder for issue #3463
-    pluginkit -a  "/Applications/@APPLICATION_EXECUTABLE@.app/Contents/PlugIns/FinderSyncExt.appex/"
-    # Since El Capitan we need to sleep #4650
-    sleep 10s
-    # enable it
-    pluginkit -e use -i @APPLICATION_REV_DOMAIN@.FinderSyncExt
-fi
-
-exit 0

admin/osx/pre_install.sh.cmake

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# kill the old version. see issue #2044
-killall @APPLICATION_EXECUTABLE@
-
-# Unload the Finder plugin. see issue #2105
-killall Finder
-
-exit 0

admin/osx/sign_app.sh

@@ -1,19 +0,0 @@
-#!/bin/sh -xe
-
-[ "$#" -lt 2 ] && echo "Usage: sign_app.sh <app> <identity> <team_identifier>" && exit
-
-src_app="$1"
-identity="$2"
-team_identifier="$3"
-
-codesign -s "$identity" --force --preserve-metadata=entitlements --verbose=4 --deep "$src_app"
-
-# Verify the signature
-codesign -dv $src_app
-codesign --verify -v $src_app
-spctl -a -t exec -vv $src_app
-
-# Validate that the key used for signing the binary matches the expected TeamIdentifier
-# needed to pass the SocketApi through the sandbox
-codesign -dv $src_app 2>&1 | grep "TeamIdentifier=$team_identifier"
-exit $?

admin/qt/patches/README.md

@@ -1,20 +0,0 @@
-## Patches used
-
-There are our patches on top of Qt 5.6.2, which we are currently
-using for our binary packages on Windows and macOS. Most of them
-have been sent upstream and are part of newer Qt releases.
-
-All changes are designed to be upstream, and all those that are
-special hacks to Qt will bear a NOUPSTREAM in their name
-
-You can apply those patches on a git clone using:
-
-```
-git am <client>/admin/qt/patches/qtbase/*.patch
-```
-
-You can update them using:
-
-```
-git format-patch -N --no-signature -o <client>/admin/qt/patches/qtbase/ <v5.x.y>
-```

admin/qt/patches/qtbase/0001-NOUPSTREAM-Fix-force-debug-info-with-macx-clang.patch

@@ -1,27 +0,0 @@
-From 96c34ce85136cbdc16ef83effa8a13137f7ae4c5 Mon Sep 17 00:00:00 2001
-From: Jocelyn Turcotte <jturcotte@woboq.com>
-Date: Fri, 6 Mar 2015 16:12:37 +0100
-Subject: [PATCH] [NOUPSTREAM] Fix -force-debug-info with macx-clang
-
----
- mkspecs/common/clang.conf | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
-index e003b94..e9b3291 100644
---- a/mkspecs/common/clang.conf
-+++ b/mkspecs/common/clang.conf
-@@ -21,11 +21,13 @@ QMAKE_CFLAGS_PRECOMPILE          = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_
- QMAKE_CFLAGS_USE_PRECOMPILE      = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT}
- QMAKE_CFLAGS_LTCG                = -flto
- QMAKE_CFLAGS_DISABLE_LTCG        = -fno-lto
-+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = $$QMAKE_CFLAGS_OPTIMIZE -g
- 
- QMAKE_CXXFLAGS_PRECOMPILE        = -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
- QMAKE_CXXFLAGS_USE_PRECOMPILE    = $$QMAKE_CFLAGS_USE_PRECOMPILE
- QMAKE_CXXFLAGS_LTCG              = $$QMAKE_CFLAGS_LTCG
- QMAKE_CXXFLAGS_DISABLE_LTCG      = $$QMAKE_CFLAGS_DISABLE_LTCG
-+QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
- QMAKE_CXXFLAGS_CXX11             = -std=c++11
- QMAKE_CXXFLAGS_CXX14             = -std=c++1y
- QMAKE_CXXFLAGS_CXX1Z             = -std=c++1z

admin/qt/patches/qtbase/0002-Remove-legacy-platform-code-in-QSslSocket-for-OS-X-1.patch

@@ -1,148 +0,0 @@
-From e6bccb1f0d8ca59acb1ffdac74a823c06346e7f3 Mon Sep 17 00:00:00 2001
-From: Daniel Molkentin <daniel@molkentin.de>
-Date: Mon, 16 Nov 2015 15:02:37 +0100
-Subject: [PATCH] Remove legacy platform code in QSslSocket for OS X < 10.5
-
-This avoids manual symbol lookups and makes the code more readable.
-Mark identical code.
-
-Also use smart pointers instead of manual memory management.
-
-(Backport of d42d7781f1cd62c3c7c008859507f24a1ff5bb2a to Qt 5.4)
-
-Change-Id: I62820313dce87de6623cdc87b6e1361200ed7822
-Reviewed-by: Markus Goetz (Woboq GmbH) <markus@woboq.com>
-
-Conflicts:
-	src/network/ssl/qsslsocket_openssl.cpp
----
- src/network/ssl/qsslsocket_openssl.cpp | 81 +++++++++++-----------------------
- src/network/ssl/qsslsocket_p.h         |  6 +--
- 2 files changed, 26 insertions(+), 61 deletions(-)
-
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index 82644c1..415f147 100644
---- a/src/network/ssl/qsslsocket_openssl.cpp
-+++ b/src/network/ssl/qsslsocket_openssl.cpp
-@@ -76,14 +76,17 @@
- 
- #include <string.h>
- 
-+#ifdef Q_OS_DARWIN
-+#  include <private/qcore_mac_p.h>
-+#endif
-+
-+#ifdef Q_OS_OSX
-+#  include <Security/Security.h>
-+#endif
-+
- QT_BEGIN_NAMESPACE
- 
--#if defined(Q_OS_MACX)
--#define kSecTrustSettingsDomainSystem 2 // so we do not need to include the header file
--    PtrSecCertificateCopyData QSslSocketPrivate::ptrSecCertificateCopyData = 0;
--    PtrSecTrustSettingsCopyCertificates QSslSocketPrivate::ptrSecTrustSettingsCopyCertificates = 0;
--    PtrSecTrustCopyAnchorCertificates QSslSocketPrivate::ptrSecTrustCopyAnchorCertificates = 0;
--#elif defined(Q_OS_WIN)
-+#if defined(Q_OS_WIN)
-     PtrCertOpenSystemStoreW QSslSocketPrivate::ptrCertOpenSystemStoreW = 0;
-     PtrCertFindCertificateInStore QSslSocketPrivate::ptrCertFindCertificateInStore = 0;
-     PtrCertCloseStore QSslSocketPrivate::ptrCertCloseStore = 0;
-@@ -509,23 +512,7 @@ void QSslSocketPrivate::ensureCiphersAndCertsLoaded()
- 
- #ifndef QT_NO_LIBRARY
-     //load symbols needed to receive certificates from system store
--#if defined(Q_OS_MACX)
--    QLibrary securityLib("/System/Library/Frameworks/Security.framework/Versions/Current/Security");
--    if (securityLib.load()) {
--        ptrSecCertificateCopyData = (PtrSecCertificateCopyData) securityLib.resolve("SecCertificateCopyData");
--        if (!ptrSecCertificateCopyData)
--            qCWarning(lcSsl, "could not resolve symbols in security library"); // should never happen
--
--        ptrSecTrustSettingsCopyCertificates = (PtrSecTrustSettingsCopyCertificates) securityLib.resolve("SecTrustSettingsCopyCertificates");
--        if (!ptrSecTrustSettingsCopyCertificates) { // method was introduced in Leopard, use legacy method if it's not there
--            ptrSecTrustCopyAnchorCertificates = (PtrSecTrustCopyAnchorCertificates) securityLib.resolve("SecTrustCopyAnchorCertificates");
--            if (!ptrSecTrustCopyAnchorCertificates)
--                qCWarning(lcSsl, "could not resolve symbols in security library"); // should never happen
--        }
--    } else {
--        qCWarning(lcSsl, "could not load security library");
--    }
--#elif defined(Q_OS_WIN)
-+#if defined(Q_OS_WIN)
-     HINSTANCE hLib = LoadLibraryW(L"Crypt32");
-     if (hLib) {
- #if defined(Q_OS_WINCE)
-@@ -693,40 +680,22 @@ QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
-     timer.start();
- #endif
-     QList<QSslCertificate> systemCerts;
--#if defined(Q_OS_MACX)
--    CFArrayRef cfCerts;
--    OSStatus status = 1;
--
--    CFDataRef SecCertificateCopyData (
--       SecCertificateRef certificate
--    );
--
--    if (ptrSecCertificateCopyData) {
--        if (ptrSecTrustSettingsCopyCertificates)
--            status = ptrSecTrustSettingsCopyCertificates(kSecTrustSettingsDomainSystem, &cfCerts);
--        else if (ptrSecTrustCopyAnchorCertificates)
--            status = ptrSecTrustCopyAnchorCertificates(&cfCerts);
--        if (!status) {
--            CFIndex size = CFArrayGetCount(cfCerts);
--            for (CFIndex i = 0; i < size; ++i) {
--                SecCertificateRef cfCert = (SecCertificateRef)CFArrayGetValueAtIndex(cfCerts, i);
--                CFDataRef data;
--
--                data = ptrSecCertificateCopyData(cfCert);
--
--                if (data == NULL) {
--                    qCWarning(lcSsl, "error retrieving a CA certificate from the system store");
--                } else {
--                    QByteArray rawCert = QByteArray::fromRawData((const char *)CFDataGetBytePtr(data), CFDataGetLength(data));
--                    systemCerts.append(QSslCertificate::fromData(rawCert, QSsl::Der));
--                    CFRelease(data);
--                }
-+    // note: also check implementation in openssl_mac.cpp
-+#if defined(Q_OS_OSX)
-+    // SecTrustSettingsCopyCertificates is not defined on iOS.
-+    QCFType<CFArrayRef> cfCerts;
-+
-+    OSStatus status = SecTrustSettingsCopyCertificates(kSecTrustSettingsDomainSystem, &cfCerts);
-+    if (status == noErr ) {
-+        const CFIndex size = CFArrayGetCount(cfCerts);
-+        for (CFIndex i = 0; i < size; ++i) {
-+            SecCertificateRef cfCert = (SecCertificateRef)CFArrayGetValueAtIndex(cfCerts, i);
-+            QCFType<CFDataRef> derData = SecCertificateCopyData(cfCert);
-+            if (derData == NULL) {
-+                qWarning("error retrieving a CA certificate from the system store");
-+            } else {
-+                systemCerts << QSslCertificate(QByteArray::fromCFData(derData), QSsl::Der);
-             }
--            CFRelease(cfCerts);
--        }
--        else {
--           // no detailed error handling here
--           qCWarning(lcSsl, "could not retrieve system CA certificates");
-         }
-     }
- #elif defined(Q_OS_WIN)
-diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h
-index d651971..17cc7b4 100644
---- a/src/network/ssl/qsslsocket_p.h
-+++ b/src/network/ssl/qsslsocket_p.h
-@@ -151,11 +151,7 @@ public:
-     static bool isMatchingHostname(const QSslCertificate &cert, const QString &peerName);
-     Q_AUTOTEST_EXPORT static bool isMatchingHostname(const QString &cn, const QString &hostname);
- 
--#if defined(Q_OS_MACX)
--    static PtrSecCertificateCopyData ptrSecCertificateCopyData;
--    static PtrSecTrustSettingsCopyCertificates ptrSecTrustSettingsCopyCertificates;
--    static PtrSecTrustCopyAnchorCertificates ptrSecTrustCopyAnchorCertificates;
--#elif defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
-+#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
-     static PtrCertOpenSystemStoreW ptrCertOpenSystemStoreW;
-     static PtrCertFindCertificateInStore ptrCertFindCertificateInStore;
-     static PtrCertCloseStore ptrCertCloseStore;

admin/qt/patches/qtbase/0003-QSslSocket-evaluate-CAs-in-all-keychain-categories.patch

@@ -1,276 +0,0 @@
-From 9d1120db0973ea7741b13a6555b20ae61f6d037e Mon Sep 17 00:00:00 2001
-From: Daniel Molkentin <danimo@owncloud.com>
-Date: Wed, 25 Nov 2015 12:37:27 +0100
-Subject: [PATCH] QSslSocket: evaluate CAs in all keychain categories
-
-This will make sure that certs in the domainUser (login),
-and domainAdmin (per machine) keychain are being picked up
-in systemCaCertificates() in addition to the (usually immutable)
-DomainSystem keychain.
-
-Also consider the trust settings on OS X: If a certificate
-is either fully trusted or trusted for the purpose of SSL,
-it will be accepted.
-
-[ChangeLog][Platform Specific Changes] OS X now accepts trusted
-        certificates from the login and system keychains.
-
-(Backport of fe3a84138e266c425f11353f7d8dc28a588af89e)
-
-Task-number: QTBUG-32898
-Change-Id: Ia23083d5af74388eeee31ba07239735cbbe64368
-Reviewed-by: Markus Goetz (Woboq GmbH) <markus@woboq.com>
----
- src/network/ssl/qsslsocket.cpp            |   4 +
- src/network/ssl/qsslsocket_mac_shared.cpp | 148 ++++++++++++++++++++++++++++++
- src/network/ssl/qsslsocket_openssl.cpp    |  30 +-----
- src/network/ssl/ssl.pri                   |   4 +-
- 4 files changed, 158 insertions(+), 28 deletions(-)
- create mode 100644 src/network/ssl/qsslsocket_mac_shared.cpp
-
-diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
-index 549906a..7b202b0 100644
---- a/src/network/ssl/qsslsocket.cpp
-+++ b/src/network/ssl/qsslsocket.cpp
-@@ -1508,6 +1508,10 @@ QList<QSslCertificate> QSslSocket::defaultCaCertificates()
-     returned by defaultCaCertificates(). You can replace that database
-     with your own with setDefaultCaCertificates().
- 
-+    \note: On OS X, only certificates that are either trusted for all
-+    purposes or trusted for the purpose of SSL in the keychain will be
-+    returned.
-+
-     \sa caCertificates(), defaultCaCertificates(), setDefaultCaCertificates()
- */
- QList<QSslCertificate> QSslSocket::systemCaCertificates()
-diff --git a/src/network/ssl/qsslsocket_mac_shared.cpp b/src/network/ssl/qsslsocket_mac_shared.cpp
-new file mode 100644
-index 0000000..60fea4c
---- /dev/null
-+++ b/src/network/ssl/qsslsocket_mac_shared.cpp
-@@ -0,0 +1,148 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2015 The Qt Company Ltd.
-+** Copyright (C) 2015 ownCloud Inc
-+** Contact: http://www.qt.io/licensing/
-+**
-+** This file is part of the QtNetwork module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL21$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and The Qt Company. For licensing terms
-+** and conditions see http://www.qt.io/terms-conditions. For further
-+** information use the contact form at http://www.qt.io/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 or version 3 as published by the Free
-+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-+** following information to ensure the GNU Lesser General Public License
-+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** As a special exception, The Qt Company gives you certain additional
-+** rights. These rights are described in The Qt Company LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+//#define QSSLSOCKET_DEBUG
-+//#define QT_DECRYPT_SSL_TRAFFIC
-+
-+#include "qsslsocket.h"
-+
-+#ifndef QT_NO_OPENSSL
-+#   include "qsslsocket_openssl_p.h"
-+#   include "qsslsocket_openssl_symbols_p.h"
-+#endif
-+
-+#include "qsslcertificate_p.h"
-+
-+#ifdef Q_OS_DARWIN
-+#   include <private/qcore_mac_p.h>
-+#endif
-+
-+#include <QtCore/qdebug.h>
-+
-+#ifdef Q_OS_OSX
-+#   include <Security/Security.h>
-+#endif
-+
-+
-+QT_BEGIN_NAMESPACE
-+
-+#ifdef Q_OS_OSX
-+namespace {
-+
-+bool hasTrustedSslServerPolicy(SecPolicyRef policy, CFDictionaryRef props) {
-+    QCFType<CFDictionaryRef> policyProps = SecPolicyCopyProperties(policy);
-+    // only accept certificates with policies for SSL server validation for now
-+    if (CFEqual(CFDictionaryGetValue(policyProps, kSecPolicyOid), kSecPolicyAppleSSL)) {
-+        CFBooleanRef policyClient;
-+        if (CFDictionaryGetValueIfPresent(policyProps, kSecPolicyClient, reinterpret_cast<const void**>(&policyClient)) &&
-+            CFEqual(policyClient, kCFBooleanTrue)) {
-+            return false; // no client certs
-+        }
-+        if (!CFDictionaryContainsKey(props, kSecTrustSettingsResult)) {
-+            // as per the docs, no trust settings result implies full trust
-+            return true;
-+        }
-+        CFNumberRef number = static_cast<CFNumberRef>(CFDictionaryGetValue(props, kSecTrustSettingsResult));
-+        SecTrustSettingsResult settingsResult;
-+        CFNumberGetValue(number, kCFNumberSInt32Type, &settingsResult);
-+        switch (settingsResult) {
-+        case kSecTrustSettingsResultTrustRoot:
-+        case kSecTrustSettingsResultTrustAsRoot:
-+            return true;
-+        default:
-+            return false;
-+        }
-+    }
-+    return false;
-+}
-+
-+bool isCaCertificateTrusted(SecCertificateRef cfCert, int domain)
-+{
-+    QCFType<CFArrayRef> cfTrustSettings;
-+    OSStatus status = SecTrustSettingsCopyTrustSettings(cfCert, domain, &cfTrustSettings);
-+    if (status == noErr) {
-+        CFIndex size = CFArrayGetCount(cfTrustSettings);
-+        // if empty, trust for everything (as per the Security Framework documentation)
-+        if (size == 0) {
-+            return true;
-+        } else {
-+            for (CFIndex i = 0; i < size; ++i) {
-+                CFDictionaryRef props = static_cast<CFDictionaryRef>(CFArrayGetValueAtIndex(cfTrustSettings, i));
-+                if (CFDictionaryContainsKey(props, kSecTrustSettingsPolicy)) {
-+                    if (hasTrustedSslServerPolicy((SecPolicyRef)CFDictionaryGetValue(props, kSecTrustSettingsPolicy), props))
-+                        return true;
-+                }
-+            }
-+        }
-+    } else {
-+        qWarning("Error receiving trust for a CA certificate");
-+    }
-+    return false;
-+}
-+
-+} // anon namespace
-+#endif // Q_OS_OSX
-+
-+QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
-+{
-+    ensureInitialized();
-+
-+    QList<QSslCertificate> systemCerts;
-+    // SecTrustSettingsCopyCertificates is not defined on iOS.
-+#ifdef Q_OS_OSX
-+    QCFType<CFArrayRef> cfCerts;
-+    // iterate through all enum members, order:
-+    // kSecTrustSettingsDomainUser, kSecTrustSettingsDomainAdmin, kSecTrustSettingsDomainSystem
-+    for (int dom = kSecTrustSettingsDomainUser; dom <= kSecTrustSettingsDomainSystem; dom++) {
-+        OSStatus status = SecTrustSettingsCopyCertificates(dom, &cfCerts);
-+        if (status == noErr) {
-+            const CFIndex size = CFArrayGetCount(cfCerts);
-+            for (CFIndex i = 0; i < size; ++i) {
-+                SecCertificateRef cfCert = (SecCertificateRef)CFArrayGetValueAtIndex(cfCerts, i);
-+                QCFType<CFDataRef> derData = SecCertificateCopyData(cfCert);
-+                if (::isCaCertificateTrusted(cfCert, dom)) {
-+                    if (derData == NULL) {
-+                        qWarning("Error retrieving a CA certificate from the system store");
-+                    } else {
-+                        systemCerts << QSslCertificate(QByteArray::fromCFData(derData), QSsl::Der);
-+                    }
-+                }
-+            }
-+        }
-+    }
-+#endif
-+    return systemCerts;
-+}
-+
-+QT_END_NAMESPACE
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index 415f147..7a3cb42 100644
---- a/src/network/ssl/qsslsocket_openssl.cpp
-+++ b/src/network/ssl/qsslsocket_openssl.cpp
-@@ -76,14 +76,6 @@
- 
- #include <string.h>
- 
--#ifdef Q_OS_DARWIN
--#  include <private/qcore_mac_p.h>
--#endif
--
--#ifdef Q_OS_OSX
--#  include <Security/Security.h>
--#endif
--
- QT_BEGIN_NAMESPACE
- 
- #if defined(Q_OS_WIN)
-@@ -672,6 +664,7 @@ void QSslSocketPrivate::resetDefaultEllipticCurves()
-     setDefaultSupportedEllipticCurves(curves);
- }
- 
-+#ifndef Q_OS_DARWIN // Apple implementation in qsslsocket_mac_shared.cpp
- QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
- {
-     ensureInitialized();
-@@ -680,25 +673,7 @@ QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
-     timer.start();
- #endif
-     QList<QSslCertificate> systemCerts;
--    // note: also check implementation in openssl_mac.cpp
--#if defined(Q_OS_OSX)
--    // SecTrustSettingsCopyCertificates is not defined on iOS.
--    QCFType<CFArrayRef> cfCerts;
--
--    OSStatus status = SecTrustSettingsCopyCertificates(kSecTrustSettingsDomainSystem, &cfCerts);
--    if (status == noErr ) {
--        const CFIndex size = CFArrayGetCount(cfCerts);
--        for (CFIndex i = 0; i < size; ++i) {
--            SecCertificateRef cfCert = (SecCertificateRef)CFArrayGetValueAtIndex(cfCerts, i);
--            QCFType<CFDataRef> derData = SecCertificateCopyData(cfCert);
--            if (derData == NULL) {
--                qWarning("error retrieving a CA certificate from the system store");
--            } else {
--                systemCerts << QSslCertificate(QByteArray::fromCFData(derData), QSsl::Der);
--            }
--        }
--    }
--#elif defined(Q_OS_WIN)
-+#if defined(Q_OS_WIN)
-     if (ptrCertOpenSystemStoreW && ptrCertFindCertificateInStore && ptrCertCloseStore) {
-         HCERTSTORE hSystemStore;
- #if defined(Q_OS_WINCE)
-@@ -775,6 +750,7 @@ QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
- 
-     return systemCerts;
- }
-+#endif // Q_OS_DARWIN
- 
- void QSslSocketBackendPrivate::startClientEncryption()
- {
-diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
-index 29c47cd..8eb605b 100644
---- a/src/network/ssl/ssl.pri
-+++ b/src/network/ssl/ssl.pri
-@@ -62,7 +62,9 @@ contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
-                ssl/qsslsocket_openssl.cpp \
-                ssl/qsslsocket_openssl_symbols.cpp
- 
--android:!android-no-sdk: SOURCES += ssl/qsslsocket_openssl_android.cpp
-+    darwin:SOURCES += ssl/qsslsocket_mac_shared.cpp
-+
-+    android:!android-no-sdk: SOURCES += ssl/qsslsocket_openssl_android.cpp
- 
-     # Add optional SSL libs
-     # Static linking of OpenSSL with msvc:

admin/win/Toolchain-mingw32-openSUSE.cmake

@@ -22,8 +22,8 @@ SET(QMAKESPEC               win32-g++-cross)
 
 # dirs
 SET(QT_LIBRARY_DIR          /usr/${MINGW_PREFIX}/bin)
-SET(QT_PLUGINS_DIR          ${CMAKE_FIND_ROOT_PATH}/lib/qt5/plugins)
-SET(QT_MKSPECS_DIR          ${CMAKE_FIND_ROOT_PATH}/share/qt5/mkspecs)
+SET(QT_PLUGINS_DIR          ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins)
+SET(QT_MKSPECS_DIR          ${CMAKE_FIND_ROOT_PATH}/share/qt4/mkspecs)
 SET(QT_QT_INCLUDE_DIR       ${CMAKE_FIND_ROOT_PATH}/include)
 
 # qt tools
@@ -32,3 +32,7 @@ SET(QT_MOC_EXECUTABLE       ${MINGW_PREFIX}-moc)
 SET(QT_RCC_EXECUTABLE       ${MINGW_PREFIX}-rcc)
 SET(QT_UIC_EXECUTABLE       ${MINGW_PREFIX}-uic)
 SET(QT_LRELEASE_EXECUTABLE  ${MINGW_PREFIX}-lrelease)
+
+# neon config
+SET(NEON_CONFIG_EXECUTABLE  ${CMAKE_FIND_ROOT_PATH}/bin/neon-config)
+# /usr/i686-w64-mingw32/sys-root/mingw/bin/neon-config

admin/win/create_stable_toolchain.sh

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-#
-# This script creates a new windows toolchain repository in OBS.
-# It only works for versions that do not yet exist.
-#
-# Make sure to adopt the variable stableversion.
-
-# Set the new stable version accordingly:
-stableversion=2.1
-targetproject="isv:ownCloud:toolchains:mingw:win32:${stableversion}"
-
-# Create the new repo
-
-# get the xml build description of the stable repo
-xml=`osc meta prj isv:ownCloud:toolchains:mingw:win32:stable`
-stable_xml="${xml/stable/$stableversion}"
-
-echo $stable_xml
-
-echo $stable_xml | osc meta prj -F - ${targetproject}
-
-
-# now copy all packages
-packs=`osc ls isv:ownCloud:toolchains:mingw:win32:stable`
-
-for pack in $packs
-do
-    osc copypac isv:ownCloud:toolchains:mingw:win32:stable $pack $targetproject
-done

admin/win/docker/Dockerfile

@@ -1,37 +0,0 @@
-FROM opensuse:42.1
-
-MAINTAINER Daniel Molkentin <danimo@owncloud.com>
-
-ENV TERM ansi
-ENV HOME /root
-
-ENV REFRESHED_AT 20160421
-
-RUN zypper --non-interactive --gpg-auto-import-keys refresh
-RUN zypper --non-interactive --gpg-auto-import-keys ar http://download.opensuse.org/repositories/windows:/mingw/openSUSE_42.1/windows:mingw.repo
-RUN zypper --non-interactive --gpg-auto-import-keys ar http://download.opensuse.org/repositories/isv:ownCloud:toolchains:mingw:win32:2.3/openSUSE_Leap_42.1/isv:ownCloud:toolchains:mingw:win32:2.3.repo
-RUN zypper --non-interactive --gpg-auto-import-keys install cmake make mingw32-cross-binutils mingw32-cross-cpp mingw32-cross-gcc \
-                      mingw32-cross-gcc-c++ mingw32-cross-pkg-config mingw32-filesystem \
-                      mingw32-headers mingw32-runtime site-config mingw32-libwebp \
-                      mingw32-cross-libqt5-qmake mingw32-cross-libqt5-qttools mingw32-libqt5* \
-                      mingw32-qt5keychain* mingw32-angleproject* \
-                      mingw32-cross-nsis mingw32-libopenssl* \
-                      mingw32-sqlite* kdewin-png2ico \
-                      osslsigncode wget
-
-# RPM depends on curl for installs from HTTP
-RUN zypper --non-interactive --gpg-auto-import-keys install curl
-
-# sudo needed for building as user
-RUN zypper --non-interactive --gpg-auto-import-keys install sudo
-
-# Use packaged UAC dependencies
-RUN zypper --non-interactive --gpg-auto-import-keys install mingw32-cross-nsis-plugin-uac mingw32-cross-nsis-plugin-nsprocess
-
-# Required for checksumming
-RUN zypper --non-interactive --gpg-auto-import-keys install mingw32-zlib-devel
-
-# Required for windres not to crash
-RUN zypper --non-interactive --gpg-auto-import-keys install glibc-locale
-
-CMD /bin/bash

admin/win/docker/build.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-if [ $# -lt 1 ]; then
-  echo "Usage: $(basename $0) directory_relative_to_home [uid]"
-  exit
-fi
-
-useradd user -u ${2:-1000}
-su - user << EOF
-  cd /home/user/$1
-  rm -rf build-win32
-  mkdir build-win32
-  cd build-win32
-  ../admin/win/download_runtimes.sh
-  cmake .. -DCMAKE_TOOLCHAIN_FILE=../admin/win/Toolchain-mingw32-openSUSE.cmake -DWITH_CRASHREPORTER=ON
-  make -j4
-  make package
-  ctest .
-EOF

admin/win/download_runtimes.sh

@@ -1,19 +0,0 @@
-#!/bin/sh -x
-
-#VS2013
-base_url=http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3
-tmp_path=${1:-/tmp/.vcredist}
-
-mkdir -p $tmp_path
-
-copy_cached_file() {
-  file=$1
-  if [ ! -e $tmp_path/$file ]; then
-    wget -O $tmp_path/$file $base_url/$file
-  fi
-  cp -a $tmp_path/$file $PWD
-}
-
-copy_cached_file "vcredist_x64.exe"
-copy_cached_file "vcredist_x86.exe"
-

admin/win/nsi/README.md

@@ -2,9 +2,9 @@
 
 ## Introduction
 
-Translations on transifex: http://www.transifex.com/projects/p/owncloud/resource/client-nsis/
+Translations on transifex: http://www.transifex.com/projects/p/owncloud/resource/mirall-wininstaller/
 
-Daily sync job: https://ci.owncloud.org/view/translation-sync/job/translation-sync-client-nsis/
+Daily sync job: https://ci.owncloud.org/view/translation-sync/job/translation-sync-mirall-wininstaller/
 
 ## How to add a new translation string?
 

admin/win/nsi/l10n/.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[owncloud.client-nsis]
+[owncloud.mirall-wininstaller]
 host = https://www.transifex.com
 source_file = pofiles/messages.pot
 source_lang = en
@@ -10,25 +10,24 @@ minimum_perc = 5
 
 # simple one-to-one language mappings
 trans.ca = pofiles/ca.po
-trans.el = pofiles/el.po
-trans.es_AR = pofiles/es_AR.po
-trans.es = pofiles/es.po
-trans.eu = pofiles/eu.po
-trans.fa = pofiles/fa.po
-trans.fr = pofiles/fr.po
-trans.gl = pofiles/gl.po
-trans.it = pofiles/it.po
-trans.nb_NO = pofiles/nb_NO.po
-trans.nl = pofiles/nl.po
-trans.pl = pofiles/pl.po
-trans.pt_BR = pofiles/pt_BR.po
-trans.ru = pofiles/ru.po
+trans.el = pofiles/el.po  
+trans.es = pofiles/es.po  
+trans.es_AR = pofiles/es_AR.po  
+trans.eu = pofiles/eu.po  
+trans.fa = pofiles/fa.po 
+trans.fr = pofiles/fr.po 
+trans.gl = pofiles/gl.po  
+trans.it = pofiles/it.po  
+trans.nl = pofiles/nl.po    
+trans.pl = pofiles/pl.po     
+trans.pt_BR = pofiles/pt_BR.po  
+trans.ru = pofiles/ru.po    
 trans.sl = pofiles/sl.po
 trans.sv = pofiles/sv.po
 trans.tr = pofiles/tr.po
-trans.uk = pofiles/uk.po
-trans.zh_CN = pofiles/zh_CN.po
-trans.zh_TW = pofiles/zh_TW.po
+trans.uk = pofiles/uk.po     
+trans.zh_TW = pofiles/zh_TW.po  
+trans.zh_CN = pofiles/zh_CN.po  
 
 # special handling below
 
@@ -36,13 +35,14 @@ trans.zh_TW = pofiles/zh_TW.po
 trans.de_DE = pofiles/de.po
 
 # choose one of the given translations on transifex as default
-trans.pt_PT = pofiles/pt.po
+trans.pt_PT = pofiles/pt.po  
 
 # choose a special language as more generic default
-trans.cs_CZ = pofiles/cs.po
-trans.et_EE = pofiles/et.po
-trans.fi_FI = pofiles/fi.po
-trans.hu_HU = pofiles/hu.po
-trans.ja_JP = pofiles/ja.po
-trans.sk_SK = pofiles/sk.po
-trans.th_TH = pofiles/th.po
+trans.cs_CZ = pofiles/cs.po 
+trans.et_EE = pofiles/et.po 
+trans.fi_FI = pofiles/fi.po  
+trans.ja_JP = pofiles/ja.po  
+trans.hu_HU = pofiles/hu.po  
+trans.sk_SK = pofiles/sk.po  
+trans.th_TH = pofiles/th.po  
+

admin/win/nsi/l10n/Basque.nsh

@@ -1,43 +1,44 @@
 # Auto-generated - do not modify
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Erakutsi bertsio-berritze oharrak"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Gelditu beharreko ${APPLICATION_EXECUTABLE} prozesua(k) aurkitu dira.$\nNahi duzu instalatzaileak zure partetik hauek gelditzea?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "${APPLICATION_EXECUTABLE} prozesuak hiltzen."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "kill prozesua ez da aurkitu!"
-StrCpy $PageReinstall_NEW_Field_1 "${APPLICATION_NAME}ren bertsio zaharrago bat instalatuta dago. Aholkatzen da hau desinstalatzea berria instalatu baino lehen. Hautatu nahi duzun aukera eta sakatu Hurrengoa jarraitzeko."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstalatu instalatu baino lehen"
 StrCpy $PageReinstall_NEW_Field_3 "Ez desinstalatu"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Dagoeneko Instalatuta"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Hautatu nola nahi duzun ${APPLICATION_NAME} instalatzea."
-StrCpy $PageReinstall_OLD_Field_1 "${APPLICATION_NAME}ren bertsio berriago bat instalatuta dago! Ez da aholkatzen bertsio zaharrago bat instalatzea. Benetan bertsio zaharrago hau instalatu nahi baduzu, hobe da lehenengo bertsio berria desinstalatzea. Hautatu nahi duzun aukera eta sakatu Hurrengoa jarraitzeko."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} dagoeneko instalatuta dago.$\nHautatu zer operazio egin nahi duzu eta klikatu Hurrengoa jarraitzeko."
 StrCpy $PageReinstall_SAME_Field_2 "Gehitu/Berrinstalatu osagaiak"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalatu ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalatu ${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Hautatu zer mantenu aukera egin nahi duzun."
-StrCpy $SEC_APPLICATION_DETAILS "${APPLICATION_NAME} ezinbestekoak instalatzen."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Windows Explorerekin Integrazioa"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Windows Explorerekin Integrazioa Instalatzen"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Hasierako Menuko Lasterbidea"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Hasierako Menuan ${APPLICATION_NAME}rako Abiarazle bizkorra sortzen."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Mahaigaineko Lasterbidea"
 StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Mahaigaineko Lasterbideak Sortzen"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Abiarazle Bizkorreko Lasterbidea"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Abiarazle Bizkorreko Lasterbidea Sortzen"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} ezinbestekoak."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} lasterbidea."
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "${APPLICATION_NAME}rako mahaigaineko lasterbidea."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "${APPLICATION_NAME}erako Abiarazle Bizkorreko Lasterbidea."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Ezabatu ${APPLICATION_NAME}en datuen karpeta zure ordenagailutik."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "${APPLICATION_NAME}en datuen karpeta ezabatu nahi duzu?"
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Bai, ezabtu datu karpeta hau."
 StrCpy $UNINSTALLER_FILE_Detail "Desinstalatzailea idazten"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Instalatzaileko Erregistroko Giltzak idazten"
 StrCpy $UNINSTALLER_FINISHED_Detail "Bukatuta"
-StrCpy $UNINSTALL_MESSAGEBOX "Ez dirudi ${APPLICATION_NAME} '$INSTDIR'.$ direktorioan instalatuta dagoenik.$\n$\nJarraitu hala ere (ez da aholkatzen)?"
 StrCpy $UNINSTALL_ABORT "Desinstalazioak erabiltzaileak bertan behera utzi du"
 StrCpy $INIT_NO_QUICK_LAUNCH "Abiarazle Bizkorreko Lasterbidea (E/E)"
-StrCpy $INIT_NO_DESKTOP "Mahaigaineko Lasterbidea (dagoena berridazten du)"
-StrCpy $UAC_ERROR_ELEVATE "Ezin izan da goratu, errorea:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Instalatzaileak administratzaile baimenak behar ditu, saiatu berriro"
 StrCpy $INIT_INSTALLER_RUNNING "Instalatzailea dagoeneko martxan da."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Desinstalatzaile honek administratzaile baimenak behar ditu, saiatu berriro"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Saioa hasteko zerbitzua ez dago martxan, bertan behera uzten!"
 StrCpy $INIT_UNINSTALLER_RUNNING "Desinstalatzailea dagoeneko martxan da."
 StrCpy $SectionGroup_Shortcuts "Lasterbideak"
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Show release notes"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Killing ${APPLICATION_EXECUTABLE} processes."
+StrCpy $PageReinstall_NEW_Field_1 "An older version of ${APPLICATION_NAME} is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_OLD_Field_1 "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choose the maintenance option to perform."
+StrCpy $SEC_APPLICATION_DETAILS "Installing ${APPLICATION_NAME} essentials."
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} essentials."
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Leave unchecked to keep the data folder for later use or check to delete the data folder."
+StrCpy $UNINSTALL_MESSAGEBOX "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
+StrCpy $INIT_NO_DESKTOP "Desktop Shortcut (overwrites existing)"
+StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"

admin/win/nsi/l10n/Catalan.nsh

@@ -1,43 +1,44 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar les notes de versió"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "S'ha trobat el(s) procés ${APPLICATION_EXECUTABLE} que s'ha d'aturar.$\nVoleu que l'instal·lador l'aturi?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "S'estan matant els processos ${APPLICATION_EXECUTABLE}."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Procés per matar no trobat!"
 StrCpy $PageReinstall_NEW_Field_1 "Una versió anterior de ${APPLICATION_NAME}  està instal·lada en el vostre sistema. Es recomana desinstal·lar la versió actual abans d'instal·lar. Seleccioneu l'operació que desitjeu realitzar i feu clic a Següent per continuar."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstal·lar abans d'instal·lar"
 StrCpy $PageReinstall_NEW_Field_3 "No instal·lar"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ja instal·lat"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Trieu la manera com voleu instal·lar ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "Una versió més recent de ${APPLICATION_NAME} ja està instal.lada!! No es recomana instal.lar una versió més antiga. Si realment voleu instal.lar una versió més antiga, és millor primer desinstal.lar la versió actual. Seleccioni l'operació que desitjeu realitzar i feu clic a Següent per a continuar."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} ja està instal·lat.$\n$\nSeleccioneu la operació que voleu fer i feu clic a Següent per continuar."
-StrCpy $PageReinstall_SAME_Field_2 "Afegir/Reinstal.lar components"
-StrCpy $PageReinstall_SAME_Field_3 "Desinstal.lar ${APPLICATION_NAME}"
-StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstal.lar ${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Escolliu l'opció de manteniment per executar-ho."
-StrCpy $SEC_APPLICATION_DETAILS "Instal·lant ${APPLICATION_NAME} essencial."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integració per Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instal·lant integració per Windows Explorer"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Accés directe del programa al menú d'inici"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Afegint la drecera per ${APPLICATION_NAME} al menú d'inici."
-StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Drecera a l'escriptori"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Creant les dreceres a l'escriptori"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Drecera d'inici ràpid"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creant la drecera per l'inici ràpid"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} essencial."
-StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Drecera ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Drecera a l'escrptori per ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Drecera d'inici ràpid per ${APPLICATION_NAME}."
-StrCpy $UNINSTALLER_FILE_Detail "Escrivint el desinstal·lador"
-StrCpy $UNINSTALLER_REGISTRY_Detail "Escrivint les claus del registre de l'instal·lador"
 StrCpy $UNINSTALLER_FINISHED_Detail "Acabat"
-StrCpy $UNINSTALL_MESSAGEBOX "No sembla que ${APPLICATION_NAME} estigui instal·lat en la carpeta '$INSTDIR'.$\n$\nContinuo igualment (no recomanat)?"
-StrCpy $UNINSTALL_ABORT "La desinstal·lació s'ha cancel·lat."
-StrCpy $INIT_NO_QUICK_LAUNCH "Drecera d'inici ràpid (N/A)"
-StrCpy $INIT_NO_DESKTOP "Drecera de l'escrpitori (sobreescriu l'existent)"
-StrCpy $UAC_ERROR_ELEVATE "No es pot elevar, error:"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Aquest instal·lador requereix accés d'administrador, intenteu-ho de nou"
-StrCpy $INIT_INSTALLER_RUNNING "L'instal·lador ja s'està executant."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Aquest desinstal·lador requereix accés d'administrador, intenteu-ho de nou."
-StrCpy $UAC_ERROR_LOGON_SERVICE "El servei de inici de sessió no s'està executant, s'està abortant!"
-StrCpy $INIT_UNINSTALLER_RUNNING "El desinstal·lador ja s'està executant."
 StrCpy $SectionGroup_Shortcuts "Dreceres"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Killing ${APPLICATION_EXECUTABLE} processes."
+StrCpy $PageReinstall_OLD_Field_1 "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_Field_2 "Add/Reinstall components"
+StrCpy $PageReinstall_SAME_Field_3 "Uninstall ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Uninstall ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choose the maintenance option to perform."
+StrCpy $SEC_APPLICATION_DETAILS "Installing ${APPLICATION_NAME} essentials."
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start Menu Program Shortcut"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Adding shortcut for ${APPLICATION_NAME} to the Start Menu."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Desktop Shortcut"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Creating Desktop Shortcuts"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Quick Launch Shortcut"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creating Quick Launch Shortcut"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} essentials."
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} shortcut."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Desktop shortcut for ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Quick Launch shortcut for ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Remove ${APPLICATION_NAME}'s data folder from your computer."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Do you want to delete ${APPLICATION_NAME}'s data folder?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Leave unchecked to keep the data folder for later use or check to delete the data folder."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Yes, delete this data folder."
+StrCpy $UNINSTALLER_FILE_Detail "Writing Uninstaller"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Writing Installer Registry Keys"
+StrCpy $UNINSTALL_MESSAGEBOX "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
+StrCpy $UNINSTALL_ABORT "Uninstall aborted by user"
+StrCpy $INIT_NO_QUICK_LAUNCH "Quick Launch Shortcut (N/A)"
+StrCpy $INIT_NO_DESKTOP "Desktop Shortcut (overwrites existing)"
+StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "This installer requires admin access, try again"
+StrCpy $INIT_INSTALLER_RUNNING "The installer is already running."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "This uninstaller requires admin access, try again"
+StrCpy $INIT_UNINSTALLER_RUNNING "The uninstaller is already running."

admin/win/nsi/l10n/Czech.nsh

@@ -1,43 +1,44 @@
 # Auto-generated - do not modify
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Zobrazit pozn mky k vyd n¡"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Nalezen proces(y) ${APPLICATION_EXECUTABLE}, kter‚ je nutn‚ ukonŸit .$\nPýejete si, aby je instal tor za v s ukonŸil?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "UkonŸuji procesy ${APPLICATION_EXECUTABLE}."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Proces k ukonŸen¡ nebyl nalezen! "
-StrCpy $PageReinstall_NEW_Field_1 "Starç¡ verze ${APPLICATION_NAME} je nainstalov na na tomto syst‚mu. DoporuŸuje se pýedem tuto verzi odinstalovat. Zvolte operaci, kterou chcete uskuteŸnit, a kliknØte na tlaŸ¡tko Dalç¡ pro pokraŸov n¡."
-StrCpy $PageReinstall_NEW_Field_2 "Odinstalovat pýed instalac¡"
-StrCpy $PageReinstall_NEW_Field_3 "Neodinstalov vat"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ji§ nainstalov no"
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Zobrazit poznámky k vydání"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Nalezen proces(y) ${APPLICATION_EXECUTABLE}, které je nutné ukončit .$\nPřejete si, aby je instalátor za vás ukončil?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Ukončuji procesy ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Proces k ukončení nebyl nalezen! "
+StrCpy $PageReinstall_NEW_Field_1 "Starší verze ${APPLICATION_NAME} je nainstalována na tomto systému. Doporučuje se předem tuto verzi odinstalovat. Zvolte operaci, kterou chcete uskutečnit, a klikněte na tlačítko Další pro pokračování."
+StrCpy $PageReinstall_NEW_Field_2 "Odinstalovat před instalací"
+StrCpy $PageReinstall_NEW_Field_3 "Neodinstalovávat"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Již nainstalováno"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Zvolte, jak chcete ${APPLICATION_NAME} nainstalovat."
-StrCpy $PageReinstall_OLD_Field_1 "NovØjç¡ verze aplikace ${APPLICATION_NAME} je ji§ nainstalov na. Instalace starç¡ verze se nedoporuŸuje. Pokud opravdu chcete tuto starç¡ verzi nainstalovat, je lepç¡ nejprve odinstalovat souŸasnou verzi. Zvolte po§adovanou operaci a kliknØte na Dalç¡ pro pokraŸov n¡."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} je ji§ nainstalov na.$\n$\nZvolte po§adovanou operaci a kliknØte na Dalç¡ pro pokraŸov n¡."
-StrCpy $PageReinstall_SAME_Field_2 "Pýidat Ÿi znovu instalovat komponenty"
+StrCpy $PageReinstall_OLD_Field_1 "Novější verze aplikace ${APPLICATION_NAME} je již nainstalována. Instalace starší verze se nedoporučuje. Pokud opravdu chcete tuto starší verzi nainstalovat, je lepší nejprve odinstalovat současnou verzi. Zvolte požadovanou operaci a klikněte na Další pro pokračování."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} je již nainstalována.\nZvolte požadovanou operaci a klikněte na Další pro pokračování."
+StrCpy $PageReinstall_SAME_Field_2 "Přidat či znovu instalovat komponenty"
 StrCpy $PageReinstall_SAME_Field_3 "Odinstalovat ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Odinstalovat ${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Vyberte mo§nost £dr§by k proveden¡."
-StrCpy $SEC_APPLICATION_DETAILS "Instaluj¡ se n le§itosti ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integrace do pr…zkumn¡ka Windows"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalace integrace do pr…zkumn¡ka Windows"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Z stupce v Nab¡dce Start"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Pýid v m z stupce pro ${APPLICATION_NAME} do Nab¡dky Start."
-StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Z stupce na ploçe"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Vytv ý¡m z stupce na ploçe"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Z stupce v panelu rychl‚ho spuçtØn¡"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Vytv ý¡m z stupce v panelu rychl‚ho spuçtØn¡"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "N le§itosti ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Z stupce ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Z stupce na ploçe pro ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Z stupce rychl‚ho spuçtØn¡ pro ${APPLICATION_NAME}."
-StrCpy $UNINSTALLER_FILE_Detail "Zapisuji odinstal tor"
-StrCpy $UNINSTALLER_REGISTRY_Detail "Zapisuji instal tor do registr…"
-StrCpy $UNINSTALLER_FINISHED_Detail "DokonŸeno"
-StrCpy $UNINSTALL_MESSAGEBOX "Nezd  se, §e ${APPLICATION_NAME} je nainstalov na v adres ýi '$INSTDIR'.$\n$\nChcete pokraŸovat (nedoporuŸuje se)?"
-StrCpy $UNINSTALL_ABORT "Odinstalace zruçena u§ivatelem"
-StrCpy $INIT_NO_QUICK_LAUNCH "Z stupce rychl‚ho spuçtØn¡ (nen¡ k dispozici)"
-StrCpy $INIT_NO_DESKTOP "Z stupce na ploçe (pýep¡çe existuj¡c¡)"
-StrCpy $UAC_ERROR_ELEVATE "Nelze zvìçit, chyba:"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Tento instal tor vy§aduje spr vcovsk  opr vnØn¡, opakujte znovu"
-StrCpy $INIT_INSTALLER_RUNNING "Instal tor je ji§ spuçtØn."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Tento odinstal tor vy§aduje spr vcovsk  opr vnØn¡, opakujte znovu"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Slu§ba pýihl çen¡ nebا¡, ukonŸuji!"
-StrCpy $INIT_UNINSTALLER_RUNNING "Odinstal tor je ji§ spuçtØn."
-StrCpy $SectionGroup_Shortcuts "Z stupci"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Vyberte možnost údržby k provedení."
+StrCpy $SEC_APPLICATION_DETAILS "Instalují se náležitosti ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Zástupce v Nabídce Start"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Přidávám zástupce pro ${APPLICATION_NAME} do Nabídky Start."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Zástupce na ploše"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Vytvářím zástupce na ploše"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Zástupce v panelu rychlého spuštění"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Vytvářím zástupce v panelu rychlého spuštění"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Náležitosti ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Zástupce ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Zástupce na ploše pro ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Zástupce rychlého spuštění pro ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Odstraňte složku s daty aplikace ${APPLICATION_NAME} z tohoto počítače."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Chcete smazat složku s daty ${APPLICATION_NAME}?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Ponechejte nezaškrtnuté, pokud chcete složku s daty ponechat pro pozdější využití, nebo zaškrtněte, pokud chcete složku smazat."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Ano, smazat tuto složku s daty."
+StrCpy $UNINSTALLER_FILE_Detail "Zapisuji odinstalátor"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Zapisuji instalátor do registrů"
+StrCpy $UNINSTALLER_FINISHED_Detail "Dokončeno"
+StrCpy $UNINSTALL_MESSAGEBOX "Nezdá se, že ${APPLICATION_NAME} je nainstalována ve složce '$INSTDIR'.\nChcete pokračovat (nedoporučuje se)?"
+StrCpy $UNINSTALL_ABORT "Odinstalace zrušena uživatelem"
+StrCpy $INIT_NO_QUICK_LAUNCH "Zástupce rychlého spuštění (není k dispozici)"
+StrCpy $INIT_NO_DESKTOP "Zástupce na ploše (přepíše existující)"
+StrCpy $UAC_ERROR_ELEVATE "Nelze zvýšit, chyba:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Tento instalátor vyžaduje správcovská oprávnění, opakujte znovu"
+StrCpy $INIT_INSTALLER_RUNNING "Instalátor je již spuštěn."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Tento odinstalátor vyžaduje správcovská oprávnění, opakujte znovu"
+StrCpy $INIT_UNINSTALLER_RUNNING "Odinstalátor je již spuštěn."
+StrCpy $SectionGroup_Shortcuts "Zástupci"

admin/win/nsi/l10n/Dutch.nsh

@@ -1,22 +1,20 @@
 # Auto-generated - do not modify
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Toon opmerkingen bij deze versie"
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Toon releaseopmerkingen"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Gevonden ${APPLICATION_EXECUTABLE} proces(sen) moet worden gestopt.$\nWilt u dat het installatieprogramma dat voor u doet?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Stoppen ${APPLICATION_EXECUTABLE} processen."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Het te stoppen proces is niet gevonden!"
 StrCpy $PageReinstall_NEW_Field_1 "Er is een oudere versie van ${APPLICATION_NAME} geïnstalleerd op uw systeem. geadviseerd wordt om de huidige versie te de-installeren voordat de nieuwe versie wordt geïnstalleerd. Selecteer de uit te voeren actie en klik op Verder om door te gaan."
-StrCpy $PageReinstall_NEW_Field_2 "Verwijder oude versie"
-StrCpy $PageReinstall_NEW_Field_3 "Behoud oude versie"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Al geïnstalleerd"
+StrCpy $PageReinstall_NEW_Field_2 "De-installeren voor installeren"
+StrCpy $PageReinstall_NEW_Field_3 "Niet de-installeren"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Reeds geinstalleerd"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Kies hoe u ${APPLICATION_NAME} wilt installeren."
 StrCpy $PageReinstall_OLD_Field_1 "Er is al een recentere versie van ${APPLICATION_NAME} geïnstalleerd! Installeren van een oudere versie wordt niet aangeraden. Als u echt de oudere versie wilt installeren, adviseren we de huidige versie eerst te verwijderen. Kies de actie die u wilt uitvoeren en druk op Verder om door te gaan."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is al geïnstalleerd.$\n$\nKies de actie die u uit wil voeren en druk op Verder om door te gaan."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is al geïnstalleerd.\nKies de actie die u wilt uitvoeren en druk op Verder om door te gaan."
 StrCpy $PageReinstall_SAME_Field_2 "Toevoegen/herinstalleren componenten"
 StrCpy $PageReinstall_SAME_Field_3 "De-installeer ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "De-installeer ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Kies de uit te voeren onderhoudsoptie."
 StrCpy $SEC_APPLICATION_DETAILS "Installeren ${APPLICATION_NAME} basis."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integratie binnen Windows Verkenner"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installeren Integratie binnen Windows Verkenner"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Startmenu snelkoppeling"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Toevoegen snelkoppeling voor ${APPLICATION_NAME} aan het Startmenu."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Werkblad snelkoppeling"
@@ -27,17 +25,20 @@ StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} basis."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} snelkoppeling."
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Werkblad snelkoppeling voor ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Snelstart snelkoppeling voor ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Verwijder ${APPLICATION_NAME}'s data map van uw computer."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Wilt u de ${APPLICATION_NAME}'s data map verwijderen?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Niet aankruisen om de datamap te bewaren of aankruisen om de datamap te verwijderen."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Ja, verwijder deze data map."
 StrCpy $UNINSTALLER_FILE_Detail "Wegschrijven Uninstaller"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Wegschrijven installer Registersleutels"
 StrCpy $UNINSTALLER_FINISHED_Detail "Klaar"
 StrCpy $UNINSTALL_MESSAGEBOX "Het lijkt er niet op dat ${APPLICATION_NAME} is geïnstalleerd in de map '$INSTDIR'.$\n$\nToch doorgaan (niet aangeraden)?"
 StrCpy $UNINSTALL_ABORT "De-installatie afgebroken door de gebruiker"
 StrCpy $INIT_NO_QUICK_LAUNCH "Snelstart snelkoppeling (N/A)"
-StrCpy $INIT_NO_DESKTOP "Bureaublad snelkoppeling (overschrijft huidige)"
+StrCpy $INIT_NO_DESKTOP "Desktop snelkoppeleng (overschrijft huidige)"
 StrCpy $UAC_ERROR_ELEVATE "Kan niet verhogen, fout:"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Dit installatieprogramma vereist beheerdersrechten. Probeer het opnieuw"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Dit installatieprogramma vereist administrator rechten. Probeer het opnieuw"
 StrCpy $INIT_INSTALLER_RUNNING "De Installer is al gestart."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Deze uninstaller vereist Beheerderstoegang, probeer opnieuw"
-StrCpy $UAC_ERROR_LOGON_SERVICE "De aanmeldprocedure is niet actief; er wordt afgebroken!"
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Deze uninstaller vereist administrator toegang, probeer opnieuw"
 StrCpy $INIT_UNINSTALLER_RUNNING "De uninstaller is al gestart."
 StrCpy $SectionGroup_Shortcuts "Snelkoppelingen"

admin/win/nsi/l10n/English.nsh

@@ -9,14 +9,12 @@ StrCpy $PageReinstall_NEW_Field_3 "Do not uninstall"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Already Installed"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Choose how you want to install ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
 StrCpy $PageReinstall_SAME_Field_2 "Add/Reinstall components"
 StrCpy $PageReinstall_SAME_Field_3 "Uninstall ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Uninstall ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choose the maintenance option to perform."
 StrCpy $SEC_APPLICATION_DETAILS "Installing ${APPLICATION_NAME} essentials."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integration for Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing Integration for Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start Menu Program Shortcut"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Adding shortcut for ${APPLICATION_NAME} to the Start Menu."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Desktop Shortcut"
@@ -27,6 +25,10 @@ StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} essentials."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} shortcut."
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Desktop shortcut for ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Quick Launch shortcut for ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Remove ${APPLICATION_NAME}'s data folder from your computer."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Do you want to delete ${APPLICATION_NAME}'s data folder?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Leave unchecked to keep the data folder for later use or check to delete the data folder."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Yes, delete this data folder."
 StrCpy $UNINSTALLER_FILE_Detail "Writing Uninstaller"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Writing Installer Registry Keys"
 StrCpy $UNINSTALLER_FINISHED_Detail "Finished"
@@ -38,6 +40,5 @@ StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "This installer requires admin access, try again"
 StrCpy $INIT_INSTALLER_RUNNING "The installer is already running."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "This uninstaller requires admin access, try again"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
 StrCpy $INIT_UNINSTALLER_RUNNING "The uninstaller is already running."
 StrCpy $SectionGroup_Shortcuts "Shortcuts"

admin/win/nsi/l10n/Estonian.nsh

@@ -9,35 +9,36 @@ StrCpy $PageReinstall_NEW_Field_3 "
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Juba paigaldatud"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Vali, kuidas sa soovid paigaldada ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Uuem versioon ${APPLICATION_NAME} on juba paigaldatud! Vanema versiooni paigaldus ei ole soovitatav. Kui tõesti tahad paigaldada vanemat versiooni, siis on parem esmalt eemaldada olemasolev. Vali tehtav toiming ning kliki Jätka."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} on juba paigaldatud.\nVali tehtav toiming ning kliki Jätka."
 StrCpy $PageReinstall_SAME_Field_2 "Lisa/Taaspaigalda komponente"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalli ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalli ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Vali hooldustegevus, mida sa soovid sooritada."
 StrCpy $SEC_APPLICATION_DETAILS "Paigaldan ${APPLICATION_NAME} põhiosa."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integreerimine Windows Exploreriga"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Paigalda Windows Exploreriga integreerimine"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start Menüü programmide otsetee"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Lisan ${APPLICATION_NAME} otsetee Start menüüsse."
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start Menüü Programmide viit"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Lisan ${APPLICATION_NAME} viida Start menüüsse."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Töölaua otsetee"
 StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Töölaua otseteede loomine"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Kiirvaliku otsetee"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Kiirvaliku otsetee loomine"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Kiirvaliku nupp"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Kiirvaliku nupu loomine"
 StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} põhiosa."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} otsetee."
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Töölaua otsetee rakendusele ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Kiirvaliku otsetee rakendusele ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Töölaua viit rakendusele ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Kiirvaliku viit rakendusele ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Eemalda arvutist rakenduse ${APPLICATION_NAME} andmete kataloog."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Kas soovid kustutada ${APPLICATION_NAME} andmete kataloogi?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Jäta märkimata säilitamaks andmete kataloog hilisemaks kasutuseks või märgi andmete kataloogi kustutamiseks."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Jah, kustuta andmete kaust."
 StrCpy $UNINSTALLER_FILE_Detail "Desinstallija kirjutamine"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Kirjutan paigaldaja registri võtmeid"
 StrCpy $UNINSTALLER_FINISHED_Detail "Lõpetatud"
 StrCpy $UNINSTALL_MESSAGEBOX "Ei leia, et ${APPLICATION_NAME} oleks paigaldatud kataloogi '$INSTDIR'.$\n$\nJätkata sellele vaatamata (pole soovitav)?"
 StrCpy $UNINSTALL_ABORT "Desinstallimine on kasutaja poolt katkestatud"
-StrCpy $INIT_NO_QUICK_LAUNCH "Kiirvaliku otsetee (N/A)"
+StrCpy $INIT_NO_QUICK_LAUNCH "Kiirvaliku viit (N/A)"
 StrCpy $INIT_NO_DESKTOP "Ikoon töölaual (kirjutab olemasoleva üle)"
 StrCpy $UAC_ERROR_ELEVATE "Ei suuda ülendada õigusi, viga: "
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "See paigaldaja vajab admini ligipääsu, proovi uuesti"
 StrCpy $INIT_INSTALLER_RUNNING "Paigaldaja on juba käimas."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "See desinstallija vajab admini ligipääsu, proovi uuesti"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Sisselogimisteenus ei tööta, katkestamine!"
-StrCpy $INIT_UNINSTALLER_RUNNING "See desinstallija on juba käimas."
-StrCpy $SectionGroup_Shortcuts "Otseteed"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
+StrCpy $INIT_UNINSTALLER_RUNNING "See desinstallija on juba käimas"
+StrCpy $SectionGroup_Shortcuts "Viidad"

admin/win/nsi/l10n/Farsi.nsh

@@ -1,43 +0,0 @@
-# Auto-generated - do not modify
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "نمایش پادداشت های انتشار نسخه"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "${APPLICATION_EXECUTABLE} پردازش (ها) که باید متوقف شوند را پیدا کرد. $\nآیا میخواهیم برنامه نصاب این پردازشها را برای شما متوقف کند ؟"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "حذف پردازش‌های ${APPLICATION_EXECUTABLE}."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "پردازش برای از بین بردن یافت نشد!"
-StrCpy $PageReinstall_NEW_Field_1 "نسخه‌ی قدیمی از برنامه ${APPLICATION_NAME}  بر روی سیستم شما نصب شده است، پیشنهاد می‌شود نسخه‌ی فعلی را قبل از نصب حذف کنید. عملیات مورد نظر را انتخاب کنید و برای ادامه روی دکمه Next کلیک کنید."
-StrCpy $PageReinstall_NEW_Field_2 "عمل حذف را قبل از نصب انجام دهید"
-StrCpy $PageReinstall_NEW_Field_3 "حذف نکن"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "از قبل نصب شده است"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "نحوه‌ی نصب ${APPLICATION_NAME} را انتخاب کنید."
-StrCpy $PageReinstall_OLD_Field_1 "نسخه جدیدتری از برنامه  ${APPLICATION_NAME} بر روی سیستم شما نصب شده است، نصب نسخه‌ی قدیمی‌تر پیشنهاد نمی‌شود. درصورتیکه میخواهید نسخه‌ی قدیمی را نصب کنید، حذف نسخه‌ی کنونی قبل از اجرای نصب جدید پیشنهاد می‌شود. عملیات مورد نظر را انتخاب و بر روی دکمه‌ی Next کلیک کنید."
-StrCpy $PageReinstall_SAME_Field_1 "نسخه ${VERSION} از ${APPLICATION_NAME}  هم‌اکنون نصب شده است.$↩$\nعملیات مورد نظر را انتخاب و بر روی دکمه Next کلیک کنید."
-StrCpy $PageReinstall_SAME_Field_2 "افزودن/نصب مجدد اجزا"
-StrCpy $PageReinstall_SAME_Field_3 "حذف ${APPLICATION_NAME}"
-StrCpy $UNINSTALLER_APPDATA_TITLE "حذف ${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "گزینه نگهداری را به منظور اجرا انتخاب کنید."
-StrCpy $SEC_APPLICATION_DETAILS "نصب ضروریات ${APPLICATION_NAME}"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "یکپارچه‌سازی با Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "نصب یکپارچه‌ساز با Windows Explorer"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "بازکردن میانبر منو برنامه"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "افزودن میانبر ${APPLICATION_NAME} به استارت منو ."
-StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "میانبر دسکتاپ"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "ایجاد میانبر دسکتاپ"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "میانبر بازکردن سریع"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "ایجاد میانبر اجرای سریع"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "ملزومات ${APPLICATION_NAME}"
-StrCpy $OPTION_SECTION_SC_START_MENU_Desc "میانبر ${APPLICATION_NAME} "
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "میانبر دسکتاپ برای ${APPLICATION_NAME} ."
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "میانبر اجرای سریع برای ${APPLICATION_NAME}"
-StrCpy $UNINSTALLER_FILE_Detail "نوشتن حذف کننده"
-StrCpy $UNINSTALLER_REGISTRY_Detail "در حال نوشتن کلید های رجیستری نصاب"
-StrCpy $UNINSTALLER_FINISHED_Detail "اتمام"
-StrCpy $UNINSTALL_MESSAGEBOX "به نظر نمی رسد نرم افزار ${APPLICATION_NAME} در '$INSTDIR'.$\n$\nنصب شده باشد.$\nآیا می خواهید ادامه دهید ( توصیه نشده است ) ؟"
-StrCpy $UNINSTALL_ABORT "عمل حذف توسط کاربر متوقف شد"
-StrCpy $INIT_NO_QUICK_LAUNCH "میانبر بازکردن سریع ( N/A )"
-StrCpy $INIT_NO_DESKTOP "میانبر دسکتاپ (رونویسی وجود دارد)"
-StrCpy $UAC_ERROR_ELEVATE "مشکل در بالااوردن ، خطا : "
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "برای نصب، دسترسی مدیر سیستم نیاز است، مجددا تلاش کنید"
-StrCpy $INIT_INSTALLER_RUNNING "نصاب از قبل در حال اجراست."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "حذف برنامه نیاز به دسترسی مدیر دارد ، لطفا دوباره سعی کنید"
-StrCpy $UAC_ERROR_LOGON_SERVICE "سرویس ورود اجرا نیست، درحال لغو نصب!"
-StrCpy $INIT_UNINSTALLER_RUNNING "حذف کننده از قبل در حال اجراست."
-StrCpy $SectionGroup_Shortcuts "میانبرها"

admin/win/nsi/l10n/Finnish.nsh

@@ -1,43 +1,44 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Näytä julkaisutiedot"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Havaittiin sovelluksen ${APPLICATION_EXECUTABLE} prosessi (tai prosesseja) jotka pitäisi pysäyttää.$\nHaluatko että asennusohjelma pysäyttää nämä puolestasi?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Pysäytetään sovelluksen ${APPLICATION_EXECUTABLE} prosessit."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Tapettavaa prosessia ei löytynyt!"
-StrCpy $PageReinstall_NEW_Field_1 "Vanhempi versio sovelluksesta ${APPLICATION_NAME} on jo asennettu. On suositeltavaa että poistat vanhan asennuksen ensin. Valitse mikä toiminto suoritetaan ja napsauta Seuraava jatkaaksesi."
 StrCpy $PageReinstall_NEW_Field_2 "Poista ennen asentamista"
 StrCpy $PageReinstall_NEW_Field_3 "Älä poista"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Asennettu jo"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Valitse miten ${APPLICATION_NAME} asennetaan."
-StrCpy $PageReinstall_OLD_Field_1 "Uudempi versio sovelluksesta ${APPLICATION_NAME} on jo asennettu! Vanhan version asennus ei ole suositeltavaa. Jos todella haluat asentaa vanhemman version, kannattaa poistaa nykyisen version asennus ensin. Valitse minkä toimenpiteen haluat suorittaa ja paina Seuraava jatkaaksesi."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} on jo asennettu.$\n$\nValitse haluamasi toiminto ja napsauta Seuraava jatkaaksesi."
-StrCpy $PageReinstall_SAME_Field_2 "Lisää/uudelleenasenna komponentteja"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} on jo asennettu.\nValitse suoritettava toimenpide ja napsauta Seuraava jatkaaksesi."
 StrCpy $PageReinstall_SAME_Field_3 "Poista ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Poista ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Valitse suoritettava huoltotoimenpide."
-StrCpy $SEC_APPLICATION_DETAILS "Asennetaan sovelluksen ${APPLICATION_NAME} välttämättömyyksiä."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integraatio Windows Exploreriin"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Asennetaan integraatiota Windows Exploreriin"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Käynnistä-valikon pikakuvake"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Lisätään ${APPLICATION_NAME}-pikakuvake Käynnistä-valikkoon."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Työpöydän pikakuvake"
 StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Luodaan työpöydän pikakuvakkeet"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Pikakäynnistyksen pikakuvake"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Luodaan pikakuvaketta pikakäynnistykseen"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} välttämättömyydet."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME}-pikakuvake."
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Sovelluksen ${APPLICATION_NAME} työpyötäpikakuvake."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Pikakäynnistyksen pikakuvake sovellukselle ${APPLICATION_NAME}."
-StrCpy $UNINSTALLER_FILE_Detail "Kirjoitetaan poisto-ohjelmaa"
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Poista ${APPLICATION_NAME}-datakansio tietokoneelta."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Haluatko varmasti poistaa ${APPLICATION_NAME}-datakansion?"
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Kyllä, poista tämä datakansio."
 StrCpy $UNINSTALLER_REGISTRY_Detail "Kirjoitetaan asennusohjelman rekisteriavaimia"
 StrCpy $UNINSTALLER_FINISHED_Detail "Valmis"
-StrCpy $UNINSTALL_MESSAGEBOX "Vaikuttaa siltä että sovellus ${APPLICATION_NAME} on asennettu kansioon '$INSTDIR'.$\n$\nHaluatko jatkaa tästä huolimatta (ei suositeltavaa)?"
 StrCpy $UNINSTALL_ABORT "Poistaminen keskeytettiin käyttäjän toimesta"
-StrCpy $INIT_NO_QUICK_LAUNCH "Pikakäynnistyksen pikakuvake (-)"
 StrCpy $INIT_NO_DESKTOP "Työpöydän pikakuvake (korvaa nykyinen)"
-StrCpy $UAC_ERROR_ELEVATE "Kohottaminen ei onnistu, virhe:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Tämä asennusohjelma vaatii ylläpitäjän oikeudet, yritä uudelleen."
 StrCpy $INIT_INSTALLER_RUNNING "Asennusohjelma on jo käynnissä."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Tämä poisto-ohjelma vaatii ylläpitäjän oikeudet, yritä uudelleen."
-StrCpy $UAC_ERROR_LOGON_SERVICE "Kirjautumispalvelu ei ole käynnissä, perutaan!"
 StrCpy $INIT_UNINSTALLER_RUNNING "Poisto-ohjelma on jo käynnissä."
 StrCpy $SectionGroup_Shortcuts "Pikakuvakkeet"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Killing ${APPLICATION_EXECUTABLE} processes."
+StrCpy $PageReinstall_NEW_Field_1 "An older version of ${APPLICATION_NAME} is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_OLD_Field_1 "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_Field_2 "Add/Reinstall components"
+StrCpy $SEC_APPLICATION_DETAILS "Installing ${APPLICATION_NAME} essentials."
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} essentials."
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Leave unchecked to keep the data folder for later use or check to delete the data folder."
+StrCpy $UNINSTALLER_FILE_Detail "Writing Uninstaller"
+StrCpy $UNINSTALL_MESSAGEBOX "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
+StrCpy $INIT_NO_QUICK_LAUNCH "Quick Launch Shortcut (N/A)"
+StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"

admin/win/nsi/l10n/French.nsh

@@ -1,43 +1,44 @@
 # Auto-generated - do not modify
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Afficher les notes de version"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Les processus ${APPLICATION_EXECUTABLE} en cours d’exécution doivent être stoppés avant de poursuivre.$\nVoulez-vous que le programme d’installation s’en charge pour vous ?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Fermeture des processus ${APPLICATION_EXECUTABLE}."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Le processus à stopper n'a pas été trouvé !"
-StrCpy $PageReinstall_NEW_Field_1 "Une ancienne version de ${APPLICATION_NAME} est installée sur votre système. Il est recommandé de désinstaller cette version avant de continuer. Sélectionnez l'opération que vous voulez exécuter et cliquez sur Suivant pour continuer."
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Montrer les notes de version"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Le(s) processus en cours d’exécution ${APPLICATION_EXECUTABLE} doit être stoppé afin de poursuivre.$\nVoulez-vous que le programme d’installation s’en charge pour vous ?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Fermeture du processus ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Les processus à stopper n'ont pas été trouvés."
+StrCpy $PageReinstall_NEW_Field_1 "Une vieille version de ${APPLICATION_NAME} est installée sur votre système. Il est recommandé que vous désinstalliez cette version avant l'installation. Sélectionnez l'opération que vous voulez exécuter et cliquez sur Suivant pour continuer."
 StrCpy $PageReinstall_NEW_Field_2 "Désinstaller avant d'installer à nouveau"
 StrCpy $PageReinstall_NEW_Field_3 "Ne pas désinstaller"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Déjà installé"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Choisissez comment installer ${APPLICATION_NAME}."
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Déjà installée"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Choisissez comment vous voulez installer ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Une version plus récente de ${APPLICATION_NAME} est déjà installée ! Il n'est pas recommandé d'installer une version plus ancienne. Si vous voulez vraiment installer cette version plus ancienne, il est préférable de d'abord désinstaller la version courante. Sélectionnez l'opération que vous voulez exécuter et cliquez sur Suivant pour continuer."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} est déjà installé.$\n$\nSélectionnez l'opération que vous souhaitez effectuer et cliquez sur Suivant pour continuer."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} est déjà installée.\nSélectionnez l'opération que vous voulez exécuter et cliquez sur Suivant pour continuer."
 StrCpy $PageReinstall_SAME_Field_2 "Ajouter/Réinstaller des composants"
 StrCpy $PageReinstall_SAME_Field_3 "Désinstaller ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Désinstaller ${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choisir l'opération de maintenance à effectuer."
-StrCpy $SEC_APPLICATION_DETAILS "Installation des essentiels de ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Intégration à l'Explorateur Windows"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installation de l'intégration à l'Explorateur Windows..."
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choisir l'option de maintenance à appliquer."
+StrCpy $SEC_APPLICATION_DETAILS "Installer les essentiels de ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Raccourci programme du menu Démarrer"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Ajout d'un raccourci pour ${APPLICATION_NAME} au menu Démarrer."
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Ajouter un raccourci pour ${APPLICATION_NAME} au menu Démarrer."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Raccourci Bureau"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Création d'un raccourci sur le Bureau"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Créer un raccourci Bureau"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Raccourci de lancement rapide"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Création d'un raccourci de lancement rapide"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Créer un raccourci de lancement rapide"
 StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Essentiels de ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Raccourci de ${APPLICATION_NAME}"
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Raccourci de bureau pour ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Raccourci Bureau de ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Raccourci de lancement rapide de ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Supprimer de cet ordinateur le dossier de données de ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Voulez-vous supprimer le dossier de données de ${APPLICATION_NAME} ?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Laisser non-coché pour garder le dossier de données pour un usage ultérieur. Cocher pour supprimer le dossier de données."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Oui, supprimer ce dossier de données."
 StrCpy $UNINSTALLER_FILE_Detail "Écriture du désinstallateur"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Écriture des clefs de registre du désinstallateur"
 StrCpy $UNINSTALLER_FINISHED_Detail "Terminé"
-StrCpy $UNINSTALL_MESSAGEBOX "Il semble que ${APPLICATION_NAME} ne soit pas installé dans le dossier '$INSTDIR'.$\n$\nVoulez-vous poursuivre (non recommandé) ?"
+StrCpy $UNINSTALL_MESSAGEBOX "Il semble que ${APPLICATION_NAME} ne soit pas installée dans le dossier '$INSTDIR'.$\n$\nVoulez-vous poursuivre (non recommandé) ?"
 StrCpy $UNINSTALL_ABORT "Désinstallation interrompue par l'utilisateur"
-StrCpy $INIT_NO_QUICK_LAUNCH "Raccourci de lancement rapide (non disponible)"
+StrCpy $INIT_NO_QUICK_LAUNCH "Raccourci de lancement rapide (N/A)"
 StrCpy $INIT_NO_DESKTOP "Raccourci bureau (remplace l’existant)"
-StrCpy $UAC_ERROR_ELEVATE "Échec d'élévation, erreur :"
+StrCpy $UAC_ERROR_ELEVATE "Echec d'élévation, erreur :"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Cet installateur requiert les droits administrateur, essayez à nouveau"
 StrCpy $INIT_INSTALLER_RUNNING "Une installation est déjà en cours."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Ce désinstallateur requiert les droits administrateur, essayez à nouveau"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Service de logon non lancé ! Abandon."
 StrCpy $INIT_UNINSTALLER_RUNNING "Une désinstallation est déjà en cours."
 StrCpy $SectionGroup_Shortcuts "Raccourcis"

admin/win/nsi/l10n/Galician.nsh

@@ -3,21 +3,20 @@ StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Amosar as notas de publicaci
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Atopáronse procesos ${APPLICATION_EXECUTABLE} que teñen que ser detidos.$\nQuere que sexa o instalador quen o(s) deteña?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Matando os procesos ${APPLICATION_EXECUTABLE}."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Non se atopou o proceso para matalo!"
-StrCpy $PageReinstall_NEW_Field_1 "No seu sistema hai instalada unha versión anterior de ${APPLICATION_NAME}. Recomendámoslle que desinstale a versión actual antes de instalar. Seleccione a operación que quere realizar e prema en Seguinte para continuar."
+StrCpy $PageReinstall_NEW_Field_1 "No seu sistema hai instalada unha versión anterior do ${APPLICATION_NAME}. Recomendámoslle que desinstale a versión actual antes de instalar. Seleccione a operación que quere realizar e prema en Seguinte para continuar."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
 StrCpy $PageReinstall_NEW_Field_3 "Non desinstalar"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Xa instalado"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Escolla como quere instalar ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Ten instalada unha versión actualizada do ${APPLICATION_NAME}! recomendámoslle que non instale unha versión anterior. Se realmente quere instalar esta versión máis antiga, é preferíbel que desinstale a versión actual antes de instalar. Seleccione a operación que quere realizar e prema en Seguinte para continuar."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} xa está instalado.\nSeleccione a operación que que quere realizar e prema en Seguinte para continuar."
 StrCpy $PageReinstall_SAME_Field_2 "Engadir/reinstalar compoñentes"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalar ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Escolla a opción de mantemento a realizar."
 StrCpy $SEC_APPLICATION_DETAILS "Instalando ${APPLICATION_NAME} esenciais."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integración con Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalando a integración con Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso directo ao programa no menú de inicio"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Engadindo o acceso directo a ${APPLICATION_NAME} no menú de inicio"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Engadindo o acceso directo ao ${APPLICATION_NAME} no menú de inicio"
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Acceso directo no escritorio"
 StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Creando os accesos directos no escritorio"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Acceso de inicio rápido"
@@ -26,6 +25,10 @@ StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} esenciais."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Acceso directo ao ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Acceso directo no escritorio para "
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Acceso de inicio rápido para ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Retirar o cartafol de datos do ${APPLICATION_NAME} do seu computador."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Confirma que quere eliminar o cartafol de datos do ${APPLICATION_NAME}?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Deixeo sen marcar para manter o cartafol de datos para o seu uso posterior ou marqueo para eliminar o cartafol de datos."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Si, eliminar este cartafol de datos."
 StrCpy $UNINSTALLER_FILE_Detail "Escribindo o desinstalador"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Escribindo o instalador nas chaves do rexistro"
 StrCpy $UNINSTALLER_FINISHED_Detail "Rematado"
@@ -34,10 +37,8 @@ StrCpy $UNINSTALL_ABORT "A desinstalaci
 StrCpy $INIT_NO_QUICK_LAUNCH "Acceso de inicio rápido (n/d)"
 StrCpy $INIT_NO_DESKTOP "Atallo no escritorio (sobrescribe o existente)"
 StrCpy $UAC_ERROR_ELEVATE "Non foi posíbel elevalo, erro:"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Este instalador require acceso de administrador, ténteo de novo"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Este instalador require acceso de administrador, tenteo de novo"
 StrCpy $INIT_INSTALLER_RUNNING "O instalador xa está en execución."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Este desinstalador require acceso de administrador, ténteo de novo"
-StrCpy $UAC_ERROR_LOGON_SERVICE "O servizo de acceso non está en execución, cancelando!"
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Este desinstalador require acceso de administrador, tenteo de novo"
 StrCpy $INIT_UNINSTALLER_RUNNING "O desinstalador xa está en execución."
 StrCpy $SectionGroup_Shortcuts "Atallos"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."

admin/win/nsi/l10n/German.nsh

@@ -9,14 +9,12 @@ StrCpy $PageReinstall_NEW_Field_3 "Nicht entfernen"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Bereits installiert"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Wählen Sie die Methode, mit der sie ${APPLICATION_NAME} installieren wollen."
 StrCpy $PageReinstall_OLD_Field_1 "Eine neuere Version von  ${APPLICATION_NAME} ist bereits installiert! Es wird nicht empfohlen, eine ältere Version zu installieren. Wollen Sie dies trotzdem tun, so sollten Sie die aktuelle Version zunächst entfernen. Wählen Sie eine Vorgehensweise und wählen dann $\"Weiter$\"."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} ist bereits installiert. $\nWählen Sie eine Vorgehensweise und klicken Sie auf $\"Weiter$\"."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} ist bereits installiert.\nWählen Sie eine Vorgehensweise und klicken Sie auf $\"Weiter$\"."
 StrCpy $PageReinstall_SAME_Field_2 "Komponenten hinzufügen"
 StrCpy $PageReinstall_SAME_Field_3 "${APPLICATION_NAME} entfernen"
 StrCpy $UNINSTALLER_APPDATA_TITLE "${APPLICATION_NAME} entfernen"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Wählen Sie zur Ausführung die Wartungsoption."
 StrCpy $SEC_APPLICATION_DETAILS "Installiere ${APPLICATION_NAME} Basis."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integration in den Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installiere Integration in den Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Installiere Verknüpfung im Programmmenü"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Füge Verknüpfung für ${APPLICATION_NAME} dem Startmenü hinzu."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Desktop-Verknüpfung"
@@ -27,6 +25,10 @@ StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} Basis."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} Verknüfung."
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Desktop-Verknüpfung für ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Schnellstart-Verknüpfung für ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Entferne Datenordner ${APPLICATION_NAME} von der Maschine."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Wollen sie den ${APPLICATION_NAME} Datenordner entfernen?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Abwählen, um den Datenordner für spätere Verwendung zu behalten."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Ja, Datenordner löschen."
 StrCpy $UNINSTALLER_FILE_Detail "Schreibe Uninstaller"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Schreibe Registrierungseinträge"
 StrCpy $UNINSTALLER_FINISHED_Detail "Abgeschlossen"
@@ -34,10 +36,9 @@ StrCpy $UNINSTALL_MESSAGEBOX "Es scheint, als ob ${APPLICATION_NAME} nicht im Ve
 StrCpy $UNINSTALL_ABORT "Deinstallation vom Benutzer abgebrochen"
 StrCpy $INIT_NO_QUICK_LAUNCH "Schnellstart-Verknüpfung (Nicht verfügbar)"
 StrCpy $INIT_NO_DESKTOP "Desktop-Verknüpfung (überschreibt vorhandene)"
-StrCpy $UAC_ERROR_ELEVATE "Rechte können nicht erhöht werden, Fehler:"
+StrCpy $UAC_ERROR_ELEVATE "Kann Rechte nicht erhöhen, Fehler:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Dieses Installationsprogramm erfordert Administrator-Rechte, bitte erneut versuchen"
 StrCpy $INIT_INSTALLER_RUNNING "Das Installationsprogramm wird bereits ausgeführt."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Das Deinstallationsprogramm erfordert Administrator-Rechte. Bitte erneut versuchen."
-StrCpy $UAC_ERROR_LOGON_SERVICE "Anmeldedienst läuft nicht, abbruch!"
 StrCpy $INIT_UNINSTALLER_RUNNING "Das Deinstallationsprogramm wird bereits ausgeführt."
 StrCpy $SectionGroup_Shortcuts "Verknüpfungen"

admin/win/nsi/l10n/Greek.nsh

@@ -9,14 +9,12 @@ StrCpy $PageReinstall_NEW_Field_3 "
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ήδη εγκατεστημένη"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Επιλέξτε πώς θέλετε να εγκαταστήσετε την ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Μια νεώτερη έκδοση της ${APPLICATION_NAME} είναι ήδη εγκατεστημένη! Δεν συνίσταται να εγκαταστείσετε μια παλαιότερη έκδοση. Εάν θέλετε πραγματικά να εγκαταστήσετε αυτήν την παλαιότερη έκδοση, είναι καλύτερο να απεγκαταστήσετε την τρέχουσα έκδοση πρώτα. Επιλέξτε τη διαδικασία που επιθυμείτε να εκτελέσετε και επιλέξτε Επόμενο για να συνεχίσετε."
-StrCpy $PageReinstall_SAME_Field_1 "Η ${APPLICATION_NAME} ${VERSION} είναι ήδη εγκατεστημένη.$\n$\nΕπιλέξτε τη λειτουργία που επιθυμείτε να εκτελέσετε και επιλέξτε Επόμενο για να συνεχίσετε."
+StrCpy $PageReinstall_SAME_Field_1 "Η ${APPLICATION_NAME} ${VERSION} είναι ήδη εγκατεστημένη.\n\nΕπιλέξτε τη διαδικασία που επιθυμείτε να εκτελέσετε και επιλέξτε Επόμενο για να συνεχίσετε."
 StrCpy $PageReinstall_SAME_Field_2 "Προσθήκη/ Επανεγκατάσταση συνιστωσών"
 StrCpy $PageReinstall_SAME_Field_3 "Απεγκατάσταση ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Απεγκατάσταση ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Επιλέξτε την επιλογή συντήρησης που θα πραγματοποιηθεί."
 StrCpy $SEC_APPLICATION_DETAILS "Εγκατάσταση βάσης ${APPLICATION_NAME} σε εξέλιξη."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Ενσωμάτωση στην Εξερεύνηση των Windows"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Εγκατάσταση ενσωμάτωσης στην Εξερεύνηση των Windows"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Συντόμευση στο Αρχικό Μενού"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Προσθήκη συντόμευσης για την ${APPLICATION_NAME} στο Αρχικό Μενού."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Συντόμευση επιφάνειας εργασίας"
@@ -27,6 +25,10 @@ StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Συντόμευση ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Συντόμευση επιφάνειας εργασίας της ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Συντόμευση Ταχείας Εκκίνησης της ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Αφαίρεση του φακέλου δεδομένων της ${APPLICATION_NAME} από τον υπολογιστή σας."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Θέλετε να αφαιρέσετε τον φάκελο δεδομένων της ${APPLICATION_NAME};"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Αφήστε κενό για να διατηρήσετε τον φάκελο δεδομένων για μελλοντική χρήση ή επιλέξτε για να διγράψετε το φάκελο δεδομένων."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Ναι, διαγραφή αυτού του φακέλου δεδομένων."
 StrCpy $UNINSTALLER_FILE_Detail "Εγγραφή Εφαρμογής Απεγκατάστασης"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Εγγραφή Κλειδιών μητρώου (Registry) της Εφαρμογής Εγκατάστασης"
 StrCpy $UNINSTALLER_FINISHED_Detail "Ολοκληρώθηκε"
@@ -38,6 +40,5 @@ StrCpy $UAC_ERROR_ELEVATE "
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Αυτή η εφαρμογή εγκατάστασης απαιτεί πρόσβαση διαχειριστή, δοκιμάστε ξανά"
 StrCpy $INIT_INSTALLER_RUNNING "Η εφαρμογή εγκατάστασης λειτουργεί ήδη."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Αυτή η εφαρμογή απεγκατάστασης απαιτεί πρόσβαση διαχειριστή, δοκιμάστε ξανά"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Η υπηρεσία σύνδεσης δεν εκτελείται, ακύρωση!"
 StrCpy $INIT_UNINSTALLER_RUNNING "Η εφαρμογή απεγκατάστασης λειτουργεί ήδη."
 StrCpy $SectionGroup_Shortcuts "Συντομεύσεις"

admin/win/nsi/l10n/Hungarian.nsh

@@ -1,43 +1,44 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Kiadási jegyzetek megtekintése"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "A következő folyamatot(okat) meg kell állítani ${APPLICATION_EXECUTABLE}.$\nSzeretné ha a telepítő program megállítani ezeket a folyamatokat?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "${APPLICATION_EXECUTABLE} folyamat kilövése."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "A kilövésre szánt folyamat nem található!"
-StrCpy $PageReinstall_NEW_Field_1 "Az ${APPLICATION_NAME} alkalmazás egy régebbi verziója telepítve van a rendszeren. Ajánlott a régi alkalmazás eltávolítása mielőtt a legfrissebb verziót telepítené. Válassza ki milyen műveletet szeretne végrehajtani, és nyomja meg a $\"Következő$\" gombot a folytatáshoz."
 StrCpy $PageReinstall_NEW_Field_2 "Eltávolítás telepítés előtt"
 StrCpy $PageReinstall_NEW_Field_3 "Ne távolítsa el"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Már telepítve"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Válassza ki, hogy szeretné telepíteni a következő alkalmazást: ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "Az ${APPLICATION_NAME} alkalmazás egy újabb verziója már megtalálható a rendszeren. Nem ajánlott egy régebbi verzió telepítése. Ha valóban szeretné a régebbi verziót telepíteni, akkor ajánlott a jelenleg telepített verzió eltávolítása. Válassza ki milyen műveletet szeretne végrehajtani, és nyomja meg a $\"Következő$\" gombot a folytatáshoz."
-StrCpy $PageReinstall_SAME_Field_1 "Az ${APPLICATION_NAME} alkalmazás ${VERSION} verziója már telepítve van.$↩$\nKérjük válaszd ki milyen műveletet szeretnél végrehajtani, és nyomd meg a  „Következő” gombot."
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Válaszd ki, hogy szeretnéd telepíteni a következő alkalmazást ${APPLICATION_NAME}."
 StrCpy $PageReinstall_SAME_Field_2 "Komponens hozzáadása/újratelepítése"
 StrCpy $PageReinstall_SAME_Field_3 "${APPLICATION_NAME} eltávolítása"
 StrCpy $UNINSTALLER_APPDATA_TITLE "${APPLICATION_NAME} eltávolítása"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Válassza ki milyen karbantartási műveletet szeretne elvégezni."
-StrCpy $SEC_APPLICATION_DETAILS "Az ${APPLICATION_NAME} alkalmazás lényeges komponenseinek telepítése."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Windows Explorer integráció"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Windows Explorer integráció telepítése"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start Menü parancsikonok"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "A ${APPLICATION_NAME} parancsikon hozzáadása a Start Menühöz"
-StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Asztali parancsikon"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Asztali parancsikon létrehozása"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Gyorsindító eszköztár parancsikon"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Gyorsindító eszköztár parancsikon létrehozása"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} lényeges komponensek."
-StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} parancsikon"
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Asztali parancsikon a ${APPLICATION_NAME} alkalmazásnak."
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Gyorsindítás eszköztár parancsikon a ${APPLICATION_NAME} alkalmazásnak."
-StrCpy $UNINSTALLER_FILE_Detail "Elltávolító írása"
-StrCpy $UNINSTALLER_REGISTRY_Detail "Telepítési registry kulcsok írása"
-StrCpy $UNINSTALLER_FINISHED_Detail "Befejezve!"
-StrCpy $UNINSTALL_MESSAGEBOX "Nem sikerült az ${APPLICATION_NAME} alkalmazás telepítése a '$INSTDIR' könyvtárba.$\n$\nSzeretné mindenképpen folytatni (nem ajánlott)?"
-StrCpy $UNINSTALL_ABORT "Az eltávolítást a felhasználó megszakította"
-StrCpy $INIT_NO_QUICK_LAUNCH "Gyorsindító hivatkozás (N/A)"
-StrCpy $INIT_NO_DESKTOP "Asztali hivatkozás (felülírja a meglévőt)"
-StrCpy $UAC_ERROR_ELEVATE "Nem sikerült felemelni, hiba:"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "A telepítő futtatásához adminisztrátori hozzáférés szükséges, próbálja újra."
-StrCpy $INIT_INSTALLER_RUNNING "A telepítő már fut."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Az eltávolító futtatásához adminisztrátori hozzáférés szükséges, próbálja újra."
-StrCpy $UAC_ERROR_LOGON_SERVICE "A bejelentkező szolgáltatás nem fut, megszakítás!"
-StrCpy $INIT_UNINSTALLER_RUNNING "Az eltávolító már fut."
-StrCpy $SectionGroup_Shortcuts "Parancsikonok"
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Igen, törölje ezt az adatkönyvtárat."
+StrCpy $UNINSTALLER_FINISHED_Detail "Befejezve"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Killing ${APPLICATION_EXECUTABLE} processes."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Process to kill not found!"
+StrCpy $PageReinstall_NEW_Field_1 "An older version of ${APPLICATION_NAME} is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_OLD_Field_1 "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choose the maintenance option to perform."
+StrCpy $SEC_APPLICATION_DETAILS "Installing ${APPLICATION_NAME} essentials."
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start Menu Program Shortcut"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Adding shortcut for ${APPLICATION_NAME} to the Start Menu."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Desktop Shortcut"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Creating Desktop Shortcuts"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Quick Launch Shortcut"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creating Quick Launch Shortcut"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} essentials."
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} shortcut."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Desktop shortcut for ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Quick Launch shortcut for ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Remove ${APPLICATION_NAME}'s data folder from your computer."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Do you want to delete ${APPLICATION_NAME}'s data folder?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Leave unchecked to keep the data folder for later use or check to delete the data folder."
+StrCpy $UNINSTALLER_FILE_Detail "Writing Uninstaller"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Writing Installer Registry Keys"
+StrCpy $UNINSTALL_MESSAGEBOX "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
+StrCpy $UNINSTALL_ABORT "Uninstall aborted by user"
+StrCpy $INIT_NO_QUICK_LAUNCH "Quick Launch Shortcut (N/A)"
+StrCpy $INIT_NO_DESKTOP "Desktop Shortcut (overwrites existing)"
+StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "This installer requires admin access, try again"
+StrCpy $INIT_INSTALLER_RUNNING "The installer is already running."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "This uninstaller requires admin access, try again"
+StrCpy $INIT_UNINSTALLER_RUNNING "The uninstaller is already running."
+StrCpy $SectionGroup_Shortcuts "Shortcuts"

admin/win/nsi/l10n/Italian.nsh

@@ -9,14 +9,12 @@ StrCpy $PageReinstall_NEW_Field_3 "Non disinstallare"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Già installato"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Scegli come desideri installare ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Una versione più recente di ${APPLICATION_NAME} è già installata! Non è consigliabile installare una versione più vecchia. Se vuoi davvero installare una versione più vecchia, ti consigliamo di rimuovere prima la versione attuale. Scegli l'operazione da eseguire e fai clic su Avanti per continuare."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} è già installato.$\n$\nSeleziona l'operazione che desideri eseguire e fai clic su Avanti per continuare.."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} è già installato.\nSeleziona l'operazione che desideri eseguire e fai clic su Avanti per continuare."
 StrCpy $PageReinstall_SAME_Field_2 "Aggiungi/Reinstalla i componenti"
 StrCpy $PageReinstall_SAME_Field_3 "Disinstalla ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Disinstalla ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Scegli l'opzione di manutenzione da eseguire."
 StrCpy $SEC_APPLICATION_DETAILS "Installazione degli elementi fondamentali di ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integrazione con Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installazione dell'integrazione con Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Scorciatoia di programma menu Start"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Aggiunta della scorciatoia per ${APPLICATION_NAME} al menu Start."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Scorciatoia del desktop"
@@ -27,10 +25,14 @@ StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Oggetti fondamentali di ${APPLICATIO
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Scorciatoia di ${APPLICATION_NAME}"
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Scorciatoia del desktop per ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Scorciatoia per ${APPLICATION_NAME} dell'avvio veloce."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Rimuovi la cartella dei dati di ${APPLICATION_NAME} dal tuo computer."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Vuoi eliminare la cartella dei dati di ${APPLICATION_NAME}?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Lasciala smarcata per conservare la cartella dei dati per usi futuri o marcala per eliminarla."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Sì, elimina questa cartella di dati."
 StrCpy $UNINSTALLER_FILE_Detail "Creazione del programma di disinstallazione"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Scrittura delle chiavi di registro del programma di installazione"
 StrCpy $UNINSTALLER_FINISHED_Detail "Completato"
-StrCpy $UNINSTALL_MESSAGEBOX "Non sembra che ${APPLICATION_NAME} sia installato nella cartella '$INSTDIR'.$$\nVuoi continuare comunque (non consigliato)?"
+StrCpy $UNINSTALL_MESSAGEBOX "Non sembra che ${APPLICATION_NAME} sia installato nella cartella '$INSTDIR'.$\nVuoi continuare comunque (non consigliato)?"
 StrCpy $UNINSTALL_ABORT "Disinstallazione interrotta dall'utente"
 StrCpy $INIT_NO_QUICK_LAUNCH "Scorciatoia dell'avvio veloce (N/D)"
 StrCpy $INIT_NO_DESKTOP "Scorciatoia del desktop (sovrascrivi se esistente)"
@@ -38,6 +40,5 @@ StrCpy $UAC_ERROR_ELEVATE "Impossibile elevare, errore:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Il programma di installazione necessita delle credenziali di amministrazione, riprova"
 StrCpy $INIT_INSTALLER_RUNNING "Il programma di installazione è già in esecuzione."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Il programma di disinstallazione necessita delle credenziali di amministrazione, riprova"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Il servizio di accesso non è in esecuzione, interruzione in corso!"
 StrCpy $INIT_UNINSTALLER_RUNNING "Il programma di disinstallazione è già in esecuzione."
 StrCpy $SectionGroup_Shortcuts "Scorciatoie"

admin/win/nsi/l10n/Japanese.nsh

@@ -1,22 +1,20 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "リリースノートを表示"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "${APPLICATION_EXECUTABLE} のプロセスを終了する必要があります。$\nインストーラーがそのプロセスを停止してもよろしいですか？"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "${APPLICATION_EXECUTABLE} のプロセスを終了する必要があります。\nインストーラーがそのプロセスを停止してもよろしいですか？"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "${APPLICATION_EXECUTABLE} プロセスを停止しています。"
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "終了するプロセスがありません"
-StrCpy $PageReinstall_NEW_Field_1 "システムに　${APPLICATION_NAME}　の旧バージョンがインストールされています。$\n旧バージョンをアンインストールし、最新バージョンをインストールするのをお勧めします。$\nオペレーションを選択し、次へをクリックする。"
+StrCpy $PageReinstall_NEW_Field_1 "システムに　${APPLICATION_NAME}　の旧バージョンがインストールされています。\n旧バージョンをアンインストールし、最新バージョンをインストールするのをお勧めします。\nオペレーションを選択し、次へをクリックする。"
 StrCpy $PageReinstall_NEW_Field_2 "インストール前にアンインストールする"
 StrCpy $PageReinstall_NEW_Field_3 "アンインストールしない"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "インストール済"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "${APPLICATION_NAME} のインストール方法を選択する"
-StrCpy $PageReinstall_OLD_Field_1 "${APPLICATION_NAME} の最新バージョンがすでにインストールされています。$\n旧バージョンのインストールはお勧めしません。旧バージョンのインストールが本当に必要な場合は、まず最新バージョンをアンインストールしてから、旧バージョンをインストールしてください。$\nオペレーションを選択し、次へをクリックする。"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} は、${VERSION} がすでにインストールされています。$\n$\n実行したい操作を選択して、次へをクリックしてください。"
+StrCpy $PageReinstall_OLD_Field_1 "${APPLICATION_NAME} の最新バージョンがすでにインストールされています。\n旧バージョンのインストールはお勧めしません。旧バージョンのインストールが本当に必要な場合は、まず最新バージョンをアンインストールしてから、旧バージョンをインストールしてください。\nオペレーションを選択し、次へをクリックする。"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION}　はすでにインストールされています。\n実行するオペレーションを選択し、次へをクリックする"
 StrCpy $PageReinstall_SAME_Field_2 "追加/再インストールコンポーネント"
 StrCpy $PageReinstall_SAME_Field_3 "${APPLICATION_NAME} をアンインストール"
 StrCpy $UNINSTALLER_APPDATA_TITLE "${APPLICATION_NAME} をアンインストール"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "実行するには、メンテナンスオプションを選択してください。"
 StrCpy $SEC_APPLICATION_DETAILS "${APPLICATION_NAME} の重要なパッケージをインストール中"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Windows エクスプローラーへの統合"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Windows エクスプローラーへの統合をインストールしています。"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "スタートメニューショートカット"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "スタートメニューに${APPLICATION_NAME}　のショートカットの追加"
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "デスクトップショートカット"
@@ -27,6 +25,10 @@ StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME}
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} のショートカット"
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "${APPLICATION_NAME} のデスクトップショートカット"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "${APPLICATION_NAME} のクイック起動ショートカット"
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "${APPLICATION_NAME} のデータフォルダーを削除する"
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "${APPLICATION_NAME} のデータフォルダーを削除しますか？"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "データフォルダーを削除する場合、チェックボックスをオンにする。\nまたは、データフォルダーを保存する場合、チェックボックスをオフにする。"
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "はい。データフォルダーを削除します。"
 StrCpy $UNINSTALLER_FILE_Detail "アンインストーラーを書き込み"
 StrCpy $UNINSTALLER_REGISTRY_Detail "インストーラーのレジストリキーの書き込み"
 StrCpy $UNINSTALLER_FINISHED_Detail "終了"
@@ -38,6 +40,5 @@ StrCpy $UAC_ERROR_ELEVATE "
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "このインストーラーは、管理者権限が必要です。インストールを再試行してください。"
 StrCpy $INIT_INSTALLER_RUNNING "インストーラーは、すでに起動しています。"
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "このアンインストーラーは、管理者権限が必要です。アンインストールを再試行してください。"
-StrCpy $UAC_ERROR_LOGON_SERVICE "ログオンサービスが動いていません。中止します。"
 StrCpy $INIT_UNINSTALLER_RUNNING "アンインストーラーは、すでに起動しています。"
 StrCpy $SectionGroup_Shortcuts "ショートカット"

admin/win/nsi/l10n/Norwegian.nsh

@@ -1,43 +0,0 @@
-# Auto-generated - do not modify
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Vis versjonsmerknader"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Fant ${APPLICATION_EXECUTABLE}-prosess(er) som må stoppes.$\nVil du at installasjonsprogrammet skal stoppe dem for deg?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Terminerer ${APPLICATION_EXECUTABLE}-prosesser."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Fant ikke prosess som skulle termineres!"
-StrCpy $PageReinstall_NEW_Field_1 "En eldre versjon av ${APPLICATION_NAME} er installert på systemet ditt. Det anbefales at du avnistallerer den versjonen før installering av ny versjon. Velg hva du vil gjøre og klikk Neste for å fortsette."
-StrCpy $PageReinstall_NEW_Field_2 "Avinstaller før installering"
-StrCpy $PageReinstall_NEW_Field_3 "Ikke avinstaller"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Allerede installert"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Velg hvordan du vil installere ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "En nyere versjon av ${APPLICATION_NAME} er allerede installert! Det anbefales ikke at du installerer en eldre versjon. Hvis du virkelig ønsker å installere denne eldre versjonen, er det bedre å avinstallere gjeldende versjon først. Velg hva du vil gjøre og klikk Neste for å fortsette."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} er installert allerede.$\n$\nVelg hva du ønsker å gjøre og klikk Neste for å fortsette."
-StrCpy $PageReinstall_SAME_Field_2 "Legg til/installer komponenter på nytt"
-StrCpy $PageReinstall_SAME_Field_3 "Avinstaller ${APPLICATION_NAME}"
-StrCpy $UNINSTALLER_APPDATA_TITLE "Avinstaller ${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Velg hva slags vedlikehold som skal utføres."
-StrCpy $SEC_APPLICATION_DETAILS "Installerer ${APPLICATION_NAME} grunnleggende."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integrering med Windows Utforsker"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installerer integrering med Windows Utforsker"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Snarvei i Start-menyen"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Legger til snarvei for ${APPLICATION_NAME} i Start-menyen."
-StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Snarvei på skrivebordet"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Oppretter snarveier på skrivebordet"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Snarvei i Hurtigstart"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Oppretter snarvei i Hurtigstart"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} grunnleggende."
-StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME}-snarvei."
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Skrivebordssnarvei for ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Hurtigstart-snarvei for ${APPLICATION_NAME}."
-StrCpy $UNINSTALLER_FILE_Detail "Skriver Avinstallasjonsprogram."
-StrCpy $UNINSTALLER_REGISTRY_Detail "Skriver registernøkler for installasjonsprogrammet"
-StrCpy $UNINSTALLER_FINISHED_Detail "Ferdig"
-StrCpy $UNINSTALL_MESSAGEBOX "Det ser ikke ut som ${APPLICATION_NAME} er installert i mappe '$INSTDIR'.$\n$\nFortsett likevel (ikke anbefalt)?"
-StrCpy $UNINSTALL_ABORT "Avinstallering avbrutt av bruker"
-StrCpy $INIT_NO_QUICK_LAUNCH "Hurtigstart-snarvei (I/T)"
-StrCpy $INIT_NO_DESKTOP "Snarvei på skrivebordet (skriver over eksisterende)"
-StrCpy $UAC_ERROR_ELEVATE "Klarte ikke å heve tilgangsnivå. Feil: "
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Dette installasjonsprogrammet krever administrasjonstilgang. Prøv igjen"
-StrCpy $INIT_INSTALLER_RUNNING "Installasjonsprogrammet kjører allerede."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Avinstallasjonsprogrammet krever administrasjonstilgang. Prøv igjen"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Påloggingstjenesten kjører ikke, avbryter!"
-StrCpy $INIT_UNINSTALLER_RUNNING "Avinstallasjonsprogrammet kjører allerede."
-StrCpy $SectionGroup_Shortcuts "Snarveier"

admin/win/nsi/l10n/Polish.nsh

@@ -1,43 +1,44 @@
 # Auto-generated - do not modify
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Poka¿ informacje o wydaniu"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Proces ${APPLICATION_EXECUTABLE} musi zostaæ zatrzymany $\nCzy chcesz aby instalator zatrzyma³ je dla ciebie?"
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Pokaż informacje o wydaniu"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Proces ${APPLICATION_EXECUTABLE} musi zostać zatrzymany $\nCzy chcesz aby instalator zatrzymał je dla ciebie?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Zamykam proces ${APPLICATION_EXECUTABLE}."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Nie znaleziono procesu!"
-StrCpy $PageReinstall_NEW_Field_1 "W Twoim systemie jest zainstalowana starsza wersja ${APPLICATION_NAME}. Zalecane jest jej usuniêcie przed dalsz¹ instalacj¹. Wybierz operacjê któr¹ chcesz wykonaæ i naciœnij przycisk Dalej."
+StrCpy $PageReinstall_NEW_Field_1 "W Twoim systemie jest zainstalowana starsza wersja ${APPLICATION_NAME}. Zalecane jest jej usunięcie przed dalszą instalacją. Wybierz operację którą chcesz wykonać i naciśnij przycisk Dalej."
 StrCpy $PageReinstall_NEW_Field_2 "Odinstaluj przed instalacja"
 StrCpy $PageReinstall_NEW_Field_3 "Nie usuwaj "
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ju¿ zainstalowane"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Wybierz jak chcesz zainstalowaæ ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "Zainstalowana jest nowsza wersja ${APPLICATION_NAME}! Niezalecane jest instalowanie starszej wersji. Jeœli naprawdê chcesz zainstalowaæ starsz¹ wersjê lepiej najpierw odinstalowaæ obecn¹ aplikacjê. Wybierz operacjê któr¹ chcesz wykonaæ i naciœnij przycisk Dalej."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} jest ju¿ zainstalowany.$\nWybierz operacjê któr¹ chcesz wykonaæ i naciœnij przycisk Dalej."
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Już zainstalowane"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Wybierz jak chcesz zainstalować ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "Zainstalowana jest nowsza wersja ${APPLICATION_NAME}! Niezalecane jest instalowanie starszej wersji. Jeśli naprawdę chcesz zainstalować starszą wersję lepiej najpierw odinstalować obecną aplikację. Wybierz operację którą chcesz wykonać i naciśnij przycisk Dalej."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} jest już zainstalowany.\nWybierz operację którą chcesz wykonać i naciśnij przycisk Dalej."
 StrCpy $PageReinstall_SAME_Field_2 "Doda/Przeinstaluj komponenty"
 StrCpy $PageReinstall_SAME_Field_3 "Odinstaluj ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Odinstaluj ${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Wybierz sposób utrzymywania."
-StrCpy $SEC_APPLICATION_DETAILS "Instaluje niezbêdne pliki ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "integracja z Eksploratorem Windows"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalowanie Integracji z Eksploratorem Windows"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Skrót w Menu Start"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Dodajê skrót ${APPLICATION_NAME} w Menu Start."
-StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Skrót na Pulpicie"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Utworzy skrót na Pulpicie"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Skrót na Pasku Zadañ"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Tworzê skrót na Pasku Zadañ"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Niezbêdne pliki ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Skrót ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Skrót ${APPLICATION_NAME} na pulpicie."
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Skrót ${APPLICATION_NAME} na Pasku Zadañ."
-StrCpy $UNINSTALLER_FILE_Detail "Tworzê dezinstalator"
-StrCpy $UNINSTALLER_REGISTRY_Detail "Tworzê wpisy w rejestrze"
-StrCpy $UNINSTALLER_FINISHED_Detail "Zakoñczony"
-StrCpy $UNINSTALL_MESSAGEBOX "Nie wygl¹da na to ¿e ${APPLICATION_NAME} jest zainstalowane w katalogu '$INSTDIR'.$$ Kontynuowaæ mimo tego (nie zalecane)?"
-StrCpy $UNINSTALL_ABORT "Dezinstalacja przerwana przez u¿ytkownika"
-StrCpy $INIT_NO_QUICK_LAUNCH "Skrót na Pasku Zadañ (NIE DOTYCZY)"
-StrCpy $INIT_NO_DESKTOP "Skróty na pulpicie (nadpisuje obecne)"
-StrCpy $UAC_ERROR_ELEVATE "Niemo¿noœæ podniesienia, b³¹d:"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Ten instalator potrzebuje uprawnieñ administratora, spróbuj ponownie"
-StrCpy $INIT_INSTALLER_RUNNING "Instalator ju¿ jest uruchomiony."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Ten dezinstalator potrzebuje uprawnieñ administratora, spróbuj ponownie"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Proces logowania nie jest uruchomiony, przerywam !"
-StrCpy $INIT_UNINSTALLER_RUNNING "Dezinstalator ju¿ jest uruchomiony."
-StrCpy $SectionGroup_Shortcuts "Skróty"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Wybierz sposób utrzymywania."
+StrCpy $SEC_APPLICATION_DETAILS "Instaluje niezbędne pliki ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Skrót w Menu Start"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Dodaję skrót ${APPLICATION_NAME} w Menu Start."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Skrót na Pulpicie"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Utworzy skrót na Pulpicie"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Skrót na Pasku Zadań"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Tworzę skrót na Pasku Zadań"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Niezbędne pliki ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Skrót ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Skrót ${APPLICATION_NAME} na pulpicie."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Skrót ${APPLICATION_NAME} na Pasku Zadań."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Usuń folder z danymi ${APPLICATION_NAME} z komputera."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Czy chcesz usunąć folder z danymi ${APPLICATION_NAME}?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Zostaw niezaznaczone aby zachować folder z danymi lub zaznacz aby go usunąć."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Tak, usuń folder z danymi."
+StrCpy $UNINSTALLER_FILE_Detail "Tworzę dezinstalator"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Tworzę wpisy w rejestrze"
+StrCpy $UNINSTALLER_FINISHED_Detail "Zakończony"
+StrCpy $UNINSTALL_MESSAGEBOX "Nie wygląda na to że ${APPLICATION_NAME} jest zainstalowane w katalogu '$INSTDIR'.$$ Kontynuować mimo tego (nie zalecane)?"
+StrCpy $UNINSTALL_ABORT "Dezinstalacja przerwana przez użytkownika"
+StrCpy $INIT_NO_QUICK_LAUNCH "Skrót na Pasku Zadań (NIE DOTYCZY)"
+StrCpy $INIT_NO_DESKTOP "Skróty na pulpicie (nadpisuje obecne)"
+StrCpy $UAC_ERROR_ELEVATE "Niemożność podniesienia, błąd:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Ten instalator potrzebuje uprawnień administratora, spróbuj ponownie"
+StrCpy $INIT_INSTALLER_RUNNING "Instalator już jest uruchomiony."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Ten dezinstalator potrzebuje uprawnień administratora, spróbuj ponownie"
+StrCpy $INIT_UNINSTALLER_RUNNING "Dezinstalator już jest uruchomiony."
+StrCpy $SectionGroup_Shortcuts "Skróty"

admin/win/nsi/l10n/Portuguese.nsh

@@ -1,43 +1,44 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar notas de lançamento"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Encontrados ${APPLICATION_EXECUTABLE} processo(s) em execução que precisa(m) de ser interrompido(s).$\nDeseja que o instalador o(s) termine por si?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "A terminar os processos de ${APPLICATION_EXECUTABLE}."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Não foi encontrado o processo para terminar!"
-StrCpy $PageReinstall_NEW_Field_1 "Está instalada no sistema uma versão antiga de ${APPLICATION_NAME}. É recomendado que desinstale a versão atual antes de instalar a mais recente. Selecione a operação que deseja executar e clique em $\"Seguinte$\" para continuar."
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Encontrados processos ${APPLICATION_EXECUTABLE} que precisam de ser parados.$\nDeseja que o instalador os pare ?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "A terminar processos ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Processo para terminar não foi encontrado!"
+StrCpy $PageReinstall_NEW_Field_1 "Está instalada uma versão anterior de ${APPLICATION_NAME} no seu sistema. Recomenda-se que desinstale primeiro a versão atual antes de instalar. Selecione a operação que pretende fazer, e clique Seguinte para continuar."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
-StrCpy $PageReinstall_NEW_Field_3 "Não desinstale"
+StrCpy $PageReinstall_NEW_Field_3 "Não desinstalar"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Já instalado"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Escolha como pretende instalar ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "Já está instalada uma versão mais recente de ${APPLICATION_NAME}! Não é recomendada a instalação de uma versão mais antiga. Se realmente desejar instalar esta versão antiga, aconselha-se que desinstale primeiro a versão atual. Selecione a operação que deseja executar e clique em $\"Seguinte$\" para continuar."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} já está instalada.$\nSelecione a operação que deseja realizar e clique em 'Seguinte' para continuar."
+StrCpy $PageReinstall_OLD_Field_1 "Já esta instalada uma nova versão dfe ${APPLICATION_NAME}! Não se recomenda instalar uma versão anterior. Se quer mesmo instalar esta versão mais antiga, é melhor desinstalar primeiro a versão atual. Selecione a operação que pretende fazer e clique Seguinte para continuar."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} já está instalado.\nSelecione a operação que deseja fazer, e clique Seguinte para continuar."
 StrCpy $PageReinstall_SAME_Field_2 "Adicionar/Reinstalar Componentes"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalar ${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Escolha a opção de manutenção a realizar."
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Escolha a opção de manutenção a fazer."
 StrCpy $SEC_APPLICATION_DETAILS "A instalar o essencial de ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integração para Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "A instalar integração para Windows Explorer"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Atalho  do progama no Menu Iniciar"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Atalho  do progama no Menu Inicial"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "A adicionar o atalho de ${APPLICATION_NAME} ao Menu Inicial."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Atalho da área de trabalho"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "A criar atalhos na área de trabalho"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "A criar atalhos da área de trabalho"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Atalho de início rápido"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "A criar atalho de início rápido"
 StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "O essencial de ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Atalho de ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Atalho do ambiente de trabalho para ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Atalho no ambiente de trabalho de ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Atalho de início rápido de ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Remover a pasta de dados de ${APPLICATION_NAME} do seu computador."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Deseja remover a pasta de dados de ${APPLICATION_NAME}?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Não assinale para manter a pasta de dados para uso mais tarde, ou assinale para apagar a pasta de dados."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Sim, remover esta pasta."
 StrCpy $UNINSTALLER_FILE_Detail "A escrever o Desinstalador"
 StrCpy $UNINSTALLER_REGISTRY_Detail "A escrever chaves de registo do instalador"
 StrCpy $UNINSTALLER_FINISHED_Detail "Terminado"
-StrCpy $UNINSTALL_MESSAGEBOX "Não parece que a aplicação ${APPLICATION_NAME} esteja instalada no diretório '$INSTDIR'.$\n$\nContinuar na mesma (não recomendado)?"
+StrCpy $UNINSTALL_MESSAGEBOX "Não parece que ${APPLICATION_NAME} esteja instalado no diretório '$INSTDIR'.$\n$\nContinuar na mesma (não recomendado)?"
 StrCpy $UNINSTALL_ABORT "Desinstalação cancelada pelo utilizador"
 StrCpy $INIT_NO_QUICK_LAUNCH "Atalho de Início Rápido (N/A)"
 StrCpy $INIT_NO_DESKTOP "Atalho do Ambiente de Trabalho (sobrepõe o existente)"
 StrCpy $UAC_ERROR_ELEVATE "Incapaz de elevar, erro:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Este instalador precisa de permissões de administrador, tente novamente"
-StrCpy $INIT_INSTALLER_RUNNING "O instalador já está em execução."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Este desinstalador requer permissões de administrador, tente novamente"
-StrCpy $UAC_ERROR_LOGON_SERVICE "O serviço do início de sessão não está em execução, a abortar!"
-StrCpy $INIT_UNINSTALLER_RUNNING "O desinstalador já está em execução."
+StrCpy $INIT_INSTALLER_RUNNING "O instalador já está a correr."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Este desinstalador precisa de acesso de administrador; tente novamente"
+StrCpy $INIT_UNINSTALLER_RUNNING "O desinstalador já está a correr."
 StrCpy $SectionGroup_Shortcuts "Atalhos"

admin/win/nsi/l10n/PortugueseBR.nsh

@@ -6,19 +6,17 @@ StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Processo para eliminar n
 StrCpy $PageReinstall_NEW_Field_1 "Uma versão mais antiga de ${APPLICATION_NAME} está instalado em seu sistema. É recomendado que você desinstale a versão atual antes de instalar. Selecione a operação que deseja executar e clique em Avançar para continuar."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
 StrCpy $PageReinstall_NEW_Field_3 "Não desinstale"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Já Instalado"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Já instalado"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Escolha como você deseja instalar ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "A versão mais recente do ${APPLICATION_NAME} já está instalado! Não é recomendado que você instale uma versão mais antiga. Se você realmente deseja instalar esta versão mais antiga, é melhor desinstalar a versão atual primeiro. Selecione a operação que deseja executar e clique em Avançar para continuar."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} já está instalado.$\n$\nSelecione a operação que você quer realizar e clique Próximo para continuar."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${version} já está instalado. \nSelecione a operação que deseja executar e clique em Avançar para continuar."
 StrCpy $PageReinstall_SAME_Field_2 "Adicionar/reinstalar componentes"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalar ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Escolha a opção de realizar manutenção."
 StrCpy $SEC_APPLICATION_DETAILS "Instalando ${APPLICATION_NAME}  fundamentos."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integração para Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalação de Integração para Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Menu Iniciar Programa Atalho"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Adicionando atalho para ${APPLICATION_NAME} ao Menu Iniciar."
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Adicionando atalho para ${APPLICATION_NAME} para o Menu Iniciar."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Atalho Desktop"
 StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Criando Atalhos de Desktop"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Atalho Rápido"
@@ -27,17 +25,20 @@ StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} esseciais."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} atalho."
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Atalho Desktop para ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Atalho Rápido para ${APPLICATION_NAME}."
-StrCpy $UNINSTALLER_FILE_Detail "Gravando Desinstalador"
-StrCpy $UNINSTALLER_REGISTRY_Detail "Gravando Chaves de Registro do Inslalador"
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Remover ${APPLICATION_NAME}  pasta de dados de seu computador."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Você quer apagar ${APPLICATION_NAME} 's pasta de dados?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Deixe desmarcada para manter a pasta de dados para uso posterior ou cheque para excluir a pasta de dados."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Sim, excluir essa pasta de dados."
+StrCpy $UNINSTALLER_FILE_Detail "Escrevendo Desinstalador"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Escrevendo Chaves de Registro do Inslalador"
 StrCpy $UNINSTALLER_FINISHED_Detail "Finalizado"
 StrCpy $UNINSTALL_MESSAGEBOX "Não parece que ${APPLICATION_NAME} está instalado no diretório '$INSTDIR'.$\n$\nContinuar assim mesmo (não recomendado)?"
 StrCpy $UNINSTALL_ABORT "Desinstalação abortada pelo usuário"
 StrCpy $INIT_NO_QUICK_LAUNCH "Atalho de Inicialização Rápida (N/A)"
-StrCpy $INIT_NO_DESKTOP "Atalho Desktop (substitui os existente)"
+StrCpy $INIT_NO_DESKTOP "Atalho Desktop (substituições existente)"
 StrCpy $UAC_ERROR_ELEVATE "Incapaz de elevar, erro:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Este programa de instalação requer acesso de administrador, tente novamente"
 StrCpy $INIT_INSTALLER_RUNNING "O instalador já está em execução."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Este desinstalador requer acesso de administrador, tente novamente"
-StrCpy $UAC_ERROR_LOGON_SERVICE "O serviço de logon não está sendo executado, abortando!"
 StrCpy $INIT_UNINSTALLER_RUNNING "O desinstalador já está em execução."
 StrCpy $SectionGroup_Shortcuts "Atalhos"

admin/win/nsi/l10n/Russian.nsh

@@ -1,43 +1,44 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Показать примечания к выпуску"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Обнаружен процесс ${APPLICATION_EXECUTABLE}, который требуется остановить.$\nВы хотите чтобы программа установки сделала это самостоятельно?"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Обнаружены процес(сы) ${APPLICATION_EXECUTABLE}, которые должны быть остановлены.$\nХотите программа установки сделает это самостоятельно?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Завершение процессов ${APPLICATION_EXECUTABLE}."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Процессы для завершения не найдены!"
-StrCpy $PageReinstall_NEW_Field_1 "Обнаружена более старая версия ${APPLICATION_NAME}. Рекомендуется удалить её перед установкой. Выберите желаемое действие и нажмите Далее для продолжения."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Не найдены процессы, которые нужно завершить!"
+StrCpy $PageReinstall_NEW_Field_1 "Обнаружена более старая версия ${APPLICATION_NAME}. Рекомендуется удалить её перед установкой. Выберите желаемое действие и нажмите $\"Далее$\"."
 StrCpy $PageReinstall_NEW_Field_2 "Удалить перед установкой"
 StrCpy $PageReinstall_NEW_Field_3 "Не устанавливать"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Уже установлено"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Выберите, как вы хотите установить ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "Новая версия ${APPLICATION_NAME} уже установлена​​! Не рекомендуется устанавливать старую версию. Если вы действительно хотите установить эту старую версию, то сначала лучше удалить текущую версию. Выберите желаемое действие и нажмите Далее для продолжения."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} уже установлен.$\n$\nУкажите действие и нажмите Далее для продолжения."
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Выберите, как вы хотите установить  ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "Новая версия ${APPLICATION_NAME} уже установлена​​! Не рекомендуется устанавливать старую версию. Если вы действительно хотите, чтобы устанавливать старую версию, лучше удалить текущую версию. Выберите операцию, которую необходимо выполнить, и нажмите Далее, чтобы продолжить."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} уже установлена.\nВыберите операцию, которую необходимо выполнить, и нажмите Далее, чтобы продолжить."
 StrCpy $PageReinstall_SAME_Field_2 "Добавить/Переустановить компоненты"
 StrCpy $PageReinstall_SAME_Field_3 "Удалить ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Удалить ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Выберите опцию обслуживания для исполнения."
-StrCpy $SEC_APPLICATION_DETAILS "Установка базовых компонентов ${APPLICATION_NAME}"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Интеграция для проводника Windows"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Установка интеграции с проводником Windows"
+StrCpy $SEC_APPLICATION_DETAILS "Установка зависимостей приложения ${APPLICATION_NAME}"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Ярлык в меню Пуск"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Добавление ярлыка ${APPLICATION_NAME} в меню Пуск"
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Ярлык на рабочем столе"
 StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Создание ярлыков на рабочем столе"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Ярлык в меню быстрого запуска"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Создание ярлыка в меню быстрого запуска"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Базовые компоненты ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Зависимости приложения ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Ярлык приложения ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Ярлык на рабочем столе для ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Ярлык в меню быстрого запуска для ${APPLICATION_NAME}."
-StrCpy $UNINSTALLER_FILE_Detail "Сохранение деинсталлятора"
-StrCpy $UNINSTALLER_REGISTRY_Detail "Запись ключей реестра установщика"
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Удалить папку данных ${APPLICATION_NAME} с вашего компьютера."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Вы хотите удалить папку с данными ${APPLICATION_NAME} ?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Оставьте неактивным, для сохранения папки с данными приложения, для последующего их использования."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Да, удалить эту папку с данными."
+StrCpy $UNINSTALLER_FILE_Detail "Сохранение деинсталятора"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Запись ключей реестра"
 StrCpy $UNINSTALLER_FINISHED_Detail "Завершено"
-StrCpy $UNINSTALL_MESSAGEBOX "Похоже, что приложение ${APPLICATION_NAME} не установлено в каталог '$INSTDIR'.$\nВсе равно продолжить (не рекомендуется)?"
+StrCpy $UNINSTALL_MESSAGEBOX "Скорее всего, приложение ${APPLICATION_NAME} уже установлено в директорию '$INSTDIR'.\nВсе равно продолжить (не рекомендуется)?"
 StrCpy $UNINSTALL_ABORT "Удаление отменено пользователем"
-StrCpy $INIT_NO_QUICK_LAUNCH "Ярлык быстрого запуска (не доступен)"
-StrCpy $INIT_NO_DESKTOP "Ярлык на рабочем столе (перезапись существующего)"
-StrCpy $UAC_ERROR_ELEVATE "Невозможно повысить привилегии, ошибка:"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Этому установщику требуются права администратора, попробуйте ещё раз"
+StrCpy $INIT_NO_QUICK_LAUNCH "Ярлык быстрого запуска (недоступен)"
+StrCpy $INIT_NO_DESKTOP "Ярлык на рабочем столе (перезаписать существующий)"
+StrCpy $UAC_ERROR_ELEVATE "Невозможно поднять, ошибка:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Для установки необходимы права администратора, попробуйте ещё раз."
 StrCpy $INIT_INSTALLER_RUNNING "Установщик уже запущен."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Этому деинсталлятору требуются права администратора, попробуйте ещё раз"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Служба входа в систему не запущена, прерывание!"
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Этот деинсталятор требует права администратора, попытайтесь ещё"
 StrCpy $INIT_UNINSTALLER_RUNNING "Программа удаления уже выполняется."
 StrCpy $SectionGroup_Shortcuts "Ярлыки"

admin/win/nsi/l10n/SimpChinese.nsh

@@ -1,24 +1,17 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "查看版本日志"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "有 ${APPLICATION_EXECUTABLE} 项进程需要关闭。$\n您想让安装程序关闭这些进程吗？"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "停止${APPLICATION_EXECUTABLE}进程。"
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "未找到要停止的进程！"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "杀死${APPLICATION_EXECUTABLE}进程。"
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "未找到要杀死的进程！"
 StrCpy $PageReinstall_NEW_Field_1 "您的系统已经安装${APPLICATION_NAME}较老版本。建议安装前卸载当前版本。选择将要执行的操作，点击下一步继续。"
 StrCpy $PageReinstall_NEW_Field_2 "在安装前先卸载"
 StrCpy $PageReinstall_NEW_Field_3 "不要卸载"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "已经安装"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "选择如何安装${APPLICATION_NAME}。"
-StrCpy $PageReinstall_OLD_Field_1 "较新版本的 ${APPLICATION_NAME} 已经安装！安装较旧版本的程序是不推荐的。如果您希望继续安装较旧版本，建议先卸载较新版本。选择您想要执行的操作并点击下一步以继续。"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} 已经安装。$\n$\n请选择想要执行的操作并点击下一步。"
-StrCpy $PageReinstall_SAME_Field_2 "增加/重装组件"
+StrCpy $PageReinstall_SAME_Field_2 "添加/重装组件"
 StrCpy $PageReinstall_SAME_Field_3 "卸载${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "卸载${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "选择需要执行的维护选项。"
 StrCpy $SEC_APPLICATION_DETAILS "安装${APPLICATION_NAME}基本组件。"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "整合到 Windows 资源管理器"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "正在整合到 Windows 资源管理器"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "开始菜单程序快捷方式"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "添加 ${APPLICATION_NAME} 快捷方式到开始菜单。"
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "桌面快捷方式"
 StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "创建桌面快捷方式"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "快速启动栏快捷方式"
@@ -27,17 +20,25 @@ StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME}基本组件。"
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME}快捷方式。"
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "${APPLICATION_NAME}桌面快捷方式。"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "${APPLICATION_NAME}快速启动栏快捷方式。"
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "删除数据文件。"
 StrCpy $UNINSTALLER_FILE_Detail "覆盖卸载器"
-StrCpy $UNINSTALLER_REGISTRY_Detail "正在写入注册表"
 StrCpy $UNINSTALLER_FINISHED_Detail "完成"
-StrCpy $UNINSTALL_MESSAGEBOX "${APPLICATION_NAME} 可能并没有安装在 $INSTDIR。$\n$\n仍然继续吗？(不推荐)"
-StrCpy $UNINSTALL_ABORT "用户取消了卸载"
 StrCpy $INIT_NO_QUICK_LAUNCH "快速启动栏快捷方式(N/A)"
 StrCpy $INIT_NO_DESKTOP "桌面快捷方式(覆盖)"
-StrCpy $UAC_ERROR_ELEVATE "无法获得权限，错误："
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "安装程序需要管理员权限，请重试"
-StrCpy $INIT_INSTALLER_RUNNING "安装程序已经运行。"
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "卸载程序需要管理员权限，请重试"
-StrCpy $UAC_ERROR_LOGON_SERVICE "登录服务器未运行！"
-StrCpy $INIT_UNINSTALLER_RUNNING "卸载程序已经运行。"
 StrCpy $SectionGroup_Shortcuts "快捷方式"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?"
+StrCpy $PageReinstall_OLD_Field_1 "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choose the maintenance option to perform."
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Adding shortcut for ${APPLICATION_NAME} to the Start Menu."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Remove ${APPLICATION_NAME}'s data folder from your computer."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Do you want to delete ${APPLICATION_NAME}'s data folder?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Leave unchecked to keep the data folder for later use or check to delete the data folder."
+StrCpy $UNINSTALLER_REGISTRY_Detail "Writing Installer Registry Keys"
+StrCpy $UNINSTALL_MESSAGEBOX "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
+StrCpy $UNINSTALL_ABORT "Uninstall aborted by user"
+StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "This installer requires admin access, try again"
+StrCpy $INIT_INSTALLER_RUNNING "The installer is already running."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "This uninstaller requires admin access, try again"
+StrCpy $INIT_UNINSTALLER_RUNNING "The uninstaller is already running."

admin/win/nsi/l10n/Slovak.nsh

@@ -3,20 +3,18 @@ StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Zobrazi
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Našli sa ${APPLICATION_EXECUTABLE} proces (y), ktoré je potrebné zastavi<76>.$\nChcete, aby ich inštalátor zastavil?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Ukonèujem ${APPLICATION_EXECUTABLE} procesy."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Proces ukonèenia nebol nájdený!"
-StrCpy $PageReinstall_NEW_Field_1 "Staršia verzia ${APPLICATION_NAME} je nainštalovaná vo vašom poèítaèi. Odporúèam vám odinštalova<76> aktuálnu verziu pred inštaláciou. Vyberte operáciu, ktorú chcete vykona<6E>, a kliknite na tlaèidlo Ïalej pre pokraèovanie."
+StrCpy $PageReinstall_NEW_Field_1 "Staršia verzia ${APPLICATION_NAME} je nainštalovaná vo vašom systéme. Odporúèam vám odinštalova<76> aktuálnu verziu pred inštaláciou. Vyberte operáciu, ktorú chcete vykona<6E>, a kliknite na tlaèidlo Ïalej pre pokraèovanie."
 StrCpy $PageReinstall_NEW_Field_2 "Odinštalova<EFBFBD> pred inštaláciou"
 StrCpy $PageReinstall_NEW_Field_3 "Neodinštalova<EFBFBD>"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Už je nainštalovaný"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Vyberte si, ako chcete nainštalova<76> ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Novšia verzia ${APPLICATION_NAME} je už nainštalovaná! Neodporúèam vám nainštalova<76> staršiu verziu. Ak naozaj chcete nainštalova<76> túto staršiu verziu, je lepšie najprv odinštalova<76> aktuálnu verziu. Vyberte operáciu, ktorú chcete vykona<6E>, a kliknite na tlaèidlo Ïalej pre pokraèovanie."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} je už nainštalovaná.$\n$\nVyberte operáciu, ktorú chcete vykona<6E>, a kliknite na tlaèidlo Ïalej pre pokraèovanie."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} je už nainštalovaná.\nVyberte operáciu, ktorú chcete vykona<6E>, a kliknite na tlaèidlo Ïalej pre pokraèovanie."
 StrCpy $PageReinstall_SAME_Field_2 "Prida<EFBFBD>/Preinštalova<76> komponenty"
 StrCpy $PageReinstall_SAME_Field_3 "Odinštalova<EFBFBD> ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Odinštalova<EFBFBD> ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Vyberte možnos<6F> vykona<6E> údržbu."
 StrCpy $SEC_APPLICATION_DETAILS "Inštalujú sa náležitosti ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integrácia do Windows Explorera"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Inštalaácia integrácie do Windows Explorera"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Zástupca programu v menu Štart"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Prida<EFBFBD> zástupcu pre ${APPLICATION_NAME} do menu Štart."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Zástupca na ploche"
@@ -27,6 +25,10 @@ StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "N
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} zástupca."
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Zástupca na ploche pre ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Zástupca na paneli úloh pre ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Zmaza<EFBFBD> dátový prieèinok ${APPLICATION_NAME}'s z vášho poèítaèa."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Naozaj chcete zmaza<7A> prieèinok s dátami ${APPLICATION_NAME}'s ?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Ponechajte nezaškrtnuté, ak chcete prieèinok s dátami ponecha<68> na neskoršie použitie, alebo zaškrtnite, ak chcete prieèinok zmaza<7A>."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Áno, zmaza<7A> tento prieèinok."
 StrCpy $UNINSTALLER_FILE_Detail "Zapisujem odinštalátor"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Zapisujem inštalaèné k¾úèe do registra"
 StrCpy $UNINSTALLER_FINISHED_Detail "Dokonèené"
@@ -38,6 +40,5 @@ StrCpy $UAC_ERROR_ELEVATE "Nemo
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Tento inštalátor vyžaduje admin prístup, skúste to znova"
 StrCpy $INIT_INSTALLER_RUNNING "Inštalátor je už spustený."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Tento odinštalátor vyžaduje admin prístup, skúste to znova"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Prihlasovacia služba nebeží! Prerušuje sa."
 StrCpy $INIT_UNINSTALLER_RUNNING "Odinštalátor je už spustený."
 StrCpy $SectionGroup_Shortcuts "Zástupcovia"

admin/win/nsi/l10n/Slovenian.nsh

@@ -9,14 +9,12 @@ StrCpy $PageReinstall_NEW_Field_3 "Ne odstrani namestitve"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Program je že nameščen"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Izberite način namestitve programa ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Novejša različica programa ${APPLICATION_NAME} je že nameščena! Ni priporočljivo namestiti starejše. V kolikor želite vseeno nadaljevati z namestitvijo, prej odstranite obstoječo različico. Izberite opravilo in pritisnite gumb za nadaljevanje."
-StrCpy $PageReinstall_SAME_Field_1 "Program ${APPLICATION_NAME} ${VERSION} je že nameščen.$\n$\nIzberite opravilo, ki ga želite izvesti in kliknite za nadaljevanje."
+StrCpy $PageReinstall_SAME_Field_1 "Program ${APPLICATION_NAME} ${VERSION} je že nameščen. Izberite opravilo in pritisnite gumb za nadaljevanje."
 StrCpy $PageReinstall_SAME_Field_2 "Dodaj/Ponovno namesti programe"
 StrCpy $PageReinstall_SAME_Field_3 "Odstrani ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Odstrani ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Izberite možnost vzdrževanja za izvedbo."
 StrCpy $SEC_APPLICATION_DETAILS "Poteka nameščanje ključnih paketov programa ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Podpora programa Windows raziskovalca"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Nameščanje podpore za program Windows Raziskovalec"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Bližnjica programa v programskem meniju"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Poteka dodajanje bližnjice programa ${APPLICATION_NAME} v programski meni."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Bližnica namizja"
@@ -27,6 +25,10 @@ StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Knji
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Bližnjica programa ${APPLICATION_NAME}"
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Bližnjica namizja za program ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Bližnjica za hiter dostop za program ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Odstrani podatkovno mapo programa ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Ali želite izbrisati podatkovno mapo programa ${APPLICATION_NAME}?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Pustite možnost neoznačeno za kasnejšo rabo podatkov v mapi, ali pa možnost izberite in jo izbrišite."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Da, izbriši podatkovno mapo."
 StrCpy $UNINSTALLER_FILE_Detail "Zapisovanje programa za odstranjevanje namestitve"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Poteka zapisovanje namestilnika v register"
 StrCpy $UNINSTALLER_FINISHED_Detail "Končano"
@@ -38,6 +40,5 @@ StrCpy $UAC_ERROR_ELEVATE "Ni mogo
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Namestilnik zahteva skrbniška dovoljenja."
 StrCpy $INIT_INSTALLER_RUNNING "Namestilnik je že zagnan."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Program za odstranjevanje namestitve zahteva skrbniška dovoljenja."
-StrCpy $UAC_ERROR_LOGON_SERVICE "Storitev za prijavo ni zagnana. Opravilo je ustavljeno!"
 StrCpy $INIT_UNINSTALLER_RUNNING "Program za odstranjevanje namestitve je že zagnan."
 StrCpy $SectionGroup_Shortcuts "Bližnjice"

admin/win/nsi/l10n/Spanish.nsh

@@ -2,42 +2,43 @@
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar las notas de la versión"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "El/los proceso/s ${APPLICATION_EXECUTABLE} debe/n ser detenidos.$\n¿Quiere que el instalador lo haga por usted?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Deteniendo el/los proceso/s ${APPLICATION_EXECUTABLE}."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "¡Proceso a finalizar no encontrado!"
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "¡Proceso a detener no encontrado!"
 StrCpy $PageReinstall_NEW_Field_1 "Una versión anterior de ${APPLICATION_NAME} se encuentra instalada en el sistema. Se recomienda de instalar la versión actual antes de instalar la nueva. Seleccione la operacion deseada y haga click en Siguiente para continuar."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
 StrCpy $PageReinstall_NEW_Field_3 "No desinstalar"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ya está instalado"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Elija cómo quiere instalar ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "Una nueva versión de ${APPLICATION_NAME} ya está instalada. No es recomendable instalar una versión anterior. Si realmente quiere instalar esta versión anterior, es mejor que desinstale la versión actual primero. Seleccione la operación que desea realizar y pulse Siguiente para continuar."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} ya está instalado.$\n$\nSeleccione la operación que desea realizar y haga click en Siguiente para continuar."
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Elija como quiere instalar ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "Una nueva versión de ${APPLICATION_NAME} ya está instalada. No es recomendable instalar una versión anterior. Si realmente quiere instalar esta versión anterior, es mejor que desinstale la versión actual primero. Seleccione la operación que desea realizar y pulse Next para continuar."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} ya está instalada.\nSeleccione la operación que desea realizar y pulse Next para continuar."
 StrCpy $PageReinstall_SAME_Field_2 "Añadir/Reinstalar componentes"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalar ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Elija la opcion de mantenimiento a realizar."
 StrCpy $SEC_APPLICATION_DETAILS "Instalando  ${APPLICATION_NAME} esenciales."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integración para Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalando la integración para Windows Explorer"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso directo al programa Menú de Inicio"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso Directo al Programa Menú de Inicio"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Añadiendo accesos directos para ${APPLICATION_NAME} en el Menú de Inicio."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Acceso directo de Escritorio"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Creando accesos directos de escritorio"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Atajo de accceso rápido"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Creando Accesos Directos de Escritorio"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Acceso Directo al Lanzador Rápido"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creando un Acceso Directo al Lanzador Rápido"
 StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} esencial."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Acceso Directo de ${APPLICATION_NAME}"
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Acceso Directo de Escritorio para ${APPLICATION_NAME}"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Lanzador Rápido de Accesos Director para ${APPLICATION_NAME}."
-StrCpy $UNINSTALLER_FILE_Detail "Escribiendo desinstalador"
-StrCpy $UNINSTALLER_REGISTRY_Detail "Escribiendo claves en el registro del instalador"
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Remueva la carpeta de datos de ${APPLICATION_NAME} del computador."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "¿Desea eliminar la carpeta de datos de ${APPLICATION_NAME}?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Deja sin marcar para mantener la carpeta de datos para uso posterior, o del marque para eliminar la carpeta de datos."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Si, Elimine esta carpeta de datos."
+StrCpy $UNINSTALLER_FILE_Detail "Escribiendo Desinstalador"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Escribiendo Llaves en el Registro del Instalador"
 StrCpy $UNINSTALLER_FINISHED_Detail "Terminado"
-StrCpy $UNINSTALL_MESSAGEBOX "Parece que ${APPLICATION_NAME} no está instalado en el directorio '$INSTDIR'.$$ ¿Continuar de todos modos? (No recomendado)"
+StrCpy $UNINSTALL_MESSAGEBOX "Parece que ${APPLICATION_NAME} no está instalado en el directorio '$INSTDIR'.$$ ¿Continuar de todos modos? (No Recomendado)"
 StrCpy $UNINSTALL_ABORT "Desinstalación cancelada por el usuario"
-StrCpy $INIT_NO_QUICK_LAUNCH "Atajo de inicio rápido (N/A)"
+StrCpy $INIT_NO_QUICK_LAUNCH "Acceso Directo al Lanzador Rápido (N/A)"
 StrCpy $INIT_NO_DESKTOP "Atajo de escritorio (sobreescribe el existente)"
-StrCpy $UAC_ERROR_ELEVATE "No se ha podido elevar, error:"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "El instalador requiere acceso administrativo, inténtelo de nuevo"
+StrCpy $UAC_ERROR_ELEVATE "No se ha podido elevar, Error:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "El instalador requiere acceso administrativo, intente de nuevo"
 StrCpy $INIT_INSTALLER_RUNNING "El instalador ya se encuentra en ejecución"
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "El desinstalador requiere acceso administrativo, inténtelo de nuevo"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Servicio Inicio de sesión no se está ejecutando, abortando!"
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "El desinstalador requiere acceso administrativo, intente de nuevo"
 StrCpy $INIT_UNINSTALLER_RUNNING "El desinstalador ya se encuentra en ejecución."
-StrCpy $SectionGroup_Shortcuts "Accesos directos"
+StrCpy $SectionGroup_Shortcuts "Accesos Directos"

admin/win/nsi/l10n/SpanishInternational.nsh

@@ -1,6 +1,5 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar notas de la versión"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Se encontrarion ${APPLICATION_EXECUTABLE} proceso(s) que debe/n ser detenidos.$\"$\n$\"¿Quiere que el instalador lo haga por usted?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Parando el proceso ${APPLICATION_EXECUTABLE}."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Proceso a detener no encontrado!"
 StrCpy $PageReinstall_NEW_Field_1 "Una versión anterior de ${APPLICATION_NAME} esta instalada en el sistema. Es recomendado que quite esta versión antes de instalar. Elija la operación a realizar y seleccione Siguiente para continuar."
@@ -9,35 +8,37 @@ StrCpy $PageReinstall_NEW_Field_3 "No des-instalar."
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Actualmente Instalado."
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Elija como desea instalar ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Una versión mas reciente de ${APPLICATION_NAME} esta actualmente instalada! No es recomendado que instale una versión antigua. Si realmente desea instalar esta versión obsoleta, es mejor que des-instale la versión actual primero. Seleccione la operación que desea realizar y presione en Siguiente para continuar. "
-StrCpy $PageReinstall_SAME_Field_1 "La ${APPLICATION_NAME} ${VERSION} ya está instalado.$\n$\nSeleccione la operación que desea realizar y haga click en Siguiente para continuar."
 StrCpy $PageReinstall_SAME_Field_2 "Agregar/Re-Instalar componentes"
 StrCpy $PageReinstall_SAME_Field_3 "Des-instalar ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Des-instalar ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Elija la opción de mantenimiento a realizar."
 StrCpy $SEC_APPLICATION_DETAILS "Instalar  esenciales ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integración para Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalando la integración para Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso Directo en Menú de Programas"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Agregando el Acceso Directo al Menú de Inicio para ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Acceso directo en Escritorio"
 StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Creando Accesos Directos en Escritorio"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Atajo de Acceso Rápido"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creando Atajo de Acceso Rápido"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} esencial."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Acceso directo de ${APPLICATION_NAME}"
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Acceso Directo al Escritorio para ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Atajo de Acceso Rápido para ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Quitar la carpeta de datos ${APPLICATION_NAME} de la computadora."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Desea borrar la carpeta de datos de ${APPLICATION_NAME}?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Dejar des-tildado para mantener la carpeta de datos para posterior uso o tildar para borrar la carpeta de datos."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Si, eliminar esta carpeta de datos."
 StrCpy $UNINSTALLER_FILE_Detail "Escribiendo Des-Instalador."
 StrCpy $UNINSTALLER_REGISTRY_Detail "Escribiendo claves de Registro del Instalador"
 StrCpy $UNINSTALLER_FINISHED_Detail "Terminado"
-StrCpy $UNINSTALL_MESSAGEBOX "Parece que ${APPLICATION_NAME} no esta instalado en el directorio '$INSTDIR'.$\n$\n¿Continuar de todos modos? (No recomendado)"
 StrCpy $UNINSTALL_ABORT "Des-instalación abortada por el usuario"
-StrCpy $INIT_NO_QUICK_LAUNCH "Atajo de Acceso Rápido (N/A)"
 StrCpy $INIT_NO_DESKTOP "Acceso Directo en Escritorio (Sobrescribe existentes)"
-StrCpy $UAC_ERROR_ELEVATE "No se ha podido elevar, error:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Este instalador requiere acceso Administrador, intente de nuevo. "
 StrCpy $INIT_INSTALLER_RUNNING "El instalador ya esta corriendo."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Este des-instalador requiere acceso administrador, intente de nuevo"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Servicio Inicio de sesión no se está ejecutando, abortando!"
 StrCpy $INIT_UNINSTALLER_RUNNING "El des-instalador ya esta corriendo"
 StrCpy $SectionGroup_Shortcuts "Accesos Directos"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Quick Launch Shortcut"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creating Quick Launch Shortcut"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} essentials."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Quick Launch shortcut for ${APPLICATION_NAME}."
+StrCpy $UNINSTALL_MESSAGEBOX "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
+StrCpy $INIT_NO_QUICK_LAUNCH "Quick Launch Shortcut (N/A)"
+StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"

admin/win/nsi/l10n/Swedish.nsh

@@ -9,14 +9,12 @@ StrCpy $PageReinstall_NEW_Field_3 "Avinstallera inte"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Redan installerad"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Välj hur du vill installera ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "En nyare version av ${APPLICATION_NAME} är redan installerad! Det rekommenderas inte att du installerar en äldre version. Om du verkligen vill installera denna äldre versionen, är det bättre att du avinstallerar den nuvarande versionen först. Välj den åtgärd du vill utföra och klicka Nästa för att fortsätta."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} är redan installerad.$\n$\nVälj den åtgärd du vill utföra och klicka på Nästa för att fortsätta."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} är redan installerad.\nVälj den åtgärd du vill utföra och klicka Nästa för att fortsätta."
 StrCpy $PageReinstall_SAME_Field_2 "Lägg till/Ominstallera komponenter"
 StrCpy $PageReinstall_SAME_Field_3 "Avinstallera ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Avinstallera ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Välj underhålls alternativ att utföra."
 StrCpy $SEC_APPLICATION_DETAILS "Installerar ${APPLICATION_NAME} väsentligheter."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integration för Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installerar integration för Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start-meny program genväg"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Lägger till genväg för ${APPLICATION_NAME} till Start-menyn."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Skrivbordsgenväg"
@@ -27,6 +25,10 @@ StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} väsentligheter.
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} genväg."
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Skrivbordsgenväg för ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Snabbstartsgenväg för ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Tag bort ${APPLICATION_NAME}s data mapp från din dator."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Vill du radera ${APPLICATION_NAME}s data mapp?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Lämna omarkerad för att behålla data mappen för senare användning eller markera för att radera data mappen.."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Ja, radera denna data mappen."
 StrCpy $UNINSTALLER_FILE_Detail "Skriver avinstallationsprogram"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Skriver installationsprogrammets registernycklar"
 StrCpy $UNINSTALLER_FINISHED_Detail "Klar"
@@ -37,7 +39,6 @@ StrCpy $INIT_NO_DESKTOP "Skrivbordsgenväg (skriver över nuvarande)"
 StrCpy $UAC_ERROR_ELEVATE "Kunde inte få förhöjda rättigheter, fel:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Detta installationsprogram kräver adminstratörs rättigheter, försök igen"
 StrCpy $INIT_INSTALLER_RUNNING "Installationsprogrammet körs redan."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Detta avinstallationsprogram  kräver administratörsrättigheter, försök igen"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Login-service körs inte, avbryter!"
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Detta avinstallationsprogram  kräver administratörs rättigheter, försök igen"
 StrCpy $INIT_UNINSTALLER_RUNNING "Avinstallationsprogrammet körs redan."
 StrCpy $SectionGroup_Shortcuts "Genvägar"

admin/win/nsi/l10n/Thai.nsh

@@ -1,43 +0,0 @@
-# Auto-generated - do not modify
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "แสดงบันทึกที่มี"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "พบว่ากระบวนการ ${APPLICATION_EXECUTABLE} จะต้องหยุดทำงาน$\nคุณต้องการติดตั้งเพื่อหยุดการทำงานเหล่านี้ของคุณ?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "ฆ่ากระบวนการทำงาน ${APPLICATION_EXECUTABLE}"
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "ไม่พบการฆ่ากระบวนการ!"
-StrCpy $PageReinstall_NEW_Field_1 "รุ่นเก่าของ ${APPLICATION_NAME} ได้ถูกติดตั้งในระบบของคุณ ขอแนะนำให้คุณถอนการติดตั้งรุ่นปัจจุบันออกก่อน แล้วเลือกการดำเนินการที่คุณต้องการหลังจากนั้นคลิกถัดไปเพื่อดำเนินการต่อ"
-StrCpy $PageReinstall_NEW_Field_2 "ถอนการติดตั้งก่อนการติดตั้ง"
-StrCpy $PageReinstall_NEW_Field_3 "อย่าถอนการติดตั้ง"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "ติดตั้งแล้ว"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "เลือกวิธีที่คุณต้องการติดตั้ง ${APPLICATION_NAME}"
-StrCpy $PageReinstall_OLD_Field_1 "รุ่นใหม่ของ ${APPLICATION_NAME} ถูกติดตั้งแล้ว! เราไม่แนะนำให้คุณติดตั้งรุ่นที่เก่ากว่า ถ้าคุณอยากจะติดตั้งรุ่นเก่าก็สามารถถอนการติดตั้งได้"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} รุ่น ${VERSION} ถูกติดตั้งไปแล้ว$ $\nเลือกดำเนินงานที่คุณต้องการและคลิกถัดไปเพื่อดำเนินการต่อ"
-StrCpy $PageReinstall_SAME_Field_2 "ส่วนประกอบ เพิ่ม/ติดตั้งใหม่ "
-StrCpy $PageReinstall_SAME_Field_3 "ถอนการติดตั้ง ${APPLICATION_NAME}"
-StrCpy $UNINSTALLER_APPDATA_TITLE "ถอนการติดตั้ง ${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "เลือกตัวเลือกการบำรุงรักษาเพื่อดำเนินการ"
-StrCpy $SEC_APPLICATION_DETAILS "กำลังติดตั้งข้อมูลที่เป็นเป็นของ ${APPLICATION_NAME}"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "บูรณาการสำหรับ Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "บูรณาการกำลังติดตั้งสำหรับ Windows Explorer"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "โปรแกรมทางลัดเมนูเริ่มต้น"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "เพิ่มทางลัดสำหรับ ${APPLICATION_NAME} ที่เมนูเริ่มต้น"
-StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "ทางลัดพื้นโต๊ะ"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "สร้างทางลัดบนเดสก์ทอป"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "ทางลัดเร่งด่วน"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "สร้างทางลัดเร่งด่วน"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} ที่จำเป็น"
-StrCpy $OPTION_SECTION_SC_START_MENU_Desc "ทางลัด ${APPLICATION_NAME}"
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "ทางลัดบนเดสก์ทอปสำหรับ ${APPLICATION_NAME}"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "ทางลัดเร่งด่วนสำหรับ ${APPLICATION_NAME}"
-StrCpy $UNINSTALLER_FILE_Detail "กำลังถอนการติดตั้ง"
-StrCpy $UNINSTALLER_REGISTRY_Detail "กำลังติดตั้งรหัสรีจิสทรี"
-StrCpy $UNINSTALLER_FINISHED_Detail "เสร็จสิ้น"
-StrCpy $UNINSTALL_MESSAGEBOX "มันจะไม่ปรากฏ ${APPLICATION_NAME} ที่มีการติดตั้งในไดเรกทอรี '$INSTDIR' ดำเนินการต่อไป (ไม่แนะนำ)?"
-StrCpy $UNINSTALL_ABORT "ถอนการติดตั้งถูกยกเลิกโดยผู้ใช้"
-StrCpy $INIT_NO_QUICK_LAUNCH "ทางลัดเร่งด่วน (N/A)"
-StrCpy $INIT_NO_DESKTOP "ทางลัดเดสก์ทอป (จะเขียนทับหากมีอยู่แล้ว)"
-StrCpy $UAC_ERROR_ELEVATE "ไม่สามารถที่จะยกระดับข้อผิดพลาด:"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "การติดตั้งนี้จะต้องมีการเข้าถึงผู้ดูแลระบบ กรุณาลองอีกครั้ง"
-StrCpy $INIT_INSTALLER_RUNNING "กำลังทำการติดตั้ง"
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "การถอนการติดตั้งนี้จะต้องมีการเข้าถึงส่วนผู้ดูแลระบบ กรุณาลองอีกครั้ง"
-StrCpy $UAC_ERROR_LOGON_SERVICE "บริการเข้าสู่ระบบไม่ทำงาน กำลังยกเลิก!"
-StrCpy $INIT_UNINSTALLER_RUNNING "กำลังทำการถอนการติดตั้ง"
-StrCpy $SectionGroup_Shortcuts "ทางลัด"

admin/win/nsi/l10n/Turkish.nsh

@@ -9,14 +9,12 @@ StrCpy $PageReinstall_NEW_Field_3 "Kald
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Zaten Yüklü"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "${APPLICATION_NAME} uygulamasını nasıl yüklemek istediğinizi seçin."
 StrCpy $PageReinstall_OLD_Field_1 "${APPLICATION_NAME} uygulamasının daha yeni sürümü zaten yüklü! Daha eski bir sürümünü yüklemeniz önerilmez. Gerçekten bu eski sürümü yüklemek isterseniz, ilk olarak geçerli sürümü kaldırmanız tavsiye edilir. Yapmak istediğiniz işlemi seçin ve devam etmek üzere İleri tıklayın."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} zaten yüklü.$\n$\nYapmak istediðiniz iþlemi seçin ve devam etmek için Ýleri týklayýn."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} zaten yüklü.\n\nYapmak istediğiniz işlemi seçin ve devam etmek için İleri tıklayın."
 StrCpy $PageReinstall_SAME_Field_2 "Bileşenleri ekle/yeniden yükle"
 StrCpy $PageReinstall_SAME_Field_3 "${APPLICATION_NAME} uygulamasını kaldır"
 StrCpy $UNINSTALLER_APPDATA_TITLE "${APPLICATION_NAME} uygulamasını kaldır"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Yapmak istediğiniz bakım işlemini seçin."
 StrCpy $SEC_APPLICATION_DETAILS "${APPLICATION_NAME} gereklilikleri yükleniyor."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Windows Gezgini için tümleþtirme"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Windows Gezgini için Tümleþtirme Yükleme"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Başlat Menüsü Program Kısayolu"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "${APPLICATION_NAME} için Başlat Menüsü'ne kısayol ekleniyor."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Masaüstü Kısayolu"
@@ -27,6 +25,10 @@ StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} gereklilikleri."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} kısayolu."
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "${APPLICATION_NAME} için masaüstü kısayolu."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "${APPLICATION_NAME} için Hızlı Başlat kısayolu."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Bilgisayarınızdan ${APPLICATION_NAME} veri klasörünü kaldırır."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "${APPLICATION_NAME} veri klasörünü silmek istiyor musunuz?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Veri klasörünün daha sonraki kullanımı için saklamak üzere işaretini kaldırın veya silmek için işaretleyin."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Evet bu veri klasörünü sil."
 StrCpy $UNINSTALLER_FILE_Detail "Kaldırıcı Yazılıyor"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Yükleyici Kayıt Anahtarları Yazılıyor"
 StrCpy $UNINSTALLER_FINISHED_Detail "Tamamlandı"
@@ -38,6 +40,5 @@ StrCpy $UAC_ERROR_ELEVATE "Y
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Bu yükleyici yönetici erişimi gerektiriyor, yeniden deneyin"
 StrCpy $INIT_INSTALLER_RUNNING "Yükleyici zaten çalışıyor."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Bu kaldırıcı yönetici erişimi gerektiriyor, yeniden deneyin"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Oturum açýlacak sunucu çalýþmadýðýndan iptal ediliyor!"
 StrCpy $INIT_UNINSTALLER_RUNNING "Kaldırıcı zaten çalışıyor."
 StrCpy $SectionGroup_Shortcuts "Kısayollar"

admin/win/nsi/l10n/Ukrainian.nsh

@@ -1,43 +0,0 @@
-# Auto-generated - do not modify
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Показати примітки до випуску"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Знайдено процес(и) ${APPLICATION_EXECUTABLE}, які необхідно зупинити.$\nХочете щоб програма установки зробила це самостійно?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Завершення процесів ${APPLICATION_EXECUTABLE}."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Не знайдено процеси, які необхідно зупинити!"
-StrCpy $PageReinstall_NEW_Field_1 "У вашої системі встановлена застаріла версія додатку ${APPLICATION_NAME}. Рекомендуємо видалити її перед початком встановлення поточної версії. Оберіть подальшу дію та натисніть $\"Далі$\"."
-StrCpy $PageReinstall_NEW_Field_2 "Видалити перед установкою"
-StrCpy $PageReinstall_NEW_Field_3 "Не видаляти"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Установлено"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Оберіть, як ви хочете установити ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "Знайдено новішу версію ${APPLICATION_NAME}! Ми не рекомендуємо встановлювати стару версію. Якщо ви все ж бажаєте встановити цю версію, спочатку видаліть поточну версію. Оберіть подальшу дію та натисніть $\"Далі$\"."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} вже встановлено.$\n$\nОберіть подальшу дію та натисніть $\"Далі$\" для продовження."
-StrCpy $PageReinstall_SAME_Field_2 "Додати/Перевстановити компоненти"
-StrCpy $PageReinstall_SAME_Field_3 "Видалити ${APPLICATION_NAME}"
-StrCpy $UNINSTALLER_APPDATA_TITLE "Видалити ${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Оберіть опцію обслуговування для виконання."
-StrCpy $SEC_APPLICATION_DETAILS "Установка залежностей ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Інтеграція з провідником Windows"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Встановлення інтеграції з провідником Windows"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Ярлик в меню Пуск"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Створення ярлика ${APPLICATION_NAME} в меню Пуск."
-StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Ярлик на Робочому столі"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Створення ярлика на Робочому столі"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Ярлик на панелі швидкого запуску"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Створення ярлика на панелі швидкого запуску"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} залежності."
-StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} ярлик."
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Ярлик ${APPLICATION_NAME} на Робочому столі."
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Ярлик ${APPLICATION_NAME} на панелі швидкого запуску."
-StrCpy $UNINSTALLER_FILE_Detail "Збереження Програми видалення"
-StrCpy $UNINSTALLER_REGISTRY_Detail "Запис ключів реєстру"
-StrCpy $UNINSTALLER_FINISHED_Detail "Завершено"
-StrCpy $UNINSTALL_MESSAGEBOX "Скоріш за все ${APPLICATION_NAME} вже встановлено в теку '$INSTDIR'.$↩$\nВсе одно продовжити (не рекомендується)?"
-StrCpy $UNINSTALL_ABORT "Видалення перервано користувачем."
-StrCpy $INIT_NO_QUICK_LAUNCH "Ярлик в області швидкого запуску (недоступний)"
-StrCpy $INIT_NO_DESKTOP "Ярлик на Робочому столі (перезаписати існуючий)"
-StrCpy $UAC_ERROR_ELEVATE "Неможливо підняти, помилка:"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Для установки потрібні права адміністратора, спробуйте ще раз"
-StrCpy $INIT_INSTALLER_RUNNING "Установка вже запущена."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Для видалення потрібні права адміністратора, спробуйте ще раз"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Сервіс авторизації не запущений, припиняю!"
-StrCpy $INIT_UNINSTALLER_RUNNING "Програма видалення вже запущено."
-StrCpy $SectionGroup_Shortcuts "Ярлики"

admin/win/nsi/l10n/bin/build_locale_nsi.py

@@ -67,7 +67,7 @@ localeToName = {
     "mg" : "Malagasy",
     "ms" : "Malay",
     "mn" : "Mongolian",
-    "nb_NO" : "Norwegian",
+    "nb" : "Norwegian",
     "nn" : "NorwegianNynorsk",
     "ps" : "Pashto",
     "pl" : "Polish",
@@ -104,13 +104,10 @@ localeToName = {
 def escapeNSIS(st):
     return st.replace('\\', r'$\\')\
              .replace('\t', r'$\t')\
-             .replace('\r', r'$\r')\
-             .replace('\n', r'$\n')\
+             .replace('\r', r'\r')\
+             .replace('\n', r'\n')\
              .replace('\"', r'$\"')\
-             .replace('$$\\', '$\\')\
-             .replace('$\\n', r'$\n')\
-             .replace('$\\\\n', r'$\n')
-
+             .replace('$$\\', '$\\')
 
 translationCache = {}
 

admin/win/nsi/l10n/bin/l10n.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 L10NDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
 SCRIPTDIR="$L10NDIR/bin"
 PODIR="$L10NDIR/pofiles"
@@ -44,8 +44,5 @@ iconv -t CP1252 -o Finnish.nsh Finnish.nsh
 iconv -t CP932 -o Japanese.nsh Japanese.nsh
 iconv -t CP1250 -o Slovak.nsh Slovak.nsh
 iconv -t CP1254 -o Turkish.nsh Turkish.nsh
-iconv -t CP1252 -o Norwegian.nsh Norwegian.nsh
-iconv -t CP1250 -o Polish.nsh Polish.nsh
-iconv -t CP852  -o Czech.nsh Czech.nsh
-#iconv -t CP852  -o Slovak.nsh Slovak.nsh
+
 

admin/win/nsi/l10n/declarations.nsh

@@ -15,8 +15,6 @@ Var PageReinstall_SAME_Field_3
 Var UNINSTALLER_APPDATA_TITLE
 Var PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE
 Var SEC_APPLICATION_DETAILS
-Var OPTION_SECTION_SC_SHELL_EXT_SECTION
-Var OPTION_SECTION_SC_SHELL_EXT_DetailPrint
 Var OPTION_SECTION_SC_START_MENU_SECTION
 Var OPTION_SECTION_SC_START_MENU_DetailPrint
 Var OPTION_SECTION_SC_DESKTOP_SECTION
@@ -27,6 +25,10 @@ Var OPTION_SECTION_SC_APPLICATION_Desc
 Var OPTION_SECTION_SC_START_MENU_Desc
 Var OPTION_SECTION_SC_DESKTOP_Desc
 Var OPTION_SECTION_SC_QUICK_LAUNCH_Desc
+Var UNINSTALLER_APPDATA_SUBTITLE
+Var UNINSTALLER_APPDATA_LABEL_1
+Var UNINSTALLER_APPDATA_LABEL_2
+Var UNINSTALLER_APPDATA_CHECKBOX
 Var UNINSTALLER_FILE_Detail
 Var UNINSTALLER_REGISTRY_Detail
 Var UNINSTALLER_FINISHED_Detail
@@ -38,6 +40,5 @@ Var UAC_ERROR_ELEVATE
 Var UAC_INSTALLER_REQUIRE_ADMIN
 Var INIT_INSTALLER_RUNNING
 Var UAC_UNINSTALLER_REQUIRE_ADMIN
-Var UAC_ERROR_LOGON_SERVICE
 Var INIT_UNINSTALLER_RUNNING
 Var SectionGroup_Shortcuts

admin/win/nsi/l10n/languages.nsh

@@ -2,28 +2,24 @@
 !insertmacro MUI_LANGUAGE "Swedish"
 !insertmacro MUI_LANGUAGE "Estonian"
 !insertmacro MUI_LANGUAGE "Turkish"
-!insertmacro MUI_LANGUAGE "PortugueseBR"
 !insertmacro MUI_LANGUAGE "Slovenian"
 !insertmacro MUI_LANGUAGE "SpanishInternational"
 !insertmacro MUI_LANGUAGE "Dutch"
-!insertmacro MUI_LANGUAGE "Norwegian"
 !insertmacro MUI_LANGUAGE "Hungarian"
-!insertmacro MUI_LANGUAGE "Ukrainian"
 !insertmacro MUI_LANGUAGE "French"
 !insertmacro MUI_LANGUAGE "Catalan"
 !insertmacro MUI_LANGUAGE "Russian"
-!insertmacro MUI_LANGUAGE "Thai"
 !insertmacro MUI_LANGUAGE "Finnish"
 !insertmacro MUI_LANGUAGE "Basque"
 !insertmacro MUI_LANGUAGE "Greek"
 !insertmacro MUI_LANGUAGE "SimpChinese"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
 !insertmacro MUI_LANGUAGE "Italian"
 !insertmacro MUI_LANGUAGE "Portuguese"
-!insertmacro MUI_LANGUAGE "Czech"
+!insertmacro MUI_LANGUAGE "German"
 !insertmacro MUI_LANGUAGE "Japanese"
 !insertmacro MUI_LANGUAGE "Galician"
-!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Czech"
 !insertmacro MUI_LANGUAGE "Slovak"
 !insertmacro MUI_LANGUAGE "Spanish"
 !insertmacro MUI_LANGUAGE "Polish"
-!insertmacro MUI_LANGUAGE "Farsi"

admin/win/nsi/l10n/pofiles/messages.pot

@@ -65,9 +65,9 @@ msgstr "A newer version of ${APPLICATION_NAME} is already installed! It is not r
 
 #. PageReinstall_SAME_Field_1
 msgid ""
-"${APPLICATION_NAME} ${VERSION} is already installed.$\r$\n"
+"${APPLICATION_NAME} ${VERSION} is already installed.\r\n"
 "Select the operation you want to perform and click Next to continue."
-msgstr "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
+msgstr "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
 
 #. PageReinstall_SAME_Field_2
 msgid "Add/Reinstall components"
@@ -85,14 +85,6 @@ msgstr "Choose the maintenance option to perform."
 msgid "Installing ${APPLICATION_NAME} essentials."
 msgstr "Installing ${APPLICATION_NAME} essentials."
 
-#. OPTION_SECTION_SC_SHELL_EXT_SECTION
-msgid "Integration for Windows Explorer"
-msgstr "Integration for Windows Explorer"
-
-#. OPTION_SECTION_SC_SHELL_EXT_DetailPrint
-msgid "Installing Integration for Windows Explorer"
-msgstr "Installing Integration for Windows Explorer"
-
 #. OPTION_SECTION_SC_START_MENU_SECTION
 msgid "Start Menu Program Shortcut"
 msgstr "Start Menu Program Shortcut"
@@ -133,6 +125,24 @@ msgstr "Desktop shortcut for ${APPLICATION_NAME}."
 msgid "Quick Launch shortcut for ${APPLICATION_NAME}."
 msgstr "Quick Launch shortcut for ${APPLICATION_NAME}."
 
+#. UNINSTALLER_APPDATA_SUBTITLE
+msgid "Remove ${APPLICATION_NAME}'s data folder from your computer."
+msgstr "Remove ${APPLICATION_NAME}'s data folder from your computer."
+
+#. UNINSTALLER_APPDATA_LABEL_1
+msgid "Do you want to delete ${APPLICATION_NAME}'s data folder?"
+msgstr "Do you want to delete ${APPLICATION_NAME}'s data folder?"
+
+#. UNINSTALLER_APPDATA_LABEL_2
+msgid ""
+"Leave unchecked to keep the data folder for later use or check to delete the"
+" data folder."
+msgstr "Leave unchecked to keep the data folder for later use or check to delete the data folder."
+
+#. UNINSTALLER_APPDATA_CHECKBOX
+msgid "Yes, delete this data folder."
+msgstr "Yes, delete this data folder."
+
 #. UNINSTALLER_FILE_Detail
 msgid "Writing Uninstaller"
 msgstr "Writing Uninstaller"
@@ -180,10 +190,6 @@ msgstr "The installer is already running."
 msgid "This uninstaller requires admin access, try again"
 msgstr "This uninstaller requires admin access, try again"
 
-#. UAC_ERROR_LOGON_SERVICE
-msgid "Logon service is not running, aborting!"
-msgstr "Logon service is not running, aborting!"
-
 #. INIT_UNINSTALLER_RUNNING
 msgid "The uninstaller is already running."
 msgstr "The uninstaller is already running."

admin/win/nsi/nsis_processes/license.rtf

@@ -0,0 +1,35 @@
+{\rtf1\ansi\ansicpg1252\uc1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f39\fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Verdana;}
+{\f172\froman\fcharset238\fprq2 Times New Roman CE;}{\f173\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f175\froman\fcharset161\fprq2 Times New Roman Greek;}{\f176\froman\fcharset162\fprq2 Times New Roman Tur;}
+{\f177\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f178\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f179\froman\fcharset186\fprq2 Times New Roman Baltic;}{\f180\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\f562\fswiss\fcharset238\fprq2 Verdana CE;}{\f563\fswiss\fcharset204\fprq2 Verdana Cyr;}{\f565\fswiss\fcharset161\fprq2 Verdana Greek;}{\f566\fswiss\fcharset162\fprq2 Verdana Tur;}{\f569\fswiss\fcharset186\fprq2 Verdana Baltic;}
+{\f570\fswiss\fcharset163\fprq2 Verdana (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;
+\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{
+\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 Normal;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*
+\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 
+\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}{\*\cs15 \additive \ul\cf2 \sbasedon10 \styrsid7485074 Hyperlink;}}
+{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\rsidtbl \rsid6712196\rsid7485074\rsid11352300\rsid15940516}{\*\generator Microsoft Word 11.0.5604;}{\info{\title Processes v1}{\author Hardwired}{\operator Hardwired}{\creatim\yr2004\mo12\dy12\hr23\min42}
+{\revtim\yr2004\mo12\dy12\hr23\min51}{\version2}{\edmins9}{\nofpages1}{\nofwords80}{\nofchars458}{\nofcharsws537}{\vern24689}}\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180
+\dgvspace180\dghorigin1800\dgvorigin1440\dghshow1\dgvshow1
+\jexpand\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct
+\asianbrkrule\rsidroot7485074\newtblstyruls\nogrowautofit \fet0\sectd \linex0\endnhere\sectlinegrid360\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}
+{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}
+{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain 
+\qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid7485074 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\b\f39\insrsid7485074\charrsid7485074 Processes v1.0}{\f39\insrsid7485074\charrsid7485074 .0.1
+\par }{\f39\fs20\insrsid7485074 
+\par }\pard \qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid15940516 {\f39\fs20\insrsid15940516 This software binaries and source-code are free for any kind of use, including commercial use. }{
+\f39\fs20\insrsid7485074\charrsid7485074 There is no restriction and no guaranty for using}{\f39\fs20\insrsid7485074\charrsid7485074  t}{\f39\fs20\insrsid7485074\charrsid7485074 his software}{\f39\fs20\insrsid7485074\charrsid7485074  and/or it
+s source-code. }{\f39\fs20\insrsid15940516 
+\par I}{\f39\fs20\insrsid7485074\charrsid7485074 f you use the plug}{\f39\fs20\insrsid7485074\charrsid7485074 -}{\f39\fs20\insrsid7485074\charrsid7485074 in }{\f39\fs20\insrsid7485074\charrsid7485074 and/}{\f39\fs20\insrsid7485074\charrsid7485074 or it}{
+\f39\fs20\insrsid7485074\charrsid7485074 s}{\f39\fs20\insrsid7485074\charrsid7485074  source-code, I would }{\f39\fs20\insrsid7485074\charrsid7485074 appreciate }{\f39\fs20\insrsid7485074\charrsid7485074 if my name is mentioned.}{
+\f39\fs20\insrsid7485074\charrsid7485074 
+\par }\pard \qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid7485074 {\f39\fs20\insrsid7485074\charrsid7485074 
+\par }{\b\f39\fs20\insrsid7485074\charrsid7485074 Andrei Ciubotaru [Hardwired]
+\par }{\f39\fs20\insrsid7485074\charrsid7485074 Lead Developer ICode&Ideas SRL (}{\field\flddirty{\*\fldinst {\f39\fs20\insrsid7485074\charrsid7485074  HYPERLINK "http://www.icode.ro/" }{\f39\fs20\insrsid7485074\charrsid7485074 {\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b02000000170000001500000068007400740070003a002f002f007700770077002e00690063006f00640065002e0072006f002f000000e0c9ea79f9bace118c8200aa004ba90b2a00000068007400740070003a002f002f007700770077002e00690063006f00640065002e007200
+6f002f000000}}}{\fldrslt {\cs15\f39\fs20\ul\cf2\insrsid7485074\charrsid7485074 http://www.icode.ro/}}}{\f39\fs20\insrsid7485074\charrsid7485074 )
+\par }{\field{\*\fldinst {\f39\fs20\insrsid7485074  HYPERLINK "hardwiredteks@gmail.com" }{\f39\fs20\insrsid15940516\charrsid7485074 {\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b02000000010000000303000000000000c00000000000004600001800000068617264776972656474656b7340676d61696c2e636f6d00ffffadde000000000000000000000000000000000000000000000000}}}{\fldrslt {
+\cs15\f39\fs20\ul\cf2\insrsid7485074\charrsid7485074 hardwiredteks@gmail.com}}}{\f39\fs20\insrsid7485074\charrsid7485074 , }{\field{\*\fldinst {\f39\fs20\insrsid7485074  HYPERLINK "hardwired@icode.ro" }{\f39\fs20\insrsid15940516\charrsid7485074 
+{\*\datafield 00d0c9ea79f9bace118c8200aa004ba90b02000000010000000303000000000000c0000000000000460000130000006861726477697265644069636f64652e726f00ffffadde000000000000000000000000000000000000000000000000}}}{\fldrslt {
+\cs15\f39\fs20\ul\cf2\insrsid7485074\charrsid7485074 hardwired@icode.ro}}}{\f39\fs20\insrsid7485074\charrsid7485074 
+\par }}

admin/win/nsi/nsis_processes/readme.txt

@@ -0,0 +1,122 @@
+----------------------------------------------------------------
+----------------------------------------------------------------
+Processes (Processes.dll)
+Version:	1.0.1.0
+Release:	24.february.2005
+Description:	Nullsoft Installer (NSIS) plug-in for managing?! 
+		Windows processes.
+
+Copyright:	© 2004-2005 Hardwired. No rights reserved.
+		There is no restriction and no guaranty for using
+		this software.
+
+Author:		Andrei Ciubotaru [Hardwired]
+		Lead Developer ICode&Ideas SRL (http://www.icode.ro/)
+		hardwiredteks@gmail.com, hardwired@icode.ro
+
+----------------------------------------------------------------
+----------------------------------------------------------------
+INTRODUCTION
+
+	The Need For Plug-in - I need it for the one of my installers.
+	
+	Briefly: Use it when you need to find\kill a process when
+installing\uninstalling some application. Also, use it when you 
+need to test the presence of a device driver.
+
+
+SUPPORT
+	
+	Supported platforms are: WinNT,Win2K,WinXP and Win2003 Server.
+
+
+DESCRIPTION
+
+	Processes::FindProcess <process_name>	;without ".exe"
+	
+		Searches the currently running processes for the given
+		process name.
+		
+		return:	1	- the process was found
+			0	- the process was not found
+	
+	Processes::KillProcess <process_name>	; without ".exe"
+	
+		Searches the currently running processes for the given
+		process name. If the process is found then the it gets
+		killed.
+		
+		return:	1	- the process was found and killed
+			0	- the process was not found or the process
+						cannot be killed (insuficient rights)
+	
+	Processes::FindDevice <device_base_name>
+	
+		Searches the installed devices drivers for the given
+		device base name.
+		(important: I said BASE NAME not FILENAME)
+		
+		return:	1	- the device driver was found
+			0	- the device driver was not found
+				
+
+USAGE
+
+	First of all, does not matter where you use it. Ofcourse, the
+routines must be called inside of a Section/Function scope.
+
+	Processes::FindProcess "process_name"
+	Pop $R0
+ 
+	StrCmp $R0 "1" make_my_day noooooo
+	
+	make_my_day:
+		...
+	
+	noooooo:
+		...
+		
+	
+	Processes::KillProcess "process_name"
+	Pop $R0
+ 
+	StrCmp $R0 "1" dead_meat why_wont_you_die
+	
+	dead_meat:
+		...
+	
+	why_wont_you_die:
+		...
+		
+
+	Processes::FindDevice "device_base_name"
+	Pop $R0
+ 
+	StrCmp $R0 "1" blabla more_blabla
+	
+	blabla:
+		...
+	
+	more_blabla:
+		...
+		
+	
+THANKS
+
+	Sunil Kamath for inspiring me. I wanted to use its FindProcDLL
+but my requirements made it imposible.
+
+	Nullsoft for creating this very powerfull installer. One big,
+free and full-featured (hmmm... and guiless for the moment) mean
+install machine!:)
+
+	ME for being such a great coder...
+						... HAHAHAHAHAHAHA!
+										
+ONE MORE THING
+
+	If you use the plugin or it's source-code, I would apreciate
+if my name is mentioned.
+
+----------------------------------------------------------------
+----------------------------------------------------------------

admin/win/nsi/nsis_processes/src/StdAfx.cpp

@@ -1,8 +1,8 @@
-// stdafx.cpp : source file that includes just the standard includes
-// OCContextMenu.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
+// stdafx.cpp : source file that includes just the standard includes
+//	KillProcDLL.pch will be the pre-compiled header
+//	stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file

admin/win/nsi/nsis_processes/src/StdAfx.h

@@ -0,0 +1,34 @@
+// stdafx.h : include file for standard system include files,
+//  or project specific include files that are used frequently, but
+//      are changed infrequently
+//
+
+#if !defined(AFX_STDAFX_H__780690DC_E128_403D_BC07_780D1B2CC101__INCLUDED_)
+#define AFX_STDAFX_H__780690DC_E128_403D_BC07_780D1B2CC101__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
+
+#include <windows.h>
+
+#include <string> // String management...
+
+//From exam28.cpp
+#include <tlhelp32.h>
+//#include <iostream.h>
+
+#ifdef BORLANDC
+  #include <string.h>
+  #include <ctype.h>
+#endif
+
+//To make it a NSIS Plug-In
+#include "exdll.h"
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_STDAFX_H__780690DC_E128_403D_BC07_780D1B2CC101__INCLUDED_)

admin/win/nsi/nsis_processes/src/exdll.c

@@ -0,0 +1,37 @@
+#include <windows.h>
+#include "exdll.h"
+
+HINSTANCE g_hInstance;
+
+HWND g_hwndParent;
+
+void __declspec(dllexport) myFunction(HWND hwndParent, int string_size, 
+                                      char *variables, stack_t **stacktop)
+{
+  g_hwndParent=hwndParent;
+
+  EXDLL_INIT();
+
+
+  // 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
+  // calling popstring() the first time would give you file.dat,
+  // and the second time would give you poop.dat. 
+  // 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);
+  }
+}
+
+
+
+BOOL WINAPI _DllMainCRTStartup(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
+{
+  g_hInstance=hInst;
+	return TRUE;
+}

admin/win/nsi/nsis_processes/src/exdll.h

@@ -0,0 +1,136 @@
+#ifndef _EXDLL_H_
+#define _EXDLL_H_
+
+
+
+
+
+//
+// only include this file from one place in your DLL.
+// (it is all static, if you use it in two places it will fail)
+//
+#define EXDLL_INIT()           {  \
+        g_stringsize	= string_size; \
+        g_stacktop		= stacktop;      \
+        g_variables		= variables; }
+
+
+
+
+//
+// For page showing plug-ins
+//
+#define WM_NOTIFY_OUTER_NEXT (WM_USER+0x8)
+#define WM_NOTIFY_CUSTOM_READY (WM_USER+0xd)
+#define NOTIFY_BYE_BYE 'x'
+
+typedef struct _stack_t 
+{
+  struct _stack_t	*next;
+  char				text[1]; // this should be the length of string_size
+} stack_t;
+
+
+static unsigned int		g_stringsize;
+static stack_t			**g_stacktop;
+static char				*g_variables;
+
+enum
+{
+INST_0,         // $0
+INST_1,         // $1
+INST_2,         // $2
+INST_3,         // $3
+INST_4,         // $4
+INST_5,         // $5
+INST_6,         // $6
+INST_7,         // $7
+INST_8,         // $8
+INST_9,         // $9
+INST_R0,        // $R0
+INST_R1,        // $R1
+INST_R2,        // $R2
+INST_R3,        // $R3
+INST_R4,        // $R4
+INST_R5,        // $R5
+INST_R6,        // $R6
+INST_R7,        // $R7
+INST_R8,        // $R8
+INST_R9,        // $R9
+INST_CMDLINE,   // $CMDLINE
+INST_INSTDIR,   // $INSTDIR
+INST_OUTDIR,    // $OUTDIR
+INST_EXEDIR,    // $EXEDIR
+INST_LANG,      // $LANGUAGE
+__INST_LAST
+};
+
+
+
+
+
+//
+// utility functions (not required but often useful)
+//
+static int popstring( char *str )
+{
+  stack_t	*th;
+
+
+  if( !g_stacktop || 
+	  !*g_stacktop )
+	  return 1;
+
+  th			= (*g_stacktop);
+  lstrcpy( str, th->text );
+  *g_stacktop	= th->next;
+  GlobalFree( (HGLOBAL)th );
+
+  return 0;
+}
+
+
+
+
+static void pushstring( char *str )
+{
+  stack_t	*th;
+
+
+  if( !g_stacktop )
+	  return;
+
+  th			= (stack_t*)GlobalAlloc( GPTR, sizeof(stack_t) + g_stringsize );
+  lstrcpyn( th->text, str, g_stringsize );
+  th->next		= *g_stacktop;
+  *g_stacktop	= th;
+}
+
+
+
+
+
+static char *getuservariable( int varnum )
+{
+  if( varnum < 0 || 
+	  varnum >= __INST_LAST )
+	  return NULL;
+
+  return (g_variables + varnum*g_stringsize);
+}
+
+
+
+
+
+static void setuservariable( int varnum, char *var )
+{
+	if( var != NULL && 
+		varnum >= 0 && 
+		varnum < __INST_LAST ) 
+		lstrcpy( g_variables + varnum*g_stringsize, var );
+}
+
+
+
+#endif//_EXDLL_H_

admin/win/nsi/nsis_processes/src/processes.cpp

@@ -0,0 +1,411 @@
+#include "stdafx.h"
+#include "processes.h"
+#include "string.h"
+
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+// global variables
+lpfEnumProcesses			EnumProcesses;
+lpfEnumProcessModules		EnumProcessModules;
+lpfGetModuleBaseName		GetModuleBaseName;
+lpfEnumDeviceDrivers		EnumDeviceDrivers;
+lpfGetDeviceDriverBaseName	GetDeviceDriverBaseName;
+
+HINSTANCE					g_hInstance;
+HWND						g_hwndParent;
+HINSTANCE					g_hInstLib;
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+// main DLL entry
+BOOL WINAPI		_DllMainCRTStartup( HANDLE	hInst, 
+									ULONG	ul_reason_for_call,
+									LPVOID	lpReserved )
+{
+    g_hInstance		= (struct HINSTANCE__ *)hInst;
+
+    return TRUE;
+}
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+// loads the psapi routines
+bool	LoadPSAPIRoutines( void )
+{
+	if( NULL == (g_hInstLib = LoadLibraryA( "PSAPI.DLL" )) )
+		return false;
+
+	EnumProcesses			= (lpfEnumProcesses)			GetProcAddress( g_hInstLib, "EnumProcesses" );
+	EnumProcessModules		= (lpfEnumProcessModules)		GetProcAddress( g_hInstLib, "EnumProcessModules" );
+	GetModuleBaseName		= (lpfGetModuleBaseName)		GetProcAddress( g_hInstLib, "GetModuleBaseNameA" );
+	EnumDeviceDrivers		= (lpfEnumDeviceDrivers)		GetProcAddress( g_hInstLib, "EnumDeviceDrivers" );
+	GetDeviceDriverBaseName	= (lpfGetDeviceDriverBaseName)	GetProcAddress( g_hInstLib, "GetDeviceDriverBaseNameA" );
+
+	if( ( NULL == EnumProcesses ) ||
+		( NULL == EnumProcessModules ) ||
+		( NULL == EnumDeviceDrivers ) ||
+		( NULL == GetModuleBaseName ) ||
+		( NULL == GetDeviceDriverBaseName ) )
+	{
+		FreeLibrary( g_hInstLib );
+
+		return false;
+	}
+
+	return true;
+}
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+// free the psapi routines
+bool	FreePSAPIRoutines( void )
+{
+	EnumProcesses		= NULL;
+	EnumProcessModules	= NULL;
+	GetModuleBaseName	= NULL;
+	EnumDeviceDrivers	= NULL;
+
+	if( FALSE == FreeLibrary( g_hInstLib ) )
+		return false;
+
+	return true;
+}
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+// find a process by name
+// return value:	true	- process was found
+//					false	- process not found
+bool	FindProc( char *szProcess )
+{
+	char		szProcessName[ 1024 ];
+	char		szCurrentProcessName[ 1024 ];
+	DWORD		dPID[ 1024 ];
+	DWORD		dPIDSize( 1024 );
+	DWORD		dSize( 1024 );
+	HANDLE		hProcess;
+	HMODULE		phModule[ 1024 ];
+
+  
+	//
+	// make the name lower case
+	//
+	memset( szProcessName, 0, 1024*sizeof(char) );
+	sprintf( szProcessName, "%s", szProcess );
+	strlwr( szProcessName );
+
+	//
+    // load PSAPI routines
+	//
+	if( false == LoadPSAPIRoutines() )
+		return false;
+
+	//
+	// enumerate processes names
+	//
+    if( FALSE == EnumProcesses( dPID, dSize, &dPIDSize ) )
+	{
+		FreePSAPIRoutines();
+
+		return false;
+	}
+
+	//
+	// walk trough and compare see if the process is running
+	//
+	for( int k( dPIDSize / sizeof( DWORD ) ); k >= 0; k-- )
+	{
+		memset( szCurrentProcessName, 0, 1024*sizeof(char) );
+
+		if( NULL != ( hProcess = OpenProcess( PROCESS_ALL_ACCESS, FALSE, dPID[ k ] ) ) )
+		{
+			if( TRUE == EnumProcessModules( hProcess, phModule, sizeof(HMODULE)*1024, &dPIDSize ) )
+				if( GetModuleBaseName( hProcess, phModule[ 0 ], szCurrentProcessName, 1024 ) > 0 )
+				{
+					strlwr( szCurrentProcessName );
+
+					if( NULL != strstr( szCurrentProcessName, szProcessName ) )
+					{
+						FreePSAPIRoutines();
+						CloseHandle( hProcess );
+
+						return true;
+					}
+				}
+
+			CloseHandle( hProcess );
+		}
+	}
+	
+	//
+	// free PSAPI routines
+	//
+	FreePSAPIRoutines();
+
+	return false;
+}
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+// kills a process by name
+// return value:	true	- process was found
+//					false	- process not found
+bool	KillProc( char *szProcess )
+{
+	char		szProcessName[ 1024 ];
+	char		szCurrentProcessName[ 1024 ];
+	DWORD		dPID[ 1024 ];
+	DWORD		dPIDSize( 1024 );
+	DWORD		dSize( 1024 );
+	HANDLE		hProcess;
+	HMODULE		phModule[ 1024 ];
+
+  
+	//
+	// make the name lower case
+	//
+	memset( szProcessName, 0, 1024*sizeof(char) );
+	sprintf( szProcessName, "%s", szProcess );
+	strlwr( szProcessName );
+
+	//
+    // load PSAPI routines
+	//
+	if( false == LoadPSAPIRoutines() )
+		return false;
+
+	//
+	// enumerate processes names
+	//
+    if( FALSE == EnumProcesses( dPID, dSize, &dPIDSize ) )
+	{
+		FreePSAPIRoutines();
+
+		return false;
+	}
+
+	//
+	// walk trough and compare see if the process is running
+	//
+	for( int k( dPIDSize / sizeof( DWORD ) ); k >= 0; k-- )
+	{
+		memset( szCurrentProcessName, 0, 1024*sizeof(char) );
+
+		if( NULL != ( hProcess = OpenProcess( PROCESS_ALL_ACCESS, FALSE, dPID[ k ] ) ) )
+		{
+			if( TRUE == EnumProcessModules( hProcess, phModule, sizeof(HMODULE)*1024, &dPIDSize ) )
+				if( GetModuleBaseName( hProcess, phModule[ 0 ], szCurrentProcessName, 1024 ) > 0 )
+				{
+					strlwr( szCurrentProcessName );
+
+					if( NULL != strstr( szCurrentProcessName, szProcessName ) )
+					{
+						FreePSAPIRoutines();
+
+						//
+						// kill process
+						//
+						if( false == TerminateProcess( hProcess, 0 ) )
+						{
+							CloseHandle( hProcess );
+
+							return true;
+						}
+
+						//
+						// refresh systray
+						//
+						UpdateWindow( FindWindow( NULL, "Shell_TrayWnd" ) );
+
+						//
+						// refresh desktop window
+						//
+						UpdateWindow( GetDesktopWindow() );
+
+						CloseHandle( hProcess );
+
+						return true;
+					}
+				}
+
+			CloseHandle( hProcess );
+		}
+	}
+	
+	//
+	// free PSAPI routines
+	//
+	FreePSAPIRoutines();
+
+	return false;
+}
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+bool	FindDev( char *szDriverName )
+{
+	char		szDeviceName[ 1024 ];
+	char		szCurrentDeviceName[ 1024 ];
+	LPVOID		lpDevices[ 1024 ];
+	DWORD		dDevicesSize( 1024 );
+	DWORD		dSize( 1024 );
+	TCHAR		tszCurrentDeviceName[ 1024 ];
+	DWORD		dNameSize( 1024 );
+
+  
+	//
+	// make the name lower case
+	//
+	memset( szDeviceName, 0, 1024*sizeof(char) );
+	sprintf( szDeviceName, "%s", strlwr( szDriverName ) );
+
+	//
+    // load PSAPI routines
+	//
+	if( false == LoadPSAPIRoutines() )
+		return false;
+
+	//
+	// enumerate devices
+	//
+    if( FALSE == EnumDeviceDrivers( lpDevices, dSize, &dDevicesSize ) )
+	{
+		FreePSAPIRoutines();
+
+		return false;
+	}
+
+	//
+	// walk trough and compare see if the device driver exists
+	//
+	for( int k( dDevicesSize / sizeof( LPVOID ) ); k >= 0; k-- )
+	{
+		memset( szCurrentDeviceName, 0, 1024*sizeof(char) );
+		memset( tszCurrentDeviceName, 0, 1024*sizeof(TCHAR) );
+
+		if( 0 != GetDeviceDriverBaseName( lpDevices[ k ], tszCurrentDeviceName, dNameSize ) )
+		{
+			sprintf( szCurrentDeviceName, "%S", tszCurrentDeviceName );
+
+			if( 0 == strcmp( strlwr( szCurrentDeviceName ), szDeviceName ) )
+			{
+				FreePSAPIRoutines();
+
+				return true;
+			}
+		}
+	}
+	
+	//
+	// free PSAPI routines
+	//
+	FreePSAPIRoutines();
+
+	return false;
+}
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+extern "C" __declspec(dllexport) void	FindProcess( HWND		hwndParent, 
+													 int		string_size,
+													 char		*variables, 
+													 stack_t	**stacktop )
+{
+	char		szParameter[ 1024 ];
+
+
+	g_hwndParent	= hwndParent;
+
+	EXDLL_INIT();
+	{
+		popstring( szParameter );
+
+		if( true == FindProc( szParameter ) )
+			wsprintf( szParameter, "1" );
+		else
+			wsprintf( szParameter, "0" );
+
+		setuservariable( INST_R0, szParameter );
+	}
+}
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+extern "C" __declspec(dllexport) void	KillProcess( HWND		hwndParent, 
+													 int		string_size,
+													 char		*variables, 
+													 stack_t	**stacktop )
+{
+	char		szParameter[ 1024 ];
+
+
+	g_hwndParent	= hwndParent;
+
+	EXDLL_INIT();
+	{
+		popstring( szParameter );
+
+		if( true == KillProc( szParameter ) )
+			wsprintf( szParameter, "1" );
+		else
+			wsprintf( szParameter, "0" );
+
+		setuservariable( INST_R0, szParameter );
+	}
+}
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+extern "C" __declspec(dllexport) void	FindDevice( HWND		hwndParent, 
+													 int		string_size,
+													 char		*variables, 
+													 stack_t	**stacktop )
+{
+	char		szParameter[ 1024 ];
+
+
+	g_hwndParent	= hwndParent;
+
+	EXDLL_INIT();
+	{
+		popstring( szParameter );
+
+		if( true == FindDev( szParameter ) )
+			wsprintf( szParameter, "1" );
+		else
+			wsprintf( szParameter, "0" );
+
+		setuservariable( INST_R0, szParameter );
+	}
+}

admin/win/nsi/nsis_processes/src/processes.h

@@ -0,0 +1,49 @@
+#pragma once
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+// PSAPI function pointers
+typedef BOOL	(WINAPI *lpfEnumProcesses)			( DWORD *, DWORD, DWORD * );
+typedef BOOL	(WINAPI *lpfEnumProcessModules)		( HANDLE, HMODULE *, DWORD, LPDWORD );
+typedef DWORD	(WINAPI *lpfGetModuleBaseName)		( HANDLE, HMODULE, LPTSTR, DWORD );
+typedef BOOL	(WINAPI *lpfEnumDeviceDrivers)		( LPVOID *, DWORD, LPDWORD );
+typedef BOOL	(WINAPI *lpfGetDeviceDriverBaseName)( LPVOID, LPTSTR, DWORD );
+
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+// Internal use routines
+bool	LoadPSAPIRoutines( void );
+bool	FreePSAPIRoutines( void );
+
+bool	FindProc( char *szProcess );
+bool	KillProc( char *szProcess );
+
+bool	FindDev( char *szDriverName );
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+// Exported routines
+extern "C" __declspec(dllexport) void	FindProcess( HWND		hwndParent, 
+													 int		string_size,
+													 char		*variables, 
+													 stack_t	**stacktop );
+
+extern "C" __declspec(dllexport) void	KillProcess( HWND		hwndParent, 
+													 int		string_size,
+													 char		*variables, 
+													 stack_t	**stacktop );
+
+extern "C" __declspec(dllexport) void	FindDevice(  HWND		hwndParent, 
+													 int		string_size,
+													 char		*variables, 
+													 stack_t	**stacktop );

admin/win/nsi/nsis_processes/src/processes.rc

@@ -0,0 +1,103 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "NSIS Plug-in for Windows process management. Only WinNT, Win2K, WinXP and Win2003 Server supported."
+            VALUE "CompanyName", "Andrei Ciubotaru [Hardwired]"
+            VALUE "FileDescription", "Windows Processes Management"
+            VALUE "FileVersion", "1, 0, 0, 1"
+            VALUE "InternalName", "Processes"
+            VALUE "LegalCopyright", "Copyright (c) 2004 Hardwired. No rights reserved."
+            VALUE "OriginalFilename", "Processes.dll"
+            VALUE "ProductName", "Processes"
+            VALUE "ProductVersion", "1, 0, 0, 1"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

admin/win/nsi/nsis_processes/src/processes.sln

@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "processes", "processes.vcproj", "{3438467F-A719-46DC-93E5-137A8B691727}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{3438467F-A719-46DC-93E5-137A8B691727}.Debug.ActiveCfg = Debug|Win32
+		{3438467F-A719-46DC-93E5-137A8B691727}.Debug.Build.0 = Debug|Win32
+		{3438467F-A719-46DC-93E5-137A8B691727}.Release.ActiveCfg = Release|Win32
+		{3438467F-A719-46DC-93E5-137A8B691727}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal

admin/win/nsi/nsis_processes/src/processes.txt

@@ -0,0 +1,122 @@
+----------------------------------------------------------------
+----------------------------------------------------------------
+Processes (Processes.dll)
+Version:	1.0.0.1
+Release:	12.december.2004
+Description:Nullsoft Installer (NSIS) plug-in for managing?! 
+			Windows processes.
+
+Copyright:	© 2004 Hardwired. No rights reserved.
+			There is no restriction and no guaranty for using
+			this software.
+
+Author:		Andrei Ciubotaru [Hardwired]
+			Lead Developer ICode&Ideas SRL (http://www.icode.ro)
+			hardwiredteks@gmail.com, hardwired@icode.ro
+
+----------------------------------------------------------------
+----------------------------------------------------------------
+INTRODUCTION
+
+	The Need For Plug-in - I need it for the one of my installers.
+	
+	Briefly: Use it when you need to find\kill a process when
+installing\uninstalling some application. Also, use it when you 
+need to test the presence of a device driver.
+
+
+SUPPORT
+	
+	Supported platforms are: WinNT,Win2K,WinXP and Win2003 Server.
+
+
+DESCRIPTION
+
+	Processes::FindProcess <process_name.exe>
+	
+		Searches the currently running processes for the given
+		process name.
+		
+		return:	1	- the process was found
+				0	- the process was not found
+	
+	Processes::KillProcess <process_name.exe>
+	
+		Searches the currently running processes for the given
+		process name. If the process is found then the it gets
+		killed.
+		
+		return:	1	- the process was found and killed
+				0	- the process was not found or the process
+						cannot be killed (insuficient rights)
+	
+	Processes::FindDevice <device_base_name>
+	
+		Searches the installed devices drivers for the given
+		device base name.
+		(important: I said BASE NAME not FILENAME)
+		
+		return:	1	- the device driver was found
+				0	- the device driver was not found
+				
+
+USAGE
+
+	First of all, does not matter where you use it. Ofcourse, the
+routines must be called inside of a Section/Function scope.
+
+	Processes::FindProcess "process_name.exe"
+	Pop $R0
+ 
+	StrCmp $R0 "1" make_my_day noooooo
+	
+	make_my_day:
+		...
+	
+	noooooo:
+		...
+		
+	
+	Processes::KillProcess "process_name.exe"
+	Pop $R0
+ 
+	StrCmp $R0 "1" dead_meat why_wont_you_die
+	
+	dead_meat:
+		...
+	
+	why_wont_you_die:
+		...
+		
+
+	Processes::FindDevice "device_base_name"
+	Pop $R0
+ 
+	StrCmp $R0 "1" blabla more_blabla
+	
+	blabla:
+		...
+	
+	more_blabla:
+		...
+		
+	
+THANKS
+
+	Sunil Kamath for inspiring me. I wanted to use its FindProcDLL
+but my requirements made it imposible.
+
+	Nullsoft for creating this very powerfull installer. One big,
+free and full-featured (hmmm... and guiless for the moment) mean
+install machine!:)
+
+	ME for being such a great coder...
+											... HAHAHAHAHAHAHA!
+											
+ONE MORE THING
+
+	If you use the plugin or it's source-code, I would apreciate
+if my name is mentioned.
+
+----------------------------------------------------------------
+----------------------------------------------------------------

admin/win/nsi/nsis_processes/src/processes.vcproj

@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="processes"
+	SccProjectName="processes"
+	SccLocalPath=".">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FINDPROCDLL_EXPORTS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="3"
+				PrecompiledHeaderThrough="stdafx.h"
+				PrecompiledHeaderFile=".\Debug/processes.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile=".\Debug/processes.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\Debug/processes.pdb"
+				ImportLibrary=".\Debug/processes.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/processes.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1034"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\bin"
+			IntermediateDirectory="..\bin\processes"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2"
+			WholeProgramOptimization="TRUE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="1"
+				FavorSizeOrSpeed="1"
+				OptimizeForWindowsApplication="TRUE"
+				PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;FINDPROCDLL_EXPORTS"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				StructMemberAlignment="1"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="3"
+				PrecompiledHeaderThrough="stdafx.h"
+				PrecompiledHeaderFile="..\bin\processes/processes.pch"
+				AssemblerListingLocation="..\bin\processes/"
+				ObjectFile="..\bin\processes/"
+				ProgramDataBaseFileName="..\bin\processes/"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libc.lib"
+				OutputFile="..\bin/Processes.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				IgnoreAllDefaultLibraries="FALSE"
+				ProgramDatabaseFile="..\bin/processes.pdb"
+				OptimizeForWindows98="1"
+				ImportLibrary="..\bin/processes.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/processes.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="processes.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;FINDPROCDLL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="1"
+						PreprocessorDefinitions="NDEBUG;_WINDOWS;_MBCS;_USRDLL;FINDPROCDLL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\processes.rc">
+			</File>
+			<File
+				RelativePath="StdAfx.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;FINDPROCDLL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						UsePrecompiledHeader="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="1"
+						PreprocessorDefinitions="NDEBUG;_WINDOWS;_MBCS;_USRDLL;FINDPROCDLL_EXPORTS;$(NoInherit)"
+						UsePrecompiledHeader="1"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="exdll.h">
+			</File>
+			<File
+				RelativePath=".\processes.h">
+			</File>
+			<File
+				RelativePath=".\resource.h">
+			</File>
+			<File
+				RelativePath="StdAfx.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+		</Filter>
+		<File
+			RelativePath="processes.txt">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

admin/win/nsi/nsis_processes/src/resource.h

@@ -1,14 +1,15 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by OCContextMenu.rc
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by processes.rc
+//
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

admin/win/nsi/nsis_uac/History.txt

@@ -0,0 +1,102 @@
+History:
+--------
+
+v0.0.11d - 20090705 (AndersK)
+	*Fixed UAC_RealWorldFullyLoadedDualModeExample.nsi so installing as admin will allow both modes
+
+v0.0.11c - 20090124 (AndersK)
+	*Checks for seclogon service on NT5 and returns ERROR_SERVICE_NOT_ACTIVE in $0 if not running
+
+v0.0.11b - 20090102 (AndersK)
+	*Fixed unicode compile bugs
+
+v0.0.11 - 20081021 (AndersK)
+	+Added UAC_GetUserShellFolderPath.nsi (Uses the new UAC::GetShellFolderPath)
+
+v0.0.10a - 20081004 (AndersK)
+	+Added SEE_MASK_NOZONECHECKS flag (experimental)
+
+v0.0.10 - 20080812 (AndersK)
+	+Added ugly hook hack to the shells run-as dialog on xp, defaults to other user
+
+v0.0.9 - 20080721 (AndersK)
+	*Fixed UAC_RealWorldFullyLoadedDualModeExample.nsi related bug (Thanks Case)
+
+v0.0.8 - 20080310 (AndersK)
+	+HTML Readme
+	+Added UAC::GetOuterHwnd (used by UAC_RealWorldFullyLoadedDualModeExample.nsi)
+	*Fixed UAC_RealWorldFullyLoadedDualModeExample.nsi
+	*Major code cleanup in UAC.cpp
+	-Removed UAC::RunElevatedAndProcessMessages (UAC::RunElevated now supports non NULL $HWNDParent)
+	-Removed several useless sample scripts
+
+v0.0.7e - 20080229 (AndersK)
+	*Added ugly hack for hackwnd to find correct title and give us a proper taskbar so the elevation dialog does not get lost (2000,XP (This also fixed Alt-Tab icon on Vista))
+	*Should compile with MSVC2005 now (Thanks Case)
+	*More unicode fixes, this time even tested with NSIS Unicode (Only RunElevated and Exec tested)
+
+v0.0.7d - 20080226 (AndersK)
+	*Fixed a couple of unicode version bugs (Unicode version still untested)
+	*Fixed weird XP string length bug (Thanks kfank)
+
+v0.0.7c - 20080218 (AndersK)
+	*Fixed SyncVars string length bug
+
+v0.0.7b - 20080205 (AndersK)
+	*Fixed DelayLoadDlls() problem on NT4
+
+v0.0.7 - 20080120 (AndersK)
+	+Added UAC::StackPush (For use with ExecCodeSegment)
+
+v0.0.6d - 20071108 (AndersK)
+	+Now syncs basic registers/variables before calling UAC::*Exec* and UAC::ExecCodeSegment (r0-r9,R0-R9,$CMDLINE,$INSTDIR,$OUTDIR,$EXEDIR,$LANGUAGE)
+	+Added UAC::RunElevatedAndProcessMessages, this can be called after .onInit (Very experimental, DO NOT USE)
+	+New include file with helper macros: UAC.nsh
+	*Replazed Clammerz hack with a better version
+
+v0.0.6c - 20071014 (AndersK)
+	+Check for and split up "domain\user" style input in RunAs.cpp for CreateProcessWithLogonW
+	*Added a ugly hack to trick messagebox'es in .OnInit to appear correctly on Vista (Thanks Clammerz)
+
+v0.0.6b - 20070523 (AndersK)
+	*Fixed showwindow flag (Thanks for the help kichik)
+
+v0.0.6	- 20070512 (AndersK)
+	+Added basic language support for MyRunAs dialog.
+
+v0.0.5e	- 20070509 (AndersK)
+	*Fixed detection of UAC mode?
+	+IPC window is visible (but offscreen) during elevation to help with SetForegroundWindow/Focus problems
+
+v0.0.5d - 20070324 (AndersK)
+	*Fixed stupid IsAdmin bug
+
+v0.0.5c	- 20070304 (AndersK)
+	*_IsAdmin now uses CheckTokenMembership if it exists ( MSKB:Q118626 / http://blogs.msdn.com/larryosterman/archive/2007/03/14/why-does-kb-118626-use-accesscheck-to-check-if-you-re-a-member-of-the-administrators-group.aspx )	
+
+v0.0.5b	- 20070301 (AndersK)
+	*Fixed ExecCodeSegment (Thread now calls CoInitialize)
+
+v0.0.5	- 20070228 (AndersK)
+	+Added ExecCodeSegment (You can now call ANY code in the context of the original user)
+
+v0.0.4b	- 20070226 (AndersK)
+	*Fixed (My)RunAs font (http://blogs.msdn.com/oldnewthing/archive/2005/02/04/366987.aspx)
+  
+v0.0.4	- 20070225 (AndersK)
+	+Added (My)RunAs dialog, used on Vista when running as LUA with UAC off
+	+Always uses /NCRC for elevated instance
+	*Now compiles as UNICODE (Untested, no UnicodeNSIS to test on)
+
+v0.0.3	- 20070224 (AndersK)
+	+Added Exec/ExecWait
+	+Added Verb & ShowWindow support for ShellExec[Wait]
+
+v0.0.2	- 20070219 (AndersK)
+	+Added ShellExecWait
+	*IPC srv wnd now has its own thread and msg loop
+	*Removed CRT dependency
+	*Hopefully loads on Win95 now
+
+v0.0.1	- 20070215 (AndersK)
+	*Initial release

admin/win/nsi/nsis_uac/License.txt

@@ -0,0 +1,14 @@
+This software is provided 'as-is', without any express or implied warranty.
+
+ZLIB/LIBPNG LICENSE
+-------------------
+
+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.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+      1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+
+      2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+
+      3. This notice may not be removed or altered from any source distribution.

admin/win/nsi/nsis_uac/NSISUtil.h

@@ -0,0 +1,149 @@
+/*
+Alternative to ExDll.h
+
+v0.0.1 - 20060811 (AndersK)
+*/
+
+#pragma once
+#include <TChar.h>
+
+
+typedef TCHAR NSISCH;
+#define NSISCALL      __stdcall
+
+namespace NSIS {
+
+__forceinline void* NSISCALL MemAlloc(SIZE_T cb) {return GlobalAlloc(LPTR,cb);}
+__forceinline void NSISCALL MemFree(void* p) {GlobalFree(p);}
+
+enum {
+INST_0,         // $0
+INST_1,         // $1
+INST_2,         // $2
+INST_3,         // $3
+INST_4,         // $4
+INST_5,         // $5
+INST_6,         // $6
+INST_7,         // $7
+INST_8,         // $8
+INST_9,         // $9
+INST_R0,        // $R0
+INST_R1,        // $R1
+INST_R2,        // $R2
+INST_R3,        // $R3
+INST_R4,        // $R4
+INST_R5,        // $R5
+INST_R6,        // $R6
+INST_R7,        // $R7
+INST_R8,        // $R8
+INST_R9,        // $R9
+INST_CMDLINE,   // $CMDLINE
+INST_INSTDIR,   // $INSTDIR
+INST_OUTDIR,    // $OUTDIR
+INST_EXEDIR,    // $EXEDIR
+INST_LANG,      // $LANGUAGE
+__INST_LAST,
+
+VIDX_TEMP=(INST_LANG+1), //#define state_temp_dir            g_usrvars[25]
+VIDX_PLUGINSDIR,//#  define state_plugins_dir       g_usrvars[26]
+VIDX_EXEPATH,//#define state_exe_path            g_usrvars[27]
+VIDX_EXEFILENAME,//#define state_exe_file            g_usrvars[28]
+VIDX_STATECLICKNEXT,//#define state_click_next          g_usrvars[30]
+__VIDX_UNDOCLAST
+};
+
+
+
+typedef struct _stack_t {
+  struct _stack_t *next;
+  NSISCH text[ANYSIZE_ARRAY];
+} stack_t;
+
+typedef struct {
+  int autoclose;
+  int all_user_var;
+  int exec_error;
+  int abort;
+  int exec_reboot;
+  int reboot_called;
+  int XXX_cur_insttype; // deprecated
+  int XXX_insttype_changed; // deprecated
+  int silent;
+  int instdir_error;
+  int rtl;
+  int errlvl;
+//NSIS v2.3x ?
+  int alter_reg_view;
+  int status_update;
+} exec_flags_type;
+
+typedef struct {
+  exec_flags_type *exec_flags;
+  int (NSISCALL *ExecuteCodeSegment)(int, HWND);
+  void (NSISCALL *validate_filename)(char *);
+} extra_parameters;
+
+extern UINT StrSize;
+extern stack_t **StackTop;
+extern NSISCH*Vars;
+
+inline bool NSISCALL SetErrLvl(extra_parameters*pExtraParams,int ErrLevel) {return pExtraParams? ((pExtraParams->exec_flags->errlvl=ErrLevel)||true):false;}
+inline bool NSISCALL SetErrorFlag(extra_parameters*pExtraParams) {return pExtraParams? ((pExtraParams->exec_flags->exec_error=1)||true):false;}
+inline bool NSISCALL ClearErrorFlag(extra_parameters*pExtraParams) {return pExtraParams?((pExtraParams->exec_flags->exec_error=0)||true):false;}
+
+__forceinline int NSISCALL ExecuteCodeSegment(extra_parameters*pExtraParams,int pos,HWND hwndProgress=NULL) {
+	return pExtraParams?pExtraParams->ExecuteCodeSegment(pos,hwndProgress):(/*EXEC_ERROR*/0x7FFFFFFF);
+}
+
+static NSISCH* __fastcall GetVar(const int varnum) 
+{
+	//ASSERT(NSIS::Vars && NSIS::StrSize);
+	if (varnum < 0 || varnum >= __VIDX_UNDOCLAST) return NULL;
+	return NSIS::Vars+(varnum*NSIS::StrSize);
+}
+
+inline void NSISCALL SetVarUINT(const int varnum,UINT Value) {
+	wsprintf(GetVar(varnum),_T("%u"),Value);
+}
+
+static stack_t* NSISCALL StackPop() {
+	if (NSIS::StackTop && *NSIS::StackTop) {
+		stack_t*s=(*NSIS::StackTop);
+		*NSIS::StackTop=(*NSIS::StackTop)->next;
+		return s;
+	}
+	return 0;
+}
+__forceinline void NSISCALL StackFreeItem(stack_t*pStackItem) {NSIS::MemFree(pStackItem);}
+
+static DWORD NSISCALL StackPush(NSISCH*InStr,UINT StackStrSize=NSIS::StrSize) {
+	if (!NSIS::StackTop)return ERROR_INVALID_PARAMETER;
+	stack_t*sNew=(stack_t*)NSIS::MemAlloc(sizeof(stack_t)+(StackStrSize*sizeof(NSISCH)));
+	if (!sNew)return ERROR_OUTOFMEMORY;
+	lstrcpyn(sNew->text,InStr,StackStrSize);
+	sNew->next=*NSIS::StackTop;
+	*NSIS::StackTop=sNew;
+	return NO_ERROR;
+}
+
+}; /* namespace */
+
+#define NSISUTIL_INIT() namespace NSIS {static UINT StrSize;static stack_t **StackTop;static NSISCH*Vars;}//Call in only ONE source file
+#define NSISUTIL_INITEXPORT(_v,_strsize,_stackt) NSIS::Vars=_v;NSIS::StrSize=_strsize;NSIS::StackTop=_stackt
+
+//#define NSISEXPORT4(_func,_h,_strsize,_v,_stackt) extern "C" void __declspec(dllexport) __cdecl \
+//	_func (HWND _h,int _strsize,NSISCH*_v,NSIS::stack_t **_stackt) { NSISUTIL_INITEXPORT(_v,_strsize,_stackt); TRACE("EXPORT::" #_func "\n"); 
+//#define NSISEXPORT5(_func,_h,_strsize,_v,_stackt,_eparams) extern "C" void __declspec(dllexport) __cdecl \
+//	_func (HWND _h,int _strsize,NSISCH*_v,NSIS::stack_t **_stackt,NSIS::extra_parameters* _eparams) {  NSISUTIL_INITEXPORT(_v,_strsize,_stackt); TRACE("EXPORT::" #_func "\n"); 
+//#define NSISEXPORT NSISEXPORT5
+
+#ifdef _MSC_VER
+#	define EXPORTNSISFUNC extern "C" void __declspec(dllexport) __cdecl
+#	else
+#	error EXPORTNSISFUNC needs compiler goo, you are on your own!
+#	endif
+#define NSISFUNCSTART4(_h,_strsize,_v,_stackt) {NSISUTIL_INITEXPORT(_v,_strsize,_stackt);
+#define NSISFUNCSTART5(_h,_strsize,_v,_stackt,_eparams) NSISFUNCSTART4(_h,_strsize,_v,_stackt)
+#define NSISFUNCSTART NSISFUNCSTART5
+#define NSISFUNCEND() }
+

admin/win/nsi/nsis_uac/RunAs.cpp

@@ -0,0 +1,277 @@
+//Copyright (C) 2007 Anders Kjersem. Licensed under the zlib/libpng license, see License.txt for details.
+/*
+If UAC is disabled, the runas verb is broken (Vista RTM) so when running as LUA there is no way to elevate so 
+we provide our own dialog.
+*/
+
+#include "UAC.h"
+#ifdef FEAT_CUSTOMRUNASDLG
+#include <Lmcons.h>//UNLEN && GNLEN && PWLEN
+#include <WindowsX.h>
+#include "resource.h"
+#include "NSISUtil.h"
+using namespace NSIS;
+#define ERRAPP_TRYAGAIN (0x20000000|1)
+#define MYMAX_DOMAIN (2+max(GNLEN,MAX_COMPUTERNAME_LENGTH)+1)
+
+
+static LPCTSTR g_RunAsDlgTitle=_T("Run as");
+static LPCTSTR g_RunAsHelpText=_T("You may not have the necessary permissions to use all the features of the program you are about to run. You may run this program as a different user or continue to run the program as the current user.");
+static LPCTSTR g_RunAsCurrUsrFmt=_T("&Current user (%s)");//Max 50 chars!
+static LPCTSTR g_RunAsSpecHelp=_T("Run the program as the &following user:");
+
+FORCEINLINE bool MySetDlgItemText(HWND hDlg,int id,LPCTSTR s) {return MySndDlgItemMsg(hDlg,id,WM_SETTEXT,0,(LPARAM)s)!=0;}
+
+typedef struct {
+	SHELLEXECUTEINFO*pSEI;
+	bool AsSelf;
+} RUNASDLGDATA;
+
+void MyRunAsFmtCurrUserRadio(HWND hDlg,LPCTSTR Fmt) {
+	TCHAR bufFullName[MYMAX_DOMAIN+UNLEN+1];
+	TCHAR buf[50+MYMAX_DOMAIN+UNLEN+1];
+	*bufFullName=0;
+	ULONG cch;
+	if ((!_GetUserNameEx || !_GetUserNameEx(NameSamCompatible,bufFullName,&(cch=COUNTOF(bufFullName)))) && 
+		!_GetUserName(bufFullName,&(cch=COUNTOF(bufFullName))) ) {
+		*bufFullName=0;
+	}
+	wsprintf(buf,Fmt,*bufFullName?bufFullName:_T("?"));
+	MySetDlgItemText(hDlg,IDC_RUNASCURR,buf);
+
+	// default the "User name:" to Administrator from shell32
+	if (LoadString(GetModuleHandle(_T("SHELL32.dll")),21763, bufFullName, COUNTOF(bufFullName)) > 0) {
+		MySetDlgItemText(hDlg,IDC_USERNAME,bufFullName);
+	}
+}
+
+#ifdef FEAT_CUSTOMRUNASDLG_TRANSLATE
+void MyRunAsTranslateDlgString(LPCTSTR StrID,LPTSTR Ini,HWND hDlg,INT_PTR DlgItemId,int special=0) {
+	TCHAR buf[MAX_PATH*2];
+	DWORD len=GetPrivateProfileString(_T("MyRunAsStrings"),StrID,0,buf,ARRAYSIZE(buf),Ini);
+	if (len) {
+		if (IDC_RUNASCURR==special)
+			MyRunAsFmtCurrUserRadio(hDlg,buf);
+		else
+			(DlgItemId==-1) ? SetWindowText(hDlg,buf) : MySetDlgItemText(hDlg,DlgItemId,buf);
+	}
+}
+
+void MyRunAsTranslateDlg(HWND hDlg) {
+	DWORD len;
+	TCHAR buf[MAX_PATH*2];
+	HMODULE hDll=GetWindowInstance(hDlg);ASSERT(hDll);
+	if ( (len=GetModuleFileName(hDll,buf,ARRAYSIZE(buf))) <1)return;
+	buf[len-3]=0;
+	lstrcat(buf,_T("lng"));
+	MyRunAsTranslateDlgString(_T("DlgTitle"),buf,hDlg,-1);
+	MyRunAsTranslateDlgString(_T("HelpText"),buf,hDlg,IDC_HELPTEXT);
+	MyRunAsTranslateDlgString(_T("OptCurrUser"),buf,hDlg,IDC_RUNASCURR,IDC_RUNASCURR);
+	MyRunAsTranslateDlgString(_T("OptOtherUser"),buf,hDlg,IDC_RUNASSPEC);
+	MyRunAsTranslateDlgString(_T("Username"),buf,hDlg,IDC_LBLUSER);
+	MyRunAsTranslateDlgString(_T("Pwd"),buf,hDlg,IDC_LBLPWD);
+	MyRunAsTranslateDlgString(_T("OK"),buf,hDlg,IDOK);
+	MyRunAsTranslateDlgString(_T("Cancel"),buf,hDlg,IDCANCEL);
+	HWND h=GetDlgItem(hDlg,IDC_RUNASCURR);
+	if (GetPrivateProfileInt(_T("MyRunAsCfg"),_T("DisableCurrUserOpt"),false,buf))EnableWindow(h,false);
+	if (GetPrivateProfileInt(_T("MyRunAsCfg"),_T("HideCurrUserOpt"),false,buf))ShowWindow(h,false);
+}
+#endif
+
+bool ErrorIsLogonError(DWORD err) {
+	switch (err) {
+	case ERROR_LOGON_FAILURE:
+	case ERROR_ACCOUNT_RESTRICTION:
+	case ERROR_INVALID_LOGON_HOURS:
+	case ERROR_INVALID_WORKSTATION:
+	case ERROR_PASSWORD_EXPIRED:
+	case ERROR_ACCOUNT_DISABLED:
+	case ERROR_NONE_MAPPED:
+	case ERROR_NO_SUCH_USER:
+	case ERROR_INVALID_ACCOUNT_NAME:
+		return true;
+	}
+	return false;
+}
+
+
+
+void VerifyOKBtn(HWND hDlg,RUNASDLGDATA*pRADD) {
+	const bool HasText=pRADD?(pRADD->AsSelf?true:MySndDlgItemMsg(hDlg,IDC_USERNAME,WM_GETTEXTLENGTH)>0):false;
+	EnableWindow(GetDlgItem(hDlg,IDOK),HasText);
+}
+
+void SetDlgState(HWND hDlg,bool AsSelf,RUNASDLGDATA*pRADD) {
+	if (pRADD)pRADD->AsSelf=AsSelf;
+	MySndDlgItemMsg(hDlg,IDC_RUNASCURR,BM_SETCHECK,AsSelf?BST_CHECKED:BST_UNCHECKED);
+	MySndDlgItemMsg(hDlg,IDC_RUNASSPEC,BM_SETCHECK,!AsSelf?BST_CHECKED:BST_UNCHECKED);
+	int ids[]={IDC_USERNAME,IDC_PASSWORD,IDC_LBLUSER,IDC_LBLPWD};
+	for (int i=0; i<COUNTOF(ids);++i)EnableWindow(GetDlgItem(hDlg,ids[i]),!AsSelf);
+	VerifyOKBtn(hDlg,pRADD);
+}
+
+INT_PTR CALLBACK MyRunAsDlgProc(HWND hwnd,UINT uMsg,WPARAM wp,LPARAM lp) {
+	RUNASDLGDATA*pRADD=(RUNASDLGDATA*)GetWindowLongPtr(hwnd,GWLP_USERDATA);
+	switch(uMsg) {
+	//case WM_DESTROY:
+	//	break;
+	case WM_CLOSE:
+		return DestroyWindow(hwnd);
+	case WM_INITDIALOG:
+		{	
+			pRADD=(RUNASDLGDATA*)lp;ASSERT(pRADD);
+			SetWindowLongPtr(hwnd,GWLP_USERDATA,lp);
+			Edit_LimitText(GetDlgItem(hwnd,IDC_USERNAME),UNLEN+1+MYMAX_DOMAIN); //room for "foo@BAR" or "BAR\foo"
+			Edit_LimitText(GetDlgItem(hwnd,IDC_PASSWORD),PWLEN);
+			const HINSTANCE hSh32=GetModuleHandle(_T("SHELL32.dll"));
+			const HICON hIco=(HICON)LoadImage(hSh32,MAKEINTRESOURCE(194),IMAGE_ICON,32,32,LR_SHARED);
+			MySndDlgItemMsg(hwnd,IDC_SHICON,STM_SETICON,(WPARAM)hIco);
+			SendMessage(hwnd,WM_SETTEXT,0,(LPARAM)g_RunAsDlgTitle);
+			MySetDlgItemText(hwnd,IDC_HELPTEXT,g_RunAsHelpText);
+			MyRunAsFmtCurrUserRadio(hwnd,g_RunAsCurrUsrFmt);
+			MySetDlgItemText(hwnd,IDC_RUNASSPEC,g_RunAsSpecHelp);
+#ifdef FEAT_CUSTOMRUNASDLG_TRANSLATE
+			MyRunAsTranslateDlg(hwnd);
+#endif
+			SetDlgState(hwnd,false,pRADD);
+
+#if defined(BUILD_DBG) && 0 //auto login used during testing ;)
+			SetDlgItemText(hwnd,IDC_USERNAME,_T("root"));
+			SetDlgItemText(hwnd,IDC_PASSWORD,_T("???"));
+			Sleep(1);PostMessage(hwnd,WM_COMMAND,IDOK,0);
+#endif
+		}
+		return true;
+	case WM_COMMAND:
+		{
+			switch(HIWORD(wp)) {
+			case EN_CHANGE:
+				VerifyOKBtn(hwnd,pRADD);
+				break;
+			case EN_SETFOCUS:
+			case BN_CLICKED:
+				if (LOWORD(wp)<=IDCANCEL)break;
+				SetDlgState(hwnd,LOWORD(wp)==IDC_RUNASCURR,pRADD);
+				return FALSE;
+			}
+			INT_PTR exitcode=!pRADD?-1:IDCANCEL;
+			switch(LOWORD(wp)) {
+			case IDOK:
+				if (pRADD) {
+					SHELLEXECUTEINFO&sei=*pRADD->pSEI;
+					PROCESS_INFORMATION pi={0};
+					DWORD ec=NO_ERROR;
+					WCHAR*wszExec;//Also used as TCHAR buffer in AsSelf mode
+					bool PerformTCharFmt=pRADD->AsSelf;
+					//const DWORD CommonStartupInfoFlags=STARTF_FORCEONFEEDBACK;
+#ifdef UNICODE
+					PerformTCharFmt=true;
+#endif
+					wszExec=(WCHAR*)NSIS::MemAlloc( (pRADD->AsSelf?sizeof(TCHAR):sizeof(WCHAR)) *(lstrlen(sei.lpFile)+1+lstrlen(sei.lpParameters)+1));
+					if (!wszExec)ec=ERROR_OUTOFMEMORY;
+					if (PerformTCharFmt)wsprintf((TCHAR*)wszExec,_T("%s%s%s"),sei.lpFile,((sei.lpParameters&&*sei.lpParameters)?_T(" "):_T("")),sei.lpParameters);
+					if (!ec) {
+						if (pRADD->AsSelf) {
+							STARTUPINFO si={sizeof(si)};
+							TRACEF("MyRunAs:CreateProcess:%s|\n",wszExec);
+							ec=(CreateProcess(0,(TCHAR*)wszExec,0,0,false,0,0,0,&si,&pi)?NO_ERROR:GetLastError());
+						}
+						else {
+							//All Wide strings!
+							WCHAR wszPwd[PWLEN+1];
+							WCHAR wszUName[UNLEN+1+MYMAX_DOMAIN+1];
+							STARTUPINFOW siw={sizeof(siw)};
+							WCHAR*p;
+#ifndef UNICODE
+							//Build unicode string, we already know the buffer is big enough so no error handling
+							p=wszExec;
+							MultiByteToWideChar(CP_THREAD_ACP,0,sei.lpFile,-1,p,0xFFFFFF);
+							if (sei.lpParameters && *sei.lpParameters) {
+								p+=lstrlen(sei.lpFile);*p++=L' ';*p=0;
+								MultiByteToWideChar(CP_THREAD_ACP,0,sei.lpParameters,-1,p,0xFFFFFF);
+							}
+#endif
+							SendMessageW(GetDlgItem(hwnd,IDC_USERNAME),WM_GETTEXT,COUNTOF(wszUName),(LPARAM)wszUName);
+							SendMessageW(GetDlgItem(hwnd,IDC_PASSWORD),WM_GETTEXT,COUNTOF(wszPwd),(LPARAM)wszPwd);
+							
+							//Try to find [\\]domain\user and split into username and domain strings
+							WCHAR*pUName=wszUName,*pDomain=0;
+							p=wszUName;
+							//if (*p==p[1]=='\\')pUName=(p+=2);else \  //Should we still split things up if the string starts with \\ ? Is it possible to use \\machine\user at all?
+							++p;//Don't parse "\something", require at least one char before backslash "?[*\]something"
+							while(*p && *p!='\\')++p;
+							if (*p=='\\') { 
+								pDomain=pUName;
+								pUName=p+1;*p=0;
+							}
+
+							TRACEF("MyRunAs:CreateProcessWithLogonW:%ws|%ws|%ws|%ws|\n",pUName,pDomain?pDomain:L"NO?DOMAIN",wszPwd,wszExec);
+							ec=(_CreateProcessWithLogonW(pUName,pDomain?pDomain:0,wszPwd,LOGON_WITH_PROFILE,0,wszExec,0,0,0,&siw,&pi)?NO_ERROR:GetLastError());
+							TRACEF("MyRunAs:CreateProcessWithLogonW: ret=%u\n",ec);
+							SecureZeroMemory(wszPwd,sizeof(wszPwd));//if (wszPwd) {volatile WCHAR*_p=wszPwd;for(;_p&&*_p;++_p)*_p=1;if (_p)*wszPwd=0;}//Burn password (And attempt to prevent compiler from removing it)	
+							if (ec && ErrorIsLogonError(ec)) {
+								LPTSTR szMsg;
+								DWORD ret=FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS,0,ec,MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),(LPTSTR)&szMsg,0,0);
+								if (ret) {
+									ec=ERRAPP_TRYAGAIN;
+									MessageBox(hwnd,szMsg,0,MB_ICONWARNING);
+									LocalFree(szMsg);
+								}
+								else ec=GetLastError();
+							}
+						}
+					}
+					NSIS::MemFree(wszExec);
+					if (pi.hThread)CloseHandle(pi.hThread);
+					if (ERRAPP_TRYAGAIN==ec)break;
+					if (ec) {
+						SetLastError(ec);
+						exitcode=-1;
+					}
+					else {
+						pRADD->pSEI->hProcess=pi.hProcess;
+						exitcode=IDOK;
+					}
+				}
+			case IDCANCEL:
+				EndDialog(hwnd,exitcode);
+			}
+		}
+		break;
+	}
+	return FALSE;
+}
+
+DWORD MyRunAs(HINSTANCE hInstDll,SHELLEXECUTEINFO&sei) {
+	INT_PTR ec;
+	ASSERT(sei.cbSize>=sizeof(SHELLEXECUTEINFO) && hInstDll);
+	if (ec=DelayLoadDlls())return ec;
+	ASSERT(_CreateProcessWithLogonW && _GetUserName);
+	RUNASDLGDATA radd={0};
+	radd.pSEI=&sei;
+	ec=DialogBoxParam(hInstDll,MAKEINTRESOURCE(IDD_MYRUNAS),sei.hwnd,MyRunAsDlgProc,(LPARAM)&radd);
+	TRACEF("MyRunAs returned %d (%s|%s)\n",ec,sei.lpFile,sei.lpParameters);
+	switch(ec) {
+	case 0:
+		return ERROR_INVALID_HANDLE;//DialogBoxParam returns 0 on bad hwnd
+	case IDOK:
+		return NO_ERROR;
+	case IDCANCEL:
+		return ERROR_CANCELLED;
+	}
+	//TODO:BUGBUG: on vista, the last error seems to get lost, should probably put it in RUNASDLGDATA and always return IDOK
+	return GetLastError();
+}
+
+
+#ifdef BUILD_DBG
+// RunDll exports are __stdcall, we dont care about that for this debug export, rundll32.exe is able to handle this mistake
+extern "C" void __declspec(dllexport) __cdecl DBGRDMyRunAs(HWND hwnd,HINSTANCE hinst,LPTSTR lpCmdLine,int nCmdShow) {
+	SHELLEXECUTEINFO sei={sizeof(sei)};
+	sei.lpFile=_T("Notepad.exe");//sei.lpParameters=_T("param1");
+	TRACEF("ec=%d\n",MyRunAs(GetModuleHandle(_T("UAC.dll")),sei));
+}
+#endif
+
+#endif /* FEAT_CUSTOMRUNASDLG */
+

admin/win/nsi/nsis_uac/UAC Readme.html

@@ -0,0 +1,222 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html><head>
+<title>UAC plug-in readme</title>
+<script type="text/javascript">
+function NavGL(q){window.open("http://www.google.com/search?hl=en&btnI=I&num=2&q="+escape(q));return 0;}
+</script>
+<style type="text/css">
+html,body {background-color:#FFF; color:#000;}
+a:link, a:visited, a:active {color:#00F;}
+h2 {border-bottom:0.1em solid #000;}
+#docHdrHdln{text-align:center;}
+.importanttxt {color:#e00;}
+.code {font-family:monospace;}
+.nsisvar {color:#C00;}
+.str {color:#390}
+.inifile {background-color:#EEE;border:1px solid #000;padding:0.2em;}
+.inicomment {background-color:#f5f5c5;color:#555;}
+table.piexport {text-align:left;margin-bottom:1em;}
+table.piexport td {vertical-align:top;}
+table.piexport table.ret {padding:0;margin:0;border:0;}
+</style>
+</head><body>
+<h1 id="docHdrHdln">UAC plug-in</h1>
+
+
+<code><pre>
+Interactive User (MediumIL)        Admin user(HighIL)
++++[Setup.exe]++++++++++++++       +++[Setup.exe]++++++++++++++
++                          +       +                          +
++ ***[.OnInit]************ +       + ***[.OnInit]************ +
++ * UAC::RunElevated >---+-+------>+ *                      * +
++ * NSIS.Quit()          * +       + *                      * +
++ ************************ +       + ***********||*********** +
++                          +       +            ||            +
++                          +       +            \/            +
++ ***[Sections]*********** +       + ***[Sections]*********** +
++ *                      * +    /--+-+-< UAC::Exec          * +
++ ************************ +    |  + ************************ +
++                          +    |  +                          +
++  Win32.CreateProcess() <-+----/  +                          +
++                          +       +                          +
+++++++++++++++++++++++++++++       ++++++++++++++++++++++++++++
+</pre></code>
+
+
+<h2>Contents</h2>
+<ul>
+<li><a href="#exports">Plugin Functions</a>
+<li><a href="#lang">Language support</a>
+<li><a href="#knownissues">Known Issues</a>
+<li><a href="#glossary">Glossary</a>
+</ul>
+
+
+
+
+
+
+<a name="exports"><h2>Plugin Functions</h2></a><div class="CntSec"><p>
+Every function will try to emulate the basic NSIS instruction (of similar name) when UAC::RunElevated has not "succeeded" or running on a system that does not support elevation (Win9x/NT4)</p>
+
+<table class="piexport"><tr><th colspan=2>UAC::RunElevated</th></tr>
+<tr><td>Parameters:</td><td></td></tr>
+<tr><td>Returns:</td><td>
+	<table class="ret">
+	<tr><td><span class="nsisvar">$0</span></td><td>Win32 error code (0 on success, 1223 if user aborted elevation dialog, anything else should be treated as a fatal error)</td></tr>
+	<tr><td><span class="nsisvar">$1</span></td><td><span class="code">If <span class="nsisvar">$0</span>==0</span>:
+		<table class="ret">
+		<tr><td>0</td><td>UAC is not supported by the OS</td></tr>
+		<tr><td>1</td><td>Started a elevated child process, the current process should act like a wrapper (Call Quit without any further processing)</td></tr>
+		<tr><td>2</td><td>The process is already running @ HighIL (Member of admin group)</td></tr>
+		<tr><td>3</td><td>You should call RunElevated again (This can happen if a user without admin priv. is used in the runas dialog)</td></tr>
+		</table>	
+		</td></tr>
+	<tr><td><span class="nsisvar">$2</span></td><td><span class="code">If <span class="nsisvar">$0</span>==0 && <span class="nsisvar">$1</span>==1</span>: ExitCode of the elevated fork process (The NSIS errlvl is also set)</td></tr>
+	<tr><td><span class="nsisvar">$3</span></td><td><span class="code">If <span class="nsisvar">$0</span>==0</span>: 1 if the user is a member of the admin group or 0 otherwise</td></tr>
+	</table></td></tr>
+<tr><td>Description:</td><td>Allows non-admin/UAC.LUA users to re-spawn the installer as another user and UAC.Admin users to elevate.</td></tr>
+</table>
+<!--table class="piexport"><tr><th colspan=2>UAC::RunElevatedAndProcessMessages <i style="font-size:smaller;">(Experimental)</i></th></tr>
+<tr><td>Parameters:</td><td></td></tr>
+<tr><td>Returns:</td><td><i>See UAC::RunElevated</i></td></tr>
+<tr><td>Description:</td><td>Version of UAC::RunElevated that can be called from a page</td></tr>
+</table-->
+
+<table class="piexport"><tr><th colspan=2>UAC::Unload</th></tr>
+<tr><td>Parameters:</td><td></td></tr>
+<tr><td>Returns:</td><td></td></tr>
+<tr><td>Description:</td><td>Cleanup, you must call this function in .OnInstFailed, .onUserAbort and .OnInstSuccess</td></tr>
+</table>
+
+<table class="piexport"><tr>
+<th colspan=2>UAC::Exec</th></tr>
+<tr><td>Parameters:</td><td>&lt;INT:ShowWindow&gt; &lt;STR:App&gt; &lt;STR:Parameters&gt; &lt;STR:WorkingDir&gt;</td></tr>
+<tr><td>Returns:</td><td>
+	<table class="ret">
+	<tr><td><span class="nsisvar">$0</span></td><td>Win32 error code, 0 on success (ErrorFlag is also set on error)</td></tr>
+	</table></td></tr>
+</table>
+<table class="piexport"><tr>
+<th colspan=2>UAC::ExecWait</th></tr>
+<tr><td>Parameters:</td><td>&lt;INT:ShowWindow&gt; &lt;STR:App&gt; &lt;STR:Parameters&gt; &lt;STR:WorkingDir&gt;</td></tr>
+<tr><td>Returns:</td><td>
+	<table class="ret">
+	<tr><td><span class="nsisvar">$0</span></td><td>Win32 error code, 0 on success (ErrorFlag is also set on error)</td></tr>
+	<tr><td><span class="nsisvar">$1</span></td><td>Exitcode of new process</td></tr>
+	</table></td></tr>
+</table>
+<table class="piexport"><tr>
+<th colspan=2>UAC::ShellExec</th></tr>
+<tr><td>Parameters:</td><td>&lt;STR:Verb&gt; &lt;INT:ShowWindow&gt; &lt;STR:App&gt; &lt;STR:Parameters&gt; &lt;STR:WorkingDir&gt;</td></tr>
+<tr><td>Returns:</td><td>
+	<table class="ret">
+	<tr><td><span class="nsisvar">$0</span></td><td>Win32 error code, 0 on success (ErrorFlag is also set on error)</td></tr>
+	</table></td></tr>
+</table>
+<table class="piexport"><tr>
+<th colspan=2>UAC::ShellExecWait</th></tr>
+<tr><td>Parameters:</td><td>&lt;STR:Verb&gt; &lt;INT:ShowWindow&gt; &lt;STR:App&gt; &lt;STR:Parameters&gt; &lt;STR:WorkingDir&gt;</td></tr>
+<tr><td>Returns:</td><td>
+	<table class="ret">
+	<tr><td><span class="nsisvar">$0</span></td><td>Win32 error code, 0 on success (ErrorFlag is also set on error)</td></tr>
+	<tr><td><span class="nsisvar">$1</span></td><td>Exitcode of new process</td></tr>
+	</table></td></tr>
+</table>
+
+<table class="piexport"><tr><th colspan=2>UAC::IsAdmin</th></tr>
+<tr><td>Parameters:</td><td></td></tr>
+<tr><td>Returns:</td><td><span class="nsisvar">$0</span> (BOOL) result</td></tr>
+<tr><td>Description:</td><td>Check current thread/process token for a non-deny admin group SID entry</td></tr>
+</table>
+
+<table class="piexport"><tr><th colspan=2>UAC::ExecCodeSegment</th></tr>
+<tr><td>Parameters:</td><td>&lt;INT:NSISFunctionAddress&gt;</td></tr>
+<tr><td>Returns:</td><td>[None] (ErrorFlag is set on error)</td></tr>
+<tr><td>Description:</td><td>Calls NSIS function in LUA/outer instance (If you use instructions that alter the UI or the stack/variables in the code segment (StrCpy,Push/Pop/Exch,DetailPrint etc.) they will affect the hidden wrapper installer and not "your" installer instance)</td></tr>
+</table>
+
+<table class="piexport"><tr><th colspan=2>UAC::StackPush</th></tr>
+<tr><td>Parameters:</td><td>&lt;STR:String&gt;</td></tr>
+<tr><td>Returns:</td><td>[None] (ErrorFlag is set on error)</td></tr>
+<tr><td>Description:</td><td>Push to outer instance stack (For use with UAC::ExecCodeSegment)</td></tr>
+</table>
+
+<table class="piexport"><tr><th colspan=2>UAC::GetOuterHwnd</th></tr>
+<tr><td>Parameters:</td><td></td></tr>
+<tr><td>Returns:</td><td><span class="nsisvar">$0</span> HWNDPARENT of outer instance</td></tr>
+<tr><td>Description:</td><td>For use with ${UAC.RunElevatedAndProcessMessages}</td></tr>
+</table>
+
+<table class="piexport"><tr><th colspan=2>UAC::SupportsUAC</th></tr>
+<tr><td>Parameters:</td><td></td></tr>
+<tr><td>Returns:</td><td><span class="nsisvar">$0</span> !=0 if supported</td></tr>
+<tr><td>Description:</td><td>Check if the OS supports UAC (And the user has UAC turned on) <span class="importanttxt">This function only tests if UAC is active, will return 0 on NT5 even though runas is implemented on those platforms, will also return 0 on NT6+ if UAC is off. You should only call this function during testing, NOT to determine if you can call UAC::RunElevated</span></td></tr>
+</table>
+
+<table class="piexport"><tr><th colspan=2>UAC::GetElevationType</th></tr>
+<tr><td>Parameters:</td><td></td></tr>
+<tr><td>Returns:</td><td>
+	<table class="ret">
+	<tr><td><span class="nsisvar">$0</span></td><td><a href="#" OnClick="return NavGL('TOKEN_ELEVATION_TYPE Enumeration')">TOKEN_ELEVATION_TYPE</a>:
+		<table class="ret">
+		<tr><td>0</td><td>Unsupported/Failed (ErrorFlag is also set)</td></tr>
+		<tr><td>1</td><td>TokenElevationTypeDefault: User is not using a split token (UAC disabled)</td></tr>
+		<tr><td>2</td><td>TokenElevationTypeFull: UAC enabled, the (current) process is elevated</td></tr>
+		<tr><td>3</td><td>TokenElevationTypeLimited: UAC enabled, the process is not elevated</td></tr>
+		</table>	
+		</td></tr>
+	</table></td></tr>
+</table>
+
+</div>
+
+
+
+
+
+<a name="lang"><h2>Language support</h2></a><div class="CntSec">
+<p>If the plugin is built with FEAT_CUSTOMRUNASDLG_TRANSLATE (Enabled by default), 
+you can extract a file named <span class="str">UAC.LNG</span> to <span class="nsisvar">$pluginsdir</span>. 
+It is a ini file with the following sections:
+</p><pre class="inifile">
+[MyRunAsCfg]
+<span class="inicomment">;Set to 1 to disable the radio button</span>
+DisableCurrUserOpt=
+<span class="inicomment">;Set to 1 to hide the radio button</span>
+HideCurrUserOpt=
+
+[MyRunAsStrings]
+DlgTitle=Hello There!
+HelpText=Just do your thing!
+<span class="inicomment">;Label for current user radio button, %s is replaced with result of GetUserNameEx(NameSamCompatible,...)</span>
+OptCurrUser=Self service (%s)
+OptOtherUser=Run as someone:
+UserName=Who:
+Pwd=PIN:
+OK=Okey!
+Cancel=No Way</pre>
+</div>
+
+<a name="knownissues"><h2>Known Issues</h2></a><div class="CntSec">
+<ul>
+<li>UACPI.KI#1: DetailPrint in outer process is ignored
+<li>UACPI.KI#2: Elevation can fail if the installer is located on a remote share that requires authentication
+</ul>
+</div>
+
+
+<a name="glossary"><h2>Glossary</h2></a><div class="CntSec">
+<ul>
+<li>AAM: Admin Approval Mode
+<li>IL: Integrity level (Part of the new MIC/WIC security levels added to NT6)
+<li>LUA: Limited/Least-privilege User Account
+<li>MIC: <a href="http://en.wikipedia.org/wiki/Mandatory_Integrity_Control">Mandatory Integrity Controls</a> (Now known as WIC)
+<li>UAC: User Account Control (Part of the UAP umbrella)
+<li>UAP: User Account Protection
+<li>WIC: <a href="http://www.securityfocus.com/infocus/1887">Windows Integrity Controls</a>
+<li>Win32 error code: Standard windows error codes, ERROR_???
+</ul>
+</div>
+
+</body></html>

admin/win/nsi/nsis_uac/UAC.nsh

@@ -0,0 +1,191 @@
+/*
+=======================
+UAC helper include file
+.......................
+
+Macros starting with UAC.I should only be called from the installer and vice versa for UAC.U macros.
+
+*/
+!ifndef UAC_HDR__INC
+!define UAC_HDR__INC
+!include LogicLib.nsh
+
+!define UAC.RunElevatedAndProcessMessages 'UAC::RunElevated '
+!define UAC.Unload 'UAC::Unload '
+!define UAC.StackPush 'UAC::StackPush '
+
+/*!macro _UAC.BuildOnInitElevationFunc _funcprefix
+Function ${_funcprefix}onInit
+!ifmacrodef
+FunctionEnd
+!macroend*/
+
+!macro _UAC.GenerateSimpleFunction _funcprefix _funcName _funcCode
+Function ${_funcprefix}${_funcName}
+${_funcCode}
+#messagebox mb_ok "${_funcprefix}${_funcName}"
+FunctionEnd
+!macroend
+
+!macro _UAC.TryDef _d _v
+!ifndef ${_d}
+!define ${_d} "${_v}"
+!endif
+!macroend
+
+!macro _UAC.InitStrings _modeprefix
+!insertmacro _UAC.TryDef UACSTR.UnDataFile "UAC.dat"
+!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvWinErr "Unable to elevate , error $0"
+!ifNdef __UNINSTALL__
+	!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvAbortReqAdmin "This installer requires admin access, aborting!"
+	!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvMustTryAgain "This installer requires admin access, try again"
+	!else
+	!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvAbortReqAdmin "This uninstaller requires admin access, aborting!"
+	!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvMustTryAgain "This uninstaller requires admin access, try again"
+	!endif
+!macroend
+
+!ifmacroNdef _UAC.GenerateUninstallerTango
+!macro _UAC.GenerateUninstallerTango UninstallerFileName
+!ifdef __GLOBAL__
+	!error "UAC: Needs to be called inside a function"
+	!endif
+!ifNdef __UNINSTALL__
+	!error "UAC: _UAC.GenerateUninstallerTango should only be called by uninstaller, see http://forums.winamp.com/showthread.php?threadid=280330"
+	!endif
+!ifNdef UAC_UNINSTALLERTANGOFORALLPLATFORMS
+	!include WinVer.nsh
+	!endif
+!insertmacro _UAC.InitStrings 'U.'
+ReadIniStr $0 "$ExeDir\${UACSTR.UnDataFile}" UAC "Un.Ready"
+${IF} $0 != 1
+!ifNdef UAC_UNINSTALLERTANGOFORALLPLATFORMS
+${AndIf} ${AtLeastWinVista}
+!endif
+	InitPluginsDir
+	WriteIniStr "$PluginsDir\${UACSTR.UnDataFile}" UAC "Un.Ready" 1
+	CopyFiles /SILENT "$EXEPATH" "$PluginsDir\${UninstallerFileName}"
+	StrCpy $0 ""
+	${IfThen} ${Silent} ${|} StrCpy $0 "/S " ${|}
+	ExecWait '"$PluginsDir\${UninstallerFileName}" $0/NCRC _?=$INSTDIR' $0
+	SetErrorLevel $0
+	Quit
+	${EndIf}
+!macroend
+!endif
+
+!ifmacroNdef _UAC.GenerateOnInitElevationCode
+!macro _UAC.GenerateOnInitElevationCode _modeprefix
+!ifndef __FUNCTION__
+	!error "UAC: Needs to be called inside a function"
+	!endif
+!insertmacro _UAC.InitStrings ${_modeprefix}
+!define _UAC.GOIECUniq L${__LINE__}
+UAC_Elevate_${_UAC.GOIECUniq}:
+UAC::RunElevated 
+StrCmp 1223 $0 UAC_ElevationAborted_${_UAC.GOIECUniq} ; UAC dialog aborted by user?
+StrCmp 0 $0 0 UAC_Err_${_UAC.GOIECUniq} ; Error?
+StrCmp 1 $1 0 UAC_Success_${_UAC.GOIECUniq} ;Are we the real deal or just the wrapper?
+Quit
+UAC_Err_${_UAC.GOIECUniq}:
+MessageBox mb_iconstop "${UACSTR.${_modeprefix}ElvWinErr}"
+Abort
+UAC_ElevationAborted_${_UAC.GOIECUniq}:
+MessageBox mb_iconstop "${UACSTR.${_modeprefix}ElvAbortReqAdmin}"
+Abort
+UAC_Success_${_UAC.GOIECUniq}:
+# if $0==0 && $3==1, we are a member of the admin group (Any OS)
+# if $0==0 && $1==0, UAC not supported (Probably <NT6), run as normal?
+# if $0==0 && $1==3, we can try to elevate again
+StrCmp 1 $3 /*+4*/ UAC_Done_${_UAC.GOIECUniq} ;Admin?
+StrCmp 3 $1 0 UAC_ElevationAborted_${_UAC.GOIECUniq} ;Try again or abort?
+MessageBox mb_iconexclamation "${UACSTR.${_modeprefix}ElvMustTryAgain}" ;Inform user...
+goto UAC_Elevate_${_UAC.GOIECUniq} ;...lets try again
+UAC_Done_${_UAC.GOIECUniq}:
+!undef _UAC.GOIECUniq
+!macroend
+!endif
+
+!define UAC.I.Elevate.AdminOnly '!insertmacro UAC.I.Elevate.AdminOnly '
+!macro UAC.I.Elevate.AdminOnly
+!insertmacro _UAC.GenerateOnInitElevationCode 'I.'
+!macroend
+
+!define UAC.U.Elevate.AdminOnly '!insertmacro UAC.U.Elevate.AdminOnly '
+!macro UAC.U.Elevate.AdminOnly _UninstallerName
+!ifNdef UAC_DISABLEUNINSTALLERTANGO
+	!insertmacro _UAC.GenerateUninstallerTango "${_UninstallerName}"
+	!endif
+!insertmacro _UAC.GenerateOnInitElevationCode 'U.'
+!macroend
+
+!define UAC.AutoCodeUnload '!insertmacro UAC.AutoCodeUnload '
+!macro UAC.AutoCodeUnload _HasUninstaller
+!insertmacro _UAC.GenerateSimpleFunction "" .OnInstFailed '${UAC.Unload}'
+!insertmacro _UAC.GenerateSimpleFunction "" .OnInstSuccess '${UAC.Unload}'
+!ifNdef MUI_INCLUDED
+	!insertmacro _UAC.GenerateSimpleFunction "" .onUserAbort '${UAC.Unload}'
+	!else
+	!ifNdef MUI_CUSTOMFUNCTION_ABORT
+		!error "UAC: must call $$ {UAC.Unload} in MUI_CUSTOMFUNCTION_ABORT!"
+		!endif
+	!endif
+!if "${_HasUninstaller}" != ""
+	!insertmacro _UAC.GenerateSimpleFunction "un" .onUninstFailed '${UAC.Unload}'
+	!insertmacro _UAC.GenerateSimpleFunction "un" .onUninstSuccess '${UAC.Unload}'
+	!ifNdef MUI_INCLUDED
+		!insertmacro _UAC.GenerateSimpleFunction "un" .onUserAbort '${UAC.Unload}'
+		!else
+		!ifNdef MUI_CUSTOMFUNCTION_ABORT
+			!error "UAC: must call $$ {UAC.Unload} in MUI_CUSTOMFUNCTION_(UN)ABORT!"
+			!endif
+		!endif
+	!endif
+!macroend
+
+!define UAC.FastCallFunctionAsUser '!insertmacro UAC.FastCallFunctionAsUser '
+!macro UAC.FastCallFunctionAsUser _func _var
+GetFunctionAddress ${_var} ${_func}
+UAC::ExecCodeSegment ${_var}
+!macroend
+!define UAC.CallFunctionAsUser '!insertmacro UAC.CallFunctionAsUser '
+!macro UAC.CallFunctionAsUser _func
+push $R9
+!insertmacro UAC.FastCallFunctionAsUser ${_func} $R9
+pop $R9
+!macroend
+
+!define UAC.FastCallGetOuterInstanceHwndParent UAC::GetOuterHwnd
+!define UAC.GetOuterInstanceHwndParent '!insertmacro UAC.GetOuterInstanceHwndParent '
+!macro UAC.GetOuterInstanceHwndParent _var
+push $0
+${UAC.FastCallGetOuterInstanceHwndParent}
+Exch $0
+Pop ${_var}
+!macroend
+
+
+
+!macro _UAC.DumpEx _disp _f _fp _v
+${_f} ${_fp}
+DetailPrint "${_disp}=${_v}"
+!macroend
+!macro _UAC.Dump _f _fp _v
+!insertmacro _UAC.DumpEx `${_f}` `${_f}` `${_fp}` `${_v}`
+!macroend
+!macro _UAC.DbgDetailPrint
+push $0
+push $1
+System::Call /NoUnload "advapi32::GetUserName(t.r0,*i${NSIS_MAX_STRLEN})"
+System::Call "Kernel32::GetComputerName(t.r1,*i${NSIS_MAX_STRLEN})"
+DetailPrint "$1\$0"
+;!insertmacro _UAC.DumpEx "User" System::Call "advapi32::GetUserName(t.r0,*i${NSIS_MAX_STRLEN})" $0
+!insertmacro _UAC.DumpEx "CmdLine" "" "" "$CmdLine"
+!insertmacro _UAC.Dump UAC::IsAdmin "" $0
+!insertmacro _UAC.Dump UAC::SupportsUAC "" $0
+!insertmacro _UAC.Dump UAC::GetElevationType "" $0
+pop $1
+pop $0
+!macroend
+
+!endif /* ifndef UAC_HDR__INC */

admin/win/nsi/nsis_uac/UAC_AdminOnly.nsi

@@ -0,0 +1,62 @@
+RequestExecutionLevel user /* RequestExecutionLevel REQUIRED! */
+!define APPNAME "UAC_AdminOnly"
+Name "${APPNAME}"
+OutFile "${APPNAME}.exe"
+ShowInstDetails show
+
+!include UAC.nsh ;<<< New headerfile that does everything for you ;)
+!include LogicLib.nsh
+
+!define UACSTR.I.ElvAbortReqAdmin "This fancy app requires admin rights fool" ;custom error string, see _UAC.InitStrings macro in uac.nsh for more
+
+Function .OnInit
+${UAC.I.Elevate.AdminOnly}
+FunctionEnd
+
+Function .OnInstFailed
+${UAC.Unload}
+FunctionEnd
+Function .OnInstSuccess
+${UAC.Unload}
+FunctionEnd
+
+Function ExecCodeSegmentTest
+${If} "$1" != "666, the # of the beast"
+	MessageBox mb_ok "uh oh"
+	${EndIf}
+FunctionEnd
+
+Section "Info"
+!insertmacro _UAC.DbgDetailPrint
+
+StrCpy $1 "666, the # of the beast"
+!insertmacro UAC.CallFunctionAsUser ExecCodeSegmentTest
+SectionEnd
+
+page InstFiles
+
+/* LEGACY CODE: (now uses magic code from UAC.nsh)
+Function .OnInit
+UAC_Elevate:
+UAC::RunElevated 
+StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
+StrCmp 0 $0 0 UAC_Err ; Error?
+StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper?
+Quit
+UAC_Err:
+MessageBox mb_iconstop "Unable to elevate , error $0"
+Abort
+UAC_ElevationAborted:
+/*System::Call "user32::CreateWindowEx(i ${WS_EX_TRANSPARENT}|${WS_EX_LAYERED}, t 'Button', t 'blah', i 0, i 10, i 10, i 10, i 10, i 0, i 0, i 0) i .r0"
+ShowWindow $0 ${SW_SHOW}
+System::Call "user32::SetForegroundWindow(i r0) i."
+System::Call "user32::DestroyWindow(i r0) i."
+* /
+MessageBox mb_iconstop "This installer requires admin access, aborting!"
+Abort
+UAC_Success:
+StrCmp 1 $3 +4 ;Admin?
+StrCmp 3 $1 0 UAC_ElevationAborted ;Try again or abort?
+MessageBox mb_iconstop "This installer requires admin access, try again" ;Inform user...
+goto UAC_Elevate ;... and try again
+FunctionEnd*/

admin/win/nsi/nsis_uac/UAC_AllowLUA.nsi

@@ -0,0 +1,45 @@
+/*
+This sample will try to elevate, but it will also allow non admin users to continue if they click cancel in the elevation dialog
+*/
+
+RequestExecutionLevel user /* RequestExecutionLevel REQUIRED! */
+!define APPNAME "UAC_AllowLUA"
+Name "${APPNAME}"
+OutFile "${APPNAME}.exe"
+ShowInstDetails show
+!include UAC.nsh
+
+
+Function .OnInstFailed
+UAC::Unload ;Must call unload!
+FunctionEnd
+Function .OnInstSuccess
+UAC::Unload ;Must call unload!
+FunctionEnd
+
+Function .OnInit
+UAC::RunElevated 
+;MessageBox mb_iconinformation "Debug: UAC::RunElevated: $\n0(Error)=$0 $\n1(UACMode)=$1 $\n2=$2 $\nadmin=$3$\n$\n$CmdLine"
+StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
+StrCmp 0 $0 0 UAC_Err ; Error?
+StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper?
+Quit
+UAC_Err:
+MessageBox mb_iconstop "Unable to elevate , error $0"
+Abort
+UAC_ElevationAborted:
+# elevation was aborted, we still run as normal
+UAC_Success:
+FunctionEnd
+
+
+
+Section "Info"
+!insertmacro _UAC.DbgDetailPrint
+SectionEnd
+
+
+
+
+
+Page InstFiles

admin/win/nsi/nsis_uac/UAC_GetUserShellFolderPath.nsi

@@ -0,0 +1,30 @@
+RequestExecutionLevel user /* RequestExecutionLevel REQUIRED! */
+!define APPNAME "UAC_GetUserShellFolderPath"
+Name "${APPNAME}"
+OutFile "${APPNAME}.exe"
+ShowInstDetails show
+
+!include UAC.nsh
+!include LogicLib.nsh
+
+page instfiles
+
+Function .onInit
+${UAC.I.Elevate.AdminOnly}
+FunctionEnd
+
+!ifndef CSIDL_PERSONAL
+	!define CSIDL_PERSONAL 0x0005 ;My Documents
+!endif
+Section
+
+/*
+You can specify a fallback value in the 2nd parameter, it is used if the installer is not elevated 
+or running on NT4/Win9x or on errors.
+If you just want to check for success, use "" as the 2nd parameter and compare $0 with "" 
+*/
+UAC::GetShellFolderPath ${CSIDL_PERSONAL} $Documents
+DetailPrint MyDocs=$0
+
+
+SectionEnd

admin/win/nsi/nsis_uac/UAC_RealWorldFullyLoadedDualModeExample.nsi

@@ -0,0 +1,235 @@
+/*
+This sample supports two modes, installing as a normal user (single user install) AND as admin (all users install)
+This sample uses the registry plugin, so you need to download that if you don't already have it
+*/
+
+!define APPNAME "UAC_RealWorldFullyLoadedDualMode"
+!define ELEVATIONTITLE "${APPNAME}: Elevate" ;displayed during elevation on our custom page
+!define UNINSTALLER_NAME "Uninstall ${APPNAME}.exe"
+!define UNINSTALLER_REGSECTION "${APPNAME}"
+!define RegPath.MSUninstall "Software\Microsoft\Windows\CurrentVersion\Uninstall"
+Name "${APPNAME}"
+OutFile "${APPNAME}.exe"
+ShowInstDetails show
+SetCompressor LZMA
+RequestExecutionLevel user /* RequestExecutionLevel REQUIRED! */
+!include MUI.nsh
+!include UAC.nsh
+!include LogicLib.nsh
+!include Registry.nsh
+!include nsDialogs.nsh	;for our custom page
+!include FileFunc.nsh	;we need to parse the command line
+
+!insertmacro GetParameters
+!insertmacro GetOptions
+
+!define MUI_CUSTOMFUNCTION_ABORT onAbort
+!define MUI_CUSTOMFUNCTION_GUIINIT onGuiInit
+!define MUI_COMPONENTSPAGE_NODESC
+!define MUI_FINISHPAGE_NOAUTOCLOSE
+!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\llama-blue.ico"
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\llama-blue.ico"
+!define MUI_WELCOMEPAGE_TITLE_3LINES
+
+var InstMode 	# 0: Single user, 1:All users, >1:elevated instance, perform page jump
+var hKey 		# Reg hive
+var hSelModeAdminRadio
+var StartMenuFolder
+
+!macro SetMode IsAdmin
+!if "${IsAdmin}" > 0
+	SetShellVarContext all
+	StrCpy $InstMode 1
+	StrCpy $hKey HKLM
+	!else
+	SetShellVarContext current
+	StrCpy $InstMode 0
+	StrCpy $hKey HKCU
+	!endif
+!macroend
+
+Function .OnInit
+!insertmacro SetMode 0
+${GetParameters} $R9
+${GetOptions} "$R9" UAC $0 ;look for special /UAC:???? parameter (sort of undocumented)
+${Unless} ${Errors}
+	UAC::IsAdmin
+	${If} $0 < 1 
+		SetErrorLevel 666 ;special return value for outer instance so it knows we did not have admin rights
+		Quit 
+		${EndIf}
+	!insertmacro SetMode 1
+	StrCpy $InstMode 2
+	${EndIf}
+FunctionEnd
+
+Function onGuiInit
+${If} $InstMode >= 2
+	${UAC.GetOuterInstanceHwndParent} $0
+	${If} $0 <> 0 
+		System::Call /NOUNLOAD "*(i,i,i,i)i.r1"
+		System::Call /NOUNLOAD 'user32::GetWindowRect(i $0,i r1)i.r2'
+		${If} $2 <> 0
+			System::Call /NOUNLOAD "*$1(i.r2,i.r3)"
+			System::Call /NOUNLOAD 'user32::SetWindowPos(i $hwndParent,i0,ir2,ir3,i0,i0,i 4|1)'
+			${EndIf}
+		ShowWindow $hwndParent ${SW_SHOW}
+		ShowWindow $0 ${SW_HIDE} ;hide outer instance installer window
+		System::Free $1
+		${EndIf}
+	${EndIf}
+FunctionEnd
+
+Function Un.OnInit
+!insertmacro SetMode 0
+ReadRegDWORD $0 HKLM "${RegPath.MSUninstall}\${UNINSTALLER_REGSECTION}" InstMode ;We saved the "mode" in the installer
+${If} $0 U> 0
+	; If it was installed for all users, we have to be admin to uninstall it
+	${UAC.U.Elevate.AdminOnly} "${UNINSTALLER_NAME}"
+	!insertmacro SetMode 1
+	${EndIf}
+FunctionEnd
+
+Function onAbort
+${UAC.Unload}
+FunctionEnd
+
+${UAC.AutoCodeUnload} 1 ;Auto-generate .OnInstFailed and .OnInstSuccess functions
+
+!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipPageInElvModePreCB
+!insertmacro MUI_PAGE_WELCOME
+Page Custom ModeSelectionPageCreate ModeSelectionPageLeave
+!define MUI_PAGE_CUSTOMFUNCTION_PRE CmpntsPreCB
+!insertmacro MUI_PAGE_COMPONENTS
+!define MUI_PAGE_CUSTOMFUNCTION_PRE DirPreCB
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_STARTMENU 1 $StartMenuFolder
+!insertmacro MUI_PAGE_INSTFILES
+!define MUI_FINISHPAGE_TITLE_3LINES
+!define MUI_FINISHPAGE_RUN
+!define MUI_FINISHPAGE_RUN_FUNCTION FinishRunCB
+!insertmacro MUI_PAGE_FINISH
+!define MUI_WELCOMEPAGE_TITLE_3LINES
+!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_LANGUAGE "English"
+
+Function CmpntsPreCB
+GetDlgItem $0 $hwndparent 3
+${IfThen} $InstMode >= 1 ${|} EnableWindow $0 0 ${|} ;prevent user from going back and selecting single user so noobs don't end up installing as the wrong user
+FunctionEnd
+
+Function SkipPageInElvModePreCB
+${IfThen} $InstMode > 1 ${|} Abort ${|} ;skip this page so we get to the mode selection page
+FunctionEnd
+
+Function ModeSelectionPageCreate
+${If} $InstMode > 1 
+	StrCpy $InstMode 1
+	Abort ;skip this page and contine where the "parent" would have gone
+	${EndIf}
+!insertmacro MUI_HEADER_TEXT_PAGE "Select install type" "Blah blah blah blah"
+nsDialogs::Create /NOUNLOAD 1018
+Pop $0
+${NSD_CreateLabel} 0 20u 75% 20u "Blah blah blah blah select install type..."
+Pop $0
+System::Call "advapi32::GetUserName(t.r0, *i ${NSIS_MAX_STRLEN}r1) i.r2"
+${NSD_CreateRadioButton} 0 40u 75% 15u "Single User ($0)"
+Pop $0
+${IfThen} $InstMode U< 1 ${|} SendMessage $0 ${BM_SETCHECK} 1 0 ${|}
+${NSD_CreateRadioButton} 0 60u 75% 15u "All users"
+Pop $hSelModeAdminRadio
+${IfThen} $InstMode U> 0 ${|} SendMessage $hSelModeAdminRadio ${BM_SETCHECK} 1 0 ${|}
+nsDialogs::Show
+FunctionEnd
+
+!macro EnableCtrl dlg id state
+push $language
+GetDlgItem $language ${dlg} ${id}
+EnableWindow $language ${state}
+pop $language
+!macroend
+
+Function ModeSelectionPageLeave
+SendMessage $hSelModeAdminRadio ${BM_GETCHECK} 0 0 $9
+UAC::IsAdmin
+${If} $9 U> 0
+	${If} $0 <> 0
+		!insertmacro SetMode 1
+	${Else}
+		System::Call /NoUnload 'user32::GetWindowText(i $HwndParent,t.R1,i ${NSIS_MAX_STRLEN})' ;get original window title
+		System::Call /NoUnload 'user32::SetWindowText(i $HwndParent,t "${ELEVATIONTITLE}")' ;set out special title
+		StrCpy $2 "" ;reset special return, only gets set when sub process is executed, not when user cancels
+		!insertmacro EnableCtrl $HWNDParent 1 0 ;Disable next button, just because it looks good ;)
+		${UAC.RunElevatedAndProcessMessages}
+		!insertmacro EnableCtrl $HWNDParent 1 1
+		System::Call 'user32::SetWindowText(i $HwndParent,t "$R1")' ;restore title
+		${If} $2 = 666 ;our special return, the new process was not admin after all 
+			MessageBox mb_iconExclamation "You need to login with an account that is a member of the admin group to continue..."
+			Abort 
+		${ElseIf} $0 = 1223 ;cancel
+			Abort
+		${Else}
+			${If} $0 <> 0
+				${If} $0 = 1062
+					MessageBox mb_iconstop "Unable to elevate, Secondary Logon service not running!"
+				${Else}
+					MessageBox mb_iconstop "Unable to elevate, error $0 ($1,$2,$3)"
+				${EndIf} 
+				Abort
+			${EndIf}
+		${EndIf} 
+		Quit ;We now have a new process, the install will continue there, we have nothing left to do here
+	${EndIf}
+${EndIf}
+FunctionEnd
+
+Function DirPreCB
+${If} $InstDir == ""
+	${If} $InstMode U> 0
+		StrCpy $InstDir "$ProgramFiles\${APPNAME}"
+		${Else}
+		StrCpy $InstDir "$APPDATA\${APPNAME}"
+		${EndIf}
+	${EndIf}
+FunctionEnd
+
+Function FinishRunCB
+UAC::Exec "" "Notepad.exe" "$Windir\Win.INI" "$InstDir"
+FunctionEnd
+
+Function CreateSMShortcuts
+CreateShortcut "$SMPrograms\${APPNAME}.lnk" "$Windir\Notepad.exe"
+FunctionEnd
+Function CreateDeskShortcuts
+CreateShortcut "$Desktop\${APPNAME}.lnk" "$Windir\Notepad.exe"
+FunctionEnd
+
+Section "!Required files"
+SectionIn RO
+SetOutPath -
+!insertmacro _UAC.DbgDetailPrint ;some debug info, useful during testing
+;Install files here...
+WriteUninstaller "$InstDir\${UNINSTALLER_NAME}"
+${registry::Write} "$hKey\${RegPath.MSUninstall}\${UNINSTALLER_REGSECTION}" DisplayName "${APPNAME}" REG_SZ $0
+${registry::Write} "$hKey\${RegPath.MSUninstall}\${UNINSTALLER_REGSECTION}" UninstallString "$InstDir\${UNINSTALLER_NAME}" REG_SZ $0
+${registry::Write} "$hKey\${RegPath.MSUninstall}\${UNINSTALLER_REGSECTION}" InstMode $InstMode REG_DWORD $0
+${registry::Unload}
+SectionEnd
+
+Section "Startmenu Shortcuts"
+${UAC.CallFunctionAsUser} CreateSMShortcuts
+SectionEnd
+Section "Desktop Shortcut"
+${UAC.CallFunctionAsUser} CreateDeskShortcuts
+SectionEnd
+
+Section Uninstall
+Delete "$InstDir\${UNINSTALLER_NAME}"
+Delete "$SMPrograms\${APPNAME}.lnk"
+Delete "$Desktop\${APPNAME}.lnk"
+
+RMDir "$InstDir"
+${registry::DeleteKey} "$hKey\${RegPath.MSUninstall}\${UNINSTALLER_REGSECTION}" $0
+${registry::Unload}
+SectionEnd

admin/win/nsi/nsis_uac/UAC_Uninstaller.nsi

@@ -0,0 +1,49 @@
+/*
+This script was made in response to http://forums.winamp.com/showthread.php?threadid=280330
+It is a ugly hack and is mostly here just to have a solution right now.
+Hopefully, NSIS will add support for changing the RequestExecutionLevel of the uninstaller
+This code inspired the _UAC.GenerateUninstallerTango macro (called by ${UAC.U.Elevate.AdminOnly} unless you define UAC_DISABLEUNINSTALLERTANGO)
+*/
+
+RequestExecutionLevel user /* RequestExecutionLevel REQUIRED! */
+!define APPNAME "UAC_Uninstaller"
+Name "${APPNAME}"
+OutFile "${APPNAME}.exe"
+ShowInstDetails show
+!include LogicLib.nsh
+
+!define UNINSTALLER_UACDATA "uac.ini"
+!define UNINSTALLER_NAME "Uninstall FooBarBaz"
+
+Function un.onInit
+ReadIniStr $0 "$ExeDir\${UNINSTALLER_UACDATA}" UAC "Un.First"
+${IF} $0 != 1
+	;SetSilent silent
+	InitPluginsDir
+	WriteIniStr "$PluginsDir\${UNINSTALLER_UACDATA}" UAC "Un.First" 1
+	CopyFiles /SILENT "$EXEPATH" "$PluginsDir\${UNINSTALLER_NAME}.exe"
+	StrCpy $0 ""
+	${IfThen} ${Silent} ${|} StrCpy $0 "/S " ${|}
+	ExecWait '"$PluginsDir\${UNINSTALLER_NAME}.exe" $0/NCRC _?=$INSTDIR' $0
+	SetErrorLevel $0
+	Quit
+	${EndIf}
+
+# UAC code goes here ...
+FunctionEnd
+
+Section
+WriteUninstaller "$exedir\${UNINSTALLER_NAME}.exe"
+SetAutoClose true
+DetailPrint "Uninstalling..."
+Sleep 1111
+Exec '"$exedir\${UNINSTALLER_NAME}.exe"'
+SectionEnd
+
+Section uninstall
+MessageBox mb_ok "My filename is: $EXEFILE"
+Delete "$instdir\${UNINSTALLER_NAME}.exe"
+Delete "$instdir\${APPNAME}.exe" ;delete generated installer aswell, this is just a sample script
+SectionEnd
+
+page InstFiles

admin/win/nsi/nsis_uac/resource.h

@@ -0,0 +1,24 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by resource.rc
+//
+#define IDD_MYRUNAS                     101
+#define IDC_RUNASCURR                   1000
+#define IDC_RUNASSPEC                   1001
+#define IDC_SHICON                      1002
+#define IDC_HELPTEXT                    1003
+#define IDC_USERNAME                    1004
+#define IDC_PASSWORD                    1005
+#define IDC_LBLUSER                     1007
+#define IDC_LBLPWD                      1008
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1009
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

admin/win/nsi/nsis_uac/resource.rc

@@ -0,0 +1,109 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+#include "uac.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_MYRUNAS DIALOG DISCARDABLE  0, 0, 250, 145
+STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_SETFOREGROUND | DS_FIXEDSYS | 
+    DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "&OK",IDOK,132,122,50,14
+    PUSHBUTTON      "Ca&ncel",IDCANCEL,188,122,50,14
+    ICON            "",IDC_SHICON,7,7,20,20
+    LTEXT           "",IDC_HELPTEXT,34,7,204,35
+    CONTROL         "",IDC_RUNASCURR,"Button",BS_AUTORADIOBUTTON,20,49,218,
+                    10
+    CONTROL         "",IDC_RUNASSPEC,"Button",BS_AUTORADIOBUTTON,20,65,218,
+                    10
+    LTEXT           "&User name:",IDC_LBLUSER,20,84,42,16
+    EDITTEXT        IDC_USERNAME,63,83,175,14,ES_AUTOHSCROLL
+    LTEXT           "&Password:",IDC_LBLPWD,20,102,42,20
+    EDITTEXT        IDC_PASSWORD,63,100,175,14,ES_PASSWORD | ES_AUTOHSCROLL
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_MYRUNAS, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 238
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 136
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "#include ""uac.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+