Merge pull request #525 from nextcloud/feature/132/about_dialog

Add legal notice button to about dialog
2026-04-08 12:13:05 +02:00 · 2018-08-02 22:32:56 +02:00 · 2018-08-02 22:17:11 +02:00 · 2018-08-02 22:13:30 +02:00 · 2018-08-02 21:19:57 +02:00 · 2018-08-02 20:23:26 +02:00
803 changed files with 114002 additions and 13584 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -0,0 +1,228 @@
 clone:
  git:
    image: plugins/git
    tags: true
    depth: 1
 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
    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
    AppImage:
        image: nextcloudci/client-5.11:client-5.11-3
        commands:
            - /bin/bash -c "./admin/linux/build-appimage.sh"
        when:
            matrix:
                BUILD: AppImage
    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
    documentation:
        image: nextcloudci/documentation:documentation-5
        commands:
            - cd doc
            - make html
        when:
            matrix:
                TESTS: documentation
 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
 branches: [ master, 2.* ]
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,60 +0,0 @@
 <!--- 
 Please try to only report a bug if it happens with the latest version
 The latest version can be seen by checking the ChangeLog: https://owncloud.org/changelog/desktop/
 For support try: https://central.owncloud.org/c/desktop-client
 --->
 ### Expected behaviour
 Tell us what should happen
 ### Actual behaviour
 Tell us what happens instead
 ### Steps to reproduce
 1. 
 2. 
 3. 
 ### Server configuration
 Operating system:
 Web server: 
 Database:
 PHP version:
 ownCloud version:
 Storage backend (external storage):
 ### Client configuration
 Client version:
 Operating system:
 OS language:
 Qt version used by client package (Linux only, see also Settings dialog):
 Client package (From ownCloud or distro) (Linux only):
 Installation path of client:
 ### Logs
 Please use Gist (https://gist.github.com/) or a similar code paster for longer
 logs.
 ```Template for output < 10 lines```
 1. Client logfile: Output of `owncloud --logwindow` or `owncloud --logfile log.txt`
 (On Windows using `cmd.exe`, you might need to first `cd` into the ownCloud directory)
 (See also http://doc.owncloud.org/desktop/2.2/troubleshooting.html#client-logfile )
 2. Web server error log:
 3. Server logfile: ownCloud log (data/owncloud.log):
--- a/.github/release_template.md
+++ b/.github/release_template.md
@@ -1,115 +0,0 @@
 <!--
 This is the template for new release issues.
 (originated from https://github.com/owncloud/client/wiki/Release%20Checklist%20Template)
 -->
 Copy below text into a task and tick the items:
 ```
 Some weeks before the release:
 * [ ] Check if we should update the bundled sqlite3 (https://github.com/owncloud/client/tree/master/src/3rdparty/sqlite3)
 * [ ] Check if we should update Sparkle on build machine (https://github.com/sparkle-project/Sparkle/releases)
 * [ ] Ensure NSIS is up to date on the build machine
 * [ ] Ensure up-to-date dependencies (e.g. [latest Qt version](http://qt-project.org/downloads#qt-lib) is installed on the machine and picked up (cmake output)
 * [ ] Ensure the crash reporter server is up
 * [ ] Check crash reporter for bad crashes
 * [ ] Ensure Windows Overlay DLLs are rebuilt
 * [ ] Check nightly builds are up and running, that is Jenkins jobs ownCloud-client-linux, ownCloud-client-osx and ownCloud-client-win32 all green.
 * [ ] Ensure Linux nightlies are built too for all distros https://build.opensuse.org/package/show/isv:ownCloud:community:nightly/owncloud-client
 * [ ] Build branded clients through the scripting machine and smoke test one or two branded clients (especially with predefined url)
 * [ ] Upload a nightly build of the windows version to virustotal.com
  * Contact AV vendors whom's engine reports a virus
 * [ ] Documentation should be online before the release http://doc.owncloud.org/desktop/1.X/
 * [ ] QA goes over https://github.com/owncloud/mirall/wiki/Testing-Scenarios
 * [ ] Make sure to have `client/ChangeLog` updated
 * use `git log --format=oneline v<lastrelease>...master` if your memory fails you
 * [ ] check if enterprise issues are fixed
 For first Alpha/Beta of a Major or Minor release:
 * [ ] branch off master to new version branch (e.g. master -> 2.1, when releasing 2.1)
 * [ ] Adjust `VERSION.cmake` in master and count up (e.g. 2.2)
 * [ ] Adjust translation jobs for [client](https://ci.owncloud.org/view/translation-sync/job/translation-sync-client/) and [NSIS](https://ci.owncloud.org/view/translation-sync/job/translation-sync-client-nsis/) to point to the release branch (e.g. 2.1).
 * [ ] Make sure there is a job for the docs of the new master branch and the current release branch on rotor e.g. http://doc.owncloud.org/desktop/1.X/ exists
 For all alphas, betas and RCs (Copy this section for each alpha/beta/rc):
 * [ ] Add last updates to Changelog in the client source repository.
 * [ ] Branch off a release branch called VERSION-rcX or VERSION-betaX  (without v, v is for tags)
 * [ ] Edit ```VERSION.cmake``` to set the suffix to beta1, beta2 etc. Commit the result to the release branch only
 * [ ] Create build for using owncloud-client-trigger (uncheck the "nightly build" checkbox, use the proper dropdown for version suffix) for theme 'ownCloud'
 * [ ] Create build for using owncloud-client-trigger (uncheck the "nightly build" checkbox, use the proper dropdown for version suffix) for theme 'testpilotcloud'
 * [ ] Only now download the last created source .tar.xz and sign it with gpg. Copy the signature into a new .asc file. (timing issue because currently 'testpilotcloud' re-creates the source .tar.xz)
 * (no need to copy builds as they are already in testing directory or repository) (https://github.com/owncloud/enterprise/wiki/Desktop-Signing-Knowledge)
 * [ ] Mac: Perform smoke test (Install, make sure it does not explode, and check if all version indicators are correct)
 * [ ] Win: Perform smoke test (Install, make sure it does not explode, and check if all version indicators are correct)
 * [ ] Linux: Smoke test of one distro package (Install, make sure it does not explode, and check if all version indicators are correct)
 * [ ] Create a signed tag using ```git tag -u E94E7B37 tagname``` (https://github.com/owncloud/enterprise/wiki/Desktop-Signing-Knowledge)
 * [ ] Create a pull request to the owncloud.org repository to update the install page (strings.php, page-desktop.php) and the changelog on owncloud.org. From now on download packages from the staging webserver.
 * [ ] Inform community mailinglists devel@owncloud.org and testpilots@owncloud.org
 * [ ] Inform packagers @dragotin (openSUSE) @hefee (Debian)
 * [ ] Announce on https://central.owncloud.org
 * [ ] Check crash reporter
 One week before the final release:
 * [ ] Communicate the release schedule on mailinglist release-coordination@owncloud.com. Give a high level overview of the upcoming new features, changes etc.
 * [ ] Ensure marketing is aware (marketing@owncloud.com) and prepared for the release (social, .com website, cust. communications)
 * [ ] Inform GCX knows the next version is about 1 week out (gcx@owncloud.com)
 Day before final Release:
 * [ ] Check the translations coming from transifex: All synchronized?
 * [ ] Run the tx.pl scripts on the final code tag
 * [ ] Run ```make test```
 * [ ] Run smashbox
 * [ ] Inform product management and marketing that we are 1 day out
 On Release Day (for final release):
 * [ ] Add last updates to Changelog in the client source repository.
 * [ ] Branch off a release branch called VERSION-rcX or VERSION-betaX  (without v, v is for tags)
 * [ ] Edit ```VERSION.cmake``` to set the suffix to beta1, beta2 etc. Commit the result to the release branch only
 * [ ] Make sure to increase the version number of the branched of release, e.g. if you release 2.3.2 then you should change VERSION.cmake in 2.3 to 2.3.3 since that branch now will be 2.3.3
 * [ ] Create build for using owncloud-client-trigger (uncheck the "nightly build" checkbox, use the proper dropdown for version suffix) for theme 'ownCloud'
 * [ ] Create build for using owncloud-client-trigger (uncheck the "nightly build" checkbox, use the proper dropdown for version suffix) for theme 'testpilotcloud'
 * [ ] Only now download the last created source .tar.xz and sign it with gpg. Copy the signature into a new .asc file. (timing issue because currently 'testpilotcloud' re-creates the source .tar.xz) (https://github.com/owncloud/enterprise/wiki/Desktop-Signing-Knowledge)
 * [ ] Branch isv:ownCloud:desktop to isv:ownCloud:desktop:client-X.Y.Z before overwriting https://github.com/owncloud/administration/blob/master/jenkins/obs_integration/obs-backup-prj.sh
  * Check if patches still apply in the linux packages
  * Update [OBS repository](https://build.opensuse.org/project/show?project=isv%3AownCloud%3Adesktop) `isv:ownCloud:desktop`
 * [ ] Re-download Mac builds and check signature. Interactive in installer window
 * [ ] Re-download Win build check signature. From Mac or Linux: ```osslsigncode verify ownCloud-version-setup.exe```
 * [ ] Mac: Perform smoke test (Install, make sure it does not explode, and check if all version indicators are correct)
 * [ ] Win: Perform smoke test (Install, make sure it does not explode, and check if all version indicators are correct)
 * [ ] Linux: Smoke test of one distro package (Install, make sure it does not explode, and check if all version indicators are correct)
 * [ ] Linux: Run @SamuAlfageme 's magic Linux-test-all-packages-script
 * [ ] Linux: Re-enable OBS publishing on the project (check for accidentially disabled packages too) 
 * Let obs build and publish exactly once. then
  * [ ] disable publishing (on the obs project!) and rebuild the owncloud-client package and all its dependencies.
  * [ ] double-check that there are no _aggregatepac from other projects
  * [ ] Create a signed tag using ```git tag -u E94E7B37 tagname``` (https://github.com/owncloud/enterprise/wiki/Desktop-Signing-Knowledge)
 * [ ] Copy builds from ```testing``` to ```stable``` on download.owncloud.com, double check the download links. (make sure the .asc is there too)
 * [ ] Create a pull request to the owncloud.org repository to update the install page (strings.php, page-desktop.php). From now on download packages from the staging webserver.
 * [ ] Announce on https://central.owncloud.org
 * [ ] Announce on announcements@owncloud.org
 * [ ] Inform packagers @dragotin (openSUSE) @hefee (Debian)
 * [ ] Create git signed tag in client repository using ```git tag -u E94E7B37 tagname```
 * [ ] Send out Social (tweet, blog, other)
 * [ ] Send out customer communication (if any)
 * [ ] Inform GCX that the new version is released (gcx@owncloud.com)
 * [ ] Inform release-coordination@owncloud.com
 * [ ] Ensure marketing is aware (marketing@owncloud.com)
 * [ ] Take pride and celebrate!
 * [ ] Also update the testpilotcloud builds for that release version and make sure they show up on the download page
 * [ ] Tell GCX to increment the minimum supported version for enterprise customers
 * [ ] Check if minimum.supported.desktop.version (https://github.com/owncloud/core/blob/master/config/config.sample.php#L1152) needs to be updated in server
 * [ ] Linux OBS: Update the testing repository to the latest stable version.
 15 minutes after after release:
 * [ ] Test all advertised download links to have the expected version
 * [ ] Check for build errors in OBS
 * [ ] disable publishing in OBS to prevent that accidential rebuilds hit the end users.
 A few days after the release (for final release)
 * [ ] Review changes in the release branch, merge back into master
 * [ ] check the crash reporter if auto update is a good idea or we need a new release
 * [ ] Update the updater script ```clientupdater.php```
 * [ ] Execute announced deprecations. Disable builds for deprecated platforms. Update accordingly: https://doc.owncloud.org/server/latest/admin_manual/installation/system_requirements.html#desktop
 * [ ] Increment version number in nightly builds. Special case: after the last release in a branch, jump forward to the 'next release branch'... That may mean, this is nightly is the same as edge then.
 ```
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,37 +0,0 @@
 sudo: required
 language: cpp
 services:
  - docker
 branches:
  only:
  - coverity_scan 
 before_install:
 - sudo sh -c "echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_14.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
 - sudo sh -c "echo 'deb-src http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_14.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
 - wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/Ubuntu_14.04/Release.key
 - sudo apt-key add - < Release.key
 - sudo apt-get update
 - sudo apt-get -y build-dep owncloud-client
 - checkout=$(git show-ref --head --hash head)
 - cd ../
 - wget https://scan.coverity.com/download/linux-64 --post-data "token=$token&project=owncloud%2Fmirall" -O coverity_tool.tgz
 - mkdir coverity
 - tar -xvf coverity_tool.tgz -C coverity --strip-components=1
 - export PATH=$PATH:$PWD/coverity/bin/
 - cd $TRAVIS_BUILD_DIR
 install:
 - cd ../
 - mkdir client-build
 - cd client-build
 - cmake -DCMAKE_BUILD_TYPE="Debug" $TRAVIS_BUILD_DIR
 - cov-build --dir cov-int make
 - tar czvf client.tgz cov-int 
 - curl --form token=$token --form email=lukas@statuscode.ch --form file=@$PWD/client.tgz --form version="$checkout" --form description="$checkout" https://scan.coverity.com/builds?project=owncloud%2Fmirall
 # Hack to stop processing
 script: true
--- a/.tx/config
+++ b/.tx/config
@@ -0,0 +1,16 @@
 [main]
 host = https://www.transifex.com
 lang_map = bg_BG: bg, cs_CZ: cs, de_DE: de, fi_FI: fi, hu_HU: hu, nb_NO: nb, sk_SK: sk, th_TH: th, ja_JP: ja, pt_PT: pt, et_EE: et
 [nextcloud.client]
 host = https://www.transifex.com
 source_lang = en
 source_file = translations/client_en.ts
 file_filter = translations/client_<lang>.ts
 type = QT
 [nextcloud.client-desktop]
 host = https://www.transifex.com
 source_file = mirall.desktop.in
 source_lang = en
 type = DESKTOP
--- a/.tx/nextcloud.client-desktop/cs_translation
+++ b/.tx/nextcloud.client-desktop/cs_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 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
--- a/.tx/nextcloud.client-desktop/de_translation
+++ b/.tx/nextcloud.client-desktop/de_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 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
--- a/.tx/nextcloud.client-desktop/en_GB_translation
+++ b/.tx/nextcloud.client-desktop/en_GB_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 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
--- a/.tx/nextcloud.client-desktop/es_CL_translation
+++ b/.tx/nextcloud.client-desktop/es_CL_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 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
--- a/.tx/nextcloud.client-desktop/es_CO_translation
+++ b/.tx/nextcloud.client-desktop/es_CO_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 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
--- a/.tx/nextcloud.client-desktop/es_CR_translation
+++ b/.tx/nextcloud.client-desktop/es_CR_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 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
--- a/.tx/nextcloud.client-desktop/es_DO_translation
+++ b/.tx/nextcloud.client-desktop/es_DO_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 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
--- a/.tx/nextcloud.client-desktop/es_EC_translation
+++ b/.tx/nextcloud.client-desktop/es_EC_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 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
--- a/.tx/nextcloud.client-desktop/es_GT_translation
+++ b/.tx/nextcloud.client-desktop/es_GT_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 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
--- a/.tx/nextcloud.client-desktop/es_MX_translation
+++ b/.tx/nextcloud.client-desktop/es_MX_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 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
--- a/.tx/nextcloud.client-desktop/es_SV_translation
+++ b/.tx/nextcloud.client-desktop/es_SV_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 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
--- a/.tx/nextcloud.client-desktop/es_translation
+++ b/.tx/nextcloud.client-desktop/es_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 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
--- a/.tx/nextcloud.client-desktop/fr_translation
+++ b/.tx/nextcloud.client-desktop/fr_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 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
--- a/.tx/nextcloud.client-desktop/he_translation
+++ b/.tx/nextcloud.client-desktop/he_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 Comment[he]=@APPLICATION_NAME@ לקוח סנכרון לשולחן העבודה
 Icon[he]=@APPLICATION_EXECUTABLE@
 Name[he]=@APPLICATION_NAME@ לקוח סנכרון לשולחן העבודה 
 GenericName[he]=סנכרון תיקיות
--- a/.tx/nextcloud.client-desktop/hr_translation
+++ b/.tx/nextcloud.client-desktop/hr_translation
@@ -0,0 +1,203 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 Comment[hr]=klijent za sinkronizaciju računala
 Name[hr]=sinkronizacija računala
 GenericName[hr]=Sinkronizacija mapa
--- a/.tx/nextcloud.client-desktop/is_translation
+++ b/.tx/nextcloud.client-desktop/is_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 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
--- a/.tx/nextcloud.client-desktop/it_translation
+++ b/.tx/nextcloud.client-desktop/it_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 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
--- a/.tx/nextcloud.client-desktop/ja_translation
+++ b/.tx/nextcloud.client-desktop/ja_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 Comment[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
 Icon[ja_JP]=@APPLICATION_EXECUTABLE@
 Name[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
 GenericName[ja_JP]=フォルダーを同期する
--- a/.tx/nextcloud.client-desktop/pt_BR_translation
+++ b/.tx/nextcloud.client-desktop/pt_BR_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 Comment[pt_BR]=@APPLICATION_NAME@ cliente de sincronização desktop
 Icon[pt_BR]=@APPLICATION_EXECUTABLE@
 Name[pt_BR]=@APPLICATION_NAME@ cliente de sincronização desktop
 GenericName[pt_BR]=Sincronizar Pasta
--- a/.tx/nextcloud.client-desktop/ru_translation
+++ b/.tx/nextcloud.client-desktop/ru_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 Comment[ru]=Клиент синхронизации @APPLICATION_NAME@ для ПК
 Icon[ru]=@APPLICATION_EXECUTABLE@
 Name[ru]=@APPLICATION_NAME@  клиент для ПК
 GenericName[ru]=Синхронизация папок
--- a/.tx/nextcloud.client-desktop/sr_translation
+++ b/.tx/nextcloud.client-desktop/sr_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 Comment[sr]=@APPLICATION_NAME@ десктоп клијент за синхронизацију
 Icon[sr]=@APPLICATION_EXECUTABLE@
 Name[sr]=@APPLICATION_NAME@ десктоп клијент за синхронизацију
 GenericName[sr]=Синхронизација фасцикли
--- a/.tx/nextcloud.client-desktop/tr_translation
+++ b/.tx/nextcloud.client-desktop/tr_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 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
--- a/.tx/nextcloud.client-desktop/zh_TW_translation
+++ b/.tx/nextcloud.client-desktop/zh_TW_translation
@@ -0,0 +1,204 @@
 [Desktop Entry]
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 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
 Comment[zh_TW]=@APPLICATION_NAME@ 桌面同步客戶端
 Icon[zh_TW]=@APPLICATION_EXECUTABLE@
 Name[zh_TW]=@APPLICATION_NAME@ 桌面同步客戶端
 GenericName[zh_TW]=資料夾同步
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.2)
 set(CMAKE_CXX_STANDARD 14)
 project(client)
@@ -9,7 +9,7 @@ set(OEM_THEME_DIR "" CACHE STRING "Define directory containing a custom theme")
 if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake )
     include ( ${OEM_THEME_DIR}/OEM.cmake )
 else ()
-     include ( ${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake )
+     include ( ${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake )
 endif()
 # need this logic to not mess with re/uninstallations via macosx.pkgproj
 if(${APPLICATION_REV_DOMAIN} STREQUAL "com.owncloud.desktopclient")
@@ -183,15 +183,19 @@ if(BUILD_CLIENT)
    endif()
    find_package(Sphinx)
    find_package(PdfLatex)
    find_package(OpenSSL REQUIRED VERSION 1.1)
   find_package(ZLIB REQUIRED)
   find_package(GLib2)
   find_package(Gio)
   find_package(Libcloudproviders)
 endif()
 if (NOT DEFINED APPLICATION_ICON_NAME)
    set(APPLICATION_ICON_NAME ${APPLICATION_SHORTNAME})
 endif()
-include(OwnCloudCPack.cmake)
+include(NextcloudCPack.cmake)
 add_definitions(-DUNICODE)
 add_definitions(-D_UNICODE)
@@ -211,9 +215,6 @@ endif()
 file( GLOB TRANS_FILES ${CMAKE_SOURCE_DIR}/translations/client_*.ts)
 set(TRANSLATIONS ${TRANS_FILES})
 # Make sure we set this before recursing into child folders.
 set(WITH_TESTING ${UNIT_TESTING})
 if(BUILD_CLIENT)
    add_subdirectory(src)
    if(NOT BUILD_LIBRARIES_ONLY)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,20 +1,18 @@
 ## Submitting Desktop Client issues
-If you have questions about how to use the ownCloud Desktop Client, please
+If you have questions about how to use the Nextcloud Desktop Client, please
-direct these to the [mailing list][mailinglist] or our [forum][forum].
+visit our [support site][support] or our [forum][forum].
 We are also available on [IRC][irc].
 ### Bug Reporting Guidelines
 * __Important__: Report the issue using our [template][template], it includes all the
  information we need to track down the issue.  
-* __SECURITY__: Report any potential security bug to security@owncloud.com following our [security policy](https://owncloud.org/security/) instead of filing an issue in our bug tracker
+* __SECURITY__: Report any potential security bug by following our [security policy](https://nextcloud.com/security/) instead of filing an issue in our bug tracker
-* This repository is *only* for issues within the ownCloud desktop client. 
+* This repository is *only* for issues within the Nextcloud desktop client. 
  Issues in other components should be reported in their own repositores: 
-  - [ownCloud server](https://github.com/owncloud/core/issues)
+  - [Nextcloud server](https://github.com/nextcloud/server/issues)
-  - [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar,
+  - [Android client](https://github.com/nextcloud/android/issues)
-    Contacts...)
+  - [iOS client](https://github.com/nextcloud/ios/issues)
  - [Android client](https://github.com/owncloud/android/issues)
  - [iOS client](https://github.com/owncloud/ios-issues/issues)
 * Search the existing issues first, it's likely that your issue was already
  reported.
@@ -23,27 +21,20 @@ 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.github.com/owncloud/client/master/.github/issue_template.md
+[template]: https://raw.githubusercontent.com/nextcloud/appstore/master/.github/issue_template.md
-[mailinglist]: https://mail.kde.org/mailman/listinfo/owncloud
+[support]: https://nextcloud.com/support/
-[forum]: http://forum.owncloud.org/
+[forum]: https://help.nextcloud.com/categories
-[irc]: http://webchat.freenode.net/?channels=owncloud&uio=d4
+[irc]: https://webchat.freenode.net/?channels=nextcloud
 ## Contributing to Source Code
-Thanks for wanting to contribute source code to ownCloud. That's great!
+Thanks for wanting to contribute source code to Nextcloud. That's great!
-Before we're able to merge your code to ownCloud Desktop Client, you need to sign
+You do not need to sign a Contributor Agreement, but we ask that you follow our 
-our [Contributor Agreement][agreement].
+[Code of Conduct](https://nextcloud.com/code-of-conduct/).
-Please read the [Desktop Client Manual][desktopman] and the [Developer
+Please read the [Contribution Guide](https://nextcloud.com/contribute/) to get 
-Manuals][devmanual] to get useful info like how to create your first
+started.
 application or how to test the ownCloud code with phpunit.
 [agreement]: http://owncloud.org/about/contributor-agreement/
 [devmanual]: http://owncloud.org/dev
 [desktopman]: http://doc.owncloud.org/desktop
 ## Translations
-Please submit translations via [Transifex][transifex].
+Please submit translations via [Transifex](https://www.transifex.com/nextcloud/nextcloud/).
 [transifex]: https://www.transifex.com/projects/p/owncloud/
--- a/CPackOptions.cmake.in
+++ b/CPackOptions.cmake.in
@@ -14,7 +14,7 @@ set( OEM_THEME_DIR     @OEM_THEME_DIR@ )
 if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
     include ( ${OEM_THEME_DIR}/OEM.cmake )
 else ()
-     include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" )
+     include ( "${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake" )
 endif()
 set( CRASHREPORTER_EXECUTABLE @CRASHREPORTER_EXECUTABLE@)
--- a/29
+++ b/29
@@ -1,7 +1,22 @@
 ChangeLog
 =========
-version 2.4.0 (2017-12-XX)
+version 2.4.1 (2017-02-xx)
 * Ignore files with file names that can't be encoded for the filesystem (#6287, #5676, #5719)
 * Issues: Speed up insertion and add hard upper limit (#6272)
 * Notifications: Fix "Dismiss" action
 * Notifications: Fix timer invocation on macOS
 * Notifications: Immediately poll when account online
 * Protocol: Remove entries for auto resolved conflicts (#6316)
 * owncloudcmd: Set proxy before capabilities call (#6281)
 * owncloudcmd: Do not do the capability call when --nonshib is passed
 * Avatars: Use old location for servers <10 (#6279)
 * Link shares: Change default share name (#6298)
 * Nautilus integration: Work with python2 and python3
 * HTTP2: Only allow with Qt 5.9.4 (#6285)
 * Crash fixes
 version 2.4.0 (2017-12-21)
 * If you're using 2.4.0 alpha1, please upgrade as previous alphas/rcs had an issue with hidden files and renames!
 * OAuth2 authentication support by opening external browser (#5668)
 * Shibboleth: Change to use OAuth2 if supported (#6198)
@@ -204,7 +219,7 @@ version 2.2.2 (release 2016-06-21)
 version 2.2.1 (release 2016-06-06)
 * Fix out of memory error when too many uploads happen (#4611)
 * Fix display errors in progress display (#4803 #4856)
- * LockWatcher: Remember to upload files after they become unlocked (#4865) 
+ * LockWatcher: Remember to upload files after they become unlocked (#4865)
 * Fix overlay icons for files with umlauts (#4884)
 * Certs: Re-ask for different cert after rejection (#4898, #4911)
 * Progress: Don't count items without propagation jobs (#4856, #4910)
@@ -261,7 +276,7 @@ version 2.1 (release 2015-12-03)
 * GUI: Improved upload/download progress UI (#3403, #3569)
 * Allowed sharing with ownCloud internal users and groups from Desktop
 * Changed files starting in .* to be considered hidden on all platforms (#4023)
- * Reflect read-only permissions in filesystem (#3244)  
+ * Reflect read-only permissions in filesystem (#3244)
 * Blacklist: Clear on successful chunk upload (#3934)
 * Improved reconnecting after network change/disconnect (#4167 #3969 ...)
 * Improved performance in Windows file system discovery
@@ -335,7 +350,7 @@ version 2.0.2 (release 2015-10-21)
  * ShareDialog: Fix folder display (#3659)
  * AccountSettings: Restore from legacy only once (#3565)
  * SSL Certificate Error Dialog: show account name (#3729)
-  * Tray notification: Don't show a message about modified folder (#3613) 
+  * Tray notification: Don't show a message about modified folder (#3613)
  * PropagateLocalRemove:  remove entries from the DB even if there was an error.
  * Settings UI improvements (eg. #3713, #3721, #3619 and others)
  * Folder: Do not create the sync folder if it does not exist (#3692)
@@ -966,7 +981,7 @@ version 1.1.1 (release 2012-10-18), csync 0.60.1 required
               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.
+            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
@@ -986,8 +1001,8 @@ version 1.0.4 (release 2012-08-10), csync 0.50.8 required
  * [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)
+          French, Russian, Japanese, Swedish, Portuguese (Portugal)
-	  all with translation rate >90%.
+          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.
--- a/72
+++ b/72
@@ -1,72 +0,0 @@
 #!groovy
 //
 // We now run the tests in Debug mode so that ASSERTs are triggered.
 // Ideally we should run the tests in both Debug and Release so we catch
 // all possible error combinations.
 // See also the top comment in syncenginetestutils.h
 //
 // We are building "Linux - GCC" with "make" and "Linux - Clang" with ninja,
 // the combinations are more or less arbitrarily chosen. We just want to
 // check that both compilers and both CMake generators work. It's
 // unlikely that a specific generator only breaks with a specific
 // compiler.
 // Constructed from the DockerFile in admin/linux/DockerFile
 def linux = docker.image('dominikschmidt/docker-owncloud-client-linux:latest')
 // Constructed from the DockerFile in admin/win/docker/DockerFile
 def win32 = docker.image('dominikschmidt/docker-owncloud-client-win32-cross:latest')
 node('CLIENT') {
    stage 'Checkout'
        checkout scm
        sh '''git submodule update --init'''
    stage 'Linux - Pull Docker Image'
        linux.pull()
    stage 'Linux - GCC'
        linux.inside {
            sh '''
            export HOME="$(pwd)/home"
            rm -rf build home
            mkdir build
            cd build
            cmake -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE="Debug" -DUNIT_TESTING=1 ..
            make -j4
            LC_ALL=C.UTF-8 ctest -V --output-on-failure
            '''
        }
    stage 'Linux - Clang'
        linux.inside {
            sh '''
            export HOME="$(pwd)/home"
            rm -rf build home
            mkdir build
            cd build
            cmake -GNinja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE="Debug" -DUNIT_TESTING=1 ..
            ninja -j4
            LC_ALL=C.UTF-8 ctest -V --output-on-failure
            '''
        }
    stage 'Win32 Cross - Pull Docker Image'
        win32.pull()
    stage 'Win32 Cross'
        win32.inside {
            sh '''
            rm -rf build-win32
            mkdir build-win32
            cd build-win32
            ../admin/win/download_runtimes.sh
            cmake .. -DCMAKE_TOOLCHAIN_FILE=../admin/win/Toolchain-mingw32-openSUSE.cmake -DWITH_CRASHREPORTER=ON
            make -j4
            make package
            ctest .
            '''
        }
   // Stage 'macOS' TODO
 }
--- a/NEXTCLOUD.cmake
+++ b/NEXTCLOUD.cmake
@@ -0,0 +1,24 @@
 set( APPLICATION_NAME       "Nextcloud" )
 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_ICON_NAME  "Nextcloud" )
 set( LINUX_PACKAGE_SHORTNAME "nextcloud" )
 set( THEME_CLASS            "NextcloudTheme" )
 set( APPLICATION_REV_DOMAIN "com.nextcloud.desktopclient" )
 set( WIN_SETUP_BITMAP_PATH  "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
 set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-background.png" CACHE STRING "The MacOSX installer background image")
 # set( THEME_INCLUDE          "${OEM_THEME_DIR}/mytheme.h" )
 # 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_ICON ":/owncloud-icon.png" )
 option( WITH_PROVIDERS "Build with providers list" OFF )
--- a/NextcloudCPack.cmake
+++ b/NextcloudCPack.cmake
@@ -5,7 +5,7 @@ set( CPACK_PACKAGE_CONTACT  "Dominik Schmidt <domme@tomahawk-player.org>" )
 if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
     include ( "${OEM_THEME_DIR}/OEM.cmake" )
 else ()
-     include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" )
+     include ( "${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake" )
 endif()
 include( VERSION.cmake )
--- a/OWNCLOUD.cmake
+++ b/OWNCLOUD.cmake
@@ -1,22 +0,0 @@
 set( APPLICATION_NAME       "ownCloud" )
 set( APPLICATION_SHORTNAME  "ownCloud" )
 set( APPLICATION_EXECUTABLE "owncloud" )
 set( APPLICATION_DOMAIN     "owncloud.com" )
 set( APPLICATION_VENDOR     "ownCloud" )
 set( APPLICATION_UPDATE_URL "https://updates.owncloud.com/client/" CACHE string "URL for updater" )
 set( APPLICATION_ICON_NAME  "owncloud" )
 set( LINUX_PACKAGE_SHORTNAME "owncloud" )
 set( THEME_CLASS            "ownCloudTheme" )
 set( APPLICATION_REV_DOMAIN "com.owncloud.desktopclient" )
 set( WIN_SETUP_BITMAP_PATH  "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
 set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-background.png" CACHE STRING "The MacOSX installer background image")
 # set( THEME_INCLUDE          "${OEM_THEME_DIR}/mytheme.h" )
 # 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_ICON ":/owncloud-icon.png" )
--- a/README.md
+++ b/README.md
@@ -1,62 +1,94 @@
-# ownCloud Desktop Client
+# Nextcloud Desktop Client
-[![Build Status](https://jenkins.owncloud.org/buildStatus/icon?job=owncloud-client/client/master)](https://jenkins.owncloud.org/job/owncloud-client/job/client/job/master/) [![Build status](https://ci.appveyor.com/api/projects/status/a1x3dslys7de6e21/branch/master?svg=true)](https://ci.appveyor.com/project/ownclouders/client/branch/master)
+The :computer: Nextcloud Desktop Client is a tool to synchronize files from Nextcloud Server
 ## Introduction
 The ownCloud Desktop Client is a tool to synchronize files from ownCloud Server
 with your computer.
-## Download
+<p align="center">
    <img src="https://nextcloud.com/wp-content/themes/next/assets/img/clients/desktop/macsettings.png?x16328" alt="Desktop Client on Mac OS]">
 </p>
-### Binary packages
+## :blue_heart: :tada: Contributing
-* Refer to the download page https://owncloud.org/install/#install-clients
+### :hammer_and_wrench: How to compile the desktop client
-### Source code
+:building_construction: [System requirements](https://github.com/nextcloud/desktop/wiki/System-requirements-for-compiling-the-desktop-client) includes OpenSSL 1.1.x, QtKeychain, Qt 5.x.x and zlib.
-The ownCloud Desktop Client is developed in Git. Since Git makes it easy to
+#### :memo: Step by step instructions
 ##### Clone the repo and create build directory
 ```
 $ git clone git@github.com:nextcloud/desktop.git
 $ cd desktop
 $ mkdir build
 ```
 ##### Compile and install
 ##### Linux
 ```
 $ 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=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
 $ cmake --build . --config Debug --target install
 ```
 ##### 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
 #### :high_brightness: Daily builds
 - Daily builds based on the latest master are available for Linux :penguin:, Mac, and Windows
 [in the desktop/daily folder of our download server](https://download.nextcloud.com/desktop/daily).
 For more info: [Wiki/Daily Builds](https://github.com/nextcloud/desktop/wiki/Daily-Builds).
 #### :rocket: Releases
 - Refer to the [download page https://nextcloud.com/install/#install-clients](https://nextcloud.com/install/#install-clients)
 ### :bomb: Reporting issues
 - If you find any bugs or have any suggestion for improvement, please
 file an issue at https://github.com/nextcloud/client/issues. Do not
 contact the authors directly by mail, as this increases the chance
 of your report being lost. :boom:
 ### :smiley: :trophy: Pull requests
 - If you created a patch :heart_eyes:, please submit a [Pull
 Request](https://github.com/nextcloud/client/pulls).
 ## :satellite: Contact us
 If you want to contact us, e.g. before starting a more complex feature, for questions :question:
 you can join us at
 [#nextcloud-client](https://webchat.freenode.net/?channels=nextcloud-client).
 ## :v: Code of conduct
 The Nextcloud community has core values that are shared between all members during conferences, hackweeks and on all interactions in online platforms including [Github](https://github.com/nextcloud) and [Forums](https://help.nextcloud.com). If you contribute, participate or interact with this community, please respect [our shared values](https://nextcloud.com/code-of-conduct/). :relieved:
 ## :memo: Source code
 The Nextcloud Desktop Client is developed in Git. Since Git makes it easy to
 fork and improve the source code and to adapt it to your need, many copies
 can be found on the Internet, in particular on GitHub. However, the
 authoritative repository maintained by the developers is located at
-https://github.com/owncloud/client.
+https://github.com/nextcloud/desktop.
-## Building the source code
+## :scroll: License
 [Building the Client](http://doc.owncloud.org/desktop/2.3/building.html)
 in the ownCloud Desktop Client manual.
 ## Maintainers and Contributors
 The maintainers of this repository are:
 * Klaas Freitag <freitag@owncloud.com>
 * Daniel Molkentin <danimo@owncloud.com>
 * Markus Goetz <guruz@owncloud.com>
 * Olivier Goffart <ogoffart@owncloud.com>
 ownCloud Desktop Client is developed by the ownCloud community and receives
 patches from a variety of authors.
 ## Reporting issues and contributing
 If you find any bugs or have any suggestion for improvement, please
 file an issue at https://github.com/owncloud/client/issues. Do not
 contact the authors directly by mail, as this increases the chance
 of your report being lost.
 If you created a patch, please submit a [Pull
 Request](https://github.com/owncloud/client/pulls). For non-trivial
 patches, we need you to sign the [Contributor
 Agreement](https://owncloud.org/contribute/agreement) before
 we can accept your patch.
 If you want to contact us, e.g. before starting a more complex feature,
 you can join us at
 [#owncloud-client-dev](irc://irc.freenode.net/#owncloud-client-dev).
 ## License
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,7 +1,7 @@
 set( MIRALL_VERSION_MAJOR 2 )
 set( MIRALL_VERSION_MINOR 5 )
 set( MIRALL_VERSION_PATCH 0 )
-set( MIRALL_VERSION_YEAR  2017 )
+set( MIRALL_VERSION_YEAR  2018 )
 set( MIRALL_SOVERSION 0 )
 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
--- a/admin/linux/build-appimage.sh
+++ b/admin/linux/build-appimage.sh
@@ -0,0 +1,103 @@
 #! /bin/bash
 set -xe
 mkdir /app
 mkdir /build
 #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
 export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
 #set defaults
 export SUFFIX=${DRONE_PULL_REQUEST:=master}
 if [ $SUFFIX != "master" ]; then
    SUFFIX="PR-$SUFFIX"
 fi
 #QtKeyChain 0.8.0
 cd /build
 git clone https://github.com/frankosterfeld/qtkeychain.git
 cd qtkeychain
 git checkout v0.8.0
 mkdir build
 cd build
 cmake -D CMAKE_INSTALL_PREFIX=/usr ../
 make -j4
 make DESTDIR=/app install 
 #Build client
 cd /build
 mkdir build-client
 cd build-client
 cmake -D CMAKE_INSTALL_PREFIX=/usr \
    -D NO_SHIBBOLETH=1 \
    -D QTKEYCHAIN_LIBRARY=/app/usr/lib/x86_64-linux-gnu/libqt5keychain.so \
    -D QTKEYCHAIN_INCLUDE_DIR=/app/usr/include/qt5keychain/ \
    -DMIRALL_VERSION_SUFFIX=PR-$DRONE_PULL_REQUEST \
    -DMIRALL_VERSION_BUILD=$DRONE_BUILD_NUMBER \
    $DRONE_WORKSPACE
 make -j4
 make DESTDIR=/app install
 # Move stuff around
 cd /app
 mv ./usr/lib/x86_64-linux-gnu/nextcloud/* ./usr/lib/x86_64-linux-gnu/
 mv ./usr/lib/x86_64-linux-gnu/* ./usr/lib/
 rm -rf ./usr/lib/nextcloud
 rm -rf ./usr/lib/cmake
 rm -rf ./usr/include
 rm -rf ./usr/mkspecs
 rm -rf ./usr/lib/x86_64-linux-gnu/
 # Don't bundle nextcloudcmd as we don't run it anyway
 rm -rf ./usr/bin/nextcloudcmd
 # Don't bundle the explorer extentions as we can't do anything with them in the AppImage
 rm -rf ./usr/share/caja-python/
 rm -rf ./usr/share/nautilus-python/
 rm -rf ./usr/share/nemo-python/
 # Move sync exlucde to right location
 mv ./etc/Nextcloud/sync-exclude.lst ./usr/bin/
 rm -rf ./etc
 sed -i -e 's|Icon=nextcloud|Icon=Nextcloud|g' usr/share/applications/nextcloud.desktop # Bug in desktop file?
 cp ./usr/share/icons/hicolor/512x512/apps/Nextcloud.png . # Workaround for linuxeployqt bug, FIXME
 # Because distros need to get their shit together
 cp -R /lib/x86_64-linux-gnu/libssl.so* ./usr/lib/
 cp -R /lib/x86_64-linux-gnu/libcrypto.so* ./usr/lib/
 cp -P /usr/local/lib/libssl.so* ./usr/lib/
 cp -P /usr/local/lib/libcrypto.so* ./usr/lib/
 # NSS fun
 cp -P -r /usr/lib/x86_64-linux-gnu/nss ./usr/lib/
 # Use linuxdeployqt to deploy
 cd /build
 wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
 chmod a+x linuxdeployqt*.AppImage
 ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract
 rm ./linuxdeployqt-continuous-x86_64.AppImage
 unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=/app/usr/lib/
 ./squashfs-root/AppRun /app/usr/share/applications/nextcloud.desktop -bundle-non-qt-libs
 # Set origin
 ./squashfs-root/usr/bin/patchelf --set-rpath '$ORIGIN/' /app/usr/lib/libnextcloudsync.so.0
 # Build AppImage
 ./squashfs-root/AppRun /app/usr/share/applications/nextcloud.desktop -appimage
 mv Nextcloud*.AppImage Nextcloud-${SUFFIX}-${DRONE_COMMIT}-x86_64.AppImage
 curl --upload-file $(readlink -f ./Nextcloud*.AppImage) https://transfer.sh/Nextcloud-${SUFFIX}-${DRONE_COMMIT}-x86_64.AppImage
 echo
 echo "Get the AppImage at the link above!"
--- a/admin/linux/debian/README
+++ b/admin/linux/debian/README
@@ -0,0 +1,31 @@
 - .pbuilderrc:
  COMPONENTS="main restricted universe multiverse"
  OTHERMIRROR="deb [trusted=yes] file:///${HOME}/pbuilder/deps ./"
  HOOKDIR="${HOME}/pbuilder/hook.d"
  BINDMOUNTS="${HOME}/pbuilder/deps"
  EXTRAPACKAGES="apt-utils"
 - pbuilder/hook.d/D70setupdeps: hook to create a Packages file for the
  packages in pbuilder/deps
 - pbuilder-dist trusty create --override-config --othermirror "deb [trusted=yes] file:///${HOME}/pbuilder/deps ./"
  The OTHERMIRROR setting in .pbuilderrc is overridden by pbuilder-dist!
 - scripts:
  config.sh: basic configuration variables
  create_debdir.sh <tag> <version> <distribution>:
     create the Debian-conformant source directory and .orig.tar.bz2
     in the build area
  build.sh <tag> <version> <distribution> <debuild options...>:
     call create_debdir.sh and then debuild
  pbuilder.sh <distribution>:
     build the existing source package with pbuilder-dist.
  pbuild.sh <distribution>:
     build the source packages with build.sh and then call
     pbuilder.sh
--- a/admin/linux/debian/debian.bionic/changelog
+++ b/admin/linux/debian/debian.bionic/changelog
@@ -0,0 +1,23 @@
 nextcloud-client (2.3.3-1.0~bionic1) bionic; 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~bionic1) bionic; 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~bionic1) bionic; 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~bionic1) bionic; 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
--- a/admin/linux/debian/debian.bionic/control
+++ b/admin/linux/debian/debian.bionic/control
@@ -0,0 +1,88 @@
 Source: nextcloud-client
 Section: contrib/devel
 Priority: optional
 Maintainer: István Váradi <ivaradi@varadiistvan.hu>
 Build-Depends: cmake,
               debhelper,
               cdbs,
               dh-python,
               extra-cmake-modules (>= 5.16),
               kdelibs5-dev,
               kio-dev,
               libcmocka-dev,
               libhttp-dav-perl,
               libinotify-dev [kfreebsd-any],
               libqt5webkit5-dev,
               libsqlite3-dev,
               libssl-dev (>> 1.0.0),
               zlib1g-dev,
               optipng,
               pkg-kde-tools,
               python-sphinx | python3-sphinx,
               python3-all,
               qt5keychain-dev,
               qtwebengine5-dev,
               qtdeclarative5-dev,
               qttools5-dev,
               qttools5-dev-tools,
               xvfb
 Standards-Version: 3.9.8
 Homepage: https://github.com/nextcloud/client_theming
 #Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
 #Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
 Package: nextcloud-client
 Architecture: any
 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
 one or more directories on your local machine and always
 have access to your latest files wherever you are.
 Package: libnextcloudsync0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Nextcloud sync library
 Used by the Nextcloud desktop client as the synchronization engine.
 Package: libnextcloudsync-dev
 Architecture: any
 Section: contrib/libdevel
 Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
 Description: Nextcloud sync library development files
 The headers and development library for the Nextcloud sync library.
 Package: nextcloud-client-l10n
 Architecture: all
 Depends: ${misc:Depends}
 Description: Nextcloud client internatialization files
 The translation files.
 Package: nextcloud-client-nautilus
 Architecture: all
 Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
 Description: Nautilus plugin for Nextcloud
 This package contains a Nautilus plugin to display
 synchronization status icons for Nextcloud files.
 Package: nextcloud-client-nemo
 Architecture: all
 Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo | nemo-python, nemo, ${misc:Depends}
 Description: Nemo plugin for Nextcloud
 This package contains a Nemo plugin to display
 synchronization status icons for Nextcloud files.
 Package: nextcloud-client-caja
 Architecture: all
 Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
 Description: Caja plugin for Nextcloud
 This package contains a Caja plugin to display
 synchronization status icons for Nextcloud files.
 Package: nextcloud-client-dolphin
 Architecture: any
 Depends: dolphin (>= 4:15.12.1), libnextcloudsync0 (= ${binary:Version}), nextcloud-client, ${misc:Depends}, ${shlibs:Depends}
 Description: Dolphin plugin for Nextcloud
 This package contains a Dolphin plugin to display
 synchronization status icons for Nextcloud files.
--- a/admin/linux/debian/debian.cosmic/changelog
+++ b/admin/linux/debian/debian.cosmic/changelog
@@ -0,0 +1,23 @@
 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~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~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~cosmic1) cosmic; 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
--- a/admin/linux/debian/debian.cosmic/control
+++ b/admin/linux/debian/debian.cosmic/control
@@ -0,0 +1,88 @@
 Source: nextcloud-client
 Section: contrib/devel
 Priority: optional
 Maintainer: István Váradi <ivaradi@varadiistvan.hu>
 Build-Depends: cmake,
               debhelper,
               cdbs,
               dh-python,
               extra-cmake-modules (>= 5.16),
               kdelibs5-dev,
               kio-dev,
               libcmocka-dev,
               libhttp-dav-perl,
               libinotify-dev [kfreebsd-any],
               libqt5webkit5-dev,
               libsqlite3-dev,
               libssl-dev (>> 1.0.0),
               zlib1g-dev,
               optipng,
               pkg-kde-tools,
               python-sphinx | python3-sphinx,
               python3-all,
               qt5keychain-dev,
               qtwebengine5-dev,
               qtdeclarative5-dev,
               qttools5-dev,
               qttools5-dev-tools,
               xvfb
 Standards-Version: 3.9.8
 Homepage: https://github.com/nextcloud/client_theming
 #Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
 #Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
 Package: nextcloud-client
 Architecture: any
 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
 one or more directories on your local machine and always
 have access to your latest files wherever you are.
 Package: libnextcloudsync0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Nextcloud sync library
 Used by the Nextcloud desktop client as the synchronization engine.
 Package: libnextcloudsync-dev
 Architecture: any
 Section: contrib/libdevel
 Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
 Description: Nextcloud sync library development files
 The headers and development library for the Nextcloud sync library.
 Package: nextcloud-client-l10n
 Architecture: all
 Depends: ${misc:Depends}
 Description: Nextcloud client internatialization files
 The translation files.
 Package: nextcloud-client-nautilus
 Architecture: all
 Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
 Description: Nautilus plugin for Nextcloud
 This package contains a Nautilus plugin to display
 synchronization status icons for Nextcloud files.
 Package: nextcloud-client-nemo
 Architecture: all
 Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo | nemo-python, nemo, ${misc:Depends}
 Description: Nemo plugin for Nextcloud
 This package contains a Nemo plugin to display
 synchronization status icons for Nextcloud files.
 Package: nextcloud-client-caja
 Architecture: all
 Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
 Description: Caja plugin for Nextcloud
 This package contains a Caja plugin to display
 synchronization status icons for Nextcloud files.
 Package: nextcloud-client-dolphin
 Architecture: any
 Depends: dolphin (>= 4:15.12.1), libnextcloudsync0 (= ${binary:Version}), nextcloud-client, ${misc:Depends}, ${shlibs:Depends}
 Description: Dolphin plugin for Nextcloud
 This package contains a Dolphin plugin to display
 synchronization status icons for Nextcloud files.
--- a/admin/linux/debian/debian.stable/changelog
+++ b/admin/linux/debian/debian.stable/changelog
@@ -0,0 +1,48 @@
 nextcloud-client (2.3.3-1.0~stable1) stable; 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) stable; 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) stable; 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) stable; 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
 nextcloud-client (2.2.4-1.3) stable; urgency=medium
  * Caja syncstate plugin is built.
  * The syncstate plugin has application-specific name
 -- István Váradi <ivaradi@varadiistvan.hu>  Fri, 27 Jan 2017 19:34:18 +0100
 nextcloud-client (2.2.4-1.2) stable; urgency=medium
  * Fixed appname in the Nemo syncstate extension.
 -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 19 Jan 2017 16:46:50 +0100
 nextcloud-client (2.2.4-1.1) stable; urgency=medium
  * Added Nautilus and Nemo syncstate extensions.
 -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 17 Jan 2017 19:55:32 +0100
 nextcloud-client (2.2.4-1.0) stable; urgency=medium
  * Initial release.
 -- István Váradi <ivaradi@varadiistvan.hu>  Wed, 14 Dec 2016 20:07:46 +0100
--- a/admin/linux/debian/debian.stable/control
+++ b/admin/linux/debian/debian.stable/control
@@ -0,0 +1,82 @@
 Source: nextcloud-client
 Section: contrib/devel
 Priority: optional
 Maintainer: István Váradi <ivaradi@varadiistvan.hu>
 Build-Depends: cmake,
               debhelper,
               cdbs,
               dh-python,
               extra-cmake-modules (>= 5.16),
               kdelibs5-dev,
               kio-dev,
               libcmocka-dev,
               libhttp-dav-perl,
               libinotify-dev [kfreebsd-any],
               libqt5webkit5-dev,
               libsqlite3-dev,
               libssl-dev (>> 1.0.0),
               zlib1g-dev,
               optipng,
               pkg-kde-tools,
               python-sphinx | python3-sphinx,
               python3-all,
               qt5keychain-dev,
               qtwebengine5-dev,
               qtdeclarative5-dev,
               qttools5-dev,
               qttools5-dev-tools,
               xvfb
 Standards-Version: 3.9.8
 Homepage: https://github.com/nextcloud/client_theming
 #Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
 #Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
 Package: nextcloud-client
 Architecture: any
 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
 one or more directories on your local machine and always
 have access to your latest files wherever you are.
 Package: libnextcloudsync0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Nextcloud sync library
 Used by the Nextcloud desktop client as the synchronization engine.
 Package: libnextcloudsync-dev
 Architecture: any
 Section: contrib/libdevel
 Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
 Description: Nextcloud sync library development files
 The headers and development library for the Nextcloud sync library.
 Package: nextcloud-client-l10n
 Architecture: all
 Depends: ${misc:Depends}
 Description: Nextcloud client internatialization files
 The translation files.
 Package: nextcloud-client-nautilus
 Architecture: all
 Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
 Description: Nautilus plugin for Nextcloud
 This package contains a Nautilus plugin to display
 synchronization status icons for Nextcloud files.
 Package: nextcloud-client-nemo
 Architecture: all
 Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo, nemo, ${misc:Depends}
 Description: Nemo plugin for Nextcloud
 This package contains a Nemo plugin to display
 synchronization status icons for Nextcloud files.
 Package: nextcloud-client-caja
 Architecture: all
 Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
 Description: Caja plugin for Nextcloud
 This package contains a Caja plugin to display
 synchronization status icons for Nextcloud files.
--- a/admin/linux/debian/debian.xenial/post-patches/qt5.5.patch
+++ b/admin/linux/debian/debian.xenial/post-patches/qt5.5.patch
@@ -0,0 +1,24 @@
 Binary files nextcloud-client-2.4.0.orig/.git/index and nextcloud-client-2.4.0/.git/index differ
 diff -ruN nextcloud-client-2.4.0.orig/src/CMakeLists.txt nextcloud-client-2.4.0/src/CMakeLists.txt
 --- nextcloud-client-2.4.0.orig/src/CMakeLists.txt	2018-02-01 19:16:38.461162563 +0100
 +++ nextcloud-client-2.4.0/src/CMakeLists.txt	2018-02-01 19:20:20.253824030 +0100
@@ -4,7 +4,7 @@
 set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
 -find_package(Qt5 5.6 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
 +find_package(Qt5 5.5 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
 if (Qt5Core_VERSION VERSION_LESS 5.9.0)
 message(STATUS "For HTTP/2 support, compile with Qt 5.9 or higher.")
 endif()
 --- nextcloud-client-2.4.0.orig/admin/osx/CMakeLists.txt	2018-05-22 07:01:48.248646951 +0200
 +++ nextcloud-client-2.4.0/admin/osx/CMakeLists.txt	2018-05-22 07:01:51.012689711 +0200
@@ -11,7 +11,7 @@
   set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "0")
 endif()
 -find_package(Qt5 5.6 COMPONENTS Core REQUIRED)
 +find_package(Qt5 5.5 COMPONENTS Core REQUIRED)
 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)
--- a/admin/linux/debian/debian/101-sync-inotify.conf
+++ b/admin/linux/debian/debian/101-sync-inotify.conf
@@ -0,0 +1 @@
 fs.inotify.max_user_watches = 524288
--- a/admin/linux/debian/debian/changelog
+++ b/admin/linux/debian/debian/changelog
@@ -0,0 +1,48 @@
 nextcloud-client (2.3.3-1.0~xenial1) xenial; 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~xenial1) xenial; 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~xenial1) xenial; 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~xenial1) xenial; 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
 nextcloud-client (2.2.4-1.3~xenial1) xenial; urgency=medium
  * Caja syncstate plugin is built.
  * The syncstate plugin has application-specific name
 -- István Váradi <ivaradi@varadiistvan.hu>  Fri, 27 Jan 2017 19:34:18 +0100
 nextcloud-client (2.2.4-1.2~xenial1) xenial; urgency=medium
  * Fixed appname in the Nemo syncstate extension.
 -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 19 Jan 2017 16:46:50 +0100
 nextcloud-client (2.2.4-1.1~xenial1) xenial; urgency=medium
  * Added Nautilus and Nemo syncstate extensions.
 -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 17 Jan 2017 19:55:32 +0100
 nextcloud-client (2.2.4-1.0~xenial1) xenial; urgency=medium
  * Initial release.
 -- István Váradi <ivaradi@varadiistvan.hu>  Wed, 14 Dec 2016 20:07:46 +0100
--- a/admin/linux/debian/debian/compat
+++ b/admin/linux/debian/debian/compat
@@ -0,0 +1 @@
 9
--- a/admin/linux/debian/debian/control
+++ b/admin/linux/debian/debian/control
@@ -0,0 +1,89 @@
 Source: nextcloud-client
 Section: contrib/devel
 Priority: optional
 Maintainer: István Váradi <ivaradi@varadiistvan.hu>
 Build-Depends: cmake,
               debhelper,
               cdbs,
               dh-python,
               extra-cmake-modules (>= 5.16),
               kdelibs5-dev,
               kio-dev,
               libcmocka-dev,
               libhttp-dav-perl,
               libinotify-dev [kfreebsd-any],
               libqt5webkit5-dev,
               libsqlite3-dev,
               libssl-dev (>> 1.0.0),
               zlib1g-dev,
               optipng,
               pkg-kde-tools,
               python-sphinx | python3-sphinx,
               python3-all,
               qt5keychain-dev,
               qtwebengine5-dev,
               qtdeclarative5-dev,
               qttools5-dev,
               qttools5-dev-tools,
               xvfb
 Standards-Version: 3.9.8
 Homepage: https://github.com/nextcloud/client_theming
 #Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
 #Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
 Package: nextcloud-client
 Architecture: any
 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
 one or more directories on your local machine and always
 have access to your latest files wherever you are.
 Package: libnextcloudsync0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Nextcloud sync library
 Used by the Nextcloud desktop client as the synchronization engine.
 Package: libnextcloudsync-dev
 Architecture: any
 Section: contrib/libdevel
 Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
 Description: Nextcloud sync library development files
 The headers and development library for the Nextcloud sync library.
 Package: nextcloud-client-l10n
 Architecture: all
 Depends: ${misc:Depends}
 Description: Nextcloud client internatialization files
 The translation files.
 Package: nextcloud-client-nautilus
 Architecture: all
 Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
 Description: Nautilus plugin for Nextcloud
 This package contains a Nautilus plugin to display
 synchronization status icons for Nextcloud files.
 Package: nextcloud-client-nemo
 Architecture: all
 Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo | nemo-python, nemo, ${misc:Depends}
 Description: Nemo plugin for Nextcloud
 This package contains a Nemo plugin to display
 synchronization status icons for Nextcloud files.
 Package: nextcloud-client-caja
 Architecture: all
 Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
 Description: Caja plugin for Nextcloud
 This package contains a Caja plugin to display
 synchronization status icons for Nextcloud files.
 Package: nextcloud-client-dolphin
 Architecture: any
 Depends: dolphin (>= 4:15.12.1), libnextcloudsync0 (= ${binary:Version}), nextcloud-client, ${misc:Depends}, ${shlibs:Depends}
 Description: Dolphin plugin for Nextcloud
 This package contains a Dolphin plugin to display
 synchronization status icons for Nextcloud files.
--- a/admin/linux/debian/debian/copyright
+++ b/admin/linux/debian/debian/copyright
@@ -0,0 +1,3 @@
 Files: *
 Copyright: 2012-2015 ownCloud, inc.; Nuernberg, Germany., 2016 Nextcloud GmbH
 License: GPL-2+
--- a/admin/linux/debian/debian/libnextcloudsync-dev.install
+++ b/admin/linux/debian/debian/libnextcloudsync-dev.install
@@ -0,0 +1,3 @@
 usr/include
 usr/lib/*/libnextcloudsync.so
 usr/lib/*/nextcloud/libocsync.so
--- a/admin/linux/debian/debian/libnextcloudsync0.install
+++ b/admin/linux/debian/debian/libnextcloudsync0.install
@@ -0,0 +1,3 @@
 etc
 usr/lib/*/libnextcloudsync.so.?*
 usr/lib/*/nextcloud/libocsync.so.?*
--- a/admin/linux/debian/debian/nextcloud-client-caja.install
+++ b/admin/linux/debian/debian/nextcloud-client-caja.install
@@ -0,0 +1 @@
 usr/share/caja-python
--- a/admin/linux/debian/debian/nextcloud-client-dolphin.install
+++ b/admin/linux/debian/debian/nextcloud-client-dolphin.install
@@ -0,0 +1,4 @@
 usr/lib/*/libnextclouddolphinpluginhelper.so
 usr/lib/*/qt5/plugins/kf5/overlayicon/nextclouddolphinoverlayplugin.so
 usr/lib/*/qt5/plugins/nextclouddolphinactionplugin.so
 usr/share/kservices5/nextclouddolphinactionplugin.desktop
--- a/admin/linux/debian/debian/nextcloud-client-dolphin.lintian-overrides
+++ b/admin/linux/debian/debian/nextcloud-client-dolphin.lintian-overrides
@@ -0,0 +1,2 @@
 nextcloud-client-dolphin: package-name-doesnt-match-sonames
 nextcloud-client-dolphin: shlib-without-versioned-soname
--- a/admin/linux/debian/debian/nextcloud-client-dolphin.triggers
+++ b/admin/linux/debian/debian/nextcloud-client-dolphin.triggers
@@ -0,0 +1 @@
 activate-noawait ldconfig
--- a/admin/linux/debian/debian/nextcloud-client-l10n.install
+++ b/admin/linux/debian/debian/nextcloud-client-l10n.install
@@ -0,0 +1 @@
 usr/share/nextcloud/i18n
--- a/admin/linux/debian/debian/nextcloud-client-nautilus.install
+++ b/admin/linux/debian/debian/nextcloud-client-nautilus.install
@@ -0,0 +1 @@
 usr/share/nautilus-python
--- a/admin/linux/debian/debian/nextcloud-client-nemo.install
+++ b/admin/linux/debian/debian/nextcloud-client-nemo.install
@@ -0,0 +1 @@
 usr/share/nemo-python
--- a/admin/linux/debian/debian/nextcloud-client.install
+++ b/admin/linux/debian/debian/nextcloud-client.install
@@ -0,0 +1,4 @@
 usr/bin
 usr/share/applications
 usr/share/icons
 debian/101-sync-inotify.conf etc/sysctl.d
--- a/admin/linux/debian/debian/nextcloud-client.lintian-overrides
+++ b/admin/linux/debian/debian/nextcloud-client.lintian-overrides
@@ -0,0 +1,3 @@
 nextcloud-client: binary-or-shlib-defines-rpath
 nextcloud-client: binary-without-manpage
 nextcloud-client: license-problem-convert-utf-code
--- a/admin/linux/debian/debian/rules
+++ b/admin/linux/debian/debian/rules
@@ -0,0 +1,12 @@
 #!/usr/bin/make -f
 # See debhelper(7) (uncomment to enable)
 # output every command that modifies files on the build system.
 #export DH_VERBOSE = 1
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 DEB_SHLIBDEPS_INCLUDE=$(CURDIR)/$(DEB_BUILDDIR)/csync/src
 DEB_SRCDIR=.
 DEB_CMAKE_EXTRA_FLAGS = -DCMAKE_SKIP_RPATH=OFF -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON
--- a/admin/linux/debian/debian/source/format
+++ b/admin/linux/debian/debian/source/format
@@ -0,0 +1 @@
 3.0 (quilt)
--- a/admin/linux/debian/debian/source/lintian-overrides
+++ b/admin/linux/debian/debian/source/lintian-overrides
@@ -0,0 +1,9 @@
 nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/bootstrap/static/bootstrap.js line length is 22206 characters (>512)
 nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/bootstrap/static/jquery.js
 nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/bootstrap/static/jquery.js line length is 32412 characters (>512)
 nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_com/static/bootstrap.js line length is 22206 characters (>512)
 nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_com/static/jquery.js line length is 32412 characters (>512)
 nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_release/static/bootstrap.js line length is 22206 characters (>512)
 nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_release/static/jquery.js line length is 32412 characters (>512)
 nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_org/static/js/jquery-1.11.0.min.js
 nextcloud-client source: license-problem-convert-utf-code
--- a/admin/linux/debian/drone-build.sh
+++ b/admin/linux/debian/drone-build.sh
@@ -0,0 +1,124 @@
 #!/bin/bash
 set -xe
 shopt -s extglob
 PPA=ppa:nextcloud-devs/client-beta
 PPA_BETA=ppa:nextcloud-devs/client-alpha
 OBS_PROJECT=home:ivaradi:beta
 OBS_PROJECT_BETA=home:ivaradi:alpha
 OBS_PACKAGE=nextcloud-client
 pull_request=${DRONE_PULL_REQUEST:=master}
 if test -z "${DRONE_WORKSPACE}"; then
    DRONE_WORKSPACE=`pwd`
 fi
 if test -z "${DRONE_DIR}"; then
    DRONE_DIR=`dirname ${DRONE_WORKSPACE}`
 fi
 set +x
 if test "$DEBIAN_SECRET_KEY" -a "$DEBIAN_SECRET_IV"; then
    openssl aes-256-cbc -K $DEBIAN_SECRET_KEY -iv $DEBIAN_SECRET_IV -in admin/linux/debian/signing-key.txt.enc -d | gpg --import
    openssl aes-256-cbc -K $DEBIAN_SECRET_KEY -iv $DEBIAN_SECRET_IV -in admin/linux/debian/oscrc.enc -out ~/.oscrc -d
    touch ~/.has_ppa_keys
 fi
 set -x
 cd "${DRONE_WORKSPACE}"
 read basever kind <<<$(admin/linux/debian/scripts/git2changelog.py /tmp/tmpchangelog stable)
 cd "${DRONE_DIR}"
 echo "$kind" > kind
 kind="release"
 if test "$kind" = "beta"; then
    repo=nextcloud-devs/client-alpha
 else
    repo=nextcloud-devs/client-beta
 fi
 origsourceopt=""
 if ! wget http://ppa.launchpad.net/${repo}/ubuntu/pool/main/n/nextcloud-client/nextcloud-client_${basever}.orig.tar.bz2; then
    cp -a ${DRONE_WORKSPACE} nextcloud-client_${basever}
    tar cjf nextcloud-client_${basever}.orig.tar.bz2 --exclude .git nextcloud-client_${basever}
    origsourceopt="-sa"
 fi
 for distribution in xenial bionic cosmic stable; do
    rm -rf nextcloud-client_${basever}
    cp -a ${DRONE_WORKSPACE} nextcloud-client_${basever}
    cd nextcloud-client_${basever}
    cp -a admin/linux/debian/debian .
    if test -d admin/linux/debian/debian.${distribution}; then
        tar cf - -C admin/linux/debian/debian.${distribution} . | tar xf - -C debian
    fi
    admin/linux/debian/scripts/git2changelog.py /tmp/tmpchangelog ${distribution}
    cp /tmp/tmpchangelog debian/changelog
    if test -f admin/linux/debian/debian.${distribution}/changelog; then
        cat admin/linux/debian/debian.${distribution}/changelog >> debian/changelog
    else
        cat admin/linux/debian/debian/changelog >> debian/changelog
    fi
    for p in debian/post-patches/*.patch; do
        if test -f "${p}"; then
            echo "Applying ${p}"
            patch -p1 < "${p}"
        fi
    done
    fullver=`head -1 debian/changelog | sed "s:nextcloud-client (\([^)]*\)).*:\1:"`
    EDITOR=true dpkg-source --commit . local-changes
    dpkg-source --build .
    dpkg-genchanges -S ${origsourceopt} > "../nextcloud-client_${fullver}_source.changes"
    if test -f ~/.has_ppa_keys; then
        debsign -k7D14AA7B -S
    fi
    cd ..
 done
 if test "${pull_request}" = "master"; then
    kind=`cat kind`
    if test "$kind" = "beta"; then
        PPA=$PPA_BETA
        OBS_PROJECT=$OBS_PROJECT_BETA
    fi
    OBS_SUBDIR="${OBS_PROJECT}/${OBS_PACKAGE}"
    if test -f ~/.has_ppa_keys; then
        for changes in nextcloud-client_*~+([a-z])1_source.changes; do
            dput $PPA $changes > /dev/null
        done
        mkdir osc
        cd osc
        osc co ${OBS_PROJECT} ${OBS_PACKAGE}
        if test "$(ls ${OBS_SUBDIR})"; then
            osc delete ${OBS_SUBDIR}/*
        fi
        cp ../nextcloud-client*.orig.tar.* ${OBS_SUBDIR}/
        cp ../nextcloud-client_*[0-9.][0-9].dsc ${OBS_SUBDIR}/
        cp ../nextcloud-client_*[0-9.][0-9].debian.tar* ${OBS_SUBDIR}/
        cp ../nextcloud-client_*[0-9.][0-9]_source.changes ${OBS_SUBDIR}/
        osc add ${OBS_SUBDIR}/*
        cd ${OBS_SUBDIR}
        osc commit -m "Travis update"
    fi
 fi
--- a/admin/linux/debian/oscrc.enc
+++ b/admin/linux/debian/oscrc.enc
--- a/admin/linux/debian/scripts/addchange.sh
+++ b/admin/linux/debian/scripts/addchange.sh
@@ -0,0 +1,50 @@
 #!/bin/bash
 set -e -u
 scriptdir=`dirname $0`
 DEFAULT_DIST=yakkety
 package="nextcloud-client"
 version="$1"
 comment="$2"
 distver="${3:-}"
 if test -z "${distver}"; then
    distver="1"
 fi
 packagedir="${scriptdir}/../${package}"
 now=`date -R`
 tmpfile="/tmp/addchange.$$"
 for subdir in "${packagedir}/debian"*; do
    if test -f "${subdir}/changelog"; then
        echo "${subdir}"
        bname=`basename "${subdir}"`
        dist=`echo "${bname}" | sed 's:debian\.\?::'`
        if test -z "${dist}"; then
            dist="${DEFAULT_DIST}"
        fi
        if test "${dist}" = "stable"; then
            versuffix=""
        else
            versuffix="~${dist}${distver}"
        fi
        cat > "${tmpfile}" <<EOF
 ${package} (${version}${versuffix}) ${dist}; urgency=medium
  * ${comment}
 -- István Váradi <ivaradi@varadiistvan.hu>  ${now}
 EOF
        cat "${subdir}/changelog" >> "${tmpfile}"
        mv "${tmpfile}" "${subdir}/changelog"
    fi
 done
 rm -f "${tmpfile}"
--- a/admin/linux/debian/scripts/config.sh
+++ b/admin/linux/debian/scripts/config.sh
@@ -0,0 +1,26 @@
 # The directory where the sources are found
 SOURCES="${HOME}/sources/nextcloud/client"
 # The directory into which the packages should be genereated
 BUILDAREA="${SOURCES}/build-area"
 # The directory containing the Git repositories
 GITROOTS="${SOURCES}/git"
 # The pbuilder root directory
 PBUILDER_ROOT="${HOME}/pbuilder"
 # The dependencies directory for pbuilder
 PBUILDER_DEPS="${PBUILDER_ROOT}/deps"
 # The version of the nextcloud-client package
 NEXTCLOUD_CLIENT_VERSION=2.4.0
 # The FULL version of the nextcloud-client package
 NEXTCLOUD_CLIENT_FULL_VERSION="${NEXTCLOUD_CLIENT_VERSION}-1.0~@DISTRIBUTION@1"
 # The tag of the nextcloud-client package
 NEXTCLOUD_CLIENT_TAG="v${NEXTCLOUD_CLIENT_VERSION}"
 # The number of CPUs that can be used for paralel builds
 NUMCPUS=4
--- a/admin/linux/debian/scripts/create_debdir.sh
+++ b/admin/linux/debian/scripts/create_debdir.sh
@@ -0,0 +1,89 @@
 #!/bin/bash
 set -e -u
 scriptdir=`dirname $0`
 scriptdir=`cd "${scriptdir}" && pwd`
 . "${scriptdir}/config.sh"
 package="nextcloud-client"
 tag="${1}"
 version="${2}"
 distribution="${3}"
 gitdir="${GITROOTS}/client"
 packagedir="${BUILDAREA}/${package}_${version}"
 origtarname="${package}_${version}.orig.tar.bz2"
 origtar="${BUILDAREA}/${origtarname}"
 archive_submodules()
 {
    local subdir="${1}"
    local treeish="${2}"
    local dir="${gitdir}"
    local destdir="${packagedir}"
    if test "${subdir}"; then
        echo "  copying submodule ${subdir}"
        dir="${dir}/${subdir}"
        destdir="${destdir}/${subdir}"
    fi
    mkdir -p "${destdir}"
    (cd "${dir}"; git archive "${treeish}" | tar xf - -C "${destdir}")
    (cd "${dir}"; git ls-tree "${treeish}" -r) | while read mode type object file; do
        if test "${type}" = "commit"; then
            sdir="${file}"
            if test "${subdir}"; then
                sdir="${subdir}/${sdir}"
            fi
            archive_submodules "${sdir}" "${object}"
        fi
    done
 }
 rm -rf "${packagedir}"
 mkdir -p "${packagedir}"
 echo "Updating submodules"
 commit=`cd "${gitdir}"; git rev-parse HEAD`
 (cd "${gitdir}"; git checkout "${tag}"; git submodule update --recursive --init)
 echo "Copying sources"
 archive_submodules "" "${tag}"
 if test -f "${GITROOTS}/${origtarname}"; then
    echo "Copying orig archive from ${GITROOTS}"
    cp -a "${GITROOTS}/${origtarname}" "${BUILDAREA}"
 else
    echo "Creating orig archive"
    tar cjf "${origtar}" -C "${BUILDAREA}" "${package}_${version}"
 fi
 echo "Restoring Git state"
 (cd "${gitdir}"; git checkout "${commit}")
 cd "${scriptdir}"
 echo "Copying Debian files"
 mkdir -p "${packagedir}/debian"
 tar cf - -C "${scriptdir}/../debian" . | tar xf - -C "${packagedir}/debian"
 if test -d "${scriptdir}/../debian.${distribution}"; then
    tar cf - -C "${scriptdir}/../debian.${distribution}" . | tar xf - -C "${packagedir}/debian"
 fi
 pushd "${packagedir}"
 for p in debian/post-patches/*.patch; do
    if test -f "${p}"; then
        echo "Applying ${p}"
        patch -p1 < "${p}"
    fi
 done
 popd
 "${scriptdir}/git2changelog.py"  /tmp/git2changelog "${distribution}"
 mv "${packagedir}/debian/changelog" "${packagedir}/debian/changelog.old"
 cat /tmp/git2changelog "${packagedir}/debian/changelog.old" > "${packagedir}/debian/changelog"
--- a/admin/linux/debian/scripts/git2changelog.cfg
+++ b/admin/linux/debian/scripts/git2changelog.cfg
@@ -0,0 +1,8 @@
 # Use the configuration below with appropriate changes,
 # if you want to support a new client version using
 # your own fork. In such a case the tags do not come
 # accross to the main repo for a pull request, so
 # some hacking is needed
 [versionhack]
 commit = bc7e65b39552ac458b2adacf76cbf98735ec29a0
 tag = v2.4.0-beta
--- a/admin/linux/debian/scripts/git2changelog.py
+++ b/admin/linux/debian/scripts/git2changelog.py
@@ -0,0 +1,140 @@
 #!//usr/bin/env python2.7
 import subprocess
 import re
 import sys
 import datetime
 import os
 import ConfigParser
 distribution="yakkety"
 versionTagRE = re.compile("^v([0-9]+((\.[0-9]+)+))(-(.+))?$")
 def processVersionTag(tag):
    m = versionTagRE.match(tag)
    if m:
        return (m.group(1), "release" if m.group(4) is None else "beta")
    else:
        return None
 def getCommitVersion(commit):
    major=None
    minor=None
    patch=None
    for line in subprocess.check_output(["git", "show",
                                         commit + ":VERSION.cmake"]).splitlines():
        m = re.match("set\( MIRALL_VERSION_([A-Z]+) +([0-9])+ *\)", line)
        if m is not None:
            kind=m.group(1)
            version=m.group(2)
            if kind=="MAJOR":
                major=version
            elif kind=="MINOR":
                minor=version
            elif kind=="PATCH":
                patch=version
    if major and minor and patch:
        return major + "." + minor + "." + patch
    else:
        return None
 def collectEntries(baseCommit, baseVersion, kind):
    scriptdir = os.path.dirname(__file__)
    configPath = os.path.join(scriptdir, "git2changelog.cfg")
    newVersionCommit = None
    newVersionTag = None
    newVersionOrigTag = None
    if os.path.exists(configPath):
        config = ConfigParser.SafeConfigParser()
        config.read(configPath)
        if config.has_section("versionhack"):
            if config.has_option("versionhack", "commit") and \
               config.has_option("versionhack", "tag"):
                newVersionCommit = config.get("versionhack", "commit")
                newVersionTag = config.get("versionhack", "tag")
    entries = []
    args = ["git", "log",
            "--format=%h%x09%an%x09%ae%x09%aD%x09%ad%x09%s",
            "--date=unix", "--author-date-order", "--reverse"]
    try:
        output = subprocess.check_output(args + [baseCommit + ".."])
    except:
        output = subprocess.check_output(args)
    lastVersionTag = None
    lastCMAKEVersion = None
    for line in output.splitlines():
        (commit, name, email, date, revdate, subject) = line.split("\t")
        revdate = datetime.datetime.utcfromtimestamp(long(revdate)).strftime("%Y%m%d.%H%M%S")
        if commit==newVersionCommit:
            result = processVersionTag(newVersionTag)
            if result:
                newVersionOrigTag = lastVersionTag
                (baseVersion, kind) = result
        version=getCommitVersion(commit)
        if version and version!=lastCMAKEVersion:
            tag = "v" + version
            if tag!=newVersionOrigTag:
                result = processVersionTag(tag)
                if result:
                    lastVersionTag = tag
                    lastCMAKEVersion = version
                    (baseVersion, kind) = result
        for tag in subprocess.check_output(["git", "tag",
                                            "--points-at",
                                            commit]).splitlines():
            if tag!=newVersionOrigTag:
                result = processVersionTag(tag)
                if result:
                    lastVersionTag = tag
                    (baseVersion, kind) = result
        entries.append((commit, name, email, date, revdate, subject,
                        baseVersion, kind))
    entries.reverse()
    return entries
 def genChangeLogEntries(f, entries, distribution):
    latestBaseVersion = None
    latestKind = None
    for (commit, name, email, date, revdate, subject, baseVersion, kind) in entries:
        if latestBaseVersion is None:
            latestBaseVersion = baseVersion
            latestKind = kind
        upstreamVersion = baseVersion + "-" + revdate
        if distribution=="stable":
            version = upstreamVersion
        else:
            version = upstreamVersion + "~" + distribution + "1"
        print >> f, "nextcloud-client (%s) %s; urgency=medium" % (version, distribution)
        print >> f
        print >> f, "  * " + subject
        print >> f
        print >> f, " -- %s <%s>  %s" % (name, email, date)
        print >> f
    return (latestBaseVersion, latestKind)
 if __name__ == "__main__":
    distribution = sys.argv[2]
    #entries = collectEntries("8aade24147b5313f8241a8b42331442b7f40eef9", "2.2.4", "release")
    entries = collectEntries("f9b1c724d6ab5431e0cd56b7cd834f2dd48cebb1", "2.4.0", "release")
    with open(sys.argv[1], "wt") as f:
        (baseVersion, kind) = genChangeLogEntries(f, entries, distribution)
        print baseVersion, kind
--- a/admin/linux/debian/scripts/pbuild.sh
+++ b/admin/linux/debian/scripts/pbuild.sh
@@ -0,0 +1,17 @@
 #!/bin/bash
 set -e -u
 scriptdir=`dirname $0`
 scriptdir=`cd "${scriptdir}" && pwd`
 . "${scriptdir}/config.sh"
 distribution="${1}"
 shift
 pushd /
 "${scriptdir}/build.sh" "${distribution}" -S "$@"
 "${scriptdir}/pbuilder.sh" "${distribution}" "$@"
 popd
--- a/admin/linux/debian/scripts/pbuilder.sh
+++ b/admin/linux/debian/scripts/pbuilder.sh
@@ -0,0 +1,21 @@
 #!/bin/bash
 set -e -u
 scriptdir=`dirname $0`
 . "${scriptdir}/config.sh"
 distribution="${1}"
 shift
 resultdir="${PBUILDER_ROOT}/${distribution}_result"
 rm -f "${PBUILDER_DEPS}/"*.deb
 echo -n > "${PBUILDER_DEPS}/Packages"
 rm -f "${resultdir}/"*
 source "${HOME}/.pbuilderrc"
 dscversion=`echo ${NEXTCLOUD_CLIENT_FULL_VERSION} | sed "s:@DISTRIBUTION@:${distribution}:g"`
 pbuilder-dist "${distribution}" build --othermirror "${OTHERMIRROR}" --debbuildopts "-j${NUMCPUS}" "$@" "${BUILDAREA}/nextcloud-client_${dscversion}.dsc"
--- a/admin/linux/debian/signing-key.txt.enc
+++ b/admin/linux/debian/signing-key.txt.enc
--- a/admin/osx/CMakeLists.txt
+++ b/admin/osx/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Check if varialbe MAC_INSTALLER_BACKGROUND_FILE is defined. That might come
-# from the OEM.cmake for branded clients or from OWNCLOUD.cmake for the non
+# from the OEM.cmake for branded clients or from NEXTCLOUD.cmake for the non
 # branded client.
 # Make sure that the MAC_INSTALLER_BACKGROUND_FILE contains the full path, ie.
 # includes CMAKE_SOURCE_DIR or so.
@@ -11,7 +11,8 @@ else()
  set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "0")
 endif()
-configure_file(create_mac_pkg.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
+find_package(Qt5 5.6 COMPONENTS Core REQUIRED)
-configure_file(macosx.pkgproj ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
+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)
--- a/admin/osx/create_mac_pkg.sh.cmake
+++ b/admin/osx/create_mac_pkg.sh.cmake
@@ -23,7 +23,7 @@ identity="$3"
 prjfile=$build_path/admin/osx/macosx.pkgproj
 # The name of the installer package
-installer="@APPLICATION_SHORTNAME@-@MIRALL_VERSION_FULL@@MIRALL_VERSION_SUFFIX@"
+installer="@APPLICATION_SHORTNAME@-qt@Qt5Core_VERSION@-@MIRALL_VERSION_FULL@@MIRALL_VERSION_SUFFIX@"
 installer_file="$installer.pkg"
 installer_file_tar="$installer.pkg.tar"
 installer_file_tar_bz2="$installer.pkg.tar.bz2"
--- a/admin/osx/macdeployqt.py
+++ b/admin/osx/macdeployqt.py
@@ -22,6 +22,7 @@ import subprocess
 import commands
 import sys
 from glob import glob
 from distutils.version import LooseVersion
 def QueryQMake(attrib):
    return subprocess.check_output([qmake_path, '-query', attrib]).rstrip('\n')
@@ -31,7 +32,7 @@ FRAMEWORK_SEARCH_PATH=[
    os.path.join(os.environ['HOME'], 'Library/Frameworks')
 ]
-LIBRARY_SEARCH_PATH=['/usr/local/lib', '.']
+LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Qt-5.6.2/lib', '.']
 QT_PLUGINS = [
    'sqldrivers/libqsqlite.dylib',
@@ -44,7 +45,8 @@ QT_PLUGINS = [
 QT_PLUGINS_SEARCH_PATH=[
 #    os.path.join(os.environ['QTDIR'], 'plugins'),
-    '/usr/local/Cellar/qt/5.2.1/plugins',
+#    '/usr/local/Cellar/qt/5.2.1/plugins',
    '/usr/local/Qt-5.6.2/plugins',
 ]
@@ -92,6 +94,8 @@ commands.append(['mkdir', '-p', resources_dir])
 plugins_dir = os.path.join(bundle_dir, 'Contents', 'PlugIns')
 binaries = [i for i in glob(os.path.join(bundle_dir, 'Contents', 'MacOS', "*")) if is_exe(i)];
 qt_version = QueryQMake('QT_VERSION')
 print "Using Qt", qt_version
 fixed_libraries = []
 fixed_frameworks = []
@@ -261,9 +265,9 @@ def CopyFramework(source_dylib):
      dest_path = os.path.join(frameworks_dir, framework)
      dest_dylib_path = os.path.join(frameworks_dir, *parts[i:-1])
      break
-  if os.path.exists(dest_path):
+#  if os.path.exists(dest_path):
-    print dest_path, "already exists, skipping copy..."
+#    print dest_path, "already exists, skipping copy..."
-    return os.path.join(dest_dylib_path, dylib_name)
+#    return os.path.join(dest_dylib_path, dylib_name)
  args = ['mkdir', '-p', dest_dylib_path]
  commands.append(args)
@@ -279,6 +283,10 @@ def CopyFramework(source_dylib):
  commands.append(args)
  args = ['cp', '-r', os.path.join(source_path, 'Versions', '5', 'Resources'), os.path.join(dest_path, 'Versions', '5')]
  commands.append(args)
  args = ['ln', '-s', os.path.join('Versions', 'Current', 'Helpers'), os.path.join(dest_path, 'Helpers')]
  commands.append(args)
  args = ['cp', '-r', os.path.join(source_path, 'Versions', '5', 'Helpers'), os.path.join(dest_path, 'Versions', '5')]
  commands.append(args)
  return os.path.join(dest_dylib_path, dylib_name)
@@ -337,6 +345,13 @@ for binary in binaries:
 for plugin in QT_PLUGINS:
  FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
 if LooseVersion(qt_version) >= LooseVersion("5.10.0"):
  args = ['plutil', '-insert', 'LSMinimumSystemVersion', '-string', '10.10.0', os.path.join(bundle_dir, 'Contents', 'Info.plist')]
  commands.append(args)
 else:
  args = ['plutil', '-insert', 'LSMinimumSystemVersion', '-string', '10.7.0', os.path.join(bundle_dir, 'Contents', 'Info.plist')]
  commands.append(args)
 if len(sys.argv) <= 2:
  print 'Will run %d commands:' % len(commands)
  for command in commands:
--- a/admin/osx/macosx.pkgproj.cmake
+++ b/admin/osx/macosx.pkgproj.cmake
@@ -579,7 +579,9 @@
 					</dict>
 				</dict>
 				<key>INSTALLATION TYPE</key>
-				<integer>0</integer>
+                                <integer>1</integer>
                                <key>MODE</key>
                                <integer>1</integer>
 			</dict>
 			<key>INSTALLATION_STEPS</key>
 			<array>
@@ -699,7 +701,7 @@
 			<key>BUILD_PATH</key>
 			<dict>
 				<key>PATH</key>
-				<string>../install/.</string>
+                                <string>@CMAKE_INSTALL_PREFIX@/.</string>
 				<key>PATH_TYPE</key>
 				<integer>3</integer>
 			</dict>
--- a/admin/osx/post_install.sh.cmake
+++ b/admin/osx/post_install.sh.cmake
@@ -1,12 +1,16 @@
 #!/bin/sh
-osascript << EOF
+# Check if Finder is running (for systems with Finder disabled)
 finder_status=`ps aux | grep "/System/Library/CoreServices/Finder.app/Contents/MacOS/Finder" | grep -v "grep"`
 if ! [ "$finder_status" == "" ] ; then # Finder is running
   osascript << EOF
 tell application "Finder"
   activate
   select the last Finder window
 	reveal POSIX file "/Applications/@APPLICATION_EXECUTABLE@.app"
 end tell
 EOF
 fi
 # Always enable the new 10.10 finder plugin if available
 if [ -x "$(command -v pluginkit)" ]; then
--- a/admin/osx/sparkle/dsa_pub.pem
+++ b/admin/osx/sparkle/dsa_pub.pem
@@ -1,12 +1,36 @@
 -----BEGIN PUBLIC KEY-----
-MIIBtzCCASsGByqGSM44BAEwggEeAoGBANC50nTWzroQwwawgaV4jd5TjjqbGKDH
+MIIGOzCCBC0GByqGSM44BAEwggQgAoICAQCwGHwZVKUPwJafICkknBmoIS7TGjfw
-6CWbZzyfJ246mJcrwTfM2h5Z80GwLSNFBIjtLGpFd7Wd+CI1dY8oIOYxnYgWDSJC
+TnHpZdWJ/kVvMIhFiui3cJaB85e8R2yGRq7wr6ljYCR5EyjRXEJGEFW05PCUxLhh
-Al1RMoUSSwx0LRr8J3gojcvvsrhk/t57o9bjXynE2tiP1fwzPb+B3NH/02fMnzfH
+LnUg7yWIL1EnRM61zSlnWer4f7IBO7Qf8hd35jL5VuQtqE+Shq1vtC21SFO6GMog
-k+B8/8GOnX8dAhUA9PZ1QrH/mN+7ckiGjmoegZdv9tMCgYBPEj2850r8+9tXljU4
+sfQdeyhTMIH67nw19fDxbyqPh+fPsBgitWmO07eF132Qxju0MwXvaju3YrXepuoR
-X0s1NKBfiyhBGw/quJMZ3k0fQ/tpOyYwXYBg+9GBVc4pF1CKMVGoBS6XnLrZ1OkC
+ClonI8pfPCJAAyJd5sEAfJPiqObgW/ehNgU5mVXv2D6VNtvvyu0flnvj05TOtkz+
-OP9g+NNH5cLOKrBxjtd1GPG8UF/sZpak2sVfuNKzRtFT/6WFHc3f7C+LiDFZ2aPO
+6392xh0u/xtz1F1clPe31JW3C2zxkvS14M7eSn96hMlojLev75/V84pQNZ7qXQ/X
-A+Kr5MZJ8xxYDYj16WV2nKgoQgOBhQACgYEAuQzycfUZKm7MR9WZSFF9uQ3N3SQr
+TxWaucnipJ94EqRLTg1hD3qwyC+5JKqOA6ELFmMARsP2MV4wmBIE+bz/bP2g7UCT
-PKYggCl6GTdWYmrsFyXLEBmb3m2qXxx9AcfR2LdkTp/CRCzm+HD6wyHVAAVG2kI2
+UIJVTZrZAemozMFR6zsQQMrdz9fEPXQhibcg3LppMnnTkAJUdMkKlGIpehGe1tVC
-mWafcahlx/lVMd2yytdRE5pjpjLxw7rrt/fvSZsGwUswQJLl4iDWoE+mFfaaZnnM
+LaOgYh03zf/N7yFwH9eMIiAoXTlqR7iRO1HHsXn60OF8XYEt8Xga8cK7zMiPYOqm
-JKoiKLX7LUFOPaU=
+o4rheeXw33pckX63glOjJ+ADH1jhU7vOjRsAySXMFjanD8A31Mh8NbhuvPJowJAx
 ez8Hu4M6+fg644z7WHmsrbp0R3/Ow9FI/zmvYT6najOlEwnar8ix210ezjWmAOxN
 BTuHN6Bj7ckgdQIVAKwAcb77T0Fyjus9ZImfCqlKdihZAoICABiPO4bywe636AlU
 FRhMS/XFeGqRD7GbJSbGzIahooUPyVAeyRIU1HzmeVPx7jTqcoqcau0vXfv10EB+
 nJ3q6EzfCbitGIDJ1TjT2BhMtsnhzplhvVOAThuLnLpYwa3h8DIfgTqxh+DaCJHc
 ccdl/sAgj/6m54FCRc5ukyQZZeOFgSO2L+JfGDYJpn1CFuRVrXr4DbvtUDItRTbQ
 Gxlg5OEx2D1eO5DHtmuRPBZbumgACnFeD97tRQVjVKqQiMU3ZfNDp+mub0/MS/PY
 djDZIZM4E3/Nx+IuSuRELGKgifM/ED0tyiq6FYy9kx1nVVoRhWt29ipkQSskvRL3
 Ba593/u7dMt2Pa/RVNha+9J1VIadblNu0OkieI8OrPJ8PEdrr3Igit1GuURxz/oR
 c4T5nWCM+7e9yxs1resVDsU4D0aJVBMnE7IZwnN9/f4wduR0rxuBTLbMgtgBoIak
 JhgplAQu7SdSxKSpY6keGZUpt8ATkixkScZmVhFKmuVYc1c0tLfUqQnlC4Ty44Wk
 MEyub6749iRgNQp9vzvntS3EoLDho4CdEWlrp7YBtvTPiey46gcoLeLNZVyGuQ42
 CdFw09MIDPEhXBe6oWsOqW4OUla/UoVJyEjuPeiNIMruUJKIGkB1RL6OaiWxJkGM
 2HXSebMEweWuScaJmNR5VX87n6KTA4ICBgACggIBAKIAUUc/MJYZYkZectbSabZy
 TmlrPmi00q7wpsInTieeKVqOSypS+fuoiG2uuUX4+duqK8mLiA9WC0/y/cBJiWth
 Bp28s1ADdC98wamERYpZOxWuHDS9MEsovQzm5RIxgVtZbK7vKk/f0WbGE6xwgERH
 dt1zSZRh1ZWi/UWDVGHjlVMEhtNxoRD/Q5T4KUpLez0DNf2VpKk17KsqD2sS1zit
 IwIMR++PEY9Rfw1FWIkE5GzJnjxR8sUr6hg5A4z779W7qW/KK5DGlOVYrHhdxUDA
 b5q4wGBP3sDCPhhZ/g1V62tb1LAXnTMgAkdXGpRCxoe21TcB21PSQAbW1sOpFbSu
 07kMLAZIh+L1eR5sY6z7S/pqE4W4ukYUEFJPUSCVUCXkN2ZbSfbQLLi2mVNNIp7u
 /MJVxNQOtRqHM+2/nN+98Grivr1ct1G1NUHYgP/lr7Y2QNBiST0Lcnos8pjmI42v
 0NxCt+BOx+cc0SNXxRJD2j73IgzD8YW3gvWfzSwUcIqgC27JEEMhscEVNI4vD/CR
 mdDmYm0QJdBmEczPf5cA5gyAa1ATYS8ejrh6HpbC++FpSf4FN++5uu9cXtYJgI9B
 G0ZEvlGwqzStV35LeqwF2KBSZIspquILBDJDaKHG7wPE5/MdSsFky1awX7jgyGZV
 H5CvBpIDHOrQ0r1b40oB
 -----END PUBLIC KEY-----
--- a/admin/win/nsi/installer.ico
+++ b/admin/win/nsi/installer.ico
--- a/admin/win/nsi/page_header.bmp
+++ b/admin/win/nsi/page_header.bmp
--- a/admin/win/nsi/welcome.bmp
+++ b/admin/win/nsi/welcome.bmp
--- a/client.qrc
+++ b/client.qrc
@@ -20,8 +20,22 @@
        <file>resources/lock-https.png</file>
        <file>resources/lock-https@2x.png</file>
        <file>resources/account.png</file>
-        <file>resources/more.png</file>
+        <file>resources/more.svg</file>
        <file>resources/delete.png</file>
-        <file>resources/bell.png</file>
+        <file>resources/close.svg</file>
        <file>resources/bell.svg</file>
        <file>resources/link.svg</file>
        <file>resources/files.svg</file>
        <file>resources/folder-grey.png</file>
        <file>resources/state-error.svg</file>
        <file>resources/state-warning.svg</file>
        <file>resources/folder.svg</file>
        <file>resources/network.svg</file>
        <file>resources/settings.svg</file>
        <file>resources/public-white.svg</file>
        <file>resources/public.svg</file>
        <file>resources/confirm.svg</file>
        <file>resources/copy.svg</file>
    </qresource>
    <qresource prefix="/"/>
 </RCC>
--- a/cmake/modules/DBusMacros.cmake
+++ b/cmake/modules/DBusMacros.cmake
--- a/cmake/modules/FindGLib2.cmake
+++ b/cmake/modules/FindGLib2.cmake
@@ -0,0 +1,35 @@
 # FindGLib2.cmake
 # GLib2_FOUND - System has GLib2
 # GLib2_INCLUDES - The GLib2 include directories
 # GLib2_LIBRARIES - The libraries needed to use GLib2
 # GLib2_DEFINITIONS - Compiler switches required for using GLib2
 find_package(PkgConfig)
 pkg_check_modules(GLib2 QUIET glib-2.0)
 set(GLib2_DEFINITIONS ${GLib2_CFLAGS_OTHER})
 find_path(GLib2_INCLUDE_DIR
          NAMES glib.h glib-object.h
          HINTS ${GLib2_INCLUDEDIR} ${GLib2_INCLUDE_DIRS}
          PATH_SUFFIXES glib-2.0)
 find_path(GLIBCONFIG_INCLUDE_DIR
          NAMES glibconfig.h
          HINTS ${LIBDIR} ${LIBRARY_DIRS} ${_GLib2_LIBRARY_DIR}
                ${GLib2_INCLUDEDIR} ${GLib2_INCLUDE_DIRS}
                ${CMAKE_EXTRA_INCLUDES} ${CMAKE_EXTRA_LIBRARIES} 
          PATH_SUFFIXES glib-2.0 glib-2.0/include)
 list(APPEND GLib2_INCLUDE_DIR ${GLIBCONFIG_INCLUDE_DIR})
 find_library(GLib2_LIBRARY
             NAMES glib-2.0 libglib-2.0
             HINTS ${GLib2_LIBDIR} ${GLib2_LIBRARY_DIRS})
 set(GLib2_LIBRARIES ${GLib2_LIBRARY})
 set(GLib2_INCLUDE_DIRS ${GLib2_INCLUDE_DIR})
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(GLib2 DEFAULT_MSG
                                  GLib2_LIBRARY GLib2_INCLUDE_DIR)
 mark_as_advanced(GLib2_INCLUDE_DIR GLib2_LIBRARY)
--- a/cmake/modules/FindGio.cmake
+++ b/cmake/modules/FindGio.cmake
@@ -0,0 +1,61 @@
 # - Try to find Gio
 # Once done this will define
 #
 #  GIO_FOUND - system has Gio
 #  GIO_INCLUDE_DIR - the Gio include directory
 #  GIO_LIBRARIES - the libraries needed to use Gio
 #  GIO_DEFINITIONS - Compiler switches required for using Gio
 IF (GIO_INCLUDE_DIR AND GIO_LIBRARIES)
   # in cache already
   SET(Gio_FIND_QUIETLY TRUE)
 ELSE (GIO_INCLUDE_DIR AND GIO_LIBRARIES)
   SET(Gio_FIND_QUIETLY FALSE)
 ENDIF (GIO_INCLUDE_DIR AND GIO_LIBRARIES)
 IF (NOT WIN32)
   # use pkg-config to get the directories and then use these values
   # in the FIND_PATH() and FIND_LIBRARY() calls
   FIND_PACKAGE(PkgConfig)
   PKG_CHECK_MODULES(GIO gio-2.0)
   #MESSAGE(STATUS "DEBUG: Gio include directory = ${GIO_INCLUDE_DIRS}")
   #MESSAGE(STATUS "DEBUG: Gio link directory = ${GIO_LIBRARY_DIRS}")
   #MESSAGE(STATUS "DEBUG: Gio CFlags = ${GIO_CFLAGS}")
   SET(GIO_DEFINITIONS ${GIO_CFLAGS_OTHER})
 ENDIF (NOT WIN32)
 FIND_PATH(GIO_INCLUDE_DIR gio.h
   PATHS
   ${GIO_INCLUDEDIR}
   ${GIO_INCLUDE_DIRS}
   PATH_SUFFIXES glib-2.0/gio/
   )
 FIND_LIBRARY(_GioLibs NAMES gio-2.0 libgio-2.0
   PATHS
   ${GIO_LIBDIR}
   ${GIO_LIBRARY_DIRS}
   )
 SET( GIO_LIBRARIES ${_GioLibs} )
 SET( GIO_INCLUDE_DIRS ${GIO_INCLUDE_DIR} )
 IF (GIO_INCLUDE_DIR AND GIO_LIBRARIES)
   SET(GIO_FOUND TRUE)
 ELSE (GIO_INCLUDE_DIR AND GIO_LIBRARIES)
   SET(GIO_FOUND FALSE)
 ENDIF (GIO_INCLUDE_DIR AND GIO_LIBRARIES)
 IF (GIO_FOUND)
   IF (NOT Gio_FIND_QUIETLY)
      MESSAGE(STATUS "Found Gio libraries: ${GIO_LIBRARIES}")
      MESSAGE(STATUS "Found Gio includes : ${GIO_INCLUDE_DIR}")
   ENDIF (NOT Gio_FIND_QUIETLY)
 ELSE (GIO_FOUND)
    IF (Gio_FIND_REQUIRED)
      MESSAGE(STATUS "Could NOT find Gio")
    ENDIF(Gio_FIND_REQUIRED)
 ENDIF (GIO_FOUND)
 MARK_AS_ADVANCED(GIO_INCLUDE_DIR _GioLibs)
--- a/cmake/modules/FindLibcloudproviders.cmake
+++ b/cmake/modules/FindLibcloudproviders.cmake
@@ -0,0 +1,22 @@
 # FindLibcloudproviders.cmake
 find_path(LIBCLOUDPROVIDERS_INCLUDE_DIR
    NAMES cloudprovidersproviderexporter.h cloudprovidersaccountexporter.h
    PATH_SUFFIXES cloudproviders
 )
 find_library(LIBCLOUDPROVIDERS_LIBRARY
    NAMES
        libcloudproviders
        cloudproviders
    HINTS
       /usr/lib
       /usr/lib/${CMAKE_ARCH_TRIPLET}
       /usr/local/lib
       /opt/local/lib
       ${CMAKE_LIBRARY_PATH}
       ${CMAKE_INSTALL_PREFIX}/lib
 )
 message("================> ${LIBCLOUDPROVIDERS_LIBRARY}")
 find_package_handle_standard_args(LIBCLOUDPROVIDERS DEFAULT_MSG LIBCLOUDPROVIDERS_INCLUDE_DIR LIBCLOUDPROVIDERS_LIBRARY)
--- a/cmake/modules/MacOSXBundleInfo.plist.in
+++ b/cmake/modules/MacOSXBundleInfo.plist.in
@@ -27,11 +27,11 @@
        <key>CFBundleShortVersionString</key>
        <string>@MIRALL_VERSION_STRING@</string>
        <key>NSHumanReadableCopyright</key>
-        <string>(C) 2014-2016 @APPLICATION_VENDOR@</string>
+        <string>(C) 2014-2018 @APPLICATION_VENDOR@</string>
        <key>NSSupportsAutomaticGraphicsSwitching</key>
        <true/>
        <key>SUShowReleaseNotes</key>
        <false/>
        <key>LSMinimumBundleVersion</key>
        <string>10.7.0</string>
        <key>SUPublicDSAKeyFile</key>
        <string>dsa_pub.pem</string>
 </dict>
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -403,6 +403,8 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
   File "${IMAGEFORMATS_DLL_PATH}\qgif.dll"
   File "${IMAGEFORMATS_DLL_PATH}\qjpeg.dll"
   File "${IMAGEFORMATS_DLL_PATH}\qico.dll"
   File "${IMAGEFORMATS_DLL_PATH}\qsvg.dll"
   ; PNG is built in Qt
   SetOutPath "$INSTDIR\sqldrivers"
   File "${SQLITE_DLL_PATH}\qsqlite.dll"
@@ -420,6 +422,7 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
   File "${QT_DLL_PATH}\Qt5Gui.dll"
   File "${QT_DLL_PATH}\Qt5Network.dll"
   File "${QT_DLL_PATH}\Qt5PrintSupport.dll"
   File "${QT_DLL_PATH}\Qt5Svg.dll"
   File "${QT_DLL_PATH}\Qt5Qml.dll"
   File "${QT_DLL_PATH}\Qt5Sql.dll"
   File "${QT_DLL_PATH}\Qt5WebKit.dll"
--- a/cmake/modules/Warnings.cmake
+++ b/cmake/modules/Warnings.cmake
@@ -7,10 +7,11 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
    # Fix sqlite compilation on macOS
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types-discards-qualifiers")
    # Fix sqlite compilation on MinGW
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-discarded-qualifiers")
    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
        # Fix sqlite compilation on MinGW
        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-discarded-qualifiers")
        execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
                        OUTPUT_VARIABLE GCC_VERSION)
        if(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
--- a/config.h.in
+++ b/config.h.in
@@ -4,6 +4,7 @@
 #cmakedefine USE_INOTIFY 1
 #cmakedefine WITH_QTKEYCHAIN 1
 #cmakedefine WITH_CRASHREPORTER
 #cmakedefine WITH_PROVIDERS "@WITH_PROVIDERS@"
 #cmakedefine CRASHREPORTER_EXECUTABLE "@CRASHREPORTER_EXECUTABLE@"
 #define SOCKETAPI_TEAM_IDENTIFIER_PREFIX "@SOCKETAPI_TEAM_IDENTIFIER_PREFIX@"
@@ -24,6 +25,4 @@
 #cmakedefine SYSCONFDIR "@SYSCONFDIR@"
 #cmakedefine SHAREDIR "@SHAREDIR@"
 #cmakedefine WITH_TESTING 1
 #endif
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -16,8 +16,6 @@ if(SPHINX_FOUND)
    install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
    install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in" conf.py @ONLY)
    if(WITH_DOC)
       add_custom_target(doc ALL DEPENDS doc-html COMMENT "Building documentation...")
    else(WITH_DOC)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -43,22 +43,17 @@ help:
 clean:
 	-rm -rf $(BUILDDIR)/*
-html:   html-org
+html:   html-com
-html-all: html-release html-org html-com
+html-all: html-release html-com
 html-release:
-	$(SPHINXBUILD) -b html -D html_theme='owncloud_release' $(ALLSPHINXOPTS) $(BUILDDIR)/html/release
+	$(SPHINXBUILD) -b html -D html_theme='nextcloud_release' $(ALLSPHINXOPTS) $(BUILDDIR)/html/release
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/release."
 html-org:
 	$(SPHINXBUILD) -b html -D html_theme='owncloud_org' $(ALLSPHINXOPTS) $(BUILDDIR)/html/org
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/org."
 html-com:
-	$(SPHINXBUILD) -b html -D html_theme='owncloud_com' $(ALLSPHINXOPTS) $(BUILDDIR)/html/com
+	$(SPHINXBUILD) -b html -D html_theme='nextcloud_com' $(ALLSPHINXOPTS) $(BUILDDIR)/html/com
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/com."
--- a/doc/_shared_assets/static/.gitignore
+++ b/doc/_shared_assets/static/.gitignore
--- a/doc/_shared_assets/static/logo-blue.pdf
+++ b/doc/_shared_assets/static/logo-blue.pdf
--- a/doc/_shared_assets/static/logo-blue.png
+++ b/doc/_shared_assets/static/logo-blue.png
--- a/doc/_shared_assets/static/social/diaspora.svg
+++ b/doc/_shared_assets/static/social/diaspora.svg
@@ -0,0 +1,57 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   enable-background="new 0 0 512 512"
   height="512px"
   id="Layer_1"
   version="1.1"
   viewBox="0 0 512 512"
   width="512px"
   xml:space="preserve"
   inkscape:version="0.91 r13725"
   sodipodi:docname="diaspora.svg"><metadata
     id="metadata23"><rdf:RDF><cc:Work
         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
     id="defs21" /><sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1"
     objecttolerance="10"
     gridtolerance="10"
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="1600"
     inkscape:window-height="835"
     id="namedview19"
     showgrid="false"
     inkscape:snap-page="true"
     inkscape:snap-bbox="true"
     inkscape:bbox-paths="true"
     inkscape:bbox-nodes="true"
     inkscape:zoom="0.65186405"
     inkscape:cx="44.967724"
     inkscape:cy="89.460609"
     inkscape:window-x="0"
     inkscape:window-y="0"
     inkscape:window-maximized="1"
     inkscape:current-layer="g3" /><g
     id="g3"><rect
       style="opacity:1;fill:#212121;fill-opacity:1;fill-rule:evenodd;stroke:none"
       id="rect4151"
       width="512"
       height="512"
       x="0"
       y="0"
       ry="256" /><path
       transform="matrix(0.99926466,0,0,0.99926466,0.18974539,0.19224343)"
       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd"
       d="m 256.078,321.98 -71.808,98.86 -57.139,-41.563 71.652,-98.711 -116.095,-37.793 21.767,-67.269 116.248,37.789 0,-122.141 70.594,0 0,122.141 116.246,-37.789 21.766,67.269 -116.094,37.637 71.801,98.867 -57.133,41.563 z"
       id="polygon17" /></g></svg>
--- a/Show More
+++ b/Show More
		`@@ -0,0 +1,2 @@`
							`nextcloud-client-dolphin: package-name-doesnt-match-sonames`
							`nextcloud-client-dolphin: shlib-without-versioned-soname`