Merge pull request #2761 from nextcloud/bump_to_3.1.1

Bump release to 3.1.1
2026-04-03 09:11:33 +02:00 · 2020-12-22 10:54:32 +01:00 · 2020-12-22 10:44:45 +01:00 · 2020-12-22 03:47:02 +00:00 · 2020-12-21 12:15:54 +01:00 · 2020-12-21 11:08:29 +00:00
172 changed files with 61833 additions and 36673 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -122,7 +122,7 @@ steps:
 - name: build
  image: nextcloudci/client-debian-ci:client-debian-ci-2
  commands:
-    - /bin/bash -c "./admin/linux/debian/drone-build.sh"
+    - /bin/bash -c "./admin/linux/debian/drone-build.sh" || echo "[WARNING] Debian build failed but this is a non-blocking CI event"
  environment:
    DEBIAN_SECRET_KEY:
      from_secret: DEBIAN_SECRET_KEY
--- a/.tx/nextcloud.client-desktop/ar_translation
+++ b/.tx/nextcloud.client-desktop/ar_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/bg_translation
+++ b/.tx/nextcloud.client-desktop/bg_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/br_translation
+++ b/.tx/nextcloud.client-desktop/br_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/ca_translation
+++ b/.tx/nextcloud.client-desktop/ca_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/cs_translation
+++ b/.tx/nextcloud.client-desktop/cs_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/cy_GB_translation
+++ b/.tx/nextcloud.client-desktop/cy_GB_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/da_translation
+++ b/.tx/nextcloud.client-desktop/da_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/de_translation
+++ b/.tx/nextcloud.client-desktop/de_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/el_translation
+++ b/.tx/nextcloud.client-desktop/el_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/en_GB_translation
+++ b/.tx/nextcloud.client-desktop/en_GB_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/eo_translation
+++ b/.tx/nextcloud.client-desktop/eo_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/es_AR_translation
+++ b/.tx/nextcloud.client-desktop/es_AR_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/es_CL_translation
+++ b/.tx/nextcloud.client-desktop/es_CL_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/es_CO_translation
+++ b/.tx/nextcloud.client-desktop/es_CO_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/es_CR_translation
+++ b/.tx/nextcloud.client-desktop/es_CR_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/es_DO_translation
+++ b/.tx/nextcloud.client-desktop/es_DO_translation
@@ -8,196 +8,20 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+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
--- a/.tx/nextcloud.client-desktop/es_EC_translation
+++ b/.tx/nextcloud.client-desktop/es_EC_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/es_GT_translation
+++ b/.tx/nextcloud.client-desktop/es_GT_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/es_MX_translation
+++ b/.tx/nextcloud.client-desktop/es_MX_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/es_SV_translation
+++ b/.tx/nextcloud.client-desktop/es_SV_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/es_translation
+++ b/.tx/nextcloud.client-desktop/es_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/et_translation
+++ b/.tx/nextcloud.client-desktop/et_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/eu_translation
+++ b/.tx/nextcloud.client-desktop/eu_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/fa_translation
+++ b/.tx/nextcloud.client-desktop/fa_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/fi_translation
+++ b/.tx/nextcloud.client-desktop/fi_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/fr_translation
+++ b/.tx/nextcloud.client-desktop/fr_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/gl_translation
+++ b/.tx/nextcloud.client-desktop/gl_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/he_translation
+++ b/.tx/nextcloud.client-desktop/he_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/hr_translation
+++ b/.tx/nextcloud.client-desktop/hr_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/hu_translation
+++ b/.tx/nextcloud.client-desktop/hu_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/is_translation
+++ b/.tx/nextcloud.client-desktop/is_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/it_translation
+++ b/.tx/nextcloud.client-desktop/it_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/ja_translation
+++ b/.tx/nextcloud.client-desktop/ja_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/ko_translation
+++ b/.tx/nextcloud.client-desktop/ko_translation
@@ -8,196 +8,20 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
 Icon[ko]=@APPLICATION_ICON_NAME@
+Name[ko]=@APPLICATION_NAME@ 데스크톱 동기화 클라이언트
 Comment[ko]=@APPLICATION_NAME@ 데스크톱 동기화 클라이언트
 GenericName[ko]=폴더 동기화
--- a/.tx/nextcloud.client-desktop/lt_LT_translation
+++ b/.tx/nextcloud.client-desktop/lt_LT_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/lv_translation
+++ b/.tx/nextcloud.client-desktop/lv_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/mk_translation
+++ b/.tx/nextcloud.client-desktop/mk_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/nb_translation
+++ b/.tx/nextcloud.client-desktop/nb_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/nl_translation
+++ b/.tx/nextcloud.client-desktop/nl_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/oc_translation
+++ b/.tx/nextcloud.client-desktop/oc_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/pl_translation
+++ b/.tx/nextcloud.client-desktop/pl_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/pt_BR_translation
+++ b/.tx/nextcloud.client-desktop/pt_BR_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/pt_translation
+++ b/.tx/nextcloud.client-desktop/pt_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/ro_translation
+++ b/.tx/nextcloud.client-desktop/ro_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/ru_translation
+++ b/.tx/nextcloud.client-desktop/ru_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/sk_translation
+++ b/.tx/nextcloud.client-desktop/sk_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/sl_translation
+++ b/.tx/nextcloud.client-desktop/sl_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/sr_translation
+++ b/.tx/nextcloud.client-desktop/sr_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/sv_translation
+++ b/.tx/nextcloud.client-desktop/sv_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/sw_translation
+++ b/.tx/nextcloud.client-desktop/sw_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/tr_translation
+++ b/.tx/nextcloud.client-desktop/tr_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/uk_translation
+++ b/.tx/nextcloud.client-desktop/uk_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/zh_CN_translation
+++ b/.tx/nextcloud.client-desktop/zh_CN_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/.tx/nextcloud.client-desktop/zh_TW_translation
+++ b/.tx/nextcloud.client-desktop/zh_TW_translation
@@ -8,193 +8,16 @@ GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
 X-GNOME-Autostart-Delay=3
-# Translations
-
+MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
+Actions=Quit;

 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@


 # Translations
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,6 +1,6 @@
 set( MIRALL_VERSION_MAJOR 3 )
-set( MIRALL_VERSION_MINOR 0 )
-set( MIRALL_VERSION_PATCH 81 )
+set( MIRALL_VERSION_MINOR 1 )
+set( MIRALL_VERSION_PATCH 1 )
 set( MIRALL_VERSION_YEAR  2020 )
 set( MIRALL_SOVERSION 0 )

--- a/admin/linux/build-appimage.sh
+++ b/admin/linux/build-appimage.sh
@@ -21,11 +21,11 @@ if [ $SUFFIX != "master" ]; then
    SUFFIX="PR-$SUFFIX"
 fi

-#QtKeyChain master
+#QtKeyChain v0.10.0
 cd /build
 git clone https://github.com/frankosterfeld/qtkeychain.git
 cd qtkeychain
-git checkout master
+git checkout v0.10.0
 mkdir build
 cd build
 cmake -D CMAKE_INSTALL_PREFIX=/usr ../
--- a/admin/linux/debian/drone-build.sh
+++ b/admin/linux/debian/drone-build.sh
@@ -76,7 +76,7 @@ for distribution in ${UBUNTU_DISTRIBUTIONS} ${DEBIAN_DISTRIBUTIONS}; do

    git merge ${DRONE_COMMIT}

-    admin/linux/debian/scripts/git2changelog.py /tmp/tmpchangelog ${distribution} ${revdate}
+    admin/linux/debian/scripts/git2changelog.py /tmp/tmpchangelog ${distribution} ${revdate} ${basever}
    cat /tmp/tmpchangelog debian/changelog > debian/changelog.new
    mv debian/changelog.new debian/changelog

--- a/admin/linux/debian/scripts/git2changelog.py
+++ b/admin/linux/debian/scripts/git2changelog.py
@@ -31,7 +31,7 @@ def getCommitVersion(commit):
    try:
        for line in subprocess.check_output(["git", "show",
                                             commit + ":VERSION.cmake"]).splitlines():
-            m = re.match("set\( MIRALL_VERSION_([A-Z]+) +([0-9])+ *\)", line)
+            m = re.match("set\( MIRALL_VERSION_([A-Z]+) +([0-9]+) *\)", line)
            if m is not None:
                kind=m.group(1)
                version=m.group(2)
@@ -48,7 +48,7 @@ def getCommitVersion(commit):
    except:
        return None

-def collectEntries(baseCommit, baseVersion, kind, finalRevDate, config):
+def collectEntries(baseCommit, baseVersion, kind, finalBaseVersion, finalRevDate, config):

    newVersionCommit = None
    newVersionTag = None
@@ -89,7 +89,6 @@ def collectEntries(baseCommit, baseVersion, kind, finalRevDate, config):
                newVersionOrigTag = lastVersionTag
                (baseVersion, _kind) = result

-
        version=getCommitVersion(commit)
        if version and version!=lastCMAKEVersion:
            tag = "v" + version
@@ -119,6 +118,8 @@ def collectEntries(baseCommit, baseVersion, kind, finalRevDate, config):
            revdate = datetime.datetime.now().strftime("%Y%m%d.%H%M%S")+ "." + commit
        else:
            revdate = finalRevDate
+        if finalBaseVersion is not None:
+            baseVersion = finalBaseVersion
        entries[-1] = (commit, name, email, date, revdate, subject, baseVersion, kind)

    entries.reverse()
@@ -167,8 +168,10 @@ if __name__ == "__main__":

    distribution = sys.argv[2]
    finalRevDate = sys.argv[3] if len(sys.argv)>3 else None
+    finalBaseVersion = sys.argv[4] if len(sys.argv)>4 else None

-    entries = collectEntries(baseCommit, baseVersion, "alpha", finalRevDate, config)
+    entries = collectEntries(baseCommit, baseVersion, "alpha",
+                             finalBaseVersion, finalRevDate, config)

    with open(sys.argv[1], "wt") as f:
        (baseVersion, revdate, kind) = genChangeLogEntries(f, entries, distribution)
--- a/cmake/modules/FindSparkle.cmake
+++ b/cmake/modules/FindSparkle.cmake
@@ -2,8 +2,7 @@
 #
 # Once done this will define
 #  SPARKLE_FOUND - system has Sparkle
-#  SPARKLE_INCLUDE_DIR - the Sparkle include directory
-#  SPARKLE_LIBRARY - The library needed to use Sparkle
+#  SPARKLE_LIBRARY - The framework needed to use Sparkle
 # Copyright (c) 2009, Vittorio Giovara <vittorio.giovara@gmail.com>
 #
 # Distributed under the OSI-approved BSD License (the "License");
@@ -15,9 +14,8 @@

 include(FindPackageHandleStandardArgs)

-find_path(SPARKLE_INCLUDE_DIR Sparkle.h)
 find_library(SPARKLE_LIBRARY NAMES Sparkle)

-find_package_handle_standard_args(Sparkle DEFAULT_MSG SPARKLE_INCLUDE_DIR SPARKLE_LIBRARY)
-mark_as_advanced(SPARKLE_INCLUDE_DIR SPARKLE_LIBRARY)
+find_package_handle_standard_args(Sparkle DEFAULT_MSG SPARKLE_LIBRARY)
+mark_as_advanced(SPARKLE_LIBRARY)

--- a/doc/troubleshooting.rst
+++ b/doc/troubleshooting.rst
@@ -153,10 +153,42 @@ Saving Files Directly

 The Nextcloud client enables you to save log files directly to a predefined file
 or directory.  This is a useful option for troubleshooting sporadic issues as
-it enables you to log large amounts of data and bypasses the limited buffer
+it enables you to log large amounts of data and bypass the limited buffer
 settings associated with the log window.

-To save log files to a file or a directory:
+To enable logging to a directory, stop the client and add the following to the General section in the configuration file:
+
+```
+[General]
+logDebug=true
+logExpire=<hours>
+logDir=<dir>
+```
+
+  .. note:: Independent of platform you must use slash (/) as a path reparator:
+
+  * Correct: C:/Temp
+  * Not correct: C:\Temp
+
+As an example, to keep log data for two days in a directory called temp:
+
+```
+[General]
+logDebug=true
+logExpire=48
+logDir=C:/Temp
+```
+
+Once you restart the client, you will find the log file in the ``<dir>`` defined in ``logDir``.
+
+  .. note:: You will find the configuration file in the following locations:
+
+   * Microsoft Windows systems: ``%APPDATA%\Nextcloud\nextcloud.cfg``
+   * macOS systems: ``$HOME/Library/Preferences/Nextcloud/nextcloud.cfg``
+   * Linux distributions: ``$HOME/.config/Nextcloud/nextcloud.cfg``
+
+
+Alternatively, you can start the client in the command line with parameters:

 1. To save to a file, start the client using the ``--logfile <file>`` command,
   where ``<file>`` is the filename to which you want to save the file.
@@ -177,21 +209,6 @@ issue the following command:
 nextcloud --logdir /tmp/nextcloud_logs --logexpire 48
 ```

-Alternatively, you can add the following to the configuration file:
-```
-logDebug=true
-logExpire=<hours>
-logDir=<dir>
-```
-
-Once you restart the client, you will find the log file in the ``<dir>`` defined in ``logDir``.
-
-  .. note:: You will find the configuration file in the following locations:
-
-   * Microsoft Windows systems: ``%APPDATA%\Nextcloud\nextcloud.cfg``
-   * macOS systems: ``$HOME/Library/Preferences/Nextcloud/nextcloud.cfg``
-   * Linux distributions: ``$HOME/.config/Nextcloud/nextcloud.cfg``
-
 Nextcloud server Log File
 ~~~~~~~~~~~~~~~~~~~~~~~~~

--- a/resources.qrc
+++ b/resources.qrc
@@ -5,5 +5,6 @@
        <file>src/gui/tray/HeaderButton.qml</file>
        <file>theme/Style/Style.qml</file>
        <file>theme/Style/qmldir</file>
+        <file>src/gui/tray/ActivityActionButton.qml</file>
    </qresource>
 </RCC>
--- a/src/common/utility.h
+++ b/src/common/utility.h
@@ -30,11 +30,11 @@
 #include <QMap>
 #include <QUrl>
 #include <QUrlQuery>
-#include <QtQuick/QQuickImageProvider>
 #include <functional>
 #include <memory>

 #ifdef Q_OS_WIN
+#include <QRect>
 #include <windows.h>
 #endif

--- a/src/common/utility_unix.cpp
+++ b/src/common/utility_unix.cpp
@@ -18,6 +18,7 @@
 */

 #include <QStandardPaths>
+#include <QtGlobal>

 namespace OCC {

@@ -71,12 +72,18 @@ void setLaunchOnStartup_private(const QString &appName, const QString &guiName,
            qCWarning(lcUtility) << "Could not write auto start entry" << desktopFileLocation;
            return;
        }
+        // When running inside an AppImage, we need to set the path to the
+        // AppImage instead of the path to the executable
+        const QString appImagePath = qEnvironmentVariable("APPIMAGE");
+        const bool runningInsideAppImage = !appImagePath.isNull() && QFile::exists(appImagePath);
+        const QString executablePath = runningInsideAppImage ? appImagePath : QCoreApplication::applicationFilePath();
+
        QTextStream ts(&iniFile);
        ts.setCodec("UTF-8");
        ts << QLatin1String("[Desktop Entry]") << endl
           << QLatin1String("Name=") << guiName << endl
           << QLatin1String("GenericName=") << QLatin1String("File Synchronizer") << endl
-           << QLatin1String("Exec=") << QCoreApplication::applicationFilePath() << " --background" << endl
+           << QLatin1String("Exec=\"") << executablePath << "\" --background" << endl
           << QLatin1String("Terminal=") << "false" << endl
           << QLatin1String("Icon=") << APPLICATION_ICON_NAME << endl
           << QLatin1String("Categories=") << QLatin1String("Network") << endl
--- a/src/csync/csync_exclude.cpp
+++ b/src/csync/csync_exclude.cpp
@@ -317,17 +317,20 @@ bool ExcludedFiles::loadExcludeFile(const QByteArray & basePath, const QString &
    if (!f.open(QIODevice::ReadOnly))
        return false;

+    QList<QByteArray> patterns;
    while (!f.atEnd()) {
        QByteArray line = f.readLine().trimmed();
        if (line.isEmpty() || line.startsWith('#'))
            continue;
        csync_exclude_expand_escapes(line);
-        _allExcludes[basePath].append(line);
+        patterns.append(line);
    }
+    _allExcludes.insert(basePath, patterns);

    // nothing to prepare if the user decided to not exclude anything
-    if(_allExcludes.size())
+    if (!_allExcludes.value(basePath).isEmpty()){
        prepare(basePath);
+    }

    return true;
 }
@@ -411,10 +414,12 @@ CSYNC_EXCLUDE_TYPE ExcludedFiles::traversalPatternMatch(const char *path, ItemTy

    // Directories are guaranteed to be visited before their files
    if (filetype == ItemTypeDirectory) {
-        QFileInfo fi = QFileInfo(_localPath + path + "/.sync-exclude.lst");
+        const auto basePath = QString(_localPath + path + QLatin1Char('/')).toUtf8();
+        const auto fi = QFileInfo(basePath + QStringLiteral(".sync-exclude.lst"));
+
        if (fi.isReadable()) {
            addInTreeExcludeFilePath(fi.absoluteFilePath());
-            loadExcludeFile(fi.absolutePath().toUtf8(), fi.absoluteFilePath());
+            loadExcludeFile(basePath, fi.absoluteFilePath());
        }
    }

--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -4,6 +4,10 @@ set(CMAKE_AUTOMOC TRUE)
 set(CMAKE_AUTOUIC TRUE)
 set(CMAKE_AUTORCC TRUE)

+if(CMAKE_BUILD_TYPE MATCHES Debug)
+    add_definitions(-DQT_QML_DEBUG)
+endif()
+
 IF(BUILD_UPDATER)
    add_subdirectory(updater)
 endif()
@@ -39,6 +43,7 @@ set(client_UI_SRCS
    addcertificatedialog.ui
    proxyauthdialog.ui
    mnemonicdialog.ui
+    tray/ActivityActionButton.qml
    tray/Window.qml
    tray/UserLine.qml
    wizard/flow2authwidget.ui
@@ -157,9 +162,16 @@ IF( APPLE )
    list(APPEND client_SRCS systray.mm)

    if(SPARKLE_FOUND AND BUILD_UPDATER)
-       # Define this, we need to check in updater.cpp
-       add_definitions( -DHAVE_SPARKLE )
-       list(APPEND updater_SRCS updater/sparkleupdater_mac.mm)
+        # Define this, we need to check in updater.cpp
+        add_definitions(-DHAVE_SPARKLE)
+        list(APPEND updater_SRCS updater/sparkleupdater_mac.mm updater/sparkleupdater.h)
+        list(APPEND updater_DEPS ${SPARKLE_LIBRARY})
+
+        # Sparkle.framework is installed from here because macdeployqt's CopyFramework breaks on this bundle
+        # as its logic is tightly tailored around Qt5 frameworks
+        install(DIRECTORY "${SPARKLE_LIBRARY}"
+                DESTINATION "${OWNCLOUD_OSX_BUNDLE}/Contents/Frameworks" USE_SOURCE_PERMISSIONS)
+
   endif()
 ENDIF()

@@ -305,7 +317,7 @@ endif()

 IF(BUILD_UPDATER)
    add_library(updater STATIC ${updater_SRCS})
-    target_link_libraries(updater ${synclib_NAME} Qt5::Widgets Qt5::Svg Qt5::Network Qt5::Xml)
+    target_link_libraries(updater ${synclib_NAME} ${updater_DEPS} Qt5::Widgets Qt5::Svg Qt5::Network Qt5::Xml)
    target_include_directories(updater PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 endif()

--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -208,9 +208,6 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent)
        _ui->encryptionMessage->hide();
    }

-    connect(UserModel::instance(), &UserModel::addAccount,
-         this, &AccountSettings::slotOpenAccountWizard);
-
    customizeStyle();
 }

@@ -246,17 +243,6 @@ QString AccountSettings::selectedFolderAlias() const
    return _model->data(selected, FolderStatusDelegate::FolderAliasRole).toString();
 }

-void AccountSettings::slotOpenAccountWizard()
-{
-    // We can't call isSystemTrayAvailable with appmenu-qt5 because it breaks the systemtray
-    // (issue #4693, #4944)
-    if (qgetenv("QT_QPA_PLATFORMTHEME") == "appmenu-qt5" || QSystemTrayIcon::isSystemTrayAvailable()) {
-        topLevelWidget()->close();
-    }
-
-    OwncloudSetupWizard::runWizard(qApp, SLOT(slotownCloudWizardDone(int)), nullptr);
-}
-
 void AccountSettings::slotToggleSignInState()
 {
    if (_accountState->isSignedOut()) {
--- a/src/gui/accountsettings.h
+++ b/src/gui/accountsettings.h
@@ -89,7 +89,6 @@ protected slots:
    void slotFolderWizardRejected();
    void slotDeleteAccount();
    void slotToggleSignInState();
-    void slotOpenAccountWizard();
    void refreshSelectiveSyncStatus();
    void slotMarkSubfolderEncrypted(const FolderStatusModel::SubFolderInfo* folderInfo);
    void slotSubfolderContextMenuRequested(const QModelIndex& idx, const QPoint& point);
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -898,43 +898,6 @@ void Folder::slotItemCompleted(const SyncFileItemPtr &item)
        return;
    }

-    // add new directories or remove gone away dirs to the watcher
-    if (_folderWatcher && item->isDirectory()) {
-    switch (item->_instruction) {
-        case CSYNC_INSTRUCTION_NEW:
-                _folderWatcher->addPath(path() + item->_file);
-        break;
-        case CSYNC_INSTRUCTION_REMOVE:
-                _folderWatcher->removePath(path() + item->_file);
-        break;
-        case CSYNC_INSTRUCTION_RENAME:
-                _folderWatcher->removePath(path() + item->_file);
-                _folderWatcher->addPath(path() + item->destination());
-        break;
-        default:
-        break;
-    }
-    }
-
-    // Success and failure of sync items adjust what the next sync is
-    // supposed to do.
-    //
-    // For successes, we want to wipe the file from the list to ensure we don't
-    // rediscover it even if this overall sync fails.
-    //
-    // For failures, we want to add the file to the list so the next sync
-    // will be able to retry it.
-    if (item->_status == SyncFileItem::Success
-        || item->_status == SyncFileItem::FileIgnored
-        || item->_status == SyncFileItem::Restoration
-        || item->_status == SyncFileItem::Conflict) {
-        if (_previousLocalDiscoveryPaths.erase(item->_file.toUtf8()))
-            qCDebug(lcFolder) << "local discovery: wiped" << item->_file;
-    } else {
-        _localDiscoveryPaths.insert(item->_file.toUtf8());
-        qCDebug(lcFolder) << "local discovery: inserted" << item->_file << "due to sync failure";
-    }
-
    _syncResult.processCompletedItem(item);

    _fileLog->logItem(*item);
@@ -1077,6 +1040,7 @@ void Folder::registerFolderWatcher()
    connect(_folderWatcher.data(), &FolderWatcher::becameUnreliable,
        this, &Folder::slotWatcherUnreliable);
    _folderWatcher->init(path());
+    _folderWatcher->startNotificatonTest(path() + QLatin1String(".owncloudsync.log"));
 }

 void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction dir, bool *cancel)
--- a/src/gui/folderwatcher.cpp
+++ b/src/gui/folderwatcher.cpp
@@ -33,6 +33,7 @@
 #endif

 #include "folder.h"
+#include "filesystem.h"

 namespace OCC {

@@ -60,7 +61,7 @@ bool FolderWatcher::pathIsIgnored(const QString &path)
        return false;

 #ifndef OWNCLOUD_TEST
-    if (_folder->isFileExcludedAbsolute(path)) {
+    if (_folder->isFileExcludedAbsolute(path) && !Utility::isConflictFile(path)) {
        qCDebug(lcFolderWatcher) << "* Ignoring file" << path;
        return true;
    }
@@ -86,6 +87,57 @@ void FolderWatcher::appendSubPaths(QDir dir, QStringList& subPaths) {
    }
 }

+void FolderWatcher::startNotificatonTest(const QString &path)
+{
+#ifdef Q_OS_MAC
+    // Testing the folder watcher on OSX is harder because the watcher
+    // automatically discards changes that were performed by our process.
+    // It would still be useful to test but the OSX implementation
+    // is deferred until later.
+    return;
+#endif
+
+    Q_ASSERT(_testNotificationPath.isEmpty());
+    _testNotificationPath = path;
+
+    // Don't do the local file modification immediately:
+    // wait for FolderWatchPrivate::_ready
+    startNotificationTestWhenReady();
+}
+
+void FolderWatcher::startNotificationTestWhenReady()
+{
+    if (!_d->_ready) {
+        QTimer::singleShot(1000, this, &FolderWatcher::startNotificationTestWhenReady);
+        return;
+    }
+
+    auto path = _testNotificationPath;
+    if (QFile::exists(path)) {
+        auto mtime = FileSystem::getModTime(path);
+        FileSystem::setModTime(path, mtime + 1);
+    } else {
+        QFile f(path);
+        f.open(QIODevice::WriteOnly | QIODevice::Append);
+    }
+
+    QTimer::singleShot(5000, this, [this]() {
+        if (!_testNotificationPath.isEmpty())
+            emit becameUnreliable(tr("The watcher did not receive a test notification."));
+        _testNotificationPath.clear();
+    });
+}
+
+
+int FolderWatcher::testLinuxWatchCount() const
+{
+#ifdef Q_OS_LINUX
+    return _d->testWatchCount();
+#else
+    return -1;
+#endif
+}
+
 void FolderWatcher::changeDetected(const QString &path)
 {
    QFileInfo fileInfo(path);
@@ -118,6 +170,10 @@ void FolderWatcher::changeDetected(const QStringList &paths)
    // ------- handle ignores:
    for (int i = 0; i < paths.size(); ++i) {
        QString path = paths[i];
+        if (!_testNotificationPath.isEmpty()
+            && Utility::fileNamesEqual(path, _testNotificationPath)) {
+            _testNotificationPath.clear();
+        }
        if (pathIsIgnored(path)) {
            continue;
        }
@@ -134,15 +190,4 @@ void FolderWatcher::changeDetected(const QStringList &paths)
    }
 }

-void FolderWatcher::addPath(const QString &path)
-{
-    _d->addPath(path);
-}
-
-void FolderWatcher::removePath(const QString &path)
-{
-    _d->removePath(path);
-}
-
-
 } // namespace OCC
--- a/src/gui/folderwatcher.h
+++ b/src/gui/folderwatcher.h
@@ -22,7 +22,7 @@
 #include <QObject>
 #include <QString>
 #include <QStringList>
-#include <QTime>
+#include <QElapsedTimer>
 #include <QHash>
 #include <QScopedPointer>
 #include <QSet>
@@ -44,11 +44,6 @@ class Folder;
 * for changes in the local file system. Changes are signalled
 * through the pathChanged() signal.
 *
- * Note that if new folders are created, this folderwatcher class
- * does not automatically add them to the list of monitored
- * dirs. That is the responsibility of the user of this class to
- * call addPath() with the new dir.
- *
 * @ingroup gui
 */

@@ -65,14 +60,6 @@ public:
     */
    void init(const QString &root);

-    /**
-     * Not all backends are recursive by default.
-     * Those need to be notified when a directory is added or removed while the watcher is disabled.
-     * This is a no-op for backends that are recursive
-     */
-    void addPath(const QString &);
-    void removePath(const QString &);
-
    /* Check if the path is ignored. */
    bool pathIsIgnored(const QString &path);

@@ -85,6 +72,17 @@ public:
     */
    bool isReliable() const;

+    /**
+     * Triggers a change in the path and verifies a notification arrives.
+     *
+     * If no notification is seen, the folderwatcher marks itself as unreliable.
+     * The path must be ignored by the watcher.
+     */
+    void startNotificatonTest(const QString &path);
+
+    /// For testing linux behavior only
+    int testLinuxWatchCount() const;
+
 signals:
    /** Emitted when one of the watched directories or one
     *  of the contained files is changed. */
@@ -111,18 +109,24 @@ protected slots:
    void changeDetected(const QString &path);
    void changeDetected(const QStringList &paths);

+private slots:
+    void startNotificationTestWhenReady();
+
 protected:
    QHash<QString, int> _pendingPathes;

 private:
    QScopedPointer<FolderWatcherPrivate> _d;
-    QTime _timer;
+    QElapsedTimer _timer;
    QSet<QString> _lastPaths;
    Folder *_folder;
    bool _isReliable = true;

    void appendSubPaths(QDir dir, QStringList& subPaths);

+    /** Path of the expected test notification */
+    QString _testNotificationPath;
+
    friend class FolderWatcherPrivate;
 };
 }
--- a/src/gui/folderwatcher_linux.cpp
+++ b/src/gui/folderwatcher_linux.cpp
@@ -71,34 +71,37 @@ bool FolderWatcherPrivate::findFoldersBelow(const QDir &dir, QStringList &fullLi

 void FolderWatcherPrivate::inotifyRegisterPath(const QString &path)
 {
-    if (!path.isEmpty()) {
-        int wd = inotify_add_watch(_fd, path.toUtf8().constData(),
-            IN_CLOSE_WRITE | IN_ATTRIB | IN_MOVE | IN_CREATE | IN_DELETE | IN_DELETE_SELF | IN_MOVE_SELF | IN_UNMOUNT | IN_ONLYDIR);
-        if (wd > -1) {
-            _watches.insert(wd, path);
-        } else {
-            // If we're running out of memory or inotify watches, become
-            // unreliable.
-            if (_parent->_isReliable && (errno == ENOMEM || errno == ENOSPC)) {
-                _parent->_isReliable = false;
-                emit _parent->becameUnreliable(
-                    tr("This problem usually happens when the inotify watches are exhausted. "
-                       "Check the FAQ for details."));
-            }
+    if (path.isEmpty())
+        return;
+
+    int wd = inotify_add_watch(_fd, path.toUtf8().constData(),
+        IN_CLOSE_WRITE | IN_ATTRIB | IN_MOVE | IN_CREATE | IN_DELETE | IN_DELETE_SELF | IN_MOVE_SELF | IN_UNMOUNT | IN_ONLYDIR);
+    if (wd > -1) {
+        _watchToPath.insert(wd, path);
+        _pathToWatch.insert(path, wd);
+    } else {
+        // If we're running out of memory or inotify watches, become
+        // unreliable.
+        if (_parent->_isReliable && (errno == ENOMEM || errno == ENOSPC)) {
+            _parent->_isReliable = false;
+            emit _parent->becameUnreliable(
+                tr("This problem usually happens when the inotify watches are exhausted. "
+                   "Check the FAQ for details."));
        }
    }
 }

 void FolderWatcherPrivate::slotAddFolderRecursive(const QString &path)
 {
+    if (_pathToWatch.contains(path))
+        return;
+
    int subdirs = 0;
    qCDebug(lcFolderWatcher) << "(+) Watcher:" << path;

    QDir inPath(path);
    inotifyRegisterPath(inPath.absolutePath());

-    const QStringList watchedFolders = _watches.values();
-
    QStringList allSubfolders;
    if (!findFoldersBelow(QDir(path), allSubfolders)) {
        qCWarning(lcFolderWatcher) << "Could not traverse all sub folders";
@@ -107,7 +110,7 @@ void FolderWatcherPrivate::slotAddFolderRecursive(const QString &path)
    while (subfoldersIt.hasNext()) {
        QString subfolder = subfoldersIt.next();
        QDir folder(subfolder);
-        if (folder.exists() && !watchedFolders.contains(folder.absolutePath())) {
+        if (folder.exists() && !_pathToWatch.contains(folder.absolutePath())) {
            subdirs++;
            if (_parent->pathIsIgnored(subfolder)) {
                qCDebug(lcFolderWatcher) << "* Not adding" << folder.path();
@@ -152,57 +155,65 @@ void FolderWatcherPrivate::slotReceivedNotification(int fd)
        error = errno;
    }

-    // reset counter
-    i = 0;
-    // while there are enough events in the buffer
-    while (i + sizeof(struct inotify_event) < static_cast<unsigned int>(len)) {
+    // iterate events in buffer
+    unsigned int ulen = len;
+    for (i = 0; i + sizeof(inotify_event) < ulen; i += sizeof(inotify_event) + (event ? event->len : 0)) {
        // cast an inotify_event
        event = (struct inotify_event *)&buffer[i];
        if (!event) {
            qCDebug(lcFolderWatcher) << "NULL event";
-            i += sizeof(struct inotify_event);
            continue;
        }

        // Fire event for the path that was changed.
-        if (event->len > 0 && event->wd > -1) {
-            QByteArray fileName(event->name);
-            if (fileName.startsWith("._sync_")
-                || fileName.startsWith(".csync_journal.db")
-                || fileName.startsWith(".owncloudsync.log")
-                || fileName.startsWith(".sync_")) {
-            } else {
-                const QString p = _watches[event->wd] + '/' + fileName;
-                _parent->changeDetected(p);
-            }
+        if (event->len == 0 || event->wd <= -1)
+            continue;
+        QByteArray fileName(event->name);
+        // Filter out journal changes - redundant with filtering in
+        // FolderWatcher::pathIsIgnored.
+        if (fileName.startsWith("._sync_")
+            || fileName.startsWith(".csync_journal.db")
+            || fileName.startsWith(".sync_")) {
+            continue;
        }
+        const QString p = _watchToPath[event->wd] + '/' + fileName;
+        _parent->changeDetected(p);

-        // increment counter
-        i += sizeof(struct inotify_event) + event->len;
+        if ((event->mask & (IN_MOVED_TO | IN_CREATE))
+            && QFileInfo(p).isDir()
+            && !_parent->pathIsIgnored(p)) {
+            slotAddFolderRecursive(p);
+        }
+        if (event->mask & (IN_MOVED_FROM | IN_DELETE)) {
+            removeFoldersBelow(p);
+        }
    }
 }

-void FolderWatcherPrivate::addPath(const QString &path)
+void FolderWatcherPrivate::removeFoldersBelow(const QString &path)
 {
-    slotAddFolderRecursive(path);
-}
+    auto it = _pathToWatch.find(path);
+    if (it == _pathToWatch.end())
+        return;

-void FolderWatcherPrivate::removePath(const QString &path)
-{
-    int wid = -1;
-    // Remove the inotify watch.
-    QHash<int, QString>::const_iterator i = _watches.constBegin();
+    QString pathSlash = path + '/';

-    while (i != _watches.constEnd()) {
-        if (i.value() == path) {
-            wid = i.key();
+    // Remove the entry and all subentries
+    while (it != _pathToWatch.end()) {
+        auto itPath = it.key();
+        if (!itPath.startsWith(path))
            break;
+        if (itPath != path && !itPath.startsWith(pathSlash)) {
+            // order is 'foo', 'foo bar', 'foo/bar'
+            ++it;
+            continue;
        }
-        ++i;
-    }
-    if (wid > -1) {
+
+        auto wid = it.value();
        inotify_rm_watch(_fd, wid);
-        _watches.remove(wid);
+        _watchToPath.remove(wid);
+        it = _pathToWatch.erase(it);
+        qCDebug(lcFolderWatcher) << "Removed watch for" << itPath;
    }
 }

--- a/src/gui/folderwatcher_linux.h
+++ b/src/gui/folderwatcher_linux.h
@@ -23,6 +23,8 @@

 #include "folderwatcher.h"

+class QTimer;
+
 namespace OCC {

 /**
@@ -37,8 +39,10 @@ public:
    FolderWatcherPrivate(FolderWatcher *p, const QString &path);
    ~FolderWatcherPrivate();

-    void addPath(const QString &path);
-    void removePath(const QString &);
+    int testWatchCount() const { return _pathToWatch.size(); }
+
+    /// On linux the watcher is ready when the ctor finished.
+    bool _ready = true;

 protected slots:
    void slotReceivedNotification(int fd);
@@ -47,12 +51,14 @@ protected slots:
 protected:
    bool findFoldersBelow(const QDir &dir, QStringList &fullList);
    void inotifyRegisterPath(const QString &path);
+    void removeFoldersBelow(const QString &path);

 private:
    FolderWatcher *_parent;

    QString _folder;
-    QHash<int, QString> _watches;
+    QHash<int, QString> _watchToPath;
+    QMap<QString, int> _pathToWatch;
    QScopedPointer<QSocketNotifier> _socket;
    int _fd;
 };
--- a/src/gui/folderwatcher_mac.h
+++ b/src/gui/folderwatcher_mac.h
@@ -33,13 +33,13 @@ public:
    FolderWatcherPrivate(FolderWatcher *p, const QString &path);
    ~FolderWatcherPrivate();

-    void addPath(const QString &) {}
-    void removePath(const QString &) {}
-
    void startWatching();
    QStringList addCoalescedPaths(const QStringList &) const;
    void doNotifyParent(const QStringList &);

+    /// On OSX the watcher is ready when the ctor finished.
+    bool _ready = true;
+
 private:
    FolderWatcher *_parent;

--- a/src/gui/folderwatcher_win.cpp
+++ b/src/gui/folderwatcher_win.cpp
@@ -84,6 +84,8 @@ void WatcherThread::watchChanges(size_t fileNotifyBufferSize,
            break;
        }

+        emit ready();
+
        HANDLE handles[] = { _resultEvent, _stopEvent };
        DWORD result = WaitForMultipleObjects(
            2, handles,
@@ -139,6 +141,8 @@ void WatcherThread::watchChanges(size_t fileNotifyBufferSize,

            if (!skip) {
                emit changed(longfile);
+            } else {
+                qCDebug(lcFolderWatcher) << "Skipping syncing of" << longfile;
            }

            if (curEntry->NextEntryOffset == 0) {
@@ -204,6 +208,8 @@ FolderWatcherPrivate::FolderWatcherPrivate(FolderWatcher *p, const QString &path
        _parent, SLOT(changeDetected(const QString &)));
    connect(_thread, SIGNAL(lostChanges()),
        _parent, SIGNAL(lostChanges()));
+    connect(_thread, &WatcherThread::ready,
+        this, [this]() { _ready = 1; });
    _thread->start();
 }

--- a/src/gui/folderwatcher_win.h
+++ b/src/gui/folderwatcher_win.h
@@ -54,6 +54,7 @@ protected:
 signals:
    void changed(const QString &path);
    void lostChanges();
+    void ready();

 private:
    QString _path;
@@ -74,8 +75,8 @@ public:
    FolderWatcherPrivate(FolderWatcher *p, const QString &path);
    ~FolderWatcherPrivate();

-    void addPath(const QString &) {}
-    void removePath(const QString &) {}
+    /// Set to non-zero once the WatcherThread is capturing events.
+    QAtomicInt _ready;

 private:
    FolderWatcher *_parent;
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -26,6 +26,10 @@
 #if defined(BUILD_UPDATER)
 #include "updater/updater.h"
 #include "updater/ocupdater.h"
+#ifdef Q_OS_MAC
+// FIXME We should unify those, but Sparkle does everything behind the scene transparently
+#include "updater/sparkleupdater.h"
+#endif
 #endif

 #include "ignorelisteditor.h"
@@ -41,6 +45,7 @@
 #include <QNetworkProxy>
 #include <QDir>
 #include <QScopedValueRollback>
+#include <QMessageBox>

 #include <private/qzipwriter_p.h>

@@ -248,34 +253,88 @@ void GeneralSettings::loadMiscSettings()
 #if defined(BUILD_UPDATER)
 void GeneralSettings::slotUpdateInfo()
 {
-    // Note: the sparkle-updater is not an OCUpdater
-    auto *updater = qobject_cast<OCUpdater *>(Updater::instance());
-    if (ConfigFile().skipUpdateCheck()) {
-        updater = nullptr; // don't show update info if updates are disabled
+    if (ConfigFile().skipUpdateCheck() || !Updater::instance()) {
+        // updater disabled on compile
+        _ui->updatesGroupBox->setVisible(false);
+        return;
    }

-    if (updater) {
-        connect(updater, &OCUpdater::downloadStateChanged, this, &GeneralSettings::slotUpdateInfo, Qt::UniqueConnection);
-        connect(_ui->restartButton, &QAbstractButton::clicked, updater, &OCUpdater::slotStartInstaller, Qt::UniqueConnection);
+    // Note: the sparkle-updater is not an OCUpdater
+    auto *ocupdater = qobject_cast<OCUpdater *>(Updater::instance());
+    if (ocupdater) {
+        connect(ocupdater, &OCUpdater::downloadStateChanged, this, &GeneralSettings::slotUpdateInfo, Qt::UniqueConnection);
+        connect(_ui->restartButton, &QAbstractButton::clicked, ocupdater, &OCUpdater::slotStartInstaller, Qt::UniqueConnection);
        connect(_ui->restartButton, &QAbstractButton::clicked, qApp, &QApplication::quit, Qt::UniqueConnection);
        connect(_ui->updateButton, &QAbstractButton::clicked, this, &GeneralSettings::slotUpdateCheckNow, Qt::UniqueConnection);
        connect(_ui->autoCheckForUpdatesCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::slotToggleAutoUpdateCheck);

-        QString status = updater->statusString();
+        QString status = ocupdater->statusString();
        Theme::replaceLinkColorStringBackgroundAware(status);
        _ui->updateStateLabel->setText(status);

-        _ui->restartButton->setVisible(updater->downloadState() == OCUpdater::DownloadComplete);
+        _ui->restartButton->setVisible(ocupdater->downloadState() == OCUpdater::DownloadComplete);

-        _ui->updateButton->setEnabled(updater->downloadState() != OCUpdater::CheckingServer &&
-                                      updater->downloadState() != OCUpdater::Downloading &&
-                                      updater->downloadState() != OCUpdater::DownloadComplete);
+        _ui->updateButton->setEnabled(ocupdater->downloadState() != OCUpdater::CheckingServer &&
+                                      ocupdater->downloadState() != OCUpdater::Downloading &&
+                                      ocupdater->downloadState() != OCUpdater::DownloadComplete);

        _ui->autoCheckForUpdatesCheckBox->setChecked(ConfigFile().autoUpdateCheck());
-    } else {
-        // can't have those infos from sparkle currently
-        _ui->updatesGroupBox->setVisible(false);
    }
+#if defined(Q_OS_MAC) && defined(HAVE_SPARKLE)
+    else if (auto sparkleUpdater = qobject_cast<SparkleUpdater *>(Updater::instance())) {
+        _ui->updateStateLabel->setText(sparkleUpdater->statusString());
+        _ui->restartButton->setVisible(false);
+    }
+#endif
+
+    // Channel selection
+    _ui->updateChannel->setCurrentIndex(ConfigFile().updateChannel() == "beta" ? 1 : 0);
+    connect(_ui->updateChannel, &QComboBox::currentTextChanged,
+        this, &GeneralSettings::slotUpdateChannelChanged, Qt::UniqueConnection);
+}
+
+void GeneralSettings::slotUpdateChannelChanged(const QString &channel)
+{
+    if (channel == ConfigFile().updateChannel())
+        return;
+
+    auto msgBox = new QMessageBox(
+        QMessageBox::Warning,
+        tr("Change update channel?"),
+        tr("The update channel determines which client updates will be offered "
+           "for installation. The \"stable\" channel contains only upgrades that "
+           "are considered reliable, while the versions in the \"beta\" channel "
+           "may contain newer features and bugfixes, but have not yet been tested "
+           "thoroughly."
+           "\n\n"
+           "Note that this selects only what pool upgrades are taken from, and that "
+           "there are no downgrades: So going back from the beta channel to "
+           "the stable channel usually cannot be done immediately and means waiting "
+           "for a stable version that is newer than the currently installed beta "
+           "version."),
+        QMessageBox::NoButton,
+        this);
+    msgBox->addButton(tr("Change update channel"), QMessageBox::AcceptRole);
+    msgBox->addButton(tr("Cancel"), QMessageBox::RejectRole);
+    connect(msgBox, &QMessageBox::finished, msgBox, [this, channel, msgBox](int result) {
+        msgBox->deleteLater();
+        if (result == QMessageBox::AcceptRole) {
+            ConfigFile().setUpdateChannel(channel);
+            if (auto updater = qobject_cast<OCUpdater *>(Updater::instance())) {
+                updater->setUpdateUrl(Updater::updateUrl());
+                updater->checkForUpdate();
+            }
+#if defined(Q_OS_MAC) && defined(HAVE_SPARKLE)
+            else if (auto updater = qobject_cast<SparkleUpdater *>(Updater::instance())) {
+                updater->setUpdateUrl(Updater::updateUrl());
+                updater->checkForUpdate();
+            }
+#endif
+        } else {
+            _ui->updateChannel->setCurrentText(ConfigFile().updateChannel());
+        }
+    });
+    msgBox->open();
 }

 void GeneralSettings::slotUpdateCheckNow()
--- a/src/gui/generalsettings.h
+++ b/src/gui/generalsettings.h
@@ -53,6 +53,7 @@ private slots:
    void slotShowLegalNotice();
 #if defined(BUILD_UPDATER)
    void slotUpdateInfo();
+    void slotUpdateChannelChanged(const QString &channel);
    void slotUpdateCheckNow();
    void slotToggleAutoUpdateCheck();
 #endif
--- a/src/gui/generalsettings.ui
+++ b/src/gui/generalsettings.ui
@@ -124,26 +124,46 @@
          </property>
         </widget>
        </item>
-        <item>
-         <spacer name="horizontalSpacer_5">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Preferred</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
       </layout>
      </item>
      <item row="1" column="0">
       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QLabel" name="updateChannelLabel">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>&amp;Channel</string>
+          </property>
+          <property name="buddy">
+           <cstring>updateChannel</cstring>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="updateChannel">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <item>
+           <property name="text">
+            <string>stable</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>beta</string>
+           </property>
+          </item>
+         </widget>
+        </item>
        <item>
         <widget class="QLabel" name="updateStateLabel">
          <property name="text">
@@ -170,22 +190,6 @@
          </property>
         </widget>
        </item>
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Preferred</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
       </layout>
      </item>
     </layout>
--- a/src/gui/ocsshareejob.cpp
+++ b/src/gui/ocsshareejob.cpp
@@ -28,7 +28,8 @@ OcsShareeJob::OcsShareeJob(AccountPtr account)
 void OcsShareeJob::getSharees(const QString &search,
    const QString &itemType,
    int page,
-    int perPage)
+    int perPage,
+    bool lookup)
 {
    setVerb("GET");

@@ -36,6 +37,7 @@ void OcsShareeJob::getSharees(const QString &search,
    addParam(QString::fromLatin1("itemType"), itemType);
    addParam(QString::fromLatin1("page"), QString::number(page));
    addParam(QString::fromLatin1("perPage"), QString::number(perPage));
+    addParam(QString::fromLatin1("lookup"), QVariant(lookup).toString());

    start();
 }
--- a/src/gui/ocsshareejob.h
+++ b/src/gui/ocsshareejob.h
@@ -38,7 +38,7 @@ public:
     *
     * @param path Path to request shares for (default all shares)
     */
-    void getSharees(const QString &search, const QString &itemType, int page = 1, int perPage = 50);
+    void getSharees(const QString &search, const QString &itemType, int page = 1, int perPage = 50, bool lookup = false);
 signals:
    /**
     * Result of the OCS request
--- a/src/gui/sharee.cpp
+++ b/src/gui/sharee.cpp
@@ -38,10 +38,14 @@ QString Sharee::format() const

    if (_type == Type::Group) {
        formatted += QLatin1String(" (group)");
+    } else if (_type == Type::Email) {
+        formatted += QLatin1String(" (email)");
    } else if (_type == Type::Federated) {
        formatted += QLatin1String(" (remote)");
    } else if (_type == Type::Circle) {
        formatted += QLatin1String(" (circle)");
+    } else if (_type == Type::Room) {
+        formatted += QLatin1String(" (conversation)");
    }

    return formatted;
@@ -69,71 +73,34 @@ ShareeModel::ShareeModel(const AccountPtr &account, const QString &type, QObject
 {
 }

-void ShareeModel::fetch(const QString &search, const ShareeSet &blacklist)
+void ShareeModel::fetch(const QString &search, const ShareeSet &blacklist, LookupMode lookupMode)
 {
    _search = search;
    _shareeBlacklist = blacklist;
    auto *job = new OcsShareeJob(_account);
    connect(job, &OcsShareeJob::shareeJobFinished, this, &ShareeModel::shareesFetched);
    connect(job, &OcsJob::ocsError, this, &ShareeModel::displayErrorMessage);
-    job->getSharees(_search, _type, 1, 50);
+    job->getSharees(_search, _type, 1, 50, lookupMode == GlobalSearch ? true : false);
 }

 void ShareeModel::shareesFetched(const QJsonDocument &reply)
 {
-    auto data = reply.object().value("ocs").toObject().value("data").toObject();
-
    QVector<QSharedPointer<Sharee>> newSharees;

-    /*
-     * Todo properly loop all of this
-     */
-    auto exact = data.value("exact").toObject();
    {
-        auto users = exact.value("users").toArray();
-        foreach (auto user, users) {
-            newSharees.append(parseSharee(user.toObject()));
-        }
+        const QStringList shareeTypes {"users", "groups", "emails", "remotes", "circles", "rooms"};

-        auto groups = exact.value("groups").toArray();
-        foreach (auto group, groups) {
-            newSharees.append(parseSharee(group.toObject()));
-        }
+        const auto appendSharees = [this, &shareeTypes](const QJsonObject &data, QVector<QSharedPointer<Sharee>>& out) {
+            for (const auto &shareeType : shareeTypes) {
+                const auto category = data.value(shareeType).toArray();
+                for (const auto &sharee : category) {
+                    out.append(parseSharee(sharee.toObject()));
+                }
+            }
+        };

-        auto remotes = exact.value("remotes").toArray();
-        foreach (auto remote, remotes) {
-            newSharees.append(parseSharee(remote.toObject()));
-        }
-
-        auto circles = exact.value("circles").toArray();
-        foreach (auto circle, circles) {
-            newSharees.append(parseSharee(circle.toObject()));
-        }
-    }
-
-    {
-        auto users = data.value("users").toArray();
-        foreach (auto user, users) {
-            newSharees.append(parseSharee(user.toObject()));
-        }
-    }
-    {
-        auto groups = data.value("groups").toArray();
-        foreach (auto group, groups) {
-            newSharees.append(parseSharee(group.toObject()));
-        }
-    }
-    {
-        auto remotes = data.value("remotes").toArray();
-        foreach (auto remote, remotes) {
-            newSharees.append(parseSharee(remote.toObject()));
-        }
-    }
-    {
-        auto circles = data.value("circles").toArray();
-        foreach (auto circle, circles) {
-            newSharees.append(parseSharee(circle.toObject()));
-        }
+        appendSharees(reply.object().value("ocs").toObject().value("data").toObject(), newSharees);
+        appendSharees(reply.object().value("ocs").toObject().value("data").toObject().value("exact").toObject(), newSharees);
    }

    // Filter sharees that we have already shared with
--- a/src/gui/sharee.h
+++ b/src/gui/sharee.h
@@ -40,8 +40,10 @@ public:
    enum Type {
        User = 0,
        Group = 1,
+        Email = 4,
        Federated = 6,
-        Circle = 7
+        Circle = 7,
+        Room = 10
    };

    explicit Sharee(const QString shareWith,
@@ -64,10 +66,15 @@ class ShareeModel : public QAbstractListModel
 {
    Q_OBJECT
 public:
+    enum LookupMode {
+        LocalSearch = 0,
+        GlobalSearch = 1
+    };
+
    explicit ShareeModel(const AccountPtr &account, const QString &type, QObject *parent = nullptr);

    using ShareeSet = QVector<QSharedPointer<Sharee>>; // FIXME: make it a QSet<Sharee> when Sharee can be compared
-    void fetch(const QString &search, const ShareeSet &blacklist);
+    void fetch(const QString &search, const ShareeSet &blacklist, LookupMode lookupMode);
    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
    QVariant data(const QModelIndex &index, int role) const override;

--- a/src/gui/sharemanager.h
+++ b/src/gui/sharemanager.h
@@ -44,8 +44,10 @@ public:
        TypeUser = Sharee::User,
        TypeGroup = Sharee::Group,
        TypeLink = 3,
+        TypeEmail = Sharee::Email,
        TypeRemote = Sharee::Federated,
-        TypeCircle = Sharee::Circle
+        TypeCircle = Sharee::Circle,
+        TypeRoom = Sharee::Room
    };

    using Permissions = SharePermissions;
--- a/src/gui/shareusergroupwidget.cpp
+++ b/src/gui/shareusergroupwidget.cpp
@@ -24,7 +24,6 @@
 #include "capabilities.h"
 #include "guiutility.h"
 #include "thumbnailjob.h"
-#include "sharee.h"
 #include "sharemanager.h"
 #include "theme.h"

@@ -85,6 +84,16 @@ ShareUserGroupWidget::ShareUserGroupWidget(AccountPtr account,
    _completer->setCompletionMode(QCompleter::UnfilteredPopupCompletion);
    _ui->shareeLineEdit->setCompleter(_completer);

+    auto searchGloballyAction = new QAction(_ui->shareeLineEdit);
+    searchGloballyAction->setIcon(QIcon(":/client/theme/magnifying-glass.svg"));
+    searchGloballyAction->setToolTip(tr("Search globally"));
+
+    connect(searchGloballyAction, &QAction::triggered, this, [this]() {
+        searchForSharees(ShareeModel::GlobalSearch);
+    });
+
+    _ui->shareeLineEdit->addAction(searchGloballyAction, QLineEdit::LeadingPosition);
+
    _manager = new ShareManager(_account, this);
    connect(_manager, &ShareManager::sharesFetched, this, &ShareUserGroupWidget::slotSharesFetched);
    connect(_manager, &ShareManager::shareCreated, this, &ShareUserGroupWidget::getShares);
@@ -104,7 +113,9 @@ ShareUserGroupWidget::ShareUserGroupWidget(AccountPtr account,
    connect(_ui->shareeLineEdit, &QLineEdit::textEdited,
        this, &ShareUserGroupWidget::slotLineEditTextEdited, Qt::QueuedConnection);
    _ui->shareeLineEdit->installEventFilter(this);
-    connect(&_completionTimer, &QTimer::timeout, this, &ShareUserGroupWidget::searchForSharees);
+    connect(&_completionTimer, &QTimer::timeout, this, [this]() {
+        searchForSharees(ShareeModel::LocalSearch);
+    });
    _completionTimer.setSingleShot(true);
    _completionTimer.setInterval(600);

@@ -163,9 +174,13 @@ void ShareUserGroupWidget::slotLineEditReturn()
    _completionTimer.start();
 }

-
-void ShareUserGroupWidget::searchForSharees()
+void ShareUserGroupWidget::searchForSharees(ShareeModel::LookupMode lookupMode)
 {
+    if (_ui->shareeLineEdit->text().isEmpty()) {
+        return;
+    }
+
+    _ui->shareeLineEdit->setEnabled(false);
    _completionTimer.stop();
    _pi_sharee.startAnimation();
    ShareeModel::ShareeSet blacklist;
@@ -178,7 +193,7 @@ void ShareUserGroupWidget::searchForSharees()
        blacklist << sw->share()->getShareWith();
    }
    _ui->errorLabel->hide();
-    _completerModel->fetch(_ui->shareeLineEdit->text(), blacklist);
+    _completerModel->fetch(_ui->shareeLineEdit->text(), blacklist, lookupMode);
 }

 void ShareUserGroupWidget::getShares()
@@ -246,7 +261,7 @@ void ShareUserGroupWidget::slotSharesFetched(const QList<QSharedPointer<Share>>
    scrollArea->setWidget(newViewPort);

    _disableCompleterActivated = false;
-    _ui->shareeLineEdit->setEnabled(true);
+    activateShareeLineEdit();
 }

 void ShareUserGroupWidget::slotAdjustScrollWidgetSize()
@@ -275,11 +290,14 @@ void ShareUserGroupWidget::slotPrivateLinkShare()

 void ShareUserGroupWidget::slotShareesReady()
 {
+    activateShareeLineEdit();
+
    _pi_sharee.stopAnimation();
    if (_completerModel->rowCount() == 0) {
        displayError(0, tr("No results for '%1'").arg(_completerModel->currentSearch()));
-        return;
    }
+
+    // if no rows are present in the model - complete() will hide the completer
    _completer->complete();
 }

@@ -349,7 +367,7 @@ void ShareUserGroupWidget::displayError(int code, const QString &message)
    qCWarning(lcSharing) << "Sharing error from server" << code << message;
    _ui->errorLabel->setText(message);
    _ui->errorLabel->show();
-    _ui->shareeLineEdit->setEnabled(true);
+    activateShareeLineEdit();
 }

 void ShareUserGroupWidget::slotPrivateLinkOpenBrowser()
@@ -389,6 +407,12 @@ void ShareUserGroupWidget::customizeStyle()
    }
 }

+void ShareUserGroupWidget::activateShareeLineEdit()
+{
+    _ui->shareeLineEdit->setEnabled(true);
+    _ui->shareeLineEdit->setFocus();
+}
+
 ShareUserLine::ShareUserLine(QSharedPointer<Share> share,
    SharePermissions maxSharingPermissions,
    bool isFile,
--- a/src/gui/shareusergroupwidget.h
+++ b/src/gui/shareusergroupwidget.h
@@ -17,6 +17,7 @@

 #include "accountfwd.h"
 #include "sharepermissions.h"
+#include "sharee.h"
 #include "QProgressIndicator.h"
 #include <QDialog>
 #include <QWidget>
@@ -40,9 +41,7 @@ namespace Ui {
 class AbstractCredentials;
 class SyncResult;
 class Share;
-class Sharee;
 class ShareManager;
-class ShareeModel;

 /**
 * @brief The ShareDialog (user/group) class
@@ -73,7 +72,7 @@ private slots:
    void slotSharesFetched(const QList<QSharedPointer<Share>> &shares);

    void on_shareeLineEdit_textChanged(const QString &text);
-    void searchForSharees();
+    void searchForSharees(ShareeModel::LookupMode lookupMode);
    void slotLineEditTextEdited(const QString &text);

    void slotLineEditReturn();
@@ -91,6 +90,8 @@ private slots:
 private:
    void customizeStyle();

+    void activateShareeLineEdit();
+
    Ui::ShareUserGroupWidget *_ui;
    QScrollArea *_parentScrollArea;
    AccountPtr _account;
--- a/src/gui/socketapi.cpp
+++ b/src/gui/socketapi.cpp
@@ -711,7 +711,9 @@ void SocketApi::command_RESOLVE_CONFLICT(const QString &localFile, SocketListene
    dialog.setBaseFilename(baseName);
    dialog.setLocalVersionFilename(conflictedPath);
    dialog.setRemoteVersionFilename(basePath);
-    dialog.exec();
+    if (dialog.exec() == ConflictDialog::Accepted) {
+        fileData.folder->scheduleThisFolderSoon();
+    }
 #endif
 }

--- a/src/gui/systray.cpp
+++ b/src/gui/systray.cpp
@@ -119,6 +119,8 @@ Systray::Systray()

    connect(UserModel::instance(), &UserModel::newUserSelected,
        this, &Systray::slotNewUserSelected);
+    connect(UserModel::instance(), &UserModel::addAccount,
+            this, &Systray::openAccountWizard);

    connect(AccountManager::instance(), &AccountManager::accountAdded,
        this, &Systray::showWindow);
@@ -267,6 +269,14 @@ void Systray::forceWindowInit(QQuickWindow *window) const
    // this shouldn't flicker
    window->show();
    window->hide();
+    
+#ifdef Q_OS_MAC
+    // On macOS we need to designate the tray window as visible on all spaces and
+    // at the menu bar level, otherwise showing it can cause the current spaces to
+    // change, or the window could be obscured by another window that shouldn't
+    // normally cover a menu.
+    OCC::setTrayWindowLevelAndVisibleOnAllSpaces(window);
+#endif
 }

 QScreen *Systray::currentScreen() const
--- a/src/gui/systray.h
+++ b/src/gui/systray.h
@@ -23,12 +23,14 @@
 class QScreen;
 class QQmlApplicationEngine;
 class QQuickWindow;
+class QWindow;

 namespace OCC {

 #ifdef Q_OS_OSX
 bool canOsXSendUserNotification();
 void sendOsXUserNotification(const QString &title, const QString &message);
+void setTrayWindowLevelAndVisibleOnAllSpaces(QWindow *window);
 #endif

 /**
--- a/src/gui/systray.mm
+++ b/src/gui/systray.mm
@@ -1,4 +1,5 @@
 #include <QString>
+#include <QWindow>
 #import <Cocoa/Cocoa.h>

@interface NotificationCenterDelegate : NSObject
@@ -41,4 +42,13 @@ void sendOsXUserNotification(const QString &title, const QString &message)
    [notification release];
 }

+void setTrayWindowLevelAndVisibleOnAllSpaces(QWindow *window)
+{
+    NSView *nativeView = (NSView *)window->winId();
+    NSWindow *nativeWindow = (NSWindow *)[nativeView window];
+    [nativeWindow setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces | NSWindowCollectionBehaviorIgnoresCycle |
+                  NSWindowCollectionBehaviorTransient];
+    [nativeWindow setLevel:NSMainMenuWindowLevel];
+}
+
 }
--- a/src/gui/tray/ActivityActionButton.qml
+++ b/src/gui/tray/ActivityActionButton.qml
@@ -0,0 +1,106 @@
+import QtQuick 2.5
+import QtQuick.Controls 2.3
+import Style 1.0
+
+Item {
+    id: root
+    readonly property bool labelVisible: label.visible
+    readonly property bool iconVisible: icon.visible
+
+    // label value
+    property string text: ""
+
+    // icon value
+    property string imageSource: ""
+
+    // Tooltip value
+    property string tooltipText: text
+
+    // text color
+    property color textColor: Style.ncTextColor
+    property color textColorHovered: Style.lightHover
+
+    // text background color
+    property color textBgColor: "transparent"
+    property color textBgColorHovered: Style.lightHover
+
+    // icon background color
+    property color iconBgColor: "transparent"
+    property color iconBgColorHovered: Style.lightHover
+
+    // text border color
+    property color textBorderColor: "transparent"
+
+    property alias hovered: mouseArea.containsMouse
+
+    signal clicked()
+
+    Accessible.role: Accessible.Button
+    Accessible.name: text !== "" ? text : (tooltipText !== "" ? tooltipText : qsTr("Activity action button"))
+    Accessible.onPressAction: clicked()
+
+    // background with border around the Text
+    Rectangle {
+        visible: parent.labelVisible
+
+        anchors.fill: parent
+
+        // padding
+        anchors.topMargin: 10
+        anchors.bottomMargin: 10
+
+        border.color: parent.textBorderColor
+        border.width: 1
+
+        color: parent.hovered ? parent.textBgColorHovered : parent.textBgColor
+
+        radius: 25
+    }
+
+    // background with border around the Image
+    Rectangle {
+        visible: parent.iconVisible
+
+        anchors.fill: parent
+
+        color: parent.hovered ? parent.iconBgColorHovered : parent.iconBgColor
+    }
+
+    // label
+    Text {
+        id: label
+        visible: parent.text !== ""
+        text: parent.text
+        font: parent.font
+        color: parent.hovered ? parent.textColorHovered : parent.textColor
+        anchors.fill: parent
+        anchors.leftMargin: 10
+        anchors.rightMargin: 10
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        elide: Text.ElideRight
+    }
+
+    // icon
+    Image {
+        id: icon
+        visible: parent.imageSource !== ""
+        anchors.centerIn: parent
+        source: parent.imageSource
+        sourceSize.width: visible ? 32 : 0
+        sourceSize.height: visible ? 32 : 0
+    }
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onClicked: parent.clicked()
+        hoverEnabled: true
+    }
+
+    ToolTip {
+        text: parent.tooltipText
+        delay: 1000
+        visible: text != "" && parent.hovered
+    }
+}
--- a/src/gui/tray/ActivityData.h
+++ b/src/gui/tray/ActivityData.h
@@ -27,11 +27,18 @@ namespace OCC {

 class ActivityLink
 {
+    Q_GADGET
+
+    Q_PROPERTY(QString label MEMBER _label)
+    Q_PROPERTY(QString link MEMBER _link)
+    Q_PROPERTY(QByteArray verb MEMBER _verb)
+    Q_PROPERTY(bool primary MEMBER _primary)
+
 public:
    QString _label;
    QString _link;
    QByteArray _verb;
-    bool _isPrimary;
+    bool _primary;
 };

 /* ==================================================================== */
--- a/src/gui/tray/ActivityListModel.cpp
+++ b/src/gui/tray/ActivityListModel.cpp
@@ -53,6 +53,7 @@ QHash<int, QByteArray> ActivityListModel::roleNames() const
    roles[ActionRole] = "type";
    roles[ActionIconRole] = "icon";
    roles[ActionTextRole] = "subject";
+    roles[ActionsLinksRole] = "links";
    roles[ActionTextColorRole] = "activityTextTitleColor";
    roles[ObjectTypeRole] = "objectType";
    roles[PointInTimeRole] = "dateTime";
@@ -139,10 +140,8 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
    }
    case ActionsLinksRole: {
        QList<QVariant> customList;
-        foreach (ActivityLink customItem, a._links) {
-            QVariant customVariant;
-            customVariant.setValue(customItem);
-            customList << customVariant;
+        foreach (ActivityLink activityLink, a._links) {
+            customList << QVariant::fromValue(activityLink);
        }
        return customList;
    }
@@ -418,17 +417,17 @@ void ActivityListModel::removeActivityFromActivityList(Activity activity)
    }
 }

-void ActivityListModel::triggerActionAtIndex(int id) const
+void ActivityListModel::triggerDefaultAction(int activityIndex) const
 {
-    if (id < 0 || id >= _finalList.size()) {
-        qCWarning(lcActivity) << "Couldn't trigger action at index" << id << "/ final list size:" << _finalList.size();
+    if (activityIndex < 0 || activityIndex >= _finalList.size()) {
+        qCWarning(lcActivity) << "Couldn't trigger default action at index" << activityIndex << "/ final list size:" << _finalList.size();
        return;
    }

-    const auto modelIndex = index(id);
+    const auto modelIndex = index(activityIndex);
    const auto path = data(modelIndex, PathRole).toUrl();

-    const auto activity = _finalList.at(id);
+    const auto activity = _finalList.at(activityIndex);
    if (activity._status == SyncFileItem::Conflict) {
        Q_ASSERT(!activity._file.isEmpty());
        Q_ASSERT(!activity._folder.isEmpty());
@@ -449,7 +448,9 @@ void ActivityListModel::triggerActionAtIndex(int id) const
        dialog.setBaseFilename(baseName);
        dialog.setLocalVersionFilename(conflictedPath);
        dialog.setRemoteVersionFilename(basePath);
-        dialog.exec();
+        if (dialog.exec() == ConflictDialog::Accepted) {
+            folder->scheduleThisFolderSoon();
+        }
        return;
    }

@@ -461,6 +462,30 @@ void ActivityListModel::triggerActionAtIndex(int id) const
    }
 }

+void ActivityListModel::triggerAction(int activityIndex, int actionIndex)
+{
+    if (activityIndex < 0 || activityIndex >= _finalList.size()) {
+        qCWarning(lcActivity) << "Couldn't trigger action on activity at index" << activityIndex << "/ final list size:" << _finalList.size();
+        return;
+    }
+
+    const auto activity = _finalList[activityIndex];
+
+    if (actionIndex < 0 || actionIndex >= activity._links.size()) {
+        qCWarning(lcActivity) << "Couldn't trigger action at index" << actionIndex << "/ actions list size:" << activity._links.size();
+        return;
+    }
+
+    const auto action = activity._links[actionIndex];
+
+    if (action._verb == "WEB") {
+        QDesktopServices::openUrl(QUrl(action._link));
+        return;
+    }
+
+    emit sendNotificationRequest(activity._accName, action._link, action._verb, activityIndex);
+}
+
 void ActivityListModel::combineActivityLists()
 {
    ActivityList resultList;
--- a/src/gui/tray/ActivityListModel.h
+++ b/src/gui/tray/ActivityListModel.h
@@ -74,7 +74,8 @@ public:
    void removeActivityFromActivityList(int row);
    void removeActivityFromActivityList(Activity activity);

-    Q_INVOKABLE void triggerActionAtIndex(int id) const;
+    Q_INVOKABLE void triggerDefaultAction(int activityIndex) const;
+    Q_INVOKABLE void triggerAction(int activityIndex, int actionIndex);

 public slots:
    void slotRefreshActivity();
@@ -86,6 +87,7 @@ private slots:

 signals:
    void activityJobStatusCode(int statusCode);
+    void sendNotificationRequest(const QString &accountName, const QString &link, const QByteArray &verb, int row);

 protected:
    QHash<int, QByteArray> roleNames() const override;
--- a/src/gui/tray/HeaderButton.qml
+++ b/src/gui/tray/HeaderButton.qml
@@ -18,7 +18,7 @@ Button {

    icon.width: Style.headerButtonIconSize
    icon.height: Style.headerButtonIconSize
-    icon.color: "transparent"
+    icon.color: Style.ncTextColor

    Layout.alignment: Qt.AlignRight
    Layout.preferredWidth:  Style.trayWindowHeaderHeight
--- a/src/gui/tray/NotificationHandler.cpp
+++ b/src/gui/tray/NotificationHandler.cpp
@@ -128,7 +128,7 @@ void ServerNotificationHandler::slotNotificationsReceived(const QJsonDocument &j
            al._label = QUrl::fromPercentEncoding(actionJson.value("label").toString().toUtf8());
            al._link = actionJson.value("link").toString();
            al._verb = actionJson.value("type").toString().toUtf8();
-            al._isPrimary = actionJson.value("primary").toBool();
+            al._primary = actionJson.value("primary").toBool();

            a._links.append(al);
        }
@@ -139,7 +139,7 @@ void ServerNotificationHandler::slotNotificationsReceived(const QJsonDocument &j
        al._label = tr("Dismiss");
        al._link = Utility::concatUrlPath(ai->account()->url(), notificationsPath + "/" + QString::number(a._id)).toString();
        al._verb = "DELETE";
-        al._isPrimary = false;
+        al._primary = false;
        a._links.append(al);

        list.append(a);
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -81,7 +81,9 @@ MenuItem {
                        }
                        Image {
                            id: accountStateIndicator
-                            source: isConnected ? "qrc:///client/theme/colored/state-ok.svg" : "qrc:///client/theme/colored/state-offline.svg"
+                            source: model.isConnected
+                                    ? Style.stateOnlineImageSource
+                                    : Style.stateOfflineImageSource
                            cache: false
                            x: accountStateIndicatorBackground.x + 1
                            y: accountStateIndicatorBackground.y + 1
@@ -89,7 +91,7 @@ MenuItem {
                            sourceSize.height: Style.accountAvatarStateIndicatorSize

                            Accessible.role: Accessible.Indicator
-                            Accessible.name: isConnected ? qsTr("Account connected") : qsTr("Account not connected")
+                            Accessible.name: model.isConnected ? qsTr("Account connected") : qsTr("Account not connected")
                        }
                    }

@@ -163,11 +165,11 @@ MenuItem {
                    }

                    MenuItem {
-                        text: isConnected ? qsTr("Log out") : qsTr("Log in")
+                        text: model.isConnected ? qsTr("Log out") : qsTr("Log in")
                        font.pixelSize: Style.topLinePixelSize
                        hoverEnabled: true
                        onClicked: {
-                            isConnected ? UserModel.logout(index) : UserModel.login(index)
+                            model.isConnected ? UserModel.logout(index) : UserModel.login(index)
                            accountMenu.close()
                        }

@@ -182,10 +184,10 @@ MenuItem {
                        }

                        Accessible.role: Accessible.Button
-                        Accessible.name: isConnected ? qsTr("Log out") : qsTr("Log in")
+                        Accessible.name: model.isConnected ? qsTr("Log out") : qsTr("Log in")

                        onPressed: {
-                            if (isConnected) {
+                            if (model.isConnected) {
                                UserModel.logout(index)
                            } else {
                                UserModel.login(index)
@@ -221,4 +223,13 @@ MenuItem {
                }
            }
        }
+
+        Connections {
+            target: UserModel
+            onRefreshCurrentUserGui: {
+                accountStateIndicator.source = model.isConnected
+                        ? Style.stateOnlineImageSource
+                        : Style.stateOfflineImageSource
+            }
+        }
 }   // MenuItem userLine
--- a/src/gui/tray/UserModel.cpp
+++ b/src/gui/tray/UserModel.cpp
@@ -41,6 +41,7 @@ User::User(AccountStatePtr &account, const bool &isCurrent, QObject *parent)

    connect(_account.data(), &AccountState::stateChanged,
            [=]() { if (isConnected()) {slotRefresh();} });
+    connect(_account.data(), &AccountState::stateChanged, this, &User::accountStateChanged);
    connect(_account.data(), &AccountState::hasFetchedNavigationApps,
        this, &User::slotRebuildNavigationAppList);
    connect(_account->account().data(), &Account::accountChangedDisplayName, this, &User::nameChanged);
@@ -50,6 +51,8 @@ User::User(AccountStatePtr &account, const bool &isCurrent, QObject *parent)
    connect(this, &User::guiLog, Logger::instance(), &Logger::guiLog);

    connect(_account->account().data(), &Account::accountChangedAvatar, this, &User::avatarChanged);
+
+    connect(_activityModel, &ActivityListModel::sendNotificationRequest, this, &User::slotSendNotificationRequest);
 }

 void User::slotBuildNotificationDisplay(const ActivityList &list)
@@ -328,7 +331,7 @@ void User::slotAddError(const QString &folderAlias, const QString &message, Erro
            link._label = tr("Retry all uploads");
            link._link = folderInstance->path();
            link._verb = "";
-            link._isPrimary = true;
+            link._primary = true;
            activity._links.append(link);
        }

@@ -552,6 +555,7 @@ void UserModel::buildUserList()
    }
    if (_init) {
        _users.first()->setCurrentUser(true);
+        connect(_users.first(), &User::accountStateChanged, this, &UserModel::refreshCurrentUserGui);
        _init = false;
    }
 }
@@ -568,7 +572,7 @@ Q_INVOKABLE int UserModel::currentUserId() const

 Q_INVOKABLE bool UserModel::isUserConnected(const int &id)
 {
-    if (_users.isEmpty())
+    if (id < 0 || id >= _users.size())
        return false;

    return _users[id]->isConnected();
@@ -576,7 +580,7 @@ Q_INVOKABLE bool UserModel::isUserConnected(const int &id)

 QImage UserModel::avatarById(const int &id)
 {
-    if (_users.isEmpty())
+    if (id < 0 || id >= _users.size())
        return {};

    return _users[id]->avatar();
@@ -584,7 +588,7 @@ QImage UserModel::avatarById(const int &id)

 Q_INVOKABLE QString UserModel::currentUserServer()
 {
-    if (_users.isEmpty())
+    if (_currentUserId < 0 || _currentUserId >= _users.size())
        return {};

    return _users[_currentUserId]->server();
@@ -613,6 +617,7 @@ void UserModel::addUser(AccountStatePtr &user, const bool &isCurrent)
        _users << u;
        if (isCurrent) {
            _currentUserId = _users.indexOf(_users.last());
+            connect(u, &User::accountStateChanged, this, &UserModel::refreshCurrentUserGui);
        }

        endInsertRows();
@@ -629,7 +634,7 @@ int UserModel::currentUserIndex()

 Q_INVOKABLE void UserModel::openCurrentAccountLocalFolder()
 {
-    if (_users.isEmpty())
+    if (_currentUserId < 0 || _currentUserId >= _users.size())
        return;

    _users[_currentUserId]->openLocalFolder();
@@ -650,7 +655,7 @@ Q_INVOKABLE void UserModel::openCurrentAccountTalk()

 Q_INVOKABLE void UserModel::openCurrentAccountServer()
 {
-    if (_users.isEmpty())
+    if (_currentUserId < 0 || _currentUserId >= _users.size())
        return;

    QString url = _users[_currentUserId]->server(false);
@@ -662,11 +667,13 @@ Q_INVOKABLE void UserModel::openCurrentAccountServer()

 Q_INVOKABLE void UserModel::switchCurrentUser(const int &id)
 {
-    if (_users.isEmpty())
+    if (_currentUserId < 0 || _currentUserId >= _users.size())
        return;

+    disconnect(_users[_currentUserId], &User::accountStateChanged, this, &UserModel::refreshCurrentUserGui);
    _users[_currentUserId]->setCurrentUser(false);
    _users[id]->setCurrentUser(true);
+    connect(_users[id], &User::accountStateChanged, this, &UserModel::refreshCurrentUserGui);
    _currentUserId = id;
    emit refreshCurrentUserGui();
    emit newUserSelected();
@@ -674,7 +681,7 @@ Q_INVOKABLE void UserModel::switchCurrentUser(const int &id)

 Q_INVOKABLE void UserModel::login(const int &id)
 {
-    if (_users.isEmpty())
+    if (id < 0 || id >= _users.size())
        return;

    _users[id]->login();
@@ -683,7 +690,7 @@ Q_INVOKABLE void UserModel::login(const int &id)

 Q_INVOKABLE void UserModel::logout(const int &id)
 {
-    if (_users.isEmpty())
+    if (id < 0 || id >= _users.size())
        return;

    _users[id]->logout();
@@ -692,7 +699,7 @@ Q_INVOKABLE void UserModel::logout(const int &id)

 Q_INVOKABLE void UserModel::removeAccount(const int &id)
 {
-    if (_users.isEmpty())
+    if (id < 0 || id >= _users.size())
        return;

    QMessageBox messageBox(QMessageBox::Question,
@@ -710,6 +717,10 @@ Q_INVOKABLE void UserModel::removeAccount(const int &id)
        return;
    }

+    if (_users[id]->isCurrentUser()) {
+        disconnect(_users[id], &User::accountStateChanged, this, &UserModel::refreshCurrentUserGui);
+    }
+
    if (_users[id]->isCurrentUser() && _users.count() > 1) {
        id == 0 ? switchCurrentUser(1) : switchCurrentUser(0);
    }
@@ -766,7 +777,7 @@ QHash<int, QByteArray> UserModel::roleNames() const

 ActivityListModel *UserModel::currentActivityModel()
 {
-    if (_users.isEmpty())
+    if (currentUserIndex() < 0 || currentUserIndex() >= _users.size())
        return nullptr;

    return _users[currentUserIndex()]->getActivityModel();
@@ -774,7 +785,7 @@ ActivityListModel *UserModel::currentActivityModel()

 bool UserModel::currentUserHasActivities()
 {
-    if (_users.isEmpty())
+    if (currentUserIndex() < 0 || currentUserIndex() >= _users.size())
        return false;

    return _users[currentUserIndex()]->hasActivities();
@@ -782,7 +793,7 @@ bool UserModel::currentUserHasActivities()

 bool UserModel::currentUserHasLocalFolder()
 {
-    if (_users.isEmpty())
+    if (currentUserIndex() < 0 || currentUserIndex() >= _users.size())
        return false;

    return _users[currentUserIndex()]->getFolder() != nullptr;
@@ -790,21 +801,23 @@ bool UserModel::currentUserHasLocalFolder()

 void UserModel::fetchCurrentActivityModel()
 {
-    if (!_users.isEmpty())
-        _users[currentUserId()]->slotRefresh();
+    if (currentUserId() < 0 || currentUserId() >= _users.size())
+        return;
+
+    _users[currentUserId()]->slotRefresh();
 }

 AccountAppList UserModel::appList() const
 {
-    if (_users.isEmpty())
-        return AccountAppList();
+    if (_currentUserId < 0 || _currentUserId >= _users.size())
+        return {};

    return _users[_currentUserId]->appList();
 }

 User *UserModel::currentUser() const
 {
-    if (_users.isEmpty())
+    if (currentUserId() < 0 || currentUserId() >= _users.size())
        return nullptr;

    return _users[currentUserId()];
--- a/src/gui/tray/UserModel.h
+++ b/src/gui/tray/UserModel.h
@@ -52,6 +52,7 @@ signals:
    void hasLocalFolderChanged();
    void serverHasTalkChanged();
    void avatarChanged();
+    void accountStateChanged(int state);

 public slots:
    void slotItemCompleted(const QString &folder, const SyncFileItemPtr &item);
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -36,7 +36,9 @@ Window {

    onVisibleChanged: {
        currentAccountStateIndicator.source = ""
-        currentAccountStateIndicator.source = UserModel.isUserConnected(UserModel.currentUserId) ? "qrc:///client/theme/colored/state-ok.svg" : "qrc:///client/theme/colored/state-offline.svg"
+        currentAccountStateIndicator.source = UserModel.isUserConnected(UserModel.currentUserId)
+                ? Style.stateOnlineImageSource
+                : Style.stateOfflineImageSource

        // HACK: reload account Instantiator immediately by restting it - could be done better I guess
        // see also id:accountMenu below
@@ -48,7 +50,9 @@ Window {
        target: UserModel
        onRefreshCurrentUserGui: {
            currentAccountStateIndicator.source = ""
-            currentAccountStateIndicator.source = UserModel.isUserConnected(UserModel.currentUserId) ? "qrc:///client/theme/colored/state-ok.svg" : "qrc:///client/theme/colored/state-offline.svg"
+            currentAccountStateIndicator.source = UserModel.isUserConnected(UserModel.currentUserId)
+                    ? Style.stateOnlineImageSource
+                    : Style.stateOfflineImageSource
        }
        onNewUserSelected: {
            accountMenu.close();
@@ -104,23 +108,11 @@ Window {
            id: trayWindowHeaderBackground

            anchors.left:   trayWindowBackground.left
+            anchors.right:  trayWindowBackground.right
            anchors.top:    trayWindowBackground.top
            height:         Style.trayWindowHeaderHeight
-            width:          Style.trayWindowWidth
            color:          Style.ncBlue

-            // The overlay rectangle below eliminates the rounded corners from the bottom of the header
-            // as Qt only allows setting the radius for all corners right now, not specific ones
-            Rectangle {
-                id: trayWindowHeaderButtomHalfBackground
-
-                anchors.left:   trayWindowHeaderBackground.left
-                anchors.bottom: trayWindowHeaderBackground.bottom
-                height:         Style.trayWindowHeaderHeight / 2
-                width:          Style.trayWindowWidth
-                color:          Style.ncBlue
-            }
-
            RowLayout {
                id: trayWindowHeaderLayout

@@ -357,7 +349,9 @@ Window {

                            Image {
                                id: currentAccountStateIndicator
-                                source: UserModel.isUserConnected(UserModel.currentUserId) ? "qrc:///client/theme/colored/state-ok.svg" : "qrc:///client/theme/colored/state-offline.svg"
+                                source: UserModel.isUserConnected(UserModel.currentUserId)
+                                        ? Style.stateOnlineImageSource
+                                        : Style.stateOfflineImageSource
                                cache: false
                                x: currentAccountStateIndicatorBackground.x + 1
                                y: currentAccountStateIndicatorBackground.y + 1
@@ -394,13 +388,19 @@ Window {
                            }
                        }

-                        Image {
-                            Layout.alignment: Qt.AlignRight
-                            verticalAlignment: Qt.AlignCenter
-                            Layout.margins: Style.accountDropDownCaretMargin
-                            source: "qrc:///client/theme/white/caret-down.svg"
-                            sourceSize.width: Style.accountDropDownCaretSize
-                            sourceSize.height: Style.accountDropDownCaretSize
+                        ColorOverlay {
+                            cached: true
+                            color: Style.ncTextColor
+                            width: source.width
+                            height: source.height
+                            source: Image {
+                                Layout.alignment: Qt.AlignRight
+                                verticalAlignment: Qt.AlignCenter
+                                Layout.margins: Style.accountDropDownCaretMargin
+                                source: "qrc:///client/theme/white/caret-down.svg"
+                                sourceSize.width: Style.accountDropDownCaretSize
+                                sourceSize.height: Style.accountDropDownCaretSize
+                            }
                        }
                    }
                }
@@ -505,16 +505,17 @@ Window {

        ListView {
            id: activityListView
-
            anchors.top: trayWindowHeaderBackground.bottom
-            anchors.horizontalCenter: trayWindowBackground.horizontalCenter
-            width:  Style.trayWindowWidth - Style.trayWindowBorderWidth
-            height: Style.trayWindowHeight - Style.trayWindowHeaderHeight
+            anchors.left: trayWindowBackground.left
+            anchors.right: trayWindowBackground.right
+            anchors.bottom: trayWindowBackground.bottom
            clip: true
            ScrollBar.vertical: ScrollBar {
                id: listViewScrollbar
            }

+            readonly property int maxActionButtons: 2
+
            keyNavigationEnabled: true

            Accessible.role: Accessible.List
@@ -525,26 +526,28 @@ Window {
            delegate: RowLayout {
                id: activityItem

+                readonly property variant links: model.links
+
+                readonly property int itemIndex: model.index
+
                width: parent.width
                height: Style.trayWindowHeaderHeight
                spacing: 0

                Accessible.role: Accessible.ListItem
                Accessible.name: path !== "" ? qsTr("Open %1 locally").arg(displayPath)
-                                                    : message
+                                             : message
                Accessible.onPressAction: activityMouseArea.clicked()

                MouseArea {
                    id: activityMouseArea
                    enabled: (path !== "" || link !== "")
                    anchors.left: activityItem.left
-                    anchors.right: (shareButton.visible) ? shareButton.left
-                                 : (replyButton.visible) ? replyButton.left
-                                 : activityItem.right
+                    anchors.right: activityActionsLayout.right
                    height: parent.height
                    anchors.margins: 2
                    hoverEnabled: true
-                    onClicked: activityModel.triggerActionAtIndex(model.index)
+                    onClicked: activityModel.triggerDefaultAction(model.index)

                    Rectangle {
                        anchors.fill: parent
@@ -569,13 +572,14 @@ Window {
                Column {
                    id: activityTextColumn
                    anchors.left: activityIcon.right
+                    anchors.right: activityActionsLayout.left
                    anchors.leftMargin: 8
                    spacing: 4
                    Layout.alignment: Qt.AlignLeft
                    Text {
                        id: activityTextTitle
                        text: (type === "Activity" || type === "Notification") ? subject : message
-                        width: Style.activityLabelBaseWidth + ((path === "") ? activityItem.height : 0) + ((link === "") ? activityItem.height : 0) - 8
+                        width: parent.width
                        elide: Text.ElideRight
                        font.pixelSize: Style.topLinePixelSize
                        color: activityTextTitleColor
@@ -588,7 +592,7 @@ Window {
                            : (type === "Notification") ? message
                            : ""
                        height: (text === "") ? 0 : activityTextTitle.height
-                        width: Style.activityLabelBaseWidth + ((path === "") ? activityItem.height : 0) + ((link === "") ? activityItem.height : 0) - 8
+                        width: parent.width
                        elide: Text.ElideRight
                        font.pixelSize: Style.subLinePixelSize
                    }
@@ -597,7 +601,7 @@ Window {
                        id: activityTextDateTime
                        text: dateTime
                        height: (text === "") ? 0 : activityTextTitle.height
-                        width: Style.activityLabelBaseWidth + ((path === "") ? activityItem.height : 0) + ((link === "") ? activityItem.height : 0) - 8
+                        width: parent.width
                        elide: Text.ElideRight
                        font.pixelSize: Style.subLinePixelSize
                        color: "#808080"
@@ -618,56 +622,175 @@ Window {
                        }
                    }
                }
-                Button {
-                    id: shareButton
+                RowLayout {
+                    id: activityActionsLayout
                    anchors.right: activityItem.right
-
-                    Layout.preferredWidth: (path === "") ? 0 : parent.height
-                    Layout.preferredHeight: parent.height
+                    spacing: 0
                    Layout.alignment: Qt.AlignRight
-                    flat: true
-                    hoverEnabled: true
-                    visible: (path === "") ? false : true
-                    display: AbstractButton.IconOnly
-                    icon.source: "qrc:///client/theme/share.svg"
-                    icon.color: "transparent"
-                    background: Rectangle {
-                        color: parent.hovered ? Style.lightHover : "transparent"
+
+                    function actionButtonIcon(actionIndex) {
+                        const verb = String(model.links[actionIndex].verb);
+                        if (verb === "WEB" && (model.objectType === "chat" || model.objectType === "call")) {
+                            return "qrc:///client/theme/reply.svg";
+                        } else if (verb === "DELETE") {
+                            return "qrc:///client/theme/close.svg";
+                        }
+
+                        return "qrc:///client/theme/confirm.svg";
                    }
-                    ToolTip.visible: hovered
-                    ToolTip.delay: 1000
-                    ToolTip.text: qsTr("Open share dialog")
-                    onClicked: Systray.openShareDialog(displayPath,absolutePath)

-                    Accessible.role: Accessible.Button
-                    Accessible.name: qsTr("Share %1").arg(displayPath)
-                    Accessible.onPressAction: shareButton.clicked()
-                }
+                    Repeater {
+                        model: activityItem.links.length > activityListView.maxActionButtons ? 1 : activityItem.links.length

-                Button {
-                    id: replyButton
-                    anchors.right: activityItem.right
+                        ActivityActionButton {
+                            id: activityActionButton
+
+                            readonly property int actionIndex: model.index
+                            readonly property bool primary: model.index === 0 && String(activityItem.links[actionIndex].verb) !== "DELETE"
+
+                            height: activityItem.height
+
+                            text: !primary ? "" : activityItem.links[actionIndex].label
+
+                            imageSource: !primary ? activityActionsLayout.actionButtonIcon(actionIndex) : ""
+
+                            textColor: primary ? Style.ncBlue : "black"
+                            textColorHovered: Style.lightHover
+
+                            textBorderColor: Style.ncBlue
+
+                            textBgColor: "transparent"
+                            textBgColorHovered: Style.ncBlue
+
+                            tooltipText: activityItem.links[actionIndex].label
+
+                            Layout.minimumWidth: primary ? 80 : -1
+                            Layout.minimumHeight: parent.height
+
+                            Layout.preferredWidth: primary ? -1 : parent.height
+
+                            onClicked: activityModel.triggerAction(activityItem.itemIndex, actionIndex)
+                        }

-                    Layout.preferredWidth: (objectType == "chat" || objectType == "call") ? parent.height : 0
-                    Layout.preferredHeight: parent.height
-                    Layout.alignment: Qt.AlignRight
-                    flat: true
-                    hoverEnabled: true
-                    visible: (objectType == "chat" || objectType == "call") ? true : false
-                    display: AbstractButton.IconOnly
-                    icon.source: "qrc:///client/theme/reply.svg"
-                    icon.color: "transparent"
-                    background: Rectangle {
-                        color: parent.hovered ? Style.lightHover : "transparent"
                    }
-                    ToolTip.visible: hovered
-                    ToolTip.delay: 1000
-                    ToolTip.text: qsTr("Open Talk")
-                    onClicked: Qt.openUrlExternally(link)

-                    Accessible.role: Accessible.Button
-                    Accessible.name: qsTr("Open Talk %1").arg(link)
-                    Accessible.onPressAction: replyButton.clicked()
+                    Button {
+                        id: moreActionsButton
+
+                        Layout.preferredWidth: parent.height
+                        Layout.preferredHeight: parent.height
+                        Layout.alignment: Qt.AlignRight
+
+                        flat: true
+                        hoverEnabled: true
+                        visible: activityItem.links.length > activityListView.maxActionButtons
+                        display: AbstractButton.IconOnly
+                        icon.source: "qrc:///client/theme/more.svg"
+                        icon.color: "transparent"
+                        background: Rectangle {
+                            color: parent.hovered ? Style.lightHover : "transparent"
+                        }
+                        ToolTip.visible: hovered
+                        ToolTip.delay: 1000
+                        ToolTip.text: qsTr("Show more actions")
+
+                        Accessible.role: Accessible.Button
+                        Accessible.name: qsTr("Show more actions")
+                        Accessible.onPressAction: moreActionsButton.clicked()
+
+                        onClicked:  moreActionsButtonContextMenu.popup();
+
+                        Connections {
+                            target: trayWindow
+                            onActiveChanged: {
+                                if (!trayWindow.active) {
+                                    moreActionsButtonContextMenu.close();
+                                }
+                            }
+                        }
+
+                        Connections {
+                            target: activityListView
+
+                            onMovementStarted: {
+                                moreActionsButtonContextMenu.close();
+                            }
+                        }
+
+                        Container {
+                            id: moreActionsButtonContextMenuContainer
+                            visible: moreActionsButtonContextMenu.opened
+
+                            width: moreActionsButtonContextMenu.width
+                            height: moreActionsButtonContextMenu.height
+                            anchors.right: moreActionsButton.right
+                            anchors.top: moreActionsButton.top
+
+                            Menu {
+                                id: moreActionsButtonContextMenu
+                                anchors.centerIn: parent
+
+                                // transform model to contain indexed actions with primary action filtered out
+                                function actionListToContextMenuList(actionList) {
+                                    // early out with non-altered data
+                                    if (activityItem.links.length <= activityListView.maxActionButtons) {
+                                        return actionList;
+                                    }
+
+                                    // add index to every action and filter 'primary' action out
+                                    var reducedActionList = actionList.reduce(function(reduced, action, index) {
+                                        if (!action.primary) {
+                                           var actionWithIndex = { actionIndex: index, label: action.label };
+                                           reduced.push(actionWithIndex);
+                                        }
+                                        return reduced;
+                                    }, []);
+
+
+                                    return reducedActionList;
+                                }
+
+                                Repeater {
+                                    id: moreActionsButtonContextMenuRepeater
+
+                                    model: moreActionsButtonContextMenu.actionListToContextMenuList(activityItem.links)
+
+                                    delegate: MenuItem {
+                                        id: moreActionsButtonContextMenuEntry
+                                        readonly property int actionIndex: model.modelData.actionIndex
+                                        readonly property string label: model.modelData.label
+                                        text: label
+                                        onTriggered: activityModel.triggerAction(activityItem.itemIndex, actionIndex)
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    Button {
+                        id: shareButton
+
+                        Layout.preferredWidth: (path === "") ? 0 : parent.height
+                        Layout.preferredHeight: parent.height
+                        Layout.alignment: Qt.AlignRight
+                        flat: true
+                        hoverEnabled: true
+                        visible: (path === "") ? false : true
+                        display: AbstractButton.IconOnly
+                        icon.source: "qrc:///client/theme/share.svg"
+                        icon.color: "transparent"
+                        background: Rectangle {
+                            color: parent.hovered ? Style.lightHover : "transparent"
+                        }
+                        ToolTip.visible: hovered
+                        ToolTip.delay: 1000
+                        ToolTip.text: qsTr("Open share dialog")
+                        onClicked: Systray.openShareDialog(displayPath,absolutePath)
+
+                        Accessible.role: Accessible.Button
+                        Accessible.name: qsTr("Share %1").arg(displayPath)
+                        Accessible.onPressAction: shareButton.clicked()
+                    }
                }
            }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kevin Ottens	75c329f4ff	Merge pull request #2761 from nextcloud/bump_to_3.1.1 Bump release to 3.1.1	2020-12-22 10:54:32 +01:00
Kevin Ottens	b69c047be1	Bump release to 3.1.1 Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>	2020-12-22 10:44:45 +01:00
Nextcloud bot	f0292b15a0	[tx-robot] updated from transifex	2020-12-22 03:47:02 +00:00
Kevin Ottens	e1b0e3474f	Merge pull request #2753 from nextcloud/backport/2739/stable-3.1 [stable-3.1] Fixed the autostart for AppImages. See #2504.	2020-12-21 12:15:54 +01:00
Hannah Rittich	98077abfba	Fixed the autostart for AppImages. See #2504 . Signed-off-by: Hannah Rittich <hrittich@users.noreply.github.com>	2020-12-21 11:08:29 +00:00
Nextcloud bot	1d265c791b	[tx-robot] updated from transifex	2020-12-21 03:44:58 +00:00
Nextcloud bot	f93829afd7	[tx-robot] updated from transifex	2020-12-20 03:47:21 +00:00
Nextcloud bot	68bc4367d2	[tx-robot] updated from transifex	2020-12-19 03:45:53 +00:00
Nextcloud bot	1ead3608f0	[tx-robot] updated from transifex	2020-12-18 03:47:04 +00:00
Kevin Ottens	48dcd9c8f0	Merge pull request #2730 from nextcloud/backport/2725/stable-3.1 [stable-3.1] Make monochrome icons the default on Linux and Mac OS.	2020-12-17 11:00:24 +01:00
Camila	7688d5f607	Make monochrome icons the default on Linux and Mac OS. Unless it is branded with other icons. Signed-off-by: Camila <hello@camila.codes>	2020-12-17 07:03:54 +00:00
Nextcloud bot	7957b1b6b7	[tx-robot] updated from transifex	2020-12-17 03:45:10 +00:00
Nextcloud bot	f3957ba72b	[tx-robot] updated from transifex	2020-12-16 03:47:14 +00:00
Camila	b391d88ed4	Merge pull request #2717 from nextcloud/backport/2714/stable-3.1 [stable-3.1] Ensure a sync happens after a conflict resolution	2020-12-15 11:18:31 +01:00
Kevin Ottens	9774b6a429	Ensure a sync happens after a conflict resolution You'd expect that after a conflict resolution the file watcher would pick up the change and trigger a sync. For some reason it doesn't seem to happen on at least some Ubuntu systems. In such cases the user would then still have a stale conflict entry in the activity list and wouldn't be able to do anything with it. Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>	2020-12-15 10:04:15 +00:00
Camila	2e216c8f29	Merge pull request #2715 from nextcloud/backport/2713/stable-3.1 [stable-3.1] UserModel: check indices are inside the user list	2020-12-15 11:03:12 +01:00
Kevin Ottens	8997d5ced9	UserModel: check indices are inside the user list The model was just checking for the user list being empty or not which is overly optimistic. Indeed there might be cases where the id is actually outside the boundaries so properly check for this. Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>	2020-12-15 09:51:38 +00:00
Camila	c85d12425d	Merge pull request #2716 from nextcloud/backport/2698/stable-3.1 [stable-3.1] Use the icon color property to color the icons in the tray window header.	2020-12-15 10:50:34 +01:00
Camila	3fa796e11e	Use the icon color property to color the icons in the tray window header. The icon color is set with APPLICATION_WIZARD_HEADER_TITLE_COLOR in the theme. Signed-off-by: Camila <hello@camila.codes>	2020-12-15 09:44:51 +00:00
Nextcloud bot	583c4960d8	[tx-robot] updated from transifex	2020-12-15 03:47:30 +00:00
Kevin Ottens	6a94f0deef	Merge pull request #2709 from nextcloud/backport/2708/stable-3.1 [stable-3.1] Have the new account wizard open again	2020-12-14 16:38:24 +01:00
Kevin Ottens	3c9e065170	Have the new account wizard open again UserModel can't be connected to AccountSettings if the settings dialog doesn't exist. This is the case now since we delay the creation of that dialog and free it after use. Instead it should be properly channeled through the Systray object all the way up to OwncloudGui which knows how to handle this properly. Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>	2020-12-14 15:29:24 +00:00
Nextcloud bot	a0719b782b	[tx-robot] updated from transifex	2020-12-14 03:47:59 +00:00
Nextcloud bot	6caff18d7c	[tx-robot] updated from transifex	2020-12-13 03:43:55 +00:00
Nextcloud bot	9114419d8e	[tx-robot] updated from transifex	2020-12-12 03:46:15 +00:00
Nextcloud bot	3991350c47	[tx-robot] updated from transifex	2020-12-11 03:44:45 +00:00
Kevin Ottens	7f4ffd0f72	Merge pull request #2696 from nextcloud/v.3.1.0 Bump master version to 3.1.0	2020-12-10 12:16:47 +01:00
allexzander	e6b06d0a6b	Bump master version to 3.1.0 Signed-off-by: allexzander <blackslayer4@gmail.com>	2020-12-10 12:47:51 +02:00
Nextcloud bot	e160788204	[tx-robot] updated from transifex	2020-12-10 03:53:56 +00:00
Nextcloud bot	f5d4ac518f	[tx-robot] updated from transifex	2020-12-09 03:44:40 +00:00
allexzander	31d3ce7663	Merge pull request #2685 from nextcloud/fix-slow-sharee-search-in-dialog Fixed slow sharee search in the share dialog	2020-12-08 15:56:29 +02:00
allexzander	9266ecc2e8	Fixed slow sharee search in the share dialog Signed-off-by: allexzander <blackslayer4@gmail.com>	2020-12-08 13:48:43 +00:00
allexzander	14105d4ec6	Merge pull request #2686 from nextcloud/add-email-sharing Added sharing via email.	2020-12-08 15:24:08 +02:00
allexzander	6e8658dc2c	Added sharing via email. Signed-off-by: allexzander <blackslayer4@gmail.com>	2020-12-08 11:08:45 +02:00
Nextcloud bot	1d7b7c26d3	[tx-robot] updated from transifex	2020-12-08 03:48:38 +00:00
Kevin Ottens	b2dfa29325	Merge pull request #2690 from nextcloud/update-documentation Update documentation on how to generate debug logs.	2020-12-07 16:22:37 +01:00
Camila	09c2279bb5	Update documentation on how to generate debug logs. Minor change: bypasses => bypass. Signed-off-by: Camila <hello@camila.codes>	2020-12-07 14:52:51 +01:00
Nextcloud bot	4886525e08	[tx-robot] updated from transifex	2020-12-07 03:48:13 +00:00
Nextcloud bot	f2fd083898	[tx-robot] updated from transifex	2020-12-06 03:43:57 +00:00
Nextcloud bot	8a2eb71c4f	[tx-robot] updated from transifex	2020-12-04 03:45:51 +00:00
Kevin Ottens	8e29935195	Merge pull request #2682 from nextcloud/debug-skip Add debug log to check which folders are being skipped during syncing.	2020-12-03 12:37:38 +01:00
Camila	5517ff2c02	Add debug log to check which folders are being skipped during syncing. Signed-off-by: Camila <hello@camila.codes>	2020-12-03 12:24:25 +01:00
Nextcloud bot	bd959018a1	[tx-robot] updated from transifex	2020-12-03 03:45:56 +00:00
Camila	a527e85fe6	Merge pull request #2666 from nextcloud/notification_actions_bring_back_from_version_2 Notification action buttons and context menu	2020-12-02 15:42:32 +01:00
allexzander	f04281cb69	Implemented notification action buttons and context menu for confirm/dismiss and other actions. Signed-off-by: allexzander <blackslayer4@gmail.com>	2020-12-02 08:08:37 +00:00
Kevin Ottens	7721832ee0	Merge pull request #2677 from briankendall/fix-tray-window-spaces-bug Fix macOS bug where tray window causes spaces to switch	2020-12-02 08:23:19 +01:00
Brian Kendall	f9991e180c	Fix macOS bug where tray window causes spaces to switch Signed-off-by: Brian Kendall <brian@briankendall.net>	2020-12-02 06:54:16 +00:00
Nextcloud bot	bc38c0ba3f	[tx-robot] updated from transifex	2020-12-02 03:46:16 +00:00
Nextcloud bot	9ff8d97647	[tx-robot] updated from transifex	2020-12-01 03:45:58 +00:00
István Váradi	62bf777cda	Merge pull request #2652 from ivaradi/debian-version-discrepancy Handle the case when the release version differs from that in VERSION.cmake	2020-11-30 16:46:20 +01:00
István Váradi	3d9d5f2fe7	Handle the case when the release version differs from that in VERSION.cmake Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>	2020-11-30 15:33:34 +01:00
allexzander	57e1f2ac07	Merge pull request #2675 from nextcloud/fix-appimage-build fix AppImage build	2020-11-30 14:20:30 +02:00
allexzander	0fdb423fe0	fix AppImage build by using v0.10.0 for qtkeychain Signed-off-by: allexzander <blackslayer4@gmail.com>	2020-11-30 13:41:12 +02:00
Nextcloud bot	7bfd8ea23c	[tx-robot] updated from transifex	2020-11-30 03:43:17 +00:00
Nextcloud bot	57a4cd926d	[tx-robot] updated from transifex	2020-11-29 03:42:10 +00:00
Nextcloud bot	de4edb6099	[tx-robot] updated from transifex	2020-11-28 03:39:34 +00:00
Nextcloud bot	70dbbbeaa4	[tx-robot] updated from transifex	2020-11-27 03:40:43 +00:00
Camila	9614d051a5	Merge pull request #2667 from nextcloud/version-bump Master is now 3.0.82.	2020-11-26 13:08:20 +01:00
Camila	8d1fe8ed3c	Master is now 3.0.82. Signed-off-by: Camila <hello@camila.codes>	2020-11-26 12:52:55 +01:00
Camila	4d133ba9a5	Merge pull request #2540 from nextcloud/fix-issue-1458 Add last / to exclude list file path.	2020-11-26 12:51:53 +01:00
Camila	bdd3465e7b	Check if there are patterns associated with a sync exclude file. The previous check didn't take into the account that .sync-exclude.lst might be empty which would crash at Q_ASSERT(_allExcludes.contains(basePath)) in the prepare function. It also takes into account that _allExcludes[basePath] was creating new items in the list. Signed-off-by: Camila <hello@camila.codes>	2020-11-26 12:12:04 +01:00
Camila	998e93ac13	Add last / to exclude list file path. This Q_ASSERT(this->endsWith('/')) in BasePathByteArray was the reason for bug report #1458. Signed-off-by: Camila <hello@camila.codes>	2020-11-26 12:11:57 +01:00
Nextcloud bot	820ab12561	[tx-robot] updated from transifex	2020-11-26 03:45:21 +00:00
Kevin Ottens	c38189e981	Merge pull request #2665 from nextcloud/sparkle_build_fixes Sparkle build fixes	2020-11-25 18:00:34 +01:00
Dominik Schmidt	a50c665051	Simplify Sparkle handling in CMake	2020-11-25 09:43:59 +01:00
Chih-Hsuan Yen	6962cbf582	Fix build without Sparkle.framework (PR #6567)	2020-11-25 09:40:20 +01:00
Christian Kamm	60d3696ccd	Settings: Add warning when switching update channel	2020-11-25 09:39:16 +01:00
Nextcloud bot	c4987aa641	[tx-robot] updated from transifex	2020-11-25 03:42:43 +00:00
Camila	104d3c0661	Merge pull request #2647 from nextcloud/cherry_pick_updater_fixes_and_improvements Cherry pick updater fixes and improvements	2020-11-24 20:58:26 +01:00
Kevin Ottens	4906353f2e	Please the clang-tidy overlord Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>	2020-11-24 18:22:33 +00:00
Hannah von Reth	038644f378	Don't scare users with critical parser log messages	2020-11-24 18:22:33 +00:00
Hannah von Reth	d30cd0f0fd	Include architecture in updater query Fixes: #8074	2020-11-24 18:22:33 +00:00
Hannah von Reth	c76095859a	Cleanup stirngs	2020-11-24 18:22:33 +00:00
Olivier Goffart	a7f010c370	Updater: Fix crash when there is an XML error The problem was accessing the lines with an off by one error, while printing the log. Other problem included the fact that QDebug added spaces, quotes, and other things which made the error lot look right in the console. Issue #7545	2020-11-24 18:22:33 +00:00
Olivier Goffart	1bf895cadc	Updater: Fix Version numer not shown in the user visible string There was one argument too many in the string. Bug was introduced in commit 21ac396b Issue: #7288	2020-11-24 18:22:33 +00:00
Christian Kamm	c58f00abc7	Updater: Improved logging output #7388	2020-11-24 18:22:33 +00:00
Hannah von Reth	1df3f5b6df	NSISUpdater: Improve logging for version comparison	2020-11-24 18:22:33 +00:00
Hannah von Reth	1aca005267	Updater: Log parsing issues in autoupdatLog parsing issues in autoupdatee	2020-11-24 18:22:33 +00:00
Markus Goetz	9a375211d7	Autoupdater: Log the URL #3475	2020-11-24 18:22:33 +00:00
Christian Kamm	d2991210c5	Updater: Preserve target version string For #7217	2020-11-24 18:22:33 +00:00
Christian Kamm	aa7409f401	Updater: Make "Update manually" not also "skip this version" See #7217	2020-11-24 18:22:33 +00:00
Christian Kamm	0b3512f49c	WinUpdater: More useful options on update failure #7217 Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>	2020-11-24 18:22:33 +00:00
Olivier Goffart	9596eb7f20	Updater: show the human readable version in the settings The xml looks like this: <version>2.5.0.328</version> <versionstring>ownCloud Client 2.5.0 alpha1 (build 238)</versionstring> And we should show the version string Issue #6602	2020-11-24 18:22:33 +00:00
Olivier Goffart	f2c3ef741b	Updater: remove unused function	2020-11-24 18:22:33 +00:00
Dominik Schmidt	ae38b88d1c	Remove unused installers before copying new ones into the appdata dir	2020-11-24 18:22:33 +00:00
Olivier Goffart	e93972824d	MSI: Fix crash in the auto updater 'auto' here is a QStringBuilder referencing a temporary Ammend commit `150d4f5935` (MSI: Always with logfile #6609) Found in the crash reporter: https://sentry.io/owncloud/desktop-win-and-mac/issues/623245771/	2020-11-24 18:22:33 +00:00
Markus Goetz	5e518419de	MSI: Always with logfile #6609	2020-11-24 18:22:33 +00:00
Dominik Schmidt	d069fda9ab	Extract filename of updateFile without leading slash	2020-11-24 18:22:33 +00:00
Dominik Schmidt	dfac8c0e59	Escape msi and owncloud.exe path (who knows...)	2020-11-24 18:22:33 +00:00
Dominik Schmidt	ed0dc68db2	Run msi properly and restart client after update	2020-11-24 18:22:33 +00:00
Dominik Schmidt	08b5981fb6	Implement basic .msi support in updater	2020-11-24 18:22:33 +00:00
Markus Goetz	412e43b696	Updater: Comments	2020-11-24 18:22:33 +00:00
Christian Kamm	4b39731c27	Updater: Make sparkle updater respect release channel	2020-11-24 18:22:33 +00:00
Markus Goetz	311e3a3bd8	Auto Updater: Show UI element also on macOS (cherry picked from commit dfdc2e1e87f99d387a042f4983c999fbb7fcf3d9)	2020-11-24 18:22:33 +00:00
Christian Kamm	a8ad946758	Settings: Add update channel combobox #6259	2020-11-24 18:22:33 +00:00
Markus Goetz	65035d1990	Sparkle: Delegate calls work now with 1.18.1 (maybe even before) We can extend on this to give UI feedback.	2020-11-24 18:22:33 +00:00
Camila	c24b81c081	Merge pull request #2660 from nextcloud/folder-watcher FolderWatcher: fixes and improvements	2020-11-24 19:19:08 +01:00
Christian Kamm	08014b6dc3	FolderWatcher: Disable test on OSX #7305	2020-11-24 16:56:49 +00:00
Olivier Goffart	5a432a193f	FolderWatcher: Usage of QTime for elapsed time is deprecated	2020-11-24 16:56:49 +00:00
Christian Kamm	28e4fc54a1	FolderWatcher: Wait for ready before testing #7305	2020-11-24 16:56:49 +00:00
Christian Kamm	e97fc430bf	FolderWatcher: Become unreliable if test notification fails #7241 Necessary for some filesystems on windows that don't have full file watching capabilities.	2020-11-24 16:56:49 +00:00
Christian Kamm	74382ddcc0	FolderWatcher linux: Make automatically recursive #7068 Previously it depended on addFolder() / removeFolder() calls to adjust watchers when new folders were added or removed. There also needed to be complex move handling. Now, any folder creation/move-in notifications automatically trigger watcher additions and folder deletion/move-out triggers removal.	2020-11-24 16:56:49 +00:00
Christian Kamm	21b931dc6b	FolderWatcher: Always notify about conflict files #7073 This makes sure that the conflict list can be updated if a user resolves a conflict by deleting the local conflict file. Previously one had to wait for the next sync run.	2020-11-24 16:56:49 +00:00
Christian Kamm	351bada552	Folderwatcher: On linux, fix paths after dir renames #6808 If a folder was renamed A -> B, the folder watcher for the inode would be unaware and still report changes for A/foo. Now directory renames in the watched folders are tracked and paths are updated accordingly.	2020-11-24 16:56:49 +00:00
allexzander	fe29290564	Merge pull request #2663 from nextcloud/fix-windows-compilation Fix Windows compilation broken after QML debugging fix.	2020-11-24 18:34:04 +02:00
allexzander	29ca1404cc	Fix Windows compilation broken after QML debugging fix. Signed-off-by: allexzander <blackslayer4@gmail.com>	2020-11-24 16:50:16 +02:00
allexzander	d4c14f8f4f	Merge pull request #2662 from nextcloud/fix-qml-debugging Fix QML debugging by removing incorrect dependency	2020-11-24 16:24:17 +02:00
allexzander	92733e9069	Fix QML debugging by removing incorrect dependency Signed-off-by: allexzander <blackslayer4@gmail.com>	2020-11-24 15:19:17 +02:00
Nextcloud bot	2aa3d17e5c	[tx-robot] updated from transifex	2020-11-24 03:41:57 +00:00
Kevin Ottens	7cf3f14f78	Merge pull request #2658 from nextcloud/enable_qml_debugger_on_debug_builds Enable the QML debugger on debug builds	2020-11-23 18:59:52 +01:00
Kevin Ottens	922b322337	Enable the QML debugger on debug builds Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>	2020-11-23 17:39:50 +00:00
allexzander	f530758f78	Merge pull request #2655 from nextcloud/use-dinamyc-path-for-account-state-icons Use dynamic path for account online/offline state icon. Refresh GUI on connection state change.	2020-11-23 18:01:13 +02:00
allexzander	665a8c4217	Use dynamic path for account online/offline state icon. Refresh GUI on connection state change. Signed-off-by: Alex Zolotov <alex.zolotov.nextcloud.com> Signed-off-by: allexzander <blackslayer4@gmail.com>	2020-11-23 17:49:25 +02:00
Nextcloud bot	10cb0a71eb	[tx-robot] updated from transifex	2020-11-23 03:38:35 +00:00
Nextcloud bot	e6ea3878a9	[tx-robot] updated from transifex	2020-11-21 03:44:21 +00:00
Nextcloud bot	8faa103ebf	[tx-robot] updated from transifex	2020-11-20 03:43:18 +00:00
Nextcloud bot	d0004230b9	[tx-robot] updated from transifex	2020-11-19 03:43:51 +00:00
Kevin Ottens	44f2bc24ff	Merge pull request #2648 from nextcloud/debian_packages_should_not_block_ci Issue a warning for Debian pipeline failures but don't fail the CI	2020-11-18 16:32:29 +01:00
Kevin Ottens	6f25840ec9	Issue a warning for Debian pipeline failures but don't fail the CI Since this fails every time we bump the version number and takes time to catch up while failing every following PRs, let's prevent this pipeline from failing the CI. Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>	2020-11-18 16:05:19 +01:00
Nextcloud bot	1950efcfff	[tx-robot] updated from transifex	2020-11-18 03:41:49 +00:00
Nextcloud bot	d026aa9301	[tx-robot] updated from transifex	2020-11-16 03:43:48 +00:00
Nextcloud bot	0d7865e6f8	[tx-robot] updated from transifex	2020-11-15 03:41:36 +00:00
Nextcloud bot	fa1f20ca8e	[tx-robot] updated from transifex	2020-11-14 03:44:00 +00:00
Nextcloud bot	771bac2279	[tx-robot] updated from transifex	2020-11-13 03:43:12 +00:00