OS X: write a qt.conf file

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

 cmake_minimum_required(VERSION 2.6)
+cmake_policy(VERSION 2.8.0)
+
 project(mirall)
 set(PACKAGE "mirall")
 set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )

-if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
+include(Warnings)
+
+set(OEM_THEME_DIR "" CACHE STRING "Define directory containing a custom theme")
+if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake )
     include ( ${OEM_THEME_DIR}/OEM.cmake )
 else ()
     include ( ${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake )
 endif()

+if (NOT DEFINED APPLICATION_SHORTNAME)
+     set ( APPLICATION_SHORTNAME ${APPLICATION_NAME} )
+endif()
+
 include(${CMAKE_SOURCE_DIR}/VERSION.cmake)
 configure_file( ${CMAKE_SOURCE_DIR}/src/mirall/version.h.in "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/version.h" )
-include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/")
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/")
+
+#####
+## handle DBUS for Fdo notifications
+if( UNIX AND NOT APPLE )
+    add_definitions( -DUSE_FDO_NOTIFICATIONS)
+    set(WITH_DBUS ON)
+endif()
+####

 include(GNUInstallDirs)
+include(DefineInstallationPaths)
+include(QtVersionAbstraction)
+
+setup_qt()

 include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REFSPEC GIT_SHA1)
@@ -22,6 +43,7 @@ get_git_head_revision(GIT_REFSPEC GIT_SHA1)
 # if we cannot get it from git, directly try .tag (packages)
 # this will work if the tar balls have been properly created
 # via git-archive.
+if (GIT_SHA1)
 if (${GIT_SHA1} STREQUAL "GITDIR-NOTFOUND")
    file(READ ${CMAKE_SOURCE_DIR}/.tag sha1_candidate)
    string(REPLACE "\n" "" sha1_candidate ${sha1_candidate})
@@ -30,18 +52,19 @@ if (${GIT_SHA1} STREQUAL "GITDIR-NOTFOUND")
        set (GIT_SHA1 "${sha1_candidate}")
    endif()
 endif()
-
-## stupid, we should upstream this
-if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" AND NOT CMAKE_INSTALL_SYSCONFDIR)
-    set(CMAKE_INSTALL_SYSCONFDIR "/etc")
 endif()

+set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
+set(DATADIR ${DATA_INSTALL_DIR})
+
 #####
 ## handle BUILD_OWNCLOUD_OSX_BUNDLE
 # BUILD_OWNCLOUD_OSX_BUNDLE was not initialized OR set to true on OSX
 if(APPLE AND (NOT DEFINED BUILD_OWNCLOUD_OSX_BUNDLE OR BUILD_OWNCLOUD_OSX_BUNDLE))
    set(BUILD_OWNCLOUD_OSX_BUNDLE ON)
    set(OWNCLOUD_OSX_BUNDLE "${APPLICATION_EXECUTABLE}.app")
+    set(LIB_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS")
+    set(BIN_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS")

 # BUILD_OWNCLOUD_OSX_BUNDLE was disabled on OSX
 elseif(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE)
@@ -53,60 +76,80 @@ else()
 endif()
 #####

+# this option removes Http authentication, keychain, shibboleth etc and is intended for
+# external authentication mechanisms
+option(TOKEN_AUTH_ONLY "TOKEN_AUTH_ONLY" OFF)
+if(TOKEN_AUTH_ONLY)
+   message("Compiling with token authentication")
+   add_definitions(-DTOKEN_AUTH_ONLY=1)
+endif()
+
+# this option creates only libocsync and libowncloudsync
+option(BUILD_LIBRARIES_ONLY "BUILD_LIBRARIES_ONLY" OFF)
+
+# When this option is enabled, 5xx errors are not added to the clacklist
+# Normaly you don't want to enable this option because if a particular file
+# trigger a bug on the server, you want the file to be blacklisted.
+option(OWNCLOUD_5XX_NO_BLACKLIST "OWNCLOUD_5XX_NO_BLACKLIST" OFF)
+if(OWNCLOUD_5XX_NO_BLACKLIST)
+    add_definitions(-DOWNCLOUD_5XX_NO_BLACKLIST=1)
+endif()
+
 #### find libs
-find_package(Qt4 4.6.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtTest REQUIRED )
-find_package(Csync)
+#find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtTest QtWebkit REQUIRED )
+#if( UNIX AND NOT APPLE ) # Fdo notifications
+#    find_package(Qt4 4.7.0 COMPONENTS QtDBus REQUIRED )
+#endif()
+find_package(Neon REQUIRED)
+
+if(NOT TOKEN_AUTH_ONLY)
+    if (Qt5Core_DIR)
+    find_package(Qt5Keychain REQUIRED)
+    else()
+    find_package(QtKeychain REQUIRED)
+    endif()
+endif()
+
+if(APPLE)
+  find_package(Sparkle)
+endif(APPLE)
+
 if(UNIX)
-find_package(INotify REQUIRED)
+  find_package(INotify REQUIRED)
 else()
-find_package(INotify)
+  find_package(INotify)
 endif()
 find_package(Sphinx)
 find_package(PdfLatex)
-find_package(QtKeychain)

-set(WITH_CSYNC CSYNC_FOUND)
-set(WITH_QTKEYCHAIN ${QTKEYCHAIN_FOUND})
-set(USE_INOTIFY ${INOTIFY_FOUND})
+

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

-set(CPACK_SOURCE_IGNORE_FILES
-  # hidden files
-  "/\\\\..+$"
-  # temporary files
-  "\\\\.swp$"
-  # backup files
-  "~$"
-  # others
-  "\\\\.#"
-  "/#"
-  "/build/"
-  "/_build/"
-  # used before
-  "\\\\.o$"
-  "\\\\.lo$"
-  "\\\\.la$"
-  "Makefile\\\\.in$"
-)
+configure_file(test/test_journal.db "${CMAKE_BINARY_DIR}/test/test_journal.db" COPYONLY)
+
+# Copy that logo, the installer uses it later
+if(BUILD_OWNCLOUD_OSX_BUNDLE)
+    install(FILES resources/owncloud_logo_blue.png DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
+endif()

 include(OwnCloudCPack.cmake)

-#
-# This cmake builds two targets (aka apps), mirall and owncloud. For the owncloud
-# target, OWNCLOUD_CLIENT needs to be a compile flag. It is set in src/CMakeLists.txt
-# but if that fails because cmake is too old, uncomment this here if you want to build
-# owncloud.
-# add_definitions(-DOWNCLOUD_CLIENT)
 add_definitions(-DUNICODE)
 add_definitions(-D_UNICODE)
+if( WIN32 )
+add_definitions( -D__USE_MINGW_ANSI_STDIO=1 )
+endif( WIN32 )

 # Handle Translations, pick all mirall_* files from trans directory.
 file( GLOB TRANS_FILES ${CMAKE_SOURCE_DIR}/translations/mirall_*.ts)
 set(TRANSLATIONS ${TRANS_FILES})

+add_subdirectory(csync)
 add_subdirectory(src)
+add_subdirectory(shell_integration)
 add_subdirectory(doc)
+add_subdirectory(admin)

 if(UNIT_TESTING)
    include(CTest)
@@ -117,5 +160,6 @@ endif(UNIT_TESTING)
 if(BUILD_OWNCLOUD_OSX_BUNDLE)
    configure_file(sync-exclude.lst ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
 else()
-    install( FILES sync-exclude.lst DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} )
+    install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
+    configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
 endif()
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,8 +4,8 @@ If you have questions about how to use the ownCloud Desktop Client, please
 direct these to the [mailing list][mailinglist] or our [forum][forum].
 We are also available on [IRC][irc].

-### Guidelines
-* Report the issue using our [template][template], it includes all the
+### Bug Reporting Guidelines
+* Important: Report the issue using our [template][template], it includes all the
  informations we need to track down the issue.  
 * This repository is *only* for issues within the ownCloud desktop client. 
  Issues in other compontents should be reported in their own repositores: 
--- a/CPackOptions.cmake.in
+++ b/CPackOptions.cmake.in
@@ -17,17 +17,6 @@ else ()
     include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" )
 endif()

-set( CSYNC_BINARY_DIR  @CSYNC_BINARY_DIR@ )
-set( MINGW_ROOT @CMAKE_FIND_ROOT_PATH@ )
-if(CSYNC_BINARY_DIR)
-    set( CSYNC_LIBRARY_DIR "${CSYNC_BINARY_DIR}/src" )
-    set( CSYNC_PLUGIN_DIR  "${CSYNC_BINARY_DIR}/modules" )
-    set( CSYNC_CONFIG_DIR  "${CSYNC_BINARY_DIR}/config" )
-else()
-    set( CSYNC_LIBRARY_DIR "${MINGW_ROOT}/bin" )
-    set( CSYNC_PLUGIN_DIR  "${MINGW_ROOT}/plugins-0" ) #FIXME: whatever it is
-    set( CSYNC_CONFIG_DIR  "${MINGW_ROOT}/etc/ocsync" )
-endif()
 set( BUILD_OWNCLOUD_OSX_BUNDLE @BUILD_OWNCLOUD_OSX_BUNDLE@)
 if(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE)
    message( FATAL_ERROR "You're trying to build a bundle although you haven't built mirall in bundle mode.\n Add -DBUILD_OWNCLOUD_OSX_BUNDLE=ON")
--- a/291
+++ b/291
@@ -1,7 +1,291 @@
 ChangeLog
 =========
-version 1.2.2 (release 2013-04-02 ), csync 0.70.5 required
+version 1.6.2 (release 2014-07-28 )
+ * Limit the HTTP buffer size when downloading to limit memory consumption.
+ * Another small mem leak fixed in HTTP Credentials.
+ * Fix local file name clash detection for MacOSX.
+ * Limit maximum wait time to ten seconds in network limiting.
+ * Fix data corruption while trying to resume and the server does
+   not support it.
+ * HTTP Credentials: Read password from legacy place if not found.
+ * Shibboleth: Fix the waiting curser that would not disapear (#1915)
+ * Limit memory usage to avoid mem wasting and crashes
+ * Propagator: Fix crash when logging out during upload (#1957)
+ * Propagator_qnam: Fix signal slot connection (#1963)
+ * Use more elaborated way to detect that the server was reconfigured (#1948)
+ * Setup Wizard: Reconfigure Server also if local path was changed (#1948)

+version 1.6.1 (release 2014-06-26 )
+ * Fix 'precondition failed' bug with broken upload
+ * Fix openSSL problems for windows deployment
+ * Fix syncing a folder with '#' in the name
+ * Fix #1845: do not update parent directory etag before sub
+   directories are removed
+ * Fix reappearing directories if dirs are removed during its
+   upload
+ * Fix app version in settings dialog, General tab
+ * Fix crash in FolderWizard when going offline
+ * Shibboleth fixes
+ * More specific error messages (file remove during upload, open
+   local sync file)
+ * Use QSet rather than QHash in SyncEngine (save memory)
+ * Fix some memory leaks
+ * Fix some thread race problems, ie. wait for neon thread to finish
+   before the propagator is shut down
+ * Fix a lot of issues and warnings found by Coverity
+ * Fix Mac some settings dialog problems
+
+
+version 1.6.0 (release 2014-05-30 )
+ * Minor GUI improvements
+ * Qt5 compile issues fixed
+ * Ignore sync log file in filewatcher
+ * Install libocsync to private library dir and use rpath to localize
+ * Fix reconnect after server disconnect
+ * Fix "unknown action" display in Activity window
+ * Fix memory leaks
+ * Respect XDG_CONFIG_HOME environment var
+ * Handle empty fileids in the journal correctly
+ * Add abilility to compile libowncloudsync without GUI dependendy
+ * Fix SSL error with previously-expired CAs on Windows
+ * Fix incorrect folder pause state after start
+ * Fix a couple of actual potential crashes
+ * Improve Cookie support (e.g. for cookie-based load-balancers)
+ * Introduce a general timeout of 300s for network operations
+ * Improve error handling, blacklisting
+ * Job-based change propagation, enables faster parallel up/downloads 
+   (right now only if no bandwidth limit is set and no proxy is used)
+ * Significantly reduced CPU load when checking for local and remote changes
+ * Speed up file stat code on Windows
+ * Enforce Qt5 for Windows and Mac OS X builds
+ * Improved owncloudcmd: SSL support, documentation
+ * Added advanced logging of operations (file .???.log in sync
+   directory)
+ * Avoid creating a temporary copy of the sync database (.ctmp)
+ * Enable support for TLS 1.2 negotiation on platforms that use
+   Qt 5.2 or later
+ * Forward server exception messages to client error messages
+ * Mac OS X: Support Notification Center in OS X 10.8+
+ * Mac OS X: Use native settings dialog 
+ * Mac OS X: Fix UI inconsistencies on Mavericks
+ * Shibboleth: Warn if authenticating with a different user
+ * Remove vio abstraction in csync
+ * Avoid data loss when a client file system is not case sensitive
+
+version 1.5.3 (release 2014-03-10 )
+  * Fix usage of proxies after first sync run (#1502, #1524, #1459, #1521)
+  * Do not wipe the credentials from config for reconnect (#1499, #1503)
+  * Do not erase the full account config if an old version of the client stored
+    the password (related to above)
+  * Fix layout of the network tab (fixes #1491)
+  * Handle authentication requests by a Shibboleth IdP
+  * Shibboleth: If no connection is available, don't open the login window
+  * [Packaging] Debian/Ubuntu: ship sync-exclude.lst
+  * [Packaging] Fix issues with access to gnome keychain in Fedora and RHEL6
+  * [Packaging] Ensure all sub packages get updated
+  * [Packaging] Fix incorrect path in desktop file (RHEL6/CentOS6)
+
+version 1.5.2 (release 2014-02-26 )
+  * Fix behavior when attempting to rename Shared folder
+  * Fix potential endless sync loops on Mac OS (#1463)
+  * Fix potential crash when pausing during update phase (#1442)
+  * Fix handing of shared directories
+  * Fix online state handling (#1441, #1459)
+  * Fix potential crash in c_iconv on Mac OS
+  * Fix certificate chain display in SSLButton
+  * Fix sporadicly appearing multiple auth prompts on sign-in
+  * Show correct state icon in Account Settings right away
+  * Re-fetch content that gets deleted from read only shared directories
+  * Do not store the password in the config file, erase existing ones (#1469)
+  * Shibboleth: Close browser window after login
+  * Shibboleth: Proper invalidation if timeout during sync
+  * Shibboleth: Do not pop up IdP login immediately when modifying account
+  * Shibboleth: Avoid auth on restart by storing cookies in the wallet
+  * Fix license headers 
+
+version 1.5.1 (release 2014-02-13 )
+  * Added an auto updater that updates the client if a
+    more recent version was found automatically (Windows, Mac OS X)
+  * Added a button to the account dialog that gives information
+    about the encryption layer used for communication, plus a
+    certificate information widget
+  * Preserve the permission settings of local files rather than
+    setting them to a default (Bug #820)
+  * Handle windows lnk files correctly (Bug #1307)
+  * Detect removes and renames in read only shares and
+    restore the gone away files. (Bug #1386)
+  * Fixes sign in/sign out and password dialog. (Bug #1353)
+  * Fixed error messages (Bug #1394)
+  * Lots of fixes for building with Qt5
+  * Changes to network limits are now also applied during a
+    sync run
+  * Fixed mem leak after via valgrind on Mac
+  * Imported the ocsync library into miralls repository.
+    Adopted all build systems and packaging to that.
+  * Introduce a new linux packaging scheme following the
+    debian upstream scheme
+  * Use a refactored Linux file system watcher based on
+    inotify, incl. unit tests
+  * Wizard: Gracefully fall back to HTTP if HTTPS connection
+    fails, issuing a warning
+  * Fixed translation misses in the propagator
+  * Fixes in proxy configuration
+  * Fixes in sync journal handling
+  * Fix the upload progress if the local source is still
+    changing when the upload begins.
+  * Add proxy support to owncloud commandline client
+  * NSIS fixes
+  * A lot of other fixes and minor improvements
+  * Improve Qt5 compatability
+
+version 1.5.0 (release 2013-12-12 ), csync 0.91.4 required
+  * New owncloud propagator that skips the vio abstraction layer
+  * Add owncloudcmd to replace the ocsync command line tool
+  * Localize Windows installer
+  * Allow to sign in and out
+  * Ask for password if missing
+  * Introduce activity view
+  * Introduce black list for files which could not be synced
+  * Enabling accessbility by shipping accessibility enables on OS X (#736)
+  * Toggle Settings window when clicking on systray icon on Win and KDE (#896)
+  * FolderWizard: Sanitize error detection (#1201)
+  * Set proper enable state of blacklist button after the dialog was opened
+  * Set proper tooltips in blacklist
+  * Translatable error messages for file errors
+  * Add man page for owncloudcmd (#1234)
+  * Don't close setup wizard when the initial sync run is started
+  * Close the sync journal if a folder gets removed (#1252)
+  * Activity: Avoid horizontal scrollbar (#1213)
+  * Fix crash (#1229)
+  * Resize wizard appropriately (#1130)
+  * Fix account identity test (#1231)
+  * Maintain the file type correctly
+  * Display rename-target in sync protocol action column
+  * Let recursive removal also remove the top dir
+  * If item is a directory, remove its contents from the database as well (#1257)
+  * Install headers for owncloudsync library
+  * Fix opening the explorer with a selected file in Windows (#1249)
+  * Add build number into versioning scheme
+  * Windows: Fix rename of temporary files
+  * Windows: Fix move file operation
+
+version 1.4.2 (release 2013-10-18 ), csync 0.90.4 required
+  * Do not show the warning icon in the tray (#944)
+  * Fix manual proxy support when switching (#1016)
+  * Add folder column to detailed sync protocol (#1037)
+  * Fix possible endless loop in inotify (#1041)
+  * Do not elide the progress text (#1049)
+  * Fix high CPU load (#1073)
+  * Reconnect if network is unavailable after startup (#1080)
+  * Ensure paused folder stays paused when syncing with more than one folder (#1083)
+  * Don't show desktop notification when the user doesn't want to (#1093)
+  * System tray: Avoid quick flickering up of the ok-icon for the sync prepare state
+  * Progress: Do not show progress if nothing is transmitted
+  * Progress: Show number of deletes.
+
+version 1.4.1 (release 2013-09-24 ), csync 0.90.1 required
+
+  * Translation and documentation fixes.
+  * Fixed error display in settings/status dialog, displays multi 
+    line error messages now correctly.
+  * Wait up to 30 secs before complaining about missing systray
+    Fixes bug #949
+  * Fixed utf8 issues with basic auth authentication, fixes bug #941
+  * Fixed remote folder selector, avoid recursive syncing, fixes bug #962
+  * Handle and display network problems at startup correctly.
+  * Enable and disable the folder watcher during syncs correctly.
+  * Fix setting of thread priority.
+  * Fixed file size display.
+  * Fixed various folder wizard issues, bug #992
+  * Made "Sync started" message optional, fixes bug #934
+  * Fixed shutdown, avoid crashed config on win32, fixes bug #945
+  * Pop up config wizard if no server url is configured, fixes bug #1018
+  * Settings: calculate sidebar width dynamically, fixes bug #1020
+  * Fixed a crash if sync folders were removed, fixes bug #713
+  * Do proper resync after network disconnect, fixes bug #1007
+  * Various minor code fixes
+
+version 1.4.0 (release 2013-09-04 ), csync 0.90.0 required
+
+  * New Scheduler: Only sync when there are actual changes in the server
+  * Add a Settings Dialog, move Proxy Settings there
+  * Transform folder Status Dialog into Account Settings, provide feedback via context menu
+  * Add Bandwidth Control
+  * Add a visual storage/quota indicator (context menu and account settings)
+  * Add progress indication (context menu and account settings)
+  * Introduce a sync history, persisting results across syncs
+  * Move ability to switch to mono icons from a switch to a Settings option
+  * Add "Launch on System Startup" GUI option
+  * Add "Show Desktop Nofications"GUI option (enabled by default)
+    top optionally disable sync notifications
+  * Add Help item, pointing to online reference
+  * Implement graphical selection of remote folders in FolderWizard
+  * Allow custom ignore patterns
+  * Add an editor for ingore patterns
+  * ALlow to flag certain ignore patterns as discardable
+  * Ensure to ship with all valid translations
+  * Progress Dialog now preserves the last syncned items across sync runs
+  * Split Setup Wizard into multiple pages again
+  * Implement "--logfile -" to log to stdout
+  * Add preliminary support for Shibboleth authentication
+  * Linux: Provide more icon sizes
+  * Linux: Do not trigger notifier on ignored files
+  * Windows: Reduce priority of CSync thread
+  * Documentation: Prem. updates to reflect UI changes
+  * Significant code refactorings
+  * Require Qt 4.7
+  * Known issue: Under certain conditions, a file will only get uploaded after up to five minutes
+
+version 1.3.0 (release 2013-06-25 ), csync 0.80.0 required
+
+  * Default proxy port to 8080
+  * Don't lose proxy settings when changing passwords
+  * Support SOCKS5 proxy (useful in combination with ssh   *D)
+  * Propagate proxy changes to csync at runtime
+  * Improve proxy wizard
+  * Display proxy errors
+  * Solved problems with lock files
+  * Warn if for some reason all files are scheduled for removal on either side
+  * Avoid infinite loop if authentication fails in certain cases
+  * Fix reading the password from the config in certain cases
+  * Do not crash when configured sync target disappears
+  * Make --help work on windows
+  * Make sync feedback less ambiguous.
+  * Fix icon tray tooltip sometimes showing repeated content
+  * More use of native directory separators on Windows
+  * Remove journal when reusing a directory that used to have a journal before
+  * Visual clean up of status dialog items
+  * Wizard: When changing the URL or user name, allow the user to push his data
+    to the new location or wipe the folder and start from scratch
+  * Wizard: Make setting a custom folder as a sync target work again
+  * Fix application icon
+  * User-Agent now contains "Mozilla/5.0" and the Platform name (for firewall/proxy compat)
+  * Server side directory moves will be detected
+  * New setup wizard, defaulting to root syncing (only for new setups)
+  * Improved thread stop/termination
+
+version 1.2.5 (release 2013-04-23 ), csync 0.70.7 required
+  * [Fixes] NSIS installer fixes
+  * [Fixes] Fix crash race by making certificateChain() thread safe
+  * [Fixes] Build with older CMake versions (CentOS/RHEL 6) 
+  * [Fixes] Wording in GUI
+  * [Fixes] Silently ignore "installed = true" status.php
+  * Set log verbosity before calling csync_init.
+  * GUI feedback for the statistics copy action
+  * Safer approach for detecting duplicate sync runs
+
+version 1.2.4 (release 2013-04-11 ), csync 0.70.6 required
+  * [Fixes] Clarify string in folder wizard
+  * [Fixes] Fixed some valgrind warnings
+  * [Fixes] Ensure that only one sync thread can ever run 
+  * [Fixes] Fix default config storage path
+  * [Fixes] Skip folders with no absolute path
+  * [Fixes] Allow setting the configuration directory on command line
+
+version 1.2.3 (release 2013-04-02 ), csync 0.70.5 required
+  * [Fixes] Unbreak self-signed certificate handling
+
+version 1.2.2 (release 2013-04-02 ), csync 0.70.5 required
  * [Fixes] Do not crash when local file tree contains symlinks
  * [Fixes] Correctly handle locked files on Windows
  * [Fixes] Display errors in all members of the SSL chain
@@ -176,8 +460,3 @@ version 1.0.1 (release 2012-04-18), csync 0.50.5 required
  * [Platform] MacOSX Bundle creation added
  * [Platform] Enabled ranslations on Windows.

-
-ChangeLog
-=========
-
-version 1.2.1 (release 2013-02-26 ), csync 0.70.4 required
--- a/OWNCLOUD.cmake
+++ b/OWNCLOUD.cmake
@@ -1,9 +1,11 @@
-set( APPLICATION_SHORTNAME  "owncloud" )
 set( APPLICATION_NAME       "ownCloud" )
-set( APPLICATION_EXECUTABLE "owncloud"        )
-set( APPLICATION_DOMAIN     "owncloud.com"    )
-set( APPLICATION_VENDOR     "ownCloud, Inc"   )
-set( THEME_CLASS            "ownCloudTheme"   )
+#set( APPLICATION_SHORTNAME  ${APPLICATION_NAME} )
+set( APPLICATION_EXECUTABLE "owncloud" )
+set( APPLICATION_DOMAIN     "owncloud.com" )
+set( APPLICATION_VENDOR     "ownCloud" )
+set( APPLICATION_UPDATE_URL "https://updates.owncloud.com/client/" CACHE string "URL for updater" )
+
+set( THEME_CLASS            "ownCloudTheme" )
 set( APPLICATION_REV_DOMAIN "com.owncloud.desktopclient" )
 set( WIN_SETUP_BITMAP_PATH  "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
 # set( THEME_INCLUDE          "${OEM_THEME_DIR}/mytheme.h" )
--- a/OwnCloudCPack.cmake
+++ b/OwnCloudCPack.cmake
@@ -9,10 +9,11 @@ else ()
 endif()

 include( VERSION.cmake )
-set( CPACK_PACKAGE_VERSION_MAJOR  ${VERSION_MAJOR} )
-set( CPACK_PACKAGE_VERSION_MINOR  ${VERSION_MINOR} )
-set( CPACK_PACKAGE_VERSION_PATCH  ${VERSION_PATCH} )
-set( CPACK_PACKAGE_VERSION  ${VERSION} )
+set( CPACK_PACKAGE_VERSION_MAJOR  ${MIRALL_VERSION_MAJOR} )
+set( CPACK_PACKAGE_VERSION_MINOR  ${MIRALL_VERSION_MINOR} )
+set( CPACK_PACKAGE_VERSION_PATCH  ${MIRALL_VERSION_PATCH} )
+set( CPACK_PACKAGE_VERSION_BUILD  ${MIRALL_VERSION_BUILD} )
+set( CPACK_PACKAGE_VERSION  ${MIRALL_VERSION_FULL}${MIRALL_VERSION_SUFFIX} )

 if(APPLE)
    set( CPACK_GENERATOR "DragNDrop" )
--- a/README.md
+++ b/README.md
@@ -2,50 +2,12 @@

 ## Introduction

-Mirall synchronizes your folders with another computer.
-
-The ultimate goals of Mirall are:
-
-* Network location aware: should not try to sync against your NAS if you are
-  not in the home network
-* It is a zero-interaction tool. So forget about resolving conflicts.
-* It should work silently and realiably.
-
-Mirall is in early stages of development, and may still eat your
-files or hang your computer.
-
-* Network location awareness not implemented yet
-* Current version supports local and remote (sftp and smb) folders.
-* It is powered by csync (http://www.csync.org), however
-  the user does not know and other tools will be incorporated to provide other
-  functionality.
-
-## Current issues
-
-* No sane way to backup conflicting versions yet, this should be solved
-  in a near csync release (--conflictcopy, available in Jann's branch).
-  Right now the newest copy wins.
-* You can't remove folder configurations
-  Workaround: delete ~/.local/share/data/Mirall/folders/$alias and restart
-* Some tasks block the GUI (initial setup of watchers)
-* May be some concurrency issues
-
-## Roadmap
-
-* Improve robustness to minimize user interaction
-* Improve feedback and sync results
-* Add support for other folder types: tarsnap, duplicity, git (SparkleShare)
-
-## Requirements
-
-* Linux (currently it uses inotify to detect file changes)
-* unison installed in the local and remote machine
-  (you should not care if you got Mirall with your favorite
-   distribution)
+Mirall is a tool to synchronize files from ownCloud Server with your computer.
+It uses OCSync as its syncing backend.

 ## Download

-### openSUSE
+### Binary packages

 * Refer to the download page http://owncloud.org/sync-clients/

@@ -55,23 +17,13 @@ files or hang your computer.

 ## Building the source code

-You need Qt 4.7 and cmake:
-
-    mkdir build
-    cd build
-    cmake ..
-    make
-
-To generate a tarball:
-
-    mkdir build
-    cd build
-    cmake ..
-    make package_source
+Please refer to doc/building.rst, or
+[Building the Client](http://doc.owncloud.org/desktop/1.5/building.html)
+in the ownCloud client manual.

 ## Authors

-* Duncan Mac-Vicar P. <duncan@kde.org>
+* Duncan Mac-Vicar P. <duncan@kde.org> (original Mirall author)
 * Klaas Freitag <freitag@owncloud.com>
 * Daniel Molkentin <danimo@owncloud.com>

--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,6 +1,25 @@
-set( VERSION_MAJOR 1 )
-set( VERSION_MINOR 2 )
-set( VERSION_PATCH 2 )
-set( VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX})
-set( SOVERSION 0 )
+set( MIRALL_VERSION_MAJOR 1 )
+set( MIRALL_VERSION_MINOR 7 )
+set( MIRALL_VERSION_PATCH 0 )
+set( MIRALL_SOVERSION 0 )

+if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
+    set( MIRALL_VERSION_SUFFIX "beta2") #e.g. beta1, beta2, rc1
+endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
+
+if( NOT DEFINED MIRALL_VERSION_BUILD )
+    set( MIRALL_VERSION_BUILD "0" ) # Integer ID. Generated by the build system
+endif( NOT DEFINED MIRALL_VERSION_BUILD )
+# Composite defines
+# Used e.g. for libraries Keep at x.y.z.
+set( MIRALL_VERSION "${MIRALL_VERSION_MAJOR}.${MIRALL_VERSION_MINOR}.${MIRALL_VERSION_PATCH}" )
+# Version with Build ID. Used in the installer
+set( MIRALL_VERSION_FULL ${MIRALL_VERSION} )
+set( MIRALL_VERSION_STRING ${MIRALL_VERSION} )
+set( MIRALL_VERSION_FULL "${MIRALL_VERSION_FULL}.${MIRALL_VERSION_BUILD}" )
+
+set( MIRALL_VERSION_STRING "${MIRALL_VERSION}${MIRALL_VERSION_SUFFIX}" )
+
+if( MIRALL_VERSION_BUILD )
+    set( MIRALL_VERSION_STRING "${MIRALL_VERSION_STRING} (build ${MIRALL_VERSION_BUILD})" )
+endif( MIRALL_VERSION_BUILD )
--- a/admin/CMakeLists.txt
+++ b/admin/CMakeLists.txt
@@ -0,0 +1,2 @@
+# traverse into osx subdirectory to install and patch the create-pack script
+add_subdirectory(osx)
--- a/admin/osx/CMakeLists.txt
+++ b/admin/osx/CMakeLists.txt
@@ -0,0 +1,3 @@
+
+configure_file(create_mac_pkg.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
+configure_file(macosx.pkgproj ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
--- a/admin/osx/create_mac_pkg.sh.cmake
+++ b/admin/osx/create_mac_pkg.sh.cmake
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# Script to create the Mac installer using the packages tool from
+# http://s.sudre.free.fr/Software/Packages/about.html
+#
+
+[ "$#" -lt 2 ] && echo "Usage: create_mac_pkg.sh <CMAKE_INSTALL_DIR> <build dir> <installer sign identity>" && exit
+
+# the path of installation must be given as parameter
+if [ -z "$1" ]; then
+  echo "ERROR: Provide the path to CMAKE_INSTALL_DIR to this script as first parameter."
+  exit 1
+fi
+
+if [ -z "$2" ]; then
+  echo "ERROR: Provide the path to build directory as second parameter."
+  exit 1
+fi
+
+install_path="$1"
+build_path="$2"
+identity="$3"
+prjfile=$build_path/admin/osx/macosx.pkgproj
+
+# The name of the installer package
+installer="@APPLICATION_NAME@-@MIRALL_VERSION_FULL@@MIRALL_VERSION_SUFFIX@"
+installer_file="$installer.pkg"
+installer_file_tar="$installer.pkg.tar"
+installer_file_tar_bz2="$installer.pkg.tar.bz2"
+installer_file_tbz="$installer.pkg.tbz"
+
+# set the installer name to the copied prj config file
+/usr/local/bin/packagesutil --file $prjfile set project name "$installer"
+
+# The command line tool of the "Packages" tool, see link above.
+pkgbuild=/usr/local/bin/packagesbuild
+
+$pkgbuild -F $install_path $prjfile
+rc=$?
+
+if [ $rc == 0 ]; then
+  echo "Successfully created $installer_file"
+else
+  echo "Failed to create $installer_file"
+  exit 3
+fi
+
+# Sign the finished package if desired.
+if [ ! -z "$identity" ]; then
+	echo "Will try to sign the installer"
+	pushd $install_path
+	productsign --sign "$identity" "$installer_file" "$installer_file.new"
+	mv "$installer_file".new $installer_file
+	popd
+else
+	echo "No certificate given, will not sign the pkg"
+fi
+
+# FIXME: OEMs?
+# they will need to do their own signing..
+
+
+# Sparkle wants a tbz, it cannot install raw pkg
+cd $install_path
+tar cf "$installer_file_tar" "$installer_file"
+bzip2 -9 "$installer_file_tar"
+mv "$installer_file_tar_bz2" "$installer_file_tbz"
+rc=$?
+if [ $rc == 0 ]; then
+  echo "Successfully created $installer_file"
+else
+  echo "Failed to create $installer_file"
+  exit 3
+fi
--- a/admin/osx/deny_autoupdate_com.owncloud.desktopclient.plist
+++ b/admin/osx/deny_autoupdate_com.owncloud.desktopclient.plist
--- a/admin/osx/macdeployqt.py
+++ b/admin/osx/macdeployqt.py
@@ -0,0 +1,330 @@
+#!/usr/bin/python
+#  This file is part of ownCloud.
+#  It was inspired in large part by the macdeploy script in Clementine
+#  and Tomahawk
+#
+#  ownCloud is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; version 2 of the License.
+#
+#  ownCLoud is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with ownCloud.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import re
+import subprocess
+import commands
+import sys
+from glob import glob
+
+def QueryQMake(attrib):
+    return subprocess.check_output(['qmake', '-query', attrib]).rstrip('\n')
+
+FRAMEWORK_SEARCH_PATH=[
+    '/Library/Frameworks',
+    os.path.join(os.environ['HOME'], 'Library/Frameworks')
+]
+
+LIBRARY_SEARCH_PATH=['/usr/local/lib', '.']
+
+QT_PLUGINS = [
+    'accessible/libqtaccessiblewidgets.dylib',
+    'sqldrivers/libqsqlite.dylib',
+    'platforms/libqcocoa.dylib',
+    'imageformats/libqgif.dylib',
+    'imageformats/libqico.dylib',
+    'imageformats/libqjpeg.dylib',
+    'imageformats/libqsvg.dylib',
+    'imageformats/libqmng.dylib',
+]
+
+QT_PLUGINS_SEARCH_PATH=[
+#    os.path.join(os.environ['QTDIR'], 'plugins'),
+    '/usr/local/Cellar/qt/5.2.1/plugins',
+]
+
+
+class Error(Exception):
+  pass
+
+
+class CouldNotFindQtPluginErrorFindFrameworkError(Error):
+  pass
+
+
+class InstallNameToolError(Error):
+  pass
+
+
+class CouldNotFindQtPluginError(Error):
+  pass
+
+
+class CouldNotFindScriptPluginError(Error):
+  pass
+
+if len(sys.argv) < 2:
+  print 'Usage: %s <bundle.app>' % sys.argv[0]
+  exit()
+
+def is_exe(fpath):
+  return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
+
+bundle_dir = sys.argv[1]
+
+bundle_name = os.path.basename(bundle_dir).split('.')[0]
+
+commands = []
+
+binary_dir = os.path.join(bundle_dir, 'Contents', 'MacOS')
+frameworks_dir = os.path.join(bundle_dir, 'Contents', 'Frameworks')
+commands.append(['mkdir', '-p', frameworks_dir])
+resources_dir = os.path.join(bundle_dir, 'Contents', 'Resources')
+commands.append(['mkdir', '-p', resources_dir])
+plugins_dir = os.path.join(bundle_dir, 'Contents', 'PlugIns')
+binaries = [i for i in glob(os.path.join(bundle_dir, 'Contents', 'MacOS', "*")) if is_exe(i)];
+
+
+fixed_libraries = []
+fixed_frameworks = []
+
+def WriteQtConf():
+  print "Writing qt.conf..."
+  with open(os.path.join(resources_dir, 'qt.conf'), 'w') as f:
+    f.write("[Paths]\nPlugins = PlugIns\n");
+    f.close()
+
+def GetBrokenLibraries(binary):
+  #print "Checking libs for binary: %s" % binary
+  output = subprocess.Popen(['otool', '-L', binary], stdout=subprocess.PIPE).communicate()[0]
+  broken_libs = {
+      'frameworks': [],
+      'libs': []}
+  for line in [x.split(' ')[0].lstrip() for x in output.split('\n')[1:]]:
+    #print "Checking line: %s" % line
+    if not line:  # skip empty lines
+      continue
+    if os.path.basename(binary) == os.path.basename(line):
+      #print "mnope %s-%s" % (os.path.basename(binary), os.path.basename(line))
+      continue
+    if re.match(r'^\s*/System/', line):
+      continue  # System framework
+    elif re.match(r'^\s*/usr/lib/', line):
+      #print "unix style system lib"
+      continue  # unix style system library
+    elif re.match(r'Breakpad', line):
+      continue  # Manually added by cmake.
+    elif re.match(r'^\s*@executable_path', line) or re.match(r'^\s*@loader_path', line):
+      # Potentially already fixed library
+      if '.framework' in line:
+        relative_path = os.path.join(*line.split('/')[3:])
+        if not os.path.exists(os.path.join(frameworks_dir, relative_path)):
+          broken_libs['frameworks'].append(relative_path)
+      else:
+        relative_path = os.path.join(*line.split('/')[1:])
+        #print "RELPATH %s %s" % (relative_path, os.path.join(binary_dir, relative_path))
+        if not os.path.exists(os.path.join(binary_dir, relative_path)):
+          broken_libs['libs'].append(relative_path)
+    elif re.search(r'\w+\.framework', line):
+      broken_libs['frameworks'].append(line)
+    else:
+      broken_libs['libs'].append(line)
+
+  return broken_libs
+
+def FindFramework(path):
+  search_pathes = FRAMEWORK_SEARCH_PATH
+  search_pathes.insert(0, QueryQMake('QT_INSTALL_LIBS'))
+  for search_path in search_pathes:
+    abs_path = os.path.join(search_path, path)
+    if os.path.exists(abs_path):
+      return abs_path
+
+  raise CouldNotFindFrameworkError(path)
+
+def FindLibrary(path):
+  if os.path.exists(path):
+    return path
+  search_pathes = LIBRARY_SEARCH_PATH
+  search_pathes.insert(0, QueryQMake('QT_INSTALL_LIBS'))
+  for search_path in search_pathes:
+    abs_path = os.path.join(search_path, path)
+    if os.path.exists(abs_path):
+      return abs_path
+    else: # try harder---look for lib name in library folders
+      newpath = os.path.join(search_path,os.path.basename(path))
+      if os.path.exists(newpath):
+        return newpath
+
+  return ""
+  #raise CouldNotFindFrameworkError(path)
+
+def FixAllLibraries(broken_libs):
+  for framework in broken_libs['frameworks']:
+    FixFramework(framework)
+  for lib in broken_libs['libs']:
+    FixLibrary(lib)
+
+def FixFramework(path):
+  if path in fixed_libraries:
+    return
+  else:
+    fixed_libraries.append(path)
+  abs_path = FindFramework(path)
+  broken_libs = GetBrokenLibraries(abs_path)
+  FixAllLibraries(broken_libs)
+
+  new_path = CopyFramework(abs_path)
+  id = os.sep.join(new_path.split(os.sep)[3:])
+  FixFrameworkId(new_path, id)
+  for framework in broken_libs['frameworks']:
+    FixFrameworkInstallPath(framework, new_path)
+  for library in broken_libs['libs']:
+    FixLibraryInstallPath(library, new_path)
+
+def FixLibrary(path):
+  if path in fixed_libraries or FindSystemLibrary(os.path.basename(path)) is not None:
+    return
+  else:
+    fixed_libraries.append(path)
+  abs_path = FindLibrary(path)
+  if abs_path == "":
+    print "Could not resolve %s, not fixing!" % path
+    return
+  broken_libs = GetBrokenLibraries(abs_path)
+  FixAllLibraries(broken_libs)
+
+  new_path = CopyLibrary(abs_path)
+  FixLibraryId(new_path)
+  for framework in broken_libs['frameworks']:
+    FixFrameworkInstallPath(framework, new_path)
+  for library in broken_libs['libs']:
+    FixLibraryInstallPath(library, new_path)
+
+def FixPlugin(abs_path, subdir):
+  broken_libs = GetBrokenLibraries(abs_path)
+  FixAllLibraries(broken_libs)
+
+  new_path = CopyPlugin(abs_path, subdir)
+  for framework in broken_libs['frameworks']:
+    FixFrameworkInstallPath(framework, new_path)
+  for library in broken_libs['libs']:
+    FixLibraryInstallPath(library, new_path)
+
+def FixBinary(path):
+  broken_libs = GetBrokenLibraries(path)
+  FixAllLibraries(broken_libs)
+  for framework in broken_libs['frameworks']:
+    FixFrameworkInstallPath(framework, path)
+  for library in broken_libs['libs']:
+    FixLibraryInstallPath(library, path)
+
+def CopyLibrary(path):
+  new_path = os.path.join(binary_dir, os.path.basename(path))
+  args = ['ditto', '--arch=x86_64', path, new_path]
+  commands.append(args)
+  args = ['chmod', 'u+w', new_path]
+  commands.append(args)
+  return new_path
+
+def CopyPlugin(path, subdir):
+  new_path = os.path.join(plugins_dir, subdir, os.path.basename(path))
+  args = ['mkdir', '-p', os.path.dirname(new_path)]
+  commands.append(args)
+  args = ['ditto', '--arch=x86_64', path, new_path]
+  commands.append(args)
+  args = ['chmod', 'u+w', new_path]
+  commands.append(args)
+  return new_path
+
+def CopyFramework(path):
+  parts = path.split(os.sep)
+  print "CopyFramework:", path
+  for i, part in enumerate(parts):
+    if re.match(r'\w+\.framework', part):
+      full_path = os.path.join(frameworks_dir, *parts[i:-1])
+      break
+  args = ['mkdir', '-p', full_path]
+  commands.append(args)
+  args = ['ditto', '--arch=x86_64', path, full_path]
+  commands.append(args)
+  args = ['chmod', 'u+w', os.path.join(full_path, parts[-1])]
+  commands.append(args)
+
+  info_plist = os.path.join(os.path.split(path)[0], '..', '..', 'Contents', 'Info.plist')
+  if os.path.exists(info_plist):
+    args = ['cp', '-r', info_plist, resources_dir]
+    commands.append(args)
+
+  return os.path.join(full_path, parts[-1])
+
+def FixId(path, library_name):
+  id = '@executable_path/../Frameworks/%s' % library_name
+  args = ['install_name_tool', '-id', id, path]
+  commands.append(args)
+
+def FixLibraryId(path):
+  library_name = os.path.basename(path)
+  FixId(path, library_name)
+
+def FixFrameworkId(path, id):
+  FixId(path, id)
+
+def FixInstallPath(library_path, library, new_path):
+  args = ['install_name_tool', '-change', library_path, new_path, library]
+  commands.append(args)
+
+def FindSystemLibrary(library_name):
+  for path in ['/lib', '/usr/lib']:
+    full_path = os.path.join(path, library_name)
+    if os.path.exists(full_path):
+      return full_path
+  return None
+
+def FixLibraryInstallPath(library_path, library):
+  system_library = FindSystemLibrary(os.path.basename(library_path))
+  if system_library is None:
+    new_path = '@executable_path/../MacOS/%s' % os.path.basename(library_path)
+    FixInstallPath(library_path, library, new_path)
+  else:
+    FixInstallPath(library_path, library, system_library)
+
+def FixFrameworkInstallPath(library_path, library):
+  parts = library_path.split(os.sep)
+  for i, part in enumerate(parts):
+    if re.match(r'\w+\.framework', part):
+      full_path = os.path.join(*parts[i:])
+      break
+  new_path = '@executable_path/../Frameworks/%s' % full_path
+  FixInstallPath(library_path, library, new_path)
+
+def FindQtPlugin(name):
+  search_path = QT_PLUGINS_SEARCH_PATH
+  search_path.insert(0, QueryQMake('QT_INSTALL_PLUGINS'))
+  for path in search_path:
+    if os.path.exists(path):
+      if os.path.exists(os.path.join(path, name)):
+        return os.path.join(path, name)
+  raise CouldNotFindQtPluginError(name)
+
+for binary in binaries:
+  FixBinary(binary)
+
+for plugin in QT_PLUGINS:
+  FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
+
+if len(sys.argv) <= 2:
+  print 'Will run %d commands:' % len(commands)
+  for command in commands:
+    print ' '.join(command)
+
+for command in commands:
+  p = subprocess.Popen(command)
+  os.waitpid(p.pid, 0)
+
+WriteQtConf()
--- a/admin/osx/macosx.pkgproj
+++ b/admin/osx/macosx.pkgproj
--- a/admin/osx/sign_app.sh
+++ b/admin/osx/sign_app.sh
@@ -0,0 +1,32 @@
+#!/bin/sh -x
+
+[ "$#" -lt 2 ] && echo "Usage: sign_app.sh <app> <identity>" && exit
+
+src_app="$1"
+identity="$2"
+
+QT_FMWK_VERSION="5"
+
+fix_frameworks() {
+    TMP_APP=$1
+    QT_FMWK_PATH=$2
+    QT_FMWKS=$3/Qt*.framework
+
+    echo "Patching Qt frameworks..."
+    for FMWK in $QT_FMWKS; do
+        FMWK_NAME=`basename -s .framework $FMWK`
+        FMWK=`basename $FMWK`
+        FMWK_PATH="${TMP_APP}/Contents/Frameworks/${FMWK}"
+        mkdir -p "${FMWK_PATH}/Versions/${QT_FMWK_VERSION}/Resources/"
+        cp -avf "${QT_FMWK_PATH}/${FMWK}/Contents/Info.plist" "${FMWK_PATH}/Versions/${QT_FMWK_VERSION}/Resources"
+        (cd "${FMWK_PATH}" && ln -sf "Versions/${QT_FMWK_VERSION}/Resources" "Resources")
+        perl -pi -e "s/${FMWK_NAME}_debug/${FMWK_NAME}/" "${FMWK_PATH}/Resources/Info.plist"
+    done
+}
+
+fix_frameworks "$src_app" `qmake -query QT_INSTALL_LIBS` "$src_app"/Contents/Frameworks
+codesign -s "$identity" --force --verbose=4 --deep "$src_app"
+
+# Just for our debug purposes:
+spctl -a -t exec -vv $src_app
+codesign -dv $src_app
--- a/admin/osx/sign_dmg.sh
+++ b/admin/osx/sign_dmg.sh
@@ -2,19 +2,39 @@

 [ "$#" -lt 2 ] && echo "Usage: sign_dmg.sh <dmg> <identity>" && exit

-src_dmg=$1
-tmp_dmg=writable_$1
-signed_dmg=signed_$1
-identity=$2
-mount="/Volumes/$(basename $src_dmg|cut -d"-" -f1)"
+src_dmg="$1"
+tmp_dmg="writable_$1"
+signed_dmg="signed_$1"
+identity="$2"

-test -e $tmp_dmg && rm -rf $tmp_dmg
-hdiutil convert $src_dmg -format UDRW -o $tmp_dmg
-open $tmp_dmg
-sleep 12s
-pushd $mount
-codesign -s "$identity" $mount/*.app
+QT_FMWKS=`basename ${TMP_APP}/Contents/Frameworks`/Qt*
+QT_FMWK_VERSION="5"
+
+fix_frameworks() {
+    TMP_APP=$1
+    QT_FMWK_PATH=$2
+    QT_FMWKS=$3/Qt*.framework
+
+    echo "Patching Qt frameworks..."
+    for FMWK in $QT_FMWKS; do
+        FMWK_NAME=`basename -s .framework $FMWK`
+        FMWK=`basename $FMWK`
+        FMWK_PATH="${TMP_APP}/Contents/Frameworks/${FMWK}"
+        mkdir -p "${FMWK_PATH}/Versions/${QT_FMWK_VERSION}/Resources/"
+        cp -avf "${QT_FMWK_PATH}/${FMWK}/Contents/Info.plist" "${FMWK_PATH}/Versions/${QT_FMWK_VERSION}/Resources"
+        (cd "${FMWK_PATH}" && ln -sf "Versions/${QT_FMWK_VERSION}/Resources" "Resources")
+        perl -pi -e "s/${FMWK_NAME}_debug/${FMWK_NAME}/" "${FMWK_PATH}/Resources/Info.plist"
+    done
+}
+
+mount="/Volumes/$(basename "$src_dmg"|sed 's,-\([0-9]\)\(.*\),,')"
+test -e "$tmp_dmg" && rm -rf "$tmp_dmg"
+hdiutil convert "$src_dmg" -format UDRW -o "$tmp_dmg"
+hdiutil attach "$tmp_dmg"
+pushd "$mount"
+fix_frameworks "$mount"/*.app `qmake -query QT_INSTALL_LIBS` "$mount"/*.app/Contents/Frameworks
+codesign -s "$identity" --deep "$mount"/*.app
 popd
-diskutil eject $mount
-test -e $signed_dmg && rm -rf $signed_dmg
-hdiutil convert $tmp_dmg -format UDBZ -o $signed_dmg
+diskutil eject "$mount"
+test -e "$signed_dmg" && rm -rf "$signed_dmg"
+hdiutil convert "$tmp_dmg" -format UDBZ -o "$signed_dmg"
--- a/admin/osx/sparkle/dsa_pub.pem
+++ b/admin/osx/sparkle/dsa_pub.pem
@@ -0,0 +1,12 @@
+-----BEGIN PUBLIC KEY-----
+MIIBtzCCASsGByqGSM44BAEwggEeAoGBANC50nTWzroQwwawgaV4jd5TjjqbGKDH
+6CWbZzyfJ246mJcrwTfM2h5Z80GwLSNFBIjtLGpFd7Wd+CI1dY8oIOYxnYgWDSJC
+Al1RMoUSSwx0LRr8J3gojcvvsrhk/t57o9bjXynE2tiP1fwzPb+B3NH/02fMnzfH
+k+B8/8GOnX8dAhUA9PZ1QrH/mN+7ckiGjmoegZdv9tMCgYBPEj2850r8+9tXljU4
+X0s1NKBfiyhBGw/quJMZ3k0fQ/tpOyYwXYBg+9GBVc4pF1CKMVGoBS6XnLrZ1OkC
+OP9g+NNH5cLOKrBxjtd1GPG8UF/sZpak2sVfuNKzRtFT/6WFHc3f7C+LiDFZ2aPO
+A+Kr5MZJ8xxYDYj16WV2nKgoQgOBhQACgYEAuQzycfUZKm7MR9WZSFF9uQ3N3SQr
+PKYggCl6GTdWYmrsFyXLEBmb3m2qXxx9AcfR2LdkTp/CRCzm+HD6wyHVAAVG2kI2
+mWafcahlx/lVMd2yytdRE5pjpjLxw7rrt/fvSZsGwUswQJLl4iDWoE+mFfaaZnnM
+JKoiKLX7LUFOPaU=
+-----END PUBLIC KEY-----
--- a/admin/osx/sparkle/example_update_rss.rss
+++ b/admin/osx/sparkle/example_update_rss.rss
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle"  
+xmlns:dc="http://purl.org/dc/elements/1.1/">
+   <channel>
+      <title>oC</title>
+      <link>127.0.0.1/test.rss</link>
+      <description>Most recent changes with links to updates.</description>
+      <language>en</language>
+         <item>
+            <title>Version 1.5.1.2180-nightly20140202</title>
+            <pubDate>Wed, 09 Feb 2013 19:20:11 +0000</pubDate>
+            <enclosure url="http://127.0.0.1:8080/signed_ownCloud-1.5.1.2180-nightly20140202.dmg" 
+sparkle:version="1.5.1.2180-nightly20140202" 
+length="21078089" 
+type="application/octet-stream"
+sparkle:dsaSignature="MCwCFA/RpP/MvNS1SpjD/2/U6RPyju3HAhQteFXvpUjTnNv3sC/lGkxtEkoB4Q=="
+/>
+         </item>
+   </channel>
+</rss>
+
--- a/admin/win/download_runtimes.sh
+++ b/admin/win/download_runtimes.sh
@@ -0,0 +1,19 @@
+#!/bin/sh -x
+
+#VS2013
+base_url=http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3
+tmp_path=/tmp/.vcredist
+
+mkdir -p $tmp_path
+
+copy_cached_file() {
+  file=$1
+  if [ ! -e $tmp_path/$file ]; then
+    wget -O $tmp_path/$file $base_url/$file
+  fi
+  cp -a $tmp_path/$file $PWD
+}
+
+copy_cached_file "vcredist_x64.exe"
+copy_cached_file "vcredist_x86.exe"
+
--- a/admin/win/nsi/README.md
+++ b/admin/win/nsi/README.md
@@ -0,0 +1,28 @@
+# Windows Installer Translations
+
+## Introduction
+
+Translations on transifex: http://www.transifex.com/projects/p/owncloud/resource/mirall-wininstaller/
+
+Daily sync job: https://ci.owncloud.org/view/translation-sync/job/translation-sync-mirall-wininstaller/
+
+## How to add a new translation string?
+
+0. Add the string to the pofiles/messages.pot manually. This step is necessary
+for the upload of strings to be translated to transifex
+
+1. Run bin/l10n.sh to properly generate declarations.nsh and English.nsh
+
+2. If you want to test your installer right away you need to add the new string
+at least to l10n/English.nsh
+
+
+## How to add a new language?
+
+0. Add the new language to l10n/.tx/config which holds the explicit list of
+languages to be downloaded from transifex on each translation sync run.
+
+1. Add the new language to l10n/languages.nsh
+
+2. In NSIS.template.in the language has to be added in the macro SETLANG.
+
--- a/admin/win/nsi/l10n/.tx/config
+++ b/admin/win/nsi/l10n/.tx/config
@@ -0,0 +1,48 @@
+[main]
+host = https://www.transifex.com
+
+[owncloud.mirall-wininstaller]
+host = https://www.transifex.com
+source_file = pofiles/messages.pot
+source_lang = en
+type = PO
+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.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  
+
+# special handling below
+
+# de_DE holds the formal translation which we want as default
+trans.de_DE = pofiles/de.po
+
+# choose one of the given translations on transifex as default
+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  
+
--- a/admin/win/nsi/l10n/Basque.nsh
+++ b/admin/win/nsi/l10n/Basque.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Erakutsi bertsio-berritze oharrak"
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "kill prozesua ez da aurkitu!"
+StrCpy $PageReinstall_NEW_Field_2 "Desinstalatu instalatu baino lehen"
+StrCpy $PageReinstall_NEW_Field_3 "Ez desinstalatu"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Dagoeneko Instalatuta"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Hautatu nola nahi duzun ${APPLICATION_NAME} instalatzea."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} dagoeneko instalatuta dago.\nHautatu zer operazio egin nahi duzu eta klikatu Hurrengoa jarraitzeko."
+StrCpy $PageReinstall_SAME_Field_2 "Gehitu/Berrinstalatu osagaiak"
+StrCpy $PageReinstall_SAME_Field_3 "Desinstalatu ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalatu ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Hautatu zer mantenu aukera egin nahi duzun."
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Hasierako Menuko Lasterbidea"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Hasierako Menuan ${APPLICATION_NAME}rako Abiarazle bizkorra sortzen."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Mahaigaineko Lasterbidea"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Mahaigaineko Lasterbideak Sortzen"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Abiarazle Bizkorreko Lasterbidea"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Abiarazle Bizkorreko Lasterbidea Sortzen"
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} lasterbidea."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "${APPLICATION_NAME}rako mahaigaineko lasterbidea."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "${APPLICATION_NAME}erako Abiarazle Bizkorreko Lasterbidea."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Ezabatu ${APPLICATION_NAME}en datuen karpeta zure ordenagailutik."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "${APPLICATION_NAME}en datuen karpeta ezabatu nahi duzu?"
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Bai, ezabtu datu karpeta hau."
+StrCpy $UNINSTALLER_FILE_Detail "Desinstalatzailea idazten"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Instalatzaileko Erregistroko Giltzak idazten"
+StrCpy $UNINSTALLER_FINISHED_Detail "Bukatuta"
+StrCpy $UNINSTALL_ABORT "Desinstalazioak erabiltzaileak bertan behera utzi du"
+StrCpy $INIT_NO_QUICK_LAUNCH "Abiarazle Bizkorreko Lasterbidea (E/E)"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Instalatzaileak administratzaile baimenak behar ditu, saiatu berriro"
+StrCpy $INIT_INSTALLER_RUNNING "Instalatzailea dagoeneko martxan da."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Desinstalatzaile honek administratzaile baimenak behar ditu, saiatu berriro"
+StrCpy $INIT_UNINSTALLER_RUNNING "Desinstalatzailea dagoeneko martxan da."
+StrCpy $SectionGroup_Shortcuts "Lasterbideak"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Killing ${APPLICATION_EXECUTABLE} processes."
+StrCpy $PageReinstall_NEW_Field_1 "An older version of ${APPLICATION_NAME} is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_OLD_Field_1 "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
+StrCpy $SEC_APPLICATION_DETAILS "Installing ${APPLICATION_NAME} essentials."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} essentials."
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Leave unchecked to keep the data folder for later use or check to delete the data folder."
+StrCpy $UNINSTALL_MESSAGEBOX "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
+StrCpy $INIT_NO_DESKTOP "Desktop Shortcut (overwrites existing)"
+StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"
--- a/admin/win/nsi/l10n/Catalan.nsh
+++ b/admin/win/nsi/l10n/Catalan.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar les notes de versió"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "S'ha trobat el(s) procés ${APPLICATION_EXECUTABLE} que s'ha d'aturar.$\nVoleu que l'instal·lador l'aturi?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "S'estan matant els processos ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Procés per matar no trobat!"
+StrCpy $PageReinstall_NEW_Field_1 "Una versió anterior de ${APPLICATION_NAME}  està instal·lada en el vostre sistema. Es recomana desinstal·lar la versió actual abans d'instal·lar. Seleccioneu l'operació que desitjeu realitzar i feu clic a Següent per continuar."
+StrCpy $PageReinstall_NEW_Field_2 "Desinstal·lar abans d'instal·lar"
+StrCpy $PageReinstall_NEW_Field_3 "No instal·lar"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ja instal·lat"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Trieu la manera com voleu instal·lar ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "Una versió més recent de ${APPLICATION_NAME} ja està instal.lada!! No es recomana instal.lar una versió més antiga. Si realment voleu instal.lar una versió més antiga, és millor primer desinstal.lar la versió actual. Seleccioni l'operació que desitjeu realitzar i feu clic a Següent per a continuar."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} ja està instal.lat.↩\nSeleccioneu l'operació que desitjeu realitzar i feu clic a Següent per continuar."
+StrCpy $PageReinstall_SAME_Field_2 "Afegir/Reinstal.lar components"
+StrCpy $PageReinstall_SAME_Field_3 "Desinstal.lar ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstal.lar ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Escolliu l'opció de manteniment per executar-ho."
+StrCpy $SEC_APPLICATION_DETAILS "Instal·lant ${APPLICATION_NAME} essencial."
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Accés directe del programa al menú d'inici"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Afegint la drecera per ${APPLICATION_NAME} al menú d'inici."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Drecera a l'escriptori"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Creant les dreceres a l'escriptori"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Drecera d'inici ràpid"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creant la drecera per l'inici ràpid"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} essencial."
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Drecera ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Drecera a l'escrptori per ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Drecera d'inici ràpid per ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_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"
+StrCpy $UNINSTALL_MESSAGEBOX "No sembla que ${APPLICATION_NAME} estigui instal·lat en la carpeta '$INSTDIR'.$\n$\nContinuo igualment (no recomanat)?"
+StrCpy $UNINSTALL_ABORT "La desinstal·lació s'ha cancel·lat."
+StrCpy $INIT_NO_QUICK_LAUNCH "Drecera d'inici ràpid (N/A)"
+StrCpy $INIT_NO_DESKTOP "Drecera de l'escrpitori (sobreescriu l'existent)"
+StrCpy $UAC_ERROR_ELEVATE "No es pot elevar, error:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Aquest instal·lador requereix accés d'administrador, intenteu-ho de nou"
+StrCpy $INIT_INSTALLER_RUNNING "L'instal·lador ja s'està executant."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Aquest desinstal·lador requereix accés d'administrador, intenteu-ho de nou."
+StrCpy $INIT_UNINSTALLER_RUNNING "El desinstal·lador ja s'està executant."
+StrCpy $SectionGroup_Shortcuts "Dreceres"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer"
--- a/admin/win/nsi/l10n/Czech.nsh
+++ b/admin/win/nsi/l10n/Czech.nsh
@@ -0,0 +1,46 @@
+# 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 $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_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 "Stavová ikona pro Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instaluji stavovou ikonu pro Windows Explorer"
+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"
--- a/admin/win/nsi/l10n/Dutch.nsh
+++ b/admin/win/nsi/l10n/Dutch.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Toon releaseopmerkingen"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Gevonden ${APPLICATION_EXECUTABLE} proces(sen) moet worden gestopt.$\nWilt u dat het installatieprogramma dat voor u doet?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Stoppen ${APPLICATION_EXECUTABLE} processen."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Het te stoppen proces is niet gevonden!"
+StrCpy $PageReinstall_NEW_Field_1 "Er is een oudere versie van ${APPLICATION_NAME} geïnstalleerd op uw systeem. geadviseerd wordt om de huidige versie te de-installeren voordat de nieuwe versie wordt geïnstalleerd. Selecteer de uit te voeren actie en klik op Verder om door te gaan."
+StrCpy $PageReinstall_NEW_Field_2 "De-installeren voor installeren"
+StrCpy $PageReinstall_NEW_Field_3 "Niet de-installeren"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Al geïnstalleerd"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Kies hoe u ${APPLICATION_NAME} wilt installeren."
+StrCpy $PageReinstall_OLD_Field_1 "Er is al een recentere versie van ${APPLICATION_NAME} geïnstalleerd! Installeren van een oudere versie wordt niet aangeraden. Als u echt de oudere versie wilt installeren, adviseren we de huidige versie eerst te verwijderen. Kies de actie die u wilt uitvoeren en druk op Verder om door te gaan."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is al geïnstalleerd.\nKies de actie die u wilt uitvoeren en druk op Verder om door te gaan."
+StrCpy $PageReinstall_SAME_Field_2 "Toevoegen/herinstalleren componenten"
+StrCpy $PageReinstall_SAME_Field_3 "De-installeer ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "De-installeer ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Kies de uit te voeren onderhoudsoptie."
+StrCpy $SEC_APPLICATION_DETAILS "Installeren ${APPLICATION_NAME} basis."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Statuspictogrammen voor Windows Verkenner"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installeren statuspictogrammen voor Windows Verkenner"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Startmenu snelkoppeling"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Toevoegen snelkoppeling voor ${APPLICATION_NAME} aan het Startmenu."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Werkblad snelkoppeling"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Aanmaken werkblad snelkoppelingen"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Snelstart snelkoppeling"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Aanmaken snelstart snelkoppeling"
+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"
+StrCpy $UNINSTALL_MESSAGEBOX "Het lijkt er niet op dat ${APPLICATION_NAME} is geïnstalleerd in de map '$INSTDIR'.$\n$\nToch doorgaan (niet aangeraden)?"
+StrCpy $UNINSTALL_ABORT "De-installatie afgebroken door de gebruiker"
+StrCpy $INIT_NO_QUICK_LAUNCH "Snelstart snelkoppeling (N/A)"
+StrCpy $INIT_NO_DESKTOP "Bureaublad snelkoppeling (overschrijft huidige)"
+StrCpy $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 $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
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Show release notes"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Killing ${APPLICATION_EXECUTABLE} processes."
+StrCpy $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_NEW_Field_2 "Uninstall before installing"
+StrCpy $PageReinstall_NEW_Field_3 "Do not uninstall"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Already Installed"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Choose how you want to install ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_Field_2 "Add/Reinstall components"
+StrCpy $PageReinstall_SAME_Field_3 "Uninstall ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Uninstall ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choose the maintenance option to perform."
+StrCpy $SEC_APPLICATION_DETAILS "Installing ${APPLICATION_NAME} essentials."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons 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_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"
+StrCpy $UNINSTALL_MESSAGEBOX "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
+StrCpy $UNINSTALL_ABORT "Uninstall aborted by user"
+StrCpy $INIT_NO_QUICK_LAUNCH "Quick Launch Shortcut (N/A)"
+StrCpy $INIT_NO_DESKTOP "Desktop Shortcut (overwrites existing)"
+StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "This installer requires admin access, try again"
+StrCpy $INIT_INSTALLER_RUNNING "The installer is already running."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "This uninstaller requires admin access, try again"
+StrCpy $INIT_UNINSTALLER_RUNNING "The uninstaller is already running."
+StrCpy $SectionGroup_Shortcuts "Shortcuts"
--- a/admin/win/nsi/l10n/Estonian.nsh
+++ b/admin/win/nsi/l10n/Estonian.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Näita väljalaske märkmeid"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Leitud protsess(id) ${processName} mis tuleks peatada. $\nKas soovid, et installer seiskaks need?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "${APPLICATION_EXECUTABLE} protsessi lõpetamine."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Ei leitud protsessi, mida tappa!"
+StrCpy $PageReinstall_NEW_Field_1 "Üks vanem versioon ${APPLICATION_NAME} on juba paigaldatud. On soovitav see eemaldada enne uue paigaldamist. Vali tehtav toiming ning kliki Jätka."
+StrCpy $PageReinstall_NEW_Field_2 "Eemalda enne paigaldamist"
+StrCpy $PageReinstall_NEW_Field_3 "Ära paigalda"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Juba paigaldatud"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Vali, kuidas sa soovid paigaldada ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "Uuem versioon ${APPLICATION_NAME} on juba paigaldatud! Vanema versiooni paigaldus ei ole soovitatav. Kui tõesti tahad paigaldada vanemat versiooni, siis on parem esmalt eemaldada olemasolev. Vali tehtav toiming ning kliki Jätka."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} on juba paigaldatud.\nVali tehtav toiming ning kliki Jätka."
+StrCpy $PageReinstall_SAME_Field_2 "Lisa/Taaspaigalda komponente"
+StrCpy $PageReinstall_SAME_Field_3 "Desinstalli ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalli ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Vali hooldustegevus, mida sa soovid sooritada."
+StrCpy $SEC_APPLICATION_DETAILS "Paigaldan ${APPLICATION_NAME} põhiosa."
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start Menüü Programmide viit"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Lisan ${APPLICATION_NAME} viida Start menüüsse."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Töölaua otsetee"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Töölaua otseteede loomine"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Kiirvaliku nupp"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Kiirvaliku nupu loomine"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} põhiosa."
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} otsetee."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Töölaua viit rakendusele ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Kiirvaliku viit rakendusele ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Eemalda arvutist rakenduse ${APPLICATION_NAME} andmete kataloog."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Kas soovid kustutada ${APPLICATION_NAME} andmete kataloogi?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Jäta märkimata säilitamaks andmete kataloog hilisemaks kasutuseks või märgi andmete kataloogi kustutamiseks."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Jah, kustuta andmete kaust."
+StrCpy $UNINSTALLER_FILE_Detail "Desinstallija kirjutamine"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Kirjutan paigaldaja registri võtmeid"
+StrCpy $UNINSTALLER_FINISHED_Detail "Lõpetatud"
+StrCpy $UNINSTALL_MESSAGEBOX "Ei leia, et ${APPLICATION_NAME} oleks paigaldatud kataloogi '$INSTDIR'.$\n$\nJätkata sellele vaatamata (pole soovitav)?"
+StrCpy $UNINSTALL_ABORT "Desinstallimine on kasutaja poolt katkestatud"
+StrCpy $INIT_NO_QUICK_LAUNCH "Kiirvaliku viit (N/A)"
+StrCpy $INIT_NO_DESKTOP "Ikoon töölaual (kirjutab olemasoleva üle)"
+StrCpy $UAC_ERROR_ELEVATE "Ei suuda ülendada õigusi, viga: "
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "See paigaldaja vajab admini ligipääsu, proovi uuesti"
+StrCpy $INIT_INSTALLER_RUNNING "Paigaldaja on juba käimas."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "See desinstallija vajab admini ligipääsu, proovi uuesti"
+StrCpy $INIT_UNINSTALLER_RUNNING "See desinstallija on juba käimas"
+StrCpy $SectionGroup_Shortcuts "Viidad"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer"
--- a/admin/win/nsi/l10n/Farsi.nsh
+++ b/admin/win/nsi/l10n/Farsi.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "نمایش پادداشت های انتشار نسخه"
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "پردازش برای از بین بردن یافت نشد!"
+StrCpy $PageReinstall_NEW_Field_3 "حذف نکن"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "از قبل نصب شده است"
+StrCpy $PageReinstall_SAME_Field_2 "افزودن/نصب مجدد اجزا"
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "میانبر دسکتاپ"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "ایجاد میانبر دسکتاپ"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "میانبر بازکردن سریع"
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "بله، این پوشه داده را حذف کن."
+StrCpy $UNINSTALLER_FILE_Detail "نوشتن حذف کننده"
+StrCpy $UNINSTALLER_FINISHED_Detail "اتمام"
+StrCpy $INIT_INSTALLER_RUNNING "نصاب از قبل در حال اجراست."
+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."
+StrCpy $PageReinstall_SAME_Field_3 "Uninstall ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Uninstall ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choose the maintenance option to perform."
+StrCpy $SEC_APPLICATION_DETAILS "Installing ${APPLICATION_NAME} essentials."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons 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"
--- a/admin/win/nsi/l10n/Finnish.nsh
+++ b/admin/win/nsi/l10n/Finnish.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Näytä julkaisutiedot"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Havaittiin sovelluksen ${APPLICATION_EXECUTABLE} prosessi (tai prosesseja) jotka pitäisi pysäyttää.\nHaluatko että asennusohjelma pysäyttää nämä puolestasi?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Pysäytetään sovelluksen ${APPLICATION_EXECUTABLE} prosessit."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Tapettavaa prosessia ei löytynyt!"
+StrCpy $PageReinstall_NEW_Field_1 "Vanhempi versio sovelluksesta ${APPLICATION_NAME} on jo asennettu. On suositeltavaa että poistat vanhan asennuksen ensin. Valitse mikä toiminto suoritetaan ja napsauta Seuraava jatkaaksesi."
+StrCpy $PageReinstall_NEW_Field_2 "Poista ennen asentamista"
+StrCpy $PageReinstall_NEW_Field_3 "Älä poista"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Asennettu jo"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Valitse miten ${APPLICATION_NAME} asennetaan."
+StrCpy $PageReinstall_OLD_Field_1 "Uudempi versio sovelluksesta ${APPLICATION_NAME} on jo asennettu! Vanhan version asennus ei ole suositeltavaa. Jos todella haluat asentaa vanhemman version, kannattaa poistaa nykyisen version asennus ensin. Valitse minkä toimenpiteen haluat suorittaa ja paina Seuraava jatkaaksesi."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} on jo asennettu.\nValitse suoritettava toimenpide ja napsauta Seuraava jatkaaksesi."
+StrCpy $PageReinstall_SAME_Field_2 "Lisää/uudelleenasenna komponentteja"
+StrCpy $PageReinstall_SAME_Field_3 "Poista ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Poista ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Valitse suoritettava huoltotoimenpide."
+StrCpy $SEC_APPLICATION_DETAILS "Asennetaan sovelluksen ${APPLICATION_NAME} välttämättömyyksiä."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Tilakuvakkeet Windows Explorerille"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Asennetaan tilakuvakkeet Windows Explorerille"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Käynnistä-valikon pikakuvake"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Lisätään ${APPLICATION_NAME}-pikakuvake Käynnistä-valikkoon."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Työpöydän pikakuvake"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Luodaan työpöydän pikakuvakkeet"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Pikakäynnistyksen pikakuvake"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Luodaan pikakuvaketta pikakäynnistykseen"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} välttämättömyydet."
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME}-pikakuvake."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Sovelluksen ${APPLICATION_NAME} työpyötäpikakuvake."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Pikakäynnistyksen pikakuvake sovellukselle ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_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_REGISTRY_Detail "Kirjoitetaan asennusohjelman rekisteriavaimia"
+StrCpy $UNINSTALLER_FINISHED_Detail "Valmis"
+StrCpy $UNINSTALL_MESSAGEBOX "Vaikuttaa siltä että sovellus ${APPLICATION_NAME} on asennettu kansioon '$INSTDIR'.\n\nHaluatko jatkaa tästä huolimatta (ei suositeltavaa)?"
+StrCpy $UNINSTALL_ABORT "Poistaminen keskeytettiin käyttäjän toimesta"
+StrCpy $INIT_NO_DESKTOP "Työpöydän pikakuvake (korvaa nykyinen)"
+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 $INIT_UNINSTALLER_RUNNING "Poisto-ohjelma on jo käynnissä."
+StrCpy $SectionGroup_Shortcuts "Pikakuvakkeet"
+StrCpy $UNINSTALLER_FILE_Detail "Writing Uninstaller"
+StrCpy $INIT_NO_QUICK_LAUNCH "Quick Launch Shortcut (N/A)"
+StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"
--- a/admin/win/nsi/l10n/French.nsh
+++ b/admin/win/nsi/l10n/French.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Montrer les notes de version"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Le(s) processus en cours d’exécution ${APPLICATION_EXECUTABLE} doit être stoppé afin de poursuivre.$\nVoulez-vous que le programme d’installation s’en charge pour vous ?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Fermeture du processus ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Les processus à stopper n'ont pas été trouvés."
+StrCpy $PageReinstall_NEW_Field_1 "Une vieille version de ${APPLICATION_NAME} est installée sur votre système. Il est recommandé que vous désinstalliez cette version avant l'installation. Sélectionnez l'opération que vous voulez exécuter et cliquez sur Suivant pour continuer."
+StrCpy $PageReinstall_NEW_Field_2 "Désinstaller avant d'installer à nouveau"
+StrCpy $PageReinstall_NEW_Field_3 "Ne pas désinstaller"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Déjà installée"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Choisissez comment vous voulez installer ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "Une version plus récente de ${APPLICATION_NAME} est déjà installée ! Il n'est pas recommandé d'installer une version plus ancienne. Si vous voulez vraiment installer cette version plus ancienne, il est préférable de d'abord désinstaller la version courante. Sélectionnez l'opération que vous voulez exécuter et cliquez sur Suivant pour continuer."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} est déjà installée.\nSélectionnez l'opération que vous voulez exécuter et cliquez sur Suivant pour continuer."
+StrCpy $PageReinstall_SAME_Field_2 "Ajouter/Réinstaller des composants"
+StrCpy $PageReinstall_SAME_Field_3 "Désinstaller ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Désinstaller ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choisir l'option de maintenance à appliquer."
+StrCpy $SEC_APPLICATION_DETAILS "Installer les essentiels de ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Raccourci programme du menu Démarrer"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Ajouter un raccourci pour ${APPLICATION_NAME} au menu Démarrer."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Raccourci Bureau"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Créer un raccourci Bureau"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Raccourci de lancement rapide"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Créer un raccourci de lancement rapide"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Essentiels de ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Raccourci de ${APPLICATION_NAME}"
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Raccourci Bureau de ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Raccourci de lancement rapide de ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Supprimer de cet ordinateur le dossier de données de ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Voulez-vous supprimer le dossier de données de ${APPLICATION_NAME} ?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Laisser non-coché pour garder le dossier de données pour un usage ultérieur. Cocher pour supprimer le dossier de données."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Oui, supprimer ce dossier de données."
+StrCpy $UNINSTALLER_FILE_Detail "Écriture du désinstallateur"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Écriture des clefs de registre du désinstallateur"
+StrCpy $UNINSTALLER_FINISHED_Detail "Terminé"
+StrCpy $UNINSTALL_MESSAGEBOX "Il semble que ${APPLICATION_NAME} ne soit pas installée dans le dossier '$INSTDIR'.$\n$\nVoulez-vous poursuivre (non recommandé) ?"
+StrCpy $UNINSTALL_ABORT "Désinstallation interrompue par l'utilisateur"
+StrCpy $INIT_NO_QUICK_LAUNCH "Raccourci de lancement rapide (N/A)"
+StrCpy $INIT_NO_DESKTOP "Raccourci bureau (remplace l’existant)"
+StrCpy $UAC_ERROR_ELEVATE "Echec d'élévation, erreur :"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Cet installateur requiert les droits administrateur, essayez à nouveau"
+StrCpy $INIT_INSTALLER_RUNNING "Une installation est déjà en cours."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Ce désinstallateur requiert les droits administrateur, essayez à nouveau"
+StrCpy $INIT_UNINSTALLER_RUNNING "Une désinstallation est déjà en cours."
+StrCpy $SectionGroup_Shortcuts "Raccourcis"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer"
--- a/admin/win/nsi/l10n/Galician.nsh
+++ b/admin/win/nsi/l10n/Galician.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Amosar as notas de publicación"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Atopáronse procesos ${APPLICATION_EXECUTABLE} que teñen que ser detidos.$\nQuere que sexa o instalador quen o(s) deteña?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Matando os procesos ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Non se atopou o proceso para matalo!"
+StrCpy $PageReinstall_NEW_Field_1 "No seu sistema hai instalada unha versión anterior do ${APPLICATION_NAME}. Recomendámoslle que desinstale a versión actual antes de instalar. Seleccione a operación que quere realizar e prema en Seguinte para continuar."
+StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
+StrCpy $PageReinstall_NEW_Field_3 "Non desinstalar"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Xa instalado"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Escolla como quere instalar ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "Ten instalada unha versión actualizada do ${APPLICATION_NAME}! recomendámoslle que non instale unha versión anterior. Se realmente quere instalar esta versión máis antiga, é preferíbel que desinstale a versión actual antes de instalar. Seleccione a operación que quere realizar e prema en Seguinte para continuar."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} xa está instalado.\nSeleccione a operación que que quere realizar e prema en Seguinte para continuar."
+StrCpy $PageReinstall_SAME_Field_2 "Engadir/reinstalar compoñentes"
+StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalar ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Escolla a opción de mantemento a realizar."
+StrCpy $SEC_APPLICATION_DETAILS "Instalando ${APPLICATION_NAME} esenciais."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Iconas de estado para Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalando as iconas de estado para Windows Explorer"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso directo ao programa no menú de inicio"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Engadindo o acceso directo ao ${APPLICATION_NAME} no menú de inicio"
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Acceso directo no escritorio"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Creando os accesos directos no escritorio"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Acceso de inicio rápido"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creando o acceso de inicio rápido"
+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"
+StrCpy $UNINSTALL_MESSAGEBOX "Semella que ${APPLICATION_NAME} non está instalado no directorio «$INSTDIR».$\n$\nContinuar aínda así (non recomendado)?"
+StrCpy $UNINSTALL_ABORT "A desinstalación foi interrompida polo usuario."
+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 $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 $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
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Release-Informationen anzeigen"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "${APPLICATION_EXECUTABLE} Prozess(e) gefunden, die gestoppt werden müssen.$\nWollen Sie, dass der Installer diese nun für Sie stoppt?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Stoppe ${APPLICATION_EXECUTABLE} Prozess(e)."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Prozess zum Beenden nicht gefunden!"
+StrCpy $PageReinstall_NEW_Field_1 "Eine ältere Version von  ${APPLICATION_NAME} ist auf Ihrem System installiert. Es wird empfohlen, diese Version zunächst zu entfernen. Wählen Sie unter folgenden Vorgehenweisen und wählen Sie $\"Weiter$\"."
+StrCpy $PageReinstall_NEW_Field_2 "Vor der Installation entfernen"
+StrCpy $PageReinstall_NEW_Field_3 "Nicht entfernen"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Bereits installiert"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Wählen Sie die Methode, mit der sie ${APPLICATION_NAME} installieren wollen."
+StrCpy $PageReinstall_OLD_Field_1 "Eine neuere Version von  ${APPLICATION_NAME} ist bereits installiert! Es wird nicht empfohlen, eine ältere Version zu installieren. Wollen Sie dies trotzdem tun, so sollten Sie die aktuelle Version zunächst entfernen. Wählen Sie eine Vorgehensweise und wählen dann $\"Weiter$\"."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} ist bereits installiert.\nWählen Sie eine Vorgehensweise und klicken Sie auf $\"Weiter$\"."
+StrCpy $PageReinstall_SAME_Field_2 "Komponenten hinzufügen"
+StrCpy $PageReinstall_SAME_Field_3 "${APPLICATION_NAME} entfernen"
+StrCpy $UNINSTALLER_APPDATA_TITLE "${APPLICATION_NAME} entfernen"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Wählen Sie zur Ausführung die Wartungsoption."
+StrCpy $SEC_APPLICATION_DETAILS "Installiere ${APPLICATION_NAME} Basis."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status-Icons für den Windows-Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installiere Status-Icons für den Windows-Explorer"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Installiere Verknüpfung im Programmmenü"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Füge Verknüpfung für ${APPLICATION_NAME} dem Startmenü hinzu."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Desktop-Verknüpfung"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Erstellt Desktop-Verknüpfung"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Schnellstart-Verknüpfung"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Erstelle Schnellstart-Verknüpfung"
+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"
+StrCpy $UNINSTALL_MESSAGEBOX "Es scheint, als ob ${APPLICATION_NAME} nicht im Verzeichnis  '$INSTDIR' installiert ist.$\n$\nTrotzdem fortfahren (nicht empfohlen)?"
+StrCpy $UNINSTALL_ABORT "Deinstallation vom Benutzer abgebrochen"
+StrCpy $INIT_NO_QUICK_LAUNCH "Schnellstart-Verknüpfung (Nicht verfügbar)"
+StrCpy $INIT_NO_DESKTOP "Desktop-Verknüpfung (überschreibt vorhandene)"
+StrCpy $UAC_ERROR_ELEVATE "Kann Rechte nicht erhöhen, Fehler:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Dieses Installationsprogramm erfordert Administrator-Rechte, bitte erneut versuchen"
+StrCpy $INIT_INSTALLER_RUNNING "Das Installationsprogramm wird bereits ausgeführt."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Das Deinstallationsprogramm erfordert Administrator-Rechte. Bitte erneut versuchen."
+StrCpy $INIT_UNINSTALLER_RUNNING "Das Deinstallationsprogramm wird bereits ausgeführt."
+StrCpy $SectionGroup_Shortcuts "Verknüpfungen"
--- a/admin/win/nsi/l10n/Greek.nsh
+++ b/admin/win/nsi/l10n/Greek.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Εμφάνιση σημειώσεων έκδοσης"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Βρέθηκε η(οι) διεργασία(ες) ${APPLICATION_EXECUTABLE} η(οι) οποία(ες) θα πρέπει να τερματιστεί(ούν).$\nΘα θέλατε να την(τις) τερματίσει ο βοηθός εγκατάστασης για εσάς;"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Τερματισμός διεργασιών ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Δεν βρέθηκε διεργασία για βίαιο τερματισμό!"
+StrCpy $PageReinstall_NEW_Field_1 "Μια παλαιότερη έκδοση της ${APPLICATION_NAME} είναι εγκατεστημένη στο σύστημά σας. Είναι προτεινόμενο να απεγκαταστήσετε την τρέχουσα έκδοση πριν την εγκατάσταση. Επιλέξτε τη διαδικασία που επιθυμείτε να εκτελέσετε και πατήστε Επόμενο για να συνεχίσετε."
+StrCpy $PageReinstall_NEW_Field_2 "Απεγκατάσταση πριν την εγκατάσταση"
+StrCpy $PageReinstall_NEW_Field_3 "Να μην απεγκατασταθεί"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ήδη εγκατεστημένη"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Επιλέξτε πώς θέλετε να εγκαταστήσετε την ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "Μια νεώτερη έκδοση της ${APPLICATION_NAME} είναι ήδη εγκατεστημένη! Δεν συνίσταται να εγκαταστείσετε μια παλαιότερη έκδοση. Εάν θέλετε πραγματικά να εγκαταστήσετε αυτήν την παλαιότερη έκδοση, είναι καλύτερο να απεγκαταστήσετε την τρέχουσα έκδοση πρώτα. Επιλέξτε τη διαδικασία που επιθυμείτε να εκτελέσετε και επιλέξτε Επόμενο για να συνεχίσετε."
+StrCpy $PageReinstall_SAME_Field_1 "Η ${APPLICATION_NAME} ${VERSION} είναι ήδη εγκατεστημένη.\n\nΕπιλέξτε τη διαδικασία που επιθυμείτε να εκτελέσετε και επιλέξτε Επόμενο για να συνεχίσετε."
+StrCpy $PageReinstall_SAME_Field_2 "Προσθήκη/ Επανεγκατάσταση συνιστωσών"
+StrCpy $PageReinstall_SAME_Field_3 "Απεγκατάσταση ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Απεγκατάσταση ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Επιλέξτε την επιλογή συντήρησης που θα πραγματοποιηθεί."
+StrCpy $SEC_APPLICATION_DETAILS "Εγκατάσταση βάσης ${APPLICATION_NAME} σε εξέλιξη."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Εικονίδια κατάστασης για την Εξερεύνηση των Windows"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Εγκατάσταση εικονιδίων κατάστασης στην Εξερεύνηση των Windows"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Συντόμευση στο Αρχικό Μενού"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Προσθήκη συντόμευσης για την ${APPLICATION_NAME} στο Αρχικό Μενού."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Συντόμευση επιφάνειας εργασίας"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Δημιουργία Συντομεύσεων στην Επιφάνεια Εργασίας"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Συντόμευση Ταχείας Εκκίνησης"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Δημιουργία Συντόμευσης Ταχείας Εκκίνησης"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Βάση ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Συντόμευση ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Συντόμευση επιφάνειας εργασίας της ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Συντόμευση Ταχείας Εκκίνησης της ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_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 "Ολοκληρώθηκε"
+StrCpy $UNINSTALL_MESSAGEBOX "Δεν φαίνεται να είναι εγκατεστημένηη η ${APPLICATION_NAME} στον κατάλογο '$INSTDIR'.$\n$\nΣυνέχιση παρ' όλα αυτά (δεν συνίσταται);"
+StrCpy $UNINSTALL_ABORT "Η απεγκατάσταση ματαιώθηκε από το χρήστη"
+StrCpy $INIT_NO_QUICK_LAUNCH "Συντόμευση Ταχείας Εκκίνησης (Μ/Δ)"
+StrCpy $INIT_NO_DESKTOP "Συντόμευση Επιφάνειας Εργασίας (αντικαθιστά υπάρχουσα)"
+StrCpy $UAC_ERROR_ELEVATE "Αδυναμία ανύψωσης, σφάλμα:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Αυτή η εφαρμογή εγκατάστασης απαιτεί πρόσβαση διαχειριστή, δοκιμάστε ξανά"
+StrCpy $INIT_INSTALLER_RUNNING "Η εφαρμογή εγκατάστασης λειτουργεί ήδη."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Αυτή η εφαρμογή απεγκατάστασης απαιτεί πρόσβαση διαχειριστή, δοκιμάστε ξανά"
+StrCpy $INIT_UNINSTALLER_RUNNING "Η εφαρμογή απεγκατάστασης λειτουργεί ήδη."
+StrCpy $SectionGroup_Shortcuts "Συντομεύσεις"
--- a/admin/win/nsi/l10n/Hungarian.nsh
+++ b/admin/win/nsi/l10n/Hungarian.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Kiadási jegyzetek megtekintése"
+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_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 $UNINSTALLER_FINISHED_Detail "Befejezve"
+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_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 $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 "Status icons for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons 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"
--- a/admin/win/nsi/l10n/Italian.nsh
+++ b/admin/win/nsi/l10n/Italian.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostra le note di rilascio"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Trovati ${APPLICATION_EXECUTABLE} processi che dovrebbero essere fermati.$\nVuoi che il programma di installazione li fermi al posto tuo?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Sto terminando ${APPLICATION_EXECUTABLE} processi."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Il processo da terminare non è stato trovato!"
+StrCpy $PageReinstall_NEW_Field_1 "Una versione più datata di ${APPLICATION_NAME} è installata sul tuo sistema. Si consiglia di disinstallare la versione attuale prima di installare. Seleziona l'operazione da eseguire e fai clic su Avanti per continuare."
+StrCpy $PageReinstall_NEW_Field_2 "Disinstalla prima di installare"
+StrCpy $PageReinstall_NEW_Field_3 "Non disinstallare"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Già installato"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Scegli come desideri installare ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "Una versione più recente di ${APPLICATION_NAME} è già installata! Non è consigliabile installare una versione più vecchia. Se vuoi davvero installare una versione più vecchia, ti consigliamo di rimuovere prima la versione attuale. Scegli l'operazione da eseguire e fai clic su Avanti per continuare."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} è già installato.\nSeleziona l'operazione che desideri eseguire e fai clic su Avanti per continuare."
+StrCpy $PageReinstall_SAME_Field_2 "Aggiungi/Reinstalla i componenti"
+StrCpy $PageReinstall_SAME_Field_3 "Disinstalla ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Disinstalla ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Scegli l'opzione di manutenzione da eseguire."
+StrCpy $SEC_APPLICATION_DETAILS "Installazione degli elementi fondamentali di ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Icone di stato per Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installazione delle icone di stato per Windows Explorer"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Scorciatoia di programma menu Start"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Aggiunta della scorciatoia per ${APPLICATION_NAME} al menu Start."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Scorciatoia del desktop"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Creazione delle scorciatoie del desktop"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Scorciatoia dell'avvio veloce"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creazione della scorciatoia dell'avvio veloce"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Oggetti fondamentali di ${APPLICATION_NAME}"
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Scorciatoia di ${APPLICATION_NAME}"
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Scorciatoia del desktop per ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Scorciatoia per ${APPLICATION_NAME} dell'avvio veloce."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Rimuovi la cartella dei dati di ${APPLICATION_NAME} dal tuo computer."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Vuoi eliminare la cartella dei dati di ${APPLICATION_NAME}?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Lasciala smarcata per conservare la cartella dei dati per usi futuri o marcala per eliminarla."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Sì, elimina questa cartella di dati."
+StrCpy $UNINSTALLER_FILE_Detail "Creazione del programma di disinstallazione"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Scrittura delle chiavi di registro del programma di installazione"
+StrCpy $UNINSTALLER_FINISHED_Detail "Completato"
+StrCpy $UNINSTALL_MESSAGEBOX "Non sembra che ${APPLICATION_NAME} sia installato nella cartella '$INSTDIR'.$\nVuoi continuare comunque (non consigliato)?"
+StrCpy $UNINSTALL_ABORT "Disinstallazione interrotta dall'utente"
+StrCpy $INIT_NO_QUICK_LAUNCH "Scorciatoia dell'avvio veloce (N/D)"
+StrCpy $INIT_NO_DESKTOP "Scorciatoia del desktop (sovrascrivi se esistente)"
+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 $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
@@ -0,0 +1,46 @@
+# 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}　の旧バージョンがインストールされています。\n旧バージョンをアンインストールし、最新バージョンをインストールするのをお勧めします。\nオペレーションを選択し、次へをクリックする。"
+StrCpy $PageReinstall_NEW_Field_2 "インストール前にアンインストールする"
+StrCpy $PageReinstall_NEW_Field_3 "アンインストールしない"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "インストール済"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "${APPLICATION_NAME} のインストール方法を選択する"
+StrCpy $PageReinstall_OLD_Field_1 "${APPLICATION_NAME} の最新バージョンがすでにインストールされています。\n旧バージョンのインストールはお勧めしません。旧バージョンのインストールが本当に必要な場合は、まず最新バージョンをアンインストールしてから、旧バージョンをインストールしてください。\nオペレーションを選択し、次へをクリックする。"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION}　はすでにインストールされています。\n実行するオペレーションを選択し、次へをクリックする"
+StrCpy $PageReinstall_SAME_Field_2 "追加/再インストールコンポーネント"
+StrCpy $PageReinstall_SAME_Field_3 "${APPLICATION_NAME} をアンインストール"
+StrCpy $UNINSTALLER_APPDATA_TITLE "${APPLICATION_NAME} をアンインストール"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "実行するには、メンテナンスオプションを選択してください。"
+StrCpy $SEC_APPLICATION_DETAILS "${APPLICATION_NAME} の重要なパッケージをインストール中"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Windowsエクスプローラの状態アイコン"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Windowsエクスプローラの状態アイコンをインストール中"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "スタートメニューショートカット"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "スタートメニューに${APPLICATION_NAME}　のショートカットの追加"
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "デスクトップショートカット"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "デスクトップショートカット作成"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "クイック起動ショートカット"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "クイック起動ショートカットを作成"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} の重要なパッケージ"
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} のショートカット"
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "${APPLICATION_NAME} のデスクトップショートカット"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "${APPLICATION_NAME} のクイック起動ショートカット"
+StrCpy $UNINSTALLER_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 "終了"
+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 $INIT_UNINSTALLER_RUNNING "アンインストーラーは、すでに起動しています。"
+StrCpy $SectionGroup_Shortcuts "ショートカット"
--- a/admin/win/nsi/l10n/Polish.nsh
+++ b/admin/win/nsi/l10n/Polish.nsh
@@ -0,0 +1,46 @@
+# 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 $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_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_SAME_Field_2 "Doda/Przeinstaluj komponenty"
+StrCpy $PageReinstall_SAME_Field_3 "Odinstaluj ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Odinstaluj ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Wybierz sposób utrzymywania."
+StrCpy $SEC_APPLICATION_DETAILS "Instaluje niezbędne pliki ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Ikona statusu dla Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instaluj ikonę statusu dla Windows Explorer"
+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"
--- a/admin/win/nsi/l10n/Portuguese.nsh
+++ b/admin/win/nsi/l10n/Portuguese.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar notas de lançamento"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Encontrados processos ${APPLICATION_EXECUTABLE} que precisam de ser parados.$\nDeseja que o instalador os pare ?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "A terminar processos ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Processo para terminar não foi encontrado!"
+StrCpy $PageReinstall_NEW_Field_1 "Está instalada uma versão anterior de ${APPLICATION_NAME} no seu sistema. Recomenda-se que desinstale primeiro a versão atual antes de instalar. Selecione a operação que pretende fazer, e clique Seguinte para continuar."
+StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
+StrCpy $PageReinstall_NEW_Field_3 "Não desinstalar"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Já instalado"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Escolha como pretende instalar ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "Já esta instalada uma nova versão dfe ${APPLICATION_NAME}! Não se recomenda instalar uma versão anterior. Se quer mesmo instalar esta versão mais antiga, é melhor desinstalar primeiro a versão atual. Selecione a operação que pretende fazer e clique Seguinte para continuar."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} já está instalado.\nSelecione a operação que deseja fazer, e clique Seguinte para continuar."
+StrCpy $PageReinstall_SAME_Field_2 "Adicionar/Reinstalar Componentes"
+StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalar ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Escolha a opção de manutenção a fazer."
+StrCpy $SEC_APPLICATION_DETAILS "A instalar o essencial de ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Icons de estado para Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "A instalar icons de estado para Windows Explorer"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Atalho  do progama no Menu Inicial"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "A adicionar o atalho de ${APPLICATION_NAME} ao Menu Inicial."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Atalho da área de trabalho"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "A criar atalhos da área de trabalho"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Atalho de início rápido"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "A criar atalho de início rápido"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "O essencial de ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Atalho de ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Atalho no ambiente de trabalho de ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Atalho de início rápido de ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Remover a pasta de dados de ${APPLICATION_NAME} do seu computador."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Deseja remover a pasta de dados de ${APPLICATION_NAME}?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Não assinale para manter a pasta de dados para uso mais tarde, ou assinale para apagar a pasta de dados."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Sim, remover esta pasta."
+StrCpy $UNINSTALLER_FILE_Detail "A escrever o Desinstalador"
+StrCpy $UNINSTALLER_REGISTRY_Detail "A escrever chaves de registo do instalador"
+StrCpy $UNINSTALLER_FINISHED_Detail "Terminado"
+StrCpy $UNINSTALL_MESSAGEBOX "Não parece que ${APPLICATION_NAME} esteja instalado no diretório '$INSTDIR'.$\n$\nContinuar na mesma (não recomendado)?"
+StrCpy $UNINSTALL_ABORT "Desinstalação cancelada pelo utilizador"
+StrCpy $INIT_NO_QUICK_LAUNCH "Atalho de Início Rápido (N/A)"
+StrCpy $INIT_NO_DESKTOP "Atalho do Ambiente de Trabalho (sobrepõe o existente)"
+StrCpy $UAC_ERROR_ELEVATE "Incapaz de elevar, erro:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Este instalador precisa de permissões de administrador, tente novamente"
+StrCpy $INIT_INSTALLER_RUNNING "O instalador já está a correr."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Este desinstalador precisa de acesso de administrador; tente novamente"
+StrCpy $INIT_UNINSTALLER_RUNNING "O desinstalador já está a correr."
+StrCpy $SectionGroup_Shortcuts "Atalhos"
--- a/admin/win/nsi/l10n/PortugueseBR.nsh
+++ b/admin/win/nsi/l10n/PortugueseBR.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar notas de lançamento"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Encontrados ${APPLICATION_EXECUTABLE} processo(s) que precisam ser interrompidos.$\nVocê quer que o instalador pare esses processos para você?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Desativando ${APPLICATION_EXECUTABLE} processos."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Processo para eliminar não encontrado!"
+StrCpy $PageReinstall_NEW_Field_1 "Uma versão mais antiga de ${APPLICATION_NAME} está instalado em seu sistema. É recomendado que você desinstale a versão atual antes de instalar. Selecione a operação que deseja executar e clique em Avançar para continuar."
+StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
+StrCpy $PageReinstall_NEW_Field_3 "Não desinstale"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Já Instalado"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Escolha como você deseja instalar ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "A versão mais recente do ${APPLICATION_NAME} já está instalado! Não é recomendado que você instale uma versão mais antiga. Se você realmente deseja instalar esta versão mais antiga, é melhor desinstalar a versão atual primeiro. Selecione a operação que deseja executar e clique em Avançar para continuar."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${version} já está instalado. \nSelecione a operação que deseja executar e clique em Avançar para continuar."
+StrCpy $PageReinstall_SAME_Field_2 "Adicionar/reinstalar componentes"
+StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalar ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Escolha a opção de realizar manutenção."
+StrCpy $SEC_APPLICATION_DETAILS "Instalando ${APPLICATION_NAME}  fundamentos."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Ícones de status para Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalando os ícones de status para o Windows Explorer"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Menu Iniciar Programa Atalho"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Adicionando atalho para ${APPLICATION_NAME} ao Menu Iniciar."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Atalho Desktop"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Criando Atalhos de Desktop"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Atalho Rápido"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Criando Atalho Rápido"
+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"
+StrCpy $UNINSTALL_MESSAGEBOX "Não parece que ${APPLICATION_NAME} está instalado no diretório '$INSTDIR'.$\n$\nContinuar assim mesmo (não recomendado)?"
+StrCpy $UNINSTALL_ABORT "Desinstalação abortada pelo usuário"
+StrCpy $INIT_NO_QUICK_LAUNCH "Atalho de Inicialização Rápida (N/A)"
+StrCpy $INIT_NO_DESKTOP "Atalho Desktop (substitui os existente)"
+StrCpy $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 $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
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Показать примечания к выпуску"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Обнаружены процес(сы) ${APPLICATION_EXECUTABLE}, которые должны быть остановлены.$\nХотите программа установки сделает это самостоятельно?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Завершение процессов ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Не найдены процессы, которые нужно завершить!"
+StrCpy $PageReinstall_NEW_Field_1 "Обнаружена более старая версия ${APPLICATION_NAME}. Рекомендуется удалить её перед установкой. Выберите желаемое действие и нажмите $\"Далее$\"."
+StrCpy $PageReinstall_NEW_Field_2 "Удалить перед установкой"
+StrCpy $PageReinstall_NEW_Field_3 "Не устанавливать"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Уже установлено"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Выберите, как вы хотите установить  ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "Новая версия ${APPLICATION_NAME} уже установлена! Не рекомендуется устанавливать старую версию. Если вы действительно хотите, чтобы устанавливать старую версию, лучше удалить текущую версию. Выберите операцию, которую необходимо выполнить, и нажмите Далее, чтобы продолжить."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} уже установлена.\nВыберите операцию, которую необходимо выполнить, и нажмите Далее, чтобы продолжить."
+StrCpy $PageReinstall_SAME_Field_2 "Добавить/Переустановить компоненты"
+StrCpy $PageReinstall_SAME_Field_3 "Удалить ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Удалить ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Выберите опцию обслуживания для исполнения."
+StrCpy $SEC_APPLICATION_DETAILS "Установка зависимостей приложения ${APPLICATION_NAME}"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Значки статуса для проводника Windows"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Установка значков статуса для проводника Windows"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Ярлык в меню Пуск"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Добавление ярлыка ${APPLICATION_NAME} в меню Пуск"
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Ярлык на рабочем столе"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Создание ярлыков на рабочем столе"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Ярлык в меню быстрого запуска"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Создание ярлыка в меню быстрого запуска"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Зависимости приложения ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Ярлык приложения ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Ярлык на рабочем столе для ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Ярлык в меню быстрого запуска для ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Удалить папку данных ${APPLICATION_NAME} с вашего компьютера."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Вы хотите удалить папку с данными ${APPLICATION_NAME} ?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Оставьте неактивным, для сохранения папки с данными приложения, для последующего их использования."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Да, удалить эту папку с данными."
+StrCpy $UNINSTALLER_FILE_Detail "Сохранение деинсталятора"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Запись ключей реестра"
+StrCpy $UNINSTALLER_FINISHED_Detail "Завершено"
+StrCpy $UNINSTALL_MESSAGEBOX "Скорее всего, приложение ${APPLICATION_NAME} уже установлено в директорию '$INSTDIR'.\nВсе равно продолжить (не рекомендуется)?"
+StrCpy $UNINSTALL_ABORT "Удаление отменено пользователем"
+StrCpy $INIT_NO_QUICK_LAUNCH "Ярлык быстрого запуска (недоступен)"
+StrCpy $INIT_NO_DESKTOP "Ярлык на рабочем столе (перезаписать существующий)"
+StrCpy $UAC_ERROR_ELEVATE "Невозможно поднять, ошибка:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Для установки необходимы права администратора, попробуйте ещё раз."
+StrCpy $INIT_INSTALLER_RUNNING "Установщик уже запущен."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Этот деинсталятор требует права администратора, попытайтесь ещё"
+StrCpy $INIT_UNINSTALLER_RUNNING "Программа удаления уже выполняется."
+StrCpy $SectionGroup_Shortcuts "Ярлыки"
--- a/admin/win/nsi/l10n/SimpChinese.nsh
+++ b/admin/win/nsi/l10n/SimpChinese.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "查看版本日志"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "有 ${APPLICATION_EXECUTABLE} 项进程需要关闭。$\n您想让安装程序关闭这些进程吗？"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "杀死${APPLICATION_EXECUTABLE}进程。"
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "未找到要杀死的进程！"
+StrCpy $PageReinstall_NEW_Field_1 "您的系统已经安装${APPLICATION_NAME}较老版本。建议安装前卸载当前版本。选择将要执行的操作，点击下一步继续。"
+StrCpy $PageReinstall_NEW_Field_2 "在安装前先卸载"
+StrCpy $PageReinstall_NEW_Field_3 "不要卸载"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "已经安装"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "选择如何安装${APPLICATION_NAME}。"
+StrCpy $PageReinstall_OLD_Field_1 "较新版本的 ${APPLICATION_NAME} 已经安装！安装较旧版本的程序是不推荐的。如果您希望继续安装较旧版本，建议先卸载较新版本。选择您想要执行的操作并点击下一步以继续。"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} 已经安装。\n请选择想要执行的操作并点击下一步。"
+StrCpy $PageReinstall_SAME_Field_2 "增加/重装组件"
+StrCpy $PageReinstall_SAME_Field_3 "卸载${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "卸载${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "选择需要执行的维护选项。"
+StrCpy $SEC_APPLICATION_DETAILS "安装${APPLICATION_NAME}基本组件。"
+StrCpy $OPTION_SECTION_SC_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_APPDATA_SUBTITLE "从电脑中移除 ${APPLICATION_NAME} 数据文件夹。"
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "移除 ${APPLICATION_NAME} 数据文件夹？"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "选择以删除数据文件夹，不选择以保留数据文件夹内容供后续使用。"
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "删除数据文件。"
+StrCpy $UNINSTALLER_FILE_Detail "覆盖卸载器"
+StrCpy $UNINSTALLER_REGISTRY_Detail "正在写入注册表"
+StrCpy $UNINSTALLER_FINISHED_Detail "完成"
+StrCpy $UNINSTALL_MESSAGEBOX "${APPLICATION_NAME} 可能并没有安装在 $INSTDIR。$\n$\n仍然继续吗？(不推荐)"
+StrCpy $UNINSTALL_ABORT "用户取消了卸载"
+StrCpy $INIT_NO_QUICK_LAUNCH "快速启动栏快捷方式(N/A)"
+StrCpy $INIT_NO_DESKTOP "桌面快捷方式(覆盖)"
+StrCpy $UAC_ERROR_ELEVATE "无法获得权限，错误："
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "安装程序需要管理员权限，请重试"
+StrCpy $INIT_INSTALLER_RUNNING "安装程序已经运行。"
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "卸载程序需要管理员权限，请重试"
+StrCpy $INIT_UNINSTALLER_RUNNING "卸载程序已经运行。"
+StrCpy $SectionGroup_Shortcuts "快捷方式"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer"
--- a/admin/win/nsi/l10n/Slovak.nsh
+++ b/admin/win/nsi/l10n/Slovak.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Zobrazi<EFBFBD> zoznam zmien"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Našli sa ${APPLICATION_EXECUTABLE} proces (y), ktoré je potrebné zastavi<76>.$\nChcete, aby ich inštalátor zastavil?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Ukonèujem ${APPLICATION_EXECUTABLE} procesy."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Proces ukonèenia nebol nájdený!"
+StrCpy $PageReinstall_NEW_Field_1 "Staršia verzia ${APPLICATION_NAME} je nainštalovaná vo vašom poèítaèi. Odporúèam vám odinštalova<76> aktuálnu verziu pred inštaláciou. Vyberte operáciu, ktorú chcete vykona<6E>, a kliknite na tlaèidlo Ïalej pre pokraèovanie."
+StrCpy $PageReinstall_NEW_Field_2 "Odinštalova<EFBFBD> pred inštaláciou"
+StrCpy $PageReinstall_NEW_Field_3 "Neodinštalova<EFBFBD>"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Už je nainštalovaný"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Vyberte si, ako chcete nainštalova<76> ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "Novšia verzia ${APPLICATION_NAME} je už nainštalovaná! Neodporúèam vám nainštalova<76> staršiu verziu. Ak naozaj chcete nainštalova<76> túto staršiu verziu, je lepšie najprv odinštalova<76> aktuálnu verziu. Vyberte operáciu, ktorú chcete vykona<6E>, a kliknite na tlaèidlo Ïalej pre pokraèovanie."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} je už nainštalovaná.\nVyberte operáciu, ktorú chcete vykona<6E>, a kliknite na tlaèidlo Ïalej pre pokraèovanie."
+StrCpy $PageReinstall_SAME_Field_2 "Prida<EFBFBD>/Preinštalova<76> komponenty"
+StrCpy $PageReinstall_SAME_Field_3 "Odinštalova<EFBFBD> ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Odinštalova<EFBFBD> ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Vyberte možnos<6F> vykona<6E> údržbu."
+StrCpy $SEC_APPLICATION_DETAILS "Inštalujú sa náležitosti ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Stavová ikona pre Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Inštalujem stavovú ikonu pre Windows Explorer"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Zástupca programu v menu Štart"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Prida<EFBFBD> zástupcu pre ${APPLICATION_NAME} do menu Štart."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Zástupca na ploche"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Vytvorenie zástupcu na ploche"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Zástupca na paneli úloh"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Vytvorenie zástupcu na paneli úloh"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Náležitosti ${APPLICATION_NAME}"
+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é"
+StrCpy $UNINSTALL_MESSAGEBOX "Nezdá sa, že ${APPLICATION_NAME} je nainštalovaný v prieèinku '$INSTDIR'.$\n$\nNapriek tomu pokraèova<76> (neodporúèa sa)?"
+StrCpy $UNINSTALL_ABORT "Odinštalácia prerušená používate¾om"
+StrCpy $INIT_NO_QUICK_LAUNCH "Zástupca na paneli úloh (N/A)"
+StrCpy $INIT_NO_DESKTOP "Zástupca na ploche (prepíše existujúci)"
+StrCpy $UAC_ERROR_ELEVATE "Nemožno povýši<C5A1>, chyba:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Tento inštalátor vyžaduje admin prístup, skúste to znova"
+StrCpy $INIT_INSTALLER_RUNNING "Inštalátor je už spustený."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Tento odinštalátor vyžaduje admin prístup, skúste to znova"
+StrCpy $INIT_UNINSTALLER_RUNNING "Odinštalátor je už spustený."
+StrCpy $SectionGroup_Shortcuts "Zástupcovia"
--- a/admin/win/nsi/l10n/Slovenian.nsh
+++ b/admin/win/nsi/l10n/Slovenian.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Pokaži opombe k objavi"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Zaznana so dejavna opravila programa ${APPLICATION_EXECUTABLE}, ki pa morajo biti pred nadaljevanjem zaustavljena.$\nAli želite izvajanje teh dejanj končati?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Poteka zaustavljanje opravil programa ${APPLICATION_EXECUTABLE}"
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Opravila, določenega za uničenje, ni mogoče najti!"
+StrCpy $PageReinstall_NEW_Field_1 "Nameščena je starejša različica ${APPLICATION_NAME}. Priporočljivo je najprej odstraniti obstoječo namestitev in šele nato namestiti novo. Izberite ustrezno možnost in kliknite za nadaljevanje."
+StrCpy $PageReinstall_NEW_Field_2 "Pred namestitvijo je treba obstoječo različico odstraniti"
+StrCpy $PageReinstall_NEW_Field_3 "Ne odstrani namestitve"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Program je že nameščen"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Izberite način namestitve programa ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "Novejša različica programa ${APPLICATION_NAME} je že nameščena! Ni priporočljivo namestiti starejše. V kolikor želite vseeno nadaljevati z namestitvijo, prej odstranite obstoječo različico. Izberite opravilo in pritisnite gumb za nadaljevanje."
+StrCpy $PageReinstall_SAME_Field_1 "Program ${APPLICATION_NAME} ${VERSION} je že nameščen. Izberite opravilo in pritisnite gumb za nadaljevanje."
+StrCpy $PageReinstall_SAME_Field_2 "Dodaj/Ponovno namesti programe"
+StrCpy $PageReinstall_SAME_Field_3 "Odstrani ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Odstrani ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Izberite možnost vzdrževanja za izvedbo."
+StrCpy $SEC_APPLICATION_DETAILS "Poteka nameščanje ključnih paketov programa ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Ikona stanja za program Raziskovalec"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Nameščanje ikone stanja za Raziskovalca"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Bližnjica programa v programskem meniju"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Poteka dodajanje bližnjice programa ${APPLICATION_NAME} v programski meni."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Bližnica namizja"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Poteka ustvarjanje bližnjice na namizju"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Bližnjica na hitri dostop"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Poteka ustvarjanje bližnjice za hitri dostop"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Knjižnice programa ${APPLICATION_NAME}."
+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"
+StrCpy $UNINSTALL_MESSAGEBOX "Ni videti, da bi bil program ${APPLICATION_NAME} nameščen v mapi '$INSTDIR'.$\n$\nAli želite vseeno nadaljevati (ni priporočeno)?"
+StrCpy $UNINSTALL_ABORT "Odstranjevanje namestitve je bilo prekinjeno s strani uporabnika"
+StrCpy $INIT_NO_QUICK_LAUNCH "Bližnjica za hiter dostop (N/A)"
+StrCpy $INIT_NO_DESKTOP "Bližnjica namizja (obstajajo predmeti za prepis)"
+StrCpy $UAC_ERROR_ELEVATE "Ni mogoče dvigniti; napaka:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Namestilnik zahteva skrbniška dovoljenja."
+StrCpy $INIT_INSTALLER_RUNNING "Namestilnik je že zagnan."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Program za odstranjevanje namestitve zahteva skrbniška dovoljenja."
+StrCpy $INIT_UNINSTALLER_RUNNING "Program za odstranjevanje namestitve je že zagnan."
+StrCpy $SectionGroup_Shortcuts "Bližnjice"
--- a/admin/win/nsi/l10n/Spanish.nsh
+++ b/admin/win/nsi/l10n/Spanish.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar las notas de la versión"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "El/los proceso/s ${APPLICATION_EXECUTABLE} debe/n ser detenidos.$\n¿Quiere que el instalador lo haga por usted?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Deteniendo el/los proceso/s ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "¡Proceso a detener no encontrado!"
+StrCpy $PageReinstall_NEW_Field_1 "Una versión anterior de ${APPLICATION_NAME} se encuentra instalada en el sistema. Se recomienda de instalar la versión actual antes de instalar la nueva. Seleccione la operacion deseada y haga click en Siguiente para continuar."
+StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
+StrCpy $PageReinstall_NEW_Field_3 "No desinstalar"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ya está instalado"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Elija como quiere instalar ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "Una nueva versión de ${APPLICATION_NAME} ya está instalada. No es recomendable instalar una versión anterior. Si realmente quiere instalar esta versión anterior, es mejor que desinstale la versión actual primero. Seleccione la operación que desea realizar y pulse Next para continuar."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} ya está instalada.\nSeleccione la operación que desea realizar y pulse Next para continuar."
+StrCpy $PageReinstall_SAME_Field_2 "Añadir/Reinstalar componentes"
+StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalar ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Elija la opcion de mantenimiento a realizar."
+StrCpy $SEC_APPLICATION_DETAILS "Instalando  ${APPLICATION_NAME} esenciales."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Íconos de estado para el Explorador de Windows"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalando íconos de estado para el Explorador de Windows"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso Directo al Programa Menú de Inicio"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Añadiendo accesos directos para ${APPLICATION_NAME} en el Menú de Inicio."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Acceso directo de Escritorio"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Creando Accesos Directos de Escritorio"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Acceso Directo al Lanzador Rápido"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creando un Acceso Directo al Lanzador Rápido"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} esencial."
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Acceso Directo de ${APPLICATION_NAME}"
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Acceso Directo de Escritorio para ${APPLICATION_NAME}"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Lanzador Rápido de Accesos Director para ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Remueva la carpeta de datos de ${APPLICATION_NAME} del computador."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "¿Desea eliminar la carpeta de datos de ${APPLICATION_NAME}?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Deja sin marcar para mantener la carpeta de datos para uso posterior, o del marque para eliminar la carpeta de datos."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Si, Elimine esta carpeta de datos."
+StrCpy $UNINSTALLER_FILE_Detail "Escribiendo Desinstalador"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Escribiendo Llaves en el Registro del Instalador"
+StrCpy $UNINSTALLER_FINISHED_Detail "Terminado"
+StrCpy $UNINSTALL_MESSAGEBOX "Parece que ${APPLICATION_NAME} no está instalado en el directorio '$INSTDIR'.$$ ¿Continuar de todos modos? (No Recomendado)"
+StrCpy $UNINSTALL_ABORT "Desinstalación cancelada por el usuario"
+StrCpy $INIT_NO_QUICK_LAUNCH "Acceso Directo al Lanzador Rápido (N/A)"
+StrCpy $INIT_NO_DESKTOP "Atajo de escritorio (sobreescribe el existente)"
+StrCpy $UAC_ERROR_ELEVATE "No se ha podido elevar, Error:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "El instalador requiere acceso administrativo, intente de nuevo"
+StrCpy $INIT_INSTALLER_RUNNING "El instalador ya se encuentra en ejecución"
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "El desinstalador requiere acceso administrativo, intente de nuevo"
+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
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar notas de la versión"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Parando el proceso ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Proceso a detener no encontrado!"
+StrCpy $PageReinstall_NEW_Field_1 "Una versión anterior de ${APPLICATION_NAME} esta instalada en el sistema. Es recomendado que quite esta versión antes de instalar. Elija la operación a realizar y seleccione Siguiente para continuar."
+StrCpy $PageReinstall_NEW_Field_2 "Des-instale antes de Instalar."
+StrCpy $PageReinstall_NEW_Field_3 "No des-instalar."
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Actualmente Instalado."
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Elija como desea instalar ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "Una versión mas reciente de ${APPLICATION_NAME} esta actualmente instalada! No es recomendado que instale una versión antigua. Si realmente desea instalar esta versión obsoleta, es mejor que des-instale la versión actual primero. Seleccione la operación que desea realizar y presione en Siguiente para continuar. "
+StrCpy $PageReinstall_SAME_Field_2 "Agregar/Re-Instalar componentes"
+StrCpy $PageReinstall_SAME_Field_3 "Des-instalar ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Des-instalar ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Elija la opción de mantenimiento a realizar."
+StrCpy $SEC_APPLICATION_DETAILS "Instalar  esenciales ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso Directo en Menú de Programas"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Agregando el Acceso Directo al Menú de Inicio para ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Acceso directo en Escritorio"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Creando Accesos Directos en Escritorio"
+StrCpy $OPTION_SECTION_SC_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"
+StrCpy $UNINSTALL_ABORT "Des-instalación abortada por el usuario"
+StrCpy $INIT_NO_DESKTOP "Acceso Directo en Escritorio (Sobrescribe existentes)"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Este instalador requiere acceso Administrador, intente de nuevo. "
+StrCpy $INIT_INSTALLER_RUNNING "El instalador ya esta corriendo."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Este des-instalador requiere acceso administrador, intente de nuevo"
+StrCpy $INIT_UNINSTALLER_RUNNING "El des-instalador ya esta corriendo"
+StrCpy $SectionGroup_Shortcuts "Accesos Directos"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Quick Launch Shortcut"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creating Quick Launch Shortcut"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} essentials."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Quick Launch shortcut for ${APPLICATION_NAME}."
+StrCpy $UNINSTALL_MESSAGEBOX "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
+StrCpy $INIT_NO_QUICK_LAUNCH "Quick Launch Shortcut (N/A)"
+StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"
--- a/admin/win/nsi/l10n/Swedish.nsh
+++ b/admin/win/nsi/l10n/Swedish.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Visa versionsinformationen"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Hittade ${APPLICATION_EXECUTABLE} process(er) som behöver stoppas.$\nVill du att installationsprogrammet ska stoppa dessa åt dig?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Dödar ${APPLICATION_EXECUTABLE} processer."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Processen att döda hittades inte!"
+StrCpy $PageReinstall_NEW_Field_1 "En tidigare version av ${APPLICATION_NAME} är installerad på ditt system. Det är rekommenderat att du avinstallerar den nuvarande versionen före installation. Välj den åtgärd du vill utföra och klicka Nästa för att fortsätta."
+StrCpy $PageReinstall_NEW_Field_2 "Avinstallera före installation"
+StrCpy $PageReinstall_NEW_Field_3 "Avinstallera inte"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Redan installerad"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Välj hur du vill installera ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "En nyare version av ${APPLICATION_NAME} är redan installerad! Det rekommenderas inte att du installerar en äldre version. Om du verkligen vill installera denna äldre versionen, är det bättre att du avinstallerar den nuvarande versionen först. Välj den åtgärd du vill utföra och klicka Nästa för att fortsätta."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} är redan installerad.\nVälj den åtgärd du vill utföra och klicka Nästa för att fortsätta."
+StrCpy $PageReinstall_SAME_Field_2 "Lägg till/Ominstallera komponenter"
+StrCpy $PageReinstall_SAME_Field_3 "Avinstallera ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Avinstallera ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Välj underhålls alternativ att utföra."
+StrCpy $SEC_APPLICATION_DETAILS "Installerar ${APPLICATION_NAME} väsentligheter."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Statusikoner för Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installerar statusikoner för Windows Explorer"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start-meny program genväg"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Lägger till genväg för ${APPLICATION_NAME} till Start-menyn."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Skrivbordsgenväg"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Skapar skrivbordsgenvägar"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Snabbstartsgenväg"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Skapar snabbstartsgenväg"
+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"
+StrCpy $UNINSTALL_MESSAGEBOX "Det verkar inte som ${APPLICATION_NAME} är installerad i katalogen '$INSTDIR'.$\n$\nFortsätt ändå (rekommenderas ej)?"
+StrCpy $UNINSTALL_ABORT "Avinstallering avbröts av användare"
+StrCpy $INIT_NO_QUICK_LAUNCH "Snabbstartsgenväg (N/A)"
+StrCpy $INIT_NO_DESKTOP "Skrivbordsgenväg (skriver över nuvarande)"
+StrCpy $UAC_ERROR_ELEVATE "Kunde inte få förhöjda rättigheter, fel:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Detta installationsprogram kräver adminstratörs rättigheter, försök igen"
+StrCpy $INIT_INSTALLER_RUNNING "Installationsprogrammet körs redan."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Detta avinstallationsprogram  kräver administratörs rättigheter, försök igen"
+StrCpy $INIT_UNINSTALLER_RUNNING "Avinstallationsprogrammet körs redan."
+StrCpy $SectionGroup_Shortcuts "Genvägar"
--- a/admin/win/nsi/l10n/Turkish.nsh
+++ b/admin/win/nsi/l10n/Turkish.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Sürüm notlarını göster"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Durdurulması gereken ${APPLICATION_EXECUTABLE} süreçleri bulundu.$\nYükleyicinin bunları sizin için durdurmasını ister misiniz?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "${APPLICATION_EXECUTABLE} süreçleri sonlandırılıyor."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Sonlandırılacak süreç bulunamadı!"
+StrCpy $PageReinstall_NEW_Field_1 "${APPLICATION_NAME} önceki sürümü sisteminizde yüklü. Kurulumdan önce bunu kaldırmanız önerilir. Yapmak istediğiniz işlemi seçip devam etmek için İleri tıklayın."
+StrCpy $PageReinstall_NEW_Field_2 "Yüklemeden önce kaldır"
+StrCpy $PageReinstall_NEW_Field_3 "Kaldırma"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Zaten Yüklü"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "${APPLICATION_NAME} uygulamasını nasıl yüklemek istediğinizi seçin."
+StrCpy $PageReinstall_OLD_Field_1 "${APPLICATION_NAME} uygulamasının daha yeni sürümü zaten yüklü! Daha eski bir sürümünü yüklemeniz önerilmez. Gerçekten bu eski sürümü yüklemek isterseniz, ilk olarak geçerli sürümü kaldırmanız tavsiye edilir. Yapmak istediğiniz işlemi seçin ve devam etmek üzere İleri tıklayın."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} zaten yüklü.\n\nYapmak istediğiniz işlemi seçin ve devam etmek için İleri tıklayın."
+StrCpy $PageReinstall_SAME_Field_2 "Bileşenleri ekle/yeniden yükle"
+StrCpy $PageReinstall_SAME_Field_3 "${APPLICATION_NAME} uygulamasını kaldır"
+StrCpy $UNINSTALLER_APPDATA_TITLE "${APPLICATION_NAME} uygulamasını kaldır"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Yapmak istediğiniz bakım işlemini seçin."
+StrCpy $SEC_APPLICATION_DETAILS "${APPLICATION_NAME} gereklilikleri yükleniyor."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Windows Gezgini için durum simgeleri"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Windows Gezgini için durum simgeleri yükleniyor"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Başlat Menüsü Program Kısayolu"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "${APPLICATION_NAME} için Başlat Menüsü'ne kısayol ekleniyor."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Masaüstü Kısayolu"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Masaüstü Kısayolları Oluşturuluyor"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Hızlı Başlat Kısayolu"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Hızlı Başlat Kısayolu Oluşturuluyor"
+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ı"
+StrCpy $UNINSTALL_MESSAGEBOX "${APPLICATION_NAME} uygulaması '$INSTDIR' dizinine yüklenmiş gibi görünmüyor.$\n$\nYine de devam edilsin mi (önerilmez)?"
+StrCpy $UNINSTALL_ABORT "Kaldırma kullanıcı tarafından iptal edildi"
+StrCpy $INIT_NO_QUICK_LAUNCH "Hızlı Başlat Kısayolu (Kullanılamıyor)"
+StrCpy $INIT_NO_DESKTOP "Masaüstü Kısayolu (mevcut olanın üzerine yazılır)"
+StrCpy $UAC_ERROR_ELEVATE "Yükseltme başarısız, hata:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Bu yükleyici yönetici erişimi gerektiriyor, yeniden deneyin"
+StrCpy $INIT_INSTALLER_RUNNING "Yükleyici zaten çalışıyor."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Bu kaldırıcı yönetici erişimi gerektiriyor, yeniden deneyin"
+StrCpy $INIT_UNINSTALLER_RUNNING "Kaldırıcı zaten çalışıyor."
+StrCpy $SectionGroup_Shortcuts "Kısayollar"
--- a/admin/win/nsi/l10n/bin/build_locale_nsi.py
+++ b/admin/win/nsi/l10n/bin/build_locale_nsi.py
@@ -0,0 +1,182 @@
+##############################################################################
+#
+#  PROJECT:     ownCloud v1.0
+#  LICENSE:     See LICENSE in the top level directory
+#
+##############################################################################
+import collections
+import os
+import polib
+from optparse import OptionParser
+
+parser = OptionParser()
+parser.add_option("-o", "--output", dest="output",
+                  help="Directory for localized output", default="../Shared/installer/nightly_localized.nsi")
+parser.add_option("-p", "--podir", dest="podir",
+                  help="Directory containing PO files", default="../Shared/installer/locale/")
+parser.add_option("-l", "--lang", dest="lang",
+                  help="Default language of the NSI", default="English" )
+
+(options, args) = parser.parse_args()
+
+
+# Define a dict to convert locale names to language names
+localeToName = {
+    "af" : "Afrikaans",
+    "sq" : "Albanian",
+    "ar" : "Arabic",
+    "hy" : "Armenian",
+    "eu" : "Basque",
+    "be" : "Belarusian",
+    "bs" : "Bosnian",
+    "br" : "Breton",
+    "bg" : "Bulgarian",
+    "ca" : "Catalan",
+    "bem" : "Cibemba",
+    "hr" : "Croatian",
+    "cs" : "Czech",
+    "da" : "Danish",
+    "nl" : "Dutch",
+    "efi" : "Efik",
+    "en" : "English",
+    "eo" : "Esperanto",
+    "et" : "Estonian",
+    "fa" : "Farsi",
+    "fi" : "Finnish",
+    "fr" : "French",
+    "gl" : "Galician",
+    "ka" : "Georgian",
+    "de" : "German",
+    "el" : "Greek",
+    "he" : "Hebrew",
+    "hi" : "Hindi",
+    "hu" : "Hungarian",
+    "is" : "Icelandic",
+    "ig" : "Igbo",
+    "id" : "Indonesian",
+    "ga" : "Irish",
+    "it" : "Italian",
+    "ja" : "Japanese",
+    "km" : "Khmer",
+    "ko" : "Korean",
+    "ku" : "Kurdish",
+    "lv" : "Latvian",
+    "lt" : "Lithuanian",
+    "lb" : "Luxembourgish",
+    "mk" : "Macedonian",
+    "mg" : "Malagasy",
+    "ms" : "Malay",
+    "mn" : "Mongolian",
+    "nb" : "Norwegian",
+    "nn" : "NorwegianNynorsk",
+    "ps" : "Pashto",
+    "pl" : "Polish",
+    "pt" : "Portuguese",
+    "pt_BR" : "PortugueseBR",
+    "ro" : "Romanian",
+    "ru" : "Russian",
+    "sr" : "Serbian",
+    "sr_sp" : "SerbianLatin",
+    "st" : "Sesotho",
+    "sn" : "Shona",
+    "zh_CN" : "SimpChinese",
+    "sk" : "Slovak",
+    "sl" : "Slovenian",
+    "es" : "Spanish",
+    "es_AR" : "SpanishInternational",
+    "sw" : "Swahili",
+    "sv" : "Swedish",
+    "ta" : "Tamil",
+    "th" : "Thai",
+    "zh_HK" : "TradChinese",
+    "tr" : "Turkish",
+    "tw" : "Twi",
+    "uk" : "Ukrainian",
+    "ug" : "Uyghur",
+    "uz" : "Uzbek",
+    "ca@valencia" : "Valencian",
+    "vi" : "Vietnamese",
+    "cy" : "Welsh",
+    "yo" : "Yoruba",
+    "zu" : "Zulu",
+}
+
+def escapeNSIS(st):
+    return st.replace('\\', r'$\\')\
+             .replace('\t', r'$\t')\
+             .replace('\r', r'\r')\
+             .replace('\n', r'\n')\
+             .replace('\"', r'$\"')\
+             .replace('$$\\', '$\\')
+
+translationCache = {}
+
+# The purpose of this loop is to go to the podir scanning for PO files for each locale name
+# Once we've found a PO file, we use PO lib to read every translated entry
+# Using this, for each each language, we store a dict of entries - { nsilabel (comment) : translation (msgstr) }
+# For untranslated entries, we use msgid instead of msgstr (i.e. default English string)
+for root,dirs,files in os.walk(options.podir):
+    for file in files:
+        filename,ext = os.path.splitext(file)
+        if ext == ".po":
+            # Valid locale filename (fr.po, de.po etc)?
+            if filename in localeToName:
+                language = localeToName[filename]
+                translationCache[language] = collections.OrderedDict()
+                
+                po = polib.pofile(os.path.join(root,file))
+                for entry in po.translated_entries():
+                    # Loop through all our labels and add translation (each translation may have multiple labels)
+                    for label in entry.comment.split():
+                        translationCache[language][label] = escapeNSIS(entry.msgstr)
+                # For untranslated strings, let's add the English entry
+                for entry in po.untranslated_entries():
+                    for label in entry.comment.split():
+                        print("Warning: Label '%s' for language '%s' remains untranslated"%(label,language))
+                        translationCache[language][label] = escapeNSIS(entry.msgid)
+
+def tostr(obj):
+    if type(obj) == unicode:
+        return obj.encode("utf-8")
+    else:
+        return obj
+
+NSILanguages = []
+NSIDeclarations = []
+
+# file header
+NSILanguages.append( tostr('; Auto-generated - do not modify\n') )
+NSIDeclarations.append( tostr('; Auto-generated - do not modify\n') )
+
+# loopthrough the languages an generate one nsh files for each language
+lineNo = 1
+for language,translations in translationCache.iteritems():
+    NSINewLines = []
+    NSINewLines.append( tostr('# Auto-generated - do not modify\n') )
+    count = 0
+    # if the language isn't the default, we add our MUI_LANGUAGE macro
+    if language.upper() != options.lang.upper():
+        NSILanguages.append( tostr('!insertmacro MUI_LANGUAGE "%s"\n'%language) )
+
+    # For every translation we grabbed from the .po, let's add our StrCpy command
+    for label,value in translations.iteritems():
+        NSINewLines.append( tostr('StrCpy $%s "%s"\n' % (label,value)) )
+        if language.upper() == options.lang.upper():
+	    NSIDeclarations.append( tostr('Var %s\n' % label) )
+
+        count += 1
+    NSIWorkingFile = open('%s/%s.nsh' % (options.output, language),"w")
+    NSIWorkingFile.writelines(NSINewLines)
+    NSIWorkingFile.close()
+    print ( "%i translations merged for language '%s'"%(count,language) )
+    
+# Finally, let's write languages.nsh and declarations.nsh
+NSIWorkingFile = open('%s/languages.nsh' % options.output,"w")
+NSIWorkingFile.writelines(NSILanguages)
+NSIWorkingFile.close()
+
+NSIWorkingFile = open('%s/declarations.nsh' % options.output,"w")
+NSIWorkingFile.writelines(NSIDeclarations)
+NSIWorkingFile.close()
+    
+print ( "NSI Localization Operation Complete" )
--- a/admin/win/nsi/l10n/bin/l10n.sh
+++ b/admin/win/nsi/l10n/bin/l10n.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+L10NDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
+SCRIPTDIR="$L10NDIR/bin"
+PODIR="$L10NDIR/pofiles"
+
+# messages.pot will be used as English translation
+cp -f $PODIR/messages.pot $PODIR/en.po
+
+# generate all the languages nsh files
+python $SCRIPTDIR/build_locale_nsi.py -o $L10NDIR -p $PODIR -l "English"
+
+# for future references: the windows code pages
+# 874 — Thai
+# 932 — Japanese
+# 936 — Chinese (simplified) (PRC, Singapore)
+# 949 — Korean
+# 950 — Chinese (traditional) (Taiwan, Hong Kong)
+# 1200 — Unicode (BMP of ISO 10646, UTF-16LE)
+# 1201 — Unicode (BMP of ISO 10646, UTF-16BE)
+# 1250 — Latin (Central European languages)
+# 1251 — Cyrillic
+# 1252 — Latin (Western European languages, replacing Code page 850)
+# 1253 — Greek
+# 1254 — Turkish
+# 1255 — Hebrew
+# 1256 — Arabic
+# 1257 — Latin (Baltic languages)
+# 1258 — Vietnamese
+
+# convert file to proper content
+cd $L10NDIR
+iconv -t CP1252 -o German.nsh German.nsh
+iconv -t CP1252 -o Basque.nsh Basque.nsh
+iconv -t CP1252 -o English.nsh English.nsh
+iconv -t CP1252 -o Galician.nsh Galician.nsh
+iconv -t CP1253 -o Greek.nsh Greek.nsh    
+iconv -t CP1250 -o Slovenian.nsh Slovenian.nsh
+iconv -t CP1257 -o Estonian.nsh Estonian.nsh
+iconv -t CP1252 -o Italian.nsh Italian.nsh
+iconv -t CP1252 -o PortugueseBR.nsh PortugueseBR.nsh
+iconv -t CP1252 -o Spanish.nsh Spanish.nsh
+iconv -t CP1252 -o Dutch.nsh Dutch.nsh
+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
+
+
--- a/admin/win/nsi/l10n/declarations.nsh
+++ b/admin/win/nsi/l10n/declarations.nsh
@@ -0,0 +1,46 @@
+; Auto-generated - do not modify
+Var MUI_FINISHPAGE_SHOWREADME_TEXT_STRING
+Var ConfirmEndProcess_MESSAGEBOX_TEXT
+Var ConfirmEndProcess_KILLING_PROCESSES_TEXT
+Var ConfirmEndProcess_KILL_NOT_FOUND_TEXT
+Var PageReinstall_NEW_Field_1
+Var PageReinstall_NEW_Field_2
+Var PageReinstall_NEW_Field_3
+Var PageReinstall_NEW_MUI_HEADER_TEXT_TITLE
+Var PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE
+Var PageReinstall_OLD_Field_1
+Var PageReinstall_SAME_Field_1
+Var PageReinstall_SAME_Field_2
+Var PageReinstall_SAME_Field_3
+Var UNINSTALLER_APPDATA_TITLE
+Var PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE
+Var SEC_APPLICATION_DETAILS
+Var OPTION_SECTION_SC_SHELL_EXT_SECTION
+Var OPTION_SECTION_SC_SHELL_EXT_DetailPrint
+Var OPTION_SECTION_SC_START_MENU_SECTION
+Var OPTION_SECTION_SC_START_MENU_DetailPrint
+Var OPTION_SECTION_SC_DESKTOP_SECTION
+Var OPTION_SECTION_SC_DESKTOP_DetailPrint
+Var OPTION_SECTION_SC_QUICK_LAUNCH_SECTION
+Var OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint
+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
+Var UNINSTALL_MESSAGEBOX
+Var UNINSTALL_ABORT
+Var INIT_NO_QUICK_LAUNCH
+Var INIT_NO_DESKTOP
+Var UAC_ERROR_ELEVATE
+Var UAC_INSTALLER_REQUIRE_ADMIN
+Var INIT_INSTALLER_RUNNING
+Var UAC_UNINSTALLER_REQUIRE_ADMIN
+Var INIT_UNINSTALLER_RUNNING
+Var SectionGroup_Shortcuts
--- a/admin/win/nsi/l10n/languages.nsh
+++ b/admin/win/nsi/l10n/languages.nsh
@@ -0,0 +1,26 @@
+; Auto-generated - do not modify
+!insertmacro MUI_LANGUAGE "Swedish"
+!insertmacro MUI_LANGUAGE "Estonian"
+!insertmacro MUI_LANGUAGE "Turkish"
+!insertmacro MUI_LANGUAGE "Slovenian"
+!insertmacro MUI_LANGUAGE "SpanishInternational"
+!insertmacro MUI_LANGUAGE "Dutch"
+!insertmacro MUI_LANGUAGE "Hungarian"
+!insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "Catalan"
+!insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "Finnish"
+!insertmacro MUI_LANGUAGE "Basque"
+!insertmacro MUI_LANGUAGE "Greek"
+!insertmacro MUI_LANGUAGE "SimpChinese"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+!insertmacro MUI_LANGUAGE "Italian"
+!insertmacro MUI_LANGUAGE "Portuguese"
+!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Japanese"
+!insertmacro MUI_LANGUAGE "Galician"
+!insertmacro MUI_LANGUAGE "Czech"
+!insertmacro MUI_LANGUAGE "Slovak"
+!insertmacro MUI_LANGUAGE "Spanish"
+!insertmacro MUI_LANGUAGE "Polish"
+!insertmacro MUI_LANGUAGE "Farsi"
--- a/admin/win/nsi/l10n/pofiles/messages.pot
+++ b/admin/win/nsi/l10n/pofiles/messages.pot
@@ -0,0 +1,208 @@
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-12-09 06:40\n"
+"PO-Revision-Date: 2013-12-03 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. MUI_FINISHPAGE_SHOWREADME_TEXT_STRING
+msgid "Show release notes"
+msgstr "Show release notes"
+
+#. ConfirmEndProcess_MESSAGEBOX_TEXT
+msgid ""
+"Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\n"
+"Do you want the installer to stop these for you?"
+msgstr "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?"
+
+#. ConfirmEndProcess_KILLING_PROCESSES_TEXT
+msgid "Killing ${APPLICATION_EXECUTABLE} processes."
+msgstr "Killing ${APPLICATION_EXECUTABLE} processes."
+
+#. ConfirmEndProcess_KILL_NOT_FOUND_TEXT
+msgid "Process to kill not found!"
+msgstr "Process to kill not found!"
+
+#. PageReinstall_NEW_Field_1
+msgid ""
+"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."
+msgstr "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."
+
+#. PageReinstall_NEW_Field_2
+msgid "Uninstall before installing"
+msgstr "Uninstall before installing"
+
+#. PageReinstall_NEW_Field_3
+msgid "Do not uninstall"
+msgstr "Do not uninstall"
+
+#. PageReinstall_NEW_MUI_HEADER_TEXT_TITLE
+msgid "Already Installed"
+msgstr "Already Installed"
+
+#. PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE
+msgid "Choose how you want to install ${APPLICATION_NAME}."
+msgstr "Choose how you want to install ${APPLICATION_NAME}."
+
+#. PageReinstall_OLD_Field_1
+msgid ""
+"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."
+msgstr "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."
+
+#. PageReinstall_SAME_Field_1
+msgid ""
+"${APPLICATION_NAME} ${VERSION} is already installed.\r\n"
+"Select the operation you want to perform and click Next to continue."
+msgstr "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
+
+#. PageReinstall_SAME_Field_2
+msgid "Add/Reinstall components"
+msgstr "Add/Reinstall components"
+
+#. PageReinstall_SAME_Field_3 UNINSTALLER_APPDATA_TITLE
+msgid "Uninstall ${APPLICATION_NAME}"
+msgstr "Uninstall ${APPLICATION_NAME}"
+
+#. PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE
+msgid "Choose the maintenance option to perform."
+msgstr "Choose the maintenance option to perform."
+
+#. SEC_APPLICATION_DETAILS
+msgid "Installing ${APPLICATION_NAME} essentials."
+msgstr "Installing ${APPLICATION_NAME} essentials."
+
+#. OPTION_SECTION_SC_SHELL_EXT_SECTION
+msgid "Status icons for Windows Explorer"
+msgstr "Status icons for Windows Explorer"
+
+#. OPTION_SECTION_SC_SHELL_EXT_DetailPrint
+msgid "Installing status icons for Windows Explorer"
+msgstr "Installing status icons for Windows Explorer"
+
+#. OPTION_SECTION_SC_START_MENU_SECTION
+msgid "Start Menu Program Shortcut"
+msgstr "Start Menu Program Shortcut"
+
+#. OPTION_SECTION_SC_START_MENU_DetailPrint
+msgid "Adding shortcut for ${APPLICATION_NAME} to the Start Menu."
+msgstr "Adding shortcut for ${APPLICATION_NAME} to the Start Menu."
+
+#. OPTION_SECTION_SC_DESKTOP_SECTION
+msgid "Desktop Shortcut"
+msgstr "Desktop Shortcut"
+
+#. OPTION_SECTION_SC_DESKTOP_DetailPrint
+msgid "Creating Desktop Shortcuts"
+msgstr "Creating Desktop Shortcuts"
+
+#. OPTION_SECTION_SC_QUICK_LAUNCH_SECTION
+msgid "Quick Launch Shortcut"
+msgstr "Quick Launch Shortcut"
+
+#. OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint
+msgid "Creating Quick Launch Shortcut"
+msgstr "Creating Quick Launch Shortcut"
+
+#. OPTION_SECTION_SC_APPLICATION_Desc
+msgid "${APPLICATION_NAME} essentials."
+msgstr "${APPLICATION_NAME} essentials."
+
+#. OPTION_SECTION_SC_START_MENU_Desc
+msgid "${APPLICATION_NAME} shortcut."
+msgstr "${APPLICATION_NAME} shortcut."
+
+#. OPTION_SECTION_SC_DESKTOP_Desc
+msgid "Desktop shortcut for ${APPLICATION_NAME}."
+msgstr "Desktop shortcut for ${APPLICATION_NAME}."
+
+#. OPTION_SECTION_SC_QUICK_LAUNCH_Desc
+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"
+
+#. UNINSTALLER_REGISTRY_Detail
+msgid "Writing Installer Registry Keys"
+msgstr "Writing Installer Registry Keys"
+
+#. UNINSTALLER_FINISHED_Detail
+msgid "Finished"
+msgstr "Finished"
+
+#. UNINSTALL_MESSAGEBOX
+msgid ""
+"It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r"
+"$\n"
+"Continue anyway (not recommended)?"
+msgstr "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
+
+#. UNINSTALL_ABORT
+msgid "Uninstall aborted by user"
+msgstr "Uninstall aborted by user"
+
+#. INIT_NO_QUICK_LAUNCH
+msgid "Quick Launch Shortcut (N/A)"
+msgstr "Quick Launch Shortcut (N/A)"
+
+#. INIT_NO_DESKTOP
+msgid "Desktop Shortcut (overwrites existing)"
+msgstr "Desktop Shortcut (overwrites existing)"
+
+#. UAC_ERROR_ELEVATE
+msgid "Unable to elevate, error:"
+msgstr "Unable to elevate, error:"
+
+#. UAC_INSTALLER_REQUIRE_ADMIN
+msgid "This installer requires admin access, try again"
+msgstr "This installer requires admin access, try again"
+
+#. INIT_INSTALLER_RUNNING
+msgid "The installer is already running."
+msgstr "The installer is already running."
+
+#. UAC_UNINSTALLER_REQUIRE_ADMIN
+msgid "This uninstaller requires admin access, try again"
+msgstr "This uninstaller requires admin access, try again"
+
+#. INIT_UNINSTALLER_RUNNING
+msgid "The uninstaller is already running."
+msgstr "The uninstaller is already running."
+
+#. SectionGroup_Shortcuts
+msgid "Shortcuts"
+msgstr "Shortcuts"
+
--- a/admin/win/nsi/nsis_uac/UAC_RealWorldFullyLoadedDualModeExample.nsi
+++ b/admin/win/nsi/nsis_uac/UAC_RealWorldFullyLoadedDualModeExample.nsi
@@ -5,7 +5,6 @@ This sample uses the registry plugin, so you need to download that if you don't

 !define APPNAME "UAC_RealWorldFullyLoadedDualMode"
 !define ELEVATIONTITLE "${APPNAME}: Elevate" ;displayed during elevation on our custom page
-!define SMSUBDIR $StartMenuFolder ;"${APPNAME}"
 !define UNINSTALLER_NAME "Uninstall ${APPNAME}.exe"
 !define UNINSTALLER_REGSECTION "${APPNAME}"
 !define RegPath.MSUninstall "Software\Microsoft\Windows\CurrentVersion\Uninstall"
@@ -200,10 +199,7 @@ UAC::Exec "" "Notepad.exe" "$Windir\Win.INI" "$InstDir"
 FunctionEnd

 Function CreateSMShortcuts
-StrCpy ${SMSUBDIR} $9 ;stupid sync
-CreateDirectory "$SMPrograms\${SMSUBDIR}"
-CreateShortcut "$SMPrograms\${SMSUBDIR}\${APPNAME}.lnk" "$Windir\Notepad.exe"
-CreateShortcut "$SMPrograms\${SMSUBDIR}\Uninstall ${APPNAME}.lnk" "$InstDir\${UNINSTALLER_NAME}"
+CreateShortcut "$SMPrograms\${APPNAME}.lnk" "$Windir\Notepad.exe"
 FunctionEnd
 Function CreateDeskShortcuts
 CreateShortcut "$Desktop\${APPNAME}.lnk" "$Windir\Notepad.exe"
@@ -222,7 +218,6 @@ ${registry::Unload}
 SectionEnd

 Section "Startmenu Shortcuts"
-StrCpy $9 ${SMSUBDIR} ;this is stupid as hell, we need correct ${SMSUBDIR} in the outer process, this is the only way (plugins cannot enum "custom" var's AFAIK)
 ${UAC.CallFunctionAsUser} CreateSMShortcuts
 SectionEnd
 Section "Desktop Shortcut"
@@ -231,9 +226,7 @@ SectionEnd

 Section Uninstall
 Delete "$InstDir\${UNINSTALLER_NAME}"
-Delete "$SMPrograms\${SMSUBDIR}\${APPNAME}.lnk"
-Delete "$SMPrograms\${SMSUBDIR}\Uninstall ${APPNAME}.lnk"
-RMDir "$SMPrograms\${SMSUBDIR}"
+Delete "$SMPrograms\${APPNAME}.lnk"
 Delete "$Desktop\${APPNAME}.lnk"

 RMDir "$InstDir"
--- a/1
+++ b/1
--- a/cmake/modules/AddAppIconMacro.cmake
+++ b/cmake/modules/AddAppIconMacro.cmake
@@ -66,10 +66,10 @@ macro (KDE4_ADD_APP_ICON appsources pattern)
                message(STATUS "Unable to find a related icon that matches pattern ${pattern} for variable ${appsources} - application will not have an application icon!")
            endif(_icons)
        else(PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
-            message(FATAL_ERROR "Unable to find the png2ico or windres utilities - application will not have an application icon!")
+            message(WARNING "Unable to find the png2ico or windres utilities - application will not have an application icon!")
        endif(PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
    endif(WIN32)
-    if (Q_WS_MAC)
+    if (APPLE)
        # first convert image to a tiff using the Mac OS X "sips" utility,
        # then use tiff2icns to convert to an icon
        find_program(SIPS_EXECUTABLE NAMES sips)
@@ -110,5 +110,5 @@ macro (KDE4_ADD_APP_ICON appsources pattern)
        else(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
            message(STATUS "Unable to find the sips and tiff2icns utilities - application will not have an application icon!")
        endif(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
-    endif(Q_WS_MAC)
+    endif(APPLE)
 endmacro (KDE4_ADD_APP_ICON)
--- a/cmake/modules/AddCMockaTest.cmake
+++ b/cmake/modules/AddCMockaTest.cmake
@@ -0,0 +1,23 @@
+# - ADD_CHECK_TEST(test_name test_source linklib1 ... linklibN)
+
+# Copyright (c) 2007      Daniel Gollub <dgollub@suse.de>
+# Copyright (c) 2007-2010 Andreas Schneider <asn@cynapses.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+enable_testing()
+include(CTest)
+
+if(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW)
+    set(CMAKE_C_FLAGS_PROFILING "-g -O0 -Wall -W -Wshadow -Wunused-variable -Wunused-parameter -Wunused-function -Wunused -Wno-system-headers -Wwrite-strings -fprofile-arcs -ftest-coverage" CACHE STRING "Profiling Compiler Flags")
+    set(CMAKE_SHARED_LINKER_FLAGS_PROFILING " -fprofile-arcs -ftest-coverage" CACHE STRING "Profiling Linker Flags")
+    set(CMAKE_MODULE_LINKER_FLAGS_PROFILING " -fprofile-arcs -ftest-coverage" CACHE STRING "Profiling Linker Flags")
+    set(CMAKE_EXEC_LINKER_FLAGS_PROFILING " -fprofile-arcs -ftest-coverage" CACHE STRING "Profiling Linker Flags")
+endif(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW)
+
+function (ADD_CMOCKA_TEST _testName _testSource)
+    add_executable(${_testName} ${_testSource})
+    target_link_libraries(${_testName} ${ARGN})
+    add_test(${_testName} ${CMAKE_CURRENT_BINARY_DIR}/${_testName})
+endfunction (ADD_CMOCKA_TEST)
--- a/cmake/modules/COPYING-CMAKE-SCRIPTS
+++ b/cmake/modules/COPYING-CMAKE-SCRIPTS
@@ -0,0 +1,22 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/cmake/modules/CheckCCompilerFlagSSP.cmake
+++ b/cmake/modules/CheckCCompilerFlagSSP.cmake
@@ -0,0 +1,26 @@
+# - Check whether the C compiler supports a given flag in the
+# context of a stack checking compiler option.
+
+# CHECK_C_COMPILER_FLAG_SSP(FLAG VARIABLE)
+#
+#  FLAG - the compiler flag
+#  VARIABLE - variable to store the result
+#
+#  This actually calls check_c_source_compiles.
+#  See help for CheckCSourceCompiles for a listing of variables
+#  that can modify the build.
+
+# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+include(CheckCSourceCompiles)
+
+function(CHECK_C_COMPILER_FLAG_SSP _FLAG _RESULT)
+   set(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
+   set(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")
+   check_c_source_compiles("int main(int argc, char **argv) { char buffer[256]; return buffer[argc]=0;}" ${_RESULT})
+   set(CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
+endfunction(CHECK_C_COMPILER_FLAG_SSP)
--- a/cmake/modules/CheckPrototypeDefinition.c.in
+++ b/cmake/modules/CheckPrototypeDefinition.c.in
@@ -0,0 +1,29 @@
+@CHECK_PROTOTYPE_DEFINITION_HEADER@
+
+static void cmakeRequireSymbol(int dummy, ...) {
+  (void) dummy;
+}
+
+static void checkSymbol(void) {
+#ifndef @CHECK_PROTOTYPE_DEFINITION_SYMBOL@
+  cmakeRequireSymbol(0, &@CHECK_PROTOTYPE_DEFINITION_SYMBOL@);
+#endif
+}
+
+@CHECK_PROTOTYPE_DEFINITION_PROTO@ {
+  return @CHECK_PROTOTYPE_DEFINITION_RETURN@;
+}
+
+#ifdef __CLASSIC_C__
+int main() {
+  int ac;
+  char*av[];
+#else
+int main(int ac, char *av[]) {
+#endif
+  checkSymbol();
+  if (ac > 1000) {
+    return *av[0];
+  }
+  return 0;
+}
--- a/cmake/modules/CheckPrototypeDefinition.cmake
+++ b/cmake/modules/CheckPrototypeDefinition.cmake
@@ -0,0 +1,98 @@
+# - Check if the protoype we expect is correct.
+# check_prototype_definition(FUNCTION PROTOTYPE RETURN HEADER VARIABLE)
+#  FUNCTION - The name of the function (used to check if prototype exists)
+#  PROTOTYPE- The prototype to check.
+#  RETURN - The return value of the function.
+#  HEADER - The header files required.
+#  VARIABLE - The variable to store the result.
+# Example:
+#  check_prototype_definition(getpwent_r
+#   "struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)"
+#   "NULL"
+#   "unistd.h;pwd.h"
+#   SOLARIS_GETPWENT_R)
+# The following variables may be set before calling this macro to
+# modify the way the check is run:
+#
+#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
+#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
+#  CMAKE_REQUIRED_INCLUDES = list of include directories
+#  CMAKE_REQUIRED_LIBRARIES = list of libraries to link
+
+#=============================================================================
+# Copyright 2005-2009 Kitware, Inc.
+# Copyright 2010-2011 Andreas Schneider <asn@cryptomilk.org>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+#
+
+
+get_filename_component(__check_proto_def_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
+
+function(CHECK_PROTOTYPE_DEFINITION _FUNCTION _PROTOTYPE _RETURN _HEADER _VARIABLE)
+
+  if ("${_VARIABLE}" MATCHES "^${_VARIABLE}$")
+    set(CHECK_PROTOTYPE_DEFINITION_CONTENT "/* */\n")
+
+    set(CHECK_PROTOTYPE_DEFINITION_FLAGS ${CMAKE_REQUIRED_FLAGS})
+    if (CMAKE_REQUIRED_LIBRARIES)
+      set(CHECK_PROTOTYPE_DEFINITION_LIBS
+        LINK_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
+    else()
+      set(CHECK_PROTOTYPE_DEFINITION_LIBS)
+    endif()
+    if (CMAKE_REQUIRED_INCLUDES)
+      set(CMAKE_SYMBOL_EXISTS_INCLUDES
+        "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
+    else()
+      set(CMAKE_SYMBOL_EXISTS_INCLUDES)
+    endif()
+
+    foreach(_FILE ${_HEADER})
+      set(CHECK_PROTOTYPE_DEFINITION_HEADER
+        "${CHECK_PROTOTYPE_DEFINITION_HEADER}#include <${_FILE}>\n")
+    endforeach()
+
+    set(CHECK_PROTOTYPE_DEFINITION_SYMBOL ${_FUNCTION})
+    set(CHECK_PROTOTYPE_DEFINITION_PROTO ${_PROTOTYPE})
+    set(CHECK_PROTOTYPE_DEFINITION_RETURN ${_RETURN})
+
+    configure_file("${__check_proto_def_dir}/CheckPrototypeDefinition.c.in"
+      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c" @ONLY)
+
+    file(READ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c _SOURCE)
+
+    try_compile(${_VARIABLE}
+      ${CMAKE_BINARY_DIR}
+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c
+      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
+      ${CHECK_PROTOTYPE_DEFINITION_LIBS}
+      CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CHECK_PROTOTYPE_DEFINITION_FLAGS}
+      "${CMAKE_SYMBOL_EXISTS_INCLUDES}"
+      OUTPUT_VARIABLE OUTPUT)
+
+    if (${_VARIABLE})
+      set(${_VARIABLE} 1 CACHE INTERNAL "Have correct prototype for ${_FUNCTION}")
+      message(STATUS "Checking prototype ${_FUNCTION} for ${_VARIABLE} - True")
+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+        "Determining if the prototype ${_FUNCTION} exists for ${_VARIABLE} passed with the following output:\n"
+        "${OUTPUT}\n\n")
+    else ()
+      message(STATUS "Checking prototype ${_FUNCTION} for ${_VARIABLE} - False")
+      set(${_VARIABLE} 0 CACHE INTERNAL "Have correct prototype for ${_FUNCTION}")
+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+        "Determining if the prototype ${_FUNCTION} exists for ${_VARIABLE} failed with the following output:\n"
+        "${OUTPUT}\n\n${_SOURCE}\n\n")
+    endif ()
+  endif()
+
+endfunction()
--- a/cmake/modules/Copyright.txt
+++ b/cmake/modules/Copyright.txt
@@ -0,0 +1,13 @@
+CMake - Cross Platform Makefile Generator
+Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+* Neither the names of Kitware, Inc., the Insight Software Consortium, nor the names of their contributors may be used to endorse or promote products derived from this software without specific prior written  permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/cmake/modules/DefineCMakeDefaults.cmake
+++ b/cmake/modules/DefineCMakeDefaults.cmake
@@ -0,0 +1,34 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
+# Always include srcdir and builddir in include path
+# This saves typing ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY} in
+# about every subdir
+# since cmake 2.4.0
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+# Put the include dirs which are in the source or build tree
+# before all other include dirs, so the headers in the sources
+# are prefered over the already installed ones
+# since cmake 2.4.1
+set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
+
+# Use colored output
+# since cmake 2.4.0
+set(CMAKE_COLOR_MAKEFILE ON)
+
+# Define the generic version of the libraries here
+set(GENERIC_LIB_VERSION "0.1.0")
+set(GENERIC_LIB_SOVERSION "0")
+
+# set -Werror
+set(CMAKE_ENABLE_WERROR ON)
+
+# Set the default build type to release with debug info
+if (NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE RelWithDebInfo
+    CACHE STRING
+      "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
+  )
+endif (NOT CMAKE_BUILD_TYPE)
--- a/cmake/modules/DefineCompilerFlags.cmake
+++ b/cmake/modules/DefineCompilerFlags.cmake
@@ -0,0 +1,92 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
+# define system dependent compiler flags
+
+include(CheckCCompilerFlag)
+include(CheckCCompilerFlagSSP)
+
+#
+# Define GNUCC compiler flags
+#
+if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")
+
+    # add -Wconversion ?
+    # cannot be pedantic with sqlite3 directly linked
+    if (NOT CSYNC_STATIC_COMPILE_DIR)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic -pedantic-errors")
+    endif()
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused -Wfloat-equal -Wpointer-arith -Wwrite-strings -Wformat-security")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute -D_GNU_SOURCE")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__STDC_FORMAT_MACROS=1")
+
+    set(CSYNC_STRICT OFF CACHE BOOL "Strict error checking, enabled -Werror and friends")
+    if (CSYNC_STRICT)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+    endif(CSYNC_STRICT)
+
+    # with -fPIC
+    check_c_compiler_flag("-fPIC" WITH_FPIC)
+    if (WITH_FPIC AND NOT WIN32)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+    endif (WITH_FPIC AND NOT WIN32)
+
+    check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR)
+    if (WITH_STACK_PROTECTOR AND NOT WIN32)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector")
+    endif (WITH_STACK_PROTECTOR AND NOT WIN32)
+
+    if (CMAKE_BUILD_TYPE)
+        string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+        if (CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)")
+            check_c_compiler_flag("-Wp,-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE)
+            if (WITH_FORTIFY_SOURCE)
+                set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wp,-D_FORTIFY_SOURCE=2")
+            endif (WITH_FORTIFY_SOURCE)
+        endif()
+    endif()
+endif (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")
+
+if (UNIX AND NOT WIN32)
+    #
+    # Check for large filesystem support
+    #
+    if (CMAKE_SIZEOF_VOID_P MATCHES "8")
+        # with large file support
+        execute_process(
+            COMMAND
+                getconf LFS64_CFLAGS
+            OUTPUT_VARIABLE
+                _lfs_CFLAGS
+            ERROR_QUIET
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+    else (CMAKE_SIZEOF_VOID_P MATCHES "8")
+        # with large file support
+        execute_process(
+            COMMAND
+                getconf LFS_CFLAGS
+            OUTPUT_VARIABLE
+                _lfs_CFLAGS
+            ERROR_QUIET
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+    endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
+    if (_lfs_CFLAGS)
+        string(REGEX REPLACE "[\r\n]" " " "${_lfs_CFLAGS}" "${${_lfs_CFLAGS}}")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_lfs_CFLAGS}")
+    endif (_lfs_CFLAGS)
+else(UNIX AND NOT WIN32)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64")
+endif (UNIX AND NOT WIN32)
+
+if (MSVC)
+    # Use secure functions by defaualt and suppress warnings about
+    #"deprecated" functions
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_NONSTDC_NO_WARNINGS=1 /D _CRT_SECURE_NO_WARNINGS=1")
+endif (MSVC)
--- a/cmake/modules/DefineInstallationPaths.cmake
+++ b/cmake/modules/DefineInstallationPaths.cmake
@@ -0,0 +1,116 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
+if (UNIX)
+  # Suffix for Linux
+  SET(LIB_SUFFIX
+    CACHE STRING "Define suffix of directory name (32/64)"
+  )
+
+  SET(EXEC_INSTALL_PREFIX
+    "${CMAKE_INSTALL_PREFIX}"
+    CACHE PATH  "Base directory for executables and libraries"
+  )
+  SET(SHARE_INSTALL_PREFIX
+    "${CMAKE_INSTALL_PREFIX}/share"
+    CACHE PATH "Base directory for files which go to share/"
+  )
+  SET(DATA_INSTALL_PREFIX
+    "${SHARE_INSTALL_PREFIX}"
+    CACHE PATH "The parent directory where applications can install their data")
+
+  # The following are directories where stuff will be installed to
+  SET(BIN_INSTALL_DIR
+    "${CMAKE_INSTALL_BINDIR}"
+    CACHE PATH "The ${APPLICATION_SHORTNAME} binary install dir (default prefix/bin)"
+  )
+  SET(SBIN_INSTALL_DIR
+    "${EXEC_INSTALL_PREFIX}/sbin"
+    CACHE PATH "The ${APPLICATION_SHORTNAME} sbin install dir (default prefix/sbin)"
+  )
+  SET(LIB_INSTALL_DIR
+    "${CMAKE_INSTALL_LIBDIR}"
+    CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/lib)"
+  )
+  SET(LIBEXEC_INSTALL_DIR
+    "${EXEC_INSTALL_PREFIX}/libexec"
+    CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/libexec)"
+  )
+  SET(LIB_PRIVATE_INSTALL_DIR
+	  "${LIB_INSTALL_DIR}"
+	  CACHE PATH "The subdirectory relative to the install prefix where private libs are installed"
+	  )
+  SET(PLUGIN_INSTALL_DIR
+    "${LIB_INSTALL_DIR}"
+    CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is prefix/lib/${APPLICATION_SHORTNAME})"
+  )
+  SET(INCLUDE_INSTALL_DIR
+    "${CMAKE_INSTALL_PREFIX}/include"
+    CACHE PATH "The subdirectory to the header prefix (default prefix/include)"
+  )
+
+  SET(DATA_INSTALL_DIR
+    "${DATA_INSTALL_PREFIX}"
+    CACHE PATH "The parent directory where applications can install their data (default prefix/share/${APPLICATION_SHORTNAME})"
+  )
+  SET(HTML_INSTALL_DIR
+    "${DATA_INSTALL_PREFIX}/doc/HTML"
+    CACHE PATH "The HTML install dir for documentation (default data/doc/html)"
+  )
+  SET(ICON_INSTALL_DIR
+    "${DATA_INSTALL_PREFIX}/icons"
+    CACHE PATH "The icon install dir (default data/icons/)"
+  )
+  SET(SOUND_INSTALL_DIR
+    "${DATA_INSTALL_PREFIX}/sounds"
+    CACHE PATH "The install dir for sound files (default data/sounds)"
+  )
+
+  SET(LOCALE_INSTALL_DIR
+    "${SHARE_INSTALL_PREFIX}/locale"
+    CACHE PATH "The install dir for translations (default prefix/share/locale)"
+  )
+
+  SET(XDG_APPS_DIR
+    "${SHARE_INSTALL_PREFIX}/applications/"
+    CACHE PATH "The XDG apps dir"
+  )
+  SET(XDG_DIRECTORY_DIR
+    "${SHARE_INSTALL_PREFIX}/desktop-directories"
+    CACHE PATH "The XDG directory"
+  )
+
+  IF(NOT "${EXEC_INSTALL_PREFIX}" STREQUAL "/usr")
+    SET(SYSCONFDIR_INSTALL_PREFIX "${EXEC_INSTALL_PREFIX}")
+  endif()
+
+  SET(SYSCONF_INSTALL_DIR
+    "${SYSCONFDIR_INSTALL_PREFIX}/etc"
+    CACHE PATH "The ${APPLICATION_SHORTNAME} sysconfig install dir (default prefix/etc)"
+  )
+  SET(MAN_INSTALL_DIR
+    "${SHARE_INSTALL_PREFIX}/man"
+    CACHE PATH "The ${APPLICATION_SHORTNAME} man install dir (default prefix/man)"
+  )
+  SET(INFO_INSTALL_DIR
+    "${SHARE_INSTALL_PREFIX}/info"
+    CACHE PATH "The ${APPLICATION_SHORTNAME} info install dir (default prefix/info)"
+  )
+endif (UNIX)
+
+if (WIN32)
+  # Same same
+  set(SHARE_INSTALL_PREFIX "share" CACHE PATH "-")
+  set(BIN_INSTALL_DIR "." CACHE PATH "-")
+  set(SBIN_INSTALL_DIR "." CACHE PATH "-")
+  set(LIB_INSTALL_DIR "lib" CACHE PATH "-")
+  set(INCLUDE_INSTALL_DIR "include" CACHE PATH "-")
+  set(PLUGIN_INSTALL_DIR "plugins" CACHE PATH "-")
+  set(HTML_INSTALL_DIR "doc/HTML" CACHE PATH "-")
+  set(ICON_INSTALL_DIR "." CACHE PATH "-")
+  set(SOUND_INSTALL_DIR "." CACHE PATH "-")
+  set(LOCALE_INSTALL_DIR "lang" CACHE PATH "-")
+  set(SYSCONF_INSTALL_DIR "config" CACHE PATH "-")
+  set(MAN_INSTALL_DIR "man" CACHE PATH "-")
+endif (WIN32)
--- a/cmake/modules/DefinePlatformDefaults.cmake
+++ b/cmake/modules/DefinePlatformDefaults.cmake
@@ -0,0 +1,32 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
+# Set system vars
+
+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+    set(LINUX TRUE)
+endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
+if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+    set(FREEBSD TRUE)
+    set(BSD TRUE)
+endif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+
+if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+    set(OPENBSD TRUE)
+    set(BSD TRUE)
+endif (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+
+if (CMAKE_SYSTEM_NAME MATCHES "NetBSD")
+    set(NETBSD TRUE)
+    set(BSD TRUE)
+endif (CMAKE_SYSTEM_NAME MATCHES "NetBSD")
+
+if (CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
+    set(SOLARIS TRUE)
+endif (CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
+
+if (CMAKE_SYSTEM_NAME MATCHES "OS2")
+    set(OS2 TRUE)
+endif (CMAKE_SYSTEM_NAME MATCHES "OS2")
--- a/cmake/modules/DeployQt5.cmake
+++ b/cmake/modules/DeployQt5.cmake
@@ -0,0 +1,381 @@
+# - Functions to help assemble a standalone Qt5 executable.
+# A collection of CMake utility functions useful for deploying
+# Qt5 executables.
+#
+# The following functions are provided by this module:
+#   write_qt5_conf
+#   resolve_qt5_paths
+#   fixup_qt5_executable
+#   install_qt5_plugin_path
+#   install_qt5_plugin
+#   install_qt5_executable
+# Requires CMake 2.6 or greater because it uses function and
+# PARENT_SCOPE. Also depends on BundleUtilities.cmake.
+#
+#  WRITE_QT5_CONF(<qt_conf_dir> <qt_conf_contents>)
+# Writes a qt.conf file with the <qt_conf_contents> into <qt_conf_dir>.
+#
+#  RESOLVE_QT5_PATHS(<paths_var> [<executable_path>])
+# Loop through <paths_var> list and if any don't exist resolve them
+# relative to the <executable_path> (if supplied) or the CMAKE_INSTALL_PREFIX.
+#
+#  FIXUP_QT5_EXECUTABLE(<executable> [<qtplugins> <libs> <dirs> <plugins_dir> <request_qt_conf>])
+# Copies Qt plugins, writes a Qt configuration file (if needed) and fixes up a
+# Qt5 executable using BundleUtilities so it is standalone and can be
+# drag-and-drop copied to another machine as long as all of the system
+# libraries are compatible.
+#
+# <executable> should point to the executable to be fixed-up.
+#
+# <qtplugins> should contain a list of the names or paths of any Qt plugins
+# to be installed.
+#
+# <libs> will be passed to BundleUtilities and should be a list of any already
+# installed plugins, libraries or executables to also be fixed-up.
+#
+# <dirs> will be passed to BundleUtilities and should contain and directories
+# to be searched to find library dependencies.
+#
+# <plugins_dir> allows an custom plugins directory to be used.
+#
+# <request_qt_conf> will force a qt.conf file to be written even if not needed.
+#
+#  INSTALL_QT5_PLUGIN_PATH(plugin executable copy installed_plugin_path_var <plugins_dir> <component> <configurations>)
+# Install (or copy) a resolved <plugin> to the default plugins directory
+# (or <plugins_dir>) relative to <executable> and store the result in
+# <installed_plugin_path_var>.
+#
+# If <copy> is set to TRUE then the plugins will be copied rather than
+# installed. This is to allow this module to be used at CMake time rather than
+# install time.
+#
+# If <component> is set then anything installed will use this COMPONENT.
+#
+#  INSTALL_QT5_PLUGIN(plugin executable copy installed_plugin_path_var <plugins_dir> <component>)
+# Install (or copy) an unresolved <plugin> to the default plugins directory
+# (or <plugins_dir>) relative to <executable> and store the result in
+# <installed_plugin_path_var>. See documentation of INSTALL_QT5_PLUGIN_PATH.
+#
+#  INSTALL_QT5_EXECUTABLE(<executable> [<qtplugins> <libs> <dirs> <plugins_dir> <request_qt_conf> <component>])
+# Installs Qt plugins, writes a Qt configuration file (if needed) and fixes up
+# a Qt5 executable using BundleUtilities so it is standalone and can be
+# drag-and-drop copied to another machine as long as all of the system
+# libraries are compatible. The executable will be fixed-up at install time.
+# <component> is the COMPONENT used for bundle fixup and plugin installation.
+# See documentation of FIXUP_QT5_BUNDLE.
+
+#=============================================================================
+# Copyright 2011 Mike McQuaid <m...@mikemcquaid.com>
+# Copyright 2013 Mihai Moldovan <io...@ionic.de>
+# CMake - Cross Platform Makefile Generator
+# Copyright 2000-2011 Kitware, Inc., Insight Software Consortium
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+#
+# * Neither the names of Kitware, Inc., the Insight Software Consortium,
+#   nor the names of their contributors may be used to endorse or promote
+#   products derived from this software without specific prior written
+#   permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# The functions defined in this file depend on the fixup_bundle function
+# (and others) found in BundleUtilities.cmake
+
+include(BundleUtilities)
+set(DeployQt5_cmake_dir "${CMAKE_CURRENT_LIST_DIR}")
+set(DeployQt5_apple_plugins_dir "PlugIns")
+
+function(write_qt5_conf qt_conf_dir qt_conf_contents)
+        set(qt_conf_path "${qt_conf_dir}/qt.conf")
+        message(STATUS "Writing ${qt_conf_path}")
+        file(WRITE "${qt_conf_path}" "${qt_conf_contents}")
+endfunction()
+
+function(resolve_qt5_paths paths_var)
+        set(executable_path ${ARGV1})
+
+        set(paths_resolved)
+        foreach(path ${${paths_var}})
+                if(EXISTS "${path}")
+                        list(APPEND paths_resolved "${path}")
+                else()
+                        if(${executable_path})
+                                list(APPEND paths_resolved
+"${executable_path}/${path}")
+                        else()
+                                list(APPEND paths_resolved
+"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${path}")
+                        endif()
+                endif()
+        endforeach()
+        set(${paths_var} ${paths_resolved} PARENT_SCOPE)
+endfunction()
+
+function(fixup_qt5_executable executable)
+        set(qtplugins ${ARGV1})
+        set(libs ${ARGV2})
+        set(dirs ${ARGV3})
+        set(plugins_dir ${ARGV4})
+        set(request_qt_conf ${ARGV5})
+
+        message(STATUS "fixup_qt5_executable")
+        message(STATUS "  executable='${executable}'")
+        message(STATUS "  qtplugins='${qtplugins}'")
+        message(STATUS "  libs='${libs}'")
+        message(STATUS "  dirs='${dirs}'")
+        message(STATUS "  plugins_dir='${plugins_dir}'")
+        message(STATUS "  request_qt_conf='${request_qt_conf}'")
+
+        if(QT_LIBRARY_DIR)
+                list(APPEND dirs "${QT_LIBRARY_DIR}")
+        endif()
+        if(QT_BINARY_DIR)
+                list(APPEND dirs "${QT_BINARY_DIR}")
+        endif()
+
+        if(APPLE)
+                set(qt_conf_dir "${executable}/Contents/Resources")
+                set(executable_path "${executable}")
+                set(write_qt_conf TRUE)
+                if(NOT plugins_dir)
+                        set(plugins_dir "${DeployQt5_apple_plugins_dir}")
+                endif()
+        else()
+                get_filename_component(executable_path "${executable}" PATH)
+                if(NOT executable_path)
+                        set(executable_path ".")
+                endif()
+                set(qt_conf_dir "${executable_path}")
+                set(write_qt_conf ${request_qt_conf})
+        endif()
+
+        foreach(plugin ${qtplugins})
+                set(installed_plugin_path "")
+                install_qt5_plugin("${plugin}" "${executable}" 1
+installed_plugin_path)
+                list(APPEND libs ${installed_plugin_path})
+        endforeach()
+
+        foreach(lib ${libs})
+                if(NOT EXISTS "${lib}")
+                        message(FATAL_ERROR "Library does not exist: ${lib}")
+                endif()
+        endforeach()
+
+        resolve_qt5_paths(libs "${executable_path}")
+
+        if(write_qt_conf)
+                set(qt_conf_contents "[Paths]\nPlugins = ${plugins_dir}")
+                write_qt5_conf("${qt_conf_dir}" "${qt_conf_contents}")
+        endif()
+
+        fixup_bundle("${executable}" "${libs}" "${dirs}")
+endfunction()
+
+function(install_qt5_plugin_path plugin executable copy
+installed_plugin_path_var)
+        set(plugins_dir ${ARGV4})
+        set(component ${ARGV5})
+        set(configurations ${ARGV6})
+        if(EXISTS "${plugin}")
+                if(APPLE)
+                        if(NOT plugins_dir)
+                                set(plugins_dir
+"${DeployQt5_apple_plugins_dir}")
+                        endif()
+                        set(plugins_path
+"${executable}/Contents/${plugins_dir}")
+                else()
+                        get_filename_component(plugins_path "${executable}"
+PATH)
+                        if(NOT plugins_path)
+                                set(plugins_path ".")
+                        endif()
+                        if(plugins_dir)
+                                set(plugins_path
+"${plugins_path}/${plugins_dir}")
+                        endif()
+                endif()
+
+                set(plugin_group "")
+
+                get_filename_component(plugin_path "${plugin}" PATH)
+                get_filename_component(plugin_parent_path "${plugin_path}" PATH)
+                get_filename_component(plugin_parent_dir_name
+"${plugin_parent_path}" NAME)
+                get_filename_component(plugin_name "${plugin}" NAME)
+                string(TOLOWER "${plugin_parent_dir_name}"
+plugin_parent_dir_name)
+
+                if("${plugin_parent_dir_name}" STREQUAL "plugins")
+                        get_filename_component(plugin_group "${plugin_path}"
+NAME)
+                        set(${plugin_group_var} "${plugin_group}")
+                endif()
+                set(plugins_path "${plugins_path}/${plugin_group}")
+
+                if(${copy})
+                        file(MAKE_DIRECTORY "${plugins_path}")
+                        file(COPY "${plugin}" DESTINATION "${plugins_path}")
+                else()
+                        if(configurations AND (CMAKE_CONFIGURATION_TYPES OR
+CMAKE_BUILD_TYPE))
+                                set(configurations CONFIGURATIONS
+${configurations})
+                        else()
+                                unset(configurations)
+                        endif()
+                        install(FILES "${plugin}" DESTINATION "${plugins_path}"
+${configurations} ${component})
+                endif()
+                set(${installed_plugin_path_var}
+"${plugins_path}/${plugin_name}" PARENT_SCOPE)
+        endif()
+endfunction()
+
+function(install_qt5_plugin plugin executable copy installed_plugin_path_var)
+        set(plugins_dir ${ARGV4})
+        set(component ${ARGV5})
+        if(EXISTS "${plugin}")
+                install_qt5_plugin_path("${plugin}" "${executable}" "${copy}"
+"${installed_plugin_path_var}" "${plugins_dir}" "${component}")
+        else()
+                #string(TOUPPER "QT_${plugin}_PLUGIN" plugin_var)
+                set(plugin_release)
+                set(plugin_debug)
+                set(plugin_tmp_path)
+                set(plugin_find_path "${Qt5Core_DIR}/../../../plugins/")
+                get_filename_component(plugin_find_path "${plugin_find_path}"
+REALPATH)
+                set(plugin_find_release_filename "lib${plugin}.dylib")
+                set(plugin_find_debug_filename "lib${plugin}_debug.dylib")
+                file(GLOB_RECURSE pluginlist "${plugin_find_path}"
+"${plugin_find_path}/*/lib*.dylib")
+                foreach(found_plugin ${pluginlist})
+                  get_filename_component(curname "${found_plugin}" NAME)
+                  if("${curname}" STREQUAL "${plugin_find_release_filename}")
+                    set(plugin_tmp_release_path "${found_plugin}")
+                  endif()
+                  if("${curname}" STREQUAL "${plugin_find_debug_filename}")
+                    set(plugin_tmp_debug_path "${found_plugin}")
+                  endif()
+                endforeach()
+
+                if((NOT DEFINED plugin_tmp_release_path OR NOT EXISTS
+"${plugin_tmp_release_path}") AND (NOT DEFINED plugin_tmp_debug_PATH OR NOT
+EXISTS "${plugin_tmp_debug_path}"))
+                        message(WARNING "Qt plugin \"${plugin}\" not recognized
+or found.")
+                endif()
+
+                if(EXISTS "${plugin_tmp_release_path}")
+                  set(plugin_release "${plugin_tmp_release_path}")
+                elseif(EXISTS "${plugin_tmp_debug_path}")
+                  set(plugin_release "${plugin_tmp_debug_path}")
+                endif()
+
+                if(EXISTS "${plugin_tmp_debug_path}")
+                  set(plugin_debug "${plugin_tmp_debug_path}")
+                elseif(EXISTS "${plugin_tmp_release_path}")
+                  set(plugin_debug "${plugin_tmp_release_path}")
+                endif()
+
+                if(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+                        install_qt5_plugin_path("${plugin_release}"
+"${executable}" "${copy}" "${installed_plugin_path_var}_release"
+"${plugins_dir}" "${component}" "Release|RelWithDebInfo|MinSizeRel")
+                        install_qt5_plugin_path("${plugin_debug}"
+"${executable}" "${copy}" "${installed_plugin_path_var}_debug" "${plugins_dir}"
+"${component}" "Debug")
+
+                        if(CMAKE_BUILD_TYPE MATCHES "^Debug$")
+                                set(${installed_plugin_path_var}
+${${installed_plugin_path_var}_debug})
+                        else()
+                                set(${installed_plugin_path_var}
+${${installed_plugin_path_var}_release})
+                        endif()
+                else()
+                        install_qt5_plugin_path("${plugin_release}"
+"${executable}" "${copy}" "${installed_plugin_path_var}" "${plugins_dir}"
+"${component}")
+                endif()
+        endif()
+        set(${installed_plugin_path_var} ${${installed_plugin_path_var}}
+PARENT_SCOPE)
+endfunction()
+
+function(install_qt5_executable executable)
+        set(qtplugins ${ARGV1})
+        set(libs ${ARGV2})
+        set(dirs ${ARGV3})
+        set(plugins_dir ${ARGV4})
+        set(request_qt_conf ${ARGV5})
+        set(component ${ARGV6})
+        if(QT_LIBRARY_DIR)
+                list(APPEND dirs "${QT_LIBRARY_DIR}")
+        endif()
+        if(QT_BINARY_DIR)
+                list(APPEND dirs "${QT_BINARY_DIR}")
+        endif()
+        if(component)
+                set(component COMPONENT ${component})
+        else()
+                unset(component)
+        endif()
+
+        get_filename_component(executable_absolute "${executable}" ABSOLUTE)
+        if(EXISTS "${QT_QTCORE_LIBRARY_RELEASE}")
+            gp_file_type("${executable_absolute}"
+"${QT_QTCORE_LIBRARY_RELEASE}" qtcore_type)
+        elseif(EXISTS "${QT_QTCORE_LIBRARY_DEBUG}")
+            gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY_DEBUG}"
+qtcore_type)
+        endif()
+        if(qtcore_type STREQUAL "system")
+                set(qt_plugins_dir "")
+        endif()
+
+        if(QT_IS_STATIC)
+                message(WARNING "Qt built statically: not installing plugins.")
+        else()
+                foreach(plugin ${qtplugins})
+                        message(STATUS "trying to install plugin ${plugin}")
+                        set(installed_plugin_paths "")
+                        install_qt5_plugin("${plugin}" "${executable}" 0
+installed_plugin_paths "${plugins_dir}" "${component}")
+                        list(APPEND libs ${installed_plugin_paths})
+                endforeach()
+        endif()
+
+        resolve_qt5_paths(libs "")
+
+        install(CODE
+  "include(\"${DeployQt5_cmake_dir}/DeployQt5.cmake\")
+  set(BU_CHMOD_BUNDLE_ITEMS TRUE)
+  FIXUP_QT5_EXECUTABLE(\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${executable}\"
+\"\" \"${libs}\" \"${dirs}\" \"${plugins_dir}\" \"${request_qt_conf}\")"
+                ${component}
+        )
+endfunction()
--- a/cmake/modules/FindCMocka.cmake
+++ b/cmake/modules/FindCMocka.cmake
@@ -0,0 +1,49 @@
+# - Try to find CMocka
+# Once done this will define
+#
+#  CMOCKA_ROOT_DIR - Set this variable to the root installation of CMocka
+#
+# Read-Only variables:
+#  CMOCKA_FOUND - system has CMocka
+#  CMOCKA_INCLUDE_DIR - the CMocka include directory
+#  CMOCKA_LIBRARIES - Link these to use CMocka
+#  CMOCKA_DEFINITIONS - Compiler switches required for using CMocka
+#
+#=============================================================================
+#  Copyright (c) 2011-2012 Andreas Schneider <asn@cryptomilk.org>
+#
+#  Distributed under the OSI-approved BSD License (the "License");
+#  see accompanying file Copyright.txt for details.
+#
+#  This software is distributed WITHOUT ANY WARRANTY; without even the
+#  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#  See the License for more information.
+#=============================================================================
+#
+
+find_path(CMOCKA_INCLUDE_DIR
+    NAMES
+        cmocka.h
+    PATHS
+        ${CMOCKA_ROOT_DIR}/include
+)
+
+find_library(CMOCKA_LIBRARY
+    NAMES
+        cmocka
+    PATHS
+        ${CMOCKA_ROOT_DIR}/include
+)
+
+if (CMOCKA_LIBRARY)
+  set(CMOCKA_LIBRARIES
+      ${CMOCKA_LIBRARIES}
+      ${CMOCKA_LIBRARY}
+  )
+endif (CMOCKA_LIBRARY)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(CMocka DEFAULT_MSG CMOCKA_LIBRARIES CMOCKA_INCLUDE_DIR)
+
+# show the CMOCKA_INCLUDE_DIR and CMOCKA_LIBRARIES variables only in the advanced view
+mark_as_advanced(CMOCKA_INCLUDE_DIR CMOCKA_LIBRARIES)
--- a/cmake/modules/FindCsync.cmake
+++ b/cmake/modules/FindCsync.cmake
@@ -1,28 +0,0 @@
-
-IF( DEFINED CSYNC_BUILD_PATH )
-  SET(CSYNC_LIBRARY_PATH ${CSYNC_BUILD_PATH})
-  SET(CSYNC_BINARY_DIR ${CSYNC_BUILD_PATH})
-
-  IF(WIN32)
-    SET(CSYNC_LIBRARY ${CSYNC_BUILD_PATH}/src/libocsync.dll)
-  ELSEIF( APPLE )
-    SET(CSYNC_LIBRARY ${CSYNC_BUILD_PATH}/src/libocsync.dylib)
-  ELSE()
-    SET(CSYNC_LIBRARY ${CSYNC_BUILD_PATH}/src/libocsync.so)
-  ENDIF()
-ELSE()
-  FIND_LIBRARY(CSYNC_LIBRARY NAMES ocsync HINTS $ENV{CSYNC_DIR})
-ENDIF()
-
-IF(NOT DEFINED CSYNC_INCLUDE_PATH)
-  FIND_PATH(CSYNC_INCLUDE_PATH NAMES csync.h HINTS $ENV{CSYNC_DIR} )
-ENDIF()
-
-SET(CSYNC_INCLUDE_DIR ${CSYNC_INCLUDE_PATH})
-
-# handle the QUIETLY and REQUIRED arguments and set CSYNC_FOUND to TRUE if
-# all listed variables are TRUE
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Csync DEFAULT_MSG CSYNC_LIBRARY CSYNC_INCLUDE_PATH)
-
-MARK_AS_ADVANCED( CSYNC_INCLUDE_PATH CSYNC_LIBRARY )
--- a/cmake/modules/FindINotify.cmake
+++ b/cmake/modules/FindINotify.cmake
@@ -1,3 +1,7 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
 # This module defines
 #  INOTIFY_INCLUDE_DIR, where to find inotify.h, etc.
 #  INOTIFY_FOUND, If false, do not try to use inotify.
--- a/cmake/modules/FindIconv.cmake
+++ b/cmake/modules/FindIconv.cmake
@@ -0,0 +1,82 @@
+# - Try to find Iconv
+# Once done this will define
+#
+#  ICONV_FOUND - system has Iconv
+#  ICONV_INCLUDE_DIRS - the Iconv include directory
+#  ICONV_LIBRARIES - Link these to use Iconv
+#  ICONV_DEFINITIONS - Compiler switches required for using Iconv
+#
+#  Copyright (c) 2013 Andreas Schneider <asn@cryptomilk.org>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+include(CheckIncludeFile)
+include(CheckFunctionExists)
+include(CheckLibraryExists)
+include(CheckPrototypeDefinition)
+
+find_path(ICONV_INCLUDE_DIR
+    NAMES
+        iconv.h sys/iconv.h
+)
+
+set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
+check_include_file(iconv.h HAVE_ICONV_H)
+check_include_file(sys/iconv.h HAVE_SYS_ICONV_H)
+set(CMAKE_REQUIRED_INCLUDES)
+
+find_library(ICONV_LIBRARY
+    NAMES
+        iconv
+        libiconv
+    PATHS
+)
+
+if (ICONV_LIBRARY)
+    get_filename_component(_ICONV_NAME ${ICONV_LIBRARY} NAME)
+    get_filename_component(_ICONV_PATH ${ICONV_LIBRARY} PATH)
+    check_library_exists(${_ICONV_NAME} iconv ${_ICONV_PATH} HAVE_ICONV)
+else()
+    check_function_exists(iconv HAVE_ICONV)
+endif()
+
+if (HAVE_ICONV_H OR HAVE_SYS_ICONV_H)
+    if (HAVE_ICONV_H)
+        set(_ICONV_PROTO_INCLUDE "iconv.h")
+    endif (HAVE_ICONV_H)
+    if (HAVE_SYS_ICONV_H)
+        set(_ICONV_PROTO_INCLUDE "sys/iconv.h")
+    endif (HAVE_SYS_ICONV_H)
+
+    set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
+    check_prototype_definition(iconv
+        "size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)"
+        "-1"
+        ${_ICONV_PROTO_INCLUDE}
+        HAVE_ICONV_CONST)
+    set(CMAKE_REQUIRED_INCLUDES)
+endif (HAVE_ICONV_H OR HAVE_SYS_ICONV_H)
+
+set(ICONV_INCLUDE_DIRS
+    ${ICONV_INCLUDE_DIR}
+)
+
+if (ICONV_LIBRARY)
+    set(ICONV_LIBRARIES
+        ${ICONV_LIBRARIES}
+        ${ICONV_LIBRARY}
+    )
+endif (ICONV_LIBRARY)
+
+include(FindPackageHandleStandardArgs)
+if (ICONV_LIBRARIES)
+    find_package_handle_standard_args(Iconv DEFAULT_MSG ICONV_LIBRARIES ICONV_INCLUDE_DIRS)
+else()
+    find_package_handle_standard_args(Iconv DEFAULT_MSG ICONV_INCLUDE_DIRS)
+endif()
+
+# show the ICONV_INCLUDE_DIRS and ICONV_LIBRARIES variables only in the advanced view
+mark_as_advanced(ICONV_INCLUDE_DIRS ICONV_LIBRARIES)
--- a/cmake/modules/FindLibSSH.cmake
+++ b/cmake/modules/FindLibSSH.cmake
@@ -0,0 +1,96 @@
+# - Try to find LibSSH
+# Once done this will define
+#
+#  LIBSSH_FOUND - system has LibSSH
+#  LIBSSH_INCLUDE_DIRS - the LibSSH include directory
+#  LIBSSH_LIBRARIES - Link these to use LibSSH
+#  LIBSSH_DEFINITIONS - Compiler switches required for using LibSSH
+#
+#  Copyright (c) 2009 Andreas Schneider <asn@cryptomilk.org>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+if (LIBSSH_LIBRARIES AND LIBSSH_INCLUDE_DIRS)
+  # in cache already
+  set(LIBSSH_FOUND TRUE)
+else (LIBSSH_LIBRARIES AND LIBSSH_INCLUDE_DIRS)
+
+  find_path(LIBSSH_INCLUDE_DIR
+    NAMES
+      libssh/libssh.h
+    PATHS
+      /usr/include
+      /usr/local/include
+      /opt/local/include
+      /sw/include
+      ${CMAKE_INCLUDE_PATH}
+      ${CMAKE_INSTALL_PREFIX}/include
+  )
+  
+  find_library(SSH_LIBRARY
+    NAMES
+      ssh
+      libssh
+    PATHS
+      /usr/lib
+      /usr/local/lib
+      /opt/local/lib
+      /sw/lib
+      ${CMAKE_LIBRARY_PATH}
+      ${CMAKE_INSTALL_PREFIX}/lib
+  )
+
+  if (LIBSSH_INCLUDE_DIR AND SSH_LIBRARY)
+    set(SSH_FOUND TRUE)
+  endif (LIBSSH_INCLUDE_DIR AND SSH_LIBRARY)
+
+  set(LIBSSH_INCLUDE_DIRS
+    ${LIBSSH_INCLUDE_DIR}
+  )
+
+  if (SSH_FOUND)
+    set(LIBSSH_LIBRARIES
+      ${LIBSSH_LIBRARIES}
+      ${SSH_LIBRARY}
+    )
+
+    if (LibSSH_FIND_VERSION)
+      file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MAJOR
+        REGEX "#define[ ]+LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
+      # Older versions of libssh like libssh-0.2 have LIBSSH_VERSION but not LIBSSH_VERSION_MAJOR
+      if (LIBSSH_VERSION_MAJOR)
+        string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MAJOR ${LIBSSH_VERSION_MAJOR})
+	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MINOR
+          REGEX "#define[ ]+LIBSSH_VERSION_MINOR[ ]+[0-9]+")
+	string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MINOR ${LIBSSH_VERSION_MINOR})
+	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_PATCH
+          REGEX "#define[ ]+LIBSSH_VERSION_MICRO[ ]+[0-9]+")
+	string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_PATCH ${LIBSSH_VERSION_PATCH})
+
+	set(LibSSH_VERSION ${LIBSSH_VERSION_MAJOR}.${LIBSSH_VERSION_MINOR}.${LIBSSH_VERSION_PATCH})
+
+	include(FindPackageVersionCheck)
+	find_package_version_check(LibSSH DEFAULT_MSG)
+      else (LIBSSH_VERSION_MAJOR)
+        message(STATUS "LIBSSH_VERSION_MAJOR not found in ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h, assuming libssh is too old")
+        set(LIBSSH_FOUND FALSE)
+      endif (LIBSSH_VERSION_MAJOR)
+    endif (LibSSH_FIND_VERSION)
+  endif (SSH_FOUND)
+
+  # If the version is too old, but libs and includes are set,
+  # find_package_handle_standard_args will set LIBSSH_FOUND to TRUE again,
+  # so we need this if() here.
+  if (LIBSSH_FOUND)
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(LibSSH DEFAULT_MSG LIBSSH_LIBRARIES LIBSSH_INCLUDE_DIRS)
+  endif (LIBSSH_FOUND)
+
+  # show the LIBSSH_INCLUDE_DIRS and LIBSSH_LIBRARIES variables only in the advanced view
+  mark_as_advanced(LIBSSH_INCLUDE_DIRS LIBSSH_LIBRARIES)
+
+endif (LIBSSH_LIBRARIES AND LIBSSH_INCLUDE_DIRS)
+
--- a/cmake/modules/FindNeon.cmake
+++ b/cmake/modules/FindNeon.cmake
@@ -0,0 +1,73 @@
+# - Try to find Neon
+# Once done this will define
+#
+#  NEON_FOUND - system has Neon
+#  NEON_INCLUDE_DIRS - the Neon include directory
+#  NEON_LIBRARIES - Link these to use Neon
+#  NEON_DEFINITIONS - Compiler switches required for using Neon
+#
+#  Copyright (c) 2011-2013 Andreas Schneider <asn@cryptomilk.org>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+find_package(PkgConfig)
+if (PKG_CONFIG_FOUND)
+    pkg_check_modules(_NEON neon)
+endif (PKG_CONFIG_FOUND)
+
+include(GNUInstallDirs)
+
+find_path(NEON_INCLUDE_DIRS
+NAMES
+    neon/ne_basic.h
+HINTS
+    ${_NEON_INCLUDEDIR}
+    ${CMAKE_INSTALL_INCLUDEDIR}
+)
+
+find_library(NEON_LIBRARIES
+NAMES
+    neon neon-27
+HINTS
+    ${_NEON_LIBDIR}
+    ${CMAKE_INSTALL_LIBDIR}
+    ${CMAKE_INSTALL_PREFIX}/lib
+    ${CMAKE_INSTALL_PREFIX}/lib64
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Neon DEFAULT_MSG NEON_LIBRARIES NEON_INCLUDE_DIRS)
+
+# show the NEON_INCLUDE_DIRS and NEON_LIBRARIES variables only in the advanced view
+mark_as_advanced(NEON_INCLUDE_DIRS NEON_LIBRARIES)
+
+# Check if neon was compiled with LFS support, if so, the NE_LFS variable has to
+# be defined in the owncloud module.
+# If neon was not compiled with LFS its also ok since the underlying system
+# than probably supports large files anyway.
+IF( CMAKE_FIND_ROOT_PATH )
+	FIND_PROGRAM( NEON_CONFIG_EXECUTABLE NAMES neon-config HINTS ${CMAKE_FIND_ROOT_PATH}/bin )
+ELSE( CMAKE_FIND_ROOT_PATH )
+	FIND_PROGRAM( NEON_CONFIG_EXECUTABLE NAMES neon-config )
+ENDIF( CMAKE_FIND_ROOT_PATH )
+
+IF ( NEON_CONFIG_EXECUTABLE )
+	MESSAGE(STATUS "neon-config executable: ${NEON_CONFIG_EXECUTABLE}")
+	# neon-config --support lfs
+	EXECUTE_PROCESS( COMMAND ${NEON_CONFIG_EXECUTABLE} "--support" "lfs"
+			    RESULT_VARIABLE LFS
+			    OUTPUT_STRIP_TRAILING_WHITESPACE )
+
+	IF (LFS EQUAL 0)
+		MESSAGE(STATUS "libneon has been compiled with LFS support")
+		SET(NEON_WITH_LFS 1)
+	ELSE (LFS EQUAL 0)
+		MESSAGE(STATUS "libneon has not been compiled with LFS support, rely on OS")
+	ENDIF (LFS EQUAL 0)
+ELSE  ( NEON_CONFIG_EXECUTABLE )
+    MESSAGE(STATUS, "neon-config could not be found.")
+ENDIF ( NEON_CONFIG_EXECUTABLE )
--- a/cmake/modules/FindOpenSSLCross.cmake
+++ b/cmake/modules/FindOpenSSLCross.cmake
@@ -0,0 +1,306 @@
+# - Try to find the OpenSSL encryption library
+# Once done this will define
+#
+#  OPENSSL_ROOT_DIR - Set this variable to the root installation of OpenSSL
+#
+# Read-Only variables:
+#  OPENSSL_FOUND - system has the OpenSSL library
+#  OPENSSL_INCLUDE_DIR - the OpenSSL include directory
+#  OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
+#  OPENSSL_VERSION - This is set to $major.$minor.$revision$path (eg. 0.9.8s)
+
+#=============================================================================
+# Copyright 2006-2009 Kitware, Inc.
+# Copyright 2006 Alexander Neundorf <neundorf@kde.org>
+# Copyright 2009-2011 Mathieu Malaterre <mathieu.malaterre@gmail.com>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+if (UNIX)
+  find_package(PkgConfig QUIET)
+  pkg_check_modules(_OPENSSL QUIET openssl)
+endif (UNIX)
+
+# http://www.slproweb.com/products/Win32OpenSSL.html
+SET(_OPENSSL_ROOT_HINTS
+  $ENV{OPENSSL_ROOT_DIR}
+  ${OPENSSL_ROOT_DIR}
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]"
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]"
+  )
+SET(_OPENSSL_ROOT_PATHS
+  "$ENV{PROGRAMFILES}/OpenSSL"
+  "$ENV{PROGRAMFILES}/OpenSSL-Win32"
+  "$ENV{PROGRAMFILES}/OpenSSL-Win64"
+  "C:/OpenSSL/"
+  "C:/OpenSSL-Win32/"
+  "C:/OpenSSL-Win64/"
+  )
+SET(_OPENSSL_ROOT_HINTS_AND_PATHS
+  HINTS ${_OPENSSL_ROOT_HINTS}
+  PATHS ${_OPENSSL_ROOT_PATHS}
+  )
+
+FIND_PATH(OPENSSL_INCLUDE_DIR
+  NAMES
+    openssl/ssl.h
+  HINTS
+    ${_OPENSSL_INCLUDEDIR}
+  ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+  PATH_SUFFIXES
+    include
+)
+
+IF(WIN32 AND NOT CYGWIN)
+  # MINGW should go here too
+  IF(MSVC)
+    # /MD and /MDd are the standard values - if someone wants to use
+    # others, the libnames have to change here too
+    # use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
+    # TODO: handle /MT and static lib
+    # In Visual C++ naming convention each of these four kinds of Windows libraries has it's standard suffix:
+    #   * MD for dynamic-release
+    #   * MDd for dynamic-debug
+    #   * MT for static-release
+    #   * MTd for static-debug
+
+    # Implementation details:
+    # We are using the libraries located in the VC subdir instead of the parent directory eventhough :
+    # libeay32MD.lib is identical to ../libeay32.lib, and
+    # ssleay32MD.lib is identical to ../ssleay32.lib
+    FIND_LIBRARY(LIB_EAY_DEBUG
+      NAMES
+        libeay32MDd
+        libeay32
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib"
+        "VC"
+        "lib/VC"
+    )
+
+    FIND_LIBRARY(LIB_EAY_RELEASE
+      NAMES
+        libeay32MD
+        libeay32
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib"
+        "VC"
+        "lib/VC"
+    )
+
+    FIND_LIBRARY(SSL_EAY_DEBUG
+      NAMES
+        ssleay32MDd
+        ssleay32
+        ssl
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib"
+        "VC"
+        "lib/VC"
+    )
+
+    FIND_LIBRARY(SSL_EAY_RELEASE
+      NAMES
+        ssleay32MD
+        ssleay32
+        ssl
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib"
+        "VC"
+        "lib/VC"
+    )
+
+    if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
+      set( OPENSSL_LIBRARIES
+        optimized ${SSL_EAY_RELEASE} debug ${SSL_EAY_DEBUG}
+        optimized ${LIB_EAY_RELEASE} debug ${LIB_EAY_DEBUG}
+        )
+    else()
+      set( OPENSSL_LIBRARIES ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} )
+    endif()
+    MARK_AS_ADVANCED(SSL_EAY_DEBUG SSL_EAY_RELEASE)
+    MARK_AS_ADVANCED(LIB_EAY_DEBUG LIB_EAY_RELEASE)
+  ELSEIF(MINGW)
+    # same player, for MingW
+    FIND_LIBRARY(LIB_EAY
+      NAMES
+        libeay32
+        crypto
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib"
+        "lib/MinGW"
+    )
+
+    FIND_LIBRARY(SSL_EAY
+      NAMES
+        ssleay32
+        ssl
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib"
+        "lib/MinGW"
+    )
+
+    MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
+    set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
+  ELSE(MSVC)
+    # Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues:
+    FIND_LIBRARY(LIB_EAY
+      NAMES
+        libeay32
+      HINTS
+        ${_OPENSSL_LIBDIR}
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        lib
+    )
+
+    FIND_LIBRARY(SSL_EAY
+      NAMES
+        ssleay32
+      HINTS
+        ${_OPENSSL_LIBDIR}
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        lib
+    )
+
+    MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
+    set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
+  ENDIF(MSVC)
+ELSE(WIN32 AND NOT CYGWIN)
+
+  FIND_LIBRARY(OPENSSL_SSL_LIBRARY
+    NAMES
+      ssl
+      ssleay32
+      ssleay32MD
+    HINTS
+      ${_OPENSSL_LIBDIR}
+    ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+    PATH_SUFFIXES
+      lib
+  )
+
+  FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARY
+    NAMES
+      crypto
+    HINTS
+      ${_OPENSSL_LIBDIR}
+    ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+    PATH_SUFFIXES
+      lib
+  )
+
+  MARK_AS_ADVANCED(OPENSSL_CRYPTO_LIBRARY OPENSSL_SSL_LIBRARY)
+
+  # compat defines
+  SET(OPENSSL_SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY})
+  SET(OPENSSL_CRYPTO_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
+
+  SET(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
+
+ENDIF(WIN32 AND NOT CYGWIN)
+
+function(from_hex HEX DEC)
+  string(TOUPPER "${HEX}" HEX)
+  set(_res 0)
+  string(LENGTH "${HEX}" _strlen)
+
+  while (_strlen GREATER 0)
+    math(EXPR _res "${_res} * 16")
+    string(SUBSTRING "${HEX}" 0 1 NIBBLE)
+    string(SUBSTRING "${HEX}" 1 -1 HEX)
+    if (NIBBLE STREQUAL "A")
+      math(EXPR _res "${_res} + 10")
+    elseif (NIBBLE STREQUAL "B")
+      math(EXPR _res "${_res} + 11")
+    elseif (NIBBLE STREQUAL "C")
+      math(EXPR _res "${_res} + 12")
+    elseif (NIBBLE STREQUAL "D")
+      math(EXPR _res "${_res} + 13")
+    elseif (NIBBLE STREQUAL "E")
+      math(EXPR _res "${_res} + 14")
+    elseif (NIBBLE STREQUAL "F")
+      math(EXPR _res "${_res} + 15")
+    else()
+      math(EXPR _res "${_res} + ${NIBBLE}")
+    endif()
+
+    string(LENGTH "${HEX}" _strlen)
+  endwhile()
+
+  set(${DEC} ${_res} PARENT_SCOPE)
+endfunction(from_hex)
+
+if (OPENSSL_INCLUDE_DIR)
+  if (_OPENSSL_VERSION)
+    set(OPENSSL_VERSION "${_OPENSSL_VERSION}")
+  elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
+    file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
+         REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
+
+    # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
+    # The status gives if this is a developer or prerelease and is ignored here.
+    # Major, minor, and fix directly translate into the version numbers shown in
+    # the string. The patch field translates to the single character suffix that
+    # indicates the bug fix state, which 00 -> nothing, 01 -> a, 02 -> b and so
+    # on.
+
+    string(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F]).*$"
+           "\\1;\\2;\\3;\\4;\\5" OPENSSL_VERSION_LIST "${openssl_version_str}")
+    list(GET OPENSSL_VERSION_LIST 0 OPENSSL_VERSION_MAJOR)
+    list(GET OPENSSL_VERSION_LIST 1 OPENSSL_VERSION_MINOR)
+    from_hex("${OPENSSL_VERSION_MINOR}" OPENSSL_VERSION_MINOR)
+    list(GET OPENSSL_VERSION_LIST 2 OPENSSL_VERSION_FIX)
+    from_hex("${OPENSSL_VERSION_FIX}" OPENSSL_VERSION_FIX)
+    list(GET OPENSSL_VERSION_LIST 3 OPENSSL_VERSION_PATCH)
+
+    if (NOT OPENSSL_VERSION_PATCH STREQUAL "00")
+      from_hex("${OPENSSL_VERSION_PATCH}" _tmp)
+      # 96 is the ASCII code of 'a' minus 1
+      math(EXPR OPENSSL_VERSION_PATCH_ASCII "${_tmp} + 96")
+      unset(_tmp)
+      # Once anyone knows how OpenSSL would call the patch versions beyond 'z'
+      # this should be updated to handle that, too. This has not happened yet
+      # so it is simply ignored here for now.
+      string(ASCII "${OPENSSL_VERSION_PATCH_ASCII}" OPENSSL_VERSION_PATCH_STRING)
+    endif (NOT OPENSSL_VERSION_PATCH STREQUAL "00")
+
+    set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}")
+  endif (_OPENSSL_VERSION)
+endif (OPENSSL_INCLUDE_DIR)
+
+include(FindPackageHandleStandardArgs)
+
+if (OPENSSL_VERSION)
+  find_package_handle_standard_args(OpenSSL
+    REQUIRED_VARS
+      OPENSSL_LIBRARIES
+      OPENSSL_INCLUDE_DIR
+    VERSION_VAR
+      OPENSSL_VERSION
+    FAIL_MESSAGE
+      "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
+  )
+else (OPENSSL_VERSION)
+  find_package_handle_standard_args(OpenSSL "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
+    OPENSSL_LIBRARIES
+    OPENSSL_INCLUDE_DIR
+  )
+endif (OPENSSL_VERSION)
+
+MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)
--- a/cmake/modules/FindPackageVersionCheck.cmake
+++ b/cmake/modules/FindPackageVersionCheck.cmake
@@ -0,0 +1,72 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
+# FIND_PACKAGE_VERSION_CHECK(NAME (DEFAULT_MSG|"Custom failure message"))
+#    This function is intended to be used in FindXXX.cmake modules files.
+#    It handles NAME_FIND_VERSION and NAME_VERSION variables in a Module.
+#
+#    Example:
+#    find_package(LibSSH 0.3.2)
+#
+#    # check for the version and set it
+#    set(LibSSH_VERSION 0.3.0)
+#    find_package_version_check(LibSSH DEFAULT_MSG)
+#
+#
+# Copyright (c) 2009 Andreas Schneider <asn@cryptomilk.org>
+#
+# Redistribution and use is allowed according to the terms of the New
+# BSD license.
+
+function(FIND_PACKAGE_VERSION_CHECK _NAME _FAIL_MSG)
+  string(TOUPPER ${_NAME} _NAME_UPPER)
+  set(_AGE "old")
+
+  if(${_NAME}_FIND_VERSION_EXACT)
+    if (${_NAME}_FIND_VERSION VERSION_EQUAL ${_NAME}_VERSION)
+      # exact version found
+      set(${_NAME_UPPER}_FOUND TRUE)
+    else (${_NAME}_FIND_VERSION VERSION_EQUAL ${_NAME}_VERSION)
+      # exect version not found
+      set(${_NAME_UPPER}_FOUND FALSE)
+      # check if newer or older
+      if (${_NAME}_FIND_VERSION VERSION_LESS ${_NAME}_VERSION)
+        set(_AGE "new")
+      else (${_NAME}_FIND_VERSION VERSION_LESS ${_NAME}_VERSION)
+        set(_AGE "old")
+      endif (${_NAME}_FIND_VERSION VERSION_LESS ${_NAME}_VERSION)
+    endif (${_NAME}_FIND_VERSION VERSION_EQUAL ${_NAME}_VERSION)
+  else (${_NAME}_FIND_VERSION_EXACT)
+    if (${_NAME}_FIND_VERSION)
+      if (${_NAME}_VERSION VERSION_LESS ${_NAME}_FIND_VERSION)
+        set(${_NAME_UPPER}_FOUND FALSE)
+        set(_AGE "old")
+      else (${_NAME}_VERSION VERSION_LESS ${_NAME}_FIND_VERSION)
+        set(${_NAME_UPPER}_FOUND TRUE)
+     endif (${_NAME}_VERSION VERSION_LESS ${_NAME}_FIND_VERSION)
+    endif (${_NAME}_FIND_VERSION)
+  endif(${_NAME}_FIND_VERSION_EXACT)
+
+  if ("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
+    if (${_NAME}_FIND_VERSION_EXACT)
+      set(_FAIL_MESSAGE "The installed ${_NAME} version ${${_NAME}_VERSION} is too ${_AGE}, version ${${_NAME}_FIND_VERSION} is required.")
+    else (${_NAME}_FIND_VERSION_EXACT)
+      set(_FAIL_MESSAGE "The installed ${_NAME} version ${${_NAME}_VERSION} is too ${_AGE}, at least version ${${_NAME}_FIND_VERSION} is required.")
+    endif (${_NAME}_FIND_VERSION_EXACT)
+  else ("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
+    set(_FAIL_MESSAGE "${_FAIL_MSG}")
+  endif ("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
+
+  if (NOT ${_NAME_UPPER}_FOUND)
+    if (${_NAME}_FIND_REQUIRED)
+      message(FATAL_ERROR "${_FAIL_MESSAGE}")
+    else (${_NAME}_FIND_REQUIRED)
+      if (NOT ${_NAME}_FIND_QUIETLY)
+        message(STATUS "${_FAIL_MESSAGE}")
+      endif (NOT ${_NAME}_FIND_QUIETLY)
+    endif (${_NAME}_FIND_REQUIRED)
+  endif (NOT ${_NAME_UPPER}_FOUND)
+
+  set(${_NAME_UPPER}_FOUND ${${_NAME_UPPER}_FOUND} PARENT_SCOPE)
+endfunction(FIND_PACKAGE_VERSION_CHECK)
--- a/cmake/modules/FindPdfLatex.cmake
+++ b/cmake/modules/FindPdfLatex.cmake
@@ -1,3 +1,7 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
 find_program(PDFLATEX_EXECUTABLE NAMES pdflatex
  HINTS
  $ENV{PDFLATEX_DIR}
--- a/cmake/modules/FindQt5Keychain.cmake
+++ b/cmake/modules/FindQt5Keychain.cmake
@@ -0,0 +1,33 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
+# - Try to find QtKeychain
+# Once done this will define
+#  QTKEYCHAIN_FOUND - System has QtKeychain
+#  QTKEYCHAIN_INCLUDE_DIRS - The QtKeychain include directories
+#  QTKEYCHAIN_LIBRARIES - The libraries needed to use QtKeychain
+#  QTKEYCHAIN_DEFINITIONS - Compiler switches required for using LibXml2
+
+find_path(QTKEYCHAIN_INCLUDE_DIR qt5keychain/keychain.h)
+
+find_library(QTKEYCHAIN_LIBRARY
+            NAMES
+              qt5keychain
+              lib5qtkeychain
+            PATHS
+               /usr/lib
+               /usr/lib/${CMAKE_ARCH_TRIPLET}
+               /usr/local/lib
+               /opt/local/lib
+               ${CMAKE_LIBRARY_PATH}
+               ${CMAKE_INSTALL_PREFIX}/lib
+            )
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set QTKEYCHAIN_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(Qt5Keychain  DEFAULT_MSG
+	QTKEYCHAIN_LIBRARY QTKEYCHAIN_INCLUDE_DIR)
+
+mark_as_advanced(QTKEYCHAIN_INCLUDE_DIR QTKEYCHAIN_LIBRARY)
--- a/cmake/modules/FindQtKeychain.cmake
+++ b/cmake/modules/FindQtKeychain.cmake
@@ -1,18 +1,33 @@
-# - Try to find QtKeyChain
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
+# - Try to find QtKeychain
 # Once done this will define
-#  QTKEYCHAIN_FOUND - System has QtKeyChain
-#  QTKEYCHAIN_INCLUDE_DIRS - The QtKeyChain include directories
-#  QTKEYCHAIN_LIBRARIES - The libraries needed to use QtKeyChain
+#  QTKEYCHAIN_FOUND - System has QtKeychain
+#  QTKEYCHAIN_INCLUDE_DIRS - The QtKeychain include directories
+#  QTKEYCHAIN_LIBRARIES - The libraries needed to use QtKeychain
 #  QTKEYCHAIN_DEFINITIONS - Compiler switches required for using LibXml2

 find_path(QTKEYCHAIN_INCLUDE_DIR qtkeychain/keychain.h)

-find_library(QTKEYCHAIN_LIBRARY NAMES libqtkeychain qtkeychain)
+find_library(QTKEYCHAIN_LIBRARY
+            NAMES
+              qtkeychain
+              libqtkeychain
+            PATHS
+               /usr/lib
+               /usr/lib/${CMAKE_ARCH_TRIPLET}
+               /usr/local/lib
+               /opt/local/lib
+               ${CMAKE_LIBRARY_PATH}
+               ${CMAKE_INSTALL_PREFIX}/lib
+            )

 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set QTKEYCHAIN_FOUND to TRUE
 # if all listed variables are TRUE
-find_package_handle_standard_args(QtKeyChain  DEFAULT_MSG
+find_package_handle_standard_args(QtKeychain  DEFAULT_MSG
 	QTKEYCHAIN_LIBRARY QTKEYCHAIN_INCLUDE_DIR)

-mark_as_advanced(QTKEYCHAIN_INCLUDE_DIR QTKEYCHAIN_LIBRARY )
+mark_as_advanced(QTKEYCHAIN_INCLUDE_DIR QTKEYCHAIN_LIBRARY)
--- a/cmake/modules/FindSMBClient.cmake
+++ b/cmake/modules/FindSMBClient.cmake
@@ -0,0 +1,66 @@
+# - Try to find SMBClient
+# Once done this will define
+#
+#  SMBCLIENT_FOUND - system has SMBClient
+#  SMBCLIENT_INCLUDE_DIRS - the SMBClient include directory
+#  SMBCLIENT_LIBRARIES - Link these to use SMBClient
+#  SMBCLIENT_DEFINITIONS - Compiler switches required for using SMBClient
+#
+#  Copyright (c) 2013 Andreas Schneider <asn@cryptomilk.org>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+if (SMBCLIENT_LIBRARIES AND SMBCLIENT_INCLUDE_DIRS)
+  # in cache already
+  set(SMBCLIENT_FOUND TRUE)
+else (SMBCLIENT_LIBRARIES AND SMBCLIENT_INCLUDE_DIRS)
+  find_package(PkgConfig)
+  if (PKG_CONFIG_FOUND)
+    pkg_check_modules(_SMBCLIENT smbclient)
+  endif (PKG_CONFIG_FOUND)
+
+  find_path(SMBCLIENT_INCLUDE_DIR
+    NAMES
+      libsmbclient.h
+    PATHS
+      ${_SMBCLIENT_INCLUDEDIR}
+      /usr/include
+      /usr/local/include
+      /opt/local/include
+      /sw/include
+  )
+
+  find_library(SMBCLIENT_LIBRARY
+    NAMES
+      smbclient
+    PATHS
+      ${_SMBCLIENT_LIBDIR}
+      /usr/lib
+      /usr/local/lib
+      /opt/local/lib
+      /sw/lib
+  )
+
+  set(SMBCLIENT_INCLUDE_DIRS
+    ${SMBCLIENT_INCLUDE_DIR}
+  )
+
+  if (SMBCLIENT_LIBRARY)
+    set(SMBCLIENT_LIBRARIES
+        ${SMBCLIENT_LIBRARIES}
+        ${SMBCLIENT_LIBRARY}
+    )
+  endif (SMBCLIENT_LIBRARY)
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(SMBClient DEFAULT_MSG SMBCLIENT_LIBRARIES SMBCLIENT_INCLUDE_DIRS)
+
+  # show the SMBCLIENT_INCLUDE_DIRS and SMBCLIENT_LIBRARIES variables only in the advanced view
+  mark_as_advanced(SMBCLIENT_INCLUDE_DIRS SMBCLIENT_LIBRARIES)
+
+endif (SMBCLIENT_LIBRARIES AND SMBCLIENT_INCLUDE_DIRS)
+
--- a/cmake/modules/FindSQLite3.cmake
+++ b/cmake/modules/FindSQLite3.cmake
@@ -0,0 +1,58 @@
+# - Try to find SQLite3
+# Once done this will define
+#
+#  SQLITE3_FOUND - system has SQLite3
+#  SQLITE3_INCLUDE_DIRS - the SQLite3 include directory
+#  SQLITE3_LIBRARIES - Link these to use SQLite3
+#  SQLITE3_DEFINITIONS - Compiler switches required for using SQLite3
+#
+#  Copyright (c) 2009-2013 Andreas Schneider <asn@cryptomilk.org>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+if (UNIX)
+  find_package(PkgConfig)
+  if (PKG_CONFIG_FOUND)
+    pkg_check_modules(_SQLITE3 sqlite3)
+  endif (PKG_CONFIG_FOUND)
+endif (UNIX)
+
+find_path(SQLITE3_INCLUDE_DIR
+    NAMES
+        sqlite3.h
+    PATHS
+        ${_SQLITE3_INCLUDEDIR}
+)
+
+find_library(SQLITE3_LIBRARY
+    NAMES
+        sqlite3 sqlite3-0
+    PATHS
+        ${_SQLITE3_LIBDIR}
+)
+
+set(SQLITE3_INCLUDE_DIRS
+    ${SQLITE3_INCLUDE_DIR}
+)
+
+if (SQLITE3_LIBRARY)
+    set(SQLITE3_LIBRARIES
+        ${SQLITE3_LIBRARIES}
+        ${SQLITE3_LIBRARY}
+    )
+endif (SQLITE3_LIBRARY)
+
+if (SQLite3_FIND_VERSION AND _SQLITE3_VERSION)
+    set(SQLite3_VERSION _SQLITE3_VERSION)
+endif (SQLite3_FIND_VERSION AND _SQLITE3_VERSION)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SQLite3 DEFAULT_MSG SQLITE3_LIBRARIES SQLITE3_INCLUDE_DIRS)
+
+# show the SQLITE3_INCLUDE_DIRS and SQLITE3_LIBRARIES variables only in the advanced view
+mark_as_advanced(SQLITE3_INCLUDE_DIRS SQLITE3_LIBRARIES)
+
--- a/cmake/modules/FindSparkle.cmake
+++ b/cmake/modules/FindSparkle.cmake
@@ -0,0 +1,23 @@
+# Find Sparkle.framework
+#
+# Once done this will define
+#  SPARKLE_FOUND - system has Sparkle
+#  SPARKLE_INCLUDE_DIR - the Sparkle include directory
+#  SPARKLE_LIBRARY - The library needed to use Sparkle
+# Copyright (c) 2009, Vittorio Giovara <vittorio.giovara@gmail.com>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+
+include(FindPackageHandleStandardArgs)
+
+find_path(SPARKLE_INCLUDE_DIR Sparkle.h)
+find_library(SPARKLE_LIBRARY NAMES Sparkle)
+
+find_package_handle_standard_args(Sparkle DEFAULT_MSG SPARKLE_INCLUDE_DIR SPARKLE_LIBRARY)
+mark_as_advanced(SPARKLE_INCLUDE_DIR SPARKLE_LIBRARY)
+
--- a/cmake/modules/FindSphinx.cmake
+++ b/cmake/modules/FindSphinx.cmake
@@ -1,3 +1,7 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
 find_program(SPHINX_EXECUTABLE NAMES sphinx-build
  HINTS
  $ENV{SPHINX_DIR}
--- a/cmake/modules/GNUInstallDirs.cmake
+++ b/cmake/modules/GNUInstallDirs.cmake
@@ -1,32 +1,49 @@
-# - Define GNU standard installation directories
+#.rst:
+# GNUInstallDirs
+# --------------
+#
+# Define GNU standard installation directories
+#
 # Provides install directory variables as defined for GNU software:
-#  http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+#
+# ::
+#
+#   http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+#
 # Inclusion of this module defines the following variables:
-#  CMAKE_INSTALL_<dir>      - destination for files of a given type
-#  CMAKE_INSTALL_FULL_<dir> - corresponding absolute path
+#
+# ::
+#
+#   CMAKE_INSTALL_<dir>      - destination for files of a given type
+#   CMAKE_INSTALL_FULL_<dir> - corresponding absolute path
+#
 # where <dir> is one of:
-#  BINDIR           - user executables (bin)
-#  SBINDIR          - system admin executables (sbin)
-#  LIBEXECDIR       - program executables (libexec)
-#  SYSCONFDIR       - read-only single-machine data (etc)
-#  SHAREDSTATEDIR   - modifiable architecture-independent data (com)
-#  LOCALSTATEDIR    - modifiable single-machine data (var)
-#  LIBDIR           - object code libraries (lib or lib64)
-#  INCLUDEDIR       - C header files (include)
-#  OLDINCLUDEDIR    - C header files for non-gcc (/usr/include)
-#  DATAROOTDIR      - read-only architecture-independent data root (share)
-#  DATADIR          - read-only architecture-independent data (DATAROOTDIR)
-#  INFODIR          - info documentation (DATAROOTDIR/info)
-#  LOCALEDIR        - locale-dependent data (DATAROOTDIR/locale)
-#  MANDIR           - man documentation (DATAROOTDIR/man)
-#  DOCDIR           - documentation root (DATAROOTDIR/doc/PROJECT_NAME)
-# Each CMAKE_INSTALL_<dir> value may be passed to the DESTINATION options of
-# install() commands for the corresponding file type.  If the includer does
-# not define a value the above-shown default will be used and the value will
-# appear in the cache for editing by the user.
-# Each CMAKE_INSTALL_FULL_<dir> value contains an absolute path constructed
-# from the corresponding destination by prepending (if necessary) the value
-# of CMAKE_INSTALL_PREFIX.
+#
+# ::
+#
+#   BINDIR           - user executables (bin)
+#   SBINDIR          - system admin executables (sbin)
+#   LIBEXECDIR       - program executables (libexec)
+#   SYSCONFDIR       - read-only single-machine data (etc)
+#   SHAREDSTATEDIR   - modifiable architecture-independent data (com)
+#   LOCALSTATEDIR    - modifiable single-machine data (var)
+#   LIBDIR           - object code libraries (lib or lib64 or lib/<multiarch-tuple> on Debian)
+#   INCLUDEDIR       - C header files (include)
+#   OLDINCLUDEDIR    - C header files for non-gcc (/usr/include)
+#   DATAROOTDIR      - read-only architecture-independent data root (share)
+#   DATADIR          - read-only architecture-independent data (DATAROOTDIR)
+#   INFODIR          - info documentation (DATAROOTDIR/info)
+#   LOCALEDIR        - locale-dependent data (DATAROOTDIR/locale)
+#   MANDIR           - man documentation (DATAROOTDIR/man)
+#   DOCDIR           - documentation root (DATAROOTDIR/doc/PROJECT_NAME)
+#
+# Each CMAKE_INSTALL_<dir> value may be passed to the DESTINATION
+# options of install() commands for the corresponding file type.  If the
+# includer does not define a value the above-shown default will be used
+# and the value will appear in the cache for editing by the user.  Each
+# CMAKE_INSTALL_FULL_<dir> value contains an absolute path constructed
+# from the corresponding destination by prepending (if necessary) the
+# value of CMAKE_INSTALL_PREFIX.

 #=============================================================================
 # Copyright 2011 Nikita Krupen'ko <krnekit@gmail.com>
@@ -68,30 +85,90 @@ if(NOT DEFINED CMAKE_INSTALL_LOCALSTATEDIR)
  set(CMAKE_INSTALL_LOCALSTATEDIR "var" CACHE PATH "modifiable single-machine data (var)")
 endif()

-if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+# We check if the variable was manually set and not cached, in order to
+# allow projects to set the values as normal variables before including
+# GNUInstallDirs to avoid having the entries cached or user-editable. It
+# replaces the "if(NOT DEFINED CMAKE_INSTALL_XXX)" checks in all the
+# other cases.
+# If CMAKE_INSTALL_LIBDIR is defined, if _libdir_set is false, then the
+# variable is a normal one, otherwise it is a cache one.
+get_property(_libdir_set CACHE CMAKE_INSTALL_LIBDIR PROPERTY TYPE SET)
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set
+    AND DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX
+    AND NOT "${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX}" STREQUAL "${CMAKE_INSTALL_PREFIX}"))
+  # If CMAKE_INSTALL_LIBDIR is not defined, it is always executed.
+  # Otherwise:
+  #  * if _libdir_set is false it is not executed (meaning that it is
+  #    not a cache variable)
+  #  * if _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX is not defined it is
+  #    not executed
+  #  * if _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX and
+  #    CMAKE_INSTALL_PREFIX are the same string it is not executed.
+  #    _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX is updated after the
+  #    execution, of this part of code, therefore at the next inclusion
+  #    of the file, CMAKE_INSTALL_LIBDIR is defined, and the 2 strings
+  #    are equal, meaning that the if is not executed the code the
+  #    second time.
+
  set(_LIBDIR_DEFAULT "lib")
  # Override this default 'lib' with 'lib64' iff:
  #  - we are on Linux system but NOT cross-compiling
  #  - we are NOT on debian
  #  - we are on a 64 bits system
  # reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
-  # Note that the future of multi-arch handling may be even
-  # more complicated than that: http://wiki.debian.org/Multiarch
-  if(CMAKE_SYSTEM_NAME MATCHES "Linux"
-      AND NOT CMAKE_CROSSCOMPILING
-      AND NOT EXISTS "/etc/debian_version")
-    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
-      message(AUTHOR_WARNING
-        "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
-        "Please enable at least one language before including GNUInstallDirs.")
-    else()
-      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-        set(_LIBDIR_DEFAULT "lib64")
+  # For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
+  # CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
+  # and CMAKE_INSTALL_PREFIX is "/usr"
+  # See http://wiki.debian.org/Multiarch
+  if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX)
+    set(__LAST_LIBDIR_DEFAULT "lib")
+    # __LAST_LIBDIR_DEFAULT is the default value that we compute from
+    # _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX, not a cache entry for
+    # the value that was last used as the default.
+    # This value is used to figure out whether the user changed the
+    # CMAKE_INSTALL_LIBDIR value manually, or if the value was the
+    # default one. When CMAKE_INSTALL_PREFIX changes, the value is
+    # updated to the new default, unless the user explicitly changed it.
+  endif()
+  if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
+      AND NOT CMAKE_CROSSCOMPILING)
+    if (EXISTS "/etc/debian_version") # is this a debian system ?
+      if(CMAKE_LIBRARY_ARCHITECTURE)
+        if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
+          set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+        endif()
+        if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX
+            AND "${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
+          set(__LAST_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+        endif()
+      endif()
+    else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
+      if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
+        message(AUTHOR_WARNING
+          "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
+          "Please enable at least one language before including GNUInstallDirs.")
+      else()
+        if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+          set(_LIBDIR_DEFAULT "lib64")
+          if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX)
+            set(__LAST_LIBDIR_DEFAULT "lib64")
+          endif()
+        endif()
      endif()
    endif()
  endif()
-  set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
+  if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+    set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
+  elseif(DEFINED __LAST_LIBDIR_DEFAULT
+      AND "${__LAST_LIBDIR_DEFAULT}" STREQUAL "${CMAKE_INSTALL_LIBDIR}")
+    set_property(CACHE CMAKE_INSTALL_LIBDIR PROPERTY VALUE "${_LIBDIR_DEFAULT}")
+  endif()
 endif()
+# Save for next run
+set(_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE INTERNAL "CMAKE_INSTALL_PREFIX during last run")
+unset(_libdir_set)
+unset(__LAST_LIBDIR_DEFAULT)
+

 if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
  set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE PATH "C header files (include)")
--- a/cmake/modules/MacOSXBundleInfo.plist.in
+++ b/cmake/modules/MacOSXBundleInfo.plist.in
@@ -17,16 +17,22 @@
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleLongVersionString</key>
-        <string>@APPLICATION_NAME@ @VERSION@</string>
+        <string>@APPLICATION_NAME@ @MIRALL_VERSION_STRING@</string>
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-        <string>@VERSION@</string>
+        <string>@MIRALL_VERSION_FULL@</string>
        <key>CFBundleShortVersionString</key>
-        <string>@VERSION@</string>
+        <string>@MIRALL_VERSION_STRING@</string>
        <key>NSHumanReadableCopyright</key>
-        <string>(C) 2012 @APPLICATION_VENDOR@</string>
+        <string>(C) 2014 @APPLICATION_VENDOR@</string>
+        <key>SUShowReleaseNotes</key>
+        <false/>
+        <key>LSMinimumBundleVersion</key>
+        <string>10.7.0</string>
+        <key>SUPublicDSAKeyFile</key>
+        <string>dsa_pub.pem</string>
 </dict>
 </plist>
--- a/cmake/modules/MacroAddCompileFlags.cmake
+++ b/cmake/modules/MacroAddCompileFlags.cmake
@@ -0,0 +1,21 @@
+# - MACRO_ADD_COMPILE_FLAGS(target_name flag1 ... flagN)
+
+# Copyright (c) 2006, Oswald Buddenhagen, <ossi@kde.org>
+# Copyright (c) 2006, Andreas Schneider, <asn@cryptomilk.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+macro (MACRO_ADD_COMPILE_FLAGS _target)
+
+  get_target_property(_flags ${_target} COMPILE_FLAGS)
+  if (_flags)
+    set(_flags ${_flags} ${ARGN})
+  else (_flags)
+    set(_flags ${ARGN})
+  endif (_flags)
+
+  set_target_properties(${_target} PROPERTIES COMPILE_FLAGS ${_flags})
+
+endmacro (MACRO_ADD_COMPILE_FLAGS)
--- a/cmake/modules/MacroAddLinkFlags.cmake
+++ b/cmake/modules/MacroAddLinkFlags.cmake
@@ -0,0 +1,20 @@
+# - MACRO_ADD_LINK_FLAGS(target_name flag1 ... flagN)
+
+# Copyright (c) 2006, Oswald Buddenhagen, <ossi@kde.org>
+# Copyright (c) 2006, Andreas Schneider, <asn@cryptomilk.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+macro (MACRO_ADD_LINK_FLAGS _target)
+
+  get_target_property(_flags ${_target} LINK_FLAGS)
+  if (_flags)
+    set(_flags "${_flags} ${ARGN}")
+  else (_flags)
+    set(_flags "${ARGN}")
+  endif (_flags)
+
+  set_target_properties(${_target} PROPERTIES LINK_FLAGS "${_flags}")
+
+endmacro (MACRO_ADD_LINK_FLAGS)
--- a/cmake/modules/MacroAddPlugin.cmake
+++ b/cmake/modules/MacroAddPlugin.cmake
@@ -0,0 +1,30 @@
+#  - MACRO_ADD_PLUGIN(name [WITH_PREFIX] file1 .. fileN)
+#
+#  Create a plugin from the given source files.
+#  If WITH_PREFIX is given, the resulting plugin will have the
+#  prefix "lib", otherwise it won't.
+#
+# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
+# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
+# Copyright (c) 2006, Andreas Schneider, <asn@cryptomilk.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+macro (MACRO_ADD_PLUGIN _target_NAME _with_PREFIX)
+
+  if (${_with_PREFIX} STREQUAL "WITH_PREFIX")
+    set(_first_SRC)
+  else (${_with_PREFIX} STREQUAL "WITH_PREFIX")
+    set(_first_SRC ${_with_PREFIX})
+  endif (${_with_PREFIX} STREQUAL "WITH_PREFIX")
+
+  add_library(${_target_NAME} MODULE ${_first_SRC} ${ARGN})
+
+  if (_first_SRC)
+    set_target_properties(${_target_NAME} PROPERTIES PREFIX "")
+  endif (_first_SRC)
+
+endmacro (MACRO_ADD_PLUGIN _name _sources)
+
--- a/cmake/modules/MacroCopyFile.cmake
+++ b/cmake/modules/MacroCopyFile.cmake
@@ -0,0 +1,37 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
+# - macro_copy_file(_src _dst)
+# Copies a file to ${_dst} only if ${_src} is different (newer) than ${_dst}
+#
+# Example:
+# macro_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/icon.png ${CMAKE_CURRENT_BINARY_DIR}/.)
+# Copies file icon.png to ${CMAKE_CURRENT_BINARY_DIR} directory
+#
+# Copyright (c) 2006-2007  Wengo
+# Copyright (c) 2006-2008  Andreas Schneider <asn@cryptomilk.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING file.
+
+
+macro (macro_copy_file _src _dst)
+  # Removes all path containing .svn or CVS or CMakeLists.txt during the copy
+  if (NOT ${_src} MATCHES ".*\\.svn|CVS|CMakeLists\\.txt.*")
+
+    if (CMAKE_VERBOSE_MAKEFILE)
+      message(STATUS "Copy file from ${_src} to ${_dst}")
+    endif (CMAKE_VERBOSE_MAKEFILE)
+
+    # Creates directory if necessary
+    get_filename_component(_path ${_dst} PATH)
+    file(MAKE_DIRECTORY ${_path})
+
+    execute_process(
+      COMMAND
+        ${CMAKE_COMMAND} -E copy_if_different ${_src} ${_dst}
+      OUTPUT_QUIET
+    )
+  endif (NOT ${_src} MATCHES ".*\\.svn|CVS|CMakeLists\\.txt.*")
+endmacro (macro_copy_file)
--- a/cmake/modules/MacroEnsureOutOfSourceBuild.cmake
+++ b/cmake/modules/MacroEnsureOutOfSourceBuild.cmake
@@ -0,0 +1,17 @@
+# - MACRO_ENSURE_OUT_OF_SOURCE_BUILD(<errorMessage>)
+# MACRO_ENSURE_OUT_OF_SOURCE_BUILD(<errorMessage>)
+
+# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+macro (MACRO_ENSURE_OUT_OF_SOURCE_BUILD _errorMessage)
+
+   string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" _insource)
+   if (_insource)
+     message(SEND_ERROR "${_errorMessage}")
+     message(FATAL_ERROR "Remove the file CMakeCache.txt in ${CMAKE_SOURCE_DIR} first.")
+   endif (_insource)
+
+endmacro (MACRO_ENSURE_OUT_OF_SOURCE_BUILD)
--- a/cmake/modules/MacroLogFeature.cmake
+++ b/cmake/modules/MacroLogFeature.cmake
@@ -0,0 +1,157 @@
+# This file defines the Feature Logging macros.
+#
+# MACRO_LOG_FEATURE(VAR FEATURE DESCRIPTION URL [REQUIRED [MIN_VERSION [COMMENTS]]])
+#   Logs the information so that it can be displayed at the end
+#   of the configure run
+#   VAR : TRUE or FALSE, indicating whether the feature is supported
+#   FEATURE: name of the feature, e.g. "libjpeg"
+#   DESCRIPTION: description what this feature provides
+#   URL: home page
+#   REQUIRED: TRUE or FALSE, indicating whether the featue is required
+#   MIN_VERSION: minimum version number. empty string if unneeded
+#   COMMENTS: More info you may want to provide.  empty string if unnecessary
+#
+# MACRO_DISPLAY_FEATURE_LOG()
+#   Call this to display the collected results.
+#   Exits CMake with a FATAL error message if a required feature is missing
+#
+# Example:
+#
+# INCLUDE(MacroLogFeature)
+#
+# FIND_PACKAGE(JPEG)
+# MACRO_LOG_FEATURE(JPEG_FOUND "libjpeg" "Support JPEG images" "http://www.ijg.org" TRUE "3.2a" "")
+# ...
+# MACRO_DISPLAY_FEATURE_LOG()
+
+# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
+# Copyright (c) 2006, Allen Winter, <winter@kde.org>
+# Copyright (c) 2009, Sebastian Trueg, <trueg@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+IF (NOT _macroLogFeatureAlreadyIncluded)
+   SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt)
+   IF (EXISTS ${_file})
+      FILE(REMOVE ${_file})
+   ENDIF (EXISTS ${_file})
+
+   SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt)
+   IF (EXISTS ${_file})
+      FILE(REMOVE ${_file})
+   ENDIF (EXISTS ${_file})
+
+   SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt)
+   IF (EXISTS ${_file})
+      FILE(REMOVE ${_file})
+  ENDIF (EXISTS ${_file})
+
+  SET(_macroLogFeatureAlreadyIncluded TRUE)
+
+  INCLUDE(FeatureSummary)
+
+ENDIF (NOT _macroLogFeatureAlreadyIncluded)
+
+
+MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _comments)
+
+   STRING(TOUPPER "${ARGV4}" _required)
+   SET(_minvers "${ARGV5}")
+   SET(_comments "${ARGV6}")
+
+   IF (${_var})
+     SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/EnabledFeatures.txt)
+   ELSE (${_var})
+     IF ("${_required}" STREQUAL "TRUE")
+       SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/MissingRequirements.txt)
+     ELSE ("${_required}" STREQUAL "TRUE")
+       SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/DisabledFeatures.txt)
+     ENDIF ("${_required}" STREQUAL "TRUE")
+   ENDIF (${_var})
+
+   SET(_logtext "   * ${_package}")
+
+   IF (NOT ${_var})
+      IF (${_minvers} MATCHES ".*")
+        SET(_logtext "${_logtext} (${_minvers} or higher)")
+      ENDIF (${_minvers} MATCHES ".*")
+      SET(_logtext "${_logtext}  <${_url}>\n     ")
+   ELSE (NOT ${_var})
+     SET(_logtext "${_logtext} - ")
+   ENDIF (NOT ${_var})
+
+   SET(_logtext "${_logtext}${_description}")
+
+   IF (NOT ${_var})
+      IF (${_comments} MATCHES ".*")
+        SET(_logtext "${_logtext}\n     ${_comments}")
+      ENDIF (${_comments} MATCHES ".*")
+#      SET(_logtext "${_logtext}\n") #double-space missing features?
+   ENDIF (NOT ${_var})
+
+   FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n")
+
+   IF(COMMAND SET_PACKAGE_INFO)  # in FeatureSummary.cmake since CMake 2.8.3
+     SET_PACKAGE_INFO("${_package}" "\"${_description}\"" "${_url}" "\"${_comments}\"")
+   ENDIF(COMMAND SET_PACKAGE_INFO)
+
+ENDMACRO(MACRO_LOG_FEATURE)
+
+
+MACRO(MACRO_DISPLAY_FEATURE_LOG)
+   IF(COMMAND FEATURE_SUMMARY) # in FeatureSummary.cmake since CMake 2.8.3
+      FEATURE_SUMMARY(FILENAME ${CMAKE_CURRENT_BINARY_DIR}/FindPackageLog.txt
+                      WHAT ALL)
+   ENDIF(COMMAND FEATURE_SUMMARY)
+
+   SET(_missingFile ${CMAKE_BINARY_DIR}/MissingRequirements.txt)
+   SET(_enabledFile ${CMAKE_BINARY_DIR}/EnabledFeatures.txt)
+   SET(_disabledFile ${CMAKE_BINARY_DIR}/DisabledFeatures.txt)
+
+   IF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS ${_disabledFile})
+     SET(_printSummary TRUE)
+   ENDIF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS ${_disabledFile})
+
+   IF(_printSummary)
+     SET(_missingDeps 0)
+     IF (EXISTS ${_enabledFile})
+       FILE(READ ${_enabledFile} _enabled)
+       FILE(REMOVE ${_enabledFile})
+       SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following external packages were located on your system.\n-- This installation will have the extra features provided by these packages.\n-----------------------------------------------------------------------------\n${_enabled}")
+     ENDIF (EXISTS ${_enabledFile})
+
+
+     IF (EXISTS ${_disabledFile})
+       SET(_missingDeps 1)
+       FILE(READ ${_disabledFile} _disabled)
+       FILE(REMOVE ${_disabledFile})
+       SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following OPTIONAL packages could NOT be located on your system.\n-- Consider installing them to enable more features from this software.\n-----------------------------------------------------------------------------\n${_disabled}")
+     ENDIF (EXISTS ${_disabledFile})
+
+
+     IF (EXISTS ${_missingFile})
+       SET(_missingDeps 1)
+       FILE(READ ${_missingFile} _requirements)
+       SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system.\n-- You must install these packages before continuing.\n-----------------------------------------------------------------------------\n${_requirements}")
+       FILE(REMOVE ${_missingFile})
+       SET(_haveMissingReq 1)
+     ENDIF (EXISTS ${_missingFile})
+
+
+     IF (NOT ${_missingDeps})
+       SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- Congratulations! All external packages have been found.")
+     ENDIF (NOT ${_missingDeps})
+
+
+     MESSAGE(${_summary})
+     MESSAGE("-----------------------------------------------------------------------------\n")
+
+
+     IF(_haveMissingReq)
+       MESSAGE(FATAL_ERROR "Exiting: Missing Requirements")
+     ENDIF(_haveMissingReq)
+
+   ENDIF(_printSummary)
+
+ENDMACRO(MACRO_DISPLAY_FEATURE_LOG)
--- a/cmake/modules/MacroOptionalFindPackage.cmake
+++ b/cmake/modules/MacroOptionalFindPackage.cmake
@@ -0,0 +1,47 @@
+# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
+# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
+# This macro is a combination of OPTION() and FIND_PACKAGE(), it
+# works like FIND_PACKAGE(), but additionally it automatically creates
+# an option name WITH_<name>, which can be disabled via the cmake GUI.
+# or via -DWITH_<name>=OFF
+# The standard <name>_FOUND variables can be used in the same way
+# as when using the normal FIND_PACKAGE()
+
+# Copyright (c) 2006-2010 Alexander Neundorf, <neundorf@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+# This is just a helper macro to set a bunch of variables empty.
+# We don't know whether the package uses UPPERCASENAME or CamelCaseName, so we try both:
+macro(_MOFP_SET_EMPTY_IF_DEFINED _name _var)
+   if(DEFINED ${_name}_${_var})
+      set(${_name}_${_var} "")
+   endif(DEFINED ${_name}_${_var})
+
+   string(TOUPPER ${_name} _nameUpper)
+   if(DEFINED ${_nameUpper}_${_var})
+      set(${_nameUpper}_${_var}  "")
+   endif(DEFINED ${_nameUpper}_${_var})
+endmacro(_MOFP_SET_EMPTY_IF_DEFINED _package _var)
+
+
+macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
+   option(WITH_${_name} "Search for ${_name} package" ON)
+   if (WITH_${_name})
+      find_package(${_name} ${ARGN})
+   else (WITH_${_name})
+      string(TOUPPER ${_name} _nameUpper)
+      set(${_name}_FOUND FALSE)
+      set(${_nameUpper}_FOUND FALSE)
+
+      _mofp_set_empty_if_defined(${_name} INCLUDE_DIRS)
+      _mofp_set_empty_if_defined(${_name} INCLUDE_DIR)
+      _mofp_set_empty_if_defined(${_name} INCLUDES)
+      _mofp_set_empty_if_defined(${_name} LIBRARY)
+      _mofp_set_empty_if_defined(${_name} LIBRARIES)
+      _mofp_set_empty_if_defined(${_name} LIBS)
+      _mofp_set_empty_if_defined(${_name} FLAGS)
+      _mofp_set_empty_if_defined(${_name} DEFINITIONS)
+   endif (WITH_${_name})
+endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -1,9 +1,10 @@
 ;ownCloud installer script.

-!define APPLICATION_SHORTNAME "@APPLICATION_SHORTNAME@"
+!define APPLICATION_SHORTNAME "@APPLICATION_EXECUTABLE@"
 !define APPLICATION_NAME "@APPLICATION_NAME@"
 !define APPLICATION_VENDOR "@APPLICATION_VENDOR@"
 !define APPLICATION_EXECUTABLE "@APPLICATION_EXECUTABLE@.exe"
+!define APPLICATION_CMD_EXECUTABLE "@APPLICATION_EXECUTABLE@cmd.exe"
 !define APPLICATION_DOMAIN "@APPLICATION_DOMAIN@"
 !define APPLICATION_LICENSE "@APPLICATION_LICENSE@"
 !define WIN_SETUP_BITMAP_PATH "@WIN_SETUP_BITMAP_PATH@"
@@ -15,10 +16,10 @@
  !define OPTION_LICENSE_AGREEMENT
 !endif
 !define OPTION_UAC_PLUGIN_ENHANCED
+!define OPTION_SECTION_SC_SHELL_EXT
 !define OPTION_SECTION_SC_START_MENU
 !define OPTION_SECTION_SC_DESKTOP
 !define OPTION_SECTION_SC_QUICK_LAUNCH
-!define OPTION_SECTION_SC_AUTOSTART
 !define OPTION_FINISHPAGE
 !define OPTION_FINISHPAGE_LAUNCHER
 ; !define OPTION_FINISHPAGE_RELEASE_NOTES
@@ -35,12 +36,12 @@
 !define BUILD_PATH "@CMAKE_BINARY_DIR@"
 !define SOURCE_PATH "@CMAKE_SOURCE_DIR@"
 !define QT_DLL_PATH "${MING_BIN}"
-!define ACCESSIBLE_DLL_PATH "${MING_LIB}/qt4/plugins/accessible"
-!define SQLITE_DLL_PATH "${MING_LIB}/qt4/plugins/sqldrivers"
-!define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt4/plugins/imageformats"
+!define ACCESSIBLE_DLL_PATH "${MING_LIB}/qt5/plugins/accessible"
+!define SQLITE_DLL_PATH "${MING_LIB}/qt5/plugins/sqldrivers"
+!define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt5/plugins/imageformats"
+!define PLATFORMS_DLL_PATH "${MING_LIB}/qt5/plugins/platforms"

 !define CSYNC_LIBRARY_DIR "@CSYNC_LIBRARY_DIR@"
-!define CSYNC_PLUGIN_DIR "@CSYNC_PLUGIN_DIR@"
 !define CSYNC_CONFIG_DIR "@CSYNC_CONFIG_DIR@"

 !define NSI_PATH "${source_path}/admin/win/nsi"
@@ -51,9 +52,13 @@

 !define VER_MAJOR "@CPACK_PACKAGE_VERSION_MAJOR@"
 !define VER_MINOR "@CPACK_PACKAGE_VERSION_MINOR@"
-!define VER_BUILD "@CPACK_PACKAGE_VERSION_PATCH@"
+!define VER_PATCH "@CPACK_PACKAGE_VERSION_PATCH@"
+!define VER_BUILD "@CPACK_PACKAGE_VERSION_BUILD@"
 !define VERSION "@CPACK_PACKAGE_VERSION@"

+Var InstallRunIfSilent
+Var NoAutomaticUpdates
+
 ;-----------------------------------------------------------------------------
 ; Installer build timestamp.
 ;-----------------------------------------------------------------------------
@@ -66,7 +71,7 @@ Name "@CPACK_NSIS_PACKAGE_NAME@"
 BrandingText "${APPLICATION_NAME} ${VERSION}  -- ${BUILD_TIME}"
 OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
 InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-InstallDirRegKey HKCU "Software\${APPLICATION_NAME}" ""
+InstallDirRegKey HKCU "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" ""
 InstType Standard
 InstType Full
 InstType Minimal
@@ -88,7 +93,10 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 !include Memento.nsh ;Remember user selections.
 !include WinVer.nsh ;Windows version detection.
 !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 Library.nsh ;Used by the COM registration for shell extensions
+!include x64.nsh ;Used to determine the right arch for the shell extensions

 ;-----------------------------------------------------------------------------
 ; Memento selections stored in registry.
@@ -106,13 +114,13 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_BITMAP  ${WIN_SETUP_BITMAP_PATH}/page_header.bmp
 !define MUI_COMPONENTSPAGE_SMALLDESC
-!define MUI_FINISHPAGE_LINK "www.${APPLICATION_DOMAIN}"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.${APPLICATION_DOMAIN}"
+!define MUI_FINISHPAGE_LINK "${APPLICATION_DOMAIN}"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://${APPLICATION_DOMAIN}"
 !define MUI_FINISHPAGE_NOREBOOTSUPPORT
 !ifdef OPTION_FINISHPAGE_RELEASE_NOTES
   !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
   !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NOTES.txt"
-   !define MUI_FINISHPAGE_SHOWREADME_TEXT "Show release notes"
+   !define MUI_FINISHPAGE_SHOWREADME_TEXT $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING
 !endif
 !ifdef OPTION_FINISHPAGE_LAUNCHER
   !define MUI_FINISHPAGE_NOAUTOCLOSE
@@ -143,6 +151,89 @@ UninstPage custom un.UnPageUserAppData un.UnPageUserAppDataLeave
 ;-----------------------------------------------------------------------------
 !insertmacro MUI_LANGUAGE "English"

+!include ${source_path}/admin/win/nsi/l10n/languages.nsh
+!include ${source_path}/admin/win/nsi/l10n/declarations.nsh
+
+; Set version strings with english locale
+VIProductVersion "${VERSION}"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${APPLICATION_NAME}"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "${APPLICATION_VENDOR}"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}"
+
+!macro SETLANG un
+   Function ${un}SetLang
+      # load the selected language file
+      !include "${source_path}/admin/win/nsi/l10n\English.nsh"
+      StrCmp $LANGUAGE ${LANG_GERMAN} German 0
+      StrCmp $LANGUAGE ${LANG_DUTCH} Dutch 0
+      StrCmp $LANGUAGE ${LANG_FINNISH} Finnish 0
+      StrCmp $LANGUAGE ${LANG_JAPANESE} Japanese 0
+      StrCmp $LANGUAGE ${LANG_SLOVENIAN} Slovenian 0
+      StrCmp $LANGUAGE ${LANG_SPANISH} Spanish 0
+      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_PORTUGUESEBR} Brazilian EndLanguageCmp
+      German:
+      !include "${source_path}/admin/win/nsi/l10n\German.nsh"
+      Goto EndLanguageCmp
+      Dutch:
+      !include "${source_path}/admin/win/nsi/l10n\Dutch.nsh"
+      Goto EndLanguageCmp
+      Finnish:
+      !include "${source_path}/admin/win/nsi/l10n\Finnish.nsh"
+      Goto EndLanguageCmp
+      Japanese:
+      !include "${source_path}/admin/win/nsi/l10n\Japanese.nsh"
+      Goto EndLanguageCmp
+      Slovenian:
+      !include "${source_path}/admin/win/nsi/l10n\Slovenian.nsh"
+      Goto EndLanguageCmp
+      Spanish:
+      !include "${source_path}/admin/win/nsi/l10n\Spanish.nsh"
+      Goto EndLanguageCmp
+      Italian:
+      !include "${source_path}/admin/win/nsi/l10n\Italian.nsh"
+      Goto EndLanguageCmp
+      Estonian:
+      !include "${source_path}/admin/win/nsi/l10n\Estonian.nsh"
+      Goto EndLanguageCmp
+      Greek:
+      !include "${source_path}/admin/win/nsi/l10n\Greek.nsh"
+      Goto EndLanguageCmp
+      Basque:
+      !include "${source_path}/admin/win/nsi/l10n\Basque.nsh"
+      Goto EndLanguageCmp
+      Galician:
+      !include "${source_path}/admin/win/nsi/l10n\Galician.nsh"
+      Goto EndLanguageCmp
+      Slovak:
+      !include "${source_path}/admin/win/nsi/l10n\Slovak.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"
+      EndLanguageCmp:
+
+   FunctionEnd
+!macroend
+
+!insertmacro SETLANG ""
+!insertmacro SETLANG "un."
+
+; Usage: ${If} ${HasSection} SectionName
+!macro _HasSection _a _b _t _f
+   ReadRegDWORD $_LOGICLIB_TEMP "${MEMENTO_REGISTRY_ROOT}" "${MEMENTO_REGISTRY_KEY}" "MementoSection_${_b}"
+   IntCmpU $_LOGICLIB_TEMP 0 ${_f} ${_t}
+!macroend
+!define HasSection `"" HasSection`
+
 ##############################################################################
 #                                                                            #
 #   FINISH PAGE LAUNCHER FUNCTIONS                                           #
@@ -170,14 +261,14 @@ FunctionEnd

 !macro ConfirmEndProcess processName
   MessageBox MB_YESNO|MB_ICONEXCLAMATION \
-     "Found ${processName} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?" \
+     $ConfirmEndProcess_MESSAGEBOX_TEXT \
     IDYES process_${processName}_kill IDNO process_${processName}_ended
   process_${processName}_kill:
-      DetailPrint "Killing ${processName} processes."
+      DetailPrint $ConfirmEndProcess_KILLING_PROCESSES_TEXT
      Processes::KillProcess ${processName}
      Sleep 1500
      StrCmp $R0 "1" process_${processName}_ended
-      DetailPrint "Process to kill not found!"
+      DetailPrint $ConfirmEndProcess_KILL_NOT_FOUND_TEXT
   process_${processName}_ended:
 !macroend

@@ -191,6 +282,16 @@ Function EnsureOwncloudShutdown
   !insertmacro CheckAndConfirmEndProcess "${APPLICATION_EXECUTABLE}"
 FunctionEnd

+Function InstallRedistributables
+   ${If} ${RunningX64}
+      ExecWait '"$OUTDIR\vcredist_x64.exe" /install /quiet'
+   ${Else}
+      ExecWait '"$OUTDIR\vcredist_x86.exe" /install /quiet'
+   ${EndIf}
+   Delete "$OUTDIR\vcredist_x86.exe"
+   Delete "$OUTDIR\vcredist_x64.exe"
+FunctionEnd
+
 ##############################################################################
 #                                                                            #
 #   RE-INSTALLER FUNCTIONS                                                   #
@@ -198,41 +299,44 @@ FunctionEnd
 ##############################################################################

 Function PageReinstall
-   ReadRegStr $R0 HKLM "Software\${APPLICATION_NAME}" ""
+   ReadRegStr $R0 HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" ""
   StrCmp $R0 "" 0 +2
   Abort

   ;Detect version
-   ReadRegDWORD $R0 HKLM "Software\${APPLICATION_NAME}" "VersionMajor"
+   ReadRegDWORD $R0 HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "VersionMajor"
   IntCmp $R0 ${VER_MAJOR} minor_check new_version older_version
   minor_check:
-      ReadRegDWORD $R0 HKLM "Software\${APPLICATION_NAME}" "VersionMinor"
-      IntCmp $R0 ${VER_MINOR} build_check new_version older_version
+      ReadRegDWORD $R0 HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "VersionMinor"
+      IntCmp $R0 ${VER_MINOR} rev_check new_version older_version
+   rev_check:
+      ReadRegDWORD $R0 HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "VersionRevision"
+      IntCmp $R0 ${VER_PATCH} build_check new_version older_version
   build_check:
-      ReadRegDWORD $R0 HKLM "Software\${APPLICATION_NAME}" "VersionBuild"
+      ReadRegDWORD $R0 HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "VersionBuild"
      IntCmp $R0 ${VER_BUILD} same_version new_version older_version

   new_version:
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "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."
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" "Uninstall before installing"
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Do not uninstall"
-      !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install ${APPLICATION_NAME}."
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" $PageReinstall_NEW_Field_1
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" $PageReinstall_NEW_Field_2
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" $PageReinstall_NEW_Field_3
+      !insertmacro MUI_HEADER_TEXT $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE
      StrCpy $R0 "1"
      Goto reinst_start

   older_version:
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "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."
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" "Uninstall before installing"
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Do not uninstall"
-      !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install ${APPLICATION_NAME}."
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" $PageReinstall_OLD_Field_1
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" $PageReinstall_NEW_Field_2
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" $PageReinstall_NEW_Field_3
+      !insertmacro MUI_HEADER_TEXT $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE
      StrCpy $R0 "1"
      Goto reinst_start

   same_version:
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" "Add/Reinstall components"
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Uninstall ${APPLICATION_NAME}"
-      !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose the maintenance option to perform."
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" $PageReinstall_SAME_Field_1
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" $PageReinstall_SAME_Field_2
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" $PageReinstall_SAME_Field_3
+      !insertmacro MUI_HEADER_TEXT $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE
      StrCpy $R0 "2"

   reinst_start:
@@ -246,7 +350,7 @@ Function PageLeaveReinstall
   StrCmp $R0 "2" 0 +3
   StrCmp $R1 "1" reinst_done reinst_uninstall
   reinst_uninstall:
-      ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "UninstallString"
+      ReadRegStr $R1 ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "UninstallString"
      HideWindow
      ClearErrors
      ExecWait '$R1 _?=$INSTDIR'
@@ -267,131 +371,85 @@ FunctionEnd
 #   INSTALLER SECTIONS                                                       #
 #                                                                            #
 ##############################################################################
-Section "${APPLICATION_NAME}" SEC_OWNCLOUD
+Section "${APPLICATION_NAME}" SEC_APPLICATION
   SectionIn 1 2 3 RO
   SetDetailsPrint listonly

   SetDetailsPrint textonly
-   DetailPrint "Installing ${APPLICATION_NAME} essentials."
+   DetailPrint $SEC_APPLICATION_DETAILS
   SetDetailsPrint listonly
   SetOutPath "$INSTDIR"

-   !ifdef INSTALL_PATH
-        ;Main executable.
-        File "${INSTALL_PATH}\bin\${APPLICATION_EXECUTABLE}"
-   !endif
-   !ifndef INSTALL_PATH
-        ;Main executable.
-        File "${BUILD_PATH}\bin\${APPLICATION_EXECUTABLE}"
-        File "${BUILD_PATH}\src\libowncloudsync.dll"
+   ;Main executable & csync
+   File "${BUILD_PATH}\bin\${APPLICATION_EXECUTABLE}"
+   File "${BUILD_PATH}\bin\${APPLICATION_CMD_EXECUTABLE}"
+   File "${BUILD_PATH}\bin\socketapiclient.exe"
+   File "${BUILD_PATH}\src\lib${APPLICATION_SHORTNAME}sync.dll"
+   File "${BUILD_PATH}\csync\src\libocsync.dll"

-        File "${BUILD_PATH}\src\mirall_ca.qm"
-        File "${BUILD_PATH}\src\mirall_cs_CZ.qm"
-        File "${BUILD_PATH}\src\mirall_da.qm"
-        File "${BUILD_PATH}\src\mirall_de.qm"
-        File "${BUILD_PATH}\src\mirall_el.qm"
-        File "${BUILD_PATH}\src\mirall_en.qm"
-        File "${BUILD_PATH}\src\mirall_eo.qm"
-        File "${BUILD_PATH}\src\mirall_es.qm"
-        File "${BUILD_PATH}\src\mirall_es_AR.qm"
-        File "${BUILD_PATH}\src\mirall_et_EE.qm"
-        File "${BUILD_PATH}\src\mirall_eu.qm"
-        File "${BUILD_PATH}\src\mirall_fa.qm"
-        File "${BUILD_PATH}\src\mirall_fi_FI.qm"
-        File "${BUILD_PATH}\src\mirall_fr.qm"
-        File "${BUILD_PATH}\src\mirall_gl.qm"
-        File "${BUILD_PATH}\src\mirall_he.qm"
-        File "${BUILD_PATH}\src\mirall_hr.qm"
-        File "${BUILD_PATH}\src\mirall_hu_HU.qm"
-        File "${BUILD_PATH}\src\mirall_it.qm"
-        File "${BUILD_PATH}\src\mirall_ja_JP.qm"
-        File "${BUILD_PATH}\src\mirall_ko.qm"
-        File "${BUILD_PATH}\src\mirall_lb.qm"
-        File "${BUILD_PATH}\src\mirall_lt_LT.qm"
-        File "${BUILD_PATH}\src\mirall_lv.qm"
-        File "${BUILD_PATH}\src\mirall_mk.qm"
-        File "${BUILD_PATH}\src\mirall_ms_MY.qm"
-        File "${BUILD_PATH}\src\mirall_nb_NO.qm"
-        File "${BUILD_PATH}\src\mirall_nl.qm"
-        File "${BUILD_PATH}\src\mirall_oc.qm"
-        File "${BUILD_PATH}\src\mirall_pl.qm"
-        File "${BUILD_PATH}\src\mirall_pt_BR.qm"
-        File "${BUILD_PATH}\src\mirall_pt_PT.qm"
-        File "${BUILD_PATH}\src\mirall_ro.qm"
-        File "${BUILD_PATH}\src\mirall_ru.qm"
-        File "${BUILD_PATH}\src\mirall_ru_RU.qm"
-        File "${BUILD_PATH}\src\mirall_si_LK.qm"
-        File "${BUILD_PATH}\src\mirall_sk_SK.qm"
-        File "${BUILD_PATH}\src\mirall_sl.qm"
-        File "${BUILD_PATH}\src\mirall_sr@latin.qm"
-        File "${BUILD_PATH}\src\mirall_sv.qm"
-        File "${BUILD_PATH}\src\mirall_ta_LK.qm"
-        File "${BUILD_PATH}\src\mirall_th_TH.qm"
-        File "${BUILD_PATH}\src\mirall_tr.qm"
-        File "${BUILD_PATH}\src\mirall_uk.qm"
-        File "${BUILD_PATH}\src\mirall_vi.qm"
-        File "${BUILD_PATH}\src\mirall_zh_CN.qm"
-        File "${BUILD_PATH}\src\mirall_zh_TW.qm"
-
-        #File "${MING_SHARE}\qt4\translations\qt_ar.qm"
-        File "${MING_SHARE}\qt4\translations\qt_cs.qm"
-        File "${MING_SHARE}\qt4\translations\qt_da.qm"
-        File "${MING_SHARE}\qt4\translations\qt_de.qm"
-        File "${MING_SHARE}\qt4\translations\qt_es.qm"
-        File "${MING_SHARE}\qt4\translations\qt_fa.qm"
-        File "${MING_SHARE}\qt4\translations\qt_fr.qm"
-        File "${MING_SHARE}\qt4\translations\qt_gl.qm"
-        File "${MING_SHARE}\qt4\translations\qt_he.qm"
-        File "${MING_SHARE}\qt4\translations\qt_hu.qm"
-        File "${MING_SHARE}\qt4\translations\qt_ja.qm"
-        File "${MING_SHARE}\qt4\translations\qt_ko.qm"
-        File "${MING_SHARE}\qt4\translations\qt_lt.qm"
-        File "${MING_SHARE}\qt4\translations\qt_pl.qm"
-        File "${MING_SHARE}\qt4\translations\qt_pt.qm"
-        File "${MING_SHARE}\qt4\translations\qt_ru.qm"
-        File "${MING_SHARE}\qt4\translations\qt_sk.qm"
-        File "${MING_SHARE}\qt4\translations\qt_sl.qm"
-        File "${MING_SHARE}\qt4\translations\qt_sv.qm"
-        File "${MING_SHARE}\qt4\translations\qt_uk.qm"
-        File "${MING_SHARE}\qt4\translations\qt_zh_CN.qm"
-        File "${MING_SHARE}\qt4\translations\qt_zh_TW.qm"
-        File "${MING_SHARE}\qt4\translations\qt_zh_TW.qm"
-
-        File "${MING_SHARE}\qt4\translations\qtkeychain_de.qm"
-
-        SetOutPath "$INSTDIR\accessible"
-        File "${ACCESSIBLE_DLL_PATH}\qtaccessiblewidgets4.dll"
-
-        SetOutPath "$INSTDIR\modules"
-        ; FIXME: fix installation dir of module, currently needs manual copying to
-        ; /usr/i686-w64-mingw32/sys-root/mingw/bin/csync_modules/
-
-        File "${CSYNC_PLUGIN_DIR}/ocsync_owncloud.dll"
-        SetOutPath "$INSTDIR"
-   !endif
+   File "${BUILD_PATH}\src\mirall_*.qm"
+   ; Make sure only to copy qt, not qt_help, etc
+   File "${MING_SHARE}\qt5\translations\qt_??.qm"
+   File "${MING_SHARE}\qt5\translations\qt_??_??.qm"
+   File "${MING_SHARE}\qt5\translations\qtkeychain_*.qm"

+   SetOutPath "$INSTDIR\platforms"
+   File "${PLATFORMS_DLL_PATH}\qwindows.dll"
+   SetOutPath "$INSTDIR\accessible"
+   File "${ACCESSIBLE_DLL_PATH}\qtaccessiblewidgets.dll"
+   SetOutPath "$INSTDIR\imageformats"
+   File "${IMAGEFORMATS_DLL_PATH}\qgif.dll"
+   File "${IMAGEFORMATS_DLL_PATH}\qjpeg.dll"
+   File "${IMAGEFORMATS_DLL_PATH}\qico.dll"

+   SetOutPath "$INSTDIR\sqldrivers"
+   File "${SQLITE_DLL_PATH}\qsqlite.dll"

+   SetOutPath "$INSTDIR"
   ;License & release notes.
   File "@CPACK_RESOURCE_FILE_LICENSE@"
-   File /oname=NOTES.txt ${NSI_PATH}\RELEASE_NOTES.txt
+   ;File /oname=NOTES.txt ${NSI_PATH}\RELEASE_NOTES.txt

-   ;QT stuff:
-   File "${QT_DLL_PATH}\QtCore4.dll"
-   File "${QT_DLL_PATH}\QtGui4.dll"
-   File "${QT_DLL_PATH}\QtNetwork4.dll"
-   File "${QT_DLL_PATH}\QtXml4.dll"
+   ;Qt stuff:
+   File "${QT_DLL_PATH}\Qt5Core.dll"
+   File "${QT_DLL_PATH}\Qt5Gui.dll"
+   File "${QT_DLL_PATH}\Qt5Network.dll"
+   File "${QT_DLL_PATH}\Qt5OpenGL.dll"
+   File "${QT_DLL_PATH}\Qt5PrintSupport.dll"
+   File "${QT_DLL_PATH}\Qt5Qml.dll"
+   File "${QT_DLL_PATH}\Qt5Quick.dll"
+   File "${QT_DLL_PATH}\Qt5Sensors.dll"
+   File "${QT_DLL_PATH}\Qt5Sql.dll"
+   File "${QT_DLL_PATH}\Qt5WebKit.dll"
+   File "${QT_DLL_PATH}\Qt5WebKitWidgets.dll"
+   File "${QT_DLL_PATH}\Qt5Widgets.dll"
+   File "${QT_DLL_PATH}\Qt5Xml.dll"
+
+   ;Qt deps
+   File "${MING_BIN}\libpng16-16.dll"
+   File "${MING_BIN}\icudata53.dll"
+   File "${MING_BIN}\icui18n53.dll"
+   File "${MING_BIN}\icuuc53.dll"
+   File "${MING_BIN}\libEGL.dll"
+   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"
+   File "${MING_BIN}\libstdc++-6.dll"
+   File "${MING_BIN}\libwebp-4.dll"
+   File "${MING_BIN}\libxslt-1.dll"
+   File "${MING_BIN}\zlib1.dll"
+
+   ;QtSql and csync dep
+   File "${MING_BIN}\libsqlite3-0.dll"

   ;QtKeyChain stuff
-   File "${MING_BIN}\libqtkeychain.dll"
+   File "${MING_BIN}\libqt5keychain.dll"

-   File "${CSYNC_LIBRARY_DIR}/libocsync.dll"
-   File "${MING_BIN}\libsqlite3-0.dll"
-   File "${MING_BIN}\libiniparser.dll"
-   File "${MING_BIN}\libdl.dll"
-   File "${MING_BIN}\libpng15-15.dll"
-
-   ; ownCloud plugin
+   ;ownCloud plugin
   File "${MING_BIN}\libintl-8.dll"
   File "${MING_BIN}\libneon-27.dll"
   File "${MING_BIN}\libproxy.dll"
@@ -401,53 +459,63 @@ Section "${APPLICATION_NAME}" SEC_OWNCLOUD
   ;MinGW stuff
   File "${MING_BIN}\libgcc_s_sjlj-1.dll"
   File "${MING_BIN}\libstdc++-6.dll"
+   File "${MING_BIN}\libwinpthread-1.dll"

-   ; Other
-   ;File "${MING_BIN}\libpng15-15.dll"
-   ;File "${MING_BIN}\libjpeg-8.dll"
-   File "${MING_BIN}\zlib1.dll"
-   File "${MING_BIN}\libcrypto-10.dll"
-   File "${MING_BIN}\libssl-10.dll"
-
-   ; CSync configs
+   ;CSync configs
   File "${SOURCE_PATH}/sync-exclude.lst"

 SectionEnd

-SectionGroup "Shortcuts"
+!ifdef OPTION_SECTION_SC_SHELL_EXT
+   ${MementoSection} $OPTION_SECTION_SC_SHELL_EXT_SECTION SEC_SHELL_EXT
+      SectionIn 1 2
+      SetDetailsPrint textonly
+      DetailPrint $OPTION_SECTION_SC_SHELL_EXT_DetailPrint
+      File "${BUILD_PATH}\vcredist_x86.exe"
+      File "${BUILD_PATH}\vcredist_x64.exe"
+      Call InstallRedistributables
+      CreateDirectory "$INSTDIR\shellext"
+      ${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"
+         !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\x64\OCOverlays_x64.dll" "$INSTDIR\shellext\OCOverlays_x64.dll" "$INSTDIR\shellext"
+         !undef LIBRARY_X64
+     ${Else}
+         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\Win32\OCUtil_x86.dll" "$INSTDIR\shellext\OCUtil_x86.dll" "$INSTDIR\shellext"
+         !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\Win32\OCOverlays_x86.dll" "$INSTDIR\shellext\OCOverlays_x86.dll" "$INSTDIR\shellext"
+      ${Endif}
+   ${MementoSectionEnd}
+!endif
+
+SectionGroup $SectionGroup_Shortcuts

 !ifdef OPTION_SECTION_SC_START_MENU
-   ${MementoSection} "Start Menu Program Group" SEC_START_MENU
+   ${MementoSection} $OPTION_SECTION_SC_START_MENU_SECTION SEC_START_MENU
      SectionIn 1 2 3
      SetDetailsPrint textonly
-      DetailPrint "Adding shortcuts for the ${APPLICATION_NAME} program group to the Start Menu."
+      DetailPrint $OPTION_SECTION_SC_START_MENU_DetailPrint
      SetDetailsPrint listonly
      SetShellVarContext all
-      RMDir /r "$SMPROGRAMS\${APPLICATION_NAME}"
-      CreateDirectory "$SMPROGRAMS\${APPLICATION_NAME}"
-      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\LICENSE.lnk" "$INSTDIR\LICENSE.txt"
-      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_EXECUTABLE}"
-      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Release notes.lnk" "$INSTDIR\NOTES.txt"
-      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_EXECUTABLE}"
      SetShellVarContext current
   ${MementoSectionEnd}
 !endif

 !ifdef OPTION_SECTION_SC_DESKTOP
-   ${MementoSection} "Desktop Shortcut" SEC_DESKTOP
+   ${MementoSection} $OPTION_SECTION_SC_DESKTOP_SECTION SEC_DESKTOP
      SectionIn 1 2
      SetDetailsPrint textonly
-      DetailPrint "Creating Desktop Shortcuts"
+      DetailPrint $OPTION_SECTION_SC_DESKTOP_DetailPrint
      SetDetailsPrint listonly
      CreateShortCut "$DESKTOP\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_EXECUTABLE}"
   ${MementoSectionEnd}
 !endif

 !ifdef OPTION_SECTION_SC_QUICK_LAUNCH
-   ${MementoSection} "Quick Launch Shortcut" SEC_QUICK_LAUNCH
+   ${MementoSection} $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION SEC_QUICK_LAUNCH
      SectionIn 1 2
      SetDetailsPrint textonly
-      DetailPrint "Creating Quick Launch Shortcut"
+      DetailPrint $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint
      SetDetailsPrint listonly
      CreateShortCut "$QUICKLAUNCH\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_EXECUTABLE}"
   ${MementoSectionEnd}
@@ -455,66 +523,55 @@ SectionGroup "Shortcuts"

 SectionGroupEnd

-!ifdef OPTION_SECTION_SC_AUTOSTART
-   ${MementoSection} "Autostart" SEC_AUTOSTART
-      SectionIn 1 2
-      SetDetailsPrint textonly
-      DetailPrint "Creating Windows Start Entry"
-      SetDetailsPrint listonly
-      WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Run" \
-               "${APPLICATION_NAME}" "$INSTDIR\${APPLICATION_EXECUTABLE}" 
-  ${MementoSectionEnd}
-!endif
-
 ${MementoSectionDone}

 ; Installer section descriptions
 ;--------------------------------
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_APPLICATION} "${APPLICATION_NAME} essentials."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} "${APPLICATION_NAME} program group."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_DESKTOP} "Desktop shortcut for ${APPLICATION_NAME}."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_LAUNCH} "Quick Launch shortcut for ${APPLICATION_NAME}."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_AUTOSTART} "Register ${APPLICATION_NAME} to run on Windows startup."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_APPLICATION} $OPTION_SECTION_SC_APPLICATION_Desc
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} $OPTION_SECTION_SC_START_MENU_Desc
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_DESKTOP} $OPTION_SECTION_SC_DESKTOP_Desc
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_LAUNCH} $OPTION_SECTION_SC_QUICK_LAUNCH_Desc
 !insertmacro MUI_FUNCTION_DESCRIPTION_END

+
 Section -post

   ;Uninstaller file.
   SetDetailsPrint textonly
-   DetailPrint "Writing Uninstaller"
+   DetailPrint $UNINSTALLER_FILE_Detail
   SetDetailsPrint listonly
   WriteUninstaller $INSTDIR\uninstall.exe

   ;Registry keys required for installer version handling and uninstaller.
   SetDetailsPrint textonly
-   DetailPrint "Writing Installer Registry Keys"
+   DetailPrint $UNINSTALLER_REGISTRY_Detail
   SetDetailsPrint listonly

   ;Version numbers used to detect existing installation version for comparisson.
-   WriteRegStr HKLM "Software\${APPLICATION_NAME}" "" $INSTDIR
-   WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionMajor" "${VER_MAJOR}"
-   WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionMinor" "${VER_MINOR}"
-   WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionRevision" "${REVISION}"
-   WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionBuild" "${VER_BUILD}"
+   WriteRegStr HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "" $INSTDIR
+   WriteRegDWORD HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "VersionMajor" "${VER_MAJOR}"
+   WriteRegDWORD HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "VersionMinor" "${VER_MINOR}"
+   WriteRegDWORD HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "VersionRevision" "${VER_PATCH}"
+   WriteRegDWORD HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "VersionBuild" "${VER_BUILD}"

   ;Add or Remove Programs entry.
-   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
-   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "InstallLocation" "$INSTDIR"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "DisplayName" "${APPLICATION_NAME}"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "Publisher" "${APPLICATION_VENDOR}"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "DisplayIcon" "$INSTDIR\Uninstall.exe,0"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "DisplayVersion" "${VERSION}"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "VersionMajor" "${VER_MAJOR}"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "VersionMinor" "${VER_MINOR}.${REVISION}"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "URLInfoAbout" "http://${APPLICATION_DOMAIN}/"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "HelpLink" "http://${APPLICATION_DOMAIN}/"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "NoModify" "1"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "NoRepair" "1"
+   WriteRegExpandStr ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
+   WriteRegExpandStr ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "InstallLocation" "$INSTDIR"
+   WriteRegStr ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "DisplayName" "${APPLICATION_NAME}"
+   WriteRegStr ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "Publisher" "${APPLICATION_VENDOR}"
+   WriteRegStr ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "DisplayIcon" "$INSTDIR\Uninstall.exe,0"
+   WriteRegStr ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "DisplayVersion" "${VERSION}"
+   WriteRegDWORD ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "VersionMajor" "${VER_MAJOR}"
+   WriteRegDWORD ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "VersionMinor" "${VER_MINOR}.${VER_PATCH}.${VER_BUILD}"
+   WriteRegStr ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "URLInfoAbout" "http://${APPLICATION_DOMAIN}/"
+   WriteRegStr ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "HelpLink" "http://${APPLICATION_DOMAIN}/"
+   WriteRegDWORD ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "NoModify" "1"
+   WriteRegDWORD ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "NoRepair" "1"


   SetDetailsPrint textonly
-   DetailPrint "Finished."
+   DetailPrint $UNINSTALLER_FINISHED_Detail
 SectionEnd

 ##############################################################################
@@ -529,7 +586,7 @@ Var UnPageUserAppDataCheckbox_State
 Var UnPageUserAppDataEditBox

 Function un.UnPageUserAppData
-   !insertmacro MUI_HEADER_TEXT "Uninstall ${APPLICATION_NAME}" "Remove ${APPLICATION_NAME}'s data folder from your computer."
+   !insertmacro MUI_HEADER_TEXT $UNINSTALLER_APPDATA_TITLE $UNINSTALLER_APPDATA_SUBTITLE
   nsDialogs::Create /NOUNLOAD 1018
   Pop $UnPageUserAppDataDialog

@@ -537,17 +594,17 @@ Function un.UnPageUserAppData
      Abort
   ${EndIf}

-   ${NSD_CreateLabel} 0 0 100% 12u "Do you want to delete ${APPLICATION_NAME}'s data folder?"
+   ${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 "Leave unchecked to keep the data folder for later use or check to delete the data folder."
+   ${NSD_CreateLabel} 0 46u 100% 24u $UNINSTALLER_APPDATA_LABEL_2
   Pop $0

-   ${NSD_CreateCheckbox} 0 71u 100% 8u "Yes, delete this data folder."
+   ${NSD_CreateCheckbox} 0 71u 100% 8u $UNINSTALLER_APPDATA_CHECKBOX
   Pop $UnPageUserAppDataCheckbox

   nsDialogs::Show
@@ -563,43 +620,60 @@ FunctionEnd

 Section Uninstall
   IfFileExists "$INSTDIR\${APPLICATION_EXECUTABLE}" owncloud_installed
-      MessageBox MB_YESNO "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?" IDYES owncloud_installed
-      Abort "Uninstall aborted by user"
+      MessageBox MB_YESNO $UNINSTALL_MESSAGEBOX /SD IDYES IDYES owncloud_installed
+      Abort $UNINSTALL_ABORT
   owncloud_installed:

   ;Delete registry keys.
-   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}"
-   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionBuild"
-   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionMajor"
-   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionMinor"
-   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionRevision"
-   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" ""
-   DeleteRegKey HKLM "Software\${APPLICATION_NAME}"
+   DeleteRegValue HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "VersionBuild"
+   DeleteRegValue HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "VersionMajor"
+   DeleteRegValue HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "VersionMinor"
+   DeleteRegValue HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "VersionRevision"
+   DeleteRegValue HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" ""
+   DeleteRegKey HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}"

   DeleteRegKey HKCR "${APPLICATION_NAME}"

-   ;Windows Start entry
-   !ifdef OPTION_SECTION_SC_AUTOSTART
-      DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "${APPLICATION_NAME}"
+   ;Shell extension
+   !ifdef OPTION_SECTION_SC_SHELL_EXT
+      !define LIBRARY_COM
+      !define LIBRARY_SHELL_EXTENSION
+      ${If} ${HasSection} SEC_SHELL_EXT
+        !define LIBRARY_X64
+        !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED "$INSTDIR/shellext/OCUtil_x64.dll"
+        !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR/shellext/OCOverlays_x64.dll"
+        !undef LIBRARY_X64
+     ${Else}
+        !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED "$INSTDIR/shellext/OCUtil_x86.dll"
+        !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR/shellext/OCOverlays_x86.dll"
+      ${EndIf}
   !endif

-   ;Start menu shortcuts.
+   ;Start menu shortcut
   !ifdef OPTION_SECTION_SC_START_MENU
      SetShellVarContext all
-      RMDir /r "$SMPROGRAMS\${APPLICATION_NAME}"
+      ${If} ${HasSection} SEC_START_MENU
+         Delete "$SMPROGRAMS\${APPLICATION_NAME}.lnk"
+      ${EndIf}
      SetShellVarContext current
   !endif

   ;Desktop shortcut.
   !ifdef OPTION_SECTION_SC_DESKTOP
-      IfFileExists "$DESKTOP\${APPLICATION_NAME}.lnk" 0 +2
-         Delete "$DESKTOP\${APPLICATION_NAME}.lnk"
+      ${If} ${HasSection} SEC_DESKTOP
+         ${If} ${FileExists} "$DESKTOP\${APPLICATION_NAME}.lnk"
+            Delete "$DESKTOP\${APPLICATION_NAME}.lnk"
+         ${EndIf}
+      ${EndIf}
   !endif

   ;Quick Launch shortcut.
   !ifdef OPTION_SECTION_SC_QUICK_LAUNCH
-      IfFileExists "$QUICKLAUNCH\${APPLICATION_NAME}.lnk" 0 +2
-         Delete "$QUICKLAUNCH\${APPLICATION_NAME}.lnk"
+      ${If} ${HasSection} SEC_QUICK_LAUNCH
+         ${If} ${FileExists} "$QUICKLAUNCH\${APPLICATION_NAME}.lnk"
+            Delete "$QUICKLAUNCH\${APPLICATION_NAME}.lnk"
+         ${EndIf}
+      ${EndIf}
   !endif

   ;Remove all the Program Files.
@@ -610,8 +684,10 @@ Section Uninstall
      RMDir /r "$LOCALAPPDATA\${APPLICATION_NAME}"
   ${EndIf}

+   DeleteRegKey ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}"
+
   SetDetailsPrint textonly
-   DetailPrint "Finshed."
+   DetailPrint $UNINSTALLER_FINISHED_Detail
 SectionEnd

 ##############################################################################
@@ -621,15 +697,45 @@ SectionEnd
 ##############################################################################

 Function .onInit
+   SetOutPath $INSTDIR
+
+   ${GetParameters} $R0
+   ${GetOptions} $R0 "/launch" $R0
+   ${IfNot} ${Errors}
+      StrCpy $InstallRunIfSilent "yes"
+   ${EndIf}
+
+   ${GetParameters} $R0
+   ${GetOptions} $R0 "/noautoupdate" $R0
+   ${IfNot} ${Errors}
+      StrCpy $NoAutomaticUpdates "yes"
+   ${EndIf}
+
+
   !insertmacro INSTALLOPTIONS_EXTRACT "NSIS.InstallOptions.ini"

-   ;Remove Quick Launch option from Windows 7, as no longer applicable - usually.
+   ; uncomment this line if you want to see the language selection
+   ;!insertmacro MUI_LANGDLL_DISPLAY
+
+   Call SetLang
+
+   ; Remove Quick Launch option from Windows 7, as no longer applicable - usually.
   ${IfNot} ${AtMostWinVista}
-      SectionSetText ${SEC_QUICK_LAUNCH} "Quick Launch Shortcut (N/A)"
+      SectionSetText ${SEC_QUICK_LAUNCH} $INIT_NO_QUICK_LAUNCH
      SectionSetFlags ${SEC_QUICK_LAUNCH} ${SF_RO}
      SectionSetInstTypes ${SEC_QUICK_LAUNCH} 0
   ${EndIf}

+   ; Some people might have a shortcut called 'ownCloud' pointing elsewhere, see #356
+   ; Unselect item and adjust text
+   ${If} ${FileExists} "$DESKTOP\${APPLICATION_NAME}.lnk"
+      SectionSetText ${SEC_DESKTOP} $INIT_NO_DESKTOP
+      Push $0
+      SectionSetFlags ${SEC_DESKTOP} 0
+      SectionSetInstTypes ${SEC_DESKTOP} 0
+      Pop $0
+   ${EndIf}
+
   ${MementoSectionRestore}

   UAC_Elevate:
@@ -640,7 +746,7 @@ Function .onInit
      Quit

   UAC_Err:
-      MessageBox MB_ICONSTOP "Unable to elevate, error $0"
+      MessageBox MB_ICONSTOP "$UAC_ERROR_ELEVATE $0"
      Abort

   UAC_ElevationAborted:
@@ -649,19 +755,19 @@ Function .onInit
   UAC_Success:
      StrCmp 1 $3 +4 ;Admin?
      StrCmp 3 $1 0 UAC_ElevationAborted ;Try again?
-      MessageBox MB_ICONSTOP "This installer requires admin access, try again"
+      MessageBox MB_ICONSTOP $UAC_INSTALLER_REQUIRE_ADMIN
      goto UAC_Elevate

   ;Prevent multiple instances.
   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "owncloudInstaller") i .r1 ?e'
   Pop $R0
   StrCmp $R0 0 +3
-      MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running."
+      MessageBox MB_OK|MB_ICONEXCLAMATION $INIT_INSTALLER_RUNNING
      Abort

   ;Use available InstallLocation when possible. This is useful in the uninstaller
   ;via re-install, which would otherwise use a default location - a bug.
-   ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "InstallLocation"
+   ReadRegStr $R0 ${MEMENTO_REGISTRY_ROOT} "${MEMENTO_REGISTRY_KEY}" "InstallLocation"
   StrCmp $R0 "" SkipSetInstDir
   StrCpy $INSTDIR $R0
   SkipSetInstDir:
@@ -672,6 +778,15 @@ FunctionEnd

 Function .onInstSuccess
   ${MementoSectionSave}
+
+   ${If} $NoAutomaticUpdates == "yes"
+      WriteRegDWORD HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "skipUpdateCheck" "1"
+   ${EndIf}
+
+   ${If} ${Silent}
+   ${AndIf} $InstallRunIfSilent == "yes"
+     Call LaunchApplication
+   ${EndIf}
   UAC::Unload ;Must call unload!
 FunctionEnd

@@ -686,6 +801,8 @@ FunctionEnd
 ##############################################################################

 Function un.onInit
+   Call un.SetLang
+
   UAC_Elevate:
      UAC::RunElevated
      StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
@@ -694,7 +811,7 @@ Function un.onInit
      Quit

   UAC_Err:
-      MessageBox MB_ICONSTOP "Unable to elevate, error $0"
+      MessageBox MB_ICONSTOP "$UAC_ERROR_ELEVATE $0"
      Abort

   UAC_ElevationAborted:
@@ -703,14 +820,14 @@ Function un.onInit
   UAC_Success:
      StrCmp 1 $3 +4 ;Admin?
      StrCmp 3 $1 0 UAC_ElevationAborted ;Try again?
-      MessageBox MB_ICONSTOP "This uninstaller requires admin access, try again"
+      MessageBox MB_ICONSTOP $UAC_UNINSTALLER_REQUIRE_ADMIN
      goto UAC_Elevate

   ;Prevent multiple instances.
   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "owncloudUninstaller") i .r1 ?e'
   Pop $R0
   StrCmp $R0 0 +3
-      MessageBox MB_OK|MB_ICONEXCLAMATION "This uninstaller is already running."
+      MessageBox MB_OK|MB_ICONEXCLAMATION $INIT_UNINSTALLER_RUNNING
      Abort

   ;Shutdown ${APPLICATION_NAME} in order to remove locked files.
--- a/cmake/modules/QtVersionAbstraction.cmake
+++ b/cmake/modules/QtVersionAbstraction.cmake
@@ -0,0 +1,163 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
+include (MacroOptionalFindPackage)
+include (MacroLogFeature)
+
+option(BUILD_WITH_QT4 "Build with Qt4 no matter if Qt5 was found" OFF)
+
+if( BUILD_WITH_QT4 )
+    message(STATUS "Search for Qt5 was disalbed by option BUILD_WITH_QT4")
+else( BUILD_WITH_QT4 )
+    find_package(Qt5Core QUIET)
+endif( BUILD_WITH_QT4 )
+
+if( Qt5Core_FOUND )
+    message(STATUS "Found Qt5 core, checking for further dependencies...")
+    find_package(Qt5Network REQUIRED)
+    find_package(Qt5Xml REQUIRED)
+    if(NOT TOKEN_AUTH_ONLY)
+        find_package(Qt5WebKitWidgets REQUIRED)
+        find_package(Qt5WebKit REQUIRED)
+        find_package(Qt5PrintSupport REQUIRED)
+        find_package(Qt5Quick REQUIRED)
+        find_package(Qt5Widgets REQUIRED)
+        if(APPLE)
+           find_package(Qt5MacExtras REQUIRED)
+        endif(APPLE)
+    endif()
+
+else( Qt5Core_FOUND )
+    if(WIN32 OR APPLE)
+	message(FATAL_ERROR "Qt 5 not found, but application depends on Qt5 on Windows and Mac OS X")
+    endif(WIN32 OR APPLE)
+endif( Qt5Core_FOUND )
+
+
+if( Qt5Core_FOUND )
+    message(STATUS "Using Qt 5!")
+
+    # We need this to find the paths to qdbusxml2cpp and co
+    if (WITH_DBUS)
+	find_package(Qt5DBus REQUIRED)
+	include_directories(${Qt5DBus_INCLUDES})
+	add_definitions(${Qt5DBus_DEFINITIONS})
+    endif (WITH_DBUS)
+    include_directories(${Qt5Core_INCLUDES})
+    add_definitions(${Qt5Core_DEFINITIONS})
+    if (NOT WIN32) #implied on Win32
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+    endif(NOT WIN32)
+#        set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+
+    if(APPLE AND NOT TOKEN_AUTH_ONLY)
+	include_directories(${Qt5MacExtras_INCLUDE_DIRS})
+	add_definitions(${Qt5MacExtras_DEFINITIONS})
+	set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
+    endif()
+
+if(NOT BUILD_LIBRARIES_ONLY)
+    macro(qt_wrap_ui)
+	qt5_wrap_ui(${ARGN})
+    endmacro()
+else()
+    # hack
+    SET(QT_UIC_EXECUTABLE "") 
+endif()
+
+    macro(qt_add_resources)
+	qt5_add_resources(${ARGN})
+    endmacro()
+
+    find_package(Qt5LinguistTools REQUIRED)
+    macro(qt_add_translation)
+	qt5_add_translation(${ARGN})
+    endmacro()
+
+    macro(qt_add_dbus_interface)
+	qt5_add_dbus_interface(${ARGN})
+    endmacro()
+
+    macro(qt_add_dbus_adaptor)
+	qt5_add_dbus_adaptor(${ARGN})
+    endmacro()
+
+    macro(qt_wrap_cpp)
+	qt5_wrap_cpp(${ARGN})
+    endmacro()
+
+    macro(install_qt_executable)
+	install_qt5_executable(${ARGN})
+    endmacro()
+
+    macro(setup_qt)
+    endmacro()
+
+    set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}")
+
+    #Enable deprecated symbols
+    add_definitions("-DQT_DISABLE_DEPRECATED_BEFORE=0")
+endif( Qt5Core_FOUND )
+
+if(NOT Qt5Core_FOUND)
+    message(STATUS "Could not find Qt5, searching for Qt4 instead...")
+
+    set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork" "QtGui" "QtWebkit")
+    if( BUILD_TESTS )
+        list(APPEND NEEDED_QT4_COMPONENTS "QtTest")
+    endif()
+
+    find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
+    macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://www.qt-project.org" TRUE "" "If you see this, although libqt4-devel is installed, check whether the \n     qtwebkit-devel package and whatever contains QtUiTools is installed too")
+
+    macro(qt5_use_modules)
+    endmacro()
+
+    macro(qt_wrap_ui)
+        qt4_wrap_ui(${ARGN})
+    endmacro()
+
+    macro(qt_add_resources)
+        qt4_add_resources(${ARGN})
+    endmacro()
+
+    macro(qt_add_translation)
+        qt4_add_translation(${ARGN})
+    endmacro()
+
+    macro(qt_add_dbus_interface)
+      qt4_add_dbus_interface(${ARGN})
+    endmacro()
+
+    macro(qt_add_dbus_adaptor)
+        qt4_add_dbus_adaptor(${ARGN})
+    endmacro()
+
+    macro(qt_wrap_cpp)
+        qt4_wrap_cpp(${ARGN})
+    endmacro()
+
+    macro(install_qt_executable)
+        install_qt4_executable(${ARGN})
+    endmacro()
+
+    macro(setup_qt)
+        set(QT_USE_QTGUI TRUE)
+        set(QT_USE_QTSQL TRUE)
+        set(QT_USE_QTNETWORK TRUE)
+        set(QT_USE_QTXML TRUE)
+        set(QT_USE_QTWEBKIT TRUE)
+        set(QT_USE_QTDBUS TRUE)
+
+        include( ${QT_USE_FILE} )
+    endmacro()
+
+    add_definitions("-DQ_DECL_OVERRIDE=override")
+endif()
+
+if( Qt5Core_DIR )
+    set( HAVE_QT5 TRUE )
+else( Qt5Core_DIR )
+    set( HAVE_QT5 FALSE )
+endif( Qt5Core_DIR )
--- a/cmake/modules/UseAsciidoc.cmake
+++ b/cmake/modules/UseAsciidoc.cmake
@@ -0,0 +1,58 @@
+#  - macro_asciidoc2man(inputfile outputfile)
+#
+#  Create a manpage with asciidoc.
+#  Example: macro_asciidoc2man(foo.txt foo.1)
+#
+# Copyright (c) 2006, Andreas Schneider, <asn@cryptomilk.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+include(MacroCopyFile)
+
+macro(MACRO_ASCIIDOC2MAN _a2m_input _a2m_output)
+  find_program(A2X
+    NAMES
+      a2x
+  )
+  #message("+++ A2X: ${A2X}")
+
+  if (A2X)
+
+    #message("+++ ${A2X} --doctype=manpage --format=manpage --destination-dir=${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${_a2m_input}")
+    macro_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/${_a2m_input} ${CMAKE_CURRENT_BINARY_DIR}/${_a2m_input})
+
+    execute_process(
+      COMMAND
+        ${A2X} --doctype=manpage --format=manpage ${_a2m_input}
+      WORKING_DIRECTORY
+        ${CMAKE_CURRENT_BINARY_DIR}
+      RESULT_VARIABLE
+        A2M_MAN_GENERATED
+      ERROR_QUIET
+    )
+
+    #message("+++ A2M_MAN_GENERATED: ${A2M_MAN_GENERATED}")
+    if (A2M_MAN_GENERATED EQUAL 0)
+      find_file(A2M_MAN_FILE
+        NAME
+          ${_a2m_output}
+        PATHS
+          ${CMAKE_CURRENT_BINARY_DIR}
+        NO_DEFAULT_PATH
+      )
+
+      if (A2M_MAN_FILE)
+        get_filename_component(A2M_MAN_CATEGORY ${A2M_MAN_FILE} EXT)
+        string(SUBSTRING ${A2M_MAN_CATEGORY} 1 1 A2M_MAN_CATEGORY)
+        install(
+          FILES
+            ${A2M_MAN_FILE}
+          DESTINATION
+            ${MAN_INSTALL_DIR}/man${A2M_MAN_CATEGORY}
+        )
+      endif (A2M_MAN_FILE)
+    endif (A2M_MAN_GENERATED EQUAL 0)
+
+  endif (A2X)
+endmacro(MACRO_ASCIIDOC2MAN _a2m_input _a2m_file)
--- a/cmake/modules/UseDoxygen.cmake
+++ b/cmake/modules/UseDoxygen.cmake
@@ -0,0 +1,131 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
+# -helper macro to add a "doc" target with CMake build system. 
+# and configure doxy.config.in to doxy.config
+#
+# target "doc" allows building the documentation with doxygen/dot on WIN32 and Linux
+# Creates .chm windows help file if MS HTML help workshop 
+# (available from http://msdn.microsoft.com/workshop/author/htmlhelp)
+# is installed with its DLLs in PATH.
+#
+#
+# Please note, that the tools, e.g.:
+# doxygen, dot, latex, dvips, makeindex, gswin32, etc.
+# must be in path.
+#
+# Note about Visual Studio Projects: 
+# MSVS has its own path environment which may differ from the shell.
+# See "Menu Tools/Options/Projects/VC++ Directories" in VS 7.1
+#
+# author Jan Woetzel 2004-2006
+# www.mip.informatik.uni-kiel.de/~jw
+
+
+FIND_PACKAGE(Doxygen)
+
+IF (DOXYGEN_FOUND)
+
+  # click+jump in Emacs and Visual Studio (for doxy.config) (jw)
+  IF    (CMAKE_BUILD_TOOL MATCHES "(msdev|devenv)")
+    SET(DOXY_WARN_FORMAT "\"$file($line) : $text \"")
+  ELSE  (CMAKE_BUILD_TOOL MATCHES "(msdev|devenv)")
+    SET(DOXY_WARN_FORMAT "\"$file:$line: $text \"")
+  ENDIF (CMAKE_BUILD_TOOL MATCHES "(msdev|devenv)")
+
+  # we need latex for doxygen because of the formulas
+  FIND_PACKAGE(LATEX)
+  IF    (NOT LATEX_COMPILER)
+    MESSAGE(STATUS "latex command LATEX_COMPILER not found but usually required. You will probably get warnings and user inetraction on doxy run.")
+  ENDIF (NOT LATEX_COMPILER)
+  IF    (NOT MAKEINDEX_COMPILER)
+    MESSAGE(STATUS "makeindex command MAKEINDEX_COMPILER not found but usually required.")
+  ENDIF (NOT MAKEINDEX_COMPILER)
+  IF    (NOT DVIPS_CONVERTER)
+    MESSAGE(STATUS "dvips command DVIPS_CONVERTER not found but usually required.")
+  ENDIF (NOT DVIPS_CONVERTER)
+  FIND_PROGRAM(DOXYGEN_DOT_EXECUTABLE_PATH NAMES dot)
+  IF (DOXYGEN_DOT_EXECUTABLE_PATH)
+    SET(DOXYGEN_DOT_FOUND "YES")
+  ENDIF (DOXYGEN_DOT_EXECUTABLE_PATH)
+
+  IF   (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/doxy.config.in")
+    MESSAGE(STATUS "Generate ${CMAKE_CURRENT_BINARY_DIR}/doxy.config from doxy.config.in")
+    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/doxy.config.in 
+      ${CMAKE_CURRENT_BINARY_DIR}/doxy.config
+      @ONLY )
+    # use (configured) doxy.config from (out of place) BUILD tree:
+    SET(DOXY_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/doxy.config")
+  ELSE (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/doxy.config.in")
+    # use static hand-edited doxy.config from SOURCE tree:
+    SET(DOXY_CONFIG "${CMAKE_CURRENT_SOURCE_DIR}/doxy.config")
+    IF   (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/doxy.config")
+      MESSAGE(STATUS "WARNING: using existing ${CMAKE_CURRENT_SOURCE_DIR}/doxy.config instead of configuring from doxy.config.in file.")
+    ELSE (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/doxy.config")
+      IF   (EXISTS "${CMAKE_MODULE_PATH}/doxy.config.in")
+        # using template doxy.config.in
+        MESSAGE(STATUS "Generate ${CMAKE_CURRENT_BINARY_DIR}/doxy.config from doxy.config.in")
+        CONFIGURE_FILE(${CMAKE_MODULE_PATH}/doxy.config.in 
+          ${CMAKE_CURRENT_BINARY_DIR}/doxy.config
+          @ONLY )
+        SET(DOXY_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/doxy.config")
+      ELSE (EXISTS "${CMAKE_MODULE_PATH}/doxy.config.in")
+        # failed completely...
+        MESSAGE(SEND_ERROR "Please create ${CMAKE_CURRENT_SOURCE_DIR}/doxy.config.in (or doxy.config as fallback)")
+      ENDIF(EXISTS "${CMAKE_MODULE_PATH}/doxy.config.in")
+
+    ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/doxy.config")
+  ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/doxy.config.in")
+
+  ADD_CUSTOM_TARGET(csync_doc ${DOXYGEN_EXECUTABLE} ${DOXY_CONFIG} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/doxy.config)
+
+  # create a windows help .chm file using hhc.exe
+  # HTMLHelp DLL must be in path!
+  # fallback: use hhw.exe interactively
+  IF    (WIN32)
+    FIND_PACKAGE(HTMLHelp)
+    IF   (HTML_HELP_COMPILER)      
+      SET (TMP "${CMAKE_CURRENT_BINARY_DIR}\\doc\\html\\index.hhp")
+      STRING(REGEX REPLACE "[/]" "\\\\" HHP_FILE ${TMP} )
+      # MESSAGE(SEND_ERROR "DBG  HHP_FILE=${HHP_FILE}")
+      ADD_CUSTOM_TARGET(winhelp ${HTML_HELP_COMPILER} ${HHP_FILE})
+      ADD_DEPENDENCIES (winhelp doc)
+     
+      IF (NOT TARGET_DOC_SKIP_INSTALL)
+      # install windows help?
+      # determine useful name for output file 
+      # should be project and version unique to allow installing 
+      # multiple projects into one global directory      
+      IF   (EXISTS "${PROJECT_BINARY_DIR}/doc/html/index.chm")
+        IF   (PROJECT_NAME)
+          SET(OUT "${PROJECT_NAME}")
+        ELSE (PROJECT_NAME)
+          SET(OUT "Documentation") # default
+        ENDIF(PROJECT_NAME)
+        IF   (${PROJECT_NAME}_VERSION_MAJOR)
+          SET(OUT "${OUT}-${${PROJECT_NAME}_VERSION_MAJOR}")
+          IF   (${PROJECT_NAME}_VERSION_MINOR)
+            SET(OUT  "${OUT}.${${PROJECT_NAME}_VERSION_MINOR}")
+            IF   (${PROJECT_NAME}_VERSION_PATCH)
+              SET(OUT "${OUT}.${${PROJECT_NAME}_VERSION_PATCH}")      
+            ENDIF(${PROJECT_NAME}_VERSION_PATCH)
+          ENDIF(${PROJECT_NAME}_VERSION_MINOR)
+        ENDIF(${PROJECT_NAME}_VERSION_MAJOR)
+        # keep suffix
+        SET(OUT  "${OUT}.chm")
+        
+        #MESSAGE("DBG ${PROJECT_BINARY_DIR}/doc/html/index.chm \n${OUT}")
+        # create target used by install and package commands 
+        INSTALL(FILES "${PROJECT_BINARY_DIR}/doc/html/index.chm"
+          DESTINATION "doc"
+          RENAME "${OUT}"
+        )
+      ENDIF(EXISTS "${PROJECT_BINARY_DIR}/doc/html/index.chm")
+      ENDIF(NOT TARGET_DOC_SKIP_INSTALL)
+
+    ENDIF(HTML_HELP_COMPILER)
+    # MESSAGE(SEND_ERROR "HTML_HELP_COMPILER=${HTML_HELP_COMPILER}")
+  ENDIF (WIN32) 
+ENDIF(DOXYGEN_FOUND)
+
--- a/cmake/modules/Warnings.cmake
+++ b/cmake/modules/Warnings.cmake
@@ -0,0 +1,26 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
+if(CMAKE_COMPILER_IS_GNUCXX)
+    execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
+                    OUTPUT_VARIABLE GCC_VERSION)
+    if(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Wno-long-long")
+    else(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long")
+    endif(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+endif(CMAKE_COMPILER_IS_GNUCXX)
+if(CMAKE_CXX_COMPILER MATCHES "clang")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+endif(CMAKE_CXX_COMPILER MATCHES "clang")
+# TODO: handle msvc compilers warnings?
+
+if(DEFINED MIRALL_FATAL_WARNINGS)
+    if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER MATCHES "clang")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+    endif (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER MATCHES "clang")
+    # TODO: handle msvc compilers warnings?
+endif(DEFINED MIRALL_FATAL_WARNINGS)
--- a/cmake/scripts/generate_findpackage_file
+++ b/cmake/scripts/generate_findpackage_file
@@ -0,0 +1,154 @@
+#!/usr/bin/env ruby
+
+# Simple script to generate simple cmake modules for finding
+# libraries (packages)
+#
+# usage: generate_findpackage_file
+# then you will be prompted to enter the required parameters
+#
+#####################################################################
+#
+# Copyright (c) 2006 Alexander Neundorf <neundorf@kde.org>
+# Copyright (c) 2006 Andreas Schneider <asn@cryptomilk.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA  02110-1301, USA.
+#
+
+require 'readline'
+
+package=Readline.readline("Name of package: ")
+
+name=Readline.readline("\nYour Name (for copyright): ")
+
+email=Readline.readline("\nYour mail (for copyright): ")
+
+pkgconfig=Readline.readline("\npkgconfig package name (e.g. \"libxml-2.0\", leave empty to skip pkgconfig): ")
+
+header=Readline.readline("\nLook for header (e.g. \"jpeglib.h\" or \"libxml/xpath.h\"): ")
+
+incSubDir=Readline.readline("\nLook for header subdir (e.g. \"libxml2\", empty to skip ): ")
+
+libs=Readline.readline("\nLook for library (e.g. \"xml2\" or \"avcodec avutil\"): ")
+
+t = Time.now
+
+cmakeIncDirName=package.upcase+"_INCLUDE_DIR"
+cmakeIncDirNames=package.upcase+"_INCLUDE_DIRS"
+cmakeLibNames=package.upcase+"_LIBRARIES"
+cmakeDefsName=package.upcase+"_DEFINITIONS"
+cmakeFoundName=package.upcase+"_FOUND"
+cmakeQuietName=package+"_FIND_QUIETLY"
+cmakeRequiredName=package+"_FIND_REQUIRED"
+
+file=File.new("Find#{package}.cmake", "w+")
+
+
+file.printf("# - Try to find #{package}\n")
+file.printf("# Once done this will define\n")
+file.printf("#\n")
+file.printf("#  #{cmakeFoundName} - system has #{package}\n")
+file.printf("#  #{cmakeIncDirNames} - the #{package} include directory\n")
+file.printf("#  #{cmakeLibNames} - Link these to use #{package}\n")
+file.printf("#  #{cmakeDefsName} - Compiler switches required for using #{package}\n")
+file.printf("#\n")
+file.printf("#  Copyright (c) #{t.year} #{name} <#{email}>\n")
+file.printf("#\n")
+file.printf("#  Redistribution and use is allowed according to the terms of the New\n")
+file.printf("#  BSD license.\n")
+file.printf("#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.\n")
+file.printf("#\n")
+
+file.printf("\n")
+file.printf("\n")
+
+file.printf("if (#{cmakeLibNames} AND #{cmakeIncDirNames})\n")
+file.printf("  # in cache already\n")
+file.printf("  set(#{cmakeFoundName} TRUE)\n")
+file.printf("else (#{cmakeLibNames} AND #{cmakeIncDirNames})\n")
+
+if not pkgconfig.empty?
+   file.printf("  find_package(PkgConfig)\n")
+   file.printf("  if (PKG_CONFIG_FOUND)\n")
+   file.printf("    pkg_check_modules(_#{package.upcase} #{pkgconfig})\n")
+   file.printf("  endif (PKG_CONFIG_FOUND)\n")
+end
+
+file.printf("\n")
+
+file.printf("  find_path(#{cmakeIncDirName}\n")
+file.printf("    NAMES\n")
+file.printf("      #{header}\n")
+file.printf("    PATHS\n")
+if not pkgconfig.empty?
+   file.printf("      ${_#{package.upcase}_INCLUDEDIR}\n")
+end
+file.printf("      /usr/include\n")
+file.printf("      /usr/local/include\n")
+file.printf("      /opt/local/include\n")
+file.printf("      /sw/include\n")
+
+if not incSubDir.empty?
+	file.printf("    PATH_SUFFIXES\n")
+	file.printf("      #{incSubDir}\n")
+end
+file.printf("  )\n")
+
+file.printf("\n")
+
+libs.split(" ").each do |lib|
+	file.printf("  find_library(#{lib.upcase}_LIBRARY\n")
+	file.printf("    NAMES\n")
+	file.printf("      #{lib}\n")
+	file.printf("    PATHS\n")
+	if not pkgconfig.empty?
+		file.printf("      ${_#{package.upcase}_LIBDIR}\n")
+	end
+	file.printf("      /usr/lib\n")
+	file.printf("      /usr/local/lib\n")
+	file.printf("      /opt/local/lib\n")
+	file.printf("      /sw/lib\n")
+	file.printf("  )\n")
+	file.printf("\n")
+end
+
+file.printf("  set(#{cmakeIncDirNames}\n")
+file.printf("    ${#{cmakeIncDirName}}\n")
+file.printf("  )\n")
+
+file.printf("\n")
+
+libs.split(" ").each do |lib|
+	file.printf("  if (#{lib.upcase}_LIBRARY)\n")
+	file.printf("    set(#{cmakeLibNames}\n")
+	file.printf("        ${#{cmakeLibNames}}\n")
+	file.printf("        ${#{lib.upcase}_LIBRARY}\n")
+	file.printf("    )\n")
+	file.printf("  endif (#{lib.upcase}_LIBRARY)\n")
+	file.printf("\n")
+end
+
+file.printf("  include(FindPackageHandleStandardArgs)\n")
+file.printf("  find_package_handle_standard_args(#{package} DEFAULT_MSG #{cmakeLibNames} #{cmakeIncDirNames})\n")
+
+file.printf("\n")
+
+file.printf("  # show the #{cmakeIncDirNames} and #{cmakeLibNames} variables only in the advanced view\n")
+file.printf("  mark_as_advanced(#{cmakeIncDirNames} #{cmakeLibNames})\n\n")
+
+file.printf("endif (#{cmakeLibNames} AND #{cmakeIncDirNames})\n\n")
+
+printf("Done, generated Find#{package}.cmake\n")
+
--- a/cmake/scripts/generate_lib_file
+++ b/cmake/scripts/generate_lib_file
@@ -0,0 +1,135 @@
+#!/usr/bin/env ruby
+
+# simple script to generate CMakeLists.txt for wengophone libs
+#
+# usage: generate_lib_file
+# then you will be prompted to enter the required parameters
+#
+#####################################################################
+#
+# Copyright (c) 2006 Andreas Schneider <asn@cryptomilk.org>
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA  02110-1301, USA.
+#
+
+print("Name of project: ")
+project=gets.chomp
+
+printf("\n")
+
+print("Other projects to includes (e.g. \"owutil tinyxml\", leave emtpy to skip): ")
+otherprojects=gets.chomp
+
+printf("\n")
+
+print("Defininitions (leave empty to skip): ")
+definitions=gets.chomp
+
+cmakePublicIncDirName = project.upcase+"_PUBLIC_INCLUDE_DIRS"
+cmakePrivateIncDirName = project.upcase+"_PRIVATE_INCLUDE_DIRS"
+cmakeLibName = project.upcase+"_LIBRARY"
+cmakeLibNames = project.upcase+"_LINK_LIBRARIES"
+cmakePublicDefsName = project.upcase+"_PUBLIC_DEFINITIONS"
+cmakePrivateDefsName = project.upcase+"_PRIVATE_DEFINITIONS"
+
+file=File.new("CMakeLists.txt", "w+")
+
+file.printf("project(#{project})\n")
+file.printf("\n")
+file.printf("# needed include directories to build #{project}\n")
+file.printf("# saves the variable in internal cache for later use\n")
+file.printf("set(#{cmakePublicIncDirName}\n")
+file.printf("  ${CMAKE_CURRENT_SOURCE_DIR}\n")
+file.printf("  ${CMAKE_CURRENT_SOURCE_DIR}/include\n")
+file.printf("  CACHE INTERNAL \"#{project} public include directories\"\n")
+file.printf(")\n")
+
+file.printf("\n")
+
+file.printf("set(#{cmakePrivateIncDirName}\n")
+otherprojects.split(" ").each do |otherproject|
+	file.printf("  ${#{otherproject.upcase}_PUBLIC_INCLUDE_DIRS}\n")
+end
+file.printf("  ${CMAKE_CURRENT_BINARY_DIR}\n")
+file.printf(")\n")
+
+file.printf("\n")
+
+file.printf("set(#{cmakeLibName}\n")
+file.printf("  #{project}\n")
+file.printf("  CACHE INTERNAL \"#{project} library\"\n")
+file.printf(")\n")
+
+file.printf("\n")
+
+file.printf("# #{project} lib and dependencies\n")
+file.printf("set(#{cmakeLibNames}\n")
+file.printf("  #{cmakeLibName}\n")
+otherprojects.split(" ").each do |otherproject|
+	file.printf("  ${#{otherproject.upcase}_LIBRARIES}\n")
+end
+file.printf(")\n")
+
+file.printf("\n")
+
+if not definitions.empty?
+	file.printf("set(#{cmakePublicDefsName}\n")
+	file.printf("  #{definitions}\n")
+	file.printf("  CACHE INTERNAL \"#{project} public definitions\"\n")
+	file.printf(")\n")
+
+	file.printf("\n")
+
+	file.printf("set(#{cmakePrivateDefsName}\n")
+	file.printf("  #{definitions}\n")
+	file.printf(")\n")
+
+	file.printf("\n")
+end
+
+file.printf("set(#{project}_SRCS\n")
+file.printf("  files.c\n")
+file.printf(")\n")
+
+file.printf("\n")
+
+file.printf("include_directories(\n")
+file.printf("  ${#{cmakePublicIncDirName}}\n")
+file.printf("  ${#{cmakePrivateIncDirName}}\n")
+file.printf(")\n")
+
+file.printf("\n")
+
+if not definitions.empty?
+	file.printf("add_definitions(\n")
+	file.printf("  ${#{cmakePublicDefsName}}\n")
+	file.printf("  ${#{cmakePrivateDefsName}}\n")
+	file.printf(")\n")
+
+	file.printf("\n")
+end
+
+file.printf("\n")
+
+file.printf("add_library(${#{cmakeLibName}} STATIC ${#{project}_SRCS})\n")
+
+file.printf("\n")
+
+file.printf("target_link_libraries(${#{cmakeLibNames}})\n")
+
+file.printf("\n")
+
+printf("Generated CMakeLists.txt for #{project}\n")
+
--- a/Show More
+++ b/Show More