[tx-robot] updated from transifex

Be less verbose with logging

.drone.yml

@@ -14,7 +14,7 @@ pipeline:
               cd /tmp &&
               git clone https://github.com/frankosterfeld/qtkeychain.git &&
               cd qtkeychain &&
-              git checkout v0.8.0 &&
+              git checkout v0.9.1 &&
               mkdir build &&
               cd build &&
               cmake ../ &&
@@ -42,7 +42,7 @@ pipeline:
               cd /tmp &&
               git clone https://github.com/frankosterfeld/qtkeychain.git &&
               cd qtkeychain &&
-              git checkout v0.8.0 &&
+              git checkout v0.9.1 &&
               mkdir build &&
               cd build &&
               cmake ../ &&
@@ -70,7 +70,7 @@ pipeline:
               cd /tmp &&
               git clone https://github.com/frankosterfeld/qtkeychain.git &&
               cd qtkeychain &&
-              git checkout v0.8.0 &&
+              git checkout v0.9.1 &&
               mkdir build &&
               cd build &&
               cmake ../ &&
@@ -100,7 +100,7 @@ pipeline:
               cd /tmp &&
               git clone https://github.com/frankosterfeld/qtkeychain.git &&
               cd qtkeychain &&
-              git checkout v0.8.0 &&
+              git checkout v0.9.1 &&
               mkdir build &&
               cd build &&
               cmake ../ &&
@@ -132,7 +132,7 @@ pipeline:
               cd /tmp &&
               git clone https://github.com/frankosterfeld/qtkeychain.git &&
               cd qtkeychain &&
-              git checkout v0.8.0 &&
+              git checkout v0.9.1 &&
               mkdir build &&
               cd build &&
               cmake ../ &&
@@ -165,7 +165,7 @@ pipeline:
               cd /tmp &&
               git clone https://github.com/frankosterfeld/qtkeychain.git &&
               cd qtkeychain &&
-              git checkout v0.8.0 &&
+              git checkout v0.9.1 &&
               mkdir build &&
               cd build &&
               cmake ../ &&

.github/issue_template.md

@@ -0,0 +1,64 @@
+<!---
+Please try to only report a bug if it happens with the latest version
+The latest version can be seen by checking https://download.nextcloud.com/desktop/
+For support try our forums: https://help.nextcloud.com
+--->
+
+
+### Expected behaviour
+Tell us what should happen
+
+### Actual behaviour
+Tell us what happens instead
+
+### Steps to reproduce
+1.
+2.
+3.
+
+### Client configuration
+Client version:
+
+Operating system:
+
+OS language:
+
+Qt version used by client package (Linux only, see also Settings dialog):
+
+Client package (From Nextcloud or distro) (Linux only):
+
+Installation path of client:
+
+
+### Server configuration
+<!---
+Optional section. It depends on the issue.
+--->
+
+Operating system:
+
+Web server:
+
+Database:
+
+PHP version:
+
+Nextcloud version:
+
+Storage backend (external storage):
+
+### Logs
+
+Please use Gist (https://gist.github.com/) or a similar code paster for longer
+logs.
+
+```Template for output < 10 lines```
+
+1. Client logfile: Output of `nextcloud --logwindow` or `nextcloud --logfile log.txt`
+(On Windows using `cmd.exe`, you might need to first `cd` into the Nextcloud directory)
+(See also https://docs.nextcloud.com/desktop/2.3/troubleshooting.html#log-files)
+
+2. Web server error log:
+
+3. Server logfile: nextcloud log (data/nextcloud.log):
+

.gitignore

@@ -164,3 +164,10 @@ UpgradeLog*.htm
 # Microsoft Fakes
 FakesAssemblies/
 
+#cmake temporary stuff
+CMakeCache.txt
+CMakeFiles/
+CPackConfig.cmake
+CPackOptions.cmake
+CPackSourceConfig.cmake
+

.tx/nextcloud.client-desktop/ca_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[ca]=@APPLICATION_NAME@ client de sincronització d'escriptori
-Icon[ca]=@APPLICATION_EXECUTABLE@
+Icon[ca]=@APPLICATION_ICON_NAME@
 Name[ca]=@APPLICATION_NAME@ client de sincro d'escriptori
+Comment[ca]=@APPLICATION_NAME@ client de sincronització d'escriptori
 GenericName[ca]=Directori de sincronització

.tx/nextcloud.client-desktop/cs_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[cs_CZ]=@APPLICATION_NAME@ desktopový synchronizační klient
-Icon[cs_CZ]=@APPLICATION_EXECUTABLE@
-Name[cs_CZ]=@APPLICATION_NAME@ desktopový synchronizační klient
+Icon[cs_CZ]=@NAZEV_IKONY_APLIKACE@
+Name[cs_CZ]=@APPLICATION_NAME@ synchronizační klient pro desktop
+Comment[cs_CZ]=@APPLICATION_NAME@ synchronizační klient pro desktop
 GenericName[cs_CZ]=Synchronizace složek

.tx/nextcloud.client-desktop/da_translation

@@ -0,0 +1,204 @@
+[Desktop Entry]
+Categories=Utility;X-SuSE-SyncUtility;
+Type=Application
+Exec=@APPLICATION_EXECUTABLE@
+Name=@APPLICATION_NAME@ desktop sync client 
+Comment=@APPLICATION_NAME@ desktop synchronization client
+GenericName=Folder Sync
+Icon=@APPLICATION_ICON_NAME@
+Keywords=@APPLICATION_NAME@;syncing;file;sharing;
+X-GNOME-Autostart-Delay=3
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+Icon[da]=@APPLICATION_ICON_NAME@
+Name[da]=@APPLICATION_NAME@ Arbejdsstationsssynkroniseringsklient
+Comment[da]=@APPLICATION_NAME@ Arbejdsstationsssynkroniseringsklient
+GenericName[da]=Mappe sync

.tx/nextcloud.client-desktop/de_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
-Icon[de]=@APPLICATION_EXECUTABLE@
-Name[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
-GenericName[de]=Synchronisationsordner
+Icon[de_DE]=@APPLICATION_ICON_NAME@
+Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
+Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
+GenericName[de_DE]=Synchronisationsordner

.tx/nextcloud.client-desktop/el_translation

@@ -0,0 +1,201 @@
+[Desktop Entry]
+Categories=Utility;X-SuSE-SyncUtility;
+Type=Application
+Exec=@APPLICATION_EXECUTABLE@
+Name=@APPLICATION_NAME@ desktop sync client 
+Comment=@APPLICATION_NAME@ desktop synchronization client
+GenericName=Folder Sync
+Icon=@APPLICATION_ICON_NAME@
+Keywords=@APPLICATION_NAME@;syncing;file;sharing;
+X-GNOME-Autostart-Delay=3
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+GenericName[el]=Συγχρονισμός φακέλου

.tx/nextcloud.client-desktop/en_GB_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[en_GB]=@APPLICATION_NAME@ desktop synchronisation client
-Icon[en_GB]=@APPLICATION_EXECUTABLE@
+Icon[en_GB]=@APPLICATION_ICON_NAME@
 Name[en_GB]=@APPLICATION_NAME@ desktop sync client 
+Comment[en_GB]=@APPLICATION_NAME@ desktop synchronisation client
 GenericName[en_GB]=Folder Sync

.tx/nextcloud.client-desktop/eo_translation

@@ -0,0 +1,204 @@
+[Desktop Entry]
+Categories=Utility;X-SuSE-SyncUtility;
+Type=Application
+Exec=@APPLICATION_EXECUTABLE@
+Name=@APPLICATION_NAME@ desktop sync client 
+Comment=@APPLICATION_NAME@ desktop synchronization client
+GenericName=Folder Sync
+Icon=@APPLICATION_ICON_NAME@
+Keywords=@APPLICATION_NAME@;syncing;file;sharing;
+X-GNOME-Autostart-Delay=3
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+Icon[eo]=@APPLICATION_ICON_NAME@
+Name[eo]=@APPLICATION_NAME@ sinkroniga kliento
+Comment[eo]=@APPLICATION_NAME@ sinkroniga kliento
+GenericName[eo]=Dosieruja sinkronigo

.tx/nextcloud.client-desktop/es_CL_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,6 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[es_CL]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_CL]=@APPLICATION_EXECUTABLE@
 Name[es_CL]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
+Comment[es_CL]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
 GenericName[es_CL]=Sincronización de carpeta

.tx/nextcloud.client-desktop/es_CO_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,6 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[es_CO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_CO]=@APPLICATION_EXECUTABLE@
 Name[es_CO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
+Comment[es_CO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
 GenericName[es_CO]=Sincronización de carpeta

.tx/nextcloud.client-desktop/es_CR_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,6 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[es_CR]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_CR]=@APPLICATION_EXECUTABLE@
 Name[es_CR]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
+Comment[es_CR]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
 GenericName[es_CR]=Sincronización de carpeta

.tx/nextcloud.client-desktop/es_DO_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,6 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[es_DO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_DO]=@APPLICATION_EXECUTABLE@
 Name[es_DO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
+Comment[es_DO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
 GenericName[es_DO]=Sincronización de carpeta

.tx/nextcloud.client-desktop/es_EC_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,6 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[es_EC]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_EC]=@APPLICATION_EXECUTABLE@
 Name[es_EC]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
+Comment[es_EC]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
 GenericName[es_EC]=Sincronización de carpeta

.tx/nextcloud.client-desktop/es_GT_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,6 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[es_GT]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_GT]=@APPLICATION_EXECUTABLE@
 Name[es_GT]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
+Comment[es_GT]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
 GenericName[es_GT]=Sincronización de carpeta

.tx/nextcloud.client-desktop/es_MX_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,6 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[es_MX]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_MX]=@APPLICATION_EXECUTABLE@
 Name[es_MX]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
+Comment[es_MX]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
 GenericName[es_MX]=Sincronización de carpeta

.tx/nextcloud.client-desktop/es_SV_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,6 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[es_SV]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-Icon[es_SV]=@APPLICATION_EXECUTABLE@
 Name[es_SV]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
+Comment[es_SV]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
 GenericName[es_SV]=Sincronización de carpeta

.tx/nextcloud.client-desktop/es_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[es]=Cliente de sincronización de escritorio @APPLICATION_NAME@
-Icon[es]=@APPLICATION_EXECUTABLE@
+Icon[es]=@APPLICATION_ICON_NAME@
 Name[es]=Cliente de sincronización de escritorio @APPLICATION_NAME@
+Comment[es]=Cliente de sincronización de escritorio @APPLICATION_NAME@
 GenericName[es]=Sincronización de carpetas

.tx/nextcloud.client-desktop/eu_translation

@@ -0,0 +1,204 @@
+[Desktop Entry]
+Categories=Utility;X-SuSE-SyncUtility;
+Type=Application
+Exec=@APPLICATION_EXECUTABLE@
+Name=@APPLICATION_NAME@ desktop sync client 
+Comment=@APPLICATION_NAME@ desktop synchronization client
+GenericName=Folder Sync
+Icon=@APPLICATION_ICON_NAME@
+Keywords=@APPLICATION_NAME@;syncing;file;sharing;
+X-GNOME-Autostart-Delay=3
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+Icon[eu]=@APPLICATION_ICON_NAME@
+Name[eu]=@APPLICATION_NAME@ mahaigainerako sinkronizazio bezeroa
+Comment[eu]=@APPLICATION_NAME@ mahaigainerako sinkronizazio bezeroa
+GenericName[eu]=Karpeta-sinkronizazioa

.tx/nextcloud.client-desktop/fr_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[fr]=Client  desktop de synchronisation @APPLICATION_NAME@
-Icon[fr]=@APPLICATION_EXECUTABLE@
-Name[fr]=Client  desktop de synchronisation @APPLICATION_NAME@
+Icon[fr]=@APPLICATION_ICON_NAME@
+Name[fr]=Client  de synchro @APPLICATION_NAME@
+Comment[fr]=Client de synchronisation @APPLICATION_NAME@
 GenericName[fr]=Synchronisation du dossier

.tx/nextcloud.client-desktop/gl_translation

@@ -0,0 +1,204 @@
+[Desktop Entry]
+Categories=Utility;X-SuSE-SyncUtility;
+Type=Application
+Exec=@APPLICATION_EXECUTABLE@
+Name=@APPLICATION_NAME@ desktop sync client 
+Comment=@APPLICATION_NAME@ desktop synchronization client
+GenericName=Folder Sync
+Icon=@APPLICATION_ICON_NAME@
+Keywords=@APPLICATION_NAME@;syncing;file;sharing;
+X-GNOME-Autostart-Delay=3
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+Icon[gl]=@APPLICATION_ICON_NAME@
+Name[gl]=@APPLICATION_NAME@ cliente de sincronización para escritorio
+Comment[gl]=@APPLICATION_NAME@ cliente de sincronización para escritorio
+GenericName[gl]=Sincronización de cartafol

.tx/nextcloud.client-desktop/he_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[he]=@APPLICATION_NAME@ לקוח סנכרון לשולחן העבודה
-Icon[he]=@APPLICATION_EXECUTABLE@
+Icon[he]=@APPLICATION_ICON_NAME@
 Name[he]=@APPLICATION_NAME@ לקוח סנכרון לשולחן העבודה 
+Comment[he]=@APPLICATION_NAME@ לקוח סנכרון לשולחן העבודה
 GenericName[he]=סנכרון תיקיות

.tx/nextcloud.client-desktop/hr_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,6 +198,6 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[hr]=klijent za sinkronizaciju računala
 Name[hr]=sinkronizacija računala
+Comment[hr]=klijent za sinkronizaciju računala
 GenericName[hr]=Sinkronizacija mapa

.tx/nextcloud.client-desktop/hu_translation

@@ -0,0 +1,204 @@
+[Desktop Entry]
+Categories=Utility;X-SuSE-SyncUtility;
+Type=Application
+Exec=@APPLICATION_EXECUTABLE@
+Name=@APPLICATION_NAME@ desktop sync client 
+Comment=@APPLICATION_NAME@ desktop synchronization client
+GenericName=Folder Sync
+Icon=@APPLICATION_ICON_NAME@
+Keywords=@APPLICATION_NAME@;syncing;file;sharing;
+X-GNOME-Autostart-Delay=3
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+Icon[hu_HU]=@APPLICATION_ICON_NAME@
+Name[hu_HU]=@APPLICATION_NAME@ asztali szinkronizálási kliens
+Comment[hu_HU]=@APPLICATION_NAME@ asztali szinkronizálási kliens
+GenericName[hu_HU]=Mappaszinkronizálás

.tx/nextcloud.client-desktop/is_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[is]=@APPLICATION_NAME@ forrit til samstillingar við tölvu
-Icon[is]=@APPLICATION_EXECUTABLE@
+Icon[is]=@APPLICATION_ICON_NAME@
 Name[is]=@APPLICATION_NAME@ forrit til samstillingar við tölvu
+Comment[is]=@APPLICATION_NAME@ forrit til samstillingar við tölvu
 GenericName[is]=Samstilling á möppum

.tx/nextcloud.client-desktop/it_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[it]=Client di sincronizzazione desktop di @APPLICATION_NAME@ 
-Icon[it]=@APPLICATION_EXECUTABLE@
+Icon[it]=@APPLICATION_ICON_NAME@
 Name[it]=Client di sincronizzazione desktop di @APPLICATION_NAME@ 
+Comment[it]=Client di sincronizzazione desktop di @APPLICATION_NAME@ 
 GenericName[it]=Sincronizzazione cartelle

.tx/nextcloud.client-desktop/ja_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
-Icon[ja_JP]=@APPLICATION_EXECUTABLE@
+Icon[ja_JP]=@APPLICATION_ICON_NAME@
 Name[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
+Comment[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
 GenericName[ja_JP]=フォルダーを同期する

.tx/nextcloud.client-desktop/ko_translation

@@ -0,0 +1,203 @@
+[Desktop Entry]
+Categories=Utility;X-SuSE-SyncUtility;
+Type=Application
+Exec=@APPLICATION_EXECUTABLE@
+Name=@APPLICATION_NAME@ desktop sync client 
+Comment=@APPLICATION_NAME@ desktop synchronization client
+GenericName=Folder Sync
+Icon=@APPLICATION_ICON_NAME@
+Keywords=@APPLICATION_NAME@;syncing;file;sharing;
+X-GNOME-Autostart-Delay=3
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+Icon[ko]=@APPLICATION_ICON_NAME@
+Comment[ko]=@APPLICATION_NAME@ 데스크톱 동기화 클라이언트
+GenericName[ko]=폴더 동기화

.tx/nextcloud.client-desktop/lt_LT_translation

@@ -0,0 +1,204 @@
+[Desktop Entry]
+Categories=Utility;X-SuSE-SyncUtility;
+Type=Application
+Exec=@APPLICATION_EXECUTABLE@
+Name=@APPLICATION_NAME@ desktop sync client 
+Comment=@APPLICATION_NAME@ desktop synchronization client
+GenericName=Folder Sync
+Icon=@APPLICATION_ICON_NAME@
+Keywords=@APPLICATION_NAME@;syncing;file;sharing;
+X-GNOME-Autostart-Delay=3
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+Icon[lt_LT]=@APPLICATION_ICON_NAME@
+Name[lt_LT]=@APPLICATION_NAME@ darbalaukio sinchronizavimo kliento programa
+Comment[lt_LT]=@APPLICATION_NAME@ darbalaukio sinchronizavimo kliento programa
+GenericName[lt_LT]=Aplankų sinchronizavimas

.tx/nextcloud.client-desktop/lv_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[lv]=@APPLICATION_NAME@ darbavirsmas sinhronizešanas klients
-Icon[lv]=@APPLICATION_EXECUTABLE@
+Icon[lv]=@APPLICATION_ICON_NAME@
 Name[lv]=@APPLICATION_NAME@ darbavirsmas sinhronizešanas klients
+Comment[lv]=@APPLICATION_NAME@ darbavirsmas sinhronizešanas klients
 GenericName[lv]=Mapju Sinhronizēšana

.tx/nextcloud.client-desktop/nb_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[nb_NO]=@APPLICATION_NAME@ klient for synkroinisering
-Icon[nb_NO]=@APPLICATION_EXECUTABLE@
+Icon[nb_NO]=@APPLICATION_ICON_NAME@
 Name[nb_NO]=@APPLICATION_NAME@ klient for synkroinisering
+Comment[nb_NO]=@APPLICATION_NAME@ klient for synkroinisering
 GenericName[nb_NO]=Mappe synkroinisering

.tx/nextcloud.client-desktop/nl_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[nl]=@APPLICATION_NAME@ desktopsynchronisatieclient
-Icon[nl]=@APPLICATION_EXECUTABLE@
+Icon[nl]=@APPLICATION_ICON_NAME@
 Name[nl]=@APPLICATION_NAME@ desktop sync client 
+Comment[nl]=@APPLICATION_NAME@ desktopsynchronisatieclient
 GenericName[nl]=Map synchronisatie

.tx/nextcloud.client-desktop/pl_translation

@@ -0,0 +1,204 @@
+[Desktop Entry]
+Categories=Utility;X-SuSE-SyncUtility;
+Type=Application
+Exec=@APPLICATION_EXECUTABLE@
+Name=@APPLICATION_NAME@ desktop sync client 
+Comment=@APPLICATION_NAME@ desktop synchronization client
+GenericName=Folder Sync
+Icon=@APPLICATION_ICON_NAME@
+Keywords=@APPLICATION_NAME@;syncing;file;sharing;
+X-GNOME-Autostart-Delay=3
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+Icon[pl]=@APPLICATION_ICON_NAME@
+Name[pl]=@APPLICATION_NAME@ desktopowy klient synchronizacji
+Comment[pl]=@APPLICATION_NAME@ desktopowy klient synchronizacji
+GenericName[pl]=Katalog synchronizacji

.tx/nextcloud.client-desktop/pt_BR_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[pt_BR]=@APPLICATION_NAME@ cliente de sincronização desktop
-Icon[pt_BR]=@APPLICATION_EXECUTABLE@
+Icon[pt_BR]=@APPLICATION_ICON_NAME@
 Name[pt_BR]=@APPLICATION_NAME@ cliente de sincronização desktop
+Comment[pt_BR]=@APPLICATION_NAME@ cliente de sincronização desktop
 GenericName[pt_BR]=Sincronizar Pasta

.tx/nextcloud.client-desktop/pt_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[pt_PT]=@APPLICATION_NAME@ - Cliente de Sincronização da Área de Trabalho
-Icon[pt_PT]=@APPLICATION_EXECUTABLE@
+Icon[pt_PT]=@APPLICATION_ICON_NAME@
 Name[pt_PT]=@APPLICATION_NAME@ - Cliente de Sincronização da Área de Trabalho
+Comment[pt_PT]=@APPLICATION_NAME@ - Cliente de Sincronização da Área de Trabalho
 GenericName[pt_PT]=Sincronização de Pasta

.tx/nextcloud.client-desktop/ro_translation

@@ -0,0 +1,204 @@
+[Desktop Entry]
+Categories=Utility;X-SuSE-SyncUtility;
+Type=Application
+Exec=@APPLICATION_EXECUTABLE@
+Name=@APPLICATION_NAME@ desktop sync client 
+Comment=@APPLICATION_NAME@ desktop synchronization client
+GenericName=Folder Sync
+Icon=@APPLICATION_ICON_NAME@
+Keywords=@APPLICATION_NAME@;syncing;file;sharing;
+X-GNOME-Autostart-Delay=3
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+Icon[ro]=@APPLICATION_ICON_NAME@
+Name[ro]=@APPLICATION_NAME@ client de sincronizare pentru desktop
+Comment[ro]=@APPLICATION_NAME@ client de sincronizare pentru desktop
+GenericName[ro]=Sincronizare dosare

.tx/nextcloud.client-desktop/ru_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
+Icon[ru]=@APPLICATION_ICON_NAME@
+Name[ru]=@APPLICATION_NAME@ для ПК
 Comment[ru]=Клиент синхронизации @APPLICATION_NAME@ для ПК
-Icon[ru]=@APPLICATION_EXECUTABLE@
-Name[ru]=@APPLICATION_NAME@  клиент для ПК
 GenericName[ru]=Синхронизация папок

.tx/nextcloud.client-desktop/sk_translation

@@ -0,0 +1,204 @@
+[Desktop Entry]
+Categories=Utility;X-SuSE-SyncUtility;
+Type=Application
+Exec=@APPLICATION_EXECUTABLE@
+Name=@APPLICATION_NAME@ desktop sync client 
+Comment=@APPLICATION_NAME@ desktop synchronization client
+GenericName=Folder Sync
+Icon=@APPLICATION_ICON_NAME@
+Keywords=@APPLICATION_NAME@;syncing;file;sharing;
+X-GNOME-Autostart-Delay=3
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+Icon[sk_SK]=@APPLICATION_ICON_NAME@
+Name[sk_SK]=@APPLICATION_NAME@ Synchronizačný klient pre PC
+Comment[sk_SK]=@APPLICATION_NAME@ Synchronizačný klient pre PC
+GenericName[sk_SK]=Synchnonizácia priečinka

.tx/nextcloud.client-desktop/sl_translation

@@ -0,0 +1,204 @@
+[Desktop Entry]
+Categories=Utility;X-SuSE-SyncUtility;
+Type=Application
+Exec=@APPLICATION_EXECUTABLE@
+Name=@APPLICATION_NAME@ desktop sync client 
+Comment=@APPLICATION_NAME@ desktop synchronization client
+GenericName=Folder Sync
+Icon=@APPLICATION_ICON_NAME@
+Keywords=@APPLICATION_NAME@;syncing;file;sharing;
+X-GNOME-Autostart-Delay=3
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+Icon[sl]=@APPLICATION_ICON_NAME@
+Name[sl]=@APPLICATION_NAME@ odjemalec za usklajevanje
+Comment[sl]=@APPLICATION_NAME@ odjemalec za usklajevanje
+GenericName[sl]=Usklajevanje map

.tx/nextcloud.client-desktop/sr_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[sr]=@APPLICATION_NAME@ десктоп клијент за синхронизацију
-Icon[sr]=@APPLICATION_EXECUTABLE@
+Icon[sr]=@APPLICATION_ICON_NAME@
 Name[sr]=@APPLICATION_NAME@ десктоп клијент за синхронизацију
+Comment[sr]=@APPLICATION_NAME@ десктоп клијент за синхронизацију
 GenericName[sr]=Синхронизација фасцикли

.tx/nextcloud.client-desktop/sv_translation

@@ -0,0 +1,202 @@
+[Desktop Entry]
+Categories=Utility;X-SuSE-SyncUtility;
+Type=Application
+Exec=@APPLICATION_EXECUTABLE@
+Name=@APPLICATION_NAME@ desktop sync client 
+Comment=@APPLICATION_NAME@ desktop synchronization client
+GenericName=Folder Sync
+Icon=@APPLICATION_ICON_NAME@
+Keywords=@APPLICATION_NAME@;syncing;file;sharing;
+X-GNOME-Autostart-Delay=3
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+Icon[sv]=@APPLICATION_ICON_NAME@
+GenericName[sv]=Mappsynkronisering

.tx/nextcloud.client-desktop/tr_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[tr]=@APPLICATION_NAME@ masaüstü eşitleme istemcisi
-Icon[tr]=@APPLICATION_EXECUTABLE@
+Icon[tr]=@APPLICATION_ICON_NAME@
 Name[tr]=@APPLICATION_NAME@ masaüstü eşiteme istemcisi
+Comment[tr]=@APPLICATION_NAME@ masaüstü eşitleme istemcisi
 GenericName[tr]=Klasör Eşitleme

.tx/nextcloud.client-desktop/uk_translation

@@ -0,0 +1,204 @@
+[Desktop Entry]
+Categories=Utility;X-SuSE-SyncUtility;
+Type=Application
+Exec=@APPLICATION_EXECUTABLE@
+Name=@APPLICATION_NAME@ desktop sync client 
+Comment=@APPLICATION_NAME@ desktop synchronization client
+GenericName=Folder Sync
+Icon=@APPLICATION_ICON_NAME@
+Keywords=@APPLICATION_NAME@;syncing;file;sharing;
+X-GNOME-Autostart-Delay=3
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+Icon[uk]=@APPLICATION_ICON_NAME@
+Name[uk]=@APPLICATION_NAME@ клієнт для ПК
+Comment[uk]=Клієнт синхронізації @APPLICATION_NAME@ для ПК
+GenericName[uk]=Синхронізація каталогів

.tx/nextcloud.client-desktop/zh_CN_translation

@@ -0,0 +1,204 @@
+[Desktop Entry]
+Categories=Utility;X-SuSE-SyncUtility;
+Type=Application
+Exec=@APPLICATION_EXECUTABLE@
+Name=@APPLICATION_NAME@ desktop sync client 
+Comment=@APPLICATION_NAME@ desktop synchronization client
+GenericName=Folder Sync
+Icon=@APPLICATION_ICON_NAME@
+Keywords=@APPLICATION_NAME@;syncing;file;sharing;
+X-GNOME-Autostart-Delay=3
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+Icon[zh_CN]=@APPLICATION_ICON_NAME@
+Name[zh_CN]=@APPLICATION_NAME@ 桌面同步客户端
+Comment[zh_CN]=@APPLICATION_NAME@ 桌面同步客户端
+GenericName[zh_CN]=文件夹同步

.tx/nextcloud.client-desktop/zh_TW_translation

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,7 +198,6 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Comment[zh_TW]=@APPLICATION_NAME@ 桌面同步客戶端
-Icon[zh_TW]=@APPLICATION_EXECUTABLE@
 Name[zh_TW]=@APPLICATION_NAME@ 桌面同步客戶端
+Comment[zh_TW]=@APPLICATION_NAME@ 桌面同步客戶端
 GenericName[zh_TW]=資料夾同步

CONTRIBUTING.md

@@ -21,7 +21,7 @@ If your issue appears to be a bug, and hasn't been reported, open a new issue.
 Help us to maximize the effort we can spend fixing issues and adding new
 features, by not reporting duplicate issues.
 
-[template]: https://raw.githubusercontent.com/nextcloud/appstore/master/.github/issue_template.md
+[template]: https://raw.githubusercontent.com/nextcloud/desktop/master/.github/issue_template.md
 [support]: https://nextcloud.com/support/
 [forum]: https://help.nextcloud.com/categories
 [irc]: https://webchat.freenode.net/?channels=nextcloud

NEXTCLOUD.cmake

@@ -4,7 +4,9 @@ set( APPLICATION_EXECUTABLE "nextcloud" )
 set( APPLICATION_DOMAIN     "nextcloud.com" )
 set( APPLICATION_VENDOR     "Nextcloud GmbH" )
 set( APPLICATION_UPDATE_URL "https://updates.nextcloud.org/client/" CACHE string "URL for updater" )
+set( APPLICATION_HELP_URL   "" CACHE string "URL for the help menu" )
 set( APPLICATION_ICON_NAME  "Nextcloud" )
+set( APPLICATION_SERVER_URL "" CACHE string "URL for the server to use. If entered the server can only connect to this instance" )
 
 set( LINUX_PACKAGE_SHORTNAME "nextcloud" )
 
@@ -22,3 +24,10 @@ option( WITH_CRASHREPORTER "Build crashreporter" OFF )
 #set( CRASHREPORTER_ICON ":/owncloud-icon.png" )
 
 option( WITH_PROVIDERS "Build with providers list" ON )
+
+
+## Theming options
+set( APPLICATION_WIZARD_HEADER_BACKGROUND_COLOR "#0082c9" CACHE string "Hex color of the wizard header background")
+set( APPLICATION_WIZARD_HEADER_TITLE_COLOR "#ffffff" CACHE string "Hex color of the text in the wizard header")
+option( APPLICATION_WIZARD_USE_CUSTOM_LOGO "Use the logo from ':/client/theme/colored/wizard_logo.png' else the default application icon is used" ON )
+

NextcloudCPack.cmake

@@ -19,7 +19,7 @@ if(APPLE)
     set( CPACK_GENERATOR "DragNDrop" )
     set( CPACK_SOURCE_GENERATOR "")
     set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_SHORTNAME}-${CPACK_PACKAGE_VERSION} )
-    set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/ownCloud.icns)
+    set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/${APPLICATION_ICON_NAME}.icns)
 
     set( CPACK_DMG_DS_STORE "${CMAKE_SOURCE_DIR}/admin/osx/DS_Store.in")
 #    set( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/admin/osx/DMGBackground.png" )

README.md

@@ -17,30 +17,36 @@ with your computer.
 
 ##### Clone the repo and create build directory
 ```
-$ git clone git@github.com:nextcloud/desktop.git
+$ git clone https://github.com/nextcloud/desktop.git
 $ cd desktop
 $ mkdir build
+$ cd build
 ```
 ##### Compile and install
 
+For development reasons it is better to install the client on user space
+instead on the global system. For example you could use in the next
+instructions `path-to-install-folder/` as `~/.local/` in a linux system. If
+you want to install system wide you could use `/usr/local` or `/opt/nextcloud/`.
+
 ##### Linux
 
 ```
-$ cmake .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
+$ cmake .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1 -DQTKEYCHAIN_LIBRARY=/path-to-qt5keychain-folder/lib64/libqt5keychain.so -DQTKEYCHAIN_INCLUDE_DIR=/path-to-qt5keychain-folder/include/qt5keychain/ -DOPENSSL_ROOT_DIR=/path-to-openssl-folder/ -DOPENSSL_INCLUDE_DIR=path-to-openssl-folder/include -DOPENSSL_LIBRARIES=path-to-openssl-folder/lib
 $ make install
 ```
 
 ##### Windows
 
 ```
-$ cmake -G "Visual Studio 15 2017 Win64" .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
+$ cmake -G "Visual Studio 15 2017 Win64" .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1 -DPng2Ico_EXECUTABLE=/path-to-install-png2ico/png2ico.exe  -DQTKEYCHAIN_LIBRARY=/path-to-qt5keychain-folder/lib/qt5keychain.lib -DQTKEYCHAIN_INCLUDE_DIR=/path-to-qt5keychain-folder/include/qt5keychain/ -DOPENSSL_ROOT_DIR=/path-to-openssl-folder/ -DOPENSSL_INCLUDE_DIR=path-to-openssl-folder/include -DOPENSSL_LIBRARIES=path-to-openssl-folder/lib
 $ cmake --build . --config Debug --target install
 ```
 
 ##### Mac OS
 
 ```
-$ cmake .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
+$ cmake .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1 -DQTKEYCHAIN_LIBRARY=/path-to-qt5keychain-folder/lib/libqt5keychain.dylib -DQTKEYCHAIN_INCLUDE_DIR=/path-to-qt5keychain-folder/include/qt5keychain/ -DOPENSSL_ROOT_DIR=/path-to-openssl-folder/ -DOPENSSL_INCLUDE_DIR=path-to-openssl-folder/include -DOPENSSL_LIBRARIES=path-to-openssl-folder/lib
 $ make install
 ```
 
@@ -69,6 +75,8 @@ of your report being lost. :boom:
 
 - If you created a patch :heart_eyes:, please submit a [Pull
 Request](https://github.com/nextcloud/client/pulls).
+- How to create a pull request? This guide will help you get started: [Opening a pull request](https://opensource.guide/how-to-contribute/#opening-a-pull-request) :heart:
+
 
 ## :satellite: Contact us
 
@@ -99,5 +107,3 @@ https://github.com/nextcloud/desktop.
     WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
     or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
     for more details.
-
-

VERSION.cmake

@@ -1,7 +1,7 @@
 set( MIRALL_VERSION_MAJOR 2 )
 set( MIRALL_VERSION_MINOR 5 )
-set( MIRALL_VERSION_PATCH 0 )
-set( MIRALL_VERSION_YEAR  2018 )
+set( MIRALL_VERSION_PATCH 2 )
+set( MIRALL_VERSION_YEAR  2019 )
 set( MIRALL_SOVERSION 0 )
 
 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )

admin/linux/build-appimage.sh

@@ -18,11 +18,11 @@ if [ $SUFFIX != "master" ]; then
     SUFFIX="PR-$SUFFIX"
 fi
 
-#QtKeyChain 0.8.0
+#QtKeyChain 0.9.1
 cd /build
 git clone https://github.com/frankosterfeld/qtkeychain.git
 cd qtkeychain
-git checkout v0.8.0
+git checkout v0.9.1
 mkdir build
 cd build
 cmake -D CMAKE_INSTALL_PREFIX=/usr ../

admin/linux/debian/debian.disco/changelog

@@ -0,0 +1,23 @@
+nextcloud-client (2.3.3-1.0~disco1) disco; urgency=medium
+
+  * Debian build support for the forked client.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Mon, 6 Nov 2017 20:20:04 +0100
+
+nextcloud-client (2.3.1-1.0~disco1) disco; urgency=medium
+
+  * New upstream version
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 23 Mar 2017 19:07:36 +0100
+
+nextcloud-client (2.3.0-1.0~disco1) disco; urgency=medium
+
+  * New upstream version
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 21 Mar 2017 19:34:13 +0100
+
+nextcloud-client (2.2.4-1.4~disco1) disco; urgency=medium
+
+  * The locale-specific icon names are correct too
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 7 Feb 2017 19:55:40 +0100

admin/linux/debian/debian.xenial/post-patches/qt5.5-compat.patch

@@ -0,0 +1,40 @@
+--- nextcloud-client-2.4.0.orig/src/gui/wizard/owncloudoauthcredspage.cpp
++++ nextcloud-client-2.4.0/src/gui/wizard/owncloudoauthcredspage.cpp
+@@ -53,10 +53,8 @@ OwncloudOAuthCredsPage::OwncloudOAuthCredsPage()
+     _ui.openLinkButton->setContextMenuPolicy(Qt::CustomContextMenu);
+     QObject::connect(_ui.openLinkButton, &QWidget::customContextMenuRequested, [this](const QPoint &pos) {
+         auto menu = new QMenu(_ui.openLinkButton);
+-        menu->addAction(tr("Copy link to clipboard"), this, [this] {
+-            if (_asyncAuth)
+-                QApplication::clipboard()->setText(_asyncAuth->authorisationLink().toString(QUrl::FullyEncoded));
+-        });
++        auto action = menu->addAction(tr("Copy link to clipboard"));
++        connect(action, &QAction::triggered, this, &OwncloudOAuthCredsPage::copyLinkToClipboard);
+         menu->setAttribute(Qt::WA_DeleteOnClose);
+         menu->popup(_ui.openLinkButton->mapToGlobal(pos));
+     });
+@@ -131,4 +129,11 @@ bool OwncloudOAuthCredsPage::isComplete() const
+     return false; /* We can never go forward manually */
+ }
+ 
++void OwncloudOAuthCredsPage::copyLinkToClipboard()
++{
++    if (_asyncAuth)
++      QApplication::clipboard()->setText(_asyncAuth->authorisationLink().toString(QUrl::FullyEncoded));
++}
++
++
+ } // namespace OCC
+--- nextcloud-client-2.4.0.orig/src/gui/wizard/owncloudoauthcredspage.h
++++ nextcloud-client-2.4.0/src/gui/wizard/owncloudoauthcredspage.h
+@@ -57,6 +57,10 @@ public:
+     QString _refreshToken;
+     QScopedPointer<OAuth> _asyncAuth;
+     Ui_OwncloudOAuthCredsPage _ui;
++
++protected slots:
++    void copyLinkToClipboard();
++
+ };
+ 
+ } // namespace OCC

admin/linux/debian/drone-build.sh

@@ -3,11 +3,11 @@
 set -xe
 shopt -s extglob
 
-PPA=ppa:nextcloud-devs/client-beta
-PPA_BETA=ppa:nextcloud-devs/client-alpha
+PPA=ppa:nextcloud-devs/client
+PPA_BETA=ppa:nextcloud-devs/client-beta
 
-OBS_PROJECT=home:ivaradi:beta
-OBS_PROJECT_BETA=home:ivaradi:alpha
+OBS_PROJECT=home:ivaradi
+OBS_PROJECT_BETA=home:ivaradi:beta
 OBS_PACKAGE=nextcloud-client
 
 pull_request=${DRONE_PULL_REQUEST:=master}
@@ -36,12 +36,11 @@ read basever kind <<<$(admin/linux/debian/scripts/git2changelog.py /tmp/tmpchang
 cd "${DRONE_DIR}"
 
 echo "$kind" > kind
-kind="release"
 
 if test "$kind" = "beta"; then
-    repo=nextcloud-devs/client-alpha
-else
     repo=nextcloud-devs/client-beta
+else
+    repo=nextcloud-devs/client
 fi
 
 origsourceopt=""
@@ -52,7 +51,7 @@ if ! wget http://ppa.launchpad.net/${repo}/ubuntu/pool/main/n/nextcloud-client/n
     origsourceopt="-sa"
 fi
 
-for distribution in xenial bionic cosmic stable; do
+for distribution in xenial bionic cosmic disco stable; do
     rm -rf nextcloud-client_${basever}
     cp -a ${DRONE_WORKSPACE} nextcloud-client_${basever}
 

admin/linux/debian/scripts/git2changelog.py

@@ -73,11 +73,13 @@ def collectEntries(baseCommit, baseVersion, kind):
         (commit, name, email, date, revdate, subject) = line.split("\t")
         revdate = datetime.datetime.utcfromtimestamp(long(revdate)).strftime("%Y%m%d.%H%M%S")
 
+        kind = "beta"
+
         if commit==newVersionCommit:
             result = processVersionTag(newVersionTag)
             if result:
                 newVersionOrigTag = lastVersionTag
-                (baseVersion, kind) = result
+                (baseVersion, _kind) = result
 
 
         version=getCommitVersion(commit)
@@ -88,7 +90,7 @@ def collectEntries(baseCommit, baseVersion, kind):
                 if result:
                     lastVersionTag = tag
                     lastCMAKEVersion = version
-                    (baseVersion, kind) = result
+                    (baseVersion, _kind) = result
 
         for tag in subprocess.check_output(["git", "tag",
                                             "--points-at",
@@ -132,7 +134,7 @@ if __name__ == "__main__":
     distribution = sys.argv[2]
 
     #entries = collectEntries("8aade24147b5313f8241a8b42331442b7f40eef9", "2.2.4", "release")
-    entries = collectEntries("f9b1c724d6ab5431e0cd56b7cd834f2dd48cebb1", "2.4.0", "release")
+    entries = collectEntries("f9b1c724d6ab5431e0cd56b7cd834f2dd48cebb1", "2.4.0", "beta")
 
 
     with open(sys.argv[1], "wt") as f:

admin/osx/installer-background.svg

@@ -1,51 +1,2 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   enable-background="new 0 0 595.275 311.111"
-   xml:space="preserve"
-   height="200"
-   width="320"
-   version="1.1"
-   y="0px"
-   x="0px"
-   viewBox="0 0 35 0"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="installer-background.svg"><metadata
-     id="metadata12"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs10" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1002"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="0.734375"
-     inkscape:cx="-49.141255"
-     inkscape:cy="236.17459"
-     inkscape:window-x="0"
-     inkscape:window-y="34"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" /><path
-     style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#ffffff;fill-opacity:1;enable-background:accumulate"
-     d="m 75.63384,28.421489 c -29.36582,0 -53.09172,23.724901 -53.09172,53.091701 0,12.1047 4.03087,23.2455 10.82647,32.1667 14.74225,-17.0631 36.50138,-27.8988 60.79508,-27.8988 11.88546,0 23.15644,2.6467 33.31219,7.2871 0.82221,-3.7185 1.24924,-7.5856 1.24924,-11.555 0,-29.3658 -23.72491,-53.091701 -53.09172,-53.091701 z M 6.30358,52.98809 c -15.29297,0 -27.58645,12.3977 -27.58645,27.6906 0,4.9515 1.27738,9.6301 3.53933,13.6373 9.22826,-5.206 19.89756,-8.2239 31.23002,-8.2239 1.09366,0 2.14708,0.039 3.22713,0.1052 -0.12231,-1.5502 -0.20806,-3.103 -0.20806,-4.6844 0,-8.5178 1.85002,-16.6223 5.10106,-23.9429 -4.37708,-2.9351 -9.62115,-4.5803 -15.30284,-4.5803 z m 130.95716,19.0502 c -1.12983,0 -2.21885,0.1381 -3.33122,0.2078 0.48121,3.0338 0.83274,6.097 0.83274,9.2651 0,4.9298 -0.62692,9.6869 -1.7697,14.2616 13.39754,7.4144 24.52385,18.5084 31.8547,31.9586 7.60342,-3.9586 16.08566,-6.4754 25.08804,-7.0787 -2.32015,-27.2093 -24.86184,-48.6137 -52.67416,-48.6137 z m -43.09675,19.7789 c -41.09117,0 -74.32775,33.2333 -74.32775,74.3278 0,41.0911 33.23329,74.3277 74.32775,74.3277 41.09447,0 74.32775,-33.2366 74.32775,-74.3277 0,-41.0945 -33.23657,-74.3278 -74.32775,-74.3278 z m -80.67652,0.3117 c -31.87937,0 -57.67166,25.792 -57.67166,57.6717 0,18.7668 8.94156,35.3802 22.79774,45.9078 5.84147,-11.2667 17.57406,-18.9461 31.1258,-18.9461 1.63789,0 3.21,0.1986 4.78871,0.4169 -0.49554,-3.6054 -0.72871,-7.2937 -0.72871,-11.0346 0,-17.8847 5.82174,-34.4234 15.71907,-47.7819 -5.92466,-7.4133 -10.1643,-16.321 -11.97162,-26.025 -1.33935,-0.092 -2.69673,-0.2078 -4.05979,-0.2078 z m 180.71831,34.3544 c -9.68,0 -18.74781,2.4714 -26.75364,6.6625 4.54607,10.0696 7.07867,21.2422 7.07867,32.9998 0,22.0146 -8.85114,42.0052 -23.21431,56.5275 10.5516,11.7145 25.861,19.0503 42.88961,19.0503 31.87937,0 57.67165,-25.7916 57.67165,-57.6717 0,-31.8793 -25.79195,-57.5664 -57.67165,-57.5664 z m -244.00885,7.5998 c -29.3701,0 -53.19693,23.6164 -53.19693,52.9832 0,29.3669 23.82815,53.1937 53.19364,53.1937 11.17727,0 21.53161,-3.4825 30.08487,-9.369 -3.5344,-5.492 -5.62151,-12.0581 -5.62151,-19.0503 0,-3.6291 0.53552,-7.1158 1.56148,-10.4099 -16.01267,-11.5721 -26.44131,-30.4034 -26.44131,-51.6319 0,-5.394 0.71083,-10.6098 1.97792,-15.6152 -0.52591,-0.013 -1.03171,-0.1052 -1.56152,-0.1052 z m 312.19495,45.5955 c -1.56661,0 -3.08252,0.1789 -4.58026,0.4169 0.0829,1.3242 0.1039,2.6108 0.1039,3.9559 0,16.9326 -6.68118,32.3015 -17.4889,43.7214 5.31706,6.1831 13.12695,10.0976 21.96526,10.0976 16.09849,0 29.14785,-12.9451 29.14785,-29.0439 0,-16.0985 -13.04936,-29.1479 -29.14785,-29.1479 z m -252.64924,3.1229 c -16.09783,0 -29.04395,12.9461 -29.04395,29.044 0,16.0978 12.94612,29.1478 29.04395,29.1478 12.33919,0 22.81287,-7.6994 27.06599,-18.5298 -10.378,-10.57 -17.83675,-24.0544 -21.13213,-39.0363 -1.92854,-0.3985 -3.88588,-0.6247 -5.93386,-0.6247 z"
-     id="path6"
-     inkscape:connector-curvature="0" /></svg>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xml:space="preserve" height="200" width="320" enable-background="new 0 0 595.275 311.111" y="0px" x="0px" viewBox="0 0 35 0"><path style="color-rendering:auto;text-decoration-color:#000000;color:#000000;isolation:auto;mix-blend-mode:normal;shape-rendering:auto;solid-color:#000000;block-progression:tb;text-decoration-line:none;image-rendering:auto;white-space:normal;text-indent:0;enable-background:accumulate;text-transform:none;text-decoration-style:solid" d="m100.3 47.902c-41.68 0.003-76.667 28.536-87.36 66.923-9.3312-20.531-29.874-35.082-53.741-35.083-32.488 0.003-59.2 26.715-59.203 59.203-0.0058 32.494 26.709 59.213 59.203 59.216 23.869-0.003 44.397-14.562 53.728-35.096 10.691 38.4 45.696 66.94 87.372 66.94 41.446 0.003 76.269-28.226 87.178-66.288 9.4834 20.154 29.709 34.446 53.302 34.45 32.501 0.006 59.221-26.715 59.216-59.216-0.003-32.494-26.722-59.21-59.216-59.203-23.594 0.003-43.832 14.293-53.314 34.45-10.896-38.064-45.712-66.293-87.152-66.29zm0 34.754c31.298-0.002 56.298 24.992 56.301 56.29 0.002 31.301-25 56.304-56.301 56.301-31.296-0.002-56.291-25.003-56.288-56.301 0.003-31.294 24.992-56.286 56.288-56.29zm-141.1 31.84c13.71 0.002 24.448 10.74 24.45 24.45 0.0024 13.713-10.736 24.461-24.45 24.462-13.713-0.002-24.453-10.749-24.45-24.462 0.0016-13.71 10.74-24.448 24.45-24.45zm281.58 0c13.713-0.002 24.461 10.736 24.462 24.45 0.003 13.716-10.745 24.464-24.462 24.462-13.713-0.002-24.453-10.749-24.45-24.462 0.002-13.71 10.74-24.448 24.45-24.45z" fill="#fff"/></svg>

cmake/modules/AddAppIconMacro.cmake

@@ -45,6 +45,9 @@ macro (KDE4_ADD_APP_ICON appsources pattern)
                 if (fn MATCHES ".*128.*" )
                     list (APPEND _icons ${it})
                 endif (fn MATCHES ".*128.*")
+                if (fn MATCHES ".*256.*" )
+                    list (APPEND _icons ${it})
+                endif (fn MATCHES ".*256.*")                
             endforeach (it)
             if (_icons)
                 add_custom_command(OUTPUT ${_outfilename}.ico ${_outfilename}.rc

cmake/modules/ECMAddAppIcon.cmake

@@ -168,7 +168,8 @@ function(ecm_add_app_icon appsources)
                       ${icons_at_32px}
                       ${icons_at_48px}
                       ${icons_at_64px}
-                      ${icons_at_128px})
+                      ${icons_at_128px}
+                      ${icons_at_256px})
     if (NOT windows_icons)
         message(AUTHOR_WARNING "No icons suitable for use on Windows provided")
     endif()

cmake/modules/MacOSXBundleInfo.plist.in

@@ -11,7 +11,7 @@
         <key>CFBundleExecutable</key>
         <string>@APPLICATION_EXECUTABLE@</string>
         <key>CFBundleIconFile</key>
-        <string>ownCloud.icns</string>
+        <string>@APPLICATION_ICON_NAME@.icns</string>
         <key>CFBundleIdentifier</key>
         <string>@APPLICATION_REV_DOMAIN@</string>
         <key>CFBundleInfoDictionaryVersion</key>

config.h.in

@@ -18,7 +18,12 @@
 #cmakedefine APPLICATION_SHORTNAME "@APPLICATION_SHORTNAME@"
 #cmakedefine APPLICATION_EXECUTABLE "@APPLICATION_EXECUTABLE@"
 #cmakedefine APPLICATION_UPDATE_URL "@APPLICATION_UPDATE_URL@"
+#cmakedefine APPLICATION_HELP_URL "@APPLICATION_HELP_URL@"
 #cmakedefine APPLICATION_ICON_NAME "@APPLICATION_ICON_NAME@"
+#cmakedefine APPLICATION_SERVER_URL "@APPLICATION_SERVER_URL@"
+#cmakedefine APPLICATION_WIZARD_HEADER_BACKGROUND_COLOR "@APPLICATION_WIZARD_HEADER_BACKGROUND_COLOR@"
+#cmakedefine APPLICATION_WIZARD_HEADER_TITLE_COLOR "@APPLICATION_WIZARD_HEADER_TITLE_COLOR@"
+#cmakedefine APPLICATION_WIZARD_USE_CUSTOM_LOGO "@APPLICATION_WIZARD_USE_CUSTOM_LOGO@"
 
 #cmakedefine ZLIB_FOUND @ZLIB_FOUND@
 

doc/CMakeLists.txt

@@ -16,6 +16,8 @@ if(SPHINX_FOUND)
     install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
     install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
 
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py" conf.py COPYONLY)
+
     if(WITH_DOC)
        add_custom_target(doc ALL DEPENDS doc-html COMMENT "Building documentation...")
     else(WITH_DOC)

doc/faq.rst

@@ -21,6 +21,25 @@ When a deeply nested directory is excluded from synchronization it will be
 listed with other ignored files and directories in the "Not synced" tab of
 the "Activity" pane.
 
+There Was A Warning About Changes In Synchronized Folders Not Being Tracked Reliably.
+-------------------------------------------------------------------------------------
+
+On linux when the synchronized folder contains very many subfolders the
+operating system may not allow for enough inotify watches to monitor the
+changes in all of them.
+
+In this case the client will not be able to immediately start the
+synchronization process when a file in one of the unmonitored folders changes.
+Instead, the client will show the warning and manually scan folders for changes
+in a regular interval (two hours by default).
+
+This problem can be solved by setting the fs.inotify.max_user_watches
+sysctl to a higher value. This can usually be done either temporarily::
+
+    echo 524288 > /proc/sys/fs/inotify/max_user_watches
+
+or permanently by adjusting ``/etc/sysctl.conf``.
+
 I Want To Move My Local Sync Folder
 -----------------------------------
 

doc/options.rst

@@ -24,7 +24,9 @@ The other options are:
 ``--logflush``
         Clears (flushes) the log file after each write action.
 
+``--logdebug``
+        Also output debug-level messages in the log (equivalent to setting the env var QT_LOGGING_RULES="qt.*=true;*.debug=true").
+)
+
 ``--confdir`` `<dirname>`
         Uses the specified configuration directory.
-        
-

man/nextcloud.1.rst

@@ -0,0 +1,33 @@
+:orphan:
+
+nextcloud(1)
+————
+
+SYNOPSIS
+========
+*nextcloud* [`OPTIONS`...]
+
+
+DESCRIPTION
+===========
+The nextCloud Client is a file synchronization desktop utility. It synchronizes files on your local computer, tablet, or handheld device with an nextCloud Server. If you make a change to the files on one device, the change is propagated to all other synchronized devices using the desktop synchronization clients.
+
+Normally, you start the client by clicking on the desktop icon or by starting it from the client application menu. After starting, an nextCloud icon appears in the computer system tray or on your tablet or handheld device.
+
+Options
+=======
+.. include:: ../doc/options.rst
+
+Config File
+===========
+.. include:: ../doc/conffile.rst
+
+BUGS
+====
+
+Please report bugs at https://github.com/nextcloud/client/issues.
+
+
+SEE ALSO
+========
+:manpage:`nextcloudcmd(1)`

man/nextcloudcmd.1.rst

@@ -1,30 +1,30 @@
 :orphan:
 
-owncloudcmd(1)
+nextcloudcmd(1)
 —————
 
 SYNOPSIS
 ========
-*owncloudcmd* [`OPTIONS`...] sourcedir owncloudurl
+*nextcloudcmd* [`OPTIONS`...] sourcedir nextcloudurl
 
 DESCRIPTION
 ===========
-owncloudcmd is the command line tool used for the ownCloud file synchronization
+nextcloudcmd is the command line tool used for the nextCloud file synchronization
 desktop utility.
 
-Contrary to the :manpage:`owncloud(1)` GUI client, `owncloudcmd` only performs
-a single sync run and then exits. In so doing, `owncloudcmd` replaces the
+Contrary to the :manpage:`nextcloud(1)` GUI client, `nextcloudcmd` only performs
+a single sync run and then exits. In so doing, `nextcloudcmd` replaces the
 `ocsync` binary used for the same purpose in earlier releases.
 
 A *sync run* synchronizes a single local directory using a WebDAV share on a
-remote ownCloud server.
+remote nextCloud server.
 
 To invoke the command line client, provide the local and the remote repository:
 The first parameter is the local directory. The second parameter is
 the server URL.
 
-.. note:: Prior to the 1.6 release of owncloudcmd, the tool only accepted
-   ``owncloud://`` or ``ownclouds://`` in place of ``http://`` and ``https://`` as
+.. note:: Prior to the 1.6 release of nextcloudcmd, the tool only accepted
+   ``nextcloud://`` or ``nextclouds://`` in place of ``http://`` and ``https://`` as
    a scheme. See ``Examples`` for details.
 
 OPTIONS
@@ -70,28 +70,28 @@ OPTIONS
 
 Example
 =======
-To synchronize the ownCloud directory ``Music`` to the local directory ``media/music``
+To synchronize the nextCloud directory ``Music`` to the local directory ``media/music``
 through a proxy listening on port ``8080`` on the gateway machine ``192.168.178.1``,
 the command line would be::
 
-  $ owncloudcmd —httpproxy http://192.168.178.1:8080 \
+  $ nextcloudcmd —httpproxy http://192.168.178.1:8080 \
                 $HOME/media/music \
-                https://server/owncloud/remote.php/webdav/Music
+                https://server/nextcloud/remote.php/webdav/Music
 
-``owncloudcmd`` will enquire user name and password, unless they have
+``nextcloudcmd`` will enquire user name and password, unless they have
 been specified on the command line or ``-n`` (see `netrc(5)`) has been passed.
 
 Using the legacy scheme, it would be::
 
-  $ owncloudcmd —httpproxy http://192.168.178.1:8080 \
+  $ nextcloudcmd —httpproxy http://192.168.178.1:8080 \
                 $HOME/media/music \
-                ownclouds://server/owncloud/remote.php/webdav/Music
+                nextclouds://server/nextcloud/remote.php/webdav/Music
 
 
 BUGS
 ====
-Please report bugs at https://github.com/owncloud/client/issues.
+Please report bugs at https://github.com/nextcloud/client/issues.
 
 SEE ALSO
 ========
-:manpage:`owncloud(1)`
+:manpage:`nextcloud(1)`

man/owncloud.1.rst

@@ -1,33 +0,0 @@
-:orphan:
-
-owncloud(1)
-————
-
-SYNOPSIS
-========
-*owncloud* [`OPTIONS`...]
-
-
-DESCRIPTION
-===========
-The ownCloud Client is a file synchronization desktop utility. It synchronizes files on your local computer, tablet, or handheld device with an ownCloud Server. If you make a change to the files on one device, the change is propagated to all other synchronized devices using the desktop synchronization clients.
-
-Normally, you start the client by clicking on the desktop icon or by starting it from the client application menu. After starting, an ownCloud icon appears in the computer system tray or on your tablet or handheld device.
-
-Options
-=======
-.. include:: ../doc/options.rst
-
-Config File
-===========
-.. include:: ../doc/conffile.rst
-
-BUGS
-====
-
-Please report bugs at https://github.com/owncloud/client/issues.
-
-
-SEE ALSO
-========
-:manpage:`owncloudcmd(1)`

mirall.desktop.in

@@ -5,7 +5,7 @@ Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
+Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
 # Translations
@@ -198,185 +198,185 @@ X-GNOME-Autostart-Delay=3
 Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
 GenericName[oc]=Dorsièr de Sincronizacion
 Name[oc]=@APPLICATION_NAME@ sincronizacion del client
-Icon[oc]=@APPLICATION_EXECUTABLE@
+Icon[oc]=@APPLICATION_ICON_NAME@
 Comment[ar]=@APPLICATION_NAME@ زبون مزامنة مكتبي
 GenericName[ar]=مزامنة المجلد
 Name[ar]=@APPLICATION_NAME@ زبون مزامنة مكتبي
-Icon[ar]=@APPLICATION_EXECUTABLE@
+Icon[ar]=@APPLICATION_ICON_NAME@
 Comment[bg_BG]=@APPLICATION_NAME@ клиент за десктоп синхронизация
 GenericName[bg_BG]=Синхронизиране на папката
 Name[bg_BG]=@APPLICATION_NAME@ клиент десктоп синхронизация
-Icon[bg_BG]=@APPLICATION_EXECUTABLE@
+Icon[bg_BG]=@APPLICATION_ICON_NAME@
 Comment[ca]=Client de sincronització d'escriptori @APPLICATION_NAME@
 GenericName[ca]=Sincronització de carpetes
 Name[ca]=Client de sincronització d'escriptori @APPLICATION_NAME@
-Icon[ca]=@APPLICATION_EXECUTABLE@
+Icon[ca]=@APPLICATION_ICON_NAME@
 Comment[da]=@APPLICATION_NAME@ skrivebordsklient til synkronisering
 GenericName[da]=Mappesynkronisering
 Name[da]=@APPLICATION_NAME@ skrivebordsklient til synk
-Icon[da]=@APPLICATION_EXECUTABLE@
+Icon[da]=@APPLICATION_ICON_NAME@
 Comment[de]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
 GenericName[de]=Ordner-Synchronisation
 Name[de]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
-Icon[de]=@APPLICATION_EXECUTABLE@
+Icon[de]=@APPLICATION_ICON_NAME@
 Comment[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
 GenericName[ja_JP]=フォルダー同期
 Name[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
-Icon[ja_JP]=@APPLICATION_EXECUTABLE@
+Icon[ja_JP]=@APPLICATION_ICON_NAME@
 Comment[el]=@ΟΝΟΜΑ_ΕΦΑΡΜΟΓΗΣ@ συγχρονισμός επιφάνειας εργασίας πελάτη
 GenericName[el]=Συγχρονισμός φακέλου
 Name[el]=@ΟΝΟΜΑ_ΕΦΑΡΜΟΓΗΣ@  συγχρονισμός επιφάνειας εργασίας πελάτη
-Icon[el]=@APPLICATION_EXECUTABLE@
+Icon[el]=@APPLICATION_ICON_NAME@
 Comment[en_GB]=@APPLICATION_NAME@ desktop synchronisation client
 GenericName[en_GB]=Folder Sync
 Name[en_GB]=@APPLICATION_NAME@ desktop sync client 
-Icon[en_GB]=@APPLICATION_EXECUTABLE@
+Icon[en_GB]=@APPLICATION_ICON_NAME@
 Comment[es]=@APPLICATION_NAME@ cliente de sincronización de escritorio
 GenericName[es]=Sincronización de carpeta
 Name[es]=@APPLICATION_NAME@ cliente de sincronización de escritorio
-Icon[es]=@APPLICATION_EXECUTABLE@
+Icon[es]=@APPLICATION_ICON_NAME@
 Comment[de_DE]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
 GenericName[de_DE]=Ordner-Synchronisation
 Name[de_DE]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
-Icon[de_DE]=@APPLICATION_EXECUTABLE@
+Icon[de_DE]=@APPLICATION_ICON_NAME@
 Comment[eu]=@APPLICATION_NAME@ mahaigaineko sinkronizazio bezeroa
 GenericName[eu]=Karpetaren sinkronizazioa
 Name[eu]=@APPLICATION_NAME@ mahaigaineko sinkronizazio bezeroa
-Icon[eu]=@APPLICATION_EXECUTABLE@
+Icon[eu]=@APPLICATION_ICON_NAME@
 GenericName[fa]=همسان سازی پوشه‌ها
 Name[fa]=@APPLICATION_EXECUTABLE@ نسخه‌ی همسان سازی مشتری
-Icon[fa]=@APPLICATION_EXECUTABLE@
+Icon[fa]=@APPLICATION_ICON_NAME@
 Comment[fr]=Synchronisez vos dossiers avec un serveur @APPLICATION_NAME@
 GenericName[fr]=Synchronisation de dossier
 Name[fr]=Client de synchronisation @APPLICATION_NAME@
-Icon[fr]=@APPLICATION_EXECUTABLE@
+Icon[fr]=@APPLICATION_ICON_NAME@
 Comment[gl]=@APPLICATION_NAME@ cliente de sincronización para escritorio
 GenericName[gl]=Sincronizar Cartafol
 Name[gl]=@APPLICATION_NAME@ cliente de sincronización para escritorio
-Icon[gl]=@APPLICATION_EXECUTABLE@
+Icon[gl]=@APPLICATION_ICON_NAME@
 Comment[he]=@APPLICATION_NAME@ לקוח סנכון שולחן עבודה
 GenericName[he]=סנכון תיקייה
 Name[he]=@APPLICATION_NAME@ לקוח סנכרון שולחן עבודה 
-Icon[he]=@APPLICATION_EXECUTABLE@
+Icon[he]=@APPLICATION_ICON_NAME@
 Comment[ia]=@APPLICATION_NAME@ cliente de synchronisation pro scriptorio
 GenericName[ia]=Synchronisar Dossier 
 Name[ia]=@APPLICATION_NAME@ cliente de synchronisation pro scriptorio
-Icon[ia]=@APPLICATION_EXECUTABLE@
+Icon[ia]=@APPLICATION_ICON_NAME@
 Comment[id]=Klien sinkronisasi desktop @APPLICATION_NAME@
 GenericName[id]=Folder Sync
 Name[id]=Klien sync desktop @APPLICATION_NAME@
-Icon[id]=@APPLICATION_EXECUTABLE@
+Icon[id]=@APPLICATION_ICON_NAME@
 Comment[is]=@APPLICATION_NAME@ skjáborðsforrit samstillingar
 GenericName[is]=Samstilling möppu
 Name[is]=@APPLICATION_NAME@ skjáborðsforrit samstillingar
-Icon[is]=@APPLICATION_EXECUTABLE@
+Icon[is]=@APPLICATION_ICON_NAME@
 Comment[it]=Client di sincronizzazione del desktop di @APPLICATION_NAME@
 GenericName[it]=Sincronizzazione cartella
 Name[it]=Client di sincronizzazione del desktop di @APPLICATION_NAME@
-Icon[it]=@APPLICATION_EXECUTABLE@
+Icon[it]=@APPLICATION_ICON_NAME@
 Comment[ko]=@APPLICATION_NAME@ 데스크톱 동기화 클라이언트
 GenericName[ko]=폴더 동기화
 Name[ko]=@APPLICATION_NAME@ 데스크톱 동기화 클라이언트
-Icon[ko]=@APPLICATION_EXECUTABLE@
+Icon[ko]=@APPLICATION_ICON_NAME@
 Comment[hu_HU]=@APPLICATION_NAME@ asztali szinkronizációs kliens
 GenericName[hu_HU]=Könyvtár szinkronizálás
 Name[hu_HU]=@APPLICATION_NAME@ asztali szinkr. kliens
-Icon[hu_HU]=@APPLICATION_EXECUTABLE@
+Icon[hu_HU]=@APPLICATION_ICON_NAME@
 Comment[af_ZA]=@APPLICATION_NAME@ werkskermsinchroniseerkliënt
 GenericName[af_ZA]=Vouersinchronisering
 Name[af_ZA]=@APPLICATION_NAME@ werkskermsinchroniseerkliënt
-Icon[af_ZA]=@APPLICATION_EXECUTABLE@
+Icon[af_ZA]=@APPLICATION_ICON_NAME@
 Comment[nl]=@APPLICATION_NAME@ desktop synchronisatie client
 GenericName[nl]=Mappen sync
 Name[nl]=@APPLICATION_NAME@ desktop sync client 
-Icon[nl]=@APPLICATION_EXECUTABLE@
+Icon[nl]=@APPLICATION_ICON_NAME@
 Comment[et_EE]=@APPLICATION_NAME@ sünkroonimise klient töölauale
 GenericName[et_EE]=Kaustade sünkroonimine
 Name[et_EE]=@APPLICATION_NAME@ sünkroonimise klient töölauale
-Icon[et_EE]=@APPLICATION_EXECUTABLE@
+Icon[et_EE]=@APPLICATION_ICON_NAME@
 Comment[pl]=@APPLICATION_NAME@ klient synchronizacji dla komputerów stacjonarnych
 GenericName[pl]=Folder Synchronizacji
 Name[pl]=@APPLICATION_NAME@ klient synchronizacji dla komputerów stacjonarnych
-Icon[pl]=@APPLICATION_EXECUTABLE@
+Icon[pl]=@APPLICATION_ICON_NAME@
 Comment[pt_BR]=@APPLICATION_NAME@ cliente de sincronização do computador
 GenericName[pt_BR]=Sincronização de Pasta
 Name[pt_BR]=@APPLICATION_NAME@ cliente de sincronização de desktop
-Icon[pt_BR]=@APPLICATION_EXECUTABLE@
+Icon[pt_BR]=@APPLICATION_ICON_NAME@
 Comment[cs_CZ]=@APPLICATION_NAME@ počítačový synchronizační klient
 GenericName[cs_CZ]=Synchronizace adresáře
 Name[cs_CZ]=@APPLICATION_NAME@ počítačový synchronizační klient
-Icon[cs_CZ]=@APPLICATION_EXECUTABLE@
+Icon[cs_CZ]=@APPLICATION_ICON_NAME@
 Comment[ru]=Настольный клиент синхронизации @APPLICATION_NAME@ 
 GenericName[ru]=Синхронизация каталогов
 Name[ru]=Настольный клиент синхронизации @APPLICATION_NAME@
-Icon[ru]=@APPLICATION_EXECUTABLE@
+Icon[ru]=@APPLICATION_ICON_NAME@
 Comment[sl]=@APPLICATION_NAME@ ‒ Program za usklajevanje datotek z namizjem
 GenericName[sl]=Usklajevanje map
 Name[sl]=@APPLICATION_NAME@ ‒ Program za usklajevanje datotek z namizjem
-Icon[sl]=@APPLICATION_EXECUTABLE@
+Icon[sl]=@APPLICATION_ICON_NAME@
 Comment[sq]=Klient njëkohësimesh @APPLICATION_NAME@ për desktop
 GenericName[sq]=Njëkohësim Dosjesh
 Name[sq]=Klient njëkohësimesh @APPLICATION_NAME@ për desktop
-Icon[sq]=@APPLICATION_EXECUTABLE@
+Icon[sq]=@APPLICATION_ICON_NAME@
 Comment[fi_FI]=@APPLICATION_NAME@ työpöytäsynkronointisovellus
 GenericName[fi_FI]=Kansion synkronointi
 Name[fi_FI]=@APPLICATION_NAME@ työpöytäsynkronointisovellus
-Icon[fi_FI]=@APPLICATION_EXECUTABLE@
+Icon[fi_FI]=@APPLICATION_ICON_NAME@
 Comment[sv]=@APPLICATION_NAME@ desktop synkroniseringsklient
 GenericName[sv]=Mappsynk
 Name[sv]=@APPLICATION_NAME@ desktop synk-klient
-Icon[sv]=@APPLICATION_EXECUTABLE@
+Icon[sv]=@APPLICATION_ICON_NAME@
 Comment[tr]=@APPLICATION_NAME@ masaüstü eşitleme istemcisi
 GenericName[tr]=Dosya Eşitleme
 Name[tr]=@APPLICATION_NAME@ masaüstü eşitleme istemcisi
-Icon[tr]=@APPLICATION_EXECUTABLE@
+Icon[tr]=@APPLICATION_ICON_NAME@
 Comment[uk]=Настільний клієнт синхронізації @APPLICATION_NAME@
 GenericName[uk]=Синхронізація теки
 Name[uk]=Настільний клієнт синхронізації @APPLICATION_NAME@
-Icon[uk]=@APPLICATION_EXECUTABLE@
+Icon[uk]=@APPLICATION_ICON_NAME@
 Comment[ro]=@APPLICATION_NAME@ client de sincronizare pe desktop
 GenericName[ro]=Sincronizare director
 Name[ro]=@APPLICATION_NAME@ client de sincronizare pe desktop
-Icon[ro]=@APPLICATION_EXECUTABLE@
+Icon[ro]=@APPLICATION_ICON_NAME@
 Comment[zh_CN]=@APPLICATION_NAME@ 桌面同步客户端
 GenericName[zh_CN]=文件夹同步
 Name[zh_CN]=@APPLICATION_NAME@ 桌面同步客户端
-Icon[zh_CN]=@APPLICATION_EXECUTABLE@
+Icon[zh_CN]=@APPLICATION_ICON_NAME@
 Comment[zh_HK]=桌面版同步客户端
 Comment[zh_TW]=@APPLICATION_NAME@ 桌面同步客戶端
 GenericName[zh_TW]=資料夾同步
 Name[zh_TW]=@APPLICATION_NAME@ 桌面同步客戶端
-Icon[zh_TW]=@APPLICATION_EXECUTABLE@
+Icon[zh_TW]=@APPLICATION_ICON_NAME@
 Comment[es_AR]=Cliente de sincronización para escritorio @APPLICATION_NAME@ 
 GenericName[es_AR]=Sincronización de directorio
 Name[es_AR]=Cliente de sincronización para escritorio @APPLICATION_NAME@ 
-Icon[es_AR]=@APPLICATION_EXECUTABLE@
+Icon[es_AR]=@APPLICATION_ICON_NAME@
 Comment[lt_LT]=@APPLICATION_NAME@ darbalaukio sinchronizavimo programa
 GenericName[lt_LT]=Katalogo sinchnorizacija
 Name[lt_LT]=@APPLICATION_NAME@ darbalaukio programa
-Icon[lt_LT]=@APPLICATION_EXECUTABLE@
+Icon[lt_LT]=@APPLICATION_ICON_NAME@
 Comment[th_TH]=@APPLICATION_NAME@ ไคลเอนต์ประสานข้อมูลเดสก์ท็อป
 GenericName[th_TH]=ประสานข้อมูลโฟลเดอร์
 Name[th_TH]= @APPLICATION_NAME@ ไคลเอนต์ประสานข้อมูลเดสก์ท็อป
-Icon[th_TH]=@APPLICATION_EXECUTABLE@
+Icon[th_TH]=@APPLICATION_ICON_NAME@
 Comment[es_MX]=Cliente de escritorio para  sincronziación de @APPLICATION_NAME@
 GenericName[es_MX]=Sincronización de Carpetas
 Name[es_MX]=Cliente de escritorio para  sincronziación de @APPLICATION_NAME@
-Icon[es_MX]=@APPLICATION_EXECUTABLE@
+Icon[es_MX]=@APPLICATION_ICON_NAME@
 Comment[nb_NO]=@APPLICATION_NAME@ skrivebordssynkroniseringsklient
 GenericName[nb_NO]=Mappesynkronisering
 Name[nb_NO]=@APPLICATION_NAME@ skrivebordssynkroniseringsklient 
-Icon[nb_NO]=@APPLICATION_EXECUTABLE@
+Icon[nb_NO]=@APPLICATION_ICON_NAME@
 Comment[nn_NO]=@APPLICATION_NAME@ klient for å synkronisera frå skrivebord
 GenericName[nn_NO]=Mappe synkronisering
 Name[nn_NO]=@APPLICATION_NAME@ klient for å synkronisera frå skrivebord
-Icon[nn_NO]=@APPLICATION_EXECUTABLE@
+Icon[nn_NO]=@APPLICATION_ICON_NAME@
 Comment[pt_PT]=@APPLICATION_NAME@ - Cliente de Sincronização para PC
 GenericName[pt_PT]=Sincronizar Pasta
 Name[pt_PT]=@APPLICATION_NAME@ - Cliente de Sincronização para PC
-Icon[pt_PT]=@APPLICATION_EXECUTABLE@
-Icon[km]=@APPLICATION_EXECUTABLE@
+Icon[pt_PT]=@APPLICATION_ICON_NAME@
+Icon[km]=@APPLICATION_ICON_NAME@
 Comment[lb]=@APPLICATION_NAME@ Desktop Synchronisatioun Client
 GenericName[lb]=Dossier Dync
 Name[lb]=@APPLICATION_NAME@ Desktop Sync Client
-Icon[lb]=@APPLICATION_EXECUTABLE@
+Icon[lb]=@APPLICATION_ICON_NAME@

shell_integration/dolphin/CMakeLists.txt

@@ -20,7 +20,12 @@ set_package_properties(DolphinVcs PROPERTIES
     PURPOSE "Provides plugin interfaces for Dolphin."
 )
 
+set(KDE_INSTALL_DIRS_NO_DEPRECATED TRUE)
 include(KDEInstallDirs)
+# Before KF5 5.54, kcoreaddons_add_plugin uses deprecated VAR PLUGIN_INSTALL_DIR
+# when that is fixed and you want to remove this workaround,
+# you need to _require_ the new enough kcoreaddons
+set(PLUGIN_INSTALL_DIR "${KDE_INSTALL_PLUGINDIR}")
 include(KDECMakeSettings)
 include(KDECompilerSettings)
 include(ECMMarkNonGuiExecutable)

shell_integration/nautilus/setappname.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 # this script replaces the line
-#  appname = 'ownCloud'
+#  appname = 'Nextcloud'
 # with the correct branding name in the syncstate.py script
-sed -i.org -e 's/appname\s*=\s*'"'"'ownCloud'"'/appname = '$1'/" syncstate.py
+sed -i.org -e 's/appname\s*=\s*'"'"'Nextcloud'"'/appname = '$1'/" syncstate.py

shell_integration/nautilus/syncstate.py

@@ -32,7 +32,7 @@ from gi.repository import GObject, Nautilus
 # The reason is that we use a script to adopt this file for branding
 # by replacing this line with the branding app name. If the following
 # line is changed, the script can not match the pattern and fails.
-appname = 'ownCloud'
+appname = 'Nextcloud'
 
 print("Initializing "+appname+"-client-nautilus extension")
 print("Using python version {}".format(sys.version_info))
@@ -63,7 +63,7 @@ class SocketConnect(GObject.GObject):
         self._watch_id = 0
         self._sock = None
         self._listeners = [self._update_registered_paths, self._get_version]
-        self._remainder = ''.encode()
+        self._remainder = ''.encode() if python3 else ''
         self.protocolVersion = '1.0'
         self.nautilusVFSFile_table = {}  # not needed in this object actually but shared
                                          # all over the other objects.
@@ -82,7 +82,7 @@ class SocketConnect(GObject.GObject):
         # print("Server command: " + cmd)
         if self.connected:
             try:
-                self._sock.send(cmd.encode())
+                self._sock.send(cmd.encode() if python3 else cmd)
             except:
                 print("Sending failed.")
                 self.reconnect()
@@ -134,7 +134,8 @@ class SocketConnect(GObject.GObject):
             return []
         data = self._remainder[:end]
         self._remainder = self._remainder[end+1:]
-        return data.decode().split('\n')
+        data = data.decode() if python3 else data
+        return data.split('\n')
 
     # Notify is the raw answer from the socket
     def _handle_notify(self, source, condition):
@@ -233,7 +234,7 @@ class MenuExtension(GObject.GObject, Nautilus.MenuProvider):
     def ask_for_menu_items(self, files):
         record_separator = '\x1e'
         filesstring = record_separator.join(files)
-        socketConnect.sendCommand('GET_MENU_ITEMS:{}\n'.format(filesstring))
+        socketConnect.sendCommand(u'GET_MENU_ITEMS:{}\n'.format(filesstring))
 
         done = False
         start = time.time()

src/3rdparty/sqlite3/sqlite3.h

@@ -123,9 +123,9 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.23.1"
-#define SQLITE_VERSION_NUMBER 3023001
-#define SQLITE_SOURCE_ID      "2018-04-10 17:39:29 4bb2294022060e61de7da5c227a69ccd846ba330e31626ebcd59a94efd148b3b"
+#define SQLITE_VERSION        "3.24.0"
+#define SQLITE_VERSION_NUMBER 3024000
+#define SQLITE_SOURCE_ID      "2018-06-04 19:24:41 c7ee0833225bfd8c5ec2f9bf62b97c4e04d03bd9566366d5221ac8fb199a87ca"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -504,6 +504,7 @@ SQLITE_API int sqlite3_exec(
 #define SQLITE_IOERR_COMMIT_ATOMIC     (SQLITE_IOERR | (30<<8))
 #define SQLITE_IOERR_ROLLBACK_ATOMIC   (SQLITE_IOERR | (31<<8))
 #define SQLITE_LOCKED_SHAREDCACHE      (SQLITE_LOCKED |  (1<<8))
+#define SQLITE_LOCKED_VTAB             (SQLITE_LOCKED |  (2<<8))
 #define SQLITE_BUSY_RECOVERY           (SQLITE_BUSY   |  (1<<8))
 #define SQLITE_BUSY_SNAPSHOT           (SQLITE_BUSY   |  (2<<8))
 #define SQLITE_CANTOPEN_NOTEMPDIR      (SQLITE_CANTOPEN | (1<<8))
@@ -511,6 +512,7 @@ SQLITE_API int sqlite3_exec(
 #define SQLITE_CANTOPEN_FULLPATH       (SQLITE_CANTOPEN | (3<<8))
 #define SQLITE_CANTOPEN_CONVPATH       (SQLITE_CANTOPEN | (4<<8))
 #define SQLITE_CORRUPT_VTAB            (SQLITE_CORRUPT | (1<<8))
+#define SQLITE_CORRUPT_SEQUENCE        (SQLITE_CORRUPT | (2<<8))
 #define SQLITE_READONLY_RECOVERY       (SQLITE_READONLY | (1<<8))
 #define SQLITE_READONLY_CANTLOCK       (SQLITE_READONLY | (2<<8))
 #define SQLITE_READONLY_ROLLBACK       (SQLITE_READONLY | (3<<8))
@@ -1930,6 +1932,22 @@ struct sqlite3_mem_methods {
 ** I/O required to support statement rollback.
 ** The default value for this setting is controlled by the
 ** [SQLITE_STMTJRNL_SPILL] compile-time option.
+**
+** [[SQLITE_CONFIG_SORTERREF_SIZE]]
+** <dt>SQLITE_CONFIG_SORTERREF_SIZE
+** <dd>The SQLITE_CONFIG_SORTERREF_SIZE option accepts a single parameter
+** of type (int) - the new value of the sorter-reference size threshold.
+** Usually, when SQLite uses an external sort to order records according
+** to an ORDER BY clause, all fields required by the caller are present in the
+** sorted records. However, if SQLite determines based on the declared type
+** of a table column that its values are likely to be very large - larger
+** than the configured sorter-reference size threshold - then a reference
+** is stored in each sorted record and the required column values loaded
+** from the database as records are returned in sorted order. The default
+** value for this option is to never use this optimization. Specifying a 
+** negative value for this option restores the default behaviour.
+** This option is only available if SQLite is compiled with the
+** [SQLITE_ENABLE_SORTER_REFERENCES] compile-time option.
 ** </dl>
 */
 #define SQLITE_CONFIG_SINGLETHREAD  1  /* nil */
@@ -1959,6 +1977,7 @@ struct sqlite3_mem_methods {
 #define SQLITE_CONFIG_PMASZ               25  /* unsigned int szPma */
 #define SQLITE_CONFIG_STMTJRNL_SPILL      26  /* int nByte */
 #define SQLITE_CONFIG_SMALL_MALLOC        27  /* boolean */
+#define SQLITE_CONFIG_SORTERREF_SIZE      28  /* int nByte */
 
 /*
 ** CAPI3REF: Database Connection Configuration Options
@@ -2095,6 +2114,21 @@ struct sqlite3_mem_methods {
 ** 0 or 1 to indicate whether output-for-triggers has been disabled - 0 if 
 ** it is not disabled, 1 if it is.  
 ** </dd>
+**
+** <dt>SQLITE_DBCONFIG_RESET_DATABASE</dt>
+** <dd> Set the SQLITE_DBCONFIG_RESET_DATABASE flag and then run
+** [VACUUM] in order to reset a database back to an empty database
+** with no schema and no content. The following process works even for
+** a badly corrupted database file:
+** <ol>
+** <li> sqlite3_db_config(db, SQLITE_DBCONFIG_RESET_DATABASE, 1, 0);
+** <li> [sqlite3_exec](db, "[VACUUM]", 0, 0, 0);
+** <li> sqlite3_db_config(db, SQLITE_DBCONFIG_RESET_DATABASE, 0, 0);
+** </ol>
+** Because resetting a database is destructive and irreversible, the
+** process requires the use of this obscure API and multiple steps to help
+** ensure that it does not happen by accident.
+** </dd>
 ** </dl>
 */
 #define SQLITE_DBCONFIG_MAINDBNAME            1000 /* const char* */
@@ -2106,7 +2140,8 @@ struct sqlite3_mem_methods {
 #define SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE      1006 /* int int* */
 #define SQLITE_DBCONFIG_ENABLE_QPSG           1007 /* int int* */
 #define SQLITE_DBCONFIG_TRIGGER_EQP           1008 /* int int* */
-#define SQLITE_DBCONFIG_MAX                   1008 /* Largest DBCONFIG */
+#define SQLITE_DBCONFIG_RESET_DATABASE        1009 /* int int* */
+#define SQLITE_DBCONFIG_MAX                   1009 /* Largest DBCONFIG */
 
 /*
 ** CAPI3REF: Enable Or Disable Extended Result Codes
@@ -5492,6 +5527,41 @@ SQLITE_API SQLITE_EXTERN char *sqlite3_temp_directory;
 */
 SQLITE_API SQLITE_EXTERN char *sqlite3_data_directory;
 
+/*
+** CAPI3REF: Win32 Specific Interface
+**
+** These interfaces are available only on Windows.  The
+** [sqlite3_win32_set_directory] interface is used to set the value associated
+** with the [sqlite3_temp_directory] or [sqlite3_data_directory] variable, to
+** zValue, depending on the value of the type parameter.  The zValue parameter
+** should be NULL to cause the previous value to be freed via [sqlite3_free];
+** a non-NULL value will be copied into memory obtained from [sqlite3_malloc]
+** prior to being used.  The [sqlite3_win32_set_directory] interface returns
+** [SQLITE_OK] to indicate success, [SQLITE_ERROR] if the type is unsupported,
+** or [SQLITE_NOMEM] if memory could not be allocated.  The value of the
+** [sqlite3_data_directory] variable is intended to act as a replacement for
+** the current directory on the sub-platforms of Win32 where that concept is
+** not present, e.g. WinRT and UWP.  The [sqlite3_win32_set_directory8] and
+** [sqlite3_win32_set_directory16] interfaces behave exactly the same as the
+** sqlite3_win32_set_directory interface except the string parameter must be
+** UTF-8 or UTF-16, respectively.
+*/
+SQLITE_API int sqlite3_win32_set_directory(
+  unsigned long type, /* Identifier for directory being set or reset */
+  void *zValue        /* New value for directory being set or reset */
+);
+SQLITE_API int sqlite3_win32_set_directory8(unsigned long type, const char *zValue);
+SQLITE_API int sqlite3_win32_set_directory16(unsigned long type, const void *zValue);
+
+/*
+** CAPI3REF: Win32 Directory Types
+**
+** These macros are only available on Windows.  They define the allowed values
+** for the type argument to the [sqlite3_win32_set_directory] interface.
+*/
+#define SQLITE_WIN32_DATA_DIRECTORY_TYPE  1
+#define SQLITE_WIN32_TEMP_DIRECTORY_TYPE  2
+
 /*
 ** CAPI3REF: Test For Auto-Commit Mode
 ** KEYWORDS: {autocommit mode}
@@ -6224,6 +6294,10 @@ struct sqlite3_index_info {
 
 /*
 ** CAPI3REF: Virtual Table Scan Flags
+**
+** Virtual table implementations are allowed to set the 
+** [sqlite3_index_info].idxFlags field to some combination of
+** these bits.
 */
 #define SQLITE_INDEX_SCAN_UNIQUE      1     /* Scan visits at most 1 row */
 
@@ -6999,7 +7073,7 @@ SQLITE_API int sqlite3_test_control(int op, ...);
 #define SQLITE_TESTCTRL_ALWAYS                  13
 #define SQLITE_TESTCTRL_RESERVE                 14
 #define SQLITE_TESTCTRL_OPTIMIZATIONS           15
-#define SQLITE_TESTCTRL_ISKEYWORD               16
+#define SQLITE_TESTCTRL_ISKEYWORD               16  /* NOT USED */
 #define SQLITE_TESTCTRL_SCRATCHMALLOC           17  /* NOT USED */
 #define SQLITE_TESTCTRL_LOCALTIME_FAULT         18
 #define SQLITE_TESTCTRL_EXPLAIN_STMT            19  /* NOT USED */
@@ -7013,6 +7087,189 @@ SQLITE_API int sqlite3_test_control(int op, ...);
 #define SQLITE_TESTCTRL_PARSER_COVERAGE         26
 #define SQLITE_TESTCTRL_LAST                    26  /* Largest TESTCTRL */
 
+/*
+** CAPI3REF: SQL Keyword Checking
+**
+** These routines provide access to the set of SQL language keywords 
+** recognized by SQLite.  Applications can uses these routines to determine
+** whether or not a specific identifier needs to be escaped (for example,
+** by enclosing in double-quotes) so as not to confuse the parser.
+**
+** The sqlite3_keyword_count() interface returns the number of distinct
+** keywords understood by SQLite.
+**
+** The sqlite3_keyword_name(N,Z,L) interface finds the N-th keyword and
+** makes *Z point to that keyword expressed as UTF8 and writes the number
+** of bytes in the keyword into *L.  The string that *Z points to is not
+** zero-terminated.  The sqlite3_keyword_name(N,Z,L) routine returns
+** SQLITE_OK if N is within bounds and SQLITE_ERROR if not. If either Z
+** or L are NULL or invalid pointers then calls to
+** sqlite3_keyword_name(N,Z,L) result in undefined behavior.
+**
+** The sqlite3_keyword_check(Z,L) interface checks to see whether or not
+** the L-byte UTF8 identifier that Z points to is a keyword, returning non-zero
+** if it is and zero if not.
+**
+** The parser used by SQLite is forgiving.  It is often possible to use
+** a keyword as an identifier as long as such use does not result in a
+** parsing ambiguity.  For example, the statement
+** "CREATE TABLE BEGIN(REPLACE,PRAGMA,END);" is accepted by SQLite, and
+** creates a new table named "BEGIN" with three columns named
+** "REPLACE", "PRAGMA", and "END".  Nevertheless, best practice is to avoid
+** using keywords as identifiers.  Common techniques used to avoid keyword
+** name collisions include:
+** <ul>
+** <li> Put all identifier names inside double-quotes.  This is the official
+**      SQL way to escape identifier names.
+** <li> Put identifier names inside &#91;...&#93;.  This is not standard SQL,
+**      but it is what SQL Server does and so lots of programmers use this
+**      technique.
+** <li> Begin every identifier with the letter "Z" as no SQL keywords start
+**      with "Z".
+** <li> Include a digit somewhere in every identifier name.
+** </ul>
+**
+** Note that the number of keywords understood by SQLite can depend on
+** compile-time options.  For example, "VACUUM" is not a keyword if
+** SQLite is compiled with the [-DSQLITE_OMIT_VACUUM] option.  Also,
+** new keywords may be added to future releases of SQLite.
+*/
+SQLITE_API int sqlite3_keyword_count(void);
+SQLITE_API int sqlite3_keyword_name(int,const char**,int*);
+SQLITE_API int sqlite3_keyword_check(const char*,int);
+
+/*
+** CAPI3REF: Dynamic String Object
+** KEYWORDS: {dynamic string}
+**
+** An instance of the sqlite3_str object contains a dynamically-sized
+** string under construction.
+**
+** The lifecycle of an sqlite3_str object is as follows:
+** <ol>
+** <li> ^The sqlite3_str object is created using [sqlite3_str_new()].
+** <li> ^Text is appended to the sqlite3_str object using various
+** methods, such as [sqlite3_str_appendf()].
+** <li> ^The sqlite3_str object is destroyed and the string it created
+** is returned using the [sqlite3_str_finish()] interface.
+** </ol>
+*/
+typedef struct sqlite3_str sqlite3_str;
+
+/*
+** CAPI3REF: Create A New Dynamic String Object
+** CONSTRUCTOR: sqlite3_str
+**
+** ^The [sqlite3_str_new(D)] interface allocates and initializes
+** a new [sqlite3_str] object.  To avoid memory leaks, the object returned by
+** [sqlite3_str_new()] must be freed by a subsequent call to 
+** [sqlite3_str_finish(X)].
+**
+** ^The [sqlite3_str_new(D)] interface always returns a pointer to a
+** valid [sqlite3_str] object, though in the event of an out-of-memory
+** error the returned object might be a special singleton that will
+** silently reject new text, always return SQLITE_NOMEM from 
+** [sqlite3_str_errcode()], always return 0 for 
+** [sqlite3_str_length()], and always return NULL from
+** [sqlite3_str_finish(X)].  It is always safe to use the value
+** returned by [sqlite3_str_new(D)] as the sqlite3_str parameter
+** to any of the other [sqlite3_str] methods.
+**
+** The D parameter to [sqlite3_str_new(D)] may be NULL.  If the
+** D parameter in [sqlite3_str_new(D)] is not NULL, then the maximum
+** length of the string contained in the [sqlite3_str] object will be
+** the value set for [sqlite3_limit](D,[SQLITE_LIMIT_LENGTH]) instead
+** of [SQLITE_MAX_LENGTH].
+*/
+SQLITE_API sqlite3_str *sqlite3_str_new(sqlite3*);
+
+/*
+** CAPI3REF: Finalize A Dynamic String
+** DESTRUCTOR: sqlite3_str
+**
+** ^The [sqlite3_str_finish(X)] interface destroys the sqlite3_str object X
+** and returns a pointer to a memory buffer obtained from [sqlite3_malloc64()]
+** that contains the constructed string.  The calling application should
+** pass the returned value to [sqlite3_free()] to avoid a memory leak.
+** ^The [sqlite3_str_finish(X)] interface may return a NULL pointer if any
+** errors were encountered during construction of the string.  ^The
+** [sqlite3_str_finish(X)] interface will also return a NULL pointer if the
+** string in [sqlite3_str] object X is zero bytes long.
+*/
+SQLITE_API char *sqlite3_str_finish(sqlite3_str*);
+
+/*
+** CAPI3REF: Add Content To A Dynamic String
+** METHOD: sqlite3_str
+**
+** These interfaces add content to an sqlite3_str object previously obtained
+** from [sqlite3_str_new()].
+**
+** ^The [sqlite3_str_appendf(X,F,...)] and 
+** [sqlite3_str_vappendf(X,F,V)] interfaces uses the [built-in printf]
+** functionality of SQLite to append formatted text onto the end of 
+** [sqlite3_str] object X.
+**
+** ^The [sqlite3_str_append(X,S,N)] method appends exactly N bytes from string S
+** onto the end of the [sqlite3_str] object X.  N must be non-negative.
+** S must contain at least N non-zero bytes of content.  To append a
+** zero-terminated string in its entirety, use the [sqlite3_str_appendall()]
+** method instead.
+**
+** ^The [sqlite3_str_appendall(X,S)] method appends the complete content of
+** zero-terminated string S onto the end of [sqlite3_str] object X.
+**
+** ^The [sqlite3_str_appendchar(X,N,C)] method appends N copies of the
+** single-byte character C onto the end of [sqlite3_str] object X.
+** ^This method can be used, for example, to add whitespace indentation.
+**
+** ^The [sqlite3_str_reset(X)] method resets the string under construction
+** inside [sqlite3_str] object X back to zero bytes in length.  
+**
+** These methods do not return a result code.  ^If an error occurs, that fact
+** is recorded in the [sqlite3_str] object and can be recovered by a
+** subsequent call to [sqlite3_str_errcode(X)].
+*/
+SQLITE_API void sqlite3_str_appendf(sqlite3_str*, const char *zFormat, ...);
+SQLITE_API void sqlite3_str_vappendf(sqlite3_str*, const char *zFormat, va_list);
+SQLITE_API void sqlite3_str_append(sqlite3_str*, const char *zIn, int N);
+SQLITE_API void sqlite3_str_appendall(sqlite3_str*, const char *zIn);
+SQLITE_API void sqlite3_str_appendchar(sqlite3_str*, int N, char C);
+SQLITE_API void sqlite3_str_reset(sqlite3_str*);
+
+/*
+** CAPI3REF: Status Of A Dynamic String
+** METHOD: sqlite3_str
+**
+** These interfaces return the current status of an [sqlite3_str] object.
+**
+** ^If any prior errors have occurred while constructing the dynamic string
+** in sqlite3_str X, then the [sqlite3_str_errcode(X)] method will return
+** an appropriate error code.  ^The [sqlite3_str_errcode(X)] method returns
+** [SQLITE_NOMEM] following any out-of-memory error, or
+** [SQLITE_TOOBIG] if the size of the dynamic string exceeds
+** [SQLITE_MAX_LENGTH], or [SQLITE_OK] if there have been no errors.
+**
+** ^The [sqlite3_str_length(X)] method returns the current length, in bytes,
+** of the dynamic string under construction in [sqlite3_str] object X.
+** ^The length returned by [sqlite3_str_length(X)] does not include the
+** zero-termination byte.
+**
+** ^The [sqlite3_str_value(X)] method returns a pointer to the current
+** content of the dynamic string under construction in X.  The value
+** returned by [sqlite3_str_value(X)] is managed by the sqlite3_str object X
+** and might be freed or altered by any subsequent method on the same
+** [sqlite3_str] object.  Applications must not used the pointer returned
+** [sqlite3_str_value(X)] after any subsequent method call on the same
+** object.  ^Applications may change the content of the string returned
+** by [sqlite3_str_value(X)] as long as they do not write into any bytes
+** outside the range of 0 to [sqlite3_str_length(X)] and do not read or
+** write any byte after any subsequent sqlite3_str method call.
+*/
+SQLITE_API int sqlite3_str_errcode(sqlite3_str*);
+SQLITE_API int sqlite3_str_length(sqlite3_str*);
+SQLITE_API char *sqlite3_str_value(sqlite3_str*);
+
 /*
 ** CAPI3REF: SQLite Runtime Status
 **
@@ -8282,11 +8539,11 @@ SQLITE_API int sqlite3_vtab_on_conflict(sqlite3 *);
 ** method of a [virtual table], then it returns true if and only if the
 ** column is being fetched as part of an UPDATE operation during which the
 ** column value will not change.  Applications might use this to substitute
-** a lighter-weight value to return that the corresponding [xUpdate] method
-** understands as a "no-change" value.
+** a return value that is less expensive to compute and that the corresponding
+** [xUpdate] method understands as a "no-change" value.
 **
 ** If the [xColumn] method calls sqlite3_vtab_nochange() and finds that
-** the column is not changed by the UPDATE statement, they the xColumn
+** the column is not changed by the UPDATE statement, then the xColumn
 ** method can optionally return without setting a result, without calling
 ** any of the [sqlite3_result_int|sqlite3_result_xxxxx() interfaces].
 ** In that case, [sqlite3_value_nochange(X)] will return true for the
@@ -8781,7 +9038,7 @@ SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_recover(sqlite3 *db, const c
 ** been a prior call to [sqlite3_deserialize(D,S,...)] with the same
 ** values of D and S.
 ** The size of the database is written into *P even if the 
-** SQLITE_SERIALIZE_NOCOPY bit is set but no contigious copy
+** SQLITE_SERIALIZE_NOCOPY bit is set but no contiguous copy
 ** of the database exists.
 **
 ** A call to sqlite3_serialize(D,S,P,F) might return NULL even if the

src/cmd/cmd.cpp

@@ -319,7 +319,7 @@ int main(int argc, char **argv)
     options.trustSSL = false;
     options.useNetrc = false;
     options.interactive = true;
-    options.ignoreHiddenFiles = true;
+    options.ignoreHiddenFiles = false; // Default is to sync hidden files
     options.nonShib = false;
     options.restartTimes = 3;
     options.uplimit = 0;

src/common/filesystembase.cpp

@@ -272,10 +272,12 @@ bool FileSystem::openAndSeekFileSharedRead(QFile *file, QString *errorOrNull, qi
     int fd = _open_osfhandle((intptr_t)fileHandle, _O_RDONLY);
     if (fd == -1) {
         error = "could not make fd from handle";
+        CloseHandle(fileHandle);
         return false;
     }
     if (!file->open(fd, QIODevice::ReadOnly, QFile::AutoCloseHandle)) {
         error = file->errorString();
+        _close(fd); // implicitly closes fileHandle
         return false;
     }
 

src/common/syncjournaldb.cpp

@@ -602,7 +602,7 @@ void SyncJournalDb::close()
     commitTransaction();
 
     _db.close();
-    _avoidReadFromDbOnNextSyncFilter.clear();
+    clearEtagStorageFilter();
     _metadataTableIsEmpty = false;
 }
 
@@ -824,10 +824,10 @@ bool SyncJournalDb::setFileRecord(const SyncJournalFileRecord &_record)
     SyncJournalFileRecord record = _record;
     QMutexLocker locker(&_mutex);
 
-    if (!_avoidReadFromDbOnNextSyncFilter.isEmpty()) {
+    if (!_etagStorageFilter.isEmpty()) {
         // If we are a directory that should not be read from db next time, don't write the etag
         QByteArray prefix = record._path + "/";
-        foreach (const QByteArray &it, _avoidReadFromDbOnNextSyncFilter) {
+        foreach (const QByteArray &it, _etagStorageFilter) {
             if (it.startsWith(prefix)) {
                 qCInfo(lcDb) << "Filtered writing the etag of" << prefix << "because it is a prefix of" << it;
                 record._etag = "_invalid_";
@@ -1816,7 +1816,12 @@ void SyncJournalDb::avoidReadFromDbOnNextSync(const QByteArray &fileName)
     // Prevent future overwrite of the etags of this folder and all
     // parent folders for this sync
     argument.append('/');
-    _avoidReadFromDbOnNextSyncFilter.append(argument);
+    _etagStorageFilter.append(argument);
+}
+
+void SyncJournalDb::clearEtagStorageFilter()
+{
+    _etagStorageFilter.clear();
 }
 
 void SyncJournalDb::forceRemoteDiscoveryNextSync()

src/common/syncjournaldb.h

@@ -178,10 +178,18 @@ public:
      * Since folders in the selective sync list will not be rediscovered (csync_ftw,
      * _csync_detect_update skip them), the _invalid_ marker will stay. And any
      * child items in the db will be ignored when reading a remote tree from the database.
+     *
+     * Any setFileRecord() call to affected directories before the next sync run will be
+     * adjusted to retain the invalid etag via _etagStorageFilter.
      */
     void avoidReadFromDbOnNextSync(const QString &fileName) { avoidReadFromDbOnNextSync(fileName.toUtf8()); }
     void avoidReadFromDbOnNextSync(const QByteArray &fileName);
 
+    /**
+     * Wipe _etagStorageFilter. Also done implicitly on close().
+     */
+    void clearEtagStorageFilter();
+
     /**
      * Ensures full remote discovery happens on the next sync.
      *
@@ -295,13 +303,20 @@ private:
     SqlQuery _setConflictRecordQuery;
     SqlQuery _deleteConflictRecordQuery;
 
-    /* This is the list of paths we called avoidReadFromDbOnNextSync on.
-     * It means that they should not be written to the DB in any case since doing
-     * that would write the etag and would void the purpose of avoidReadFromDbOnNextSync
+    /* Storing etags to these folders, or their parent folders, is filtered out.
+     *
+     * When avoidReadFromDbOnNextSync() is called some etags to _invalid_ in the
+     * database. If this is done during a sync run, a later propagation job might
+     * undo that by writing the correct etag to the database instead. This filter
+     * will prevent this write and instead guarantee the _invalid_ etag stays in
+     * place.
+     *
+     * The list is cleared on close() (end of sync run) and explicitly with
+     * clearEtagStorageFilter() (start of sync run).
      *
      * The contained paths have a trailing /.
      */
-    QList<QByteArray> _avoidReadFromDbOnNextSyncFilter;
+    QList<QByteArray> _etagStorageFilter;
 
     /** The journal mode to use for the db.
      *

src/csync/csync_reconcile.cpp

@@ -166,7 +166,7 @@ static void _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx)
                 /* First, check that the file is NOT in our tree (another file with the same name was added) */
                 if (our_tree->findFile(basePath)) {
                     other = nullptr;
-                    qCDebug(lcReconcile, "Origin found in our tree : %s", basePath.constData());
+                    qCInfo(lcReconcile, "Origin found in our tree : %s", basePath.constData());
                 } else {
                     /* Find the potential rename source file in the other tree.
                     * If the renamed file could not be found in the opposite tree, that is because it
@@ -174,7 +174,7 @@ static void _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx)
                     * The journal is cleaned up later after propagation.
                     */
                     other = other_tree->findFile(basePath);
-                    qCDebug(lcReconcile, "Rename origin in other tree (%s) %s",
+                    qCInfo(lcReconcile, "Rename origin in other tree (%s) %s",
                         basePath.constData(), other ? "found" : "not found");
                 }
 
@@ -185,7 +185,7 @@ static void _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx)
                     // Some other EVAL_RENAME already claimed other.
                     // We do nothing: maybe a different candidate for
                     // other is found as well?
-                    qCDebug(lcReconcile, "Other has already been renamed to %s",
+                    qCInfo(lcReconcile, "Other has already been renamed to %s",
                         other->rename_path.constData());
                 } else if (cur->type == ItemTypeDirectory
                     // The local replica is reconciled first, so the remote tree would
@@ -197,13 +197,17 @@ static void _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx)
                     || other->instruction == CSYNC_INSTRUCTION_NONE
                     || other->instruction == CSYNC_INSTRUCTION_UPDATE_METADATA
                     || other->instruction == CSYNC_INSTRUCTION_REMOVE) {
-                    qCDebug(lcReconcile, "Switching %s to RENAME to %s",
+                    qCInfo(lcReconcile, "Switching %s to RENAME to %s",
                         other->path.constData(), cur->path.constData());
                     other->instruction = CSYNC_INSTRUCTION_RENAME;
                     other->rename_path = cur->path;
                     if( !cur->file_id.isEmpty() ) {
                         other->file_id = cur->file_id;
                     }
+                    if (ctx->current == LOCAL_REPLICA) {
+                        // Keep the local mtime.
+                        other->modtime = cur->modtime;
+                    }
                     other->inode = cur->inode;
                     cur->instruction = CSYNC_INSTRUCTION_NONE;
                     // We have consumed 'other': exit this loop to not consume another one.
@@ -217,7 +221,7 @@ static void _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx)
                     // Local: The remote reconcile will be able to deal with this.
                     // Remote: The local replica has already dealt with this.
                     //         See the EVAL_RENAME case when other was found directly.
-                    qCDebug(lcReconcile, "File in a renamed directory, other side's instruction: %d",
+                    qCInfo(lcReconcile, "File in a renamed directory, other side's instruction: %d",
                         other->instruction);
                     cur->instruction = CSYNC_INSTRUCTION_NONE;
                 } else {
@@ -225,7 +229,7 @@ static void _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx)
                     // and the instruction in the local tree is NEW while cur has EVAL_RENAME
                     // due to a remote move of the same file. In these scenarios we just
                     // want the instruction to stay NEW.
-                    qCDebug(lcReconcile, "Other already has instruction %d",
+                    qCInfo(lcReconcile, "Other already has instruction %d",
                         other->instruction);
                 }
             };
@@ -233,7 +237,7 @@ static void _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx)
             if (ctx->current == LOCAL_REPLICA) {
                 /* use the old name to find the "other" node */
                 OCC::SyncJournalFileRecord base;
-                qCDebug(lcReconcile, "Finding rename origin through inode %" PRIu64 "",
+                qCInfo(lcReconcile, "Finding rename origin through inode %" PRIu64 "",
                     cur->inode);
                 ctx->statedb->getFileRecordByInode(cur->inode, &base);
                 renameCandidateProcessing(base._path);
@@ -246,7 +250,7 @@ static void _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx)
                 // line.
                 auto basePath = csync_rename_adjust_full_path_source(ctx, cur->path);
                 if (basePath != cur->path) {
-                    qCDebug(lcReconcile, "Trying rename origin by csync_rename mapping %s",
+                    qCInfo(lcReconcile, "Trying rename origin by csync_rename mapping %s",
                         basePath.constData());
                     // We go through getFileRecordsByFileId to ensure the basePath
                     // computed in this way also has the expected fileid.
@@ -259,7 +263,7 @@ static void _csync_merge_algorithm_visitor(csync_file_stat_t *cur, CSYNC * ctx)
 
                 // Also feed all the other files with the same fileid if necessary
                 if (!processedRename) {
-                    qCDebug(lcReconcile, "Finding rename origin through file ID %s",
+                    qCInfo(lcReconcile, "Finding rename origin through file ID %s",
                         cur->file_id.constData());
                     ctx->statedb->getFileRecordsByFileId(cur->file_id,
                         [&](const OCC::SyncJournalFileRecord &base) { renameCandidateProcessing(base._path); });

src/csync/csync_update.cpp

@@ -125,12 +125,12 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
        * This code should probably be in csync_exclude, but it does not have the fs parameter.
        * Keep it here for now */
       if (ctx->ignore_hidden_files && (fs->is_hidden)) {
-          qCDebug(lcUpdate, "file excluded because it is a hidden file: %s", fs->path.constData());
+          qCInfo(lcUpdate, "file excluded because it is a hidden file: %s", fs->path.constData());
           excluded = CSYNC_FILE_EXCLUDE_HIDDEN;
       }
   } else {
       /* File is ignored because it's matched by a user- or system exclude pattern. */
-      qCDebug(lcUpdate, "%s excluded  (%d)", fs->path.constData(), excluded);
+      qCInfo(lcUpdate, "%s excluded  (%d)", fs->path.constData(), excluded);
       if (excluded == CSYNC_FILE_EXCLUDE_AND_REMOVE) {
           return 1;
       }
@@ -155,7 +155,7 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
        */
       QTextEncoder encoder(localCodec, QTextCodec::ConvertInvalidToNull);
       if (encoder.fromUnicode(QString::fromUtf8(fs->path)).contains('\0')) {
-          qCDebug(lcUpdate, "cannot encode %s to local encoding %d",
+          qCInfo(lcUpdate, "cannot encode %s to local encoding %d",
               fs->path.constData(), localCodec->mibEnum());
           excluded = CSYNC_FILE_EXCLUDE_CANNOT_ENCODE;
       }
@@ -163,7 +163,7 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
 
   if (fs->type == ItemTypeFile ) {
     if (fs->modtime == 0) {
-      qCDebug(lcUpdate, "file: %s - mtime is zero!", fs->path.constData());
+      qCInfo(lcUpdate, "file: %s - mtime is zero!", fs->path.constData());
     }
   }
 
@@ -245,7 +245,7 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
                   checksumIdentical = fs->checksumHeader == base._checksumHeader;
               }
               if (checksumIdentical) {
-                  qCDebug(lcUpdate, "NOTE: Checksums are identical, file did not actually change: %s", fs->path.constData());
+                  qCInfo(lcUpdate, "NOTE: Checksums are identical, file did not actually change: %s", fs->path.constData());
                   fs->instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
                   goto out;
               }
@@ -269,7 +269,7 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
            * The metadata comparison ensure that we fetch all the file id or permission when
            * upgrading owncloud
            */
-          qCDebug(lcUpdate, "Reading from database: %s", fs->path.constData());
+          qCInfo(lcUpdate, "Reading from database: %s", fs->path.constData());
           ctx->remote.read_from_db = true;
       }
       /* If it was remembered in the db that the remote dir has ignored files, store
@@ -280,7 +280,7 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
       }
       if (metadata_differ) {
           /* file id or permissions has changed. Which means we need to update them in the DB. */
-          qCDebug(lcUpdate, "Need to update metadata for: %s", fs->path.constData());
+          qCInfo(lcUpdate, "Need to update metadata for: %s", fs->path.constData());
           fs->instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
       } else {
           fs->instruction = CSYNC_INSTRUCTION_NONE;
@@ -288,7 +288,7 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
   } else {
       /* check if it's a file and has been renamed */
       if (ctx->current == LOCAL_REPLICA) {
-          qCDebug(lcUpdate, "Checking for rename based on inode # %" PRId64 "", (uint64_t) fs->inode);
+          qCInfo(lcUpdate, "Checking for rename based on inode # %" PRId64 "", (uint64_t) fs->inode);
 
           OCC::SyncJournalFileRecord base;
           if(!ctx->statedb->getFileRecordByInode(fs->inode, &base)) {
@@ -315,13 +315,13 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
                       _rel_to_abs(ctx, fs->path), base._checksumHeader,
                       ctx->callbacks.checksum_userdata);
               if (!fs->checksumHeader.isEmpty()) {
-                  qCDebug(lcUpdate, "checking checksum of potential rename %s %s <-> %s", fs->path.constData(), fs->checksumHeader.constData(), base._checksumHeader.constData());
+                  qCInfo(lcUpdate, "checking checksum of potential rename %s %s <-> %s", fs->path.constData(), fs->checksumHeader.constData(), base._checksumHeader.constData());
                   isRename = fs->checksumHeader == base._checksumHeader;
               }
           }
 
           if (isRename) {
-              qCDebug(lcUpdate, "pot rename detected based on inode # %" PRId64 "", (uint64_t) fs->inode);
+              qCInfo(lcUpdate, "pot rename detected based on inode # %" PRId64 "", (uint64_t) fs->inode);
               /* inode found so the file has been renamed */
               fs->instruction = CSYNC_INSTRUCTION_EVAL_RENAME;
               if (fs->type == ItemTypeDirectory) {
@@ -331,6 +331,8 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
           goto out;
 
       } else {
+          qCInfo(lcUpdate, "Checking for rename based on fileid %s", fs->file_id.constData());
+
           /* Remote Replica Rename check */
           fs->instruction = CSYNC_INSTRUCTION_NEW;
 
@@ -376,7 +378,8 @@ static int _csync_detect_update(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> f
                   return;
               }
 
-              qCDebug(lcUpdate, "remote rename detected based on fileid %s --> %s", qPrintable(base._path), qPrintable(fs->path.constData()));
+              qCInfo(lcUpdate, "remote rename detected based on fileid %s --> %s", base._path.constData(), fs->path.constData());
+
               fs->instruction = CSYNC_INSTRUCTION_EVAL_RENAME;
               done = true;
           };
@@ -484,11 +487,11 @@ int csync_walker(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> fs) {
       }
       break;
   case ItemTypeSoftLink:
-    qCDebug(lcUpdate, "symlink: %s - not supported", fs->path.constData());
+    qCInfo(lcUpdate, "symlink: %s - not supported", fs->path.constData());
     break;
   default:
+    qCInfo(lcUpdate, "item: %s - item type %d not iterated", fs->path.constData(), fs->type);
     return 0;
-    break;
   }
 
   rc = _csync_detect_update(ctx, std::move(fs));
@@ -511,7 +514,7 @@ static bool fill_tree_from_db(CSYNC *ctx, const char *uri)
              * their correct etags again and we don't run into this case.
              */
             if (rec._etag == "_invalid_") {
-                qCDebug(lcUpdate, "%s selective sync excluded", rec._path.constData());
+                qCInfo(lcUpdate, "%s selective sync excluded", rec._path.constData());
                 skipbase = rec._path;
                 skipbase += '/';
                 return;
@@ -663,7 +666,21 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
       goto error;
   }
 
-  while ((dirent = csync_vio_readdir(ctx, dh))) {
+  while (true) {
+    // Get the next item in the directory
+    errno = 0;
+    dirent = csync_vio_readdir(ctx, dh);
+    if (!dirent) {
+        if (errno != 0) {
+            // Note: Windows vio converts any error into EACCES
+            qCWarning(lcUpdate, "readdir failed for file in %s - errno %d", uri, errno);
+            goto error;
+        }
+
+        // Normal case: End of items in directory
+        break;
+    }
+
     /* Conversion error */
     if (dirent->path.isEmpty() && !dirent->original_path.isEmpty()) {
         ctx->status_code = CSYNC_STATUS_INVALID_CHARACTERS;
@@ -757,7 +774,7 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
   }
 
   csync_vio_closedir(ctx, dh);
-  qCDebug(lcUpdate, " <= Closing walk for %s with read_from_db %d", uri, read_from_db);
+  qCInfo(lcUpdate, " <= Closing walk for %s with read_from_db %d", uri, read_from_db);
 
   return rc;
 

src/csync/vio/csync_vio_local_win.cpp

@@ -156,6 +156,7 @@ std::unique_ptr<csync_file_stat_t> csync_vio_local_readdir(csync_vio_handle_t *d
           // might be error, check!
           int dwError = GetLastError();
           if (dwError != ERROR_NO_MORE_FILES) {
+              qCWarning(lcCSyncVIOLocal, "FindNextFile error %d", dwError);
               errno = EACCES; // no more files is fine. Otherwise EACCESS
           }
           return nullptr;
@@ -181,7 +182,7 @@ std::unique_ptr<csync_file_stat_t> csync_vio_local_readdir(csync_vio_handle_t *d
       }
     } else if (handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_DEVICE
                 || handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_OFFLINE
-                || handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_TEMPORARY) {
+              ) {
         file_stat->type = ItemTypeSkip;
     } else if (handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
         file_stat->type = ItemTypeDirectory;

src/gui/CMakeLists.txt

@@ -53,6 +53,7 @@ set(client_SRCS
     folderman.cpp
     folderstatusmodel.cpp
     folderstatusdelegate.cpp
+    folderstatusview.cpp
     folderwatcher.cpp
     folderwizard.cpp
     generalsettings.cpp
@@ -116,6 +117,7 @@ set(client_SRCS
     wizard/owncloudwizardresultpage.cpp
     wizard/webviewpage.cpp
     wizard/webview.cpp
+    wizard/slideshow.cpp
 )
 
 IF(NOT NO_SHIBBOLETH)
@@ -272,7 +274,7 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
     add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src})
 else()
     # set(CMAKE_INSTALL_PREFIX ".") # Examples use /Applications. hurmpf.
-    set(MACOSX_BUNDLE_ICON_FILE "ownCloud.icns")
+    set(MACOSX_BUNDLE_ICON_FILE "${APPLICATION_ICON_NAME}.icns")
 
     # we must add MACOSX_BUNDLE only if building a bundle
     add_executable( ${APPLICATION_EXECUTABLE} WIN32 MACOSX_BUNDLE main.cpp ${final_src})

src/gui/accountmanager.cpp

@@ -52,7 +52,7 @@ AccountManager *AccountManager::instance()
 bool AccountManager::restore()
 {
     auto settings = ConfigFile::settingsWithGroup(QLatin1String(accountsC));
-    if (settings->status() != QSettings::NoError) {
+    if (settings->status() != QSettings::NoError || !settings->isWritable()) {
         qCWarning(lcAccountManager) << "Could not read settings from" << settings->fileName()
                                     << settings->status();
         return false;
@@ -253,6 +253,20 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings)
         acc->setUrl(urlConfig.toUrl());
     }
 
+    // Migrate to webflow
+    if (authType == QLatin1String("http")) {
+        authType = "webflow";
+        settings.setValue(QLatin1String(authTypeC), authType);
+
+        foreach(QString key, settings.childKeys()) {
+            if (!key.startsWith("http_"))
+                continue;
+            auto newkey = QString::fromLatin1("webflow_").append(key.mid(5));
+            settings.setValue(newkey, settings.value((key)));
+            settings.remove(key);
+        }
+    }
+
     qCInfo(lcAccountManager) << "Account for" << acc->url() << "using auth type" << authType;
 
     acc->_serverVersion = settings.value(QLatin1String(serverVersionC)).toString();
@@ -340,7 +354,7 @@ void AccountManager::displayMnemonic(const QString& mnemonic)
     Ui_Dialog ui;
     ui.setupUi(widget);
     widget->setWindowTitle(tr("End to end encryption mnemonic"));
-    ui.label->setText(tr("To protect your Cryptocraphic Identity, we encrypt it with a mnemonic of 12 dictionary words."
+    ui.label->setText(tr("To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. "
                          "Please note these down and keep them safe. "
                          "They will be needed to add other devices to your account (like your mobile phone or laptop)."));
     ui.textEdit->setText(mnemonic);

src/gui/accountsettings.cpp

@@ -265,7 +265,7 @@ void AccountSettings::slotOpenAccountWizard()
         qFatal("nope");
     }
 #endif
-    OwncloudSetupWizard::runWizard(qApp, SLOT(slotownCloudWizardDone(int)), 0);
+    OwncloudSetupWizard::runWizard(qApp, SLOT(slotownCloudWizardDone(int)), nullptr);
 }
 
 void AccountSettings::slotToggleSignInState()
@@ -625,7 +625,7 @@ void AccountSettings::slotFolderListClicked(const QModelIndex &indx)
             return;
         }
         if (FolderStatusDelegate::errorsListRect(tv->visualRect(indx)).contains(pos)) {
-            emit showIssuesList(_model->data(indx, FolderStatusDelegate::FolderAliasRole).toString());
+            emit showIssuesList(_accountState);
             return;
         }
 
@@ -680,7 +680,7 @@ void AccountSettings::slotFolderWizardAccepted()
 
     /* take the value from the definition of already existing folders. All folders have
      * the same setting so far.
-     * The default is to not sync hidden files
+     * The default is to sync hidden files
      */
     definition.ignoreHiddenFiles = folderMan->ignoreHiddenFiles();
 
@@ -808,7 +808,7 @@ void AccountSettings::slotEnableCurrentFolder()
                 QWidget *parent = this;
                 Qt::WindowFlags flags = Qt::Sheet;
 #else
-                QWidget *parent = 0;
+                QWidget *parent = nullptr;
                 Qt::WindowFlags flags = Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint; // default flags
 #endif
                 QMessageBox msgbox(QMessageBox::Question, tr("Sync Running"),
@@ -1152,7 +1152,7 @@ void AccountSettings::slotDeleteAccount()
     }
 
     // Else it might access during destruction. This should be better handled by it having a QSharedPointer
-    _model->setAccountState(0);
+    _model->setAccountState(nullptr);
 
     auto manager = AccountManager::instance();
     manager->deleteAccount(_accountState);

src/gui/accountsettings.h

@@ -53,15 +53,15 @@ class AccountSettings : public QWidget
     Q_OBJECT
 
 public:
-    explicit AccountSettings(AccountState *accountState, QWidget *parent = 0);
+    explicit AccountSettings(AccountState *accountState, QWidget *parent = nullptr);
     ~AccountSettings();
-    QSize sizeHint() const Q_DECL_OVERRIDE { return ownCloudGui::settingsDialogSize(); }
+    QSize sizeHint() const override { return ownCloudGui::settingsDialogSize(); }
     bool canEncryptOrDecrypt(const FolderStatusModel::SubFolderInfo* folderInfo);
 
 signals:
     void folderChanged();
     void openFolderAlias(const QString &);
-    void showIssuesList(const QString &folderAlias);
+    void showIssuesList(AccountState *account);
     void requesetMnemonic();
 
 public slots:
@@ -122,7 +122,7 @@ protected slots:
 private:
     void showConnectionLabel(const QString &message,
         QStringList errors = QStringList());
-    bool event(QEvent *) Q_DECL_OVERRIDE;
+    bool event(QEvent *) override;
     void createAccountToolbox();
 
     /// Returns the alias of the selected folder, empty string if none

src/gui/accountsettings.ui

@@ -117,7 +117,7 @@
     </layout>
    </item>
    <item row="2" column="0">
-    <widget class="QTreeView" name="_folderList">
+    <widget class="OCC::FolderStatusView" name="_folderList">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
@@ -275,6 +275,11 @@
    <extends>QToolButton</extends>
    <header>sslbutton.h</header>
   </customwidget>
+  <customwidget>
+   <class>OCC::FolderStatusView</class>
+   <extends>QTreeView</extends>
+   <header>folderstatusview.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

src/gui/accountstate.cpp

@@ -335,10 +335,10 @@ void AccountState::slotInvalidCredentials()
 
     if (account()->credentials()->ready()) {
         account()->credentials()->invalidateToken();
-        if (auto creds = qobject_cast<HttpCredentials *>(account()->credentials())) {
-            if (creds->refreshAccessToken())
-                return;
-        }
+    }
+    if (auto creds = qobject_cast<HttpCredentials *>(account()->credentials())) {
+        if (creds->refreshAccessToken())
+            return;
     }
     account()->credentials()->askFromUser();
 }
@@ -371,7 +371,7 @@ void AccountState::slotCredentialsAsked(AbstractCredentials *credentials)
         // When new credentials become available we always want to restart the
         // connection validation, even if it's currently running.
         _connectionValidator->deleteLater();
-        _connectionValidator = 0;
+        _connectionValidator = nullptr;
     }
 
     checkConnectivity();

src/gui/activityitemdelegate.cpp

@@ -229,14 +229,13 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
     // change pen color if use is not online
     QPalette p = option.palette;
     if(!accountOnline)
-        painter->setPen(p.color(QPalette::Disabled, QPalette::Text));
+        p.setCurrentColorGroup(QPalette::Disabled);
 
     // change pen color if the line is selected
-    QPalette::ColorGroup cg = option.state & (QStyle::State_Enabled | QStyle::State_Active)
-            ? QPalette::Normal
-            : QPalette::Inactive;
-
-    painter->setPen(option.palette.color(cg, QPalette::Text));
+    if (option.state & QStyle::State_Selected)
+        painter->setPen(p.color(QPalette::HighlightedText));
+    else
+        painter->setPen(p.color(QPalette::Text));
 
     // calculate space for text - use the max possible before using the elipses
     int spaceLeftForText = option.rect.width() - (actionIconRect.width() + margin + rightMargin + leftMargin) -
@@ -262,11 +261,10 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
     }
 
     // change pen color for the time
-    painter->setPen(p.color(QPalette::Disabled, QPalette::Text));
-
-    // check if line is selected
     if (option.state & QStyle::State_Selected)
-        painter->setPen(option.palette.color(cg, QPalette::HighlightedText));
+        painter->setPen(p.color(QPalette::Disabled, QPalette::HighlightedText));
+    else
+        painter->setPen(p.color(QPalette::Disabled, QPalette::Text));
 
     // draw the time
     const QString elidedTime = fm.elidedText(timeStr, Qt::ElideRight, spaceLeftForText);

src/gui/activityitemdelegate.h

@@ -43,10 +43,10 @@ public:
         AccountConnectedRole,
         SyncFileStatusRole };
 
-    void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const Q_DECL_OVERRIDE;
-    QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const Q_DECL_OVERRIDE;
+    void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const override;
+    QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const override;
     bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option,
-        const QModelIndex &index) Q_DECL_OVERRIDE;
+        const QModelIndex &index) override;
 
     static int rowHeight();
     static int iconHeight();

src/gui/activitylistmodel.cpp

@@ -121,7 +121,6 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
         return type;
         break;
     }
-    case Qt::ToolTipRole:
     case ActivityItemDelegate::ActionTextRole:
         return a._subject;
         break;
@@ -151,16 +150,12 @@ int ActivityListModel::rowCount(const QModelIndex &) const
     return _finalList.count();
 }
 
-// current strategy: Fetch 100 items per Account
-// ATTENTION: This method is const and thus it is not possible to modify
-// the _activityLists hash or so. Doesn't make it easier...
 bool ActivityListModel::canFetchMore(const QModelIndex &) const
 {
-    if (_activityLists.count() == 0)
-        return true;
-
+    // We need to be connected to be able to fetch more
     if (_accountState && _accountState->isConnected()) {
-        if (_activityLists.count() == 0 && !_currentlyFetching) {
+        // If the fetching is reported to be done or we are currently fetching we can't fetch more
+        if (!_doneFetching && !_currentlyFetching) {
             return true;
         }
     }
@@ -178,8 +173,8 @@ void ActivityListModel::startFetchJob()
         this, &ActivityListModel::slotActivitiesReceived);
 
     QUrlQuery params;
-    params.addQueryItem(QLatin1String("page"), QLatin1String("0"));
-    params.addQueryItem(QLatin1String("pagesize"), QLatin1String("100"));
+    params.addQueryItem(QLatin1String("start"), QString::number(_currentItem));
+    params.addQueryItem(QLatin1String("count"), QString::number(100));
     job->addQueryParams(params);
 
     _currentlyFetching = true;
@@ -193,10 +188,16 @@ void ActivityListModel::slotActivitiesReceived(const QJsonDocument &json, int st
 
     ActivityList list;
     auto ast = _accountState;
-    if (!ast)
+    if (!ast) {
         return;
+    }
 
-    _currentlyFetching = 0;
+    if (activities.size() == 0) {
+        _doneFetching = true;
+    }
+
+    _currentlyFetching = false;
+    _currentItem += activities.size();
 
     foreach (auto activ, activities) {
         auto json = activ.toObject();
@@ -213,7 +214,7 @@ void ActivityListModel::slotActivitiesReceived(const QJsonDocument &json, int st
         list.append(a);
     }
 
-    _activityLists = list;
+    _activityLists.append(list);
 
     emit activityJobStatusCode(statusCode);
 
@@ -232,9 +233,16 @@ void ActivityListModel::addNotificationToActivityList(Activity activity) {
     combineActivityLists();
 }
 
+void ActivityListModel::clearNotifications() {
+    qCInfo(lcActivity) << "Clear the notifications";
+    _notificationLists.clear();
+    combineActivityLists();
+}
+
 void ActivityListModel::removeActivityFromActivityList(int row) {
     Activity activity =  _finalList.at(row);
     removeActivityFromActivityList(activity);
+    combineActivityLists();
 }
 
 void ActivityListModel::addSyncFileItemToActivityList(Activity activity) {
@@ -292,18 +300,32 @@ void ActivityListModel::combineActivityLists()
     endInsertRows();
 }
 
+bool ActivityListModel::canFetchActivities() const {
+    return _accountState->isConnected() && _accountState->account()->capabilities().hasActivities();
+}
+
 void ActivityListModel::fetchMore(const QModelIndex &)
 {
-    if (_accountState->isConnected()) {
-        _activityLists = ActivityList();
+    if (canFetchActivities()) {
         startFetchJob();
+    } else {
+        _doneFetching = true;
+        combineActivityLists();
     }
 }
 
 void ActivityListModel::slotRefreshActivity()
 {
     _activityLists.clear();
-    startFetchJob();
+    _doneFetching = false;
+    _currentItem = 0;
+
+    if (canFetchActivities()) {
+        startFetchJob();
+    } else {
+        _doneFetching = true;
+        combineActivityLists();
+    }
 }
 
 void ActivityListModel::slotRemoveAccount()
@@ -311,5 +333,7 @@ void ActivityListModel::slotRemoveAccount()
     _finalList.clear();
     _activityLists.clear();
     _currentlyFetching = false;
+    _doneFetching = false;
+    _currentItem = 0;
 }
 }

src/gui/activitylistmodel.h

@@ -38,17 +38,18 @@ class ActivityListModel : public QAbstractListModel
 {
     Q_OBJECT
 public:
-    explicit ActivityListModel(AccountState *accountState, QWidget *parent = 0);
+    explicit ActivityListModel(AccountState *accountState, QWidget *parent = nullptr);
 
-    QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+    QVariant data(const QModelIndex &index, int role) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
-    bool canFetchMore(const QModelIndex &) const Q_DECL_OVERRIDE;
-    void fetchMore(const QModelIndex &) Q_DECL_OVERRIDE;
+    bool canFetchMore(const QModelIndex &) const override;
+    void fetchMore(const QModelIndex &) override;
 
     ActivityList activityList() { return _finalList; }
     ActivityList errorsList() { return _notificationErrorsLists; }
     void addNotificationToActivityList(Activity activity);
+    void clearNotifications();
     void addErrorToActivityList(Activity activity);
     void addSyncFileItemToActivityList(Activity activity);
     void removeActivityFromActivityList(int row);
@@ -67,6 +68,7 @@ signals:
 private:
     void startFetchJob();
     void combineActivityLists();
+    bool canFetchActivities() const;
 
     ActivityList _activityLists;
     ActivityList _syncFileItemLists;
@@ -74,7 +76,9 @@ private:
     ActivityList _notificationErrorsLists;
     ActivityList _finalList;
     AccountState *_accountState;
-    bool _currentlyFetching = true;
+    bool _currentlyFetching = false;
+    bool _doneFetching = false;
+    int _currentItem = 0;
 };
 }
 #endif // ACTIVITYLISTMODEL_H

src/gui/activitywidget.cpp

@@ -179,7 +179,8 @@ void ActivityWidget::slotItemCompleted(const QString &folder, const SyncFileItem
 
         if(item->_status == SyncFileItem::NoStatus || item->_status == SyncFileItem::Success){
             qCWarning(lcActivity) << "Item " << item->_file << " retrieved successfully.";
-            activity._message.prepend(tr("Synced "));
+            activity._message.prepend(" ");
+            activity._message.prepend(tr("Synced"));
             _model->addSyncFileItemToActivityList(activity);
         } else {
             qCWarning(lcActivity) << "Item " << item->_file << " retrieved resulted in error " << item->_errorString;
@@ -430,20 +431,17 @@ void ActivityWidget::slotOpenFile(QModelIndex indx)
 // collected.
 void ActivityWidget::slotBuildNotificationDisplay(const ActivityList &list)
 {
-    QString listAccountName;
-
     // Whether a new notification was added to the list
     bool newNotificationShown = false;
 
+    _model->clearNotifications();
+
     foreach (auto activity, list) {
         if (_blacklistedNotifications.contains(activity)) {
             qCInfo(lcActivity) << "Activity in blacklist, skip";
             continue;
         }
 
-        // remember the list account name for the strayCat handling below.
-        listAccountName = activity._accName;
-
         // handle gui logs. In order to NOT annoy the user with every fetching of the
         // notifications the notification id is stored in a Set. Only if an id
         // is not in the set, it qualifies for guiLog.
@@ -468,14 +466,15 @@ void ActivityWidget::slotBuildNotificationDisplay(const ActivityList &list)
                     emit guiLog(activity._subject, activity._accName);
                 }
             }
-
-            _model->addNotificationToActivityList(activity);
         }
+
+        _model->addNotificationToActivityList(activity);
     }
 
     // restart the gui log timer now that we show a new notification
-    if(newNotificationShown)
+    if(newNotificationShown) {
         _guiLogTimer.start();
+    }
 }
 
 void ActivityWidget::slotSendNotificationRequest(const QString &accountName, const QString &link, const QByteArray &verb, int row)

src/gui/activitywidget.h

@@ -56,9 +56,9 @@ class ActivityWidget : public QWidget
 {
     Q_OBJECT
 public:
-    explicit ActivityWidget(AccountState *accountState, QWidget *parent = 0);
+    explicit ActivityWidget(AccountState *accountState, QWidget *parent = nullptr);
     ~ActivityWidget();
-    QSize sizeHint() const Q_DECL_OVERRIDE { return ownCloudGui::settingsDialogSize(); }
+    QSize sizeHint() const override { return ownCloudGui::settingsDialogSize(); }
     void storeActivityList(QTextStream &ts);
 
     /**
@@ -128,10 +128,10 @@ class ActivitySettings : public QWidget
 {
     Q_OBJECT
 public:
-    explicit ActivitySettings(AccountState *accountState, QWidget *parent = 0);
+    explicit ActivitySettings(AccountState *accountState, QWidget *parent = nullptr);
 
     ~ActivitySettings();
-    QSize sizeHint() const Q_DECL_OVERRIDE { return ownCloudGui::settingsDialogSize(); }
+    QSize sizeHint() const override { return ownCloudGui::settingsDialogSize(); }
 
 public slots:
     void slotRefresh();
@@ -146,7 +146,7 @@ signals:
     void guiLog(const QString &, const QString &);
 
 private:
-    bool event(QEvent *e) Q_DECL_OVERRIDE;
+    bool event(QEvent *e) override;
 
     ActivityWidget *_activityWidget;
     QProgressIndicator *_progressIndicator;

src/gui/activitywidget.ui

@@ -10,70 +10,6 @@
     <height>556</height>
    </rect>
   </property>
-  <property name="palette">
-   <palette>
-    <active>
-     <colorrole role="Base">
-      <brush brushstyle="SolidPattern">
-       <color alpha="255">
-        <red>252</red>
-        <green>252</green>
-        <blue>252</blue>
-       </color>
-      </brush>
-     </colorrole>
-     <colorrole role="Window">
-      <brush brushstyle="SolidPattern">
-       <color alpha="255">
-        <red>255</red>
-        <green>255</green>
-        <blue>255</blue>
-       </color>
-      </brush>
-     </colorrole>
-    </active>
-    <inactive>
-     <colorrole role="Base">
-      <brush brushstyle="SolidPattern">
-       <color alpha="255">
-        <red>252</red>
-        <green>252</green>
-        <blue>252</blue>
-       </color>
-      </brush>
-     </colorrole>
-     <colorrole role="Window">
-      <brush brushstyle="SolidPattern">
-       <color alpha="255">
-        <red>255</red>
-        <green>255</green>
-        <blue>255</blue>
-       </color>
-      </brush>
-     </colorrole>
-    </inactive>
-    <disabled>
-     <colorrole role="Base">
-      <brush brushstyle="SolidPattern">
-       <color alpha="255">
-        <red>255</red>
-        <green>255</green>
-        <blue>255</blue>
-       </color>
-      </brush>
-     </colorrole>
-     <colorrole role="Window">
-      <brush brushstyle="SolidPattern">
-       <color alpha="255">
-        <red>255</red>
-        <green>255</green>
-        <blue>255</blue>
-       </color>
-      </brush>
-     </colorrole>
-    </disabled>
-   </palette>
-  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
@@ -81,6 +17,18 @@
    <property name="sizeConstraint">
     <enum>QLayout::SetDefaultConstraint</enum>
    </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QListView" name="_activityList">
      <property name="sizePolicy">
@@ -89,70 +37,6 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="palette">
-      <palette>
-       <active>
-        <colorrole role="Base">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>252</red>
-           <green>252</green>
-           <blue>252</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="Window">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>252</red>
-           <green>252</green>
-           <blue>252</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </active>
-       <inactive>
-        <colorrole role="Base">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>252</red>
-           <green>252</green>
-           <blue>252</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="Window">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>252</red>
-           <green>252</green>
-           <blue>252</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </inactive>
-       <disabled>
-        <colorrole role="Base">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>252</red>
-           <green>252</green>
-           <blue>252</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="Window">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>252</red>
-           <green>252</green>
-           <blue>252</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </disabled>
-      </palette>
-     </property>
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>

src/gui/addcertificatedialog.h

@@ -34,7 +34,7 @@ class AddCertificateDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit AddCertificateDialog(QWidget *parent = 0);
+    explicit AddCertificateDialog(QWidget *parent = nullptr);
     ~AddCertificateDialog();
     QString getCertificatePath();
     QString getCertificatePasswd();

src/gui/application.cpp

@@ -71,8 +71,9 @@ namespace {
         "  --logexpire <hours>  : removes logs older than <hours> hours.\n"
         "                         (to be used with --logdir)\n"
         "  --logflush           : flush the log file after every write.\n"
-        "  --logdebug           : also output debug-level messages in the log (equivalent to setting the env var QT_LOGGING_RULES=\"qt.*=true;*.debug=true\").\n"
-        "  --confdir <dirname>  : Use the given configuration folder.\n";
+        "  --logdebug           : also output debug-level messages in the log.\n"
+        "  --confdir <dirname>  : Use the given configuration folder.\n"
+        "  --background         : launch the application in the background.\n";
 
     QString applicationTrPath()
     {
@@ -96,7 +97,7 @@ namespace {
 
 Application::Application(int &argc, char **argv)
     : SharedTools::QtSingleApplication(Theme::instance()->appName(), argc, argv)
-    , _gui(0)
+    , _gui(nullptr)
     , _theme(Theme::instance())
     , _helpOnly(false)
     , _versionOnly(false)
@@ -106,6 +107,7 @@ Application::Application(int &argc, char **argv)
     , _logDebug(false)
     , _userTriggeredConnect(false)
     , _debugMode(false)
+    , _backgroundMode(false)
 {
     _startedAt.start();
 
@@ -125,7 +127,8 @@ Application::Application(int &argc, char **argv)
     setAttribute(Qt::AA_UseHighDpiPixmaps, true);
 
     auto confDir = ConfigFile().configPath();
-    if (!QFileInfo(confDir).exists()) {
+    if (confDir.endsWith('/')) confDir.chop(1);  // macOS 10.11.x does not like trailing slash for rename/move.
+    if (!QFileInfo(confDir).isDir()) {
         // Migrate from version <= 2.4
         setApplicationName(_theme->appNameGUI());
 #ifndef QT_WARNING_DISABLE_DEPRECATED // Was added in Qt 5.9
@@ -136,6 +139,7 @@ Application::Application(int &argc, char **argv)
         // We need to use the deprecated QDesktopServices::storageLocation because of its Qt4
         // behavior of adding "data" to the path
         QString oldDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+        if (oldDir.endsWith('/')) oldDir.chop(1); // macOS 10.11.x does not like trailing slash for rename/move.
         QT_WARNING_POP
         setApplicationName(_theme->appName());
         if (QFileInfo(oldDir).isDir()) {
@@ -184,12 +188,12 @@ Application::Application(int &argc, char **argv)
         if (!AccountManager::instance()->restore()) {
             qCCritical(lcApplication) << "Could not read the account settings, quitting";
             QMessageBox::critical(
-                0,
+                nullptr,
                 tr("Error accessing the configuration file"),
                 tr("There was an error while accessing the configuration "
-                   "file at %1.")
+                   "file at %1. Please make sure the file can be accessed by your user.")
                     .arg(ConfigFile().configFile()),
-                tr("Quit ownCloud"));
+                tr("Quit %1").arg(Theme::instance()->appNameGUI()));
             QTimer::singleShot(0, qApp, SLOT(quit()));
             return;
         }
@@ -202,9 +206,8 @@ Application::Application(int &argc, char **argv)
     _theme->setSystrayUseMonoIcons(cfg.monoIcons());
     connect(_theme, &Theme::systrayUseMonoIconsChanged, this, &Application::slotUseMonoIconsChanged);
 
-    FolderMan::instance()->setupFolders();
-    _proxy.setupQtProxyFromConfig(); // folders have to be defined first, than we set up the Qt proxy.
-
+    // Setting up the gui class will allow tray notifications for the
+    // setup that follows, like folder setup
     _gui = new ownCloudGui(this);
     if (_showLogWindow) {
         _gui->slotToggleLogBrowser(); // _showLogWindow is set in parseOptions.
@@ -213,6 +216,9 @@ Application::Application(int &argc, char **argv)
     _gui->setupCloudProviders();
 #endif
 
+    FolderMan::instance()->setupFolders();
+    _proxy.setupQtProxyFromConfig(); // folders have to be defined first, than we set up the Qt proxy.
+
     // Enable word wrapping of QInputDialog (#4197)
     setStyleSheet("QInputDialog QLabel { qproperty-wordWrap:1; }");
 
@@ -463,6 +469,8 @@ void Application::parseOptions(const QStringList &options)
         } else if (option == QLatin1String("--debug")) {
             _logDebug = true;
             _debugMode = true;
+        } else if (option == QLatin1String("--background")) {
+            _backgroundMode = true;
         } else if (option == QLatin1String("--version")) {
             _versionOnly = true;
         } else {
@@ -536,6 +544,11 @@ bool Application::debugMode()
     return _debugMode;
 }
 
+bool Application::backgroundMode() const
+{
+    return _backgroundMode;
+}
+
 void Application::setHelp()
 {
     _helpOnly = true;