Adding thumbs.db

Adding images
Adding screen captures for installation instructions.
2014-06-12 13:20:59 -04:00 · 2014-06-12 13:10:44 -04:00
@@ -2,4 +2,3 @@
 .gitignore              export-ignore
 .gitattributes          export-ignore
 .commit-template        export-ignore
-/binary                 export-ignore
@@ -16,153 +16,3 @@ build*
 cscope.*
 tags
 t1.cfg
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-build/
-bld/
-[Bb]in/
-[Oo]bj/
-
-# Roslyn cache directories
-*.ide/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-#NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Mac OS X specific
-shell_integration/MacOSX/*.xcworkspace/xcuserdata/
-**/.DS_Store
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.cachefile
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# TFS 2012 Local Workspace
-$tf/
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-## TODO: Comment the next line if you want to checkin your
-## web deploy settings but do note that will include unencrypted
-## passwords
-*.pubxml
-
-# NuGet Packages
-packages/*
-*.nupkg
-## TODO: If the tool you use requires repositories.config
-## uncomment the next line
-#!packages/repositories.config
-
-# Enable "build/" folder in the NuGet Packages folder since
-# NuGet packages use it for MSBuild targets.
-# This line needs to be after the ignore of the build folder
-# (and the packages folder if the line above has been uncommented)
-!packages/build/
-
-# Windows Store app package directory
-AppPackages/
-
-# Others
-sql/
-*.Cache
-ClientBin/
-[Ss]tyle[Cc]op.*
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.pfx
-*.publishsettings
-node_modules/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Microsoft Fakes
-FakesAssemblies/
-
@@ -3,7 +3,4 @@
 	url = https://github.com/owncloud/documentation
 [submodule "src/3rdparty/qtmacgoodies"]
 	path = src/3rdparty/qtmacgoodies
-	url = git://github.com/guruz/qtmacgoodies.git
-[submodule "binary"]
-	path = binary
-	url = git://github.com/owncloud/owncloud-client-binary.git
+	url = git://github.com/shadone/qtmacgoodies.git
@@ -1,35 +0,0 @@
-language: cpp
-
-compiler: 
-  - gcc
-  - clang
-
-env:
-  - QT=qt4
-  - QT=qt5 PATH=/opt/Qt/5.3/gcc_64/bin:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin
-
-os:
-  - linux
-  - osx
-
-before_install:
-  - sh -c "if [ '$QT' = 'qt4' ]; then wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/xUbuntu_12.04/Release.key; sudo apt-key add - < Release.key; fi"
-  - sudo sh -c "if [ '$QT' = 'qt4' ]; then echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_12.04/ /' > /etc/apt/sources.list.d/qtkeychain.list; fi"
-  - sh -c "if [ '$QT' = 'qt4' ]; then sudo apt-get update -qq; sudo apt-get install -qq libqt4-dev qt4-dev-tools libqtkeychain-dev; fi"
-  - sh -c "if [ '$QT' = 'qt5' ]; then sudo apt-add-repository -y ppa:canonical-qt5-edgers/qt5-daily; sudo apt-get update -qq; sudo apt-get install -qq qtdeclarative5-dev libqt5webkit5-dev qttools5-dev; fi"
-  - sh -c "if [ '$QT' = 'qt5' ]; then wget http://download.opensuse.org/repositories/home:/DeepDiver1975:/branches:/isv:/ownCloud:/desktop/xUbuntu_13.10/Release.key; sudo apt-key add - < Release.key; fi"
-  - sudo sh -c "if [ '$QT' = 'qt5' ]; then echo 'deb http://download.opensuse.org/repositories/home:/DeepDiver1975:/branches:/isv:/ownCloud:/desktop/xUbuntu_13.10/ /' > /etc/apt/sources.list.d/qt5keychain.list; fi"
-  - sh -c "if [ '$QT' = 'qt5' ]; then wget http://download.owncloud.com/download/qt-5.3-travis.tar.xz; fi"
-  - sh -c "if [ '$QT' = 'qt5' ]; then sudo tar xif -C /opt ~/qt-5.3-travis.tar.xz; fi"
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq cmake sqlite3 libneon27-gnutls-dev
-
-before_script:
-  - mkdir build
-  - cd build
-  - cmake -DUNIT_TESTING=1 ..
-
-script: 
-  - make
-  - ctest --output-on-failure
-
@@ -1,7 +1,5 @@

 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 )
@@ -20,6 +18,7 @@ if (NOT DEFINED APPLICATION_SHORTNAME)
 endif()

 include(${CMAKE_SOURCE_DIR}/VERSION.cmake)
+configure_file( ${CMAKE_SOURCE_DIR}/src/mirall/version.h.in "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/version.h" )
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/")

 #####
@@ -61,9 +60,9 @@ set(DATADIR ${DATA_INSTALL_DIR})
 # BUILD_OWNCLOUD_OSX_BUNDLE was not initialized OR set to true on OSX
 if(APPLE AND (NOT DEFINED BUILD_OWNCLOUD_OSX_BUNDLE OR BUILD_OWNCLOUD_OSX_BUNDLE))
    set(BUILD_OWNCLOUD_OSX_BUNDLE ON)
-    set(OWNCLOUD_OSX_BUNDLE "bin/${APPLICATION_EXECUTABLE}.app")
-    set(LIB_INSTALL_DIR "bin/${APPLICATION_EXECUTABLE}.app/Contents/MacOS")
-    set(BIN_INSTALL_DIR "bin/${APPLICATION_EXECUTABLE}.app/Contents/MacOS")
+    set(OWNCLOUD_OSX_BUNDLE "${APPLICATION_EXECUTABLE}.app")
+    set(LIB_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS")
+    set(BIN_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS")

 # BUILD_OWNCLOUD_OSX_BUNDLE was disabled on OSX
 elseif(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE)
@@ -141,7 +140,6 @@ set(TRANSLATIONS ${TRANS_FILES})

 add_subdirectory(csync)
 add_subdirectory(src)
-add_subdirectory(shell_integration)
 add_subdirectory(doc)

 if(UNIT_TESTING)
@@ -1,40 +1,5 @@
 ChangeLog
 =========
-version 1.6.2 (release 2014-07-x )
- * Another small mem leak fixed in HTTP Credentials.
- * Fix local file name clash detection for MacOSX.
- * Limit maximum wait time to ten seconds in network limiting.
- * Fix data corruption while trying to resume and the server does
-   not support it.
- * HTTP Credentials: Read password from legacy place if not found.
- * Shibboleth: Fix the waiting curser that would not disapear (#1915)
- * Limit memory usage to avoid mem wasting and crashes
- * Propagator: Fix crash when logging out during upload (#1957)
- * Propagator_qnam: Fix signal slot connection (#1963)
- * Use more elaborated way to detect that the server was reconfigured (#1948)
- * Setup Wizard: Reconfigure Server also if local path was changed (#1948)
-
-version 1.6.1 (release 2014-06-26 )
- * Fix 'precondition failed' bug with broken upload
- * Fix openSSL problems for windows deployment
- * Fix syncing a folder with '#' in the name
- * Fix #1845: do not update parent directory etag before sub
-   directories are removed
- * Fix reappearing directories if dirs are removed during its
-   upload
- * Fix app version in settings dialog, General tab
- * Fix crash in FolderWizard when going offline
- * Shibboleth fixes
- * More specific error messages (file remove during upload, open
-   local sync file)
- * Use QSet rather than QHash in SyncEngine (save memory)
- * Fix some memory leaks
- * Fix some thread race problems, ie. wait for neon thread to finish
-   before the propagator is shut down
- * Fix a lot of issues and warnings found by Coverity
- * Fix Mac some settings dialog problems
-
-
 version 1.6.0 (release 2014-05-30 )
 * Minor GUI improvements
 * Qt5 compile issues fixed
@@ -4,7 +4,7 @@ set( MIRALL_VERSION_PATCH 0 )
 set( MIRALL_SOVERSION 0 )

 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "beta1") #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "prealpha") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )

 if( NOT DEFINED MIRALL_VERSION_BUILD )
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-# Script to create the Mac installer using the packages tool from
-# http://s.sudre.free.fr/Software/Packages/about.html
-#
-
-# the path of installation must be given as parameter
-if [ -z "$1" ]; then
-  echo "ERROR: Provide the CMAKE_INSTALL_DIR to this script."
-  exit 1
-fi
-
-prjfile="admin/osx/macosx.pkgproj"
-if [ ! -f $prjfile ]; then
-  echo "ERROR: macosx.pkgproj not in admin dir, start from CMAKE_SOURCE_DIR!"
-  exit 2
-fi
-
-pack="admin/ownCloud Installer.pkg"
-rm -f $pack
-
-install_path=$1
-
-# The name of the installer package
-installer=ownCloud\ Installer.pkg
-
-# The command line tool of the "Packages" tool, see link above.
-pkgbuild=/usr/local/bin/packagesbuild
-
-$pkgbuild -F $install_path $prjfile
-rc=$?
-
-if [ $rc == 0 ]; then
-  echo "Successfully created $pack"
-else
-  echo "Failed to create $pack"
-  exit 3
-fi
-
-# FIXME: Sign the finished package.
-# See http://s.sudre.free.fr/Software/documentation/Packages/en/Project_Configuration.html#5
-# certname=gdbsign
-# productsign --cert $certname admin/$installer ./$installer
-
-
@@ -1,19 +0,0 @@
-#!/bin/sh -x
-
-#VS2013
-base_url=http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3
-tmp_path=/tmp/.vcredist
-
-mkdir -p $tmp_path
-
-copy_cached_file() {
-  file=$1
-  if [ ! -e $tmp_path/$file ]; then
-    wget -O $tmp_path/$file $base_url/$file
-  fi
-  cp -a $tmp_path/$file $PWD
-}
-
-copy_cached_file "vcredist_x64.exe"
-copy_cached_file "vcredist_x86.exe"
-
@@ -1,15 +1,12 @@
 # Auto-generated - do not modify
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Erakutsi bertsio-berritze oharrak"
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "kill prozesua ez da aurkitu!"
 StrCpy $PageReinstall_NEW_Field_2 "Desinstalatu instalatu baino lehen"
 StrCpy $PageReinstall_NEW_Field_3 "Ez desinstalatu"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Dagoeneko Instalatuta"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Hautatu nola nahi duzun ${APPLICATION_NAME} instalatzea."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} dagoeneko instalatuta dago.\nHautatu zer operazio egin nahi duzu eta klikatu Hurrengoa jarraitzeko."
 StrCpy $PageReinstall_SAME_Field_2 "Gehitu/Berrinstalatu osagaiak"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalatu ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalatu ${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Hautatu zer mantenu aukera egin nahi duzun."
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Hasierako Menuko Lasterbidea"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Hasierako Menuan ${APPLICATION_NAME}rako Abiarazle bizkorra sortzen."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Mahaigaineko Lasterbidea"
@@ -32,13 +29,14 @@ 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 $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Show release notes"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Killing ${APPLICATION_EXECUTABLE} processes."
 StrCpy $PageReinstall_NEW_Field_1 "An older version of ${APPLICATION_NAME} is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
 StrCpy $PageReinstall_OLD_Field_1 "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choose the maintenance option to perform."
 StrCpy $SEC_APPLICATION_DETAILS "Installing ${APPLICATION_NAME} essentials."
-StrCpy $OPTION_SECTION_SC_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)?"
@@ -1,46 +1,44 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar les notes de versió"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "S'ha trobat el(s) procés ${APPLICATION_EXECUTABLE} que s'ha d'aturar.$\nVoleu que l'instal·lador l'aturi?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "S'estan matant els processos ${APPLICATION_EXECUTABLE}."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Procés per matar no trobat!"
 StrCpy $PageReinstall_NEW_Field_1 "Una versió anterior de ${APPLICATION_NAME}  està instal·lada en el vostre sistema. Es recomana desinstal·lar la versió actual abans d'instal·lar. Seleccioneu l'operació que desitjeu realitzar i feu clic a Següent per continuar."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstal·lar abans d'instal·lar"
 StrCpy $PageReinstall_NEW_Field_3 "No instal·lar"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ja instal·lat"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Trieu la manera com voleu instal·lar ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "Una versió més recent de ${APPLICATION_NAME} ja està instal.lada!! No es recomana instal.lar una versió més antiga. Si realment voleu instal.lar una versió més antiga, és millor primer desinstal.lar la versió actual. Seleccioni l'operació que desitjeu realitzar i feu clic a Següent per a continuar."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} ja està instal.lat.↩\nSeleccioneu l'operació que desitjeu realitzar i feu clic a Següent per continuar."
-StrCpy $PageReinstall_SAME_Field_2 "Afegir/Reinstal.lar components"
-StrCpy $PageReinstall_SAME_Field_3 "Desinstal.lar ${APPLICATION_NAME}"
-StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstal.lar ${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Escolliu l'opció de manteniment per executar-ho."
-StrCpy $SEC_APPLICATION_DETAILS "Instal·lant ${APPLICATION_NAME} essencial."
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Accés directe del programa al menú d'inici"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Afegint la drecera per ${APPLICATION_NAME} al menú d'inici."
-StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Drecera a l'escriptori"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Creant les dreceres a l'escriptori"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Drecera d'inici ràpid"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creant la drecera per l'inici ràpid"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} essencial."
-StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Drecera ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Drecera a l'escrptori per ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Drecera d'inici ràpid per ${APPLICATION_NAME}."
-StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Esborra la carpeta de dades de ${APPLICATION_NAME} del vostre equip."
-StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Voleu esborrar la carpeta de dades de ${APPLICATION_NAME}?"
-StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Deixeu-ho sense marcar per mantenir la carpeta de dades per un ús posterior o marqueu-ho per esborrar la carpeta de dades."
-StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Sí, esborra la carpeta de dades."
-StrCpy $UNINSTALLER_FILE_Detail "Escrivint el desinstal·lador"
-StrCpy $UNINSTALLER_REGISTRY_Detail "Escrivint les claus del registre de l'instal·lador"
 StrCpy $UNINSTALLER_FINISHED_Detail "Acabat"
-StrCpy $UNINSTALL_MESSAGEBOX "No sembla que ${APPLICATION_NAME} estigui instal·lat en la carpeta '$INSTDIR'.$\n$\nContinuo igualment (no recomanat)?"
-StrCpy $UNINSTALL_ABORT "La desinstal·lació s'ha cancel·lat."
-StrCpy $INIT_NO_QUICK_LAUNCH "Drecera d'inici ràpid (N/A)"
-StrCpy $INIT_NO_DESKTOP "Drecera de l'escrpitori (sobreescriu l'existent)"
-StrCpy $UAC_ERROR_ELEVATE "No es pot elevar, error:"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Aquest instal·lador requereix accés d'administrador, intenteu-ho de nou"
-StrCpy $INIT_INSTALLER_RUNNING "L'instal·lador ja s'està executant."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Aquest desinstal·lador requereix accés d'administrador, intenteu-ho de nou."
-StrCpy $INIT_UNINSTALLER_RUNNING "El desinstal·lador ja s'està executant."
 StrCpy $SectionGroup_Shortcuts "Dreceres"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Killing ${APPLICATION_EXECUTABLE} processes."
+StrCpy $PageReinstall_OLD_Field_1 "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_Field_2 "Add/Reinstall components"
+StrCpy $PageReinstall_SAME_Field_3 "Uninstall ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Uninstall ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choose the maintenance option to perform."
+StrCpy $SEC_APPLICATION_DETAILS "Installing ${APPLICATION_NAME} essentials."
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start Menu Program Shortcut"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Adding shortcut for ${APPLICATION_NAME} to the Start Menu."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Desktop Shortcut"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Creating Desktop Shortcuts"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Quick Launch Shortcut"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creating Quick Launch Shortcut"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} essentials."
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} shortcut."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Desktop shortcut for ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Quick Launch shortcut for ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Remove ${APPLICATION_NAME}'s data folder from your computer."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Do you want to delete ${APPLICATION_NAME}'s data folder?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Leave unchecked to keep the data folder for later use or check to delete the data folder."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Yes, delete this data folder."
+StrCpy $UNINSTALLER_FILE_Detail "Writing Uninstaller"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Writing Installer Registry Keys"
+StrCpy $UNINSTALL_MESSAGEBOX "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
+StrCpy $UNINSTALL_ABORT "Uninstall aborted by user"
+StrCpy $INIT_NO_QUICK_LAUNCH "Quick Launch Shortcut (N/A)"
+StrCpy $INIT_NO_DESKTOP "Desktop Shortcut (overwrites existing)"
+StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "This installer requires admin access, try again"
+StrCpy $INIT_INSTALLER_RUNNING "The installer is already running."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "This uninstaller requires admin access, try again"
+StrCpy $INIT_UNINSTALLER_RUNNING "The uninstaller is already running."
@@ -15,8 +15,6 @@ StrCpy $PageReinstall_SAME_Field_3 "Odinstalovat ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Odinstalovat ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Vyberte možnost údržby k provedení."
 StrCpy $SEC_APPLICATION_DETAILS "Instalují se náležitosti ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Stavová ikona pro Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instaluji stavovou ikonu pro Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Zástupce v Nabídce Start"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Přidávám zástupce pro ${APPLICATION_NAME} do Nabídky Start."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Zástupce na ploše"
@@ -6,7 +6,7 @@ StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Het te stoppen proces is niet gev
 StrCpy $PageReinstall_NEW_Field_1 "Er is een oudere versie van ${APPLICATION_NAME} geïnstalleerd op uw systeem. geadviseerd wordt om de huidige versie te de-installeren voordat de nieuwe versie wordt geïnstalleerd. Selecteer de uit te voeren actie en klik op Verder om door te gaan."
 StrCpy $PageReinstall_NEW_Field_2 "De-installeren voor installeren"
 StrCpy $PageReinstall_NEW_Field_3 "Niet de-installeren"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Al geïnstalleerd"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Reeds geinstalleerd"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Kies hoe u ${APPLICATION_NAME} wilt installeren."
 StrCpy $PageReinstall_OLD_Field_1 "Er is al een recentere versie van ${APPLICATION_NAME} geïnstalleerd! Installeren van een oudere versie wordt niet aangeraden. Als u echt de oudere versie wilt installeren, adviseren we de huidige versie eerst te verwijderen. Kies de actie die u wilt uitvoeren en druk op Verder om door te gaan."
 StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is al geïnstalleerd.\nKies de actie die u wilt uitvoeren en druk op Verder om door te gaan."
@@ -15,8 +15,6 @@ StrCpy $PageReinstall_SAME_Field_3 "De-installeer ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "De-installeer ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Kies de uit te voeren onderhoudsoptie."
 StrCpy $SEC_APPLICATION_DETAILS "Installeren ${APPLICATION_NAME} basis."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Statuspictogrammen voor Windows Verkenner"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installeren statuspictogrammen voor Windows Verkenner"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Startmenu snelkoppeling"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Toevoegen snelkoppeling voor ${APPLICATION_NAME} aan het Startmenu."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Werkblad snelkoppeling"
@@ -29,7 +27,7 @@ StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Werkblad snelkoppeling voor ${APPLICATIO
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Snelstart snelkoppeling voor ${APPLICATION_NAME}."
 StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Verwijder ${APPLICATION_NAME}'s data map van uw computer."
 StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Wilt u de ${APPLICATION_NAME}'s data map verwijderen?"
-StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Niet aankruisen om de datamap te bewaren, wel aankruisen om de datamap te verwijderen."
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Niet aankruisen om de datamap te bewaren of aankruisen om de datamap te verwijderen."
 StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Ja, verwijder deze data map."
 StrCpy $UNINSTALLER_FILE_Detail "Wegschrijven Uninstaller"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Wegschrijven installer Registersleutels"
@@ -37,10 +35,10 @@ StrCpy $UNINSTALLER_FINISHED_Detail "Klaar"
 StrCpy $UNINSTALL_MESSAGEBOX "Het lijkt er niet op dat ${APPLICATION_NAME} is geïnstalleerd in de map '$INSTDIR'.$\n$\nToch doorgaan (niet aangeraden)?"
 StrCpy $UNINSTALL_ABORT "De-installatie afgebroken door de gebruiker"
 StrCpy $INIT_NO_QUICK_LAUNCH "Snelstart snelkoppeling (N/A)"
-StrCpy $INIT_NO_DESKTOP "Bureaublad snelkoppeling (overschrijft huidige)"
+StrCpy $INIT_NO_DESKTOP "Desktop snelkoppeleng (overschrijft huidige)"
 StrCpy $UAC_ERROR_ELEVATE "Kan niet verhogen, fout:"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Dit installatieprogramma vereist beheerdersrechten. Probeer het opnieuw"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Dit installatieprogramma vereist administrator rechten. Probeer het opnieuw"
 StrCpy $INIT_INSTALLER_RUNNING "De Installer is al gestart."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Deze uninstaller vereist Beheerderstoegang, probeer opnieuw"
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Deze uninstaller vereist administrator toegang, probeer opnieuw"
 StrCpy $INIT_UNINSTALLER_RUNNING "De uninstaller is al gestart."
 StrCpy $SectionGroup_Shortcuts "Snelkoppelingen"
@@ -15,8 +15,6 @@ StrCpy $PageReinstall_SAME_Field_3 "Uninstall ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Uninstall ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choose the maintenance option to perform."
 StrCpy $SEC_APPLICATION_DETAILS "Installing ${APPLICATION_NAME} essentials."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start Menu Program Shortcut"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Adding shortcut for ${APPLICATION_NAME} to the Start Menu."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Desktop Shortcut"
@@ -42,5 +42,3 @@ 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"
@@ -1,46 +0,0 @@
-# Auto-generated - do not modify
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "نمایش پادداشت های انتشار نسخه"
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "پردازش برای از بین بردن یافت نشد!"
-StrCpy $PageReinstall_NEW_Field_3 "حذف نکن"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "از قبل نصب شده است"
-StrCpy $PageReinstall_SAME_Field_2 "افزودن/نصب مجدد اجزا"
-StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "میانبر دسکتاپ"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "ایجاد میانبر دسکتاپ"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "میانبر بازکردن سریع"
-StrCpy $UNINSTALLER_APPDATA_CHECKBOX "بله، این پوشه داده را حذف کن."
-StrCpy $UNINSTALLER_FILE_Detail "نوشتن حذف کننده"
-StrCpy $UNINSTALLER_FINISHED_Detail "اتمام"
-StrCpy $INIT_INSTALLER_RUNNING "نصاب از قبل در حال اجراست."
-StrCpy $INIT_UNINSTALLER_RUNNING "حذف کننده از قبل در حال اجراست."
-StrCpy $SectionGroup_Shortcuts "میانبرها"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Killing ${APPLICATION_EXECUTABLE} processes."
-StrCpy $PageReinstall_NEW_Field_1 "An older version of ${APPLICATION_NAME} is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
-StrCpy $PageReinstall_NEW_Field_2 "Uninstall before installing"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Choose how you want to install ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
-StrCpy $PageReinstall_SAME_Field_3 "Uninstall ${APPLICATION_NAME}"
-StrCpy $UNINSTALLER_APPDATA_TITLE "Uninstall ${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choose the maintenance option to perform."
-StrCpy $SEC_APPLICATION_DETAILS "Installing ${APPLICATION_NAME} essentials."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start Menu Program Shortcut"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Adding shortcut for ${APPLICATION_NAME} to the Start Menu."
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creating Quick Launch Shortcut"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} essentials."
-StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} shortcut."
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Desktop shortcut for ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Quick Launch shortcut for ${APPLICATION_NAME}."
-StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Remove ${APPLICATION_NAME}'s data folder from your computer."
-StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Do you want to delete ${APPLICATION_NAME}'s data folder?"
-StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Leave unchecked to keep the data folder for later use or check to delete the data folder."
-StrCpy $UNINSTALLER_REGISTRY_Detail "Writing Installer Registry Keys"
-StrCpy $UNINSTALL_MESSAGEBOX "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
-StrCpy $UNINSTALL_ABORT "Uninstall aborted by user"
-StrCpy $INIT_NO_QUICK_LAUNCH "Quick Launch Shortcut (N/A)"
-StrCpy $INIT_NO_DESKTOP "Desktop Shortcut (overwrites existing)"
-StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "This installer requires admin access, try again"
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "This uninstaller requires admin access, try again"
@@ -15,8 +15,6 @@ StrCpy $PageReinstall_SAME_Field_3 "Poista ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Poista ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Valitse suoritettava huoltotoimenpide."
 StrCpy $SEC_APPLICATION_DETAILS "Asennetaan sovelluksen ${APPLICATION_NAME} välttämättömyyksiä."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Tilakuvakkeet Windows Explorerille"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Asennetaan tilakuvakkeet Windows Explorerille"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Käynnistä-valikon pikakuvake"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Lisätään ${APPLICATION_NAME}-pikakuvake Käynnistä-valikkoon."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Työpöydän pikakuvake"
@@ -42,5 +42,3 @@ 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"
@@ -15,8 +15,6 @@ StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalar ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Escolla a opción de mantemento a realizar."
 StrCpy $SEC_APPLICATION_DETAILS "Instalando ${APPLICATION_NAME} esenciais."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Iconas de estado para Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalando as iconas de estado para Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso directo ao programa no menú de inicio"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Engadindo o acceso directo ao ${APPLICATION_NAME} no menú de inicio"
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Acceso directo no escritorio"
@@ -15,8 +15,6 @@ StrCpy $PageReinstall_SAME_Field_3 "${APPLICATION_NAME} entfernen"
 StrCpy $UNINSTALLER_APPDATA_TITLE "${APPLICATION_NAME} entfernen"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Wählen Sie zur Ausführung die Wartungsoption."
 StrCpy $SEC_APPLICATION_DETAILS "Installiere ${APPLICATION_NAME} Basis."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status-Icons für den Windows-Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installiere Status-Icons für den Windows-Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Installiere Verknüpfung im Programmmenü"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Füge Verknüpfung für ${APPLICATION_NAME} dem Startmenü hinzu."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Desktop-Verknüpfung"
@@ -15,8 +15,6 @@ 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_START_MENU_SECTION "Συντόμευση στο Αρχικό Μενού"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Προσθήκη συντόμευσης για την ${APPLICATION_NAME} στο Αρχικό Μενού."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Συντόμευση επιφάνειας εργασίας"
@@ -9,13 +9,6 @@ StrCpy $PageReinstall_SAME_Field_3 "${APPLICATION_NAME} eltávolítása"
 StrCpy $UNINSTALLER_APPDATA_TITLE "${APPLICATION_NAME} eltávolítása"
 StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Igen, törölje ezt az adatkönyvtárat."
 StrCpy $UNINSTALLER_FINISHED_Detail "Befejezve"
-StrCpy $UNINSTALL_ABORT "Az eltávolítást egy felhasználó megszakította"
-StrCpy $INIT_NO_QUICK_LAUNCH "Gyorsindító Hivatkozás (N/A)"
-StrCpy $INIT_NO_DESKTOP "Asztali Hivatkozás (felülírja a meglévőt)"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "A telepítő futtatásához adminisztrátori hozzáférés szükséges, próbáld újra."
-StrCpy $INIT_INSTALLER_RUNNING "A telepítő már fut."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Az  eltávolító futtatásához adminisztrátori hozzáférés szükséges, próbáld újra."
-StrCpy $INIT_UNINSTALLER_RUNNING "Az eltávolító már fut."
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Killing ${APPLICATION_EXECUTABLE} processes."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Process to kill not found!"
@@ -24,8 +17,6 @@ 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_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"
@@ -42,5 +33,12 @@ StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Leave unchecked to keep the data folder for
 StrCpy $UNINSTALLER_FILE_Detail "Writing Uninstaller"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Writing Installer Registry Keys"
 StrCpy $UNINSTALL_MESSAGEBOX "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
+StrCpy $UNINSTALL_ABORT "Uninstall aborted by user"
+StrCpy $INIT_NO_QUICK_LAUNCH "Quick Launch Shortcut (N/A)"
+StrCpy $INIT_NO_DESKTOP "Desktop Shortcut (overwrites existing)"
 StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "This installer requires admin access, try again"
+StrCpy $INIT_INSTALLER_RUNNING "The installer is already running."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "This uninstaller requires admin access, try again"
+StrCpy $INIT_UNINSTALLER_RUNNING "The uninstaller is already running."
 StrCpy $SectionGroup_Shortcuts "Shortcuts"
@@ -15,8 +15,6 @@ StrCpy $PageReinstall_SAME_Field_3 "Disinstalla ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Disinstalla ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Scegli l'opzione di manutenzione da eseguire."
 StrCpy $SEC_APPLICATION_DETAILS "Installazione degli elementi fondamentali di ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Icone di stato per Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installazione delle icone di stato per Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Scorciatoia di programma menu Start"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Aggiunta della scorciatoia per ${APPLICATION_NAME} al menu Start."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Scorciatoia del desktop"
@@ -15,8 +15,6 @@ 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 "デスクトップショートカット"
@@ -15,8 +15,6 @@ StrCpy $PageReinstall_SAME_Field_3 "Odinstaluj ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Odinstaluj ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Wybierz sposób utrzymywania."
 StrCpy $SEC_APPLICATION_DETAILS "Instaluje niezbędne pliki ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Ikona statusu dla Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instaluj ikonę statusu dla Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Skrót w Menu Start"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Dodaję skrót ${APPLICATION_NAME} w Menu Start."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Skrót na Pulpicie"
@@ -15,8 +15,6 @@ StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalar ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Escolha a opção de manutenção a fazer."
 StrCpy $SEC_APPLICATION_DETAILS "A instalar o essencial de ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Icons de estado para Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "A instalar icons de estado para Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Atalho  do progama no Menu Inicial"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "A adicionar o atalho de ${APPLICATION_NAME} ao Menu Inicial."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Atalho da área de trabalho"
@@ -6,7 +6,7 @@ StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Processo para eliminar n
 StrCpy $PageReinstall_NEW_Field_1 "Uma versão mais antiga de ${APPLICATION_NAME} está instalado em seu sistema. É recomendado que você desinstale a versão atual antes de instalar. Selecione a operação que deseja executar e clique em Avançar para continuar."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
 StrCpy $PageReinstall_NEW_Field_3 "Não desinstale"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Já Instalado"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Já instalado"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Escolha como você deseja instalar ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "A versão mais recente do ${APPLICATION_NAME} já está instalado! Não é recomendado que você instale uma versão mais antiga. Se você realmente deseja instalar esta versão mais antiga, é melhor desinstalar a versão atual primeiro. Selecione a operação que deseja executar e clique em Avançar para continuar."
 StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${version} já está instalado. \nSelecione a operação que deseja executar e clique em Avançar para continuar."
@@ -15,10 +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_START_MENU_SECTION "Menu Iniciar Programa Atalho"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Adicionando atalho para ${APPLICATION_NAME} ao Menu Iniciar."
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Adicionando atalho para ${APPLICATION_NAME} para o Menu Iniciar."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Atalho Desktop"
 StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Criando Atalhos de Desktop"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Atalho Rápido"
@@ -31,13 +29,13 @@ StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Remover ${APPLICATION_NAME}  pasta de dado
 StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Você quer apagar ${APPLICATION_NAME} 's pasta de dados?"
 StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Deixe desmarcada para manter a pasta de dados para uso posterior ou cheque para excluir a pasta de dados."
 StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Sim, excluir essa pasta de dados."
-StrCpy $UNINSTALLER_FILE_Detail "Gravando Desinstalador"
-StrCpy $UNINSTALLER_REGISTRY_Detail "Gravando Chaves de Registro do Inslalador"
+StrCpy $UNINSTALLER_FILE_Detail "Escrevendo Desinstalador"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Escrevendo Chaves de Registro do Inslalador"
 StrCpy $UNINSTALLER_FINISHED_Detail "Finalizado"
 StrCpy $UNINSTALL_MESSAGEBOX "Não parece que ${APPLICATION_NAME} está instalado no diretório '$INSTDIR'.$\n$\nContinuar assim mesmo (não recomendado)?"
 StrCpy $UNINSTALL_ABORT "Desinstalação abortada pelo usuário"
 StrCpy $INIT_NO_QUICK_LAUNCH "Atalho de Inicialização Rápida (N/A)"
-StrCpy $INIT_NO_DESKTOP "Atalho Desktop (substitui os existente)"
+StrCpy $INIT_NO_DESKTOP "Atalho Desktop (substituições existente)"
 StrCpy $UAC_ERROR_ELEVATE "Incapaz de elevar, erro:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Este programa de instalação requer acesso de administrador, tente novamente"
 StrCpy $INIT_INSTALLER_RUNNING "O instalador já está em execução."
@@ -15,8 +15,6 @@ 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 "Ярлык на рабочем столе"
@@ -1,6 +1,5 @@
 # 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}较老版本。建议安装前卸载当前版本。选择将要执行的操作，点击下一步继续。"
@@ -8,15 +7,11 @@ StrCpy $PageReinstall_NEW_Field_2 "在安装前先卸载"
 StrCpy $PageReinstall_NEW_Field_3 "不要卸载"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "已经安装"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "选择如何安装${APPLICATION_NAME}。"
-StrCpy $PageReinstall_OLD_Field_1 "较新版本的 ${APPLICATION_NAME} 已经安装！安装较旧版本的程序是不推荐的。如果您希望继续安装较旧版本，建议先卸载较新版本。选择您想要执行的操作并点击下一步以继续。"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} 已经安装。\n请选择想要执行的操作并点击下一步。"
 StrCpy $PageReinstall_SAME_Field_2 "增加/重装组件"
 StrCpy $PageReinstall_SAME_Field_3 "卸载${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "卸载${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "选择需要执行的维护选项。"
 StrCpy $SEC_APPLICATION_DETAILS "安装${APPLICATION_NAME}基本组件。"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "开始菜单程序快捷方式"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "添加 ${APPLICATION_NAME} 快捷方式到开始菜单。"
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "桌面快捷方式"
 StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "创建桌面快捷方式"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "快速启动栏快捷方式"
@@ -25,22 +20,25 @@ StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME}基本组件。"
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME}快捷方式。"
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "${APPLICATION_NAME}桌面快捷方式。"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "${APPLICATION_NAME}快速启动栏快捷方式。"
-StrCpy $UNINSTALLER_APPDATA_SUBTITLE "从电脑中移除 ${APPLICATION_NAME} 数据文件夹。"
-StrCpy $UNINSTALLER_APPDATA_LABEL_1 "移除 ${APPLICATION_NAME} 数据文件夹？"
-StrCpy $UNINSTALLER_APPDATA_LABEL_2 "选择以删除数据文件夹，不选择以保留数据文件夹内容供后续使用。"
 StrCpy $UNINSTALLER_APPDATA_CHECKBOX "删除数据文件。"
 StrCpy $UNINSTALLER_FILE_Detail "覆盖卸载器"
-StrCpy $UNINSTALLER_REGISTRY_Detail "正在写入注册表"
 StrCpy $UNINSTALLER_FINISHED_Detail "完成"
-StrCpy $UNINSTALL_MESSAGEBOX "${APPLICATION_NAME} 可能并没有安装在 $INSTDIR。$\n$\n仍然继续吗？(不推荐)"
-StrCpy $UNINSTALL_ABORT "用户取消了卸载"
 StrCpy $INIT_NO_QUICK_LAUNCH "快速启动栏快捷方式(N/A)"
 StrCpy $INIT_NO_DESKTOP "桌面快捷方式(覆盖)"
-StrCpy $UAC_ERROR_ELEVATE "无法获得权限，错误："
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "安装程序需要管理员权限，请重试"
-StrCpy $INIT_INSTALLER_RUNNING "安装程序已经运行。"
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "卸载程序需要管理员权限，请重试"
-StrCpy $INIT_UNINSTALLER_RUNNING "卸载程序已经运行。"
 StrCpy $SectionGroup_Shortcuts "快捷方式"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?"
+StrCpy $PageReinstall_OLD_Field_1 "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choose the maintenance option to perform."
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Adding shortcut for ${APPLICATION_NAME} to the Start Menu."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Remove ${APPLICATION_NAME}'s data folder from your computer."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Do you want to delete ${APPLICATION_NAME}'s data folder?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Leave unchecked to keep the data folder for later use or check to delete the data folder."
+StrCpy $UNINSTALLER_REGISTRY_Detail "Writing Installer Registry Keys"
+StrCpy $UNINSTALL_MESSAGEBOX "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
+StrCpy $UNINSTALL_ABORT "Uninstall aborted by user"
+StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "This installer requires admin access, try again"
+StrCpy $INIT_INSTALLER_RUNNING "The installer is already running."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "This uninstaller requires admin access, try again"
+StrCpy $INIT_UNINSTALLER_RUNNING "The uninstaller is already running."
@@ -3,7 +3,7 @@ StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Zobrazi
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Našli sa ${APPLICATION_EXECUTABLE} proces (y), ktoré je potrebné zastavi�.$\nChcete, aby ich inštalátor zastavil?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Ukonèujem ${APPLICATION_EXECUTABLE} procesy."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Proces ukonèenia nebol nájdený!"
-StrCpy $PageReinstall_NEW_Field_1 "Staršia verzia ${APPLICATION_NAME} je nainštalovaná vo vašom poèítaèi. Odporúèam vám odinštalova� aktuálnu verziu pred inštaláciou. Vyberte operáciu, ktorú chcete vykona�, a kliknite na tlaèidlo Ïalej pre pokraèovanie."
+StrCpy $PageReinstall_NEW_Field_1 "Staršia verzia ${APPLICATION_NAME} je nainštalovaná vo vašom systéme. Odporúèam vám odinštalova� aktuálnu verziu pred inštaláciou. Vyberte operáciu, ktorú chcete vykona�, a kliknite na tlaèidlo Ïalej pre pokraèovanie."
 StrCpy $PageReinstall_NEW_Field_2 "Odinštalova� pred inštaláciou"
 StrCpy $PageReinstall_NEW_Field_3 "Neodinštalova�"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Už je nainštalovaný"
@@ -15,8 +15,6 @@ StrCpy $PageReinstall_SAME_Field_3 "Odin
 StrCpy $UNINSTALLER_APPDATA_TITLE "Odinštalova� ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Vyberte možnos� vykona� údržbu."
 StrCpy $SEC_APPLICATION_DETAILS "Inštalujú sa náležitosti ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Stavová ikona pre Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Inštalujem stavovú ikonu pre Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Zástupca programu v menu Štart"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Prida� zástupcu pre ${APPLICATION_NAME} do menu Štart."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Zástupca na ploche"
@@ -15,8 +15,6 @@ StrCpy $PageReinstall_SAME_Field_3 "Odstrani ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Odstrani ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Izberite možnost vzdrževanja za izvedbo."
 StrCpy $SEC_APPLICATION_DETAILS "Poteka nameščanje ključnih paketov programa ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Ikona stanja za program Raziskovalec"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Nameščanje ikone stanja za Raziskovalca"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Bližnjica programa v programskem meniju"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Poteka dodajanje bližnjice programa ${APPLICATION_NAME} v programski meni."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Bližnica namizja"
@@ -15,8 +15,6 @@ StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalar ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Elija la opcion de mantenimiento a realizar."
 StrCpy $SEC_APPLICATION_DETAILS "Instalando  ${APPLICATION_NAME} esenciales."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Íconos de estado para el Explorador de Windows"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalando íconos de estado para el Explorador de Windows"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso Directo al Programa Menú de Inicio"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Añadiendo accesos directos para ${APPLICATION_NAME} en el Menú de Inicio."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Acceso directo de Escritorio"
@@ -35,8 +35,6 @@ StrCpy $INIT_UNINSTALLER_RUNNING "El des-instalador ya esta corriendo"
 StrCpy $SectionGroup_Shortcuts "Accesos Directos"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?"
 StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Quick Launch Shortcut"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creating Quick Launch Shortcut"
 StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} essentials."
@@ -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"
@@ -15,8 +15,6 @@ 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_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"
@@ -15,8 +15,6 @@ Var PageReinstall_SAME_Field_3
 Var UNINSTALLER_APPDATA_TITLE
 Var PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE
 Var SEC_APPLICATION_DETAILS
-Var OPTION_SECTION_SC_SHELL_EXT_SECTION
-Var OPTION_SECTION_SC_SHELL_EXT_DetailPrint
 Var OPTION_SECTION_SC_START_MENU_SECTION
 Var OPTION_SECTION_SC_START_MENU_DetailPrint
 Var OPTION_SECTION_SC_DESKTOP_SECTION
@@ -23,4 +23,3 @@
 !insertmacro MUI_LANGUAGE "Slovak"
 !insertmacro MUI_LANGUAGE "Spanish"
 !insertmacro MUI_LANGUAGE "Polish"
-!insertmacro MUI_LANGUAGE "Farsi"
@@ -85,14 +85,6 @@ msgstr "Choose the maintenance option to perform."
 msgid "Installing ${APPLICATION_NAME} essentials."
 msgstr "Installing ${APPLICATION_NAME} essentials."

-#. OPTION_SECTION_SC_SHELL_EXT_SECTION
-msgid "Status icons for Windows Explorer"
-msgstr "Status icons for Windows Explorer"
-
-#. OPTION_SECTION_SC_SHELL_EXT_DetailPrint
-msgid "Installing status icons for Windows Explorer"
-msgstr "Installing status icons for Windows Explorer"
-
 #. OPTION_SECTION_SC_START_MENU_SECTION
 msgid "Start Menu Program Shortcut"
 msgstr "Start Menu Program Shortcut"
@@ -13,7 +13,7 @@ if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")
    if (NOT CSYNC_STATIC_COMPILE_DIR)
        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic -pedantic-errors")
    endif()
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes -Wdeclaration-after-statement")
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused -Wfloat-equal -Wpointer-arith -Wwrite-strings -Wformat-security")
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute")
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute -D_GNU_SOURCE")
@@ -16,7 +16,6 @@
  !define OPTION_LICENSE_AGREEMENT
 !endif
 !define OPTION_UAC_PLUGIN_ENHANCED
-!define OPTION_SECTION_SC_SHELL_EXT
 !define OPTION_SECTION_SC_START_MENU
 !define OPTION_SECTION_SC_DESKTOP
 !define OPTION_SECTION_SC_QUICK_LAUNCH
@@ -95,8 +94,6 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 !include WordFunc.nsh  ;Used by VersionCompare macro function.
 !include FileFunc.nsh  ;Used to read out parameters
 !include UAC.nsh ;Used by the UAC elevation to install as user or admin.
-!include Library.nsh ;Used by the COM registration for shell extensions
-!include x64.nsh ;Used to determine the right arch for the shell extensions

 ;-----------------------------------------------------------------------------
 ; Memento selections stored in registry.
@@ -114,8 +111,8 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_BITMAP  ${WIN_SETUP_BITMAP_PATH}/page_header.bmp
 !define MUI_COMPONENTSPAGE_SMALLDESC
-!define MUI_FINISHPAGE_LINK "${APPLICATION_DOMAIN}"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://${APPLICATION_DOMAIN}"
+!define MUI_FINISHPAGE_LINK "www.${APPLICATION_DOMAIN}"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.${APPLICATION_DOMAIN}"
 !define MUI_FINISHPAGE_NOREBOOTSUPPORT
 !ifdef OPTION_FINISHPAGE_RELEASE_NOTES
   !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
@@ -282,16 +279,6 @@ Function EnsureOwncloudShutdown
   !insertmacro CheckAndConfirmEndProcess "${APPLICATION_EXECUTABLE}"
 FunctionEnd

-Function InstallRedistributables
-   ${If} ${RunningX64}
-      ExecWait '"$OUTDIR\vcredist_x64.exe" /install /quiet'
-   ${Else}
-      ExecWait '"$OUTDIR\vcredist_x86.exe" /install /quiet'
-   ${EndIf}
-   Delete "$OUTDIR\vcredist_x86.exe"
-   Delete "$OUTDIR\vcredist_x64.exe"
-FunctionEnd
-
 ##############################################################################
 #                                                                            #
 #   RE-INSTALLER FUNCTIONS                                                   #
@@ -383,11 +370,11 @@ 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\libsync\lib${APPLICATION_SHORTNAME}sync.dll"
+   File "${BUILD_PATH}\src\lib${APPLICATION_SHORTNAME}sync.dll"
   File "${BUILD_PATH}\csync\src\libocsync.dll"

-   File "${BUILD_PATH}\src\gui\mirall_*.qm"
+
+   File "${BUILD_PATH}\src\mirall_*.qm"
   ; Make sure only to copy qt, not qt_help, etc
   File "${MING_SHARE}\qt5\translations\qt_??.qm"
   File "${MING_SHARE}\qt5\translations\qt_??_??.qm"
@@ -426,15 +413,17 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
   File "${QT_DLL_PATH}\Qt5Xml.dll"

   ;Qt deps
-   File "${MING_BIN}\libpng16-16.dll"
-   File "${MING_BIN}\icudata53.dll"
-   File "${MING_BIN}\icui18n53.dll"
-   File "${MING_BIN}\icuuc53.dll"
+   File "${MING_BIN}\libpng15-15.dll"
+   File "${MING_BIN}\icudata51.dll"
+   File "${MING_BIN}\icui18n51.dll"
+   File "${MING_BIN}\icuuc51.dll"
   File "${MING_BIN}\libEGL.dll"
   File "${MING_BIN}\libGLESv2.dll"
   File "${MING_BIN}\libjpeg-8.dll"
   File "${MING_BIN}\libpcre16-0.dll"
+   File "${MING_BIN}\libpng15-15.dll"
   File "${MING_BIN}\libproxy.dll"
+   File "${MING_BIN}\libqt5keychain.dll"
   File "${MING_BIN}\libsqlite3-0.dll"
   File "${MING_BIN}\libcrypto-10.dll"
   File "${MING_BIN}\libssl-10.dll"
@@ -447,9 +436,9 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
   File "${MING_BIN}\libsqlite3-0.dll"

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

-   ;ownCloud plugin
+   ; ownCloud plugin
   File "${MING_BIN}\libintl-8.dll"
   File "${MING_BIN}\libneon-27.dll"
   File "${MING_BIN}\libproxy.dll"
@@ -459,34 +448,12 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
   ;MinGW stuff
   File "${MING_BIN}\libgcc_s_sjlj-1.dll"
   File "${MING_BIN}\libstdc++-6.dll"
-   File "${MING_BIN}\libwinpthread-1.dll"

-   ;CSync configs
+   ; CSync configs
   File "${SOURCE_PATH}/sync-exclude.lst"

 SectionEnd

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

 !ifdef OPTION_SECTION_SC_START_MENU
@@ -634,21 +601,6 @@ Section Uninstall

   DeleteRegKey HKCR "${APPLICATION_NAME}"

-   ;Shell extension
-   !ifdef OPTION_SECTION_SC_SHELL_EXT
-      !define LIBRARY_COM
-      !define LIBRARY_SHELL_EXTENSION
-      ${If} ${HasSection} SEC_SHELL_EXT
-        !define LIBRARY_X64
-        !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED "$INSTDIR/shellext/OCUtil_x64.dll"
-        !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR/shellext/OCOverlays_x64.dll"
-        !undef LIBRARY_X64
-     ${Else}
-        !insertmacro UnInstallLib DLL NOTSHARED REBOOT_PROTECTED "$INSTDIR/shellext/OCUtil_x86.dll"
-        !insertmacro UnInstallLib REGDLL NOTSHARED REBOOT_PROTECTED "$INSTDIR/shellext/OCOverlays_x86.dll"
-      ${EndIf}
-   !endif
-
   ;Start menu shortcut
   !ifdef OPTION_SECTION_SC_START_MENU
      SetShellVarContext all
@@ -19,11 +19,10 @@ if( Qt5Core_FOUND )
        find_package(Qt5PrintSupport REQUIRED)
        find_package(Qt5Quick REQUIRED)
        find_package(Qt5Widgets REQUIRED)
-        if(APPLE)
-           find_package(Qt5MacExtras REQUIRED)
-        endif(APPLE)
    endif()
-
+    if(APPLE)
+	find_package(Qt5MacExtras REQUIRED)
+    endif(APPLE)
 else( Qt5Core_FOUND )
    if(WIN32 OR APPLE)
 	message(FATAL_ERROR "Qt 5 not found, but application depends on Qt5 on Windows and Mac OS X")
@@ -148,8 +147,6 @@ if(NOT Qt5Core_FOUND)

        include( ${QT_USE_FILE} )
    endmacro()
-
-    add_definitions("-DQ_DECL_OVERRIDE=override")
 endif()

 if( Qt5Core_DIR )
@@ -6,11 +6,9 @@ if(CMAKE_COMPILER_IS_GNUCXX)
    else(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long")
    endif(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 endif(CMAKE_COMPILER_IS_GNUCXX)
 if(CMAKE_CXX_COMPILER MATCHES "clang")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 endif(CMAKE_CXX_COMPILER MATCHES "clang")
 # TODO: handle msvc compilers warnings?

@@ -22,6 +22,7 @@
 #cmakedefine HAVE_UTIMES 1
 #cmakedefine HAVE_LSTAT 1
 #cmakedefine HAVE_FNMATCH 1
+#cmakedefine HAVE___MINGW_ASPRINTF 1
 #cmakedefine HAVE_ICONV 1
 #cmakedefine HAVE_ICONV_CONST 1

@@ -30,6 +31,5 @@
 #endif

 #cmakedefine HAVE___MINGW_ASPRINTF 1
-#cmakedefine HAVE_ASPRINTF 1

 #cmakedefine WITH_UNIT_TESTING 1
@@ -96,10 +96,10 @@ include_directories(
 )

 add_library(${CSYNC_LIBRARY} SHARED ${csync_SRCS})
-#add_library(${CSYNC_LIBRARY}_static STATIC ${csync_SRCS})
+add_library(${CSYNC_LIBRARY}_static STATIC ${csync_SRCS})

 target_link_libraries(${CSYNC_LIBRARY} ${CSYNC_LINK_LIBRARIES})
-#target_link_libraries(${CSYNC_LIBRARY}_static ${CSYNC_LINK_LIBRARIES})
+target_link_libraries(${CSYNC_LIBRARY}_static ${CSYNC_LINK_LIBRARIES})

 set_target_properties(
  ${CSYNC_LIBRARY}
@@ -128,6 +128,9 @@ int csync_create(CSYNC **csync, const char *local, const char *remote) {

  ctx->status_code = CSYNC_STATUS_OK;

+  ctx->pwd.uid = getuid();
+  ctx->pwd.euid = geteuid();
+
  ctx->local.list     = 0;
  ctx->remote.list    = 0;
  ctx->current_fs = NULL;
@@ -240,6 +243,11 @@ int csync_update(CSYNC *ctx) {
            c_secdiff(finish, start), c_rbtree_size(ctx->local.tree));
  csync_memstat_check();

+  if (rc < 0) {
+    ctx->status_code = CSYNC_STATUS_TREE_ERROR;
+    return -1;
+  }
+
  /* update detection for remote replica */
  csync_gettime(&start);
  ctx->current = REMOTE_REPLICA;
@@ -392,13 +400,14 @@ static int _csync_treewalk_visitor(void *obj, void *data) {
      trav.path         = cur->path;
      trav.size         = cur->size;
      trav.modtime      = cur->modtime;
+      trav.uid          = cur->uid;
+      trav.gid          = cur->gid;
      trav.mode         = cur->mode;
      trav.type         = cur->type;
      trav.instruction  = cur->instruction;
      trav.rename_path  = cur->destpath;
      trav.etag         = cur->etag;
      trav.file_id      = cur->file_id;
-      trav.remotePerm = cur->remotePerm;
      trav.directDownloadUrl = cur->directDownloadUrl;
      trav.directDownloadCookies = cur->directDownloadCookies;
      trav.inode        = cur->inode;
@@ -660,7 +669,7 @@ int csync_add_exclude_list(CSYNC *ctx, const char *path) {
    return -1;
  }

-  return csync_exclude_load(path, &ctx->excludes);
+  return csync_exclude_load(ctx, path);
 }

 void csync_clear_exclude_list(CSYNC *ctx)
@@ -134,6 +134,23 @@ enum csync_ftw_type_e {
    CSYNC_FTW_TYPE_SKIP
 };

+enum csync_notify_type_e {
+  CSYNC_NOTIFY_INVALID,
+  CSYNC_NOTIFY_START_SYNC_SEQUENCE,
+  CSYNC_NOTIFY_START_DOWNLOAD,
+  CSYNC_NOTIFY_START_UPLOAD,
+  CSYNC_NOTIFY_PROGRESS,
+  CSYNC_NOTIFY_FINISHED_DOWNLOAD,
+  CSYNC_NOTIFY_FINISHED_UPLOAD,
+  CSYNC_NOTIFY_FINISHED_SYNC_SEQUENCE,
+  CSYNC_NOTIFY_START_DELETE,
+  CSYNC_NOTIFY_END_DELETE,
+  CSYNC_NOTIFY_ERROR,
+  CSYNC_NOTIFY_START_LOCAL_UPDATE,
+  CSYNC_NOTIFY_FINISHED_LOCAL_UPDATE,
+  CSYNC_NOTIFY_START_REMOTE_UPDATE,
+  CSYNC_NOTIFY_FINISHED_REMOTE_UPDATE
+};

 /**
 * CSync File Traversal structure.
@@ -148,6 +165,13 @@ struct csync_tree_walk_file_s {
    int64_t     size;
    int64_t     inode;
    time_t      modtime;
+#ifdef _WIN32
+    uint32_t    uid;
+    uint32_t    gid;
+#else
+    uid_t       uid;
+    gid_t       gid;
+#endif
    mode_t      mode;
    enum csync_ftw_type_e     type;
    enum csync_instructions_e instruction;
@@ -158,7 +182,6 @@ struct csync_tree_walk_file_s {
    const char *rename_path;
    const char *etag;
    const char *file_id;
-    const char *remotePerm;
    char *directDownloadUrl;
    char *directDownloadCookies;
    struct {
@@ -186,9 +209,6 @@ typedef void (*csync_log_callback) (int verbosity,
                                    const char *buffer,
                                    void *userdata);

-typedef void (*csync_update_callback) (bool local,
-                                    const char *dirUrl,
-                                    void *userdata);

 /**
 * @brief Allocate a csync context.
@@ -40,28 +40,28 @@
 #define CSYNC_LOG_CATEGORY_NAME "csync.exclude"
 #include "csync_log.h"

-static int _csync_exclude_add(c_strlist_t **inList, const char *string) {
+static int _csync_exclude_add(CSYNC *ctx, const char *string) {
    c_strlist_t *list;

-    if (*inList == NULL) {
-        *inList = c_strlist_new(32);
-        if (*inList == NULL) {
+    if (ctx->excludes == NULL) {
+        ctx->excludes = c_strlist_new(32);
+        if (ctx->excludes == NULL) {
            return -1;
        }
    }

-    if ((*inList)->count == (*inList)->size) {
-        list = c_strlist_expand(*inList, 2 * (*inList)->size);
+    if (ctx->excludes->count == ctx->excludes->size) {
+        list = c_strlist_expand(ctx->excludes, 2 * ctx->excludes->size);
        if (list == NULL) {
            return -1;
        }
-        *inList = list;
+        ctx->excludes = list;
    }

-    return c_strlist_add(*inList, string);
+    return c_strlist_add(ctx->excludes, string);
 }

-int csync_exclude_load(const char *fname, c_strlist_t **list) {
+int csync_exclude_load(CSYNC *ctx, const char *fname) {
  int fd = -1;
  int i = 0;
  int rc = -1;
@@ -70,7 +70,7 @@ int csync_exclude_load(const char *fname, c_strlist_t **list) {
  char *entry = NULL;
  mbchar_t *w_fname;

-  if (fname == NULL) {
+  if (ctx == NULL || fname == NULL) {
      return -1;
  }

@@ -119,7 +119,7 @@ int csync_exclude_load(const char *fname, c_strlist_t **list) {
        buf[i] = '\0';
        if (*entry != '#') {
          CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Adding entry: %s", entry);
-          rc = _csync_exclude_add(list, entry);
+          rc = _csync_exclude_add(ctx, entry);
          if (rc < 0) {
              goto out;
          }
@@ -145,21 +145,6 @@ void csync_exclude_destroy(CSYNC *ctx) {
 }

 CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) {
-
-    CSYNC_EXCLUDE_TYPE match = CSYNC_NOT_EXCLUDED;
-
-    match = csync_excluded_no_ctx( ctx->excludes, path, filetype );
-
-    if (match == CSYNC_NOT_EXCLUDED && ctx->checkBlackListHook) {
-        if (ctx->checkBlackListHook(ctx->checkBlackListData, path)) {
-            match = CSYNC_FILE_EXCLUDE_LIST;
-        }
-    }
-
-    return match;
-}
-
-CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path, int filetype) {
  size_t i = 0;
  const char *p = NULL;
  char *bname = NULL;
@@ -223,10 +208,7 @@ CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path
  }

  if (getenv("CSYNC_CONFLICT_FILE_USERNAME")) {
-      rc = asprintf(&conflict, "*_conflict_%s-*", getenv("CSYNC_CONFLICT_FILE_USERNAME"));
-      if (rc < 0) {
-          goto out;
-      }
+      asprintf(&conflict, "*_conflict_%s-*", getenv("CSYNC_CONFLICT_FILE_USERNAME"));
      rc = csync_fnmatch(conflict, path, 0);
      if (rc == 0) {
          match = CSYNC_FILE_SILENTLY_EXCLUDED;
@@ -241,19 +223,18 @@ CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path
  SAFE_FREE(bname);
  SAFE_FREE(dname);

-  if( ! excludes ) {
+  if (ctx == NULL || ctx->excludes == NULL) {
      goto out;
  }

  /* Loop over all exclude patterns and evaluate the given path */
-  for (i = 0; match == CSYNC_NOT_EXCLUDED && i < excludes->count; i++) {
+  for (i = 0; match == CSYNC_NOT_EXCLUDED && i < ctx->excludes->count; i++) {
      bool match_dirs_only = false;
-      char *pattern_stored = c_strdup(excludes->vector[i]);
+      char *pattern_stored = c_strdup(ctx->excludes->vector[i]);
      char* pattern = pattern_stored;

      type = CSYNC_FILE_EXCLUDE_LIST;
      if (strlen(pattern) < 1) {
-	  SAFE_FREE(pattern_stored);
          continue;
      }
      /* Ecludes starting with ']' means it can be cleanup */
@@ -289,9 +270,6 @@ CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path

          if (bname == NULL || dname == NULL) {
              match = CSYNC_NOT_EXCLUDED;
-	      SAFE_FREE(bname);
-	      SAFE_FREE(dname);
-              SAFE_FREE(pattern_stored);
              goto out;
          }

@@ -328,7 +306,6 @@ CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path
      SAFE_FREE(dname);
  }

-
 out:

  return match;
@@ -37,7 +37,7 @@ typedef enum csync_exclude_type_e CSYNC_EXCLUDE_TYPE;
 *
 * @return  0 on success, -1 if an error occured with errno set.
 */
-int csync_exclude_load(const char *fname, c_strlist_t **list);
+int csync_exclude_load(CSYNC *ctx, const char *fname);

 /**
 * @brief Clear the exclude list in memory.
@@ -65,14 +65,6 @@ void csync_exclude_destroy(CSYNC *ctx);
 */
 CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype);

-/**
- * @brief csync_excluded_no_ctx
- * @param excludes
- * @param path
- * @param filetype
- * @return
- */
-CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path, int filetype);
 #endif /* _CSYNC_EXCLUDE_H */

 /* vim: set ft=c.doxygen ts=8 sw=2 et cindent: */
@@ -24,8 +24,6 @@

 #include <inttypes.h>

-#include "csync_private.h"
-

 /*
 * helper method to build up a user text for SSL problems, called from the
@@ -432,8 +430,6 @@ static int dav_connect(csync_owncloud_ctx_t *ctx,  const char *base_url) {
        ne_set_read_timeout(ctx->dav_session.ctx, ctx->dav_session.read_timeout);
        DEBUG_WEBDAV("Timeout set to %u seconds", ctx->dav_session.read_timeout );
    }
-    // Should never take more than some seconds, 30 is really a max.
-    ne_set_connect_timeout(ctx->dav_session.ctx, 30);

    snprintf( uaBuf, sizeof(uaBuf), "Mozilla/5.0 (%s) csyncoC/%s",
              csync_owncloud_get_platform(), CSYNC_STRINGIFY( LIBCSYNC_VERSION ));
@@ -465,7 +461,7 @@ static int dav_connect(csync_owncloud_ctx_t *ctx,  const char *base_url) {
    if( proxystate < 0 ) {
        DEBUG_WEBDAV("Error: Proxy-Configuration failed.");
    } else if( proxystate > 0 ) {
-        ne_set_proxy_auth( ctx->dav_session.ctx, proxy_authentication_callback_by_neon, ctx );
+        ne_set_proxy_auth( ctx->dav_session.ctx, proxy_authentication_callback_by_neon, 0 );
    }

    ctx->_connected = 1;
@@ -490,10 +486,20 @@ static void propfind_results_callback(void *userdata,
 {
    struct listdir_context *fetchCtx = userdata;
    struct resource *newres = 0;
+    const char *clength, *modtime = NULL;
+    const char *resourcetype = NULL;
+    const char *md5sum = NULL;
+    const char *file_id = NULL;
+    const char *directDownloadUrl = NULL;
+    const char *directDownloadCookies = NULL;
    const ne_status *status = NULL;
    char *path = ne_path_unescape( uri->path );

    (void) status;
+    if( ! fetchCtx ) {
+        DEBUG_WEBDAV("No valid fetchContext");
+        return;
+    }

    if( ! fetchCtx->target ) {
        DEBUG_WEBDAV("error: target must not be zero!" );
@@ -502,9 +508,46 @@ static void propfind_results_callback(void *userdata,

    /* Fill the resource structure with the data about the file */
    newres = c_malloc(sizeof(struct resource));
+    ZERO_STRUCTP(newres);
    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);
+
+    modtime      = ne_propset_value( set, &ls_props[0] );
+    clength      = ne_propset_value( set, &ls_props[1] );
+    resourcetype = ne_propset_value( set, &ls_props[2] );
+    md5sum       = 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] );
+
+    newres->type = resr_normal;
+    if( clength == NULL && resourcetype && strncmp( resourcetype, "<DAV:collection>", 16 ) == 0) {
+        newres->type = resr_collection;
+    }
+
+    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( md5sum ) {
+        newres->md5 = csync_normalize_etag(md5sum);
+    }
+
+    csync_vio_set_file_id(newres->file_id, file_id);
+
+    if (directDownloadUrl) {
+        newres->directDownloadUrl = c_strdup(directDownloadUrl);
+    }
+    if (directDownloadCookies) {
+        newres->directDownloadCookies = c_strdup(directDownloadCookies);
+    }

    /* prepend the new resource to the result list */
    newres->next   = fetchCtx->list;
@@ -541,11 +584,6 @@ static struct listdir_context *fetch_resource_list(csync_owncloud_ctx_t *ctx, co
        }
    }

-    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;
@@ -576,7 +614,7 @@ static struct listdir_context *fetch_resource_list(csync_owncloud_ctx_t *ctx, co
            ret = NE_CONNECT;
            set_error_message(ctx, req_status->reason_phrase);
        }
-        DEBUG_WEBDAV("Simple propfind result code %d.", req_status ? req_status->code : -1);
+        DEBUG_WEBDAV("Simple propfind result code %d.", req_status->code);
    } else {
        if( ret == NE_ERROR && req_status->code == 404) {
            errno = ENOENT;
@@ -127,7 +127,6 @@ static const ne_propname ls_props[] = {
    { "http://owncloud.org/ns", "id"},
    { "http://owncloud.org/ns", "dDU"},
    { "http://owncloud.org/ns", "dDC"},
-    { "http://owncloud.org/ns", "permissions"},
    { NULL, NULL }
 };

@@ -147,8 +146,6 @@ typedef struct resource {
    // 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;
@@ -189,8 +186,7 @@ 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);
-
+int _stat_perms( int type );
 void resourceToFileStat( csync_vio_file_stat_t *lfs, struct resource *res );
 void resource_free(struct resource* o);
 struct resource* resource_dup(struct resource* o);
@@ -54,9 +54,6 @@ struct listdir_context *get_listdir_context_from_recursive_cache(csync_owncloud_
        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 ));
@@ -101,7 +98,11 @@ static void propfind_results_recursive_callback(void *userdata,
                    const ne_prop_result_set *set)
 {
    struct resource *newres = 0;
-
+    const char *clength, *modtime, *file_id = NULL;
+    const char *directDownloadUrl = NULL;
+    const char *directDownloadCookies = NULL;
+    const char *resourcetype = NULL;
+    const char *md5sum = NULL;
    const ne_status *status = NULL;
    char *path = ne_path_unescape( uri->path );
    char *parentPath;
@@ -119,17 +120,55 @@ static void propfind_results_recursive_callback(void *userdata,

    /* Fill the resource structure with the data about the file */
    newres = c_malloc(sizeof(struct resource));
+    ZERO_STRUCTP(newres);

    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) {
+    modtime      = ne_propset_value( set, &ls_props[0] );
+    clength      = ne_propset_value( set, &ls_props[1] );
+    resourcetype = ne_propset_value( set, &ls_props[2] );
+    md5sum       = 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] );
+
+    newres->type = resr_normal;
+    if( resourcetype && strncmp( resourcetype, "<DAV:collection>", 16 ) == 0) {
+        newres->type = resr_collection;
        ctx->propfind_recursive_cache_folder_count++;
    } else {
+        /* DEBUG_WEBDAV("propfind_results_recursive %s [%d]", newres->uri, newres->type); */
        ctx->propfind_recursive_cache_file_count++;
    }

+    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( md5sum ) {
+        newres->md5 = csync_normalize_etag(md5sum);
+    }
+
+    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);
+    }
+
    /* Create new item in rb tree */
    if (newres->type == resr_collection) {
        DEBUG_WEBDAV("propfind_results_recursive %s is a folder", newres->uri);
@@ -144,14 +183,6 @@ static void propfind_results_recursive_callback(void *userdata,
            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);
-	    }
        }
    }

@@ -182,12 +213,13 @@ static void propfind_results_recursive_callback(void *userdata,
            }

            /* DEBUG_WEBDAV("results_recursive Added child %s to collection %s", newres->uri, element->self->uri); */
-            return;
+        } else {
+            /* DEBUG_WEBDAV("results_recursive No parent %s found for child %s", parentPath, newres->uri); */
+            resource_free(newres);
+            newres = NULL;
        }
    }

-    resource_free(newres);
-    newres = NULL;
 }

 void fetch_resource_list_recursive(csync_owncloud_ctx_t *ctx, const char *uri, const char *curi)
@@ -200,9 +232,6 @@ void fetch_resource_list_recursive(csync_owncloud_ctx_t *ctx, const char *uri, c
    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);
@@ -298,6 +298,10 @@ void resourceToFileStat(csync_vio_file_stat_t *lfs, struct resource *res )
        DEBUG_WEBDAV("ERROR: Unknown resource type %d", res->type);
    }

+    // FIXME Those are defaults, we'll have to use the real ownCloud WebDAV permissions soon
+    lfs->mode   = _stat_perms( lfs->type );
+    lfs->fields |= CSYNC_VIO_FILE_STAT_FIELDS_PERMISSIONS;
+
    lfs->mtime = res->modtime;
    lfs->fields |= CSYNC_VIO_FILE_STAT_FIELDS_MTIME;
    lfs->size  = res->size;
@@ -317,72 +321,26 @@ void resourceToFileStat(csync_vio_file_stat_t *lfs, struct resource *res )
        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;
+/* WebDAV does not deliver permissions. Set a default here. */
+int _stat_perms( int type ) {
+    int ret = 0;

-    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] );
-    perm = ne_propset_value( set, &ls_props[7] );
-
-    if( resourcetype && strncmp( resourcetype, "<DAV:collection>", 16 ) == 0) {
-        newres->type = resr_collection;
+    if( type == CSYNC_VIO_FILE_TYPE_DIRECTORY ) {
+        /* DEBUG_WEBDAV("Setting mode in stat (dir)"); */
+        /* directory permissions */
+        ret = S_IFDIR | S_IRUSR | S_IWUSR | S_IXUSR /* directory, rwx for user */
+                | S_IRGRP | S_IXGRP                       /* rx for group */
+                | S_IROTH | S_IXOTH;                      /* rx for others */
    } 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
+        /* regualar file permissions */
+        /* DEBUG_WEBDAV("Setting mode in stat (file)"); */
+        ret = S_IFREG | S_IRUSR | S_IWUSR /* regular file, user read & write */
+                | S_IRGRP                         /* group read perm */
+                | S_IROTH;                        /* others read perm */
    }
+    return ret;
 }

 struct resource* resource_dup(struct resource* o) {
@@ -403,9 +361,6 @@ struct resource* resource_dup(struct resource* o) {
    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);

@@ -87,8 +87,6 @@ struct csync_s {
  struct {
      csync_auth_callback auth_function;
      void *userdata;
-      csync_update_callback update_callback;
-      void *update_callback_userdata;
  } callbacks;
  c_strlist_t *excludes;

@@ -96,6 +94,7 @@ struct csync_s {
    char *file;
    sqlite3 *db;
    int exists;
+    int disabled;

    sqlite3_stmt* by_hash_stmt;
    sqlite3_stmt* by_fileid_stmt;
@@ -119,11 +118,18 @@ struct csync_s {
    c_list_t *ignored_cleanup;
  } remote;

-#if defined(HAVE_ICONV) && defined(WITH_ICONV)
  struct {
+    int sync_symbolic_links;
+    int timeout;
+#if defined(HAVE_ICONV) && defined(WITH_ICONV)
    iconv_t iconv_cd;
-  } options;
 #endif
+  } options;
+
+  struct {
+    uid_t uid;
+    uid_t euid;
+  } pwd;

  /* replica we are currently walking */
  enum csync_replica_e current;
@@ -146,10 +152,6 @@ struct csync_s {
  int  read_from_db_disabled;

  struct csync_owncloud_ctx_s *owncloud_context;
-
-  /* hooks for checking the white list */
-  void *checkBlackListData;
-  int (*checkBlackListHook)(void*, const char*);
 };


@@ -162,6 +164,8 @@ struct csync_file_stat_s {
  int64_t size;       /* u64 */
  size_t pathlen;   /* u64 */
  uint64_t inode;   /* u64 */
+  uid_t uid;        /* u32 */
+  gid_t gid;        /* u32 */
  mode_t mode;      /* u32 */
  int nlink;        /* u32 */
  int type;         /* u32 */
@@ -173,7 +177,6 @@ struct csync_file_stat_s {
  char file_id[FILE_ID_BUF_SIZE+1];  /* the ownCloud file id is fixed width of 21 byte. */
  char *directDownloadUrl;
  char *directDownloadCookies;
-  char remotePerm[REMOTE_PERM_BUF_SIZE+1];

  CSYNC_STATUS error_status;

@@ -184,7 +184,6 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
                        csync_vio_set_file_id( other->file_id, cur->file_id );
                    }
                    other->inode = cur->inode;
-                    other->should_update_etag = true;
                    cur->instruction = CSYNC_INSTRUCTION_NONE;
                } else if (other->instruction == CSYNC_INSTRUCTION_REMOVE) {
                    other->instruction = CSYNC_INSTRUCTION_RENAME;
@@ -194,7 +193,6 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
                        csync_vio_set_file_id( other->file_id, cur->file_id );
                    }
                    other->inode = cur->inode;
-                    other->should_update_etag = true;
                    cur->instruction = CSYNC_INSTRUCTION_NONE;
                } else if (other->instruction == CSYNC_INSTRUCTION_NEW) {
                    CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "OOOO=> NEW detected in other tree!");
@@ -240,8 +238,8 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
            /* file on other replica is changed or new */
            case CSYNC_INSTRUCTION_NEW:
            case CSYNC_INSTRUCTION_EVAL:
-                if (other->type == CSYNC_FTW_TYPE_DIR &&
-                        cur->type == CSYNC_FTW_TYPE_DIR) {
+                if (other->type == CSYNC_VIO_FILE_TYPE_DIRECTORY &&
+                        cur->type == CSYNC_VIO_FILE_TYPE_DIRECTORY) {
                    is_equal_files = (other->modtime == cur->modtime);
                } else {
                    is_equal_files = ((other->size == cur->size) && (other->modtime == cur->modtime));
@@ -133,8 +133,6 @@ static int _csync_statedb_check(const char *statedb) {
                    }
                }
            }
-        } else {
-            close(fd);
        }
        /* if it comes here, the database is broken and should be recreated. */
        _tunlink(wstatedb);
@@ -222,9 +220,6 @@ int csync_statedb_load(CSYNC *ctx, const char *statedb, sqlite3 **pdb) {
  result = csync_statedb_query(db, "PRAGMA case_sensitive_like = ON;");
  c_strlist_destroy(result);

-  /* set a busy handler with 5 seconds timeout */
-  sqlite3_busy_timeout(db, 5000);
-
 #ifndef NDEBUG
  sqlite3_profile(db, sqlite_profile, 0 );
 #endif
@@ -303,6 +298,8 @@ static int _csync_file_stat_from_metadata_table( csync_file_stat_t **st, sqlite3
            name = (const char*) sqlite3_column_text(stmt, 2);
            memcpy((*st)->path, (len ? name : ""), len + 1);
            (*st)->inode = sqlite3_column_int64(stmt,3);
+            (*st)->uid = sqlite3_column_int(stmt, 4);
+            (*st)->gid = sqlite3_column_int(stmt, 5);
            (*st)->mode = sqlite3_column_int(stmt, 6);
            (*st)->modtime = strtoul((char*)sqlite3_column_text(stmt, 7), NULL, 10);

@@ -316,15 +313,6 @@ static int _csync_file_stat_from_metadata_table( csync_file_stat_t **st, sqlite3
            if(column_count > 10 && sqlite3_column_text(stmt,10)) {
                csync_vio_set_file_id((*st)->file_id, (char*) sqlite3_column_text(stmt, 10));
            }
-            if(column_count > 11 && sqlite3_column_text(stmt,11)) {
-                strncpy((*st)->remotePerm,
-                        (char*) sqlite3_column_text(stmt, 11),
-                        REMOTE_PERM_BUF_SIZE);
-            }
-        }
-    } else {
-        if( rc != SQLITE_DONE ) {
-            CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "WARN: Query results in %d", rc);
        }
    }
    return rc;
@@ -357,9 +345,8 @@ 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);
-  if( !(rc == SQLITE_ROW || rc == SQLITE_DONE) )  {
-      CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata: %d!", rc);
+  if( _csync_file_stat_from_metadata_table(&st, ctx->statedb.by_hash_stmt) < 0 ) {
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata!");
  }
  sqlite3_reset(ctx->statedb.by_hash_stmt);

@@ -395,9 +382,8 @@ csync_file_stat_t *csync_statedb_get_stat_by_file_id(CSYNC *ctx,
    /* bind the query value */
    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);
-    if( !(rc == SQLITE_ROW || rc == SQLITE_DONE) ) {
-        CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata: %d!", rc);
+    if( _csync_file_stat_from_metadata_table(&st, ctx->statedb.by_fileid_stmt) < 0 ) {
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata!");
    }
    // clear the resources used by the statement.
    sqlite3_reset(ctx->statedb.by_fileid_stmt);
@@ -436,9 +422,8 @@ 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);
-  if( !(rc == SQLITE_ROW || rc == SQLITE_DONE) ) {
-      CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata by inode: %d!", rc);
+  if( _csync_file_stat_from_metadata_table(&st, ctx->statedb.by_inode_stmt) < 0 ) {
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata by inode!");
  }
  sqlite3_reset(ctx->statedb.by_inode_stmt);

@@ -467,7 +452,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 FROM metadata WHERE path LIKE(?)"

 int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {
    int rc;
@@ -475,7 +460,6 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {
    int64_t cnt = 0;
    char *likepath;
    int asp;
-    int min_path_len;

    if( !path ) {
        return -1;
@@ -487,7 +471,7 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {

    rc = sqlite3_prepare_v2(ctx->statedb.db, BELOW_PATH_QUERY, -1, &stmt, NULL);
    if( rc != SQLITE_OK ) {
-      CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Unable to create stmt for below path query.");
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Unable to create stmt for hash query.");
      return -1;
    }

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

-    min_path_len = strlen(path);
-    sqlite3_bind_int(stmt, 1, min_path_len);
-    sqlite3_bind_text(stmt, 2, likepath, -1, SQLITE_STATIC);
+    sqlite3_bind_text(stmt, 1, likepath, -1, SQLITE_STATIC);

    cnt = 0;

@@ -254,31 +254,26 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
            st->instruction = CSYNC_INSTRUCTION_EVAL;
            goto out;
        }
-        bool metadata_differ = (ctx->current == REMOTE_REPLICA && (!c_streq(fs->file_id, tmp->file_id)
-                                                            || !c_streq(fs->remotePerm, tmp->remotePerm)))
-                             || (ctx->current == LOCAL_REPLICA && fs->inode != tmp->inode);
        if (type == CSYNC_FTW_TYPE_DIR && ctx->current == REMOTE_REPLICA
-                && !metadata_differ && !ctx->read_from_db_disabled) {
+                && c_streq(fs->file_id, tmp->file_id) && !ctx->read_from_db_disabled) {
            /* If both etag and file id are equal for a directory, read all contents from
             * the database.
-             * The metadata comparison ensure that we fetch all the file id or permission when
-             * upgrading owncloud
+             * The comparison of file id ensure that we fetch all the file id when upgrading from
+             * owncloud 5 to owncloud 6.
             */
            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Reading from database: %s", path);
            ctx->remote.read_from_db = true;
        }
-        if (metadata_differ) {
-            /* file id or permissions has changed. Which means we need to update them in the DB. */
-            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Need to update metadata for: %s", path);
+
+        if (!c_streq(fs->file_id, tmp->file_id) && ctx->current == REMOTE_REPLICA) {
+            /* file id has changed. Which means we need to update the DB.
+             * (upgrade from owncloud 5 to owncloud 6 for instence) */
            st->should_update_etag = true;
        }
        st->instruction = CSYNC_INSTRUCTION_NONE;
    } else {
        enum csync_vio_file_type_e tmp_vio_type = CSYNC_VIO_FILE_TYPE_UNKNOWN;

-        /* tmp might point to malloc mem, so free it here before reusing tmp  */
-        SAFE_FREE(tmp);
-
        /* check if it's a file and has been renamed */
        if (ctx->current == LOCAL_REPLICA) {
            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Checking for rename based on inode # %" PRId64 "", (uint64_t) fs->inode);
@@ -342,7 +337,6 @@ 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;
  }

@@ -383,9 +377,7 @@ out:
      SAFE_FREE(st->directDownloadCookies);
      st->directDownloadCookies = c_strdup(fs->directDownloadCookies);
  }
-  if (fs->fields & CSYNC_VIO_FILE_STAT_FIELDS_PERM) {
-      strncpy(st->remotePerm, fs->remotePerm, REMOTE_PERM_BUF_SIZE);
-  }
+

 fastout:  /* target if the file information is read from database into st */
  st->phash = h;
@@ -694,7 +686,8 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,

    if (flag == CSYNC_FTW_FLAG_DIR && ctx->current_fs
        && (ctx->current_fs->instruction == CSYNC_INSTRUCTION_EVAL ||
-            ctx->current_fs->instruction == CSYNC_INSTRUCTION_NEW)) {
+            ctx->current_fs->instruction == CSYNC_INSTRUCTION_NEW ||
+            ctx->current_fs->instruction == CSYNC_INSTRUCTION_EVAL_RENAME)) {
        ctx->current_fs->should_update_etag = true;
    }

@@ -113,12 +113,12 @@ void csync_win32_set_file_hidden( const char *file, bool h ) {
  fileName = c_utf8_to_locale( file );
  dwAttrs = GetFileAttributesW(fileName);

-  if (dwAttrs != INVALID_FILE_ATTRIBUTES) {
-      if (h && !(dwAttrs & FILE_ATTRIBUTE_HIDDEN)) {
-          SetFileAttributesW(fileName, dwAttrs | FILE_ATTRIBUTE_HIDDEN );
-      } else if (!h && (dwAttrs & FILE_ATTRIBUTE_HIDDEN)) {
-          SetFileAttributesW(fileName, dwAttrs & ~FILE_ATTRIBUTE_HIDDEN );
-      }
+  if (dwAttrs==INVALID_FILE_ATTRIBUTES) return;
+
+  if (h && !(dwAttrs & FILE_ATTRIBUTE_HIDDEN)) {
+     SetFileAttributesW(fileName, dwAttrs | FILE_ATTRIBUTE_HIDDEN );
+  } else if (!h && (dwAttrs & FILE_ATTRIBUTE_HIDDEN)) {
+     SetFileAttributesW(fileName, dwAttrs & ~FILE_ATTRIBUTE_HIDDEN );
  }

  c_free_locale_string(fileName);
@@ -140,9 +140,7 @@ bool csync_file_locked_or_open( const char *dir, const char *fname) {
    if (!csync_file_locked_or_open_ext) {
        return false;
    }
-    if (asprintf(&tmp_uri, "%s/%s", dir, fname) < 0) {
-        return -1;
-    }
+    asprintf(&tmp_uri, "%s/%s", dir, fname);
    CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "csync_file_locked_or_open %s", tmp_uri);
    ret = csync_file_locked_or_open_ext(tmp_uri);
    SAFE_FREE(tmp_uri);
@@ -204,9 +204,9 @@ void hbf_free_transfer( hbf_transfer_t *transfer ) {

    for( cnt = 0; cnt < transfer->block_cnt; cnt++ ) {
        hbf_block_t *block = transfer->block_arr[cnt];
-        if( !block ) continue;
        if( block->http_error_msg ) free( block->http_error_msg );
        if( block->etag ) free( block->etag );
+        if( block ) free(block);
    }
    free( transfer->block_arr );
    free( transfer->url );
@@ -536,8 +536,8 @@ Hbf_State hbf_transfer( ne_session *session, hbf_transfer_t *transfer, const cha
            } else {
                state = HBF_MEMORY_FAIL;
            }
+            free( transfer_url );
        }
-        free( transfer_url );
    }

    /* do the source file validation finally (again). */
@@ -135,8 +135,7 @@ int c_utimes(const char *uri, const struct timeval *times) {
    if(!SetFileTime(hFile, NULL, &LastAccessTime, &LastModificationTime)) {
        //can this happen?
        errno=ENOENT;
-        CloseHandle(hFile);
-        c_free_locale_string(wuri);
+	CloseHandle(hFile);
        return -1;
    }

@@ -48,9 +48,6 @@ csync_vio_handle_t *csync_vio_opendir(CSYNC *ctx, const char *name) {
      return owncloud_opendir(ctx, name);
      break;
    case LOCAL_REPLICA:
-	if( ctx->callbacks.update_callback ) {
-	  ctx->callbacks.update_callback(ctx->replica, name, ctx->callbacks.update_callback_userdata);
-	}
      return csync_vio_local_opendir(name);
      break;
    default:
@@ -34,9 +34,6 @@

 #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 {
@@ -59,7 +56,7 @@ enum csync_vio_file_type_e {
 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_PERMISSIONS = 1 << 1,
  CSYNC_VIO_FILE_STAT_FIELDS_FLAGS = 1 << 2,
  CSYNC_VIO_FILE_STAT_FIELDS_DEVICE = 1 << 3,
  CSYNC_VIO_FILE_STAT_FIELDS_INODE = 1 << 4,
@@ -78,19 +75,16 @@ enum csync_vio_file_stat_fields_e {
  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
-
+  CSYNC_VIO_FILE_STAT_FIELDS_DIRECTDOWNLOADCOOKIES = 1 << 20
 };


 struct csync_vio_file_stat_s {
  char *name;
-  char *etag; // FIXME: Should this be inlined like file_id and perm?
+  char *etag;
  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;
@@ -227,6 +227,9 @@ int csync_vio_local_stat(const char *uri, csync_vio_file_stat_t *buf) {
    buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_FLAGS;
    buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_TYPE;

+    buf->mode = 666;
+    buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_PERMISSIONS;
+
    buf->device = fileInfo.dwVolumeSerialNumber;
    buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_DEVICE;

@@ -257,7 +260,6 @@ int csync_vio_local_stat(const char *uri, csync_vio_file_stat_t *buf) {
        buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_CTIME;
    }

-    c_free_locale_string(wuri);
    CloseHandle(h);

    return 0;
@@ -313,7 +315,7 @@ int csync_vio_local_stat(const char *uri, csync_vio_file_stat_t *buf) {
  buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_TYPE;

  buf->mode = sb.st_mode;
-  buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_MODE;
+  buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_PERMISSIONS;

  if (buf->type == CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK) {
    /* FIXME: handle symlink */
@@ -38,6 +38,7 @@ static void check_csync_destroy_null(void **state)
 static void check_csync_create(void **state)
 {
    CSYNC *csync;
+    char confdir[1024] = {0};
    int rc;

    (void) state; /* unused */
@@ -25,8 +25,6 @@
 #define CSYNC_TEST 1
 #include "csync_exclude.c"

-#define EXCLUDE_LIST_FILE SOURCEDIR"/../sync-exclude.lst"
-
 static void setup(void **state) {
    CSYNC *csync;
    int rc;
@@ -44,7 +42,7 @@ static void setup_init(void **state) {
    rc = csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
    assert_int_equal(rc, 0);

-    rc = csync_exclude_load(EXCLUDE_LIST_FILE, &(csync->excludes));
+    rc = csync_exclude_load(csync, SOURCEDIR "/../sync-exclude.lst");
    assert_int_equal(rc, 0);

    *state = csync;
@@ -68,7 +66,7 @@ static void teardown(void **state) {
 static void check_csync_exclude_add(void **state)
 {
  CSYNC *csync = *state;
-  _csync_exclude_add(&(csync->excludes), "/tmp/check_csync1/*");
+  _csync_exclude_add(csync, (const char *) "/tmp/check_csync1/*");
  assert_string_equal(csync->excludes->vector[0], "/tmp/check_csync1/*");
 }

@@ -77,11 +75,10 @@ static void check_csync_exclude_load(void **state)
    CSYNC *csync = *state;
    int rc;

-    rc = csync_exclude_load(EXCLUDE_LIST_FILE, &(csync->excludes) );
+    rc = csync_exclude_load(csync,  SOURCEDIR "/../sync-exclude.lst");
    assert_int_equal(rc, 0);

    assert_string_equal(csync->excludes->vector[0], "*.filepart");
-    assert_int_not_equal(csync->excludes->count, 0);
 }

 static void check_csync_excluded(void **state)
@@ -109,9 +106,15 @@ static void check_csync_excluded(void **state)
    rc = csync_excluded(csync, "foo/bar/.apdisk", CSYNC_FTW_TYPE_DIR);
    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);

+    /*
+     * Pattern: .java/
+     * A file wont be excluded but a directory .java will be.
+     */
+ /*   rc = csync_excluded(csync, ".java", CSYNC_FTW_TYPE_DIR);
+    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
    rc = csync_excluded(csync, ".java", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
+*/
    /* Files in the ignored dir .java will also be ignored. */
    rc = csync_excluded(csync, ".apdisk/totally_amazing.jar", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
@@ -138,6 +141,20 @@ static void check_csync_excluded(void **state)
    /* Not excluded because the pattern .netscape/cache requires directory. */
    rc = csync_excluded(csync, ".netscape/cache", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
+/*
+    rc = csync_excluded(csync, ".netscape/cache", CSYNC_FTW_TYPE_DIR);
+    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);*/
+
+    /* Excluded because the parent dir .netscape/cache is ingored. */
+/*    rc = csync_excluded(csync, ".netscape/cache/foo", CSYNC_FTW_TYPE_FILE);
+    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
+
+    rc = csync_excluded(csync, ".netscape/cache/bar.txt", CSYNC_FTW_TYPE_FILE);
+    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
+
+    rc = csync_excluded(csync, ".netscape/cache/longrun", CSYNC_FTW_TYPE_DIR);
+    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
+*/

 }

@@ -120,6 +120,8 @@ static csync_vio_file_stat_t* create_fstat(const char *name,
    fs->type = CSYNC_VIO_FILE_TYPE_REGULAR;
    fs->fields |= CSYNC_VIO_FILE_STAT_FIELDS_TYPE;

+    fs->mode = 0644;
+    fs->fields |= CSYNC_VIO_FILE_STAT_FIELDS_PERMISSIONS;

    if (inode == 0) {
        fs->inode = 619070;
@@ -34,8 +34,6 @@ use LWP::UserAgent;
 use LWP::Protocol::https;
 use HTTP::Request::Common qw( POST GET DELETE );
 use File::Basename;
-use IO::Handle;
-use POSIX qw/strftime/;

 use Encode qw(from_to);
 use utf8;
@@ -62,7 +60,7 @@ our $infoCnt = 1;
 our %config;

@ISA        = qw(Exporter);
-@EXPORT     = qw( initTesting createRemoteDir removeRemoteDir createLocalDir cleanup csync
+@EXPORT     = qw( initTesting createRemoteDir createLocalDir cleanup csync
                  assertLocalDirs assertLocalAndRemoteDir glob_put put_to_dir 
                  putToDirLWP localDir remoteDir localCleanup createLocalFile md5OfFile
                  remoteCleanup server initLocalDir initRemoteDir moveRemoteFile
@@ -130,9 +128,8 @@ sub initTesting(;$)
  # $d->DebugLevel(3);
  $prefix = "t1" unless( defined $prefix );
  
-  my $dirId = sprintf("%02d", rand(100));
-  my $dateTime = strftime('%Y%m%d%H%M%S',localtime);
-  my $dir = sprintf( "%s-%s-%s/", $prefix, $dateTime, $dirId );
+  my $dirId = sprintf("%#.3o", rand(1000));
+  my $dir = sprintf( "%s-%s/", $prefix, $dirId );
  
  $localDir = $dir;
  $localDir .= "/" unless( $localDir =~ /\/$/ );
@@ -182,32 +179,6 @@ sub initLocalDir
  mkdir ($localDir, 0777 );
 }

-sub removeRemoteDir($;$)
-{
-    my ($dir, $optionsRef) = @_;
-
-    my $url = testDirUrl() . $dir;
-
-    if( $optionsRef && $optionsRef->{user} && $optionsRef->{passwd} ) {
-	$d->credentials( -url=> $owncloud, -realm=>"ownCloud",
-			 -user=> $optionsRef->{user},
-			 -pass=> $optionsRef->{passwd} );
-	if( $optionsRef->{url} ) {
-	    $url = $optionsRef->{url} . $dir;
-	}
-    }
-
-    $d->open( $owncloud );
-    print $d->message . "\n";
-
-    my $re = $d->delete( $url );
-    if( $re == 0 ) {
-	print "Failed to remove directory <$url>:" . $d->message() ."\n";
-    }
-  
-    return $re;
-}
-
 sub createRemoteDir(;$$)
 {
    my ($dir, $optionsRef) = @_;
@@ -228,7 +199,7 @@ sub createRemoteDir(;$$)

    my $re = $d->mkcol( $url );
    if( $re == 0 ) {
-	print "Failed to create directory <$url>: " . $d->message() ."\n";
+	print "Failed to create directory <$url>: $d->message() \n";
 	exit 1;
    }
    $d->open( $url );
@@ -606,7 +577,7 @@ sub createLocalFile( $$ )
  my $minimum = 32;
  my $range = 96;

-  for (my $bytes = 0; $bytes < $size-1; $bytes += 4) {
+  for (my $bytes = 0; $bytes < $size; $bytes += 4) {
    my $rand = int(rand($range ** 4));
    my $string = '';
    for (1..4) {
@@ -616,9 +587,6 @@ sub createLocalFile( $$ )
    print FILE $string;
    $md5->add($string);
  }
-  my $s = "\n";
-  print FILE $s;
-  $md5->add($s);
  close FILE;
  return $md5->hexdigest; 
 }
@@ -637,22 +605,13 @@ sub md5OfFile( $ )
  return $hash;
 }

-sub moveRemoteFile($$;$)
+sub moveRemoteFile($$)
 {
-  my ($from, $to, $no_testdir) = @_;
-
-  $d->credentials( -url=> $owncloud, -realm=>"ownCloud",
-		      -user=> $user,
-		  -pass=> $passwd );
-
+  my ($from, $to) = @_;
+    
  my $fromUrl = testDirUrl(). $from;
  my $toUrl = testDirUrl() . $to;
  
-  if( $no_testdir ) {
-     $fromUrl = $from;
-     $toUrl = $to;
-  }
-  
  $d->move($fromUrl, $toUrl);
  
 }
@@ -123,9 +123,8 @@ assertLocalAndRemoteDir( '', 0);

 # The previous sync should have updated the etags, and this should NOT be a conflict
 printInfo( "Update the file again");
-createLocalFile( localDir() . "remoteToLocal1/kernelcrash.txt", 2136 );
-createLocalFile( localDir() . "remoteToLocal1/kraft_logo.gif", 2332 );
-system( "sleep 2 && touch " . localDir() . "remoteToLocal1/kernelcrash.txt" );
+system("echo more data >> " .  localDir() . "remoteToLocal1/kernelcrash.txt");
+system("echo corruption >> " .  localDir() . "remoteToLocal1/kraft_logo.gif");
 csync( );
 assertLocalAndRemoteDir( '', 0);

@@ -185,35 +185,12 @@ assertLocalAndRemoteDir( 'remoteToLocal1', 1);
 printInfo("Move a file from the server");
 $inode = getInode('remoteToLocal1/rtl2/kb1_local_gone.jpg');
 moveRemoteFile( 'remoteToLocal1/rtl2/kb1_local_gone.jpg', 'remoteToLocal1/rtl2/kb1_local_gone2.jpg');
-
-#also create a new directory localy for the next test
-mkdir( localDir().'superNewDir' );
-createLocalFile(localDir().  'superNewDir/f1', 1234 );
-createLocalFile(localDir().  'superNewDir/f2', 1324 );
-my $superNewDirInode = getInode('superNewDir');
-
-
 csync();
-assertLocalAndRemoteDir( '', 1);
+assertLocalAndRemoteDir( 'remoteToLocal1', 1);
 $inode2 = getInode('remoteToLocal1/rtl2/kb1_local_gone2.jpg');
 assert( $inode == $inode2, "Inode has changed 3!");


-printInfo("Move a newly created directory");
-moveRemoteFile('superNewDir', 'superNewDirRenamed');
-#also add new files in new directory
-createLocalFile(localDir().  'superNewDir/f3' , 2456 );
-$inode = getInode('superNewDir/f3');
-
-csync();
-assertLocalAndRemoteDir( '', 1);
-my $file = localDir() . 'superNewDir';
-assert( ! -e $file );
-
-$inode2 = getInode('superNewDirRenamed/f3');
-assert( $inode == $inode2, "Inode of f3 changed");
-$inode2 = getInode('superNewDirRenamed');
-assert( $superNewDirInode == $inode2, "Inode of superNewDir changed");

 cleanup();

@@ -30,20 +30,11 @@ use ownCloud::Test;
 use strict;

 print "Hello, this is t5, a tester for syncing of files in Shares\n";
+# stat error occours on windsows when the file is busy for example

 initTesting();

-# Create empty test dirs.
-csync();
-
 my $share_dir = "share_source";
-my $sharee = { user   => configValue('share_user'),
-               passwd => configValue('share_passwd'),
-	       url    => server() };
-
-# first remove a possibly left over share dir.
-printInfo( "Remove possibly left over share dir" );
-removeRemoteDir( $share_dir, $sharee );

 printInfo( "Create a share." );
 my $shareId = createShare( $share_dir, 31 );
@@ -51,53 +42,24 @@ print "Created share with id <$shareId>\n";

 assert( $shareId > 0 );

+my $sharee = { user => configValue('share_user'),
+               passwd => configValue('share_passwd'),
+	       url => server() };
 # put a couple of files into the shared directory in the sharer account
 glob_put( 'sharing/*', $share_dir, $sharee);

-# Move the shared dir remotely into the test dir, otherwise the script
-# has a hard time to find it.
-moveRemoteFile( server() . $share_dir, localDir(), 1 ); 
+# now user kf has a new directory in shared.

 # call csync, sync local t1 to remote t1
 printInfo("Initial sync, sync stuff down.");
-csync();
-
-
-assertLocalAndRemoteDir( '', 0 );
+csync( server()."Shared" );
+assertLocalAndRemoteDir( 'Shared', 0, server() );

 # Local file to a read/write share should be synced up
 printInfo("Put a file into the share.");
-createLocalFile(localDir() . "$share_dir/foobar.txt", 8094 );
-csync( );
-assertLocalAndRemoteDir( '', 0 );
-
-# now move the file locally and sync
-printInfo("Move the file locally and sync.");
-my $cmd = "mv " . localDir() . "$share_dir/foobar.txt ". localDir() . "$share_dir/moved_file.txt";
-system( $cmd );
-csync( );
-assertLocalAndRemoteDir( '', 0 );
-
-# now create aother directory and redo
-printInfo("Create another directory and file");
-my $cmd = "mkdir ". localDir() . "$share_dir/newDir";
-system( $cmd );
-createLocalFile( localDir() . "$share_dir/newDir/a_file.bin", 5321 );
-csync( );
-assertLocalAndRemoteDir( '', 0 );
-
-# Remove the local file again
-printInfo("Remove the local file again.");
-unlink( localDir() . "$share_dir/newDir/a_file.bin" );
-csync( );
-assertLocalAndRemoteDir( '', 0 );
-
-# Remove the local directory again
-printInfo("Remove the local directory again.");
-rmdir( localDir() . "$share_dir/newDir" );
-csync( );
-assertLocalAndRemoteDir( '', 0 );
-
+createLocalFile( localDir(). $share_dir . "/foobar.txt", 8094 );
+csync( server()."Shared" );
+assertLocalAndRemoteDir( 'Shared', 0, server() );


 printInfo("Remove a Share.");
@@ -33,34 +33,6 @@ print "Hello, this is t6, a tester for csync with ownCloud.\n";

 initTesting();

-sub createPostUpdateScript()
-{
-    my $srcFile = localDir()."BIG.file";
-    my $cred = configValue("user") . ":" . configValue("passwd");
-    my $cmd = "curl -T $srcFile -u $cred " . testDirUrl();
-    my $script = "/tmp/post_update_script.sh";
-    open SC, ">$script" || die("Can not create script file");
-    print SC "#!/bin/bash\n";
-    print SC "$cmd\n";
-    close SC;
-    chmod 0755, $script;
-
-    return $script;
-}
-
-sub getETagFromJournal($)
-{
-    my ($num) = @_;
-    
-    my $sql = "sqlite3 " . localDir() . ".csync_journal.db \"SELECT md5 FROM metadata WHERE path='BIG.file';\"";
-    open(my $fh, '-|', $sql) or die $!;
-    my $etag  = <$fh>;
-    close $fh;
-    print "$num etag: $etag";
-
-    return $etag;
-}
-
 sub chunkFileTest( $$ ) 
 {
    my ($name, $size) = @_;
@@ -91,27 +63,7 @@ sub chunkFileTest( $$ )
 printInfo("Big file that needs chunking with default chunk size");
 chunkFileTest( "BIG.file", 23251233 );

-printInfo("Update the existing file and trigger reupload");
-# change the existing file again -> update
-chunkFileTest( "BIG.file", 21762122 );
-
-printInfo("Cause a precondition failed error");
-# Now overwrite the existing file to change it
-createLocalFile( localDir()."BIG.file", 21832199 );
-# and create a post update script
-my $script = createPostUpdateScript();
-$ENV{'OWNCLOUD_POST_UPDATE_SCRIPT'} = $script;
-
-# Save the etag before the sync
-my $firstETag = getETagFromJournal('First');
-csync(); # Sync, which ends in a precondition failed error 
-# get the etag again. It has to be unchanged because of the error.
-my $secondETag = getETagFromJournal('Second');
-assert( $firstETag eq $secondETag, "Different ETags, no precondition error." );
-
-unlink($script);
-
-# Set a custom chunk size in environment.
+ # Set a custom chunk size in environment.
 my $ChunkSize = 1*1024*1024;
 $ENV{'OWNCLOUD_CHUNK_SIZE'} = $ChunkSize;

@@ -1,256 +0,0 @@
-#!/usr/bin/perl
-#
-# Test script for the ownCloud module of csync.
-# This script requires a running ownCloud instance accessible via HTTP.
-# It does quite some fancy tests and asserts the results.
-#
-# Copyright (C) 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
-#
-
-use lib ".";
-
-use Carp::Assert;
-use File::Copy;
-use ownCloud::Test;
-
-use strict;
-
-print "Hello, this is t7, a tester for syncing of files in read only directory\n";
-
-# Check if the expected rows in the DB are non-empty. Note that in some cases they might be, then we cannot use this function
-# https://github.com/owncloud/mirall/issues/2038
-sub assertCsyncJournalOk {
-	my $path = $_[0];
-
-    # FIXME: should test also remoteperm but it's not working with owncloud6
-    #     my $cmd = 'sqlite3 ' . $path . '.csync_journal.db "SELECT count(*) from metadata where length(remotePerm) == 0 or length(fileId) == 0"';
-    my $cmd = 'sqlite3 ' . $path . '.csync_journal.db "SELECT count(*) from metadata where length(fileId) == 0"';
-	my $result = `$cmd`;
-	assert($result == "0");
-}
-
-# IMPORTANT NOTE :
-print "This test use the OWNCLOUD_TEST_PERMISSIONS environement variable and _PERM_xxx_ on filenames to set the permission. ";
-print "It does not rely on real permission set on the server.  This test is just for testing the propagation choices\n";
-# "It would be nice" to have a test that test with real permissions on the server
-
-$ENV{OWNCLOUD_TEST_PERMISSIONS} = "1";
-
-initTesting();
-
-printInfo( "Init" );
-
-#create some files localy
-my $tmpdir = "/tmp/t7/";
-mkdir($tmpdir);
-createLocalFile( $tmpdir . "normalFile_PERM_WVND_.data", 100 );
-createLocalFile( $tmpdir . "cannotBeRemoved_PERM_WVN_.data", 101 );
-createLocalFile( $tmpdir . "canBeRemoved_PERM_D_.data", 102 );
-my $md5CanotBeModified = createLocalFile( $tmpdir . "canotBeModified_PERM_DVN_.data", 103 );
-createLocalFile( $tmpdir . "canBeModified_PERM_W_.data", 104 );
-
-#put them in some directories
-createRemoteDir( "normalDirectory_PERM_CKDNV_" );
-glob_put( "$tmpdir/*", "normalDirectory_PERM_CKDNV_" );
-createRemoteDir( "readonlyDirectory_PERM_M_" );
-glob_put( "$tmpdir/*", "readonlyDirectory_PERM_M_" );
-createRemoteDir( "readonlyDirectory_PERM_M_/subdir_PERM_CK_" );
-createRemoteDir( "readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_" );
-glob_put( "$tmpdir/normalFile_PERM_WVND_.data", "readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_" );
-
-
-csync();
-assertCsyncJournalOk(localDir());
-assertLocalAndRemoteDir( '', 0);
-
-system("sleep 1"); #make sure changes have different mtime
-
-printInfo( "Do some changes and see how they propagate" );
-
-#1. remove the file than cannot be removed
-#  (they should be recovered)
-unlink( localDir() . 'normalDirectory_PERM_CKDNV_/cannotBeRemoved_PERM_WVN_.data' );
-unlink( localDir() . 'readonlyDirectory_PERM_M_/cannotBeRemoved_PERM_WVN_.data' );
-
-#2. remove the file that can be removed
-#  (they should properly be gone)
-unlink( localDir() . 'normalDirectory_PERM_CKDNV_/canBeRemoved_PERM_D_.data' );
-unlink( localDir() . 'readonlyDirectory_PERM_M_/canBeRemoved_PERM_D_.data' );
-
-#3. Edit the files that cannot be modified
-#  (they should be recovered, and a conflict shall be created)
-system("echo 'modified' > ". localDir() . "normalDirectory_PERM_CKDNV_/canotBeModified_PERM_DVN_.data");
-system("echo 'modified_' > ". localDir() . "readonlyDirectory_PERM_M_/canotBeModified_PERM_DVN_.data");
-
-#4. Edit other files
-#  (they should be uploaded)
-system("echo '__modified' > ". localDir() . "normalDirectory_PERM_CKDNV_/canBeModified_PERM_W_.data");
-system("echo '__modified_' > ". localDir() . "readonlyDirectory_PERM_M_/canBeModified_PERM_W_.data");
-
-#5. Create a new file in a read only folder
-# (they should not be uploaded)
-createLocalFile( localDir() . "readonlyDirectory_PERM_M_/newFile_PERM_WDNV_.data", 105 );
-
-#6. Create a new file in a read only folder
-# (should be uploaded)
-createLocalFile( localDir() . "normalDirectory_PERM_CKDNV_/newFile_PERM_WDNV_.data", 106 );
-
-#do the sync
-csync();
-assertCsyncJournalOk(localDir());
-
-
-#1.
-# File should be recovered
-assert( -e localDir(). 'normalDirectory_PERM_CKDNV_/cannotBeRemoved_PERM_WVN_.data' );
-assert( -e localDir(). 'readonlyDirectory_PERM_M_/cannotBeRemoved_PERM_WVN_.data' );
-
-#2.
-# File should be deleted
-assert( !-e localDir() . 'normalDirectory_PERM_CKDNV_/canBeRemoved_PERM_D_.data' );
-assert( !-e localDir() . 'readonlyDirectory_PERM_M_/canBeRemoved_PERM_D_.data' );
-
-#3.
-# File should be recovered
-assert($md5CanotBeModified eq md5OfFile( localDir().'normalDirectory_PERM_CKDNV_/canotBeModified_PERM_DVN_.data' ));
-assert($md5CanotBeModified eq md5OfFile( localDir().'readonlyDirectory_PERM_M_/canotBeModified_PERM_DVN_.data' ));
-# and conflict created
-# TODO check that the conflict file has the right content
-assert( -e glob(localDir().'normalDirectory_PERM_CKDNV_/canotBeModified_PERM_DVN__conflict-*.data' ) );
-assert( -e glob(localDir().'readonlyDirectory_PERM_M_/canotBeModified_PERM_DVN__conflict-*.data' ) );
-# remove the conflicts for the next assertLocalAndRemoteDir
-system("rm " . localDir().'normalDirectory_PERM_CKDNV_/canotBeModified_PERM_DVN__conflict-*.data' );
-system("rm " . localDir().'readonlyDirectory_PERM_M_/canotBeModified_PERM_DVN__conflict-*.data' );
-
-#4. File should be updated, that's tested by assertLocalAndRemoteDir
-
-#5.
-# The file should not exist on the remote
-# TODO: test that the file is NOT on the server
-# but still be there
-assert( -e localDir() . "readonlyDirectory_PERM_M_/newFile_PERM_WDNV_.data" );
-# remove it so assertLocalAndRemoteDir succeed.
-unlink(localDir() . "readonlyDirectory_PERM_M_/newFile_PERM_WDNV_.data");
-
-#6.
-# the file should be in the server and local
-assert( -e localDir() . "normalDirectory_PERM_CKDNV_/newFile_PERM_WDNV_.data" );
-
-
-### Both side should still be the same
-assertLocalAndRemoteDir( '', 0);
-
-
-
-
-#######################################################################
-printInfo( "remove the read only directory" );
-# -> It must be recovered
-system("rm -r " . localDir().'readonlyDirectory_PERM_M_' );
-csync();
-assertCsyncJournalOk(localDir());
-assert( -e localDir(). 'readonlyDirectory_PERM_M_/cannotBeRemoved_PERM_WVN_.data' );
-assert( -e localDir(). 'readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_WVND_.data' );
-assertLocalAndRemoteDir( '', 0);
-
-
-#######################################################################
-printInfo( "move a directory in a outside read only folder" );
-system("sqlite3 " . localDir().'.csync_journal.db .dump');
-
-#Missing directory should be restored
-#new directory should be uploaded
-system("mv " . localDir().'readonlyDirectory_PERM_M_/subdir_PERM_CK_ ' . localDir().'normalDirectory_PERM_CKDNV_/subdir_PERM_CKDNV_'  );
-
-# two syncs may be necessary for now: https://github.com/owncloud/mirall/issues/2038
-csync();
-csync();
-system("sqlite3 " . localDir().'.csync_journal.db .dump');
-assertCsyncJournalOk(localDir());
-
-# old name restored
-assert( -e localDir(). 'readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_/' );
-assert( -e localDir(). 'readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_WVND_.data' );
-
-# new still exist
-assert( -e localDir(). 'normalDirectory_PERM_CKDNV_/subdir_PERM_CKDNV_/subsubdir_PERM_CKDNV_/normalFile_PERM_WVND_.data' );
-
-assertLocalAndRemoteDir( '', 0);
-
-
-
-
-
-#######################################################################
-printInfo( "rename a directory in a read only folder and move a directory to a read-only" );
-
-# do a sync to update the database
-csync();
-
-#1. rename a directory in a read only folder
-#Missing directory should be restored
-#new directory should stay but not be uploaded
-system("mv " . localDir().'readonlyDirectory_PERM_M_/subdir_PERM_CK_ ' . localDir().'readonlyDirectory_PERM_M_/newname_PERM_CK_'  );
-
-#2. move a directory from read to read only  (move the directory from previous step)
-system("mv " . localDir().'normalDirectory_PERM_CKDNV_/subdir_PERM_CKDNV_ ' . localDir().'readonlyDirectory_PERM_M_/moved_PERM_CK_'  );
-
-# two syncs may be necessary for now: https://github.com/owncloud/mirall/issues/2038
-csync();
-csync();
-assertCsyncJournalOk(localDir());
-
-#1.
-# old name restored
-assert( -e localDir(). 'readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_WVND_.data' );
-
-# new still exist
-assert( -e localDir(). 'readonlyDirectory_PERM_M_/newname_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_WVND_.data' );
-# but is not on server: so remove for assertLocalAndRemoteDir
-system("rm -r " . localDir(). "readonlyDirectory_PERM_M_/newname_PERM_CK_");
-
-#2.
-# old removed
-assert( ! -e localDir(). 'normalDirectory_PERM_CKDNV_/subdir_PERM_CKDNV_/' );
-# new still there
-assert( -e localDir(). 'readonlyDirectory_PERM_M_/moved_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_WVND_.data' );
-#but not on server
-system("rm -r " . localDir(). "readonlyDirectory_PERM_M_/moved_PERM_CK_");
-
-assertLocalAndRemoteDir( '', 0);
-
-system("sqlite3 " . localDir().'.csync_journal.db .dump');
-
-
-cleanup();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1,110 +0,0 @@
-#!/usr/bin/perl
-#
-# Test script for the ownCloud module of csync.
-# This script requires a running ownCloud instance accessible via HTTP.
-# It does quite some fancy tests and asserts the results.
-#
-# Copyright (C) by Olivier Goffart <ogoffart@woboq.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
-#
-
-use lib ".";
-
-use Carp::Assert;
-use File::Copy;
-use ownCloud::Test;
-
-use strict;
-
-print "Hello, this is t8, a tester for syncing of files on a case sensitive FS\n";
-
-
-# The test is run on a 'normal' file system, but we tell pwncloud that it is case preserving anyway
-$ENV{OWNCLOUD_TEST_CASE_PRESERVING} = "1";
-
-# FIXME!  the code does not work with parallelism
-$ENV{OWNCLOUD_MAX_PARALLEL}="1";
-
-initTesting();
-
-printInfo( "Syncing two files with the same name that differ with case" );
-
-#create some files localy
-my $tmpdir = "/tmp/t8/";
-mkdir($tmpdir);
-createLocalFile( $tmpdir . "HELLO.dat", 100 );
-createLocalFile( $tmpdir . "Hello.dat", 150 );
-createLocalFile( $tmpdir . "Normal.dat", 110 );
-
-#put them in some directories
-createRemoteDir( "dir" );
-glob_put( "$tmpdir/*", "dir" );
-
-csync();
-
-# Check that only one of the two file was synced.
-# The one that exist here is undefined, the current implementation will take the
-# first one alphabetically,  but the other one would also be fine. What's imporant
-# is that there is only one.
-assert( -e localDir() . 'dir/HELLO.dat' );
-assert( !-e localDir() . 'dir/Hello.dat' );
-
-printInfo( "Remove one file should remove it on the server and download the other one" );
-unlink( localDir() . 'dir/HELLO.dat' );
-
-csync();
-assert( -e localDir() . 'dir/Hello.dat' );
-assert( !-e localDir() . 'dir/HELLO.dat' );
-assertLocalAndRemoteDir( '', 0);
-
-
-printInfo( "Renaming one file to the same name as another one with different casing" );
-moveRemoteFile( 'dir/Hello.dat', 'dir/NORMAL.dat');
-
-csync();
-
-#It should not have do the move
-assert( -e localDir() . 'dir/Hello.dat' );
-assert( !-e localDir() . 'dir/NORMAL.dat' );
-assert( -e localDir() . 'dir/Normal.dat' );
-
-printInfo( "Another directory with the same name but different casing is created" );
-
-createRemoteDir( "DIR" );
-glob_put( "$tmpdir/*", "DIR" );
-
-csync();
-
-assert( !-e localDir() . 'DIR' );
-
-
-printInfo( "Remove the old dir localy" );
-
-system("rm -r " . localDir() . "dir");
-
-csync();
-
-# now DIR was fetched
-assert( -e localDir() . 'DIR' );
-assert( -e localDir() . 'DIR/HELLO.dat' );
-assert( !-e localDir() . 'DIR/Hello.dat' );
-assert( !-e localDir() . 'dir' );
-
-# dir/NORMAL.dat is still on the server
-
-cleanup();
-system("rm -r " . $tmpdir);
-
@@ -1,42 +1,45 @@
 Setting up an Account
 =====================

-If no account has been configured, the ownCloud Client automatically assist in
-connecting to your ownCloud server after the application has been started.
+If no account has been configured, the ownCloud Client will automatically
+assist in connecting to your ownCloud server after the application has been
+started.

-To set up an account:
-
-1. Specify the URL to your Server. This is the same address that is used in the browser.
+As a first step, specify the URL to your Server. This is the same address
+that is used in the browser.

 .. image:: images/wizard_url.png
   :scale: 50 %

 .. note:: Make sure to use ``https://`` if the server supports it. Otherwise,
-   your password and all data will be transferred to the server unencrypted.  This
-   makes it easy for third parties to intercept your communication, and getting
-   hold of your password!
+   your password and all data will be transferred to the server unencrypted.
+   This makes it easy for third parties to intercept your communication, and
+   getting hold of your password!

-2. Enter the username and password.  These are the same credentials used to log into the web interface.
+Next, enter the username and password.  These are the same credentials used
+to log into the web interface.

 .. image:: images/wizard_user.png
   :scale: 50 %

-3. Choose the folder with which you want the ownCloud Client to synchronize the
-   contents of your ownCloud account. By default, this is a folder called
-   `ownCloud`. This folder is created in the home directory.
+Finally, choose the folder that ownCloud Client is supposed to sync the
+contents of your ownCloud account with. By default, this is a folder
+called `ownCloud`, which will be created in the home directory.

 .. image:: images/wizard_targetfolder.png
   :scale: 50 %

-   The synchronization between the root directories of the ownCloud server begins.
+At this time, the synchronization between the root directories of the
+ownCloud server will begin.

 .. image:: images/wizard_overview.png
   :scale: 50 %

-When selecting a local folder that already contains data, you can choose from two options:
+If selecting a local folder that already contains data, there are
+two options that exist.

-* :guilabel:`Keep local data`: When selected, the files in the local folder on
-  the client are synchronized to the ownCloud server.
-
-* :guilabel:`Start a clean sync`: When selected, all files in the local folder on the
-  client are deleted.  These files are not syncrhonized to the ownCloud server.
+* Keep local data: If selected, the files in the local folder on the
+  client will be synced up to the ownCloud server.
+* Start a clean sync: If selected, all files in the local folder on
+  the client will be deleted and therefore not synced to the ownCloud
+  server.
@@ -1,96 +1,88 @@
-Appendix B: History and Architecture
-====================================
+Appendix B: Architecture
+========================

-.. index:: architecture
+.. index:: architecture 

-ownCloud provides desktop sync clients to synchronize the contents of local
-directories from computers, tablets, and handheld devices to the ownCloud
-server.
+The ownCloud project provides desktop sync clients to synchronize the
+contents of local directories on the desktop machines to the ownCloud.

-Synchronization is accomplished using csync_, a bidirectional file
-synchronizing tool that provides both a command line client as well as a
-library. A special module for csync was written to synchronize with the
-ownCloud built-in WebDAV server.
+The syncing is done with csync_, a bidirectional file synchronizing tool which
+provides both a command line client as well as a library. A special module for
+csync was written to synchronize with ownCloud’s built-in WebDAV server.

-The ownCloud sync client is based on a tool called *mirall*, initially written
-by Duncan Mac Vicar. Later Klaas Freitag joined the project and enhanced it to
-function with the ownCloud server.
+The ownCloud sync client is based on a tool called mirall initially written by
+Duncan Mac Vicar. Later Klaas Freitag joined the project and enhanced it to work
+with ownCloud server.

-The ownCloud Client software is written in C++ using the `Qt Framework`_. As a
-result, the ownCloud Client runs on Linux, Windows, and MacOS.
+ownCloud Client is written in C++ using the `Qt Framework`_. As a result, the
+ownCloud Client runs on the three important platforms Linux, Windows and MacOS.

 .. _csync: http://www.csync.org
 .. _`Qt Framework`: http://www.qt-project.org

-The Synchronization Process
---------------------------
+The Sync Process
+----------------

-The process of synchronization keeps files in two separate repositories the same. When syncrhonized:
+First it is important to recall what syncing is: It tries to keep the files
+on two repositories the same. That means if a file is added to one repository
+it is going to be copied to the other repository. If a file is changed on one
+repository, the change is propagated to the other repository. Also, if a file
+is deleted on one side, it is deleted on the other. As a matter of fact, in
+ownCloud syncing we do not have a typical client/server system where the
+server is always master.

- If a file is added to one repository it is copied to the other synchronized repository.
- When a file is changed in one repository, the change is propagated to any
-  syncrhonized other repositories- If a file is deleted in one repository, it
-  is deleted in any other.
+This is the major difference to other systems like a file backup where just
+changes and new files are propagated but files never get deleted.

-It is important to note that the ownCloud synchronization process does not use
-a typical client/server system where the server is always master.  This is a
-major difference between the ownCloud syncrhonizatin process and other systems
-like a file backup, where only changes to files or folders and the addition of
-new files are propagated, but these files and folders are never deleted unless
-explicitly deleted in the backup.
+The ownCloud Client checks both repositories for changes frequently after a
+certain time span. That is refered to as a sync run. In between the local
+repository is monitored by a file system monitor system that starts a sync run
+immediately if something was edited, added or removed.

-During synchronization, the ownCloud Client checks both repositories for
-changes frequently. This process is referred to as a *sync run*. In between
-sync runs, the local repository is monitored by a file system monitoring
-process that starts a sync run immediately if something was edited, added, or
-removed.
+Sync by Time versus ETag
+------------------------
+.. index:: time stamps, file times, etag, unique id 

-Synchronization by Time versus ETag
-----------------------------------
-.. index:: time stamps, file times, etag, unique id
-
-Until the release of ownCloud 4.5 and ownCloud Client 1.1, the ownCloud
-synchronization process employed a single file property -- the file modificatin
-time -- to decide which file was newer and needed to be synchronized to the
-other repository.
+Until the release of ownCloud 4.5 and ownCloud Client 1.1, ownCloud employed
+a single file property to decide which file is newer and hence needs to be
+synced to the other repository: the files modification time.

 The *modification timestamp* is part of the files metadata. It is available on
-every relevant filesystem and is the typical indicator for a file change.
-Modification timestamps do not require special action to create, and have a
-general meaning. One design goal of csync is to not require a special server
-component. This design goal is why csync was chosen as the backend component.
+every relevant filesystem and is the natural indicator for a file change.
+Modification timestamps do not require special action to create and have
+a general meaning. One design goal of csync is to not require a special server
+component, that’s why it was chosen as the backend component.

-To compare the modification times of two files from different systems, csync
-must operate on the same base. Before ownCloud Client version 1.1.0, csync
-required both device repositories to run on the exact same time.  This
-requirement was achieved through the use of enterprise standard `NTP time
-synchronisation`_ on all machines.
+To compare the modification times of two files from different systems,
+it is needed to operate on the same base. Before version 1.1.0,
+csync requires both sides running on the exact same time, which can
+be achieved through enterprise standard `NTP time synchronisation`_ on all
+machines.

-Because this timing strategy is rather fragile without the use of NTP, ownCloud
-4.5 introduced a unique number (for each file?) that changes whenever the file
-changes. Although this number is a unique value, it is not a hash of the file.
-Instead, it is a randomly chosen number, that is transmitted in the Etag_
-field. Because the file number changes if the file changes, its use is
-guaranteed to determine if one of the files has changed and, thereby, launching
-a synchronization process.
+Since this strategy is rather fragile without NTP, ownCloud 4.5 introduced a
+unique number, which changes whenever the file changes. Although it is a unique
+value, it is not a hash of the file, but a randomly chosen number, which it will
+transmit in the Etag_ field. Since the file number is guaranteed to change if
+the file changes, it can now be used to determine if one of the files has
+changed.

-.. note:: ownCloud Client release 1.1 and later requires file ID capabilities
-   on the ownCloud server.  Servers that run with release earlier than 4.5.0 do
-   not support using the file ID functionality.
+.. note:: ownCloud Client 1.1 and newer require file ID capabilities on the
+   ownCloud server, hence using them with a server earlier than 4.5.0 is
+   not supported.

-Before the 1.3.0 release of the Desktop Client, the synchronization process
-might create faux conflict files if time deviates. Original and changed files
-conflict only in their timestamp, but not in their content. This behaviour was
-changed to employ a binary check if files differ.
+Before the 1.3.0 release of the client the sync process might create faux
+conflict files if time deviates. The original and the conflict files only
+differed in the timestamp, but not in content. This behaviour was changed
+towards a binary check if the files are different.

-Like files, directories also hold a unique ID that changes whenever one of the
-contained files or directories is modified. Because this is a recursive
-process, it significantly reduces the effort required for a synchronization
-cycle, because the client only analyzes directories with a modified ID.
+Just like files, directories also hold a unique id, which changes whenever
+one of the contained files or directories gets modified. Since this is a
+recursive process, it significantly reduces the effort required for a sync
+cycle, because the client will only walk directories with a modified unique id.


-The following table outlines the different synchronization methods used,
-depending on server/client combination:
+This table outlines the different sync methods attempted depending
+on server/client combination:

 .. index:: compatiblity table

@@ -106,10 +98,10 @@ depending on server/client combination:
 | 4.5 or later       | 1.1 or later      | File ID, Time Stamp        |
 +--------------------+-------------------+----------------------------+

-We strongly recommend using ownCloud Server release 4.5 or later when using
-ownCloud Client 1.1 or later. Using incompatible time stamp-based
-synchronization mechanism can lead to data loss in rare cases, especially when
-multiple clients are involved and one utilizes a non-synchronized NTP time.
+It is highly recommended to upgrade to ownCloud 4.5 or later with ownCloud
+Client 1.1 or later, since the time stamp-based sync mechanism can
+lead to data loss in certain edge-cases, especially when multiple clients
+are involved and one of them is not in sync with NTP time.

 .. _`NTP time synchronisation`: http://en.wikipedia.org/wiki/Network_Time_Protocol
 .. _Etag: http://en.wikipedia.org/wiki/HTTP_ETag
@@ -117,28 +109,27 @@ multiple clients are involved and one utilizes a non-synchronized NTP time.
 Comparison and Conflict Cases
 -----------------------------

-As mentioned above, during a *sync run* the client must first detect if one of
-the two repositories have changed files. On the local repository, the client
-traverses the file tree and compares the modification time of each file with an
-expected value stored in its database. If the value is not the same, the client
-determines that the file has been modified in the local repository.
+In a sync run the client first has to detect if one of the two repositories have
+changed files. On the local repository, the client traverses the file
+tree and compares the modification time of each file with the value it was 
+before. The previous value is stored in the client's database. If it is not, it
+means that the file has been added to the local repository. Note that on 
+the local side, the modificaton time a good attribute to detect changes because
+it does not depend on time shifts and such.

-.. note:: On the local side, the modificaton time a good attribute to use for detecting changes, because
-the value does not depend on time shifts and such.
+For the remote (ie. ownCloud) repository, the client compares the ETag of each
+file with it's previous value. Again the previous value is queried from the
+database. If the ETag is still the same, the file has not changed.

-For the remote (that is, ownCloud server) repository, the client compares the
-ETag of each file with its expected value. Again, the expected ETag value is
-queried from the client database. If the ETag is the same, the file has not
-changed and no synchronization occurs.
+In case a file has changed on both, the local and the remote repository since
+the last sync run, it can not easily be decided which version of the file is
+the one that should be used. However, changes to any side must not be lost.

-In the event a file has changed on both the local and the remote repository
-since the last sync run, it can not easily be decided which version of the file
-is the one that should be used. However, changes to any side be lost.  Instead,
-a *conflict case* is created. The client resolves this conflic by creating a
-conflict file of the older of the two files and saving the newer file under the
-original file name. Conflict files are always created on the client and never
-on the server. The conflict file uses the same name as the original file, but
-is appended with the timestamp of the conflict detection.
+That is called a **conflict case**. The client solves it by creating a conflict
+file of the older of the two files and save the newer one under the original
+file name. Conflict files are always created on the client and never on the
+server. The conflict file has the same name as the original file appended with
+the timestamp of the conflict detection.


 .. _ignored-files-label:
@@ -146,40 +137,40 @@ is appended with the timestamp of the conflict detection.
 Ignored Files
 -------------

-The ownCloud Client supports the ability to exclude or ignore certain files
-from the synchronization process. Some system wide file patterns that are used
-to exclude or ignore files are included with the client by default and the
-ownCloud Client provides the ability to add custom patterns.
+ownCloud Client supports that certain files are excluded or ignored from
+the synchronization. There are a couple of system wide file patterns which 
+come with the client. Custom patterns can be added by the user.

-By default, the ownCloud Client ignores the following files:
+ownCloud Client will ignore the following files:

- Files matched by one of the patterns defined in :ref:`ignoredFilesEditor-label`.
- Files containing characters that do not work on certain file systems (`\, :, ?, *, ", >, <, |`).
-* Files starting in ``.csync_journal.db*``, as these files are reserved for journalling.
+* Files matched by one of the pattern in :ref:`ignoredFilesEditor-label`
+* Files containing characters that do not work on certain file systems.
+  Currently, these characters are: `\, :, ?, *, ", >, <, |`
+* Files starting in ``.csync_journal.db*`` (reserved for journalling)

-If a pattern selected using a checkbox in the `ignoredFilesEditor-label` (or if
-a line in the exclude file starts with the character `]` directly followed by
-the file pattern), files matching the pattern are considered *fleeting meta
-data*. These files are ingored and *removed* by the client if found in the
-synchronized folder. This is suitable for meta files created by some
+If a pattern is checkmarked in the `ignoredFilesEditor-label` (or if a line in
+the exclude file starts with the character `]` directly followed
+by the file pattern), files matching this pattern are considered fleeting
+meta data. These files are ingored and *removed* by the client if found 
+in the sync folder. This is suitable for meta files created by some 
 applications that have no sustainable meaning.

-If a pattern ends with the backslash (`/`) character, only directories are
-matched. The pattern is only applied for directory components of filenames
-selected using the checkbox.
+If a pattern is ending with character `/` it means that only directories are
+matched. The pattern is only applied for directory components of the checked
+filename.

-To match filenames against the exclude patterns, the unix standard C library
-function fnmatch is used. This procesx checks the filename against the
-specified pattern using standard shell wildcard pattern matching. For more
-information, please refer to `The opengroup website
-<http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_13_01>`.
+To match file names against the exclude patterns, the unix standard C
+library function fnmatch is used. It checks the filename against the pattern
+using standard shell wildcard pattern matching. Check `The opengroup website
+<http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_13_01>`
+for the gory details.

-The path that is checked is the relative path under the sync root directory.
-
-**Pattern and File Match Examples:**
+The path that is checked is the relative path unter the sync root directory.

+Examples:
+^^^^^^^^^
 +-----------+------------------------------+
-| Pattern   | File Matches                 |
+| Pattern   | Matches                      |
 +===========+==============================+
 | ``~$*``   | ``~$foo``, ``~$example.doc`` |
 +-----------+------------------------------+
@@ -192,17 +183,15 @@ The path that is checked is the relative path under the sync root directory.
 The Sync Journal
 ----------------

-The client stores the ETag number in a per-directory database, called the
-*journal*.  This database is a hidden file contained in the directory to be
-synchronized.
+The client stores the ETag number in a per-directory database,
+called the journal.  It is a hidden file right in the directory
+to be synced.

-If the journal database is removed, the ownCloud Client CSync backend rebuilds
-the database by comparing the files and their modification times. This process
-ensures that both server and client are synchronized using the appropriate NTP
-time before restarting the client following a database removal.
+If the journal database gets removed, ownCloud Client's CSync backend will
+rebuild the database by comparing the files and their modification times. Thus
+it should be made sure that both server and client synchronized with NTP time
+before restarting the client after a database removal.

-Pressing ``F5`` while in the Account Settings Dialog enables you to "reset" the
-journal. This function can be used to recreate the journal database.
-
-.. note:: We recommend that you use this function only when advised to do so by
-   ownCloud support staff.
+Pressing ``F5`` in the Account Settings Dialog that allows to "reset" the
+journal. That can be used to recreate the journal database. Use this only
+if advised to do so by the developer or support staff.
@@ -1,126 +1,81 @@
 The Automatic Updater
 =====================

-To ensure that you are always using the latest version of the ownCloud client,
-an auto-update mechanism has been added in Version 1.5.1. The Automatic Updater
-ensures that you automatically profit from the latest features and bugfixes.
+To ensure you're always using the latest version of ownCloud Client, an
+auto-update mechanism has been added in Version 1.5.1. It will ensure
+that will automatically profit from the latest features and bugfixes.

-.. note:: The Automatic Updater functions differently, depending on the operating system.
+The updater works differently depending on the operating system.

 Basic Workflow
 --------------

-The following sections describe how to use the Automatic Updater on different operating systems:
-
 Windows
 ^^^^^^^

-The ownCloud client checks for updates and downloads them when available. You
-can view the update status under ``Settings -> General -> Updates`` in the
-ownCloud client.
+ownCloud client will check for updates and download the update if one
+is available. You can view the status under ``Settings -> General -> Updates``.
+If an update is available and has been successfully downloaded, ownCloud
+Client will start a silent update prior to its next launch and then start itself.
+If the silent update fails, the client offers a manual download.

-If an update is available, and has been successfully downloaded, the ownCloud
-client starts a silent update prior to its next launch and then restarts
-itself. Should the silent update fail, the client offers a manual download.
-
-.. note:: Administrative privileges are required to perform the update.
+.. note:: The user needs to be able to attain administrative privileges
+          to successfully perform the update.

 Mac OS X
 ^^^^^^^^

-If a new update is available, the ownCloud client initializes a pop-up dialog
-to alert you of the update and requesting that you update to the latest
-version. Due to their use of the Sparkle frameworks, this is the default
-process for Mac OS X applications.
+If a new update is available, ownCloud client will ask the user to update
+to the latest version using a pop-up dialog. This is the default for Mac
+OS X applications which use the Sparkle framework.

 Linux
 ^^^^^

-Linux distributions provide their own update tool, so ownCloud clients that use
-the Linux operating system do not perform any updates on their own. Linux
-operating systems do, however, check for the latest version of the ownCloud
-client and passively notify the user (``Settings -> General -> Updates``) when
-an update is available.
+Since distributions provide their own update tool, ownCloud Client on Linux
+will not perform any updates on its own. It will, however, check for the
+latest version and passively notify the user (``Settings -> General -> Updates``)
+if an update is available.


-Preventing Automatic Updates
----------------------------
+Preventing Auto Updates
+-----------------------

-In controlled environments, such as companies or universities, you might not
-want to enable the auto-update mechanism, as it interferes with controlled
-deployment tools and policies. To address this case, it is possible to disable
-the auto-updater entirely.  The following sections describe how to disable the
-auto-update mechanism for different operating systems.
+In controlled environment such as companies or universities, the auto-update
+mechanism might not be desired as it interferes with controlled deployment
+tools and policies. In this case, it is possible to disable the auto-updater
+entirely:

-Preventing Automatic Updates in Windows Environents
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Windows
+^^^^^^^

-You can prevent automatic updates from occuring in Windows environments using
-one of two methods.  The first method allows users to override the automatic
-update check mechanism whereas the second method prevents any manual overrides.
+There are two alternative approaches:

-To prevent automatic updates, but allow manual overrides:
+1. In ``HKEY_LOCAL_MACHINE\Software\ownCloud\ownCloud``, add a key ``skipUpdateCheck`` (of type DWORD) with the value 1 to the machine. This key
+   can be manually overrideen by the same value in ``HKEY_CURRENT_USER``.

-1. Migrate to the following directory::
+2. In ``HKEY_LOCAL_MACHINE\Software\Policies\ownCloud\ownCloud``, add a key
+   ``skipUpdateCheck`` (of type DWORD) with the value 1 to the machine.
+   Setting the value here cannot be overridden by the user and is the preferred
+   way to control the updater behavior via Group Policies.

-	HKEY_LOCAL_MACHINE\Software\ownCloud\ownCloud
+Mac OS X
+^^^^^^^^

-2. Add the key ``skipUpdateCheck`` (of type DWORD).
-
-3. Specify a value of ``1`` to the machine.
-
-To manually override this key, use the same value in ``HKEY_CURRENT_USER``.
-
-To prevent automatic updates and disallow manual overrides:
-
-.. note::This is the preferred method of controlling the updater behavior using Group Policies.
-
-1. Migrate to the following directory::
-
-	HKEY_LOCAL_MACHINE\Software\Policies\ownCloud\ownCloud
-
-2. Add the key ``skipUpdateCheck`` (of type DWORD).
-
-3. Specify a value of ``1`` to the machine.
-
-
-Preventing Automatic Updates in Mac OS X Environments
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-You can disable the automatic update mechanism in MAC OS X operating systems
-using the system-wide ``.plist`` file.  To access this file:
-
-1. Using the Windows explorer, migrate to the following location::
-
- 	/Library/Preferences/
-
- 2. Locate and open the following file::
-
- 	com.owncloud.desktopclient.plist
-
-3. Add a new root level item of type ``bool``.
-
-4. Name the item ``skipUpdateCheck``.
-
-5. Set the item to ``true``.
-
-Alternatively, you can copy the file
-``owncloud.app/Contents/Resources/deny_autoupdate_com.owncloud.desktopclient.plist``
+You can disable the update check via a system-wide ``.plist`` file located
+at ``/Library/Preferences/com.owncloud.desktopclient.plist``. Add a new root
+level item of type bool and the name ``skipUpdateCheck`` and set it to ``true``.
+You can also just copy the file
+``owncloud.app/Contents/Resources/deny_autoupdate_com.owncloud.desktopclient.plist```
 to ``/Library/Preferences/com.owncloud.desktopclient.plist``.

-Preventing Automatic Updates in Linux Environments
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Linux
+^^^^^

-Because Linux does not provide automatic updating functionality, there is no
-need to remove the automatic-update check.  However, if you want to disable
-this check:
+Since there is no updating functionality, there is no need to remove the check.
+If you want to disable the check nontheless, open a file called
+``/etc/ownCloud/ownCloud.conf`` and add the following content::

-1. Locate and open the following file::
-
-	/etc/ownCloud/ownCloud.conf
-
-2. Add the following content to the file::
-
- 	[General]
-	skipUpdateCheck=true
+ [General]
+ skipUpdateCheck=true

@@ -3,20 +3,20 @@
 Appendix A: Building the Client
 ===============================

-This section explains how to build the ownCloud Client from source for all
-major platforms. You should read this section if you want to develop for the
-desktop client.
+This section explains how to build the ownCloud Client from source
+for all major platforms. You should read this section if you want
+to development on the desktop client.

-.. note:: Building instruction are subject to change as development proceeds.
-  Please check the version for which you want to built.
+Note that the building instruction are subject to change as development 
+proceeds. It is important to check the version which is to built.

-The instructions contained in this topic were updated to work with version 1.5 of the ownCloud Client.
+This instructions were updated to work with ownCloud Client 1.5.

 Linux
 -----

 1. Add the `ownCloud repository from OBS`_.
-2. Install the dependencies (as root, or using ``sudo``) using the following commands for your specific Linux distribution:
+2. Install the dependencies (as root, or via sudo):

  * Debian/Ubuntu: ``apt-get update; apt-get build-dep owncloud-client``
  * openSUSE: ``zypper ref; zypper si -d owncloud-client``
@@ -27,51 +27,47 @@ Linux
 Mac OS X
 --------

-In additon to needing XCode (along with the command line tools), developing in
-the MAC OS X environment requires extra dependencies.  You can install these
-dependencies through MacPorts_ or Homebrew_.  These dependencies are required
-only on the build machine, because non-standard libs are deployed in the app
-bundle.
+Next to XCode (and the command line tools!), you will need some
+extra dependencies.

-The tested and preferred way to develop in this environment is through the use
-of HomeBrew_. The ownCloud team has its own repository containing non-standard
-recipes.
+You can install these dependencies via MacPorts_ or Homebrew_.
+This is only needed on the build machine, since non-standard libs
+will be deployed in the app bundle.

-To set up your build enviroment for development using HomeBrew_:
-
-1. Add the ownCloud repository using the following command::
+The tested and preferred way is to use HomeBrew_. The ownCloud team has
+its own repository which contains non-standard recipes.  Add it with::

  brew tap owncloud/owncloud

-2. Install any missing dependencies::
+Next, install the missing dependencies::

  brew install $(brew deps mirall)

+  
 To build mirall, follow the `generic build instructions`_.

-.. note:: Because the product from the mirall build is an app bundle, do not
-   call ``make install`` at any time.  Instead, call ``make package`` to create an
-   install-ready disk image.
+.. note::
+  You should not call ``make install`` at any time, since the product of the
+  mirall build is an app bundle. Call ``make package`` instead to create an
+  install-ready disk image.

-Windows (Cross-Compile)
+Windows (cross-compile)
 -----------------------

-Due to the large number of dependencies, building the client for Windows is
-**currently only supported on openSUSE**, by using the MinGW cross compiler.
-You can set up openSUSE 12.1, 12.2, or 13.1 in a virtual machine if you do not
-have it installed already.
+Due to the amount of dependencies, building the client for Windows
+is **currently only supported on openSUSE**, by using the MinGW
+cross compiler. You can set up openSUSE 12.1, 12.2 or 13.1 in a virtual machine
+if you do not have it installed already.

-To cross-compile:
+In order to cross-compile, the following repositories need to be added
+via YaST or ``zypper ar`` (adjust when using openSUSE 12.2 or 13.1)::

-1. Add the following repositories using YaST or ``zypper ar`` (adjust when using openSUSE 12.2 or 13.1):
+  zypper ar http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_13.1/windows:mingw:win32.repo
+  zypper ar http://download.opensuse.org/repositories/windows:/mingw/openSUSE_13.1/windows:mingw.repo

-  - ``zypper ar http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_13.1/windows:mingw:win32.repo``
+Next, install the cross-compiler packages and the cross-compiled dependencies::

-  - ``zypper ar http://download.opensuse.org/repositories/windows:/mingw/openSUSE_13.1/windows:mingw.repo``
-
-2. Install the cross-compiler packages and the cross-compiled dependencies::
-
-  ``zypper install cmake make mingw32-cross-binutils mingw32-cross-cpp mingw32-cross-gcc \
+  zypper install cmake make mingw32-cross-binutils mingw32-cross-cpp mingw32-cross-gcc \
                 mingw32-cross-gcc-c++ mingw32-cross-pkg-config mingw32-filesystem \
                 mingw32-headers mingw32-runtime site-config mingw32-libqt4-sql \
                 mingw32-libqt4-sql-sqlite mingw32-sqlite mingw32-libsqlite-devel \
@@ -82,86 +78,74 @@ To cross-compile:
                 mingw32-libpng-devel mingw32-libsqlite mingw32-qtkeychain \
                 mingw32-qtkeychain-devel mingw32-dlfcn mingw32-libintl-devel \
                 mingw32-libneon-devel mingw32-libopenssl-devel mingw32-libproxy-devel \
-                 mingw32-libxml2-devel mingw32-zlib-devel``
+                 mingw32-libxml2-devel mingw32-zlib-devel

-3. For the installer, install the NSIS installer package::
+For the installer, the NSIS installer package is also required::

-  ``zypper install mingw32-cross-nsis``
+  zypper install mingw32-cross-nsis

-4. Install the following plugin::
+..  Usually, the following would be needed as well, but due to a bug in mingw, they
+    will currently not build properly from source.

-    ``mingw32-cross-nsis-plugin-processes mingw32-cross-nsis-plugin-uac``
+    mingw32-cross-nsis-plugin-processes mingw32-cross-nsis-plugin-uac

-  .. note:: This plugin is typically required.  However, due to a current bug
-     in ``mingw``, the plugins do not currently build properly from source.
+You will also need to manually download and install the following files with
+``rpm -ivh <package>`` (They will also work with openSUSE 12.2 and newer)::

-5. Manually download and install the following files using ``rpm -ivh <package>``:
+  rpm -ihv http://download.tomahawk-player.org/packman/mingw:32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-processes-0-1.1.x86_64.rpm
+  rpm -ihv http://download.tomahawk-player.org/packman/mingw:32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-uac-0-3.1.x86_64.rpm

-  ..note:: These files operate using openSUSE 12.2 and newer.
+Now, follow the `generic build instructions`_, but pay attention to
+the following differences:

-  - ``rpm -ihv http://download.tomahawk-player.org/packman/mingw:32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-processes-0-1.1.x86_64.rpm``
+For building for windows a special toolchain file has to be specified.
+That makes cmake finding the platform specific tools. This parameter 
+has to be added to the call to cmake:

-  - ``rpm -ihv http://download.tomahawk-player.org/packman/mingw:32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-uac-0-3.1.x86_64.rpm``
+  ``-DCMAKE_TOOLCHAIN_FILE=../mirall/admin/win/Toolchain-mingw32-openSUSE.cmake``

-6. Follow the `generic build instructions`_
-
-  .. note:: When building for Windows platforms, you must specify a special
-     toolchain file that enables cmake to locate the platform-specific tools. To add
-     this parameter to the call to cmake, enter
-     ``DCMAKE_TOOLCHAIN_FILE=../mirall/admin/win/Toolchain-mingw32-openSUSE.cmake``.
-
-7. Build by running ``make``.
-
-  ..note:: Using ``make package`` produces an NSIS-based installer, provided
-    the NSIS mingw32 packages are installed.
+Finally, just build by running ``make``. ``make package`` will produce
+an NSIS-based installer, provided the NSIS mingw32 packages are installed.

 Generic Build Instructions
 --------------------------
 .. _`generic build instructions`

-Compared to previous versions, building Mirall has become easier. Unlike
-earlier versions, CSync, which is the sync engine library of Mirall, is now
-part of the Mirall source repository and not a separate module.
+Compared to previous versions building of Mirall has become more easy.
+CSync, which is the sync engine library of Mirall, is now part of the 
+Mirall source repository, not, like it was before, a separate module.

-You can download Mirall from the ownCloud `Client Download Page`_.
+Mirall can be downloaded at ownCloud's `Client Download Page`_.

-To build the most up to date version of the client:
+If you want to build the leading edge version of the client, you should
+use the latest versions of Mirall via Git_, like so::

-1. Clone the latest versions of Mirall from Git_ as follows:
+  git clone git://github.com/owncloud/mirall.git

-  ``git clone git://github.com/owncloud/mirall.git``
+Next, create build directories::

-2. Create build directories:
+  mkdir mirall-build

-  ``mkdir mirall-build``
+Now build mirall::

-3. Build mirall:
+  cd ../mirall-build
+  cmake -DCMAKE_BUILD_TYPE="Debug" ../mirall

-  ``cd ../mirall-build``
-  ``cmake -DCMAKE_BUILD_TYPE="Debug" ../mirall``
+Note that it is important to use absolute pathes for the include- and library
+directories. If this succeeds, call ``make``. The owncloud binary should appear
+in the ``bin`` directory. You can also run ``make install`` to install the client to
+``/usr/local/bin``.

-  ..note:: You must use absolute pathes for the ``include`` and ``library`` directories.
+To build an installer/app bundle (requires the mingw32-cross-nsis packages on Windows)::

-4. Call ``make``.
+  make package

-  The owncloud binary appear in the ``bin`` directory.
+Known cmake parameters:

-5. (Optional) Call ``make install`` to install the client to the ``/usr/local/bin`` directory.
-
-6. (Optional) Call ``make package`` to build an installer/app bundle
-
-  ..note:: This step requires the ``mingw32-cross-nsis`` packages be installed on Windows.
-
-The following are known cmake parameters:
-
-* ``QTKEYCHAIN_LIBRARY=/path/to/qtkeychain.dylib -DQTKEYCHAIN_INCLUDE_DIR=/path/to/qtkeychain/``:
-   Used for stored credentials.  When compiling with Qt5, the library is called ``qt5keychain.dylib.``
-   You need to compile QtKeychain with the same Qt version.
-* ``WITH_DOC=TRUE``: Creates doc and manpages through running ``make``; also
-* adds install statements, providing the ability to install using ``make
-* install``.
-* ``CMAKE_PREFIX_PATH=/path/to/Qt5.2.0/5.2.0/yourarch/lib/cmake/``: Builds using Qt5.
-* ``BUILD_WITH_QT4=ON``: Builds using Qt4 (even if Qt5 is found).
+* QTKEYCHAIN_LIBRARY=/path/to/qtkeychain.dylib -DQTKEYCHAIN_INCLUDE_DIR=/path/to/qtkeychain/: Use QtKeychain for stored credentials. When compiling with Qt5, the library is called qt5keychain.dylib. You need to compile QtKeychain with the same Qt version.
+* WITH_DOC=TRUE: create doc and manpages via running ``make``; also adds install statements to be able to install it via ``make install``.
+* CMAKE_PREFIX_PATH=/path/to/Qt5.2.0/5.2.0/yourarch/lib/cmake/ : to build with Qt5
+* BUILD_WITH_QT4=ON : to build with Qt4 even if Qt5 is found

 .. _`ownCloud repository from OBS`: http://software.opensuse.org/download/package?project=isv:ownCloud:devel&package=owncloud-client
 .. _CSync: http://www.csync.org
@@ -1,24 +1,26 @@
-The ownCloud Client reads a configuration file.  You can locate this configuration files as follows:
+ownCloud Client reads a configuration file.

- On Linux distributions:
+On Linux it can be found in:
        ``$HOME/.local/share/data/ownCloud/owncloud.cfg``

- In Microsoft Windows systems:
+On Windows it can be found in:
        ``%LOCALAPPDATA%\ownCloud\owncloud.cfg``

- In MAC OS X systems:
+On Mac it can be found in:
        ``$HOME/Library/Application Support/ownCloud``


-The configuration file contains settings using the Microsoft Windows .ini file
-format. You can overwrite changes using the ownCloud configuration dialog.
+It contains settings in the ini file format known from Windows. 

-.. note:: Use caution when making changes to the ownCloud Client configuration
-   file.  Incorrect settings can produce unintended results.
+.. note:: Changes here should be done carefully as wrong settings can cause disfunctionality.

-You can change the following configuration settings:
+.. note:: Changes may be overwritten by using ownCloud's configuration dialog.

- ``remotePollInterval`` (default: ``30000``) -- Specifies the poll time for the remote repository in milliseconds.
+These are config settings that may be changed:

- ``maxLogLines`` (default:  ``20000``) -- Specifies the maximum number of log lines displayed in the log window.
+``remotePollInterval`` (default: ``30000``)
+        Poll time for the remote repository in milliseconds
+
+``maxLogLines`` (default:  ``20000``)
+        Maximum count of log lines shown in the log window

@@ -1,17 +1,16 @@
 FAQ
 ===

-**Issue:**
-
-Some files are continuously uploaded to the server, even when they are not modified.
-
-**Resolution:**
+Some files are continuously uploaded to the server even when they are not modified
+----------------------------------------------------------------------------------

 It is possible that another program is changing the modification date of the file.

-If the file is uses the ``.eml`` extention, Windows automatically and
-continually changes all files, unless you remove
-``\HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers`
-from the windows registry.
+If the file is a ``.eml`` file, Windows automatically change all file all the time unless you remove
+``\HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers`` from
+the windows registry.
+See http://petersteier.wordpress.com/2011/10/22/windows-indexer-changes-modification-dates-of-eml-files/
+
+
+

-See http://petersteier.wordpress.com/2011/10/22/windows-indexer-changes-modification-dates-of-eml-files/ for more information.
--- a/Mostrar Mais
+++ b/Mostrar Mais
Autor	SHA1	Mensagem	Data
Mark Barnard	f380852986	Adding thumbs.db	2014-06-12 13:20:59 -04:00
Mark Barnard	d13ac31e08	Adding images Adding screen captures for installation instructions.	2014-06-12 13:10:44 -04:00