Add OWNCLOUDSYNC_EXPORT prefix to make windows build.

Bump version to 1.8.0 beta2.
PropagateUpload: also read the OC-ErrorString header from the poll job
2026-04-03 18:11:32 +02:00 · 2015-03-04 13:50:55 +01:00 · 2015-03-04 12:29:17 +01:00 · 2015-03-04 12:01:41 +01:00 · 2015-03-04 12:00:55 +01:00 · 2015-03-04 09:51:54 +01:00
586 changed files with 220106 additions and 41538 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 *build*/
 *flymake*
 CMakeLists.txt.user*
-*.patch
 *~
 *.autosave
 doc/_build/*
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,10 @@
 	url = https://github.com/owncloud/documentation
 [submodule "src/3rdparty/qtmacgoodies"]
 	path = src/3rdparty/qtmacgoodies
-	url = git://github.com/guruz/qtmacgoodies.git
+	url = git://github.com/shadone/qtmacgoodies.git
 [submodule "binary"]
 	path = binary
 	url = git://github.com/owncloud/owncloud-client-binary.git
+[submodule "src/3rdparty/libcrashreporter-qt"]
+	path = src/3rdparty/libcrashreporter-qt
+	url = git://github.com/dschmidt/libcrashreporter-qt.git
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,7 @@
-
 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 )
-
-include(Warnings)
+project(client)

 set(OEM_THEME_DIR "" CACHE STRING "Define directory containing a custom theme")
 if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake )
@@ -14,15 +9,38 @@ if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake )
 else ()
     include ( ${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake )
 endif()
+# need this logic to not mess with re/uninstallations via macosx.pkgproj
+if(${APPLICATION_REV_DOMAIN} STREQUAL "com.owncloud.desktopclient")
+    set(APPLICATION_REV_DOMAIN_INSTALLER "com.ownCloud.client")
+else()
+    set(APPLICATION_REV_DOMAIN_INSTALLER ${APPLICATION_REV_DOMAIN})
+endif()

 if (NOT DEFINED APPLICATION_SHORTNAME)
     set ( APPLICATION_SHORTNAME ${APPLICATION_NAME} )
 endif()

+set(PACKAGE "${APPLICATION_SHORTNAME}-client")
+set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
+
+if(NOT CRASHREPORTER_EXECUTABLE)
+    set(CRASHREPORTER_EXECUTABLE "${APPLICATION_EXECUTABLE}_crash_reporter")
+endif()
+
+include(Warnings)
+
 include(${CMAKE_SOURCE_DIR}/VERSION.cmake)
-configure_file( ${CMAKE_SOURCE_DIR}/src/mirall/version.h.in "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/version.h" )
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/")

+# disable the crashrepoter if libcrashreporter-qt is not available or we're building for ARM
+if( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/libcrashreporter-qt/CMakeLists.txt")
+    set( WITH_CRASHREPORTER OFF )
+endif()
+
+if(NOT WITH_CRASHREPORTER)
+    message(STATUS "Build of crashreporter disabled.")
+endif()
+
 #####
 ## handle DBUS for Fdo notifications
 if( UNIX AND NOT APPLE )
@@ -38,12 +56,12 @@ include(QtVersionAbstraction)
 setup_qt()

 include(GetGitRevisionDescription)
+
 get_git_head_revision(GIT_REFSPEC GIT_SHA1)

 # if we cannot get it from git, directly try .tag (packages)
 # this will work if the tar balls have been properly created
 # via git-archive.
-if (GIT_SHA1)
 if (${GIT_SHA1} STREQUAL "GITDIR-NOTFOUND")
    file(READ ${CMAKE_SOURCE_DIR}/.tag sha1_candidate)
    string(REPLACE "\n" "" sha1_candidate ${sha1_candidate})
@@ -52,7 +70,7 @@ if (${GIT_SHA1} STREQUAL "GITDIR-NOTFOUND")
        set (GIT_SHA1 "${sha1_candidate}")
    endif()
 endif()
-endif()
+message(STATUS "GIT_SHA1 ${GIT_SHA1}")

 set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
 set(DATADIR ${DATA_INSTALL_DIR})
@@ -84,6 +102,11 @@ if(TOKEN_AUTH_ONLY)
   add_definitions(-DTOKEN_AUTH_ONLY=1)
 endif()

+option(NO_MSG_HANDLER "Don't redirect QDebug outputs to the log window/file" OFF)
+if(NO_MSG_HANDLER)
+   add_definitions(-DNO_MSG_HANDLER=1)
+endif()
+
 # this option creates only libocsync and libowncloudsync
 option(BUILD_LIBRARIES_ONLY "BUILD_LIBRARIES_ONLY" OFF)

@@ -100,7 +123,27 @@ endif()
 #if( UNIX AND NOT APPLE ) # Fdo notifications
 #    find_package(Qt4 4.7.0 COMPONENTS QtDBus REQUIRED )
 #endif()
-find_package(Neon REQUIRED)
+
+
+set(USE_NEON TRUE)
+if(HAVE_QT5)
+  message(STATUS "Using Qt ${Qt5Core_VERSION_MAJOR}.${Qt5Core_VERSION_MINOR}.x")
+  if (${Qt5Core_VERSION_MAJOR} EQUAL "5")
+    if (${Qt5Core_VERSION_MINOR} EQUAL "4" OR ${Qt5Core_VERSION_MINOR} GREATER 4)
+      message(STATUS "We would not require Neon in this setup, compile without!")
+      set(USE_NEON FALSE)
+    else()
+      message(STATUS "Still requiring Neon with this Qt version :-( Qt 5.4 is better!")
+    endif()
+  endif()
+else()
+message(STATUS "If possible compile me with Qt 5.4 which is much faster/better.")
+endif()
+
+if (USE_NEON)
+  find_package(Neon REQUIRED)
+endif(USE_NEON)
+find_package(OpenSSL 1.0.0 REQUIRED)

 if(NOT TOKEN_AUTH_ONLY)
    if (Qt5Core_DIR)
@@ -123,16 +166,17 @@ find_package(Sphinx)
 find_package(PdfLatex)


+find_package(SQLite3 3.8.0 REQUIRED)
+# On some OS, we want to use our own, not the system sqlite
+if (USE_OUR_OWN_SQLITE3)
+    include_directories(BEFORE ${SQLITE3_INCLUDE_DIR})
+endif()
+

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

 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)

 add_definitions(-DUNICODE)
@@ -141,15 +185,17 @@ 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)
+# Handle Translations, pick all client_* files from trans directory.
+file( GLOB TRANS_FILES ${CMAKE_SOURCE_DIR}/translations/client_*.ts)
 set(TRANSLATIONS ${TRANS_FILES})

 add_subdirectory(csync)
 add_subdirectory(src)
+if(NOT BUILD_LIBRARIES_ONLY)
 add_subdirectory(shell_integration)
 add_subdirectory(doc)
 add_subdirectory(admin)
+endif(NOT BUILD_LIBRARIES_ONLY)

 if(UNIT_TESTING)
    include(CTest)
@@ -158,7 +204,7 @@ if(UNIT_TESTING)
 endif(UNIT_TESTING)

 if(BUILD_OWNCLOUD_OSX_BUNDLE)
-    configure_file(sync-exclude.lst ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
+    install(FILES sync-exclude.lst DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
 else()
    install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
    configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,7 +5,7 @@ direct these to the [mailing list][mailinglist] or our [forum][forum].
 We are also available on [IRC][irc].

 ### Bug Reporting Guidelines
-* Important: Report the issue using our [template][template], it includes all the
+* __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: 
@@ -22,7 +22,7 @@ If your issue appears to be a bug, and hasn't been reported, open a new issue.
 Help us to maximize the effort we can spend fixing issues and adding new
 features, by not reporting duplicate issues.

-[template]: https://raw.github.com/owncloud/mirall/master/issue_template.md
+[template]: https://raw.github.com/owncloud/client/master/issue_template.md
 [mailinglist]: https://mail.kde.org/mailman/listinfo/owncloud
 [forum]: http://forum.owncloud.org/
 [irc]: http://webchat.freenode.net/?channels=owncloud&uio=d4
@@ -31,16 +31,16 @@ features, by not reporting duplicate issues.

 Thanks for wanting to contribute source code to ownCloud. That's great!

-Before we're able to merge your code to mirall, you need to sign
+Before we're able to merge your code to ownCloud Desktop Client, you need to sign
 our [Contributor Agreement][agreement].

-Please read the [Desktop Client Manual][mirallman] and the [Developer
+Please read the [Desktop Client Manual][desktopman] and the [Developer
 Manuals][devmanual] to get useful infos like how to create your first
 application or how to test the ownCloud code with phpunit.

 [agreement]: http://owncloud.org/about/contributor-agreement/
-[devmanual]: http://owncloud.org/dev/
-[mirallman]: http://doc.owncloud.org/desktop/1.1/
+[devmanual]: http://owncloud.org/dev
+[desktopman]: http://doc.owncloud.org/desktop

 ## Translations
 Please submit translations via [Transifex][transifex].
--- a/CPackOptions.cmake.in
+++ b/CPackOptions.cmake.in
@@ -17,8 +17,10 @@ else ()
     include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" )
 endif()

+set( CRASHREPORTER_EXECUTABLE @CRASHREPORTER_EXECUTABLE@)
+
 set( BUILD_OWNCLOUD_OSX_BUNDLE @BUILD_OWNCLOUD_OSX_BUNDLE@)
 if(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE)
-    message( FATAL_ERROR "You're trying to build a bundle although you haven't built mirall in bundle mode.\n Add -DBUILD_OWNCLOUD_OSX_BUNDLE=ON")
+    message( FATAL_ERROR "You're trying to build a bundle although you haven't built the client in bundle mode.\n Add -DBUILD_OWNCLOUD_OSX_BUNDLE=ON")
 endif()

--- a/121
+++ b/121
@@ -1,5 +1,114 @@
 ChangeLog
 =========
+version 1.8.0 (release 2015-02-xx)
+ * Mac OS: HIDPI support
+ * Support Sharing from desktop: Added a share dialog that can be
+   opened by context menu in the file managers (Win, Mac, Nautilus)
+   Supports public links with password enforcement
+ * Enhanced usage of parallel HTTP requests for ownCloud 8 servers
+ * Renamed github repository from mirall to client.
+ * Mac OS: Use native notification support
+ * Selective Sync: allow to enforce selective sync in brandings.
+ * Added ability to build on Windows utilizing MingGW
+ * SQLite database fixes if running on FAT filesystems
+ * Improved detection of changing files to upload from local
+ * Preparations for the muli-account feature
+ * Fixed experience for Window manager without system tray
+ * Build with Qt 5.4
+ * Dropped libneon dependency if Qt 5.4 is available
+ * Keep files open very short, that avoid lock problems on Windows
+   especially with office software but also others.
+ * Merged some NetBSD patches
+ * Selective sync support for owncloudcmd
+ * Reorganize the source repository
+ * Prepared direct download
+ * Added Crashreporter feature to be switched on on demand
+ * A huge amount of bug fixes in all areas of the client.
+
+ * more than 7000 commits since 1.7.0
+
+version 1.7.1 (release 2014-12-18)
+ * Documentation fixes and updates
+ * Nautilus Python plugin fixed for Python 3
+ * GUI wording fixes plus improved log messages
+ * Fix hidning of the database files in the sync directories
+ * Compare http download size with the header value to avoid broken
+   downloads, bug #2528
+ * Avoid initial ETag fetch job at startup, which is not needed.
+ * Add chunk size http header to PUT requests
+ * Fixed deteteCookie method of our CookieJar, fix for Shibboleth
+ * Added fallback for distros where XDG_RUNTIME_DIR is undefined
+ * Fix the setup wizard, bug #1989, #2264
+ * Fix scheduling of ETag check jobs, bug #2553
+ * Fix to avoid syncing more than one folder at a time, bug #2407
+ * Use fife minutes timeout for all network jobs
+ * Cleanup for Folderwizard wording
+ * Improve journal check: Remove corrupted journal files, bug #2547
+ * Fix item count in progress dialog for deletes, bug #1132
+ * Display correct file count on deletion (#1132)
+ * Fix reinitializing the folder using the wizard in certain cases (#2606)
+ * Mac OS: Fixed branding of the pkg file
+ * Mac OS: Fix display of overlay icons in certain situations (#1132)
+ * Mac OS: Use a bundled version of OpenSSL (#764, #2600, #2510)
+ * Win32: improved filesystem watcher
+ * Win32: Improve threading with shell integration
+ * Win32: Upgraded to OpenSSL 1.0.1j
+ * Win32: Improve reliability of Installer, fix removal of Shell Extensions
+
+version 1.7.0 (release 2014-11-07)
+
+ * oC7 Sharing: Handle new sharing options of ownCloud 7 correctly.
+ * Added Selective sync: Ability to unselect server folders which are
+   excluded from syncing, plus GUI and setup GUI
+ * Added overlay icons for Windows Explorer, Mac OS Finder and GNOME Nautilus.
+   Information is provided by the client via a local socket / named pipe API
+   which provides information about the sync status of files.
+ * Improved local change detection: consider file size, detect files
+   with ongoing changes and do not upload immediately
+ * Improved HTTP request timeout handler: all successful requests reset
+   the timeout counter
+ * Improvements for syncing command line tool: netrc support, improved
+   SSL support, non interactive mode
+ * Permission system: ownCloud 7 delivers file and folder permissions,
+   added ability to deal with it for shared folders and more.
+ * Ignore handling: Do not recurse into ignored or excluded directories
+ * Major sync journal database improvements for more stability and performance
+ * New library interface to sqlite3
+ * Improve "resync handling" if errors occur
+ * Blacklist improvements
+ * Improved logging: more useful meta info, removed noise
+ * Updated to latest Qt5 versions on Windows and OS X
+ * Fixed data loss when renaming a download temporary fails and there was
+   a conflict at the same time.
+ * Fixed missing warnings about reusing a sync folder when the back button
+   was used in the advanced folder setup wizard.
+ * The 'Retry Sync' button now also restarts all downloads.
+ * Clean up temporary downloads and some extra database files when wiping a
+   folder.
+ * OS X: Sparkle update to provide pkg format properly
+ * OS X: Change distribution format from dmg to pkg with new installer.
+ * Windows: Fix handling of filenames with trailing dot or space
+ * Windows: Don't use the wrong way to get file mtimes in the legacy propagator.
+
+version 1.6.4 (release 2014-10-22)
+ * Fix startup logic, fixes bug #1989
+ * Fix raise dialog on X11
+ * Win32: fix overflow when computing the size of file > 4GiB
+ * Use a fixed function to get files modification time, the
+   original one was broken for certain timezone issues, see
+   core bug #9781 for details
+ * Added some missing copyright headers
+ * Avoid data corruption due to wrong error handling, bug #2280
+ * Do improved request timeout handling to reduce the number of
+   timed out jobs, bug #2155
+   version 1.6.3 (release 2014-09-03)
+ * Fixed updater on OS X
+ * Fixed memory leak in SSL button that could lead to quick memory draining
+ * Fixed upload problem with files >4 GB
+ * MacOSX, Linux: Bring Settings window to front properly
+ * Branded clients: If no configuration is detected, try to import the data
+    from a previously configured community edition.
+
 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.
@@ -53,7 +162,7 @@ version 1.6.0 (release 2014-05-30 )
 * Improve Cookie support (e.g. for cookie-based load-balancers)
 * Introduce a general timeout of 300s for network operations
 * Improve error handling, blacklisting
- * Job-based change propagation, enables faster parallel up/downloads 
+ * Job-based change propagation, enables faster parallel up/downloads
   (right now only if no bandwidth limit is set and no proxy is used)
 * Significantly reduced CPU load when checking for local and remote changes
 * Speed up file stat code on Windows
@@ -66,7 +175,7 @@ version 1.6.0 (release 2014-05-30 )
   Qt 5.2 or later
 * Forward server exception messages to client error messages
 * Mac OS X: Support Notification Center in OS X 10.8+
- * Mac OS X: Use native settings dialog 
+ * Mac OS X: Use native settings dialog
 * Mac OS X: Fix UI inconsistencies on Mavericks
 * Shibboleth: Warn if authenticating with a different user
 * Remove vio abstraction in csync
@@ -101,7 +210,7 @@ version 1.5.2 (release 2014-02-26 )
  * Shibboleth: Proper invalidation if timeout during sync
  * Shibboleth: Do not pop up IdP login immediately when modifying account
  * Shibboleth: Avoid auth on restart by storing cookies in the wallet
-  * Fix license headers 
+  * Fix license headers

 version 1.5.1 (release 2014-02-13 )
  * Added an auto updater that updates the client if a
@@ -186,7 +295,7 @@ version 1.4.2 (release 2013-10-18 ), csync 0.90.4 required
 version 1.4.1 (release 2013-09-24 ), csync 0.90.1 required

  * Translation and documentation fixes.
-  * Fixed error display in settings/status dialog, displays multi 
+  * Fixed error display in settings/status dialog, displays multi
    line error messages now correctly.
  * Wait up to 30 secs before complaining about missing systray
    Fixes bug #949
@@ -267,7 +376,7 @@ version 1.3.0 (release 2013-06-25 ), csync 0.80.0 required
 version 1.2.5 (release 2013-04-23 ), csync 0.70.7 required
  * [Fixes] NSIS installer fixes
  * [Fixes] Fix crash race by making certificateChain() thread safe
-  * [Fixes] Build with older CMake versions (CentOS/RHEL 6) 
+  * [Fixes] Build with older CMake versions (CentOS/RHEL 6)
  * [Fixes] Wording in GUI
  * [Fixes] Silently ignore "installed = true" status.php
  * Set log verbosity before calling csync_init.
@@ -277,7 +386,7 @@ version 1.2.5 (release 2013-04-23 ), csync 0.70.7 required
 version 1.2.4 (release 2013-04-11 ), csync 0.70.6 required
  * [Fixes] Clarify string in folder wizard
  * [Fixes] Fixed some valgrind warnings
-  * [Fixes] Ensure that only one sync thread can ever run 
+  * [Fixes] Ensure that only one sync thread can ever run
  * [Fixes] Fix default config storage path
  * [Fixes] Skip folders with no absolute path
  * [Fixes] Allow setting the configuration directory on command line
--- a/OWNCLOUD.cmake
+++ b/OWNCLOUD.cmake
@@ -1,5 +1,4 @@
 set( APPLICATION_NAME       "ownCloud" )
-#set( APPLICATION_SHORTNAME  ${APPLICATION_NAME} )
 set( APPLICATION_EXECUTABLE "owncloud" )
 set( APPLICATION_DOMAIN     "owncloud.com" )
 set( APPLICATION_VENDOR     "ownCloud" )
@@ -8,5 +7,12 @@ set( APPLICATION_UPDATE_URL "https://updates.owncloud.com/client/" CACHE string
 set( THEME_CLASS            "ownCloudTheme" )
 set( APPLICATION_REV_DOMAIN "com.owncloud.desktopclient" )
 set( WIN_SETUP_BITMAP_PATH  "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
+
+set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-background.png" CACHE STRING "The MacOSX installer background image")
+
 # set( THEME_INCLUDE          "${OEM_THEME_DIR}/mytheme.h" )
 # set( APPLICATION_LICENSE    "${OEM_THEME_DIR}/license.txt )
+
+option( WITH_CRASHREPORTER "Build crashreporter" OFF )
+set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE string "URL for crash repoter" )
+set( CRASHREPORTER_ICON ":/owncloud-icon.png" )
--- a/OwnCloudCPack.cmake
+++ b/OwnCloudCPack.cmake
@@ -19,7 +19,7 @@ if(APPLE)
    set( CPACK_GENERATOR "DragNDrop" )
    set( CPACK_SOURCE_GENERATOR "")
    set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_NAME}-${CPACK_PACKAGE_VERSION} )
-    set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/ownCloud.icns)
+    set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/ownCloud.icns)

    set( CPACK_DMG_DS_STORE "${CMAKE_SOURCE_DIR}/admin/osx/DS_Store.in")
 #    set( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/admin/osx/DMGBackground.png" )
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-# Mirall
+# ownCloud Desktop Client

 ## Introduction

-Mirall is a tool to synchronize files from ownCloud Server with your computer.
-It uses OCSync as its syncing backend.
+The ownCloud Desktop Client is a tool to synchronize files from ownCloud Server
+with your computer.

 ## Download

@@ -13,19 +13,45 @@ It uses OCSync as its syncing backend.

 ### Source code

-* https://github.com/owncloud/mirall
+Tehe ownCloud Desktop Client is developed in Git. Since Git makes it easy to
+fork and improve the source code and to adapt it to your need, many copies
+can be found on the Internet, in particular on GitHub. However, the
+authoritative repository maintained by the developers is located at
+https://github.com/owncloud/client.

 ## Building the source code

-Please refer to doc/building.rst, or
-[Building the Client](http://doc.owncloud.org/desktop/1.5/building.html)
-in the ownCloud client manual.
+[Building the Client](http://doc.owncloud.org/desktop/1.7/building.html)
+in the ownCloud Desktop Client manual.

-## Authors
+## Maintainers and Contributors
+
+The maintainers of this repository are:

-* Duncan Mac-Vicar P. <duncan@kde.org> (original Mirall author)
 * Klaas Freitag <freitag@owncloud.com>
 * Daniel Molkentin <danimo@owncloud.com>
+* Markus Goetz <guruz@owncloud.com>
+* Olivier Goffart <ogoffart@owncloud.com>
+
+ownCloud Desktop Client is developed by the ownCloud community and receives
+patches from a variety of authors.
+
+## Reporting issues and contributing
+
+If you find any bugs or have any suggestion for improvement, please
+file an issue at https://github.com/owncloud/client/issues. Do not
+contact the authors directly by mail, as this increases the chance
+of your report being lost.
+
+If you created a patch, please submit a [Pull
+Request](https://github.com/owncloud/client/pulls). For non-trivial
+patches, we need you to sign the [Contributor
+Agreement](https://owncloud.org/contribute/agreement) before
+we can accept your patch.
+
+If you want to contact us, e.g. before starting a more complex feature,
+you can join us at
+[#owncloud-client-dev](irc://irc.freenode.net/#owncloud-client-dev).

 ## License

--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,5 +1,5 @@
 set( MIRALL_VERSION_MAJOR 1 )
-set( MIRALL_VERSION_MINOR 7 )
+set( MIRALL_VERSION_MINOR 8 )
 set( MIRALL_VERSION_PATCH 0 )
 set( MIRALL_SOVERSION 0 )

--- a/admin/osx/CMakeLists.txt
+++ b/admin/osx/CMakeLists.txt
@@ -1,3 +1,16 @@

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

 def QueryQMake(attrib):
-    return subprocess.check_output(['qmake', '-query', attrib]).rstrip('\n')
+    return subprocess.check_output([qmake_path, '-query', attrib]).rstrip('\n')

 FRAMEWORK_SEARCH_PATH=[
    '/Library/Frameworks',
@@ -33,7 +33,6 @@ FRAMEWORK_SEARCH_PATH=[
 LIBRARY_SEARCH_PATH=['/usr/local/lib', '.']

 QT_PLUGINS = [
-    'accessible/libqtaccessiblewidgets.dylib',
    'sqldrivers/libqsqlite.dylib',
    'platforms/libqcocoa.dylib',
    'imageformats/libqgif.dylib',
@@ -68,14 +67,18 @@ class CouldNotFindQtPluginError(Error):
 class CouldNotFindScriptPluginError(Error):
  pass

-if len(sys.argv) < 2:
-  print 'Usage: %s <bundle.app>' % sys.argv[0]
+class CouldNotFindFrameworkError(Error):
+  pass
+
+if len(sys.argv) < 3:
+  print 'Usage: %s <bundle.app> <path-to-qmake>' % sys.argv[0]
  exit()

 def is_exe(fpath):
  return os.path.isfile(fpath) and os.access(fpath, os.X_OK)

 bundle_dir = sys.argv[1]
+qmake_path = sys.argv[2]

 bundle_name = os.path.basename(bundle_dir).split('.')[0]

@@ -246,8 +249,10 @@ def CopyFramework(path):
  parts = path.split(os.sep)
  print "CopyFramework:", path
  for i, part in enumerate(parts):
-    if re.match(r'\w+\.framework', part):
+    matchObj = re.match(r'(\w+\.framework)', part)
+    if matchObj:
      full_path = os.path.join(frameworks_dir, *parts[i:-1])
+      framework = matchObj.group(1)
      break
  args = ['mkdir', '-p', full_path]
  commands.append(args)
@@ -255,12 +260,13 @@ def CopyFramework(path):
  commands.append(args)
  args = ['chmod', 'u+w', os.path.join(full_path, parts[-1])]
  commands.append(args)
+  args = ['chmod', 'u+w', os.path.join(frameworks_dir, framework, "Resources")]
+  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]
+    args = ['cp', '-r', info_plist, os.path.join(frameworks_dir, framework, "Resources")]
    commands.append(args)
-
  return os.path.join(full_path, parts[-1])

 def FixId(path, library_name):
--- a/admin/osx/macosx.pkgproj
+++ b/admin/osx/macosx.pkgproj
@@ -471,13 +471,18 @@
 			</dict>
 			<key>PACKAGE_SCRIPTS</key>
 			<dict>
-				<key>POSTINSTALL_PATH</key>
-				<dict/>
-				<key>PREINSTALL_PATH</key>
-				<dict/>
-				<key>RESOURCES</key>
-				<array/>
-			</dict>
+                 <key>POSTINSTALL_PATH</key>
+                 <dict/>
+                 <key>PREINSTALL_PATH</key>
+                 <dict>
+                         <key>PATH</key>
+                         <string>@CMAKE_CURRENT_BINARY_DIR@/pre_install.sh</string>
+                         <key>PATH_TYPE</key>
+                         <integer>0</integer>
+                 </dict>
+                 <key>RESOURCES</key>
+                 <array/>
+         </dict>
 			<key>PACKAGE_SETTINGS</key>
 			<dict>
 				<key>AUTHENTICATION</key>
@@ -485,13 +490,13 @@
 				<key>CONCLUSION_ACTION</key>
 				<integer>0</integer>
 				<key>IDENTIFIER</key>
-				<string>com.ownCloud.client</string>
+				<string>@APPLICATION_REV_DOMAIN_INSTALLER@</string>
 				<key>NAME</key>
-				<string>ownCloud Client</string>
+				<string>@APPLICATION_NAME@</string>
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.6.2</string>
+				<string>@MIRALL_VERSION_FULL@</string>
 			</dict>
 			<key>UUID</key>
 			<string>7D7219B7-1897-48C3-8533-842BDEC46F71</string>
@@ -793,7 +798,7 @@
 													<key>GID</key>
 													<integer>0</integer>
 													<key>PATH</key>
-													<string>Library/ScriptingAdditions/OwnCloudFinder.osax/Contents</string>
+													<string>Library/ScriptingAdditions/SyncStateFinder.osax/Contents</string>
 													<key>PATH_TYPE</key>
 													<integer>3</integer>
 													<key>PERMISSIONS</key>
@@ -807,7 +812,7 @@
 											<key>GID</key>
 											<integer>0</integer>
 											<key>PATH</key>
-											<string>OwnCloudFinder.osax</string>
+											<string>SyncStateFinder.osax</string>
 											<key>PATH_TYPE</key>
 											<integer>0</integer>
 											<key>PERMISSIONS</key>
@@ -1019,7 +1024,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.6.2</string>
+				<string>@MIRALL_VERSION_FULL@</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
@@ -1041,7 +1046,7 @@
 			ZW50LVN0eWxlLVR5cGUiIGNvbnRlbnQ9InRleHQvY3NzIj4KPHRp
 			dGxlPjwvdGl0bGU+CjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29u
 			dGVudD0iQ29jb2EgSFRNTCBXcml0ZXIiPgo8bWV0YSBuYW1lPSJD
-			b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjExMzguNTEiPgo8c3R5bGUg
+			b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjEzNDMuMTQiPgo8c3R5bGUg
 			dHlwZT0idGV4dC9jc3MiPgo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5
 			Pgo8L2JvZHk+CjwvaHRtbD4K
 			</data>
@@ -1054,13 +1059,13 @@
 				<integer>6</integer>
 				<key>BACKGROUND_PATH</key>
 				<dict>
-				<key>PATH</key>
-				<string>./@APPLICATION_EXECUTABLE@.app/Contents/Resources/owncloud_logo_blue.png</string>
-				<key>PATH_TYPE</key>
-				<integer>3</integer>
+					<key>PATH</key>
+					<string>@MAC_INSTALLER_BACKGROUND_FILE@</string>
+					<key>PATH_TYPE</key>
+					<integer>0</integer>
 				</dict>
 				<key>CUSTOM</key>
-				<integer>1</integer>
+				<integer>@MAC_INSTALLER_DO_CUSTOM_BACKGROUND@</integer>
 				<key>SCALING</key>
 				<integer>0</integer>
 			</dict>
@@ -1213,7 +1218,7 @@
 						<key>LANGUAGE</key>
 						<string>English</string>
 						<key>VALUE</key>
-						<string>ownCloud Client</string>
+						<string>@APPLICATION_NAME@ Client</string>
 					</dict>
 				</array>
 			</dict>
@@ -1413,9 +1418,9 @@
 				</dict>
 			</array>
 			<key>NAME</key>
-			<string>ownCloud Installer</string>
+			<string>@APPLICATION_NAME@ Installer</string>
 			<key>REFERENCE_FOLDER_PATH</key>
-			<string>/Users/mackie/install</string>
+			<string>@CMAKE_INSTALL_DIR@</string>
 		</dict>
 	</dict>
 	<key>TYPE</key>
--- a/admin/osx/pre_install.sh.cmake
+++ b/admin/osx/pre_install.sh.cmake
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# kill the old version. see issue #2044
+killall @APPLICATION_EXECUTABLE@
+
+# Unload the Finder plugin. see issue #2105
+killall Finder
+
--- a/admin/osx/sign_app.sh
+++ b/admin/osx/sign_app.sh
@@ -5,26 +5,6 @@
 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:
--- a/admin/win/Toolchain-mingw32-openSUSE.cmake
+++ b/admin/win/Toolchain-mingw32-openSUSE.cmake
@@ -22,8 +22,8 @@ SET(QMAKESPEC               win32-g++-cross)

 # dirs
 SET(QT_LIBRARY_DIR          /usr/${MINGW_PREFIX}/bin)
-SET(QT_PLUGINS_DIR          ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins)
-SET(QT_MKSPECS_DIR          ${CMAKE_FIND_ROOT_PATH}/share/qt4/mkspecs)
+SET(QT_PLUGINS_DIR          ${CMAKE_FIND_ROOT_PATH}/lib/qt5/plugins)
+SET(QT_MKSPECS_DIR          ${CMAKE_FIND_ROOT_PATH}/share/qt5/mkspecs)
 SET(QT_QT_INCLUDE_DIR       ${CMAKE_FIND_ROOT_PATH}/include)

 # qt tools
--- a/admin/win/nsi/README.md
+++ b/admin/win/nsi/README.md
@@ -2,9 +2,9 @@

 ## Introduction

-Translations on transifex: http://www.transifex.com/projects/p/owncloud/resource/mirall-wininstaller/
+Translations on transifex: http://www.transifex.com/projects/p/owncloud/resource/client-nsis/

-Daily sync job: https://ci.owncloud.org/view/translation-sync/job/translation-sync-mirall-wininstaller/
+Daily sync job: https://ci.owncloud.org/view/translation-sync/job/translation-sync-client-nsis/

 ## How to add a new translation string?

--- a/admin/win/nsi/l10n/.tx/config
+++ b/admin/win/nsi/l10n/.tx/config
@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com

-[owncloud.mirall-wininstaller]
+[owncloud.client-nsis]
 host = https://www.transifex.com
 source_file = pofiles/messages.pot
 source_lang = en
--- a/admin/win/nsi/l10n/Basque.nsh
+++ b/admin/win/nsi/l10n/Basque.nsh
@@ -1,46 +1,46 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Erakutsi bertsio-berritze oharrak"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Gelditu beharreko ${APPLICATION_EXECUTABLE} prozesua(k) aurkitu dira.$\nNahi duzu instalatzaileak zure partetik hauek gelditzea?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "${APPLICATION_EXECUTABLE} prozesuak hiltzen."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "kill prozesua ez da aurkitu!"
+StrCpy $PageReinstall_NEW_Field_1 "${APPLICATION_NAME}ren bertsio zaharrago bat instalatuta dago. Aholkatzen da hau desinstalatzea berria instalatu baino lehen. Hautatu nahi duzun aukera eta sakatu Hurrengoa jarraitzeko."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstalatu instalatu baino lehen"
 StrCpy $PageReinstall_NEW_Field_3 "Ez desinstalatu"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Dagoeneko Instalatuta"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Hautatu nola nahi duzun ${APPLICATION_NAME} instalatzea."
+StrCpy $PageReinstall_OLD_Field_1 "${APPLICATION_NAME}ren bertsio berriago bat instalatuta dago! Ez da aholkatzen bertsio zaharrago bat instalatzea. Benetan bertsio zaharrago hau instalatu nahi baduzu, hobe da lehenengo bertsio berria desinstalatzea. Hautatu nahi duzun aukera eta sakatu Hurrengoa jarraitzeko."
 StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} dagoeneko instalatuta dago.\nHautatu zer operazio egin nahi duzu eta klikatu Hurrengoa jarraitzeko."
 StrCpy $PageReinstall_SAME_Field_2 "Gehitu/Berrinstalatu osagaiak"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalatu ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalatu ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Hautatu zer mantenu aukera egin nahi duzun."
+StrCpy $SEC_APPLICATION_DETAILS "${APPLICATION_NAME} ezinbestekoak instalatzen."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Windows Explorerekin Integrazioa"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Windows Explorerekin Integrazioa Instalatzen"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Hasierako Menuko Lasterbidea"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Hasierako Menuan ${APPLICATION_NAME}rako Abiarazle bizkorra sortzen."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Mahaigaineko Lasterbidea"
 StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Mahaigaineko Lasterbideak Sortzen"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Abiarazle Bizkorreko Lasterbidea"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Abiarazle Bizkorreko Lasterbidea Sortzen"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} ezinbestekoak."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} lasterbidea."
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "${APPLICATION_NAME}rako mahaigaineko lasterbidea."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "${APPLICATION_NAME}erako Abiarazle Bizkorreko Lasterbidea."
 StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Ezabatu ${APPLICATION_NAME}en datuen karpeta zure ordenagailutik."
 StrCpy $UNINSTALLER_APPDATA_LABEL_1 "${APPLICATION_NAME}en datuen karpeta ezabatu nahi duzu?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Utzi markatu gabe datuen karpeta uzteko edo markatu datuen karpeta ezabatzeko."
 StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Bai, ezabtu datu karpeta hau."
 StrCpy $UNINSTALLER_FILE_Detail "Desinstalatzailea idazten"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Instalatzaileko Erregistroko Giltzak idazten"
 StrCpy $UNINSTALLER_FINISHED_Detail "Bukatuta"
+StrCpy $UNINSTALL_MESSAGEBOX "Ez dirudi ${APPLICATION_NAME} '$INSTDIR'.$ direktorioan instalatuta dagoenik.\n$\nJarraitu hala ere (ez da aholkatzen)?"
 StrCpy $UNINSTALL_ABORT "Desinstalazioak erabiltzaileak bertan behera utzi du"
 StrCpy $INIT_NO_QUICK_LAUNCH "Abiarazle Bizkorreko Lasterbidea (E/E)"
+StrCpy $INIT_NO_DESKTOP "Mahaigaineko Lasterbidea (dagoena berridazten du)"
 StrCpy $UAC_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
@@ -42,5 +42,5 @@ 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"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integration for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing Integration for Windows Explorer"
--- a/admin/win/nsi/l10n/Czech.nsh
+++ b/admin/win/nsi/l10n/Czech.nsh
@@ -15,8 +15,8 @@ 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_SHELL_EXT_SECTION "Integrace do průzkumníka Windows"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalace integrace do průzkumníka Windows"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Zástupce v Nabídce Start"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Přidávám zástupce pro ${APPLICATION_NAME} do Nabídky Start."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Zástupce na ploše"
--- a/admin/win/nsi/l10n/Dutch.nsh
+++ b/admin/win/nsi/l10n/Dutch.nsh
@@ -15,8 +15,8 @@ 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_SHELL_EXT_SECTION "Integratie binnen Windows Verkenner"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installeren Integratie binnen Windows Verkenner"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Startmenu snelkoppeling"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Toevoegen snelkoppeling voor ${APPLICATION_NAME} aan het Startmenu."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Werkblad snelkoppeling"
--- a/admin/win/nsi/l10n/English.nsh
+++ b/admin/win/nsi/l10n/English.nsh
@@ -15,8 +15,8 @@ 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_SHELL_EXT_SECTION "Integration for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing Integration for Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start Menu Program Shortcut"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Adding shortcut for ${APPLICATION_NAME} to the Start Menu."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Desktop Shortcut"
--- a/admin/win/nsi/l10n/Estonian.nsh
+++ b/admin/win/nsi/l10n/Estonian.nsh
@@ -42,5 +42,5 @@ StrCpy $INIT_INSTALLER_RUNNING "Paigaldaja on juba k
 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"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integration for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing Integration for Windows Explorer"
--- a/admin/win/nsi/l10n/Farsi.nsh
+++ b/admin/win/nsi/l10n/Farsi.nsh
@@ -24,8 +24,8 @@ 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_SHELL_EXT_SECTION "Integration for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing Integration for Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start Menu Program Shortcut"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Adding shortcut for ${APPLICATION_NAME} to the Start Menu."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creating Quick Launch Shortcut"
--- a/admin/win/nsi/l10n/Finnish.nsh
+++ b/admin/win/nsi/l10n/Finnish.nsh
@@ -15,8 +15,8 @@ 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_SHELL_EXT_SECTION "Integraatio Windows Exploreriin"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Asennetaan integraatiota Windows Exploreriin"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Käynnistä-valikon pikakuvake"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Lisätään ${APPLICATION_NAME}-pikakuvake Käynnistä-valikkoon."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Työpöydän pikakuvake"
@@ -31,16 +31,16 @@ StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Poista ${APPLICATION_NAME}-datakansio tiet
 StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Haluatko varmasti poistaa ${APPLICATION_NAME}-datakansion?"
 StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Jätä valinta ruksimatta säilyttääksesti datakansion myöhempää käyttöä varten tai täytä ruksi jos haluat poistaa datakansion ja siinä olevat tiedostot."
 StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Kyllä, poista tämä datakansio."
+StrCpy $UNINSTALLER_FILE_Detail "Kirjoitetaan poisto-ohjelmaa"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Kirjoitetaan asennusohjelman rekisteriavaimia"
 StrCpy $UNINSTALLER_FINISHED_Detail "Valmis"
 StrCpy $UNINSTALL_MESSAGEBOX "Vaikuttaa siltä että sovellus ${APPLICATION_NAME} on asennettu kansioon '$INSTDIR'.\n\nHaluatko jatkaa tästä huolimatta (ei suositeltavaa)?"
 StrCpy $UNINSTALL_ABORT "Poistaminen keskeytettiin käyttäjän toimesta"
+StrCpy $INIT_NO_QUICK_LAUNCH "Pikakäynnistyksen pikakuvake (-)"
 StrCpy $INIT_NO_DESKTOP "Työpöydän pikakuvake (korvaa nykyinen)"
+StrCpy $UAC_ERROR_ELEVATE "Kohottaminen ei onnistu, virhe:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Tämä asennusohjelma vaatii ylläpitäjän oikeudet, yritä uudelleen."
 StrCpy $INIT_INSTALLER_RUNNING "Asennusohjelma on jo käynnissä."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Tämä poisto-ohjelma vaatii ylläpitäjän oikeudet, yritä uudelleen."
 StrCpy $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
@@ -1,26 +1,28 @@
 # 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 $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Afficher les notes de version"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Le(s) processus en cours d’exécution ${APPLICATION_EXECUTABLE} doit (doivent) être stoppé(s) afin de poursuivre.$\nVoulez-vous que le programme d’installation s’en charge pour vous ?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Fermeture des processus ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Le processus à stopper n'a pas été trouvé !"
+StrCpy $PageReinstall_NEW_Field_1 "Une ancienne version de ${APPLICATION_NAME} est installée sur votre système. Il est recommandé de désinstaller cette version avant de continuer. Sélectionnez l'opération que vous voulez exécuter et cliquez sur Suivant pour continuer."
 StrCpy $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_NEW_MUI_HEADER_TEXT_TITLE "Déjà installé"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Choisissez comment 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_1 "${APPLICATION_NAME} ${VERSION} est déjà installé.\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 $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choisir l'opération de maintenance à effectuer."
+StrCpy $SEC_APPLICATION_DETAILS "Installation des essentiels de ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Intégration à l'Explorateur Windows"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installation de l'intégration à l'Explorateur Windows..."
 StrCpy $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_START_MENU_DetailPrint "Ajout d'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_DESKTOP_DetailPrint "Création d'un raccourci sur le 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_QUICK_LAUNCH_DetailPrint "Création d'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}."
@@ -32,15 +34,13 @@ 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_MESSAGEBOX "Il semble que ${APPLICATION_NAME} ne soit pas installé 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_QUICK_LAUNCH "Raccourci de lancement rapide (non disponible)"
 StrCpy $INIT_NO_DESKTOP "Raccourci bureau (remplace l’existant)"
-StrCpy $UAC_ERROR_ELEVATE "Echec d'élévation, erreur :"
+StrCpy $UAC_ERROR_ELEVATE "Échec d'élévation, erreur :"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Cet installateur requiert les droits administrateur, essayez à nouveau"
 StrCpy $INIT_INSTALLER_RUNNING "Une installation est déjà en cours."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Ce désinstallateur requiert les droits administrateur, essayez à nouveau"
 StrCpy $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
@@ -3,7 +3,7 @@ StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Amosar as notas de publicaci
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Atopáronse procesos ${APPLICATION_EXECUTABLE} que teñen que ser detidos.$\nQuere que sexa o instalador quen o(s) deteña?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Matando os procesos ${APPLICATION_EXECUTABLE}."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Non se atopou o proceso para matalo!"
-StrCpy $PageReinstall_NEW_Field_1 "No seu sistema hai instalada unha versión anterior 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_1 "No seu sistema hai instalada unha versión anterior de ${APPLICATION_NAME}. Recomendámoslle que desinstale a versión actual antes de instalar. Seleccione a operación que quere realizar e prema en Seguinte para continuar."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
 StrCpy $PageReinstall_NEW_Field_3 "Non desinstalar"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Xa instalado"
@@ -15,10 +15,10 @@ 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_SHELL_EXT_SECTION "Integración con Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalando a integración con Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso directo ao programa no menú de inicio"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Engadindo o acceso directo ao ${APPLICATION_NAME} no menú de inicio"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Engadindo o acceso directo a ${APPLICATION_NAME} no menú de inicio"
 StrCpy $OPTION_SECTION_SC_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"
--- a/admin/win/nsi/l10n/German.nsh
+++ b/admin/win/nsi/l10n/German.nsh
@@ -15,8 +15,8 @@ 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_SHELL_EXT_SECTION "Integration in den Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installiere Integration in den Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Installiere Verknüpfung im Programmmenü"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Füge Verknüpfung für ${APPLICATION_NAME} dem Startmenü hinzu."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Desktop-Verknüpfung"
@@ -38,7 +38,7 @@ StrCpy $UNINSTALL_MESSAGEBOX "Es scheint, als ob ${APPLICATION_NAME} nicht im Ve
 StrCpy $UNINSTALL_ABORT "Deinstallation vom Benutzer abgebrochen"
 StrCpy $INIT_NO_QUICK_LAUNCH "Schnellstart-Verknüpfung (Nicht verfügbar)"
 StrCpy $INIT_NO_DESKTOP "Desktop-Verknüpfung (überschreibt vorhandene)"
-StrCpy $UAC_ERROR_ELEVATE "Kann Rechte nicht erhöhen, Fehler:"
+StrCpy $UAC_ERROR_ELEVATE "Rechte können nicht erhöht werden, 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."
--- a/admin/win/nsi/l10n/Greek.nsh
+++ b/admin/win/nsi/l10n/Greek.nsh
@@ -15,8 +15,8 @@ StrCpy $PageReinstall_SAME_Field_3 "
 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_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 "Συντόμευση επιφάνειας εργασίας"
--- a/admin/win/nsi/l10n/Hungarian.nsh
+++ b/admin/win/nsi/l10n/Hungarian.nsh
@@ -24,8 +24,8 @@ StrCpy $PageReinstall_OLD_Field_1 "A newer version of ${APPLICATION_NAME} is alr
 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_SHELL_EXT_SECTION "Integration for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing Integration for Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start Menu Program Shortcut"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Adding shortcut for ${APPLICATION_NAME} to the Start Menu."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Desktop Shortcut"
--- a/admin/win/nsi/l10n/Italian.nsh
+++ b/admin/win/nsi/l10n/Italian.nsh
@@ -15,8 +15,8 @@ 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_SHELL_EXT_SECTION "Integrazione con Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installazione dell'integrazione con Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Scorciatoia di programma menu Start"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Aggiunta della scorciatoia per ${APPLICATION_NAME} al menu Start."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Scorciatoia del desktop"
--- a/admin/win/nsi/l10n/Japanese.nsh
+++ b/admin/win/nsi/l10n/Japanese.nsh
@@ -15,8 +15,8 @@ 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_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 "デスクトップショートカット"
--- a/admin/win/nsi/l10n/Polish.nsh
+++ b/admin/win/nsi/l10n/Polish.nsh
@@ -15,8 +15,8 @@ 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_SHELL_EXT_SECTION "integracja z Eksploratorem Windows"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalowanie Integracji z Eksploratorem Windows"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Skrót w Menu Start"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Dodaję skrót ${APPLICATION_NAME} w Menu Start."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Skrót na Pulpicie"
--- a/admin/win/nsi/l10n/Portuguese.nsh
+++ b/admin/win/nsi/l10n/Portuguese.nsh
@@ -1,22 +1,22 @@
 # 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 $ConfirmEndProcess_MESSAGEBOX_TEXT "Processos(s) ${APPLICATION_EXECUTABLE} em execução. Estes processos precisam de ser interrompidos.$\\nDeseja que o instalador os termine automaticamente?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "A terminar os processos ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Não foi encontrado o processo a terminar!"
+StrCpy $PageReinstall_NEW_Field_1 "Uma versão antiga de ${APPLICATION_NAME} está instalada no 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 desinstalar"
+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 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_OLD_Field_1 "Uma versão mais recente do ${APPLICATION_NAME}  já está instalada! Não é recomendada a instalação de uma versão mais antiga. Se realmente deseja instalar esta versão, aconselha-se a desinstalação da 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 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 $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Escolha a opção de manutenção a realizar."
 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_SHELL_EXT_SECTION "Integração para Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "A instalar integração para Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Atalho  do progama no Menu 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"
@@ -40,7 +40,7 @@ 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 $INIT_INSTALLER_RUNNING "O instalador já está em execução."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Este desinstalador requer permissões de administrador, tente novamente"
+StrCpy $INIT_UNINSTALLER_RUNNING "O desinstalador já está em execução."
 StrCpy $SectionGroup_Shortcuts "Atalhos"
--- a/admin/win/nsi/l10n/PortugueseBR.nsh
+++ b/admin/win/nsi/l10n/PortugueseBR.nsh
@@ -15,8 +15,8 @@ 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_SHELL_EXT_SECTION "Integração para Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalação de Integração para Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Menu Iniciar Programa Atalho"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Adicionando atalho para ${APPLICATION_NAME} ao Menu Iniciar."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Atalho Desktop"
--- a/admin/win/nsi/l10n/Russian.nsh
+++ b/admin/win/nsi/l10n/Russian.nsh
@@ -1,46 +1,46 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Показать примечания к выпуску"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Обнаружены процес(сы) ${APPLICATION_EXECUTABLE}, которые должны быть остановлены.$\nХотите программа установки сделает это самостоятельно?"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Обнаружен процесс ${APPLICATION_EXECUTABLE}, который требуется остановить.$\nВы хотите чтобы программа установки сделала это самостоятельно?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Завершение процессов ${APPLICATION_EXECUTABLE}."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Не найдены процессы, которые нужно завершить!"
-StrCpy $PageReinstall_NEW_Field_1 "Обнаружена более старая версия ${APPLICATION_NAME}. Рекомендуется удалить её перед установкой. Выберите желаемое действие и нажмите $\"Далее$\"."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Процессы для завершения не найдены!"
+StrCpy $PageReinstall_NEW_Field_1 "Обнаружена более старая версия ${APPLICATION_NAME}. Рекомендуется удалить её перед установкой. Выберите желаемое действие и нажмите Далее для продолжения."
 StrCpy $PageReinstall_NEW_Field_2 "Удалить перед установкой"
 StrCpy $PageReinstall_NEW_Field_3 "Не устанавливать"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Уже установлено"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Выберите, как вы хотите установить  ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "Новая версия ${APPLICATION_NAME} уже установлена! Не рекомендуется устанавливать старую версию. Если вы действительно хотите, чтобы устанавливать старую версию, лучше удалить текущую версию. Выберите операцию, которую необходимо выполнить, и нажмите Далее, чтобы продолжить."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} уже установлена.\nВыберите операцию, которую необходимо выполнить, и нажмите Далее, чтобы продолжить."
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Выберите, как вы хотите установить ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "Новая версия ${APPLICATION_NAME} уже установлена! Не рекомендуется устанавливать старую версию. Если вы действительно хотите установить эту старую версию, то сначала лучше удалить текущую версию. Выберите желаемое действие и нажмите Далее для продолжения."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} уже установлена.\nВыберите желаемое действие и нажмите Далее для продолжения."
 StrCpy $PageReinstall_SAME_Field_2 "Добавить/Переустановить компоненты"
 StrCpy $PageReinstall_SAME_Field_3 "Удалить ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Удалить ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Выберите опцию обслуживания для исполнения."
-StrCpy $SEC_APPLICATION_DETAILS "Установка зависимостей приложения ${APPLICATION_NAME}"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Значки статуса для проводника Windows"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Установка значков статуса для проводника Windows"
+StrCpy $SEC_APPLICATION_DETAILS "Установка базовых компонентов ${APPLICATION_NAME}"
+StrCpy $OPTION_SECTION_SC_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_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_APPDATA_SUBTITLE "Удалить каталог данных ${APPLICATION_NAME} с вашего компьютера."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Вы действительно хотите удалить каталог с данными ${APPLICATION_NAME} ?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Оставьте неактивным для сохранения каталога с данными для последующего использования или отметьте для удаления."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Да, удалить этот каталог с данными."
+StrCpy $UNINSTALLER_FILE_Detail "Сохранение деинсталлятора"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Запись ключей реестра установщика"
 StrCpy $UNINSTALLER_FINISHED_Detail "Завершено"
-StrCpy $UNINSTALL_MESSAGEBOX "Скорее всего, приложение ${APPLICATION_NAME} уже установлено в директорию '$INSTDIR'.\nВсе равно продолжить (не рекомендуется)?"
+StrCpy $UNINSTALL_MESSAGEBOX "Похоже, что приложение ${APPLICATION_NAME} не установлено в каталог '$INSTDIR'.\nВсе равно продолжить (не рекомендуется)?"
 StrCpy $UNINSTALL_ABORT "Удаление отменено пользователем"
-StrCpy $INIT_NO_QUICK_LAUNCH "Ярлык быстрого запуска (недоступен)"
-StrCpy $INIT_NO_DESKTOP "Ярлык на рабочем столе (перезаписать существующий)"
-StrCpy $UAC_ERROR_ELEVATE "Невозможно поднять, ошибка:"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Для установки необходимы права администратора, попробуйте ещё раз."
+StrCpy $INIT_NO_QUICK_LAUNCH "Ярлык быстрого запуска (не доступен)"
+StrCpy $INIT_NO_DESKTOP "Ярлык на рабочем столе (перезапись существующего)"
+StrCpy $UAC_ERROR_ELEVATE "Невозможно повысить привилегии, ошибка:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Этому установщику требуются права администратора, попробуйте ещё раз"
 StrCpy $INIT_INSTALLER_RUNNING "Установщик уже запущен."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Этот деинсталятор требует права администратора, попытайтесь ещё"
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Этому деинсталлятору требуются права администратора, попробуйте ещё раз"
 StrCpy $INIT_UNINSTALLER_RUNNING "Программа удаления уже выполняется."
 StrCpy $SectionGroup_Shortcuts "Ярлыки"
--- a/admin/win/nsi/l10n/SimpChinese.nsh
+++ b/admin/win/nsi/l10n/SimpChinese.nsh
@@ -15,6 +15,8 @@ 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 "桌面快捷方式"
@@ -42,5 +44,3 @@ 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
@@ -15,8 +15,8 @@ StrCpy $PageReinstall_SAME_Field_3 "Odin
 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_SHELL_EXT_SECTION "Integrácia do Windows Explorera"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Inštalaácia integrácie do Windows Explorera"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Zástupca programu v menu Štart"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Prida<EFBFBD> zástupcu pre ${APPLICATION_NAME} do menu Štart."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Zástupca na ploche"
--- a/admin/win/nsi/l10n/Slovenian.nsh
+++ b/admin/win/nsi/l10n/Slovenian.nsh
@@ -15,8 +15,8 @@ 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_SHELL_EXT_SECTION "Podpora programa Windows raziskovalca"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Nameščanje podpore za program Windows Raziskovalec"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Bližnjica programa v programskem meniju"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Poteka dodajanje bližnjice programa ${APPLICATION_NAME} v programski meni."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Bližnica namizja"
--- a/admin/win/nsi/l10n/Spanish.nsh
+++ b/admin/win/nsi/l10n/Spanish.nsh
@@ -2,12 +2,12 @@
 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 $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "¡Proceso para 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_NEW_MUI_HEADER_TEXT_SUBTITLE "Elija cómo quiere instalar ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Una nueva versión de ${APPLICATION_NAME} ya está instalada. No es recomendable instalar una versión anterior. Si realmente quiere instalar esta versión anterior, es mejor que desinstale la versión actual primero. Seleccione la operación que desea realizar y pulse 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"
@@ -15,32 +15,32 @@ 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_SHELL_EXT_SECTION "Integración para Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalando la integración para Windows Explorer"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso directo al programa Menú de Inicio"
 StrCpy $OPTION_SECTION_SC_START_MENU_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_DESKTOP_DetailPrint "Creando accesos directos de escritorio"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Atajo de accceso 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_SUBTITLE "Elimine la carpeta de datos de ${APPLICATION_NAME} del computador."
 StrCpy $UNINSTALLER_APPDATA_LABEL_1 "¿Desea eliminar la carpeta de datos de ${APPLICATION_NAME}?"
-StrCpy $UNINSTALLER_APPDATA_LABEL_2 "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_APPDATA_LABEL_2 "Déjelo sin marcar para mantener la carpeta de datos para uso posterior o márquelo para eliminar la carpeta de datos."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Sí, elimine esta carpeta de datos."
+StrCpy $UNINSTALLER_FILE_Detail "Escribiendo desinstalador"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Escribiendo claves en el registro del instalador"
 StrCpy $UNINSTALLER_FINISHED_Detail "Terminado"
 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_QUICK_LAUNCH "Atajo de inicio 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 $UAC_ERROR_ELEVATE "No se ha podido elevar, error:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "El instalador requiere acceso administrativo, inténtelo de nuevo"
 StrCpy $INIT_INSTALLER_RUNNING "El instalador ya se encuentra en ejecución"
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "El desinstalador requiere acceso administrativo, intente de nuevo"
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "El desinstalador requiere acceso administrativo, inténtelo de nuevo"
 StrCpy $INIT_UNINSTALLER_RUNNING "El desinstalador ya se encuentra en ejecución."
-StrCpy $SectionGroup_Shortcuts "Accesos Directos"
+StrCpy $SectionGroup_Shortcuts "Accesos directos"
--- a/admin/win/nsi/l10n/SpanishInternational.nsh
+++ b/admin/win/nsi/l10n/SpanishInternational.nsh
@@ -35,8 +35,8 @@ 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_SHELL_EXT_SECTION "Integration for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing Integration 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."
--- a/admin/win/nsi/l10n/Swedish.nsh
+++ b/admin/win/nsi/l10n/Swedish.nsh
@@ -15,8 +15,6 @@ 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"
@@ -41,6 +39,8 @@ 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 $UAC_UNINSTALLER_REQUIRE_ADMIN "Detta avinstallationsprogram  kräver administratörsrättigheter, försök igen"
 StrCpy $INIT_UNINSTALLER_RUNNING "Avinstallationsprogrammet körs redan."
 StrCpy $SectionGroup_Shortcuts "Genvägar"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integration for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing Integration for Windows Explorer"
--- a/admin/win/nsi/l10n/Turkish.nsh
+++ b/admin/win/nsi/l10n/Turkish.nsh
@@ -15,8 +15,8 @@ StrCpy $PageReinstall_SAME_Field_3 "${APPLICATION_NAME} uygulamas
 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_SHELL_EXT_SECTION "Windows Gezgini için tümleştirme"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Windows Gezgini için Tümleştirme Yükleme"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Başlat Menüsü Program Kısayolu"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "${APPLICATION_NAME} için Başlat Menüsü'ne kısayol ekleniyor."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Masaüstü Kısayolu"
--- a/admin/win/nsi/l10n/Ukrainian.nsh
+++ b/admin/win/nsi/l10n/Ukrainian.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/languages.nsh
+++ b/admin/win/nsi/l10n/languages.nsh
@@ -6,6 +6,7 @@
 !insertmacro MUI_LANGUAGE "SpanishInternational"
 !insertmacro MUI_LANGUAGE "Dutch"
 !insertmacro MUI_LANGUAGE "Hungarian"
+!insertmacro MUI_LANGUAGE "Ukrainian"
 !insertmacro MUI_LANGUAGE "French"
 !insertmacro MUI_LANGUAGE "Catalan"
 !insertmacro MUI_LANGUAGE "Russian"
--- a/admin/win/nsi/l10n/pofiles/messages.pot
+++ b/admin/win/nsi/l10n/pofiles/messages.pot
@@ -86,12 +86,12 @@ 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"
+msgid "Integration for Windows Explorer"
+msgstr "Integration for Windows Explorer"

 #. OPTION_SECTION_SC_SHELL_EXT_DetailPrint
-msgid "Installing status icons for Windows Explorer"
-msgstr "Installing status icons for Windows Explorer"
+msgid "Installing Integration for Windows Explorer"
+msgstr "Installing Integration for Windows Explorer"

 #. OPTION_SECTION_SC_START_MENU_SECTION
 msgid "Start Menu Program Shortcut"
--- a/2
+++ b/2
--- a/client.qrc
+++ b/client.qrc
@@ -1,19 +1,21 @@
 <RCC>
-    <qresource prefix="/mirall">
+    <qresource prefix="/client">
        <file>resources/dialog-close.png</file>
        <file>resources/dialog-ok.png</file>
        <file>resources/dialog-cancel.png</file>
-        <file>resources/folder-remote-32.png</file>
-        <file>resources/folder-remote.png</file>
        <file>resources/folder-sync.png</file>
-        <file>resources/folder-grey.png</file>
+        <file>resources/folder-sync@2x.png</file>
        <file>resources/task-ongoing.png</file>
        <file>resources/view-refresh.png</file>
-        <file>resources/warning-16.png</file>
+        <file>resources/warning.png</file>
+        <file>resources/warning@2x.png</file>
        <file>resources/settings.png</file>
        <file>resources/activity.png</file>
        <file>resources/network.png</file>
-	<file>resources/lock-http.png</file>
-	<file>resources/lock-https.png</file>
+        <file>resources/lock-http.png</file>
+        <file>resources/lock-http@2x.png</file>
+        <file>resources/lock-https.png</file>
+        <file>resources/lock-https@2x.png</file>
+        <file>resources/account.png</file>
    </qresource>
 </RCC>
--- a/cmake/modules/AddAppIconMacro.cmake
+++ b/cmake/modules/AddAppIconMacro.cmake
@@ -1,4 +1,4 @@
-SET(WINDRES_EXECUTABLE  ${CMAKE_RC_COMPILER})
+SET(WINDRES_EXECUTABLE_BASE  ${CMAKE_RC_COMPILER})

 # This macro is taken from kdelibs/cmake/modules/KDE4Macros.cmake.
 #
@@ -21,7 +21,7 @@ macro (KDE4_ADD_APP_ICON appsources pattern)
        else(NOT WINCE)
        find_program(PNG2ICO_EXECUTABLE NAMES png2ico PATHS ${HOST_BINDIR} NO_DEFAULT_PATH )
        endif(NOT WINCE)
-        find_program(WINDRES_EXECUTABLE NAMES windres)
+        find_program(WINDRES_EXECUTABLE NAMES ${WINDRES_EXECUTABLE_BASE})
        if(MSVC)
            set(WINDRES_EXECUTABLE TRUE)
        endif(MSVC)
--- a/cmake/modules/DefineCompilerFlags.cmake
+++ b/cmake/modules/DefineCompilerFlags.cmake
@@ -14,7 +14,8 @@ if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")

    # add -Wconversion ?
    # cannot be pedantic with sqlite3 directly linked
-    if (NOT CSYNC_STATIC_COMPILE_DIR)
+    # FIXME Can we somehow not use those flags for sqlite3.* but use them for the rest of csync?
+    if (NOT USE_OUR_OWN_SQLITE3)
        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")
--- a/cmake/modules/FindQt5Keychain.cmake
+++ b/cmake/modules/FindQt5Keychain.cmake
@@ -9,7 +9,12 @@
 #  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_path(QTKEYCHAIN_INCLUDE_DIR
+            NAMES
+              keychain.h
+            PATH_SUFFIXES
+              qt5keychain
+            )

 find_library(QTKEYCHAIN_LIBRARY
            NAMES
--- a/cmake/modules/FindQtKeychain.cmake
+++ b/cmake/modules/FindQtKeychain.cmake
@@ -9,7 +9,13 @@
 #  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_path(QTKEYCHAIN_INCLUDE_DIR
+            NAMES
+                keychain.h
+            PATH_SUFFIXES
+                qtkeychain
+    )
+

 find_library(QTKEYCHAIN_LIBRARY
            NAMES
--- a/cmake/modules/FindSQLite3.cmake
+++ b/cmake/modules/FindSQLite3.cmake
@@ -50,8 +50,18 @@ 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)
+if (APPLE OR WIN32)
+    set(USE_OUR_OWN_SQLITE3 TRUE)
+    set(SQLITE3_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/3rdparty/sqlite3)
+    set(SQLITE3_LIBRARIES "")
+    set(SQLITE3_SOURCE ${SQLITE3_INCLUDE_DIR}/sqlite3.c)
+    MESSAGE(STATUS "Using own sqlite3 from " ${SQLITE3_INCLUDE_DIR})
+else()
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(SQLite3 DEFAULT_MSG SQLITE3_LIBRARIES SQLITE3_INCLUDE_DIRS)
+endif()
+
+

 # 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/GetGitRevisionDescription.cmake
+++ b/cmake/modules/GetGitRevisionDescription.cmake
@@ -40,7 +40,7 @@ set(__get_git_revision_description YES)
 get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)

 function(get_git_head_revision _refspecvar _hashvar)
-	set(GIT_PARENT_DIR "${CMAKE_SOURCE_DIR}")
+	set(GIT_PARENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 	set(GIT_DIR "${GIT_PARENT_DIR}/.git")
 	while(NOT EXISTS "${GIT_DIR}")	# .git dir not found, search parent directories
 		set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
@@ -53,6 +53,13 @@ function(get_git_head_revision _refspecvar _hashvar)
 		endif()
 		set(GIT_DIR "${GIT_PARENT_DIR}/.git")
 	endwhile()
+	# check if this is a submodule
+	if(NOT IS_DIRECTORY ${GIT_DIR})
+		file(READ ${GIT_DIR} submodule)
+		string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule})
+		get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
+		get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE)
+	endif()
 	set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
 	if(NOT EXISTS "${GIT_DATA}")
 		file(MAKE_DIRECTORY "${GIT_DATA}")
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -9,6 +9,8 @@
 !define APPLICATION_LICENSE "@APPLICATION_LICENSE@"
 !define WIN_SETUP_BITMAP_PATH "@WIN_SETUP_BITMAP_PATH@"

+!define CRASHREPORTER_EXECUTABLE "@CRASHREPORTER_EXECUTABLE@"
+
 ;-----------------------------------------------------------------------------
 ; Some installer script options (comment-out options not required)
 ;-----------------------------------------------------------------------------
@@ -262,7 +264,7 @@ FunctionEnd
 !macro ConfirmEndProcess processName
   MessageBox MB_YESNO|MB_ICONEXCLAMATION \
     $ConfirmEndProcess_MESSAGEBOX_TEXT \
-     IDYES process_${processName}_kill IDNO process_${processName}_ended
+     /SD IDYES IDYES process_${processName}_kill IDNO process_${processName}_ended
   process_${processName}_kill:
      DetailPrint $ConfirmEndProcess_KILLING_PROCESSES_TEXT
      Processes::KillProcess ${processName}
@@ -383,20 +385,21 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
   ;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}\bin\lib${APPLICATION_SHORTNAME}sync.dll"
+   File "${BUILD_PATH}\bin\libocsync.dll"

-   File "${BUILD_PATH}\src\mirall_*.qm"
+   File "${BUILD_PATH}\src\gui\client*.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\qtbase_*.qm"
   File "${MING_SHARE}\qt5\translations\qtkeychain_*.qm"

+   ;Add crash reporter if it was built
+   File /nonfatal "${BUILD_PATH}/bin/${CRASHREPORTER_EXECUTABLE}.exe"
+
   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"
@@ -418,13 +421,17 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
   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"

+   ;QtWebKit dependencies
+   File "${QT_DLL_PATH}\Qt5Multimedia.dll"
+   File "${QT_DLL_PATH}\Qt5MultimediaWidgets.dll"
+   File "${QT_DLL_PATH}\Qt5Sensors.dll"
+
   ;Qt deps
   File "${MING_BIN}\libpng16-16.dll"
   File "${MING_BIN}\icudata53.dll"
@@ -441,21 +448,13 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
   File "${MING_BIN}\libstdc++-6.dll"
   File "${MING_BIN}\libwebp-4.dll"
   File "${MING_BIN}\libxslt-1.dll"
+   File "${MING_BIN}\libxml2-2.dll"
   File "${MING_BIN}\zlib1.dll"
-
-   ;QtSql and csync dep
   File "${MING_BIN}\libsqlite3-0.dll"

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

-   ;ownCloud plugin
-   File "${MING_BIN}\libintl-8.dll"
-   File "${MING_BIN}\libneon-27.dll"
-   File "${MING_BIN}\libproxy.dll"
-   File "${MING_BIN}\libmodman.dll"
-   File "${MING_BIN}\libxml2-2.dll"
-
   ;MinGW stuff
   File "${MING_BIN}\libgcc_s_sjlj-1.dll"
   File "${MING_BIN}\libstdc++-6.dll"
@@ -475,15 +474,21 @@ SectionEnd
      File "${BUILD_PATH}\vcredist_x64.exe"
      Call InstallRedistributables
      CreateDirectory "$INSTDIR\shellext"
+      !define LIBRARY_COM
+      !define LIBRARY_SHELL_EXTENSION
      ${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"
+         !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\x64\OCContextMenu_x64.dll" "$INSTDIR\shellext\OCContextMenu_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"
+         !insertmacro InstallLib REGDLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\Win32\OCContextMenu_x86.dll" "$INSTDIR\shellext\OCContextMenu_x86.dll" "$INSTDIR\shellext"
      ${Endif}
+      !undef LIBRARY_COM
+      !undef LIBRARY_SHELL_EXTENSION
   ${MementoSectionEnd}
 !endif

@@ -507,7 +512,9 @@ SectionGroup $SectionGroup_Shortcuts
      SetDetailsPrint textonly
      DetailPrint $OPTION_SECTION_SC_DESKTOP_DetailPrint
      SetDetailsPrint listonly
+      SetShellVarContext all
      CreateShortCut "$DESKTOP\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_EXECUTABLE}"
+      SetShellVarContext current
   ${MementoSectionEnd}
 !endif

@@ -516,8 +523,10 @@ SectionGroup $SectionGroup_Shortcuts
      SectionIn 1 2
      SetDetailsPrint textonly
      DetailPrint $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint
+      SetShellVarContext all
      SetDetailsPrint listonly
      CreateShortCut "$QUICKLAUNCH\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_EXECUTABLE}"
+      SetShellVarContext current
   ${MementoSectionEnd}
 !endif

@@ -639,15 +648,21 @@ Section Uninstall
      !define LIBRARY_COM
      !define LIBRARY_SHELL_EXTENSION
      ${If} ${HasSection} SEC_SHELL_EXT
+        DetailPrint "Uninstalling x64 overlay DLLs"
        !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"
+        !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCContextMenu_x64.dll"
+        !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCOverlays_x64.dll"
+        !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCUtil_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"
+        DetailPrint "Uninstalling x86 overlay DLLs"
+        !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCContextMenu_x86.dll"
+        !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCOverlays_x86.dll"
+        !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED "$INSTDIR\shellext\OCUtil_x86.dll"
      ${EndIf}
-   !endif
+      !undef LIBRARY_COM
+      !undef LIBRARY_SHELL_EXTENSION
+  !endif

   ;Start menu shortcut
   !ifdef OPTION_SECTION_SC_START_MENU
@@ -661,18 +676,22 @@ Section Uninstall
   ;Desktop shortcut.
   !ifdef OPTION_SECTION_SC_DESKTOP
      ${If} ${HasSection} SEC_DESKTOP
+         SetShellVarContext all
         ${If} ${FileExists} "$DESKTOP\${APPLICATION_NAME}.lnk"
            Delete "$DESKTOP\${APPLICATION_NAME}.lnk"
         ${EndIf}
+         SetShellVarContext current
      ${EndIf}
   !endif

   ;Quick Launch shortcut.
   !ifdef OPTION_SECTION_SC_QUICK_LAUNCH
      ${If} ${HasSection} SEC_QUICK_LAUNCH
+         SetShellVarContext all
         ${If} ${FileExists} "$QUICKLAUNCH\${APPLICATION_NAME}.lnk"
            Delete "$QUICKLAUNCH\${APPLICATION_NAME}.lnk"
         ${EndIf}
+         SetShellVarContext current
      ${EndIf}
   !endif

--- a/cmake/modules/QtVersionAbstraction.cmake
+++ b/cmake/modules/QtVersionAbstraction.cmake
@@ -8,7 +8,7 @@ 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")
+    message(STATUS "Search for Qt5 was disabled by option BUILD_WITH_QT4")
 else( BUILD_WITH_QT4 )
    find_package(Qt5Core QUIET)
 endif( BUILD_WITH_QT4 )
@@ -70,10 +70,15 @@ endif()
 	qt5_add_resources(${ARGN})
    endmacro()

+if(NOT TOKEN_AUTH_ONLY)
    find_package(Qt5LinguistTools REQUIRED)
    macro(qt_add_translation)
 	qt5_add_translation(${ARGN})
    endmacro()
+	else()
+    macro(qt_add_translation)
+    endmacro()
+endif()

    macro(qt_add_dbus_interface)
 	qt5_add_dbus_interface(${ARGN})
@@ -98,6 +103,9 @@ endif()

    #Enable deprecated symbols
    add_definitions("-DQT_DISABLE_DEPRECATED_BEFORE=0")
+
+    add_definitions("-DQT_USE_QSTRINGBUILDER") #optimize string concatenation
+    add_definitions("-DQT_MESSAGELOGCONTEXT") #enable function name and line number in debug output
 endif( Qt5Core_FOUND )

 if(NOT Qt5Core_FOUND)
@@ -153,7 +161,18 @@ if(NOT Qt5Core_FOUND)
        include( ${QT_USE_FILE} )
    endmacro()

-    add_definitions("-DQ_DECL_OVERRIDE=override")
+    if (CMAKE_COMPILER_IS_GNUCC)
+        execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
+                OUTPUT_VARIABLE GCC_VERSION)
+        if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
+            add_definitions("-DQ_DECL_OVERRIDE=override")
+        else()
+            add_definitions("-DQ_DECL_OVERRIDE=")
+        endif()
+    else() #clang or others
+        add_definitions("-DQ_DECL_OVERRIDE=override")
+    endif()
+
 endif()

 if( Qt5Core_DIR )
--- a/cmake/modules/Warnings.cmake
+++ b/cmake/modules/Warnings.cmake
@@ -2,25 +2,21 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING* file.

+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+
 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")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpedantic")
    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")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
    endif(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+else()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
 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?
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
 endif(DEFINED MIRALL_FATAL_WARNINGS)
--- a/config.h.in
+++ b/config.h.in
@@ -3,6 +3,9 @@

 #cmakedefine USE_INOTIFY 1
 #cmakedefine WITH_QTKEYCHAIN 1
+#cmakedefine WITH_CRASHREPORTER
+#cmakedefine CRASHREPORTER_EXECUTABLE "@CRASHREPORTER_EXECUTABLE@"
+

 #cmakedefine GIT_SHA1 "@GIT_SHA1@"
 #cmakedefine APPLICATION_DOMAIN @APPLICATION_DOMAIN@
--- a/csync/CMakeLists.txt
+++ b/csync/CMakeLists.txt
@@ -28,10 +28,13 @@ if (NOT WIN32)
    find_package(Iconv)
 endif (NOT WIN32)

+find_package(SQLite3 3.8.0 REQUIRED)
+
 include(ConfigureChecks.cmake)


 set(SOURCE_DIR ${CMAKE_SOURCE_DIR})
+set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")

 include_directories(${CMAKE_CURRENT_BINARY_DIR})

--- a/csync/ChangeLog
+++ b/csync/ChangeLog
@@ -67,7 +67,7 @@ version 0.90.1  (released 2013-09-24, ownCloud Client 1.4.1)
  * detect if server does not send an etag after an upload 
    completed.
  * fix crash in case of network timeout, reported as
-    https://github.com/owncloud/mirall/issues/1010
+    https://github.comowncloud/client/issues/1010
  * compile and cmake fixes for win32
  * fixed behaviour of csync_exclude
  * documentation and spelling fixes.
--- a/csync/src/CMakeLists.txt
+++ b/csync/src/CMakeLists.txt
@@ -1,16 +1,11 @@
 project(libcsync)

 add_subdirectory(std)
-add_subdirectory(httpbf)
+if(USE_NEON)
+    add_subdirectory(httpbf)
+endif()

 # Statically include sqlite
-if (CSYNC_STATIC_COMPILE_DIR)
-    set(SQLITE3_INCLUDE_DIRS "")
-    set(SQLITE3_LIBRARIES "")
-    include_directories(${CSYNC_STATIC_COMPILE_DIR})
-else (CSYNC_STATIC_COMPILE_DIR)
-    find_package(SQLite3 3.3.9 REQUIRED)
-endif()

 set(CSYNC_PUBLIC_INCLUDE_DIRS
  ${CMAKE_CURRENT_BINARY_DIR}
@@ -22,7 +17,6 @@ set(CSYNC_PUBLIC_INCLUDE_DIRS
 set(CSYNC_PRIVATE_INCLUDE_DIRS
  ${SQLITE3_INCLUDE_DIRS}
  ${CSTDLIB_PUBLIC_INCLUDE_DIRS}
-  ${HTTPBF_PUBLIC_INCLUDE_DIRS}
  ${CMAKE_BINARY_DIR}
 )

@@ -35,8 +29,6 @@ set(CSYNC_LINK_LIBRARIES
  ${CSTDLIB_LIBRARY}
  ${CSYNC_REQUIRED_LIBRARIES}
  ${SQLITE3_LIBRARIES}
-  ${NEON_LIBRARIES}
-  ${HTTPBF_LIBRARY}
 )

 if(HAVE_ICONV AND WITH_ICONV)
@@ -67,27 +59,34 @@ set(csync_SRCS
  vio/csync_vio.c
  vio/csync_vio_file_stat.c
  vio/csync_vio_local.c
-
-  csync_owncloud.c
-  csync_owncloud_recursive_propfind.c
-  csync_owncloud_util.c
 )

+if(USE_NEON)
+    list(APPEND csync_SRCS
+        csync_owncloud.c
+        csync_owncloud_util.c
+    )
+    list(APPEND CSYNC_LINK_LIBRARIES
+        ${NEON_LIBRARIES}
+    )
+    include_directories(${NEON_INCLUDE_DIRS})
+    add_definitions(-DUSE_NEON)
+endif(USE_NEON)
+
+
 configure_file(csync_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/csync_version.h)

 set(csync_HDRS
  ${CMAKE_CURRENT_BINARY_DIR}/csync_version.h
  csync.h
  vio/csync_vio.h
-  vio/csync_vio_file_stat.h
-  vio/csync_vio_handle.h
  vio/csync_vio_method.h
  vio/csync_vio_module.h
 )

 # Statically include sqlite
-if (CSYNC_STATIC_COMPILE_DIR)
-    list(APPEND csync_SRCS ${CSYNC_STATIC_COMPILE_DIR}/dictionary.c  ${CSYNC_STATIC_COMPILE_DIR}/sqlite3.c)
+if (USE_OUR_OWN_SQLITE3)
+    list(APPEND csync_SRCS ${SQLITE3_SOURCE})
 endif()

 include_directories(
@@ -108,6 +107,8 @@ set_target_properties(
        ${LIBRARY_VERSION}
      SOVERSION
        ${LIBRARY_SOVERSION}
+      RUNTIME_OUTPUT_DIRECTORY
+        ${BIN_OUTPUT_DIRECTORY}
 )
 if(BUILD_OWNCLOUD_OSX_BUNDLE)
  INSTALL(
--- a/csync/src/csync.c
+++ b/csync/src/csync.c
@@ -59,8 +59,10 @@
 #include "c_jhash.h"


+#ifdef USE_NEON
 // Breaking the abstraction for fun and profit.
 #include "csync_owncloud.h"
+#endif

 static int _key_cmp(const void *key, const void *data) {
  uint64_t a;
@@ -109,27 +111,15 @@ int csync_create(CSYNC **csync, const char *local, const char *remote) {
  while(len > 0 && local[len - 1] == '/') --len;

  ctx->local.uri = c_strndup(local, len);
-  if (ctx->local.uri == NULL) {
-    ctx->status_code = CSYNC_STATUS_MEMORY_ERROR;
-    free(ctx);
-    return -1;
-  }

  /* remove trailing slashes */
  len = strlen(remote);
  while(len > 0 && remote[len - 1] == '/') --len;

  ctx->remote.uri = c_strndup(remote, len);
-  if (ctx->remote.uri == NULL) {
-    ctx->status_code = CSYNC_STATUS_MEMORY_ERROR;
-    free(ctx);
-    return -1;
-  }

  ctx->status_code = CSYNC_STATUS_OK;

-  ctx->local.list     = 0;
-  ctx->remote.list    = 0;
  ctx->current_fs = NULL;

  ctx->abort = false;
@@ -162,7 +152,9 @@ int csync_init(CSYNC *ctx) {

  ctx->local.type = LOCAL_REPLICA;

+#ifdef USE_NEON
  owncloud_init(ctx);
+#endif
  ctx->remote.type = REMOTE_REPLICA;

  if (c_rbtree_create(&ctx->local.tree, _key_cmp, _data_cmp) < 0) {
@@ -177,6 +169,8 @@ int csync_init(CSYNC *ctx) {
    goto out;
  }

+  ctx->remote.root_perms = 0;
+
  ctx->status = CSYNC_STATUS_INIT;

  /* initialize random generator */
@@ -208,7 +202,6 @@ int csync_update(CSYNC *ctx) {
    CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Journal: %s", ctx->statedb.file);

    if (csync_statedb_load(ctx, ctx->statedb.file, &ctx->statedb.db) < 0) {
-      ctx->status_code = CSYNC_STATUS_STATEDB_LOAD_ERROR;
      rc = -1;
      return rc;
    }
@@ -221,6 +214,14 @@ int csync_update(CSYNC *ctx) {
      CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "No exclude file loaded or defined!");
  }

+#ifdef USE_NEON
+  /* This is not actually connecting, just setting the info for neon. The legacy propagator can use it.. */
+  if (dav_connect( ctx, ctx->remote.uri ) < 0) {
+      ctx->status_code = CSYNC_STATUS_CONNECT_ERROR;
+      return -1;
+  }
+#endif
+
  /* update detection for local replica */
  csync_gettime(&start);
  ctx->current = LOCAL_REPLICA;
@@ -228,9 +229,10 @@ int csync_update(CSYNC *ctx) {

  rc = csync_ftw(ctx, ctx->local.uri, csync_walker, MAX_DEPTH);
  if (rc < 0) {
-    if(ctx->status_code == CSYNC_STATUS_OK)
+    if(ctx->status_code == CSYNC_STATUS_OK) {
        ctx->status_code = csync_errno_to_status(errno, CSYNC_STATUS_UPDATE_ERROR);
-    return -1;
+    }
+    goto out;
  }

  csync_gettime(&finish);
@@ -247,9 +249,10 @@ int csync_update(CSYNC *ctx) {

  rc = csync_ftw(ctx, ctx->remote.uri, csync_walker, MAX_DEPTH);
  if (rc < 0) {
-      if(ctx->status_code == CSYNC_STATUS_OK)
+      if(ctx->status_code == CSYNC_STATUS_OK) {
          ctx->status_code = csync_errno_to_status(errno, CSYNC_STATUS_UPDATE_ERROR);
-      return -1;
+      }
+      goto out;
  }

  csync_gettime(&finish);
@@ -262,7 +265,11 @@ int csync_update(CSYNC *ctx) {

  ctx->status |= CSYNC_STATUS_UPDATE;

-  return 0;
+  rc = 0;
+
+out:
+  csync_statedb_close(ctx);
+  return rc;
 }

 int csync_reconcile(CSYNC *ctx) {
@@ -278,6 +285,11 @@ int csync_reconcile(CSYNC *ctx) {
  /* Reconciliation for local replica */
  csync_gettime(&start);

+  if (csync_statedb_load(ctx, ctx->statedb.file, &ctx->statedb.db) < 0) {
+    rc = -1;
+    return rc;
+  }
+
  ctx->current = LOCAL_REPLICA;
  ctx->replica = ctx->local.type;

@@ -293,7 +305,7 @@ int csync_reconcile(CSYNC *ctx) {
      if (!CSYNC_STATUS_IS_OK(ctx->status_code)) {
          ctx->status_code = csync_errno_to_status( errno, CSYNC_STATUS_RECONCILE_ERROR );
      }
-      return -1;
+      goto out;
  }

  /* Reconciliation for remote replica */
@@ -314,11 +326,15 @@ int csync_reconcile(CSYNC *ctx) {
      if (!CSYNC_STATUS_IS_OK(ctx->status_code)) {
          ctx->status_code = csync_errno_to_status(errno,  CSYNC_STATUS_RECONCILE_ERROR );
      }
-      return -1;
+      goto out;
  }

  ctx->status |= CSYNC_STATUS_RECONCILE;

+  rc = 0;
+
+out:
+  csync_statedb_close(ctx);
  return 0;
 }

@@ -535,14 +551,10 @@ static void _csync_clean_ctx(CSYNC *ctx)

    /* free memory */
    c_rbtree_free(ctx->local.tree);
-    c_list_free(ctx->local.list);
    c_rbtree_free(ctx->remote.tree);
-    c_list_free(ctx->remote.list);
-
-    ctx->remote.list = 0;
-    ctx->local.list = 0;

    SAFE_FREE(ctx->statedb.file);
+    SAFE_FREE(ctx->remote.root_perms);
 }

 int csync_commit(CSYNC *ctx) {
@@ -561,13 +573,6 @@ int csync_commit(CSYNC *ctx) {
  }
  ctx->statedb.db = NULL;

-  rc = owncloud_commit(ctx);
-  if (rc < 0) {
-    CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "commit failed: %s",
-              ctx->error_string ? ctx->error_string : "");
-    goto out;
-  }
-
  _csync_clean_ctx(ctx);

  ctx->remote.read_from_db = 0;
@@ -622,7 +627,9 @@ int csync_destroy(CSYNC *ctx) {
  SAFE_FREE(ctx->remote.uri);
  SAFE_FREE(ctx->error_string);

+#ifdef USE_NEON
  owncloud_destroy(ctx);
+#endif

 #ifdef WITH_ICONV
  c_close_iconv();
@@ -633,15 +640,6 @@ int csync_destroy(CSYNC *ctx) {
  return rc;
 }

-/* Check if csync is the required version or get the version string. */
-const char *csync_version(int req_version) {
-  if (req_version <= LIBCSYNC_VERSION_INT) {
-    return CSYNC_STRINGIFY(LIBCSYNC_VERSION);
-  }
-
-  return NULL;
-}
-
 int csync_add_exclude_list(CSYNC *ctx, const char *path) {
  if (ctx == NULL || path == NULL) {
    return -1;
@@ -767,7 +765,12 @@ void csync_file_stat_free(csync_file_stat_t *st)

 int csync_set_module_property(CSYNC* ctx, const char* key, void* value)
 {
+#ifdef USE_NEON
    return owncloud_set_property(ctx, key, value);
+#else
+    (void)ctx, (void)key, (void)value;
+    return 0;
+#endif
 }


--- a/csync/src/csync.h
+++ b/csync/src/csync.h
@@ -32,6 +32,8 @@
 #ifndef _CSYNC_H
 #define _CSYNC_H

+#include "std/c_private.h"
+#include <sys/stat.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <unistd.h>
@@ -44,6 +46,11 @@
 extern "C" {
 #endif

+struct csync_client_certs_s {
+  char *certificatePath;
+  char *certificatePasswd;
+};  
+  
 /**
  * Instruction enum. In the file traversal structure, it describes
  * the csync state of a file.
@@ -56,22 +63,22 @@ enum csync_status_codes_e {
  CSYNC_STATUS_UNSUCCESSFUL,
  CSYNC_STATUS_NO_LOCK, /* OBSOLETE  does not happen anymore */
  CSYNC_STATUS_STATEDB_LOAD_ERROR,
-  CSYNC_STATUS_STATEDB_WRITE_ERROR,
+  CSYNC_STATUS_STATEDB_CORRUPTED,
  CSYNC_STATUS_NO_MODULE,
-  CSYNC_STATUS_TIMESKEW,
-  CSYNC_STATUS_FILESYSTEM_UNKNOWN,
+  CSYNC_STATUS_TIMESKEW, /* OBSOLETE */
+  CSYNC_STATUS_FILESYSTEM_UNKNOWN, /* UNUSED */
  CSYNC_STATUS_TREE_ERROR,
  CSYNC_STATUS_MEMORY_ERROR,
  CSYNC_STATUS_PARAM_ERROR,
  CSYNC_STATUS_UPDATE_ERROR,
  CSYNC_STATUS_RECONCILE_ERROR,
-  CSYNC_STATUS_PROPAGATE_ERROR,
-  CSYNC_STATUS_REMOTE_ACCESS_ERROR,
-  CSYNC_STATUS_REMOTE_CREATE_ERROR,
-  CSYNC_STATUS_REMOTE_STAT_ERROR,
-  CSYNC_STATUS_LOCAL_CREATE_ERROR,
-  CSYNC_STATUS_LOCAL_STAT_ERROR,
-  CSYNC_STATUS_PROXY_ERROR,
+  CSYNC_STATUS_PROPAGATE_ERROR, /* OBSOLETE */
+  CSYNC_STATUS_REMOTE_ACCESS_ERROR, /* UNUSED */
+  CSYNC_STATUS_REMOTE_CREATE_ERROR, /* UNUSED */
+  CSYNC_STATUS_REMOTE_STAT_ERROR, /* UNUSED */
+  CSYNC_STATUS_LOCAL_CREATE_ERROR, /* UNUSED */
+  CSYNC_STATUS_LOCAL_STAT_ERROR, /* UNUSED */
+  CSYNC_STATUS_PROXY_ERROR, /* UNUSED */
  CSYNC_STATUS_LOOKUP_ERROR,
  CSYNC_STATUS_SERVER_AUTH_ERROR,
  CSYNC_STATUS_PROXY_AUTH_ERROR,
@@ -82,8 +89,9 @@ enum csync_status_codes_e {
  CSYNC_STATUS_NOT_FOUND,
  CSYNC_STATUS_FILE_EXISTS,
  CSYNC_STATUS_OUT_OF_SPACE,
-  CSYNC_STATUS_QUOTA_EXCEEDED,
+  CSYNC_STATUS_QUOTA_EXCEEDED, /* UNUSED */
  CSYNC_STATUS_SERVICE_UNAVAILABLE,
+  CSYNC_STATUS_STORAGE_UNAVAILABLE,
  CSYNC_STATUS_FILE_SIZE_ERROR,
  CSYNC_STATUS_CONTEXT_LOST,
  CSYNC_STATUS_MERGE_FILETREE_ERROR,
@@ -97,6 +105,7 @@ enum csync_status_codes_e {
    CSYNC_STATUS_INDIVIDUAL_IS_HARDLINK,
    CSYNC_STATUS_INDIVIDUAL_IGNORE_LIST,
    CSYNC_STATUS_INDIVIDUAL_IS_INVALID_CHARS,
+    CSYNC_STATUS_INDIVIDUAL_EXCLUDE_LONG_FILENAME,
    CYSNC_STATUS_FILE_LOCKED_OR_OPEN
 };

@@ -136,6 +145,94 @@ enum csync_ftw_type_e {
 };


+#define FILE_ID_BUF_SIZE 21
+
+// currently specified at https://github.com/owncloud/core/issues/8322 are 9 to 10
+#define REMOTE_PERM_BUF_SIZE 15
+
+typedef struct csync_vio_file_stat_s csync_vio_file_stat_t;
+
+enum csync_vio_file_flags_e {
+  CSYNC_VIO_FILE_FLAGS_NONE = 0,
+  CSYNC_VIO_FILE_FLAGS_SYMLINK = 1 << 0,
+  CSYNC_VIO_FILE_FLAGS_HIDDEN = 1 << 1
+};
+
+enum csync_vio_file_type_e {
+  CSYNC_VIO_FILE_TYPE_UNKNOWN,
+  CSYNC_VIO_FILE_TYPE_REGULAR,
+  CSYNC_VIO_FILE_TYPE_DIRECTORY,
+  CSYNC_VIO_FILE_TYPE_FIFO,
+  CSYNC_VIO_FILE_TYPE_SOCKET,
+  CSYNC_VIO_FILE_TYPE_CHARACTER_DEVICE,
+  CSYNC_VIO_FILE_TYPE_BLOCK_DEVICE,
+  CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK
+};
+
+enum csync_vio_file_stat_fields_e {
+  CSYNC_VIO_FILE_STAT_FIELDS_NONE = 0,
+  CSYNC_VIO_FILE_STAT_FIELDS_TYPE = 1 << 0,
+  CSYNC_VIO_FILE_STAT_FIELDS_MODE = 1 << 1, // local POSIX mode
+  CSYNC_VIO_FILE_STAT_FIELDS_FLAGS = 1 << 2,
+  CSYNC_VIO_FILE_STAT_FIELDS_DEVICE = 1 << 3,
+  CSYNC_VIO_FILE_STAT_FIELDS_INODE = 1 << 4,
+  CSYNC_VIO_FILE_STAT_FIELDS_LINK_COUNT = 1 << 5,
+  CSYNC_VIO_FILE_STAT_FIELDS_SIZE = 1 << 6,
+//  CSYNC_VIO_FILE_STAT_FIELDS_BLOCK_COUNT = 1 << 7, /* will be removed */
+//  CSYNC_VIO_FILE_STAT_FIELDS_BLOCK_SIZE = 1 << 8,  /* will be removed */
+  CSYNC_VIO_FILE_STAT_FIELDS_ATIME = 1 << 9,
+  CSYNC_VIO_FILE_STAT_FIELDS_MTIME = 1 << 10,
+  CSYNC_VIO_FILE_STAT_FIELDS_CTIME = 1 << 11,
+//  CSYNC_VIO_FILE_STAT_FIELDS_SYMLINK_NAME = 1 << 12,
+//  CSYNC_VIO_FILE_STAT_FIELDS_CHECKSUM = 1 << 13,
+//  CSYNC_VIO_FILE_STAT_FIELDS_ACL = 1 << 14,
+//  CSYNC_VIO_FILE_STAT_FIELDS_UID = 1 << 15,
+//  CSYNC_VIO_FILE_STAT_FIELDS_GID = 1 << 16,
+  CSYNC_VIO_FILE_STAT_FIELDS_ETAG = 1 << 17,
+  CSYNC_VIO_FILE_STAT_FIELDS_FILE_ID = 1 << 18,
+  CSYNC_VIO_FILE_STAT_FIELDS_DIRECTDOWNLOADURL = 1 << 19,
+  CSYNC_VIO_FILE_STAT_FIELDS_DIRECTDOWNLOADCOOKIES = 1 << 20,
+  CSYNC_VIO_FILE_STAT_FIELDS_PERM = 1 << 21 // remote oC perm
+
+};
+
+
+struct csync_vio_file_stat_s {
+  char *name;
+  char *etag; // FIXME: Should this be inlined like file_id and perm?
+  char file_id[FILE_ID_BUF_SIZE+1];
+  char *directDownloadUrl;
+  char *directDownloadCookies;
+  char remotePerm[REMOTE_PERM_BUF_SIZE+1];
+
+  time_t atime;
+  time_t mtime;
+  time_t ctime;
+
+  int64_t size;
+
+  mode_t mode;
+
+  dev_t device;
+  uint64_t inode;
+  nlink_t nlink;
+
+  int fields; // actually enum csync_vio_file_stat_fields_e fields;
+  enum csync_vio_file_type_e type;
+
+  enum csync_vio_file_flags_e flags;
+};
+
+csync_vio_file_stat_t *csync_vio_file_stat_new(void);
+csync_vio_file_stat_t *csync_vio_file_stat_copy(csync_vio_file_stat_t *file_stat);
+
+void csync_vio_file_stat_destroy(csync_vio_file_stat_t *fstat);
+
+void csync_vio_file_stat_set_file_id( csync_vio_file_stat_t* dst, const char* src );
+
+void csync_vio_set_file_id(char* dst, const char *src );
+
+
 /**
 * CSync File Traversal structure.
 *
@@ -191,6 +288,16 @@ typedef void (*csync_update_callback) (bool local,
                                    const char *dirUrl,
                                    void *userdata);

+typedef void csync_vio_handle_t;
+typedef csync_vio_handle_t* (*csync_vio_opendir_hook) (const char *url,
+                                    void *userdata);
+typedef csync_vio_file_stat_t* (*csync_vio_readdir_hook) (csync_vio_handle_t *dhhandle,
+                                                              void *userdata);
+typedef void (*csync_vio_closedir_hook) (csync_vio_handle_t *dhhandle,
+                                                              void *userdata);
+typedef int (*csync_vio_stat_hook) (csync_vio_handle_t *dhhandle,
+                                                              void *userdata);
+
 /**
 * @brief Allocate a csync context.
 *
@@ -230,16 +337,7 @@ int csync_update(CSYNC *ctx);
 int csync_reconcile(CSYNC *ctx);

 /**
- * @brief Propagation
- *
- * @param ctx  The context to run the propagation on.
- *
- * @return  0 on success, less than 0 if an error occured.
- */
-int csync_propagate(CSYNC *ctx);
-
-/**
- * @brief Commit the sync results to journal
+ * @brief Re-initializes the csync context
 *
 * @param ctx  The context to commit.
 *
@@ -258,31 +356,6 @@ int csync_commit(CSYNC *ctx);
 */
 int csync_destroy(CSYNC *ctx);

-/**
- * @brief Check if csync is the required version or get the version
- * string.
- *
- * @param req_version   The version required.
- *
- * @return              If the version of csync is newer than the version
- *                      required it will return a version string.
- *                      NULL if the version is older.
- *
- * Example:
- *
- * @code
- *  if (csync_version(CSYNC_VERSION_INT(0,42,1)) == NULL) {
- *    fprintf(stderr, "libcsync version is too old!\n");
- *    exit(1);
- *  }
- *
- *  if (debug) {
- *    printf("csync %s\n", csync_version(0));
- *  }
- * @endcode
- */
-const char *csync_version(int req_version);
-
 /**
 * @brief Add an additional exclude list.
 *
@@ -482,6 +555,9 @@ int  csync_abort_requested(CSYNC *ctx);
 */
 int csync_set_read_from_db(CSYNC* ctx, int enabled);

+char *csync_normalize_etag(const char *);
+time_t oc_httpdate_parse( const char *date );
+
 #ifdef __cplusplus
 }
 #endif
--- a/csync/src/csync_exclude.c
+++ b/csync/src/csync_exclude.c
@@ -103,11 +103,6 @@ int csync_exclude_load(const char *fname, c_strlist_t **list) {
    goto out;
  }
  buf = c_malloc(size + 1);
-  if (buf == NULL) {
-      rc = -1;
-      goto out;
-  }
-
  if (read(fd, buf, size) != size) {
    rc = -1;
    goto out;
@@ -156,6 +151,40 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) {
    return match;
 }

+// See http://support.microsoft.com/kb/74496
+static const char *win_reserved_words[] = {"CON","PRN","AUX", "NUL",
+                                           "COM1", "COM2", "COM3", "COM4",
+                                           "LPT1", "LPT2", "LPT3", "CLOCK$" };
+
+
+bool csync_is_windows_reserved_word(const char* filename) {
+
+  size_t win_reserve_words_len = sizeof(win_reserved_words) / sizeof(char*);
+  size_t j;
+
+  for (j = 0; j < win_reserve_words_len; j++) {
+    int len_reserved_word = strlen(win_reserved_words[j]);
+    int len_filename = strlen(filename);
+    if (len_filename == 2 && filename[1] == ':') {
+        if (filename[0] >= 'a' && filename[0] <= 'z') {
+            return true;
+        }
+        if (filename[0] >= 'A' && filename[0] <= 'Z') {
+            return true;
+        }
+    }
+    if (c_strncasecmp(filename, win_reserved_words[j], len_reserved_word) == 0) {
+        if (len_filename == len_reserved_word) {
+            return true;
+        }
+        if ((len_filename > len_reserved_word) && (filename[len_reserved_word] == '.')) {
+            return true;
+        }
+    }
+  }
+  return false;
+}
+
 CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path, int filetype) {
  size_t i = 0;
  const char *p = NULL;
@@ -202,6 +231,14 @@ CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path
      goto out;
  }

+  // check the strlen and ignore the file if its name is longer than 254 chars.
+  if (strlen(bname) > 254) {
+      match = CSYNC_FILE_EXCLUDE_LONG_FILENAME;
+      SAFE_FREE(bname);
+      SAFE_FREE(dname);
+      goto out;
+  }
+
 #ifdef _WIN32
  // Windows cannot sync files ending in spaces (#2176). It also cannot
  // distinguish files ending in '.' from files without an ending,
@@ -214,6 +251,13 @@ CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path
      SAFE_FREE(dname);
      goto out;
  }
+
+  if (csync_is_windows_reserved_word(bname)) {
+    match = CSYNC_FILE_EXCLUDE_INVALID_CHAR;
+    SAFE_FREE(bname);
+    SAFE_FREE(dname);
+    goto out;
+  }
 #endif

  rc = csync_fnmatch(".owncloudsync.log*", bname, 0);
--- a/csync/src/csync_exclude.h
+++ b/csync/src/csync_exclude.h
@@ -26,7 +26,8 @@ enum csync_exclude_type_e {
  CSYNC_FILE_SILENTLY_EXCLUDED,
  CSYNC_FILE_EXCLUDE_AND_REMOVE,
  CSYNC_FILE_EXCLUDE_LIST,
-  CSYNC_FILE_EXCLUDE_INVALID_CHAR
+  CSYNC_FILE_EXCLUDE_INVALID_CHAR,
+  CSYNC_FILE_EXCLUDE_LONG_FILENAME
 };
 typedef enum csync_exclude_type_e CSYNC_EXCLUDE_TYPE;

@@ -80,4 +81,12 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype);
 CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path, int filetype);
 #endif /* _CSYNC_EXCLUDE_H */

+/**
+ * @brief Checks if filename is considered reserved by Windows
+ * @param file_name filename
+ * @return true if file is reserved, false otherwise
+ */
+bool csync_is_windows_reserved_word(const char *file_name);
+
+
 /* vim: set ft=c.doxygen ts=8 sw=2 et cindent: */
--- a/csync/src/csync_macros.h
+++ b/csync/src/csync_macros.h
@@ -42,11 +42,10 @@
 #define ERRNO_RETRY                  CSYNC_CUSTOM_ERRNO_BASE+9
 #define ERRNO_REDIRECT               CSYNC_CUSTOM_ERRNO_BASE+10
 #define ERRNO_WRONG_CONTENT          CSYNC_CUSTOM_ERRNO_BASE+11
-#define ERRNO_TIMEDELTA              CSYNC_CUSTOM_ERRNO_BASE+12
 #define ERRNO_ERROR_STRING           CSYNC_CUSTOM_ERRNO_BASE+13
 #define ERRNO_SERVICE_UNAVAILABLE    CSYNC_CUSTOM_ERRNO_BASE+14
-#define ERRNO_QUOTA_EXCEEDED         CSYNC_CUSTOM_ERRNO_BASE+15
 #define ERRNO_USER_ABORT             CSYNC_CUSTOM_ERRNO_BASE+16
+#define ERRNO_STORAGE_UNAVAILABLE    CSYNC_CUSTOM_ERRNO_BASE+17

 #endif /* _CSYNC_MACROS_H */
 /* vim: set ft=c.doxygen ts=8 sw=2 et cindent: */
--- a/csync/src/csync_misc.c
+++ b/csync/src/csync_misc.c
@@ -105,12 +105,12 @@ CSYNC_STATUS csync_errno_to_status(int error, CSYNC_STATUS default_status)
  case ERRNO_TIMEOUT:
    status = CSYNC_STATUS_TIMEOUT; /* Network: Timeout error */
    break;
-  case ERRNO_QUOTA_EXCEEDED:
-    status = CSYNC_STATUS_QUOTA_EXCEEDED;   /* Quota exceeded */
-    break;
  case ERRNO_SERVICE_UNAVAILABLE:
    status = CSYNC_STATUS_SERVICE_UNAVAILABLE;  /* Service temporarily down */
    break;
+  case ERRNO_STORAGE_UNAVAILABLE:
+    status = CSYNC_STATUS_STORAGE_UNAVAILABLE;  /* Storage temporarily unavailable */
+    break;
  case EFBIG:
    status = CSYNC_STATUS_FILE_SIZE_ERROR;          /* File larger than 2MB */
    break;
@@ -121,9 +121,6 @@ CSYNC_STATUS csync_errno_to_status(int error, CSYNC_STATUS default_status)
    status = CSYNC_STATUS_HTTP_ERROR;
    break;

-  case ERRNO_TIMEDELTA:
-    status = CSYNC_STATUS_TIMESKEW;
-    break;
  case EPERM:                  /* Operation not permitted */
  case EACCES:                /* Permission denied */
    status = CSYNC_STATUS_PERMISSION_DENIED;
@@ -183,7 +180,7 @@ CSYNC_STATUS csync_errno_to_status(int error, CSYNC_STATUS default_status)
 }

 /* Remove possible quotes, and also the -gzip at the end
- * Remove "-gzip" at the end (cf. https://github.com/owncloud/mirall/issues/1195)
+ * Remove "-gzip" at the end (cf. https://github.comowncloud/client/issues/1195)
 * The caller must take ownership of the resulting string.
 */
 char *csync_normalize_etag(const char *etag)
--- a/csync/src/csync_misc.h
+++ b/csync/src/csync_misc.h
@@ -47,6 +47,4 @@ int csync_fnmatch(__const char *__pattern, __const char *__name, int __flags);
 */
 CSYNC_STATUS csync_errno_to_status(int error, CSYNC_STATUS default_status);

-char *csync_normalize_etag(const char *);
-
 #endif /* _CSYNC_MISC_H */
--- a/csync/src/csync_owncloud.c
+++ b/csync/src/csync_owncloud.c
@@ -110,7 +110,7 @@ static int ssl_callback_by_neon(void *userdata, int failures,
        }
    }
    DEBUG_WEBDAV("## VERIFY_SSL CERT: %d", ret  );
-      return ret;
+    return ret;
 }

 /*
@@ -213,8 +213,8 @@ static int configureProxy( csync_owncloud_ctx_t *ctx, ne_session *session )
            re = 2;
        } else {
            DEBUG_WEBDAV("%s requested but no proxy host defined.", ctx->dav_session.proxy_type );
-	    /* we used to try ne_system_session_proxy here, but we should rather err out
-	       to behave exactly like the caller. */
+        /* we used to try ne_system_session_proxy here, but we should rather err out
+           to behave exactly like the caller. */
        }
    } else {
        DEBUG_WEBDAV( "Unsupported Proxy: %s", ctx->dav_session.proxy_type );
@@ -374,7 +374,7 @@ static int post_send_hook(ne_request *req, void *userdata,
 * This function sets the flag _connected if the connection is established
 * and returns if the flag is set, so calling it frequently is save.
 */
-static int dav_connect(csync_owncloud_ctx_t *ctx,  const char *base_url) {
+int dav_connect(CSYNC *csyncCtx,  const char *base_url) {
    int useSSL = 0;
    int rc;
    char protocol[6] = {'\0'};
@@ -384,6 +384,8 @@ static int dav_connect(csync_owncloud_ctx_t *ctx,  const char *base_url) {
    char *host = NULL;
    unsigned int port = 0;
    int proxystate = -1;
+    csync_owncloud_ctx_t *ctx = csyncCtx->owncloud_context;
+    struct csync_client_certs_s* clientCerts = csyncCtx->clientCerts;

    if (ctx->_connected) {
        return 0;
@@ -447,6 +449,29 @@ static int dav_connect(csync_owncloud_ctx_t *ctx,  const char *base_url) {
            goto out;
        }

+        if(clientCerts != NULL) {
+            ne_ssl_client_cert *clicert;
+
+            DEBUG_WEBDAV("dav_connect: certificatePath and certificatePasswd are set, so we use it" );
+            DEBUG_WEBDAV("    with certificatePath: %s", clientCerts->certificatePath );
+            DEBUG_WEBDAV("    with certificatePasswd: %s", clientCerts->certificatePasswd );
+            clicert = ne_ssl_clicert_read ( clientCerts->certificatePath );
+            if ( clicert == NULL ) {
+                DEBUG_WEBDAV ( "Error read certificate : %s", ne_get_error ( ctx->dav_session.ctx ) );
+            } else {
+                if ( ne_ssl_clicert_encrypted ( clicert ) ) {
+                    int rtn = ne_ssl_clicert_decrypt ( clicert, clientCerts->certificatePasswd );
+                    if ( !rtn ) {
+                        DEBUG_WEBDAV ( "Certificate was deciphered successfully." );
+                        ne_ssl_set_clicert ( ctx->dav_session.ctx, clicert );
+                    } else {
+                        DEBUG_WEBDAV ( "Errors while deciphering certificate: %s", ne_get_error ( ctx->dav_session.ctx ) );
+                    }
+                }
+            }
+        } else {
+            DEBUG_WEBDAV("dav_connect: error with csync_client_certs_s* clientCerts");
+        }
        ne_ssl_trust_default_ca( ctx->dav_session.ctx );
        ne_ssl_set_verify( ctx->dav_session.ctx, ssl_callback_by_neon, ctx);
    }
@@ -477,267 +502,6 @@ out:
    return rc;
 }

-/*
- * result parsing list.
- * This function is called to parse the result of the propfind request
- * to list directories on the WebDAV server. I takes a single resource
- * and fills a resource struct and stores it to the result list which
- * is stored in the listdir_context.
- */
-static void propfind_results_callback(void *userdata,
-                    const ne_uri *uri,
-                    const ne_prop_result_set *set)
-{
-    struct listdir_context *fetchCtx = userdata;
-    struct resource *newres = 0;
-    const ne_status *status = NULL;
-    char *path = ne_path_unescape( uri->path );
-
-    (void) status;
-
-    if( ! fetchCtx->target ) {
-        DEBUG_WEBDAV("error: target must not be zero!" );
-        return;
-    }
-
-    /* Fill the resource structure with the data about the file */
-    newres = c_malloc(sizeof(struct resource));
-    newres->uri =  path; /* no need to strdup because ne_path_unescape already allocates */
-    newres->name = c_basename( path );
-    fill_webdav_properties_into_resource(newres, set);
-
-    /* prepend the new resource to the result list */
-    newres->next   = fetchCtx->list;
-    fetchCtx->list = newres;
-    fetchCtx->result_count = fetchCtx->result_count + 1;
-    /* DEBUG_WEBDAV( "results for URI %s: %d %d", newres->name, (int)newres->size, (int)newres->type ); */
-}
-
-
-
-/*
- * fetches a resource list from the WebDAV server. This is equivalent to list dir.
- */
-static struct listdir_context *fetch_resource_list(csync_owncloud_ctx_t *ctx, const char *uri, int depth)
-{
-    struct listdir_context *fetchCtx;
-    int ret = 0;
-    ne_propfind_handler *hdl = NULL;
-    ne_request *request = NULL;
-    const char *content_type = NULL;
-    char *curi = NULL;
-    const ne_status *req_status = NULL;
-
-    curi = _cleanPath( uri );
-
-    /* The old legacy one-level PROPFIND cache. Also gets filled
-       by the recursive cache if 'infinity' did not suceed. */
-    if (ctx->propfind_cache) {
-        if (c_streq(curi, ctx->propfind_cache->target)) {
-            DEBUG_WEBDAV("fetch_resource_list Using simple PROPFIND cache %s", curi);
-            ctx->propfind_cache->ref++;
-            SAFE_FREE(curi);
-            return ctx->propfind_cache;
-        }
-    }
-
-    if( ctx->csync_ctx->callbacks.update_callback ) {
-	ctx->csync_ctx->callbacks.update_callback(false, curi, 
-              ctx->csync_ctx->callbacks.update_callback_userdata);
-    }
-
-    fetchCtx = c_malloc( sizeof( struct listdir_context ));
-    if (!fetchCtx) {
-        errno = ENOMEM;
-        SAFE_FREE(curi);
-        return NULL;
-    }
-    fetchCtx->list = NULL;
-    fetchCtx->target = curi;
-    fetchCtx->currResource = NULL;
-    fetchCtx->ref = 1;
-
-    /* do a propfind request and parse the results in the results function, set as callback */
-    hdl = ne_propfind_create(ctx->dav_session.ctx, curi, depth);
-
-    if(hdl) {
-        ret = ne_propfind_named(hdl, ls_props, propfind_results_callback, fetchCtx);
-        request = ne_propfind_get_request( hdl );
-        req_status = ne_get_status( request );
-    }
-
-    if( ret == NE_OK ) {
-        fetchCtx->currResource = fetchCtx->list;
-        /* Check the request status. */
-        if( req_status && req_status->klass != 2 ) {
-            set_errno_from_http_errcode(req_status->code);
-            DEBUG_WEBDAV("ERROR: Request failed: status %d (%s)", req_status->code,
-                         req_status->reason_phrase);
-            ret = NE_CONNECT;
-            set_error_message(ctx, req_status->reason_phrase);
-        }
-        DEBUG_WEBDAV("Simple propfind result code %d.", req_status ? req_status->code : -1);
-    } else {
-        if( ret == NE_ERROR && req_status->code == 404) {
-            errno = ENOENT;
-        } else {
-            set_errno_from_neon_errcode(ctx, ret);
-        }
-    }
-
-    if( ret == NE_OK ) {
-        /* Check the content type. If the server has a problem, ie. database is gone or such,
-         * the content type is not xml but a html error message. Stop on processing if it's
-         * not XML.
-         * FIXME: Generate user error message from the reply content.
-         */
-        content_type =  ne_get_response_header( request, "Content-Type" );
-        if( !(content_type && c_streq(content_type, "application/xml; charset=utf-8") ) ) {
-            DEBUG_WEBDAV("ERROR: Content type of propfind request not XML: %s.",
-                         content_type ?  content_type: "<empty>");
-            errno = ERRNO_WRONG_CONTENT;
-            set_error_message(ctx, "Server error: PROPFIND reply is not XML formatted!");
-            ret = NE_CONNECT;
-        }
-    }
-
-    if( ret != NE_OK ) {
-        const char *err = NULL;
-        set_errno_from_neon_errcode(ctx, ret);
-
-        err = ne_get_error( ctx->dav_session.ctx );
-        if(err) {
-            set_error_message(ctx, err);
-        }
-        DEBUG_WEBDAV("WRN: propfind named failed with %d, request error: %s", ret, err ? err : "<nil>");
-    }
-
-    if( hdl )
-        ne_propfind_destroy(hdl);
-
-    if( ret != NE_OK ) {
-        free_fetchCtx(fetchCtx);
-        return NULL;
-    }
-
-    free_fetchCtx(ctx->propfind_cache);
-    ctx->propfind_cache = fetchCtx;
-    ctx->propfind_cache->ref++;
-    return fetchCtx;
-}
-
-static struct listdir_context *fetch_resource_list_attempts(csync_owncloud_ctx_t *ctx, const char *uri, int depth)
-{
-    int i;
-
-    struct listdir_context *fetchCtx = NULL;
-    for(i = 0; i < 10; ++i) {
-        fetchCtx = fetch_resource_list(ctx, uri, depth);
-        if(fetchCtx) break;
-        /* only loop in case the content is not XML formatted. Otherwise for every
-         * non successful stat (for non existing directories) its tried 10 times. */
-        if( errno != ERRNO_WRONG_CONTENT ) break;
-
-        DEBUG_WEBDAV("=> Errno after fetch resource list for %s: %d", uri, errno);
-        DEBUG_WEBDAV("   New attempt %i", i);
-    }
-    return fetchCtx;
-}
-
-
-/*
- * directory functions
- */
-csync_vio_handle_t *owncloud_opendir(CSYNC *ctx, const char *uri) {
-    struct listdir_context *fetchCtx = NULL;
-    char *curi = NULL;
-
-    DEBUG_WEBDAV("opendir method called on %s", uri );
-
-    if (dav_connect( ctx->owncloud_context, uri ) < 0) {
-        DEBUG_WEBDAV("connection failed");
-        return NULL;
-    }
-
-    curi = _cleanPath( uri );
-    if (ctx->owncloud_context->is_first_propfind && !ctx->owncloud_context->dav_session.no_recursive_propfind) {
-        ctx->owncloud_context->is_first_propfind = false;
-        // Try to fill it
-        fill_recursive_propfind_cache(ctx->owncloud_context, uri, curi);
-    }
-    if (ctx->owncloud_context->propfind_recursive_cache) {
-        // Try to fetch from recursive cache (if we have one)
-        fetchCtx = get_listdir_context_from_recursive_cache(ctx->owncloud_context, curi);
-    }
-    SAFE_FREE(curi);
-    ctx->owncloud_context->is_first_propfind = false;
-    if (fetchCtx) {
-        return fetchCtx;
-    }
-
-    /* fetchCtx = fetch_resource_list( uri, NE_DEPTH_ONE ); */
-    fetchCtx = fetch_resource_list_attempts( ctx->owncloud_context, uri, NE_DEPTH_ONE);
-    if( !fetchCtx ) {
-        /* errno is set properly in fetch_resource_list */
-        DEBUG_WEBDAV("Errno set to %d", errno);
-        return NULL;
-    } else {
-        fetchCtx->currResource = fetchCtx->list;
-        DEBUG_WEBDAV("opendir returning handle %p (count=%d)", (void*) fetchCtx, fetchCtx->result_count );
-        return fetchCtx;
-    }
-    /* no freeing of curi because its part of the fetchCtx and gets freed later */
-}
-
-int owncloud_closedir(CSYNC *ctx, csync_vio_handle_t *dhandle) {
-    struct listdir_context *fetchCtx = dhandle;
-    free_fetchCtx(fetchCtx);
-    (void)ctx;
-    return 0;
-}
-
-csync_vio_file_stat_t *owncloud_readdir(CSYNC *ctx, csync_vio_handle_t *dhandle) {
-    struct listdir_context *fetchCtx = dhandle;
-    (void)ctx;
-
-//    DEBUG_WEBDAV("owncloud_readdir" );
-//    DEBUG_WEBDAV("owncloud_readdir %s ", fetchCtx->target);
-//    DEBUG_WEBDAV("owncloud_readdir %d", fetchCtx->result_count );
-//    DEBUG_WEBDAV("owncloud_readdir %p %p", fetchCtx->currResource, fetchCtx->list );
-
-    if( fetchCtx == NULL) {
-        /* DEBUG_WEBDAV("An empty dir or at end"); */
-        return NULL;
-    }
-
-    while( fetchCtx->currResource ) {
-        resource* currResource = fetchCtx->currResource;
-        char *escaped_path = NULL;
-
-        /* set pointer to next element */
-        fetchCtx->currResource = fetchCtx->currResource->next;
-
-        /* It seems strange: first uri->path is unescaped to escape it in the next step again.
-         * The reason is that uri->path is not completely escaped (ie. it seems only to have
-         * spaces escaped), while the fetchCtx->target is fully escaped.
-         * See http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-613
-         */
-        escaped_path = ne_path_escape( currResource->uri );
-        if (ne_path_compare(fetchCtx->target, escaped_path) != 0) {
-            // Convert the resource for the caller
-            csync_vio_file_stat_t* lfs = csync_vio_file_stat_new();
-            resourceToFileStat(lfs, currResource);
-
-            SAFE_FREE( escaped_path );
-            return lfs;
-        }
-
-        /* This is the target URI */
-        SAFE_FREE( escaped_path );
-    }
-
-    return NULL;
-}

 char *owncloud_error_string(CSYNC* ctx)
 {
@@ -749,18 +513,12 @@ int owncloud_commit(CSYNC* ctx) {
        return 0;
    }

-    clear_propfind_recursive_cache(ctx->owncloud_context);
-
-    free_fetchCtx(ctx->owncloud_context->propfind_cache);
-    ctx->owncloud_context->propfind_cache = NULL;
-
    if( ctx->owncloud_context->dav_session.ctx ) {
        ne_forget_auth(ctx->owncloud_context->dav_session.ctx);
        ne_session_destroy(ctx->owncloud_context->dav_session.ctx );
        ctx->owncloud_context->dav_session.ctx = 0;
    }

-    ctx->owncloud_context->is_first_propfind = true;
  /* DEBUG_WEBDAV( "********** vio_module_shutdown" ); */

  ctx->owncloud_context->dav_session.ctx = 0;
@@ -772,7 +530,6 @@ int owncloud_commit(CSYNC* ctx) {
  SAFE_FREE( ctx->owncloud_context->dav_session.pwd );
  SAFE_FREE( ctx->owncloud_context->dav_session.session_key);
  SAFE_FREE( ctx->owncloud_context->dav_session.error_string );
-
  return 0;
 }

@@ -780,7 +537,13 @@ void owncloud_destroy(CSYNC* ctx)
 {
    owncloud_commit(ctx);
    SAFE_FREE(ctx->owncloud_context);
-    ctx->owncloud_context = 0;
+
+    if (ctx->clientCerts) {
+        SAFE_FREE(ctx->clientCerts->certificatePasswd);
+        SAFE_FREE(ctx->clientCerts->certificatePath);
+        SAFE_FREE(ctx->clientCerts);
+    }
+    ne_sock_exit();
 }

 int owncloud_set_property(CSYNC* ctx, const char *key, void *data) {
@@ -810,31 +573,43 @@ int owncloud_set_property(CSYNC* ctx, const char *key, void *data) {
        *(ne_session**)data = ctx->owncloud_context->dav_session.ctx;
        return 0;
    }
-    if( c_streq(key, "no_recursive_propfind")) {
-        ctx->owncloud_context->dav_session.no_recursive_propfind = *(bool*)(data);
-        return 0;
-    }
    if( c_streq(key, "redirect_callback")) {
        if (data) {
            csync_owncloud_redirect_callback_t* cb_wrapper = data;
-
            ctx->owncloud_context->dav_session.redir_callback = *cb_wrapper;
        } else {
            ctx->owncloud_context->dav_session.redir_callback = NULL;
        }
    }
+    if( c_streq(key, "SSLClientCerts")) {
+        if(ctx->clientCerts != NULL) {
+            SAFE_FREE(ctx->clientCerts->certificatePasswd);
+            SAFE_FREE(ctx->clientCerts->certificatePath);
+            SAFE_FREE(ctx->clientCerts);
+            ctx->clientCerts = NULL;
+        }
+        if (data) {
+            struct csync_client_certs_s* clientCerts = (struct csync_client_certs_s*) data;
+            struct csync_client_certs_s* newCerts = c_malloc(sizeof(struct csync_client_certs_s));
+            newCerts->certificatePath = c_strdup(clientCerts->certificatePath);
+            newCerts->certificatePasswd = c_strdup(clientCerts->certificatePasswd);
+            ctx->clientCerts = newCerts;
+        } else {
+            DEBUG_WEBDAV("error: in owncloud_set_property for 'SSLClientCerts'" );
+        }
+    }

    return -1;
 }

 void owncloud_init(CSYNC* ctx) {

+    ne_sock_init();
+
    ctx->owncloud_context = c_malloc( sizeof( struct csync_owncloud_ctx_s ));
    ctx->owncloud_context->csync_ctx = ctx; // back reference
-    ctx->owncloud_context->is_first_propfind = true;

-    /* Disable it, Mirall can enable it for the first sync (= no DB)*/
-    ctx->owncloud_context->dav_session.no_recursive_propfind = true;
 }

 /* vim: set ts=4 sw=4 et cindent: */
+
--- a/csync/src/csync_owncloud.h
+++ b/csync/src/csync_owncloud.h
@@ -22,17 +22,15 @@
 #define CSYNC_OWNCLOUD_H

 #include "csync.h"
-#include "vio/csync_vio_file_stat.h"
 #include "vio/csync_vio.h"

 // Public API used by csync
-csync_vio_handle_t *owncloud_opendir(CSYNC* ctx, const char *uri);
-csync_vio_file_stat_t *owncloud_readdir(CSYNC* ctx, csync_vio_handle_t *dhandle);
-int owncloud_closedir(CSYNC* ctx, csync_vio_handle_t *dhandle);
 int owncloud_commit(CSYNC* ctx);
 void owncloud_destroy(CSYNC* ctx);
 char *owncloud_error_string(CSYNC* ctx);
-void owncloud_init(CSYNC* ctx);
 int owncloud_set_property(CSYNC* ctx, const char *key, void *data);
+void owncloud_init(CSYNC* ctx);
+
+int dav_connect(CSYNC* ctx,  const char *base_url);

 #endif /* CSYNC_OWNCLOUD_H */
--- a/csync/src/csync_owncloud_private.h
+++ b/csync/src/csync_owncloud_private.h
@@ -55,9 +55,7 @@
 #include "csync_misc.h"
 #include "csync_macros.h"
 #include "c_private.h"
-#include "httpbf.h"

-#include "vio/csync_vio_file_stat.h"
 #include "vio/csync_vio.h"

 #include "csync_log.h"
@@ -87,98 +85,21 @@ struct dav_session_s {

    int read_timeout;

-    bool no_recursive_propfind;
-
    csync_owncloud_redirect_callback_t redir_callback;
 };

 struct csync_owncloud_ctx_s {
    CSYNC *csync_ctx;

-    // For the PROPFIND results
-    bool is_first_propfind;
-    struct listdir_context *propfind_cache;
-    c_rbtree_t *propfind_recursive_cache;
-    int propfind_recursive_cache_depth;
-    int propfind_recursive_cache_file_count;
-    int propfind_recursive_cache_folder_count;
-
    // For the WebDAV connection
    struct dav_session_s dav_session; /* The DAV Session, initialised in dav_connect */
    int _connected;                   /* flag to indicate if a connection exists, ie.
                                         the dav_session is valid */
 };
+
 typedef struct csync_owncloud_ctx_s csync_owncloud_ctx_t;
 //typedef csync_owncloud_ctx_t* csync_owncloud_ctx_p;

-enum resource_type {
-    resr_normal = 0,
-    resr_collection,
-    resr_reference,
-    resr_error
-};
-
-/* The list of properties that is fetched in PropFind on a collection */
-static const ne_propname ls_props[] = {
-    { "DAV:", "getlastmodified" },
-    { "DAV:", "getcontentlength" },
-    { "DAV:", "resourcetype" },
-    { "DAV:", "getetag"},
-    { "http://owncloud.org/ns", "id"},
-    { "http://owncloud.org/ns", "dDU"},
-    { "http://owncloud.org/ns", "dDC"},
-    { "http://owncloud.org/ns", "permissions"},
-    { NULL, NULL }
-};
-
-/* Struct to store data for each resource found during an opendir operation.
- * It represents a single file entry.
- */
-typedef struct resource {
-    char *uri;           /* The complete uri */
-    char *name;          /* The filename only */
-
-    enum resource_type type;
-    int64_t              size;
-    time_t             modtime;
-    char*              md5;
-    char               file_id[FILE_ID_BUF_SIZE+1];
-    // Those two are optional from the server. We can use those URL to download the file directly
-    // without going through the ownCloud instance.
-    char *directDownloadUrl;
-    char *directDownloadCookies;
-    // See https://github.com/owncloud/core/issues/8322
-    char remotePerm[REMOTE_PERM_BUF_SIZE+1];
-
-    struct resource    *next;
-} resource;
-
-/* Struct to hold the context of a WebDAV PropFind operation to fetch
- * a directory listing from the server.
- */
-struct listdir_context {
-    struct resource *list;           /* The list of result resources */
-    struct resource *currResource;   /* A pointer to the current resource */
-    char            *target;        /* Request-URI of the PROPFIND */
-    unsigned int     result_count;   /* number of elements stored in list */
-    int ref; /* reference count, only destroy when it reaches 0 */
-};
-
-
-/* Values are propfind_recursive_element: */
-struct propfind_recursive_element {
-    struct resource *self;
-    struct resource *children;
-    struct propfind_recursive_element *parent;
-};
-typedef struct propfind_recursive_element propfind_recursive_element_t;
-
-void clear_propfind_recursive_cache(csync_owncloud_ctx_t *ctx);
-struct listdir_context *get_listdir_context_from_recursive_cache(csync_owncloud_ctx_t *ctx, const char *curi);
-void fill_recursive_propfind_cache(csync_owncloud_ctx_t *ctx, const char *uri, const char *curi);
-struct listdir_context *get_listdir_context_from_cache(csync_owncloud_ctx_t *ctx, const char *curi);
-void fetch_resource_list_recursive(csync_owncloud_ctx_t *ctx, const char *uri, const char *curi);
-
 void set_errno_from_http_errcode( int err );
 void set_error_message( csync_owncloud_ctx_t *ctx, const char *msg );
 void set_errno_from_neon_errcode(csync_owncloud_ctx_t *ctx, int neon_code );
@@ -187,15 +108,8 @@ void set_errno_from_session(csync_owncloud_ctx_t *ctx);

 time_t oc_httpdate_parse( const char *date );

-char *_cleanPath( const char* uri );
-
-void fill_webdav_properties_into_resource(struct resource* newres, const ne_prop_result_set *set);
-
-void resourceToFileStat( csync_vio_file_stat_t *lfs, struct resource *res );
-void resource_free(struct resource* o);
-struct resource* resource_dup(struct resource* o);
-void free_fetchCtx( struct listdir_context *ctx );
-
 const char* csync_owncloud_get_platform(void);

+char *_cleanPath( const char* uri );
+
 #endif // CSYNC_OWNCLOUD_PRIVATE_H
--- a/csync/src/csync_owncloud_recursive_propfind.c
+++ b/csync/src/csync_owncloud_recursive_propfind.c
@@ -1,285 +0,0 @@
-/*
- * libcsync -- a library to sync a directory with another
- *
- * Copyright (c) 2011      by Andreas Schneider <asn@cryptomilk.org>
- * Copyright (c) 2012      by Klaas Freitag <freitag@owncloud.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "csync_owncloud.h"
-#include "csync_owncloud_private.h"
-
-static void _tree_destructor(void *data) {
-    propfind_recursive_element_t *element = data;
-    resource_free(element->self);
-    resource_free(element->children);
-    SAFE_FREE(element);
-}
-
-void clear_propfind_recursive_cache(csync_owncloud_ctx_t *ctx)
-{
-    if (ctx->propfind_recursive_cache) {
-        DEBUG_WEBDAV("clear_propfind_recursive_cache Invalidating..");
-        c_rbtree_destroy(ctx->propfind_recursive_cache, _tree_destructor);
-        ctx->propfind_recursive_cache = NULL;
-    }
-}
-
-struct listdir_context *get_listdir_context_from_recursive_cache(csync_owncloud_ctx_t *ctx, const char *curi)
-{
-    propfind_recursive_element_t *element = NULL;
-    struct listdir_context *fetchCtx = NULL;
-    struct resource *iterator, *r;
-
-    if (!ctx->propfind_recursive_cache) {
-        DEBUG_WEBDAV("get_listdir_context_from_recursive_cache No cache");
-        return NULL;
-    }
-
-    element = c_rbtree_node_data(c_rbtree_find(ctx->propfind_recursive_cache, curi));
-    if (!element) {
-        DEBUG_WEBDAV("get_listdir_context_from_recursive_cache No element %s in cache found", curi);
-        return NULL;
-    }
-    if( ctx->csync_ctx->callbacks.update_callback ) {
-        ctx->csync_ctx->callbacks.update_callback(false, curi, ctx->csync_ctx->callbacks.update_callback_userdata);
-    }
-
-    /* Out of the element, create a listdir_context.. if we could be sure that it is immutable, we could ref instead.. need to investigate */
-    fetchCtx = c_malloc( sizeof( struct listdir_context ));
-    ZERO_STRUCTP(fetchCtx);
-    fetchCtx->list = NULL;
-    fetchCtx->target = c_strdup(curi);
-    fetchCtx->currResource = NULL;
-    fetchCtx->ref = 1;
-
-    iterator = element->children;
-    r = NULL;
-    while (iterator) {
-        r = resource_dup(iterator);
-        r->next = fetchCtx->list;
-        fetchCtx->list = r;
-        iterator = iterator->next;
-        fetchCtx->result_count++;
-        /* DEBUG_WEBDAV("get_listdir_context_from_cache Returning cache for %s element %s", fetchCtx->target, fetchCtx->list->uri); */
-    }
-
-    r = resource_dup(element->self);
-    r->next = fetchCtx->list;
-    fetchCtx->result_count++;
-    fetchCtx->list = r;
-    fetchCtx->currResource = fetchCtx->list;
-    DEBUG_WEBDAV("get_listdir_context_from_cache Returning cache for %s (%d elements)", fetchCtx->target, fetchCtx->result_count);
-    return fetchCtx;
-}
-
-static int _key_cmp(const void *key, const void *b) {
-    const char *elementAUri = (char*)key;
-    const propfind_recursive_element_t *elementB = b;
-    return ne_path_compare(elementAUri, elementB->self->uri);
-}
-static int _data_cmp(const void *a, const void *b) {
-    const propfind_recursive_element_t *elementA = a;
-    const propfind_recursive_element_t *elementB = b;
-    return ne_path_compare(elementA->self->uri, elementB->self->uri);
-}
-static void propfind_results_recursive_callback(void *userdata,
-                    const ne_uri *uri,
-                    const ne_prop_result_set *set)
-{
-    struct resource *newres = 0;
-
-    const ne_status *status = NULL;
-    char *path = ne_path_unescape( uri->path );
-    char *parentPath;
-    propfind_recursive_element_t *element = NULL;
-    propfind_recursive_element_t *pElement = NULL;
-    int depth = 0;
-    csync_owncloud_ctx_t *ctx = (csync_owncloud_ctx_t*) userdata;
-
-
-    (void) status;
-
-    if (!ctx->propfind_recursive_cache) {
-        c_rbtree_create(&ctx->propfind_recursive_cache, _key_cmp, _data_cmp);
-    }
-
-    /* Fill the resource structure with the data about the file */
-    newres = c_malloc(sizeof(struct resource));
-
-    newres->uri =  path; /* no need to strdup because ne_path_unescape already allocates */
-    newres->name = c_basename( path );
-    fill_webdav_properties_into_resource(newres, set);
-
-    if( newres->type == resr_collection) {
-        ctx->propfind_recursive_cache_folder_count++;
-    } else {
-        ctx->propfind_recursive_cache_file_count++;
-    }
-
-    /* Create new item in rb tree */
-    if (newres->type == resr_collection) {
-        DEBUG_WEBDAV("propfind_results_recursive %s is a folder", newres->uri);
-        /* Check if in rb tree */
-        element = c_rbtree_node_data(c_rbtree_find(ctx->propfind_recursive_cache,uri->path));
-        /* If not, create a new item and insert it */
-        if (!element) {
-            element = c_malloc(sizeof(propfind_recursive_element_t));
-            element->self = resource_dup(newres);
-            element->self->next = 0;
-            element->children = NULL;
-            element->parent = NULL;
-            c_rbtree_insert(ctx->propfind_recursive_cache, element);
-            /* DEBUG_WEBDAV("results_recursive Added collection %s", newres->uri); */
-
-            // We do this here and in get_listdir_context_from_recursive_cache because
-            // a recursive PROPFIND might take some time but we still want to
-            // be informed. Later when get_listdir_context_from_recursive_cache is
-            // called the DB queries might be the problem causing slowness, so do it again there then.
-            if( ctx->csync_ctx->callbacks.update_callback ) {
-		ctx->csync_ctx->callbacks.update_callback(false, path, ctx->csync_ctx->callbacks.update_callback_userdata);
-	    }
-        }
-    }
-
-    /* Check for parent in tree. If exists: Insert it into the children elements there */
-    parentPath = ne_path_parent(uri->path);
-    if (parentPath) {
-        propfind_recursive_element_t *parentElement = NULL;
-
-        parentElement = c_rbtree_node_data(c_rbtree_find(ctx->propfind_recursive_cache,parentPath));
-        free(parentPath);
-
-        if (parentElement) {
-            newres->next = parentElement->children;
-            parentElement->children = newres;
-
-            /* If the current result is a collection we also need to set its parent */
-            if (element)
-                element->parent = parentElement;
-
-            pElement = element;
-            while (pElement) {
-                depth++;
-                pElement = pElement->parent;
-            }
-            if (depth > ctx->propfind_recursive_cache_depth) {
-                DEBUG_WEBDAV("propfind_results_recursive %s new maximum tree depth %d", newres->uri, depth);
-                ctx->propfind_recursive_cache_depth = depth;
-            }
-
-            /* DEBUG_WEBDAV("results_recursive Added child %s to collection %s", newres->uri, element->self->uri); */
-            return;
-        }
-    }
-
-    resource_free(newres);
-    newres = NULL;
-}
-
-void fetch_resource_list_recursive(csync_owncloud_ctx_t *ctx, const char *uri, const char *curi)
-{
-    int ret = 0;
-    ne_propfind_handler *hdl = NULL;
-    ne_request *request = NULL;
-    const char *content_type = NULL;
-    const ne_status *req_status = NULL;
-    int depth = NE_DEPTH_INFINITE;
-
-    DEBUG_WEBDAV("fetch_resource_list_recursive Starting recursive propfind %s %s", uri, curi);
-    if( ctx->csync_ctx->callbacks.update_callback ) {
-	ctx->csync_ctx->callbacks.update_callback(false, curi, ctx->csync_ctx->callbacks.update_callback_userdata);
-    }
-
-    /* do a propfind request and parse the results in the results function, set as callback */
-    hdl = ne_propfind_create(ctx->dav_session.ctx, curi, depth);
-
-    if(hdl) {
-        ret = ne_propfind_named(hdl, ls_props, propfind_results_recursive_callback, ctx);
-        request = ne_propfind_get_request( hdl );
-        req_status = ne_get_status( request );
-    }
-
-    if( ret == NE_OK ) {
-        /* Check the request status. */
-        if( req_status && req_status->klass != 2 ) {
-            set_errno_from_http_errcode(req_status->code);
-            DEBUG_WEBDAV("ERROR: Request failed: status %d (%s)", req_status->code,
-                         req_status->reason_phrase);
-            ret = NE_CONNECT;
-            set_error_message(ctx, req_status->reason_phrase);
-        }
-        DEBUG_WEBDAV("Recursive propfind result code %d.", req_status ? req_status->code : 0);
-    } else {
-        if( ret == NE_ERROR && req_status->code == 404) {
-            errno = ENOENT;
-        } else {
-            set_errno_from_neon_errcode(ctx, ret);
-        }
-    }
-
-    if( ret == NE_OK ) {
-        /* Check the content type. If the server has a problem, ie. database is gone or such,
-         * the content type is not xml but a html error message. Stop on processing if it's
-         * not XML.
-         * FIXME: Generate user error message from the reply content.
-         */
-        content_type =  ne_get_response_header( request, "Content-Type" );
-        if( !(content_type && c_streq(content_type, "application/xml; charset=utf-8") ) ) {
-            DEBUG_WEBDAV("ERROR: Content type of propfind request not XML: %s.",
-                         content_type ?  content_type: "<empty>");
-            errno = ERRNO_WRONG_CONTENT;
-            set_error_message(ctx, "Server error: PROPFIND reply is not XML formatted!");
-            ret = NE_CONNECT;
-        }
-    }
-
-    if( ret != NE_OK ) {
-        const char *err = NULL;
-
-        err = ne_get_error( ctx->dav_session.ctx );
-        DEBUG_WEBDAV("WRN: propfind named failed with %d, request error: %s", ret, err ? err : "<nil>");
-    }
-
-    if( hdl )
-        ne_propfind_destroy(hdl);
-
-    if( ret != NE_OK ) {
-        return;
-    }
-
-    return;
-}
-
-/* Called by owncloud_opendir()->fetch_resource_list() to fill the cache */
-void fill_recursive_propfind_cache(csync_owncloud_ctx_t *ctx, const char *uri, const char *curi) {
-    fetch_resource_list_recursive(ctx, uri, curi);
-
-    if (ctx->propfind_recursive_cache_depth <= 2) {
-        DEBUG_WEBDAV("fill_recursive_propfind_cache %s Server maybe did not give us an 'infinity' depth result", curi);
-        /* transform the cache to the normal cache in propfind_cache */
-        ctx->propfind_cache = get_listdir_context_from_recursive_cache(ctx, curi);
-        /* clear the cache, it is bogus since the server returned only results for Depth 1 */
-        clear_propfind_recursive_cache(ctx);
-    } else {
-        DEBUG_WEBDAV("fill_recursive_propfind_cache %s We received %d elements deep for 'infinity' depth (%d folders, %d files)",
-                     curi,
-                     ctx->propfind_recursive_cache_depth,
-                     ctx->propfind_recursive_cache_folder_count,
-                     ctx->propfind_recursive_cache_file_count);
-
-    }
-}
--- a/csync/src/csync_owncloud_util.c
+++ b/csync/src/csync_owncloud_util.c
@@ -24,13 +24,6 @@

 #include "csync_misc.h"

-void set_error_message( csync_owncloud_ctx_t *ctx, const char *msg )
-{
-    SAFE_FREE(ctx->dav_session.error_string);
-    if( msg )
-        ctx->dav_session.error_string = c_strdup(msg);
-}
-
 void set_errno_from_http_errcode( int err ) {
    int new_errno = 0;

@@ -106,356 +99,6 @@ void set_errno_from_http_errcode( int err ) {
    errno = new_errno;
 }

-int http_result_code_from_session(csync_owncloud_ctx_t *ctx) {
-    const char *p = ne_get_error( ctx->dav_session.ctx );
-    char *q;
-    int err;
-
-    set_error_message(ctx, p); /* remember the error message */
-
-    err = strtol(p, &q, 10);
-    if (p == q) {
-        err = ERRNO_ERROR_STRING;
-    }
-    return err;
-}
-
-void set_errno_from_session(csync_owncloud_ctx_t *ctx) {
-    int err = http_result_code_from_session(ctx);
-
-    if( err == EIO || err == ERRNO_ERROR_STRING) {
-        errno = err;
-    } else {
-        set_errno_from_http_errcode(err);
-    }
-}
-
-void set_errno_from_neon_errcode(csync_owncloud_ctx_t *ctx, int neon_code ) {
-
-    if( neon_code != NE_OK ) {
-        DEBUG_WEBDAV("Neon error code was %d", neon_code);
-    }
-
-    switch(neon_code) {
-    case NE_OK:     /* Success, but still the possiblity of problems */
-    case NE_ERROR:  /* Generic error; use ne_get_error(session) for message */
-        set_errno_from_session(ctx); /* Something wrong with http communication */
-        break;
-    case NE_LOOKUP:  /* Server or proxy hostname lookup failed */
-        errno = ERRNO_LOOKUP_ERROR;
-        break;
-    case NE_AUTH:     /* User authentication failed on server */
-        errno = ERRNO_USER_UNKNOWN_ON_SERVER;
-        break;
-    case NE_PROXYAUTH:  /* User authentication failed on proxy */
-        errno = ERRNO_PROXY_AUTH;
-        break;
-    case NE_CONNECT:  /* Could not connect to server */
-        errno = ERRNO_CONNECT;
-        break;
-    case NE_TIMEOUT:  /* Connection timed out */
-        errno = ERRNO_TIMEOUT;
-        break;
-    case NE_FAILED:   /* The precondition failed */
-        errno = ERRNO_PRECONDITION;
-        break;
-    case NE_RETRY:    /* Retry request (ne_end_request ONLY) */
-        errno = ERRNO_RETRY;
-        break;
-
-    case NE_REDIRECT: /* See ne_redirect.h */
-        errno = ERRNO_REDIRECT;
-        break;
-    default:
-        errno = ERRNO_GENERAL_ERROR;
-    }
-}
-
-/* cleanPath to return an escaped path of an uri */
-char *_cleanPath( const char* uri ) {
-    int rc = 0;
-    char *path = NULL;
-    char *re = NULL;
-
-    rc = c_parse_uri( uri, NULL, NULL, NULL, NULL, NULL, &path );
-    if( rc  < 0 ) {
-        DEBUG_WEBDAV("Unable to cleanPath %s", uri ? uri: "<zero>" );
-        re = NULL;
-    } else {
-	if(path) {
-	    re = ne_path_escape( path );
-	}
-    }
-
-    SAFE_FREE( path );
-    return re;
-}
-
-
-#ifndef HAVE_TIMEGM
-#ifdef _WIN32
-static int is_leap(unsigned y) {
-    y += 1900;
-    return (y % 4) == 0 && ((y % 100) != 0 || (y % 400) == 0);
-}
-
-static time_t timegm(struct tm *tm) {
-    static const unsigned ndays[2][12] = {
-    {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
-    {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31} };
-
-    time_t res = 0;
-    int i;
-
-    for (i = 70; i < tm->tm_year; ++i)
-        res += is_leap(i) ? 366 : 365;
-
-    for (i = 0; i < tm->tm_mon; ++i)
-        res += ndays[is_leap(tm->tm_year)][i];
-     res += tm->tm_mday - 1;
-     res *= 24;
-     res += tm->tm_hour;
-     res *= 60;
-     res += tm->tm_min;
-     res *= 60;
-     res += tm->tm_sec;
-     return res;
-}
-#else
-/* A hopefully portable version of timegm */
-static time_t timegm(struct tm *tm ) {
-     time_t ret;
-     char *tz;
-
-     tz = getenv("TZ");
-     setenv("TZ", "", 1);
-     tzset();
-     ret = mktime(tm);
-     if (tz)
-         setenv("TZ", tz, 1);
-     else
-         unsetenv("TZ");
-     tzset();
-     return ret;
-}
-#endif /* Platform switch */
-#endif /* HAVE_TIMEGM */
-
-#define RFC1123_FORMAT "%3s, %02d %3s %4d %02d:%02d:%02d GMT"
-static const char short_months[12][4] = {
-    "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-/*
- * This function is borrowed from libneon's ne_httpdate_parse.
- * Unfortunately that one converts to local time but here UTC is
- * needed.
- * This one uses timegm instead, which returns UTC.
- */
-time_t oc_httpdate_parse( const char *date ) {
-    struct tm gmt;
-    char wkday[4], mon[4];
-    int n;
-    time_t result = 0;
-
-    memset(&gmt, 0, sizeof(struct tm));
-
-    /*  it goes: Sun, 06 Nov 1994 08:49:37 GMT */
-    n = sscanf(date, RFC1123_FORMAT,
-               wkday, &gmt.tm_mday, mon, &gmt.tm_year, &gmt.tm_hour,
-               &gmt.tm_min, &gmt.tm_sec);
-    /* Is it portable to check n==7 here? */
-    gmt.tm_year -= 1900;
-    for (n=0; n<12; n++)
-        if (strcmp(mon, short_months[n]) == 0)
-            break;
-    /* tm_mon comes out as 12 if the month is corrupt, which is desired,
-     * since the mktime will then fail */
-    gmt.tm_mon = n;
-    gmt.tm_isdst = -1;
-    result = timegm(&gmt);
-    return result;
-}
-
-
-/*
- * helper: convert a resource struct to file_stat struct.
- */
-void resourceToFileStat(csync_vio_file_stat_t *lfs, struct resource *res )
-{
-    ZERO_STRUCTP(lfs);
-
-    lfs->name = c_strdup( res->name );
-
-    lfs->fields = CSYNC_VIO_FILE_STAT_FIELDS_NONE;
-    if( res->type == resr_normal ) {
-        lfs->fields |= CSYNC_VIO_FILE_STAT_FIELDS_TYPE;
-        lfs->type = CSYNC_VIO_FILE_TYPE_REGULAR;
-    } else if( res->type == resr_collection ) {
-        lfs->fields |= CSYNC_VIO_FILE_STAT_FIELDS_TYPE;
-        lfs->type = CSYNC_VIO_FILE_TYPE_DIRECTORY;
-    } else {
-        DEBUG_WEBDAV("ERROR: Unknown resource type %d", res->type);
-    }
-
-    lfs->mtime = res->modtime;
-    lfs->fields |= CSYNC_VIO_FILE_STAT_FIELDS_MTIME;
-    lfs->size  = res->size;
-    lfs->fields |= CSYNC_VIO_FILE_STAT_FIELDS_SIZE;
-    if( res->md5 ) {
-        lfs->etag   = c_strdup(res->md5);
-        lfs->fields |= CSYNC_VIO_FILE_STAT_FIELDS_ETAG;
-    }
-
-    csync_vio_file_stat_set_file_id(lfs, res->file_id);
-
-    if (res->directDownloadUrl) {
-        lfs->fields |= CSYNC_VIO_FILE_STAT_FIELDS_DIRECTDOWNLOADURL;
-        lfs->directDownloadUrl = c_strdup(res->directDownloadUrl);
-    }
-    if (res->directDownloadCookies) {
-        lfs->fields |= CSYNC_VIO_FILE_STAT_FIELDS_DIRECTDOWNLOADCOOKIES;
-        lfs->directDownloadCookies = c_strdup(res->directDownloadCookies);
-    }
-    if (strlen(res->remotePerm) > 0) {
-        lfs->fields |= CSYNC_VIO_FILE_STAT_FIELDS_PERM;
-        strncpy(lfs->remotePerm, res->remotePerm, sizeof(lfs->remotePerm));
-    }
-}
-
-void fill_webdav_properties_into_resource(struct resource* newres, const ne_prop_result_set *set)
-{
-    const char *clength, *modtime, *file_id = NULL;
-    const char *directDownloadUrl = NULL;
-    const char *directDownloadCookies = NULL;
-    const char *resourcetype = NULL;
-    const char *etag = NULL;
-    const char *perm = NULL;
-
-    modtime      = ne_propset_value( set, &ls_props[0] );
-    clength      = ne_propset_value( set, &ls_props[1] );
-    resourcetype = ne_propset_value( set, &ls_props[2] );
-    etag       = ne_propset_value( set, &ls_props[3] );
-    file_id      = ne_propset_value( set, &ls_props[4] );
-    directDownloadUrl = ne_propset_value( set, &ls_props[5] );
-    directDownloadCookies = ne_propset_value( set, &ls_props[6] );
-
-    // permission flags: Defined in https://github.com/owncloud/core/issues/8322
-    perm = ne_propset_value( set, &ls_props[7] );
-
-    if( resourcetype && strncmp( resourcetype, "<DAV:collection>", 16 ) == 0) {
-        newres->type = resr_collection;
-    } else {
-        newres->type = resr_normal;
-    }
-
-    if (modtime) {
-        newres->modtime = oc_httpdate_parse(modtime);
-    }
-
-    /* DEBUG_WEBDAV("Parsing Modtime: %s -> %llu", modtime, (unsigned long long) newres->modtime ); */
-    newres->size = 0;
-    if (clength) {
-        newres->size = atoll(clength);
-        /* DEBUG_WEBDAV("Parsed File size for %s from %s: %lld", newres->name, clength, (long long)newres->size ); */
-    }
-
-    if( etag ) {
-        newres->md5 = csync_normalize_etag(etag);
-    }
-
-    csync_vio_set_file_id(newres->file_id, file_id);
-    /*
-    DEBUG_WEBDAV("propfind_results_recursive %s [%s] %s", newres->uri, newres->type == resr_collection ? "collection" : "file", newres->md5);
-    */
-
-    if (directDownloadUrl) {
-        newres->directDownloadUrl = c_strdup(directDownloadUrl);
-    }
-    if (directDownloadCookies) {
-        newres->directDownloadCookies = c_strdup(directDownloadCookies);
-    }
-    if (perm && !perm[0]) {
-        // special meaning for our code: server returned permissions but are empty
-        // meaning only reading is allowed for this resource
-        newres->remotePerm[0] = ' ';
-        // see _csync_detect_update()
-    } else if (perm && strlen(perm) < sizeof(newres->remotePerm)) {
-        strncpy(newres->remotePerm, perm, sizeof(newres->remotePerm));
-    } else {
-        // old server, keep newres->remotePerm empty
-    }
-}
-
-struct resource* resource_dup(struct resource* o) {
-    struct resource *r = c_malloc (sizeof( struct resource ));
-    ZERO_STRUCTP(r);
-
-    r->uri = c_strdup(o->uri);
-    r->name = c_strdup(o->name);
-    r->type = o->type;
-    r->size = o->size;
-    r->modtime = o->modtime;
-    if( o->md5 ) {
-        r->md5 = c_strdup(o->md5);
-    }
-    if (o->directDownloadUrl) {
-        r->directDownloadUrl = c_strdup(o->directDownloadUrl);
-    }
-    if (o->directDownloadCookies) {
-        r->directDownloadCookies = c_strdup(o->directDownloadCookies);
-    }
-    if (o->remotePerm) {
-        strncpy(r->remotePerm, o->remotePerm, sizeof(r->remotePerm));
-    }
-    r->next = o->next;
-    csync_vio_set_file_id(r->file_id, o->file_id);
-
-    return r;
-}
-void resource_free(struct resource* o) {
-    struct resource* old = NULL;
-    while (o)
-    {
-        old = o;
-        o = o->next;
-        SAFE_FREE(old->uri);
-        SAFE_FREE(old->name);
-        SAFE_FREE(old->md5);
-        SAFE_FREE(old->directDownloadUrl);
-        SAFE_FREE(old->directDownloadCookies);
-        SAFE_FREE(old);
-    }
-}
-
-void free_fetchCtx( struct listdir_context *ctx )
-{
-    struct resource *newres, *res;
-    if( ! ctx ) return;
-    newres = ctx->list;
-    res = newres;
-
-    ctx->ref--;
-    if (ctx->ref > 0) return;
-
-    SAFE_FREE(ctx->target);
-
-    while( res ) {
-        SAFE_FREE(res->uri);
-        SAFE_FREE(res->name);
-        SAFE_FREE(res->md5);
-        memset( res->file_id, 0, FILE_ID_BUF_SIZE+1 );
-        SAFE_FREE(res->directDownloadUrl);
-        SAFE_FREE(res->directDownloadCookies);
-
-        newres = res->next;
-        SAFE_FREE(res);
-        res = newres;
-    }
-    SAFE_FREE(ctx);
-}
-
-
 // as per http://sourceforge.net/p/predef/wiki/OperatingSystems/
 // extend as required
 const char* csync_owncloud_get_platform() {
--- a/csync/src/csync_private.h
+++ b/csync/src/csync_private.h
@@ -41,7 +41,6 @@
 #include "std/c_private.h"
 #include "csync.h"
 #include "csync_misc.h"
-#include "vio/csync_vio_file_stat.h"

 #ifdef WITH_ICONV
 #include <iconv.h>
@@ -80,6 +79,7 @@ typedef struct csync_file_stat_s csync_file_stat_t;

 struct csync_owncloud_ctx_s; // csync_owncloud.c

+
 /**
 * @brief csync public structure
 */
@@ -89,9 +89,17 @@ struct csync_s {
      void *userdata;
      csync_update_callback update_callback;
      void *update_callback_userdata;
+
+      csync_vio_opendir_hook remote_opendir_hook;
+      csync_vio_readdir_hook remote_readdir_hook;
+      csync_vio_closedir_hook remote_closedir_hook;
+      void *vio_userdata;
  } callbacks;
  c_strlist_t *excludes;

+  // needed for SSL client certificate support
+  struct csync_client_certs_s *clientCerts;
+  
  struct {
    char *file;
    sqlite3 *db;
@@ -100,23 +108,25 @@ struct csync_s {
    sqlite3_stmt* by_hash_stmt;
    sqlite3_stmt* by_fileid_stmt;
    sqlite3_stmt* by_inode_stmt;
+
+    int lastReturnValue;
  } statedb;

  struct {
    char *uri;
    c_rbtree_t *tree;
-    c_list_t *list;
    enum csync_replica_e type;
  } local;

  struct {
    char *uri;
    c_rbtree_t *tree;
-    c_list_t *list;
    enum csync_replica_e type;
    int  read_from_db;
+    const char *root_perms; /* Permission of the root folder. (Since the root folder is not in the db tree, we need to keep a separate entry.) */
  } remote;

+
 #if defined(HAVE_ICONV) && defined(WITH_ICONV)
  struct {
    iconv_t iconv_cd;
@@ -146,8 +156,8 @@ struct csync_s {
  struct csync_owncloud_ctx_s *owncloud_context;

  /* hooks for checking the white list */
-  void *checkBlackListData;
-  int (*checkBlackListHook)(void*, const char*);
+  void *checkSelectiveSyncBlackListData;
+  int (*checkSelectiveSyncBlackListHook)(void*, const char*);
 };


@@ -201,6 +211,10 @@ struct _csync_treewalk_context_s
 typedef struct _csync_treewalk_context_s _csync_treewalk_context;


+time_t oc_httpdate_parse( const char *date );
+
+void set_errno_from_http_errcode( int err );
+
 /**
 * }@
 */
--- a/csync/src/csync_reconcile.c
+++ b/csync/src/csync_reconcile.c
@@ -32,10 +32,6 @@

 #include "inttypes.h"

-#define ACCEPTED_TIME_DIFF 5
-#define ONE_HOUR 3600
-
-
 /* Check if a file is ignored because one parent is ignored.
 * return the node of the ignored directoy if it's the case, or NULL if it is not ignored */
 static c_rbnode_t *_csync_check_ignored(c_rbtree_t *tree, const char *path, int pathlen) {
@@ -138,6 +134,11 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
                /* Do not remove a directory that has ignored files */
                break;
            }
+            if (cur->child_modified) {
+                /* re-create directory that has modified contents */
+                cur->instruction = CSYNC_INSTRUCTION_NEW;
+                break;
+            }
            cur->instruction = CSYNC_INSTRUCTION_REMOVE;
            break;
        case CSYNC_INSTRUCTION_EVAL_RENAME:
@@ -249,6 +250,10 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
                    is_equal_files = (other->modtime == cur->modtime);
                } else {
                    is_equal_files = ((other->size == cur->size) && (other->modtime == cur->modtime));
+                    // FIXME: do a binary comparision of the file here because of the following
+                    // edge case:
+                    // The files could still have different content, even though the mtime
+                    // and size are the same.
                }
                if (is_equal_files) {
                    /* The files are considered equal. */
--- a/csync/src/csync_statedb.c
+++ b/csync/src/csync_statedb.c
@@ -50,6 +50,22 @@

 #define BUF_SIZE 16

+#define sqlite_open(A, B) sqlite3_open_v2(A,B, SQLITE_OPEN_READONLY+SQLITE_OPEN_NOMUTEX, NULL)
+
+#define SQLTM_TIME 150000
+#define SQLTM_COUNT 10
+
+#define SQLITE_BUSY_HANDLED(F) if(1) { \
+    int n = 0; \
+    do { rc = F ; \
+      if( (rc == SQLITE_BUSY) || (rc == SQLITE_LOCKED) ) { \
+         n++; \
+         usleep(SQLTM_TIME); \
+      } \
+    }while( (n < SQLTM_COUNT) && ((rc == SQLITE_BUSY) || (rc == SQLITE_LOCKED))); \
+  }
+
+
 void csync_set_statedb_exists(CSYNC *ctx, int val) {
  ctx->statedb.exists = val;
 }
@@ -73,85 +89,12 @@ static int _csync_check_db_integrity(sqlite3 *db) {
        c_strlist_destroy(result);
    }

-    return rc;
-
-}
-
-static int _csync_statedb_check(const char *statedb) {
-  int fd = -1, rc;
-  ssize_t r;
-  char buf[BUF_SIZE] = {0};
-  sqlite3 *db = NULL;
-  csync_stat_t sb;
-
-  mbchar_t *wstatedb = c_utf8_to_locale(statedb);
-
-  if (wstatedb == NULL) {
-    return -1;
-  }
-
-  /* check db version */
-#ifdef _WIN32
-    _fmode = _O_BINARY;
-#endif
-
-    fd = _topen(wstatedb, O_RDONLY);
-
-    if (fd >= 0) {
-        /* Check size. Size of zero is a valid database actually. */
-        rc = _tfstat(fd, &sb);
-
-        if (rc == 0) {
-            if (sb.st_size == 0) {
-                CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "Database size is zero byte!");
-                close(fd);
-            } else {
-                r = read(fd, (void *) buf, sizeof(buf) - 1);
-                close(fd);
-                if (r >= 0) {
-                    buf[BUF_SIZE - 1] = '\0';
-                    if (c_streq(buf, "SQLite format 3")) {
-                        if (sqlite3_open(statedb, &db ) == SQLITE_OK) {
-                            rc = _csync_check_db_integrity(db);
-                            if( sqlite3_close(db) != 0 ) {
-                                CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "WARN: sqlite3_close error!");
-                            }
-
-                            if( rc >= 0 ) {
-                                /* everything is fine */
-                                c_free_locale_string(wstatedb);
-                                return 0;
-                            }
-                            CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "Integrity check failed!");
-                        } else {
-                            /* resources need to be freed even when open failed */
-                            sqlite3_close(db);
-                            CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "database corrupted, removing!");
-                        }
-                    } else {
-                        CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "sqlite version mismatch");
-                    }
-                }
-            }
-        } else {
-            close(fd);
-        }
-        /* if it comes here, the database is broken and should be recreated. */
-        _tunlink(wstatedb);
+    if( sqlite3_threadsafe() == 0 ) {
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "* WARNING: SQLite module is not threadsafe!");
+        rc = -1;
    }

-  c_free_locale_string(wstatedb);
-
-  /* create database */
-  rc = sqlite3_open(statedb, &db);
-  if (rc == SQLITE_OK) {
-    sqlite3_close(db);
-    csync_win32_set_file_hidden(statedb, true);
-    return 1;
-  }
-  sqlite3_close(db);
-   CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "sqlite3_open failed: %s %s", sqlite3_errmsg(db), statedb);
-   return -1;
+    return rc;
 }

 static int _csync_statedb_is_empty(sqlite3 *db) {
@@ -179,7 +122,6 @@ static void sqlite_profile( void *x, const char* sql, sqlite3_uint64 time)

 int csync_statedb_load(CSYNC *ctx, const char *statedb, sqlite3 **pdb) {
  int rc = -1;
-  int check_rc = -1;
  c_strlist_t *result = NULL;
  sqlite3 *db = NULL;

@@ -187,37 +129,51 @@ int csync_statedb_load(CSYNC *ctx, const char *statedb, sqlite3 **pdb) {
      return -1;
  }

-  /* csync_statedb_check tries to open the statedb and creates it in case
-   * its not there.
-   */
-  check_rc = _csync_statedb_check(statedb);
-  if (check_rc < 0) {
-    CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "ERR: checking csync database failed - bail out.");
-
-    rc = -1;
-    goto out;
+  if (ctx->statedb.db) {
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "ERR: DB already open");
+      ctx->status_code = CSYNC_STATUS_PARAM_ERROR;
+      return -1;
  }

-  /* Open or create the temporary database */
-  if (sqlite3_open(statedb, &db) != SQLITE_OK) {
+  ctx->statedb.lastReturnValue = SQLITE_OK;
+
+  /* Openthe database */
+  if (sqlite_open(statedb, &db) != SQLITE_OK) {
    const char *errmsg= sqlite3_errmsg(ctx->statedb.db);
    CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "ERR: Failed to sqlite3 open statedb - bail out: %s.",
              errmsg ? errmsg : "<no sqlite3 errormsg>");

    rc = -1;
+    ctx->status_code = CSYNC_STATUS_STATEDB_LOAD_ERROR;
    goto out;
  }

-  /* If check_rc == 1 the database is new and empty as a result. */
-  if ((check_rc == 1) || _csync_statedb_is_empty(db)) {
-    CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "statedb doesn't exist");
+  if (_csync_check_db_integrity(db) != 0) {
+      const char *errmsg= sqlite3_errmsg(db);
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "ERR: sqlite3 integrity check failed - bail out: %s.",
+                errmsg ? errmsg : "<no sqlite3 errormsg>");
+      rc = -1;
+      ctx->status_code = CSYNC_STATUS_STATEDB_CORRUPTED;
+      goto out;
+  }
+
+  if (_csync_statedb_is_empty(db)) {
+    CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "statedb contents doesn't exist");
    csync_set_statedb_exists(ctx, 0);
  } else {
    csync_set_statedb_exists(ctx, 1);
  }

+  /* Print out the version */
+  //
+  result = csync_statedb_query(db, "SELECT sqlite_version();");
+  if (result && result->count >= 1) {
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "sqlite3 version \"%s\"", *result->vector);
+  }
+  c_strlist_destroy(result);
+
  /* optimization for speeding up SQLite */
-  result = csync_statedb_query(db, "PRAGMA synchronous = FULL;");
+  result = csync_statedb_query(db, "PRAGMA synchronous = NORMAL;");
  c_strlist_destroy(result);
  result = csync_statedb_query(db, "PRAGMA case_sensitive_like = ON;");
  c_strlist_destroy(result);
@@ -230,6 +186,8 @@ int csync_statedb_load(CSYNC *ctx, const char *statedb, sqlite3 **pdb) {
 #endif
  *pdb = db;

+   CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "Success");
+
  return 0;
 out:
  sqlite3_close(db);
@@ -244,22 +202,25 @@ int csync_statedb_close(CSYNC *ctx) {
  }

  /* deallocate query resources */
-  if( ctx->statedb.by_hash_stmt ) {
-      rc = sqlite3_finalize(ctx->statedb.by_hash_stmt);
-      ctx->statedb.by_hash_stmt = NULL;
-  }
-
  if( ctx->statedb.by_fileid_stmt ) {
-      rc = sqlite3_finalize(ctx->statedb.by_fileid_stmt);
+      sqlite3_finalize(ctx->statedb.by_fileid_stmt);
      ctx->statedb.by_fileid_stmt = NULL;
  }
-
-  if( ctx->statedb.by_inode_stmt ) {
-      rc = sqlite3_finalize(ctx->statedb.by_inode_stmt);
+  if( ctx->statedb.by_hash_stmt ) {
+      sqlite3_finalize(ctx->statedb.by_hash_stmt);
+      ctx->statedb.by_hash_stmt = NULL;
+  }
+  if( ctx->statedb.by_inode_stmt) {
+      sqlite3_finalize(ctx->statedb.by_inode_stmt);
      ctx->statedb.by_inode_stmt = NULL;
  }

-  sqlite3_close(ctx->statedb.db);
+  ctx->statedb.lastReturnValue = SQLITE_OK;
+
+  int sr = sqlite3_close(ctx->statedb.db);
+  CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "sqlite3_close=%d", sr);
+
+  ctx->statedb.db = 0;

  return rc;
 }
@@ -281,7 +242,7 @@ static int _csync_file_stat_from_metadata_table( csync_file_stat_t **st, sqlite3

    column_count = sqlite3_column_count(stmt);

-    rc = sqlite3_step(stmt);
+    SQLITE_BUSY_HANDLED( sqlite3_step(stmt) );

    if( rc == SQLITE_ROW ) {
        if(column_count > 7) {
@@ -290,9 +251,6 @@ static int _csync_file_stat_from_metadata_table( csync_file_stat_t **st, sqlite3
            /* phash, pathlen, path, inode, uid, gid, mode, modtime */
            len = sqlite3_column_int(stmt, 1);
            *st = c_malloc(sizeof(csync_file_stat_t) + len + 1);
-            if (*st == NULL) {
-                return SQLITE_NOMEM;
-            }
            /* clear the whole structure */
            ZERO_STRUCTP(*st);

@@ -321,6 +279,9 @@ static int _csync_file_stat_from_metadata_table( csync_file_stat_t **st, sqlite3
                        (char*) sqlite3_column_text(stmt, 11),
                        REMOTE_PERM_BUF_SIZE);
            }
+            if(column_count > 12 && sqlite3_column_int64(stmt,12)) {
+                (*st)->size = sqlite3_column_int64(stmt, 12);
+            }
        }
    } else {
        if( rc != SQLITE_DONE ) {
@@ -344,7 +305,8 @@ csync_file_stat_t *csync_statedb_get_stat_by_hash(CSYNC *ctx,
  if( ctx->statedb.by_hash_stmt == NULL ) {
      const char *hash_query = "SELECT * FROM metadata WHERE phash=?1";

-      rc = sqlite3_prepare_v2(ctx->statedb.db, hash_query, strlen(hash_query), &ctx->statedb.by_hash_stmt, NULL);
+      SQLITE_BUSY_HANDLED(sqlite3_prepare_v2(ctx->statedb.db, hash_query, strlen(hash_query), &ctx->statedb.by_hash_stmt, NULL));
+      ctx->statedb.lastReturnValue = rc;
      if( rc != SQLITE_OK ) {
          CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Unable to create stmt for hash query.");
          return NULL;
@@ -358,6 +320,7 @@ csync_file_stat_t *csync_statedb_get_stat_by_hash(CSYNC *ctx,
  sqlite3_bind_int64(ctx->statedb.by_hash_stmt, 1, (long long signed int)phash);

  rc = _csync_file_stat_from_metadata_table(&st, ctx->statedb.by_hash_stmt);
+  ctx->statedb.lastReturnValue = rc;
  if( !(rc == SQLITE_ROW || rc == SQLITE_DONE) )  {
      CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata: %d!", rc);
  }
@@ -385,7 +348,8 @@ csync_file_stat_t *csync_statedb_get_stat_by_file_id(CSYNC *ctx,
    if( ctx->statedb.by_fileid_stmt == NULL ) {
        const char *query = "SELECT * FROM metadata WHERE fileid=?1";

-        rc = sqlite3_prepare_v2(ctx->statedb.db, query, strlen(query), &ctx->statedb.by_fileid_stmt, NULL);
+        SQLITE_BUSY_HANDLED(sqlite3_prepare_v2(ctx->statedb.db, query, strlen(query), &ctx->statedb.by_fileid_stmt, NULL));
+        ctx->statedb.lastReturnValue = rc;
        if( rc != SQLITE_OK ) {
            CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Unable to create stmt for file id query.");
            return NULL;
@@ -396,6 +360,7 @@ csync_file_stat_t *csync_statedb_get_stat_by_file_id(CSYNC *ctx,
    sqlite3_bind_text(ctx->statedb.by_fileid_stmt, 1, file_id, -1, SQLITE_STATIC);

    rc = _csync_file_stat_from_metadata_table(&st, ctx->statedb.by_fileid_stmt);
+    ctx->statedb.lastReturnValue = rc;
    if( !(rc == SQLITE_ROW || rc == SQLITE_DONE) ) {
        CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata: %d!", rc);
    }
@@ -423,7 +388,8 @@ csync_file_stat_t *csync_statedb_get_stat_by_inode(CSYNC *ctx,
  if( ctx->statedb.by_inode_stmt == NULL ) {
      const char *inode_query = "SELECT * FROM metadata WHERE inode=?1";

-      rc = sqlite3_prepare_v2(ctx->statedb.db, inode_query, strlen(inode_query), &ctx->statedb.by_inode_stmt, NULL);
+      SQLITE_BUSY_HANDLED(sqlite3_prepare_v2(ctx->statedb.db, inode_query, strlen(inode_query), &ctx->statedb.by_inode_stmt, NULL));
+      ctx->statedb.lastReturnValue = rc;
      if( rc != SQLITE_OK ) {
          CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Unable to create stmt for inode query.");
          return NULL;
@@ -437,6 +403,7 @@ csync_file_stat_t *csync_statedb_get_stat_by_inode(CSYNC *ctx,
  sqlite3_bind_int64(ctx->statedb.by_inode_stmt, 1, (long long signed int)inode);

  rc = _csync_file_stat_from_metadata_table(&st, ctx->statedb.by_inode_stmt);
+  ctx->statedb.lastReturnValue = rc;
  if( !(rc == SQLITE_ROW || rc == SQLITE_DONE) ) {
      CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata by inode: %d!", rc);
  }
@@ -467,7 +434,7 @@ char *csync_statedb_get_etag( CSYNC *ctx, uint64_t jHash ) {
    return ret;
 }

-#define BELOW_PATH_QUERY "SELECT phash, pathlen, path, inode, uid, gid, mode, modtime, type, md5, fileid, remotePerm FROM metadata WHERE pathlen>? AND path LIKE(?)"
+#define BELOW_PATH_QUERY "SELECT phash, pathlen, path, inode, uid, gid, mode, modtime, type, md5, fileid, remotePerm, filesize FROM metadata WHERE pathlen>? AND path LIKE(?)"

 int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {
    int rc;
@@ -485,7 +452,8 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {
        return -1;
    }

-    rc = sqlite3_prepare_v2(ctx->statedb.db, BELOW_PATH_QUERY, -1, &stmt, NULL);
+    SQLITE_BUSY_HANDLED(sqlite3_prepare_v2(ctx->statedb.db, BELOW_PATH_QUERY, -1, &stmt, NULL));
+    ctx->statedb.lastReturnValue = rc;
    if( rc != SQLITE_OK ) {
      CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Unable to create stmt for below path query.");
      return -1;
@@ -507,6 +475,7 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {

    cnt = 0;

+    ctx->statedb.lastReturnValue = rc;
    do {
        csync_file_stat_t *st = NULL;

@@ -522,6 +491,7 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {
        }
    } while( rc == SQLITE_ROW );

+    ctx->statedb.lastReturnValue = rc;
    if( rc != SQLITE_DONE ) {
        ctx->status_code = CSYNC_STATUS_TREE_ERROR;
    } else {
--- a/csync/src/csync_statedb.h
+++ b/csync/src/csync_statedb.h
@@ -98,27 +98,6 @@ int csync_statedb_get_below_path(CSYNC *ctx, const char *path);
 */
 c_strlist_t *csync_statedb_query(sqlite3 *db, const char *statement);

-/**
- * @brief Insert function for the statedb.
- *
- * @param ctx        The csync context.
- * @param statement  The SQL statement to insert into the statedb.
- *
- * @return  The rowid of the most recent INSERT on success, 0 if the query
- *          wasn't successful.
- */
-typedef struct csync_progressinfo_s {
-  struct csync_progressinfo_s *next;
-  uint64_t phash;
-  uint64_t modtime;
-  char *md5;
-  int error;
-  int chunk;
-  int transferId;
-  char *tmpfile;
-  char *error_string;
-} csync_progressinfo_t;
-
 #ifdef __cplusplus
 }
 #endif
--- a/csync/src/csync_update.c
+++ b/csync/src/csync_update.c
@@ -29,6 +29,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
+#include <time.h>
+#include <math.h>

 #include "c_lib.h"
 #include "c_jhash.h"
@@ -100,6 +102,27 @@ static bool _csync_sameextension(const char *p1, const char *p2) {
 }
 #endif

+static bool _last_db_return_error(CSYNC* ctx) {
+    return ctx->statedb.lastReturnValue != SQLITE_OK && ctx->statedb.lastReturnValue != SQLITE_DONE && ctx->statedb.lastReturnValue != SQLITE_ROW;
+}
+
+
+/* Return true if two mtime are considered equal
+ * We consider mtime that are one hour difference to be equal if they are one hour appart
+ * because on some system (FAT) the date is changing when the daylight saving is changing */
+static bool _csync_mtime_equal(time_t a, time_t b)
+{
+    if (a == b)
+        return true;
+
+    /* 1h of difference +- 1 second because the accuracy of FAT is 2 seconds (#2438) */
+    if (fabs(3600 - fabs(difftime(a, b))) < 2)
+        return true;
+
+    return false;
+}
+
+
 static int _csync_detect_update(CSYNC *ctx, const char *file,
    const csync_vio_file_stat_t *fs, const int type) {
  uint64_t h = 0;
@@ -140,6 +163,14 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,

  len = strlen(path);

+  /* This code should probably be in csync_exclude, but it does not have the fs parameter.
+     Keep it here for now and TODO also find out if we want this for Windows
+     https://github.com/owncloud/mirall/issues/2086 */
+  if (fs->flags & CSYNC_VIO_FILE_FLAGS_HIDDEN) {
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "file excluded because it is a hidden file: %s", path);
+      return 0;
+  }
+
  /* Check if file is excluded */
  excluded = csync_excluded(ctx, path,type);

@@ -157,8 +188,8 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
    }
  }

-  if (ctx->current == REMOTE_REPLICA && ctx->checkBlackListHook) {
-      if (ctx->checkBlackListHook(ctx->checkBlackListData, path)) {
+  if (ctx->current == REMOTE_REPLICA && ctx->checkSelectiveSyncBlackListHook) {
+      if (ctx->checkSelectiveSyncBlackListHook(ctx->checkSelectiveSyncBlackListData, path)) {
          return 1;
      }
  }
@@ -170,10 +201,6 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
  size = sizeof(csync_file_stat_t) + len + 1;

  st = c_malloc(size);
-  if (st == NULL) {
-    ctx->status_code = CSYNC_STATUS_MEMORY_ERROR;
-    return -1;
-  }

  /* Set instruction by default to none */
  st->instruction = CSYNC_INSTRUCTION_NONE;
@@ -190,8 +217,15 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
    }

    if (fs->mtime == 0) {
-      tmp = csync_statedb_get_stat_by_hash(ctx, h);
      CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "file: %s - mtime is zero!", path);
+
+      tmp = csync_statedb_get_stat_by_hash(ctx, h);
+      if(_last_db_return_error(ctx)) {
+          SAFE_FREE(st);
+          ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
+          return -1;
+      }
+
      if (tmp == NULL) {
        CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "file: %s - not found in db, IGNORE!", path);
        st->instruction = CSYNC_INSTRUCTION_IGNORE;
@@ -228,16 +262,26 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
  if (csync_get_statedb_exists(ctx)) {
    tmp = csync_statedb_get_stat_by_hash(ctx, h);

+    if(_last_db_return_error(ctx)) {
+        SAFE_FREE(st);
+        ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
+        return -1;
+    }
+
    if(tmp && tmp->phash == h ) { /* there is an entry in the database */
        /* we have an update! */
-        CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Database entry found, compare: %" PRId64 " <-> %" PRId64 ", etag: %s <-> %s, inode: %" PRId64 " <-> %" PRId64 ", size: %" PRId64 " <-> %" PRId64,
-                  ((int64_t) fs->mtime), ((int64_t) tmp->modtime), fs->etag, tmp->etag, (uint64_t) fs->inode, (uint64_t) tmp->inode, (uint64_t) fs->size, (uint64_t) tmp->size);
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Database entry found, compare: %" PRId64 " <-> %" PRId64
+                                            ", etag: %s <-> %s, inode: %" PRId64 " <-> %" PRId64
+                                            ", size: %" PRId64 " <-> %" PRId64 ", perms: %s <-> %s",
+                  ((int64_t) fs->mtime), ((int64_t) tmp->modtime),
+                  fs->etag, tmp->etag, (uint64_t) fs->inode, (uint64_t) tmp->inode,
+                  (uint64_t) fs->size, (uint64_t) tmp->size, fs->remotePerm, tmp->remotePerm );
        if( !fs->etag) {
            st->instruction = CSYNC_INSTRUCTION_EVAL;
            goto out;
        }
        if((ctx->current == REMOTE_REPLICA && !c_streq(fs->etag, tmp->etag ))
-            || (ctx->current == LOCAL_REPLICA && (fs->mtime != tmp->modtime
+            || (ctx->current == LOCAL_REPLICA && (!_csync_mtime_equal(fs->mtime, tmp->modtime)
                                                  // zero size in statedb can happen during migration
                                                  || (tmp->size != 0 && fs->size != tmp->size)
 #if 0
@@ -289,6 +333,12 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,

            tmp = csync_statedb_get_stat_by_inode(ctx, fs->inode);

+            if(_last_db_return_error(ctx)) {
+                SAFE_FREE(st);
+                ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
+                return -1;
+            }
+
            /* translate the file type between the two stat types csync has. */
            if( tmp && tmp->type == 0 ) {
                tmp_vio_type = CSYNC_VIO_FILE_TYPE_REGULAR;
@@ -319,6 +369,12 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
        } else {
            /* Remote Replica Rename check */
            tmp = csync_statedb_get_stat_by_file_id(ctx, fs->file_id);
+
+            if(_last_db_return_error(ctx)) {
+                SAFE_FREE(st);
+                ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
+                return -1;
+            }
            if(tmp ) {                           /* tmp existing at all */
                if ((tmp->type == CSYNC_FTW_TYPE_DIR && fs->type != CSYNC_VIO_FILE_TYPE_DIRECTORY) ||
                        (tmp->type == CSYNC_FTW_TYPE_FILE && fs->type != CSYNC_VIO_FILE_TYPE_REGULAR)) {
@@ -326,6 +382,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
                    st->instruction = CSYNC_INSTRUCTION_NEW;
                    goto out;
                }
+                CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "remote rename detected based on fileid %s %s", tmp->path, file);
                st->instruction = CSYNC_INSTRUCTION_EVAL_RENAME;
                if (fs->type == CSYNC_VIO_FILE_TYPE_DIRECTORY) {
                    csync_rename_record(ctx, tmp->path, path);
@@ -346,8 +403,9 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
        }
    }
  } else  {
-      CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Unable to open statedb, setting inst to NEW" );
-      st->instruction = CSYNC_INSTRUCTION_NEW;
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Unable to open statedb" );
+      ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
+      return -1;
  }

 out:
@@ -358,6 +416,8 @@ out:
      st->error_status = CSYNC_STATUS_INDIVIDUAL_IGNORE_LIST; /* File listed on ignore list. */
    } else if (excluded == CSYNC_FILE_EXCLUDE_INVALID_CHAR) {
      st->error_status = CSYNC_STATUS_INDIVIDUAL_IS_INVALID_CHARS;  /* File contains invalid characters. */
+    } else if (excluded == CSYNC_FILE_EXCLUDE_LONG_FILENAME) {
+      st->error_status = CSYNC_STATUS_INDIVIDUAL_EXCLUDE_LONG_FILENAME; /* File name is too long. */
    }
  }
  if (st->instruction != CSYNC_INSTRUCTION_NONE && st->instruction != CSYNC_INSTRUCTION_IGNORE
@@ -536,7 +596,21 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
      goto done;
  }

-  if ((dh = csync_vio_opendir(ctx, uri)) == NULL) {
+  const char *uri_for_vio = uri;
+  if (ctx->current == REMOTE_REPLICA) {
+      uri_for_vio += strlen(ctx->remote.uri);
+      if (strlen(uri_for_vio) > 0 && uri_for_vio[0] == '/') {
+          uri_for_vio++; // cut leading slash
+      }
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "URI without fuzz for %s is \"%s\"", uri, uri_for_vio);
+  }
+
+  if ((dh = csync_vio_opendir(ctx, uri_for_vio)) == NULL) {
+      if (ctx->abort) {
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Aborted!");
+          ctx->status_code = CSYNC_STATUS_ABORTED;
+          goto error;
+      }
      int asp = 0;
      /* permission denied */
      ctx->status_code = csync_errno_to_status(errno, CSYNC_STATUS_OPENDIR_ERROR);
@@ -547,6 +621,17 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
          if (asp < 0) {
              CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "asprintf failed!");
          }
+      } else if(errno == ERRNO_STORAGE_UNAVAILABLE) {
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "Storage was not available!");
+          if (ctx->current_fs) {
+              ctx->current_fs->instruction = CSYNC_INSTRUCTION_IGNORE;
+              ctx->current_fs->error_status = CSYNC_STATUS_STORAGE_UNAVAILABLE;
+              /* If a directory has ignored files, put the flag on the parent directory as well */
+              if( previous_fs ) {
+                  previous_fs->has_ignored_files = true;
+              }
+              goto done;
+          }
      } else {
          CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "opendir failed for %s - errno %d", uri, errno);
      }
@@ -603,10 +688,14 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
    path = filename + ulen;

    /* skip ".csync_journal.db" and ".csync_journal.db.ctmp" */
+    /* Isn't this done via csync_exclude already? */
    if (c_streq(path, ".csync_journal.db")
            || c_streq(path, ".csync_journal.db.ctmp")
            || c_streq(path, ".csync_journal.db.ctmp-journal")
-            || c_streq(path, ".csync-progressdatabase")) {
+            || c_streq(path, ".csync-progressdatabase")
+            || c_streq(path, ".csync_journal.db-shm")
+            || c_streq(path, ".csync_journal.db-wal")
+            || c_streq(path, ".csync_journal.db-journal")) {
        csync_vio_file_stat_destroy(dirent);
        dirent = NULL;
        SAFE_FREE(filename);
@@ -652,6 +741,11 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
        uint64_t h = c_jhash64((uint8_t *) path, len, 0);
        etag = csync_statedb_get_etag( ctx, h );

+        if(_last_db_return_error(ctx)) {
+            ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
+            goto error;
+        }
+
        if( etag ) {
            SAFE_FREE(fs->etag);
            fs->etag = etag;
@@ -671,11 +765,6 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
    rc = fn(ctx, filename, fs, flag);
    /* this function may update ctx->current and ctx->read_from_db */

-    if (ctx->current_fs && previous_fs && ctx->current_fs->child_modified) {
-        /* If a directory has modified files, put the flag on the parent directory as well */
-        previous_fs->child_modified = ctx->current_fs->child_modified;
-    }
-
    /* Only for the local replica we have to destroy stat(), for the remote one it is a pointer to dirent */
    if (ctx->replica == LOCAL_REPLICA) {
        csync_vio_file_stat_destroy(fs);
@@ -701,7 +790,9 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
      if (ctx->current_fs && !ctx->current_fs->child_modified
          && ctx->current_fs->instruction == CSYNC_INSTRUCTION_EVAL) {
        ctx->current_fs->instruction = CSYNC_INSTRUCTION_NONE;
-        ctx->current_fs->should_update_etag = true;
+        if (ctx->current == REMOTE_REPLICA) {
+          ctx->current_fs->should_update_etag = true;
+        }
      }

      if (ctx->current_fs && previous_fs && ctx->current_fs->has_ignored_files) {
@@ -710,6 +801,11 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
      }
    }

+    if (ctx->current_fs && previous_fs && ctx->current_fs->child_modified) {
+        /* If a directory has modified files, put the flag on the parent directory as well */
+        previous_fs->child_modified = ctx->current_fs->child_modified;
+    }
+
    if (flag == CSYNC_FTW_FLAG_DIR && ctx->current_fs
        && (ctx->current_fs->instruction == CSYNC_INSTRUCTION_EVAL ||
            ctx->current_fs->instruction == CSYNC_INSTRUCTION_NEW)) {
--- a/csync/src/csync_update.h
+++ b/csync/src/csync_update.h
@@ -23,7 +23,6 @@
 #define _CSYNC_UPDATE_H

 #include "csync.h"
-#include "vio/csync_vio_file_stat.h"

 /**
 * @file csync_update.h
--- a/csync/src/csync_util.c
+++ b/csync/src/csync_util.c
@@ -148,3 +148,88 @@ bool csync_file_locked_or_open( const char *dir, const char *fname) {
    SAFE_FREE(tmp_uri);
    return ret;
 }
+
+#ifndef HAVE_TIMEGM
+#ifdef _WIN32
+static int is_leap(unsigned y) {
+    y += 1900;
+    return (y % 4) == 0 && ((y % 100) != 0 || (y % 400) == 0);
+}
+
+static time_t timegm(struct tm *tm) {
+    static const unsigned ndays[2][12] = {
+    {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
+    {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31} };
+
+    time_t res = 0;
+    int i;
+
+    for (i = 70; i < tm->tm_year; ++i)
+        res += is_leap(i) ? 366 : 365;
+
+    for (i = 0; i < tm->tm_mon; ++i)
+        res += ndays[is_leap(tm->tm_year)][i];
+     res += tm->tm_mday - 1;
+     res *= 24;
+     res += tm->tm_hour;
+     res *= 60;
+     res += tm->tm_min;
+     res *= 60;
+     res += tm->tm_sec;
+     return res;
+}
+#else
+/* A hopefully portable version of timegm */
+static time_t timegm(struct tm *tm ) {
+     time_t ret;
+     char *tz;
+
+     tz = getenv("TZ");
+     setenv("TZ", "", 1);
+     tzset();
+     ret = mktime(tm);
+     if (tz)
+         setenv("TZ", tz, 1);
+     else
+         unsetenv("TZ");
+     tzset();
+     return ret;
+}
+#endif /* Platform switch */
+#endif /* HAVE_TIMEGM */
+
+#define RFC1123_FORMAT "%3s, %02d %3s %4d %02d:%02d:%02d GMT"
+static const char short_months[12][4] = {
+    "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+};
+/*
+ * This function is borrowed from libneon's ne_httpdate_parse.
+ * Unfortunately that one converts to local time but here UTC is
+ * needed.
+ * This one uses timegm instead, which returns UTC.
+ */
+time_t oc_httpdate_parse( const char *date ) {
+    struct tm gmt;
+    char wkday[4], mon[4];
+    int n;
+    time_t result = 0;
+
+    memset(&gmt, 0, sizeof(struct tm));
+
+    /*  it goes: Sun, 06 Nov 1994 08:49:37 GMT */
+    n = sscanf(date, RFC1123_FORMAT,
+               wkday, &gmt.tm_mday, mon, &gmt.tm_year, &gmt.tm_hour,
+               &gmt.tm_min, &gmt.tm_sec);
+    /* Is it portable to check n==7 here? */
+    gmt.tm_year -= 1900;
+    for (n=0; n<12; n++)
+        if (strcmp(mon, short_months[n]) == 0)
+            break;
+    /* tm_mon comes out as 12 if the month is corrupt, which is desired,
+     * since the mktime will then fail */
+    gmt.tm_mon = n;
+    gmt.tm_isdst = -1;
+    result = timegm(&gmt);
+    return result;
+}
--- a/csync/src/httpbf/src/httpbf.c
+++ b/csync/src/httpbf/src/httpbf.c
@@ -96,6 +96,7 @@ hbf_transfer_t *hbf_init_transfer( const char *dest_uri ) {
    transfer->block_size = DEFAULT_BLOCK_SIZE;
    transfer->threshold = transfer->block_size;
    transfer->modtime_accepted = 0;
+    transfer->oc_header_modtime = 0;

    return transfer;
 }
@@ -259,9 +260,6 @@ static char* get_transfer_url( hbf_transfer_t *transfer, int indx ) {
      len += strlen("-chunking---");

      res = malloc(len);
-      if( res == NULL ) {
-        return NULL;
-      }

      /* Note: must be %u for unsigned because one does not want '--' */
      if( sprintf(res, "%s-chunking-%u-%u-%u", transfer->url, transfer->transfer_id,
@@ -491,8 +489,8 @@ Hbf_State hbf_transfer( ne_session *session, hbf_transfer_t *transfer, const cha

                snprintf(buf, sizeof(buf), "%"PRId64, transfer->stat_size);
                ne_add_request_header(req, "OC-Total-Length", buf);
-                if( transfer->modtime > 0 ) {
-                    snprintf(buf, sizeof(buf), "%"PRId64, transfer->modtime);
+                if( transfer->oc_header_modtime > 0 ) {
+                    snprintf(buf, sizeof(buf), "%"PRId64, transfer->oc_header_modtime);
                    ne_add_request_header(req, "X-OC-Mtime", buf);
                }

@@ -502,6 +500,8 @@ Hbf_State hbf_transfer( ne_session *session, hbf_transfer_t *transfer, const cha

                if( transfer->block_cnt > 1 ) {
                  ne_add_request_header(req, "OC-Chunked", "1");
+                  snprintf(buf, sizeof(buf), "%"PRId64, transfer->threshold);
+                  ne_add_request_header(req, "OC-Chunk-Size", buf);
                }
                ne_add_request_header( req, "Content-Type", "application/octet-stream");

--- a/csync/src/httpbf/src/httpbf.h
+++ b/csync/src/httpbf/src/httpbf.h
@@ -92,6 +92,7 @@ struct hbf_transfer_s {

    int64_t stat_size;
    time_t modtime;
+    time_t oc_header_modtime;
    int64_t block_size;
    int64_t threshold;

--- a/csync/src/std/CMakeLists.txt
+++ b/csync/src/std/CMakeLists.txt
@@ -20,7 +20,6 @@ set(CSTDLIB_LINK_LIBRARIES

 set(cstdlib_SRCS
  c_alloc.c
-  c_list.c
  c_path.c
  c_rbtree.c
  c_string.c
--- a/csync/src/std/c_lib.h
+++ b/csync/src/std/c_lib.h
@@ -23,7 +23,6 @@

 #include "c_macro.h"
 #include "c_alloc.h"
-#include "c_list.h"
 #include "c_path.h"
 #include "c_rbtree.h"
 #include "c_string.h"
--- a/csync/src/std/c_list.c
+++ b/csync/src/std/c_list.c
@@ -1,459 +0,0 @@
-/*
- * csync list -- a doubly-linked list
- *
- * This code is based on glist.{h,c} from glib
- *   ftp://ftp.gtk.org/pub/gtk/
- * Copyright (c) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- * Copyright (c) 2006-2013  Andreas Schneider <mail@csyncapses.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "c_alloc.h"
-#include "c_list.h"
-
-/*
- * Adds a new element on to the end of the list.
- */
-c_list_t *c_list_append(c_list_t *list, void *data) {
-  c_list_t *new;
-  c_list_t *last;
-
-  new = c_list_alloc();
-  if (new == NULL) {
-    return NULL;
-  }
-  new->data = data;
-
-  if (list == NULL) {
-    return new;
-  }
-
-  last = c_list_last(list);
-
-  last->next = new;
-  new->prev = last;
-
-  return list;
-}
-
-/*
- * Adds a new element on at the beginning of the list.
- */
-c_list_t *c_list_prepend(c_list_t *list, void *data) {
-  c_list_t *new;
-  c_list_t *first;
-
-  new = c_list_alloc();
-  if (new == NULL) {
-    return NULL;
-  }
-  new->data = data;
-
-  if (list != NULL) {
-    first = c_list_first(list);
-
-    first->prev = new;
-    new->next = first;
-  }
-
-  return new;
-}
-
-/*
- * Inserts a new element into the list at the given position.
- */
-c_list_t *c_list_insert(c_list_t *list, void *data, long position) {
-  c_list_t *new;
-  c_list_t *temp;
-
-  /* Handle wrong values for position */
-  if (position < 0) {
-    return c_list_append (list, data);
-  } else if (position == 0) {
-    return c_list_prepend (list, data);
-  }
-
-  temp = c_list_position(list, position);
-
-  if (temp == NULL) {
-    return c_list_append(list, data);
-  }
-
-  new = c_list_alloc();
-  if (new == NULL) {
-    return NULL;
-  }
-  new->data = data;
-
-  /* List is not empty */
-  if (temp->prev) {
-    temp->prev->next = new;
-    new->prev = temp->prev;
-  }
-
-  new->next = temp;
-  temp->prev = new;
-
-  /*  */
-  if (temp == list) {
-    return new;
-  }
-
-  return list;
-}
-
-/*
- * Inserts a new element into the list, using the given comparison function to
- * determine its position.
- */
-c_list_t *c_list_insert_sorted(c_list_t *list, void *data,
-    c_list_compare_fn fn) {
-  c_list_t *new;
-  c_list_t *temp;
-  int cmp;
-
-  new = c_list_alloc();
-  if (new == NULL) {
-    return NULL;
-  }
-  new->data = data;
-
-  /* list is empty */
-  if (list == NULL) {
-    return new;
-  }
-
-  temp = list;
-  cmp = (fn)(data, temp->data);
-
-  while ((temp->next) && (cmp > 0)) {
-    temp = temp->next;
-
-    cmp = (fn)(data, temp->data);
-  }
-
-  /* last element */
-  if ((temp->next == NULL) && (cmp > 0)) {
-    temp->next = new;
-    new->prev = temp;
-    return list;
-  }
-
-  /* first element */
-  if (temp->prev) {
-    temp->prev->next = new;
-    new->prev = temp->prev;
-  }
-
-  new->next = temp;
-  temp->prev = new;
-
-  /* inserted before first */
-  if (temp == list) {
-    return new;
-  }
-
-  return list;
-}
-
-/*
- * Allocates space for one c_list_t element.
- */
-c_list_t *c_list_alloc(void) {
-  c_list_t *list = NULL;
-
-  list = c_malloc(sizeof(c_list_t));
-  if (list == NULL) {
-    return NULL;
-  }
-
-  list->data = NULL;
-
-  list->prev = NULL;
-  list->next = NULL;
-
-  return list;
-}
-
-/*
- * Removes an element from a c_list. If two elements contain the same data,
- * only the first is removed.
- */
-c_list_t *c_list_remove(c_list_t *list, void *data) {
-  c_list_t *temp;
-
-  if (list == NULL || data == NULL) {
-    return NULL;
-  }
-
-  temp = list;
-
-  while (temp != NULL) {
-    if (temp->data != data) {
-      temp = temp->next;
-    } else {
-      /* not at first element */
-      if (temp->prev) {
-        temp->prev->next = temp->next;
-      }
-
-      /* not at last element */
-      if (temp->next) {
-        temp->next->prev = temp->prev;
-      }
-
-      /* first element */
-      if (list == temp) {
-        list = list->next;
-      }
-
-      SAFE_FREE(temp);
-      break;
-    }
-  }
-
-  return list;
-}
-
-/*
- * Frees all elements from a c_list.
- */
-void c_list_free(c_list_t *list) {
-  c_list_t *temp = NULL;
-
-  if (list == NULL) {
-    return;
-  }
-
-  list = c_list_last(list);
-
-  while (list->prev != NULL) {
-    temp = list;
-    list = list->prev;
-
-    SAFE_FREE(temp);
-  }
-  SAFE_FREE(list);
-}
-
-/*
- * Gets the next element in a c_list.
- */
-c_list_t *c_list_next(c_list_t *list) {
-  if (list == NULL) {
-    return NULL;
-  }
-
-  return list->next;
-}
-
-/*
- * Gets the previous element in a c_list.
- */
-c_list_t *c_list_prev(c_list_t *list) {
-  if (list == NULL) {
-    return NULL;
-  }
-
-  return list->prev;
-}
-
-/*
- * Gets the number of elements in a c_list
- */
-unsigned long c_list_length(c_list_t *list) {
-  unsigned long length = 1;
-
-  if (list == NULL) {
-    return 0;
-  }
-
-  while (list->next) {
-    length++;
-    list = list->next;
-  }
-
-  return length;
-}
-
-/*
- * Gets the first element in a c_list
- */
-c_list_t *c_list_first(c_list_t *list) {
-  if (list != NULL) {
-    while (list->prev) {
-      list = list->prev;
-    }
-  }
-
-  return list;
-}
-
-/*
- * Gets the last element in a c_list
- */
-c_list_t *c_list_last(c_list_t *list) {
-  if (list != NULL) {
-    while (list->next) {
-      list = list->next;
-    }
-  }
-
-  return list;
-}
-
-/*
- * Gets the element at the given positon in a c_list
- */
-c_list_t *c_list_position(c_list_t *list, long position) {
-  if (list == NULL) {
-    return NULL;
-  }
-
-  while ((position-- > 0) && list != NULL) {
-    list = list->next;
-  }
-
-  return list;
-}
-
-/*
- * Finds the element in a c_list_t which contains the given data.
- */
-c_list_t *c_list_find(c_list_t *list, const void *data) {
-  if (list == NULL) {
-    return NULL;
-  }
-
-  while (list != NULL) {
-    if (list->data == data) {
-      break;
-    }
-    list = list->next;
-  }
-  return list;
-}
-
-/*
- * Finds an element, using a supplied function to find the desired
- * element.
- */
-c_list_t *c_list_find_custom(c_list_t *list, const void *data,
-    c_list_compare_fn fn) {
-  int cmp;
-
-  if (list != NULL && fn != NULL) {
-    while (list != NULL) {
-      cmp = (*fn)(list->data, data);
-      if (cmp == 0) {
-        return list;
-      }
-      list = list->next;
-    }
-  }
-
-  return NULL;
-}
-
-/*
- * Internal used function to merge 2 lists using a compare function
- */
-static c_list_t *_c_list_merge(c_list_t *list1, c_list_t *list2,
-    c_list_compare_fn func) {
-  int cmp;
-
-  /* lists are emty */
-  if (list1 == NULL) {
-    return list2;
-  } else if (list2 == NULL) {
-    return list1;
-  }
-
-  cmp = ((c_list_compare_fn) func)(list1->data, list2->data);
-  /* compare if it is smaller */
-  if (cmp <= 0) {
-    list1->next = _c_list_merge(list1->next, list2, func);
-    if (list1->next) {
-      list1->next->prev = list1;
-    }return list1;
-  } else {
-    list2->next = _c_list_merge(list1, list2->next, func);
-    if (list2->next) {
-      list2->next->prev = list2;
-    }
-    return list2;
-  }
-}
-
-/*
- * Internally used function to split 2 lists.
- */
-static c_list_t *_c_list_split(c_list_t *list) {
-  c_list_t *second = NULL;
-
-  /* list is empty */
-  if (list == NULL) {
-    return NULL;
-  } else if (list->next == NULL) {
-  /* list has only 1 element */
-    return NULL;
-  } else {
-    /* split */
-    second = list->next;
-    list->next = second->next;
-    /* is last element */
-    if (list->next) {
-      list->next->prev = list;
-    }
-
-    second->prev = NULL;
-    second->next = _c_list_split(second->next);
-    /* is last element */
-    if (second->next) {
-      second->next->prev = second;
-    }
-
-    return second;
-  }
-
-  /* never reached */
-  return NULL;
-}
-
-/*
- * Sorts the elements of a c_list. This is a merge sort.
- */
-c_list_t *c_list_sort(c_list_t *list, c_list_compare_fn func) {
-  c_list_t *second;
-
-  /* list is empty */
-  if (list == NULL) {
-    return NULL;
-  } else if (list->next == NULL) {
-    /* list has only one element */
-    return list;
-  } else {
-    /* split list */
-    second = _c_list_split(list);
-  }
-
-  return _c_list_merge(c_list_sort(list, func), c_list_sort(second, func),
-      func);
-}
-
--- a/csync/src/std/c_list.h
+++ b/csync/src/std/c_list.h
@@ -1,275 +0,0 @@
-/*
- * csync list -- a doubly-linked list
- *
- * This code is based on glist.{h,c} from glib
- *   ftp://ftp.gtk.org/pub/gtk/
- * Copyright (c) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- * Copyright (c) 2006-2013  Andreas Schneider <mail@csyncapses.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-#ifndef _C_LIST_H
-#define _C_LIST_H
-
-/**
- * c_list -- a doubly-linked list.
- *
- * The c_list_t structure and its associated functions provide a standard
- * doubly-linked list data structure. Each node has two links: one points to
- * the previous node, or points to a null value or empty list if it is the
- * first  node; and one points to the next, or points to a null value or empty
- * list if it is the final node.
- *
- * The data contained in each element can be simply pointers to any type of
- * data. You are the owner of the data, this means you have to free the memory
- * you have allocated for the data.
- *
- * @file   c_list.h
- */
-
-
-/**
- * @typedef c_list_t
- * Creates a type name for c_list_s
- */
-typedef struct c_list_s c_list_t;
-/**
- * @struct c_list_s
- *
- * Used for each element in a doubly-linked list. The list can hold
- * any kind of data.
- */
-struct c_list_s {
-  /** Link to the next element in the list */
-  struct c_list_s *next;
-  /** Link to the previous element in the list */
-  struct c_list_s *prev;
-
-  /**
-   * Holds the element's data, which can be a pointer to any kind of
-   * data.
-   */
-  void *data;
-};
-
-/**
- * Specifies the type of a comparison function used to compare two values. The
- * value which should be returned depends on the context in which the
- * c_list_compare_fn is used.
- *
- * @param a             First parameter to compare with.
- *
- * @param b             Second parameter to compare with.
- *
- * @return              The function should return a number > 0 if the first
- *                      parameter comes after the second parameter in the sort
- *                      order.
- */
-typedef int (*c_list_compare_fn) (const void *a, const void *b);
-
-/**
- * Adds a new element on to the end of the list.
- *
- * @param list          A pointer to c_list.
- *
- * @param data          The data for the new element.
- *
- * @return              New start of the list, which may have changed, so make
- *                      sure you store the new value.
- */
-c_list_t *c_list_append(c_list_t *list, void *data);
-
-/**
- * Adds a new element on at the beginning of the list.
- *
- * @param list          A pointer to c_list.
- *
- * @param data          The data for the new element.
- *
- * @return              New start of the list, which may have changed, so make
- *                      sure you store the new value.
- */
-c_list_t *c_list_prepend(c_list_t *list, void *data);
-
-/**
- * Inserts a new element into the list at the given position. If the position
- * is lesser than 0, the new element gets appended to the list, if the position
- * is 0, we prepend the element and if the given position is greater than the
- * length of the list, the element gets appended too.
- *
- * @param list          A pointer to c_list.
- *
- * @param data          The data for the new element.
- *
- * @param position      The position to insert the element.
- *
- * @return              New start of the list, which may have changed, so make
- *                      sure you store the new value.
- */
-c_list_t *c_list_insert(c_list_t *list, void *data, long position);
-
-/**
- * Inserts a new element into the list, using the given comparison function to
- * determine its position.
- *
- * @param list          A pointer to c_list.
- *
- * @param data          The data for the new element.
- *
- * @param fn            The function to compare elements in the list. It
- *                      should return a number > 0 if the first parameter comes
- *                      after the second parameter in the sort order.
- *
- * @return              New start of the list, which may have changed, so make
- *                      sure you store the new value.
- */
-c_list_t *c_list_insert_sorted(c_list_t *list, void *data,
-    c_list_compare_fn fn);
-
-/**
- * Allocates space for one c_list_t element.
- *
- * @return             A pointer to the newly-allocated element.
- */
-c_list_t *c_list_alloc(void);
-
-/**
- * Removes an element from a c_list. If two elements contain the same data,
- * only the first is removed.
- *
- * @param list          A pointer to c_list.
- *
- * @param data          The data of the element to remove.
- *
- * @return              The first element of the list, NULL on error.
- */
-c_list_t *c_list_remove(c_list_t *list, void *data);
-
-/**
- * Frees all elements from a c_list.
- *
- * @param list          A pointer to c_list.
- */
-void c_list_free(c_list_t *list);
-
-/**
- * Gets the next element in a c_list.
- *
- * @param               An element in a c_list.
- *
- * @return              The next element, or NULL if there are no more
- *                      elements.
- */
-c_list_t *c_list_next(c_list_t *list);
-
-/**
- * Gets the previous element in a c_list.
- *
- * @param               An element in a c_list.
- *
- * @return              The previous element, or NULL if there are no more
- *                      elements.
- */
-c_list_t *c_list_prev(c_list_t *list);
-
-/**
- * Gets the number of elements in a c_list
- *
- * @param list          A pointer to c_list.
- *
- * @return              The number of elements
- */
-unsigned long c_list_length(c_list_t *list);
-
-/**
- * Gets the first element in a c_list
- *
- * @param list          A pointer to c_list.
- *
- * @return              New start of the list, which may have changed, so make
- *                      sure you store the new value.
- */
-c_list_t *c_list_first(c_list_t *list);
-
-/**
- * Gets the last element in a c_list
- *
- * @param list          A pointer to c_list.
- *
- * @return              New start of the list, which may have changed, so make
- *                      sure you store the new value.
- */
-c_list_t *c_list_last(c_list_t *list);
-
-/**
- * Gets the element at the given positon in a c_list.
- *
- * @param list          A pointer to c_list.
- *
- * @param position      The position of the element, counting from 0.
- *
- * @return              New start of the list, which may have changed, so make
- *                      sure you store the new value.
- */
-c_list_t *c_list_position(c_list_t *list, long position);
-
-/**
- * Finds the element in a c_list_t which contains the given data.
- *
- * @param list          A pointer to c_list.
- *
- * @param data          The data of the element to remove.
- *
- * @return              The found element or NULL if it is not found.
- */
-c_list_t *c_list_find(c_list_t *list, const void *data);
-
-/**
- * Finds an element, using a supplied function to find the desired
- * element.
- *
- * @param list          A pointer to c_list.
- *
- * @param data          The data of the element to remove.
- *
- * @param func          The function to call for each element. It should
- *                      return 0 when the desired element is found.
- *
- * @return              The found element or NULL if it is not found.
- */
-c_list_t *c_list_find_custom(c_list_t *list, const void *data,
-    c_list_compare_fn fn);
-
-/**
- * Sorts the elements of a c_list.
- * The algorithm used is Mergesort, because that works really well
- * on linked lists, without requiring the O(N) extra space it needs
- * when you do it on arrays.
- *
- * @param list          A pointer to c_list.
- *
- * @param func          The comparison function used to sort the c_list. This
- *                      function is passed 2 elements of the GList and should
- *                      return 0 if they are equal, a negative value if the
- *                      first element comes before the second, or a positive
- *                      value if the first element comes after the second.
- *
- * @return              New start of the list, which may have changed, so make
- *                      sure you store the new value.
- */
-c_list_t *c_list_sort(c_list_t *list, c_list_compare_fn func);
-
-#endif /* _C_LIST_H */
-
--- a/csync/src/std/c_path.c
+++ b/csync/src/std/c_path.c
@@ -67,9 +67,6 @@ char *c_dirname (const char *path) {
  while(len > 0 && path[len - 1] == '/') --len;

  newbuf = c_malloc(len + 1);
-  if (newbuf == NULL) {
-    return NULL;
-  }

  strncpy(newbuf, path, len);
  newbuf[len] = '\0';
@@ -107,9 +104,6 @@ char *c_basename (const char *path) {
  }

  newbuf = c_malloc(len + 1);
-  if (newbuf == NULL) {
-    return NULL;
-  }

  strncpy(newbuf, s, len);
  newbuf[len] = '\0';
--- a/csync/src/std/c_rbtree.c
+++ b/csync/src/std/c_rbtree.c
@@ -47,10 +47,6 @@ int c_rbtree_create(c_rbtree_t **rbtree, c_rbtree_compare_func *key_compare, c_r
  }

  tree = c_malloc(sizeof(*tree));
-  if (tree == NULL) {
-    return -1;
-  }
-
  tree->root = NIL;
  tree->key_compare = key_compare;
  tree->data_compare = data_compare;
@@ -400,10 +396,6 @@ int c_rbtree_insert(c_rbtree_t *tree, void *data) {
  }

  x = (c_rbnode_t *) c_malloc(sizeof(c_rbnode_t));
-  if (x == NULL) {
-    errno = ENOMEM;
-    return -1;
-  }

  x->tree = tree;
  x->data = data;
--- a/csync/src/std/c_string.c
+++ b/csync/src/std/c_string.c
@@ -115,10 +115,6 @@ static char *c_iconv(const char* str, enum iconv_direction dir)
  out = c_malloc(outsize);
  out_in = out;

-  if (out == NULL) {
-      return NULL;
-  }
-
  if (dir == iconv_to_native) {
      ret = iconv(_iconvs.to, &in, &size, &out, &outsize);
  } else {
@@ -134,6 +130,14 @@ static char *c_iconv(const char* str, enum iconv_direction dir)
 }
 #endif /* defined(HAVE_ICONV) && defined(WITH_ICONV) */

+int c_strncasecmp(const char *a, const char *b, size_t n) {
+#ifdef _WIN32
+    return _strnicmp(a, b, n);
+#else
+    return strncasecmp(a, b, n);
+#endif
+}
+
 int c_streq(const char *a, const char *b) {
  register const char *s1 = a;
  register const char *s2 = b;
@@ -165,10 +169,6 @@ c_strlist_t *c_strlist_new(size_t size) {
  }

  strlist->vector = (char **) c_malloc(size * sizeof(char *));
-  if (strlist->vector == NULL) {
-    SAFE_FREE(strlist);
-    return NULL;
-  }
  strlist->count = 0;
  strlist->size = size;

@@ -259,10 +259,6 @@ char* c_utf8_from_locale(const mbchar_t *wstr)
  size_needed = WideCharToMultiByte(CP_UTF8, 0, wstr, len, NULL, 0, NULL, NULL);
  if (size_needed > 0) {
    mdst = c_malloc(size_needed + 1);
-    if (mdst == NULL) {
-      errno = ENOMEM;
-      return NULL;
-    }

    memset(mdst, 0, size_needed + 1);
    WideCharToMultiByte(CP_UTF8, 0, wstr, len, mdst, size_needed, NULL, NULL);
@@ -297,11 +293,6 @@ mbchar_t* c_utf8_to_locale(const char *str)
  if (size_needed > 0) {
    int size_char = (size_needed + 1) * sizeof(mbchar_t);
    dst = c_malloc(size_char);
-    if (dst == NULL) {
-      errno = ENOMEM;
-      return NULL;
-    }
-
    memset((void*)dst, 0, size_char);
    MultiByteToWideChar(CP_UTF8, 0, str, -1, dst, size_needed);
  }
--- a/csync/src/std/c_string.h
+++ b/csync/src/std/c_string.h
@@ -59,6 +59,17 @@ struct c_strlist_s {
  size_t size;
 };

+/**
+ * @brief Compare to strings case insensitively.
+ *
+ * @param a  First string to compare.
+ * @param b  Second string to compare.
+ * @param n  Max comparison length.
+ *
+ * @return see strncasecmp
+ */
+int c_strncasecmp(const char *a, const char *b, size_t n);
+
 /**
 * @brief Compare to strings if they are equal.
 *
--- a/csync/src/vio/csync_vio.c
+++ b/csync/src/vio/csync_vio.c
@@ -29,7 +29,6 @@
 #include "csync_private.h"
 #include "csync_util.h"
 #include "vio/csync_vio.h"
-#include "vio/csync_vio_handle_private.h"
 #include "vio/csync_vio_local.h"
 #include "csync_statedb.h"
 #include "std/c_jhash.h"
@@ -37,7 +36,9 @@
 #define CSYNC_LOG_CATEGORY_NAME "csync.vio.main"

 #include "csync_log.h"
+#if USE_NEON
 #include "csync_owncloud.h"
+#endif

 csync_vio_handle_t *csync_vio_opendir(CSYNC *ctx, const char *name) {
  switch(ctx->replica) {
@@ -45,11 +46,11 @@ csync_vio_handle_t *csync_vio_opendir(CSYNC *ctx, const char *name) {
      if(ctx->remote.read_from_db) {
          CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "Read from db flag is true, should not!" );
      }
-      return owncloud_opendir(ctx, name);
+      return ctx->callbacks.remote_opendir_hook(name, ctx->callbacks.vio_userdata);
      break;
    case LOCAL_REPLICA:
 	if( ctx->callbacks.update_callback ) {
-	  ctx->callbacks.update_callback(ctx->replica, name, ctx->callbacks.update_callback_userdata);
+        ctx->callbacks.update_callback(ctx->replica, name, ctx->callbacks.update_callback_userdata);
 	}
      return csync_vio_local_opendir(name);
      break;
@@ -73,7 +74,8 @@ int csync_vio_closedir(CSYNC *ctx, csync_vio_handle_t *dhandle) {
      if( ctx->remote.read_from_db ) {
          CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "Remote ReadFromDb is true, should not!");
      }
-      rc = owncloud_closedir(ctx, dhandle);
+      ctx->callbacks.remote_closedir_hook(dhandle, ctx->callbacks.vio_userdata);
+      rc = 0;
      break;
  case LOCAL_REPLICA:
      rc = csync_vio_local_closedir(dhandle);
@@ -91,7 +93,7 @@ csync_vio_file_stat_t *csync_vio_readdir(CSYNC *ctx, csync_vio_handle_t *dhandle
      if( ctx->remote.read_from_db ) {
          CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "Remote readfromdb is true, should not!");
      }
-      return owncloud_readdir(ctx, dhandle);
+      return ctx->callbacks.remote_readdir_hook(dhandle, ctx->callbacks.vio_userdata);
      break;
    case LOCAL_REPLICA:
      return csync_vio_local_readdir(dhandle);
@@ -130,5 +132,8 @@ char *csync_vio_get_status_string(CSYNC *ctx) {
  if(ctx->error_string) {
    return ctx->error_string;
  }
+#ifdef USE_NEON
  return owncloud_error_string(ctx);
+#endif
+  return 0;
 }
--- a/csync/src/vio/csync_vio.h
+++ b/csync/src/vio/csync_vio.h
@@ -25,8 +25,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include "c_private.h"
-#include "vio/csync_vio_handle.h"
-#include "vio/csync_vio_file_stat.h"
+#include "csync.h"
 #include "csync_private.h"

 typedef struct fhandle_s {
--- a/csync/src/vio/csync_vio_file_stat.c
+++ b/csync/src/vio/csync_vio_file_stat.c
@@ -19,7 +19,7 @@
 */

 #include "c_lib.h"
-#include "vio/csync_vio_file_stat.h"
+#include "csync.h"

 csync_vio_file_stat_t *csync_vio_file_stat_new(void) {
  csync_vio_file_stat_t *file_stat = (csync_vio_file_stat_t *) c_malloc(sizeof(csync_vio_file_stat_t));
@@ -27,6 +27,20 @@ csync_vio_file_stat_t *csync_vio_file_stat_new(void) {
  return file_stat;
 }

+csync_vio_file_stat_t* csync_vio_file_stat_copy(csync_vio_file_stat_t *file_stat) {
+    csync_vio_file_stat_t *file_stat_cpy = csync_vio_file_stat_new();
+    memcpy(file_stat_cpy, file_stat, sizeof(csync_vio_file_stat_t));
+    file_stat_cpy->etag = c_strdup(file_stat_cpy->etag);
+    if (file_stat_cpy->directDownloadCookies) {
+        file_stat_cpy->directDownloadCookies = c_strdup(file_stat_cpy->directDownloadCookies);
+    }
+    if (file_stat_cpy->directDownloadUrl) {
+        file_stat_cpy->directDownloadUrl = c_strdup(file_stat_cpy->directDownloadUrl);
+    }
+    file_stat_cpy->name = c_strdup(file_stat_cpy->name);
+    return file_stat_cpy;
+}
+
 void csync_vio_file_stat_destroy(csync_vio_file_stat_t *file_stat) {
  /* FIXME: free rest */
  if (file_stat == NULL) {
--- a/csync/src/vio/csync_vio_file_stat.h
+++ b/csync/src/vio/csync_vio_file_stat.h
@@ -1,121 +0,0 @@
-/*
- * libcsync -- a library to sync a directory with another
- *
- * Copyright (c) 2008-2013 by Andreas Schneider <asn@cryptomilk.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef _CSYNC_VIO_FILE_STAT_H
-#define _CSYNC_VIO_FILE_STAT_H
-
-/*
- * cannot include csync_private here because
- * that would cause circular inclusion
- */
-#include "std/c_private.h"
-#include "csync.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdint.h>
-
-#define FILE_ID_BUF_SIZE 21
-
-// currently specified at https://github.com/owncloud/core/issues/8322 are 9 to 10
-#define REMOTE_PERM_BUF_SIZE 15
-
-typedef struct csync_vio_file_stat_s csync_vio_file_stat_t;
-
-enum csync_vio_file_flags_e {
-  CSYNC_VIO_FILE_FLAGS_NONE = 0,
-  CSYNC_VIO_FILE_FLAGS_SYMLINK = 1 << 0,
-  CSYNC_VIO_FILE_FLAGS_LOCAL = 1 << 1
-};
-
-enum csync_vio_file_type_e {
-  CSYNC_VIO_FILE_TYPE_UNKNOWN,
-  CSYNC_VIO_FILE_TYPE_REGULAR,
-  CSYNC_VIO_FILE_TYPE_DIRECTORY,
-  CSYNC_VIO_FILE_TYPE_FIFO,
-  CSYNC_VIO_FILE_TYPE_SOCKET,
-  CSYNC_VIO_FILE_TYPE_CHARACTER_DEVICE,
-  CSYNC_VIO_FILE_TYPE_BLOCK_DEVICE,
-  CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK
-};
-
-enum csync_vio_file_stat_fields_e {
-  CSYNC_VIO_FILE_STAT_FIELDS_NONE = 0,
-  CSYNC_VIO_FILE_STAT_FIELDS_TYPE = 1 << 0,
-  CSYNC_VIO_FILE_STAT_FIELDS_MODE = 1 << 1, // local POSIX mode
-  CSYNC_VIO_FILE_STAT_FIELDS_FLAGS = 1 << 2,
-  CSYNC_VIO_FILE_STAT_FIELDS_DEVICE = 1 << 3,
-  CSYNC_VIO_FILE_STAT_FIELDS_INODE = 1 << 4,
-  CSYNC_VIO_FILE_STAT_FIELDS_LINK_COUNT = 1 << 5,
-  CSYNC_VIO_FILE_STAT_FIELDS_SIZE = 1 << 6,
-//  CSYNC_VIO_FILE_STAT_FIELDS_BLOCK_COUNT = 1 << 7, /* will be removed */
-//  CSYNC_VIO_FILE_STAT_FIELDS_BLOCK_SIZE = 1 << 8,  /* will be removed */
-  CSYNC_VIO_FILE_STAT_FIELDS_ATIME = 1 << 9,
-  CSYNC_VIO_FILE_STAT_FIELDS_MTIME = 1 << 10,
-  CSYNC_VIO_FILE_STAT_FIELDS_CTIME = 1 << 11,
-//  CSYNC_VIO_FILE_STAT_FIELDS_SYMLINK_NAME = 1 << 12,
-//  CSYNC_VIO_FILE_STAT_FIELDS_CHECKSUM = 1 << 13,
-//  CSYNC_VIO_FILE_STAT_FIELDS_ACL = 1 << 14,
-//  CSYNC_VIO_FILE_STAT_FIELDS_UID = 1 << 15,
-//  CSYNC_VIO_FILE_STAT_FIELDS_GID = 1 << 16,
-  CSYNC_VIO_FILE_STAT_FIELDS_ETAG = 1 << 17,
-  CSYNC_VIO_FILE_STAT_FIELDS_FILE_ID = 1 << 18,
-  CSYNC_VIO_FILE_STAT_FIELDS_DIRECTDOWNLOADURL = 1 << 19,
-  CSYNC_VIO_FILE_STAT_FIELDS_DIRECTDOWNLOADCOOKIES = 1 << 20,
-  CSYNC_VIO_FILE_STAT_FIELDS_PERM = 1 << 21 // remote oC perm
-
-};
-
-
-struct csync_vio_file_stat_s {
-  char *name;
-  char *etag; // FIXME: Should this be inlined like file_id and perm?
-  char file_id[FILE_ID_BUF_SIZE+1];
-  char *directDownloadUrl;
-  char *directDownloadCookies;
-  char remotePerm[REMOTE_PERM_BUF_SIZE+1];
-
-  time_t atime;
-  time_t mtime;
-  time_t ctime;
-
-  int64_t size;
-
-  mode_t mode;
-
-  dev_t device;
-  uint64_t inode;
-  nlink_t nlink;
-
-  enum csync_vio_file_stat_fields_e fields;
-  enum csync_vio_file_type_e type;
-
-  enum csync_vio_file_flags_e flags;
-};
-
-csync_vio_file_stat_t *csync_vio_file_stat_new(void);
-
-void csync_vio_file_stat_destroy(csync_vio_file_stat_t *fstat);
-
-void csync_vio_file_stat_set_file_id( csync_vio_file_stat_t* dst, const char* src );
-
-void csync_vio_set_file_id(char* dst, const char *src );
-
-#endif /* _CSYNC_VIO_METHOD_H */
--- a/csync/src/vio/csync_vio_handle.h
+++ b/csync/src/vio/csync_vio_handle.h
@@ -1,26 +0,0 @@
-/*
- * libcsync -- a library to sync a directory with another
- *
- * Copyright (c) 2008-2013 by Andreas Schneider <asn@cryptomilk.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef _CSYNC_VIO_HANDLE_H
-#define _CSYNC_VIO_HANDLE_H
-
-typedef void csync_vio_handle_t;
-
-#endif /* _CSYNC_VIO_HANDLE_H */
--- a/csync/src/vio/csync_vio_handle_private.h
+++ b/csync/src/vio/csync_vio_handle_private.h
@@ -1,26 +0,0 @@
-/*
- * cynapses libc functions
- *
- * Copyright (c) 2008-2013 by Andreas Schneider <asn@cryptomilk.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef _CSYNC_VIO_HANDLE_PRIVATE_H
-#define _CSYNC_VIO_HANDLE_PRIVATE_H
-
-#include "vio/csync_vio_handle.h"
-
-#endif /* _CSYNC_VIO_HANDLE_PRIVATE_H */
--- a/Show More
+++ b/Show More