Bumped version to 1.6.4 rc2

In some owncloud server setups multiple concurrent connections for the
same session are not supported: owncloud/core#11153

This causes issues with multiple uploads and downloads. A usual symptom
is the quota job failing and the sync aborting.

This workaround lets activity on the propagator's GET and PUT jobs
reset the timeout of all network jobs. That way, queries like the quota
job would not time out while a large up/download is in progress.

(cherry picked from commit 2eec85a97c)

.gitmodules

@@ -3,4 +3,4 @@
 	url = https://github.com/owncloud/documentation
 [submodule "src/3rdparty/qtmacgoodies"]
 	path = src/3rdparty/qtmacgoodies
-	url = git://github.com/shadone/qtmacgoodies.git
+	url = git://github.com/guruz/qtmacgoodies.git

CMakeLists.txt

@@ -85,6 +85,14 @@ endif()
 # this option creates only libocsync and libowncloudsync
 option(BUILD_LIBRARIES_ONLY "BUILD_LIBRARIES_ONLY" OFF)
 
+# When this option is enabled, 5xx errors are not added to the clacklist
+# Normaly you don't want to enable this option because if a particular file
+# trigger a bug on the server, you want the file to be blacklisted.
+option(OWNCLOUD_5XX_NO_BLACKLIST "OWNCLOUD_5XX_NO_BLACKLIST" OFF)
+if(OWNCLOUD_5XX_NO_BLACKLIST)
+    add_definitions(-DOWNCLOUD_5XX_NO_BLACKLIST=1)
+endif()
+
 #### find libs
 #find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtTest QtWebkit REQUIRED )
 #if( UNIX AND NOT APPLE ) # Fdo notifications

ChangeLog

@@ -1,6 +1,79 @@
 ChangeLog
 =========
-version 1.6.0 (release 2014-04- )
+
+version 1.6.4 (release 2014-10-xx)
+ * Fix startup logic, fixes bug #1989
+ * Fix raise dialog on X11
+ * Win32: fix overflow when computing the size of file > 4GiB
+ * Use a fixed function to get files modification time, the
+   original one was broken for certain timezone issues, see
+   core bug #9781 for details
+ * Added some missing copyright headers
+ * Avoid data corruption due to wrong error handling, bug #2280
+ * Do improved request timeout handling to reduce the number of
+   timed out jobs, bug #2155
+
+version 1.6.3 (release 2014-09-03)
+ * Fixed updater on OS X
+ * Fixed memory leak in SSL button that could lead to quick memory draining
+ * Fixed upload problem with files >4 GB
+ * MacOSX, Linux: Bring Settings window to front properly
+ * Branded clients: If no configuration is detected, try to import the data
+   from a previously configured community edition.
+
+version 1.6.2 (release 2014-07-28 )
+ * Limit the HTTP buffer size when downloading to limit memory consumption.
+ * Another small mem leak fixed in HTTP Credentials.
+ * Fix local file name clash detection for MacOSX.
+ * Limit maximum wait time to ten seconds in network limiting.
+ * Fix data corruption while trying to resume and the server does
+   not support it.
+ * HTTP Credentials: Read password from legacy place if not found.
+ * Shibboleth: Fix the waiting curser that would not disapear (#1915)
+ * Limit memory usage to avoid mem wasting and crashes
+ * Propagator: Fix crash when logging out during upload (#1957)
+ * Propagator_qnam: Fix signal slot connection (#1963)
+ * Use more elaborated way to detect that the server was reconfigured (#1948)
+ * Setup Wizard: Reconfigure Server also if local path was changed (#1948)
+
+version 1.6.1 (release 2014-06-26 )
+ * Fix 'precondition failed' bug with broken upload
+ * Fix openSSL problems for windows deployment
+ * Fix syncing a folder with '#' in the name
+ * Fix #1845: do not update parent directory etag before sub
+   directories are removed
+ * Fix reappearing directories if dirs are removed during its
+   upload
+ * Fix app version in settings dialog, General tab
+ * Fix crash in FolderWizard when going offline
+ * Shibboleth fixes
+ * More specific error messages (file remove during upload, open
+   local sync file)
+ * Use QSet rather than QHash in SyncEngine (save memory)
+ * Fix some memory leaks
+ * Fix some thread race problems, ie. wait for neon thread to finish
+   before the propagator is shut down
+ * Fix a lot of issues and warnings found by Coverity
+ * Fix Mac some settings dialog problems
+
+
+version 1.6.0 (release 2014-05-30 )
+ * Minor GUI improvements
+ * Qt5 compile issues fixed
+ * Ignore sync log file in filewatcher
+ * Install libocsync to private library dir and use rpath to localize
+ * Fix reconnect after server disconnect
+ * Fix "unknown action" display in Activity window
+ * Fix memory leaks
+ * Respect XDG_CONFIG_HOME environment var
+ * Handle empty fileids in the journal correctly
+ * Add abilility to compile libowncloudsync without GUI dependendy
+ * Fix SSL error with previously-expired CAs on Windows
+ * Fix incorrect folder pause state after start
+ * Fix a couple of actual potential crashes
+ * Improve Cookie support (e.g. for cookie-based load-balancers)
+ * Introduce a general timeout of 300s for network operations
+ * Improve error handling, blacklisting
  * Job-based change propagation, enables faster parallel up/downloads 
    (right now only if no bandwidth limit is set and no proxy is used)
  * Significantly reduced CPU load when checking for local and remote changes
@@ -18,6 +91,7 @@ version 1.6.0 (release 2014-04- )
  * Mac OS X: Fix UI inconsistencies on Mavericks
  * Shibboleth: Warn if authenticating with a different user
  * Remove vio abstraction in csync
+ * Avoid data loss when a client file system is not case sensitive
 
 version 1.5.3 (release 2014-03-10 )
   * Fix usage of proxies after first sync run (#1502, #1524, #1459, #1521)

VERSION.cmake

@@ -1,10 +1,10 @@
 set( MIRALL_VERSION_MAJOR 1 )
 set( MIRALL_VERSION_MINOR 6 )
-set( MIRALL_VERSION_PATCH 0 )
+set( MIRALL_VERSION_PATCH 4 )
 set( MIRALL_SOVERSION 0 )
 
 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "beta1" ) #e.g. beta1, beta2, rc1
+	set( MIRALL_VERSION_SUFFIX "rc2") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
 
 if( NOT DEFINED MIRALL_VERSION_BUILD )

admin/osx/sign_dmg.sh

@@ -23,6 +23,8 @@ fix_frameworks() {
         mkdir -p "${FMWK_PATH}/Versions/${QT_FMWK_VERSION}/Resources/"
         cp -avf "${QT_FMWK_PATH}/${FMWK}/Contents/Info.plist" "${FMWK_PATH}/Versions/${QT_FMWK_VERSION}/Resources"
         (cd "${FMWK_PATH}" && ln -sf "Versions/${QT_FMWK_VERSION}/Resources" "Resources")
+        (cd "${FMWK_PATH}" && ln -sf "Versions/${QT_FMWK_VERSION}/${FMWK_NAME}")
+        (cd "${FMWK_PATH}/Versions" && ln -sf "${QT_FMWK_VERSION}" "Current")
         perl -pi -e "s/${FMWK_NAME}_debug/${FMWK_NAME}/" "${FMWK_PATH}/Resources/Info.plist"
     done
 }
@@ -30,6 +32,9 @@ fix_frameworks() {
 mount="/Volumes/$(basename "$src_dmg"|sed 's,-\([0-9]\)\(.*\),,')"
 test -e "$tmp_dmg" && rm -rf "$tmp_dmg"
 hdiutil convert "$src_dmg" -format UDRW -o "$tmp_dmg"
+#signing adds data, add a bit of space
+sectors=$(hdiutil resize -limits "$tmp_dmg" |grep -v cur|cut -f2)
+hdiutil resize -sectors $(($sectors+(51200))) "$tmp_dmg"
 hdiutil attach "$tmp_dmg"
 pushd "$mount"
 fix_frameworks "$mount"/*.app `qmake -query QT_INSTALL_LIBS` "$mount"/*.app/Contents/Frameworks

admin/win/nsi/l10n/Greek.nsh

@@ -3,13 +3,13 @@ StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Βρέθηκε η(οι) διεργασία(ες) ${APPLICATION_EXECUTABLE} η(οι) οποία(ες) θα πρέπει να τερματιστεί(ούν).$\nΘα θέλατε να την(τις) τερματίσει ο βοηθός εγκατάστασης για εσάς;"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Τερματισμός διεργασιών ${APPLICATION_EXECUTABLE}."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Δεν βρέθηκε διεργασία για βίαιο τερματισμό!"
-StrCpy $PageReinstall_NEW_Field_1 "Μια παλαιότερη έκδοση της ${APPLICATION_NAME} είναι εγκατεστημένη στο σύστημά σας. Είναι προτεινόμενο να απεγκαταστήσετε την τρέχουσα έκδοση πριν την εγκατάσταση. Επιλέξτε τη διαδικασία που επιθυμείτε να πραγματοποιείσετε και πατήστε Επόμενο για να συνεχίσετε."
+StrCpy $PageReinstall_NEW_Field_1 "Μια παλαιότερη έκδοση της ${APPLICATION_NAME} είναι εγκατεστημένη στο σύστημά σας. Είναι προτεινόμενο να απεγκαταστήσετε την τρέχουσα έκδοση πριν την εγκατάσταση. Επιλέξτε τη διαδικασία που επιθυμείτε να εκτελέσετε και πατήστε Επόμενο για να συνεχίσετε."
 StrCpy $PageReinstall_NEW_Field_2 "Απεγκατάσταση πριν την εγκατάσταση"
 StrCpy $PageReinstall_NEW_Field_3 "Να μην απεγκατασταθεί"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ήδη εγκατεστημένο"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_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_OLD_Field_1 "Μια νεώτερη έκδοση της ${APPLICATION_NAME} είναι ήδη εγκατεστημένη! Δεν συνίσταται να εγκαταστείσετε μια παλαιότερη έκδοση. Εάν θέλετε πραγματικά να εγκαταστήσετε αυτήν την παλαιότερη έκδοση, είναι καλύτερο να απεγκαταστήσετε την τρέχουσα έκδοση πρώτα. Επιλέξτε τη διαδικασία που επιθυμείτε να εκτελέσετε και επιλέξτε Επόμενο για να συνεχίσετε."
+StrCpy $PageReinstall_SAME_Field_1 "Η ${APPLICATION_NAME} ${VERSION} είναι ήδη εγκατεστημένη.\n\nΕπιλέξτε τη διαδικασία που επιθυμείτε να εκτελέσετε και επιλέξτε Επόμενο για να συνεχίσετε."
 StrCpy $PageReinstall_SAME_Field_2 "Προσθήκη/ Επανεγκατάσταση συνιστωσών"
 StrCpy $PageReinstall_SAME_Field_3 "Απεγκατάσταση ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Απεγκατάσταση ${APPLICATION_NAME}"
@@ -23,16 +23,16 @@ StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Δημιουργία Συντόμευσης Ταχείας Εκκίνησης"
 StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Βάση ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Συντόμευση ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Συντόμευση στην επιφάνεια εργασίας της "
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Συντόμευση Ταχείας Εκκίνησης της "
-StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Αφαίρεση του φακέλου δεδομένων της ${APPLICATION_NAME} από τον υπολογιστή σας"
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Συντόμευση επιφάνειας εργασίας της ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Συντόμευση Ταχείας Εκκίνησης της ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Αφαίρεση του φακέλου δεδομένων της ${APPLICATION_NAME} από τον υπολογιστή σας."
 StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Θέλετε να αφαιρέσετε τον φάκελο δεδομένων της ${APPLICATION_NAME};"
 StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Αφήστε κενό για να διατηρήσετε τον φάκελο δεδομένων για μελλοντική χρήση ή επιλέξτε για να διγράψετε το φάκελο δεδομένων."
-StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Να διαγραφεί ο φάκελος δεδομένων."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Ναι, διαγραφή αυτού του φακέλου δεδομένων."
 StrCpy $UNINSTALLER_FILE_Detail "Εγγραφή Εφαρμογής Απεγκατάστασης"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Εγγραφή Κλειδιών μητρώου (Registry) της Εφαρμογής Εγκατάστασης"
-StrCpy $UNINSTALLER_FINISHED_Detail "Ολοκλήρωση"
-StrCpy $UNINSTALL_MESSAGEBOX "Φαίνεται πως η ${APPLICATION_NAME} είναι εγκατεστημένη στον κατάλογο '$INSTDIR'.$\n$\nΣυνέχιση παρ' όλα αυτά (δεν συνίσταται);"
+StrCpy $UNINSTALLER_FINISHED_Detail "Ολοκληρώθηκε"
+StrCpy $UNINSTALL_MESSAGEBOX "Δεν φαίνεται να είναι εγκατεστημένηη η ${APPLICATION_NAME} στον κατάλογο '$INSTDIR'.$\n$\nΣυνέχιση παρ' όλα αυτά (δεν συνίσταται);"
 StrCpy $UNINSTALL_ABORT "Η απεγκατάσταση ματαιώθηκε από το χρήστη"
 StrCpy $INIT_NO_QUICK_LAUNCH "Συντόμευση Ταχείας Εκκίνησης (Μ/Δ)"
 StrCpy $INIT_NO_DESKTOP "Συντόμευση Επιφάνειας Εργασίας (αντικαθιστά υπάρχουσα)"

admin/win/nsi/l10n/Hungarian.nsh

@@ -1,17 +1,18 @@
 # Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Kiadási jegyzetek megtekintése"
+StrCpy $PageReinstall_NEW_Field_2 "Eltávolítás telepítés előtt"
+StrCpy $PageReinstall_NEW_Field_3 "Ne távolítsa el"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Már telepítve"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Válaszd ki, hogy szeretnéd telepíteni a következő alkalmazást ${APPLICATION_NAME}."
 StrCpy $PageReinstall_SAME_Field_2 "Komponens hozzáadása/újratelepítése"
-StrCpy $PageReinstall_SAME_Field_3 "Eltávolitani  ${APPLICATION_NAME}"
-StrCpy $UNINSTALLER_APPDATA_TITLE "Eltávolitani  ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_Field_3 "${APPLICATION_NAME} eltávolítása"
+StrCpy $UNINSTALLER_APPDATA_TITLE "${APPLICATION_NAME} eltávolítása"
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Igen, törölje ezt az adatkönyvtárat."
 StrCpy $UNINSTALLER_FINISHED_Detail "Befejezve"
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Show release notes"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Killing ${APPLICATION_EXECUTABLE} processes."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Process to kill not found!"
 StrCpy $PageReinstall_NEW_Field_1 "An older version of ${APPLICATION_NAME} is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
-StrCpy $PageReinstall_NEW_Field_2 "Uninstall before installing"
-StrCpy $PageReinstall_NEW_Field_3 "Do not uninstall"
 StrCpy $PageReinstall_OLD_Field_1 "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
 StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choose the maintenance option to perform."
@@ -29,7 +30,6 @@ StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Quick Launch shortcut for ${APPLICA
 StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Remove ${APPLICATION_NAME}'s data folder from your computer."
 StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Do you want to delete ${APPLICATION_NAME}'s data folder?"
 StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Leave unchecked to keep the data folder for later use or check to delete the data folder."
-StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Yes, delete this data folder."
 StrCpy $UNINSTALLER_FILE_Detail "Writing Uninstaller"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Writing Installer Registry Keys"
 StrCpy $UNINSTALL_MESSAGEBOX "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"

admin/win/nsi/l10n/Italian.nsh

@@ -1,6 +1,6 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostra le note di rilascio"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Trovati ${APPLICATION_EXECUTABLE} processi che dovrebbero essere fermati.$\nVuoi che il programma di installazione li fermi per te?"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Trovati ${APPLICATION_EXECUTABLE} processi che dovrebbero essere fermati.$\nVuoi che il programma di installazione li fermi al posto tuo?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Sto terminando ${APPLICATION_EXECUTABLE} processi."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Il processo da terminare non è stato trovato!"
 StrCpy $PageReinstall_NEW_Field_1 "Una versione più datata di ${APPLICATION_NAME} è installata sul tuo sistema. Si consiglia di disinstallare la versione attuale prima di installare. Seleziona l'operazione da eseguire e fai clic su Avanti per continuare."

admin/win/nsi/l10n/SpanishInternational.nsh

@@ -0,0 +1,44 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar notas de la versión"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Parando el proceso ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Proceso a detener no encontrado!"
+StrCpy $PageReinstall_NEW_Field_1 "Una versión anterior de ${APPLICATION_NAME} esta instalada en el sistema. Es recomendado que quite esta versión antes de instalar. Elija la operación a realizar y seleccione Siguiente para continuar."
+StrCpy $PageReinstall_NEW_Field_2 "Des-instale antes de Instalar."
+StrCpy $PageReinstall_NEW_Field_3 "No des-instalar."
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Actualmente Instalado."
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Elija como desea instalar ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "Una versión mas reciente de ${APPLICATION_NAME} esta actualmente instalada! No es recomendado que instale una versión antigua. Si realmente desea instalar esta versión obsoleta, es mejor que des-instale la versión actual primero. Seleccione la operación que desea realizar y presione en Siguiente para continuar. "
+StrCpy $PageReinstall_SAME_Field_2 "Agregar/Re-Instalar componentes"
+StrCpy $PageReinstall_SAME_Field_3 "Des-instalar ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Des-instalar ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Elija la opción de mantenimiento a realizar."
+StrCpy $SEC_APPLICATION_DETAILS "Instalar  esenciales ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso Directo en Menú de Programas"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Agregando el Acceso Directo al Menú de Inicio para ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Acceso directo en Escritorio"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Creando Accesos Directos en Escritorio"
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Acceso directo de ${APPLICATION_NAME}"
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Acceso Directo al Escritorio para ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Quitar la carpeta de datos ${APPLICATION_NAME} de la computadora."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Desea borrar la carpeta de datos de ${APPLICATION_NAME}?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Dejar des-tildado para mantener la carpeta de datos para posterior uso o tildar para borrar la carpeta de datos."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Si, eliminar esta carpeta de datos."
+StrCpy $UNINSTALLER_FILE_Detail "Escribiendo Des-Instalador."
+StrCpy $UNINSTALLER_REGISTRY_Detail "Escribiendo claves de Registro del Instalador"
+StrCpy $UNINSTALLER_FINISHED_Detail "Terminado"
+StrCpy $UNINSTALL_ABORT "Des-instalación abortada por el usuario"
+StrCpy $INIT_NO_DESKTOP "Acceso Directo en Escritorio (Sobrescribe existentes)"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Este instalador requiere acceso Administrador, intente de nuevo. "
+StrCpy $INIT_INSTALLER_RUNNING "El instalador ya esta corriendo."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Este des-instalador requiere acceso administrador, intente de nuevo"
+StrCpy $INIT_UNINSTALLER_RUNNING "El des-instalador ya esta corriendo"
+StrCpy $SectionGroup_Shortcuts "Accesos Directos"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Quick Launch Shortcut"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creating Quick Launch Shortcut"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} essentials."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Quick Launch shortcut for ${APPLICATION_NAME}."
+StrCpy $UNINSTALL_MESSAGEBOX "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
+StrCpy $INIT_NO_QUICK_LAUNCH "Quick Launch Shortcut (N/A)"
+StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"

admin/win/nsi/l10n/Swedish.nsh

@@ -36,9 +36,9 @@ StrCpy $UNINSTALL_MESSAGEBOX "Det verkar inte som ${APPLICATION_NAME} är instal
 StrCpy $UNINSTALL_ABORT "Avinstallering avbröts av användare"
 StrCpy $INIT_NO_QUICK_LAUNCH "Snabbstartsgenväg (N/A)"
 StrCpy $INIT_NO_DESKTOP "Skrivbordsgenväg (skriver över nuvarande)"
+StrCpy $UAC_ERROR_ELEVATE "Kunde inte få förhöjda rättigheter, fel:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Detta installationsprogram kräver adminstratörs rättigheter, försök igen"
 StrCpy $INIT_INSTALLER_RUNNING "Installationsprogrammet körs redan."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Detta avinstallationsprogram  kräver administratörs rättigheter, försök igen"
 StrCpy $INIT_UNINSTALLER_RUNNING "Avinstallationsprogrammet körs redan."
 StrCpy $SectionGroup_Shortcuts "Genvägar"
-StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"

admin/win/nsi/l10n/Turkish.nsh

@@ -9,7 +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ü.\nYapmak istediğiniz işlemi seçin ve devam etmek için İ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"

admin/win/nsi/l10n/languages.nsh

@@ -3,6 +3,7 @@
 !insertmacro MUI_LANGUAGE "Estonian"
 !insertmacro MUI_LANGUAGE "Turkish"
 !insertmacro MUI_LANGUAGE "Slovenian"
+!insertmacro MUI_LANGUAGE "SpanishInternational"
 !insertmacro MUI_LANGUAGE "Dutch"
 !insertmacro MUI_LANGUAGE "Hungarian"
 !insertmacro MUI_LANGUAGE "French"

cmake/modules/DefineCMakeDefaults.cmake

@@ -1,3 +1,7 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
 # Always include srcdir and builddir in include path
 # This saves typing ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY} in
 # about every subdir

cmake/modules/DefineCompilerFlags.cmake

@@ -1,3 +1,7 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
 # define system dependent compiler flags
 
 include(CheckCCompilerFlag)

cmake/modules/DefineInstallationPaths.cmake

@@ -1,3 +1,7 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
 if (UNIX)
   # Suffix for Linux
   SET(LIB_SUFFIX

cmake/modules/DefinePlatformDefaults.cmake

@@ -1,3 +1,7 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
 # Set system vars
 
 if (CMAKE_SYSTEM_NAME MATCHES "Linux")

cmake/modules/FindINotify.cmake

@@ -1,3 +1,7 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
 # This module defines
 #  INOTIFY_INCLUDE_DIR, where to find inotify.h, etc.
 #  INOTIFY_FOUND, If false, do not try to use inotify.

cmake/modules/FindNeon.cmake

@@ -31,7 +31,7 @@ HINTS
 
 find_library(NEON_LIBRARIES
 NAMES
-    neon
+    neon neon-27
 HINTS
     ${_NEON_LIBDIR}
     ${CMAKE_INSTALL_LIBDIR}

cmake/modules/FindPackageVersionCheck.cmake

@@ -1,3 +1,7 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
 # FIND_PACKAGE_VERSION_CHECK(NAME (DEFAULT_MSG|"Custom failure message"))
 #    This function is intended to be used in FindXXX.cmake modules files.
 #    It handles NAME_FIND_VERSION and NAME_VERSION variables in a Module.

cmake/modules/FindPdfLatex.cmake

@@ -1,3 +1,7 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
 find_program(PDFLATEX_EXECUTABLE NAMES pdflatex
   HINTS
   $ENV{PDFLATEX_DIR}

cmake/modules/FindQt5Keychain.cmake

@@ -1,3 +1,7 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
 # - Try to find QtKeychain
 # Once done this will define
 #  QTKEYCHAIN_FOUND - System has QtKeychain

cmake/modules/FindQtKeychain.cmake

@@ -1,3 +1,7 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
 # - Try to find QtKeychain
 # Once done this will define
 #  QTKEYCHAIN_FOUND - System has QtKeychain

cmake/modules/FindSQLite3.cmake

@@ -30,7 +30,7 @@ find_path(SQLITE3_INCLUDE_DIR
 
 find_library(SQLITE3_LIBRARY
     NAMES
-        sqlite3
+        sqlite3 sqlite3-0
     PATHS
         ${_SQLITE3_LIBDIR}
 )

cmake/modules/FindSphinx.cmake

@@ -1,3 +1,7 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
 find_program(SPHINX_EXECUTABLE NAMES sphinx-build
   HINTS
   $ENV{SPHINX_DIR}

cmake/modules/GNUInstallDirs.cmake

@@ -1,32 +1,49 @@
-# - Define GNU standard installation directories
+#.rst:
+# GNUInstallDirs
+# --------------
+#
+# Define GNU standard installation directories
+#
 # Provides install directory variables as defined for GNU software:
-#  http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+#
+# ::
+#
+#   http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+#
 # Inclusion of this module defines the following variables:
-#  CMAKE_INSTALL_<dir>      - destination for files of a given type
-#  CMAKE_INSTALL_FULL_<dir> - corresponding absolute path
+#
+# ::
+#
+#   CMAKE_INSTALL_<dir>      - destination for files of a given type
+#   CMAKE_INSTALL_FULL_<dir> - corresponding absolute path
+#
 # where <dir> is one of:
-#  BINDIR           - user executables (bin)
-#  SBINDIR          - system admin executables (sbin)
-#  LIBEXECDIR       - program executables (libexec)
-#  SYSCONFDIR       - read-only single-machine data (etc)
-#  SHAREDSTATEDIR   - modifiable architecture-independent data (com)
-#  LOCALSTATEDIR    - modifiable single-machine data (var)
-#  LIBDIR           - object code libraries (lib or lib64)
-#  INCLUDEDIR       - C header files (include)
-#  OLDINCLUDEDIR    - C header files for non-gcc (/usr/include)
-#  DATAROOTDIR      - read-only architecture-independent data root (share)
-#  DATADIR          - read-only architecture-independent data (DATAROOTDIR)
-#  INFODIR          - info documentation (DATAROOTDIR/info)
-#  LOCALEDIR        - locale-dependent data (DATAROOTDIR/locale)
-#  MANDIR           - man documentation (DATAROOTDIR/man)
-#  DOCDIR           - documentation root (DATAROOTDIR/doc/PROJECT_NAME)
-# Each CMAKE_INSTALL_<dir> value may be passed to the DESTINATION options of
-# install() commands for the corresponding file type.  If the includer does
-# not define a value the above-shown default will be used and the value will
-# appear in the cache for editing by the user.
-# Each CMAKE_INSTALL_FULL_<dir> value contains an absolute path constructed
-# from the corresponding destination by prepending (if necessary) the value
-# of CMAKE_INSTALL_PREFIX.
+#
+# ::
+#
+#   BINDIR           - user executables (bin)
+#   SBINDIR          - system admin executables (sbin)
+#   LIBEXECDIR       - program executables (libexec)
+#   SYSCONFDIR       - read-only single-machine data (etc)
+#   SHAREDSTATEDIR   - modifiable architecture-independent data (com)
+#   LOCALSTATEDIR    - modifiable single-machine data (var)
+#   LIBDIR           - object code libraries (lib or lib64 or lib/<multiarch-tuple> on Debian)
+#   INCLUDEDIR       - C header files (include)
+#   OLDINCLUDEDIR    - C header files for non-gcc (/usr/include)
+#   DATAROOTDIR      - read-only architecture-independent data root (share)
+#   DATADIR          - read-only architecture-independent data (DATAROOTDIR)
+#   INFODIR          - info documentation (DATAROOTDIR/info)
+#   LOCALEDIR        - locale-dependent data (DATAROOTDIR/locale)
+#   MANDIR           - man documentation (DATAROOTDIR/man)
+#   DOCDIR           - documentation root (DATAROOTDIR/doc/PROJECT_NAME)
+#
+# Each CMAKE_INSTALL_<dir> value may be passed to the DESTINATION
+# options of install() commands for the corresponding file type.  If the
+# includer does not define a value the above-shown default will be used
+# and the value will appear in the cache for editing by the user.  Each
+# CMAKE_INSTALL_FULL_<dir> value contains an absolute path constructed
+# from the corresponding destination by prepending (if necessary) the
+# value of CMAKE_INSTALL_PREFIX.
 
 #=============================================================================
 # Copyright 2011 Nikita Krupen'ko <krnekit@gmail.com>
@@ -68,30 +85,90 @@ if(NOT DEFINED CMAKE_INSTALL_LOCALSTATEDIR)
   set(CMAKE_INSTALL_LOCALSTATEDIR "var" CACHE PATH "modifiable single-machine data (var)")
 endif()
 
-if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+# We check if the variable was manually set and not cached, in order to
+# allow projects to set the values as normal variables before including
+# GNUInstallDirs to avoid having the entries cached or user-editable. It
+# replaces the "if(NOT DEFINED CMAKE_INSTALL_XXX)" checks in all the
+# other cases.
+# If CMAKE_INSTALL_LIBDIR is defined, if _libdir_set is false, then the
+# variable is a normal one, otherwise it is a cache one.
+get_property(_libdir_set CACHE CMAKE_INSTALL_LIBDIR PROPERTY TYPE SET)
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set
+    AND DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX
+    AND NOT "${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX}" STREQUAL "${CMAKE_INSTALL_PREFIX}"))
+  # If CMAKE_INSTALL_LIBDIR is not defined, it is always executed.
+  # Otherwise:
+  #  * if _libdir_set is false it is not executed (meaning that it is
+  #    not a cache variable)
+  #  * if _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX is not defined it is
+  #    not executed
+  #  * if _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX and
+  #    CMAKE_INSTALL_PREFIX are the same string it is not executed.
+  #    _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX is updated after the
+  #    execution, of this part of code, therefore at the next inclusion
+  #    of the file, CMAKE_INSTALL_LIBDIR is defined, and the 2 strings
+  #    are equal, meaning that the if is not executed the code the
+  #    second time.
+
   set(_LIBDIR_DEFAULT "lib")
   # Override this default 'lib' with 'lib64' iff:
   #  - we are on Linux system but NOT cross-compiling
   #  - we are NOT on debian
   #  - we are on a 64 bits system
   # reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
-  # Note that the future of multi-arch handling may be even
-  # more complicated than that: http://wiki.debian.org/Multiarch
-  if(CMAKE_SYSTEM_NAME MATCHES "Linux"
-      AND NOT CMAKE_CROSSCOMPILING
-      AND NOT EXISTS "/etc/debian_version")
-    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
-      message(AUTHOR_WARNING
-        "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
-        "Please enable at least one language before including GNUInstallDirs.")
-    else()
-      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-        set(_LIBDIR_DEFAULT "lib64")
+  # For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
+  # CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
+  # and CMAKE_INSTALL_PREFIX is "/usr"
+  # See http://wiki.debian.org/Multiarch
+  if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX)
+    set(__LAST_LIBDIR_DEFAULT "lib")
+    # __LAST_LIBDIR_DEFAULT is the default value that we compute from
+    # _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX, not a cache entry for
+    # the value that was last used as the default.
+    # This value is used to figure out whether the user changed the
+    # CMAKE_INSTALL_LIBDIR value manually, or if the value was the
+    # default one. When CMAKE_INSTALL_PREFIX changes, the value is
+    # updated to the new default, unless the user explicitly changed it.
+  endif()
+  if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
+      AND NOT CMAKE_CROSSCOMPILING)
+    if (EXISTS "/etc/debian_version") # is this a debian system ?
+      if(CMAKE_LIBRARY_ARCHITECTURE)
+        if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
+          set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+        endif()
+        if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX
+            AND "${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
+          set(__LAST_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+        endif()
+      endif()
+    else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
+      if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
+        message(AUTHOR_WARNING
+          "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
+          "Please enable at least one language before including GNUInstallDirs.")
+      else()
+        if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+          set(_LIBDIR_DEFAULT "lib64")
+          if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX)
+            set(__LAST_LIBDIR_DEFAULT "lib64")
+          endif()
+        endif()
       endif()
     endif()
   endif()
-  set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
+  if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+    set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
+  elseif(DEFINED __LAST_LIBDIR_DEFAULT
+      AND "${__LAST_LIBDIR_DEFAULT}" STREQUAL "${CMAKE_INSTALL_LIBDIR}")
+    set_property(CACHE CMAKE_INSTALL_LIBDIR PROPERTY VALUE "${_LIBDIR_DEFAULT}")
+  endif()
 endif()
+# Save for next run
+set(_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE INTERNAL "CMAKE_INSTALL_PREFIX during last run")
+unset(_libdir_set)
+unset(__LAST_LIBDIR_DEFAULT)
+
 
 if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
   set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE PATH "C header files (include)")

cmake/modules/MacroCopyFile.cmake

@@ -1,3 +1,7 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
 # - macro_copy_file(_src _dst)
 # Copies a file to ${_dst} only if ${_src} is different (newer) than ${_dst}
 #

cmake/modules/NSIS.template.in

@@ -111,8 +111,8 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_BITMAP  ${WIN_SETUP_BITMAP_PATH}/page_header.bmp
 !define MUI_COMPONENTSPAGE_SMALLDESC
-!define MUI_FINISHPAGE_LINK "www.${APPLICATION_DOMAIN}"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.${APPLICATION_DOMAIN}"
+!define MUI_FINISHPAGE_LINK "${APPLICATION_DOMAIN}"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://${APPLICATION_DOMAIN}"
 !define MUI_FINISHPAGE_NOREBOOTSUPPORT
 !ifdef OPTION_FINISHPAGE_RELEASE_NOTES
    !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
@@ -151,6 +151,12 @@ UninstPage custom un.UnPageUserAppData un.UnPageUserAppDataLeave
 !include ${source_path}/admin/win/nsi/l10n/languages.nsh
 !include ${source_path}/admin/win/nsi/l10n/declarations.nsh
 
+; Set version strings with english locale
+VIProductVersion "${VERSION}"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${APPLICATION_NAME}"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "${APPLICATION_VENDOR}"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}"
+
 !macro SETLANG un
    Function ${un}SetLang
       # load the selected language file
@@ -407,15 +413,14 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
    File "${QT_DLL_PATH}\Qt5Xml.dll"
 
    ;Qt deps
-   File "${MING_BIN}\libpng15-15.dll"
-   File "${MING_BIN}\icudata51.dll"
-   File "${MING_BIN}\icui18n51.dll"
-   File "${MING_BIN}\icuuc51.dll"
+   File "${MING_BIN}\libpng16-16.dll"
+   File "${MING_BIN}\icudata53.dll"
+   File "${MING_BIN}\icui18n53.dll"
+   File "${MING_BIN}\icuuc53.dll"
    File "${MING_BIN}\libEGL.dll"
    File "${MING_BIN}\libGLESv2.dll"
    File "${MING_BIN}\libjpeg-8.dll"
    File "${MING_BIN}\libpcre16-0.dll"
-   File "${MING_BIN}\libpng15-15.dll"
    File "${MING_BIN}\libproxy.dll"
    File "${MING_BIN}\libqt5keychain.dll"
    File "${MING_BIN}\libsqlite3-0.dll"
@@ -442,6 +447,7 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
    ;MinGW stuff
    File "${MING_BIN}\libgcc_s_sjlj-1.dll"
    File "${MING_BIN}\libstdc++-6.dll"
+   File "${MING_BIN}\libwinpthread-1.dll"
 
    ; CSync configs
    File "${SOURCE_PATH}/sync-exclude.lst"

cmake/modules/QtVersionAbstraction.cmake

@@ -1,3 +1,7 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
 include (MacroOptionalFindPackage)
 include (MacroLogFeature)
 
@@ -11,13 +15,15 @@ endif( BUILD_WITH_QT4 )
 
 if( Qt5Core_FOUND )
     message(STATUS "Found Qt5 core, checking for further dependencies...")
-    find_package(Qt5Widgets REQUIRED)
-    find_package(Qt5Quick REQUIRED)
-    find_package(Qt5PrintSupport REQUIRED)
-    find_package(Qt5WebKit REQUIRED)
     find_package(Qt5Network REQUIRED)
     find_package(Qt5Xml REQUIRED)
-    find_package(Qt5WebKitWidgets REQUIRED)
+    if(NOT TOKEN_AUTH_ONLY)
+        find_package(Qt5WebKitWidgets REQUIRED)
+        find_package(Qt5WebKit REQUIRED)
+        find_package(Qt5PrintSupport REQUIRED)
+        find_package(Qt5Quick REQUIRED)
+        find_package(Qt5Widgets REQUIRED)
+    endif()
     if(APPLE)
 	find_package(Qt5MacExtras REQUIRED)
     endif(APPLE)
@@ -37,23 +43,27 @@ if( Qt5Core_FOUND )
 	include_directories(${Qt5DBus_INCLUDES})
 	add_definitions(${Qt5DBus_DEFINITIONS})
     endif (WITH_DBUS)
-
-    include_directories(${Qt5Widgets_INCLUDES})
-    add_definitions(${Qt5Widgets_DEFINITIONS})
+    include_directories(${Qt5Core_INCLUDES})
+    add_definitions(${Qt5Core_DEFINITIONS})
     if (NOT WIN32) #implied on Win32
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
     endif(NOT WIN32)
 #        set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
 
-    if(APPLE)
+    if(APPLE AND NOT TOKEN_AUTH_ONLY)
 	include_directories(${Qt5MacExtras_INCLUDE_DIRS})
 	add_definitions(${Qt5MacExtras_DEFINITIONS})
 	set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
-    endif(APPLE)
+    endif()
 
+if(NOT BUILD_LIBRARIES_ONLY)
     macro(qt_wrap_ui)
 	qt5_wrap_ui(${ARGN})
     endmacro()
+else()
+    # hack
+    SET(QT_UIC_EXECUTABLE "") 
+endif()
 
     macro(qt_add_resources)
 	qt5_add_resources(${ARGN})

cmake/modules/UseDoxygen.cmake

@@ -1,3 +1,7 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
 # -helper macro to add a "doc" target with CMake build system. 
 # and configure doxy.config.in to doxy.config
 #

cmake/modules/Warnings.cmake

@@ -1,3 +1,7 @@
+# (c) 2014 Copyright ownCloud, Inc.
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING* file.
+
 if(CMAKE_COMPILER_IS_GNUCXX)
     execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
                     OUTPUT_VARIABLE GCC_VERSION)

csync/config_csync.h.cmake

@@ -22,7 +22,6 @@
 #cmakedefine HAVE_UTIMES 1
 #cmakedefine HAVE_LSTAT 1
 #cmakedefine HAVE_FNMATCH 1
-#cmakedefine HAVE___MINGW_ASPRINTF 1
 #cmakedefine HAVE_ICONV 1
 #cmakedefine HAVE_ICONV_CONST 1
 
@@ -31,5 +30,6 @@
 #endif
 
 #cmakedefine HAVE___MINGW_ASPRINTF 1
+#cmakedefine HAVE_ASPRINTF 1
 
 #cmakedefine WITH_UNIT_TESTING 1

csync/src/CMakeLists.txt

@@ -44,11 +44,10 @@ if(HAVE_ICONV AND WITH_ICONV)
     list(APPEND CSYNC_LINK_LIBRARIES ${ICONV_LIBRARIES})
 endif()
 
-set(BLACKLIST_ON_ERROR 0 CACHE BOOL
-  "If an errors occurs three times on the same file, do not attempt to process that file any further.")
-
-if(BLACKLIST_ON_ERROR)
-    add_definitions(-DBLACKLIST_ON_ERROR)
+# Specific option for builds tied to servers that do not support renaming extensions
+set(NO_RENAME_EXTENSION 0 CACHE BOOL "Do not issue rename if the extension changes")
+if(NO_RENAME_EXTENSION)
+    add_definitions(-DNO_RENAME_EXTENSION)
 endif()
 
 set(csync_SRCS
@@ -110,17 +109,29 @@ set_target_properties(
       SOVERSION
         ${LIBRARY_SOVERSION}
 )
-
-INSTALL(
+if(BUILD_OWNCLOUD_OSX_BUNDLE)
+  INSTALL(
+    TARGETS
+      ${CSYNC_LIBRARY}
+    LIBRARY DESTINATION
+	${LIB_INSTALL_DIR}
+    ARCHIVE DESTINATION
+	${LIB_INSTALL_DIR}
+    RUNTIME DESTINATION
+	${BIN_INSTALL_DIR}
+    )
+else()
+  INSTALL(
   TARGETS
     ${CSYNC_LIBRARY}
   LIBRARY DESTINATION
-    ${LIB_INSTALL_DIR}
+    ${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}
   ARCHIVE DESTINATION
-    ${LIB_INSTALL_DIR}
+    ${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}
   RUNTIME DESTINATION
-    ${BIN_INSTALL_DIR}
-)
+    ${BIN_INSTALL_DIR}/${APPLICATION_EXECUTABLE}
+  )
+endif()
 
 # INSTALL(
 #   FILES

csync/src/csync.c

@@ -191,15 +191,12 @@ int csync_init(CSYNC *ctx) {
   ctx->local.type = LOCAL_REPLICA;
 
   if ( !ctx->options.local_only_mode) {
-      owncloud_init(csync_get_auth_callback(ctx), csync_get_userdata(ctx));
+      owncloud_init(csync_get_userdata(ctx));
       ctx->remote.type = REMOTE_REPLICA;
   } else {
     ctx->remote.type = LOCAL_REPLICA;
   }
 
-  if (ctx->options.timeout)
-    csync_vio_set_property(ctx, "timeout", &ctx->options.timeout);
-
   if (c_rbtree_create(&ctx->local.tree, _key_cmp, _data_cmp) < 0) {
     ctx->status_code = CSYNC_STATUS_TREE_ERROR;
     rc = -1;
@@ -280,11 +277,6 @@ int csync_update(CSYNC *ctx) {
             c_secdiff(finish, start), c_rbtree_size(ctx->local.tree));
   csync_memstat_check();
 
-  if (rc < 0) {
-    ctx->status_code = CSYNC_STATUS_TREE_ERROR;
-    return -1;
-  }
-
   /* update detection for remote replica */
   if( ! ctx->options.local_only_mode ) {
     csync_gettime(&start);
@@ -447,14 +439,15 @@ static int _csync_treewalk_visitor(void *obj, void *data) {
       trav.rename_path  = cur->destpath;
       trav.etag         = cur->etag;
       trav.file_id      = cur->file_id;
+      trav.inode        = cur->inode;
 
       trav.error_status = cur->error_status;
       trav.should_update_etag = cur->should_update_etag;
 
       if( other_node ) {
           csync_file_stat_t *other_stat = (csync_file_stat_t*)other_node->data;
-          trav.other.etag = other_stat->etag ? c_strdup(other_stat->etag) : NULL;
-          trav.other.file_id = c_strdup(other_stat->file_id);
+          trav.other.etag = other_stat->etag;
+          trav.other.file_id = other_stat->file_id;
           trav.other.instruction = other_stat->instruction;
           trav.other.modtime = other_stat->modtime;
           trav.other.size = other_stat->size;
@@ -629,6 +622,8 @@ int csync_commit(CSYNC *ctx) {
   _csync_clean_ctx(ctx);
 
   ctx->remote.read_from_db = 0;
+  ctx->read_from_db_disabled = 0;
+
 
   /* Create new trees */
   rc = c_rbtree_create(&ctx->local.tree, _key_cmp, _data_cmp);
@@ -923,3 +918,10 @@ int csync_set_module_property(CSYNC* ctx, const char* key, void* value)
     return csync_vio_set_property(ctx, key, value);
 }
 
+
+int csync_set_read_from_db(CSYNC* ctx, int enabled)
+{
+    ctx->read_from_db_disabled = !enabled;
+    return 0;
+}
+

csync/src/csync.h

@@ -102,7 +102,8 @@ enum csync_status_codes_e {
     /* Codes for file individual status: */
     CSYNC_STATUS_INDIVIDUAL_IS_SYMLINK,
     CSYNC_STATUS_INDIVIDUAL_IGNORE_LIST,
-    CSYNC_STATUS_INDIVIDUAL_IS_INVALID_CHARS
+    CSYNC_STATUS_INDIVIDUAL_IS_INVALID_CHARS,
+    CYSNC_STATUS_FILE_LOCKED_OR_OPEN
 };
 
 typedef enum csync_status_codes_e CSYNC_STATUS;
@@ -130,10 +131,7 @@ enum csync_instructions_e {
   CSYNC_INSTRUCTION_IGNORE     = 0x00000020,  /* The file is ignored (UPDATE|RECONCILE) */
   CSYNC_INSTRUCTION_SYNC       = 0x00000040,  /* The file need to be pushed to the other remote (RECONCILE) */
   CSYNC_INSTRUCTION_STAT_ERROR = 0x00000080,
-  CSYNC_INSTRUCTION_ERROR      = 0x00000100,
-  /* instructions for the propagator */
-  CSYNC_INSTRUCTION_DELETED    = 0x00000200,
-  CSYNC_INSTRUCTION_UPDATED    = 0x00000400
+  CSYNC_INSTRUCTION_ERROR      = 0x00000100
 };
 
 enum csync_ftw_type_e {
@@ -172,6 +170,7 @@ enum csync_notify_type_e {
 struct csync_tree_walk_file_s {
     const char *path;
     int64_t     size;
+    int64_t     inode;
     time_t      modtime;
 #ifdef _WIN32
     uint32_t    uid;
@@ -591,6 +590,11 @@ void csync_resume(CSYNC *ctx);
  */
 int  csync_abort_requested(CSYNC *ctx);
 
+/**
+ * Specify if it is allowed to read the remote tree from the DB (default to enabled)
+ */
+int csync_set_read_from_db(CSYNC* ctx, int enabled);
+
 #ifdef __cplusplus
 }
 #endif

csync/src/csync_exclude.c

@@ -144,6 +144,7 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) {
   char *bname = NULL;
   char *dname = NULL;
   char *prev_dname = NULL;
+  char *conflict = NULL;
   int rc = -1;
   CSYNC_EXCLUDE_TYPE match = CSYNC_NOT_EXCLUDED;
   CSYNC_EXCLUDE_TYPE type  = CSYNC_NOT_EXCLUDED;
@@ -200,6 +201,19 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) {
       goto out;
   }
 
+  if (getenv("CSYNC_CONFLICT_FILE_USERNAME")) {
+      asprintf(&conflict, "*_conflict_%s-*", getenv("CSYNC_CONFLICT_FILE_USERNAME"));
+      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);
 
@@ -215,6 +229,7 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) {
 
       type = CSYNC_FILE_EXCLUDE_LIST;
       if (strlen(pattern) < 1) {
+	  SAFE_FREE(pattern_stored);
           continue;
       }
       /* Ecludes starting with ']' means it can be cleanup */
@@ -250,6 +265,9 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) {
 
           if (bname == NULL || dname == NULL) {
               match = CSYNC_NOT_EXCLUDED;
+	      SAFE_FREE(bname);
+	      SAFE_FREE(dname);
+              SAFE_FREE(pattern_stored);
               goto out;
           }
 

csync/src/csync_owncloud.c

@@ -60,7 +60,7 @@ struct dav_session_s dav_session; /* The DAV Session, initialised in dav_connect
 int _connected = 0;                   /* flag to indicate if a connection exists, ie.
                                      the dav_session is valid */
 
-csync_auth_callback _authcb;
+
 void *_userdata;
 long long chunked_total_size = 0;
 long long chunked_done = 0;
@@ -123,6 +123,7 @@ static int verify_sslcert(void *userdata, int failures,
     char buf[MAX(NE_SSL_DIGESTLEN, NE_ABUFSIZ)];
     int ret = -1;
     const ne_ssl_certificate *cert = certificate;
+    csync_auth_callback authcb = NULL;
 
     (void) userdata;
     memset( problem, 0, LEN );
@@ -160,11 +161,14 @@ static int verify_sslcert(void *userdata, int failures,
     }
     addSSLWarning( problem, "Do you want to accept the certificate chain anyway?\nAnswer yes to do so and take the risk: ", LEN );
 
-    if( _authcb ){
+    if( dav_session.csync_ctx ) {
+        authcb = csync_get_auth_callback( dav_session.csync_ctx );
+    }
+    if( authcb ){
         /* call the csync callback */
         DEBUG_WEBDAV("Call the csync callback for SSL problems");
         memset( buf, 0, NE_ABUFSIZ );
-        (*_authcb) ( problem, buf, NE_ABUFSIZ-1, 1, 0, _userdata );
+        (*authcb) ( problem, buf, NE_ABUFSIZ-1, 1, 0, _userdata );
         if( buf[0] == 'y' || buf[0] == 'Y') {
             ret = 0;
         } else {
@@ -184,6 +188,8 @@ static int ne_auth( void *userdata, const char *realm, int attempt,
                     char *username, char *password)
 {
     char buf[NE_ABUFSIZ];
+    csync_auth_callback authcb = NULL;
+    int re = attempt;
 
     (void) userdata;
     (void) realm;
@@ -199,24 +205,29 @@ static int ne_auth( void *userdata, const char *realm, int attempt,
             if( dav_session.pwd && strlen( dav_session.pwd ) < NE_ABUFSIZ ) {
                 strcpy( password, dav_session.pwd );
             }
-        } else if( _authcb != NULL ){
-            /* call the csync callback */
-            DEBUG_WEBDAV("Call the csync callback for %s", realm );
-            memset( buf, 0, NE_ABUFSIZ );
-            (*_authcb) ("Enter your username: ", buf, NE_ABUFSIZ-1, 1, 0, _userdata );
-            if( strlen(buf) < NE_ABUFSIZ ) {
-                strcpy( username, buf );
-            }
-            memset( buf, 0, NE_ABUFSIZ );
-            (*_authcb) ("Enter your password: ", buf, NE_ABUFSIZ-1, 0, 0, _userdata );
-            if( strlen(buf) < NE_ABUFSIZ) {
-                strcpy( password, buf );
-            }
         } else {
-            DEBUG_WEBDAV("I can not authenticate!");
+            if( dav_session.csync_ctx ) {
+               authcb = csync_get_auth_callback( dav_session.csync_ctx );
+            }
+            if( authcb != NULL ){
+                /* call the csync callback */
+                DEBUG_WEBDAV("Call the csync callback for %s", realm );
+                memset( buf, 0, NE_ABUFSIZ );
+                (*authcb) ("Enter your username: ", buf, NE_ABUFSIZ-1, 1, 0, _userdata );
+                if( strlen(buf) < NE_ABUFSIZ ) {
+                    strcpy( username, buf );
+                }
+                memset( buf, 0, NE_ABUFSIZ );
+                (*authcb) ("Enter your password: ", buf, NE_ABUFSIZ-1, 0, 0, _userdata );
+                if( strlen(buf) < NE_ABUFSIZ) {
+                    strcpy( password, buf );
+                }
+            } else {
+                re = 1;
+            }
         }
     }
-    return attempt;
+    return re;
 }
 
 /*
@@ -508,10 +519,10 @@ static int dav_connect(const char *base_url) {
         goto out;
     }
 
-    if (dav_session.read_timeout == 0)
-        dav_session.read_timeout = 300;  // set 300 seconds as default.
-
-    ne_set_read_timeout(dav_session.ctx, dav_session.read_timeout);
+    if (dav_session.read_timeout != 0) {
+        ne_set_read_timeout(dav_session.ctx, dav_session.read_timeout);
+        DEBUG_WEBDAV("Timeout set to %u seconds", dav_session.read_timeout );
+    }
 
     snprintf( uaBuf, sizeof(uaBuf), "Mozilla/5.0 (%s) csyncoC/%s",
               get_platform(), CSYNC_STRINGIFY( LIBCSYNC_VERSION ));
@@ -685,7 +696,7 @@ static struct listdir_context *fetch_resource_list(const char *uri, int depth)
             ret = NE_CONNECT;
             set_error_message(req_status->reason_phrase);
         }
-        DEBUG_WEBDAV("Simple propfind result code %d.", req_status->code);
+        DEBUG_WEBDAV("Simple propfind result code %d.", req_status ? req_status->code : -1);
     } else {
         if( ret == NE_ERROR && req_status->code == 404) {
             errno = ENOENT;
@@ -982,8 +993,10 @@ int owncloud_commit(void) {
 
   clean_caches();
 
-  if( dav_session.ctx )
-    ne_session_destroy( dav_session.ctx );
+  if( dav_session.ctx ) {
+      ne_forget_auth(dav_session.ctx);
+      ne_session_destroy( dav_session.ctx );
+  }
   /* DEBUG_WEBDAV( "********** vio_module_shutdown" ); */
 
   dav_session.ctx = 0;
@@ -1047,10 +1060,9 @@ int owncloud_set_property(const char *key, void *data) {
     return -1;
 }
 
-void owncloud_init(csync_auth_callback cb, void *userdata) {
+void owncloud_init(void *userdata) {
 
     _userdata = userdata;
-    _authcb = cb;
     _connected = 0;  /* triggers dav_connect to go through the whole neon setup */
 
     memset(&dav_session, 0, sizeof(dav_session));

csync/src/csync_owncloud.h

@@ -173,7 +173,7 @@ int owncloud_closedir(csync_vio_handle_t *dhandle);
 int owncloud_stat(const char *uri, csync_vio_file_stat_t *buf);
 int owncloud_commit(void);
 char *owncloud_error_string(void);
-void owncloud_init(csync_auth_callback cb, void *userdata);
+void owncloud_init(void *userdata);
 int owncloud_set_property(const char *key, void *data);
 
 #endif /* CSYNC_OWNCLOUD_H */

csync/src/csync_owncloud_recursive_propfind.c

@@ -236,13 +236,12 @@ static void propfind_results_recursive(void *userdata,
             }
 
             /* DEBUG_WEBDAV("results_recursive Added child %s to collection %s", newres->uri, element->self->uri); */
-        } else {
-            /* DEBUG_WEBDAV("results_recursive No parent %s found for child %s", parentPath, newres->uri); */
-            resource_free(newres);
-            newres = NULL;
+            return;
         }
     }
 
+    resource_free(newres);
+    newres = NULL;
 }
 
 void fetch_resource_list_recursive(const char *uri, const char *curi)

csync/src/csync_private.h

@@ -161,6 +161,7 @@ struct csync_s {
   int status;
   volatile int abort;
   void *rename_info;
+  int  read_from_db_disabled;
 };
 
 

csync/src/csync_reconcile.c

@@ -183,6 +183,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
                     if( !c_streq(cur->file_id, "") ) {
                         csync_vio_set_file_id( other->file_id, cur->file_id );
                     }
+                    other->inode = cur->inode;
                     cur->instruction = CSYNC_INSTRUCTION_NONE;
                 } else if (other->instruction == CSYNC_INSTRUCTION_REMOVE) {
                     other->instruction = CSYNC_INSTRUCTION_RENAME;
@@ -191,7 +192,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
                     if( !c_streq(cur->file_id, "") ) {
                         csync_vio_set_file_id( other->file_id, cur->file_id );
                     }
-
+                    other->inode = cur->inode;
                     cur->instruction = CSYNC_INSTRUCTION_NONE;
                 } else if (other->instruction == CSYNC_INSTRUCTION_NEW) {
                     CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "OOOO=> NEW detected in other tree!");
@@ -223,22 +224,37 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
         /* file on current replica is changed or new */
         case CSYNC_INSTRUCTION_EVAL:
         case CSYNC_INSTRUCTION_NEW:
+            // This operation is usually a no-op and will by default return false
+            if (csync_file_locked_or_open(ctx->local.uri, cur->path)) {
+                CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "[Reconciler] IGNORING file %s/%s since it is locked / open", ctx->local.uri, cur->path);
+                cur->instruction = CSYNC_INSTRUCTION_ERROR;
+                if (cur->error_status == CSYNC_STATUS_OK) // don't overwrite error
+                    cur->error_status = CYSNC_STATUS_FILE_LOCKED_OR_OPEN;
+                break;
+            } else {
+                //CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "[Reconciler] not ignoring file %s/%s", ctx->local.uri, cur->path);
+            }
             switch (other->instruction) {
             /* file on other replica is changed or new */
             case CSYNC_INSTRUCTION_NEW:
             case CSYNC_INSTRUCTION_EVAL:
-                if (other->type == CSYNC_VIO_FILE_TYPE_DIRECTORY &&
-                        cur->type == CSYNC_VIO_FILE_TYPE_DIRECTORY) {
+                if (other->type == CSYNC_FTW_TYPE_DIR &&
+                        cur->type == CSYNC_FTW_TYPE_DIR) {
                     is_equal_files = (other->modtime == cur->modtime);
                 } else {
                     is_equal_files = ((other->size == cur->size) && (other->modtime == cur->modtime));
                 }
                 if (is_equal_files) {
                     /* The files are considered equal. */
-                    cur->instruction = CSYNC_INSTRUCTION_UPDATED; /* update the DB */
+                    cur->instruction = CSYNC_INSTRUCTION_NONE;
                     other->instruction = CSYNC_INSTRUCTION_NONE;
 
-                    if( !cur->etag && other->etag ) cur->etag = c_strdup(other->etag);
+                    /* update DB with new etag from remote */
+                    if (ctx->current == LOCAL_REPLICA) {
+                        other->should_update_etag = true;
+                    } else {
+                        cur->should_update_etag = true;
+                    }
                 } else if(ctx->current == REMOTE_REPLICA) {
                         cur->instruction = CSYNC_INSTRUCTION_CONFLICT;
                         other->instruction = CSYNC_INSTRUCTION_NONE;

csync/src/csync_statedb.c

@@ -32,6 +32,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include "c_lib.h"
 #include "csync_private.h"
@@ -68,12 +69,11 @@ static void _csync_win32_hide_file( const char *file ) {
   fileName = c_utf8_to_locale( file );
   dwAttrs = GetFileAttributesW(fileName);
 
-  if (dwAttrs==INVALID_FILE_ATTRIBUTES) return;
-
-  if (!(dwAttrs & FILE_ATTRIBUTE_HIDDEN)) {
-     SetFileAttributesW(fileName, dwAttrs | FILE_ATTRIBUTE_HIDDEN );
+  if (dwAttrs != INVALID_FILE_ATTRIBUTES) {
+      if (!(dwAttrs & FILE_ATTRIBUTE_HIDDEN)) {
+          SetFileAttributesW(fileName, dwAttrs | FILE_ATTRIBUTE_HIDDEN );
+      }
   }
-
   c_free_locale_string(fileName);
 #else
     (void) file;
@@ -155,6 +155,8 @@ static int _csync_statedb_check(const char *statedb) {
                     }
                 }
             }
+        } else {
+            close(fd);
         }
         /* if it comes here, the database is broken and should be recreated. */
         _tunlink(wstatedb);
@@ -529,7 +531,7 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {
     if( rc != SQLITE_DONE ) {
         ctx->status_code = CSYNC_STATUS_TREE_ERROR;
     } else {
-        CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "%ld entries read below path %s from db.", cnt, path);
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "%" PRId64 " entries read below path %s from db.", cnt, path);
     }
     sqlite3_finalize(stmt);
     SAFE_FREE(likepath);

csync/src/csync_update.c

@@ -79,6 +79,26 @@ static uint64_t _hash_of_file(CSYNC *ctx, const char *file) {
   return h;
 }
 
+#ifdef NO_RENAME_EXTENSION
+/* Return true if the two path have the same extension. false otherwise. */
+static bool _csync_sameextension(const char *p1, const char *p2) {
+    /* Find pointer to the extensions */
+    const char *e1 = strrchr(p1, '.');
+    const char *e2 = strrchr(p2, '.');
+
+    /* If the found extension contains a '/', it is because the . was in the folder name
+     *            => no extensions */
+    if (e1 && strchr(e1, '/')) e1 = NULL;
+    if (e2 && strchr(e2, '/')) e2 = NULL;
+
+    /* If none have extension, it is the same extension */
+    if (!e1 && !e2)
+        return true;
+
+    /* c_streq takes care of the rest */
+    return c_streq(e1, e2);
+}
+#endif
 
 static int _csync_detect_update(CSYNC *ctx, const char *file,
     const csync_vio_file_stat_t *fs, const int type) {
@@ -235,18 +255,32 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
             goto out;
         }
         if (type == CSYNC_FTW_TYPE_DIR && ctx->current == REMOTE_REPLICA
-                && c_streq(fs->file_id, tmp->file_id)) {
+                && c_streq(fs->file_id, tmp->file_id) && !ctx->read_from_db_disabled) {
             /* If both etag and file id are equal for a directory, read all contents from
-             * the database. */
+             * the database.
+             * The comparison of file id ensure that we fetch all the file id when upgrading from
+             * owncloud 5 to owncloud 6.
+             */
             CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Reading from database: %s", path);
             ctx->remote.read_from_db = true;
         }
+
+        if (!c_streq(fs->file_id, tmp->file_id) && ctx->current == REMOTE_REPLICA) {
+            /* file id has changed. Which means we need to update the DB.
+             * (upgrade from owncloud 5 to owncloud 6 for instence) */
+            st->should_update_etag = true;
+        }
         st->instruction = CSYNC_INSTRUCTION_NONE;
     } else {
         enum csync_vio_file_type_e tmp_vio_type = CSYNC_VIO_FILE_TYPE_UNKNOWN;
 
+        /* tmp might point to malloc mem, so free it here before reusing tmp  */
+        SAFE_FREE(tmp);
+
         /* check if it's a file and has been renamed */
         if (ctx->current == LOCAL_REPLICA) {
+            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Checking for rename based on inode # %" PRId64 "", (uint64_t) fs->inode);
+
             tmp = csync_statedb_get_stat_by_inode(ctx, fs->inode);
 
             /* translate the file type between the two stat types csync has. */
@@ -259,8 +293,12 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
             }
 
             if (tmp && tmp->inode == fs->inode && tmp_vio_type == fs->type
-                    && (tmp->modtime == fs->mtime || fs->type == CSYNC_VIO_FILE_TYPE_DIRECTORY)) {
-                CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "inodes: %" PRId64 " <-> %" PRId64, (uint64_t) tmp->inode, (uint64_t) fs->inode);
+                    && (tmp->modtime == fs->mtime || fs->type == CSYNC_VIO_FILE_TYPE_DIRECTORY)
+#ifdef NO_RENAME_EXTENSION
+                    && _csync_sameextension(tmp->path, path)
+#endif
+               ) {
+                CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "pot rename detected based on inode # %" PRId64 "", (uint64_t) fs->inode);
                 /* inode found so the file has been renamed */
                 st->instruction = CSYNC_INSTRUCTION_EVAL_RENAME;
                 if (fs->type == CSYNC_VIO_FILE_TYPE_DIRECTORY) {
@@ -443,7 +481,6 @@ static bool fill_tree_from_db(CSYNC *ctx, const char *uri)
 /* File tree walker */
 int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
     unsigned int depth) {
-  char errbuf[256] = {0};
   char *filename = NULL;
   char *d_name = NULL;
   csync_vio_handle_t *dh = NULL;
@@ -487,10 +524,7 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
               CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "asprintf failed!");
           }
       } else {
-          C_STRERROR(errno, errbuf, sizeof(errbuf));
-          CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR,
-                    "opendir failed for %s - %s (errno %d)",
-                    uri, errbuf, errno);
+          CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "opendir failed for %s - errno %d", uri, errno);
       }
       goto error;
   }
@@ -638,7 +672,8 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
       }
     }
 
-    if (ctx->current_fs && (ctx->current_fs->instruction == CSYNC_INSTRUCTION_EVAL ||
+    if (flag == CSYNC_FTW_FLAG_DIR && ctx->current_fs
+        && (ctx->current_fs->instruction == CSYNC_INSTRUCTION_EVAL ||
             ctx->current_fs->instruction == CSYNC_INSTRUCTION_NEW ||
             ctx->current_fs->instruction == CSYNC_INSTRUCTION_EVAL_RENAME)) {
         ctx->current_fs->should_update_etag = true;

csync/src/csync_util.c

@@ -55,8 +55,6 @@ static const _instr_code_struct _instr[] =
   { "INSTRUCTION_SYNC", CSYNC_INSTRUCTION_SYNC },
   { "INSTRUCTION_STAT_ERR", CSYNC_INSTRUCTION_STAT_ERROR },
   { "INSTRUCTION_ERROR", CSYNC_INSTRUCTION_ERROR },
-  { "INSTRUCTION_DELETED", CSYNC_INSTRUCTION_DELETED },
-  { "INSTRUCTION_UPDATED", CSYNC_INSTRUCTION_UPDATED },
   { NULL, CSYNC_INSTRUCTION_ERROR }
 };
 
@@ -115,12 +113,12 @@ void csync_win32_set_file_hidden( const char *file, bool h ) {
   fileName = c_utf8_to_locale( file );
   dwAttrs = GetFileAttributesW(fileName);
 
-  if (dwAttrs==INVALID_FILE_ATTRIBUTES) return;
-
-  if (h && !(dwAttrs & FILE_ATTRIBUTE_HIDDEN)) {
-     SetFileAttributesW(fileName, dwAttrs | FILE_ATTRIBUTE_HIDDEN );
-  } else if (!h && (dwAttrs & FILE_ATTRIBUTE_HIDDEN)) {
-     SetFileAttributesW(fileName, dwAttrs & ~FILE_ATTRIBUTE_HIDDEN );
+  if (dwAttrs != INVALID_FILE_ATTRIBUTES) {
+      if (h && !(dwAttrs & FILE_ATTRIBUTE_HIDDEN)) {
+          SetFileAttributesW(fileName, dwAttrs | FILE_ATTRIBUTE_HIDDEN );
+      } else if (!h && (dwAttrs & FILE_ATTRIBUTE_HIDDEN)) {
+          SetFileAttributesW(fileName, dwAttrs & ~FILE_ATTRIBUTE_HIDDEN );
+      }
   }
 
   c_free_locale_string(fileName);
@@ -182,3 +180,22 @@ csync_vio_file_stat_t *csync_vio_convert_file_stat(csync_file_stat_t *st) {
 
   return vfs;
 }
+
+bool (*csync_file_locked_or_open_ext) (const char*) = 0; // filled in by library user
+void set_csync_file_locked_or_open_ext(bool (*f) (const char*));
+void set_csync_file_locked_or_open_ext(bool (*f) (const char*)) {
+    csync_file_locked_or_open_ext = f;
+}
+
+bool csync_file_locked_or_open( const char *dir, const char *fname) {
+    char *tmp_uri = NULL;
+    bool ret;
+    if (!csync_file_locked_or_open_ext) {
+        return false;
+    }
+    asprintf(&tmp_uri, "%s/%s", dir, fname);
+    CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "csync_file_locked_or_open %s", tmp_uri);
+    ret = csync_file_locked_or_open_ext(tmp_uri);
+    SAFE_FREE(tmp_uri);
+    return ret;
+}

csync/src/csync_util.h

@@ -35,4 +35,5 @@ void csync_win32_set_file_hidden( const char *file, bool hidden );
 /* Convert a csync_file_stat_t to csync_vio_file_stat_t */
 csync_vio_file_stat_t *csync_vio_convert_file_stat(csync_file_stat_t *st);
 
+bool csync_file_locked_or_open( const char *dir, const char *fname);
 #endif /* _CSYNC_UTIL_H */

csync/src/httpbf/src/httpbf.c

@@ -204,9 +204,9 @@ void hbf_free_transfer( hbf_transfer_t *transfer ) {
 
     for( cnt = 0; cnt < transfer->block_cnt; cnt++ ) {
         hbf_block_t *block = transfer->block_arr[cnt];
+        if( !block ) continue;
         if( block->http_error_msg ) free( block->http_error_msg );
         if( block->etag ) free( block->etag );
-        if( block ) free(block);
     }
     free( transfer->block_arr );
     free( transfer->url );
@@ -536,8 +536,8 @@ Hbf_State hbf_transfer( ne_session *session, hbf_transfer_t *transfer, const cha
             } else {
                 state = HBF_MEMORY_FAIL;
             }
-            free( transfer_url );
         }
+        free( transfer_url );
     }
 
     /* do the source file validation finally (again). */

csync/src/std/c_macro.h

@@ -55,9 +55,6 @@
 /** Get the size of an array */
 #define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
 
-/** Macro to make strerror_r work with -Werror=unused-result */
-#define C_STRERROR(errno, buf, size) if(strerror_r(errno, buf, size)) {}
-
 /**
  * This is a hack to fix warnings. The idea is to use this everywhere that we
  * get the "discarding const" warning by the compiler. That doesn't actually

csync/src/std/c_time.c

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

csync/src/vio/csync_vio.c

@@ -113,11 +113,6 @@ int csync_vio_stat(CSYNC *ctx, const char *uri, csync_vio_file_stat_t *buf) {
       if (rc < 0) {
         CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "Local stat failed, errno %d", errno);
       }
-#ifdef _WIN32
-      else {
-        CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Win32: STAT-inode for %s: %llu", uri, buf->inode );
-      }
-#endif
       break;
     default:
       break;

csync/src/vio/csync_vio_local.c

@@ -240,6 +240,9 @@ int csync_vio_local_stat(const char *uri, csync_vio_file_stat_t *buf) {
     /* printf("Index: %I64i\n", FileIndex.QuadPart); */
     buf->inode = FileIndex.QuadPart;
 
+    buf->size = (fileInfo.nFileSizeHigh * ((int64_t)(MAXDWORD)+1)) + fileInfo.nFileSizeLow;
+    buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_SIZE;
+
     /* Get the file time with a win32 call rather than through stat. See
       * http://www.codeproject.com/Articles/1144/Beating-the-Daylight-Savings-Time-bug-and-getting
       * for deeper explanation.
@@ -257,6 +260,7 @@ int csync_vio_local_stat(const char *uri, csync_vio_file_stat_t *buf) {
         buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_CTIME;
     }
 
+    c_free_locale_string(wuri);
     CloseHandle(h);
 
     return 0;

csync/tests/csync_tests/check_csync_statedb_query.c

@@ -243,19 +243,6 @@ static void check_csync_statedb_get_stat_by_hash_not_found(void **state)
     free(tmp);
 }
 
-static void check_csync_statedb_get_stat_by_inode(void **state)
-{
-    CSYNC *csync = *state;
-    csync_file_stat_t *tmp;
-
-    tmp = csync_statedb_get_stat_by_inode(csync, (ino_t) 23);
-    assert_non_null(tmp);
-
-    assert_int_equal(tmp->phash, 42);
-    assert_int_equal(tmp->inode, 23);
-
-    free(tmp);
-}
 
 static void check_csync_statedb_get_stat_by_inode_not_found(void **state)
 {
@@ -272,14 +259,10 @@ int torture_run_tests(void)
         unit_test_setup_teardown(check_csync_statedb_query_statement, setup, teardown),
         unit_test_setup_teardown(check_csync_statedb_create_error, setup, teardown),
         unit_test_setup_teardown(check_csync_statedb_insert_statement, setup, teardown),
-      /*  unit_test_setup_teardown(check_csync_statedb_is_empty, setup, teardown), */
-      /*  unit_test_setup_teardown(check_csync_statedb_create_tables, setup, teardown), */
         unit_test_setup_teardown(check_csync_statedb_drop_tables, setup, teardown),
         unit_test_setup_teardown(check_csync_statedb_insert_metadata, setup, teardown),
         unit_test_setup_teardown(check_csync_statedb_write, setup, teardown),
-     /*   unit_test_setup_teardown(check_csync_statedb_get_stat_by_hash, setup_db, teardown), */
         unit_test_setup_teardown(check_csync_statedb_get_stat_by_hash_not_found, setup_db, teardown),
-      /* unit_test_setup_teardown(check_csync_statedb_get_stat_by_inode, setup_db, teardown), */
         unit_test_setup_teardown(check_csync_statedb_get_stat_by_inode_not_found, setup_db, teardown),
     };
 

csync/tests/csync_tests/check_csync_update.c

@@ -233,8 +233,6 @@ static void check_csync_detect_update_db_none(void **state)
     st = c_rbtree_node_data(csync->local.tree->root);
     assert_int_equal(st->instruction, CSYNC_INSTRUCTION_NEW);
 
-    /* set the instruction to UPDATED that it gets written to the statedb */
-    st->instruction = CSYNC_INSTRUCTION_UPDATED;
 
     /* create a statedb */
     csync_set_status(csync, 0xFFFF);
@@ -262,9 +260,6 @@ static void check_csync_detect_update_db_eval(void **state)
     st = c_rbtree_node_data(csync->local.tree->root);
     assert_int_equal(st->instruction, CSYNC_INSTRUCTION_NEW);
 
-    /* set the instruction to UPDATED that it gets written to the statedb */
-    st->instruction = CSYNC_INSTRUCTION_UPDATED;
-
     /* create a statedb */
     csync_set_status(csync, 0xFFFF);
 
@@ -344,8 +339,6 @@ static void check_csync_detect_update_db_new(void **state)
     st = c_rbtree_node_data(csync->local.tree->root);
     assert_int_equal(st->instruction, CSYNC_INSTRUCTION_NEW);
 
-    /* set the instruction to UPDATED that it gets written to the statedb */
-    st->instruction = CSYNC_INSTRUCTION_UPDATED;
 
     /* create a statedb */
     csync_set_status(csync, 0xFFFF);

csync/tests/ownCloud/ownCloud/Test.pm

@@ -34,6 +34,7 @@ use LWP::UserAgent;
 use LWP::Protocol::https;
 use HTTP::Request::Common qw( POST GET DELETE );
 use File::Basename;
+use POSIX qw/strftime/;
 
 use Encode qw(from_to);
 use utf8;
@@ -128,8 +129,9 @@ sub initTesting(;$)
   # $d->DebugLevel(3);
   $prefix = "t1" unless( defined $prefix );
   
-  my $dirId = sprintf("%#.3o", rand(1000));
-  my $dir = sprintf( "%s-%s/", $prefix, $dirId );
+  my $dirId = sprintf("%02d", rand(100));
+  my $dateTime = strftime('%Y%m%d%H%M%S',localtime);
+  my $dir = sprintf( "%s-%s-%s/", $prefix, $dateTime, $dirId );
   
   $localDir = $dir;
   $localDir .= "/" unless( $localDir =~ /\/$/ );

csync/tests/ownCloud/t1.pl

@@ -56,13 +56,13 @@ assertLocalDirs( 'toremote1', localDir().'remoteToLocal1' );
 
 # Check if the synced files from ownCloud have the same timestamp as the local ones.
 print "\nNow assert remote 'toremote1' with local " . localDir() . " :\n";
-assertLocalAndRemoteDir( 'remoteToLocal1', 0);
+assertLocalAndRemoteDir( '', 0);
 
 # remove a local file.
 printInfo( "\nRemove a local file\n" );
-unlink( localDir() . 'remoteToLocal1/kernelcrash.txt' );
+unlink( localDir() . 'remoteToLocal1/rtl4/quitte.pdf' );
 csync();
-assertLocalAndRemoteDir( 'remoteToLocal1', 0);
+assertLocalAndRemoteDir( '', 0);
 
 # add local files to a new dir1
 printInfo( "Add some more files to local:");
@@ -76,34 +76,46 @@ foreach my $file ( <./tolocal1/*> ) {
 }
 csync( );
 print "\nAssert local and remote dirs.\n";
-assertLocalAndRemoteDir( 'fromLocal1', 0);
+assertLocalAndRemoteDir( '', 0);
 
 # move a local file
 printInfo( "Move a file locally." );
 move( "$locDir/kramer.jpg", "$locDir/oldtimer.jpg" );
 csync( );
-assertLocalAndRemoteDir( 'fromLocal1', 0);
+assertLocalAndRemoteDir( '', 0);
 
 # move a local directory.
 printInfo( "Move a local directory." );
 move( localDir() . 'remoteToLocal1/rtl1', localDir(). 'remoteToLocal1/rtlX');
 csync();
-assertLocalAndRemoteDir( 'fromLocal1', 0);
+assertLocalAndRemoteDir( '', 0);
 
 # remove a local dir
 printInfo( "Remove a local directory.");
 localCleanup( 'remoteToLocal1/rtlX' );
 csync();
-assertLocalAndRemoteDir( 'fromLocal1', 0);
+assertLocalAndRemoteDir( '', 0);
 assert( ! -e localDir().'remoteToLocal1/rtlX' );
 
-# create a false conflict, only the mtimes are changed, by content are equal.
-printInfo( "Create a false conflict.");
-my $srcFile = 'toremote1/kernelcrash.txt';
-put_to_dir( $srcFile, 'remoteToLocal1' );
+# create twos false conflict, only the mtimes are changed, by content are equal.
+printInfo( "Create two false conflict.");
+put_to_dir( 'toremote1/kernelcrash.txt', 'remoteToLocal1' );
+put_to_dir( 'toremote1/kraft_logo.gif', 'remoteToLocal1' );
+# don't wait so mtime are likely the same on the client and the server.
+system( "touch " . localDir() . "remoteToLocal1/kraft_logo.gif" );
+# wait two second so the mtime are different
 system( "sleep 2 && touch " . localDir() . "remoteToLocal1/kernelcrash.txt" );
+
+
 csync( );
-assertLocalAndRemoteDir( 'fromLocal1', 0);
+assertLocalAndRemoteDir( '', 0);
+
+# The previous sync should have updated the etags, and this should NOT be a conflict
+printInfo( "Update the file again");
+system("echo more data >> " .  localDir() . "remoteToLocal1/kernelcrash.txt");
+system("echo corruption >> " .  localDir() . "remoteToLocal1/kraft_logo.gif");
+csync( );
+assertLocalAndRemoteDir( '', 0);
 
 # create a true conflict.
 printInfo( "Create a conflict." );
@@ -111,13 +123,14 @@ system( "echo \"This is more stuff\" >> /tmp/kernelcrash.txt" );
 put_to_dir( '/tmp/kernelcrash.txt', 'remoteToLocal1' );
 system( "sleep 2 && touch " . localDir() . "remoteToLocal1/kernelcrash.txt" );
 csync();
-assertLocalAndRemoteDir( 'remoteToLocal1', 1);
+assertLocalAndRemoteDir( '', 1);
 
 my $localMD5 = md5OfFile( localDir().'remoteToLocal1/kernelcrash.txt' );
 my $realMD5 = md5OfFile( '/tmp/kernelcrash.txt' );
 print "MD5 compare $localMD5 <-> $realMD5\n";
 assert( $localMD5 eq $realMD5 );
 assert(  glob(localDir().'remoteToLocal1/kernelcrash_conflict-*.txt' ) );
+system("rm " . localDir().'remoteToLocal1/kernelcrash_conflict-*.txt' );
 
 
 # prepare test for issue 1329, rtlX need to be modified
@@ -125,13 +138,13 @@ assert(  glob(localDir().'remoteToLocal1/kernelcrash_conflict-*.txt' ) );
 printInfo( "Add a local directory");
 system("cp -r 'toremote1/rtl1/'  '" . localDir(). "remoteToLocal1/rtlX'");
 csync();
-assertLocalAndRemoteDir( 'fromLocal1', 0);
+assertLocalAndRemoteDir( '', 0);
 
 # remove a local dir (still for issue 1329)
 printInfo( "Remove that directory.");
 localCleanup( 'remoteToLocal1/rtlX' );
 csync();
-assertLocalAndRemoteDir( 'fromLocal1', 0);
+assertLocalAndRemoteDir( '', 0);
 assert( ! -e localDir().'remoteToLocal1/rtlX' );
 
 
@@ -141,7 +154,7 @@ system("cp -r 'toremote1/rtl1/'  '" . localDir(). "remoteToLocal1/rtlX'");
 assert( -e localDir().'remoteToLocal1/rtlX' );
 assert( -e localDir().'remoteToLocal1/rtlX/rtl11/file.txt' );
 csync();
-assertLocalAndRemoteDir( 'fromLocal1', 0);
+assertLocalAndRemoteDir( '', 0);
 assert( -e localDir().'remoteToLocal1/rtlX' );
 assert( -e localDir().'remoteToLocal1/rtlX/rtl11/file.txt' );
 

csync/tests/ownCloud/t2.pl

@@ -80,7 +80,6 @@ assert( $inode == $inode2, "Inode has changed!");
 
 printInfo("Move a file into a sub directory.");
 # now move the file into a sub directory
-$inode = getInode('remoteToLocal1/kernel.txt');
 moveRemoteFile( 'remoteToLocal1/kernel.txt', 'remoteToLocal1/rtl1/');
 
 csync();
@@ -175,6 +174,24 @@ createLocalFile( localDir(). 'remoteToLocal1/rtl2/newRemoteDir/donat.txt', 8021
 csync();
 assertLocalAndRemoteDir( 'remoteToLocal1', 1);
 
+printInfo("simulate a owncloud 5 update by removing all the fileid");
+## simulate a owncloud 5 update by removing all the fileid
+system( "sqlite3 " . localDir() . ".csync_journal.db \"UPDATE metadata SET fileid='';\"");
+#refresh the ids
+csync();
+assertLocalAndRemoteDir( 'remoteToLocal1', 1);
+
+
+printInfo("Move a file from the server");
+$inode = getInode('remoteToLocal1/rtl2/kb1_local_gone.jpg');
+moveRemoteFile( 'remoteToLocal1/rtl2/kb1_local_gone.jpg', 'remoteToLocal1/rtl2/kb1_local_gone2.jpg');
+csync();
+assertLocalAndRemoteDir( 'remoteToLocal1', 1);
+$inode2 = getInode('remoteToLocal1/rtl2/kb1_local_gone2.jpg');
+assert( $inode == $inode2, "Inode has changed 3!");
+
+
+
 cleanup();
 
 # --

csync/tests/ownCloud/toremote1/My Document.doc

@@ -0,0 +1 @@
+A nice document.

csync/tests/ownCloud/toremote1/kernelcrash.txt

@@ -0,0 +1,16 @@
+freitag@zora:~> 
+Message from syslogd@zora at Sep 20 21:35:41 ...
+ kernel:[ 6702.458047] general protection fault: 0000 [#1] PREEMPT SMP 
+
+Message from syslogd@zora at Sep 20 21:35:41 ...
+ kernel:[ 6702.458060] last sysfs file: /sys/devices/LNXSYSTM:00/device:00/PNP0A08:00/device:03/ATK0110:00/hwmon/hwmon0/temp1_label
+
+Message from syslogd@zora at Sep 20 21:35:41 ...
+ kernel:[ 6702.458232] Stack:
+
+Message from syslogd@zora at Sep 20 21:35:41 ...
+ kernel:[ 6702.458262] Call Trace:
+
+Message from syslogd@zora at Sep 20 21:35:41 ...
+ kernel:[ 6702.458375] Code: 00 00 80 00 00 00 48 b9 00 00 00 00 80 ff ff ff 4e 8d 34 30 49 21 ce 48 8b 4c 24 38 49 8d 56 ff 48 3b 54 24 48 4c 0f 43 74 24 40 <48> 8b 11 48 85 d2 0f 84 d4 01 00 00 48 b9 fb 0f 00 00 00 c0 ff 
+

csync/tests/ownCloud/toremote1/rtl2/mettre.xls

@@ -1 +0,0 @@
-some content.

doc/CMakeLists.txt

@@ -4,7 +4,7 @@ if(SPHINX_FOUND)
     set(SPHINX_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees")
     # HTML output directory
     set(SPHINX_HTML_DIR     "${CMAKE_CURRENT_BINARY_DIR}/html")
-    set(SPHINX_MAN_DIR      "${CMAKE_CURRENT_BINARY_DIR}/man")
+    set(SPHINX_MAN_DIR      "${CMAKE_CURRENT_BINARY_DIR}/man1")
     set(SPHINX_PDF_DIR      "${CMAKE_CURRENT_BINARY_DIR}/latex")
     set(SPHINX_QCH_DIR      "${CMAKE_CURRENT_BINARY_DIR}/qthelp")
     set(SPHINX_HTMLHELP_DIR "${CMAKE_CURRENT_BINARY_DIR}/htmlhelp")
@@ -12,12 +12,15 @@ if(SPHINX_FOUND)
     # assets
     set(LATEX_LOGO          "${CMAKE_CURRENT_SOURCE_DIR}/logo-blue.pdf")
 
+    install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL)
+    install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR} OPTIONAL)
+    install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL)
+    install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL)
+
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in" conf.py @ONLY)
 
     if(WITH_DOC)
        add_custom_target(doc ALL DEPENDS doc-html doc-man COMMENT "Building documentation...")
-       install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
-       install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR})
     else(WITH_DOC)
        add_custom_target(doc DEPENDS doc-html doc-man COMMENT "Building documentation...")
     endif(WITH_DOC)
@@ -39,9 +42,6 @@ if(SPHINX_FOUND)
         add_custom_target(doc-pdf $(MAKE) -C ${SPHINX_PDF_DIR} all-pdf
 		                  DEPENDS doc-latex )
         add_dependencies(doc doc-pdf)
-        if (WITH_DOC)
-           install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
-        endif (WITH_DOC)
     endif(PDFLATEX_FOUND)
     if (EXISTS ${QT_QCOLLECTIONGENERATOR_EXECUTABLE})
         add_custom_target( doc-qch-sphinx ${SPHINX_EXECUTABLE}
@@ -53,9 +53,6 @@ if(SPHINX_FOUND)
 		                   ${SPHINX_QCH_DIR}/*.qhcp
 				   DEPENDS doc-qch-sphinx )
         add_dependencies(doc doc-qch)
-        if (WITH_DOC)
-            install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
-        endif (WITH_DOC)
     endif()
     add_custom_target( doc-html ${SPHINX_EXECUTABLE}
 	                        -q -c . -b html

doc/accountsetup.rst

@@ -1,45 +1,42 @@
 Setting up an Account
 =====================
 
-If no account has been configured, the ownCloud Client will automatically
-assist in connecting to your ownCloud server after the application has been
-started.
+If no account has been configured, the ownCloud Client automatically assist in
+connecting to your ownCloud server after the application has been started.
 
-As a first step, specify the URL to your Server. This is the same address
-that is used in the browser.
+To set up an account:
+
+1. Specify the URL to your Server. This is the same address that is used in the browser.
 
 .. image:: images/wizard_url.png
    :scale: 50 %
 
 .. note:: Make sure to use ``https://`` if the server supports it. Otherwise,
-   your password and all data will be transferred to the server unencrypted.
-   This makes it easy for third parties to intercept your communication, and
-   getting hold of your password!
+   your password and all data will be transferred to the server unencrypted.  This
+   makes it easy for third parties to intercept your communication, and getting
+   hold of your password!
 
-Next, enter the username and password.  These are the same credentials used
-to log into the web interface.
+2. Enter the username and password.  These are the same credentials used to log into the web interface.
 
 .. image:: images/wizard_user.png
    :scale: 50 %
 
-Finally, choose the folder that ownCloud Client is supposed to sync the
-contents of your ownCloud account with. By default, this is a folder
-called `ownCloud`, which will be created in the home directory.
+3. Choose the folder with which you want the ownCloud Client to synchronize the
+   contents of your ownCloud account. By default, this is a folder called
+   `ownCloud`. This folder is created in the home directory.
 
 .. image:: images/wizard_targetfolder.png
    :scale: 50 %
 
-At this time, the synchronization between the root directories of the
-ownCloud server will begin.
+   The synchronization between the root directories of the ownCloud server begins.
 
 .. image:: images/wizard_overview.png
    :scale: 50 %
 
-If selecting a local folder that already contains data, there are
-two options that exist.
+When selecting a local folder that already contains data, you can choose from two options:
 
-* Keep local data: If selected, the files in the local folder on the
-  client will be synced up to the ownCloud server.
-* Start a clean sync: If selected, all files in the local folder on
-  the client will be deleted and therefore not synced to the ownCloud
-  server.
+* :guilabel:`Keep local data`: When selected, the files in the local folder on
+  the client are synchronized to the ownCloud server.
+
+* :guilabel:`Start a clean sync`: When selected, all files in the local folder on the
+  client are deleted.  These files are not syncrhonized to the ownCloud server.

doc/architecture.rst

@@ -1,88 +1,96 @@
-Appendix B: Architecture
-========================
+Appendix B: History and Architecture
+====================================
 
-.. index:: architecture 
+.. index:: architecture
 
-The ownCloud project provides desktop sync clients to synchronize the
-contents of local directories on the desktop machines to the ownCloud.
+ownCloud provides desktop sync clients to synchronize the contents of local
+directories from computers, tablets, and handheld devices to the ownCloud
+server.
 
-The syncing is done with csync_, a bidirectional file synchronizing tool which
-provides both a command line client as well as a library. A special module for
-csync was written to synchronize with ownCloud’s built-in WebDAV server.
+Synchronization is accomplished using csync_, a bidirectional file
+synchronizing tool that provides both a command line client as well as a
+library. A special module for csync was written to synchronize with the
+ownCloud built-in WebDAV server.
 
-The ownCloud sync client is based on a tool called mirall initially written by
-Duncan Mac Vicar. Later Klaas Freitag joined the project and enhanced it to work
-with ownCloud server.
+The ownCloud sync client is based on a tool called *mirall*, initially written
+by Duncan Mac Vicar. Later Klaas Freitag joined the project and enhanced it to
+function with the ownCloud server.
 
-ownCloud Client is written in C++ using the `Qt Framework`_. As a result, the
-ownCloud Client runs on the three important platforms Linux, Windows and MacOS.
+The ownCloud Client software is written in C++ using the `Qt Framework`_. As a
+result, the ownCloud Client runs on Linux, Windows, and MacOS.
 
 .. _csync: http://www.csync.org
 .. _`Qt Framework`: http://www.qt-project.org
 
-The Sync Process
-----------------
+The Synchronization Process
+---------------------------
 
-First it is important to recall what syncing is: It tries to keep the files
-on two repositories the same. That means if a file is added to one repository
-it is going to be copied to the other repository. If a file is changed on one
-repository, the change is propagated to the other repository. Also, if a file
-is deleted on one side, it is deleted on the other. As a matter of fact, in
-ownCloud syncing we do not have a typical client/server system where the
-server is always master.
+The process of synchronization keeps files in two separate repositories the same. When syncrhonized:
 
-This is the major difference to other systems like a file backup where just
-changes and new files are propagated but files never get deleted.
+- If a file is added to one repository it is copied to the other synchronized repository.
+- When a file is changed in one repository, the change is propagated to any
+  syncrhonized other repositories- If a file is deleted in one repository, it
+  is deleted in any other.
 
-The ownCloud Client checks both repositories for changes frequently after a
-certain time span. That is refered to as a sync run. In between the local
-repository is monitored by a file system monitor system that starts a sync run
-immediately if something was edited, added or removed.
+It is important to note that the ownCloud synchronization process does not use
+a typical client/server system where the server is always master.  This is a
+major difference between the ownCloud syncrhonizatin process and other systems
+like a file backup, where only changes to files or folders and the addition of
+new files are propagated, but these files and folders are never deleted unless
+explicitly deleted in the backup.
 
-Sync by Time versus ETag
-------------------------
-.. index:: time stamps, file times, etag, unique id 
+During synchronization, the ownCloud Client checks both repositories for
+changes frequently. This process is referred to as a *sync run*. In between
+sync runs, the local repository is monitored by a file system monitoring
+process that starts a sync run immediately if something was edited, added, or
+removed.
 
-Until the release of ownCloud 4.5 and ownCloud Client 1.1, ownCloud employed
-a single file property to decide which file is newer and hence needs to be
-synced to the other repository: the files modification time.
+Synchronization by Time versus ETag
+-----------------------------------
+.. index:: time stamps, file times, etag, unique id
+
+Until the release of ownCloud 4.5 and ownCloud Client 1.1, the ownCloud
+synchronization process employed a single file property -- the file modificatin
+time -- to decide which file was newer and needed to be synchronized to the
+other repository.
 
 The *modification timestamp* is part of the files metadata. It is available on
-every relevant filesystem and is the natural indicator for a file change.
-Modification timestamps do not require special action to create and have
-a general meaning. One design goal of csync is to not require a special server
-component, that’s why it was chosen as the backend component.
+every relevant filesystem and is the typical indicator for a file change.
+Modification timestamps do not require special action to create, and have a
+general meaning. One design goal of csync is to not require a special server
+component. This design goal is why csync was chosen as the backend component.
 
-To compare the modification times of two files from different systems,
-it is needed to operate on the same base. Before version 1.1.0,
-csync requires both sides running on the exact same time, which can
-be achieved through enterprise standard `NTP time synchronisation`_ on all
-machines.
+To compare the modification times of two files from different systems, csync
+must operate on the same base. Before ownCloud Client version 1.1.0, csync
+required both device repositories to run on the exact same time.  This
+requirement was achieved through the use of enterprise standard `NTP time
+synchronisation`_ on all machines.
 
-Since this strategy is rather fragile without NTP, ownCloud 4.5 introduced a
-unique number, which changes whenever the file changes. Although it is a unique
-value, it is not a hash of the file, but a randomly chosen number, which it will
-transmit in the Etag_ field. Since the file number is guaranteed to change if
-the file changes, it can now be used to determine if one of the files has
-changed.
+Because this timing strategy is rather fragile without the use of NTP, ownCloud
+4.5 introduced a unique number (for each file?) that changes whenever the file
+changes. Although this number is a unique value, it is not a hash of the file.
+Instead, it is a randomly chosen number, that is transmitted in the Etag_
+field. Because the file number changes if the file changes, its use is
+guaranteed to determine if one of the files has changed and, thereby, launching
+a synchronization process.
 
-.. note:: ownCloud Client 1.1 and newer require file ID capabilities on the
-   ownCloud server, hence using them with a server earlier than 4.5.0 is
-   not supported.
+.. note:: ownCloud Client release 1.1 and later requires file ID capabilities
+   on the ownCloud server.  Servers that run with release earlier than 4.5.0 do
+   not support using the file ID functionality.
 
-Before the 1.3.0 release of the client the sync process might create faux
-conflict files if time deviates. The original and the conflict files only
-differed in the timestamp, but not in content. This behaviour was changed
-towards a binary check if the files are different.
+Before the 1.3.0 release of the Desktop Client, the synchronization process
+might create faux conflict files if time deviates. Original and changed files
+conflict only in their timestamp, but not in their content. This behaviour was
+changed to employ a binary check if files differ.
 
-Just like files, directories also hold a unique id, which changes whenever
-one of the contained files or directories gets modified. Since this is a
-recursive process, it significantly reduces the effort required for a sync
-cycle, because the client will only walk directories with a modified unique id.
+Like files, directories also hold a unique ID that changes whenever one of the
+contained files or directories is modified. Because this is a recursive
+process, it significantly reduces the effort required for a synchronization
+cycle, because the client only analyzes directories with a modified ID.
 
 
-This table outlines the different sync methods attempted depending
-on server/client combination:
+The following table outlines the different synchronization methods used,
+depending on server/client combination:
 
 .. index:: compatiblity table
 
@@ -98,10 +106,10 @@ on server/client combination:
 | 4.5 or later       | 1.1 or later      | File ID, Time Stamp        |
 +--------------------+-------------------+----------------------------+
 
-It is highly recommended to upgrade to ownCloud 4.5 or later with ownCloud
-Client 1.1 or later, since the time stamp-based sync mechanism can
-lead to data loss in certain edge-cases, especially when multiple clients
-are involved and one of them is not in sync with NTP time.
+We strongly recommend using ownCloud Server release 4.5 or later when using
+ownCloud Client 1.1 or later. Using incompatible time stamp-based
+synchronization mechanism can lead to data loss in rare cases, especially when
+multiple clients are involved and one utilizes a non-synchronized NTP time.
 
 .. _`NTP time synchronisation`: http://en.wikipedia.org/wiki/Network_Time_Protocol
 .. _Etag: http://en.wikipedia.org/wiki/HTTP_ETag
@@ -109,27 +117,28 @@ are involved and one of them is not in sync with NTP time.
 Comparison and Conflict Cases
 -----------------------------
 
-In a sync run the client first has to detect if one of the two repositories have
-changed files. On the local repository, the client traverses the file
-tree and compares the modification time of each file with the value it was 
-before. The previous value is stored in the client's database. If it is not, it
-means that the file has been added to the local repository. Note that on 
-the local side, the modificaton time a good attribute to detect changes because
-it does not depend on time shifts and such.
+As mentioned above, during a *sync run* the client must first detect if one of
+the two repositories have changed files. On the local repository, the client
+traverses the file tree and compares the modification time of each file with an
+expected value stored in its database. If the value is not the same, the client
+determines that the file has been modified in the local repository.
 
-For the remote (ie. ownCloud) repository, the client compares the ETag of each
-file with it's previous value. Again the previous value is queried from the
-database. If the ETag is still the same, the file has not changed.
+.. note:: On the local side, the modificaton time a good attribute to use for detecting changes, because
+the value does not depend on time shifts and such.
 
-In case a file has changed on both, the local and the remote repository since
-the last sync run, it can not easily be decided which version of the file is
-the one that should be used. However, changes to any side must not be lost.
+For the remote (that is, ownCloud server) repository, the client compares the
+ETag of each file with its expected value. Again, the expected ETag value is
+queried from the client database. If the ETag is the same, the file has not
+changed and no synchronization occurs.
 
-That is called a **conflict case**. The client solves it by creating a conflict
-file of the older of the two files and save the newer one under the original
-file name. Conflict files are always created on the client and never on the
-server. The conflict file has the same name as the original file appended with
-the timestamp of the conflict detection.
+In the event a file has changed on both the local and the remote repository
+since the last sync run, it can not easily be decided which version of the file
+is the one that should be used. However, changes to any side be lost.  Instead,
+a *conflict case* is created. The client resolves this conflic by creating a
+conflict file of the older of the two files and saving the newer file under the
+original file name. Conflict files are always created on the client and never
+on the server. The conflict file uses the same name as the original file, but
+is appended with the timestamp of the conflict detection.
 
 
 .. _ignored-files-label:
@@ -137,40 +146,40 @@ the timestamp of the conflict detection.
 Ignored Files
 -------------
 
-ownCloud Client supports that certain files are excluded or ignored from
-the synchronization. There are a couple of system wide file patterns which 
-come with the client. Custom patterns can be added by the user.
+The ownCloud Client supports the ability to exclude or ignore certain files
+from the synchronization process. Some system wide file patterns that are used
+to exclude or ignore files are included with the client by default and the
+ownCloud Client provides the ability to add custom patterns.
 
-ownCloud Client will ignore the following files:
+By default, the ownCloud Client ignores the following files:
 
-* Files matched by one of the pattern in :ref:`ignoredFilesEditor-label`
-* Files containing characters that do not work on certain file systems.
-  Currently, these characters are: `\, :, ?, *, ", >, <, |`
-* Files starting in ``.csync_journal.db*`` (reserved for journalling)
+- Files matched by one of the patterns defined in :ref:`ignoredFilesEditor-label`.
+- Files containing characters that do not work on certain file systems (`\, :, ?, *, ", >, <, |`).
+* Files starting in ``.csync_journal.db*``, as these files are reserved for journalling.
 
-If a pattern is checkmarked in the `ignoredFilesEditor-label` (or if a line in
-the exclude file starts with the character `]` directly followed
-by the file pattern), files matching this pattern are considered fleeting
-meta data. These files are ingored and *removed* by the client if found 
-in the sync folder. This is suitable for meta files created by some 
+If a pattern selected using a checkbox in the `ignoredFilesEditor-label` (or if
+a line in the exclude file starts with the character `]` directly followed by
+the file pattern), files matching the pattern are considered *fleeting meta
+data*. These files are ingored and *removed* by the client if found in the
+synchronized folder. This is suitable for meta files created by some
 applications that have no sustainable meaning.
 
-If a pattern is ending with character `/` it means that only directories are
-matched. The pattern is only applied for directory components of the checked
-filename.
+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 file names against the exclude patterns, the unix standard C
-library function fnmatch is used. It checks the filename against the pattern
-using standard shell wildcard pattern matching. Check `The opengroup website
-<http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_13_01>`
-for the gory details.
+To match filenames against the exclude patterns, the unix standard C library
+function fnmatch is used. This procesx checks the filename against the
+specified pattern using standard shell wildcard pattern matching. For more
+information, please refer to `The opengroup website
+<http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_13_01>`.
 
-The path that is checked is the relative path unter the sync root directory.
+The path that is checked is the relative path under the sync root directory.
+
+**Pattern and File Match Examples:**
 
-Examples:
-^^^^^^^^^
 +-----------+------------------------------+
-| Pattern   | Matches                      |
+| Pattern   | File Matches                 |
 +===========+==============================+
 | ``~$*``   | ``~$foo``, ``~$example.doc`` |
 +-----------+------------------------------+
@@ -183,15 +192,17 @@ Examples:
 The Sync Journal
 ----------------
 
-The client stores the ETag number in a per-directory database,
-called the journal.  It is a hidden file right in the directory
-to be synced.
+The client stores the ETag number in a per-directory database, called the
+*journal*.  This database is a hidden file contained in the directory to be
+synchronized.
 
-If the journal database gets removed, ownCloud Client's CSync backend will
-rebuild the database by comparing the files and their modification times. Thus
-it should be made sure that both server and client synchronized with NTP time
-before restarting the client after a database removal.
+If the journal database is removed, the ownCloud Client CSync backend rebuilds
+the database by comparing the files and their modification times. This process
+ensures that both server and client are synchronized using the appropriate NTP
+time before restarting the client following a database removal.
 
-Pressing ``F5`` in the Account Settings Dialog that allows to "reset" the
-journal. That can be used to recreate the journal database. Use this only
-if advised to do so by the developer or support staff.
+Pressing ``F5`` while in the Account Settings Dialog enables you to "reset" the
+journal. This function can be used to recreate the journal database.
+
+.. note:: We recommend that you use this function only when advised to do so by
+   ownCloud support staff.

doc/autoupdate.rst

@@ -1,81 +1,126 @@
 The Automatic Updater
 =====================
 
-To ensure you're always using the latest version of ownCloud Client, an
-auto-update mechanism has been added in Version 1.5.1. It will ensure
-that will automatically profit from the latest features and bugfixes.
+To ensure that you are always using the latest version of the ownCloud client,
+an auto-update mechanism has been added in Version 1.5.1. The Automatic Updater
+ensures that you automatically profit from the latest features and bugfixes.
 
-The updater works differently depending on the operating system.
+.. note:: The Automatic Updater functions differently, depending on the operating system.
 
 Basic Workflow
 --------------
 
+The following sections describe how to use the Automatic Updater on different operating systems:
+
 Windows
 ^^^^^^^
 
-ownCloud client will check for updates and download the update if one
-is available. You can view the status under ``Settings -> General -> Updates``.
-If an update is available and has been successfully downloaded, ownCloud
-Client will start a silent update prior to its next launch and then start itself.
-If the silent update fails, the client offers a manual download.
+The ownCloud client checks for updates and downloads them when available. You
+can view the update status under ``Settings -> General -> Updates`` in the
+ownCloud client.
 
-.. note:: The user needs to be able to attain administrative privileges
-          to successfully perform the update.
+If an update is available, and has been successfully downloaded, the ownCloud
+client starts a silent update prior to its next launch and then restarts
+itself. Should the silent update fail, the client offers a manual download.
+
+.. note:: Administrative privileges are required to perform the update.
 
 Mac OS X
 ^^^^^^^^
 
-If a new update is available, ownCloud client will ask the user to update
-to the latest version using a pop-up dialog. This is the default for Mac
-OS X applications which use the Sparkle framework.
+If a new update is available, the ownCloud client initializes a pop-up dialog
+to alert you of the update and requesting that you update to the latest
+version. Due to their use of the Sparkle frameworks, this is the default
+process for Mac OS X applications.
 
 Linux
 ^^^^^
 
-Since distributions provide their own update tool, ownCloud Client on Linux
-will not perform any updates on its own. It will, however, check for the
-latest version and passively notify the user (``Settings -> General -> Updates``)
-if an update is available.
+Linux distributions provide their own update tool, so ownCloud clients that use
+the Linux operating system do not perform any updates on their own. Linux
+operating systems do, however, check for the latest version of the ownCloud
+client and passively notify the user (``Settings -> General -> Updates``) when
+an update is available.
 
 
-Preventing Auto Updates
------------------------
+Preventing Automatic Updates
+----------------------------
 
-In controlled environment such as companies or universities, the auto-update
-mechanism might not be desired as it interferes with controlled deployment
-tools and policies. In this case, it is possible to disable the auto-updater
-entirely:
+In controlled environments, such as companies or universities, you might not
+want to enable the auto-update mechanism, as it interferes with controlled
+deployment tools and policies. To address this case, it is possible to disable
+the auto-updater entirely.  The following sections describe how to disable the
+auto-update mechanism for different operating systems.
 
-Windows
-^^^^^^^
+Preventing Automatic Updates in Windows Environents
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-There are two alternative approaches:
+You can prevent automatic updates from occuring in Windows environments using
+one of two methods.  The first method allows users to override the automatic
+update check mechanism whereas the second method prevents any manual overrides.
 
-1. In ``HKEY_LOCAL_MACHINE\Software\ownCloud\ownCloud``, add a key ``skipUpdateCheck`` (of type DWORD) with the value 1 to the machine. This key
-   can be manually overrideen by the same value in ``HKEY_CURRENT_USER``.
+To prevent automatic updates, but allow manual overrides:
 
-2. In ``HKEY_LOCAL_MACHINE\Software\Policies\ownCloud\ownCloud``, add a key
-   ``skipUpdateCheck`` (of type DWORD) with the value 1 to the machine.
-   Setting the value here cannot be overridden by the user and is the preferred
-   way to control the updater behavior via Group Policies.
+1. Migrate to the following directory::
 
-Mac OS X
-^^^^^^^^
+	HKEY_LOCAL_MACHINE\Software\ownCloud\ownCloud
 
-You can disable the update check via a system-wide ``.plist`` file located
-at ``/Library/Preferences/com.owncloud.desktopclient.plist``. Add a new root
-level item of type bool and the name ``skipUpdateCheck`` and set it to ``true``.
-You can also just copy the file
-``owncloud.app/Contents/Resources/deny_autoupdate_com.owncloud.desktopclient.plist```
+2. Add the key ``skipUpdateCheck`` (of type DWORD).
+
+3. Specify a value of ``1`` to the machine.
+
+To manually override this key, use the same value in ``HKEY_CURRENT_USER``.
+
+To prevent automatic updates and disallow manual overrides:
+
+.. note::This is the preferred method of controlling the updater behavior using Group Policies.
+
+1. Migrate to the following directory::
+
+	HKEY_LOCAL_MACHINE\Software\Policies\ownCloud\ownCloud
+
+2. Add the key ``skipUpdateCheck`` (of type DWORD).
+
+3. Specify a value of ``1`` to the machine.
+
+
+Preventing Automatic Updates in Mac OS X Environments
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You can disable the automatic update mechanism in MAC OS X operating systems
+using the system-wide ``.plist`` file.  To access this file:
+
+1. Using the Windows explorer, migrate to the following location::
+
+ 	/Library/Preferences/
+
+ 2. Locate and open the following file::
+
+ 	com.owncloud.desktopclient.plist
+
+3. Add a new root level item of type ``bool``.
+
+4. Name the item ``skipUpdateCheck``.
+
+5. Set the item to ``true``.
+
+Alternatively, you can copy the file
+``owncloud.app/Contents/Resources/deny_autoupdate_com.owncloud.desktopclient.plist``
 to ``/Library/Preferences/com.owncloud.desktopclient.plist``.
 
-Linux
-^^^^^
+Preventing Automatic Updates in Linux Environments
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Since there is no updating functionality, there is no need to remove the check.
-If you want to disable the check nontheless, open a file called
-``/etc/ownCloud/ownCloud.conf`` and add the following content::
+Because Linux does not provide automatic updating functionality, there is no
+need to remove the automatic-update check.  However, if you want to disable
+this check:
 
- [General]
- skipUpdateCheck=true
+1. Locate and open the following file::
+
+	/etc/ownCloud/ownCloud.conf
+
+2. Add the following content to the file::
+
+ 	[General]
+	skipUpdateCheck=true
 

doc/building.rst

@@ -3,20 +3,20 @@
 Appendix A: Building the Client
 ===============================
 
-This section explains how to build the ownCloud Client from source
-for all major platforms. You should read this section if you want
-to development on the desktop client.
+This section explains how to build the ownCloud Client from source for all
+major platforms. You should read this section if you want to develop for the
+desktop client.
 
-Note that the building instruction are subject to change as development 
-proceeds. It is important to check the version which is to built.
+.. note:: Building instruction are subject to change as development proceeds.
+  Please check the version for which you want to built.
 
-This instructions were updated to work with ownCloud Client 1.5.
+The instructions contained in this topic were updated to work with version 1.5 of the ownCloud Client.
 
 Linux
 -----
 
 1. Add the `ownCloud repository from OBS`_.
-2. Install the dependencies (as root, or via sudo):
+2. Install the dependencies (as root, or using ``sudo``) using the following commands for your specific Linux distribution:
 
   * Debian/Ubuntu: ``apt-get update; apt-get build-dep owncloud-client``
   * openSUSE: ``zypper ref; zypper si -d owncloud-client``
@@ -27,47 +27,51 @@ Linux
 Mac OS X
 --------
 
-Next to XCode (and the command line tools!), you will need some
-extra dependencies.
+In additon to needing XCode (along with the command line tools), developing in
+the MAC OS X environment requires extra dependencies.  You can install these
+dependencies through MacPorts_ or Homebrew_.  These dependencies are required
+only on the build machine, because non-standard libs are deployed in the app
+bundle.
 
-You can install these dependencies via MacPorts_ or Homebrew_.
-This is only needed on the build machine, since non-standard libs
-will be deployed in the app bundle.
+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.
 
-The tested and preferred way is to use HomeBrew_. The ownCloud team has
-its own repository which contains non-standard recipes.  Add it with::
+To set up your build enviroment for development using HomeBrew_:
+
+1. Add the ownCloud repository using the following command::
 
   brew tap owncloud/owncloud
 
-Next, install the missing dependencies::
+2. Install any missing dependencies::
 
   brew install $(brew deps mirall)
 
-  
 To build mirall, follow the `generic build instructions`_.
 
-.. note::
-  You should not call ``make install`` at any time, since the product of the
-  mirall build is an app bundle. Call ``make package`` instead to create an
-  install-ready disk image.
+.. note:: Because the product from the mirall build is an app bundle, do not
+   call ``make install`` at any time.  Instead, call ``make package`` to create an
+   install-ready disk image.
 
-Windows (cross-compile)
+Windows (Cross-Compile)
 -----------------------
 
-Due to the amount of dependencies, building the client for Windows
-is **currently only supported on openSUSE**, by using the MinGW
-cross compiler. You can set up openSUSE 12.1, 12.2 or 13.1 in a virtual machine
-if you do not have it installed already.
+Due to the large number of dependencies, building the client for Windows is
+**currently only supported on openSUSE**, by using the MinGW cross compiler.
+You can set up openSUSE 12.1, 12.2, or 13.1 in a virtual machine if you do not
+have it installed already.
 
-In order to cross-compile, the following repositories need to be added
-via YaST or ``zypper ar`` (adjust when using openSUSE 12.2 or 13.1)::
+To cross-compile:
 
-  zypper ar http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_13.1/windows:mingw:win32.repo
-  zypper ar http://download.opensuse.org/repositories/windows:/mingw/openSUSE_13.1/windows:mingw.repo
+1. Add the following repositories using YaST or ``zypper ar`` (adjust when using openSUSE 12.2 or 13.1):
 
-Next, install the cross-compiler packages and the cross-compiled dependencies::
+  - ``zypper ar http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_13.1/windows:mingw:win32.repo``
 
-  zypper install cmake make mingw32-cross-binutils mingw32-cross-cpp mingw32-cross-gcc \
+  - ``zypper ar http://download.opensuse.org/repositories/windows:/mingw/openSUSE_13.1/windows:mingw.repo``
+
+2. Install the cross-compiler packages and the cross-compiled dependencies::
+
+  ``zypper install cmake make mingw32-cross-binutils mingw32-cross-cpp mingw32-cross-gcc \
                  mingw32-cross-gcc-c++ mingw32-cross-pkg-config mingw32-filesystem \
                  mingw32-headers mingw32-runtime site-config mingw32-libqt4-sql \
                  mingw32-libqt4-sql-sqlite mingw32-sqlite mingw32-libsqlite-devel \
@@ -78,74 +82,86 @@ Next, install the cross-compiler packages and the cross-compiled dependencies::
                  mingw32-libpng-devel mingw32-libsqlite mingw32-qtkeychain \
                  mingw32-qtkeychain-devel mingw32-dlfcn mingw32-libintl-devel \
                  mingw32-libneon-devel mingw32-libopenssl-devel mingw32-libproxy-devel \
-                 mingw32-libxml2-devel mingw32-zlib-devel
+                 mingw32-libxml2-devel mingw32-zlib-devel``
 
-For the installer, the NSIS installer package is also required::
+3. For the installer, install the NSIS installer package::
 
-  zypper install mingw32-cross-nsis
+  ``zypper install mingw32-cross-nsis``
 
-..  Usually, the following would be needed as well, but due to a bug in mingw, they
-    will currently not build properly from source.
+4. Install the following plugin::
 
-    mingw32-cross-nsis-plugin-processes mingw32-cross-nsis-plugin-uac
+    ``mingw32-cross-nsis-plugin-processes mingw32-cross-nsis-plugin-uac``
 
-You will also need to manually download and install the following files with
-``rpm -ivh <package>`` (They will also work with openSUSE 12.2 and newer)::
+  .. note:: This plugin is typically required.  However, due to a current bug
+     in ``mingw``, the plugins do not currently build properly from source.
 
-  rpm -ihv http://download.tomahawk-player.org/packman/mingw:32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-processes-0-1.1.x86_64.rpm
-  rpm -ihv http://download.tomahawk-player.org/packman/mingw:32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-uac-0-3.1.x86_64.rpm
+5. Manually download and install the following files using ``rpm -ivh <package>``:
 
-Now, follow the `generic build instructions`_, but pay attention to
-the following differences:
+  ..note:: These files operate using openSUSE 12.2 and newer.
 
-For building for windows a special toolchain file has to be specified.
-That makes cmake finding the platform specific tools. This parameter 
-has to be added to the call to cmake:
+  - ``rpm -ihv http://download.tomahawk-player.org/packman/mingw:32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-processes-0-1.1.x86_64.rpm``
 
-  ``-DCMAKE_TOOLCHAIN_FILE=../mirall/admin/win/Toolchain-mingw32-openSUSE.cmake``
+  - ``rpm -ihv http://download.tomahawk-player.org/packman/mingw:32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-uac-0-3.1.x86_64.rpm``
 
-Finally, just build by running ``make``. ``make package`` will produce
-an NSIS-based installer, provided the NSIS mingw32 packages are installed.
+6. Follow the `generic build instructions`_
+
+  .. note:: When building for Windows platforms, you must specify a special
+     toolchain file that enables cmake to locate the platform-specific tools. To add
+     this parameter to the call to cmake, enter
+     ``DCMAKE_TOOLCHAIN_FILE=../mirall/admin/win/Toolchain-mingw32-openSUSE.cmake``.
+
+7. Build by running ``make``.
+
+  ..note:: Using ``make package`` produces an NSIS-based installer, provided
+    the NSIS mingw32 packages are installed.
 
 Generic Build Instructions
 --------------------------
 .. _`generic build instructions`
 
-Compared to previous versions building of Mirall has become more easy.
-CSync, which is the sync engine library of Mirall, is now part of the 
-Mirall source repository, not, like it was before, a separate module.
+Compared to previous versions, building Mirall has become easier. Unlike
+earlier versions, CSync, which is the sync engine library of Mirall, is now
+part of the Mirall source repository and not a separate module.
 
-Mirall can be downloaded at ownCloud's `Client Download Page`_.
+You can download Mirall from the ownCloud `Client Download Page`_.
 
-If you want to build the leading edge version of the client, you should
-use the latest versions of Mirall via Git_, like so::
+To build the most up to date version of the client:
 
-  git clone git://github.com/owncloud/mirall.git
+1. Clone the latest versions of Mirall from Git_ as follows:
 
-Next, create build directories::
+  ``git clone git://github.com/owncloud/mirall.git``
 
-  mkdir mirall-build
+2. Create build directories:
 
-Now build mirall::
+  ``mkdir mirall-build``
 
-  cd ../mirall-build
-  cmake -DCMAKE_BUILD_TYPE="Debug" ../mirall
+3. Build mirall:
 
-Note that it is important to use absolute pathes for the include- and library
-directories. If this succeeds, call ``make``. The owncloud binary should appear
-in the ``bin`` directory. You can also run ``make install`` to install the client to
-``/usr/local/bin``.
+  ``cd ../mirall-build``
+  ``cmake -DCMAKE_BUILD_TYPE="Debug" ../mirall``
 
-To build an installer/app bundle (requires the mingw32-cross-nsis packages on Windows)::
+  ..note:: You must use absolute pathes for the ``include`` and ``library`` directories.
 
-  make package
+4. Call ``make``.
 
-Known cmake parameters:
+  The owncloud binary appear in the ``bin`` directory.
 
-* QTKEYCHAIN_LIBRARY=/path/to/qtkeychain.dylib -DQTKEYCHAIN_INCLUDE_DIR=/path/to/qtkeychain/: Use QtKeychain for stored credentials. When compiling with Qt5, the library is called qt5keychain.dylib. You need to compile QtKeychain with the same Qt version.
-* WITH_DOC=TRUE: create doc and manpages via running ``make``; also adds install statements to be able to install it via ``make install``.
-* CMAKE_PREFIX_PATH=/path/to/Qt5.2.0/5.2.0/yourarch/lib/cmake/ : to build with Qt5
-* BUILD_WITH_QT4=ON : to build with Qt4 even if Qt5 is found
+5. (Optional) Call ``make install`` to install the client to the ``/usr/local/bin`` directory.
+
+6. (Optional) Call ``make package`` to build an installer/app bundle
+
+  ..note:: This step requires the ``mingw32-cross-nsis`` packages be installed on Windows.
+
+The following are known cmake parameters:
+
+* ``QTKEYCHAIN_LIBRARY=/path/to/qtkeychain.dylib -DQTKEYCHAIN_INCLUDE_DIR=/path/to/qtkeychain/``:
+   Used for stored credentials.  When compiling with Qt5, the library is called ``qt5keychain.dylib.``
+   You need to compile QtKeychain with the same Qt version.
+* ``WITH_DOC=TRUE``: Creates doc and manpages through running ``make``; also
+* adds install statements, providing the ability to install using ``make
+* install``.
+* ``CMAKE_PREFIX_PATH=/path/to/Qt5.2.0/5.2.0/yourarch/lib/cmake/``: Builds using Qt5.
+* ``BUILD_WITH_QT4=ON``: Builds using Qt4 (even if Qt5 is found).
 
 .. _`ownCloud repository from OBS`: http://software.opensuse.org/download/package?project=isv:ownCloud:devel&package=owncloud-client
 .. _CSync: http://www.csync.org

doc/conffile.rst

@@ -1,26 +1,24 @@
-ownCloud Client reads a configuration file.
+The ownCloud Client reads a configuration file.  You can locate this configuration files as follows:
 
-On Linux it can be found in:
+- On Linux distributions:
         ``$HOME/.local/share/data/ownCloud/owncloud.cfg``
 
-On Windows it can be found in:
+- In Microsoft Windows systems:
         ``%LOCALAPPDATA%\ownCloud\owncloud.cfg``
 
-On Mac it can be found in:
+- In MAC OS X systems:
         ``$HOME/Library/Application Support/ownCloud``
 
 
-It contains settings in the ini file format known from Windows. 
+The configuration file contains settings using the Microsoft Windows .ini file
+format. You can overwrite changes using the ownCloud configuration dialog.
 
-.. note:: Changes here should be done carefully as wrong settings can cause disfunctionality.
+.. note:: Use caution when making changes to the ownCloud Client configuration
+   file.  Incorrect settings can produce unintended results.
 
-.. note:: Changes may be overwritten by using ownCloud's configuration dialog.
+You can change the following configuration settings:
 
-These are config settings that may be changed:
+- ``remotePollInterval`` (default: ``30000``) -- Specifies the poll time for the remote repository in milliseconds.
 
-``remotePollInterval`` (default: ``30000``)
-        Poll time for the remote repository in milliseconds
-
-``maxLogLines`` (default:  ``20000``)
-        Maximum count of log lines shown in the log window
+- ``maxLogLines`` (default:  ``20000``) -- Specifies the maximum number of log lines displayed in the log window.
 

doc/faq.rst

@@ -1,16 +1,17 @@
 FAQ
 ===
 
-Some files are continuously uploaded to the server even when they are not modified
-----------------------------------------------------------------------------------
+**Issue:**
+
+Some files are continuously uploaded to the server, even when they are not modified.
+
+**Resolution:**
 
 It is possible that another program is changing the modification date of the file.
 
-If the file is a ``.eml`` file, Windows automatically change all file all the time unless you remove
-``\HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers`` from
-the windows registry.
-See http://petersteier.wordpress.com/2011/10/22/windows-indexer-changes-modification-dates-of-eml-files/
-
-
-
+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.
 
+See http://petersteier.wordpress.com/2011/10/22/windows-indexer-changes-modification-dates-of-eml-files/ for more information.

doc/index.rst

@@ -4,11 +4,12 @@ Contents
 ========
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 3
 
    introduction
+   installing
    accountsetup
-   visualtour
+   navigating
    advancedusage
    autoupdate
 

doc/installing-linux.rst

@@ -0,0 +1,208 @@
+.. _installing-linux:
+
+Installing the Linux Desktop Client
+===================================
+
+The ownCloud Desktop Client is provided for a wide range of Linux
+distributions. The following table provides a list of Linux operating systems
+and the specific distributions on which you can install the Desktop Client.
+
++------------------+-------------------------+
+| Operating System | Distribution            | 
++==================+=========================+ 
+| CentOS (Redhat)  | - Red Hat RHEL-6        |
+|                  | - CentOS CentOS-6       | 
++------------------+-------------------------+ 
+| Debian           | - Debian 7.0            |
+|                  | - Fedora 19             |
+|                  | - Fedora 20             | 
++------------------+-------------------------+ 
+| openSUSE         | - openSUSE              |
+|                  | - Factory PPC           |
+|                  | - openSUSE Factory ARM  |	
+|                  | - openSUSE Factory      |
+|                  | - openSUSE 13.1 Ports   |	
+|                  | - openSUSE 13.1         |
+|                  | - openSUSE 12.3 Ports   |
+|                  | - openSUSE 12.3         |
+|                  | - openSUSE 12.2         | 
++------------------+-------------------------+ 
+| SUSE (SLE)       | - SLE 11 SP3            | 
++------------------+-------------------------+
+| Ubuntu           | - xUbuntu 14.04         |
+|                  | - xUbuntu 13.10         |
+|                  | - xUbuntu 12.10         |	
+|                  | - xUbuntu 12.04         |
++------------------+-------------------------+ 
+
+General instructions for how to install the ownCloud Desktop Client on any
+supported Linux distribution can be found on the `ownCloud download page
+<http://software.opensuse.org/download/package?project=isv:ownCloud:desktop&package=owncloud-client>`_.
+
+Linux Installation Methods
+--------------------------
+
+You can install the ownCloud Desktop Client using either of the following three methods:
+
+- One Click Install (openSUSE and SUSE SLE distributions only) — Installs the
+  ownCloud Desktop using a bundled installation package.
+- Adding the ownCloud package repository — Installs the ownCloud Desktop client
+  using a Linux terminal and keeps it up to date using the distribution's
+  package manager.
+
+.. note::
+	
+	Manual command line installation requires that you perform the installation as root.
+	
+- Binary package — Installs the ownCloud Desktop Client using a raw binary package.
+
+Installing the Desktop Client on Redhat or CentOS Linux Operating Systems
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To install the ownCloud Desktop Client on a Redhat or CentOS operating system manually:
+
+1. Open a Linux terminal window.
+
+2. Specify the directory in which you want to install the client.
+
+	``cd /etc/yum.repos.d/``
+
+3. Choose and download the client for your specific distribution: 
+
+	* Red Hat RHEL-6: ``wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/RedHat_RHEL-6/isv:ownCloud:desktop.repo``
+	* CentOS CentOS-6: ``wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/CentOS_CentOS-6/isv:ownCloud:desktop.repo``
+	
+4. Install the client.
+
+	``yum install owncloud-client``
+	
+5. After the installation completes, go to Setting Up the ownCloud Desktop Client.
+
+**Installing the Desktop Client on Debian 7.0 Linux Operating Systems Manually**
+
+To install the ownCloud Desktop Client on the Debian 7.0 distribution manually:
+
+1. Open a Linux terminal window.
+
+2. Download the client.
+	
+	``echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Debian_7.0/ /' >> /etc/apt/sources.list.d/owncloud-client.list``
+
+3. Download the package lists from any repositories and updates them to ensure the latest package versions and their dependencies.
+
+	``apt-get update``
+
+4. Install the client.
+
+	``apt-get install owncloud-client``
+
+5. (Optional) Download the apt-key for the Debian repository
+
+	``wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/Debian_7.0/Release.key``
+
+6. After the installation completes, go to Setting Up the ownCloud Desktop Client.
+
+Installing the Desktop Client on Fedora Linux Operating Systems
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To install the ownCloud Desktop Client on the Fedora operating system manually:
+
+1. Open a Linux terminal window.
+2. Specify the directory in which you want to install the client.
+
+	cd /etc/yum.repos.d/
+
+3. Choose and download the client for your specific distribution
+
+	* Fedora 19: ``wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/Fedora_19/isv:ownCloud:desktop.repo``
+	* Fedora 20: ``wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/Fedora_20/isv:ownCloud:desktop.repo``
+	
+4. Install the client.
+
+	``yum install owncloud-client``
+
+5. After the installation completes, go to Setting Up the ownCloud Desktop Client.
+
+Installing the Desktop Client on openSUSE Linux Operating Systems
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To install the ownCloud Desktop Client on the openSUSE operating system manually:
+
+1. Open a Linux terminal window.
+
+2. Choose and download the client for your specific distribution: 
+
+   * Factory PPC: ``zypper addrepo http://download.opensuse.org/repositories/isv:ownCloud:desktop/openSUSE_Factory_PPC/isv:ownCloud:desktop.repo``
+   * **Factory ARM**: ``zypper addrepo http://download.opensuse.org/repositories/isv:ownCloud:desktop/openSUSE_Factory_ARM/isv:ownCloud:desktop.repo``
+   * **Factory**: ``zypper addrepo http://download.opensuse.org/repositories/isv:ownCloud:desktop/openSUSE_Factory/isv:ownCloud:desktop.repo``
+   * **13.1 Ports**: ``zypper addrepo http://download.opensuse.org/repositories/isv:ownCloud:desktop/openSUSE_13.1_Ports/isv:ownCloud:desktop.repo``
+   * **13.1**: ``zypper addrepo http://download.opensuse.org/repositories/isv:ownCloud:desktop/openSUSE_13.1/isv:ownCloud:desktop.repo``
+   * **12.3 Ports**: ``zypper addrepo http://download.opensuse.org/repositories/isv:ownCloud:desktop/openSUSE_12.3_Ports/isv:ownCloud:desktop.repo``
+   * **12.3**: ``zypper addrepo http://download.opensuse.org/repositories/isv:ownCloud:desktop/openSUSE_12.3/isv:ownCloud:desktop.repo``
+   * **12.2**: ``zypper addrepo http://download.opensuse.org/repositories/isv:ownCloud:desktop/openSUSE_12.2/isv:ownCloud:desktop.repo``
+
+3. Download any package metadata  from the medium  and store  it  in  local  cache.
+
+	``zypper refresh``
+
+4. Install the client.
+
+	``zypper install owncloud-client``
+
+5. After the installation completes, go to Setting Up the ownCloud Desktop Client.
+
+Installing the Desktop Client on SLE Linux Operating Systems
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To install the ownCloud Desktop Client on the SUSE Linux Enterprise (SLE) operating system.
+
+1. Open a Linux terminal window.
+
+2. Download the client.
+
+	``zypper addrepo http://download.opensuse.org/repositories/isv:ownCloud:desktop/SLE_11_SP3/isv:ownCloud:desktop.repo``
+
+3. Download any package metadata  from the medium  and store  it  in  local  cache.
+
+	``zypper refresh``
+
+4. Install the client.
+
+	``zypper install owncloud-client``
+
+5. After the installation completes, go to Setting Up the ownCloud Desktop Client.
+
+Installing the Desktop Client on Ubuntu Linux Operating Systems
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To install the ownCloud Desktop Client on the Ubuntu operating system:
+
+1. Open a Linux terminal window.
+
+2. Choose and download  the client for your specific distribution:
+
+	* **xUbuntu 14.04**: ``sudo sh -c "echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_14.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"``
+	* **xUbuntu 13.10**: ``sudo sh -c "echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_13.10/ /' >> /etc/apt/sources.list.d/owncloud-client.list"``
+	* **xUbuntu 12.10**: ``sudo sh -c "echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_12.10/ /' >> /etc/apt/sources.list.d/owncloud-client.list"``
+	* **xUbuntu 12.04**: ``sudo sh -c "echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_12.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"``
+
+3. Download the package lists from any repositories and updates them to ensure the latest package versions and their dependencies.
+
+	``apt-get update``
+
+4. Install the client.
+
+	``sudo apt-get install owncloud-client``
+
+5. (Optional) Download the apt-key for the Ubuntu repository:
+
+	* **xUbuntu 14.04**: ``wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/xUbuntu_14.04/Release.key``
+	* **xUbuntu 13.10**: ``wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/xUbuntu_13.10/Release.key``
+	* **xUbuntu 12.10**: ``wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/xUbuntu_12.10/Release.key``
+	* **xUbuntu 12.04**: ``wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/xUbuntu_12.04/Release.key``
+
+6. (Optional) Add the apt key.
+
+	``sudo apt-key add - < Release.key``
+
+7. After the installation completes, go to `Setting Up the ownCloud Desktop Client`_.

doc/installing-macosx.rst

@@ -0,0 +1,4 @@
+.. _installing-macosx:
+
+Installing the MAC OSX Desktop Client
+=====================================

doc/installing-windows.rst

@@ -0,0 +1,102 @@
+.. _installing-windows:
+
+Installing the Windows Desktop Client
+=====================================
+
+The ownCloud desktop client for Windows is provided as a Nullsoft Scriptable Install System (NSIS) setup file for machine-wide installation.
+
+To install the ownCloud desktop client:
+
+1. Access the ownCloud website.
+
+	The ownCloud web page opens.
+
+	.. image:: images/oc_website.png
+
+	ownCloud Web Page
+ 
+2. Select Products > Desktop Clients from the website menu.
+
+	The Desktop Client download page opens.
+	
+	.. image:: images/oc_client_download_options.png
+
+	Desktop client download selections
+
+3. Click the 'Download for Windows' option.
+	The Desktop Client download page opens.
+
+	.. image:: images/oc_client_windows_download.png
+
+	ownCloud Windows Client Download
+
+4. Click the 'download' button.
+
+        The Microsoft Windows client download begins. Depending on your browser
+        settings, the client installation file might launch automatically. 
+
+5. Once the download completes, locate the client installation file in your system Downloads folder.
+
+6. Double-click the client installation file to start the download.
+
+	The Open File - Security Warning dialog box opens.
+	
+	.. image:: images/security_warning_windows.png
+
+	Open File - Security Warning dialog box
+
+7. Click 'Run' in the dialog box to begin the installation.
+
+        On systems running virus protection software, you might have to verify
+        that you want to install the ownCloud Desktop Client software.
+
+8. Click 'Yes' to continue with the software installation.
+
+	The ownCloud Setup Wizard window opens.
+	
+	.. image:: images/client_setup_wizard_main.png
+
+	ownCloud Setup Wizard Window
+
+9. Click 'Next' to continue.
+
+	The Choose Components window opens.
+	
+	.. image:: images/client_setup_wizard_components.png
+
+	Choose Components Window
+
+10. Choose the components that you want to install for the Desktop Client.
+
+        All relevant components for your platform are selected by default.
+        However, you can choose to exlude different components from the installation. 
+
+11. Click Next to continue.
+
+	The Choose Install Location window opens.
+	
+	.. image:: images/client_setup_wizard_location.png
+
+	Choose Install Location window
+
+12. Verify the destination folder for the Desktop Client installation and then click Install.
+
+	The Installing window opens.
+	
+	.. image:: images/client_setup_wizard_install_progress.png
+
+	Installing window
+
+13. Once the installation completes, click 'Next' to continue.
+
+	The Setup Wizard Completion window opens.
+
+	.. image:: images/client_setup_wizard_install_finish.png
+
+	Completion window
+
+	You can choose to launch the Desktop Client from this window or launch the application at another time.
+
+14. Click 'Finish' to complete the installation.
+
+	After the installation completes, go to Setting Up the ownCloud Desktop Client.

doc/installing.rst

@@ -0,0 +1,13 @@
+Installing the Synchronization Client
+=====================================
+
+The latest version of the ownCloud Synchronization Client can be obtained from
+the `ownCloud Website <http://www.owncloud.com>`_. You can download and install
+the client on Windows, MAC OSX, and various Linux software distrubutions. The
+following sections describe specific support and installation procedures for
+the different software platforms:
+
+- :ref:`installing-windows`
+- :ref:`installing-macosx`
+- :ref:`installing-linux`
+

doc/introduction.rst

@@ -1,32 +1,14 @@
 Introduction
 ============
 
-The ownCloud Sync Client is a desktop program installed on a user’s computer.
-It allows a user to specify one or more directories on the local machine to
-sync to the ownCloud server.  It allows the user to always have the latest
-files wherever they may be.  When a change is made to the file on the
-computer, it will sync to the ownCloud server via the sync client.
+Available for Windows, MAC OS X, and various Linux distributions, the ownCloud
+Sync client is a desktop program installed on your computer. The client enables
+you to:
 
-The ownCloud Sync Client is available for Windows, MAC OS X, and various
-Linux distributions.
+- Specify one or more directories on your computer that you want to synchronize
+  to the ownCloud server.
+- Always have the latest files synchronized, wherever they are located.
 
-Obtaining the Client
---------------------
+Changes made to any synchronized file on the computer are automatically made to
+the files on the ownCloud server using the sync client.
 
-The latest version of the Client can be obtained on the ownCloud web site.
-
-ownCloud client for **Windows** is provided as a NSIS-based setup file for
-machine-wide install. Installing the ownCloud client on **Mac OS** follows
-the normal app bundle installation pattern:
-
-1. Download the installation file: Click ``ownCloud-x.y.z.dmg``, a window with
-   the ownCloud icon opens.
-2. In that window, drag the ownCloud application into the ``Applications``
-   folder.
-3. On the right hand side From ``Applications``, choose ``ownCloud``.
-
-The ownCloud client is also provided as in a convenient repository for a wide
-range of popular **Linux distributions**.
-
-Supported distributions are Fedora, openSUSE, Ubuntu and Debian.
-To support other distributions, a is required, see :ref:`building-label`

doc/navigating.rst

@@ -0,0 +1,313 @@
+Using the Synchronization Client
+================================
+
+.. index:: navigating, usage
+
+The ownCloud Client remains in the background and is visible as an icon in the
+system tray (Windows, KDE), status bar (MAC OS X), or notification area
+(Ubuntu).
+
+.. image:: images/icon.png
+
+**ownCloud Desktop Client icon**
+
+Using the Desktop Client Menu
+-----------------------------
+
+A right click on the icon (left click on Ubuntu and Mac OS X) provides the
+following menu:
+
+.. image:: images/menu.png
+
+**ownCloud Desktop Client menu**
+
+The Desktop Client menu provides the following options:
+
+* ``Open ownCloud in browser``: Launches the ownCloud WEB interface.
+* ``Open folder 'ownCloud'``: Opens the ownCloud local 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 by the synchronization operations and provides access to the current synchronization status listing all changes since the last restart of the ownCloud client.
+* ``Settings...``: Provides access to the settings menu.
+* ``Help``: Opens a browser to display ownCloud Desktop Client Guide.
+* ``Sign out``: Disables the client from continued synchronizations.
+* ``Quit ownCloud``: Quits the ownCloud Client, ending any currently running
+  synchronizations.
+
+Using the Account Settings Window
+---------------------------------
+
+.. index:: account settings, user, password, Server URL
+
+The ``Account`` window provides a summary for general settings associated with the ownCloud account.  This window enalbes you to manage any synchronized folders in the account and enables you to modify them.
+
+To access and modify the account settings:
+
+.. image:: images/settings_account.png
+   :scale: 50 %
+
+The fields and options in this window include:
+
+* ``Connected to <ownCloud instance> as <user>`` field:  Indicates the ownCloud server to which the client is synchronizing and the user account on that server.
+
+* ``Add Folder...`` button: Provides the ability to add another folder to the synchronization process (see ``Adding a Folder``).
+
+* ``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.  If only the root folder is available, you must first remove the root from the synchronization and then add individual folders that you want to synchronize as desired.
+
+* ``Storage Usage`` field: Indicates the storage utilization on the ownCloud server.
+
+* ``Edit Ignored Files`` button: Launches the Ignored Files Editor.
+
+* ``Modify Account`` button: Enables you to change the ownCloud server to which you are synchronizing. This option launches the ``Setting up an Account`` windows (See ??).
+
+
+Adding a Folder
+^^^^^^^^^^^^^^^
+
+The ``Add a Folder ...`` button enables you to add a new folder to the syncrhonization 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
+   :scale: 50 %
+
+   **``Add Folder...`` window (local folder)**
+
+2. Specify a *unique* path and alias name to the folder or use the ``Choose...`` button to locate the new folder on your system to which you want to synchronize.
+
+  ..note:: Nested synchronizations are not supported.  In other words, 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 syncrhonizes your entire ownCloud account to the root
+    folder of the ownCloud server. Due to this default setup, you must first remove
+    the top-level folder prior to specifying new synchronizations.
+
+3. Click 'Next' to continue.
+
+  A window opens prompting you to select a remote destination folder on the
+  ownCloud server to which you want to synchronize.
+
+   .. image:: images/folderwizard_remote.png
+   :scale: 50 %
+
+   **``Add Folder...`` window (remote destination)**
+
+4. Select a folder on the ownCloud server to which you want to synchronize your newly added 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 :guilabel:`Ignored Files Editor` provides a list of preconfigured files
+that are ignored (that is, not synchronized) by the client and server during
+synchronizations. The Ignored Files Editor enables you to add patterns for
+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 incidate a single character).
+
+For additional information about this editor, see `Using the Ignored Files Editor`_
+
+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 in a cross-platform
+manner due to containing special characters that cannot be stored on certain
+file systems.
+
+.. image:: images/settings_activity.png
+   :scale: 50 %
+
+   **Activity settings window**
+
+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 enables you to set general settings for the
+ownCloud Desktop Client and provides information about the software version,
+its creator, and the existance of any updates.
+
+.. image:: images/settings_general.png
+   :scale: 50 %
+
+   **General settings window**
+
+The settings and information contained in this window are as follows:
+
+* ``Launch on System Startup`` checkbox: Provides the option to check (enable)
+  or uncheck (disable) whether the ownCloud Desktop Client launches upon system
+  startup.  By default, this option is enabled (checked)once you have configured
+  your account.
+
+* ``Show Desktop Nofications`` checkbox: Provides the option to check (enable)
+  or uncheck (disable) bubble notifications alerting you as to when a set of
+  synchronization operations is performed.
+
+* ``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 OSX 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: Provides information about 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 as
+well as limit the download and upload bandwidth utilization of file
+synchronizations.
+
+.. image:: images/settings_network.png
+   :scale: 50 %
+
+   **Network settings window**
+
+Specifying Proxy Settings
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A proxy server is a server (for example, a computer system or an application)
+that functions as an intermediary contact for requests from clients that are
+seeking resources from other servers.  For the ownCloud Desktop Client, you can
+define the following proxy settings:
+
+* ``No Proxy`` option: Specifies that the ownCloud Client circumvent the default proxy configured on the system.
+* ``Use system proxy`` option: Default setting. Follows the systems proxy
+  settings. On Linux systems, this setting uses the value of the variable
+  ``http_proxy``.
+* ``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 utilized a lot of
+bandwidth.  Bandwidth limiting can assist in shaping the total download or
+upload bandwidth (or both) of your client/server connection to a more
+manageable level. By limiting your bandwidth usage, you can maintain free
+bandwidth for other applications to use.
+
+The ownCloud Desktop Client enables you to limit (throttle) the bandwidth usage
+for both file downloads and file uploads.  The Download Bandwidth field (for
+data flowing from the ownCloud server to the client) 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 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
+------------------------------
+
+.. index:: ignored files, exclude files, pattern
+
+You might have some files or directories that you do not want to backup and
+store on the server. To identify and exclude these files or directories, you
+can use the *Ignored Files Editor* that is embedded in the ownCloud Desktop
+Client.
+
+.. image:: images/ignored_files_editor.png
+   :scale: 50%
+
+   Ignored Files Editor window
+
+The :guilabel:`Ignored Files Editor` enables you to define customized patterns that the
+ownCloud Client uses to identify files and directories that you want to exclude
+from the synchronization process. For your convenience, the editor is
+pre-populated with a default list of typically 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.
+
+Each line in the editor contains an ignore pattern string. When creating custom
+patterns, in addition to being able to use normal characters to define an
+ignore pattern, you can use wildcards characters for matching values.  As an
+example, you can use an asterisk (``*``) to idenfify an arbitrary number of
+characters or a question mark (``?``) to identify a single character. 
+
+Patterns that end with a slash character (``/``) are applied to only directory
+components of the path being checked.
+
+.. note:: Custom entries are currently not validated for syntactical
+   correctness by the editor, but might fail to load correctly.
+
+Each pattern string in the list is preceded by a checkbox. When the check box
+contains a check mark, in addition to ignoring the file or directory component
+matched by the pattern, any matched files are also deemed "fleeting metadata"
+and removed by the client.
+
+In addition to excluding files and directories that use patterns defined in
+this list:
+
+- The ownCloud Client always excludes files containing characters that cannot
+  be synchronized to other file systems.
+
+- As of ownCloud Desktop Client version 1.5.0, files are removed that cause
+  individual errors three times during a synchronization. However, the client
+  provides the option of retrying a synchronization three additional times on
+  files that produce errors.
+
+For more detailed information see :ref:`ignored-files-label`.

doc/options.rst

@@ -1,24 +1,23 @@
 When invoking the client from the command line, the following options are supported:
 
 ``-h``, ``--help``
-        shows all the below options (opens a window on Windows)
+        Displays all the options below or, when used on Windows, opens a window displaying all options.
 
 ``--logwindow``
-        open a window to show log output.
+        Opens a window displaying log output.
 
 ``--logfile`` `<filename>`
-        write log output to file <filename>. To write to stdout, specify `-`
-        as filename
+        Write log output to the file specified. To write to stdout, specify `-` as the filename.
 
 ``--logdir`` `<name>`
-        write each sync log output in a new file in directory <name>
+        Writes each synchronization log output in a new file in the specified directory.
 
 ``--logexpire`` `<hours>`
-        removes logs older than <hours> hours. (to be used with --logdir)
+        Removes logs older than the value specified (in hours). This command is used with ``--logdir``.
 
 ``--logflush``
-        flush the log file after every write.
+        Clears (flushes) the log file after each write action.
 
 ``--confdir`` `<dirname>`
-        Use the given configuration directory.
+        Uses the specified configuration directory.