Merge pull request #3517 from nextcloud/bump-version-3.2.4

Bump version to 3.2.4

.drone.yml

@@ -3,7 +3,7 @@ name: qt-5.12
 
 steps:
 - name: cmake
-  image: nextcloudci/client-5.12:client-5.12-11
+  image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18
   volumes:
     - name: build
       path: /drone/build
@@ -11,7 +11,7 @@ steps:
     - cd /drone/build
     - cmake -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 -DCMAKE_BUILD_TYPE=Debug -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DSANITIZE_ADDRESS=ON ../src
 - name: compile
-  image: nextcloudci/client-5.12:client-5.12-11
+  image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18
   volumes:
     - name: build
       path: /drone/build
@@ -19,7 +19,7 @@ steps:
     - cd /drone/build
     - make -j$(nproc)
 - name: test
-  image: nextcloudci/client-5.12:client-5.12-11
+  image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18
   volumes:
     - name: build
       path: /drone/build
@@ -47,7 +47,7 @@ name: qt-5.12-clang
 
 steps:
 - name: cmake
-  image: nextcloudci/client-5.12:client-5.12-11
+  image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18
   volumes:
     - name: build
       path: /drone/build
@@ -55,7 +55,7 @@ steps:
     - cd /drone/build
     - cmake -GNinja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON DCMAKE_C_COMPILER=clang-10 -DCMAKE_CXX_COMPILER=clang++-10 -DCMAKE_BUILD_TYPE=Debug -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DSANITIZE_ADDRESS=ON ../src
 - name: compile
-  image: nextcloudci/client-5.12:client-5.12-11
+  image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18
   volumes:
     - name: build
       path: /drone/build
@@ -63,7 +63,7 @@ steps:
     - cd /drone/build
     - ninja
 - name: test
-  image: nextcloudci/client-5.12:client-5.12-11
+  image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18
   volumes:
     - name: build
       path: /drone/build
@@ -73,7 +73,7 @@ steps:
     - chown -R test:test .
     - su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test
 - name: clang-tidy
-  image: nextcloudci/client-5.12:client-5.12-11
+  image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18
   volumes:
     - name: build
       path: /drone/build
@@ -98,7 +98,7 @@ name: AppImage
 
 steps:
 - name: build
-  image: nextcloudci/client-5.12:client-5.12-9
+  image: ghcr.io/nextcloud/continuous-integration-client-appimage:client-appimage-1
   environment:
     CI_UPLOAD_GIT_TOKEN:
       from_secret: CI_UPLOAD_GIT_TOKEN
@@ -120,7 +120,7 @@ name: Debian
 
 steps:
 - name: build
-  image: nextcloudci/client-debian-ci:client-debian-ci-2
+  image: ghcr.io/nextcloud/continuous-integration-client-debian:client-debian-3
   commands:
     - /bin/bash -c "./admin/linux/debian/drone-build.sh" || echo "[WARNING] Debian build failed but this is a non-blocking CI event"
   environment:

.tx/nextcloud.client-desktop/ar_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@

.tx/nextcloud.client-desktop/bg_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[bg_BG]=@APPLICATION_ICON_NAME@
-Name[bg_BG]=@APPLICATION_NAME@ десктоп клиент за синхронизиране
 Comment[bg_BG]=@APPLICATION_NAME@ десктоп клиент за синхронизиране 
 GenericName[bg_BG]=Синхронизиране на папка

.tx/nextcloud.client-desktop/br_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[br]=@APPLICATION_ICON_NAME@
-Name[br]=@APPLICATION_NAME@ burev kempreet an implijer
 Comment[br]=@APPLICATION_NAME@ burev kempreet an implijer
 GenericName[br]=Tuliad kemprenan

.tx/nextcloud.client-desktop/ca_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,6 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[ca]=@APPLICATION_ICON_NAME@
-Name[ca]=Client de sincronització d'escriptori del @APPLICATION_NAME@ 
+Name[ca]=@APPLICATION_NAME@ per a escriptori
 Comment[ca]=Client de sincronització d'escriptori del @APPLICATION_NAME@
 GenericName[ca]=Sincronització de carpetes

.tx/nextcloud.client-desktop/cs_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,6 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[cs_CZ]=@APPLICATION_ICON_NAME@
-Name[cs_CZ]=@APPLICATION_NAME@ synchronizační klient pro desktop
+Name[cs_CZ]=@APPLICATION_NAME@ Desktop
 Comment[cs_CZ]=@APPLICATION_NAME@ synchronizační klient pro desktop
 GenericName[cs_CZ]=Synchronizace složek

.tx/nextcloud.client-desktop/cy_GB_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[cy_GB]=@APPLICATION_ICON_NAME@
-Name[cy_GB]=@APPLICATION_NAME@ cleient cydweddu bwrdd gwaith
 Comment[cy_GB]=@APPLICATION_NAME@ cleient cydweddu bwrdd gwaith
 GenericName[cy_GB]=Cydweddu Ffolder

.tx/nextcloud.client-desktop/da_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,6 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[da]=@APPLICATION_ICON_NAME@
-Name[da]=@APPLICATION_NAME@ Arbejdsstationsssynkroniseringsklient
+Name[da]=Skrivebordsklient til @APPLICATION_NAME@
-Comment[da]=@APPLICATION_NAME@ Arbejdsstationsssynkroniseringsklient
+Comment[da]=Klient til @APPLICATION_NAME@-skrivebordssynkronisering
 GenericName[da]=Mappesynkronisering

.tx/nextcloud.client-desktop/de_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@

.tx/nextcloud.client-desktop/el_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[el]=@APPLICATION_ICON_NAME@
-Name[el]=@APPLICATION_NAME@ πρόγραμμα συγχρονισμού
 Comment[el]=@APPLICATION_NAME@ πρόγραμμα συγχρονισμού
 GenericName[el]=Συγχρονισμός φακέλου

.tx/nextcloud.client-desktop/en_GB_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 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

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # 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_AR_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[es_AR]=@APPLICATION_ICON_NAME@
-Name[es_AR]=@APPLICATION_NAME@ cliente de sincronización de escritorio
 Comment[es_AR]=@APPLICATION_NAME@ cliente de sincronización de escritorio
 GenericName[es_AR]=Sincronización de carpetas

.tx/nextcloud.client-desktop/es_CL_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -21,6 +21,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 
 # Translations
-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

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -21,6 +21,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 
 # Translations
-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

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -21,6 +21,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 
 # Translations
-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

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[es_DO]=@APPLICATION_ICON_NAME@
-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

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -21,6 +21,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 
 # Translations
-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

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -21,6 +21,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 
 # Translations
-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

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -21,6 +21,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 
 # Translations
-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

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -21,6 +21,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 
 # Translations
-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

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,6 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[es]=@APPLICATION_ICON_NAME@
-Name[es]=Cliente de sincronización de escritorio @APPLICATION_NAME@
+Name[es]=@APPLICATION_NAME@ Desktop
-Comment[es]=Cliente de sincronización de escritorio @APPLICATION_NAME@
+Comment[es]=@APPLICATION_NAME@ desktop synchronization client
 GenericName[es]=Sincronización de carpetas

.tx/nextcloud.client-desktop/et_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[et_EE]=@APPLICATION_ICON_NAME@
-Name[et_EE]=@APPLICATION_NAME@ töölaua sünkimise klient
 Comment[et_EE]=@APPLICATION_NAME@ töölaua sünkroniseerimise klient
 GenericName[et_EE]=Kausta Sünkroonimine

.tx/nextcloud.client-desktop/eu_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,6 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[eu]=@APPLICATION_ICON_NAME@
-Name[eu]=@APPLICATION_NAME@ mahaigainerako sinkronizazio bezeroa
+Name[eu]=@APPLICATION_NAME@ Mahaigaina
 Comment[eu]=@APPLICATION_NAME@ mahaigainerako sinkronizazio bezeroa
 GenericName[eu]=Karpeta-sinkronizazioa

.tx/nextcloud.client-desktop/fa_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@

.tx/nextcloud.client-desktop/fi_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[fi_FI]=@APPLICATION_ICON_NAME@
-Name[fi_FI]=@APPLICATION_NAME@ työpöydän synkronointipääte
 Comment[fi_FI]=@APPLICATION_NAME@ työpöydän synkronointipääte
 GenericName[fi_FI]=Kansio synkronointi

.tx/nextcloud.client-desktop/fr_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,6 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[fr]=@APPLICATION_ICON_NAME@
-Name[fr]=Client  de synchro @APPLICATION_NAME@
+Name[fr]=@APPLICATION_NAME@ Bureau
 Comment[fr]=Client de synchronisation @APPLICATION_NAME@
 GenericName[fr]=Synchronisation du dossier

.tx/nextcloud.client-desktop/gl_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # 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

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[he]=@APPLICATION_ICON_NAME@
-Name[he]=@APPLICATION_NAME@ לקוח סנכרון לשולחן העבודה 
 Comment[he]=@APPLICATION_NAME@ לקוח סנכרון לשולחן העבודה
 GenericName[he]=סנכרון תיקיות

.tx/nextcloud.client-desktop/hr_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[hr]=@APPLICATION_ICON_NAME@
-Name[hr]=@APPLICATION_NAME@ klijent za sink. računala
 Comment[hr]=@APPLICATION_NAME@ klijent za sinkronizaciju računala
 GenericName[hr]=Sinkronizacija mapa

.tx/nextcloud.client-desktop/hu_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,6 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[hu_HU]=@APPLICATION_ICON_NAME@
-Name[hu_HU]=@APPLICATION_NAME@ asztali szinkronizálási kliens
+Name[hu_HU]=@APPLICATION_NAME@ Desktop
 Comment[hu_HU]=@APPLICATION_NAME@ asztali szinkronizálási kliens
 GenericName[hu_HU]=Mappaszinkronizálás

.tx/nextcloud.client-desktop/is_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 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

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,6 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[it]=@APPLICATION_ICON_NAME@
-Name[it]=Client di sincronizzazione desktop di @APPLICATION_NAME@ 
+Name[it]=@APPLICATION_NAME@ Desktop
 Comment[it]=Client di sincronizzazione desktop di @APPLICATION_NAME@ 
 GenericName[it]=Sincronizzazione cartelle

.tx/nextcloud.client-desktop/ja_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,6 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[ja_JP]=@APPLICATION_ICON_NAME@
-Name[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
+Name[ja_JP]=@APPLICATION_NAME@ デスクトップ
 Comment[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
 GenericName[ja_JP]=フォルダーを同期する

.tx/nextcloud.client-desktop/ko_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[ko]=@APPLICATION_ICON_NAME@
-Name[ko]=@APPLICATION_NAME@ 데스크톱 동기화 클라이언트
 Comment[ko]=@APPLICATION_NAME@ 데스크톱 동기화 클라이언트
 GenericName[ko]=폴더 동기화

.tx/nextcloud.client-desktop/lt_LT_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # 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

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 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/mk_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[mk]=@APPLICATION_ICON_NAME@
-Name[mk]=@APPLICATION_NAME@ клиент за синхронизација на компјутер
 Comment[mk]=@APPLICATION_NAME@ клиент за синхронизација на компјутер
 GenericName[mk]=Папка за синхронизација

.tx/nextcloud.client-desktop/nb_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 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

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,6 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[nl]=@APPLICATION_ICON_NAME@
-Name[nl]=@APPLICATION_NAME@ desktop sync client 
+Name[nl]=@APPLICATION_NAME@ Desktop
 Comment[nl]=@APPLICATION_NAME@ desktopsynchronisatieclient
 GenericName[nl]=Map synchronisatie

.tx/nextcloud.client-desktop/oc_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[oc]=@APPLICATION_ICON_NAME@
-Name[oc]=@APPLICATION_NAME@ client de sincronizacion
 Comment[oc]=@APPLICATION_NAME@ client de sincronizacion
 GenericName[oc]=Sincro. dossièr

.tx/nextcloud.client-desktop/pl_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,6 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[pl]=@APPLICATION_ICON_NAME@
-Name[pl]=@APPLICATION_NAME@ desktopowy klient synchronizacji
+Name[pl]=@APPLICATION_NAME@ Desktop
-Comment[pl]=@APPLICATION_NAME@ desktopowy klient synchronizacji
+Comment[pl]=Desktopowy klient synchronizacji @APPLICATION_NAME@
 GenericName[pl]=Katalog synchronizacji

.tx/nextcloud.client-desktop/pt_BR_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,6 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[pt_BR]=@APPLICATION_ICON_NAME@
-Name[pt_BR]=@APPLICATION_NAME@ cliente de sincronização desktop
+Name[pt_BR]=@APPLICATION_NAME@ Desktop
 Comment[pt_BR]=@APPLICATION_NAME@ cliente de sincronização desktop
 GenericName[pt_BR]=Sincronizar pasta

.tx/nextcloud.client-desktop/pt_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 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

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # 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 director

.tx/nextcloud.client-desktop/ru_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[ru]=@APPLICATION_ICON_NAME@
-Name[ru]=@APPLICATION_NAME@ для ПК
 Comment[ru]=Клиент синхронизации @APPLICATION_NAME@ для ПК
 GenericName[ru]=Синхронизация папок

.tx/nextcloud.client-desktop/sc_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[sc]=@NÙMENE_ICONA_APLICATZIONE@
-Name[sc]=@NÙMENE_APLICATZIONE@ cliente sicronizadore de iscrivania
 Comment[sc]=@NÙMENE_APLICATZIONE@ cliente de sincronizatzione iscrivania
 GenericName[sc]=Sincronizadore de cartellas

.tx/nextcloud.client-desktop/sk_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,6 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[sk_SK]=@APPLICATION_ICON_NAME@
-Name[sk_SK]=@APPLICATION_NAME@ synchronizačný klient pre PC
+Name[sk_SK]=@APPLICATION_NAME@ Desktop
 Comment[sk_SK]=@APPLICATION_NAME@ synchronizačný klient pre PC
 GenericName[sk_SK]=Synchronizácia priečinkov

.tx/nextcloud.client-desktop/sl_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,6 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[sl]=@APPLICATION_ICON_NAME@
-Name[sl]=@APPLICATION_NAME@ program za usklajevanje
+Name[sl]=Namizni program @APPLICATION_NAME@
-Comment[sl]=@APPLICATION_NAME@ program za usklajevanje
+Comment[sl]=Program za usklajevanje @APPLICATION_NAME@
 GenericName[sl]=Usklajevanje map

.tx/nextcloud.client-desktop/sr_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[sr]=@APPLICATION_ICON_NAME@
-Name[sr]=@APPLICATION_NAME@ десктоп клијент за синхронизацију
 Comment[sr]=@APPLICATION_NAME@ десктоп клијент за синхронизацију
 GenericName[sr]=Синхронизација фасцикли

.tx/nextcloud.client-desktop/sv_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[sv]=@APPLICATION_ICON_NAME@
-Name[sv]=@APPLICATION_NAME@ desktopssynkklient 
 Comment[sv]=@APPLICATION_NAME@ desktopssynkroniseringsklient
 GenericName[sv]=Mappsynkronisering

.tx/nextcloud.client-desktop/sw_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[sw]=@APPLICATION_ICON_NAME@
-Name[sw]=Teja ya @APPLICATION_NAME@ ya kufanana faili kwa seva na faili ziko hapa
 Comment[sw]=Teja ya @APPLICATION_NAME@ ya kufanana faili kwa seva na faili ziko hapa 
 GenericName[sw]=Fanana Kabrasha

.tx/nextcloud.client-desktop/tr_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,6 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[tr]=@APPLICATION_ICON_NAME@
-Name[tr]=@APPLICATION_NAME@ masaüstü eşiteme istemcisi
+Name[tr]=@APPLICATION_NAME@ Masaüstü
 Comment[tr]=@APPLICATION_NAME@ masaüstü eşitleme istemcisi
-GenericName[tr]=Klasör Eşitleme
+GenericName[tr]=Klasör eşitleme

.tx/nextcloud.client-desktop/uk_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,5 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[uk]=@APPLICATION_ICON_NAME@
-Name[uk]=@APPLICATION_NAME@ клієнт для ПК
 Comment[uk]=Клієнт синхронізації @APPLICATION_NAME@ для ПК
 GenericName[uk]=Синхронізація тек

.tx/nextcloud.client-desktop/zh_CN_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,6 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[zh_CN]=@APPLICATION_ICON_NAME@
-Name[zh_CN]=@APPLICATION_NAME@ 桌面同步客户端
+Name[zh_CN]=@APPLICATION_NAME@ 桌面
 Comment[zh_CN]=@APPLICATION_NAME@ 桌面同步客户端
 GenericName[zh_CN]=文件夹同步

.tx/nextcloud.client-desktop/zh_HK_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,6 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[zh_HK]=@APPLICATION_ICON_NAME@
-Name[zh_HK]= @APPLICATION_NAME@ 桌面同步客戶端
+Name[zh_HK]=@APPLICATION_NAME@ 桌面電腦
 Comment[zh_HK]= @APPLICATION_NAME@ 桌面同步客戶端
 GenericName[zh_HK]=資料夾同步

.tx/nextcloud.client-desktop/zh_TW_translation

@@ -2,7 +2,7 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
+Name=@APPLICATION_NAME@ Desktop
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
@@ -22,6 +22,6 @@ Icon=@APPLICATION_EXECUTABLE@
 
 # Translations
 Icon[zh_TW]=@APPLICATION_ICON_NAME@
-Name[zh_TW]=@APPLICATION_NAME@ 桌面同步客戶端
+Name[zh_TW]=@APPLICATION_NAME@ 桌面版
 Comment[zh_TW]=@APPLICATION_NAME@ 桌面同步客戶端
 GenericName[zh_TW]=資料夾同步

CMakeLists.txt

@@ -10,13 +10,7 @@ endif()
 
 set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
-
+include(${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake)
-set(OEM_THEME_DIR "" CACHE STRING "Define directory containing a custom theme")
-if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake )
-     include ( ${OEM_THEME_DIR}/OEM.cmake )
-else ()
-     include ( ${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake )
-endif()
 
 # Default suffix if the theme doesn't define one
 if(NOT DEFINED APPLICATION_VIRTUALFILE_SUFFIX)

CPackOptions.cmake.in

@@ -9,13 +9,8 @@ endif(CPACK_GENERATOR MATCHES "NSIS")
 
 set( CMAKE_SOURCE_DIR  @CMAKE_SOURCE_DIR@ )
 set( CMAKE_BINARY_DIR  @CMAKE_BINARY_DIR@ )
-set( OEM_THEME_DIR     @OEM_THEME_DIR@ )
 
-if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
+include("${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake")
-     include ( ${OEM_THEME_DIR}/OEM.cmake )
-else ()
-     include ( "${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake" )
-endif()
 
 set( CRASHREPORTER_EXECUTABLE @CRASHREPORTER_EXECUTABLE@)
 

NextcloudCPack.cmake

@@ -2,11 +2,7 @@ include( InstallRequiredSystemLibraries )
 
 set( CPACK_PACKAGE_CONTACT  "Dominik Schmidt <domme@tomahawk-player.org>" )
 
-if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
+include("${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake")
-     include ( "${OEM_THEME_DIR}/OEM.cmake" )
-else ()
-     include ( "${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake" )
-endif()
 
 include( VERSION.cmake )
 set( CPACK_PACKAGE_VERSION_MAJOR  ${MIRALL_VERSION_MAJOR} )

VERSION.cmake

@@ -1,9 +1,14 @@
 set( MIRALL_VERSION_MAJOR 3 )
-set( MIRALL_VERSION_MINOR 1 )
+set( MIRALL_VERSION_MINOR 2 )
-set( MIRALL_VERSION_PATCH 81 )
+set( MIRALL_VERSION_PATCH 4 )
-set( MIRALL_VERSION_YEAR  2020 )
+set( MIRALL_VERSION_YEAR  2021 )
 set( MIRALL_SOVERSION 0 )
 
+# Minimum supported server version according to https://docs.nextcloud.com/server/latest/admin_manual/release_schedule.html
+set(NEXTCLOUD_SERVER_VERSION_MIN_SUPPORTED_MAJOR 19)
+set(NEXTCLOUD_SERVER_VERSION_MIN_SUPPORTED_MINOR 0)
+set(NEXTCLOUD_SERVER_VERSION_MIN_SUPPORTED_PATCH 0)
+
 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
     set( MIRALL_VERSION_SUFFIX "git") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )

admin/linux/build-appimage.sh

@@ -6,7 +6,7 @@ mkdir /app
 mkdir /build
 
 #Set Qt-5.12
-export QT_BASE_DIR=/opt/qt5.12.9
+export QT_BASE_DIR=/opt/qt5.12.10
 export QTDIR=$QT_BASE_DIR
 export PATH=$QT_BASE_DIR/bin:$PATH
 export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH

admin/linux/debian/drone-build.sh

@@ -15,10 +15,10 @@ OBS_PROJECT_BETA=home:ivaradi:beta
 OBS_PACKAGE=nextcloud-desktop
 
 if test "${DRONE_TARGET_BRANCH}" = "stable-2.6"; then
-    UBUNTU_DISTRIBUTIONS="bionic focal groovy hirsute"
+    UBUNTU_DISTRIBUTIONS="bionic focal groovy hirsute impish"
     DEBIAN_DISTRIBUTIONS="buster stretch testing"
 else
-    UBUNTU_DISTRIBUTIONS="focal groovy hirsute"
+    UBUNTU_DISTRIBUTIONS="focal groovy hirsute impish"
     DEBIAN_DISTRIBUTIONS="testing"
 fi
 
@@ -88,7 +88,7 @@ for distribution in ${UBUNTU_DISTRIBUTIONS} ${DEBIAN_DISTRIBUTIONS}; do
     dpkg-genchanges -S -sa > "../nextcloud-desktop_${fullver}_source.changes"
 
     if test -f ~/.has_ppa_keys; then
-        debsign -k7D14AA7B -S
+        debsign -k2265D8767D14AA7B -S
     fi
 done
 cd ..

admin/osx/CMakeLists.txt

@@ -1,7 +1,5 @@
 
-# Check if varialbe MAC_INSTALLER_BACKGROUND_FILE is defined. That might come
+# Check if varialbe MAC_INSTALLER_BACKGROUND_FILE is defined.
-# from the OEM.cmake for branded clients or from NEXTCLOUD.cmake for the non
-# branded client.
 # Make sure that the MAC_INSTALLER_BACKGROUND_FILE contains the full path, ie.
 # includes CMAKE_SOURCE_DIR or so.
 

admin/win/msi/Nextcloud.wxs

@@ -52,6 +52,9 @@
     <Property Id="INSTALLDIR">
         <RegistrySearch Id="RegistryInstallDir" Type="raw" Root="HKLM" Key="Software\$(var.AppVendor)\$(var.AppName)" Win64="no" />
     </Property>
+	<Property Id="WINDOWSRELEASEID">
+        <RegistrySearch Id="RegistryWindowsReleaseId" Type="raw" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion" Name="ReleaseId"/>
+    </Property>
 
     <!-- Detect legacy NSIS installation -->
     <Property Id="NSIS_UNINSTALLEXE">
@@ -77,8 +80,8 @@
         <!-- Uninstall: Remove sync folders from Explorer's Navigation Pane, only effective for the current user (home users) -->
         <Custom Action="RemoveNavigationPaneEntries" After="RemoveFiles">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
 
-        <!-- Schedule Reboot for the Shell Extensions -->
+        <!-- Schedule Reboot for the Shell Extensions (in silent installation mode only, or if SCHEDULE_REBOOT argument is set-->
-        <ScheduleReboot After="InstallFinalize">NOT (DO_NOT_SCHEDULE_REBOOT=1)</ScheduleReboot>
+        <ScheduleReboot After="InstallFinalize">(SCHEDULE_REBOOT=1) OR NOT (UILevel=2)</ScheduleReboot>
     </InstallExecuteSequence>
 
     <!-- "Add or Remove" Programs Entries -->
@@ -214,6 +217,6 @@
             <Condition Level="0">(NO_DESKTOP_SHORTCUT=1)</Condition>
         </Feature>
     </Feature>
-
+	<Condition Message="This application only runs on Windows 10, version 1709 or higher!">(VersionNT>=603 AND WINDOWSRELEASEID>=1709)</Condition>
     </Product>
 </Wix>

doc/conf.py

@@ -41,16 +41,16 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Nextcloud Client Manual'
-copyright = u'2013-2020, The Nextcloud developers'
+copyright = u'2013-2021, The Nextcloud developers'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '3.0'
+version = '3.2'
 # The full version, including alpha/beta/rc tags.
-release = '3.0'
+release = '3.2.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/installing.rst

@@ -6,6 +6,10 @@ You can download the latest version of the Nextcloud Desktop Synchronization
 Client from the `Nextcloud download page`_.
 There are clients for Linux, macOs, and Microsoft Windows.
 
+The currently supported server releases are the latest three stable versions
+at time of publication. It means that the |version| release series is supporting
+server major version 19, 20 and 21.
+
 Installation on Mac OS X and Windows is the same as for any software
 application: download the program and then double-click it to launch the
 installation, and then follow the installation wizard. After it is installed and
@@ -27,7 +31,7 @@ download page.
 System Requirements
 ----------------------------------
 
-- Windows 8.1+
+- Windows 10+
 - macOS 10.12+ (**64-bit only**)
 - macOS 10.10 & 10.11 (**64-bit and up to client legacy version 2.6.5 only**)
 - CentOS 6 & 7 (64-bit only)
@@ -169,36 +173,49 @@ Installation Wizard
 -------------------
 
 The installation wizard takes you step-by-step through configuration options and
-account setup. First you need to enter the URL of your Nextcloud server.
+account setup. First, you need to enter the URL of your Nextcloud server.
 
-.. image:: images/client-1.png
+.. image:: images/wizard_welcome.png
+   :alt: form for choosing between login and registering
+
+If you already have an account on a Nextcloud instance, you want to
+press the button ``Login to your Nextcloud``. If you don't have a
+Nextcloud instance and an account there, you might want to register an
+account with a provider. Press ``Create account with Provider`` in
+that case. Please keep in mind that the desktop client might have
+built without provider support. In that case, you won't see this
+page. Instead, you will be prompted with the next page.
+
+.. image:: images/wizard_setup.png
    :alt: form for entering Nextcloud server URL
 
-Enter your Nextcloud login on the next screen.
+Enter the URL for your Nextcloud instance. The URL is the same URL that
+you type into your browser when you try to access your Nextcloud
+instance.
 
-.. image:: images/client-2.png
+.. image:: images/wizard_flow2.png
-   :alt: form for entering your Nextcloud login
+   :alt: form waiting for authorization
 
-On the Local Folder Option screen you may sync
+Now your web browser should open and prompt you to login into your
-all of your files on the Nextcloud server, or select individual folders. The
+Nextcloud instance. Enter your username and password in your web
-default local sync folder is ``Nextcloud``, in your home directory. You may
+browser and grant access. After you did that, go back to the
-change this as well.
+wizard. Please keep in mind that you might not need to enter your
+username and password if you are already logged in to your browser.
 
-.. image:: images/client-3.png
+.. image:: images/wizard_advanced.png
    :alt: Select which remote folders to sync, and which local folder to store
     them in.
 
-When you have completed selecting your sync folders, click the Connect button
+On the local folder options screen, you may sync all of your files on
-at the bottom right. The client will attempt to connect to your Nextcloud
+the Nextcloud server, or select individual folders. The default local
-server, and when it is successful you'll see two buttons: one to connect to
+sync folder is ``Nextcloud``, in your home directory. You may change
-your Nextcloud Web GUI, and one to open your local folder. It will also start
+this as well.
-synchronizing your files.
 
-.. image:: images/client-4.png
+When you have completed selecting your sync folders, click the Connect
-   :alt: A successful server connection, showing a button to connect to your
+button at the bottom right. The client will attempt to connect to your
-    Web GUI, and one to open your local Nextcloud folder
+Nextcloud server, and when it is successful, the wizard closes
-
+itself. You can now observe the sync activity if you open the main
-Click the Finish button, and you're all done.
+dialogue by clicking on the tray icon.
 
 .. Links
 

doc/introduction.rst

@@ -18,10 +18,8 @@ Improvements and New Features
 The |version| release of the Nextcloud desktop sync client has many new features and
 improvements.
 
-  * Show server notifications on the client
+  * Virtual Files on Windows
-  * Improved sync speed
+  * Support for the user status from the server
-  * Improved handling of Win32 file locks and network files
+  * Many improvements to the sync engine
-  * Improved user notifications about ignored files and conflicts
+  * Make the end-to-end encryption work more reliable
-  * Add warnings for old server versions
+  * Improve sync performance
-  * Update of QtKeyChain to support Windows credential store
-  * Packaging of dolphin overlay icon module for bleeding edge distributions

src/common/filesystembase.cpp

@@ -480,6 +480,14 @@ bool FileSystem::isLnkFile(const QString &filename)
     return filename.endsWith(QLatin1String(".lnk"));
 }
 
+bool FileSystem::isExcludeFile(const QString &filename)
+{
+    return filename.compare(QStringLiteral(".sync-exclude.lst"), Qt::CaseInsensitive) == 0
+        || filename.compare(QStringLiteral("exclude.lst"), Qt::CaseInsensitive) == 0
+        || filename.endsWith(QStringLiteral("/.sync-exclude.lst"), Qt::CaseInsensitive)
+        || filename.endsWith(QStringLiteral("/exclude.lst"), Qt::CaseInsensitive);
+}
+
 bool FileSystem::isJunction(const QString &filename)
 {
 #ifdef Q_OS_WIN

src/common/filesystembase.h

@@ -153,6 +153,11 @@ namespace FileSystem {
      */
     bool OCSYNC_EXPORT isLnkFile(const QString &filename);
 
+    /**
+     * Returns whether the file is an exclude file (contains patterns to exclude from sync)
+     */
+    bool OCSYNC_EXPORT isExcludeFile(const QString &filename);
+
     /**
      * Returns whether the file is a junction (windows only)
      */

src/common/utility.cpp

@@ -676,6 +676,26 @@ QByteArray Utility::conflictFileBaseNameFromPattern(const QByteArray &conflictNa
     return conflictName.left(tagStart) + conflictName.mid(tagEnd);
 }
 
+bool Utility::isPathWindowsDrivePartitionRoot(const QString &path)
+{
+    Q_UNUSED(path)
+#ifdef Q_OS_WIN
+    // should be 2 or 3 characters length
+    if (!(path.size() >= 2 && path.size() <= 3)) {
+        return false;
+    }
+
+    // must mutch a pattern "[A-Za-z]:"
+    if (!(path.at(1) == QLatin1Char(':') && path.at(0).isLetter())) {
+        return false;
+    }
+
+    // final check - last character should be either slash/backslash, or, it should be missing
+    return path.size() < 3 || path.at(2) == QLatin1Char('/') || path.at(2) == QLatin1Char('\\');
+#endif
+    return false;
+}
+
 QString Utility::sanitizeForFileName(const QString &name)
 {
     const auto invalid = QStringLiteral(R"(/?<>\:*|")");

src/common/utility.h

@@ -235,6 +235,11 @@ namespace Utility {
      */
     OCSYNC_EXPORT QByteArray conflictFileBaseNameFromPattern(const QByteArray &conflictName);
 
+    /**
+     * @brief Check whether the path is a root of a Windows drive partition ([c:/, d:/, e:/, etc.)
+     */
+    OCSYNC_EXPORT bool isPathWindowsDrivePartitionRoot(const QString &path);
+
 #ifdef Q_OS_WIN
     OCSYNC_EXPORT bool registryKeyExists(HKEY hRootKey, const QString &subKey);
     OCSYNC_EXPORT QVariant registryGetKeyValue(HKEY hRootKey, const QString &subKey, const QString &valueName);

src/common/vfs.h

@@ -44,6 +44,12 @@ struct OCSYNC_EXPORT VfsSetupParams
      */
     QString filesystemPath;
 
+    // Folder display name in Windows Explorer
+    QString displayName;
+
+    // Folder alias
+    QString alias;
+
     /** The path to the synced folder on the account
      *
      * Always ends with /.

src/csync/vio/csync_vio_local_win.cpp

@@ -52,7 +52,7 @@ struct csync_vio_handle_t {
   QString path; // Always ends with '\'
 };
 
-static int _csync_vio_local_stat_mb(const mbchar_t *uri, csync_file_stat_t *buf);
+static int _csync_vio_local_stat_mb(const QString &path, csync_file_stat_t *buf);
 
 csync_vio_handle_t *csync_vio_local_opendir(const QString &name) {
 
@@ -163,7 +163,8 @@ std::unique_ptr<csync_file_stat_t> csync_vio_local_readdir(csync_vio_handle_t *h
     } else if (handle->ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
         file_stat->type = ItemTypeDirectory;
     } else {
-        file_stat->type = ItemTypeFile;
+        // exclude ".lnk" files as they are not essential, but, causing troubles when enabling the VFS due to QFileInfo::isDir() and other methods are freezing, which causes the ".lnk" files to start hydrating and freezing the app eventually.
+        file_stat->type = !OCC::FileSystem::isLnkFile(path) ? ItemTypeFile : ItemTypeSoftLink;
     }
 
     /* Check for the hidden flag */
@@ -174,12 +175,12 @@ std::unique_ptr<csync_file_stat_t> csync_vio_local_readdir(csync_vio_handle_t *h
     file_stat->size = (handle->ffd.nFileSizeHigh * ((int64_t)(MAXDWORD)+1)) + handle->ffd.nFileSizeLow;
     file_stat->modtime = FileTimeToUnixTime(&handle->ffd.ftLastWriteTime, &rem);
 
-    std::wstring fullPath;
+    QString fullPath;
     fullPath.reserve(handle->path.size() + std::wcslen(handle->ffd.cFileName));
-    fullPath += handle->path.toStdWString(); // path always ends with '\', by construction
+    fullPath += handle->path; // path always ends with '\', by construction
-    fullPath += handle->ffd.cFileName;
+    fullPath += QString::fromWCharArray(handle->ffd.cFileName);
 
-    if (_csync_vio_local_stat_mb(fullPath.data(), file_stat.get()) < 0) {
+    if (_csync_vio_local_stat_mb(fullPath, file_stat.get()) < 0) {
         // Will get excluded by _csync_detect_update.
         file_stat->type = ItemTypeSkip;
     }
@@ -190,12 +191,11 @@ std::unique_ptr<csync_file_stat_t> csync_vio_local_readdir(csync_vio_handle_t *h
 
 int csync_vio_local_stat(const QString &uri, csync_file_stat_t *buf)
 {
-    const std::wstring wuri = uri.toStdWString();
+    int rc = _csync_vio_local_stat_mb(uri, buf);
-    int rc = _csync_vio_local_stat_mb(wuri.data(), buf);
     return rc;
 }
 
-static int _csync_vio_local_stat_mb(const mbchar_t *wuri, csync_file_stat_t *buf)
+static int _csync_vio_local_stat_mb(const QString &path, csync_file_stat_t *buf)
 {
     /* Almost nothing to do since csync_vio_local_readdir already filled up most of the information
        But we still need to fetch the file ID.
@@ -206,18 +206,20 @@ static int _csync_vio_local_stat_mb(const mbchar_t *wuri, csync_file_stat_t *buf
     BY_HANDLE_FILE_INFORMATION fileInfo;
     ULARGE_INTEGER FileIndex;
 
-    h = CreateFileW( wuri, 0, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE,
+    const auto longPath = OCC::FileSystem::longWinPath(path);
+
+    h = CreateFileW(longPath.toStdWString().data(), 0, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE,
                      nullptr, OPEN_EXISTING,
                      FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT,
                      nullptr );
     if( h == INVALID_HANDLE_VALUE ) {
-        qCCritical(lcCSyncVIOLocal, "CreateFileW failed on %ls", wuri);
+        qCCritical(lcCSyncVIOLocal) << "CreateFileW failed on" << longPath;
         errno = GetLastError();
         return -1;
     }
 
     if(!GetFileInformationByHandle( h, &fileInfo ) ) {
-        qCCritical(lcCSyncVIOLocal, "GetFileInformationByHandle failed on %ls", wuri);
+        qCCritical(lcCSyncVIOLocal) << "GetFileInformationByHandle failed on" << longPath;
         errno = GetLastError();
         CloseHandle(h);
         return -1;

src/gui/CMakeLists.txt

@@ -9,16 +9,11 @@ IF(BUILD_UPDATER)
     add_subdirectory(updater)
 endif()
 
-set(MIRALL_RC_SRC ../../resources.qrc)
+configure_file(${CMAKE_SOURCE_DIR}/theme.qrc.in ${CMAKE_SOURCE_DIR}/theme.qrc)
-if (EXISTS "${OEM_THEME_DIR}/theme.qrc")
-    list(APPEND MIRALL_RC_SRC ${OEM_THEME_DIR}/theme.qrc)
-    set(theme_dir ${OEM_THEME_DIR}/theme)
-else()
-    list(APPEND MIRALL_RC_SRC ../../theme.qrc)
-    set(theme_dir ${CMAKE_SOURCE_DIR}/theme)
-endif()
 
-#set (QML_IMPORT_PATH "${CMAKE_SOURCE_DIR}/src/gui/tray" CACHE STRING "Extra qml module import paths" FORCE)
+set(MIRALL_RC_SRC ../../resources.qrc)
+list(APPEND MIRALL_RC_SRC ${CMAKE_SOURCE_DIR}/theme.qrc)
+set(theme_dir ${CMAKE_SOURCE_DIR}/theme)
 
 set(client_UI_SRCS
     accountsettings.ui
@@ -98,6 +93,7 @@ set(client_SRCS
     systray.cpp
     thumbnailjob.cpp
     userinfo.cpp
+    userstatus.cpp
     accountstate.cpp
     addcertificatedialog.cpp
     authenticationdialog.cpp
@@ -222,8 +218,6 @@ set( final_src
     ${MIRALL_RC_SRC}
     ${client_SRCS}
     ${client_UI_SRCS}
-    ${client_version}
-    ${client_manifest}
     ${guiMoc}
     ${client_I18N}
     ${3rdparty_SRC}
@@ -247,12 +241,81 @@ if (NOT DEFINED APPLICATION_ICON_NAME)
     set(APPLICATION_ICON_NAME ${APPLICATION_SHORTNAME})
 endif()
 
+# Generate png icons from svg
+find_program(INKSCAPE
+  NAMES inkscape inkscape.exe
+  REQUIRED
+  HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV INKSCAPE_DIR)
+# REQUIRED keyword is only supported on CMake 3.18 and above
+if (NOT INKSCAPE)
+  message(FATAL_ERROR "Could not find inkscape. Set INKSCAPE_DIR to the path of executable.")
+endif()
+
+function(generate_sized_png_from_svg icon_path size)
+  get_filename_component(icon_name_dir ${icon_path} DIRECTORY)
+  get_filename_component(icon_name_wle ${icon_path} NAME_WLE)
+
+  if (EXISTS "${icon_name_dir}/${size}-${icon_name_wle}.png")
+    return()
+  endif()
+
+  set(icon_output_name "${size}-${icon_name_wle}.png")
+  message(STATUS "Generate ${icon_output_name}")
+  execute_process(COMMAND
+    "${INKSCAPE}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}"
+    WORKING_DIRECTORY "${icon_name_dir}"
+    RESULT_VARIABLE
+    INKSCAPE_SIDEBAR_ERROR
+    OUTPUT_QUIET
+    ERROR_QUIET)
+
+  if (INKSCAPE_SIDEBAR_ERROR)
+    message(FATAL_ERROR
+      "inkscape could not generate icon: ${INKSCAPE_SIDEBAR_ERROR}")
+  else()
+  endif()
+endfunction()
+
+if ((APPLICATION_ICON_SET MATCHES "PNG")
+    AND
+    (NOT EXISTS "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg"))
+  # We may have no svg application icon in when customers use PNG
+  # icons in brander, but theme.qrc expects a svg icon.
+  file(TOUCH "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg")
+endif()
+
+if(APPLE)
+  set(MACOS_SIDEBAR_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-sidebar.svg")
+  generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 16)
+  generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 32)
+  generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 64)
+  generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 128)
+  generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 256)
+endif()
+
+if(WIN32)
+  set(STARTMENU_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-w10startmenu.svg")
+  generate_sized_png_from_svg(${STARTMENU_ICON_SVG} 70)
+  generate_sized_png_from_svg(${STARTMENU_ICON_SVG} 150)
+endif()
+
+set(APP_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg")
+generate_sized_png_from_svg(${APP_ICON_SVG} 16)
+generate_sized_png_from_svg(${APP_ICON_SVG} 24)
+generate_sized_png_from_svg(${APP_ICON_SVG} 32)
+generate_sized_png_from_svg(${APP_ICON_SVG} 48)
+generate_sized_png_from_svg(${APP_ICON_SVG} 64)
+generate_sized_png_from_svg(${APP_ICON_SVG} 128)
+generate_sized_png_from_svg(${APP_ICON_SVG} 256)
+generate_sized_png_from_svg(${APP_ICON_SVG} 512)
+generate_sized_png_from_svg(${APP_ICON_SVG} 1024)
+
 file(GLOB_RECURSE OWNCLOUD_ICONS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-icon*")
 if(APPLE)
     file(GLOB_RECURSE OWNCLOUD_SIDEBAR_ICONS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-sidebar*")
     MESSAGE(STATUS "OWNCLOUD_SIDEBAR_ICONS: ${APPLICATION_ICON_NAME}: ${OWNCLOUD_SIDEBAR_ICONS}")
 endif()
-ecm_add_app_icon(final_src ICONS "${OWNCLOUD_ICONS}" SIDEBAR_ICONS "${OWNCLOUD_SIDEBAR_ICONS}" OUTFILE_BASENAME "${APPLICATION_ICON_NAME}")
+ecm_add_app_icon(APP_ICON ICONS "${OWNCLOUD_ICONS}" SIDEBAR_ICONS "${OWNCLOUD_SIDEBAR_ICONS}" OUTFILE_BASENAME "${APPLICATION_ICON_NAME}")
 
 if(UNIX AND NOT APPLE)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE")
@@ -314,13 +377,13 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
     endif()
 
     # we may not add MACOSX_BUNDLE here, if not building one
-    add_executable(${APPLICATION_EXECUTABLE} WIN32 main.cpp)
+    add_executable(${APPLICATION_EXECUTABLE} WIN32 main.cpp ${client_version} ${client_manifest} ${APP_ICON})
 else()
     # set(CMAKE_INSTALL_PREFIX ".") # Examples use /Applications. hurmpf.
     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)
+    add_executable(${APPLICATION_EXECUTABLE} WIN32 MACOSX_BUNDLE main.cpp ${APP_ICON})
 
     set (QM_DIR ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/Translations)
     install(FILES ${client_I18N} DESTINATION ${QM_DIR})
@@ -429,11 +492,13 @@ if(BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY)
 
     add_custom_command(TARGET ${APPLICATION_EXECUTABLE} POST_BUILD
         COMMAND "${MACDEPLOYQT_EXECUTABLE}"
-            "$<TARGET_FILE_DIR:${APPLICATION_EXECUTABLE}>/../.."
+        "$<TARGET_FILE_DIR:${APPLICATION_EXECUTABLE}>/../.."
-            -qmldir=${CMAKE_SOURCE_DIR}/src/gui
+        -qmldir=${CMAKE_SOURCE_DIR}/src/gui
-            -always-overwrite
+        -always-overwrite
-            -executable="$<TARGET_FILE_DIR:${APPLICATION_EXECUTABLE}>/${cmd_NAME}"
+        -executable="$<TARGET_FILE_DIR:${APPLICATION_EXECUTABLE}>/${cmd_NAME}"
-            ${NO_STRIP}
+        ${NO_STRIP}
+        COMMAND "${CMAKE_COMMAND}"
+        -E rm -rf "${BIN_OUTPUT_DIRECTORY}/${OWNCLOUD_OSX_BUNDLE}/Contents/PlugIns/bearer"
         COMMENT "Running macdeployqt..."
     )
 endif()

src/gui/accountmanager.cpp

@@ -380,6 +380,7 @@ void AccountManager::deleteAccount(AccountState *account)
     // Forget E2E keys
     account->account()->e2e()->forgetSensitiveData(account->account());
 
+    emit accountSyncConnectionRemoved(account);
     emit accountRemoved(account);
 }
 

src/gui/accountmanager.h

@@ -114,6 +114,7 @@ public slots:
 Q_SIGNALS:
     void accountAdded(AccountState *account);
     void accountRemoved(AccountState *account);
+    void accountSyncConnectionRemoved(AccountState *account);
     void removeAccountFolders(AccountState *account);
 };
 }

src/gui/accountsettings.cpp

@@ -385,8 +385,7 @@ void AccountSettings::slotEditCurrentLocalIgnoredFiles()
 
 void AccountSettings::openIgnoredFilesDialog(const QString & absFolderPath)
 {
-    Q_ASSERT(absFolderPath.startsWith('/'));
+    Q_ASSERT(QFileInfo(absFolderPath).isAbsolute());
-    Q_ASSERT(absFolderPath.endsWith('/'));
 
     const QString ignoreFile = absFolderPath + ".sync-exclude.lst";
     auto layout = new QVBoxLayout();
@@ -572,6 +571,9 @@ void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos)
         const auto mode = bestAvailableVfsMode();
         if (mode == Vfs::WindowsCfApi || ConfigFile().showExperimentalOptions()) {
             ac = menu->addAction(tr("Enable virtual file support %1 …").arg(mode == Vfs::WindowsCfApi ? QString() : tr("(experimental)")));
+            // TODO: remove when UX decision is made
+            ac->setEnabled(!Utility::isPathWindowsDrivePartitionRoot(folder->path()));
+            //
             connect(ac, &QAction::triggered, this, &AccountSettings::slotEnableVfsCurrentFolder);
         }
     }

src/gui/accountstate.cpp

@@ -44,6 +44,8 @@ AccountState::AccountState(AccountPtr account)
     , _waitingForNewCredentials(false)
     , _maintenanceToConnectedDelay(60000 + (qrand() % (4 * 60000))) // 1-5min delay
     , _remoteWipe(new RemoteWipe(_account))
+    , _userStatus(new UserStatus(this))
+    , _isDesktopNotificationsAllowed(true)
 {
     qRegisterMetaType<AccountState *>("AccountState*");
 
@@ -125,6 +127,21 @@ void AccountState::setState(State state)
     emit stateChanged(_state);
 }
 
+UserStatus::Status AccountState::status() const
+{
+    return _userStatus->status();
+}
+
+QString AccountState::statusMessage() const
+{
+    return _userStatus->message();
+}
+
+QUrl AccountState::statusIcon() const
+{
+    return _userStatus->icon();
+}
+
 QString AccountState::stateString(State state)
 {
     switch (state) {
@@ -205,6 +222,16 @@ void AccountState::setNavigationAppsEtagResponseHeader(const QByteArray &value)
     _navigationAppsEtagResponseHeader = value;
 }
 
+bool AccountState::isDesktopNotificationsAllowed() const
+{
+    return _isDesktopNotificationsAllowed;
+}
+
+void AccountState::setDesktopNotificationsAllowed(bool isAllowed)
+{
+    _isDesktopNotificationsAllowed = isAllowed;
+}
+
 void AccountState::checkConnectivity()
 {
     if (isSignedOut() || _waitingForNewCredentials) {
@@ -422,6 +449,12 @@ void AccountState::fetchNavigationApps(){
     job->getNavigationApps();
 }
 
+void AccountState::fetchUserStatus() 
+{
+    connect(_userStatus, &UserStatus::fetchUserStatusFinished, this, &AccountState::statusChanged);
+    _userStatus->fetchUserStatus(_account);
+}
+
 void AccountState::slotEtagResponseHeaderReceived(const QByteArray &value, int statusCode){
     if(statusCode == 200){
         qCDebug(lcAccountState) << "New navigation apps ETag Response Header received " << value;

src/gui/accountstate.h

@@ -21,6 +21,7 @@
 #include <QPointer>
 #include "connectionvalidator.h"
 #include "creds/abstractcredentials.h"
+#include "userstatus.h"
 #include <memory>
 
 class QSettings;
@@ -161,6 +162,32 @@ public:
     ///Asks for user credentials
     void handleInvalidCredentials();
 
+    /** Returns the user status (Online, Dnd, Away, Offline, Invisible)
+     *  https://gist.github.com/georgehrke/55a0412007f13be1551d1f9436a39675
+    */
+    UserStatus::Status status() const;
+
+    /** Returns the user status Message (emoji + text)
+    */
+    QString statusMessage() const;
+
+    /** Returns the user status icon url
+    */
+    QUrl statusIcon() const;
+
+    /** Returns the notifications status retrieved by the notificatons endpoint
+     *  https://github.com/nextcloud/desktop/issues/2318#issuecomment-680698429
+    */
+    bool isDesktopNotificationsAllowed() const;
+
+    /** Set desktop notifications status retrieved by the notificatons endpoint
+    */
+    void setDesktopNotificationsAllowed(bool isAllowed);
+
+    /** Fetch the user status (status, icon, message)
+    */
+    void fetchUserStatus();
+
 public slots:
     /// Triggers a ping to the server to update state and
     /// connection status and errors.
@@ -174,6 +201,7 @@ signals:
     void stateChanged(State state);
     void isConnectedChanged();
     void hasFetchedNavigationApps();
+    void statusChanged();
 
 protected Q_SLOTS:
     void slotConnectionValidatorResult(ConnectionValidator::Status status, const QStringList &errors);
@@ -223,6 +251,8 @@ private:
      */
     AccountAppList _apps;
 
+    UserStatus *_userStatus;
+    bool _isDesktopNotificationsAllowed;
 };
 
 class AccountApp : public QObject

src/gui/creds/webflowcredentials.cpp

@@ -156,8 +156,8 @@ void WebFlowCredentials::askFromUser() {
             _askDialog->setUrl(url);
         }
 
-        QString msg = tr("You have been logged out of %1 as user %2. Please login again")
+        QString msg = tr("You have been logged out of %1 as user %2. Please login again.")
-                .arg(_account->displayName(), _user);
+                          .arg(_account->displayName(), _user);
         _askDialog->setInfo(msg);
 
         _askDialog->show();

src/gui/creds/webflowcredentialsdialog.cpp

@@ -27,19 +27,12 @@ WebFlowCredentialsDialog::WebFlowCredentialsDialog(Account *account, bool useFlo
     _layout->setSpacing(0);
     _layout->setMargin(0);
 
-    if(_useFlow2) {
-        _headerBanner = new HeaderBanner(this);
-        _layout->addWidget(_headerBanner);
-        Theme *theme = Theme::instance();
-        _headerBanner->setup(tr("Log in"), theme->wizardHeaderLogo(), theme->wizardHeaderBanner(),
-                             Qt::AutoText, QString::fromLatin1("color:#fff;"));
-    }
-
     _containerLayout = new QVBoxLayout(this);
     _containerLayout->setSpacing(spacing);
     _containerLayout->setMargin(margin);
 
     _infoLabel = new QLabel();
+    _infoLabel->setAlignment(Qt::AlignCenter);
     _containerLayout->addWidget(_infoLabel);
 
     if (_useFlow2) {

src/gui/folder.cpp

@@ -300,6 +300,14 @@ void Folder::setSyncPaused(bool paused)
     emit canSyncChanged();
 }
 
+void Folder::onAssociatedAccountRemoved()
+{
+    if (_vfs) {
+        _vfs->stop();
+        _vfs->unregisterFolder();
+    }
+}
+
 void Folder::setSyncState(SyncResult::Status state)
 {
     _syncResult.setStatus(state);
@@ -486,6 +494,8 @@ void Folder::startVfs()
 
     VfsSetupParams vfsParams;
     vfsParams.filesystemPath = path();
+    vfsParams.displayName = shortGuiRemotePathOrAppName();
+    vfsParams.alias = alias();
     vfsParams.remotePath = remotePathTrailingSlash();
     vfsParams.account = _accountState->account();
     vfsParams.journal = &_journal;

src/gui/folder.h

@@ -206,6 +206,8 @@ public:
       */
     virtual void wipeForRemoval();
 
+    void onAssociatedAccountRemoved();
+
     void setSyncState(SyncResult::Status state);
 
     void setDirtyNetworkLimits();

src/gui/foldercreationdialog.cpp

@@ -19,9 +19,12 @@
 
 #include <QDir>
 #include <QMessageBox>
+#include <QLoggingCategory>
 
 namespace OCC {
 
+Q_LOGGING_CATEGORY(lcFolderCreationDialog, "nextcloud.gui.foldercreationdialog", QtInfoMsg)
+
 FolderCreationDialog::FolderCreationDialog(const QString &destination, QWidget *parent)
     : QDialog(parent)
     , ui(new Ui::FolderCreationDialog)
@@ -37,7 +40,7 @@ FolderCreationDialog::FolderCreationDialog(const QString &destination, QWidget *
 
     const QString suggestedFolderNamePrefix = QObject::tr("New folder");
 
-    const auto newFolderFullPath = _destination + "/" + suggestedFolderNamePrefix;
+    const QString newFolderFullPath = _destination + QLatin1Char('/') + suggestedFolderNamePrefix;
     if (!QDir(newFolderFullPath).exists()) {
         ui->newFolderNameEdit->setText(suggestedFolderNamePrefix);
     } else {

src/gui/folderman.cpp

@@ -76,6 +76,9 @@ FolderMan::FolderMan(QObject *parent)
     connect(AccountManager::instance(), &AccountManager::removeAccountFolders,
         this, &FolderMan::slotRemoveFoldersForAccount);
 
+    connect(AccountManager::instance(), &AccountManager::accountSyncConnectionRemoved,
+        this, &FolderMan::slotAccountRemoved);
+
     connect(_lockWatcher.data(), &LockWatcher::fileUnlocked,
         this, &FolderMan::slotWatchedFileUnlocked);
 
@@ -902,6 +905,15 @@ void FolderMan::runEtagJobIfPossible(Folder *folder)
     QMetaObject::invokeMethod(folder, "slotRunEtagJob", Qt::QueuedConnection);
 }
 
+void FolderMan::slotAccountRemoved(AccountState *accountState)
+{
+    for (const auto &folder : qAsConst(_folderMap)) {
+        if (folder->accountState() == accountState) {
+            folder->onAssociatedAccountRemoved();
+        }
+    }
+}
+
 void FolderMan::slotRemoveFoldersForAccount(AccountState *accountState)
 {
     QVarLengthArray<Folder *, 16> foldersToRemove;
@@ -1477,7 +1489,7 @@ QString FolderMan::trayTooltipStatusString(
     case SyncResult::Success:
     case SyncResult::Problem:
         if (hasUnresolvedConflicts) {
-            folderMessage = tr("Sync was successful, unresolved conflicts.");
+            folderMessage = tr("Sync finished with unresolved conflicts.");
         } else {
             folderMessage = tr("Last Sync was successful.");
         }

src/gui/folderman.h

@@ -264,6 +264,8 @@ private slots:
     void slotStartScheduledFolderSync();
     void slotEtagPollTimerTimeout();
 
+    void slotAccountRemoved(AccountState *accountState);
+
     void slotRemoveFoldersForAccount(AccountState *accountState);
 
     // Wraps the Folder::syncStateChange() signal into the

src/gui/folderwizard.cpp

@@ -536,6 +536,21 @@ void FolderWizardSelectiveSync::initializePage()
         initialBlacklist = QStringList("/");
     }
     _selectiveSync->setFolderInfo(targetPath, alias, initialBlacklist);
+
+    if (_virtualFilesCheckBox) {
+        // TODO: remove when UX decision is made
+        if (Utility::isPathWindowsDrivePartitionRoot(wizard()->field(QStringLiteral("sourceFolder")).toString())) {
+            _virtualFilesCheckBox->setChecked(false);
+            _virtualFilesCheckBox->setEnabled(false);
+            _virtualFilesCheckBox->setText(tr("Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter."));
+        } else {
+            _virtualFilesCheckBox->setChecked(bestAvailableVfsMode() == Vfs::WindowsCfApi);
+            _virtualFilesCheckBox->setEnabled(true);
+            _virtualFilesCheckBox->setText(tr("Use virtual files instead of downloading content immediately %1").arg(bestAvailableVfsMode() == Vfs::WindowsCfApi ? QString() : tr("(experimental)")));
+        }
+        //
+    }
+
     QWizardPage::initializePage();
 }
 

src/gui/main.cpp

@@ -64,10 +64,7 @@ int main(int argc, char **argv)
     // OpenSSL 1.1.0: No explicit initialisation or de-initialisation is necessary.
 
     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
-#ifdef Q_OS_WIN
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
-#endif // !Q_OS_WIN
-
 #ifdef Q_OS_MAC
     Mac::CocoaInitializer cocoaInit; // RIIA
 #endif

src/gui/navigationpanehelper.cpp

@@ -86,9 +86,6 @@ void NavigationPaneHelper::updateCloudStorageRegistry()
         // We currently don't distinguish between new and existing CLSIDs, if it's there we just
         // save over it. We at least need to update the tile in case we are suddently using multiple accounts.
         foreach (Folder *folder, _folderMan->map()) {
-            if (folder->vfs().mode() == Vfs::WindowsCfApi) {
-                continue;
-            }
             if (!folder->navigationPaneClsid().isNull()) {
                 // If it already exists, unmark it for removal, this is a valid sync root.
                 entriesToRemove.removeOne(folder->navigationPaneClsid());