A more resource concious implementation to help with bug #3638

The idea is to split the incoming path to its components once and store it to a string list. In the loop over the patterns, compare each pattern to each path component, ie. each string list entry. Should need dramatically less allocations.
2015-08-17 23:27:27 +02:00
@@ -32,7 +32,7 @@ include(Warnings)
 include(${CMAKE_SOURCE_DIR}/VERSION.cmake)
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/")

-# disable the crashreporter if libcrashreporter-qt is not available or we're building for ARM
+# disable the crashrepoter if libcrashreporter-qt is not available or we're building for ARM
 if( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/libcrashreporter-qt/CMakeLists.txt")
    set( WITH_CRASHREPORTER OFF )
 endif()
@@ -114,16 +114,16 @@ endif()
 # this option creates only libocsync and libowncloudsync
 option(BUILD_LIBRARIES_ONLY "BUILD_LIBRARIES_ONLY" OFF)

-# When this option is enabled, 5xx errors are not added to the blacklist
-# Normally you don't want to enable this option because if a particular file
-# triggers a bug on the server, you want the file to be blacklisted.
+# When this option is enabled, 5xx errors are not added to the clacklist
+# Normaly you don't want to enable this option because if a particular file
+# trigger a bug on the server, you want the file to be blacklisted.
 option(OWNCLOUD_5XX_NO_BLACKLIST "OWNCLOUD_5XX_NO_BLACKLIST" OFF)
 if(OWNCLOUD_5XX_NO_BLACKLIST)
    add_definitions(-DOWNCLOUD_5XX_NO_BLACKLIST=1)
 endif()

 if(APPLE)
-  set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
+  set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesigh key's TeamIdentifier/Organizational Unit" )
 endif()

 #### find libs
@@ -138,7 +138,7 @@ if(HAVE_QT5)
  message(STATUS "Using Qt ${Qt5Core_VERSION_MAJOR}.${Qt5Core_VERSION_MINOR}.x")
  if (${Qt5Core_VERSION_MAJOR} EQUAL "5")
    if (${Qt5Core_VERSION_MINOR} EQUAL "4" OR ${Qt5Core_VERSION_MINOR} GREATER 4)
-      message(STATUS "We do not require Neon in this setup, compile without!")
+      message(STATUS "We would not require Neon in this setup, compile without!")
      set(USE_NEON FALSE)
    else()
      message(STATUS "If possible compile me with Qt 5.4 or higher.")
@@ -6,10 +6,10 @@ We are also available on [IRC][irc].

 ### Bug Reporting Guidelines
 * __Important__: Report the issue using our [template][template], it includes all the
-  information we need to track down the issue.  
+  informations we need to track down the issue.  
 * __SECURITY__: Report any potential security bug to security@owncloud.com following our [security policy](https://owncloud.org/security/) instead of filing an issue in our bug tracker
 * This repository is *only* for issues within the ownCloud desktop client. 
-  Issues in other components should be reported in their own repositores: 
+  Issues in other compontents should be reported in their own repositores: 
  - [ownCloud server](https://github.com/owncloud/core/issues)
  - [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar,
    Contacts...)
@@ -36,7 +36,7 @@ Before we're able to merge your code to ownCloud Desktop Client, you need to sig
 our [Contributor Agreement][agreement].

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

 [agreement]: http://owncloud.org/about/contributor-agreement/
@@ -1,6 +1,6 @@
 ChangeLog
 =========
-version 2.0.0 (release 2015-08-25)
+version 2.0.0 (release 2015-08-??)
  * Add support for multiple accounts (#3084)
  * Do not sync down new big folders from server without users consent (#3148)
  * Integrate Selective Sync into the default UI
@@ -25,7 +25,6 @@ version 2.0.0 (release 2015-08-25)
  * Several fixes and performance improvements in the sync engine
  * Network: Try to use SSL session tickets/identifiers. Check the SSL button to see if they are used.
  * Bandwidth Throttling: Provide automatic limit setting for downloads (#3084)
-  * Systray: Workaround for issue with Qt 5.5.0 #3656

 version 1.8.4 (release 2015-07-13)
  * Release to ship a security release of openSSL. No source changes of the ownCloud Client code.
@@ -14,5 +14,5 @@ set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-back
 # set( APPLICATION_LICENSE    "${OEM_THEME_DIR}/license.txt )

 option( WITH_CRASHREPORTER "Build crashreporter" OFF )
-set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE string "URL for crash reporter" )
+set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE string "URL for crash repoter" )
 set( CRASHREPORTER_ICON ":/owncloud-icon.png" )
@@ -27,7 +27,7 @@ https://github.com/owncloud/client.

 ## Building the source code

-[Building the Client](http://doc.owncloud.org/desktop/2.0/building.html)
+[Building the Client](http://doc.owncloud.org/desktop/1.7/building.html)
 in the ownCloud Desktop Client manual.

 ## Maintainers and Contributors
@@ -1,6 +1,6 @@
 set( MIRALL_VERSION_MAJOR 2 )
 set( MIRALL_VERSION_MINOR 0 )
-set( MIRALL_VERSION_PATCH 2 )
+set( MIRALL_VERSION_PATCH 0 )
 set( MIRALL_SOVERSION 0 )

 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
@@ -9,6 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "Ez desinstalatu"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Dagoeneko Instalatuta"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Hautatu nola nahi duzun ${APPLICATION_NAME} instalatzea."
 StrCpy $PageReinstall_OLD_Field_1 "${APPLICATION_NAME}ren bertsio berriago bat instalatuta dago! Ez da aholkatzen bertsio zaharrago bat instalatzea. Benetan bertsio zaharrago hau instalatu nahi baduzu, hobe da lehenengo bertsio berria desinstalatzea. Hautatu nahi duzun aukera eta sakatu Hurrengoa jarraitzeko."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} dagoeneko instalatuta dago.\nHautatu zer operazio egin nahi duzu eta klikatu Hurrengoa jarraitzeko."
 StrCpy $PageReinstall_SAME_Field_2 "Gehitu/Berrinstalatu osagaiak"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalatu ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalatu ${APPLICATION_NAME}"
@@ -38,6 +39,5 @@ 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 $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
 StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"
 StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
@@ -9,6 +9,7 @@ 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}"
@@ -39,5 +40,4 @@ StrCpy $INIT_INSTALLER_RUNNING "L'instal·lador ja s'està executant."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Aquest desinstal·lador requereix accés d'administrador, intenteu-ho de nou."
 StrCpy $INIT_UNINSTALLER_RUNNING "El desinstal·lador ja s'està executant."
 StrCpy $SectionGroup_Shortcuts "Dreceres"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
 StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
@@ -9,6 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "Neodinstalov
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ji§ nainstalov no"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Zvolte, jak chcete ${APPLICATION_NAME} nainstalovat."
 StrCpy $PageReinstall_OLD_Field_1 "NovØjç¡ verze aplikace ${APPLICATION_NAME} je ji§ nainstalov na. Instalace starç¡ verze se nedoporuŸuje. Pokud opravdu chcete tuto starç¡ verzi nainstalovat, je lepç¡ nejprve odinstalovat souŸasnou verzi. Zvolte po§adovanou operaci a kliknØte na Dalç¡ pro pokraŸov n¡."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} je ji§ nainstalov na.\nZvolte po§adovanou operaci a kliknØte na Dalç¡ pro pokraŸov n¡."
 StrCpy $PageReinstall_SAME_Field_2 "Pýidat Ÿi znovu instalovat komponenty"
 StrCpy $PageReinstall_SAME_Field_3 "Odinstalovat ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Odinstalovat ${APPLICATION_NAME}"
@@ -29,7 +30,7 @@ StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Z
 StrCpy $UNINSTALLER_FILE_Detail "Zapisuji odinstal tor"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Zapisuji instal tor do registr…"
 StrCpy $UNINSTALLER_FINISHED_Detail "DokonŸeno"
-StrCpy $UNINSTALL_MESSAGEBOX "Nezd  se, §e ${APPLICATION_NAME} je nainstalov na ve slo§ce '$INSTDIR'.$\n$\nChcete pokraŸovat (nedoporuŸuje se)?"
+StrCpy $UNINSTALL_MESSAGEBOX "Nezd  se, §e ${APPLICATION_NAME} je nainstalov na ve slo§ce '$INSTDIR'.\nChcete pokraŸovat (nedoporuŸuje se)?"
 StrCpy $UNINSTALL_ABORT "Odinstalace zruçena u§ivatelem"
 StrCpy $INIT_NO_QUICK_LAUNCH "Z stupce rychl‚ho spuçtØn¡ (nen¡ k dispozici)"
 StrCpy $INIT_NO_DESKTOP "Z stupce na ploçe (pýep¡çe existuj¡c¡)"
@@ -40,4 +41,3 @@ StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Tento odinstal
 StrCpy $UAC_ERROR_LOGON_SERVICE "Slu§ba pýihl çen¡ nebØ§¡, ukonŸuji!"
 StrCpy $INIT_UNINSTALLER_RUNNING "Odinstal tor je ji§ spuçtØn."
 StrCpy $SectionGroup_Shortcuts "Z stupci"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
@@ -9,7 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "Niet de-installeren"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Al geïnstalleerd"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Kies hoe u ${APPLICATION_NAME} wilt installeren."
 StrCpy $PageReinstall_OLD_Field_1 "Er is al een recentere versie van ${APPLICATION_NAME} geïnstalleerd! Installeren van een oudere versie wordt niet aangeraden. Als u echt de oudere versie wilt installeren, adviseren we de huidige versie eerst te verwijderen. Kies de actie die u wilt uitvoeren en druk op Verder om door te gaan."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is al geïnstalleerd.$\n$\nKies de actie die u uit wil voeren en druk op Verder om door te gaan."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is al geïnstalleerd.\nKies de actie die u wilt uitvoeren en druk op Verder om door te gaan."
 StrCpy $PageReinstall_SAME_Field_2 "Toevoegen/herinstalleren componenten"
 StrCpy $PageReinstall_SAME_Field_3 "De-installeer ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "De-installeer ${APPLICATION_NAME}"
@@ -9,7 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "Do not uninstall"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Already Installed"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Choose how you want to install ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
 StrCpy $PageReinstall_SAME_Field_2 "Add/Reinstall components"
 StrCpy $PageReinstall_SAME_Field_3 "Uninstall ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Uninstall ${APPLICATION_NAME}"
@@ -9,6 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Juba paigaldatud"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Vali, kuidas sa soovid paigaldada ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Uuem versioon ${APPLICATION_NAME} on juba paigaldatud! Vanema versiooni paigaldus ei ole soovitatav. Kui tõesti tahad paigaldada vanemat versiooni, siis on parem esmalt eemaldada olemasolev. Vali tehtav toiming ning kliki Jätka."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} on juba paigaldatud.\nVali tehtav toiming ning kliki Jätka."
 StrCpy $PageReinstall_SAME_Field_2 "Lisa/Taaspaigalda komponente"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalli ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalli ${APPLICATION_NAME}"
@@ -40,4 +41,3 @@ StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "See desinstallija vajab admini ligip
 StrCpy $UAC_ERROR_LOGON_SERVICE "Sisselogimisteenus ei tööta, katkestamine!"
 StrCpy $INIT_UNINSTALLER_RUNNING "See desinstallija on juba käimas."
 StrCpy $SectionGroup_Shortcuts "Otseteed"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
@@ -32,7 +32,7 @@ StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Killing ${APPLICATION_EXECUTAB
 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_MUI_HEADER_TEXT_SUBTITLE "Choose how you want to install ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
 StrCpy $PageReinstall_SAME_Field_3 "Uninstall ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Uninstall ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choose the maintenance option to perform."
@@ -9,7 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Asennettu jo"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Valitse miten ${APPLICATION_NAME} asennetaan."
 StrCpy $PageReinstall_OLD_Field_1 "Uudempi versio sovelluksesta ${APPLICATION_NAME} on jo asennettu! Vanhan version asennus ei ole suositeltavaa. Jos todella haluat asentaa vanhemman version, kannattaa poistaa nykyisen version asennus ensin. Valitse minkä toimenpiteen haluat suorittaa ja paina Seuraava jatkaaksesi."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} on jo asennettu.$\n$\nValitse haluamasi toiminto ja napsauta Seuraava jatkaaksesi."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} on jo asennettu.\nValitse suoritettava toimenpide ja napsauta Seuraava jatkaaksesi."
 StrCpy $PageReinstall_SAME_Field_2 "Lisää/uudelleenasenna komponentteja"
 StrCpy $PageReinstall_SAME_Field_3 "Poista ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Poista ${APPLICATION_NAME}"
@@ -9,6 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "Ne pas désinstaller"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Déjà installé"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Choisissez comment installer ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Une version plus récente de ${APPLICATION_NAME} est déjà installée ! Il n'est pas recommandé d'installer une version plus ancienne. Si vous voulez vraiment installer cette version plus ancienne, il est préférable de d'abord désinstaller la version courante. Sélectionnez l'opération que vous voulez exécuter et cliquez sur Suivant pour continuer."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} est déjà installé.\nSélectionnez l'opération que vous voulez exécuter et cliquez sur Suivant pour continuer."
 StrCpy $PageReinstall_SAME_Field_2 "Ajouter/Réinstaller des composants"
 StrCpy $PageReinstall_SAME_Field_3 "Désinstaller ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Désinstaller ${APPLICATION_NAME}"
@@ -37,7 +38,6 @@ StrCpy $UAC_ERROR_ELEVATE "Échec d'élévation, erreur :"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Cet installateur requiert les droits administrateur, essayez à nouveau"
 StrCpy $INIT_INSTALLER_RUNNING "Une installation est déjà en cours."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Ce désinstallateur requiert les droits administrateur, essayez à nouveau"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Service de logon non lancé ! Abandon."
 StrCpy $INIT_UNINSTALLER_RUNNING "Une désinstallation est déjà en cours."
 StrCpy $SectionGroup_Shortcuts "Raccourcis"
-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 $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
@@ -9,6 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "Non desinstalar"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Xa instalado"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Escolla como quere instalar ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Ten instalada unha versión actualizada do ${APPLICATION_NAME}! recomendámoslle que non instale unha versión anterior. Se realmente quere instalar esta versión máis antiga, é preferíbel que desinstale a versión actual antes de instalar. Seleccione a operación que quere realizar e prema en Seguinte para continuar."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} xa está instalado.\nSeleccione a operación que que quere realizar e prema en Seguinte para continuar."
 StrCpy $PageReinstall_SAME_Field_2 "Engadir/reinstalar compoñentes"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalar ${APPLICATION_NAME}"
@@ -40,4 +41,3 @@ StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Este desinstalador require acceso de admi
 StrCpy $UAC_ERROR_LOGON_SERVICE "O servizo de acceso non está en execución, cancelando!"
 StrCpy $INIT_UNINSTALLER_RUNNING "O desinstalador xa está en execución."
 StrCpy $SectionGroup_Shortcuts "Atallos"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
@@ -9,6 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "Nicht entfernen"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Bereits installiert"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Wählen Sie die Methode, mit der sie ${APPLICATION_NAME} installieren wollen."
 StrCpy $PageReinstall_OLD_Field_1 "Eine neuere Version von  ${APPLICATION_NAME} ist bereits installiert! Es wird nicht empfohlen, eine ältere Version zu installieren. Wollen Sie dies trotzdem tun, so sollten Sie die aktuelle Version zunächst entfernen. Wählen Sie eine Vorgehensweise und wählen dann $\"Weiter$\"."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} ist bereits installiert.\nWählen Sie eine Vorgehensweise und klicken Sie auf $\"Weiter$\"."
 StrCpy $PageReinstall_SAME_Field_2 "Komponenten hinzufügen"
 StrCpy $PageReinstall_SAME_Field_3 "${APPLICATION_NAME} entfernen"
 StrCpy $UNINSTALLER_APPDATA_TITLE "${APPLICATION_NAME} entfernen"
@@ -39,5 +40,4 @@ StrCpy $INIT_INSTALLER_RUNNING "Das Installationsprogramm wird bereits ausgef
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Das Deinstallationsprogramm erfordert Administrator-Rechte. Bitte erneut versuchen."
 StrCpy $INIT_UNINSTALLER_RUNNING "Das Deinstallationsprogramm wird bereits ausgeführt."
 StrCpy $SectionGroup_Shortcuts "Verknüpfungen"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
 StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
@@ -9,7 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ήδη εγκατεστημένη"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Επιλέξτε πώς θέλετε να εγκαταστήσετε την ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Μια νεώτερη έκδοση της ${APPLICATION_NAME} είναι ήδη εγκατεστημένη! Δεν συνίσταται να εγκαταστείσετε μια παλαιότερη έκδοση. Εάν θέλετε πραγματικά να εγκαταστήσετε αυτήν την παλαιότερη έκδοση, είναι καλύτερο να απεγκαταστήσετε την τρέχουσα έκδοση πρώτα. Επιλέξτε τη διαδικασία που επιθυμείτε να εκτελέσετε και επιλέξτε Επόμενο για να συνεχίσετε."
-StrCpy $PageReinstall_SAME_Field_1 "Η ${APPLICATION_NAME} ${VERSION} είναι ήδη εγκατεστημένη.$\n$\nΕπιλέξτε τη λειτουργία που επιθυμείτε να εκτελέσετε και επιλέξτε Επόμενο για να συνεχίσετε."
+StrCpy $PageReinstall_SAME_Field_1 "Η ${APPLICATION_NAME} ${VERSION} είναι ήδη εγκατεστημένη.\n\nΕπιλέξτε τη διαδικασία που επιθυμείτε να εκτελέσετε και επιλέξτε Επόμενο για να συνεχίσετε."
 StrCpy $PageReinstall_SAME_Field_2 "Προσθήκη/ Επανεγκατάσταση συνιστωσών"
 StrCpy $PageReinstall_SAME_Field_3 "Απεγκατάσταση ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Απεγκατάσταση ${APPLICATION_NAME}"
@@ -9,6 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "Ne távolítsa el"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Már telepítve"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Válaszd ki, hogy szeretnéd telepíteni a következő alkalmazást ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Az ${APPLICATION_NAME} alklamazás egy újabb verziója már megtalálható a rendszeren. Nem ajánlott egy régebbi verzió telepítése. Ha valóban szeretné a régebbi verziót telepíteni, akkor ajánlott a jelenleg telepített verzió eltávolítása. Válassza ki milyen műveletet szeretne végrehajtani, és nyomja meg a $\"Következő$\" gombot a folytatáshoz."
+StrCpy $PageReinstall_SAME_Field_1 "Az ${APPLICATION_NAME} alkalmazás ${VERSION} verziója már telepítve van.\nKérem válassza ki milyen műveletet szeretne végrehajtan, és nyomja meg a $\"Következő$\" gombot."
 StrCpy $PageReinstall_SAME_Field_2 "Komponens hozzáadása/újratelepítése"
 StrCpy $PageReinstall_SAME_Field_3 "${APPLICATION_NAME} eltávolítása"
 StrCpy $UNINSTALLER_APPDATA_TITLE "${APPLICATION_NAME} eltávolítása"
@@ -40,4 +41,3 @@ StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Az  eltávolító futtatásához adminisz
 StrCpy $UAC_ERROR_LOGON_SERVICE "A bejelentkező szolgáltatás nem fut, megszakítás!"
 StrCpy $INIT_UNINSTALLER_RUNNING "Az eltávolító már fut."
 StrCpy $SectionGroup_Shortcuts "Parancsikonok"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
@@ -9,7 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "Non disinstallare"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Già installato"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Scegli come desideri installare ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Una versione più recente di ${APPLICATION_NAME} è già installata! Non è consigliabile installare una versione più vecchia. Se vuoi davvero installare una versione più vecchia, ti consigliamo di rimuovere prima la versione attuale. Scegli l'operazione da eseguire e fai clic su Avanti per continuare."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} è già installato.$\n$\nSeleziona l'operazione che desideri eseguire e fai clic su Avanti per continuare.."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} è già installato.\nSeleziona l'operazione che desideri eseguire e fai clic su Avanti per continuare."
 StrCpy $PageReinstall_SAME_Field_2 "Aggiungi/Reinstalla i componenti"
 StrCpy $PageReinstall_SAME_Field_3 "Disinstalla ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Disinstalla ${APPLICATION_NAME}"
@@ -9,6 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "インストール済"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "${APPLICATION_NAME} のインストール方法を選択する"
 StrCpy $PageReinstall_OLD_Field_1 "${APPLICATION_NAME} の最新バージョンがすでにインストールされています。\n旧バージョンのインストールはお勧めしません。旧バージョンのインストールが本当に必要な場合は、まず最新バージョンをアンインストールしてから、旧バージョンをインストールしてください。\nオペレーションを選択し、次へをクリックする。"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION}　はすでにインストールされています。\n実行するオペレーションを選択し、次へをクリックする"
 StrCpy $PageReinstall_SAME_Field_2 "追加/再インストールコンポーネント"
 StrCpy $PageReinstall_SAME_Field_3 "${APPLICATION_NAME} をアンインストール"
 StrCpy $UNINSTALLER_APPDATA_TITLE "${APPLICATION_NAME} をアンインストール"
@@ -40,4 +41,3 @@ StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "
 StrCpy $UAC_ERROR_LOGON_SERVICE "ログオンサービスが動いていません。中止します。"
 StrCpy $INIT_UNINSTALLER_RUNNING "アンインストーラーは、すでに起動しています。"
 StrCpy $SectionGroup_Shortcuts "ショートカット"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
@@ -9,7 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "Ikke avinstaller"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Allerede installert"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Velg hvordan du vil installere ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "En nyere versjon av ${APPLICATION_NAME} er allerede installert! Det anbefales ikke at du installerer en eldre versjon. Hvis du virkelig ønsker å installere denne eldre versjonen, er det bedre å avinstallere gjeldende versjon først. Velg hva du vil gjøre og klikk Neste for å fortsette."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} er installert allerede.$\n$\nVelg hva du ønsker å gjøre og klikk Neste for å fortsette."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} er allerede installert.\nVelg hva du vil gjøre og klikk Neste for å fortsette."
 StrCpy $PageReinstall_SAME_Field_2 "Legg til/installer komponenter på nytt"
 StrCpy $PageReinstall_SAME_Field_3 "Avinstaller ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Avinstaller ${APPLICATION_NAME}"
@@ -38,6 +38,6 @@ StrCpy $UAC_ERROR_ELEVATE "Klarte ikke
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Dette installasjonsprogrammet krever administrasjonstilgang. Prøv igjen"
 StrCpy $INIT_INSTALLER_RUNNING "Installasjonsprogrammet kjører allerede."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Avinstallasjonsprogrammet krever administrasjonstilgang. Prøv igjen"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Påloggingstjenesten kjører ikke, avbryter!"
 StrCpy $INIT_UNINSTALLER_RUNNING "Avinstallasjonsprogrammet kjører allerede."
 StrCpy $SectionGroup_Shortcuts "Snarveier"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
@@ -9,6 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "Nie usuwaj "
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ju¿ zainstalowane"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Wybierz jak chcesz zainstalowaæ ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Zainstalowana jest nowsza wersja ${APPLICATION_NAME}! Niezalecane jest instalowanie starszej wersji. Jeœli naprawdê chcesz zainstalowaæ starsz¹ wersjê lepiej najpierw odinstalowaæ obecn¹ aplikacjê. Wybierz operacjê któr¹ chcesz wykonaæ i naciœnij przycisk Dalej."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} jest ju¿ zainstalowany.\nWybierz operacjê któr¹ chcesz wykonaæ i naciœnij przycisk Dalej."
 StrCpy $PageReinstall_SAME_Field_2 "Doda/Przeinstaluj komponenty"
 StrCpy $PageReinstall_SAME_Field_3 "Odinstaluj ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Odinstaluj ${APPLICATION_NAME}"
@@ -39,5 +40,4 @@ StrCpy $INIT_INSTALLER_RUNNING "Instalator ju
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Ten dezinstalator potrzebuje uprawnieñ administratora, spróbuj ponownie"
 StrCpy $INIT_UNINSTALLER_RUNNING "Dezinstalator ju¿ jest uruchomiony."
 StrCpy $SectionGroup_Shortcuts "Skróty"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
 StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
@@ -9,7 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "Não desinstale"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Já instalado"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Escolha como pretende instalar ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Uma versão mais recente do ${APPLICATION_NAME}  já está instalada! Não é recomendada a instalação de uma versão mais antiga. Se realmente deseja instalar esta versão, aconselha-se a desinstalação da versão atual primeiro. Selecione a operação que deseja executar e clique em Avançar para continuar."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} já está instalada.\nSelecione a operação que deseja realizar e clique em 'Seguinte' para continuar."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} já está instalado.\nSelecione a operação que deseja fazer, e clique Seguinte para continuar."
 StrCpy $PageReinstall_SAME_Field_2 "Adicionar/Reinstalar Componentes"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalar ${APPLICATION_NAME}"
@@ -9,7 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "N
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Já Instalado"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Escolha como você deseja instalar ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "A versão mais recente do ${APPLICATION_NAME} já está instalado! Não é recomendado que você instale uma versão mais antiga. Se você realmente deseja instalar esta versão mais antiga, é melhor desinstalar a versão atual primeiro. Selecione a operação que deseja executar e clique em Avançar para continuar."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} já está instalado.$\n$\nSelecione a operação que você quer realizar e clique Próximo para continuar."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${version} já está instalado. \nSelecione a operação que deseja executar e clique em Avançar para continuar."
 StrCpy $PageReinstall_SAME_Field_2 "Adicionar/reinstalar componentes"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalar ${APPLICATION_NAME}"
@@ -9,6 +9,7 @@ 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}"
@@ -40,4 +41,3 @@ StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Этому деинсталлятору
 StrCpy $UAC_ERROR_LOGON_SERVICE "Служба входа в систему не запущена, прерывание!"
 StrCpy $INIT_UNINSTALLER_RUNNING "Программа удаления уже выполняется."
 StrCpy $SectionGroup_Shortcuts "Ярлыки"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
@@ -9,6 +9,7 @@ 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}"
@@ -39,5 +40,4 @@ StrCpy $INIT_INSTALLER_RUNNING "安装程序已经运行。"
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "卸载程序需要管理员权限，请重试"
 StrCpy $INIT_UNINSTALLER_RUNNING "卸载程序已经运行。"
 StrCpy $SectionGroup_Shortcuts "快捷方式"
-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 $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
@@ -9,6 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "Neodin
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Už je nainštalovaný"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Vyberte si, ako chcete nainštalova� ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Novšia verzia ${APPLICATION_NAME} je už nainštalovaná! Neodporúèam vám nainštalova� staršiu verziu. Ak naozaj chcete nainštalova� túto staršiu verziu, je lepšie najprv odinštalova� aktuálnu verziu. Vyberte operáciu, ktorú chcete vykona�, a kliknite na tlaèidlo Ïalej pre pokraèovanie."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} je už nainštalovaná.\nVyberte operáciu, ktorú chcete vykona�, a kliknite na tlaèidlo Ïalej pre pokraèovanie."
 StrCpy $PageReinstall_SAME_Field_2 "Prida�/Preinštalova� komponenty"
 StrCpy $PageReinstall_SAME_Field_3 "Odinštalova� ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Odinštalova� ${APPLICATION_NAME}"
@@ -39,5 +40,4 @@ StrCpy $INIT_INSTALLER_RUNNING "In
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Tento odinštalátor vyžaduje admin prístup, skúste to znova"
 StrCpy $INIT_UNINSTALLER_RUNNING "Odinštalátor je už spustený."
 StrCpy $SectionGroup_Shortcuts "Zástupcovia"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
 StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
@@ -9,6 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "Ne odstrani namestitve"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Program je že nameščen"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Izberite način namestitve programa ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Novejša različica programa ${APPLICATION_NAME} je že nameščena! Ni priporočljivo namestiti starejše. V kolikor želite vseeno nadaljevati z namestitvijo, prej odstranite obstoječo različico. Izberite opravilo in pritisnite gumb za nadaljevanje."
+StrCpy $PageReinstall_SAME_Field_1 "Program ${APPLICATION_NAME} ${VERSION} je že nameščen. Izberite opravilo in pritisnite gumb za nadaljevanje."
 StrCpy $PageReinstall_SAME_Field_2 "Dodaj/Ponovno namesti programe"
 StrCpy $PageReinstall_SAME_Field_3 "Odstrani ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Odstrani ${APPLICATION_NAME}"
@@ -39,5 +40,4 @@ StrCpy $INIT_INSTALLER_RUNNING "Namestilnik je
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Program za odstranjevanje namestitve zahteva skrbniška dovoljenja."
 StrCpy $INIT_UNINSTALLER_RUNNING "Program za odstranjevanje namestitve je že zagnan."
 StrCpy $SectionGroup_Shortcuts "Bližnjice"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
 StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
@@ -8,7 +8,8 @@ StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
 StrCpy $PageReinstall_NEW_Field_3 "No desinstalar"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ya está instalado"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Elija cómo quiere instalar ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "Una nueva versión de ${APPLICATION_NAME} ya está instalada. No es recomendable instalar una versión anterior. Si realmente quiere instalar esta versión anterior, es mejor que desinstale la versión actual primero. Seleccione la operación que desea realizar y pulse Siguiente para continuar."
+StrCpy $PageReinstall_OLD_Field_1 "Una nueva versión de ${APPLICATION_NAME} ya está instalada. No es recomendable instalar una versión anterior. Si realmente quiere instalar esta versión anterior, es mejor que desinstale la versión actual primero. Seleccione la operación que desea realizar y pulse Next para continuar."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} ya está instalada.\nSeleccione la operación que desea realizar y pulse Next para continuar."
 StrCpy $PageReinstall_SAME_Field_2 "Añadir/Reinstalar componentes"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalar ${APPLICATION_NAME}"
@@ -40,4 +41,3 @@ StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "El desinstalador requiere acceso administ
 StrCpy $UAC_ERROR_LOGON_SERVICE "Servicio Inicio de sesión no se está ejecutando, abortando!"
 StrCpy $INIT_UNINSTALLER_RUNNING "El desinstalador ya se encuentra en ejecución."
 StrCpy $SectionGroup_Shortcuts "Accesos directos"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
@@ -30,7 +30,7 @@ StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Este des-instalador requiere acceso admin
 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 $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 "Integration for Windows Explorer"
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing Integration for Windows Explorer"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Quick Launch Shortcut"
@@ -9,6 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "Avinstallera inte"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Redan installerad"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Välj hur du vill installera ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "En nyare version av ${APPLICATION_NAME} är redan installerad! Det rekommenderas inte att du installerar en äldre version. Om du verkligen vill installera denna äldre versionen, är det bättre att du avinstallerar den nuvarande versionen först. Välj den åtgärd du vill utföra och klicka Nästa för att fortsätta."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} är redan installerad.\nVälj den åtgärd du vill utföra och klicka Nästa för att fortsätta."
 StrCpy $PageReinstall_SAME_Field_2 "Lägg till/Ominstallera komponenter"
 StrCpy $PageReinstall_SAME_Field_3 "Avinstallera ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Avinstallera ${APPLICATION_NAME}"
@@ -37,7 +38,6 @@ StrCpy $INIT_INSTALLER_RUNNING "Installationsprogrammet körs redan."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Detta avinstallationsprogram  kräver administratörsrättigheter, försök igen"
 StrCpy $INIT_UNINSTALLER_RUNNING "Avinstallationsprogrammet körs redan."
 StrCpy $SectionGroup_Shortcuts "Genvägar"
-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 "Integration for Windows Explorer"
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing Integration for Windows Explorer"
 StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
@@ -9,7 +9,7 @@ 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_1 "${APPLICATION_NAME} ${VERSION} ได้ถูกติดตั้งแล้ว เลือกการดำเนินการที่คุณต้องการที่จะดำเนินการและคลิกถัดไปเพื่อดำเนินการต่อ"
 StrCpy $PageReinstall_SAME_Field_2 "ส่วนประกอบ เพิ่ม/ติดตั้งใหม่ "
 StrCpy $PageReinstall_SAME_Field_3 "ถอนการติดตั้ง ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "ถอนการติดตั้ง ${APPLICATION_NAME}"
@@ -9,6 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "Kald
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Zaten Yüklü"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "${APPLICATION_NAME} uygulamasýný nasýl yüklemek istediðinizi seçin."
 StrCpy $PageReinstall_OLD_Field_1 "${APPLICATION_NAME} uygulamasýnýn daha yeni sürümü zaten yüklü! Daha eski bir sürümünü yüklemeniz önerilmez. Gerçekten bu eski sürümü yüklemek isterseniz, ilk olarak geçerli sürümü kaldýrmanýz tavsiye edilir. Yapmak istediðiniz iþlemi seçin ve devam etmek üzere Ýleri týklayýn."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} zaten yüklü.\n\nYapmak istediðiniz iþlemi seçin ve devam etmek için Ýleri týklayýn."
 StrCpy $PageReinstall_SAME_Field_2 "Bileþenleri ekle/yeniden yükle"
 StrCpy $PageReinstall_SAME_Field_3 "${APPLICATION_NAME} uygulamasýný kaldýr"
 StrCpy $UNINSTALLER_APPDATA_TITLE "${APPLICATION_NAME} uygulamasýný kaldýr"
@@ -37,7 +38,6 @@ StrCpy $UAC_ERROR_ELEVATE "Y
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Bu yükleyici yönetici eriþimi gerektiriyor, yeniden deneyin"
 StrCpy $INIT_INSTALLER_RUNNING "Yükleyici zaten çalýþýyor."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Bu kaldýrýcý yönetici eriþimi gerektiriyor, yeniden deneyin"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Oturum açýlacak sunucu çalýþmadýðýndan iptal ediliyor!"
 StrCpy $INIT_UNINSTALLER_RUNNING "Kaldýrýcý zaten çalýþýyor."
 StrCpy $SectionGroup_Shortcuts "Kýsayollar"
-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 $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
@@ -9,6 +9,7 @@ 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}"
@@ -39,5 +40,4 @@ StrCpy $INIT_INSTALLER_RUNNING "Установка вже запущена."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Для видалення потрібні права адміністратора, спробуйте ще раз"
 StrCpy $INIT_UNINSTALLER_RUNNING "Програма видалення вже запущено."
 StrCpy $SectionGroup_Shortcuts "Ярлики"
-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 $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
@@ -65,9 +65,9 @@ msgstr "A newer version of ${APPLICATION_NAME} is already installed! It is not r

 #. PageReinstall_SAME_Field_1
 msgid ""
-"${APPLICATION_NAME} ${VERSION} is already installed.$\r$\n"
+"${APPLICATION_NAME} ${VERSION} is already installed.\r\n"
 "Select the operation you want to perform and click Next to continue."
-msgstr "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
+msgstr "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."

 #. PageReinstall_SAME_Field_2
 msgid "Add/Reinstall components"
@@ -85,7 +85,7 @@ else(UNIX AND NOT WIN32)
 endif (UNIX AND NOT WIN32)

 if (MSVC)
-    # Use secure functions by default and suppress warnings about
+    # Use secure functions by defaualt and suppress warnings about
    #"deprecated" functions
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1")
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1")
@@ -107,7 +107,7 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 !define MEMENTO_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}"

 ;-----------------------------------------------------------------------------
-; Modern User Interface (MUI) definitions and setup.
+; Modern User Interface (MUI) defintions and setup.
 ;-----------------------------------------------------------------------------
 !define MUI_ABORTWARNING
 !define MUI_ICON ${NSI_PATH}\installer.ico
@@ -556,7 +556,7 @@ Section -post
   DetailPrint $UNINSTALLER_REGISTRY_Detail
   SetDetailsPrint listonly

-   ;Version numbers used to detect existing installation version for comparison.
+   ;Version numbers used to detect existing installation version for comparisson.
   WriteRegStr HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "" $INSTDIR
   WriteRegDWORD HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "VersionMajor" "${VER_MAJOR}"
   WriteRegDWORD HKLM "Software\${APPLICATION_VENDOR}\${APPLICATION_NAME}" "VersionMinor" "${VER_MINOR}"
@@ -720,7 +720,6 @@ Function .onInit
   ${MementoSectionRestore}

   UAC_TryAgain:
-      ClearErrors
      !insertmacro UAC_RunElevated
      ${Switch} $0
      ${Case} 0
@@ -741,7 +740,6 @@ Function .onInit
         Abort
         Quit
      ${EndSwitch}
-      ClearErrors

   ;Prevent multiple instances.
   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${APPLICATION_SHORTNAME}Installer") i .r1 ?e'
@@ -772,7 +770,6 @@ Function .onInstSuccess
   ${AndIf} $InstallRunIfSilent == "yes"
     Call LaunchApplication
   ${EndIf}
-   ClearErrors
 FunctionEnd

 Function .onInstFailed
@@ -788,7 +785,6 @@ Function un.onInit
   Call un.SetLang

   UAC_TryAgain:
-      ClearErrors
      !insertmacro UAC_RunElevated
      ${Switch} $0
      ${Case} 0
@@ -809,7 +805,6 @@ Function un.onInit
         Abort
         Quit
      ${EndSwitch}
-      ClearErrors

   ;Prevent multiple instances.
   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${APPLICATION_SHORTNAME}Uninstaller") i .r1 ?e'
@@ -823,7 +818,6 @@ Function un.onInit
 FunctionEnd

 Function un.onUnInstSuccess
-   ClearErrors
 FunctionEnd

 Function un.onUnInstFailed
@@ -37,7 +37,7 @@ IF (DOXYGEN_FOUND)
  # we need latex for doxygen because of the formulas
  FIND_PACKAGE(LATEX)
  IF    (NOT LATEX_COMPILER)
-    MESSAGE(STATUS "latex command LATEX_COMPILER not found but usually required. You will probably get warnings and user interaction on doxy run.")
+    MESSAGE(STATUS "latex command LATEX_COMPILER not found but usually required. You will probably get warnings and user inetraction on doxy run.")
  ENDIF (NOT LATEX_COMPILER)
  IF    (NOT MAKEINDEX_COMPILER)
    MESSAGE(STATUS "makeindex command MAKEINDEX_COMPILER not found but usually required.")
@@ -29,12 +29,12 @@ project=gets.chomp

 printf("\n")

-print("Other projects to include (e.g. \"owutil tinyxml\", leave emtpy to skip): ")
+print("Other projects to includes (e.g. \"owutil tinyxml\", leave emtpy to skip): ")
 otherprojects=gets.chomp

 printf("\n")

-print("Definitions (leave empty to skip): ")
+print("Defininitions (leave empty to skip): ")
 definitions=gets.chomp

 cmakePublicIncDirName = project.upcase+"_PUBLIC_INCLUDE_DIRS"
@@ -21,9 +21,9 @@ version 0.91.3  (released 2013-12-11, ownCloud Client 1.5.0rc1)
 version 0.91.2 (released 2013-12-10, ownCloud Client 1.5.0beta3)
 * have translatable error message for indiv. file errors.
 * Use uint64_t for inode on win32 to fix a type glitch.
- * Add test that directories are properly moved.
+ * Add test that directrories are properly moved.
 * Handle symlinks correctly.
- * No longer recurse into ignored directories in update 
+ * Do not longer recurse into ignored directories in update 
   phase.
 * Added proper symlink detection for win32 platform.

@@ -77,7 +77,7 @@ version 0.90.0  (released 2013-09-04, ownCloud Client 1.4.0)
  * Added c_rename function to csync std.
  * Fix: Do renames of files before any puts.
  * Improved database integrity checks.
-  * Improvements of database writing efficiency.
+  * Improvements of database writing efficiendy.
  * Fix: stat file on win32 even if its opened by application.
  * httpbf: configurable block size and threshold.
  * Many fixes found by a Coverity check.
@@ -159,7 +159,7 @@ version 0.70.0 and 0.70.1 were beta versions.

 version 0.60.2  (released 2012-11-26)
  * Migration to cross platform testing system cmocka.
-  * Fixed various minor things incl. potential mem leaks.
+  * Fixed variuos minor things incl. potential mem leaks.
  * Clang fixes.
  * Moved journal database to sync directory.
  * Fixed more csync->ocsync renaming issues.
@@ -247,7 +247,7 @@ version 0.50.0 (released 2013-08-01)
  * Added new logging framework (removed log4c dependency).
  * Added new config parser (removed iniparser dependency).
  * Added cmocka tests.
-  * Added a way to export file_tree_walk functions.
+  * Added a way to exported file_tree_walk functions.
  * Added capabilities for modules.
  * Added possiblity to push information to the modules.
  * Added iconv support to support various char sets.
@@ -20,7 +20,7 @@ sqlite3 is a runtime requirement. libsmbclient is needed for
 the smb plugin, libssh for the sftp plugin. libneon is required for the 
 ownCloud plugin.

-Note that these version numbers are versions we know work correctly. If you
+Note that these version numbers are version we know works correctly. If you
 build and run csync successfully with an older version, please let us know.


@@ -63,7 +63,7 @@ CMake options using `cmakesetup` (Windows) or `ccmake` (GNU/Linux and MacOS X).

 ## Installing

-Before installing you can run the tests if everything is working:
+Befor installing you can run the tests if everything is working:

    make test

@@ -13,7 +13,7 @@ CONTRIBUTIONS
 =============

 If you want to contribute to the development of the software then please join
-the mailing list. Patches are accepted preferably created with git and we are
+the mailing list. Patches are accepted preferebly created with git and we are
 always glad to receive feedback or suggestions to the address
 csync-devel@csync.org.
 More information on the various mailing lists can be found at
@@ -44,7 +44,24 @@
 static
 #endif
 int _csync_exclude_add(c_strlist_t **inList, const char *string) {
-    return c_strlist_add_grow(inList, string);
+    c_strlist_t *list;
+
+    if (*inList == NULL) {
+        *inList = c_strlist_new(32);
+        if (*inList == NULL) {
+            return -1;
+        }
+    }
+
+    if ((*inList)->count == (*inList)->size) {
+        list = c_strlist_expand(*inList, 2 * (*inList)->size);
+        if (list == NULL) {
+            return -1;
+        }
+        *inList = list;
+    }
+
+    return c_strlist_add(*inList, string);
 }

 int csync_exclude_load(const char *fname, c_strlist_t **list) {
@@ -169,190 +186,208 @@ bool csync_is_windows_reserved_word(const char* filename) {
  return false;
 }

-static CSYNC_EXCLUDE_TYPE _csync_excluded_common(c_strlist_t *excludes, const char *path, int filetype, bool check_leading_dirs) {
-    size_t i = 0;
-    const char *p = NULL;
-    const char *bname = NULL;
-    size_t blen = 0;
-    char *conflict = NULL;
-    int rc = -1;
-    CSYNC_EXCLUDE_TYPE match = CSYNC_NOT_EXCLUDED;
-    CSYNC_EXCLUDE_TYPE type  = CSYNC_NOT_EXCLUDED;
+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;
+  char *dname = NULL;
+  char *conflict = NULL;
+  int rc = -1;
+  CSYNC_EXCLUDE_TYPE match = CSYNC_NOT_EXCLUDED;
+  CSYNC_EXCLUDE_TYPE type  = CSYNC_NOT_EXCLUDED;

-      for (p = path; *p; p++) {
-        switch (*p) {
-          case '\\':
-          case ':':
-          case '?':
-          case '*':
-          case '"':
-          case '>':
-          case '<':
-          case '|':
-            return CSYNC_FILE_EXCLUDE_INVALID_CHAR;
-          default:
-            break;
-        }
+    for (p = path; *p; p++) {
+      switch (*p) {
+        case '\\':
+        case ':':
+        case '?':
+        case '*':
+        case '"':
+        case '>':
+        case '<':
+        case '|':
+          return CSYNC_FILE_EXCLUDE_INVALID_CHAR;
+        default:
+          break;
+      }
+    }
+
+  /* split up the path */
+  dname = c_dirname(path);
+  bname = c_basename(path);
+
+  if (bname == NULL || dname == NULL) {
+      match = CSYNC_NOT_EXCLUDED;
+      SAFE_FREE(bname);
+      SAFE_FREE(dname);
+      goto out;
+  }
+
+  rc = csync_fnmatch(".csync_journal.db*", bname, 0);
+  if (rc == 0) {
+      match = CSYNC_FILE_SILENTLY_EXCLUDED;
+      SAFE_FREE(bname);
+      SAFE_FREE(dname);
+      goto out;
+  }
+
+  // check the strlen and ignore the file if its name is longer than 254 chars.
+  // whenever changing this also check createDownloadTmpFileName
+  if (strlen(bname) > 254) {
+      match = CSYNC_FILE_EXCLUDE_LONG_FILENAME;
+      SAFE_FREE(bname);
+      SAFE_FREE(dname);
+      goto out;
+  }
+
+#ifdef _WIN32
+  // Windows cannot sync files ending in spaces (#2176). It also cannot
+  // distinguish files ending in '.' from files without an ending,
+  // as '.' is a separator that is not stored internally, so let's
+  // not allow to sync those to avoid file loss/ambiguities (#416)
+  size_t blen = strlen(bname);
+  if (blen > 1 && (bname[blen-1]== ' ' || bname[blen-1]== '.' )) {
+      match = CSYNC_FILE_EXCLUDE_INVALID_CHAR;
+      SAFE_FREE(bname);
+      SAFE_FREE(dname);
+      goto out;
+  }
+
+  if (csync_is_windows_reserved_word(bname)) {
+    match = CSYNC_FILE_EXCLUDE_INVALID_CHAR;
+    SAFE_FREE(bname);
+    SAFE_FREE(dname);
+    goto out;
+  }
+#endif
+
+  rc = csync_fnmatch(".owncloudsync.log*", bname, 0);
+  if (rc == 0) {
+      match = CSYNC_FILE_SILENTLY_EXCLUDED;
+      SAFE_FREE(bname);
+      SAFE_FREE(dname);
+      goto out;
+  }
+
+  /* Always ignore conflict files, not only via the exclude list */
+  rc = csync_fnmatch("*_conflict-*", bname, 0);
+  if (rc == 0) {
+      match = CSYNC_FILE_SILENTLY_EXCLUDED;
+      SAFE_FREE(bname);
+      SAFE_FREE(dname);
+      goto out;
+  }
+
+  if (getenv("CSYNC_CONFLICT_FILE_USERNAME")) {
+      rc = asprintf(&conflict, "*_conflict_%s-*", getenv("CSYNC_CONFLICT_FILE_USERNAME"));
+      if (rc < 0) {
+          SAFE_FREE(bname);
+          SAFE_FREE(dname);
+          goto out;
+      }
+      rc = csync_fnmatch(conflict, path, 0);
+      if (rc == 0) {
+          match = CSYNC_FILE_SILENTLY_EXCLUDED;
+          SAFE_FREE(conflict);
+          SAFE_FREE(bname);
+          SAFE_FREE(dname);
+          goto out;
+      }
+      SAFE_FREE(conflict);
+  }
+
+  SAFE_FREE(bname);
+  SAFE_FREE(dname);
+
+  if( ! excludes ) {
+      goto out;
+  }
+
+  /* split the path into its components */
+
+  /* First, count the number of components, ie. /foo/bar/baz/file.txt has four components */
+  size_t comp_cnt = 1;
+  int starter = 0;
+  if( path[0] == '/' ) {
+      starter = 1; /* in case of trailing slash, skip that one */
+  }
+  for( i = starter; i < strlen(path); i++ ) {
+      if( path[i] == '/' ) {
+          comp_cnt++;
+      }
+  }
+
+  /* Fill a string list with the components to the given path
+   * so far with all the components. */
+  c_strlist_t *path_components = NULL;
+  if( comp_cnt > 0 ) {
+      char *comp_path = c_strdup( path );
+      path_components = c_strlist_new(comp_cnt);
+      for (char *token = strtok(comp_path, "/"); token; token = strtok(NULL, "/")) {
+          c_strlist_add(path_components, c_strdup(token));
+      }
+      SAFE_FREE(comp_path);
+  }
+
+
+  /* Loop over all exclude patterns and evaluate the given path */
+  for (i = 0; match == CSYNC_NOT_EXCLUDED && i < excludes->count; i++) {
+      bool match_dirs_only = false;
+      char *pattern_stored = c_strdup(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 */
+      if (pattern[0] == ']') {
+          ++pattern;
+          if (filetype == CSYNC_FTW_TYPE_FILE) {
+              type = CSYNC_FILE_EXCLUDE_AND_REMOVE;
+          }
+      }
+      /* Check if the pattern applies to pathes only. */
+      if (pattern[strlen(pattern)-1] == '/') {
+          match_dirs_only = true;
+          pattern[strlen(pattern)-1] = '\0'; /* Cut off the slash */
      }

-    /* split up the path */
-    bname = strrchr(path, '/');
-    if (bname) {
-        bname += 1; // don't include the /
-    } else {
-        bname = path;
-    }
-    blen = strlen(bname);
+      /* check if the pattern contains a / and if, compare to the whole path */
+      if (strchr(pattern, '/')) {
+          rc = csync_fnmatch(pattern, path, FNM_PATHNAME);
+          if( rc == 0 ) {
+              match = type;
+          }
+          /* if the pattern requires a dir, but path is not, its still not excluded. */
+          if (match_dirs_only && filetype != CSYNC_FTW_TYPE_DIR) {
+              match = CSYNC_NOT_EXCLUDED;
+          }
+      }
+      /* if still not excluded, check each component of the path */
+      if (match == CSYNC_NOT_EXCLUDED) {
+          size_t stop_at = comp_cnt;
+          if( match_dirs_only && filetype == CSYNC_FTW_TYPE_FILE ) {
+              stop_at--; // do not check the trailing component for files
+          }
+          /* Loop over every component of the path and check */
+          for( size_t comp_no = 0; comp_no < stop_at && match == CSYNC_NOT_EXCLUDED; comp_no++ ) {
+              char *component = path_components->vector[comp_no];

-    rc = csync_fnmatch(".csync_journal.db*", bname, 0);
-    if (rc == 0) {
-        match = CSYNC_FILE_SILENTLY_EXCLUDED;
-        goto out;
-    }
+              rc = csync_fnmatch(pattern, component, 0);
+              if (rc == 0) {
+                  match = type;
+              }
+          }
+      }
+      SAFE_FREE(pattern_stored);
+  }
+  c_strlist_destroy(path_components);

-    // check the strlen and ignore the file if its name is longer than 254 chars.
-    // whenever changing this also check createDownloadTmpFileName
-    if (blen > 254) {
-        match = CSYNC_FILE_EXCLUDE_LONG_FILENAME;
-        goto out;
-    }

-  #ifdef _WIN32
-    // Windows cannot sync files ending in spaces (#2176). It also cannot
-    // distinguish files ending in '.' from files without an ending,
-    // as '.' is a separator that is not stored internally, so let's
-    // not allow to sync those to avoid file loss/ambiguities (#416)
-    if (blen > 1 && (bname[blen-1]== ' ' || bname[blen-1]== '.' )) {
-        match = CSYNC_FILE_EXCLUDE_INVALID_CHAR;
-        goto out;
-    }
+out:

-    if (csync_is_windows_reserved_word(bname)) {
-      match = CSYNC_FILE_EXCLUDE_INVALID_CHAR;
-      goto out;
-    }
-  #endif
-
-    rc = csync_fnmatch(".owncloudsync.log*", bname, 0);
-    if (rc == 0) {
-        match = CSYNC_FILE_SILENTLY_EXCLUDED;
-        goto out;
-    }
-
-    /* Always ignore conflict files, not only via the exclude list */
-    rc = csync_fnmatch("*_conflict-*", bname, 0);
-    if (rc == 0) {
-        match = CSYNC_FILE_SILENTLY_EXCLUDED;
-        goto out;
-    }
-
-    if (getenv("CSYNC_CONFLICT_FILE_USERNAME")) {
-        rc = asprintf(&conflict, "*_conflict_%s-*", getenv("CSYNC_CONFLICT_FILE_USERNAME"));
-        if (rc < 0) {
-            goto out;
-        }
-        rc = csync_fnmatch(conflict, path, 0);
-        if (rc == 0) {
-            match = CSYNC_FILE_SILENTLY_EXCLUDED;
-            SAFE_FREE(conflict);
-            goto out;
-        }
-        SAFE_FREE(conflict);
-    }
-
-    if( ! excludes ) {
-        goto out;
-    }
-
-    /* Build a list of path components to check. */
-    c_strlist_t *path_components = c_strlist_new(32);
-    char *path_split = strdup(path);
-    size_t len = strlen(path_split);
-    for (i = len; ; --i) {
-        // read backwards until a path separator is found
-        if (i != 0 && path_split[i-1] != '/') {
-            continue;
-        }
-
-        // check 'basename', i.e. for "/foo/bar/fi" we'd check 'fi', 'bar', 'foo'
-        if (path_split[i] != 0) {
-            c_strlist_add_grow(&path_components, path_split + i);
-        }
-
-        if (i == 0 || !check_leading_dirs) {
-            break;
-        }
-
-        // check 'dirname', i.e. for "/foo/bar/fi" we'd check '/foo/bar', '/foo'
-        path_split[i-1] = '\0';
-        c_strlist_add_grow(&path_components, path_split);
-    }
-    SAFE_FREE(path_split);
-
-    /* Loop over all exclude patterns and evaluate the given path */
-    for (i = 0; match == CSYNC_NOT_EXCLUDED && i < excludes->count; i++) {
-        bool match_dirs_only = false;
-        char *pattern_stored = c_strdup(excludes->vector[i]);
-        char* pattern = pattern_stored;
-
-        type = CSYNC_FILE_EXCLUDE_LIST;
-        if (strlen(pattern) < 1) {
-            SAFE_FREE(pattern_stored);
-            continue;
-        }
-        /* Excludes starting with ']' means it can be cleanup */
-        if (pattern[0] == ']') {
-            ++pattern;
-            if (filetype == CSYNC_FTW_TYPE_FILE) {
-                type = CSYNC_FILE_EXCLUDE_AND_REMOVE;
-            }
-        }
-        /* Check if the pattern applies to pathes only. */
-        if (pattern[strlen(pattern)-1] == '/') {
-            match_dirs_only = true;
-            pattern[strlen(pattern)-1] = '\0'; /* Cut off the slash */
-        }
-
-        /* check if the pattern contains a / and if, compare to the whole path */
-        if (strchr(pattern, '/')) {
-            rc = csync_fnmatch(pattern, path, FNM_PATHNAME);
-            if( rc == 0 ) {
-                match = type;
-            }
-            /* if the pattern requires a dir, but path is not, its still not excluded. */
-            if (match_dirs_only && filetype != CSYNC_FTW_TYPE_DIR) {
-                match = CSYNC_NOT_EXCLUDED;
-            }
-        }
-
-        /* if still not excluded, check each component and leading directory of the path */
-        if (match == CSYNC_NOT_EXCLUDED) {
-            size_t j = 0;
-            if (match_dirs_only && filetype == CSYNC_FTW_TYPE_FILE) {
-                j = 1; // skip the first entry, which is bname
-            }
-            for (; j < path_components->count; ++j) {
-                rc = csync_fnmatch(pattern, path_components->vector[j], 0);
-                if (rc == 0) {
-                    match = type;
-                    break;
-                }
-            }
-        }
-        SAFE_FREE(pattern_stored);
-    }
-    c_strlist_destroy(path_components);
-
-  out:
-
-    return match;
-}
-
-CSYNC_EXCLUDE_TYPE csync_excluded_traversal(c_strlist_t *excludes, const char *path, int filetype) {
-  return _csync_excluded_common(excludes, path, filetype, false);
-}
-
-CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path, int filetype) {
-  return _csync_excluded_common(excludes, path, filetype, true);
+  return match;
 }

@@ -66,11 +66,6 @@ void csync_exclude_destroy(CSYNC *ctx);
 *
 * This excludes also paths which can't be used without unix extensions.
 *
- * The exclude list is checked against the full path, each component of
- * the path and all leading directory strings, e.g.
- * '/foo/bar/file' checks ('/foo/bar/file', 'foo', 'bar', 'file',
- * '/foo/bar', '/foo').
- *
 * @param ctx   The synchronizer context.
 * @param path  The patch to check.
 *
@@ -78,23 +73,6 @@ void csync_exclude_destroy(CSYNC *ctx);
 */
 CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype);

-/**
- * @brief Check if the given path should be excluded in a traversal situation.
- *
- * It does only part of the work that csync_excluded does because it's assumed
- * that all leading directories have been run through csync_excluded_traversal()
- * before. This can be significantly faster.
- *
- * That means for '/foo/bar/file' only ('/foo/bar/file', 'file') is checked
- * against the exclude patterns.
- *
- * @param ctx   The synchronizer context.
- * @param path  The patch to check.
- *
- * @return  2 if excluded and needs cleanup, 1 if excluded, 0 if not.
- */
-CSYNC_EXCLUDE_TYPE csync_excluded_traversal(c_strlist_t *excludes, const char *path, int filetype);
-
 /**
 * @brief csync_excluded_no_ctx
 * @param excludes
@@ -488,7 +488,7 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {
            /* Check for exclusion from the tree.
             * Note that this is only a safety net in case the ignore list changes
             * without a full remote discovery being triggered. */
-            CSYNC_EXCLUDE_TYPE excluded = csync_excluded_traversal(ctx->excludes, st->path, st->type);
+            CSYNC_EXCLUDE_TYPE excluded = csync_excluded(ctx, st->path, st->type);
            if (excluded != CSYNC_NOT_EXCLUDED) {
                CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "%s excluded (%d)", st->path, excluded);

@@ -167,7 +167,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
      excluded =CSYNC_FILE_EXCLUDE_STAT_FAILED;
  } else {
    /* Check if file is excluded */
-    excluded = csync_excluded_traversal(ctx->excludes, path, type);
+    excluded = csync_excluded(ctx, path,type);
  }

  if( excluded == CSYNC_NOT_EXCLUDED ) {
@@ -630,15 +630,7 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
      /* permission denied */
      ctx->status_code = csync_errno_to_status(errno, CSYNC_STATUS_OPENDIR_ERROR);
      if (errno == EACCES) {
-          if (ctx->current_fs) {
-              ctx->current_fs->instruction = CSYNC_INSTRUCTION_IGNORE;
-              ctx->current_fs->error_status = CSYNC_STATUS_PERMISSION_DENIED;
-              /* If a directory has ignored files, put the flag on the parent directory as well */
-              if( previous_fs ) {
-                  previous_fs->has_ignored_files = true;
-              }
-              goto done;
-          }
+          return 0;
      } else if(errno == ENOENT) {
          asp = asprintf( &ctx->error_string, "%s", uri);
          if (asp < 0) {
@@ -660,7 +652,6 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
              }
              goto done;
          }
-          /* if current_fs is not defined here, better throw an error */
      } else {
          CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "opendir failed for %s - errno %d", uri, errno);
      }
@@ -393,8 +393,8 @@ int c_parse_uri(const char *uri,

 /*
 * This function takes a path and converts it to a UNC representation of the
- * string. That means that it prepends a \\?\ (unless already UNC) and converts
- * all slashes to backslashes.
+ * string. That means that it prepends a \\?\ and convertes all slashes to
+ * backslashes.
 *
 * Note the following:
 *  - The string must be absolute.
@@ -408,28 +408,27 @@ int c_parse_uri(const char *uri,
 {
     int len = 0;
     char *longStr = NULL;
+     int i = 4; // index where to start changing "/"=>"\"

     len = strlen(str);
     longStr = c_malloc(len+5);
     *longStr = '\0';

     // prepend \\?\ and convert '/' => '\' to support long names
-     if( str[0] == '/' || str[0] == '\\' ) {
-         // Don't prepend if already UNC
-         if( !(len > 1 && (str[1] == '/' || str[1] == '\\')) ) {
-            strcpy( longStr, "\\\\?");
-         }
+     if( str[0] == '/' ) {
+         strncpy( longStr, "\\\\?", 4);
+         i=3;
     } else {
-         strcpy( longStr, "\\\\?\\"); // prepend string by this four magic chars.
+         strncpy( longStr, "\\\\?\\", 5); // prepend string by this four magic chars.
     }
     strncat( longStr, str, len );

     /* replace all occurences of / with the windows native \ */
-     char *c = longStr;
-     for (; *c; ++c) {
-         if(*c == '/') {
-             *c = '\\';
+     while(longStr[i] != '\0') {
+         if(longStr[i] == '/') {
+             longStr[i] = '\\';
         }
+         i++;
     }
     return longStr;
 }
@@ -215,25 +215,6 @@ int c_strlist_add(c_strlist_t *strlist, const char *string) {
  return 0;
 }

-int c_strlist_add_grow(c_strlist_t **strlist, const char *string) {
-  if (*strlist == NULL) {
-    *strlist = c_strlist_new(32);
-    if (*strlist == NULL) {
-      return -1;
-    }
-  }
-
-  if ((*strlist)->count == (*strlist)->size) {
-    c_strlist_t *list = c_strlist_expand(*strlist, 2 * (*strlist)->size);
-    if (list == NULL) {
-      return -1;
-    }
-    *strlist = list;
-  }
-
-  return c_strlist_add(*strlist, string);
-}
-
 void c_strlist_clear(c_strlist_t *strlist) {
  size_t i = 0;

@@ -112,19 +112,6 @@ c_strlist_t *c_strlist_expand(c_strlist_t *strlist, size_t size);
 */
 int c_strlist_add(c_strlist_t *strlist, const char *string);

-/**
- * @brief  Add a string to the stringlist, growing it if necessary
- *
- * Duplicates the string and stores it in the stringlist.
- * It also initializes the stringlist if it starts out as null.
- *
- * @param strlist  Stringlist to add the string.
- * @param string   String to add.
- *
- * @return  0 on success, less than 0 and errno set if an error occured.
- */
-int c_strlist_add_grow(c_strlist_t **strlist, const char *string);
-
 /**
 * @brief Removes all strings from the list.
 *
@@ -74,12 +74,6 @@ csync_vio_handle_t *csync_vio_local_opendir(const char *name) {
  }

  if (!dirname || handle->hFind == INVALID_HANDLE_VALUE) {
-      int retcode = GetLastError();
-      if( retcode == ERROR_FILE_NOT_FOUND ) {
-          errno = ENOENT;
-      } else {
-          errno = EACCES;
-      }
      SAFE_FREE(handle);
      return NULL;
  }
@@ -105,9 +99,6 @@ int csync_vio_local_closedir(csync_vio_handle_t *dhandle) {
  // FindClose returns non-zero on success
  if( FindClose(handle->hFind) != 0 ) {
      rc = 0;
-  } else {
-      // error case, set errno
-      errno = EBADF;
  }

  SAFE_FREE(handle->path);
@@ -126,8 +117,7 @@ csync_vio_file_stat_t *csync_vio_local_readdir(csync_vio_handle_t *dhandle) {
  errno = 0;
  file_stat = csync_vio_file_stat_new();
  if (file_stat == NULL) {
-      errno = ENOMEM;
-      goto err;
+    goto err;
  }
  file_stat->fields = CSYNC_VIO_FILE_STAT_FIELDS_NONE;

@@ -19,7 +19,6 @@
 */
 #include "config_csync.h"
 #include <string.h>
-#include <time.h>

 #include "torture.h"

@@ -90,11 +89,6 @@ static void check_csync_excluded(void **state)
    CSYNC *csync = *state;
    int rc;

-    rc = csync_excluded(csync, "", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-    rc = csync_excluded(csync, "/", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
    rc = csync_excluded(csync, "krawel_krawel", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
    rc = csync_excluded(csync, ".kde/share/config/kwin.eventsrc", CSYNC_FTW_TYPE_FILE);
@@ -147,56 +141,6 @@ static void check_csync_excluded(void **state)

 }

-static void check_csync_excluded_traversal(void **state)
-{
-    CSYNC *csync = *state;
-    int rc;
-
-    _csync_exclude_add( &(csync->excludes), "/exclude" );
-
-    /* Check toplevel dir, the pattern only works for toplevel dir. */
-    rc = csync_excluded_traversal(csync->excludes, "/exclude", CSYNC_FTW_TYPE_DIR);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-    rc = csync_excluded_traversal(csync->excludes, "/foo/exclude", CSYNC_FTW_TYPE_DIR);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
-    /* check for a file called exclude. Must still work */
-    rc = csync_excluded_traversal(csync->excludes, "/exclude", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-    rc = csync_excluded_traversal(csync->excludes, "/foo/exclude", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
-    /* Add an exclude for directories only: excl/ */
-    _csync_exclude_add( &(csync->excludes), "excl/" );
-    rc = csync_excluded_traversal(csync->excludes, "/excl", CSYNC_FTW_TYPE_DIR);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-    rc = csync_excluded_traversal(csync->excludes, "meep/excl", CSYNC_FTW_TYPE_DIR);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-    rc = csync_excluded_traversal(csync->excludes, "meep/excl/file", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED); // because leading dirs aren't checked!
-
-    rc = csync_excluded_traversal(csync->excludes, "/excl", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
-    _csync_exclude_add(&csync->excludes, "/excludepath/withsubdir");
-
-    rc = csync_excluded_traversal(csync->excludes, "/excludepath/withsubdir", CSYNC_FTW_TYPE_DIR);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-    rc = csync_excluded_traversal(csync->excludes, "/excludepath/withsubdir", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-    rc = csync_excluded_traversal(csync->excludes, "/excludepath/withsubdir2", CSYNC_FTW_TYPE_DIR);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
-    rc = csync_excluded_traversal(csync->excludes, "/excludepath/withsubdir/foo", CSYNC_FTW_TYPE_DIR);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED); // because leading dirs aren't checked!
-}
-
 static void check_csync_pathes(void **state)
 {
    CSYNC *csync = *state;
@@ -226,25 +170,8 @@ static void check_csync_pathes(void **state)
    rc = csync_excluded(csync, "meep/excl", CSYNC_FTW_TYPE_DIR);
    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);

-    rc = csync_excluded(csync, "meep/excl/file", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
    rc = csync_excluded(csync, "/excl", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
-    _csync_exclude_add(&csync->excludes, "/excludepath/withsubdir");
-
-    rc = csync_excluded(csync, "/excludepath/withsubdir", CSYNC_FTW_TYPE_DIR);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-    rc = csync_excluded(csync, "/excludepath/withsubdir", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-    rc = csync_excluded(csync, "/excludepath/withsubdir2", CSYNC_FTW_TYPE_DIR);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
-    rc = csync_excluded(csync, "/excludepath/withsubdir/foo", CSYNC_FTW_TYPE_DIR);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
 }

 static void check_csync_is_windows_reserved_word() {
@@ -263,51 +190,7 @@ static void check_csync_is_windows_reserved_word() {
    assert_true(csync_is_windows_reserved_word("Z:"));
    assert_true(csync_is_windows_reserved_word("M:"));
    assert_true(csync_is_windows_reserved_word("m:"));
-}

-static void check_csync_excluded_performance(void **state)
-{
-    CSYNC *csync = *state;
-
-    const int N = 10000;
-    int totalRc = 0;
-
-    // Being able to use QElapsedTimer for measurement would be nice...
-    {
-        struct timeval before, after;
-        gettimeofday(&before, 0);
-
-        for (int i = 0; i < N; ++i) {
-            totalRc += csync_excluded(csync, "/this/is/quite/a/long/path/with/many/components", CSYNC_FTW_TYPE_DIR);
-            totalRc += csync_excluded(csync, "/1/2/3/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20/21/22/23/24/25/26/27/29", CSYNC_FTW_TYPE_FILE);
-        }
-        assert_int_equal(totalRc, CSYNC_NOT_EXCLUDED); // mainly to avoid optimization
-
-        gettimeofday(&after, 0);
-
-        const double total = (after.tv_sec - before.tv_sec)
-                + (after.tv_usec - before.tv_usec) / 1.0e6;
-        const double perCallMs = total / 2 / N * 1000;
-        printf("csync_excluded: %f ms per call\n", perCallMs);
-    }
-
-    {
-        struct timeval before, after;
-        gettimeofday(&before, 0);
-
-        for (int i = 0; i < N; ++i) {
-            totalRc += csync_excluded_traversal(csync->excludes, "/this/is/quite/a/long/path/with/many/components", CSYNC_FTW_TYPE_DIR);
-            totalRc += csync_excluded_traversal(csync->excludes, "/1/2/3/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20/21/22/23/24/25/26/27/29", CSYNC_FTW_TYPE_FILE);
-        }
-        assert_int_equal(totalRc, CSYNC_NOT_EXCLUDED); // mainly to avoid optimization
-
-        gettimeofday(&after, 0);
-
-        const double total = (after.tv_sec - before.tv_sec)
-                + (after.tv_usec - before.tv_usec) / 1.0e6;
-        const double perCallMs = total / 2 / N * 1000;
-        printf("csync_excluded_traversal: %f ms per call\n", perCallMs);
-    }
 }

 int torture_run_tests(void)
@@ -316,10 +199,8 @@ int torture_run_tests(void)
        unit_test_setup_teardown(check_csync_exclude_add, setup, teardown),
        unit_test_setup_teardown(check_csync_exclude_load, setup, teardown),
        unit_test_setup_teardown(check_csync_excluded, setup_init, teardown),
-        unit_test_setup_teardown(check_csync_excluded_traversal, setup_init, teardown),
        unit_test_setup_teardown(check_csync_pathes, setup_init, teardown),
        unit_test_setup_teardown(check_csync_is_windows_reserved_word, setup_init, teardown),
-        unit_test_setup_teardown(check_csync_excluded_performance, setup_init, teardown),
    };

    return run_tests(tests);
@@ -146,47 +146,13 @@ static void check_to_multibyte(void **state)

 static void check_long_win_path(void **state)
 {
+    const char *path = "C://DATA/FILES/MUSIC/MY_MUSIC.mp3"; // check a short path
+    const char *exp_path = "\\\\?\\C:\\\\DATA\\FILES\\MUSIC\\MY_MUSIC.mp3";
+    const char *new_short = c_path_to_UNC(path);
+
    (void) state; /* unused */

-    {
-        const char *path = "C://DATA/FILES/MUSIC/MY_MUSIC.mp3"; // check a short path
-        const char *exp_path = "\\\\?\\C:\\\\DATA\\FILES\\MUSIC\\MY_MUSIC.mp3";
-        const char *new_short = c_path_to_UNC(path);
-        assert_string_equal(new_short, exp_path);
-        SAFE_FREE(new_short);
-    }
-
-    {
-        const char *path = "\\\\foo\\bar/MY_MUSIC.mp3";
-        const char *exp_path = "\\\\foo\\bar\\MY_MUSIC.mp3";
-        const char *new_short = c_path_to_UNC(path);
-        assert_string_equal(new_short, exp_path);
-        SAFE_FREE(new_short);
-    }
-
-    {
-        const char *path = "//foo\\bar/MY_MUSIC.mp3";
-        const char *exp_path = "\\\\foo\\bar\\MY_MUSIC.mp3";
-        const char *new_short = c_path_to_UNC(path);
-        assert_string_equal(new_short, exp_path);
-        SAFE_FREE(new_short);
-    }
-
-    {
-        const char *path = "\\foo\\bar";
-        const char *exp_path = "\\\\?\\foo\\bar";
-        const char *new_short = c_path_to_UNC(path);
-        assert_string_equal(new_short, exp_path);
-        SAFE_FREE(new_short);
-    }
-
-    {
-        const char *path = "/foo/bar";
-        const char *exp_path = "\\\\?\\foo\\bar";
-        const char *new_short = c_path_to_UNC(path);
-        assert_string_equal(new_short, exp_path);
-        SAFE_FREE(new_short);
-    }
+    assert_string_equal(new_short, exp_path);

    const char *longPath = "D://alonglonglonglong/blonglonglonglong/clonglonglonglong/dlonglonglonglong/"
            "elonglonglonglong/flonglonglonglong/glonglonglonglong/hlonglonglonglong/ilonglonglonglong/"
@@ -204,7 +170,7 @@ static void check_long_win_path(void **state)

    // printf( "YYYYYYYYYYYY %ld\n", strlen(new_long));
    assert_int_equal( strlen(new_long), 286);
-    SAFE_FREE(new_long);
+
 }

 int torture_run_tests(void)
@@ -47,7 +47,7 @@ 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 modification
+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.

@@ -76,7 +76,7 @@ a synchronization process.
   not support using the file ID functionality.

 Before the 1.3.0 release of the Desktop Client, the synchronization process
-might create false conflict files if time deviates. Original and changed files
+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.

@@ -104,7 +104,7 @@ depending on server/client combination:
 +--------------------+-------------------+----------------------------+

 We strongly recommend using ownCloud Server release 4.5 or later when using
-ownCloud Client 1.1 or later. Using an incompatible time stamp-based
+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.

@@ -120,7 +120,7 @@ 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.

-.. note:: On the local side, the modification time is a good attribute to use for 
+.. note:: On the local side, the modification time a good attribute to use for 
   detecting changes, because
   the value does not depend on time shifts and such.

@@ -131,8 +131,8 @@ changed and no synchronization occurs.

 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 will not be lost.  Instead,
-a *conflict case* is created. The client resolves this conflict by creating a
+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
@@ -156,18 +156,18 @@ By default, the ownCloud Client ignores the following files:
 * Files starting with ``.csync_journal.db``, as these files are 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
+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 ignored and *removed* by the client if found in the
+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
 applications that have no sustainable meaning.

-If a pattern ends with the forwardslash (``/``) character, only directories are
+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.

 To match filenames against the exclude patterns, the unix standard C library
-function fnmatch is used. This process checks the filename against the
+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>`_.
@@ -87,7 +87,7 @@ To prevent automatic updates and disallow manual overrides:
 .. note::This is the preferred method of controlling the updater behavior using 
   Group Policies.

-1. Edit this Registry key:
+1. Migrate to the following directory::

 	HKEY_LOCAL_MACHINE\Software\Policies\ownCloud\ownCloud

@@ -106,7 +106,7 @@ using the system-wide ``.plist`` file.  To access this file:

 	/Library/Preferences/

-2. Locate and open the following file::
+ 2. Locate and open the following file::

 	com.owncloud.desktopclient.plist

@@ -1,6 +1,5 @@
 .. _building-label:

-===============================
 Appendix A: Building the Client
 ===============================

@@ -8,7 +7,7 @@ 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.

-.. note:: Build instructions are subject to change as development proceeds.
+.. note:: Building instruction are subject to change as development proceeds.
  Please check the version for which you want to build.

 The instructions contained in this topic were updated to work with version 1.7 of the ownCloud Client.
@@ -24,7 +23,7 @@ Linux
   * openSUSE: ``zypper ref; zypper si -d owncloud-client``
   * Fedora/CentOS: ``yum install yum-utils; yum-builddep owncloud-client``

-3. Follow the :ref:`generic-build-instructions`.
+3. Follow the `generic build instructions`_.

 4. (Optional) Call ``make install`` to install the client to the ``/usr/local/bin`` directory.

@@ -44,7 +43,7 @@ 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.

-To set up your build environment for development using HomeBrew_:
+To set up your build enviroment for development using HomeBrew_:

 1. Add the ownCloud repository using the following command::

@@ -61,7 +60,7 @@ To set up your build environment for development using HomeBrew_:
   Where ``x.z`` is the current version of Qt 5 that brew has installed
   on your machine.

-5. For compilation of the client, follow the :ref:`generic-build-instructions`.
+5. For compilation of the client, follow the `generic build instructions`_.

 6. In the build directory, run ``admin/osx/create_mac.sh <build_dir>
   <install_dir>``. If you have a developer signing certificate, you can specify
@@ -119,14 +118,14 @@ follow `Windows Installer Build (Cross-Compile)`_ instead.
    cmake -G "MinGW Makefiles" ../client
    mingw32-make

-  .. note:: You can try using ninja to build in parallel using
+  .. note:: You can try using ninja to build parallelly using
     ``cmake -G Ninja ../client`` and ``ninja`` instead.
-  .. note:: Refer to the :ref:`generic-build-instructions` section for additional options.
+  .. note:: Refer to the `generic build instructions`_ section for additional options.

-  The ownCloud binary will appear in the ``bin`` directory.
+  The owncloud binary will appear in the ``bin`` directory.

 Windows Installer Build (Cross-Compile)
---------------------------------------
+-----------------------

 Due to the large number of dependencies, building the client installer for Windows
 is **currently only officially supported on openSUSE**, by using the MinGW cross compiler.
@@ -135,38 +134,58 @@ have it installed already.

 To cross-compile:

-1. Add the following repository using YaST or ``zypper ar`` (adjust when using another openSUSE version)::
+1. Add the following repositories using YaST or ``zypper ar`` (adjust when using another openSUSE version)::

-    zypper ar https://build.opensuse.org/project/show/isv:ownCloud:toolchains:mingw:win32:stable
+    zypper ar http://download.opensuse.org/repositories/windows:/mingw/openSUSE_13.2/windows:mingw.repo
+    zypper ar http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_13.2/windows:mingw:win32.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 \
-                mingw32-cross-gcc-c++ mingw32-cross-pkg-config mingw32-filesystem \
-                mingw32-headers mingw32-runtime site-config mingw32-libwebp \
-                mingw32-cross-libqt5-qmake mingw32-cross-libqt5-qttools mingw32-libqt5*
+    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-cross-libqt5-qmake mingw32-cross-libqt5-qttools mingw32-libqt5* \
+                      mingw32-cross-nsis

 3. For the installer, install the NSIS installer package::

-    zypper install mingw32-cross-nsis mingw32-cross-nsis-plugin-uac mingw32-cross-nsis-plugin-nsprocess
+    zypper install mingw32-cross-nsis

-4. Follow the :ref:`generic-build-instructions`
+4. Install the following plugin::
+
+    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.
+
+5. Manually download and install the following files using ``rpm -ivh <package>``:
+
+  .. note:: These files also work for more recent openSUSE versions!
+
+  ::
+    # RPM depends on curl for installs from HTTP
+    zypper install curl
+
+    rpm -ivh 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 -ivh http://download.tomahawk-player.org/packman/mingw:32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-uac-0-3.1.x86_64.rpm
+
+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=../client/admin/win/Toolchain-mingw32-openSUSE.cmake``.

-5. Build by running ``make``.
+7. Build by running ``make``.

 .. note:: Using ``make package`` produces an NSIS-based installer, provided
    the NSIS mingw32 packages are installed.

-6. If you want to sign the installer, acquire a `Microsoft Authenticode`_ Certificate and install ``osslsigncode`` to sign the installer::
+8. If you want to sign the installer, acquire a `Microsoft Authenticode`_ Certificate and install ``osslsigncode`` to sign the installer::

    zypper install osslsigncode

-7. Sign the package::
+9. Sign the package::

    osslsigncode -pkcs12 $HOME/.codesign/packages.pfx -h sha1 \
               -pass yourpass \
@@ -176,12 +195,11 @@ To cross-compile:
               -in ${unsigned_file} \
               -out ${installer_file}

-   for ``-in``, use the URL to the time stamping server provided by your CA along with the Authenticode certificate. Alternatively,
+   for ``-in``, use URL to the time stamping server provided by your CA along with the Authenticode certificate. Alternatively,
   you may use the official Microsoft ``signtool`` utility on Microsoft Windows.


-.. _generic-build-instructions:
-
+.. _`generic build instructions`:
 Generic Build Instructions
 --------------------------

@@ -1,4 +1,4 @@
-The ownCloud Client reads a configuration file.  You can locate this configuration file as follows:
+The ownCloud Client reads a configuration file.  You can locate this configuration files as follows:

 On Linux distributions:
        ``$HOME/.local/share/data/ownCloud/owncloud.cfg``
@@ -9,7 +9,7 @@ Some files are continuously uploaded to the server, even when they are not modif

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

-If the file is uses the ``.eml`` extension, Windows automatically and
+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.
@@ -16,4 +16,5 @@ ownCloud Desktop Client Manual
   architecture
   troubleshooting
   faq
-   glossary
+   glossary 
+
@@ -16,7 +16,7 @@ Linux users must follow the instructions on the download page to add the
 appropriate repository for their Linux distribution, install the signing key, 
 and then use their package managers to install the desktop sync client. Linux 
 users will also update their sync clients via package manager, and the client 
-will display a notification when an update is available. 
+will display a notification when an update is available.

 Linux users must also have a password manager enabled, such as GNOME Keyring or
 KWallet, so that the sync client can login automatically.
@@ -24,92 +24,84 @@ KWallet, so that the sync client can login automatically.
 Improvements and New Features
 -----------------------------

-The 2.0 release of the ownCloud desktop sync client has many new features and 
-improvements.
+The 1.8 client has a number of enhancements and performance improvements, 
+including:

-  * Multi-account support
-  * Many UI improvements
-  * Accessibility improvements (high contrast schemes)
-  * Automatic Bandwidth Throttling
-  * Don't show redundant directory entries in activity log
-  * Remove deleted accounts properly from toolbar
-  * File manager integration: Show hidden files as ignored
-  * Show wizard when last account was deleted
-  * Do not sync down new big folders from server without user's consent
-  * Integrate Selective Sync into the default UI
-  * More reliable reconnect after timeout
-  * Use SI units for the file sizes
-  * Improve progress reporting during sync
-  * Sharing: Do not allow sharing the root folder
-  * Sharing: Show thumbnail
-  * Client Updater: Check for updates periodically, not only once per run
-  * Quota: Only refresh from server when UI is shown
-  * SSL Button: Show more information
-  * System proxy: Ask user for credentials if needed
-  * Several fixes and performance improvements in the sync engine
-  * OS X: Show file name in UI if file has invalid UTF-8 in file name 
-  * OS X: Support native finder integration for 10.10 Yosemite  
-  * Network: Try to use SSL session tickets/identifiers
-  * Windows: Support paths >255 characters
-  * Windows, OS X: Allow to not sync hidden files
-  * Windows: Remove misleading option to remove sync data
-  * Windows: Do not provoke Active Directory account locking if password changes
-  * Windows: Fix installer when installing unprivileged
+* Graphical selective sync file and folder selector. Select which files and 
+  folders to sync with just a few clicks.
+* Selective sync on account setup. Set up which files and folders you want to 
+  sync when you create a new ownCloud account.
+* File manager integration: share files from Windows Explorer, Mac OS X Finder, 
+  and Nautilus on Linux.
+* Faster uploads and downloads.

-.. note:: When you upgrade from 1.8, restart Windows to ensure that all new 
+.. note:: When you upgrade from 1.7, restart Windows to ensure that all new 
   features are visible.

-Installation Wizard
-------------------
+Installation
+------------

 The installation wizard takes you step-by-step through configuration options and 
-account setup. First you need to enter the URL of your ownCloud server.
+account setup. These examples are on Windows 7; note the new "Integration for 
+Windows Explorer Option". This allows Windows users to share files directly 
+from their local ownCloud folder in Windows Explorer, rather than having to 
+open a Web browser and share from the ownCloud Web interface. Mac users get the 
+same option for Finder, and Linux users for Nautilus. 

 .. image:: images/client1.png
-   :alt: form for entering ownCloud server URL
-   
-Enter your ownCloud login on the next screen.
+
+The next screen selects the installation folder for the client. The default is 
+fine; don't change this without a good reason.

 .. image:: images/client2.png
-   :alt: form for entering your ownCloud login

-On the Local Folder Option screen you may sync 
-all of your files on the ownCloud server, or select individual folders. The 
-default local sync folder is ``ownCloud``, in your home directory. You may 
-change this as well.
+In the next screen, enter your ownCloud server URL.

 .. image:: images/client3.png
-   :alt: Select which remote folders to sync, and which local folder to store 
-   them in.
-   
-When you have completed selecting your sync folders, click the Connect button 
-at the bottom right. The client will attempt to connect to your ownCloud 
-server, and when it is successful you'll see two buttons: one to connect to 
-your ownCloud Web GUI, and one to open your local folder. It will also start 
-synchronizing your files.
+
+If your ownCloud server has a self-signed SSL certificate, you will see a scary 
+warning. Check "Trust this certificate" and keep going.

 .. image:: images/client4.png
-   :alt: A successful server connection, showing a button to connect to your 
-   Web GUI, and one to open your local ownCloud folder

-Click the Finish button, and you're all done.   
-
-When you are in your local ownCloud folder, you can right-click any file or 
-folder, and then left-click "Share with ownCloud" to create a share link. Note 
-that Windows may also have a Share With option. This is not the ownCloud Share 
-option. Linux users must install the ``owncloud-client-nautilus`` package to 
-enable file sharing from the Nautilus file manager. The ownCloud share dialog 
-looks like the following example on Ubuntu Linux:
+On the next screen enter your ownCloud login and password.

 .. image:: images/client5.png
-   :alt: the ownCloud file share option is integrated into the normal 
-   right-click file menu in your file manager

-You may change your sync options at any time by opening your ownCloud client 
-and selecting which folders to sync, or to remove from synchronization.
-you saw in the installation wizard. **If you un-check any folders that 
-you have already synchronized, they will be deleted from your local system.**
+Now you can select while folders and files to sync, and the location of your 
+local ownCloud folder.

 .. image:: images/client6.png
-   :alt: Client dialogue to select different files to sync, or to remove from 
-   syncing
+
+When you check "Choose what to sync" it opens a file picker. Note the warning 
+at the top that unchecked folders will be removed from your local filesystem. 
+On a new installation, when you have not yet synced with your ownCloud server, 
+no files will be deleted.
+
+.. image:: images/client7.png
+
+In the next screen you may click to open ownCloud in a Web browser, or open 
+your local ownCloud folder. Open your local ownCloud folder so you can see how 
+file manager integration works.
+
+.. image:: images/client8.png
+
+When you are in your local ownCloud folder you can right-click any file or 
+folder, and then left-click "Share with ownCloud" to create a share link. Note that Windows
+may also have a Share With option. This is not the ownCloud Share option. The 
+ownCloud share dialog looks like the following example:
+
+.. image:: images/client9.png
+
+You have the same options for creating a link share as you do when you're 
+logged into the ownCloud Web GUI: you may optionally set a password and 
+expiration date.
+
+.. image:: images/client10.png
+
+You may change your sync options at any time by opening your ownCloud client 
+and clicking the "Choose what to sync" button. This opens the same file picker 
+you saw in the installation wizard. If you un-check any folders or files that 
+you have already synchronized they will be deleted.
+
+.. image:: images/client11.png
@@ -1,4 +1,3 @@
-============
 Introduction
 ============

@@ -14,4 +13,4 @@ and local PC.

 .. note:: Because of various technical issues, desktop sync clients older than 
   1.7 will not allowed to connect and sync with the ownCloud 8.1 server. It is 
-   highly recommended to keep your client updated.
+   highly recommended to keep your client updated.
@@ -1,4 +1,3 @@
-================================
 Using the Synchronization Client
 ================================

@@ -39,81 +38,245 @@ so you should click it to see what it has to tell you.
 The red circle with the white "x" indicates a configuration error, such as an 
 incorrect login or server URL.

-Using the Right-Click Menu
--------------------------
+Using the Desktop Client Menu
+-----------------------------

-A right-click on the icon opens a menu for quick access to multiple operations.
+A right-click on the icon opens the following menu:

 .. image:: images/menu.png
-   :alt: the right-click sync client menu
+
+**ownCloud Desktop Client menu**

 The Desktop Client menu provides the following options:

-* Open ownCloud in browser
-* Managed folder
-* Open folder [your local sync folder]
-* Up to date
-* Recent changes
-* Settings
-* Help
-* Log out
-* Quit ownCloud
+* ``Open ownCloud in browser``: Launches the ownCloud Web interface.
+* ``Open folder 'ownCloud'``: Opens your local ownCloud folder. If you have 
+    defined multiple synchronization targets, the window displays each local 
+    folder.
+* **Disk space indicator**: Indicates the amount of space currently used on the 
+  server.
+* **Operation indicator**: Displays the status of the current synchronization 
+  process or indicates ``Up to date`` if the server and client are in sync.
+* **Recent Changes**: Displays the last six files modified, and shows the 
+  current synchronization status listing all changes since the last restart of the 
+  ownCloud client.
+* ``Settings...``: The settings menu.
+* ``Help``: Opens a browser to display ownCloud Desktop Client Guide.
+* ``Sign out``: Stops synchronization.
+* ``Quit ownCloud``: Quits the ownCloud Client, ending any currently running
+  synchronizations.

 Using the Account Settings Window
 ---------------------------------

 .. index:: account settings, user, password, Server URL

-Click **Settings** in the right-click menu to see a summary of your ownCloud 
-account settings. This shows which ownCloud account you are connected to (or accounts, if you have more than one) your 
-quota status, and a window for managing your synchronization settings.
+The ``Account`` window provides a summary for your ownCloud account settings.  
+You can manage which folders and files you want to synchronize, change your 
+account settings, and pause and resume synchronization.

-.. image:: images/client6.png
-   :alt: Account settings window
+To access and modify the account settings:

-At the top of the window are tabs for each configured sync account, and three others for Activity, General and Network settings.
+.. image:: images/settings_account.png
+   :scale: 50 %

-The Activity window contains the log of your recent activities, including files 
-downloaded and deleted.
+The fields and options in this window include:

-The General window has configuration options such as Launch on **System 
-Startup**, **Use Monochrome Icons**, and **Show Desktop Notifications**. This 
-is where you will find the **Edit Ignored Files** button, to launch the ignored 
-files editor, and two new features: **Ask confirmation before downloading 
-folders larger than [folder size]**, and **Add an Account**. 
+* ``Connected to <ownCloud instance> as <user>`` field:  Your user account on an ownCloud 
+  server.

-Multi-Account Support
---------------------
+* ``Add Folder...`` button: Add another folder to the 
+  synchronization process (see ``Adding a Folder``).

-You may now configure multiple ownCloud accounts in your desktop sync client. 
-Simply click the **Add an Account** button on the General tab, and follow the 
-account creation wizard. The new account will appear as a new tab in the settings dialog, where you can adjust its settings at any time.
+* ``Pause/Resume`` button: Pauses the current sync (or prevents the client from 
+  starting a new sync), or resumes the sync process.
+
+* ``Remove`` button: Removes the selected folder from the sync process.  This 
+  button is used when you want to synchronize only a few folders and not the 
+  root folder. 
+
+* ``Storage Usage`` field: Displays how much space your files are using on the 
+   ownCloud server.
+
+* ``Edit Ignored Files`` button: Launches the Ignored Files Editor.
+
+* ``Modify Account`` button: Use this to change your ownCloud server settings 
+  by launching the account setup wizard (see :doc:`accountsetup`).
+* ``Modify Account`` button: Use this to change your ownCloud server settings 
+  by launching the account setup wizard (see :doc:`accountsetup`).
+
+Adding a Folder
+^^^^^^^^^^^^^^^
+
+The ``Add Folder ...`` button enables you to add a new local folder to the 
+synchronization process.
+
+To add a new folder:
+
+1. Click the ``Add a Folder ...`` button in the Account window.
+
+  The ``Add Folder...`` window opens
+
+.. image:: images/folderwizard_local.png
+
+2. Type a *unique* path and alias name to the folder, or use the ``Choose...`` 
+   button to open a graphical file picker.
+
+.. note:: Nested synchronizations are not supported.  You
+    cannot add a folder that is already contained within another synchronized
+    folder. In addition, you cannot add a higher level (parent) folder that
+    contains a folder to which you are already synchronizing.  By default, the
+    ownCloud Set Up Wizard synchronizes your entire ownCloud account to the root
+    folder of the ownCloud server. If you wish to sync certain specific folders and not 
+    the entire root, you must first remove the root folder.
+
+3. Click 'Next' to continue.
+
+  A window opens prompting you to select a remote destination folder on the
+  ownCloud server to synchronize.
+
+.. image:: images/folderwizard_remote.png
+
+4. Select a folder on the ownCloud server to which you want to synchronize your 
+   newly added local folder.
+
+.. note:: A server folder can only be synchronized with a particular client 
+  once. If you attempt to sync the root directory, you cannot sync with 
+  other folders on the server. Similarly, if you sync with folder ``/a``, you 
+  cannot create another sync with ``/a/b``, since ``b`` is already being 
+  synched.

 Editing Ignored Files
---------------------
+^^^^^^^^^^^^^^^^^^^^^

-The Ignored Files Editor can be opened by clicking on the button in the General tab of the settings dialog. The settings apply to all configured accounts. The :guilabel:`Ignored Files Editor` provides a list of  files that are ignored 
+The :guilabel:`Ignored Files Editor` provides a list of  files that are ignored 
 (that is, not synchronized) by the client and server during synchronizations. 
 You may add additional files or directories that you want to exclude from the 
 synchronization process. In addition to using standard characters, the Ignored 
 Files Editor enables you to use wild cards (for example, using an asterisk ‘*’ 
 to indicate multiple characters or a question mark ‘?’ to indicate a single 
-character). 
+character).

 For additional information see `Using the Ignored Files 
 Editor`_

-Using the Network Window
------------------------
+Using the Activity Settings Window
+----------------------------------
+
+.. index:: activity, recent changes, sync activity
+
+The Activity window provides an in-depth account of recent synchronization activity.  It 
+shows files that have not been synchronized because they are on the ignored files list, 
+or 
+because they cannot be synced due to containing special characters that cannot be stored 
+on certain file systems.
+
+.. image:: images/settings_activity.png
+
+You can open the Activity window in one of the following ways:
+
+- Click 'Activity' in the left frame of the ownCloud Settings window.
+
+- Invoke the window from the ownCloud Desktop Client menu by selecting ``Recent
+  Changes`` > ``Details...``.  (See Using the Desktop Client Menu.) 
+
+Using the General Settings Window
+---------------------------------
+
+.. index:: general settings, auto start, startup, desktop notifications
+
+The General settings window has options for launching the client at system 
+startup, notifications, and using monochrome icons.
+
+.. image:: images/settings_general.png
+
+* ``Launch on System Startup`` checkbox: Provides the option to check (enable)
+  or uncheck (disable) whether the ownCloud Desktop Client launches at system
+  startup.  By default, this option is enabled (checked) after you have configured
+  your account.
+
+* ``Show Desktop Nofications`` checkbox: Provides the option to check (enable)
+  or uncheck (disable) notifications about sync activity.
+
+* ``Use Monochrome Icons`` checkbox: Provides the option to check (enable) or
+   uncheck (disable) the use of monochrome (visually less obtrusive) icons.
+
+.. note:: This option can be useful on Mac OS X platforms.
+
+* ``About`` field: Provides information about the software authors along with
+  pertinent build conditions.
+
+.. note:: Information in this field can be valuable when submitting a support 
+   request.
+
+* ``Updates`` field: Notifies you of any available updates for the ownCloud Desktop 
+  Client.
+
+Using the Network Settings Window
+---------------------------------

 .. index:: proxy settings, SOCKS, bandwith, throttling, limiting

-The Network settings window enables you to define network proxy settings, and 
-also to limit download and upload bandwidth. New to version 2.0 is the option 
-for automatic bandwidth limits.
+The Network settings window enables you to define network proxy settings, and also to 
+limit download and upload bandwidth.

 .. image:: images/settings_network.png

+Specifying Proxy Settings
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* ``No Proxy`` option: Do not use a proxy.
+
+* ``Use system proxy`` option: Default setting. Follows the systems proxy
+  settings.
+
+* ``Specify proxy manually as`` option: Enables you to specify
+  the following custom proxy settings:
+
+  - ``HTTP(S)``: Used when you are required to use an HTTP(S) proxy server (for 
+  example, Squid or Microsoft Forefront TMG). 
+  
+  - ``SOCKSv5``: Typically used in special company LAN setups, or in 
+  combination with the OpenSSH dynamic application level forwarding feature 
+  (see ``ssh -D``).
+  
+  - ``Host``: Host name or IP address of the proxy server along with the port 
+  number. HTTP proxies typically listen over Ports 8080 (default) or 3128. 
+  SOCKS servers typically listen over port 1080.
+
+* ``Proxy Server requires authentication`` checkbox: Provides the option to 
+  check (enable/require) or uncheck (disable/not require) proxy server 
+  authentication. When not checked, the proxy server must be configured to 
+  allow anonymous usage. When checked, a proxy server username and password is 
+  required.
+
+Bandwidth Limiting
+^^^^^^^^^^^^^^^^^^
+
+Synchronization of files between a client and server can use a lot of
+bandwidth, so you can limit how much your ownCloud sync client uses.
+
+- ``No limit`` option: The default setting for the client; specifies that there
+  are no limit settings on the amount of data downloaded from the server. 
+
+- ``Limit to <value> KBytes/s`` option: Limits (throttles) the bandwidth to
+  a customized value (in KBytes/second).
+
+The Upload Bandwidth field (for data flowing from the ownCloud client to the
+server) provides the following options:
+
+- ``No limit`` option: The default setting for the client; specifies that there
+  are no limit settings on the amount of data downloaded from the server. 
+
+- ``Limit automatically``: When enabled, the ownCloud client surrenders
+  available bandwidth to other applications.  Use this option if there are
+  issues with real time communication (for example, the use of IP phone or live
+  streaming) in conjunction with the ownCloud Client.
+
+- ``Limit to <value> KBytes/s`` option: Limits (throttles) the bandwidth to a
+  customized value (in KBytes/second).
+
+
 .. _ignoredFilesEditor-label:

 Using the Ignored Files Editor
@@ -127,13 +290,13 @@ can use the *Ignored Files Editor*.

 .. image:: images/ignored_files_editor.png

-For your convenience, the editor is pre-populated with a default list of typical 
-ignore patterns. These patterns are contained in a system file (typically 
-``sync-exclude.lst``) located in the ownCloud Client application directory. You 
-cannot modify these pre-populated patterns directly from the editor. However, if 
-necessary, you can hover over any pattern in the list to show the path and 
-filename associated with that pattern, locate the file, and edit the 
-``sync-exclude.lst`` file.
+For your convenience, the editor is
+pre-populated with a default list of typical ignore patterns. These patterns
+are contained in a system file (typically ``sync-exclude.lst``) located in the
+ownCloud Client application directory. You cannot modify these pre-populated
+patterns directly from the editor. However, if necessary, you can hover over
+any pattern in the list to show the path and filename associated with that
+pattern, locate the file, and edit the ``sync-exclude.lst`` file.

 .. note:: Modifying the global exclude definition file might render the client
   unusable or result in undesired behavior.
@@ -45,9 +45,9 @@ Other command line switches supported by ``owncloudcmd`` include the following:
 Credential Handling
 ~~~~~~~~~~~~~~~~~~~

-``owncloudcmd`` uses the credentials of the GUI synchronization client.
-If no client is configured, or if you choose to use a different user to synchronize,
-you can specify the user
+By default, ``owncloudcmd`` reads the client configuration and uses the 
+credentials of the GUI synchronization client. If no client is configured, or if 
+you choose to use a different user to synchronize, you can specify the user 
 password setting with the usual URL pattern.  For example::

  $ owncloudcmd / https://carla:secret@server/owncloud/remote.php/webdav/
@@ -90,7 +90,7 @@ Other issues can affect synchronization of your ownCloud files:
 Log Files
 ---------

-Effectively debugging software requires as much relevant information as can be
+Effectively debugging software requires as much relative information as can be
 obtained.  To assist the ownCloud support personnel, please try to provide as
 many relevant logs as possible. Log output can help  with tracking down
 problems and, if you report a bug, log output can help to resolve an issue more
@@ -119,7 +119,7 @@ To obtain the client log file:

 5. Name the log file and click the 'Save' button.

-  The log file is saved in the location specifed.
+  The log files is saved in the location specifed.

 Alternatively, you can launch the ownCloud Log Output window using the
 ``--logwindow`` command. After issuing this command, the Log Output window
@@ -31,7 +31,7 @@ provides the following menu:
  since the last restart of ownCloud Client.
 * ``Settings...``: provides access to the settings menu.
 * ``Help``: Opens a browser to display this help.
-* ``Log out``: Logs the client out of the server.
+* ``Sign out``: Signs the client of of the server.
 * ``Quit ownCloud``: Quits ownCloud Client, ending a currently running
  sync run.

@@ -7,4 +7,3 @@ Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
@@ -179,8 +179,8 @@ static OwnCloudFinderContentManager* sharedInstance = nil;
 {
 	//NSLog(@"%@", NSStringFromSelector(_cmd));

-	// We won't request the new state if it finds the path in _fileNamesCache
-	// Move all entries to _oldFileNamesCache so that they get re-requested, but
+	// We won't request the new state if if finds the path in _fileNamesCache
+	// Move all entries to _oldFileNamesCache so that the get re-requested, but
 	// still available while we refill the cache
 	[_oldFileNamesCache addEntriesFromDictionary:_fileNamesCache];
 	[_fileNamesCache removeAllObjects];
@@ -12,7 +12,7 @@
 		692C18A516660C4700BF6A53 /* ContextMenuHandlers.m in Sources */ = {isa = PBXBuildFile; fileRef = 692C18A416660C4600BF6A53 /* ContextMenuHandlers.m */; };
 		692C18A9166617F500BF6A53 /* IconOverlayHandlers.m in Sources */ = {isa = PBXBuildFile; fileRef = 692C18A8166617F500BF6A53 /* IconOverlayHandlers.m */; };
 		692C18AC1666392700BF6A53 /* MenuManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 692C18AB1666392700BF6A53 /* MenuManager.m */; };
-		6993878616494C000044E4DF /* RequestManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6993878516494C000044E4DF /* RequestManager.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
+		6993878616494C000044E4DF /* RequestManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6993878516494C000044E4DF /* RequestManager.m */; };
 		69948B361636D50E0093B6CE /* ContentManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 69948B351636D50E0093B6CE /* ContentManager.m */; };
 		8C37DD9F161593BD00016A95 /* FinderHook.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C37DD9A161593BD00016A95 /* FinderHook.m */; };
 		8C37DDB2161593FF00016A95 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C37DDB1161593FF00016A95 /* Cocoa.framework */; };
@@ -49,7 +49,11 @@ static OwnCloudFinderRequestManager* sharedInstance = nil;

 - (void)dealloc
 {
+	[_syncClientProxy release];
+
 	sharedInstance = nil;
+
+	[super dealloc];
 }

 + (OwnCloudFinderRequestManager*)sharedInstance
@@ -132,11 +136,12 @@ static OwnCloudFinderRequestManager* sharedInstance = nil;
 {
 	// NSLog(@"Socket DISconnected! %@", [err localizedDescription]);

-	// clear the registered paths.
+	// clear the registered pathes.
+	[_registeredPathes release];
 	_registeredPathes = [[NSMutableDictionary alloc] init];
 	[_requestedPaths removeAllObjects];

-    // clear the caches in content manager
+    // clear the caches in conent manager
 	OwnCloudFinderContentManager *contentman = [OwnCloudFinderContentManager sharedInstance];
 	[contentman clearFileNameCache];
 	[contentman repaintAllWindows];
@@ -11,7 +11,7 @@

 EXPORT OSErr HandleLoadEvent(const AppleEvent* ev, AppleEvent* reply, long refcon);

-static NSString* globalLock = @"I'm the global lock to prevent concurrent handler executions";
+static NSString* globalLock = @"I'm the global lock to prevent concruent handler executions";

 // SIMBL-compatible interface
@interface OwnCloudShell : NSObject { }
@@ -72,7 +72,7 @@
 	_remoteEnd = (NSDistantObject <ChannelProtocol> *)tx;
 	[_remoteEnd setProtocolForProxy:@protocol(ChannelProtocol)];

-	// Everything is set up, start querying
+	// Everything is set up, start querrying
 	[self askOnSocket:@"" query:@"SHARE_MENU_TITLE"];
 }

@@ -1,7 +1,7 @@


 - The patch 0001-KOverlayIconPlugin.patch should be applied to kde-baseapps git repository
-(It should apply to both KDE/4.14 or Applications/14.12 branches)
+(It should applies to both KDE/4.14 or Applications/14.12 branches)

 - Recompile and install dolphin

@@ -10,7 +10,7 @@
 - After installing, run
    kdeinit4 --noincremental

- To test that the plugin is well installed
+- To test taht the plugin is well installed
    ktraderclient --servicetype KOverlayIconPlugin
  It should show the Owncloud plugin

@@ -1,7 +1,7 @@


 - The patch 0001-KOverlayIconPlugin.patch should be applied to kde-baseapps git repository
-(It should apply to frameworks branch)
+(It should applies to frameworks branch)

 - Recompile and install dolphin (frameworks branch)

@@ -157,18 +157,10 @@ class MenuExtension(GObject.GObject, Nautilus.MenuProvider):
        # internal or external file?!
        syncedFile = False
        for reg_path in socketConnect.registered_paths:
-            topLevelFolder=False
            filename = get_local_path(file.get_uri())
-            #check if its a folder (ends with an /), if yes add a "/" otherwise it will not find the entry in the table
-            if os.path.isdir(filename+"/"):
-                filename=filename+"/"
-                #check if toplevel folder, we need to ignore those as they cannot be shared
-                if filename.count("/") < (reg_path.count("/")+2):
-                    topLevelFolder=True                
            # only show the menu extension if the file is synced and the sync
            # status is ok. Not for ignored files etc.
-            # ignore top level folders
-            if filename.startswith(reg_path) and topLevelFolder == False and socketConnect.nautilusVFSFile_table[filename]['state'] == 'OK':
+            if filename.startswith(reg_path) and socketConnect.nautilusVFSFile_table[filename]['state'] == 'OK':
                syncedFile = True

        # if it is neither in a synced folder or is a directory
@@ -225,7 +217,7 @@ class SyncStateExtension(GObject.GObject, Nautilus.ColumnProvider, Nautilus.Info
            for item in update_items:
                item.invalidate_extension_info()

-    # Handles a single line of server response and sets the emblem
+    # Handles a single line of server respoonse and sets the emblem
    def handle_commands(self, action, args):
        Emblems = { 'OK'        : appname +'_ok',
                    'SYNC'      : appname +'_sync',
@@ -24,7 +24,7 @@

 #define OVERLAY_GENERIC_NAME        L"OC Overlay Handler"

-// two spaces to put us ahead of the competition :/
+// two spaces to put us a head of the competition :/
 #define OVERLAY_NAME_ERROR			L"  OCError"
 #define OVERLAY_NAME_ERROR_SHARED	L"  OCErrorShared"
 #define OVERLAY_NAME_OK				L"  OCOK"
@@ -45,7 +45,7 @@ endif()
 if(BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY)
   get_target_property (QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
   install(CODE "
-    message(STATUS \"Deploying (Qt) dependencies and fixing library paths...\")
+    message(STATUS \"Deploying (Qt) dependencies and fixing library pathes...\")
    execute_process(COMMAND \"${CMAKE_SOURCE_DIR}/admin/osx/macdeployqt.py\" ${CMAKE_INSTALL_PREFIX}/${OWNCLOUD_OSX_BUNDLE} ${QT_QMAKE_EXECUTABLE})
    " COMPONENT RUNTIME)
 endif()
@@ -150,7 +150,7 @@ void help()
    std::cout << "                         Proxy is http://server:port" << std::endl;
    std::cout << "  --trust                Trust the SSL certification." << std::endl;
    std::cout << "  --exclude [file]       Exclude list file" << std::endl;
-    std::cout << "  --unsyncedfolders [file]    File containing the list of unsynced folders (selective sync)" << std::endl;
+    std::cout << "  --unsyncedfolders [file]    File containing the list of unsynced folder (selective sync)" << std::endl;
    std::cout << "  --user, -u [name]      Use [name] as the login name" << std::endl;
    std::cout << "  --password, -p [pass]  Use [pass] as password" << std::endl;
    std::cout << "  -n                     Use netrc (5) for login" << std::endl;
@@ -185,7 +185,15 @@ void parseOptions( const QStringList& app_args, CmdOptions *options )
    }

    options->target_url = args.takeLast();
-
+    // check if the remote.php/webdav tail was added and append if not.
+    if(!options->target_url.endsWith("/")) {
+        options->target_url.append("/");
+    }
+    if( !options->target_url.contains("remote.php/webdav/")) {
+        options->target_url.append("remote.php/webdav/");
+    }
+    if (options->target_url.startsWith("http"))
+        options->target_url.replace(0, 4, "owncloud");
    options->source_dir = args.takeLast();
    if (!options->source_dir.endsWith('/')) {
        options->source_dir.append('/');
@@ -272,21 +280,6 @@ int main(int argc, char **argv) {

    parseOptions( app.arguments(), &options );

-    AccountPtr account = Account::create();
-
-    if( !account ) {
-        qFatal("Could not initialize account!");
-        return EXIT_FAILURE;
-    }
-    // check if the webDAV path was added to the url and append if not.
-    if(!options.target_url.endsWith("/")) {
-        options.target_url.append("/");
-    }
-    if( !options.target_url.contains( account->davPath() )) {
-        options.target_url.append(account->davPath());
-    }
-    if (options.target_url.startsWith("http"))
-        options.target_url.replace(0, 4, "owncloud");
    QUrl url = QUrl::fromUserInput(options.target_url);

    // Order of retrieval attempt (later attempts override earlier ones):
@@ -338,6 +331,8 @@ int main(int argc, char **argv) {
    // take the unmodified url to pass to csync_create()
    QByteArray remUrl = options.target_url.toUtf8();

+    AccountPtr account = Account::create();
+
    // Find the folder and the original owncloud url
    QStringList splitted = url.path().split(account->davPath());
    url.setPath(splitted.value(0));
@@ -448,7 +443,7 @@ restart_sync:


    if (loadedSystemExcludeList != 0 && loadedUserExcludeList != 0) {
-        // Always make sure at least one list has been loaded
+        // Always make sure at least one list had been loaded
        qFatal("Cannot load system exclude list or list supplied via --exclude");
        return EXIT_FAILURE;
    }
@@ -58,7 +58,7 @@ if(NOT BUILD_LIBRARIES_ONLY)
    if(BUILD_OWNCLOUD_OSX_BUNDLE)
       get_target_property (QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
       install(CODE "
-        message(STATUS \"Deploying (Qt) dependencies and fixing library paths...\")
+        message(STATUS \"Deploying (Qt) dependencies and fixing library pathes...\")
        execute_process(COMMAND \"${CMAKE_SOURCE_DIR}/admin/osx/macdeployqt.py\" ${CMAKE_INSTALL_PREFIX}/${OWNCLOUD_OSX_BUNDLE} ${QT_QMAKE_EXECUTABLE})
        " COMPONENT RUNTIME)
    endif()
@@ -62,6 +62,7 @@ set(client_SRCS
    sslerrordialog.cpp
    syncrunfilelog.cpp
    systray.cpp
+    accountmigrator.cpp
    quotainfo.cpp
    accountstate.cpp
    addcertificatedialog.cpp
@@ -29,7 +29,6 @@ static const char userC[] = "user";
 static const char httpUserC[] = "http_user";
 static const char caCertsKeyC[] = "CaCertificates";
 static const char accountsC[] = "Accounts";
-static const char versionC[] = "version";
 }


@@ -46,8 +45,7 @@ bool AccountManager::restore()
    auto settings = Account::settingsWithGroup(QLatin1String(accountsC));

    // If there are no accounts, check the old format.
-    if (settings->childGroups().isEmpty()
-            && !settings->contains(QLatin1String(versionC))) {
+    if (settings->childGroups().isEmpty()) {
        return restoreFromLegacySettings();
    }

@@ -124,15 +122,11 @@ bool AccountManager::restoreFromLegacySettings()
 void AccountManager::save(bool saveCredentials)
 {
    auto settings = Account::settingsWithGroup(QLatin1String(accountsC));
-    settings->setValue(QLatin1String(versionC), 2);
    foreach (const auto &acc, _accounts) {
        settings->beginGroup(acc->account()->id());
        save(acc->account(), *settings, saveCredentials);
        settings->endGroup();
    }
-
-    settings->sync();
-    qDebug() << "Saved all account settings, status:" << settings->status();
 }

 void AccountManager::wantsAccountSavedSlot(AccountPtr a)
@@ -142,9 +136,6 @@ void AccountManager::wantsAccountSavedSlot(AccountPtr a)
    settings->beginGroup(a->id());
    save(a, *settings, false); // don't save credentials they might not have been loaded yet
    settings->endGroup();
-
-    settings->sync();
-    qDebug() << "Saved account settings, status:" << settings->status();
 }

 void AccountManager::save(const AccountPtr& acc, QSettings& settings, bool saveCredentials)
@@ -167,6 +158,7 @@ void AccountManager::save(const AccountPtr& acc, QSettings& settings, bool saveC
        if (acc->_settingsMap.contains(httpUserC))
            settings.setValue(userC, acc->_settingsMap.value(httpUserC));
    }
+    settings.sync();

    // Save accepted certificates.
    settings.beginGroup(QLatin1String("General"));
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) by Klaas Freitag <freitag@owncloud.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#include "accountmigrator.h"
+#include "configfile.h"
+#include "folderman.h"
+#include "theme.h"
+
+
+#include <QSettings>
+#include <QStringList>
+#include <QDir>
+#include <QFileInfo>
+#include <QDebug>
+
+namespace OCC {
+
+// The purpose of this class is to migrate an existing account that
+// was set up with an unbranded client to an branded one.
+// The usecase is: Usually people try first with the community client,
+// later they maybe switch to a branded client. When they install the
+// branded client first, it should automatically pick the information
+// from the already configured account.
+
+AccountMigrator::AccountMigrator()
+{
+
+}
+
+// the list of folder definitions which are files in the directory "folders"
+// underneath the ownCloud configPath (with ownCloud as a last segment)
+// need to be copied to the themed path and adjusted.
+
+QStringList AccountMigrator::migrateFolderDefinitons()
+{
+    ConfigFile cfg;
+    QStringList re;
+
+    QString themePath = cfg.configPath();
+    // create the original ownCloud config path out of the theme path
+    // by removing the theme folder and append ownCloud.
+    QString oCPath = themePath;
+    if( oCPath.endsWith(QLatin1Char('/')) ) {
+        oCPath.truncate( oCPath.length()-1 );
+    }
+    oCPath = oCPath.left( oCPath.lastIndexOf('/'));
+
+    themePath += QLatin1String( "folders");
+    oCPath += QLatin1String( "/ownCloud/folders" );
+
+    qDebug() << "Migrator: theme-path: " << themePath;
+    qDebug() << "Migrator: ownCloud path: " << oCPath;
+
+    // get a dir listing of the ownCloud folder definitions and copy
+    // them over to the theme dir
+    QDir oCDir(oCPath);
+    oCDir.setFilter( QDir::Files );
+    QStringList files = oCDir.entryList();
+
+    foreach( const QString& file, files ) {
+        QString escapedAlias = FolderMan::instance()->escapeAlias(file);
+        QString themeFile = themePath + QDir::separator() + file;
+        QString oCFile = oCPath+QDir::separator()+file;
+        if( QFile::copy( oCFile, themeFile ) ) {
+            re.append(file);
+            qDebug() << "Migrator: Folder definition migrated: " << file;
+
+            // fix the connection entry of the folder definition
+            QSettings settings(themeFile, QSettings::IniFormat);
+            settings.beginGroup( escapedAlias );
+            settings.setValue(QLatin1String("connection"),  Theme::instance()->appName());
+            settings.sync();
+        }
+    }
+
+    return re;
+}
+
+}
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) by Klaas Freitag <freitag@owncloud.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#ifndef ACCOUNTMIGRATOR_H
+#define ACCOUNTMIGRATOR_H
+
+#include <QStringList>
+
+namespace OCC {
+
+/**
+ * @brief The AccountSettings class
+ * @ingroup gui
+ */
+class AccountMigrator {
+
+public:
+    explicit AccountMigrator();
+
+    /**
+     * @brief migrateFolderDefinitons - migrate the folder definition files
+     * @return the list of migrated folder definitions
+     */
+    QStringList migrateFolderDefinitons();
+
+};
+}
+
+#endif // ACCOUNTMIGRATOR_H
@@ -112,6 +112,19 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent) :
    QColor color = palette().highlight().color();
    ui->quotaProgressBar->setStyleSheet(QString::fromLatin1(progressBarStyleC).arg(color.name()));

+    QFont smallFont = ui->quotaInfoLabel->font();
+    smallFont.setPointSize(smallFont.pointSize() * 0.8);
+    ui->quotaInfoLabel->setFont(smallFont);
+
+    _quotaLabel = new QLabel(ui->quotaProgressBar);
+    QVBoxLayout *quotaProgressLayout = new QVBoxLayout(ui->quotaProgressBar);
+    quotaProgressLayout->setContentsMargins(-1,0,-1,0);
+    quotaProgressLayout->setSpacing(0);
+    quotaProgressLayout->addWidget(_quotaLabel);
+
+    // This ensures the progress bar is big enough for the label.
+    ui->quotaProgressBar->setMinimumHeight(_quotaLabel->height());
+
    ui->connectLabel->setText(tr("No account configured."));

    connect(_accountState, SIGNAL(stateChanged(int)), SLOT(slotAccountStateChanged(int)));
@@ -122,15 +135,6 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent) :

    connect(ui->deleteButton, SIGNAL(clicked()) , this, SLOT(slotDeleteAccount()));

-    // Expand already on single click
-    ui->_folderList->setExpandsOnDoubleClick(false);
-    QObject::connect(ui->_folderList, SIGNAL(clicked(const QModelIndex &)),
-        ui->_folderList, SLOT(expand(const QModelIndex &)));
-}
-
-void AccountSettings::doExpand()
-{
-    ui->_folderList->expandToDepth(0);
 }

 void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos)
@@ -153,11 +157,9 @@ void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos)
    menu->setAttribute(Qt::WA_DeleteOnClose);
    connect(menu->addAction(tr("Open folder")), SIGNAL(triggered(bool)),
            this, SLOT(slotOpenCurrentFolder()));
-    connect(menu->addAction(tr("Choose What to Sync")), SIGNAL(triggered(bool)),
-            this, SLOT(doExpand()));
    connect(menu->addAction(folderPaused ? tr("Resume sync") : tr("Pause sync")), SIGNAL(triggered(bool)),
            this, SLOT(slotEnableCurrentFolder()));
-    connect(menu->addAction(tr("Remove sync")), SIGNAL(triggered(bool)),
+    connect(menu->addAction(tr("Remove folder")), SIGNAL(triggered(bool)),
            this, SLOT(slotRemoveCurrentFolder()));
    menu->exec(tv->mapToGlobal(pos));
 }
@@ -201,8 +203,7 @@ void AccountSettings::slotFolderWizardAccepted()

    FolderDefinition definition;
    definition.alias        = folderWizard->field(QLatin1String("alias")).toString();
-    definition.localPath    = FolderDefinition::prepareLocalPath(
-            folderWizard->field(QLatin1String("sourceFolder")).toString());
+    definition.localPath    = folderWizard->field(QLatin1String("sourceFolder")).toString();
    definition.targetPath   = folderWizard->property("targetPath").toString();

    {
@@ -257,18 +258,14 @@ void AccountSettings::slotRemoveCurrentFolder()
        QString alias = _model->data( selected, FolderStatusDelegate::FolderAliasRole ).toString();
        qDebug() << "Remove Folder alias " << alias;
        if( !alias.isEmpty() ) {
-            QMessageBox messageBox(QMessageBox::Question,
-                                   tr("Confirm Sync Removal"),
-                                   tr("<p>Do you really want to stop syncing the folder <i>%1</i>?</p>"
-                                      "<p><b>Note:</b> This will <b>not</b> delete any files.</p>").arg(alias),
-                                   QMessageBox::NoButton,
-                                   this);
-            QPushButton* yesButton =
-                    messageBox.addButton(tr("Stop syncing"), QMessageBox::YesRole);
-            messageBox.addButton(tr("Cancel"), QMessageBox::NoRole);
+            // remove from file system through folder man
+            // _model->removeRow( selected.row() );
+            int ret = QMessageBox::question( this, tr("Confirm Folder Remove"),
+                                             tr("<p>Do you really want to stop syncing the folder <i>%1</i>?</p>"
+                                                "<p><b>Note:</b> This will not remove the files from your client.</p>").arg(alias),
+                                             QMessageBox::Yes|QMessageBox::No );

-            messageBox.exec();
-            if (messageBox.clickedButton() != yesButton) {
+            if( ret == QMessageBox::No ) {
                return;
            }

@@ -299,10 +296,9 @@ void AccountSettings::slotResetCurrentFolder()
                                         QMessageBox::Yes|QMessageBox::No );
        if( ret == QMessageBox::Yes ) {
            FolderMan *folderMan = FolderMan::instance();
-            if(Folder *f = folderMan->folder(alias)) {
-                f->slotTerminateSync();
-                f->wipe();
-            }
+            Folder *f = folderMan->folder(alias);
+            f->slotTerminateSync();
+            f->wipe();
            folderMan->slotScheduleAllFolders();
        }
    }
@@ -419,22 +415,25 @@ void AccountSettings::slotOpenOC()
 void AccountSettings::slotUpdateQuota(qint64 total, qint64 used)
 {
    if( total > 0 ) {
+        ui->storageGroupBox->setVisible(true);
        ui->quotaProgressBar->setVisible(true);
+        ui->quotaInfoLabel->setVisible(true);
        ui->quotaProgressBar->setEnabled(true);
        // workaround the label only accepting ints (which may be only 32 bit wide)
-        const double percent = used/(double)total*100;
-        const int percentInt = qMin(qRound(percent), 100);
-        ui->quotaProgressBar->setValue(percentInt);
+        ui->quotaProgressBar->setMaximum(100);
+        int qVal = qRound(used/(double)total * 100);
+        if( qVal > 100 ) qVal = 100;
+        ui->quotaProgressBar->setValue(qVal);
        QString usedStr = Utility::octetsToString(used);
        QString totalStr = Utility::octetsToString(total);
+        double percent = used/(double)total*100;
        QString percentStr = Utility::compactFormatDouble(percent, 1);
-        QString toolTip = tr("%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.").arg(usedStr, totalStr, percentStr);
-        ui->quotaInfoLabel->setText(tr("%1 of %2 in use").arg(usedStr, totalStr));
-        ui->quotaInfoLabel->setToolTip(toolTip);
-        ui->quotaProgressBar->setToolTip(toolTip);
+        _quotaLabel->setText(tr("%1 (%3%) of %2 server space in use.").arg(usedStr, totalStr, percentStr));
    } else {
-        ui->quotaProgressBar->setVisible(false);
-        ui->quotaInfoLabel->setText(tr("Currently there is no storage usage information available."));
+        ui->storageGroupBox->setVisible(false);
+        ui->quotaInfoLabel->setVisible(false);
+        ui->quotaProgressBar->setMaximum(0);
+        _quotaLabel->setText(tr("Currently there is no storage usage information available."));
    }
 }

@@ -488,21 +487,15 @@ void AccountSettings::refreshSelectiveSyncStatus()
    }

    foreach (Folder *folder, FolderMan::instance()->map().values()) {
-        if (folder->accountState() != _accountState) {
-            continue;
-        }
-
+        if (folder->accountState() != _accountState) { continue; }
        auto undecidedList =  folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncUndecidedList);
        foreach(const auto &it, undecidedList) {
-            undecidedFolder.append(it);
+            undecidedFolder += ( folder->alias() + QLatin1String("/") + it);
        }
    }
-
    if (undecidedFolder.isEmpty()) {
-        ui->selectiveSyncNotification->setVisible(false);
        ui->selectiveSyncNotification->setText(QString());
    } else {
-        ui->selectiveSyncNotification->setVisible(true);
        ui->selectiveSyncNotification->setText(
            tr("There are new folders that were not synchronized because they are too big: %1")
                .arg(undecidedFolder.join(tr(", "))));
@@ -510,6 +503,7 @@ void AccountSettings::refreshSelectiveSyncStatus()
    }

    ui->selectiveSyncApply->setEnabled(_model->isDirty() || !undecidedFolder.isEmpty());
+    ui->selectiveSyncCancel->setEnabled(_model->isDirty());
    bool wasVisible = !ui->selectiveSyncStatus->isHidden();
    if (wasVisible != shouldBeVisible) {
        QSize hint = ui->selectiveSyncStatus->sizeHint();
@@ -528,24 +522,14 @@ void AccountSettings::refreshSelectiveSyncStatus()

 void AccountSettings::slotDeleteAccount()
 {
-    // Deleting the account potentially deletes 'this', so
-    // the QMessageBox should be destroyed before that happens.
-    {
-        QMessageBox messageBox(QMessageBox::Question,
-                               tr("Confirm Account Removal"),
-                               tr("<p>Do you really want to remove the connection to the account <i>%1</i>?</p>"
-                                  "<p><b>Note:</b> This will <b>not</b> delete any files.</p>")
-                                 .arg(_accountState->account()->displayName()),
-                               QMessageBox::NoButton,
-                               this);
-        QPushButton* yesButton =
-                messageBox.addButton(tr("Remove connection"), QMessageBox::YesRole);
-        messageBox.addButton(tr("Cancel"), QMessageBox::NoRole);
+    int ret = QMessageBox::question( this, tr("Confirm Account Delete"),
+                                     tr("<p>Do you really want to delete the account <i>%1</i>?</p>"
+                                     "<p><b>Note:</b> This will not remove the files from your client.</p>")
+                                        .arg(_accountState->account()->displayName()),
+                                     QMessageBox::Yes|QMessageBox::No );

-        messageBox.exec();
-        if (messageBox.clickedButton() != yesButton) {
-            return;
-        }
+    if( ret == QMessageBox::No ) {
+        return;
    }

    auto manager = AccountManager::instance();
@@ -80,7 +80,6 @@ protected slots:
    void slotDeleteAccount();
    void refreshSelectiveSyncStatus();
    void slotCustomContextMenuRequested(const QPoint&);
-    void doExpand();

 private:
    void showConnectionLabel(const QString& message,
@@ -93,6 +92,7 @@ private:
    QUrl   _OCUrl;
    bool _wasDisabledBefore;
    AccountState *_accountState;
+    QLabel *_quotaLabel;
    QuotaInfo _quotaInfo;
 };

@@ -17,18 +17,6 @@
   <item>
    <widget class="QWidget" name="accountStatus" native="true">
     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
      <item>
       <widget class="SslButton" name="sslButton">
        <property name="sizePolicy">
@@ -73,7 +61,7 @@
         <string>Remove the account configuration from the client</string>
        </property>
        <property name="text">
-         <string>Remove Account</string>
+         <string>Delete</string>
        </property>
       </widget>
      </item>
@@ -81,55 +69,51 @@
    </widget>
   </item>
   <item>
-    <layout class="QHBoxLayout" name="storageGroupBox">
-     <item>
-      <widget class="QLabel" name="quotaInfoLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="toolTip">
-        <string/>
-       </property>
-       <property name="text">
-        <string>Storage space: ...</string>
-       </property>
-       <property name="wordWrap">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QProgressBar" name="quotaProgressBar">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>7</height>
-        </size>
-       </property>
-       <property name="maximum">
-        <number>100</number>
-       </property>
-       <property name="value">
-        <number>-1</number>
-       </property>
-       <property name="textVisible">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QGroupBox" name="storageGroupBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string/>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QProgressBar" name="quotaProgressBar">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="maximum">
+         <number>0</number>
+        </property>
+        <property name="value">
+         <number>-1</number>
+        </property>
+        <property name="textVisible">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="quotaInfoLabel">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Some folders, including network mounted or shared folders, might have different limits.</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
   </item>
   <item>
    <widget class="QTreeView" name="_folderList">
@@ -152,8 +136,14 @@
   </item>
   <item>
    <widget class="QWidget" name="selectiveSyncStatus" native="true">
-     <layout class="QHBoxLayout" name="horizontalLayout_3">
-      <item>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0" rowspan="2">
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
         <widget class="QLabel" name="selectiveSyncLabel">
@@ -186,20 +176,7 @@
        </item>
       </layout>
      </item>
-      <item>
-       <widget class="QPushButton" name="selectiveSyncCancel">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Cancel</string>
-        </property>
-       </widget>
-      </item>
-      <item>
+      <item row="0" column="1">
       <widget class="QPushButton" name="selectiveSyncApply">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
@@ -212,6 +189,19 @@
        </property>
       </widget>
      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="selectiveSyncCancel">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Cancel</string>
+        </property>
+       </widget>
+      </item>
     </layout>
    </widget>
   </item>
@@ -18,7 +18,6 @@

 #include <QDebug>
 #include <QSettings>
-#include <qfontmetrics.h>

 namespace OCC {

@@ -253,22 +252,24 @@ std::unique_ptr<QSettings> AccountState::settings()
    return s;
 }

-QString AccountState::shortDisplayNameForSettings(int width) const
+QString AccountState::shortDisplayNameForSettings() const
 {
-    QString user = account()->credentials()->user();
-    QString host = account()->url().host();
-    int port = account()->url().port();
-    if (port > 0 && port != 80 && port != 443) {
-        host.append(QLatin1Char(':'));
-        host.append(QString::number(port));
+    QString userWithoutMailHost = account()->credentials()->user();
+    if (userWithoutMailHost.contains('@')) {
+        userWithoutMailHost = userWithoutMailHost.left(userWithoutMailHost.lastIndexOf('@'));
    }
-    if (width > 0) {
-        QFont f;
-        QFontMetrics fm(f);
-        host = fm.elidedText(host, Qt::ElideMiddle, width);
-        user = fm.elidedText(user, Qt::ElideRight, width);
+    QString hostWithoutTld = account()->url().host();
+    if (hostWithoutTld.contains('.') && !hostWithoutTld.at(0).isDigit()) {
+        hostWithoutTld = hostWithoutTld.left(hostWithoutTld.lastIndexOf('.'));
+        hostWithoutTld = hostWithoutTld.replace(QLatin1String("www."), QLatin1String(""));
+        hostWithoutTld = hostWithoutTld.replace(QLatin1String("cloud."), QLatin1String(""));
+        hostWithoutTld = hostWithoutTld.replace(QLatin1String("sync."), QLatin1String(""));
+        hostWithoutTld = hostWithoutTld.replace(QLatin1String("drive."), QLatin1String(""));
+        hostWithoutTld = hostWithoutTld.replace(QLatin1String("share."), QLatin1String(""));
+        hostWithoutTld = hostWithoutTld.replace(QLatin1String("web."), QLatin1String(""));
    }
-    return user + QLatin1String("\n") + host;
+
+    return userWithoutMailHost + QLatin1String("\n") + hostWithoutTld;
 }


@@ -89,10 +89,8 @@ public:
    /** Returns a new settings object for this account, already in the right groups. */
    std::unique_ptr<QSettings> settings();

-    /** display name with two lines that is displayed in the settings
-     * If width is bigger than 0, the string will be ellided so it does not exceed that width
-     */
-    QString shortDisplayNameForSettings(int width = 0) const;
+    /** display name with two lines that is displayed in the settings  */
+    QString shortDisplayNameForSettings() const;

 private:
    void setState(State state);
@@ -62,21 +62,15 @@ static const char optionsC[] =
        "  --logwindow          : open a window to show log output.\n"
        "  --logfile <filename> : write log output to file <filename>.\n"
        "  --logdir <name>      : write each sync log output in a new file\n"
-        "                         in folder <name>.\n"
+        "                         in directory <name>.\n"
        "  --logexpire <hours>  : removes logs older than <hours> hours.\n"
        "                         (to be used with --logdir)\n"
        "  --logflush           : flush the log file after every write.\n"
-        "  --confdir <dirname>  : Use the given configuration folder.\n"
+        "  --confdir <dirname>  : Use the given configuration directory.\n"
        ;

 QString applicationTrPath()
 {
-    QString devTrPath = qApp->applicationDirPath() + QString::fromLatin1("/../src/gui/");
-    if (QDir(devTrPath).exists()) {
-        // might miss Qt, QtKeyChain, etc.
-        qDebug() << "Running from build location! Translations may be incomplete!";
-        return devTrPath;
-    }
 #if defined(Q_OS_WIN)
   return QApplication::applicationDirPath();
 #elif defined(Q_OS_MAC)
@@ -235,7 +229,7 @@ void Application::slotCheckConnection()

    if (list.isEmpty()) {
        // let gui open the setup wizard
-        _gui->slotOpenSettingsDialog();
+        _gui->slotOpenSettingsDialog( true );

        _checkConnectionTimer.stop(); // don't popup the wizard on interval;
    }
@@ -168,7 +168,7 @@ void Folder::checkLocalPath()
            _syncResult.setErrorString(tr("Local folder %1 does not exist.").arg(_definition.localPath));
            _syncResult.setStatus( SyncResult::SetupError );
        } else if( !fi.isDir() ) {
-            _syncResult.setErrorString(tr("%1 should be a folder but is not.").arg(_definition.localPath));
+            _syncResult.setErrorString(tr("%1 should be a directory but is not.").arg(_definition.localPath));
            _syncResult.setStatus( SyncResult::SetupError );
        } else if( !fi.isReadable() ) {
            _syncResult.setErrorString(tr("%1 is not readable.").arg(_definition.localPath));
@@ -441,11 +441,9 @@ void Folder::bubbleUpSyncResult()
                    break;
                case CSYNC_INSTRUCTION_CONFLICT:
                case CSYNC_INSTRUCTION_SYNC:
-                    if (!item->_isDirectory) {
-                        updatedItems++;
-                        if (!firstItemUpdated)
-                            firstItemUpdated = item;
-                    }
+                    updatedItems++;
+                    if (!firstItemUpdated)
+                        firstItemUpdated = item;
                    break;
                case CSYNC_INSTRUCTION_ERROR:
                    qDebug() << "Got Instruction ERROR. " << _syncResult.errorString();
@@ -693,9 +691,6 @@ void Folder::saveToSettings() const
    auto settings = _accountState->settings();
    settings->beginGroup(QLatin1String("Folders"));
    FolderDefinition::save(*settings, _definition);
-
-    settings->sync();
-    qDebug() << "Saved folder" << _definition.alias << "to settings, status" << settings->status();
 }

 void Folder::removeFromSettings() const
@@ -1121,7 +1116,7 @@ void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction, bool *cancel)
    QString msg =
        tr("This sync would remove all the files in the sync folder '%1'.\n"
           "This might be because the folder was silently reconfigured, or that all "
-           "the files were manually removed.\n"
+           "the file were manually removed.\n"
           "Are you sure you want to perform this operation?");
    QMessageBox msgBox(QMessageBox::Warning, tr("Remove All Files?"),
                       msg.arg(alias()));
@@ -1145,7 +1140,7 @@ void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction, bool *cancel)

 void FolderDefinition::save(QSettings& settings, const FolderDefinition& folder)
 {
-    settings.beginGroup(FolderMan::escapeAlias(folder.alias));
+    settings.beginGroup(folder.alias);
    settings.setValue(QLatin1String("localPath"), folder.localPath);
    settings.setValue(QLatin1String("targetPath"), folder.targetPath);
    settings.setValue(QLatin1String("paused"), folder.paused);
@@ -1157,28 +1152,14 @@ bool FolderDefinition::load(QSettings& settings, const QString& alias,
                            FolderDefinition* folder)
 {
    settings.beginGroup(alias);
-    folder->alias = FolderMan::unescapeAlias(alias);
+    folder->alias = alias;
    folder->localPath = settings.value(QLatin1String("localPath")).toString();
    folder->targetPath = settings.value(QLatin1String("targetPath")).toString();
    folder->paused = settings.value(QLatin1String("paused")).toBool();
    folder->ignoreHiddenFiles = settings.value(QLatin1String("ignoreHiddenFiles"), QVariant(true)).toBool();
    settings.endGroup();
-
-    // Old settings can contain paths with native separators. In the rest of the
-    // code we assum /, so clean it up now.
-    folder->localPath = prepareLocalPath(folder->localPath);
-
    return true;
 }

-QString FolderDefinition::prepareLocalPath(const QString& path)
-{
-    QString p = QDir::fromNativeSeparators(path);
-    if (!p.endsWith(QLatin1Char('/'))) {
-        p.append(QLatin1Char('/'));
-    }
-    return p;
-}
-
 } // namespace OCC

@@ -73,9 +73,6 @@ public:
    /// Reads a folder definition from a settings group with the name 'alias'.
    static bool load(QSettings& settings, const QString& alias,
                     FolderDefinition* folder);
-
-    /// Ensure / as separator and trailing /.
-    static QString prepareLocalPath(const QString& path);
 };

 /**
@@ -19,6 +19,7 @@
 #include "theme.h"
 #include "socketapi.h"
 #include "account.h"
+#include "accountmigrator.h"
 #include "accountstate.h"
 #include "accountmanager.h"
 #include "filesystem.h"
@@ -134,7 +135,6 @@ int FolderMan::unloadAndDeleteAllFolders()
    _lastSyncFolder = 0;
    _currentSyncFolder = 0;
    _scheduleQueue.clear();
-    emit scheduleQueueChanged();

    Q_ASSERT(_folderMap.count() == 0);
    return cnt;
@@ -255,7 +255,7 @@ int FolderMan::setupFoldersMigration()
        Folder *f = setupFolderFromOldConfigFile( alias, accountState );
        if( f ) {
            slotScheduleSync(f);
-            emit folderSyncStateChange(f);
+            emit( folderSyncStateChange( f ) );
        }
    }

@@ -322,7 +322,7 @@ SocketApi *FolderMan::socketApi()
    return this->_socketApi;
 }

-QString FolderMan::unescapeAlias( const QString& alias )
+QString FolderMan::unescapeAlias( const QString& alias ) const
 {
    QString a(alias);

@@ -503,17 +503,16 @@ void FolderMan::slotScheduleSync( Folder *f )
    qDebug() << "Schedule folder " << alias << " to sync!";

    if( ! _scheduleQueue.contains(f) ) {
-        if( !f->canSync() ) {
+        if(f->canSync()) {
+            f->prepareToSync();
+        } else {
            qDebug() << "Folder is not ready to sync, not scheduled!";
            if( _socketApi ) {
                _socketApi->slotUpdateFolderView(f);
            }
            return;
        }
-        f->prepareToSync();
-        emit folderSyncStateChange(f);
        _scheduleQueue.enqueue(f);
-        emit scheduleQueueChanged();
    } else {
        qDebug() << " II> Sync for folder " << alias << " already scheduled, do not enqueue!";
    }
@@ -595,7 +594,6 @@ void FolderMan::slotAccountStateChanged()
                it.remove();
            }
        }
-        emit scheduleQueueChanged();
    }
 }

@@ -688,7 +686,6 @@ void FolderMan::slotStartScheduledFolderSync()

    // Try to start the top scheduled sync.
    Folder *f = _scheduleQueue.dequeue();
-    emit scheduleQueueChanged();
    Q_ASSERT(f);

    // Start syncing this folder!
@@ -847,9 +844,7 @@ void FolderMan::slotRemoveFolder( Folder *f )
        terminateSyncProcess();
    }

-    if (_scheduleQueue.removeAll(f) > 0) {
-        emit scheduleQueueChanged();
-    }
+    _scheduleQueue.removeAll(f);

    f->wipe();
    f->setSyncPaused(true);
@@ -1135,7 +1130,7 @@ QString FolderMan::checkPathValidityForNewFolder(const QString& path, bool forNe
    }

    if( !selFile.isDir() ) {
-        return tr("The selected path is not a folder!");
+        return tr("The selected path is not a directory!");
    }

    if ( !selFile.isWritable() ) {
@@ -1154,35 +1149,27 @@ QString FolderMan::checkPathValidityForNewFolder(const QString& path, bool forNe

        if (QDir::cleanPath(f->path()) == QDir::cleanPath(userInput)
                && QDir::cleanPath(QDir(f->path()).canonicalPath()) == QDir(userInput).canonicalPath()) {
-            return tr("The local folder %1 is already used in a folder sync connection. "
-                      "Please pick another one!")
+            return tr("The local path %1 is already an upload folder. Please pick another one!")
                .arg(QDir::toNativeSeparators(userInput));
        }
        if (!forNewDirectory && QDir::cleanPath(folderDir).startsWith(QDir::cleanPath(userInput)+'/')) {
-            return tr("The local folder %1 already contains a folder used in a folder sync connection. "
-                      "Please pick another one!")
-                .arg(QDir::toNativeSeparators(userInput));
+            return tr("An already configured folder is contained in the current entry.");
        }

        QString absCleanUserFolder = QDir::cleanPath(QDir(userInput).canonicalPath())+'/';
        if (!forNewDirectory && QDir::cleanPath(folderDir).startsWith(absCleanUserFolder) ) {
-            return tr("The local folder %1 is a symbolic link. "
-                      "The link target already contains a folder used in a folder sync connection. "
-                      "Please pick another one!")
-                .arg(QDir::toNativeSeparators(userInput));
+            return tr("The selected folder is a symbolic link. An already configured "
+                      "folder is contained in the folder this link is pointing to.");
        }

        if (QDir::cleanPath(QString(userInput)).startsWith( QDir::cleanPath(folderDir)+'/')) {
-            return tr("The local folder %1 is already contained in a folder used in a folder sync connection. "
-                      "Please pick another one!")
-                .arg(QDir::toNativeSeparators(userInput));
+            return tr("An already configured folder contains the currently entered folder.");
        }

        if (absCleanUserFolder.startsWith( QDir::cleanPath(folderDir)+'/')) {
-            return tr("The local folder %1 is a symbolic link. "
-                      "The link target is already contained in a folder used in a folder sync connection. "
-                      "Please pick another one!")
-                .arg(QDir::toNativeSeparators(userInput));
+            return tr("The selected folder is a symbolic link. An already configured folder "
+                      "is the parent of the current selected contains the folder this link is "
+                      "pointing to.");
        }
    }

@@ -1208,16 +1195,6 @@ void FolderMan::setIgnoreHiddenFiles(bool ignore)
    }
 }

-QQueue<Folder*> FolderMan::scheduleQueue() const
-{
-    return _scheduleQueue;
-}
-
-Folder *FolderMan::currentSyncFolder() const
-{
-    return _currentSyncFolder;
-}
-
 void FolderMan::restartApplication()
 {
    if( Utility::isLinux() ) {
@@ -86,7 +86,6 @@ public:
    // Escaping of the alias which is used in QSettings AND the file
    // system, thus need to be escaped.
    static QString escapeAlias( const QString& );
-    static QString unescapeAlias( const QString& );

    SocketApi *socketApi();

@@ -109,16 +108,6 @@ public:
    bool ignoreHiddenFiles() const;
    void setIgnoreHiddenFiles(bool ignore);

-    /**
-     * Access to the current queue of scheduled folders.
-     */
-    QQueue<Folder*> scheduleQueue() const;
-
-    /**
-     * Access to the currently syncing folder.
-     */
-    Folder* currentSyncFolder() const;
-
 signals:
    /**
      * signal to indicate a folder has changed its sync state.
@@ -127,11 +116,6 @@ signals:
      */
    void folderSyncStateChange(Folder*);

-    /**
-     * Indicates when the schedule queue changes.
-     */
-    void scheduleQueueChanged();
-
    void folderListLoaded(const Folder::Map &);

 public slots:
@@ -209,6 +193,8 @@ private:
    // restarts the application (Linux only)
    void restartApplication();

+    QString unescapeAlias( const QString& ) const;
+
    QSet<Folder*>  _disabledFolders;
    Folder::Map    _folderMap;
    QString        _folderConfigPath;
--- a/Mostrar Mais
+++ b/Mostrar Mais