Fix context menu wording.

Signed-off-by: Camila San <hello@camila.codes>

.drone.yml

@@ -1,366 +1,228 @@
-kind: pipeline
-name: qt-5.7
+clone:
+  git:
+    image: plugins/git
+    tags: true
+    depth: 1
 
-steps:
-- name: build and test
-  image: nextcloudci/client-5.7:client-5.7-4
-  commands:
-    # Install QtKeyChain
-    - /bin/bash -c "
-      source /opt/qt57/bin/qt57-env.sh &&
-      cd /tmp &&
-      git clone https://github.com/frankosterfeld/qtkeychain.git &&
-      cd qtkeychain &&
-      git checkout v0.9.1 &&
-      mkdir build &&
-      cd build &&
-      cmake ../ &&
-      make &&
-      make install"
-    # Build client
-    - /bin/bash -c "
-      source /opt/qt57/bin/qt57-env.sh &&
-      mkdir build &&
-      cd build &&
-      cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1  ../ &&
-      make &&
-      useradd -m -s /bin/bash test &&
-      chown -R test:test . &&
-      su -c 'ctest --output-on-failure' test"
-trigger:
-  branch:
-    - master
-  event:
-    - pull_request
-    - push
+pipeline:
+    qt-5.7:
+        image: nextcloudci/client-5.7:client-5.7-3
+        commands:
+            # Install QtKeyChain
+            - /bin/bash -c "
+              source /opt/qt57/bin/qt57-env.sh &&
+              cd /tmp &&
+              git clone https://github.com/frankosterfeld/qtkeychain.git &&
+              cd qtkeychain &&
+              git checkout v0.8.0 &&
+              mkdir build &&
+              cd build &&
+              cmake ../ &&
+              make &&
+              make install"
+            # Build client
+            - /bin/bash -c "
+              source /opt/qt57/bin/qt57-env.sh &&
+              mkdir build &&
+              cd build &&
+              cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1  ../ &&
+              make &&
+              useradd -m -s /bin/bash test &&
+              chown -R test:test . &&
+              su -c 'ctest --output-on-failure' test"
+        when:
+            matrix:
+                TESTS: qt-5.7
+    qt-5.8:
+        image: nextcloudci/client-5.8:client-5.8-3
+        commands:
+            # Install QtKeyChain
+            - /bin/bash -c "
+              source /opt/qt58/bin/qt58-env.sh &&
+              cd /tmp &&
+              git clone https://github.com/frankosterfeld/qtkeychain.git &&
+              cd qtkeychain &&
+              git checkout v0.8.0 &&
+              mkdir build &&
+              cd build &&
+              cmake ../ &&
+              make &&
+              make install"
+            # Build client
+            - /bin/bash -c "
+              source /opt/qt58/bin/qt58-env.sh &&
+              mkdir build &&
+              cd build &&
+              cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
+              make &&
+              useradd -m -s /bin/bash test &&
+              chown -R test:test . &&
+              su -c 'ctest --output-on-failure' test"
+        when:
+            matrix:
+                TESTS: qt-5.8
+    qt-5.9:
+        image: nextcloudci/client-5.9:client-5.9-4
+        commands:
+            # Install QtKeyChain
+            - /bin/bash -c "
+              source /opt/qt59/bin/qt59-env.sh &&
+              cd /tmp &&
+              git clone https://github.com/frankosterfeld/qtkeychain.git &&
+              cd qtkeychain &&
+              git checkout v0.8.0 &&
+              mkdir build &&
+              cd build &&
+              cmake ../ &&
+              make &&
+              make install"
+            # Build client
+            - /bin/bash -c "
+              source /opt/qt59/bin/qt59-env.sh &&
+              mkdir build &&
+              cd build &&
+              cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
+              make &&
+              useradd -m -s /bin/bash test &&
+              chown -R test:test . &&
+              su -c 'ctest --output-on-failure' test"
+        when:
+            matrix:
+                TESTS: qt-5.9
+    qt-5.10:
+        image: nextcloudci/client-5.10:client-5.10-3
+        commands:
+            # Install QtKeyChain
+            - /bin/bash -c "
+              export CC=gcc-7 &&
+              export CXX=g++-7 &&
+              source /opt/qt510/bin/qt510-env.sh &&
+              cd /tmp &&
+              git clone https://github.com/frankosterfeld/qtkeychain.git &&
+              cd qtkeychain &&
+              git checkout v0.8.0 &&
+              mkdir build &&
+              cd build &&
+              cmake ../ &&
+              make &&
+              make install"
+            # Build client
+            - /bin/bash -c "
+              export CC=gcc-7 &&
+              export CXX=g++-7 &&
+              source /opt/qt510/bin/qt510-env.sh &&
+              mkdir build &&
+              cd build &&
+              cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
+              make &&
+              useradd -m -s /bin/bash test &&
+              chown -R test:test . &&
+              su -c 'ctest --output-on-failure' test"
+        when:
+            matrix:
+                TESTS: qt-5.10
+    qt-5.11:
+        image: nextcloudci/client-5.11:client-5.11-3
+        commands:
+            # Install QtKeyChain
+            - /bin/bash -c "
+              export CC=gcc-7 &&
+              export CXX=g++-7 &&
+              source /opt/qt511/bin/qt511-env.sh &&
+              cd /tmp &&
+              git clone https://github.com/frankosterfeld/qtkeychain.git &&
+              cd qtkeychain &&
+              git checkout v0.8.0 &&
+              mkdir build &&
+              cd build &&
+              cmake ../ &&
+              make &&
+              make install"
+            # Build client
+            - /bin/bash -c "
+              export CC=gcc-7 &&
+              export CXX=g++-7 &&
+              source /opt/qt511/bin/qt511-env.sh &&
+              mkdir build &&
+              cd build &&
+              cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
+              make &&
+              useradd -m -s /bin/bash test &&
+              chown -R test:test . &&
+              su -c 'ctest --output-on-failure' test"
+        when:
+            matrix:
+                TESTS: qt-5.11
 
----
-kind: pipeline
-name: qt-5.8
+    qt-5.11-clang:
+        image: nextcloudci/client-5.11:client-5.11-3
+        commands:
+            # Install QtKeyChain
+            - /bin/bash -c "
+              export CC=clang-6.0 &&
+              export CXX=clang++-6.0 &&
+              source /opt/qt511/bin/qt511-env.sh &&
+              cd /tmp &&
+              git clone https://github.com/frankosterfeld/qtkeychain.git &&
+              cd qtkeychain &&
+              git checkout v0.8.0 &&
+              mkdir build &&
+              cd build &&
+              cmake ../ &&
+              make &&
+              make install"
+            # Build client
+            - /bin/bash -c "
+              export CC=clang-6.0 &&
+              export CXX=clang++-6.0 &&
+              source /opt/qt511/bin/qt511-env.sh &&
+              mkdir build &&
+              cd build &&
+              cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
+              make &&
+              useradd -m -s /bin/bash test &&
+              chown -R test:test . &&
+              su -c 'ctest --output-on-failure' test"
+        when:
+            matrix:
+                TESTS: qt-5.11-clang
 
-steps:
-- name: build and test
-  image: nextcloudci/client-5.8:client-5.8-4
-  commands:
-    # Install QtKeyChain
-    - /bin/bash -c "
-      source /opt/qt58/bin/qt58-env.sh &&
-      cd /tmp &&
-      git clone https://github.com/frankosterfeld/qtkeychain.git &&
-      cd qtkeychain &&
-      git checkout v0.9.1 &&
-      mkdir build &&
-      cd build &&
-      cmake ../ &&
-      make &&
-      make install"
-    # Build client
-    - /bin/bash -c "
-      source /opt/qt58/bin/qt58-env.sh &&
-      mkdir build &&
-      cd build &&
-      cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1  ../ &&
-      make &&
-      useradd -m -s /bin/bash test &&
-      chown -R test:test . &&
-      su -c 'ctest --output-on-failure' test"
-trigger:
-  branch:
-    - master
-  event:
-    - pull_request
-    - push
+    AppImage:
+        image: nextcloudci/client-5.11:client-5.11-3
+        commands:
+            - /bin/bash -c "./admin/linux/build-appimage.sh"
+        when:
+            matrix:
+                BUILD: AppImage
 
----
-kind: pipeline
-name: qt-5.9
+    Debian:
+        image: nextcloudci/client-debian-ci:client-debian-ci-2
+        commands:
+            - /bin/bash -c "./admin/linux/debian/drone-build.sh"
+        secrets: [ DEBIAN_SECRET_KEY, DEBIAN_SECRET_IV ]
+        when:
+            matrix:
+                BUILD: Debian
 
-steps:
-- name: build and test
-  image: nextcloudci/client-5.9:client-5.9-5
-  commands:
-    # Install QtKeyChain
-    - /bin/bash -c "
-      source /opt/qt59/bin/qt59-env.sh &&
-      cd /tmp &&
-      git clone https://github.com/frankosterfeld/qtkeychain.git &&
-      cd qtkeychain &&
-      git checkout v0.9.1 &&
-      mkdir build &&
-      cd build &&
-      cmake ../ &&
-      make &&
-      make install"
-    # Build client
-    - /bin/bash -c "
-      source /opt/qt59/bin/qt59-env.sh &&
-      mkdir build &&
-      cd build &&
-      cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1  ../ &&
-      make &&
-      useradd -m -s /bin/bash test &&
-      chown -R test:test . &&
-      su -c 'ctest --output-on-failure' test"
-trigger:
-  branch:
-    - master
-  event:
-    - pull_request
-    - push
+    documentation:
+        image: nextcloudci/documentation:documentation-5
+        commands:
+            - cd doc
+            - make html
+        when:
+            matrix:
+                TESTS: documentation
 
----
-kind: pipeline
-name: qt-5.10
+matrix:
+    include:
+        - TESTS: qt-5.7
+        - TESTS: qt-5.8
+        - TESTS: qt-5.9
+        - TESTS: qt-5.10
+        - TESTS: qt-5.11
+        - TESTS: qt-5.11-clang
+        - BUILD: AppImage
+        - BUILD: Debian
+        - TESTS: documentation
 
-steps:
-- name: build and test
-  image: nextcloudci/client-5.10:client-5.10-3
-  commands:
-    # Install QtKeyChain
-    - /bin/bash -c "
-      export CC=gcc-7 &&
-      export CXX=g++-7 &&
-      source /opt/qt510/bin/qt510-env.sh &&
-      cd /tmp &&
-      git clone https://github.com/frankosterfeld/qtkeychain.git &&
-      cd qtkeychain &&
-      git checkout v0.9.1 &&
-      mkdir build &&
-      cd build &&
-      cmake ../ &&
-      make &&
-      make install"
-    # Build client
-    - /bin/bash -c "
-      export CC=gcc-7 &&
-      export CXX=g++-7 &&
-      source /opt/qt510/bin/qt510-env.sh &&
-      mkdir build &&
-      cd build &&
-      cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
-      make &&
-      useradd -m -s /bin/bash test &&
-      chown -R test:test . &&
-      su -c 'ctest --output-on-failure' test"
-trigger:
-  branch:
-    - master
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
-name: qt-5.11
-
-steps:
-- name: build and test
-  image: nextcloudci/client-5.11:client-5.11-3
-  commands:
-    # Install QtKeyChain
-    - /bin/bash -c "
-      export CC=gcc-7 &&
-      export CXX=g++-7 &&
-      source /opt/qt511/bin/qt511-env.sh &&
-      cd /tmp &&
-      git clone https://github.com/frankosterfeld/qtkeychain.git &&
-      cd qtkeychain &&
-      git checkout v0.9.1 &&
-      mkdir build &&
-      cd build &&
-      cmake ../ &&
-      make &&
-      make install"
-    # Build client
-    - /bin/bash -c "
-      export CC=gcc-7 &&
-      export CXX=g++-7 &&
-      source /opt/qt511/bin/qt511-env.sh &&
-      mkdir build &&
-      cd build &&
-      cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
-      make &&
-      useradd -m -s /bin/bash test &&
-      chown -R test:test . &&
-      su -c 'ctest --output-on-failure' test"
-trigger:
-  branch:
-    - master
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
-name: qt-5.11-clang
-
-steps:
-- name: build and test
-  image: nextcloudci/client-5.11:client-5.11-3
-  commands:
-    # Install QtKeyChain
-    - /bin/bash -c "
-      export CC=clang-6.0 &&
-      export CXX=clang++-6.0 &&
-      source /opt/qt511/bin/qt511-env.sh &&
-      cd /tmp &&
-      git clone https://github.com/frankosterfeld/qtkeychain.git &&
-      cd qtkeychain &&
-      git checkout v0.9.1 &&
-      mkdir build &&
-      cd build &&
-      cmake ../ &&
-      make &&
-      make install"
-    # Build client
-    - /bin/bash -c "
-      export CC=clang-6.0 &&
-      export CXX=clang++-6.0 &&
-      source /opt/qt511/bin/qt511-env.sh &&
-      mkdir build &&
-      cd build &&
-      cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
-      make &&
-      useradd -m -s /bin/bash test &&
-      chown -R test:test . &&
-      su -c 'ctest --output-on-failure' test"
-trigger:
-  branch:
-    - master
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
-name: qt-5.12
-
-steps:
-- name: build and test
-  image: nextcloudci/client-5.12:client-5.12-2
-  commands:
-    # Install QtKeyChain
-    - /bin/bash -c "
-      export CC=gcc-7 &&
-      export CXX=g++-7 &&
-      source /opt/qt512/bin/qt512-env.sh &&
-      cd /tmp &&
-      git clone https://github.com/frankosterfeld/qtkeychain.git &&
-      cd qtkeychain &&
-      git checkout v0.9.1 &&
-      mkdir build &&
-      cd build &&
-      cmake ../ &&
-      make &&
-      make install"
-    # Build client
-    - /bin/bash -c "
-      export CC=gcc-7 &&
-      export CXX=g++-7 &&
-      source /opt/qt512/bin/qt512-env.sh &&
-      mkdir build &&
-      cd build &&
-      cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
-      make &&
-      useradd -m -s /bin/bash test &&
-      chown -R test:test . &&
-      su -c 'ctest --output-on-failure' test"
-trigger:
-  branch:
-    - master
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
-name: qt-5.12-clang
-
-steps:
-- name: build and test
-  image: nextcloudci/client-5.12:client-5.12-2
-  commands:
-    # Install QtKeyChain
-    - /bin/bash -c "
-      export CC=clang-6.0 &&
-      export CXX=clang++-6.0 &&
-      source /opt/qt512/bin/qt512-env.sh &&
-      cd /tmp &&
-      git clone https://github.com/frankosterfeld/qtkeychain.git &&
-      cd qtkeychain &&
-      git checkout v0.9.1 &&
-      mkdir build &&
-      cd build &&
-      cmake ../ &&
-      make &&
-      make install"
-    # Build client
-    - /bin/bash -c "
-      export CC=clang-6.0 &&
-      export CXX=clang++-6.0 &&
-      source /opt/qt512/bin/qt512-env.sh &&
-      mkdir build &&
-      cd build &&
-      cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
-      make &&
-      useradd -m -s /bin/bash test &&
-      chown -R test:test . &&
-      su -c 'ctest --output-on-failure' test"
-trigger:
-  branch:
-    - master
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
-name: AppImage
-
-steps:
-- name: build
-  image: nextcloudci/client-5.12:client-5.12-2
-  commands:
-    - /bin/bash -c "./admin/linux/build-appimage.sh"
-trigger:
-  branch:
-    - master
-  event:
-    - pull_request
-    - push
----
-kind: pipeline
-name: Debian
-
-steps:
-- name: build
-  image: nextcloudci/client-debian-ci:client-debian-ci-2
-  commands:
-    - /bin/bash -c "./admin/linux/debian/drone-build.sh"
-  environment:
-    DEBIAN_SECRET_KEY:
-      from_secret: DEBIAN_SECRET_KEY
-    DEBIAN_SECRET_IV:
-      from_secret: DEBIAN_SECRET_IV
-trigger:
-  branch:
-    - master
-  event:
-    - pull_request
-    - push
----
-kind: pipeline
-name: Documentation
-
-steps:
-- name: build
-  image: nextcloudci/documentation:documentation-5
-  commands:
-    - cd doc
-    - make html
-trigger:
-  branch:
-    - master
-  event:
-    - pull_request
-    - push
+branches: [ master, 2.* ]

.github/issue_template.md

@@ -1,63 +0,0 @@
-<!--
-Dear user,
-Please understand that at the moment, we are very busy with customer issues 
-and some high priority development work. A lot of issues are getting reported. 
-Right now we can't keep up and timely respond to all of them. 
-We're sorry for that and are expanding our team, if you're looking for a C++ 
-job or know somebody who is, please point them to https://nextcloud.com/jobs
-Don't forget that Github is not a support system or a place to ask for 
-features but only a place to report verified bugs - see nextcloud.com/support 
-for support options!
--->
-
-### Expected behaviour
-Tell us what should happen
-
-### Actual behaviour
-Tell us what happens instead
-
-### Steps to reproduce
-1.
-2.
-3.
-
-### Client configuration
-Client version:
-<!---
-Please try to only report a bug if it happens with the latest version
-The latest version can be seen by checking https://download.nextcloud.com/desktop/
-For support try our forums: https://help.nextcloud.com
---->
-
-Operating system:
-
-OS language:
-
-Qt version used by client package (Linux only, see also Settings dialog):
-
-Client package (From Nextcloud or distro) (Linux only):
-
-Installation path of client:
-
-
-### Server configuration
-<!---
-Optional section. It depends on the issue.
---->
-Nextcloud version:
-
-Storage backend (external storage):
-
-### Logs
-
-Please use Gist (https://gist.github.com/) or a similar code paster for longer
-logs.
-
-1. Client logfile: Output of `nextcloud --logwindow` or `nextcloud --logfile log.txt`
-(On Windows using `cmd.exe`, you might need to first `cd` into the Nextcloud directory)
-(See also https://docs.nextcloud.com/desktop/2.3/troubleshooting.html#log-files)
-
-2. Web server error log:
-
-3. Server logfile: nextcloud log (data/nextcloud.log):
-

.gitignore

@@ -15,18 +15,9 @@ cscope.*
 tags
 t1.cfg
 
-## Ignore Visual Studio Code config & environment files
-
-.vs/
-.vscode/
-
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
-# CMake integration on VS2019+
-
-CMakeSettings.json
-
 # User-specific files
 *.suo
 *.user
@@ -173,11 +164,3 @@ UpgradeLog*.htm
 # Microsoft Fakes
 FakesAssemblies/
 
-#cmake temporary stuff
-CMakeCache.txt
-CMakeFiles/
-CPackConfig.cmake
-CPackOptions.cmake
-CPackSourceConfig.cmake
-
-compile_commands.json

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "src/3rdparty/qtmacgoodies"]
 	path = src/3rdparty/qtmacgoodies
-	url = https://github.com/camilasan/qtmacgoodies.git
+	url = https://github.com/guruz/qtmacgoodies.git
 [submodule "binary"]
 	path = binary
 	url = git://github.com/owncloud/owncloud-client-binary.git

.tx/nextcloud.client-desktop/ar_translation

@@ -1,201 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-GenericName[ar]=مزامنة المجلد

.tx/nextcloud.client-desktop/bg_translation

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

.tx/nextcloud.client-desktop/ca_translation

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

.tx/nextcloud.client-desktop/cs_translation

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

.tx/nextcloud.client-desktop/da_translation

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

.tx/nextcloud.client-desktop/de_translation

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

.tx/nextcloud.client-desktop/el_translation

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

.tx/nextcloud.client-desktop/en_GB_translation

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

.tx/nextcloud.client-desktop/eo_translation

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

.tx/nextcloud.client-desktop/es_CL_translation

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

.tx/nextcloud.client-desktop/es_CO_translation

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

.tx/nextcloud.client-desktop/es_CR_translation

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

.tx/nextcloud.client-desktop/es_DO_translation

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

.tx/nextcloud.client-desktop/es_EC_translation

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

.tx/nextcloud.client-desktop/es_GT_translation

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

.tx/nextcloud.client-desktop/es_MX_translation

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

.tx/nextcloud.client-desktop/es_SV_translation

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

.tx/nextcloud.client-desktop/es_translation

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

.tx/nextcloud.client-desktop/eu_translation

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

.tx/nextcloud.client-desktop/fr_translation

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

.tx/nextcloud.client-desktop/gl_translation

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

.tx/nextcloud.client-desktop/he_translation

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

.tx/nextcloud.client-desktop/hr_translation

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

.tx/nextcloud.client-desktop/hu_translation

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

.tx/nextcloud.client-desktop/is_translation

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

.tx/nextcloud.client-desktop/it_translation

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

.tx/nextcloud.client-desktop/ja_translation

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

.tx/nextcloud.client-desktop/ko_translation

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

.tx/nextcloud.client-desktop/lt_LT_translation

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

.tx/nextcloud.client-desktop/lv_translation

@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Icon[lv]=@APPLICATION_ICON_NAME@
-Name[lv]=@APPLICATION_NAME@ darbavirsmas sinhronizešanas klients
-Comment[lv]=@APPLICATION_NAME@ darbavirsmas sinhronizešanas klients
-GenericName[lv]=Mapju Sinhronizēšana

.tx/nextcloud.client-desktop/mk_translation

@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Icon[mk]=@APPLICATION_ICON_NAME@
-Name[mk]=@APPLICATION_NAME@ клиент за синхронизација на компјутер
-Comment[mk]=@APPLICATION_NAME@ клиент за синхронизација на компјутер
-GenericName[mk]=Папка за синхронизација

.tx/nextcloud.client-desktop/nb_translation

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

.tx/nextcloud.client-desktop/nl_translation

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

.tx/nextcloud.client-desktop/pl_translation

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

.tx/nextcloud.client-desktop/pt_BR_translation

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

.tx/nextcloud.client-desktop/pt_translation

@@ -1,204 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-Icon[pt_PT]=@APPLICATION_ICON_NAME@
-Name[pt_PT]=@APPLICATION_NAME@ - Cliente de Sincronização da Área de Trabalho
-Comment[pt_PT]=@APPLICATION_NAME@ - Cliente de Sincronização da Área de Trabalho
-GenericName[pt_PT]=Sincronização de Pasta

.tx/nextcloud.client-desktop/ro_translation

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

.tx/nextcloud.client-desktop/ru_translation

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

.tx/nextcloud.client-desktop/sk_translation

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

.tx/nextcloud.client-desktop/sl_translation

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

.tx/nextcloud.client-desktop/sr_translation

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

.tx/nextcloud.client-desktop/sv_translation

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

.tx/nextcloud.client-desktop/tr_translation

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

.tx/nextcloud.client-desktop/uk_translation

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

.tx/nextcloud.client-desktop/zh_CN_translation

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

.tx/nextcloud.client-desktop/zh_TW_translation

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

CMakeLists.txt

@@ -174,6 +174,8 @@ endif()
 if(BUILD_CLIENT)
     if(APPLE)
         find_package(Sparkle)
+        find_package(FUSE REQUIRED)
+        include_directories(BEFORE ${FUSE_INCLUDE_DIR})
     endif(APPLE)
 
     if(UNIX)
@@ -183,7 +185,7 @@ if(BUILD_CLIENT)
     endif()
     find_package(Sphinx)
     find_package(PdfLatex)
-    find_package(OpenSSL 1.1 REQUIRED )
+    find_package(OpenSSL 1.1  REQUIRED)
 
    find_package(ZLIB REQUIRED)
    find_package(GLib2)
@@ -243,7 +245,9 @@ configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
 if(BUILD_OWNCLOUD_OSX_BUNDLE)
     install(FILES sync-exclude.lst DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
     configure_file(sync-exclude.lst bin/${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
+    configure_file(LoopbackFS.icns bin/${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/LoopbackFS.icns COPYONLY)
 elseif(BUILD_CLIENT)
     install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
     configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
+    configure_file(LoopbackFS.icns bin/LoopbackFS.icns COPYONLY)
 endif()

CONTRIBUTING.md

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

ChangeLog

@@ -1,138 +1,5 @@
-2.5 Series ChangeLog
-====================
-
-version 2.5.3 (release 2019-07-22)
-* Fix empty file wording in error log (small)
-* Add Qt-5.12 to CI
-* Fix a minor typo
-* Libcloudproviders: Add missing check for Qt5DBus
-* Fix several memory leaks in cloudproviders and add translation support
-* Share link fixing
-* New drone config
-* Uses configuraion to determine if it should show empty folder popup.
-* Simplify cmake command to make copy-pastable
-* Updated default remote poll to 5 seconds #1115
-* Fix memory leak with device pointer
-* Added a nice UI for the E2E-enabled account first connect
-* This should fix issue #1000
-* Adds parameter to retrieve shares with its reshares.
-* Fixed typo
-* Fixed typo in "certificate"
-* WebView: Properly handle usernames with spaces and plus signs in it
-* Add error category for http file lock error status 423.
-* Displays the uid_owner of a shared file.
-* Minor text change in the link to help in the tab 'General'.
-
-version 2.5.2 (release 2019-04-11)
-* Handle spaces in username properly in login flow
-* Wizard: show an error message if there is no enough free space in the local folder
-* Removed whitespace from string
-* Do not add double slash to login flow url
-* Fix login flow with system proxy
-* Start with easier theming
-* Do not display dismissed notifications
-* Fixed l18n issue. Added space for separating string
-* Add invalid certiticate messagebox
-* Correct app passwords link
-* Be less verbose with logging
-* Fix typo in translation string
-* Add a command line option to launch the client in the background
-* Support Ubuntu Disco Dingo
-* Added missing Include
-* Make sure _profile and _page are deleted in the correct order
-* Fix KDEInstallDirs deprecation warnings
-* Removed Stylesheet
-
-version 2.5.1  (release 2019-01-06)
-* Fixup the port in server notification URLs
-* GUI: let Clang-Tidy modernize nullptr & override usage
-* Improve the slide show
-* Libsync: let Clang-Tidy modernize nullptr & override usage
-* SettingsDialog: fix a little glitch in the account tool button size
-* SettingsDialog: tweak color aware icons
-* More verbose error and proper app name on configuration read error
-* Fix cmake build using WITH_PROVIDERS=OFF
-* Debian/Ubuntu target repository update
-* Change man page names and contents for nextcloud
-* Share dialog alignment
-* Fixed typo
-* Change link to docs for NC 15
-* Do not fetch activities if they are not enabled
-* Do not read system exclude list if user exclude is present
-* Fix the activity loop
-* Write the actual folder to the log
-* Fix appname for Nautilus integration script
-
-version 2.5.0  (release 2018-11-14)
-* End to end encryption
-* New Web login flow
-* UI improvements: Notifications
-* UI improvements: refactoring of Activities
-* SyncJournal: Clear etag filter before sync
-* Partial local discovery: Fix scheduling logic
-* Sync hidden files by default
-* Larger Windows App Icon
-* Show a tray message when a folder watcher becomes unreliable #6119
-* Create symlinks for the small-letter application icon file names
-* In setup wizard put link to nextcloud installation
-* Web view scales vertically
-* Add a WebFlowCredentialsAccessManager
-* Mac Application Icon
-* Ensure GETFileJob notices finishing #6581
-* OAuth2: Try to refresh the token even if the credentials weren't ready.
-* Tray workarounds #6545
-* UpdateInfo: Remove unused code
-* OAuth: Remove the timeout
-* TestOAuth: Don't have global static QObject
-* Log: Adjust update/reconcile log verbosity
-* Reconcile: When detecting a local move, keep the local mtime
-* Wizard enhancement
-* FolderMan::checkPathValidityForNewFolder: make sure to work when fold…
-* Update: Report on readdir() errors #6610
-* Use encode()/decode() with Python 3 only
-* Sqlite: Update bundled version to 3.24.0
-* Do not require server replies to contain an mtime
-* Settings: Attempt to fix rename issue on old macOS
-* Support higher resolution theme icons
-* OAuth: Fix infinite loop when the refresh token is expired
-* Windows: Don't ignore files with FILE_ATTRIBUTE_TEMPORARY
-* Data-Fingerprint: Fix backup detection when fingerprint is empty
-* Nautilus: Fix GET_MENU_ITEMS with utf8 filenames #6643
-* Windows: Release handle/fd when file open fails #6699
-* SettingsDialog: Show the page for the newly created account
-* Updates submodule qtmacgoodies.
-* Fixes #665 Adds slot for confirmShare button.
-* Rename INSTALL to INSTALL.md for Preview :)
-* Add cmake temporary stuff
-* Inform user that configuration is not writable
-* Uses QByteArray to store private key.
-* Fix cmake command for linux in README too
-* Build fix: remove an unused QtSvg/QSvgRenderer include
-* Qtkeychain: 0.8.0 -> 0.9.1
-* Setup wizard: implement an animated and interactive slide show
-* Theming for general settings ui
-* Make the "Add Folder Sync Connection" button act like a button
-* Allow to use the login flow with a self signed certificate
-* Fix warning in ShareUserGroupWidget
-* Copy over config file to new location on windows
-* Update to translate strings
-* Migrate http auth to webflow
-* Margins
-* Qt 5.5 compatibility patch for Xenial
-* Fix cmake build of documentation
-* Use Nextcloud
-* Update isntaller background for OSX
-* Fix ActivityWidget palette
-* SettingsDialog: disable unnecessary wrapping for the about label
-* Added default scheme when server returns just a host
-* Removed explicit initialization; Fixed RAND_bytes not found
-* Actually open the activity view on a click for more info
-* Use a format that supports alpha channels for avatars
-* L10n. Added space for correct grammar.
-
-
-2.4 Series ChangeLog
-====================
+ChangeLog
+=========
 
 version 2.4.1 (2017-02-xx)
 * Ignore files with file names that can't be encoded for the filesystem (#6287, #5676, #5719)
@@ -247,10 +114,6 @@ version 2.4.0 (2017-12-21)
 * Compile with stack-smashing protection
 * Updater: Rudimentary support for beta channel (#6048)
 
-
-2.3 Series ChangeLog
-====================
-
 version 2.3.4 (2017-11-02)
 * Checksums: Use addData function to avoid endless loop CPU load issues with Office files
 * Packaging: Require ZLIB
@@ -321,10 +184,6 @@ version 2.3.0 (2017-03-03)
 * Improved documentation
 * Crash fixes
 
-
-2.2 Series ChangeLog
-====================
-
 version 2.2.4 (release 2016-09-27)
 * Dolphin Plugin: Use the Application name for the socket path (#5172)
 * SyncEngine: Fix renaming of folder when file are changed (#5195)
@@ -389,10 +248,6 @@ version 2.2.0 (release 2016-05-12)
  * Update of QtKeyChain to support Windows credential store
  * Packaging of dolphin overlay icon module for bleeding edge distros
 
-
-2.1 Series ChangeLog
-====================
-
 version 2.1.1 (release 2016-02-10)
  * UI improvements for HiDPI screens, error messages, RTL languages
  * Fix occurences of "Connection Closed" when a new unauthenticated TCP socket is used
@@ -426,8 +281,8 @@ version 2.1 (release 2015-12-03)
  * Improved reconnecting after network change/disconnect (#4167 #3969 ...)
  * Improved performance in Windows file system discovery
  * Removed libneon-based propagator. As a consequence, The client can no
-* longer provide bandwith limiting on Linux-distributions where it is
-* using Qt < 5.4
+   longer provide bandwith limiting on Linux-distributions where it is
+   using Qt < 5.4
  * Performance improvements in the logging functions
  * Ensured that local disk space problems are handled gracefully (#2939)
  * Improved handling of checksums: transport validation, db (#3735)
@@ -463,10 +318,6 @@ version 2.1 (release 2015-12-03)
  * Organized patches to our base Qt version into admin/qt/patches
  * Plus: A lot of unmentioned improvements and fixes
 
-
-2.0 Series ChangeLog
-====================
-
 version 2.0.2 (release 2015-10-21)
   * csync_file_stat_s: Save a bit of memory
   * Shibboleth: Add our base user agent to WebKit
@@ -542,10 +393,6 @@ version 2.0.0 (release 2015-08-25)
   * Bandwidth Throttling: Provide automatic limit setting for downloads (#3084)
   * Systray: Workaround for issue with Qt 5.5.0 #3656
 
-
-1.8 Series ChangeLog
-====================
-
 version 1.8.4 (release 2015-07-13)
   * Release to ship a security release of openSSL. No source changes of the ownCloud Client code.
 
@@ -555,7 +402,7 @@ version 1.8.3 (release 2015-06-23)
   * Ignores: Force a remote discovery after ignore list change (#3172)
   * Shibboleth: Avoid crash by letting the webview use its own QNAM (#3359)
   * System Ignores: Removed *.tmp from system ignore again. If a user
-*  wants to ignore *.tmp, it needs to be added to the user ignore list.
+    wants to ignore *.tmp, it needs to be added to the user ignore list.
 
 version 1.8.2 (release 2015-06-08)
  * Improve reporting of server error messages (#3220)
@@ -568,16 +415,16 @@ version 1.8.2 (release 2015-06-08)
  * HTTP: Add the branding name to the UserAgent string
  * ConnectonValidator: Always run with new credentials (#3266)
  * Recall Feature: Admins can trigger an upload of a file from
-* client to server again (#3246)
+   client to server again (#3246)
  * Propagator: Add 'Content-Length: 0' header to MKCOL request (#3256)
  * Switch on checksum verification through branding or config
  * Add ability for checksum verification of up and download
  * Fix opening external links for some labels (#3135)
  * AccountState: Run only a single validator, allow error message
-* overriding (#3236, #3153)
+   overriding (#3236, #3153)
  * SyncJournalDB: Minor fixes and simplificatons
  * SyncEngine: Force re-read of folder Etags for upgrades from
-* 1.8.0 and 1.8.1
+   1.8.0 and 1.8.1
  * Propagator: Limit length of temporary file name (#2789)
  * ShareDialog: Password ui fixes (#3189)
  * Fix startup hang by removing QSettings lock file (#3175)
@@ -598,12 +445,12 @@ version 1.8.2 (release 2015-06-08)
 version 1.8.1 (release 2015-05-07)
  * Make "operation canceled" error a soft error
  * Do not throw an error for files that are scheduled to be removed,
-* but can not be found on the server. #2919
+   but can not be found on the server. #2919
  * Windows: Reset QNAM to proper function after hibernation. #2899 #2895 #2973
  * Fix argument verification of --confdir #2453
  * Fix a crash when accessing a dangling UploadDevice pointer #2984
  * Add-folder wizard: Make sure there is a scrollbar if folder names
-* are too long #2962
+   are too long #2962
  * Add-folder Wizard: Select the newly created folder
  * Activity: Correctly restore column sizes #3005
  * SSL Button: do not crash on empty certificate chain
@@ -611,8 +458,8 @@ version 1.8.1 (release 2015-05-07)
  * Lookup system proxy async to avoid hangs #2993 #2802
  * ShareDialog: Some GUI refinements
  * ShareDialog: On creation of a share always retrieve the share
-* This makes sure that if a default expiration date is set this is reflected
-* in the dialog. #2889
+   This makes sure that if a default expiration date is set this is reflected
+   in the dialog. #2889
  * ShareDialog: Only show share dialog if we are connected.
  * HttpCreds: Fill pw dialog with previous password. #2848 #2879
  * HttpCreds: Delete password from old location. #2186
@@ -621,7 +468,7 @@ version 1.8.1 (release 2015-05-07)
  * ProtocolWidget: Always add seconds to the DateTime locale. #2535
  * Updater: Give context as to which app is about to be updated #3040
  * Windows: Add version information for owncloud.exe. This should help us know
-* what version or build number a crash report was generated with.
+   what version or build number a crash report was generated with.
  * Fix a crash on shutdown in ~SocketApi #3057
  * SyncEngine: Show more timing measurements #3064
  * Discovery: Add warning if returned etag is 0
@@ -644,8 +491,8 @@ version 1.8.1 (release 2015-05-07)
 version 1.8.0 (release 2015-03-17)
  * Mac OS: HIDPI support
  * Support Sharing from desktop: Added a share dialog that can be
-* opened by context menu in the file managers (Win, Mac, Nautilus)
-* Supports public links with password enforcement
+   opened by context menu in the file managers (Win, Mac, Nautilus)
+   Supports public links with password enforcement
  * Enhanced usage of parallel HTTP requests for ownCloud 8 servers
  * Renamed github repository from mirall to client.
  * Mac OS: Use native notification support
@@ -658,7 +505,7 @@ version 1.8.0 (release 2015-03-17)
  * Build with Qt 5.4
  * Dropped libneon dependency if Qt 5.4 is available
  * Keep files open very short, that avoid lock problems on Windows
-* especially with office software but also others.
+   especially with office software but also others.
  * Merged some NetBSD patches
  * Selective sync support for owncloudcmd
  * Reorganize the source repository
@@ -667,17 +514,13 @@ version 1.8.0 (release 2015-03-17)
  * A huge amount of bug fixes in all areas of the client.
  * almost 700 commits since 1.7.1
 
-
-1.7 Series ChangeLog
-====================
-
 version 1.7.1 (release 2014-12-18)
  * Documentation fixes and updates
  * Nautilus Python plugin fixed for Python 3
  * GUI wording fixes plus improved log messages
  * Fix hidning of the database files in the sync directories
  * Compare http download size with the header value to avoid broken
-* downloads, bug #2528
+   downloads, bug #2528
  * Avoid initial ETag fetch job at startup, which is not needed.
  * Add chunk size http header to PUT requests
  * Fixed deteteCookie method of our CookieJar, fix for Shibboleth
@@ -700,20 +543,21 @@ version 1.7.1 (release 2014-12-18)
  * Win32: Improve reliability of Installer, fix removal of Shell Extensions
 
 version 1.7.0 (release 2014-11-07)
+
  * oC7 Sharing: Handle new sharing options of ownCloud 7 correctly.
  * Added Selective sync: Ability to unselect server folders which are
-* excluded from syncing, plus GUI and setup GUI
+   excluded from syncing, plus GUI and setup GUI
  * Added overlay icons for Windows Explorer, Mac OS Finder and GNOME Nautilus.
-* Information is provided by the client via a local socket / named pipe API
-* which provides information about the sync status of files.
+   Information is provided by the client via a local socket / named pipe API
+   which provides information about the sync status of files.
  * Improved local change detection: consider file size, detect files
-* with ongoing changes and do not upload immediately
+   with ongoing changes and do not upload immediately
  * Improved HTTP request timeout handler: all successful requests reset
-* the timeout counter
+   the timeout counter
  * Improvements for syncing command line tool: netrc support, improved
-* SSL support, non interactive mode
+   SSL support, non interactive mode
  * Permission system: ownCloud 7 delivers file and folder permissions,
-* added ability to deal with it for shared folders and more.
+   added ability to deal with it for shared folders and more.
  * Ignore handling: Do not recurse into ignored or excluded directories
  * Major sync journal database improvements for more stability and performance
  * New library interface to sqlite3
@@ -722,40 +566,35 @@ version 1.7.0 (release 2014-11-07)
  * Improved logging: more useful meta info, removed noise
  * Updated to latest Qt5 versions on Windows and OS X
  * Fixed data loss when renaming a download temporary fails and there was
-* a conflict at the same time.
+   a conflict at the same time.
  * Fixed missing warnings about reusing a sync folder when the back button
-* was used in the advanced folder setup wizard.
+   was used in the advanced folder setup wizard.
  * The 'Retry Sync' button now also restarts all downloads.
  * Clean up temporary downloads and some extra database files when wiping a
-* folder.
+   folder.
  * OS X: Sparkle update to provide pkg format properly
  * OS X: Change distribution format from dmg to pkg with new installer.
  * Windows: Fix handling of filenames with trailing dot or space
  * Windows: Don't use the wrong way to get file mtimes in the legacy propagator.
 
-
-
-1.6 Series ChangeLog
-====================
-
 version 1.6.4 (release 2014-10-22)
  * Fix startup logic, fixes bug #1989
  * Fix raise dialog on X11
  * Win32: fix overflow when computing the size of file > 4GiB
  * Use a fixed function to get files modification time, the
-* original one was broken for certain timezone issues, see
-* core bug #9781 for details
+   original one was broken for certain timezone issues, see
+   core bug #9781 for details
  * Added some missing copyright headers
  * Avoid data corruption due to wrong error handling, bug #2280
  * Do improved request timeout handling to reduce the number of
-* timed out jobs, bug #2155
-* version 1.6.3 (release 2014-09-03)
+   timed out jobs, bug #2155
+   version 1.6.3 (release 2014-09-03)
  * Fixed updater on OS X
  * Fixed memory leak in SSL button that could lead to quick memory draining
  * Fixed upload problem with files >4 GB
  * MacOSX, Linux: Bring Settings window to front properly
  * Branded clients: If no configuration is detected, try to import the data
-*  from a previously configured community edition.
+    from a previously configured community edition.
 
 version 1.6.2 (release 2014-07-28 )
  * Limit the HTTP buffer size when downloading to limit memory consumption.
@@ -763,7 +602,7 @@ version 1.6.2 (release 2014-07-28 )
  * Fix local file name clash detection for MacOSX.
  * Limit maximum wait time to ten seconds in network limiting.
  * Fix data corruption while trying to resume and the server does
-* not support it.
+   not support it.
  * HTTP Credentials: Read password from legacy place if not found.
  * Shibboleth: Fix the waiting curser that would not disapear (#1915)
  * Limit memory usage to avoid mem wasting and crashes
@@ -777,18 +616,18 @@ version 1.6.1 (release 2014-06-26 )
  * Fix openSSL problems for windows deployment
  * Fix syncing a folder with '#' in the name
  * Fix #1845: do not update parent directory etag before sub
-* directories are removed
+   directories are removed
  * Fix reappearing directories if dirs are removed during its
-* upload
+   upload
  * Fix app version in settings dialog, General tab
  * Fix crash in FolderWizard when going offline
  * Shibboleth fixes
  * More specific error messages (file remove during upload, open
-* local sync file)
+   local sync file)
  * Use QSet rather than QHash in SyncEngine (save memory)
  * Fix some memory leaks
  * Fix some thread race problems, ie. wait for neon thread to finish
-* before the propagator is shut down
+   before the propagator is shut down
  * Fix a lot of issues and warnings found by Coverity
  * Fix Mac some settings dialog problems
 
@@ -811,16 +650,16 @@ version 1.6.0 (release 2014-05-30 )
  * Introduce a general timeout of 300s for network operations
  * Improve error handling, blacklisting
  * Job-based change propagation, enables faster parallel up/downloads
-* (right now only if no bandwidth limit is set and no proxy is used)
+   (right now only if no bandwidth limit is set and no proxy is used)
  * Significantly reduced CPU load when checking for local and remote changes
  * Speed up file stat code on Windows
  * Enforce Qt5 for Windows and Mac OS X builds
  * Improved owncloudcmd: SSL support, documentation
  * Added advanced logging of operations (file .???.log in sync
-* directory)
+   directory)
  * Avoid creating a temporary copy of the sync database (.ctmp)
  * Enable support for TLS 1.2 negotiation on platforms that use
-* Qt 5.2 or later
+   Qt 5.2 or later
  * Forward server exception messages to client error messages
  * Mac OS X: Support Notification Center in OS X 10.8+
  * Mac OS X: Use native settings dialog
@@ -829,15 +668,11 @@ version 1.6.0 (release 2014-05-30 )
  * Remove vio abstraction in csync
  * Avoid data loss when a client file system is not case sensitive
 
-
-1.5 Series ChangeLog
-====================
-
 version 1.5.3 (release 2014-03-10 )
   * Fix usage of proxies after first sync run (#1502, #1524, #1459, #1521)
   * Do not wipe the credentials from config for reconnect (#1499, #1503)
   * Do not erase the full account config if an old version of the client stored
-*  the password (related to above)
+    the password (related to above)
   * Fix layout of the network tab (fixes #1491)
   * Handle authentication requests by a Shibboleth IdP
   * Shibboleth: If no connection is available, don't open the login window
@@ -866,34 +701,34 @@ version 1.5.2 (release 2014-02-26 )
 
 version 1.5.1 (release 2014-02-13 )
   * Added an auto updater that updates the client if a
-*  more recent version was found automatically (Windows, Mac OS X)
+    more recent version was found automatically (Windows, Mac OS X)
   * Added a button to the account dialog that gives information
-*  about the encryption layer used for communication, plus a
-*  certificate information widget
+    about the encryption layer used for communication, plus a
+    certificate information widget
   * Preserve the permission settings of local files rather than
-*  setting them to a default (Bug #820)
+    setting them to a default (Bug #820)
   * Handle windows lnk files correctly (Bug #1307)
   * Detect removes and renames in read only shares and
-*  restore the gone away files. (Bug #1386)
+    restore the gone away files. (Bug #1386)
   * Fixes sign in/sign out and password dialog. (Bug #1353)
   * Fixed error messages (Bug #1394)
   * Lots of fixes for building with Qt5
   * Changes to network limits are now also applied during a
-*  sync run
+    sync run
   * Fixed mem leak after via valgrind on Mac
   * Imported the ocsync library into miralls repository.
-*  Adopted all build systems and packaging to that.
+    Adopted all build systems and packaging to that.
   * Introduce a new linux packaging scheme following the
-*  debian upstream scheme
+    debian upstream scheme
   * Use a refactored Linux file system watcher based on
-*  inotify, incl. unit tests
+    inotify, incl. unit tests
   * Wizard: Gracefully fall back to HTTP if HTTPS connection
-*  fails, issuing a warning
+    fails, issuing a warning
   * Fixed translation misses in the propagator
   * Fixes in proxy configuration
   * Fixes in sync journal handling
   * Fix the upload progress if the local source is still
-*  changing when the upload begins.
+    changing when the upload begins.
   * Add proxy support to owncloud commandline client
   * NSIS fixes
   * A lot of other fixes and minor improvements
@@ -930,10 +765,6 @@ version 1.5.0 (release 2013-12-12 ), csync 0.91.4 required
   * Windows: Fix rename of temporary files
   * Windows: Fix move file operation
 
-
-1.4 Series ChangeLog
-====================
-
 version 1.4.2 (release 2013-10-18 ), csync 0.90.4 required
   * Do not show the warning icon in the tray (#944)
   * Fix manual proxy support when switching (#1016)
@@ -949,11 +780,12 @@ version 1.4.2 (release 2013-10-18 ), csync 0.90.4 required
   * Progress: Show number of deletes.
 
 version 1.4.1 (release 2013-09-24 ), csync 0.90.1 required
+
   * Translation and documentation fixes.
   * Fixed error display in settings/status dialog, displays multi
-*  line error messages now correctly.
+    line error messages now correctly.
   * Wait up to 30 secs before complaining about missing systray
-*  Fixes bug #949
+    Fixes bug #949
   * Fixed utf8 issues with basic auth authentication, fixes bug #941
   * Fixed remote folder selector, avoid recursive syncing, fixes bug #962
   * Handle and display network problems at startup correctly.
@@ -970,6 +802,7 @@ version 1.4.1 (release 2013-09-24 ), csync 0.90.1 required
   * Various minor code fixes
 
 version 1.4.0 (release 2013-09-04 ), csync 0.90.0 required
+
   * New Scheduler: Only sync when there are actual changes in the server
   * Add a Settings Dialog, move Proxy Settings there
   * Transform folder Status Dialog into Account Settings, provide feedback via context menu
@@ -980,7 +813,7 @@ version 1.4.0 (release 2013-09-04 ), csync 0.90.0 required
   * Move ability to switch to mono icons from a switch to a Settings option
   * Add "Launch on System Startup" GUI option
   * Add "Show Desktop Nofications"GUI option (enabled by default)
-*  top optionally disable sync notifications
+    top optionally disable sync notifications
   * Add Help item, pointing to online reference
   * Implement graphical selection of remote folders in FolderWizard
   * Allow custom ignore patterns
@@ -999,14 +832,11 @@ version 1.4.0 (release 2013-09-04 ), csync 0.90.0 required
   * Require Qt 4.7
   * Known issue: Under certain conditions, a file will only get uploaded after up to five minutes
 
-
-1.3 Series ChangeLog
-====================
-
 version 1.3.0 (release 2013-06-25 ), csync 0.80.0 required
+
   * Default proxy port to 8080
   * Don't lose proxy settings when changing passwords
-  * Support SOCKS5 proxy (useful in combination with ssh* *D)
+  * Support SOCKS5 proxy (useful in combination with ssh   *D)
   * Propagate proxy changes to csync at runtime
   * Improve proxy wizard
   * Display proxy errors
@@ -1022,7 +852,7 @@ version 1.3.0 (release 2013-06-25 ), csync 0.80.0 required
   * Remove journal when reusing a directory that used to have a journal before
   * Visual clean up of status dialog items
   * Wizard: When changing the URL or user name, allow the user to push his data
-*  to the new location or wipe the folder and start from scratch
+    to the new location or wipe the folder and start from scratch
   * Wizard: Make setting a custom folder as a sync target work again
   * Fix application icon
   * User-Agent now contains "Mozilla/5.0" and the Platform name (for firewall/proxy compat)
@@ -1030,10 +860,6 @@ version 1.3.0 (release 2013-06-25 ), csync 0.80.0 required
   * New setup wizard, defaulting to root syncing (only for new setups)
   * Improved thread stop/termination
 
-
-1.2 Series ChangeLog
-====================
-
 version 1.2.5 (release 2013-04-23 ), csync 0.70.7 required
   * [Fixes] NSIS installer fixes
   * [Fixes] Fix crash race by making certificateChain() thread safe
@@ -1099,10 +925,6 @@ version 1.2.0 (release 2013-01-24 ), csync 0.70.2 required
   * [Platform] cmake fixes.
   * [Platform] Improved, more detailed error reporting.
 
-
-1.1 Series ChangeLog
-====================
-
 version 1.1.4 (release 2012-12-19 ), csync 0.60.4 required
   * No changes to mirall, only csync fixes.
 
@@ -1112,7 +934,7 @@ version 1.1.3 (release 2012-11-30 ), csync 0.60.3 required
 version 1.1.2 (release 2012-11-26 ), csync 0.60.2 required
   * [Fixes] Allow to properly cancel the password dialog.
   * [Fixes] Share folder name correctly percent encoded with old Qt
-* * * * 4.6 builds ie. Debian.
+            4.6 builds ie. Debian.
   * [Fixes] If local sync dir is not existing, create it.
   * [Fixes] lots of other minor fixes.
   * [GUI] Display error messages in status dialog.
@@ -1120,30 +942,30 @@ version 1.1.2 (release 2012-11-26 ), csync 0.60.2 required
   * [GUI] Show username for connection in statusdialog.
   * [GUI] Show intro wizard on new connection setup.
   * [APP] Use CredentialStore to better support various credential
-* * *  backends.
+          backends.
   * [APP] Handle missing local folder more robust: Create it if
-* * *  missing instead of ignoring.
+          missing instead of ignoring.
   * [APP] Simplify treewalk code.
   * [Platform] Fix Mac building
 
 version 1.1.1 (release 2012-10-18), csync 0.60.1 required
-  * [GUI]* Allow changing folder name in single folder mode
-  * [GUI]* Windows: Add license to installer
-  * [GUI]* owncloud --logwindow will bring up the log window
-* * * * in an already running instance
+  * [GUI]   Allow changing folder name in single folder mode
+  * [GUI]   Windows: Add license to installer
+  * [GUI]   owncloud --logwindow will bring up the log window
+            in an already running instance
   * [Fixes] Make sure SSL errors are always handled
   * [Fixes] Allow special characters in folder alias
   * [Fixes] Proper workaround for Menu bug in Ubuntu
   * [Fixes] csync: Fix improper memory cleanup which could
-* * * * cause memory leaks and crashes
+            cause memory leaks and crashes
   * [Fixes] csync: Fix memory leak
   * [Fixes] csync: Allow single quote (') in file names
   * [Fixes] csync: Remove stray temporary files
 
-  * [GUI]* Reworked tray context menu.
-  * [GUI]* Users can now sync the server root folder.
+  * [GUI]   Reworked tray context menu.
+  * [GUI]   Users can now sync the server root folder.
   * [Fixes] Proxy support: now supports Proxy Auto-Configuration (PAC)
-* * * * on Windows, reliability fixes across all OSes.
+            on Windows, reliability fixes across all OSes.
   * [Fixes] Url entry field in setup assistant handles http/https correctly.
   * [Fixes] Button enable state in status dialog.
   * [Fixes] Crash fixed on ending the client, tray icon related.
@@ -1156,15 +978,11 @@ version 1.1.1 (release 2012-10-18), csync 0.60.1 required
   * [Platform] Windows: ownCloud gets added to autorun by default.
   * [Platform] insert correct version info from cmake.
   * [Platform] csync conf file and database were moved to the users app data
-* * * * * directory, away from the .csync dir.
-  ** * * Renamed exclude.lst to sync-exclude.lst and moved it to
-* * * * /etc/appName()/ for more clean packaging. From the user path,
-* * * * still exclude.lst is read if sync-exclude.lst is not existing.
-  ** * * Placed custom.ini with customization options to /etc/appName()
-
-
-1.0 Series ChangeLog
-====================
+               directory, away from the .csync dir.
+  *         Renamed exclude.lst to sync-exclude.lst and moved it to
+            /etc/appName()/ for more clean packaging. From the user path,
+            still exclude.lst is read if sync-exclude.lst is not existing.
+  *         Placed custom.ini with customization options to /etc/appName()
 
 version 1.0.5 (release 2012-08-14), csync 0.50.8 required
   * [Fixes] Fixed setup dialog: Really use https if checkbox is activated.
@@ -1182,23 +1000,23 @@ version 1.0.4 (release 2012-08-10), csync 0.50.8 required
   * [GUI] Removed Log Window Button, log available through command line.
   * [GUI] Proxy configuration dialog added.
   * [GUI] Added Translations to languages Slovenian, Polish, Catalan,
-* * *  Portuguese (Brazil), German, Greek, Spanish, Czech, Italian, Slovak,
-* * *  French, Russian, Japanese, Swedish, Portuguese (Portugal)
-* * *  all with translation rate >90%.
+          Portuguese (Brazil), German, Greek, Spanish, Czech, Italian, Slovak,
+          French, Russian, Japanese, Swedish, Portuguese (Portugal)
+          all with translation rate >90%.
   * [Fixes] Loading of self signed certs into Networkmanager (#oc-843)
   * [Fixes] Win32: Handle SSL dll loading correctly.
   * [Fixes] Many other small fixes and improvements.
 
 version 1.0.3 (release 2012-06-19), csync 0.50.7 required
   * [GUI] Added a log window which catches the logging if required and
-* * *  allows to save for information.
+          allows to save for information.
   * [CMI] Added options --help, --logfile and --logflush
   * [APP] Allow to specify sync frequency in the config file.
   * [Fixes] Do not use csync database files from a sync before.
   * [Fixes] In Connection wizard, write the final config onyl if
-* * * * the user really accepted. Also remove the former database.
+            the user really accepted. Also remove the former database.
   * [Fixes] More user expected behaviour deletion of sync folder local
-* * * * and remote.
+            and remote.
   * [Fixes] Allow special characters in the sync directory names
   * [Fixes] Win32: Fixed directory removal with special character dirs.
   * [Fixes] MacOS: Do not flood the system log any more
@@ -1217,7 +1035,7 @@ version 1.0.2 (release 2012-05-18), csync 0.50.6 required
   * [Fixes] Dialogs comes to front on click
   * [Fixes] Open local sync folder from tray and status for win32
   * [Fixes] Load exclude.lst correctly on MacOSX
-*  + csync fixes.
+    + csync fixes.
 
 version 1.0.1 (release 2012-04-18), csync 0.50.5 required
   * [Security] Support SSL Connections

NEXTCLOUD.cmake

@@ -3,10 +3,8 @@ set( APPLICATION_SHORTNAME  "Nextcloud" )
 set( APPLICATION_EXECUTABLE "nextcloud" )
 set( APPLICATION_DOMAIN     "nextcloud.com" )
 set( APPLICATION_VENDOR     "Nextcloud GmbH" )
-set( APPLICATION_UPDATE_URL "https://updates.nextcloud.org/client/" CACHE STRING "URL for updater" )
-set( APPLICATION_HELP_URL   "" CACHE STRING "URL for the help menu" )
+set( APPLICATION_UPDATE_URL "https://updates.nextcloud.org/client/" CACHE string "URL for updater" )
 set( APPLICATION_ICON_NAME  "Nextcloud" )
-set( APPLICATION_SERVER_URL "" CACHE STRING "URL for the server to use. If entered the server can only connect to this instance" )
 
 set( LINUX_PACKAGE_SHORTNAME "nextcloud" )
 
@@ -20,14 +18,7 @@ set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-back
 # set( APPLICATION_LICENSE    "${OEM_THEME_DIR}/license.txt )
 
 option( WITH_CRASHREPORTER "Build crashreporter" OFF )
-#set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE STRING "URL for crash reporter" )
+#set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE string "URL for crash reporter" )
 #set( CRASHREPORTER_ICON ":/owncloud-icon.png" )
 
 option( WITH_PROVIDERS "Build with providers list" ON )
-
-
-## Theming options
-set( APPLICATION_WIZARD_HEADER_BACKGROUND_COLOR "#0082c9" CACHE STRING "Hex color of the wizard header background")
-set( APPLICATION_WIZARD_HEADER_TITLE_COLOR "#ffffff" CACHE STRING "Hex color of the text in the wizard header")
-option( APPLICATION_WIZARD_USE_CUSTOM_LOGO "Use the logo from ':/client/theme/colored/wizard_logo.png' else the default application icon is used" ON )
-

README.md

@@ -17,34 +17,34 @@ with your computer.
 
 ##### Clone the repo and create build directory
 ```
-$ git clone https://github.com/nextcloud/desktop.git
+$ git clone git@github.com:nextcloud/desktop.git
 $ cd desktop
 $ mkdir build
-$ cd build
 ```
 ##### Compile and install
 
-:warning: For development reasons it is better to **install the client on user space** instead on the global system. Mixing up libs/dll's of different version can lead to undefined behavior and crashes:
-
-* You could use the **cmake flag** ```CMAKE_INSTALL_PREFIX``` as ```~/.local/``` in a **Linux** system. If you want to install system wide you could use ```/usr/local``` or ```/opt/nextcloud/```.
-
-* On **Windows 10** [```$USERPROFILE```](https://docs.microsoft.com/en-us/windows/deployment/usmt/usmt-recognized-environment-variables#a-href-idbkmk-2avariables-that-are-recognized-only-in-the-user-context) refers to ```C:\Users\<USERNAME>```.
-
-##### Linux & Mac OS
+##### Linux
 
 ```
-$ cmake .. -DCMAKE_INSTALL_PREFIX=~/nextcloud-desktop-client -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
+$ cmake .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
 $ make install
 ```
 
 ##### Windows
 
 ```
-$ cmake -G "Visual Studio 15 2017 Win64" .. -DCMAKE_INSTALL_PREFIX=$USERPROFILE\nextcloud-desktop-client -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
+$ cmake -G "Visual Studio 15 2017 Win64" .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
 $ cmake --build . --config Debug --target install
 ```
 
-:information_source: More detailed instructions can be found at the [Desktop Client Wiki](https://github.com/nextcloud/desktop/wiki).
+##### Mac OS
+
+```
+$ cmake .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
+$ make install
+```
+
+More detailed instructions can be found at the [Desktop Client Wiki](https://github.com/nextcloud/desktop/wiki).
 
 ### :inbox_tray: Where to find binaries to download
 
@@ -69,8 +69,6 @@ of your report being lost. :boom:
 
 - If you created a patch :heart_eyes:, please submit a [Pull
 Request](https://github.com/nextcloud/client/pulls).
-- How to create a pull request? This guide will help you get started: [Opening a pull request](https://opensource.guide/how-to-contribute/#opening-a-pull-request) :heart:
-
 
 ## :satellite: Contact us
 
@@ -101,3 +99,5 @@ https://github.com/nextcloud/desktop.
     WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
     or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
     for more details.
+
+

VERSION.cmake

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

admin/linux/build-appimage.sh

@@ -5,8 +5,8 @@ set -xe
 mkdir /app
 mkdir /build
 
-#Set Qt-5.12
-export QT_BASE_DIR=/opt/qt512
+#Set Qt-5.11
+export QT_BASE_DIR=/opt/qt511
 export QTDIR=$QT_BASE_DIR
 export PATH=$QT_BASE_DIR/bin:$PATH
 export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH
@@ -18,11 +18,11 @@ if [ $SUFFIX != "master" ]; then
     SUFFIX="PR-$SUFFIX"
 fi
 
-#QtKeyChain 0.9.1
+#QtKeyChain 0.8.0
 cd /build
 git clone https://github.com/frankosterfeld/qtkeychain.git
 cd qtkeychain
-git checkout v0.9.1
+git checkout v0.8.0
 mkdir build
 cd build
 cmake -D CMAKE_INSTALL_PREFIX=/usr ../

admin/linux/debian/debian.bionic/control

@@ -13,7 +13,6 @@ Build-Depends: cmake,
                libhttp-dav-perl,
                libinotify-dev [kfreebsd-any],
                libqt5webkit5-dev,
-               libqt5svg5-dev,
                libsqlite3-dev,
                libssl-dev (>> 1.0.0),
                zlib1g-dev,
@@ -34,8 +33,7 @@ Homepage: https://github.com/nextcloud/client_theming
 
 Package: nextcloud-client
 Architecture: any
-Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, nextcloud-client-l10n
-Recommends: libgnome-keyring0
+Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgnome-keyring0, nextcloud-client-l10n
 Description: Nextcloud desktop sync client
  Use the desktop client to keep your files synchronized
  between your Nextcloud server and your desktop. Select

admin/linux/debian/debian.cosmic/changelog

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

admin/linux/debian/debian.cosmic/control

@@ -8,14 +8,13 @@ Build-Depends: cmake,
                dh-python,
                extra-cmake-modules (>= 5.16),
                kdelibs5-dev,
-               libkf5kio-dev,
+               kio-dev,
                libcmocka-dev,
                libhttp-dav-perl,
                libinotify-dev [kfreebsd-any],
-               libqt5svg5-dev,
                libqt5webkit5-dev,
                libsqlite3-dev,
-               libssl-dev (>= 1.1.0),
+               libssl-dev (>> 1.0.0),
                zlib1g-dev,
                optipng,
                pkg-kde-tools,
@@ -34,7 +33,7 @@ Homepage: https://github.com/nextcloud/client_theming
 
 Package: nextcloud-client
 Architecture: any
-Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, nextcloud-client-l10n
+Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgnome-keyring0, nextcloud-client-l10n
 Description: Nextcloud desktop sync client
  Use the desktop client to keep your files synchronized
  between your Nextcloud server and your desktop. Select

admin/linux/debian/debian.eoan/changelog

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

admin/linux/debian/debian.stable/control

@@ -13,9 +13,8 @@ Build-Depends: cmake,
                libhttp-dav-perl,
                libinotify-dev [kfreebsd-any],
                libqt5webkit5-dev,
-               libqt5svg5-dev,
                libsqlite3-dev,
-               libssl-dev (>= 1.1.0),
+               libssl-dev (>> 1.0.0),
                zlib1g-dev,
                optipng,
                pkg-kde-tools,

admin/linux/debian/debian.xenial/post-patches/libssl.patch

@@ -1,11 +0,0 @@
---- nextcloud-client-2.5.0.orig/CMakeLists.txt	2018-08-13 16:19:57.191634632 +0200
-+++ nextcloud-client-2.5.0/CMakeLists.txt	2018-08-13 16:20:05.167612238 +0200
-@@ -183,7 +183,7 @@
-     endif()
-     find_package(Sphinx)
-     find_package(PdfLatex)
--    find_package(OpenSSL 1.1 REQUIRED )
-+    find_package(OpenSSL 1.0 REQUIRED )
- 
-    find_package(ZLIB REQUIRED)
-    find_package(GLib2)

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

@@ -1,12 +0,0 @@
---- nextcloud-client-2.5.3.orig/src/3rdparty/kmessagewidget/kmessagewidget.cpp	2019-07-26 18:40:34.949349387 +0000
-+++ nextcloud-client-2.5.3/src/3rdparty/kmessagewidget/kmessagewidget.cpp	2019-07-26 18:41:39.866478051 +0000
-@@ -105,6 +105,9 @@
-     q->setMessageType(KMessageWidget::Information);
- }
- 
-+template <typename T>
-+constexpr typename std::add_const<T>::type &qAsConst(T &t) noexcept { return t; }
-+
- void KMessageWidgetPrivate::createLayout()
- {
-     delete content->layout();

admin/linux/debian/debian/control

@@ -8,14 +8,13 @@ Build-Depends: cmake,
                dh-python,
                extra-cmake-modules (>= 5.16),
                kdelibs5-dev,
-               libkf5kio-dev,
+               kio-dev,
                libcmocka-dev,
                libhttp-dav-perl,
                libinotify-dev [kfreebsd-any],
-               libqt5svg5-dev,
                libqt5webkit5-dev,
                libsqlite3-dev,
-               libssl-dev (>= 1.1.0),
+               libssl-dev (>> 1.0.0),
                zlib1g-dev,
                optipng,
                pkg-kde-tools,
@@ -34,7 +33,8 @@ Homepage: https://github.com/nextcloud/client_theming
 
 Package: nextcloud-client
 Architecture: any
-Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgnome-keyring0, nextcloud-client-l10n
+Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, nextcloud-client-l10n
+Recommends: libgnome-keyring0
 Description: Nextcloud desktop sync client
  Use the desktop client to keep your files synchronized
  between your Nextcloud server and your desktop. Select

admin/linux/debian/drone-build.sh

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

admin/linux/debian/scripts/git2changelog.py

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

admin/osx/CMakeLists.txt

@@ -16,3 +16,5 @@ configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
 configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
 configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)
 configure_file(post_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/post_install.sh)
+configure_file(fuse/FUSE\ for\ macOS\ 3.8.1.pkg ${CMAKE_CURRENT_BINARY_DIR}/fuse/FUSE\ for\ macOS\ 3.8.1.pkg COPYONLY)
+configure_file(fuse/settings.plist ${CMAKE_CURRENT_BINARY_DIR}/fuse/settings.plist  COPYONLY)

admin/osx/fuse/FUSE for Linux Website.webloc

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>URL</key>
+	<string>https://github.com/libfuse/libfuse</string>
+</dict>
+</plist>

admin/osx/fuse/FUSE for macOS Website.webloc

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>URL</key>
+	<string>https://osxfuse.github.io</string>
+</dict>
+</plist>

admin/osx/fuse/Uninstaller.app/Contents/Info.plist

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleAllowMixedLocalizations</key>
+	<true/>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>Uninstaller</string>
+	<key>CFBundleExecutable</key>
+	<string>applet</string>
+	<key>CFBundleIconFile</key>
+	<string>Uninstaller</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Uninstaller</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>aplt</string>
+	<key>LSMinimumSystemVersionByArchitecture</key>
+	<dict>
+		<key>x86_64</key>
+		<string>10.6</string>
+	</dict>
+	<key>LSRequiresCarbon</key>
+	<true/>
+	<key>LSUIElement</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © Benjamin Fleischer. All rights reserved.</string>
+</dict>
+</plist>

admin/osx/fuse/Uninstaller.app/Contents/PkgInfo

@@ -0,0 +1 @@
+APPLaplt

admin/osx/fuse/Uninstaller.app/Contents/Resources/English.lproj/Localizable.strings

@@ -0,0 +1,10 @@
+"welcome_text" = "Remove FUSE for macOS?";
+"welcome_message" = "In case FUSE for macOS was installed using a package manager (e.g. Homebrew, MacPorts), please follow the instructions provided by the package manager for removing FUSE for macOS.\n\nIt is recommended to restart the Mac once the uninstallation is complete. Would you like to continue?";
+"welcome_no" = "No";
+"welcome_yes" = "Yes";
+
+"uninstaller_successful_text" = "Uninstallation successful";
+"uninstaller_successful_message" = "FUSE for macOS has been sucessfully removed.";
+
+"uninstaller_failed_text" = "Uninstallation failed";
+"uninstaller_failed_message" = "FUSE for macOS could not be removed due to an unknown error.";

admin/osx/fuse/Uninstaller.app/Contents/Resources/German.lproj/Localizable.strings

@@ -0,0 +1,10 @@
+"welcome_text" = "FUSE for macOS entfernen?";
+"welcome_message" = "Falls FUSE for macOS mit Hilfe eines Paket Managers (z.B. Homebrew, MacPorts) installiert wurde, folgen Sie bitte den Anweisungen des Paket Managers, um FUSE for macOS zu entfernen.\n\nEs wird empfohlen den Mac nach Abschluss der Deinstallation neu zu starten. Möchten Sie fortfahren?";
+"welcome_no" = "Nein";
+"welcome_yes" = "Ja";
+
+"uninstaller_successful_text" = "Deinstallation erfolgreich";
+"uninstaller_successful_message" = "FUSE for macOS wurde erfolgreich entfernt.";
+
+"uninstaller_failed_text" = "Deinstallation fehlgeschlagen";
+"uninstaller_failed_message" = "Bei der Deinstallation von FUSE for macOS ist ein unbekannter Fehler aufgetreten.";

admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/array.sh

@@ -0,0 +1,247 @@
+#!/bin/bash
+
+# Copyright (c) 2011-2014 Benjamin Fleischer
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+# 3. Neither the name of the copyright holder nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# Requires common.sh
+# Requires math.sh
+# Requires string.sh
+
+
+function array_is_array
+{
+    if common_is_variable "${1}"
+    then
+        [[ "`declare -p "${1}" 2> /dev/null`" =~ ^"declare -"[^=]{0,}"a"[^=]{0,}" ${1}=" ]]
+    else
+        return 1
+    fi
+}
+
+function array_create
+{
+    common_assert "common_variable_is_legal_name `string_escape "${1}"`"
+
+    eval "${1}=()"
+}
+
+function array_size
+{
+    common_assert "array_is_array `string_escape "${1}"`"
+
+    eval "printf \"%u\" \${#${1}[@]}"
+}
+
+function array_get
+{
+    if [[ -z "${3}" ]]
+    then
+        common_assert "common_is_variable `string_escape "${1}"`"
+        common_assert "math_is_integer `string_escape "${2}"` && [[ ${2} -ge 0 ]]"
+
+        eval "string_escape \"\${${1}[${2}]}\""
+    else
+        common_assert "common_is_variable `string_escape "${3}"`"
+
+        eval "${3}=`array_get "${1}" "${2}"`"
+    fi
+}
+
+function array_set
+{
+    common_assert "common_is_variable `string_escape "${1}"`"
+    common_assert "math_is_integer `string_escape "${2}"` && [[ ${2} -ge 0 ]]"
+
+    eval "${1}[${2}]=`string_escape "${3}"`"
+}
+
+function array_append
+{
+    common_assert "common_is_variable `string_escape "${1}"`"
+
+    eval "${1}+=(`string_escape "${2}"`)"
+}
+
+function array_get_elements
+{
+    common_assert "common_is_variable `string_escape "${1}"`"
+
+    function array_get_elements_serialize
+    {
+        local offset=$(( ${#} / 2 + 1 ))
+
+        if [[ ${#} -ge ${offset} ]]
+        then
+            printf '[%q]=%q' "${1}" "${!offset}"
+            shift
+
+            while [[ ${#} -ge ${offset} ]]
+            do
+                printf ' [%q]=%q' "${1}" "${!offset}"
+                shift
+            done
+        fi
+    }
+    eval "array_get_elements_serialize \"\${!${1}[@]}\" \"\${${1}[@]}\""
+
+    local rc=${?}
+    unset -f array_get_elements_serialize
+    return ${rc}
+}
+
+function array_foreach
+{
+    common_assert "common_is_variable `string_escape "${1}"`"
+    common_assert "common_is_function `string_escape "${2}"`"
+    common_assert "[[ ! `string_escape "${2}"` =~ ^array_foreach_ ]]"
+
+    eval "
+        function array_foreach_internal
+        {
+            while [[ \${#} -gt 0 ]]
+            do
+                if ${2} \"\${1}\"
+                then
+                    shift
+                else
+                    return \${?}
+                fi
+            done
+        }
+
+        function array_foreach_wrapper
+        {
+            array_foreach_internal \"\${${1}[@]}\"
+        }
+    " && array_foreach_wrapper
+
+    local rc=${?}
+    unset -f array_foreach_internal
+    unset -f array_foreach_wrapper
+    return ${rc}
+}
+
+function array_contains
+{
+    eval "
+        function array_contains_compare
+        {
+            [[ \"\${1}\" != `string_escape "${2}"` ]]
+        }
+    " && ! array_foreach "${1}" array_contains_compare
+
+    local rc=${?}
+    unset -f array_contains_compare
+    return ${rc}
+}
+
+function array_sort
+{
+    common_assert "common_is_variable `string_escape "${1}"`"
+    common_assert "common_is_function `string_escape "${2}"`"
+    common_assert "[[ ! `string_escape "${2}"` =~ ^array_sort_ ]]"
+    common_assert "[[ `string_escape "${3}"` =~ !? ]]"
+
+    eval "
+        function array_sort_quicksort
+        {
+            local -a left=()
+            local -a right=()
+            local    pivot=""
+
+            if [[ \${#} -eq 0 ]]
+            then
+                return 0
+            fi
+
+            pivot=\"\${1}\"
+            shift
+
+            while [[ \${#} -gt 0 ]]
+            do
+                ${2} \"\${1}\" \"\${pivot}\"
+                if [[ ${3} \${?} -le 1 ]]
+                then
+                    left[\${#left[@]}]=\"\${1}\"
+                else
+                    right[\${#right[@]}]=\"\${1}\"
+                fi
+                shift
+            done
+
+            if [[ \${#left[@]} -gt 0 ]]
+            then
+                array_sort_quicksort \"\${left[@]}\"
+            fi
+            string_escape \"\${pivot}\"
+            printf \"%s\" \"\${IFS}\"
+            if [[ \${#right[@]} -gt 0 ]]
+            then
+                array_sort_quicksort \"\${right[@]}\"
+            fi
+        }
+
+        function array_sort_wrapper
+        {
+            eval \"${1}=(\$(array_sort_quicksort \"\${${1}[@]}\"))\"
+        }
+    " && array_sort_wrapper
+
+    local rc=${?}
+    unset -f array_sort_quicksort
+    unset -f array_sort_wrapper
+    return ${rc}
+}
+
+function array_join
+{
+    common_assert "common_is_variable `string_escape "${1}"`"
+
+    eval "
+        function array_join_internal
+        {
+            printf \"%s\" \"\${1}\"
+            shift
+            while [[ \${#} -gt 0 ]]
+            do
+                printf \"%s%s\" `string_escape "${2:-, }"` \"\${1}\"
+                shift
+            done
+            printf \"\n\"
+        }
+
+        function array_join_wrapper
+        {
+            array_join_internal \"\${${1}[@]}\"
+        }
+    " && array_join_wrapper
+
+    local rc=${?}
+    unset -f array_join_internal
+    unset -f array_join_wrapper
+    return ${rc}
+}

admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/common.sh

@@ -0,0 +1,578 @@
+#!/bin/bash
+
+# Copyright (c) 2011-2014 Benjamin Fleischer
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+# 3. Neither the name of the copyright holder nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# Requires array.sh
+# Requires math.sh
+# Requires string.sh
+
+
+declare -a COMMON_LOG_PREFIX=()
+declare -i COMMON_LOG_VERBOSE=2
+
+
+function common_log_initialize
+{
+    common_log_set_verbose ${COMMON_LOG_VERBOSE}
+}
+
+function common_log_set_verbose
+{
+    local verbose="${1}"
+
+    common_assert "math_is_integer `string_escape "${verbose}"`"
+    common_assert "[[ ${verbose} -gt 0 ]]"
+
+    COMMON_LOG_VERBOSE=${verbose}
+
+    if (( COMMON_LOG_VERBOSE > 4 ))
+    then
+        exec 3>&1
+        exec 4>&2
+    else
+        exec 3> /dev/null
+        exec 4> /dev/null
+    fi
+}
+
+function common_log
+{
+    local -a options=()
+    common_getopt options "v:,verbose:,c:,color:,t,trace,o:,offset:" "${@}"
+    common_die_on_error "${options[@]}"
+
+    set -- "${options[@]}"
+
+    local -i verbose=2
+    local    color=""
+    local -i trace=0
+    local -i trace_offset=0
+
+    while [[ ${#} -gt 0 ]]
+    do
+        case "${1}" in
+            --)
+                shift
+                break
+                ;;
+            -v|--verbose)
+                verbose="${2}"
+                shift 2
+                ;;
+            -c|--color)
+                color="${2}"
+                shift 2
+                ;;
+            -t|--trace)
+                trace=1
+                shift
+                ;;
+            -o|--trace-offset)
+                trace_offset="${2}"
+                shift 2
+                ;;
+        esac
+    done
+
+    if (( verbose > COMMON_LOG_VERBOSE ))
+    then
+        return 0
+    fi
+
+    if [[ -z "${color}" ]]
+    then
+        case ${verbose} in
+            1|2)
+                color="1;30"
+                ;;
+            4)
+                color="0;37"
+                ;;
+            [0-9]+)
+                color="0:30"
+                ;;
+        esac
+    fi
+
+    if (( trace == 1 ))
+    then
+        local -a stack=()
+        local -i i=${trace_offset}
+        local    caller=""
+        local    function=""
+        local    file=""
+        local    line=""
+
+        while caller="`caller ${i}`"
+        do
+            function="`/usr/bin/cut -d " " -f 2 <<< "${caller}"`"
+            file="`/usr/bin/cut -d " " -f 3- <<< "${caller}"`"
+            line="`/usr/bin/cut -d " " -f 1 <<< "${caller}"`"
+
+            array_append stack "at ${function} (${file}, line ${line})"
+
+            (( i++ ))
+        done
+
+        set -- "${@}" "${stack[@]}"
+    fi
+
+    while [[ ${#} -gt 0 ]]
+    do
+        if [[ ${#COMMON_LOG_PREFIX[@]} -gt 0 ]]
+        then
+            printf "%-20s | " "${COMMON_LOG_PREFIX}" >&2
+        fi
+        printf "\033[${color}m%s\033[0m\n" "${1}" >&2
+        shift
+    done
+}
+
+function common_log_variable
+{
+    while [[ ${#} -gt 0 ]]
+    do
+        common_log -v 4 -- "`common_variable_print "${1}"`"
+        shift
+    done
+}
+
+function common_warn
+{
+    common_log -v 1 -c "0;31" -o 1 "${@}"
+}
+
+function common_die
+{
+    if [[ ${#} -eq 0 ]]
+    then
+        set -- "Unspecified error"
+    fi
+
+    common_log -v 1 -c "1;31" -o 1 "${@}"
+    echo -ne "\a" >&2
+
+    if (( BASH_SUBSHELL > 0 ))
+    then
+        kill -SIGTERM 0
+    fi
+    exit 1
+}
+
+function common_assert
+{
+    if [[ -n "${1}" ]]
+    then
+        eval "${1}"
+        if (( ${?} != 0 ))
+        then
+            if [[ -n "${2}" ]]
+            then
+                common_die -t -o 2 "${2}"
+            else
+                common_die -t -o 2 "Assertion '${1}' failed"
+            fi
+        fi
+    fi
+}
+
+function common_die_on_error
+{
+    if (( ${?} != 0 ))
+    then
+        common_die "${@}"
+    fi
+}
+
+function common_warn_on_error
+{
+    if (( ${?} != 0 ))
+    then
+        common_warn "${@}"
+    fi
+}
+
+
+function common_signal_trap_initialize
+{
+    local signal=""
+    for signal in SIGINT SIGTERM
+    do
+        trap "common_signal_trap \"${signal}\"" "${signal}"
+    done
+}
+
+function common_signal_trap
+{
+    local signal="${1}"
+
+    common_log -v 4 "Received signal: ${signal}"
+    case "${signal}" in
+        SIGINT)
+            common_warn "Aborted by user"
+            exit 130
+            ;;
+        SIGTERM)
+            exit 143
+            ;;
+        *)
+            common_warn "Ignore signal: ${signal}"
+            ;;
+    esac
+}
+
+
+function common_getopt
+{
+	function common_getopt_internal
+	{
+        local variable="${1}"
+
+        local -a specs=()
+        IFS="," read -ra specs <<< "${2}"
+
+        common_assert "array_is_array `string_escape ${variable}`"
+
+        local -i error=0
+        local -a out=()
+
+        function common_getopt_spec
+	    {
+	        case "${1: -1}" in
+	            ":")
+	                common_variable_set "${2}" "${1:0:$((${#1} - 1))}"
+	                common_variable_set "${3}" 1
+	                ;;
+	            "?")
+	                common_variable_set "${2}" "${1:0:$((${#1} - 1))}"
+	                common_variable_set "${3}" 2
+	                ;;
+	            *)
+	                common_variable_set "${2}" "${1}"
+	                common_variable_set "${3}" 0
+	                ;;
+	        esac
+	    }
+
+	    local    spec_name=""
+	    local -i spec_has_argument=0
+
+	    local    option=""
+	    local    option_name=""
+	    local    option_argument=""
+	    local -i option_has_argument=0
+
+	    local -i match_found=0
+	    local    match_name=""
+	    local -i match_has_argument=0
+
+        shift 2
+	    while [[ ${#} -gt 0 ]]
+	    do
+	        case ${1} in
+	            --)
+	                break
+	                ;;
+	            -)
+	                out+=("--")
+	                break
+	                ;;
+	            --*)
+		            option="${1:2}"
+		            shift
+
+		            option_name="`/usr/bin/sed -E -n -e 's/^([^=]*).*$/\1/p' <<< "${option}"`"
+		            option_argument="`/usr/bin/sed -E -n -e 's/^[^=]*=(.*)$/\1/p' <<< "${option}"`"
+
+		            [[ ! "${option}" =~ "=" ]]
+		            option_has_argument=${?}
+
+		            match_found=0
+		            match_name=""
+		            match_has_argument=0
+		            for spec in "${specs[@]}"
+		            do
+		                common_getopt_spec "${spec}" spec_name spec_has_argument
+
+		                if [[ ${#spec_name} -eq 1 ]]
+		                then
+		                    continue
+		                fi
+
+		                if [[ "${spec_name:0:${#option_name}}" = "${option_name}" ]]
+		                then
+		                    match_name="${spec_name}"
+		                    match_has_argument=${spec_has_argument}
+
+		                    if [[ ${#spec_name} -eq ${#option_name} ]]
+		                    then
+		                        match_found=1
+		                        break
+		                    elif (( match_found != 0 ))
+		                    then
+                                error=1
+                                out=("Option '${option_name}' is ambiguous")
+                                break 2
+		                    else
+		                        match_found=1
+		                    fi
+		                fi
+		            done
+		            if (( match_found == 0 ))
+		            then
+                        error=1
+                        out=("Illegal option '${option_name}'")
+                        break
+		            fi
+		            if (( match_has_argument != 2 && option_has_argument != match_has_argument ))
+		            then
+                        error=1
+                        if (( option_has_argument == 0 ))
+                        then
+                            out=("Option '${option_name}' requires an argument")
+                        else
+                            out=("Option '${option_name}' does not allow an argument")
+                        fi
+                        break
+		            fi
+
+		            out+=("--${match_name}")
+		            if (( match_has_argument != 0 ))
+		            then
+		                out+=("${option_argument}")
+		            fi
+		        	;;
+		        -*)
+		            option="${1:1}"
+		            shift
+
+		            option_name="${option:0:1}"
+		            option_argument="${option:1}"
+
+		            match_found=0
+		            for spec in "${specs[@]}"
+		            do
+		                common_getopt_spec "${spec}" spec_name spec_has_argument
+
+		                if [[ "${option_name}" = "${spec_name}" ]]
+		                then
+		                    match_found=1
+
+		                    out+=("-${option_name}")
+		                    if (( spec_has_argument == 0 ))
+		                    then
+		                        if [[ -n "${option_argument}" ]]
+		                        then
+		                            set -- "-${option_argument}" "${@}"
+		                        fi
+		                    else
+		                        if [[ -z "${option_argument}" ]]
+		                        then
+		                            if [[ ${#} -le 0 ]]
+		                            then
+                                        error=1
+                                        out=("Option '${option_name}' requires an argument")
+                                        break 2
+		                            fi
+		                            option_argument="${1}"
+		                            shift
+		                        fi
+
+		                        out+=("${option_argument}")
+		                    fi
+		                    break
+		                fi
+		            done
+
+		            if (( match_found == 0 ))
+		            then
+                        error=1
+                        out=("Illegal option '${option_name}'")
+                        break
+		            fi
+		        	;;
+		        *)
+		            out+=("--")
+		            break
+		        	;;
+	        esac
+	    done
+
+        if (( error == 0 ))
+        then
+            out+=("${@}")
+        fi
+
+        printf "%s=%s\n" "${variable}" "`common_variable_clone out`"
+        printf "return %d\n" ${error}
+	}
+
+    eval "`common_getopt_internal "${@}"`"
+}
+
+function common_sudo
+{
+    local prompt="${1}"
+
+    common_assert "[[ -n `string_escape "${prompt}"` ]]"
+    common_assert "[[ ${#} -gt 1 ]]"
+
+    if [[ ${#COMMON_LOG_PREFIX[@]} -gt 0 ]]
+    then
+        prompt="`printf "%-20s | %s" "${COMMON_LOG_PREFIX}" "${prompt}"`"
+    fi
+
+    sudo -p "${prompt}: " "${@:2}"
+}
+
+
+function common_is_function
+{
+    [[ "`type -t "${1}"`" == "function" ]]
+}
+
+function common_function_is_legal_name
+{
+    [[ "${1}" =~ ^[a-zA-Z_][0-9a-zA-Z_]*$ ]]
+}
+
+
+function common_is_variable
+{
+    compgen -A variable | grep ^"${1}"$ > /dev/null
+}
+
+function common_variable_is_legal_name
+{
+    [[ "${1}" =~ ^[a-zA-Z_][0-9a-zA-Z_]*$ ]]
+}
+
+function common_variable_is_readonly
+{
+    if common_is_variable "${1}"
+    then
+        [[ "`declare -p "${1}" 2> /dev/null`" =~ ^"declare -"[^=]{0,}"r"[^=]{0,}" ${1}=" ]]
+    fi
+}
+
+function common_variable_get
+{
+    common_assert "common_is_variable `string_escape "${1}"`"
+
+    string_escape "${!1}"
+}
+
+function common_variable_set
+{
+    common_assert "common_variable_is_legal_name `string_escape "${1}"`"
+
+    eval "${1}=`string_escape "${2}"`"
+}
+
+function common_variable_clone
+{
+    if [[ -z "${2}" ]]
+    then
+        common_assert "common_is_variable `string_escape "${1}"`"
+
+        if array_is_array "${1}"
+        then
+            printf "("
+            array_get_elements "${1}"
+            printf ")"
+        else
+            common_variable_get "${1}"
+        fi
+    else
+        common_assert "common_variable_is_legal_name `string_escape "${2}"`"
+
+        eval "${2}=`common_variable_clone "${1}"`"
+    fi
+}
+
+function common_variable_print
+{
+    common_assert "common_is_variable `string_escape "${1}"`"
+
+    printf "%s=" "${1}"
+    common_variable_clone "${1}"
+    printf "\n"
+}
+
+function common_variable_require
+{
+    while [[ ${#} -gt 0 ]]
+    do
+        if ! common_is_variable "${1}"
+        then
+            common_die "Variable not declared: ${1}"
+        fi
+        shift
+    done
+}
+
+function common_variable_expand
+{
+    while [[ ${#} -gt 0 ]]
+    do
+        eval "echo \${!${1}@}"
+        shift
+    done
+}
+
+
+function common_path_absolute
+{
+    local    path="${1}"
+    local -a tokens=()
+    local -i tokens_count=0
+    local -i i=0
+
+    if [[ ! "${path}" =~ ^/ ]]
+    then
+        path="`pwd -P`/${path}"
+    fi
+    IFS="/" read -ra tokens <<< "${path}"
+    tokens_count=${#tokens[@]}
+
+    for (( i=0 ; i < ${tokens_count} ; i++ ))
+    do
+        case "${tokens[${i}]}" in
+            .|"")
+                unset -v tokens[${i}]
+                ;;
+            ..)
+                unset -v tokens[$(( i - 1 ))]
+                unset -v tokens[${i}]
+                ;;
+        esac
+    done
+
+    printf "/"
+    array_join tokens "/"
+}

admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/installer.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Copyright (c) 2014 Benjamin Fleischer
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+# 3. Neither the name of the copyright holder nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+
+function installer_is_package_installed
+{
+    local identifier="${1}"
+
+    /usr/sbin/pkgutil --pkg-info "${identifier}" > /dev/null 2>&1
+}
+
+function installer_package_get_info
+{
+    local identifier="${1}"
+    local field="${2}"
+
+    local info=""
+    info="`/usr/sbin/pkgutil --pkg-info "${identifier}" 2> /dev/null`"
+
+    if [[ ${?} -eq 0 ]]
+    then
+        /usr/bin/sed -E -n -e "s/^${field}: (.*)$/\1/p" <<< "${info}"
+    else
+        return 1
+    fi
+}

admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/macos.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# Copyright (c) 2011-2016 Benjamin Fleischer
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+# 3. Neither the name of the copyright holder nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# Requires common.sh
+
+
+function macos_get_version
+{
+    sw_vers -productVersion | /usr/bin/cut -d . -f 1,2 2> /dev/null
+}
+
+function macos_unload_kext
+{
+    local identifier="${1}"
+
+    common_assert "[[ -n `string_escape "${identifier}"` ]]"
+
+    if [[ -n "`/usr/sbin/kextstat -l -b "${identifier}"`" ]]
+    then
+        /sbin/kextunload -b "${identifier}" 1>&3 2>&4
+    else
+        return 0
+    fi
+}

admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/math.sh

@@ -0,0 +1,76 @@
+#!/bin/bash
+
+# Copyright (c) 2011-2014 Benjamin Fleischer
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+# 3. Neither the name of the copyright holder nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# Requires common.sh
+# Requires string.sh
+
+
+function math_is_integer
+{
+    [[ "${1}" =~ ^-?[0-9]+$ ]]
+}
+
+function math_compare
+{
+    if (( ${1} < ${2} ))
+    then
+        return 1
+    fi
+    if (( ${1} > ${2} ))
+    then
+        return 2
+    fi
+    return 0
+}
+
+function math_max
+{
+    common_assert "math_is_integer `string_escape "${1}"`"
+    common_assert "math_is_integer `string_escape "${2}"`"
+
+    if (( ${1} > ${2} ))
+    then
+        printf "%s" "${1}"
+    else
+        printf "%s" "${2}"
+    fi
+}
+
+function math_min
+{
+    common_assert "math_is_integer `string_escape "${1}"`"
+    common_assert "math_is_integer `string_escape "${2}"`"
+
+    if (( ${1} < ${2} ))
+    then
+        printf "%s" "${1}"
+    else
+        printf "%s" "${2}"
+    fi
+}

admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/osxfuse.sh

@@ -0,0 +1,160 @@
+#!/bin/bash
+
+# Copyright (c) 2014 Benjamin Fleischer
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+# 3. Neither the name of the copyright holder nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# Requires common.sh
+
+
+function osxfuse_uninstall_macfuse
+{
+    /bin/rm -rf "/Library/Application Support/Developer/Shared/Xcode/Project Templates/MacFUSE"
+    /bin/rm -rf "/Library/Filesystems/fusefs.fs"
+    /bin/rm -rf "/Library/Frameworks/MacFUSE.framework"
+    /bin/rm -rf "/Library/PreferencePanes/MacFUSE.prefPane"
+    /bin/rm -f "/Library/Preferences/com.google.macfuse.plist"
+    /bin/rm -rf "/usr/local/include/fuse"
+    /bin/rm -f "/usr/local/include/fuse.h"
+    /bin/rm -f "/usr/local/lib/libfuse.0.dylib"
+    /bin/rm -f "/usr/local/lib/libfuse.2.7.3.dylib"
+    /bin/rm -f "/usr/local/lib/libfuse.2.dylib"
+    /bin/rm -f "/usr/local/lib/libfuse.dylib"
+    /bin/rm -f "/usr/local/lib/libfuse.la"
+    /bin/rm -f "/usr/local/lib/libfuse_ino64.2.7.3.dylib"
+    /bin/rm -f "/usr/local/lib/libfuse_ino64.2.dylib"
+    /bin/rm -f "/usr/local/lib/libfuse_ino64.dylib"
+    /bin/rm -f "/usr/local/lib/libfuse_ino64.la"
+    /bin/rm -f "/usr/local/lib/pkgconfig/fuse.pc"
+
+    /bin/rm -rf "/Library/Receipts/MacFUSE.pkg"
+    /bin/rm -rf "/Library/Receipts/MacFUSE Core.pkg"
+
+    /usr/sbin/pkgutil --forget "com.google.macfuse" 1>&3 2>&4
+    /usr/sbin/pkgutil --forget "com.google.macfuse.core" 1>&3 2>&4
+
+    return 0
+}
+
+function osxfuse_uninstall_osxfuse_2_core
+{
+    /bin/rm -rf "/Library/Filesystems/osxfusefs.fs"
+    /bin/rm -rf "/Library/Frameworks/OSXFUSE.framework"
+    /bin/rm -rf "/usr/local/include/osxfuse"
+    /bin/rm -f "/usr/local/lib/libosxfuse.2.dylib"
+    /bin/rm -f "/usr/local/lib/libosxfuse.dylib"
+    /bin/rm -f "/usr/local/lib/libosxfuse.la"
+    /bin/rm -f "/usr/local/lib/libosxfuse_i32.2.dylib"
+    /bin/rm -f "/usr/local/lib/libosxfuse_i32.dylib"
+    /bin/rm -f "/usr/local/lib/libosxfuse_i32.la"
+    /bin/rm -f "/usr/local/lib/libosxfuse_i64.2.dylib"
+    /bin/rm -f "/usr/local/lib/libosxfuse_i64.dylib"
+    /bin/rm -f "/usr/local/lib/libosxfuse_i64.la"
+    /bin/rm -f "/usr/local/lib/pkgconfig/fuse.pc"
+    /bin/rm -f "/usr/local/lib/pkgconfig/osxfuse.pc"
+
+    /usr/sbin/pkgutil --forget "com.github.osxfuse.pkg.Core" 1>&3 2>&4
+
+    return 0
+}
+
+function osxfuse_uninstall_osxfuse_2_macfuse
+{
+    /bin/rm -rf "/Library/Frameworks/MacFUSE.framework"
+    /bin/rm -f "/usr/local/lib/libfuse.0.dylib"
+    /bin/rm -f "/usr/local/lib/libfuse.2.dylib"
+    /bin/rm -f "/usr/local/lib/libfuse.dylib"
+    /bin/rm -f "/usr/local/lib/libfuse.la"
+    /bin/rm -f "/usr/local/lib/libfuse_ino64.2.dylib"
+    /bin/rm -f "/usr/local/lib/libfuse_ino64.dylib"
+    /bin/rm -f "/usr/local/lib/libfuse_ino64.la"
+    /bin/rm -f "/usr/local/lib/libmacfuse_i32.2.dylib"
+    /bin/rm -f "/usr/local/lib/libmacfuse_i32.dylib"
+    /bin/rm -f "/usr/local/lib/libmacfuse_i64.2.dylib"
+    /bin/rm -f "/usr/local/lib/libmacfuse_i64.dylib"
+
+    /usr/sbin/pkgutil --forget "com.google.macfuse.core" 1>&3 2>&4
+
+    return 0
+}
+
+function osxfuse_uninstall_osxfuse_2_prefpane
+{
+    /bin/rm -rf "/Library/PreferencePanes/OSXFUSE.prefPane"
+    /bin/rm -f "/Library/Preferences/com.github.osxfuse.OSXFUSE.plist"
+
+    /usr/sbin/pkgutil --forget "com.github.osxfuse.pkg.PrefPane" 1>&3 2>&4
+
+    return 0
+}
+
+function osxfuse_uninstall_osxfuse_3_core
+{
+    /bin/rm -rf "/Library/Filesystems/osxfuse.fs"
+    /bin/rm -rf "/Library/Frameworks/OSXFUSE.framework"
+    /bin/rm -rf "/usr/local/include/osxfuse"
+    /bin/rm -f "/usr/local/lib/libosxfuse.2.dylib"
+    /bin/rm -f "/usr/local/lib/libosxfuse.dylib"
+    /bin/rm -f "/usr/local/lib/libosxfuse.la"
+    /bin/rm -f "/usr/local/lib/libosxfuse_i64.2.dylib"
+    /bin/rm -f "/usr/local/lib/libosxfuse_i64.dylib"
+    /bin/rm -f "/usr/local/lib/libosxfuse_i64.la"
+    /bin/rm -f "/usr/local/lib/pkgconfig/fuse.pc"
+    /bin/rm -f "/usr/local/lib/pkgconfig/osxfuse.pc"
+
+    /usr/sbin/pkgutil --forget "com.github.osxfuse.pkg.Core" 1>&3 2>&4
+
+    return 0
+}
+
+function osxfuse_uninstall_osxfuse_3_macfuse
+{
+    /bin/rm -rf "/Library/Frameworks/MacFUSE.framework"
+    /bin/rm -rf "/usr/local/include/fuse"
+    /bin/rm -f "/usr/local/include/fuse.h"
+    /bin/rm -f "/usr/local/lib/libfuse.0.dylib"
+    /bin/rm -f "/usr/local/lib/libfuse.2.dylib"
+    /bin/rm -f "/usr/local/lib/libfuse.dylib"
+    /bin/rm -f "/usr/local/lib/libfuse.la"
+    /bin/rm -f "/usr/local/lib/libfuse_ino64.2.dylib"
+    /bin/rm -f "/usr/local/lib/libfuse_ino64.dylib"
+    /bin/rm -f "/usr/local/lib/libfuse_ino64.la"
+    /bin/rm -f "/usr/local/lib/pkgconfig/macfuse.pc"
+
+    /usr/sbin/pkgutil --forget "com.github.osxfuse.pkg.MacFUSE" 1>&3 2>&4
+
+    return 0
+}
+
+function osxfuse_uninstall_osxfuse_3_prefpane
+{
+    /bin/rm -rf "/Library/PreferencePanes/OSXFUSE.prefPane"
+    /bin/rm -f "/Library/Preferences/com.github.osxfuse.OSXFUSE.plist"
+
+    /usr/sbin/pkgutil --forget "com.github.osxfuse.pkg.PrefPane" 1>&3 2>&4
+
+    return 0
+}

admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/string.sh

@@ -0,0 +1,87 @@
+#!/bin/bash
+
+# Copyright (c) 2011-2014 Benjamin Fleischer
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+# 3. Neither the name of the copyright holder nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+
+function string_trim
+{
+    local string="${1}"
+
+    ! shopt -q extglob
+    local -i extglob=${?}
+
+    if (( extglob == 0 ))
+    then
+        shopt -s extglob
+    fi
+
+    string="${string##+([[:space:]])}"
+    string="${string%%+([[:space:]])}"
+
+    if (( extglob == 0 ))
+    then
+        shopt -u extglob
+    fi
+
+    printf "%s" "${string}"
+}
+
+function string_lowercase
+{
+    /usr/bin/tr '[A-Z]' '[a-z]'
+}
+
+function string_uppercase
+{
+    /usr/bin/tr '[a-z]' '[A-Z]'
+}
+
+function string_escape
+{
+    local count="${2:-1}"
+
+    if [[ "${count}" =~ [0-9]+ ]] && (( count > 0 ))
+    then
+        printf "%q" "`string_escape "${1}" $(( count - 1 ))`"
+    else
+        printf "%s" "${1}"
+    fi
+}
+
+function string_compare
+{
+    if [[ "${1}" < "${2}" ]]
+    then
+        return 1
+    fi
+    if [[ "${1}" > "${2}" ]]
+    then
+        return 2
+    fi
+    return 0
+}

admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/lib/version.sh

@@ -0,0 +1,87 @@
+#!/bin/bash
+
+# Copyright (c) 2011-2014 Benjamin Fleischer
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+# 3. Neither the name of the copyright holder nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# Requires common.sh
+# Requires math.sh
+# Requires string.sh
+
+
+function version_is_version
+{
+    [[ "${1}" =~ ^[0-9]+(\.[0-9]+)*$ ]]
+}
+
+function version_compare
+{
+    common_assert "version_is_version `string_escape "${1}"`"
+    common_assert "version_is_version `string_escape "${2}"`"
+
+    local -a version1=()
+    local -a version2=()
+
+    IFS="." read -ra version1 <<< "${1}"
+    IFS="." read -ra version2 <<< "${2}"
+
+    local -i i=0
+    local    t1=""
+    local    t2=""
+    for (( i=0 ; i < `math_max ${#version1[@]} ${#version2[@]}` ; i++ ))
+    do
+        t1=${version1[${i}]:-0}
+        t2=${version2[${i}]:-0}
+
+        if (( t1 < t2 ))
+        then
+            return 1
+        fi
+        if (( t1 > t2 ))
+        then
+            return 2
+        fi
+    done
+    return 0
+}
+
+function version_compare_eq
+{
+    version_compare "${1}" "${2}"
+    (( ${?} == 0 ))
+}
+
+function version_compare_le
+{
+    version_compare "${1}" "${2}"
+    (( ${?} != 2 ))
+}
+
+function version_compare_ge
+{
+    version_compare "${1}" "${2}"
+    (( ${?} != 1 ))
+}

admin/osx/fuse/Uninstaller.app/Contents/Resources/Scripts/uninstall_osxfuse.sh

@@ -0,0 +1,137 @@
+#!/bin/bash
+
+# Copyright (c) 2014 Benjamin Fleischer
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+# 3. Neither the name of the copyright holder nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+
+function uninstall_osxfuse_main
+{
+    # Source libraries
+
+    local library_path=""
+    for library_path in "${BASH_SOURCE[0]%/*}/lib"/*.sh
+    do
+        if [[ -f "${library_path}" ]]
+        then
+            source "${library_path}" || return 1
+        fi
+    done
+
+    common_log_initialize
+    common_signal_trap_initialize
+
+    # Uninstall core
+
+    local core_version="`installer_package_get_info com.github.osxfuse.pkg.Core version`"
+
+    if [[ -z "${core_version}" ]]
+    then
+        if [[ -e "/Library/Filesystems/osxfuse.fs" ]]
+        then
+            core_version="3.0"
+
+        elif [[ -e "/Library/Filesystems/osxfusefs.fs" ]]
+        then
+            core_version="2.3"
+        fi
+    fi
+
+    if [[ -n "${core_version}" ]]
+    then
+        if version_compare_ge "${core_version}" 3.0
+        then
+            macos_unload_kext "com.github.osxfuse.filesystems.osxfuse"
+            osxfuse_uninstall_osxfuse_3_core
+
+        elif version_compare_ge "${core_version}" 2.3
+        then
+            macos_unload_kext "com.github.osxfuse.filesystems.osxfusefs"
+            osxfuse_uninstall_osxfuse_2_core
+        fi
+    fi
+
+    # Uninstall preference pane
+
+    local prefpane_version="`installer_package_get_info com.github.osxfuse.pkg.PrefPane version`"
+
+    if [[ -z "${prefpane_version}" ]]
+    then
+        if [[ -e "/Library/PreferencePanes/OSXFUSE.prefPane" ]]
+        then
+            prefpane_version="3.0"
+        fi
+    fi
+
+    if [[ -n "${prefpane_version}" ]]
+    then
+        if version_compare_ge "${prefpane_version}" 3.0
+        then
+            osxfuse_uninstall_osxfuse_3_prefpane
+
+        elif version_compare_ge "${prefpane_version}" 2.3
+        then
+            osxfuse_uninstall_osxfuse_2_prefpane
+        fi
+    fi
+
+    # Uninstall MacFUSE compatibility layer
+
+    local macfuse_version="`installer_package_get_info com.github.osxfuse.pkg.MacFUSE version`"
+
+    if [[ -z "${macfuse_version}" ]]
+    then
+        macfuse_version="`installer_package_get_info com.google.macfuse.core version`"
+    fi
+
+    if [[ -z "${macfuse_version}" ]]
+    then
+        if [[ -e /usr/local/lib/pkgconfig/macfuse.pc ]]
+        then
+            macfuse_version="3.0"
+
+        elif [[ -e /usr/local/lib/libmacfuse_i32.2.dylib ]]
+        then
+            macfuse_version="2.3"
+        fi
+    fi
+
+    if [[ -n "${macfuse_version}" ]]
+    then
+        if version_compare_ge "${macfuse_version}" 3.0
+        then
+            osxfuse_uninstall_osxfuse_3_macfuse
+
+        elif version_compare_ge "${macfuse_version}" 2.3
+        then
+            osxfuse_uninstall_osxfuse_2_macfuse
+        fi
+    fi
+
+    return 0
+}
+
+uninstall_osxfuse_main "${@}"

admin/osx/fuse/Uninstaller.app/Contents/_CodeSignature/CodeResources

@@ -0,0 +1,341 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict>
+		<key>Resources/English.lproj/Localizable.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			0Wjn3NrPepmcOASicNLS2raGv6k=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/German.lproj/Localizable.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			4buJ6nBrQzNa0CURYrv6fDLWXMc=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/Scripts/lib/array.sh</key>
+		<data>
+		acATIcnlFIi6qM0DXuVy5gdtFEc=
+		</data>
+		<key>Resources/Scripts/lib/common.sh</key>
+		<data>
+		ENbs4voSh0jU5KEK5BvFWSTjcNw=
+		</data>
+		<key>Resources/Scripts/lib/installer.sh</key>
+		<data>
+		GZbRDSAeVo5JyzznWzc3BhFuUGo=
+		</data>
+		<key>Resources/Scripts/lib/macos.sh</key>
+		<data>
+		e9Er5/UuqM3WdHEePY4vV/IBgxg=
+		</data>
+		<key>Resources/Scripts/lib/math.sh</key>
+		<data>
+		vTIVoM4Ta6BENguDomO8mSUTtto=
+		</data>
+		<key>Resources/Scripts/lib/osxfuse.sh</key>
+		<data>
+		yiCIOaPBCbVxNL4CMPRDV14AKSk=
+		</data>
+		<key>Resources/Scripts/lib/string.sh</key>
+		<data>
+		m3XuFEuae7unzvq2PMsL/+tKZfU=
+		</data>
+		<key>Resources/Scripts/lib/version.sh</key>
+		<data>
+		Maq9UhAmPuP1u0uG0CClOnEtXUI=
+		</data>
+		<key>Resources/Scripts/main.scpt</key>
+		<data>
+		SL2QzuMln6cM4yRRGLNVqm5eS/w=
+		</data>
+		<key>Resources/Scripts/uninstall_osxfuse.sh</key>
+		<data>
+		PLOe6Huk3962Njim7rKpCLhRLW0=
+		</data>
+		<key>Resources/Uninstaller.icns</key>
+		<data>
+		kL6mz31YXPBrUTT9Xk5T1T4Dhpg=
+		</data>
+		<key>Resources/applet.rsrc</key>
+		<data>
+		/jVQqMpNI1L5OTLhyJaYiMBCQY8=
+		</data>
+	</dict>
+	<key>files2</key>
+	<dict>
+		<key>Resources/English.lproj/Localizable.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			0Wjn3NrPepmcOASicNLS2raGv6k=
+			</data>
+			<key>hash2</key>
+			<data>
+			lTTq7JkVc0CP5qPxIwk54tsVL+rEiv9NMy2cuke49Tg=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/German.lproj/Localizable.strings</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			4buJ6nBrQzNa0CURYrv6fDLWXMc=
+			</data>
+			<key>hash2</key>
+			<data>
+			LhPdZbWcZjiUTy+nVQc+ybd0l0GpwKoKDP3TDrSNdUA=
+			</data>
+			<key>optional</key>
+			<true/>
+		</dict>
+		<key>Resources/Scripts/lib/array.sh</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			acATIcnlFIi6qM0DXuVy5gdtFEc=
+			</data>
+			<key>hash2</key>
+			<data>
+			n4ua44AdK1W8tQrVaNoEbE4KNiFaUPXRCjzUdP9wHHA=
+			</data>
+		</dict>
+		<key>Resources/Scripts/lib/common.sh</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			ENbs4voSh0jU5KEK5BvFWSTjcNw=
+			</data>
+			<key>hash2</key>
+			<data>
+			kH6kB2aWWzDgMHvo8zS4YLcpXSSaylMzSnEn0gQQpoc=
+			</data>
+		</dict>
+		<key>Resources/Scripts/lib/installer.sh</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			GZbRDSAeVo5JyzznWzc3BhFuUGo=
+			</data>
+			<key>hash2</key>
+			<data>
+			2Z/2eNbV2UZJCRyQ+8zMHin9TGBC15mXny15HcIJPZo=
+			</data>
+		</dict>
+		<key>Resources/Scripts/lib/macos.sh</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			e9Er5/UuqM3WdHEePY4vV/IBgxg=
+			</data>
+			<key>hash2</key>
+			<data>
+			WojtBY9VGpZjVX+xxjzOUGZR4H/o4zkDuNOcfPvFKug=
+			</data>
+		</dict>
+		<key>Resources/Scripts/lib/math.sh</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			vTIVoM4Ta6BENguDomO8mSUTtto=
+			</data>
+			<key>hash2</key>
+			<data>
+			aozCiQoNO6hiHmvUbWsebuMGVs8GAC19L4Qj7MSXFUk=
+			</data>
+		</dict>
+		<key>Resources/Scripts/lib/osxfuse.sh</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			yiCIOaPBCbVxNL4CMPRDV14AKSk=
+			</data>
+			<key>hash2</key>
+			<data>
+			zyarGvNeCuciX2oW3fH2SQ5KRiyMWlNUsmdCFK6n4Nk=
+			</data>
+		</dict>
+		<key>Resources/Scripts/lib/string.sh</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			m3XuFEuae7unzvq2PMsL/+tKZfU=
+			</data>
+			<key>hash2</key>
+			<data>
+			/vj6gilOvFq6Fz/rDQeT7tpYcOw684tKnVED/Uf/fIA=
+			</data>
+		</dict>
+		<key>Resources/Scripts/lib/version.sh</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			Maq9UhAmPuP1u0uG0CClOnEtXUI=
+			</data>
+			<key>hash2</key>
+			<data>
+			wfjFX+pXNt58pax1r1g8tld4SjgO/Ln9cwqDR7uactc=
+			</data>
+		</dict>
+		<key>Resources/Scripts/main.scpt</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			SL2QzuMln6cM4yRRGLNVqm5eS/w=
+			</data>
+			<key>hash2</key>
+			<data>
+			kq5sWt58LkxZlUULW60hlhRHz4eU6R61vqWiTjK0Scc=
+			</data>
+		</dict>
+		<key>Resources/Scripts/uninstall_osxfuse.sh</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			PLOe6Huk3962Njim7rKpCLhRLW0=
+			</data>
+			<key>hash2</key>
+			<data>
+			XBBbe5Gi2uNwDt8Bux07CSzeSQyZehHsBtSTM8M8Iyg=
+			</data>
+		</dict>
+		<key>Resources/Uninstaller.icns</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			kL6mz31YXPBrUTT9Xk5T1T4Dhpg=
+			</data>
+			<key>hash2</key>
+			<data>
+			fC0GPJXmpV4oDKdvRlAQBNfIN2Uomq/vlnFP1IcWMlk=
+			</data>
+		</dict>
+		<key>Resources/applet.rsrc</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			/jVQqMpNI1L5OTLhyJaYiMBCQY8=
+			</data>
+			<key>hash2</key>
+			<data>
+			0jPapEMRihcikRr/mzmNOcrNOYLHxGEOVmOrcBa6U/E=
+			</data>
+		</dict>
+	</dict>
+	<key>rules</key>
+	<dict>
+		<key>^Resources/</key>
+		<true/>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Resources/Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Resources/Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^[^/]+$</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>

admin/osx/fuse/Wiki.webloc

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>URL</key>
+	<string>https://github.com/osxfuse/osxfuse/wiki</string>
+</dict>
+</plist>

admin/osx/fuse/settings.plist

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<dict>
+		<key>childItems</key>
+		<array>
+			<dict>
+				<key>childItems</key>
+				<array/>
+				<key>choiceDescription</key>
+				<string>Installs the FUSE for macOS core components, including the FUSE kernel extension, the shared library libosxfuse and OSXFUSE.framework.</string>
+				<key>choiceIdentifier</key>
+				<string>com.github.osxfuse.pkg.Core</string>
+				<key>choiceIsEnabled</key>
+				<false/>
+				<key>choiceIsSelected</key>
+				<integer>1</integer>
+				<key>choiceIsVisible</key>
+				<true/>
+				<key>choiceSizeInKilobytes</key>
+				<integer>4540</integer>
+				<key>choiceTitle</key>
+				<string>FUSE for macOS Core Components</string>
+				<key>pathsOfActivePackagesInChoice</key>
+				<array>
+					<string>file://localhost/Users/JesusDeloya/clarodrive-desktop/admin/osx/fuse/FUSE%20for%20macOS%203.8.1.pkg#Core.pkg</string>
+				</array>
+			</dict>
+			<dict>
+				<key>childItems</key>
+				<array/>
+				<key>choiceDescription</key>
+				<string>Installs the FUSE for macOS Preference Pane which is used to download and install updates or remove FUSE for macOS.</string>
+				<key>choiceIdentifier</key>
+				<string>com.github.osxfuse.pkg.PrefPane</string>
+				<key>choiceIsEnabled</key>
+				<true/>
+				<key>choiceIsSelected</key>
+				<integer>1</integer>
+				<key>choiceIsVisible</key>
+				<true/>
+				<key>choiceSizeInKilobytes</key>
+				<integer>2669</integer>
+				<key>choiceTitle</key>
+				<string>FUSE for macOS Preference Pane</string>
+				<key>pathsOfActivePackagesInChoice</key>
+				<array>
+					<string>file://localhost/Users/JesusDeloya/clarodrive-desktop/admin/osx/fuse/FUSE%20for%20macOS%203.8.1.pkg#PrefPane.pkg</string>
+				</array>
+			</dict>
+			<dict>
+				<key>childItems</key>
+				<array/>
+				<key>choiceDescription</key>
+				<string>Installs the compatibility layer for legacy MacFUSE file systems, that have not been ported to FUSE for macOS.</string>
+				<key>choiceIdentifier</key>
+				<string>com.github.osxfuse.pkg.MacFUSE</string>
+				<key>choiceIsEnabled</key>
+				<true/>
+				<key>choiceIsSelected</key>
+				<integer>0</integer>
+				<key>choiceIsVisible</key>
+				<true/>
+				<key>choiceSizeInKilobytes</key>
+				<integer>1743</integer>
+				<key>choiceTitle</key>
+				<string>MacFUSE Compatibility Layer</string>
+				<key>pathsOfActivePackagesInChoice</key>
+				<array>
+					<string>file://localhost/Users/JesusDeloya/clarodrive-desktop/admin/osx/fuse/FUSE%20for%20macOS%203.8.1.pkg#MacFUSE.pkg</string>
+				</array>
+			</dict>
+		</array>
+		<key>choiceIdentifier</key>
+		<string>__ROOT_CHOICE_IDENT_FUSEformacOS</string>
+		<key>choiceIsEnabled</key>
+		<true/>
+		<key>choiceIsSelected</key>
+		<integer>1</integer>
+		<key>choiceIsVisible</key>
+		<true/>
+		<key>choiceSizeInKilobytes</key>
+		<integer>0</integer>
+		<key>choiceTitle</key>
+		<string>FUSE for macOS</string>
+		<key>pathsOfActivePackagesInChoice</key>
+		<array/>
+	</dict>
+</array>
+</plist>

admin/osx/fuse/settings_buena.plist

@@ -0,0 +1,3 @@
+<?xmlversion="1.0"encoding="UTF-8"?>
+<!DOCTYPEplistPUBLIC"-//Apple//DTDPLIST1.0//EN""http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist><array><dict><key>choiceIdentifier</key><string>__ROOT_CHOICE_IDENT_FUSEformacOS</string><key>choiceIsEnabled</key><true/><key>choiceIsSelected</key><integer>1</integer><key>choiceIsVisible</key><true/><key>choiceSizeInKilobytes</key><integer>0</integer><key>choiceTitle</key><string>FUSEformacOS</string><key>pathsOfActivePackagesInChoice</key><array/><key>childItems</key><array><dict><key>childItems</key><array/><key>choiceDescription</key><string>InstallstheFUSEformacOScorecomponents,includingtheFUSEkernelextension,thesharedlibrarylibosxfuseandOSXFUSE.framework.</string><key>choiceIdentifier</key><string>com.github.osxfuse.pkg.Core</string><key>choiceIsEnabled</key><false/><key>choiceIsSelected</key><integer>1</integer><key>choiceIsVisible</key><true/><key>choiceSizeInKilobytes</key><integer>4540</integer><key>choiceTitle</key><string>FUSEformacOSCoreComponents</string><key>pathsOfActivePackagesInChoice</key><array><string>file://localhost/Users/JesusDeloya/clarodrive-desktop/admin/osx/fuse/FUSE%20for%20macOS%203.8.1.pkg#Core.pkg</string></array></dict><dict><key>childItems</key><array/><key>choiceDescription</key><string>InstallstheFUSEformacOSPreferencePanewhichisusedtodownloadandinstallupdatesorremoveFUSEformacOS.</string><key>choiceIdentifier</key><string>com.github.osxfuse.pkg.PrefPane</string><key>choiceIsEnabled</key><true/><key>choiceIsSelected</key><integer>1</integer><key>choiceIsVisible</key><true/><key>choiceSizeInKilobytes</key><integer>2669</integer><key>choiceTitle</key><string>FUSEformacOSPreferencePane</string><key>pathsOfActivePackagesInChoice</key><array><string>file://localhost/Users/JesusDeloya/clarodrive-desktop/admin/osx/fuse/FUSE%20for%20macOS%203.8.1.pkg#PrefPane.pkg</string></array></dict><dict><key>childItems</key><array/><key>choiceDescription</key><string>InstallsthecompatibilitylayerforlegacyMacFUSEfilesystems,thathavenotbeenportedtoFUSEformacOS.</string><key>choiceIdentifier</key><string>com.github.osxfuse.pkg.MacFUSE</string><key>choiceIsEnabled</key><true/><key>choiceIsSelected</key><integer>1</integer><key>choiceIsVisible</key><true/><key>choiceSizeInKilobytes</key><integer>1743</integer><key>choiceTitle</key><string>MacFUSECompatibilityLayer</string><key>pathsOfActivePackagesInChoice</key><array><string>file://localhost/Users/JesusDeloya/clarodrive-desktop/admin/osx/fuse/FUSE%20for%20macOS%203.8.1.pkg#MacFUSE.pkg</string></array></dict></array></dict></array></plist>

admin/osx/installer-background.svg

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

admin/osx/macosx.pkgproj.cmake

@@ -486,7 +486,72 @@
                          <integer>0</integer>
                  </dict>
                  <key>RESOURCES</key>
-                 <array/>
+                 <array>
+                        <dict>
+                                <key>CHILDREN</key>
+                                <array/>
+                                <key>GID</key>
+                                <integer>0</integer>
+                                <key>PATH</key>
+                                <string>com.clarodrive.trashdetector.plist</string>
+                                <key>PATH_TYPE</key>
+                                <integer>1</integer>
+                                <key>PERMISSIONS</key>
+                                <integer>420</integer>
+                                <key>TYPE</key>
+                                <integer>3</integer>
+                                <key>UID</key>
+                                <integer>0</integer>
+                        </dict>
+                        <dict>
+                                <key>CHILDREN</key>
+                                <array/>
+                                <key>GID</key>
+                                <integer>0</integer>
+                                <key>PATH</key>
+				<string>fuse/FUSE for macOS 3.8.1.pkg</string>
+				<key>PATH_TYPE</key>
+				<integer>1</integer>
+				<key>PERMISSIONS</key>
+				<integer>420</integer>
+				<key>TYPE</key>
+				<integer>3</integer>
+				<key>UID</key>
+				<integer>0</integer>
+			</dict>
+			<dict>
+				<key>CHILDREN</key>
+				<array/>
+				<key>GID</key>
+				<integer>0</integer>
+				<key>PATH</key>
+				<string>fuse/settings.plist</string>
+				<key>PATH_TYPE</key>
+				<integer>1</integer>
+				<key>PERMISSIONS</key>
+				<integer>420</integer>
+				<key>TYPE</key>
+				<integer>3</integer>
+				<key>UID</key>
+				<integer>0</integer>
+			</dict>
+			<dict>
+				<key>CHILDREN</key>
+				<array/>
+				<key>GID</key>
+				<integer>0</integer>
+				<key>PATH</key>
+                                <string>uninstallCD.applescript</string>
+                                <key>PATH_TYPE</key>
+                                <integer>1</integer>
+                                <key>PERMISSIONS</key>
+                                <integer>420</integer>
+                                <key>TYPE</key>
+                                <integer>3</integer>
+                                <key>UID</key>
+                                <integer>0</integer>
+                        </dict>
+                </array>
          </dict>
 			<key>PACKAGE_SETTINGS</key>
 			<dict>
@@ -506,6 +571,536 @@
 			<key>UUID</key>
 			<string>7D7219B7-1897-48C3-8533-842BDEC46F71</string>
 		</dict>
+		<dict>
+			<key>PACKAGE_FILES</key>
+			<dict>
+				<key>DEFAULT_INSTALL_LOCATION</key>
+				<string>/</string>
+				<key>HIERARCHY</key>
+				<dict>
+					<key>CHILDREN</key>
+					<array>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Utilities</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Applications</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>509</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Application Support</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Documentation</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Filesystems</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Frameworks</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Input Methods</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Internet Plug-Ins</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchAgents</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchDaemons</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PreferencePanes</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Preferences</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Printers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PrivilegedHelperTools</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickLook</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickTime</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Screen Savers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array>
+										<dict>
+											<key>CHILDREN</key>
+											<array>
+												<dict>
+													<key>CHILDREN</key>
+													<array/>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>Library/ScriptingAdditions/SyncStateFinder.osax/Contents</string>
+													<key>PATH_TYPE</key>
+													<integer>3</integer>
+													<key>PERMISSIONS</key>
+													<integer>493</integer>
+													<key>TYPE</key>
+													<integer>3</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+											</array>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>PATH</key>
+											<string>SyncStateFinder.osax</string>
+											<key>PATH_TYPE</key>
+											<integer>0</integer>
+											<key>PERMISSIONS</key>
+											<integer>493</integer>
+											<key>TYPE</key>
+											<integer>2</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+									</array>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>ScriptingAdditions</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>2</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Scripts</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Services</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Widgets</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>Library</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array>
+										<dict>
+											<key>CHILDREN</key>
+											<array/>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>PATH</key>
+											<string>Extensions</string>
+											<key>PATH_TYPE</key>
+											<integer>0</integer>
+											<key>PERMISSIONS</key>
+											<integer>493</integer>
+											<key>TYPE</key>
+											<integer>1</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+									</array>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Library</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>System</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Shared</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>1023</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Users</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>GID</key>
+					<integer>0</integer>
+					<key>PATH</key>
+					<string>/</string>
+					<key>PATH_TYPE</key>
+					<integer>0</integer>
+					<key>PERMISSIONS</key>
+					<integer>493</integer>
+					<key>TYPE</key>
+					<integer>1</integer>
+					<key>UID</key>
+					<integer>0</integer>
+				</dict>
+				<key>PAYLOAD_TYPE</key>
+				<integer>0</integer>
+				<key>VERSION</key>
+				<integer>2</integer>
+			</dict>
+			<key>PACKAGE_SCRIPTS</key>
+			<dict>
+				<key>POSTINSTALL_PATH</key>
+				<dict/>
+				<key>PREINSTALL_PATH</key>
+				<dict/>
+				<key>RESOURCES</key>
+				<array/>
+			</dict>
+			<key>PACKAGE_SETTINGS</key>
+			<dict>
+				<key>AUTHENTICATION</key>
+				<integer>1</integer>
+				<key>CONCLUSION_ACTION</key>
+				<integer>0</integer>
+				<key>IDENTIFIER</key>
+				<string>com.ownCloud.finderPlugin</string>
+				<key>LOCATION</key>
+				<integer>0</integer>
+				<key>NAME</key>
+				<string>Legacy Finder Plugin (OS X 10.9 or older)</string>
+				<key>OVERWRITE_PERMISSIONS</key>
+				<false/>
+				<key>VERSION</key>
+				<string>@MIRALL_VERSION_FULL@</string>
+			</dict>
+			<key>TYPE</key>
+			<integer>0</integer>
+			<key>UUID</key>
+			<string>39F61FCD-6EAA-4F3A-81C6-25E3F667DFB5</string>
+		</dict>
 	</array>
 	<key>PROJECT</key>
 	<dict>
@@ -573,15 +1168,56 @@
 								<key>UUID</key>
 								<string>9647ADC0-BD53-4D7D-A561-73D383AACDE1</string>
 							</dict>
+							<dict>
+								<key>DESCRIPTION</key>
+								<array/>
+								<key>OPTIONS</key>
+								<dict>
+									<key>HIDDEN</key>
+									<false/>
+									<key>STATE</key>
+									<integer>1</integer>
+								</dict>
+								<key>PACKAGE_UUID</key>
+								<string>39F61FCD-6EAA-4F3A-81C6-25E3F667DFB5</string>
+								                                                                <key>REQUIREMENTS</key>
+								                                                               <array>
+								                                                                       <dict>
+								                                                                               <key>BEHAVIOR</key>
+								                                                                               <integer>1</integer>
+								                                                                               <key>DICTIONARY</key>
+								                                                                               <dict>
+								                                                                                       <key>IC_REQUIREMENT_JAVASCRIPT_FUNCTION</key>
+								                                                                                       <string>olderOsx</string>
+								                                                                                       <key>IC_REQUIREMENT_JAVASCRIPT_PARAMETERS</key>
+								                                                                                       <array/>
+								                                                                               </dict>
+								                                                                               <key>IDENTIFIER</key>
+								                                                                               <string>fr.whitebox.Packages.requirement.javascript</string>
+								                                                                               <key>MESSAGE</key>
+								                                                                               <array/>
+								                                                                               <key>NAME</key>
+								                                                                               <string>JavaScript</string>
+								                                                                               <key>STATE</key>
+							                                                                                <true/>
+								                                                                       </dict>
+								                                                               </array>								
+								<key>TITLE</key>
+								<array/>
+								<key>TOOLTIP</key>
+								<array/>
+								<key>TYPE</key>
+								<integer>0</integer>
+								<key>UUID</key>
+								<string>1D2C47E0-5FD3-4623-B934-1347C66782D0</string>
+							</dict>
 						</array>
 						<key>REMOVED</key>
 						<dict/>
 					</dict>
 				</dict>
 				<key>INSTALLATION TYPE</key>
-                                <integer>1</integer>
-                                <key>MODE</key>
-                                <integer>1</integer>
+				<integer>0</integer>
 			</dict>
 			<key>INSTALLATION_STEPS</key>
 			<array>
@@ -674,7 +1310,7 @@
 						<key>LANGUAGE</key>
 						<string>English</string>
 						<key>VALUE</key>
-						<string>@APPLICATION_NAME_XML_ESCAPED@ Client</string>
+						<string>@APPLICATION_NAME_XML_ESCAPED@</string>
 					</dict>
 				</array>
 			</dict>
@@ -701,7 +1337,7 @@
 			<key>BUILD_PATH</key>
 			<dict>
 				<key>PATH</key>
-                                <string>@CMAKE_INSTALL_PREFIX@/.</string>
+				<string>../install/.</string>
 				<key>PATH_TYPE</key>
 				<integer>3</integer>
 			</dict>
@@ -879,6 +1515,18 @@
 			<string>@CMAKE_INSTALL_DIR@</string>
 		</dict>
 	</dict>
+	        <key>SHARED_GLOBAL_DATA</key>
+	        <dict>
+	                <key>IC_REQUIREMENT_JAVASCRIPT_SHARED_SOURCE_CODE</key>
+	                <string>
+	function olderOsx() {
+   if(system.compareVersions(system.version.ProductVersion, '10.10') == -1) {
+	    return true;
+	}
+	return false;
+	}
+	</string>
+	        </dict>	
 	<key>TYPE</key>
 	<integer>0</integer>
 	<key>VERSION</key>

admin/osx/pre_install.sh.cmake

@@ -3,4 +3,6 @@
 # kill the old version. see issue #2044
 killall @APPLICATION_EXECUTABLE@
 
+installer -pkg FUSE\ for\ macOS\ 3.8.1.pkg -target / -applyChoiceChangesXML settings.plist
+
 exit 0

client.qrc

@@ -37,8 +37,6 @@
         <file>resources/confirm.svg</file>
         <file>resources/copy.svg</file>
         <file>resources/state-sync.svg</file>
-        <file>resources/add.png</file>
-        <file>resources/state-info.svg</file>
     </qresource>
     <qresource prefix="/"/>
 </RCC>

cmake/modules/AddAppIconMacro.cmake

@@ -47,13 +47,7 @@ macro (KDE4_ADD_APP_ICON appsources pattern)
                 endif (fn MATCHES ".*128.*")
                 if (fn MATCHES ".*256.*" )
                     list (APPEND _icons ${it})
-                endif (fn MATCHES ".*256.*")
-                if (fn MATCHES ".*512.*" )
-                    list (APPEND _icons ${it})
-                endif (fn MATCHES ".*512.*")
-                if (fn MATCHES ".*1024.*" )
-                    list (APPEND _icons ${it})
-                endif (fn MATCHES ".*1024.*")                   
+                endif (fn MATCHES ".*256.*")                
             endforeach (it)
             if (_icons)
                 add_custom_command(OUTPUT ${_outfilename}.ico ${_outfilename}.rc
@@ -110,14 +104,14 @@ macro (KDE4_ADD_APP_ICON appsources pattern)
         foreach (it ${files})
             if (it MATCHES ".*sidebar-16.*")
                 configure_file(${it} ${appsources}.iconset/sidebar_16x16.png COPYONLY)
-            elseif (it MATCHES ".*sidebar-32.*")
+            elseif (it MATCHES ".*sidebar-18.*")
                 configure_file(${it} ${appsources}.iconset/sidebar_18x18.png COPYONLY)
+            elseif (it MATCHES ".*sidebar-32.*")
                 configure_file(${it} ${appsources}.iconset/sidebar_16x16@2x.png COPYONLY)
-            elseif (it MATCHES ".*sidebar-64.*")
-                configure_file(${it} ${appsources}.iconset/sidebar_18x18@2x.png COPYONLY)
-            elseif (it MATCHES ".*sidebar-128.*")
                 configure_file(${it} ${appsources}.iconset/sidebar_32x32.png COPYONLY)
-            elseif (it MATCHES ".*sidebar-256.*")
+            elseif (it MATCHES ".*sidebar-36.*")
+                configure_file(${it} ${appsources}.iconset/sidebar_18x18@2x.png COPYONLY)
+            elseif (it MATCHES ".*sidebar-64.*")
                 configure_file(${it} ${appsources}.iconset/sidebar_32x32@2x.png COPYONLY)
             endif()
         endforeach (it)