Update changelogs date and version.

2.0.1rc1
Update ChangeLog
2026-04-04 20:34:17 +02:00 · 2015-09-01 15:50:21 +02:00 · 2015-08-31 16:39:37 +02:00 · 2015-08-31 16:39:17 +02:00 · 2015-08-31 16:37:22 +02:00 · 2015-08-31 16:37:00 +02:00
487 changed files with 57164 additions and 43305 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/owncloud/documentation
 [submodule "src/3rdparty/qtmacgoodies"]
 	path = src/3rdparty/qtmacgoodies
-	url = git://github.com/shadone/qtmacgoodies.git
+	url = git://github.com/guruz/qtmacgoodies.git
 [submodule "binary"]
 	path = binary
 	url = git://github.com/owncloud/owncloud-client-binary.git
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,31 @@
+language: cpp
+branches:
+  only:
+  - coverity_scan 
+
+before_install:
+- sudo sh -c "echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_12.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+- sudo sh -c "echo 'deb-src http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_12.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+- wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/xUbuntu_12.04/Release.key
+- sudo apt-key add - < Release.key
+- sudo apt-get update
+- sudo apt-get 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
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,6 +74,10 @@ message(STATUS "GIT_SHA1 ${GIT_SHA1}")

 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
@@ -118,6 +122,10 @@ if(OWNCLOUD_5XX_NO_BLACKLIST)
    add_definitions(-DOWNCLOUD_5XX_NO_BLACKLIST=1)
 endif()

+if(APPLE)
+  set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesigh key's TeamIdentifier/Organizational Unit" )
+endif()
+
 #### find libs
 #find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtTest QtWebkit REQUIRED )
 #if( UNIX AND NOT APPLE ) # Fdo notifications
@@ -133,11 +141,11 @@ if(HAVE_QT5)
      message(STATUS "We would not require Neon in this setup, compile without!")
      set(USE_NEON FALSE)
    else()
-      message(STATUS "Still requiring Neon with this Qt version :-( Qt 5.4 is better!")
+      message(STATUS "If possible compile me with Qt 5.4 or higher.")
    endif()
  endif()
 else()
-message(STATUS "If possible compile me with Qt 5.4 which is much faster/better.")
+  message(STATUS "If possible compile me with Qt 5.4 or higher.")
 endif()

 if (USE_NEON)
@@ -165,13 +173,13 @@ 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})
 endif()

+find_package(ZLIB)

 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)

@@ -194,6 +202,7 @@ 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)

@@ -205,6 +214,7 @@ 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)
 else()
    install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
    configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,6 +7,7 @@ We are also available on [IRC][irc].
 ### Bug Reporting Guidelines
 * __Important__: Report the issue using our [template][template], it includes all the
  informations 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
 * This repository is *only* for issues within the ownCloud desktop client. 
  Issues in other compontents should be reported in their own repositores: 
  - [ownCloud server](https://github.com/owncloud/core/issues)
--- a/132
+++ b/132
@@ -1,6 +1,131 @@
 ChangeLog
 =========
-version 1.8.0 (release 2015-02-xx)
+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)
@@ -12,7 +137,7 @@ version 1.8.0 (release 2015-02-xx)
 * 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 muli-account feature
+ * 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
@@ -24,8 +149,7 @@ version 1.8.0 (release 2015-02-xx)
 * Prepared direct download
 * Added Crashreporter feature to be switched on on demand
 * A huge amount of bug fixes in all areas of the client.
-
- * more than 7000 commits since 1.7.0
+ * almost 700 commits since 1.7.1

 version 1.7.1 (release 2014-12-18)
 * Documentation fixes and updates
--- a/OwnCloudCPack.cmake
+++ b/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_NAME}-${CPACK_PACKAGE_VERSION} )
+    set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_SHORTNAME}-${CPACK_PACKAGE_VERSION} )
    set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/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_NAME}")
+    set( CPACK_DMG_VOLUME_NAME "${APPLICATION_SHORTNAME}")

    # 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_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_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_NAME  ${APPLICATION_NAME} ) # Package name, defaults to the project name
    set( CPACK_PACKAGE_VENDOR  "http://${APPLICATION_DOMAIN}" )   # Package vendor name
 endif()
--- a/README.md
+++ b/README.md
@@ -1,5 +1,11 @@
 # 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/) |
+    
+
 ## Introduction

 The ownCloud Desktop Client is a tool to synchronize files from ownCloud Server
@@ -13,7 +19,7 @@ with your computer.

 ### Source code

-Tehe ownCloud Desktop Client is developed in Git. Since Git makes it easy to
+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
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,10 +1,10 @@
-set( MIRALL_VERSION_MAJOR 1 )
-set( MIRALL_VERSION_MINOR 8 )
-set( MIRALL_VERSION_PATCH 0 )
+set( MIRALL_VERSION_MAJOR 2 )
+set( MIRALL_VERSION_MINOR 0 )
+set( MIRALL_VERSION_PATCH 1 )
 set( MIRALL_SOVERSION 0 )

 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "beta2") #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 )
--- a/admin/osx/CMakeLists.txt
+++ b/admin/osx/CMakeLists.txt
@@ -14,3 +14,4 @@ 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)
--- a/admin/osx/create_mac_pkg.sh.cmake
+++ b/admin/osx/create_mac_pkg.sh.cmake
@@ -50,7 +50,7 @@ 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
+	mv "$installer_file".new "$installer_file"
 	popd
 else
 	echo "No certificate given, will not sign the pkg"
--- a/admin/osx/gen_sym_files.py
+++ b/admin/osx/gen_sym_files.py
@@ -0,0 +1,75 @@
+#!/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():
+        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)
--- a/admin/osx/macdeployqt.py
+++ b/admin/osx/macdeployqt.py
@@ -260,12 +260,18 @@ def CopyFramework(path):
  commands.append(args)
  args = ['chmod', 'u+w', os.path.join(full_path, parts[-1])]
  commands.append(args)
-  args = ['chmod', 'u+w', os.path.join(frameworks_dir, framework, "Resources")]
+  resources_dir = os.path.join(frameworks_dir, framework, "Resources")
+
+  args = ['mkdir', resources_dir]
+  commands.append(args)
+  args = ['chmod', 'u+w', resources_dir]
  commands.append(args)

  info_plist = os.path.join(os.path.split(path)[0], '..', '..', 'Contents', 'Info.plist')
+  if not os.path.exists(info_plist):
+    info_plist = os.path.join(os.path.split(path)[0], 'Resources', 'Info.plist')
  if os.path.exists(info_plist):
-    args = ['cp', '-r', info_plist, os.path.join(frameworks_dir, framework, "Resources")]
+    args = ['cp', '-r', info_plist, resources_dir]
    commands.append(args)
  return os.path.join(full_path, parts[-1])

--- a/admin/osx/macosx.pkgproj
+++ b/admin/osx/macosx.pkgproj
@@ -472,7 +472,12 @@
 			<key>PACKAGE_SCRIPTS</key>
 			<dict>
                 <key>POSTINSTALL_PATH</key>
-                 <dict/>
+                 <dict>
+                         <key>PATH</key>
+                         <string>@CMAKE_CURRENT_BINARY_DIR@/post_install.sh</string>
+                         <key>PATH_TYPE</key>
+                         <integer>0</integer>
+                 </dict>
                 <key>PREINSTALL_PATH</key>
                 <dict>
                         <key>PATH</key>
@@ -1016,11 +1021,11 @@
 				<key>CONCLUSION_ACTION</key>
 				<integer>0</integer>
 				<key>IDENTIFIER</key>
-				<string>com.owncCloud.finderPlugin</string>
+				<string>com.ownCloud.finderPlugin</string>
 				<key>LOCATION</key>
 				<integer>0</integer>
 				<key>NAME</key>
-				<string>Finder Plugin</string>
+				<string>Legacy Finder Plugin (OS X 10.9 or older)</string>
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
--- a/admin/osx/post_install.sh.cmake
+++ b/admin/osx/post_install.sh.cmake
@@ -0,0 +1,19 @@
+#!/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/"
+    # enable it
+    pluginkit -e use -i @APPLICATION_REV_DOMAIN@.FinderSyncExt
+fi
+
+exit 0
--- a/admin/osx/pre_install.sh.cmake
+++ b/admin/osx/pre_install.sh.cmake
@@ -6,3 +6,4 @@ killall @APPLICATION_EXECUTABLE@
 # Unload the Finder plugin. see issue #2105
 killall Finder

+exit 0
--- a/admin/osx/sign_app.sh
+++ b/admin/osx/sign_app.sh
@@ -1,12 +1,18 @@
-#!/bin/sh -x
+#!/bin/sh -xe

-[ "$#" -lt 2 ] && echo "Usage: sign_app.sh <app> <identity>" && exit
+[ "$#" -lt 2 ] && echo "Usage: sign_app.sh <app> <identity> <team_identifier>" && exit

 src_app="$1"
 identity="$2"
+team_identifier="$3"

-codesign -s "$identity" --force --verbose=4 --deep "$src_app"
+codesign -s "$identity" --force --preserve-metadata=entitlements --verbose=4 --deep "$src_app"

-# Just for our debug purposes:
+# Verify the signature
 spctl -a -t exec -vv $src_app
 codesign -dv $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 $?
--- a/admin/win/docker/build.sh
+++ b/admin/win/docker/build.sh
@@ -0,0 +1,19 @@
+#!/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
--- a/admin/win/download_runtimes.sh
+++ b/admin/win/download_runtimes.sh
@@ -2,7 +2,7 @@

 #VS2013
 base_url=http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3
-tmp_path=/tmp/.vcredist
+tmp_path=${1:-/tmp/.vcredist}

 mkdir -p $tmp_path

--- a/admin/win/nsi/l10n/.tx/config
+++ b/admin/win/nsi/l10n/.tx/config
@@ -10,24 +10,25 @@ minimum_perc = 5

 # simple one-to-one language mappings
 trans.ca = pofiles/ca.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.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.sl = pofiles/sl.po
 trans.sv = pofiles/sv.po
 trans.tr = pofiles/tr.po
-trans.uk = pofiles/uk.po     
-trans.zh_TW = pofiles/zh_TW.po  
-trans.zh_CN = pofiles/zh_CN.po  
+trans.uk = pofiles/uk.po
+trans.zh_CN = pofiles/zh_CN.po
+trans.zh_TW = pofiles/zh_TW.po

 # special handling below

@@ -35,14 +36,13 @@ trans.zh_CN = pofiles/zh_CN.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.ja_JP = pofiles/ja.po  
-trans.hu_HU = pofiles/hu.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.hu_HU = pofiles/hu.po
+trans.ja_JP = pofiles/ja.po
+trans.sk_SK = pofiles/sk.po
+trans.th_TH = pofiles/th.po
--- a/admin/win/nsi/l10n/Basque.nsh
+++ b/admin/win/nsi/l10n/Basque.nsh
@@ -27,10 +27,6 @@ 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_LABEL_2 "Utzi markatu gabe datuen karpeta uzteko edo markatu datuen karpeta ezabatzeko."
-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"
@@ -44,3 +40,4 @@ StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Desinstalatzaile honek administratzaile b
 StrCpy $INIT_UNINSTALLER_RUNNING "Desinstalatzailea dagoeneko martxan da."
 StrCpy $SectionGroup_Shortcuts "Lasterbideak"
 StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
--- a/admin/win/nsi/l10n/Catalan.nsh
+++ b/admin/win/nsi/l10n/Catalan.nsh
@@ -15,6 +15,8 @@ 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"
@@ -25,10 +27,6 @@ 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_APPDATA_SUBTITLE "Esborra la carpeta de dades de ${APPLICATION_NAME} del vostre equip."
-StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Voleu esborrar la carpeta de dades de ${APPLICATION_NAME}?"
-StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Deixeu-ho sense marcar per mantenir la carpeta de dades per un ús posterior o marqueu-ho per esborrar la carpeta de dades."
-StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Sí, esborra la carpeta de dades."
 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"
@@ -42,5 +40,4 @@ 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 $INIT_UNINSTALLER_RUNNING "El desinstal·lador ja s'està executant."
 StrCpy $SectionGroup_Shortcuts "Dreceres"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integration for Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing Integration for Windows Explorer"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
--- a/admin/win/nsi/l10n/Czech.nsh
+++ b/admin/win/nsi/l10n/Czech.nsh
@@ -1,46 +1,43 @@
 # 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.\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_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"
+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 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 $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"
--- a/admin/win/nsi/l10n/Dutch.nsh
+++ b/admin/win/nsi/l10n/Dutch.nsh
@@ -27,10 +27,6 @@ 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, wel 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"
@@ -42,5 +38,6 @@ StrCpy $UAC_ERROR_ELEVATE "Kan niet verhogen, fout:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Dit installatieprogramma vereist beheerdersrechten. 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 $INIT_UNINSTALLER_RUNNING "De uninstaller is al gestart."
 StrCpy $SectionGroup_Shortcuts "Snelkoppelingen"
--- a/admin/win/nsi/l10n/English.nsh
+++ b/admin/win/nsi/l10n/English.nsh
@@ -27,10 +27,6 @@ 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"
@@ -42,5 +38,6 @@ 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"
--- a/admin/win/nsi/l10n/Estonian.nsh
+++ b/admin/win/nsi/l10n/Estonian.nsh
@@ -15,32 +15,29 @@ 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_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_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_DESKTOP_SECTION "Töölaua otsetee"
 StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Töölaua otseteede loomine"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Kiirvaliku nupp"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Kiirvaliku nupu loomine"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Kiirvaliku otsetee"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Kiirvaliku otsetee 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 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 $OPTION_SECTION_SC_DESKTOP_Desc "Töölaua otsetee rakendusele ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Kiirvaliku otsetee rakendusele ${APPLICATION_NAME}."
 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 viit (N/A)"
+StrCpy $INIT_NO_QUICK_LAUNCH "Kiirvaliku otsetee (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 $INIT_UNINSTALLER_RUNNING "See desinstallija on juba käimas"
-StrCpy $SectionGroup_Shortcuts "Viidad"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integration for Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing Integration for Windows Explorer"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Sisselogimisteenus ei tööta, katkestamine!"
+StrCpy $INIT_UNINSTALLER_RUNNING "See desinstallija on juba käimas."
+StrCpy $SectionGroup_Shortcuts "Otseteed"
--- a/admin/win/nsi/l10n/Farsi.nsh
+++ b/admin/win/nsi/l10n/Farsi.nsh
@@ -1,22 +1,35 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "نمایش پادداشت های انتشار نسخه"
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "پردازش برای از بین بردن یافت نشد!"
+StrCpy $PageReinstall_NEW_Field_2 "عمل حذف را قبل از نصب انجام دهید"
 StrCpy $PageReinstall_NEW_Field_3 "حذف نکن"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "از قبل نصب شده است"
 StrCpy $PageReinstall_SAME_Field_2 "افزودن/نصب مجدد اجزا"
+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 $UNINSTALLER_APPDATA_CHECKBOX "بله، این پوشه داده را حذف کن."
+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 $INIT_INSTALLER_RUNNING "نصاب از قبل در حال اجراست."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "حذف برنامه نیاز به دسترسی مدیر دارد ، لطفا دوباره سعی کنید"
 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 $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_NEW_Field_2 "Uninstall before installing"
 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."
@@ -26,21 +39,5 @@ StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choose the maintenance opti
 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_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_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 $UAC_UNINSTALLER_REQUIRE_ADMIN "This uninstaller requires admin access, try again"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
--- a/admin/win/nsi/l10n/Finnish.nsh
+++ b/admin/win/nsi/l10n/Finnish.nsh
@@ -27,10 +27,6 @@ StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} v
 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_APPDATA_SUBTITLE "Poista ${APPLICATION_NAME}-datakansio tietokoneelta."
-StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Haluatko varmasti poistaa ${APPLICATION_NAME}-datakansion?"
-StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Jätä valinta ruksimatta säilyttääksesti datakansion myöhempää käyttöä varten tai täytä ruksi jos haluat poistaa datakansion ja siinä olevat tiedostot."
-StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Kyllä, poista tämä datakansio."
 StrCpy $UNINSTALLER_FILE_Detail "Kirjoitetaan poisto-ohjelmaa"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Kirjoitetaan asennusohjelman rekisteriavaimia"
 StrCpy $UNINSTALLER_FINISHED_Detail "Valmis"
@@ -42,5 +38,6 @@ 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"
--- a/admin/win/nsi/l10n/French.nsh
+++ b/admin/win/nsi/l10n/French.nsh
@@ -1,6 +1,6 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Afficher les notes de version"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Le(s) processus en cours d’exécution ${APPLICATION_EXECUTABLE} doit (doivent) être stoppé(s) afin de poursuivre.$\nVoulez-vous que le programme d’installation s’en charge pour vous ?"
+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."
@@ -27,10 +27,6 @@ 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 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é"
@@ -42,5 +38,6 @@ StrCpy $UAC_ERROR_ELEVATE "Échec 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"
--- a/admin/win/nsi/l10n/Galician.nsh
+++ b/admin/win/nsi/l10n/Galician.nsh
@@ -27,10 +27,6 @@ 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"
@@ -39,8 +35,9 @@ 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, tenteo de novo"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Este instalador require acceso de administrador, ténteo de novo"
 StrCpy $INIT_INSTALLER_RUNNING "O instalador xa está en execución."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Este desinstalador require acceso de administrador, tenteo de novo"
+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 $INIT_UNINSTALLER_RUNNING "O desinstalador xa está en execución."
 StrCpy $SectionGroup_Shortcuts "Atallos"
--- a/admin/win/nsi/l10n/German.nsh
+++ b/admin/win/nsi/l10n/German.nsh
@@ -27,10 +27,6 @@ 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"
@@ -44,3 +40,4 @@ StrCpy $INIT_INSTALLER_RUNNING "Das Installationsprogramm wird bereits ausgef
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Das Deinstallationsprogramm erfordert Administrator-Rechte. Bitte erneut versuchen."
 StrCpy $INIT_UNINSTALLER_RUNNING "Das Deinstallationsprogramm wird bereits ausgeführt."
 StrCpy $SectionGroup_Shortcuts "Verknüpfungen"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
--- a/admin/win/nsi/l10n/Greek.nsh
+++ b/admin/win/nsi/l10n/Greek.nsh
@@ -27,10 +27,6 @@ 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 "Ολοκληρώθηκε"
@@ -42,5 +38,6 @@ 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 "Συντομεύσεις"
--- a/admin/win/nsi/l10n/Hungarian.nsh
+++ b/admin/win/nsi/l10n/Hungarian.nsh
@@ -1,46 +1,43 @@
 # 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 "Folyamat ${APPLICATION_EXECUTABLE} kilövése."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "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ítva van a rendszeren. Ajánlott a régi alkalmazás eltávolítása mielőtt a legfrissebb verziót telepítané. 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álaszd ki, hogy szeretnéd telepíteni a következő alkalmazást ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "Az ${APPLICATION_NAME} alklamazá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érem válassza ki milyen műveletet szeretne végrehajtan, és nyomja meg a $\"Következő$\" gombot."
 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 $UNINSTALLER_APPDATA_CHECKBOX "Igen, törölje ezt az adatkönyvtárat."
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Kérem 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ás Eszköztár Parancsikon"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Gyorsindítás 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 "Program Eltá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 egy 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áld ú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áld ú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 $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_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"
-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 $UAC_ERROR_ELEVATE "Unable to elevate, error:"
-StrCpy $SectionGroup_Shortcuts "Shortcuts"
+StrCpy $SectionGroup_Shortcuts "Parancsikonok"
--- a/admin/win/nsi/l10n/Italian.nsh
+++ b/admin/win/nsi/l10n/Italian.nsh
@@ -27,10 +27,6 @@ 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"
@@ -42,5 +38,6 @@ 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"
--- a/admin/win/nsi/l10n/Japanese.nsh
+++ b/admin/win/nsi/l10n/Japanese.nsh
@@ -1,6 +1,6 @@
 # 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オペレーションを選択し、次へをクリックする。"
@@ -27,10 +27,6 @@ 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 "終了"
@@ -42,5 +38,6 @@ 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 "ショートカット"
--- a/admin/win/nsi/l10n/Norwegian.nsh
+++ b/admin/win/nsi/l10n/Norwegian.nsh
@@ -0,0 +1,43 @@
+# 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 allerede installert.\nVelg hva du vil 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 $INIT_UNINSTALLER_RUNNING "Avinstallasjonsprogrammet kjører allerede."
+StrCpy $SectionGroup_Shortcuts "Snarveier"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
--- a/admin/win/nsi/l10n/Polish.nsh
+++ b/admin/win/nsi/l10n/Polish.nsh
@@ -1,46 +1,43 @@
 # 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 $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_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"
+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 $INIT_UNINSTALLER_RUNNING "Dezinstalator ju¿ jest uruchomiony."
+StrCpy $SectionGroup_Shortcuts "Skróty"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
--- a/admin/win/nsi/l10n/Portuguese.nsh
+++ b/admin/win/nsi/l10n/Portuguese.nsh
@@ -27,10 +27,6 @@ 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 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"
@@ -42,5 +38,6 @@ 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 $SectionGroup_Shortcuts "Atalhos"
--- a/admin/win/nsi/l10n/PortugueseBR.nsh
+++ b/admin/win/nsi/l10n/PortugueseBR.nsh
@@ -27,10 +27,6 @@ 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_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 "Gravando Desinstalador"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Gravando Chaves de Registro do Inslalador"
 StrCpy $UNINSTALLER_FINISHED_Detail "Finalizado"
@@ -42,5 +38,6 @@ 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"
--- a/admin/win/nsi/l10n/Russian.nsh
+++ b/admin/win/nsi/l10n/Russian.nsh
@@ -27,10 +27,6 @@ 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 "Запись ключей реестра установщика"
 StrCpy $UNINSTALLER_FINISHED_Detail "Завершено"
@@ -42,5 +38,6 @@ 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 "Ярлыки"
--- a/admin/win/nsi/l10n/SimpChinese.nsh
+++ b/admin/win/nsi/l10n/SimpChinese.nsh
@@ -27,10 +27,6 @@ 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 "选择以删除数据文件夹，不选择以保留数据文件夹内容供后续使用。"
-StrCpy $UNINSTALLER_APPDATA_CHECKBOX "删除数据文件。"
 StrCpy $UNINSTALLER_FILE_Detail "覆盖卸载器"
 StrCpy $UNINSTALLER_REGISTRY_Detail "正在写入注册表"
 StrCpy $UNINSTALLER_FINISHED_Detail "完成"
@@ -44,3 +40,4 @@ StrCpy $INIT_INSTALLER_RUNNING "安装程序已经运行。"
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "卸载程序需要管理员权限，请重试"
 StrCpy $INIT_UNINSTALLER_RUNNING "卸载程序已经运行。"
 StrCpy $SectionGroup_Shortcuts "快捷方式"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
--- a/admin/win/nsi/l10n/Slovak.nsh
+++ b/admin/win/nsi/l10n/Slovak.nsh
@@ -27,10 +27,6 @@ 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é"
@@ -44,3 +40,4 @@ StrCpy $INIT_INSTALLER_RUNNING "In
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Tento odinštalátor vyžaduje admin prístup, skúste to znova"
 StrCpy $INIT_UNINSTALLER_RUNNING "Odinštalátor je už spustený."
 StrCpy $SectionGroup_Shortcuts "Zástupcovia"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
--- a/admin/win/nsi/l10n/Slovenian.nsh
+++ b/admin/win/nsi/l10n/Slovenian.nsh
@@ -27,10 +27,6 @@ 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"
@@ -44,3 +40,4 @@ StrCpy $INIT_INSTALLER_RUNNING "Namestilnik je
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Program za odstranjevanje namestitve zahteva skrbniška dovoljenja."
 StrCpy $INIT_UNINSTALLER_RUNNING "Program za odstranjevanje namestitve je že zagnan."
 StrCpy $SectionGroup_Shortcuts "Bližnjice"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
--- a/admin/win/nsi/l10n/Spanish.nsh
+++ b/admin/win/nsi/l10n/Spanish.nsh
@@ -27,10 +27,6 @@ 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_APPDATA_SUBTITLE "Elimine 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 "Déjelo sin marcar para mantener la carpeta de datos para uso posterior o márquelo para eliminar la carpeta de datos."
-StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Sí, elimine esta carpeta de datos."
 StrCpy $UNINSTALLER_FILE_Detail "Escribiendo desinstalador"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Escribiendo claves en el registro del instalador"
 StrCpy $UNINSTALLER_FINISHED_Detail "Terminado"
@@ -42,5 +38,6 @@ 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 $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 $INIT_UNINSTALLER_RUNNING "El desinstalador ya se encuentra en ejecución."
 StrCpy $SectionGroup_Shortcuts "Accesos directos"
--- a/admin/win/nsi/l10n/SpanishInternational.nsh
+++ b/admin/win/nsi/l10n/SpanishInternational.nsh
@@ -19,10 +19,6 @@ 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_START_MENU_Desc "Acceso directo de ${APPLICATION_NAME}"
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Acceso Directo al Escritorio 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"
@@ -44,3 +40,4 @@ StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Quick Launch shortcut for ${APPLICA
 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:"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
--- a/admin/win/nsi/l10n/Swedish.nsh
+++ b/admin/win/nsi/l10n/Swedish.nsh
@@ -25,10 +25,6 @@ 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"
@@ -44,3 +40,4 @@ StrCpy $INIT_UNINSTALLER_RUNNING "Avinstallationsprogrammet körs redan."
 StrCpy $SectionGroup_Shortcuts "Genvägar"
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integration for Windows Explorer"
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing Integration for Windows Explorer"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
--- a/admin/win/nsi/l10n/Thai.nsh
+++ b/admin/win/nsi/l10n/Thai.nsh
@@ -0,0 +1,43 @@
+# 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} ได้ถูกติดตั้งแล้ว เลือกการดำเนินการที่คุณต้องการที่จะดำเนินการและคลิกถัดไปเพื่อดำเนินการต่อ"
+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 "ทางลัด"
--- a/admin/win/nsi/l10n/Turkish.nsh
+++ b/admin/win/nsi/l10n/Turkish.nsh
@@ -27,10 +27,6 @@ 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ý"
@@ -44,3 +40,4 @@ StrCpy $INIT_INSTALLER_RUNNING "Y
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Bu kaldýrýcý yönetici eriþimi gerektiriyor, yeniden deneyin"
 StrCpy $INIT_UNINSTALLER_RUNNING "Kaldýrýcý zaten çalýþýyor."
 StrCpy $SectionGroup_Shortcuts "Kýsayollar"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
--- a/admin/win/nsi/l10n/Ukrainian.nsh
+++ b/admin/win/nsi/l10n/Ukrainian.nsh
@@ -27,10 +27,6 @@ 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 "Залиште неактивним, для збереження теки з даними програми, для подальшого використання."
-StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Так, видалити теку даних."
 StrCpy $UNINSTALLER_FILE_Detail "Збереження Програми видалення"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Запис ключів реєстру"
 StrCpy $UNINSTALLER_FINISHED_Detail "Завершено"
@@ -44,3 +40,4 @@ StrCpy $INIT_INSTALLER_RUNNING "Установка вже запущена."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Для видалення потрібні права адміністратора, спробуйте ще раз"
 StrCpy $INIT_UNINSTALLER_RUNNING "Програма видалення вже запущено."
 StrCpy $SectionGroup_Shortcuts "Ярлики"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
--- a/admin/win/nsi/l10n/bin/build_locale_nsi.py
+++ b/admin/win/nsi/l10n/bin/build_locale_nsi.py
@@ -67,7 +67,7 @@ localeToName = {
    "mg" : "Malagasy",
    "ms" : "Malay",
    "mn" : "Mongolian",
-    "nb" : "Norwegian",
+    "nb_NO" : "Norwegian",
    "nn" : "NorwegianNynorsk",
    "ps" : "Pashto",
    "pl" : "Polish",
--- a/admin/win/nsi/l10n/bin/l10n.sh
+++ b/admin/win/nsi/l10n/bin/l10n.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 L10NDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
 SCRIPTDIR="$L10NDIR/bin"
 PODIR="$L10NDIR/pofiles"
@@ -44,5 +44,8 @@ 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

--- a/admin/win/nsi/l10n/declarations.nsh
+++ b/admin/win/nsi/l10n/declarations.nsh
@@ -27,10 +27,6 @@ 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
@@ -42,5 +38,6 @@ 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
--- a/admin/win/nsi/l10n/languages.nsh
+++ b/admin/win/nsi/l10n/languages.nsh
@@ -8,13 +8,15 @@
 !insertmacro MUI_LANGUAGE "Hungarian"
 !insertmacro MUI_LANGUAGE "Ukrainian"
 !insertmacro MUI_LANGUAGE "French"
-!insertmacro MUI_LANGUAGE "Catalan"
+!insertmacro MUI_LANGUAGE "Norwegian"
 !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 "Catalan"
 !insertmacro MUI_LANGUAGE "Italian"
 !insertmacro MUI_LANGUAGE "Portuguese"
 !insertmacro MUI_LANGUAGE "German"
--- a/admin/win/nsi/l10n/pofiles/messages.pot
+++ b/admin/win/nsi/l10n/pofiles/messages.pot
@@ -133,24 +133,6 @@ 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"
@@ -198,6 +180,10 @@ 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."
--- a/admin/win/nsi/nsis_processes/bin/Processes.dll
+++ b/admin/win/nsi/nsis_processes/bin/Processes.dll
--- a/admin/win/nsi/nsis_processes/license.rtf
+++ b/admin/win/nsi/nsis_processes/license.rtf
@@ -1,35 +0,0 @@
-{\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 }}
--- a/admin/win/nsi/nsis_processes/readme.txt
+++ b/admin/win/nsi/nsis_processes/readme.txt
@@ -1,122 +0,0 @@
----------------------------------------------------------------
----------------------------------------------------------------
-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.
-
----------------------------------------------------------------
----------------------------------------------------------------
--- a/admin/win/nsi/nsis_processes/src/StdAfx.cpp
+++ b/admin/win/nsi/nsis_processes/src/StdAfx.cpp
@@ -1,8 +0,0 @@
-// 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
--- a/admin/win/nsi/nsis_processes/src/StdAfx.h
+++ b/admin/win/nsi/nsis_processes/src/StdAfx.h
@@ -1,34 +0,0 @@
-// 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_)
--- a/admin/win/nsi/nsis_processes/src/exdll.c
+++ b/admin/win/nsi/nsis_processes/src/exdll.c
@@ -1,37 +0,0 @@
-#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;
-}
--- a/admin/win/nsi/nsis_processes/src/exdll.h
+++ b/admin/win/nsi/nsis_processes/src/exdll.h
@@ -1,136 +0,0 @@
-#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_
--- a/admin/win/nsi/nsis_processes/src/processes.cpp
+++ b/admin/win/nsi/nsis_processes/src/processes.cpp
@@ -1,411 +0,0 @@
-#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 );
-	}
-}
--- a/admin/win/nsi/nsis_processes/src/processes.h
+++ b/admin/win/nsi/nsis_processes/src/processes.h
@@ -1,49 +0,0 @@
-#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 );
--- a/admin/win/nsi/nsis_processes/src/processes.ncb
+++ b/admin/win/nsi/nsis_processes/src/processes.ncb
--- a/admin/win/nsi/nsis_processes/src/processes.rc
+++ b/admin/win/nsi/nsis_processes/src/processes.rc
@@ -1,103 +0,0 @@
-// 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
-
--- a/admin/win/nsi/nsis_processes/src/processes.sln
+++ b/admin/win/nsi/nsis_processes/src/processes.sln
@@ -1,21 +0,0 @@
-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
--- a/admin/win/nsi/nsis_processes/src/processes.txt
+++ b/admin/win/nsi/nsis_processes/src/processes.txt
@@ -1,122 +0,0 @@
----------------------------------------------------------------
----------------------------------------------------------------
-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.
-
----------------------------------------------------------------
----------------------------------------------------------------
--- a/admin/win/nsi/nsis_processes/src/processes.vcproj
+++ b/admin/win/nsi/nsis_processes/src/processes.vcproj
@@ -1,222 +0,0 @@
-<?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>
--- a/admin/win/nsi/nsis_processes/src/resource.h
+++ b/admin/win/nsi/nsis_processes/src/resource.h
@@ -1,15 +0,0 @@
-//{{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
--- a/admin/win/nsi/nsis_uac/History.txt
+++ b/admin/win/nsi/nsis_uac/History.txt
@@ -1,102 +0,0 @@
-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
--- a/admin/win/nsi/nsis_uac/License.txt
+++ b/admin/win/nsi/nsis_uac/License.txt
@@ -1,14 +0,0 @@
-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.
--- a/admin/win/nsi/nsis_uac/NSISUtil.h
+++ b/admin/win/nsi/nsis_uac/NSISUtil.h
@@ -1,149 +0,0 @@
-/*
-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() }
-
--- a/admin/win/nsi/nsis_uac/Release/A/UAC.dll
+++ b/admin/win/nsi/nsis_uac/Release/A/UAC.dll
--- a/admin/win/nsi/nsis_uac/Release/U/UAC.dll
+++ b/admin/win/nsi/nsis_uac/Release/U/UAC.dll
--- a/admin/win/nsi/nsis_uac/RunAs.cpp
+++ b/admin/win/nsi/nsis_uac/RunAs.cpp
@@ -1,277 +0,0 @@
-//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 */
-
--- a/admin/win/nsi/nsis_uac/UAC
+++ b/admin/win/nsi/nsis_uac/UAC
@@ -1,222 +0,0 @@
-<!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>
--- a/admin/win/nsi/nsis_uac/UAC.nsh
+++ b/admin/win/nsi/nsis_uac/UAC.nsh
@@ -1,191 +0,0 @@
-/*
-=======================
-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 */
--- a/admin/win/nsi/nsis_uac/UAC_AdminOnly.nsi
+++ b/admin/win/nsi/nsis_uac/UAC_AdminOnly.nsi
@@ -1,62 +0,0 @@
-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*/
--- a/admin/win/nsi/nsis_uac/UAC_AllowLUA.nsi
+++ b/admin/win/nsi/nsis_uac/UAC_AllowLUA.nsi
@@ -1,45 +0,0 @@
-/*
-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
--- a/admin/win/nsi/nsis_uac/UAC_GetUserShellFolderPath.nsi
+++ b/admin/win/nsi/nsis_uac/UAC_GetUserShellFolderPath.nsi
@@ -1,30 +0,0 @@
-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
--- a/admin/win/nsi/nsis_uac/UAC_RealWorldFullyLoadedDualModeExample.nsi
+++ b/admin/win/nsi/nsis_uac/UAC_RealWorldFullyLoadedDualModeExample.nsi
@@ -1,235 +0,0 @@
-/*
-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
--- a/admin/win/nsi/nsis_uac/UAC_Uninstaller.nsi
+++ b/admin/win/nsi/nsis_uac/UAC_Uninstaller.nsi
@@ -1,49 +0,0 @@
-/*
-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
--- a/admin/win/nsi/nsis_uac/resource.h
+++ b/admin/win/nsi/nsis_uac/resource.h
@@ -1,24 +0,0 @@
-//{{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
--- a/admin/win/nsi/nsis_uac/resource.rc
+++ b/admin/win/nsi/nsis_uac/resource.rc
@@ -1,109 +0,0 @@
-//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
-
--- a/admin/win/nsi/nsis_uac/uac.cpp
+++ b/admin/win/nsi/nsis_uac/uac.cpp
--- a/admin/win/nsi/nsis_uac/uac.h
+++ b/admin/win/nsi/nsis_uac/uac.h
@@ -1,169 +0,0 @@
-//Copyright (C) 2007 Anders Kjersem. Licensed under the zlib/libpng license, see License.txt for details.
-#pragma once
-/** /#define BUILD_DBGRELEASE // Include simple debug output in release version */
-/** /#define BUILD_DBGSELECTELVMODE //Test MyRunAs*/
-
-/** /#define UNICODE // Unicode build */
-/**/#define FEAT_CUSTOMRUNASDLG // Include custom runas dialog */
-/**/#define FEAT_CUSTOMRUNASDLG_TRANSLATE //*/
-/**/#define FEAT_MSRUNASDLGMODHACK // Default to other user radio button */
-
-
-#if !defined(APSTUDIO_INVOKED) && !defined(RC_INVOKED)
-
-#if (defined(_MSC_VER) && !defined(_DEBUG))
-	#pragma comment(linker,"/opt:nowin98")
-	#pragma comment(linker,"/ignore:4078")
-	#pragma comment(linker,"/merge:.rdata=.text")
-	
-	//#pragma intrinsic(memset) //http://www.codeguru.com/forum/showthread.php?t=371491&page=2&pp=15 | http://www.ddj.com/windows/184416623
-#endif
-
-#if defined(UNICODE) && !defined(_UNICODE)
-#define _UNICODE
-#endif
-#ifdef _UNICODE
-#define TFUNCSUFFIX W
-#else
-#define TFUNCSUFFIX A
-#endif
-#define _PCJOIN(a,b) a##b
-#define PCJOIN(a,b) _PCJOIN(a,b)
-
-
-#define _WIN32_WINNT 0x0501
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ShellAPI.h>
-#include <TChar.h>
-#include "NSISUtil.h"
-
-#ifndef SEE_MASK_NOZONECHECKS
-#define SEE_MASK_NOZONECHECKS 0x00800000
-#endif
-
-#define COUNTOF(___c) ( sizeof(___c)/sizeof(___c[0]) )
-#ifndef ARRAYSIZE
-#define ARRAYSIZE COUNTOF
-#endif
-#define FORCEINLINE __forceinline
-
-#if _MSC_VER >= 1400
-extern void* __cdecl memset(void*mem,int c,size_t len);
-#endif
-
-FORCEINLINE LRESULT MySndDlgItemMsg(HWND hDlg,int id,UINT Msg,WPARAM wp=0,LPARAM lp=0) {return SendMessage(GetDlgItem(hDlg,id),Msg,wp,lp);}
-#ifndef UAC_NOCUSTOMIMPLEMENTATIONS
-FORCEINLINE HANDLE WINAPI GetCurrentProcess(){return ((HANDLE)(-1));}
-FORCEINLINE HANDLE WINAPI GetCurrentThread(){return ((HANDLE)(-2));}
-
-#define MyTStrLen lstrlen
-
-#undef lstrcpy
-#define lstrcpy MyTStrCpy
-FORCEINLINE LPTSTR MyTStrCpy(LPTSTR s1,LPCTSTR s2) {return PCJOIN(lstr,PCJOIN(cpyn,TFUNCSUFFIX))(s1,s2,0x7FFFFFFF);}
-
-#undef lstrcat
-#define lstrcat MyTStrCat
-LPTSTR MyTStrCat(LPTSTR s1,LPCTSTR s2) 
-#ifdef UAC_INITIMPORTS
-{return s1?MyTStrCpy(&s1[MyTStrLen(s1)],s2):NULL;}
-#else
-;
-#endif //UAC_INITIMPORTS
-
-#endif //UAC_NOCUSTOMIMPLEMENTATIONS
-
-
-//DelayLoaded functions:
-typedef BOOL	(WINAPI*ALLOWSETFOREGROUNDWINDOW)(DWORD dwProcessId);
-typedef BOOL	(WINAPI*OPENPROCESSTOKEN)(HANDLE ProcessHandle,DWORD DesiredAccess,PHANDLE TokenHandle);
-typedef BOOL	(WINAPI*OPENTHREADTOKEN)(HANDLE ThreadHandle,DWORD DesiredAccess,BOOL OpenAsSelf,PHANDLE TokenHandle);
-typedef BOOL	(WINAPI*GETTOKENINFORMATION)(HANDLE hToken,TOKEN_INFORMATION_CLASS TokInfoClass,LPVOID TokInfo,DWORD TokInfoLenh,PDWORD RetLen);
-typedef BOOL	(WINAPI*ALLOCATEANDINITIALIZESID)(PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority,BYTE nSubAuthorityCount,DWORD sa0,DWORD sa1,DWORD sa2,DWORD sa3,DWORD sa4,DWORD sa5,DWORD sa6,DWORD sa7,PSID*pSid);
-typedef PVOID	(WINAPI*FREESID)(PSID pSid);
-typedef BOOL	(WINAPI*EQUALSID)(PSID pSid1,PSID pSid2);
-typedef BOOL	(WINAPI*CHECKTOKENMEMBERSHIP)(HANDLE TokenHandle,PSID SidToCheck,PBOOL IsMember);
-#ifdef FEAT_CUSTOMRUNASDLG
-typedef BOOL	(WINAPI*GETUSERNAME)(LPTSTR lpBuffer,LPDWORD nSize);
-typedef BOOL	(WINAPI*CREATEPROCESSWITHLOGONW)(LPCWSTR lpUsername,LPCWSTR lpDomain,LPCWSTR lpPassword,DWORD dwLogonFlags,LPCWSTR lpApplicationName,LPWSTR lpCommandLine,DWORD dwCreationFlags,LPVOID pEnv,LPCWSTR WorkDir,LPSTARTUPINFOW pSI,LPPROCESS_INFORMATION pPI);
-#define SECURITY_WIN32
-#include <Security.h>//NameSamCompatible
-typedef BOOLEAN	(WINAPI*GETUSERNAMEEX)(EXTENDED_NAME_FORMAT NameFormat,LPTSTR lpNameBuffer,PULONG nSize);
-#endif
-#ifdef UAC_INITIMPORTS
-ALLOWSETFOREGROUNDWINDOW _AllowSetForegroundWindow=0;
-OPENPROCESSTOKEN		_OpenProcessToken=0;
-OPENTHREADTOKEN			_OpenThreadToken=0;
-GETTOKENINFORMATION		_GetTokenInformation=0;
-ALLOCATEANDINITIALIZESID _AllocateAndInitializeSid=0;
-FREESID					_FreeSid=0;
-EQUALSID				_EqualSid=0;
-CHECKTOKENMEMBERSHIP	_CheckTokenMembership=0;
-#ifdef FEAT_CUSTOMRUNASDLG
-GETUSERNAME				_GetUserName=0;
-GETUSERNAMEEX			_GetUserNameEx=0;
-CREATEPROCESSWITHLOGONW	_CreateProcessWithLogonW=0;
-#endif
-#else
-#ifdef FEAT_CUSTOMRUNASDLG
-extern GETUSERNAME _GetUserName;
-extern GETUSERNAMEEX _GetUserNameEx;
-extern CREATEPROCESSWITHLOGONW _CreateProcessWithLogonW;
-#endif
-#endif /* UAC_INITIMPORTS */ 
-
-
-extern DWORD DelayLoadDlls();
-#ifdef FEAT_CUSTOMRUNASDLG
-extern DWORD MyRunAs(HINSTANCE hInstDll,SHELLEXECUTEINFO&sei);
-#endif
-
-#if !defined(NTDDI_VISTA) || defined(BUILD_OLDSDK)
-//#if !defined(NTDDI_VERSION) || (NTDDI_VERSION < 0x06000000) || !defined(NTDDI_VISTA) 
-//#if !defined(TOKEN_ELEVATION_TYPE) || defined(BUILD_OLDSDK)
-enum TOKEN_ELEVATION_TYPE { 
-	TokenElevationTypeDefault = 1, 
-	TokenElevationTypeFull, 
-	TokenElevationTypeLimited 
-};
-enum _TOKEN_INFORMATION_CLASS___VISTA {
-	TokenElevationType = (TokenOrigin+1),
-	TokenLinkedToken,
-	TokenElevation,
-	TokenHasRestrictions,
-	TokenAccessInformation,
-	TokenVirtualizationAllowed,
-	TokenVirtualizationEnabled,
-	TokenIntegrityLevel,
-	TokenUIAccess,
-	TokenMandatoryPolicy,
-	TokenLogonSid,
-};
-#endif
-
-
-#if defined(_DEBUG) || defined(BUILD_DBGRELEASE)
-//Simple debug helpers:
-#define  BUILD_DBG
-/** /#define BUILD_XPTEST //Pretend UAC exists and "elevate" with NT runas */ 
-#define DBG_RESETDBGVIEW() do{HWND hDbgView=FindWindowA("dbgviewClass",0);PostMessage(hDbgView,WM_COMMAND,40020,0);if(0)SetForegroundWindow(hDbgView);}while(0)
-#define _pp_MakeStr_(x)	#x
-#define pp_MakeStr(x)	_pp_MakeStr_(x)
-#define TRACE OutputDebugStringA
-#define DBGONLY(_x) _x
-#ifndef ASSERT
-#define ASSERT(_x) do{if(!(_x)){MessageBoxA(GetActiveWindow(),#_x##"\n\n"##__FILE__##":"## pp_MakeStr(__LINE__),"SimpleAssert",0);/*TRACE(#_x##"\n"##__FILE__##":" pp_MakeStr(__LINE__)"\n");*/}}while(0)
-#endif
-#define VERIFY(_x) ASSERT(_x)
-static void TRACEF(const char*fmt,...) {va_list a;va_start(a,fmt);static TCHAR b[1024*4];if (sizeof(TCHAR)!=sizeof(char)){static TCHAR fmtBuf[COUNTOF(b)];VERIFY(wsprintf(fmtBuf,_T("%hs"),fmt)<COUNTOF(fmtBuf));fmt=(LPCSTR)fmtBuf;}wvsprintf(b,(TCHAR*)fmt,a);OutputDebugString(b);}
-#else
-#define TRACE /*(void)0*/
-#define DBGONLY(_x)
-#define ASSERT(_x)
-#define VERIFY(_x) ((void)(_x))
-#define TRACEF TRACE
-#endif /* DEBUG */
-
-#endif /* APSTUDIO_INVOKED */
-
--- a/2
+++ b/2
--- a/binary.rej
+++ b/binary.rej
@@ -0,0 +1,5 @@
+--- binary
+++ binary
+@@ -1 +1 @@
+-Subproject commit 1fb9ddfa9a9a1b4dbc447eee10dbed89172d968a
+Subproject commit 01d73965dc8b862d1b2310d3ef801c297b697ec7
--- a/client.qrc
+++ b/client.qrc
@@ -10,8 +10,11 @@
        <file>resources/warning.png</file>
        <file>resources/warning@2x.png</file>
        <file>resources/settings.png</file>
+        <file>resources/settings@2x.png</file>
        <file>resources/activity.png</file>
+        <file>resources/activity@2x.png</file>
        <file>resources/network.png</file>
+        <file>resources/network@2x.png</file>
        <file>resources/lock-http.png</file>
        <file>resources/lock-http@2x.png</file>
        <file>resources/lock-https.png</file>
--- a/cmake/modules/AddCMockaTest.cmake
+++ b/cmake/modules/AddCMockaTest.cmake
@@ -20,4 +20,15 @@ function (ADD_CMOCKA_TEST _testName _testSource)
    add_executable(${_testName} ${_testSource})
    target_link_libraries(${_testName} ${ARGN})
    add_test(${_testName} ${CMAKE_CURRENT_BINARY_DIR}/${_testName})
+
+  if(UNIT_TESTING)
+  INSTALL(
+  TARGETS
+    ${_testName}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  )
+  endif(UNIT_TESTING)
+
 endfunction (ADD_CMOCKA_TEST)
--- a/cmake/modules/FindINotify.cmake
+++ b/cmake/modules/FindINotify.cmake
@@ -4,20 +4,27 @@

 # This module defines
 #  INOTIFY_INCLUDE_DIR, where to find inotify.h, etc.
+#  INOTIFY_LIBRARY_DIR, the directory holding the inotify library.
 #  INOTIFY_FOUND, If false, do not try to use inotify.
 # also defined, but not for general use are
 #  INOTIFY_LIBRARY, where to find the inotify library.

 find_path(INOTIFY_INCLUDE_DIR sys/inotify.h 
-          HINTS /usr/include/${CMAKE_LIBRARY_ARCHITECTURE})
+          PATH_SUFFIXES inotify)
 mark_as_advanced(INOTIFY_INCLUDE_DIR)

+find_library(INOTIFY_LIBRARY inotify PATH_SUFFIXES lib/inotify)
+
+get_filename_component(INOTIFY_LIBRARY_DIR ${INOTIFY_LIBRARY} PATH)
+mark_as_advanced(INOTIFY_LIBRARY_DIR)
+
 # all listed variables are TRUE
 # handle the QUIETLY and REQUIRED arguments and set INOTIFY_FOUND to TRUE if
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(INOTIFY DEFAULT_MSG INOTIFY_INCLUDE_DIR)
+find_package_handle_standard_args(INOTIFY DEFAULT_MSG INOTIFY_INCLUDE_DIR INOTIFY_LIBRARY_DIR)

 IF(INOTIFY_FOUND)
  SET(INotify_INCLUDE_DIRS ${INOTIFY_INCLUDE_DIR})
+  SET(INotify_LIBRARY_DIRS ${INOTIFY_LIBRARY_DIR})
 ENDIF(INOTIFY_FOUND)

--- a/cmake/modules/MacOSXBundleInfo.plist.in
+++ b/cmake/modules/MacOSXBundleInfo.plist.in
@@ -27,7 +27,7 @@
        <key>CFBundleShortVersionString</key>
        <string>@MIRALL_VERSION_STRING@</string>
        <key>NSHumanReadableCopyright</key>
-        <string>(C) 2014 @APPLICATION_VENDOR@</string>
+        <string>(C) 2014-2015 @APPLICATION_VENDOR@</string>
        <key>SUShowReleaseNotes</key>
        <false/>
        <key>LSMinimumBundleVersion</key>
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -89,7 +89,6 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 ; Include some required header files.
 ;-----------------------------------------------------------------------------
 !include LogicLib.nsh ;Used by APPDATA uninstaller.
-!include nsDialogs.nsh ;Used by APPDATA uninstaller.
 !include MUI2.nsh ;Used by APPDATA uninstaller.
 !include InstallOptions.nsh ;Required by MUI2 to support old MUI_INSTALLOPTIONS.
 !include Memento.nsh ;Remember user selections.
@@ -97,6 +96,7 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 !include WordFunc.nsh  ;Used by VersionCompare macro function.
 !include FileFunc.nsh  ;Used to read out parameters
 !include UAC.nsh ;Used by the UAC elevation to install as user or admin.
+!include nsProcess.nsh ;Used to kill the running process
 !include Library.nsh ;Used by the COM registration for shell extensions
 !include x64.nsh ;Used to determine the right arch for the shell extensions

@@ -145,7 +145,6 @@ Page custom PageReinstall PageLeaveReinstall
   !insertmacro MUI_PAGE_FINISH
 !endif
 !insertmacro MUI_UNPAGE_CONFIRM
-UninstPage custom un.UnPageUserAppData un.UnPageUserAppDataLeave
 !insertmacro MUI_UNPAGE_INSTFILES

 ;-----------------------------------------------------------------------------
@@ -175,10 +174,11 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}"
      StrCmp $LANGUAGE ${LANG_ITALIAN} Italian 0
      StrCmp $LANGUAGE ${LANG_ESTONIAN} Estonian 0
      StrCmp $LANGUAGE ${LANG_GREEK} Greek 0
-      StrCmp $LANGUAGE ${LANG_GREEK} Basque 0
-      StrCmp $LANGUAGE ${LANG_GREEK} Galician 0
-      StrCmp $LANGUAGE ${LANG_GREEK} Slovak 0
-      StrCmp $LANGUAGE ${LANG_GREEK} Turkish 0
+      StrCmp $LANGUAGE ${LANG_BASQUE} Basque 0
+      StrCmp $LANGUAGE ${LANG_GALICIAN} Galician 0
+      StrCmp $LANGUAGE ${LANG_POLISH} Polish 0
+      StrCmp $LANGUAGE ${LANG_TURKISH} Turkish 0
+      StrCmp $LANGUAGE ${LANG_NORWEGIAN} Norwegian 0
      StrCmp $LANGUAGE ${LANG_PORTUGUESEBR} Brazilian EndLanguageCmp
      German:
      !include "${source_path}/admin/win/nsi/l10n\German.nsh"
@@ -213,14 +213,17 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}"
      Galician:
      !include "${source_path}/admin/win/nsi/l10n\Galician.nsh"
      Goto EndLanguageCmp
-      Slovak:
-      !include "${source_path}/admin/win/nsi/l10n\Slovak.nsh"
+      Polish:
+      !include "${source_path}/admin/win/nsi/l10n\Polish.nsh"
      Goto EndLanguageCmp
      Turkish:
      !include "${source_path}/admin/win/nsi/l10n\Turkish.nsh"
      Goto EndLanguageCmp
      Brazilian:
      !include "${source_path}/admin/win/nsi/l10n\PortugueseBR.nsh"
+      Goto EndLanguageCmp
+      Norwegian:
+      !include "${source_path}/admin/win/nsi/l10n\Norwegian.nsh"
      EndLanguageCmp:

   FunctionEnd
@@ -243,11 +246,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}"
 ##############################################################################

 Function LaunchApplication
-   ${UAC.CallFunctionAsUser} LaunchApplicationAsUser
-FunctionEnd
-
-Function LaunchApplicationAsUser
-   Exec "$INSTDIR\${APPLICATION_EXECUTABLE}"
+   !insertmacro UAC_AsUser_ExecShell "" "$INSTDIR\${APPLICATION_EXECUTABLE}" "" "" ""
 FunctionEnd

 ##############################################################################
@@ -257,8 +256,8 @@ FunctionEnd
 ##############################################################################

 !macro CheckForProcess processName gotoWhenFound gotoWhenNotFound
-   Processes::FindProcess ${processName}
-   StrCmp $R0 "0" ${gotoWhenNotFound} ${gotoWhenFound}
+   ${nsProcess::FindProcess} ${processName} $R0
+   StrCmp $R0 0 ${gotoWhenFound} ${gotoWhenNotFound}
 !macroend

 !macro ConfirmEndProcess processName
@@ -267,7 +266,7 @@ FunctionEnd
     /SD IDYES IDYES process_${processName}_kill IDNO process_${processName}_ended
   process_${processName}_kill:
      DetailPrint $ConfirmEndProcess_KILLING_PROCESSES_TEXT
-      Processes::KillProcess ${processName}
+      ${nsProcess::KillProcess} ${processName} $R0
      Sleep 1500
      StrCmp $R0 "1" process_${processName}_ended
      DetailPrint $ConfirmEndProcess_KILL_NOT_FOUND_TEXT
@@ -362,7 +361,6 @@ Function PageLeaveReinstall
      RMDir $INSTDIR
   no_remove_uninstaller:
      StrCmp $R0 "2" 0 +3
-      UAC::Unload
      Quit
      BringToFront
   reinst_done:
@@ -441,7 +439,6 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
   File "${MING_BIN}\libGLESv2.dll"
   File "${MING_BIN}\libjpeg-8.dll"
   File "${MING_BIN}\libpcre16-0.dll"
-   File "${MING_BIN}\libproxy.dll"
   File "${MING_BIN}\libsqlite3-0.dll"
   File "${MING_BIN}\libcrypto-10.dll"
   File "${MING_BIN}\libssl-10.dll"
@@ -476,6 +473,7 @@ SectionEnd
      CreateDirectory "$INSTDIR\shellext"
      !define LIBRARY_COM
      !define LIBRARY_SHELL_EXTENSION
+      !define LIBRARY_IGNORE_VERSION
      ${If} ${RunningX64}
         !define LIBRARY_X64
         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\x64\OCUtil_x64.dll" "$INSTDIR\shellext\OCUtil_x64.dll" "$INSTDIR\shellext"
@@ -489,6 +487,7 @@ SectionEnd
      ${Endif}
      !undef LIBRARY_COM
      !undef LIBRARY_SHELL_EXTENSION
+      !undef LIBRARY_IGNORE_VERSION
   ${MementoSectionEnd}
 !endif

@@ -589,40 +588,6 @@ SectionEnd
 #                                                                            #
 ##############################################################################

-Var UnPageUserAppDataDialog
-Var UnPageUserAppDataCheckbox
-Var UnPageUserAppDataCheckbox_State
-Var UnPageUserAppDataEditBox
-
-Function un.UnPageUserAppData
-   !insertmacro MUI_HEADER_TEXT $UNINSTALLER_APPDATA_TITLE $UNINSTALLER_APPDATA_SUBTITLE
-   nsDialogs::Create /NOUNLOAD 1018
-   Pop $UnPageUserAppDataDialog
-
-   ${If} $UnPageUserAppDataDialog == error
-      Abort
-   ${EndIf}
-
-   ${NSD_CreateLabel} 0 0 100% 12u $UNINSTALLER_APPDATA_LABEL_1
-   Pop $0
-
-   ${NSD_CreateText} 0 13u 100% 12u "$LOCALAPPDATA\${APPLICATION_NAME}"
-   Pop $UnPageUserAppDataEditBox
-   SendMessage $UnPageUserAppDataEditBox ${EM_SETREADONLY} 1 0
-
-   ${NSD_CreateLabel} 0 46u 100% 24u $UNINSTALLER_APPDATA_LABEL_2
-   Pop $0
-
-   ${NSD_CreateCheckbox} 0 71u 100% 8u $UNINSTALLER_APPDATA_CHECKBOX
-   Pop $UnPageUserAppDataCheckbox
-
-   nsDialogs::Show
-FunctionEnd
-
-Function un.UnPageUserAppDataLeave
-   ${NSD_GetState} $UnPageUserAppDataCheckbox $UnPageUserAppDataCheckbox_State
-FunctionEnd
-
 Function un.EnsureOwncloudShutdown
   !insertmacro CheckAndConfirmEndProcess "${APPLICATION_EXECUTABLE}"
 FunctionEnd
@@ -647,6 +612,7 @@ Section Uninstall
   !ifdef OPTION_SECTION_SC_SHELL_EXT
      !define LIBRARY_COM
      !define LIBRARY_SHELL_EXTENSION
+      !define LIBRARY_IGNORE_VERSION
      ${If} ${HasSection} SEC_SHELL_EXT
        DetailPrint "Uninstalling x64 overlay DLLs"
        !define LIBRARY_X64
@@ -662,6 +628,7 @@ Section Uninstall
      ${EndIf}
      !undef LIBRARY_COM
      !undef LIBRARY_SHELL_EXTENSION
+      !undef LIBRARY_IGNORE_VERSION
  !endif

   ;Start menu shortcut
@@ -698,11 +665,6 @@ Section Uninstall
   ;Remove all the Program Files.
   RMDir /r $INSTDIR

-   ;Uninstall User Data if option is checked, otherwise skip.
-   ${If} $UnPageUserAppDataCheckbox_State == ${BST_CHECKED}
-      RMDir /r "$LOCALAPPDATA\${APPLICATION_NAME}"
-   ${EndIf}
-
   DeleteRegKey ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}"

   SetDetailsPrint textonly
@@ -757,28 +719,30 @@ Function .onInit

   ${MementoSectionRestore}

-   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 "$UAC_ERROR_ELEVATE $0"
-      Abort
-
-   UAC_ElevationAborted:
-      Abort
-
-   UAC_Success:
-      StrCmp 1 $3 +4 ;Admin?
-      StrCmp 3 $1 0 UAC_ElevationAborted ;Try again?
-      MessageBox MB_ICONSTOP $UAC_INSTALLER_REQUIRE_ADMIN
-      goto UAC_Elevate
+   UAC_TryAgain:
+      !insertmacro UAC_RunElevated
+      ${Switch} $0
+      ${Case} 0
+          ${IfThen} $1 = 1 ${|} Quit ${|} ;we are the outer process, the inner process has done its work, we are done
+          ${IfThen} $3 <> 0 ${|} ${Break} ${|} ;we are admin, let the show go on
+          ${If} $1 = 3 ;RunAs completed successfully, but with a non-admin user
+             MessageBox mb_YesNo|mb_ICONEXCLAMATION|MB_TOPMOST|MB_SETFOREGROUND $UAC_INSTALLER_REQUIRE_ADMIN /SD IDNO IDYES UAC_TryAgain IDNO 0
+          ${EndIf}
+          ;fall-through and die
+      ${Case} 1223
+         MessageBox MB_ICONSTOP|MB_TOPMOST|MB_SETFOREGROUND $UAC_INSTALLER_REQUIRE_ADMIN
+         Quit
+      ${Case} 1062
+         MessageBox MB_ICONSTOP|MB_TOPMOST|MB_SETFOREGROUND $UAC_ERROR_LOGON_SERVICE
+         Quit
+      ${Default}
+         MessageBox MB_ICONSTOP "$UAC_ERROR_ELEVATE $0"
+         Abort
+         Quit
+      ${EndSwitch}

   ;Prevent multiple instances.
-   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "owncloudInstaller") i .r1 ?e'
+   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${APPLICATION_SHORTNAME}Installer") i .r1 ?e'
   Pop $R0
   StrCmp $R0 0 +3
      MessageBox MB_OK|MB_ICONEXCLAMATION $INIT_INSTALLER_RUNNING
@@ -806,11 +770,9 @@ Function .onInstSuccess
   ${AndIf} $InstallRunIfSilent == "yes"
     Call LaunchApplication
   ${EndIf}
-   UAC::Unload ;Must call unload!
 FunctionEnd

 Function .onInstFailed
-   UAC::Unload ;Must call unload!
 FunctionEnd

 ##############################################################################
@@ -822,28 +784,30 @@ FunctionEnd
 Function un.onInit
   Call un.SetLang

-   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 "$UAC_ERROR_ELEVATE $0"
-      Abort
-
-   UAC_ElevationAborted:
-      Abort
-
-   UAC_Success:
-      StrCmp 1 $3 +4 ;Admin?
-      StrCmp 3 $1 0 UAC_ElevationAborted ;Try again?
-      MessageBox MB_ICONSTOP $UAC_UNINSTALLER_REQUIRE_ADMIN
-      goto UAC_Elevate
+   UAC_TryAgain:
+      !insertmacro UAC_RunElevated
+      ${Switch} $0
+      ${Case} 0
+          ${IfThen} $1 = 1 ${|} Quit ${|} ;we are the outer process, the inner process has done its work, we are done
+          ${IfThen} $3 <> 0 ${|} ${Break} ${|} ;we are admin, let the show go on
+          ${If} $1 = 3 ;RunAs completed successfully, but with a non-admin user
+             MessageBox mb_YesNo|mb_ICONEXCLAMATION|MB_TOPMOST|MB_SETFOREGROUND $UAC_UNINSTALLER_REQUIRE_ADMIN /SD IDNO IDYES UAC_TryAgain IDNO 0
+          ${EndIf}
+          ;fall-through and die
+      ${Case} 1223
+         MessageBox MB_ICONSTOP|MB_TOPMOST|MB_SETFOREGROUND $UAC_UNINSTALLER_REQUIRE_ADMIN
+         Quit
+      ${Case} 1062
+         MessageBox MB_ICONSTOP|MB_TOPMOST|MB_SETFOREGROUND $UAC_ERROR_LOGON_SERVICE
+         Quit
+      ${Default}
+         MessageBox MB_ICONSTOP "$UAC_ERROR_ELEVATE $0"
+         Abort
+         Quit
+      ${EndSwitch}

   ;Prevent multiple instances.
-   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "owncloudUninstaller") i .r1 ?e'
+   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${APPLICATION_SHORTNAME}Uninstaller") i .r1 ?e'
   Pop $R0
   StrCmp $R0 0 +3
      MessageBox MB_OK|MB_ICONEXCLAMATION $INIT_UNINSTALLER_RUNNING
@@ -854,9 +818,7 @@ Function un.onInit
 FunctionEnd

 Function un.onUnInstSuccess
-   UAC::Unload ;Must call unload!
 FunctionEnd

 Function un.onUnInstFailed
-   UAC::Unload ;Must call unload!
 FunctionEnd
--- a/cmake/modules/QtVersionAbstraction.cmake
+++ b/cmake/modules/QtVersionAbstraction.cmake
@@ -17,6 +17,7 @@ if( Qt5Core_FOUND )
    message(STATUS "Found Qt5 core, checking for further dependencies...")
    find_package(Qt5Network REQUIRED)
    find_package(Qt5Xml REQUIRED)
+    find_package(Qt5Concurrent REQUIRED)
    if(NOT TOKEN_AUTH_ONLY)
        find_package(Qt5WebKitWidgets REQUIRED)
        find_package(Qt5WebKit REQUIRED)
--- a/config.h.in
+++ b/config.h.in
@@ -5,9 +5,8 @@
 #cmakedefine WITH_QTKEYCHAIN 1
 #cmakedefine WITH_CRASHREPORTER
 #cmakedefine CRASHREPORTER_EXECUTABLE "@CRASHREPORTER_EXECUTABLE@"
+#define SOCKETAPI_TEAM_IDENTIFIER_PREFIX "@SOCKETAPI_TEAM_IDENTIFIER_PREFIX@"

-
-#cmakedefine GIT_SHA1 "@GIT_SHA1@"
 #cmakedefine APPLICATION_DOMAIN @APPLICATION_DOMAIN@
 #cmakedefine THEME_CLASS @THEME_CLASS@
 #cmakedefine THEME_INCLUDE @THEME_INCLUDE@
@@ -19,8 +18,10 @@
 #cmakedefine APPLICATION_EXECUTABLE "@APPLICATION_EXECUTABLE@"
 #cmakedefine APPLICATION_UPDATE_URL "@APPLICATION_UPDATE_URL@"

+#cmakedefine ZLIB_FOUND @ZLIB_FOUND@
+
 #cmakedefine SYSCONFDIR "@SYSCONFDIR@"
-#cmakedefine DATADIR "@DATADIR@"
+#cmakedefine SHAREDIR "@SHAREDIR@"

 #ifndef NEON_WITH_LFS
 #cmakedefine NEON_WITH_LFS "@NEON_WITH_LFS@"
--- a/csync/CMakeLists.txt
+++ b/csync/CMakeLists.txt
@@ -3,13 +3,7 @@
 # global needed variables
 set(APPLICATION_NAME "ocsync")

-set(APPLICATION_VERSION_MAJOR "0")
-set(APPLICATION_VERSION_MINOR "91")
-set(APPLICATION_VERSION_PATCH "5")
-
-set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}")
-
-set(LIBRARY_VERSION "0.2.1")
+set(LIBRARY_VERSION ${MIRALL_VERSION})
 set(LIBRARY_SOVERSION "0")

 # add definitions
--- a/csync/config_csync.h.cmake
+++ b/csync/config_csync.h.cmake
@@ -1,7 +1,6 @@
 #cmakedefine PACKAGE "${APPLICATION_NAME}"
 #cmakedefine VERSION "${APPLICATION_VERSION}"
 #cmakedefine LOCALEDIR "${LOCALE_INSTALL_DIR}"
-#cmakedefine DATADIR "${DATADIR}"
 #cmakedefine LIBDIR "${LIBDIR}"
 #cmakedefine PLUGINDIR "${PLUGINDIR}"
 #cmakedefine SYSCONFDIR "${SYSCONFDIR}"
--- a/csync/src/CMakeLists.txt
+++ b/csync/src/CMakeLists.txt
@@ -58,9 +58,19 @@ set(csync_SRCS

  vio/csync_vio.c
  vio/csync_vio_file_stat.c
-  vio/csync_vio_local.c
 )

+if (WIN32)
+    list(APPEND csync_SRCS
+        vio/csync_vio_local_win.c
+    )
+else()
+    list(APPEND csync_SRCS
+        vio/csync_vio_local_unix.c
+    )
+endif()
+
+
 if(USE_NEON)
    list(APPEND csync_SRCS
        csync_owncloud.c
--- a/csync/src/csync.c
+++ b/csync/src/csync.c
@@ -124,6 +124,8 @@ int csync_create(CSYNC **csync, const char *local, const char *remote) {

  ctx->abort = false;

+  ctx->ignore_hidden_files = true;
+
  *csync = ctx;
  return 0;
 }
@@ -386,6 +388,20 @@ static int _csync_treewalk_visitor(void *obj, void *data) {
        SAFE_FREE(renamed_path);
    }

+    if (!other_node) {
+        /* Check the source path as well. */
+        int len;
+        uint64_t h = 0;
+        char *renamed_path = csync_rename_adjust_path_source(ctx, cur->path);
+
+        if (!c_streq(renamed_path, cur->path)) {
+            len = strlen( renamed_path );
+            h = c_jhash64((uint8_t *) renamed_path, len, 0);
+            other_node = c_rbtree_find(other_tree, &h);
+        }
+        SAFE_FREE(renamed_path);
+    }
+
    if (obj == NULL || data == NULL) {
      ctx->status_code = CSYNC_STATUS_PARAM_ERROR;
      return -1;
@@ -420,7 +436,8 @@ static int _csync_treewalk_visitor(void *obj, void *data) {
      trav.inode        = cur->inode;

      trav.error_status = cur->error_status;
-      trav.should_update_etag = cur->should_update_etag;
+      trav.should_update_metadata = cur->should_update_metadata;
+      trav.has_ignored_files = cur->has_ignored_files;

      if( other_node ) {
          csync_file_stat_t *other_stat = (csync_file_stat_t*)other_node->data;
@@ -576,7 +593,9 @@ int csync_commit(CSYNC *ctx) {
  _csync_clean_ctx(ctx);

  ctx->remote.read_from_db = 0;
-  ctx->read_from_db_disabled = 0;
+  ctx->read_remote_from_db = true;
+  ctx->db_is_empty = false;
+  ctx->ignore_hidden_files = true; // do NOT sync hidden files by default.


  /* Create new trees */
@@ -773,10 +792,3 @@ int csync_set_module_property(CSYNC* ctx, const char* key, void* value)
 #endif
 }

-
-int csync_set_read_from_db(CSYNC* ctx, int enabled)
-{
-    ctx->read_from_db_disabled = !enabled;
-    return 0;
-}
-
--- a/csync/src/csync.h
+++ b/csync/src/csync.h
@@ -40,8 +40,6 @@
 #include <sys/types.h>
 #include <config_csync.h>

-#include "csync_version.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -51,41 +49,37 @@ struct csync_client_certs_s {
  char *certificatePasswd;
 };  
  
-/**
-  * Instruction enum. In the file traversal structure, it describes
-  * the csync state of a file.
-  */
 enum csync_status_codes_e {
  CSYNC_STATUS_OK         = 0,

  CSYNC_STATUS_ERROR      = 1024, /* don't use this code,
                                     */
-  CSYNC_STATUS_UNSUCCESSFUL,
-  CSYNC_STATUS_NO_LOCK, /* OBSOLETE  does not happen anymore */
-  CSYNC_STATUS_STATEDB_LOAD_ERROR,
-  CSYNC_STATUS_STATEDB_CORRUPTED,
-  CSYNC_STATUS_NO_MODULE,
-  CSYNC_STATUS_TIMESKEW, /* OBSOLETE */
+  CSYNC_STATUS_UNSUCCESSFUL,       /* Unspecific problem happend */
+  CSYNC_STATUS_NO_LOCK,            /* OBSOLETE  does not happen anymore */
+  CSYNC_STATUS_STATEDB_LOAD_ERROR, /* Statedb can not be loaded. */
+  CSYNC_STATUS_STATEDB_CORRUPTED,  /* Statedb is corrupted */
+  CSYNC_STATUS_NO_MODULE,          /* URL passed to csync does not start with owncloud:// or ownclouds:// */
+  CSYNC_STATUS_TIMESKEW,           /* OBSOLETE */
  CSYNC_STATUS_FILESYSTEM_UNKNOWN, /* UNUSED */
-  CSYNC_STATUS_TREE_ERROR,
-  CSYNC_STATUS_MEMORY_ERROR,
-  CSYNC_STATUS_PARAM_ERROR,
-  CSYNC_STATUS_UPDATE_ERROR,
-  CSYNC_STATUS_RECONCILE_ERROR,
-  CSYNC_STATUS_PROPAGATE_ERROR, /* OBSOLETE */
+  CSYNC_STATUS_TREE_ERROR,         /* csync trees could not be created */
+  CSYNC_STATUS_MEMORY_ERROR,       /* not enough memory problem */
+  CSYNC_STATUS_PARAM_ERROR,        /* parameter is zero where not expected */
+  CSYNC_STATUS_UPDATE_ERROR,       /* general update or discovery error */
+  CSYNC_STATUS_RECONCILE_ERROR,    /* general reconcile error */
+  CSYNC_STATUS_PROPAGATE_ERROR,    /* OBSOLETE */
  CSYNC_STATUS_REMOTE_ACCESS_ERROR, /* UNUSED */
  CSYNC_STATUS_REMOTE_CREATE_ERROR, /* UNUSED */
-  CSYNC_STATUS_REMOTE_STAT_ERROR, /* UNUSED */
+  CSYNC_STATUS_REMOTE_STAT_ERROR,  /* UNUSED */
  CSYNC_STATUS_LOCAL_CREATE_ERROR, /* UNUSED */
-  CSYNC_STATUS_LOCAL_STAT_ERROR, /* UNUSED */
-  CSYNC_STATUS_PROXY_ERROR, /* UNUSED */
-  CSYNC_STATUS_LOOKUP_ERROR,
-  CSYNC_STATUS_SERVER_AUTH_ERROR,
-  CSYNC_STATUS_PROXY_AUTH_ERROR,
-  CSYNC_STATUS_CONNECT_ERROR,
-  CSYNC_STATUS_TIMEOUT,
-  CSYNC_STATUS_HTTP_ERROR,
-  CSYNC_STATUS_PERMISSION_DENIED,
+  CSYNC_STATUS_LOCAL_STAT_ERROR,   /* UNUSED */
+  CSYNC_STATUS_PROXY_ERROR,        /* UNUSED */
+  CSYNC_STATUS_LOOKUP_ERROR,       /* Neon fails to find proxy. Almost OBSOLETE */
+  CSYNC_STATUS_SERVER_AUTH_ERROR,  /* UNUSED */
+  CSYNC_STATUS_PROXY_AUTH_ERROR,   /* UNUSED */
+  CSYNC_STATUS_CONNECT_ERROR,      /* neon driven connection failed */
+  CSYNC_STATUS_TIMEOUT,            /* UNUSED */
+  CSYNC_STATUS_HTTP_ERROR,         /* UNUSED */
+  CSYNC_STATUS_PERMISSION_DENIED,  /*  */
  CSYNC_STATUS_NOT_FOUND,
  CSYNC_STATUS_FILE_EXISTS,
  CSYNC_STATUS_OUT_OF_SPACE,
@@ -102,11 +96,13 @@ enum csync_status_codes_e {
  CSYNC_STATUS_ABORTED,
    /* Codes for file individual status: */
    CSYNC_STATUS_INDIVIDUAL_IS_SYMLINK,
-    CSYNC_STATUS_INDIVIDUAL_IS_HARDLINK,
    CSYNC_STATUS_INDIVIDUAL_IGNORE_LIST,
    CSYNC_STATUS_INDIVIDUAL_IS_INVALID_CHARS,
    CSYNC_STATUS_INDIVIDUAL_EXCLUDE_LONG_FILENAME,
-    CYSNC_STATUS_FILE_LOCKED_OR_OPEN
+    CYSNC_STATUS_FILE_LOCKED_OR_OPEN,
+    CSYNC_STATUS_INDIVIDUAL_EXCLUDE_HIDDEN,
+    CSYNC_STATUS_INVALID_CHARACTERS,
+    CSYNC_STATUS_INDIVIDUAL_STAT_FAILED
 };

 typedef enum csync_status_codes_e CSYNC_STATUS;
@@ -122,7 +118,10 @@ typedef enum csync_status_codes_e CSYNC_STATUS;
 #define CSYNC_STATUS_IS_ERR(x) (unlikely((x) >= CSYNC_STATUS_ERROR))
 #define CSYNC_STATUS_IS_EQUAL(x, y) ((x) == (y))

-
+/**
+  * Instruction enum. In the file traversal structure, it describes
+  * the csync state of a file.
+  */
 enum csync_instructions_e {
  CSYNC_INSTRUCTION_NONE       = 0x00000000,  /* Nothing to do (UPDATE|RECONCILE) */
  CSYNC_INSTRUCTION_EVAL       = 0x00000001,  /* There was changed compared to the DB (UPDATE) */
@@ -176,7 +175,7 @@ enum csync_vio_file_stat_fields_e {
  CSYNC_VIO_FILE_STAT_FIELDS_FLAGS = 1 << 2,
  CSYNC_VIO_FILE_STAT_FIELDS_DEVICE = 1 << 3,
  CSYNC_VIO_FILE_STAT_FIELDS_INODE = 1 << 4,
-  CSYNC_VIO_FILE_STAT_FIELDS_LINK_COUNT = 1 << 5,
+//  CSYNC_VIO_FILE_STAT_FIELDS_LINK_COUNT = 1 << 5,
  CSYNC_VIO_FILE_STAT_FIELDS_SIZE = 1 << 6,
 //  CSYNC_VIO_FILE_STAT_FIELDS_BLOCK_COUNT = 1 << 7, /* will be removed */
 //  CSYNC_VIO_FILE_STAT_FIELDS_BLOCK_SIZE = 1 << 8,  /* will be removed */
@@ -215,12 +214,13 @@ struct csync_vio_file_stat_s {

  dev_t device;
  uint64_t inode;
-  nlink_t nlink;

  int fields; // actually enum csync_vio_file_stat_fields_e fields;
  enum csync_vio_file_type_e type;

  enum csync_vio_file_flags_e flags;
+
+  char *original_name; // only set if locale conversion fails
 };

 csync_vio_file_stat_t *csync_vio_file_stat_new(void);
@@ -251,7 +251,10 @@ struct csync_tree_walk_file_s {
    enum csync_instructions_e instruction;

    /* For directories: If the etag has been updated and need to be writen on the db */
-    int         should_update_etag;
+    int         should_update_metadata;
+
+    /* For directories: Does it have children that were ignored (hidden or ignore pattern) */
+    int         has_ignored_files;

    const char *rename_path;
    const char *etag;
@@ -550,11 +553,6 @@ void csync_resume(CSYNC *ctx);
 */
 int  csync_abort_requested(CSYNC *ctx);

-/**
- * Specify if it is allowed to read the remote tree from the DB (default to enabled)
- */
-int csync_set_read_from_db(CSYNC* ctx, int enabled);
-
 char *csync_normalize_etag(const char *);
 time_t oc_httpdate_parse( const char *date );

--- a/csync/src/csync_exclude.c
+++ b/csync/src/csync_exclude.c
@@ -81,7 +81,7 @@ int csync_exclude_load(const char *fname, c_strlist_t **list) {
  _fmode = _O_BINARY;
 #endif

-  w_fname = c_utf8_to_locale(fname);
+  w_fname = c_utf8_path_to_locale(fname);
  if (w_fname == NULL) {
      return -1;
  }
@@ -151,11 +151,12 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) {
    return match;
 }

-// See http://support.microsoft.com/kb/74496
-static const char *win_reserved_words[] = {"CON","PRN","AUX", "NUL",
-                                           "COM1", "COM2", "COM3", "COM4",
-                                           "LPT1", "LPT2", "LPT3", "CLOCK$" };
-
+// See http://support.microsoft.com/kb/74496 and
+// https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx
+// Additionally, we ignore '$Recycle.Bin', see https://github.com/owncloud/client/issues/2955
+static const char* win_reserved_words[] = {"CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5",
+                                           "COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4",
+                                           "LPT5", "LPT6", "LPT7", "LPT8", "LPT9", "CLOCK$", "$Recycle.Bin" };

 bool csync_is_windows_reserved_word(const char* filename) {

@@ -232,6 +233,7 @@ CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path
  }

  // check the strlen and ignore the file if its name is longer than 254 chars.
+  // whenever changing this also check createDownloadTmpFileName
  if (strlen(bname) > 254) {
      match = CSYNC_FILE_EXCLUDE_LONG_FILENAME;
      SAFE_FREE(bname);
@@ -280,6 +282,8 @@ CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path
  if (getenv("CSYNC_CONFLICT_FILE_USERNAME")) {
      rc = asprintf(&conflict, "*_conflict_%s-*", getenv("CSYNC_CONFLICT_FILE_USERNAME"));
      if (rc < 0) {
+          SAFE_FREE(bname);
+          SAFE_FREE(dname);
          goto out;
      }
      rc = csync_fnmatch(conflict, path, 0);
--- a/Show More
+++ b/Show More