Bump to 2.1.0 final

.clang-format

@@ -1,63 +0,0 @@
-# Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com>
-#
-# You may use this file under the terms of the 3-clause BSD license.
-# See the file LICENSE from this package for details.
-
-# This is the clang-format configuration style to be used by Qt,
-# based on the rules from https://wiki.qt.io/Qt_Coding_Style and
-# https://wiki.qt.io/Coding_Conventions
-
----
-# Webkit style was loosely based on the Qt style
-BasedOnStyle: WebKit
-
-Standard: Cpp11
-ColumnLimit: 0
-
-# Disable reflow of qdoc comments: indentation rules are different.
-# Translation comments are also excluded
-CommentPragmas: "^!|^:"
-
-# We want a space between the type and the star for pointer types
-PointerBindsToType: false
-
-# We want to break before the operators, but not before a '='
-BreakBeforeBinaryOperators: NonAssignment
-
-# Braces are usually attached, but not after functions or classes declaration
-BreakBeforeBraces: Custom
-BraceWrapping:
-    AfterClass: true
-    AfterControlStatement: false
-    AfterEnum: false
-    AfterFunction: true
-    AfterNamespace: false
-    AfterObjCDeclaration: false
-    AfterStruct: true
-    AfterUnion: false
-    BeforeCatch: false
-    BeforeElse: false
-    IndentBraces: false
-
-# The coding style does not specify the following, but this is what gives
-# results closest to the existing code.
-AlignAfterOpenBracket: DontAlign
-AlwaysBreakTemplateDeclarations: true
-
-# Ideally we should also allow less short function in a single line, but
-# clang-format does not handle that
-AllowShortFunctionsOnASingleLine: Inline
-
-# The coding style specifies some include order categories, but also tells to
-# separate categories with an empty line. It does not specify the order within
-# the categories. Since the SortInclude feature of clang-format does not
-# re-order includes separated by empty lines, the feature is not used.
-SortIncludes: false
-
-# macros for which the opening brace stays attached
-ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]
-
-# Allow two empty lines for structuring
-MaxEmptyLinesToKeep: 2
-KeepEmptyLinesAtTheStartOfBlocks: false
-

.clang-tidy

@@ -1,45 +0,0 @@
-Checks: '-*,
-    bugprone-*,
-    -bugprone-forward-declaration-namespace,
-    cppcoreguidelines-init-variables,
-    misc-*,
-    -misc-non-private-member-variables-in-classes,
-    modernize-avoid-bind,
-    modernize-concat-nested-namespaces,
-    modernize-deprecated-headers,
-    modernize-deprecated-ios-base-aliases,
-    modernize-loop-convert,
-    modernize-make-*,
-    modernize-raw-string-literal,
-    modernize-redundant-void-arg,
-    modernize-replace-*,
-    modernize-return-braced-init-list,
-    modernize-shrink-to-fit,
-    modernize-unary-static-assert,
-    modernize-use-auto,
-    modernize-use-bool-literals,
-    modernize-use-default-member-init,
-    modernize-use-emplace,
-    modernize-use-equals-delete,
-    modernize-use-nodiscard,
-    modernize-use-equals-default,
-    modernize-use-noexcept,
-    modernize-user-override,
-    modernize-use-nullptr,
-    modernize-use-transparent-functors,
-    modernize-use-uncaught-exceptions,
-    modernize-use-using,
-'
-WarningsAsErrors: '*'
-HeaderFilterRegex: '.*'
-AnalyzeTemporaryDtors: false
-FormatStyle:     none
-CheckOptions:
-  - key: bugprone-assert-side-effect.AssertMacros
-    value: 'assert;Q_ASSERT'
-  - key: bugprone-dangling-handle.HandleClasses
-    value: 'std::basic_string_view;std::experimental::basic_string_view;QStringView'
-  - key: bugprone-sizeof-expression.WarnOnSizeOfIntegerExpression
-    value: 1
-  - key: modernize-use-default-member-init.UseAssignment
-    value: 1

.drone.yml

@@ -1,152 +0,0 @@
-kind: pipeline
-name: qt-5.12
-
-steps:
-- name: cmake
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18
-  volumes:
-    - name: build
-      path: /drone/build
-  commands:
-    - cd /drone/build
-    - cmake -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 -DCMAKE_BUILD_TYPE=Debug -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DECM_ENABLE_SANITIZERS=address ../src
-- name: compile
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18
-  volumes:
-    - name: build
-      path: /drone/build
-  commands:
-    - cd /drone/build
-    - make -j$(nproc)
-- name: test
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18
-  volumes:
-    - name: build
-      path: /drone/build
-  commands:
-    - cd /drone/build
-    - useradd -m -s /bin/bash test
-    - chown -R test:test .
-    - su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test
-
-volumes:
-- name: build
-  temp: {}
-
-trigger:
-  branch:
-    - master
-    - stable-*
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
-name: qt-5.12-clang
-
-steps:
-- name: cmake
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18
-  volumes:
-    - name: build
-      path: /drone/build
-  commands:
-    - cd /drone/build
-    - cmake -GNinja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-10 -DCMAKE_CXX_COMPILER=clazy -DCMAKE_BUILD_TYPE=Debug -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DECM_ENABLE_SANITIZERS=address ../src
-- name: compile
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18
-  volumes:
-    - name: build
-      path: /drone/build
-  commands:
-    - cd /drone/build
-    - ninja 2>1 | /drone/src/admin/linux/count_compiler_warnings.py /drone/src
-- name: test
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18
-  volumes:
-    - name: build
-      path: /drone/build
-  commands:
-    - cd /drone/build
-    - useradd -m -s /bin/bash test
-    - chown -R test:test .
-    - su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test
-- name: clang-tidy
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.12-18
-  volumes:
-    - name: build
-      path: /drone/build
-  commands:
-    - "! run-clang-tidy-10 -j$(nproc) -p /drone/build -header-filter $PWD -quiet | grep -A 5 ': error:'"
-
-volumes:
-- name: build
-  temp: {}
-
-trigger:
-  branch:
-    - master
-    - stable-*
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
-name: AppImage
-
-steps:
-- name: build
-  image: ghcr.io/nextcloud/continuous-integration-client-appimage:client-appimage-1
-  environment:
-    CI_UPLOAD_GIT_TOKEN:
-      from_secret: CI_UPLOAD_GIT_TOKEN
-    CI_UPLOAD_GIT_USERNAME:
-      from_secret: CI_UPLOAD_GIT_USERNAME
-  commands:
-    - /bin/bash -c "./admin/linux/build-appimage.sh"
-    - /bin/bash -c "./admin/linux/upload-appimage.sh" || echo "Upload failed, however this is an optional step."
-trigger:
-  branch:
-    - master
-    - stable-*
-  event:
-    - pull_request
-    - push
----
-kind: pipeline
-name: Debian
-
-steps:
-- name: build
-  image: ghcr.io/nextcloud/continuous-integration-client-debian:client-debian-3
-  commands:
-    - /bin/bash -c "./admin/linux/debian/drone-build.sh" || echo "[WARNING] Debian build failed but this is a non-blocking CI event"
-  environment:
-    DEBIAN_SECRET_KEY:
-      from_secret: DEBIAN_SECRET_KEY
-    DEBIAN_SECRET_IV:
-      from_secret: DEBIAN_SECRET_IV
-trigger:
-  branch:
-    - master
-  event:
-    - pull_request
-    - push
----
-kind: pipeline
-name: Documentation
-
-steps:
-- name: build
-  image: nextcloudci/documentation:documentation-5
-  commands:
-    - cd doc
-    - make html
-trigger:
-  branch:
-    - master
-  event:
-    - pull_request
-    - push

.git-blame-ignore-revs

@@ -1 +0,0 @@
-c8d0f788e00bdae125a26d9159ce9efdd6325cd2 # Initial application of clang-format

.github/ISSUE_TEMPLATE/bug.md

@@ -1,86 +0,0 @@
----
-name: Bugs
-about: Crashes and other bugs
-labels: 'bug'
-
----
-
-<!--
-Thanks for reporting issues back to Nextcloud!
-
-This is the **issue tracker of Nextcloud**, please do NOT use this to get answers to your questions or get help for fixing your installation. You can find help debugging your system on our home user forums: https://help.nextcloud.com or, if you use Nextcloud in a large organization, ask our engineers on https://portal.nextcloud.com. See also  https://nextcloud.com/support for support options.
-
-Guidelines for submitting issues:
-
-* Please search the existing issues first, it's likely that your issue was already reported or even fixed.
-    - Go to https://github.com/nextcloud and type any word in the top search/command bar. You probably see something like "We couldn’t find any repositories matching ..." then click "Issues" in the left navigation.
-    - You can also filter by appending e. g. "state:open" to the search string.
-    - More info on search syntax within github: https://help.github.com/articles/searching-issues
-    
-* Please fill in as much of the template below as possible. The logs are absolutely crucial for the developers to be able to help you. Expect us to quickly close issues without logs or other information we need. 
-
-* Also note that we have a https://nextcloud.com/contribute/code-of-conduct/ that applies on Github. To summarize it: be kind. We try our best to be nice, too. If you can't be bothered to be polite, please just don't bother to report issues as we won't feel motivated to help you. 
--->
-
-<!--- Please keep the note below for others who read your bug report -->
-
-### How to use GitHub
-
-* Please use the 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to show that you are affected by the same issue.
-* Please don't comment if you have no relevant information to add. It's just extra noise for everyone subscribed to this issue.
-* Subscribe to receive notifications on status change and new comments. 
-
-
-### Expected behaviour
-Tell us what should happen
-
-### Actual behaviour
-Tell us what happens instead
-
-
-### Steps to reproduce
-1.
-2.
-3.
-
-### Client configuration
-Client version:
-<!---
-Please try to only report a bug if it happens with the latest version
-The latest version can be seen by checking https://nextcloud.com/install/#install-clients
---->
-
-Operating system:
-
-OS language:
-
-Qt version used by client package (Linux only, see also Settings dialog):
-
-Client package (From Nextcloud or distro) (Linux only):
-
-Installation path of client:
-
-
-### Server configuration
-<!---
-Optional section. It depends on the issue.
---->
-Nextcloud version:
-
-Storage backend (external storage):
-
-### Logs
-<!-- desktop client logs are a hard requirement for bug reports because we don't know how to do magic here :) -->
-
-Please use Gist (https://gist.github.com/) or a similar code paster for longer
-logs.
-
-1. Client logfile: 
-Since 3.1: Under the "General" settings, you can click on "Create Debug Archive ..." to pick the location of where the desktop client will export the logs and the database to a zip file.
-On previous releases: Via the command line: `nextcloud --logdebug --logwindow` or `nextcloud --logdebug --logfile log.txt`
-(See also https://docs.nextcloud.com/desktop/3.0/troubleshooting.html#log-files)
-
-2. Web server error log:
-
-3. Server logfile: nextcloud log (data/nextcloud.log):
-

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Support and Questions
-    url: "https://help.nextcloud.com/"
-    about: "If you have trouble with setting up Nextcloud, please use the forum instead of opening an issue here."

.github/ISSUE_TEMPLATE/feature.md

@@ -1,35 +0,0 @@
----
-name: Features
-about: New functionality
-labels: 'enhancement'
-
----
-
-<!--
-Thanks for requesting a feature for Nextcloud!
-
-This is the **issue tracker of Nextcloud**, please do NOT use this to get answers to your questions or get help for fixing your installation. You can find help debugging your system on our home user forums: https://help.nextcloud.com or, if you use Nextcloud in a large organization, ask our engineers on https://portal.nextcloud.com. See also  https://nextcloud.com/support for support options.
-
-Guidelines for submitting features:
-
-* Please search the existing features first, it's likely that your feature was already requested or even implemented.
-    - Go to https://github.com/nextcloud and type any word in the top search/command bar. You probably see something like "We couldn’t find any repositories matching ..." then click "Issues" in the left navigation.
-    - You can also filter by appending e. g. "state:open" to the search string.
-    - More info on search syntax within github: https://help.github.com/articles/searching-issues
-    
-* Please fill in as much of the template below as possible.
-
-* Also note that we have a https://nextcloud.com/contribute/code-of-conduct/ that applies on Github. To summarize it: be kind. We try our best to be nice, too. If you can't be bothered to be polite, please just don't bother to report issues as we won't feel motivated to help you. 
--->
-
-<!--- Please keep the note below for others who read your bug report -->
-
-### How to use GitHub
-
-* Please use the 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to show that you want to have the same feature implemented.
-* Please don't comment if you have no relevant information to add. It's just extra noise for everyone subscribed to this issue.
-* Subscribe to receive notifications on status change and new comments. 
-
-
-### Feature description
-Tell us how the feature should work

.github/pull_request_template.md

@@ -1,14 +0,0 @@
-<!-- 
-Thanks for opening a pull request on the Nextcloud desktop client.
-
-Instead of a Contributor License Agreement (CLA) we use a Developer Certificate of Origin (DCO).
-https://en.wikipedia.org/wiki/Developer_Certificate_of_Origin
-
-To accept that DCO, please make sure that you add a line like
-Signed-off-by: Random Developer <random@developer.example.org>
-at the end of each commit message.
-
-This Signed-off-by trailer can be added automatically by git if you pass --signoff or -s to git commit.
-See also:
-https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---no-signoff
--->

.github/workflows/command-rebase.yml

@@ -1,27 +0,0 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-
-on:
-  issue_comment:
-    types: [ created ]
-name: Automatic Rebase
-
-jobs:
-  rebase:
-    name: Rebase
-    # On pull requests and if the comment starts with `/rebase`
-    if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/rebase')
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout the latest code
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      
-      - name: Automatic Rebase
-        uses: cirrus-actions/rebase@1.5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/needsinfo.yml

@@ -1,24 +0,0 @@
-name: 'Close stale needs info issues'
-on:
-    schedule:
-        -   cron: '30 */8 * * *'
-
-jobs:
-    stale:
-        runs-on: ubuntu-latest
-        steps:
-            -   uses: actions/stale@v3
-                with:
-                    operations-per-run: 1500
-                    days-before-stale: 28
-                    days-before-close: 14
-                    days-before-pr-close: -1
-                    only-labels: 'needs info'
-                    stale-issue-label: 'stale needs info'
-                    exempt-issue-labels: 'bug'
-                    stale-issue-message: 'This issue has been marked as "needs info" 4 weeks ago.
-                                        Please take a look again and try to provide the information requested,
-                                        otherwise the issue will be automatically closed in 2 weeks. Thank you!'
-                    close-issue-message: "This bug report is getting automatically closed due to no answer
-                                          since the issue has been staled. Thank you!"
-                    exempt-all-pr-milestones: true

.github/workflows/needsinfohelper.yaml

@@ -1,13 +0,0 @@
-name: Remove Labels
-
-on: [issue_comment]
-
-jobs:
-  remove_labels:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions-ecosystem/action-remove-labels@v1
-        if: ${{ ! startsWith(github.event.comment.body, 'This issue has been marked as "needs info" 4 weeks ago.') && ! startsWith(github.event.comment.body, 'This bug report did not receive an update in the last 4 weeks.')}}
-        with:
-          labels: 'needs info'
-          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/stale.yml

@@ -1,23 +0,0 @@
-name: 'Close stale issues'
-on:
-    schedule:
-        -   cron: '30 */8 * * *'
-
-jobs:
-    stale:
-        runs-on: ubuntu-latest
-        steps:
-            -   uses: actions/stale@v3
-                with:
-                    operations-per-run: 1500
-                    days-before-stale: 28
-                    days-before-close: 14
-                    days-before-pr-close: -1
-                    only-labels: 'bug'
-                    exempt-issue-labels: 'approved'
-                    stale-issue-message: 'This bug report did not receive an update in the last 4 weeks.
-                                        Please take a look again and update the issue with new details,
-                                        otherwise the issue will be automatically closed in 2 weeks. Thank you!'
-                    close-issue-message: "This bug report is getting automatically closed due to no answer
-                                          since the issue has been staled. Thank you!"
-                    exempt-all-pr-milestones: true

.gitignore

@@ -7,6 +7,7 @@ CMakeLists.txt.user*
 doc/_build/*
 *.kate-swp
 *.kdev4
+win/
 admin/win/nsi/l10n/pofiles/*.po
 *.swp
 *~$
@@ -15,18 +16,9 @@ cscope.*
 tags
 t1.cfg
 
-## Ignore Visual Studio Code config & environment files
-
-.vs/
-.vscode/
-
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
-# CMake integration on VS2019+
-
-CMakeSettings.json
-
 # User-specific files
 *.suo
 *.user
@@ -85,8 +77,8 @@ dlldata.c
 *.svclog
 *.scc
 
-# macOS specific
-xcuserdata/
+# Mac OS X specific
+shell_integration/MacOSX/*.xcworkspace/xcuserdata/
 **/.DS_Store
 
 # Visual C++ cache files
@@ -173,17 +165,3 @@ UpgradeLog*.htm
 # Microsoft Fakes
 FakesAssemblies/
 
-#cmake temporary stuff
-CMakeCache.txt
-CMakeFiles/
-CPackConfig.cmake
-CPackOptions.cmake
-CPackSourceConfig.cmake
-
-compile_commands.json
-convert.exe
-.dir-locals.el
-*-icon.png
-*-sidebar.png
-*-w10startmenu.png
-theme.qrc

.gitmodules

@@ -1,3 +1,12 @@
+[submodule "doc/ocdoc"]
+	path = doc/ocdoc
+	url = https://github.com/owncloud/documentation
+[submodule "src/3rdparty/qtmacgoodies"]
+	path = src/3rdparty/qtmacgoodies
+	url = git://github.com/guruz/qtmacgoodies.git
+[submodule "binary"]
+	path = binary
+	url = git://github.com/owncloud/owncloud-client-binary.git
 [submodule "src/3rdparty/libcrashreporter-qt"]
 	path = src/3rdparty/libcrashreporter-qt
 	url = git://github.com/dschmidt/libcrashreporter-qt.git

.travis.yml

@@ -0,0 +1,31 @@
+language: cpp
+branches:
+  only:
+  - coverity_scan 
+
+before_install:
+- sudo sh -c "echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_12.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+- sudo sh -c "echo 'deb-src http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_12.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+- wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/xUbuntu_12.04/Release.key
+- sudo apt-key add - < Release.key
+- sudo apt-get update
+- sudo apt-get 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

.tx/config

@@ -1,16 +0,0 @@
-[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

.tx/nextcloud.client-desktop/ar_translation

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

.tx/nextcloud.client-desktop/bg_translation

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

.tx/nextcloud.client-desktop/br_translation

@@ -1,26 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[br]=@APPLICATION_ICON_NAME@
-Comment[br]=@APPLICATION_NAME@ burev kempreet an implijer
-GenericName[br]=Tuliad kemprenan

.tx/nextcloud.client-desktop/ca_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[ca]=@APPLICATION_ICON_NAME@
-Name[ca]=@APPLICATION_NAME@ per a escriptori
-Comment[ca]=Client de sincronització d'escriptori del @APPLICATION_NAME@
-GenericName[ca]=Sincronització de carpetes

.tx/nextcloud.client-desktop/cs_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[cs_CZ]=@APPLICATION_ICON_NAME@
-Name[cs_CZ]=@APPLICATION_NAME@ Desktop
-Comment[cs_CZ]=@APPLICATION_NAME@ synchronizační klient pro desktop
-GenericName[cs_CZ]=Synchronizace složek

.tx/nextcloud.client-desktop/cy_GB_translation

@@ -1,26 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[cy_GB]=@APPLICATION_ICON_NAME@
-Comment[cy_GB]=@APPLICATION_NAME@ cleient cydweddu bwrdd gwaith
-GenericName[cy_GB]=Cydweddu Ffolder

.tx/nextcloud.client-desktop/da_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[da]=@APPLICATION_ICON_NAME@
-Name[da]=Skrivebordsklient til @APPLICATION_NAME@
-Comment[da]=Klient til @APPLICATION_NAME@-skrivebordssynkronisering
-GenericName[da]=Mappesynkronisering

.tx/nextcloud.client-desktop/de_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[de_DE]=@APPLICATION_ICON_NAME@
-Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung
-Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung
-GenericName[de_DE]=Ordnersynchronisierung

.tx/nextcloud.client-desktop/el_translation

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

.tx/nextcloud.client-desktop/en_GB_translation

@@ -1,26 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[en_GB]=@APPLICATION_ICON_NAME@
-Comment[en_GB]=@APPLICATION_NAME@ desktop synchronisation client
-GenericName[en_GB]=Folder Sync

.tx/nextcloud.client-desktop/eo_translation

@@ -1,26 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[eo]=@APPLICATION_ICON_NAME@
-Comment[eo]=@APPLICATION_NAME@ sinkroniga kliento
-GenericName[eo]=Dosieruja sinkronigo

.tx/nextcloud.client-desktop/es_AR_translation

@@ -1,26 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[es_AR]=@APPLICATION_ICON_NAME@
-Comment[es_AR]=@APPLICATION_NAME@ cliente de sincronización de escritorio
-GenericName[es_AR]=Sincronización de carpetas

.tx/nextcloud.client-desktop/es_CL_translation

@@ -1,25 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Comment[es_CL]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_CL]=Sincronización de carpeta

.tx/nextcloud.client-desktop/es_CO_translation

@@ -1,25 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Comment[es_CO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_CO]=Sincronización de carpeta

.tx/nextcloud.client-desktop/es_CR_translation

@@ -1,25 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Comment[es_CR]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_CR]=Sincronización de carpeta

.tx/nextcloud.client-desktop/es_DO_translation

@@ -1,26 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[es_DO]=@APPLICATION_ICON_NAME@
-Comment[es_DO]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_DO]=Sincronización de carpeta

.tx/nextcloud.client-desktop/es_EC_translation

@@ -1,25 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Comment[es_EC]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_EC]=Sincronización de carpeta

.tx/nextcloud.client-desktop/es_GT_translation

@@ -1,25 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Comment[es_GT]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_GT]=Sincronización de carpeta

.tx/nextcloud.client-desktop/es_MX_translation

@@ -1,25 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Comment[es_MX]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_MX]=Sincronización de carpeta

.tx/nextcloud.client-desktop/es_SV_translation

@@ -1,25 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Comment[es_SV]=@APPLICATION_NAME@ Cliente de sincronización de escritorio
-GenericName[es_SV]=Sincronización de carpeta

.tx/nextcloud.client-desktop/es_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[es]=@APPLICATION_ICON_NAME@
-Name[es]=@APPLICATION_NAME@ Desktop
-Comment[es]=@APPLICATION_NAME@ desktop synchronization client
-GenericName[es]=Sincronización de carpetas

.tx/nextcloud.client-desktop/et_translation

@@ -1,26 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[et_EE]=@APPLICATION_ICON_NAME@
-Comment[et_EE]=@APPLICATION_NAME@ töölaua sünkroniseerimise klient
-GenericName[et_EE]=Kausta Sünkroonimine

.tx/nextcloud.client-desktop/eu_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[eu]=@APPLICATION_ICON_NAME@
-Name[eu]=@APPLICATION_NAME@ Mahaigaina
-Comment[eu]=@APPLICATION_NAME@ mahaigainerako sinkronizazio bezeroa
-GenericName[eu]=Karpeta-sinkronizazioa

.tx/nextcloud.client-desktop/fa_translation

@@ -1,24 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Comment[fa]=@ APPLICATION_NAME @ مشتری هماهنگ سازی دسکتاپ

.tx/nextcloud.client-desktop/fi_translation

@@ -1,26 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[fi_FI]=@APPLICATION_ICON_NAME@
-Comment[fi_FI]=@APPLICATION_NAME@ työpöydän synkronointipääte
-GenericName[fi_FI]=Kansio synkronointi

.tx/nextcloud.client-desktop/fr_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[fr]=@APPLICATION_ICON_NAME@
-Name[fr]=@APPLICATION_NAME@ Bureau
-Comment[fr]=Client de synchronisation @APPLICATION_NAME@
-GenericName[fr]=Synchronisation du dossier

.tx/nextcloud.client-desktop/gl_translation

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

.tx/nextcloud.client-desktop/he_translation

@@ -1,26 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[he]=@APPLICATION_ICON_NAME@
-Comment[he]=@APPLICATION_NAME@ לקוח סנכרון לשולחן העבודה
-GenericName[he]=סנכרון תיקיות

.tx/nextcloud.client-desktop/hr_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[hr]=@APPLICATION_ICON_NAME@
-Name[hr]=@APPLICATION_NAME@ Desktop
-Comment[hr]=@APPLICATION_NAME@ klijent za sinkronizaciju računala
-GenericName[hr]=Sinkronizacija mapa

.tx/nextcloud.client-desktop/hu_translation

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

.tx/nextcloud.client-desktop/is_translation

@@ -1,26 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[is]=@APPLICATION_ICON_NAME@
-Comment[is]=@APPLICATION_NAME@ forrit til samstillingar við tölvu
-GenericName[is]=Samstilling á möppum

.tx/nextcloud.client-desktop/it_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[it]=@APPLICATION_ICON_NAME@
-Name[it]=@APPLICATION_NAME@ Desktop
-Comment[it]=Client di sincronizzazione desktop di @APPLICATION_NAME@ 
-GenericName[it]=Sincronizzazione cartelle

.tx/nextcloud.client-desktop/ja_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[ja_JP]=@APPLICATION_ICON_NAME@
-Name[ja_JP]=@APPLICATION_NAME@ デスクトップ
-Comment[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
-GenericName[ja_JP]=フォルダーを同期する

.tx/nextcloud.client-desktop/ko_translation

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

.tx/nextcloud.client-desktop/lt_LT_translation

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

.tx/nextcloud.client-desktop/lv_translation

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

.tx/nextcloud.client-desktop/mk_translation

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

.tx/nextcloud.client-desktop/nb_translation

@@ -1,26 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[nb_NO]=@APPLICATION_ICON_NAME@
-Comment[nb_NO]=@APPLICATION_NAME@ klient for synkroinisering
-GenericName[nb_NO]=Mappe synkroinisering

.tx/nextcloud.client-desktop/nl_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[nl]=@APPLICATION_ICON_NAME@
-Name[nl]=@APPLICATION_NAME@ Desktop
-Comment[nl]=@APPLICATION_NAME@ desktopsynchronisatieclient
-GenericName[nl]=Map synchronisatie

.tx/nextcloud.client-desktop/oc_translation

@@ -1,26 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[oc]=@APPLICATION_ICON_NAME@
-Comment[oc]=@APPLICATION_NAME@ client de sincronizacion
-GenericName[oc]=Sincro. dossièr

.tx/nextcloud.client-desktop/pl_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[pl]=@APPLICATION_ICON_NAME@
-Name[pl]=@APPLICATION_NAME@ Desktop
-Comment[pl]=Desktopowy klient synchronizacji @APPLICATION_NAME@
-GenericName[pl]=Katalog synchronizacji

.tx/nextcloud.client-desktop/pt_BR_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[pt_BR]=@APPLICATION_ICON_NAME@
-Name[pt_BR]=@APPLICATION_NAME@ Desktop
-Comment[pt_BR]=@APPLICATION_NAME@ cliente de sincronização desktop
-GenericName[pt_BR]=Sincronizar pasta

.tx/nextcloud.client-desktop/pt_translation

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

.tx/nextcloud.client-desktop/ro_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[ro]=@APPLICATION_ICON_NAME@
-Name[ro]=@Numele_aplicației@ Client de sincronizare pentru PC
-Comment[ro]=@APPLICATION_NAME@ client de sincronizare pentru desktop
-GenericName[ro]=Sincronizare director

.tx/nextcloud.client-desktop/ru_translation

@@ -1,26 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[ru]=@APPLICATION_ICON_NAME@
-Comment[ru]=Клиент синхронизации @APPLICATION_NAME@ для ПК
-GenericName[ru]=Синхронизация папок

.tx/nextcloud.client-desktop/sc_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[sc]=@NÙMENE_ICONA_APLICATZIONE@
-Name[sc]=@NÙMENE_APLICATZIONE@ Iscrivania
-Comment[sc]=@NÙMENE_APLICATZIONE@ cliente de sincronizatzione iscrivania
-GenericName[sc]=Sincronizadore de cartellas

.tx/nextcloud.client-desktop/sk_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[sk_SK]=@APPLICATION_ICON_NAME@
-Name[sk_SK]=@APPLICATION_NAME@ Desktop
-Comment[sk_SK]=@APPLICATION_NAME@ synchronizačný klient pre PC
-GenericName[sk_SK]=Synchronizácia priečinkov

.tx/nextcloud.client-desktop/sl_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[sl]=@APPLICATION_ICON_NAME@
-Name[sl]=Namizni program @APPLICATION_NAME@
-Comment[sl]=Program za usklajevanje @APPLICATION_NAME@
-GenericName[sl]=Usklajevanje map

.tx/nextcloud.client-desktop/sr_translation

@@ -1,26 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[sr]=@APPLICATION_ICON_NAME@
-Comment[sr]=@APPLICATION_NAME@ десктоп клијент за синхронизацију
-GenericName[sr]=Синхронизација фасцикли

.tx/nextcloud.client-desktop/sv_translation

@@ -1,26 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[sv]=@APPLICATION_ICON_NAME@
-Comment[sv]=@APPLICATION_NAME@ desktopssynkroniseringsklient
-GenericName[sv]=Mappsynkronisering

.tx/nextcloud.client-desktop/sw_translation

@@ -1,26 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[sw]=@APPLICATION_ICON_NAME@
-Comment[sw]=Teja ya @APPLICATION_NAME@ ya kufanana faili kwa seva na faili ziko hapa 
-GenericName[sw]=Fanana Kabrasha

.tx/nextcloud.client-desktop/th_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[th_TH]=@APPLICATION_ICON_NAME@
-Name[th_TH]=@APPLICATION_NAME@ เดสก์ท็อป
-Comment[th_TH]=ไคลเอ็นต์ซิงโครไนซ์ @APPLICATION_NAME@ บนเดสก์ท็อป
-GenericName[th_TH]=ซิงค์โฟลเดอร์

.tx/nextcloud.client-desktop/tr_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[tr]=@APPLICATION_ICON_NAME@
-Name[tr]=@APPLICATION_NAME@ Masaüstü
-Comment[tr]=@APPLICATION_NAME@ masaüstü eşitleme istemcisi
-GenericName[tr]=Klasör eşitleme

.tx/nextcloud.client-desktop/uk_translation

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

.tx/nextcloud.client-desktop/zh_CN_translation

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

.tx/nextcloud.client-desktop/zh_HK_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[zh_HK]=@APPLICATION_ICON_NAME@
-Name[zh_HK]=@APPLICATION_NAME@ 桌面電腦
-Comment[zh_HK]= @APPLICATION_NAME@ 桌面同步客戶端
-GenericName[zh_HK]=資料夾同步

.tx/nextcloud.client-desktop/zh_TW_translation

@@ -1,27 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ Desktop
-Comment=@APPLICATION_NAME@ desktop synchronization client
-GenericName=Folder Sync
-Icon=@APPLICATION_ICON_NAME@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
-X-GNOME-Autostart-Delay=3
-MimeType=application/vnd.@APPLICATION_EXECUTABLE@;
-Actions=Quit;
-
-# Translations
-
-
-[Desktop Action Quit]
-Exec=@APPLICATION_EXECUTABLE@ --quit
-Name=Quit @APPLICATION_NAME@
-Icon=@APPLICATION_EXECUTABLE@
-
-
-# Translations
-Icon[zh_TW]=@APPLICATION_ICON_NAME@
-Name[zh_TW]=@APPLICATION_NAME@ 桌面版
-Comment[zh_TW]=@APPLICATION_NAME@ 桌面同步客戶端
-GenericName[zh_TW]=資料夾同步

CMakeLists.txt

@@ -1,19 +1,14 @@
-cmake_minimum_required(VERSION 3.6)
-set(CMAKE_CXX_STANDARD 14)
+cmake_minimum_required(VERSION 2.6)
+cmake_policy(VERSION 2.8.0)
 
 project(client)
 
-include(FeatureSummary)
-
-set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-include(${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake)
-
-# Default suffix if the theme doesn't define one
-if(NOT DEFINED APPLICATION_VIRTUALFILE_SUFFIX)
-    set(APPLICATION_VIRTUALFILE_SUFFIX "${APPLICATION_SHORTNAME}_virtual" CACHE STRING "Virtual file suffix (not including the .)")
+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 )
 endif()
-
 # need this logic to not mess with re/uninstallations via macosx.pkgproj
 if(${APPLICATION_REV_DOMAIN} STREQUAL "com.owncloud.desktopclient")
     set(APPLICATION_REV_DOMAIN_INSTALLER "com.ownCloud.client")
@@ -21,40 +16,21 @@ else()
     set(APPLICATION_REV_DOMAIN_INSTALLER ${APPLICATION_REV_DOMAIN})
 endif()
 
-# For usage in XML files we preprocess
-string(REPLACE "&" "&" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME}")
-string(REPLACE "<" "&lt;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME_XML_ESCAPED}")
-string(REPLACE ">" "&gt;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME_XML_ESCAPED}")
-
-if (NOT DEFINED LINUX_PACKAGE_SHORTNAME)
-    set(LINUX_PACKAGE_SHORTNAME "${APPLICATION_SHORTNAME}")
-endif()
-
-if (NOT DEFINED PACKAGE)
-    set(PACKAGE "${LINUX_PACKAGE_SHORTNAME}-client")
+if (NOT DEFINED APPLICATION_SHORTNAME)
+     set ( APPLICATION_SHORTNAME ${APPLICATION_NAME} )
 endif()
 
+set(PACKAGE "${APPLICATION_SHORTNAME}-client")
 set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
 
-include(ECMCoverageOption)
-
 if(NOT CRASHREPORTER_EXECUTABLE)
     set(CRASHREPORTER_EXECUTABLE "${APPLICATION_EXECUTABLE}_crash_reporter")
 endif()
 
-set(synclib_NAME "${APPLICATION_EXECUTABLE}sync")
-set(csync_NAME "${APPLICATION_EXECUTABLE}_csync")
-
 include(Warnings)
 
 include(${CMAKE_SOURCE_DIR}/VERSION.cmake)
-# For config.h
-include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
-# Allows includes based on src/ like #include "common/utility.h" or #include "csync/csync.h"
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/src
-    ${CMAKE_CURRENT_BINARY_DIR}/src
-)
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/")
 
 # disable the crashreporter if libcrashreporter-qt is not available or we're building for ARM
 if( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/libcrashreporter-qt/CMakeLists.txt")
@@ -65,24 +41,28 @@ if(NOT WITH_CRASHREPORTER)
     message(STATUS "Build of crashreporter disabled.")
 endif()
 
+#####
+## handle DBUS for Fdo notifications
+if( UNIX AND NOT APPLE )
+    add_definitions( -DUSE_FDO_NOTIFICATIONS)
+    set(WITH_DBUS ON)
+endif()
+####
+
 include(GNUInstallDirs)
 include(DefineInstallationPaths)
-include(GenerateExportHeader)
+include(QtVersionAbstraction)
+
+setup_qt()
 
 include(GetGitRevisionDescription)
 
 get_git_head_revision(GIT_REFSPEC GIT_SHA1)
 
-add_definitions(
-    -DQT_USE_QSTRINGBUILDER
-    -DQT_MESSAGELOGCONTEXT #enable function name and line number in debug output
-    -DQT_DEPRECATED_WARNINGS
-)
-
 # if we cannot get it from git, directly try .tag (packages)
 # this will work if the tar balls have been properly created
 # via git-archive.
-if ("${GIT_SHA1}" STREQUAL "GITDIR-NOTFOUND")
+if (${GIT_SHA1} STREQUAL "GITDIR-NOTFOUND")
     file(READ ${CMAKE_SOURCE_DIR}/.tag sha1_candidate)
     string(REPLACE "\n" "" sha1_candidate ${sha1_candidate})
     if (NOT ${sha1_candidate} STREQUAL "$Format:%H$")
@@ -104,9 +84,9 @@ set(SHAREDIR ${DATADIR})
 # BUILD_OWNCLOUD_OSX_BUNDLE was not initialized OR set to true on OSX
 if(APPLE AND (NOT DEFINED BUILD_OWNCLOUD_OSX_BUNDLE OR BUILD_OWNCLOUD_OSX_BUNDLE))
     set(BUILD_OWNCLOUD_OSX_BUNDLE ON)
-    set(OWNCLOUD_OSX_BUNDLE "${APPLICATION_NAME}.app")
-    set(LIB_INSTALL_DIR "${APPLICATION_NAME}.app/Contents/MacOS")
-    set(BIN_INSTALL_DIR "${APPLICATION_NAME}.app/Contents/MacOS")
+    set(OWNCLOUD_OSX_BUNDLE "${APPLICATION_EXECUTABLE}.app")
+    set(LIB_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS")
+    set(BIN_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS")
 
 # BUILD_OWNCLOUD_OSX_BUNDLE was disabled on OSX
 elseif(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE)
@@ -131,36 +111,9 @@ if(NO_MSG_HANDLER)
    add_definitions(-DNO_MSG_HANDLER=1)
 endif()
 
-# this option builds the updater
-option(BUILD_UPDATER "BUILD_UPDATER" OFF)
-if(BUILD_UPDATER)
-   message("Compiling with updater")
-   add_definitions(-DBUILD_UPDATER=1)
-else()
-   message("Compiling without updater")
-endif()
-
-# this option builds the shell integration
-option(BUILD_SHELL_INTEGRATION "BUILD_SHELL_INTEGRATION" ON)
-
-# this option builds/installs the generic shell integration icons
-option(BUILD_SHELL_INTEGRATION_ICONS "BUILD_SHELL_INTEGRATION_ICONS" ON)
-
-# this options builds the dolphin integration plugin
-option(BUILD_SHELL_INTEGRATION_DOLPHIN "BUILD_SHELL_INTEGRATION_DOLPHIN" ON)
-
-# this options builds the nautilus (like) integration plugins
-option(BUILD_SHELL_INTEGRATION_NAUTILUS "BUILD_SHELL_INTEGRATION_NAUTILUS" ON)
-
-# this option builds the client
-option(BUILD_CLIENT "BUILD_CLIENT" ON)
-
-# this option creates only libocsync and libowncloudsync (NOTE: BUILD_CLIENT needs to be on)
+# this option creates only libocsync and libowncloudsync
 option(BUILD_LIBRARIES_ONLY "BUILD_LIBRARIES_ONLY" OFF)
 
-# build the GUI component, when disabled only nextcloudcmd is built
-option(BUILD_GUI "BUILD_GUI" ON)
-
 # When this option is enabled, 5xx errors are not added to the blacklist
 # Normally you don't want to enable this option because if a particular file
 # triggers a bug on the server, you want the file to be blacklisted.
@@ -173,97 +126,89 @@ if(APPLE)
   set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
 endif()
 
-if(BUILD_CLIENT)
-    OPTION(GUI_TESTING "Build with gui introspection features of socket api" OFF)
+#### find libs
+#find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtTest QtWebkit REQUIRED )
+#if( UNIX AND NOT APPLE ) # Fdo notifications
+#    find_package(Qt4 4.7.0 COMPONENTS QtDBus REQUIRED )
+#endif()
 
-    if(APPLE AND BUILD_UPDATER)
-        find_package(Sparkle)
+
+if(HAVE_QT5)
+  if (${Qt5Core_VERSION_MAJOR} EQUAL "5")
+    if (${Qt5Core_VERSION_MINOR} EQUAL "4" OR ${Qt5Core_VERSION_MINOR} GREATER 4)
+    else()
+      message(STATUS "If possible compile me with Qt 5.4 or higher.")
     endif()
-
-    if(UNIX AND NOT APPLE)
-        find_package(Inotify REQUIRED)
-    endif()
-    find_package(Sphinx)
-    find_package(PdfLatex)
-    find_package(OpenSSL 1.1 REQUIRED )
-
-   find_package(ZLIB REQUIRED)
-
-   if(NOT WIN32 AND NOT APPLE)
-      find_package(PkgConfig REQUIRED)
-      pkg_check_modules(CLOUDPROVIDERS cloudproviders IMPORTED_TARGET)
-
-      if(CLOUDPROVIDERS_FOUND)
-        pkg_check_modules(GIO REQUIRED gio-2.0 IMPORTED_TARGET)
-        pkg_check_modules(GLIB2 REQUIRED glib-2.0 IMPORTED_TARGET)
-      endif()
-   endif()
+  endif()
+else()
+  message(STATUS "If possible compile me with Qt 5.4 or higher.")
 endif()
 
-if (NOT DEFINED APPLICATION_ICON_NAME)
-    set(APPLICATION_ICON_NAME ${APPLICATION_SHORTNAME})
+find_package(OpenSSL 1.0.0 REQUIRED)
+
+if(NOT TOKEN_AUTH_ONLY)
+    if (Qt5Core_DIR)
+    find_package(Qt5Keychain REQUIRED)
+    else()
+    find_package(QtKeychain REQUIRED)
+    endif()
 endif()
 
-include(NextcloudCPack.cmake)
+if(APPLE)
+  find_package(Sparkle)
+endif(APPLE)
+
+if(UNIX)
+  find_package(INotify REQUIRED)
+else()
+  find_package(INotify)
+endif()
+find_package(Sphinx)
+find_package(PdfLatex)
+
+find_package(SQLite3 3.8.0 REQUIRED)
+# On some OS, we want to use our own, not the system sqlite
+if (USE_OUR_OWN_SQLITE3)
+    include_directories(BEFORE ${SQLITE3_INCLUDE_DIR})
+endif()
+
+find_package(ZLIB)
+
+configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
+configure_file(test/test_journal.db "${CMAKE_BINARY_DIR}/test/test_journal.db" COPYONLY)
+
+include(OwnCloudCPack.cmake)
 
 add_definitions(-DUNICODE)
 add_definitions(-D_UNICODE)
 if( WIN32 )
 add_definitions( -D__USE_MINGW_ANSI_STDIO=1 )
-add_definitions( -DNOMINMAX )
-# Get APIs from from Vista onwards.
-add_definitions(-D_WIN32_WINNT=0x0601)
-add_definitions(-DWINVER=0x0601)
-add_definitions(-DNTDDI_VERSION=0x0A000004)
-    if( MSVC )
-    # Use automatic overload for suitable CRT safe-functions
-    # See https://docs.microsoft.com/de-de/cpp/c-runtime-library/security-features-in-the-crt?view=vs-2019
-    add_definitions( -D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 )
-    # Also: Disable compiler warnings because we don't use Windows CRT safe-functions explicitly and don't intend to
-    # as this is a pure cross-platform source the only alternative would be a ton of ifdefs with calls to the _s version
-    add_definitions( -D_CRT_SECURE_NO_WARNINGS )
-    endif( MSVC )
 endif( WIN32 )
 
-if (APPLE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-endif()
-
 # Handle Translations, pick all client_* files from trans directory.
 file( GLOB TRANS_FILES ${CMAKE_SOURCE_DIR}/translations/client_*.ts)
 set(TRANSLATIONS ${TRANS_FILES})
 
-if(BUILD_CLIENT)
-    add_subdirectory(src)
-    if(NOT BUILD_LIBRARIES_ONLY)
-        add_subdirectory(man)
-        add_subdirectory(doc)
-        add_subdirectory(doc/dev)
-        if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin)
-            add_subdirectory(admin)
-        endif(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin)
-    endif(NOT BUILD_LIBRARIES_ONLY)
-endif()
+add_subdirectory(csync)
+add_subdirectory(src)
+if(NOT BUILD_LIBRARIES_ONLY)
+add_subdirectory(shell_integration)
+add_subdirectory(doc)
+add_subdirectory(doc/dev)
+add_subdirectory(admin)
+endif(NOT BUILD_LIBRARIES_ONLY)
 
-if(BUILD_SHELL_INTEGRATION)
-    add_subdirectory(shell_integration)
-endif()
-
-if(BUILD_TESTING)
+if(UNIT_TESTING)
     include(CTest)
     enable_testing()
     add_subdirectory(test)
-endif()
-
-configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+endif(UNIT_TESTING)
 
 if(BUILD_OWNCLOUD_OSX_BUNDLE)
     install(FILES sync-exclude.lst DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
     configure_file(sync-exclude.lst bin/${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
-elseif(BUILD_CLIENT)
+else()
     install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
     configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
 endif()
-
-feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES INCLUDE_QUIET_PACKAGES)

CONTRIBUTING.md

@@ -1,18 +1,20 @@
 ## Submitting Desktop Client issues
 
-If you have questions about how to use the Nextcloud Desktop Client, please
-visit our [support site][support] or our [forum][forum].
+If you have questions about how to use the ownCloud Desktop Client, please
+direct these to the [mailing list][mailinglist] 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 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 Nextcloud desktop client. 
+* __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
+* This repository is *only* for issues within the ownCloud desktop client. 
   Issues in other components should be reported in their own repositores: 
-  - [Nextcloud server](https://github.com/nextcloud/server/issues)
-  - [Android client](https://github.com/nextcloud/android/issues)
-  - [iOS client](https://github.com/nextcloud/ios/issues)
+  - [ownCloud server](https://github.com/owncloud/core/issues)
+  - [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar,
+    Contacts...)
+  - [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.
 
@@ -21,21 +23,27 @@ If your issue appears to be a bug, and hasn't been reported, open a new issue.
 Help us to maximize the effort we can spend fixing issues and adding new
 features, by not reporting duplicate issues.
 
-[template]: https://raw.githubusercontent.com/nextcloud/desktop/master/.github/issue_template.md
-[support]: https://nextcloud.com/support/
-[forum]: https://help.nextcloud.com/categories
-[irc]: https://webchat.freenode.net/?channels=nextcloud
+[template]: https://raw.github.com/owncloud/client/master/issue_template.md
+[mailinglist]: https://mail.kde.org/mailman/listinfo/owncloud
+[forum]: http://forum.owncloud.org/
+[irc]: http://webchat.freenode.net/?channels=owncloud&uio=d4
 
 ## Contributing to Source Code
 
-Thanks for wanting to contribute source code to Nextcloud. That's great!
+Thanks for wanting to contribute source code to ownCloud. That's great!
 
-You do not need to sign a Contributor Agreement, but we ask that you follow our 
-[Code of Conduct](https://nextcloud.com/code-of-conduct/).
+Before we're able to merge your code to ownCloud Desktop Client, you need to sign
+our [Contributor Agreement][agreement].
 
-Please read the [Contribution Guide](https://nextcloud.com/contribute/) to get 
-started and follow the [Coding Style](https://github.com/nextcloud/desktop/wiki/Coding-Style)
-when writing new code.
+Please read the [Desktop Client Manual][desktopman] and the [Developer
+Manuals][devmanual] to get useful info like how to create your first
+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](https://www.transifex.com/nextcloud/nextcloud/).
+Please submit translations via [Transifex][transifex].
+
+[transifex]: https://www.transifex.com/projects/p/owncloud/

CPackOptions.cmake.in

@@ -9,8 +9,13 @@ endif(CPACK_GENERATOR MATCHES "NSIS")
 
 set( CMAKE_SOURCE_DIR  @CMAKE_SOURCE_DIR@ )
 set( CMAKE_BINARY_DIR  @CMAKE_BINARY_DIR@ )
+set( OEM_THEME_DIR     @OEM_THEME_DIR@ )
 
-include("${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake")
+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" )
+endif()
 
 set( CRASHREPORTER_EXECUTABLE @CRASHREPORTER_EXECUTABLE@)
 

NEXTCLOUD.cmake

@@ -1,63 +0,0 @@
-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_HELP_URL   "" CACHE STRING "URL for the help menu" )
-set( APPLICATION_ICON_NAME  "Nextcloud" )
-set( APPLICATION_ICON_SET   "SVG" )
-set( APPLICATION_SERVER_URL "" CACHE STRING "URL for the server to use. If entered, the UI field will be pre-filled with it" )
-set( APPLICATION_SERVER_URL_ENFORCE ON ) # If set and APPLICATION_SERVER_URL is defined, the server can only connect to the pre-defined URL
-set( APPLICATION_REV_DOMAIN "com.nextcloud.desktopclient" )
-set( APPLICATION_VIRTUALFILE_SUFFIX "nextcloud" CACHE STRING "Virtual file suffix (not including the .)")
-
-set( LINUX_PACKAGE_SHORTNAME "nextcloud" )
-set( LINUX_APPLICATION_ID "${APPLICATION_REV_DOMAIN}.${LINUX_PACKAGE_SHORTNAME}")
-
-set( THEME_CLASS            "NextcloudTheme" )
-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" )
-
-## Updater options
-option( BUILD_UPDATER "Build updater" OFF )
-
-option( WITH_PROVIDERS "Build with providers list" ON )
-
-
-## Theming options
-set(NEXTCLOUD_BACKGROUND_COLOR "#0082c9" CACHE STRING "Default Nextcloud background color")
-set( APPLICATION_WIZARD_HEADER_BACKGROUND_COLOR ${NEXTCLOUD_BACKGROUND_COLOR} CACHE STRING "Hex color of the wizard header background")
-set( APPLICATION_WIZARD_HEADER_TITLE_COLOR "#ffffff" CACHE STRING "Hex color of the text in the wizard header")
-option( APPLICATION_WIZARD_USE_CUSTOM_LOGO "Use the logo from ':/client/theme/colored/wizard_logo.(png|svg)' else the default application icon is used" ON )
-
-
-#
-## Windows Shell Extensions & MSI - IMPORTANT: Generate new GUIDs for custom builds with "guidgen" or "uuidgen"
-#
-if(WIN32)
-    # Context Menu
-    set( WIN_SHELLEXT_CONTEXT_MENU_GUID      "{BC6988AB-ACE2-4B81-84DC-DC34F9B24401}" )
-
-    # Overlays
-    set( WIN_SHELLEXT_OVERLAY_GUID_ERROR     "{E0342B74-7593-4C70-9D61-22F294AAFE05}" )
-    set( WIN_SHELLEXT_OVERLAY_GUID_OK        "{E1094E94-BE93-4EA2-9639-8475C68F3886}" )
-    set( WIN_SHELLEXT_OVERLAY_GUID_OK_SHARED "{E243AD85-F71B-496B-B17E-B8091CBE93D2}" )
-    set( WIN_SHELLEXT_OVERLAY_GUID_SYNC      "{E3D6DB20-1D83-4829-B5C9-941B31C0C35A}" )
-    set( WIN_SHELLEXT_OVERLAY_GUID_WARNING   "{E4977F33-F93A-4A0A-9D3C-83DEA0EE8483}" )
-
-    # MSI Upgrade Code (without brackets)
-    set( WIN_MSI_UPGRADE_CODE                "FD2FCCA9-BB8F-4485-8F70-A0621B84A7F4" )
-
-    # Windows build options
-    option( BUILD_WIN_MSI "Build MSI scripts and helper DLL" OFF )
-    option( BUILD_WIN_TOOLS "Build Win32 migration tools" OFF )
-endif()

OWNCLOUD.cmake

@@ -0,0 +1,18 @@
+set( APPLICATION_NAME       "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( 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" )

OwnCloudCPack.cmake

@@ -2,7 +2,11 @@ include( InstallRequiredSystemLibraries )
 
 set( CPACK_PACKAGE_CONTACT  "Dominik Schmidt <domme@tomahawk-player.org>" )
 
-include("${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake")
+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" )
+endif()
 
 include( VERSION.cmake )
 set( CPACK_PACKAGE_VERSION_MAJOR  ${MIRALL_VERSION_MAJOR} )
@@ -15,7 +19,7 @@ if(APPLE)
     set( CPACK_GENERATOR "DragNDrop" )
     set( CPACK_SOURCE_GENERATOR "")
     set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_SHORTNAME}-${CPACK_PACKAGE_VERSION} )
-    set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/${APPLICATION_ICON_NAME}.icns)
+    set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/ownCloud.icns)
 
     set( CPACK_DMG_DS_STORE "${CMAKE_SOURCE_DIR}/admin/osx/DS_Store.in")
 #    set( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/admin/osx/DMGBackground.png" )
@@ -44,7 +48,7 @@ if(WIN32)
     set( CPACK_PACKAGE_DESCRIPTION_FILE  "${CMAKE_SOURCE_DIR}/README.md" ) # File used as a description of a project     /path/to/project/ReadMe.txt
     set( CPACK_PACKAGE_DESCRIPTION_SUMMARY  "${APPLICATION_NAME} Syncing Client" ) #  Description summary of a project
     # CPACK_PACKAGE_EXECUTABLES   List of pairs of executables and labels. Used by the NSIS generator to create Start Menu shortcuts.     ccmake;CMake
-    set( CPACK_PACKAGE_INSTALL_DIRECTORY  ${APPLICATION_SHORTNAME} )     # Installation directory on the target system -> C:\Program Files\${APPLICATION_SHORTNAME}
+    set( CPACK_PACKAGE_INSTALL_DIRECTORY  ${APPLICATION_SHORTNAME} )     # Installation directory on the target system -> C:\Program Files\fellody
     set( CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${APPLICATION_SHORTNAME} )  # Registry key used when installing this project  CMake 2.5.0
     set( CPACK_PACKAGE_NAME  ${APPLICATION_NAME} ) # Package name, defaults to the project name
     set( CPACK_PACKAGE_VENDOR  "http://${APPLICATION_DOMAIN}" )   # Package vendor name

README.md

@@ -1,96 +1,65 @@
-# Nextcloud Desktop Client
+# ownCloud Desktop Client
 
-The :computer: Nextcloud Desktop Client is a tool to synchronize files from Nextcloud Server
+| Job                               | State                                                                                                                                                             |
+|-----------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| client-build-matrix               | [![Build Status](https://ci.owncloud.org/job/client-build-matrix-linux/badge/icon)](https://ci.owncloud.org/job/client-build-matrix-linux/)                       |
+| client-test-matrix-linux-no-build | [![Build Status](https://ci.owncloud.org/buildStatus/icon?job=client-test-matrix-linux-no-build)](https://ci.owncloud.org/job/client-test-matrix-linux-no-build/) |
+| coverity_scan | [![Build Status](https://img.shields.io/coverity/scan/2482.svg)](https://scan.coverity.com/projects/owncloud-mirall)
+
+## Introduction
+
+The ownCloud Desktop Client is a tool to synchronize files from ownCloud Server
 with your computer.
 
-<p align="center">
-    <img src="doc/images/main_dialog_christine.png" alt="Desktop Client on Windows" width="450">
-</p>
+## Download
 
-## :blue_heart: :tada: Contributing
+### Binary packages
 
-### :hammer_and_wrench: How to compile the desktop client
+* Refer to the download page http://owncloud.org/sync-clients/
 
-: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.
+### Source code
 
-#### :memo: Step by step instructions
-
-##### Clone the repo and create build directory
-```
-$ git clone https://github.com/nextcloud/desktop.git
-$ cd desktop
-$ mkdir build
-$ cd build
-```
-##### Compile and install
-
-:warning: For development reasons it is better to **install the client on user space** instead on the global system. Mixing up libs/dll's of different version can lead to undefined behavior and crashes:
-
-* You could use the **cmake flag** ```CMAKE_INSTALL_PREFIX``` as ```~/.local/``` in a **Linux** system. If you want to install system wide you could use ```/usr/local``` or ```/opt/nextcloud/```.
-
-* On **Windows 10** [```$USERPROFILE```](https://docs.microsoft.com/en-us/windows/deployment/usmt/usmt-recognized-environment-variables#a-href-idbkmk-2avariables-that-are-recognized-only-in-the-user-context) refers to ```C:\Users\<USERNAME>```.
-
-##### Linux & Mac OS
-
-```
-$ cmake .. -DCMAKE_INSTALL_PREFIX=~/nextcloud-desktop-client -DCMAKE_BUILD_TYPE=Debug
-$ make install
-```
-
-##### Windows
-
-```
-$ cmake -G "Visual Studio 15 2017 Win64" .. -DCMAKE_INSTALL_PREFIX=$USERPROFILE\nextcloud-desktop-client -DCMAKE_BUILD_TYPE=Debug
-$ cmake --build . --config Debug --target install
-```
-
-:information_source: More detailed instructions can be found at the [Desktop Client Wiki](https://github.com/nextcloud/desktop/wiki).
-
-### :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/desktop/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/desktop/pulls).
-- How to create a pull request? This guide will help you get started: [Opening a pull request](https://opensource.guide/how-to-contribute/#opening-a-pull-request) :heart:
-
-
-## :satellite: Contact us
-
-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
+The ownCloud 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/nextcloud/desktop.
+https://github.com/owncloud/client.
 
-## :scroll: License
+## Building the source code
+
+[Building the Client](http://doc.owncloud.org/desktop/2.0/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
@@ -101,3 +70,5 @@ https://github.com/nextcloud/desktop.
     WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
     or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
     for more details.
+
+

VERSION.cmake

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

admin/CMakeLists.txt

@@ -1,7 +1,2 @@
-if(APPLE)
-    # traverse into osx subdirectory to install and patch the create-pack script
-    add_subdirectory(osx)
-elseif(WIN32)
-    # MSI package scripts, helper DLL and migration tools
-    add_subdirectory(win)
-endif()
+# traverse into osx subdirectory to install and patch the create-pack script
+add_subdirectory(osx)

admin/linux/build-appimage.sh

@@ -1,99 +0,0 @@
-#! /bin/bash
-
-set -xe
-
-mkdir /app
-mkdir /build
-
-#Set Qt-5.12
-export QT_BASE_DIR=/opt/qt5.12.10
-export QTDIR=$QT_BASE_DIR
-export PATH=$QT_BASE_DIR/bin:$PATH
-export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH
-export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
-
-#Set APPID for .desktop file processing
-export LINUX_APPLICATION_ID=com.nextcloud.desktopclient.nextcloud
-
-#set defaults
-export SUFFIX=${DRONE_PULL_REQUEST:=master}
-if [ $SUFFIX != "master" ]; then
-    SUFFIX="PR-$SUFFIX"
-fi
-
-#QtKeyChain v0.10.0
-cd /build
-git clone https://github.com/frankosterfeld/qtkeychain.git
-cd qtkeychain
-git checkout v0.10.0
-mkdir build
-cd build
-cmake -D CMAKE_INSTALL_PREFIX=/usr ../
-make -j4
-make install
-
-#Build client
-cd /build
-mkdir build-client
-cd build-client
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-    -D BUILD_TESTING=OFF \
-    -D BUILD_UPDATER=ON \
-    -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/* ./usr/lib/
-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 exclude to right location
-mv ./etc/Nextcloud/sync-exclude.lst ./usr/bin/
-rm -rf ./etc
-
-DESKTOP_FILE=/app/usr/share/applications/${LINUX_APPLICATION_ID}.desktop
-sed -i -e 's|Icon=nextcloud|Icon=Nextcloud|g' ${DESKTOP_FILE} # 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 --ca-directory=/etc/ssl/certs/ -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 ${DESKTOP_FILE} -bundle-non-qt-libs -qmldir=$DRONE_WORKSPACE/src/gui
-
-# Set origin
-./squashfs-root/usr/bin/patchelf --set-rpath '$ORIGIN/' /app/usr/lib/libnextcloudsync.so.0
-
-# Build AppImage
-./squashfs-root/AppRun ${DESKTOP_FILE} -appimage
-
-mv Nextcloud*.AppImage Nextcloud-${SUFFIX}-${DRONE_COMMIT}-x86_64.AppImage

admin/linux/clean_tarball.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-rm -vrf admin/
-rm -vrf src/3rdparty/sqlite3   # FIXME: For CentOS6 we have to use our bundled sqlite
-rm -vrf binary/
-rm -vrf src/3rdparty/libcrashreporter-qt
-rm -vrf shell_integration/windows
-rm -vrf shell_integration/MacOSX

admin/linux/count_compiler_warnings.py

@@ -1,40 +0,0 @@
-#!/usr/bin/env python3
-
-# Small script that counts the warnings which the compiler emits
-# and takes care that not more warnings are added.
-
-import sys
-import re
-import requests
-
-
-if len(sys.argv) != 2:
-    print(f"Usage: {sys.argv[0]} REPOSITORY_PATH")
-    sys.exit(1)
-
-repository_path = sys.argv[1]
-warning_regex = re.compile(r'warning:', re.M)
-max_allowed_warnings_count_response = requests.get(
-    "https://nextclouddesktopwarningscount.felixweilbach.de")
-
-if max_allowed_warnings_count_response.status_code != 200:
-    print('Can not get maximum number of allowed warnings')
-    sys.exit(1)
-
-max_allowed_warnings_count = int(max_allowed_warnings_count_response.content)
-
-print("Max number of allowed warnings:", max_allowed_warnings_count)
-
-warnings_count = 0
-
-for line in sys.stdin:
-    if warning_regex.findall(line):
-        warnings_count += 1
-
-    print(line, end="")
-
-    if warnings_count > max_allowed_warnings_count:
-        print("Error: Too many warnings! You probably introduced a new warning!")
-        sys.exit(1)
-
-print("Total number of warnings:", warnings_count)

admin/linux/debian/drone-build.sh

@@ -1,139 +0,0 @@
-#!/bin/bash
-
-set -xe
-shopt -s extglob
-
-env
-
-PPA=ppa:nextcloud-devs/client
-PPA_ALPHA=ppa:nextcloud-devs/client-alpha
-PPA_BETA=ppa:nextcloud-devs/client-beta
-
-OBS_PROJECT=home:ivaradi
-OBS_PROJECT_ALPHA=home:ivaradi:alpha
-OBS_PROJECT_BETA=home:ivaradi:beta
-OBS_PACKAGE=nextcloud-desktop
-
-if test "${DRONE_TARGET_BRANCH}" = "stable-2.6"; then
-    UBUNTU_DISTRIBUTIONS="bionic focal hirsute impish"
-    DEBIAN_DISTRIBUTIONS="buster stretch testing"
-else
-    UBUNTU_DISTRIBUTIONS="focal hirsute impish"
-    DEBIAN_DISTRIBUTIONS="testing"
-fi
-
-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}"
-git fetch --tags
-read basever revdate kind <<<$(admin/linux/debian/scripts/git2changelog.py /tmp/tmpchangelog stable)
-
-cd "${DRONE_DIR}"
-
-echo "$kind" > kind
-
-if test "$kind" = "alpha"; then
-    repo=nextcloud-devs/client-alpha
-elif test "$kind" = "beta"; then
-    repo=nextcloud-devs/client-beta
-else
-    repo=nextcloud-devs/client
-fi
-
-origsourceopt=""
-
-cp -a ${DRONE_WORKSPACE} nextcloud-desktop_${basever}-${revdate}
-tar cjf nextcloud-desktop_${basever}-${revdate}.orig.tar.bz2 --exclude .git --exclude binary nextcloud-desktop_${basever}-${revdate}
-
-cd "${DRONE_WORKSPACE}"
-git config --global user.email "drone@noemail.invalid"
-git config --global user.name "Drone User"
-
-for distribution in ${UBUNTU_DISTRIBUTIONS} ${DEBIAN_DISTRIBUTIONS}; do
-    git checkout -- .
-    git clean -xdf
-
-    git fetch origin debian/dist/${distribution}/${DRONE_TARGET_BRANCH}
-    git checkout origin/debian/dist/${distribution}/${DRONE_TARGET_BRANCH}
-
-    git merge ${DRONE_COMMIT}
-
-    admin/linux/debian/scripts/git2changelog.py /tmp/tmpchangelog ${distribution} ${revdate} ${basever}
-    cat /tmp/tmpchangelog debian/changelog > debian/changelog.new
-    mv debian/changelog.new debian/changelog
-
-    fullver=`head -1 debian/changelog | sed "s:nextcloud-desktop (\([^)]*\)).*:\1:"`
-
-    EDITOR=true dpkg-source --commit . local-changes
-
-    dpkg-source --build .
-    dpkg-genchanges -S -sa > "../nextcloud-desktop_${fullver}_source.changes"
-
-    if test -f ~/.has_ppa_keys; then
-        debsign -k2265D8767D14AA7B -S
-    fi
-done
-cd ..
-ls -al
-
-if test "${pull_request}" = "master"; then
-    if test "$kind" = "alpha"; then
-        PPA=$PPA_ALPHA
-        OBS_PROJECT=$OBS_PROJECT_ALPHA
-    elif test "$kind" = "beta"; then
-        PPA=$PPA_BETA
-        OBS_PROJECT=$OBS_PROJECT_BETA
-    fi
-
-    if test -f ~/.has_ppa_keys; then
-        for distribution in ${UBUNTU_DISTRIBUTIONS}; do
-            changes=$(ls -1 nextcloud-desktop_*~${distribution}1_source.changes)
-            if test -f "${changes}"; then
-                dput $PPA "${changes}" > /dev/null
-            fi
-        done
-
-        for distribution in ${DEBIAN_DISTRIBUTIONS}; do
-            pkgsuffix=".${distribution}"
-            pkgvertag="~${distribution}1"
-
-            package="${OBS_PACKAGE}${pkgsuffix}"
-            OBS_SUBDIR="${OBS_PROJECT}/${package}"
-
-            mkdir -p osc
-            pushd osc
-            osc co ${OBS_PROJECT} ${package}
-            if test "$(ls ${OBS_SUBDIR})"; then
-                osc delete ${OBS_SUBDIR}/*
-            fi
-
-            cp ../nextcloud-desktop*.orig.tar.* ${OBS_SUBDIR}/
-            cp ../nextcloud-desktop_*[0-9.][0-9]${pkgvertag}.dsc ${OBS_SUBDIR}/
-            cp ../nextcloud-desktop_*[0-9.][0-9]${pkgvertag}.debian.tar* ${OBS_SUBDIR}/
-            cp ../nextcloud-desktop_*[0-9.][0-9]${pkgvertag}_source.changes ${OBS_SUBDIR}/
-            osc add ${OBS_SUBDIR}/*
-
-            cd ${OBS_SUBDIR}
-            osc commit -m "Travis update"
-            popd
-        done
-    fi
-fi

admin/linux/debian/scripts/git2changelog.cfg

@@ -1,12 +0,0 @@
-# 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
-
-[base]
-commit = 56222de768e3def4d504b3f9832d8598b1ec2043
-version = 2.7.0

admin/linux/debian/scripts/git2changelog.py

@@ -1,178 +0,0 @@
-#!//usr/bin/env python2.7
-
-from __future__ import print_function
-import subprocess
-import re
-import sys
-import datetime
-import os
-import ConfigParser
-
-try:
-    long
-except NameError:
-    long = int
-
-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
-    try:
-        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
-    except:
-        return None
-
-def collectEntries(baseCommit, baseVersion, kind, finalBaseVersion, finalRevDate, config):
-
-    newVersionCommit = None
-    newVersionTag = None
-    newVersionOrigTag = None
-
-    if config is not None and 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():
-        words = line.split("\t")
-        (commit, name, email, date, revdate) = words[0:5]
-        subject = "\t".join(words[5:])
-
-        revdate = datetime.datetime.utcfromtimestamp(long(revdate)).strftime("%Y%m%d.%H%M%S")
-        revdate += "." + commit
-
-        kind = "alpha"
-
-        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))
-
-    if entries:
-        (commit, name, email, date, revdate, subject, baseVersion, kind) = entries[-1]
-        if finalRevDate is None:
-            revdate = datetime.datetime.now().strftime("%Y%m%d.%H%M%S")+ "." + commit
-        else:
-            revdate = finalRevDate
-        if finalBaseVersion is not None:
-            baseVersion = finalBaseVersion
-        entries[-1] = (commit, name, email, date, revdate, subject, baseVersion, kind)
-
-    entries.reverse()
-
-    return entries
-
-def genChangeLogEntries(f, entries, distribution):
-    latestBaseVersion = None
-    latestRevDate = None
-    latestKind = None
-    for (commit, name, email, date, revdate, subject, baseVersion, kind) in entries:
-        if latestBaseVersion is None:
-            latestBaseVersion = baseVersion
-            latestRevDate = revdate
-            latestKind = kind
-        upstreamVersion = baseVersion + "-" + revdate
-        if distribution=="stable":
-            version = upstreamVersion
-        else:
-            version = upstreamVersion + "-1.0~" + distribution + "1"
-        print("nextcloud-desktop (%s) %s; urgency=medium" % (version, distribution), file=f)
-        print(file=f)
-        print("  * " + subject, file=f)
-        print(file=f)
-        print(" -- %s <%s>  %s" % (name, email, date), file=f)
-        print(file=f)
-    return (latestBaseVersion, latestRevDate, latestKind)
-
-if __name__ == "__main__":
-    scriptdir = os.path.dirname(__file__)
-    configPath = os.path.join(scriptdir, "git2changelog.cfg")
-
-    baseCommit = "f9b1c724d6ab5431e0cd56b7cd834f2dd48cebb1"
-    baseVersion = "2.4.0"
-
-    config = None
-    if os.path.exists(configPath):
-        config = ConfigParser.SafeConfigParser()
-        config.read(configPath)
-
-        if config.has_section("base"):
-            if config.has_option("base", "commit") and \
-               config.has_option("base", "version"):
-                baseCommit = config.get("base", "commit")
-                baseVersion = config.get("base", "version")
-
-    distribution = sys.argv[2]
-    finalRevDate = sys.argv[3] if len(sys.argv)>3 else None
-    finalBaseVersion = sys.argv[4] if len(sys.argv)>4 else None
-
-    entries = collectEntries(baseCommit, baseVersion, "alpha",
-                             finalBaseVersion, finalRevDate, config)
-
-    with open(sys.argv[1], "wt") as f:
-        (baseVersion, revdate, kind) = genChangeLogEntries(f, entries, distribution)
-        print(baseVersion, revdate, kind)

admin/linux/upload-appimage.sh

@@ -1,135 +0,0 @@
-#! /bin/bash
-
-# Env
-export BUILD=${DRONE_BUILD_NUMBER}
-export PR=${DRONE_PULL_REQUEST}
-export GIT_USERNAME=${CI_UPLOAD_GIT_USERNAME}
-export GIT_TOKEN=${CI_UPLOAD_GIT_TOKEN}
-
-# Defaults
-export GIT_REPO=ci-builds
-export API_BASE_URL=https://api.github.com/repos/$GIT_USERNAME/$GIT_REPO
-export DESKTOP_API_BASE_URL=https://api.github.com/repos/nextcloud/desktop
-
-# PR / master
-export TAG_NAME=${PR:=master}
-export RELEASE_BODY=https://github.com/nextcloud/desktop
-
-if [ $TAG_NAME != "master" ]; then
-    TAG_NAME="PR-$TAG_NAME"
-    RELEASE_BODY="nextcloud/desktop#$PR"
-fi
-
-cd /build
-
-# AppImage
-export APPIMAGE=$(readlink -f ./Nextcloud*.AppImage)
-export BASENAME=$(basename ${APPIMAGE})
-
-if ! test -e $APPIMAGE ; then
-    exit 1
-fi
-
-echo "Found AppImage: $BASENAME"
-
-if [ $TAG_NAME != "master" ]; then
-    # Delete all old comments in desktop PR, starting with "AppImage file:"
-    oldComments=$(curl 2>/dev/null -u $GIT_USERNAME:$GIT_TOKEN -X GET $DESKTOP_API_BASE_URL/issues/$PR/comments | jq '.[] | (.id |tostring) + "|" + (.user.login | test("'${GIT_USERNAME}'") | tostring) + "|" + (.body | test("AppImage file:.*") | tostring)'  | grep "true|true" | tr -d "\"" | cut -f1 -d"|")
-
-    if [[ "$oldComments" != "" ]]; then
-        echo $oldComments | while read comment ; do
-            curl 2>/dev/null -u $GIT_USERNAME:$GIT_TOKEN -X DELETE $DESKTOP_API_BASE_URL/issues/comments/$comment
-        done
-    fi
-fi
-
-# Helper functions
-urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; }
-
-create_release()
-{
-    name=$TAG_NAME
-    body=$RELEASE_BODY
-    tagName=$TAG_NAME
-    echo $(curl 2>/dev/null -u $GIT_USERNAME:$GIT_TOKEN -X POST $API_BASE_URL/releases -d "{ \"tag_name\": \"$tagName\", \"target_commitish\": \"master\", \"name\": \"$name\", \"body\": \"$body\", \"draft\": false, \"prerelease\": true }")
-}
-
-get_release()
-{
-    tagName=$TAG_NAME
-    echo $(curl 2>/dev/null -u $GIT_USERNAME:$GIT_TOKEN -X GET $API_BASE_URL/releases/tags/$tagName)
-}
-
-get_release_assets()
-{
-    releaseId=$1
-    echo $(curl 2>/dev/null -u $GIT_USERNAME:$GIT_TOKEN -X GET $API_BASE_URL/releases/$releaseId/assets)
-}
-
-upload_release_asset()
-{
-    uploadUrl=$1
-    echo $(curl --max-time 900 -u $GIT_USERNAME:$GIT_TOKEN -X POST $uploadUrl --header "Content-Type: application/octet-stream" --upload-file $APPIMAGE)
-}
-
-delete_release_asset()
-{
-    assetId=$1
-    curl 2>/dev/null -u $GIT_USERNAME:$GIT_TOKEN -X DELETE $API_BASE_URL/releases/assets/$assetId
-}
-
-# Try to get an already existing release
-json=$(get_release)
-
-releaseId=$(echo $json | jq -r '.id')
-uploadUrl=$(echo $json | jq -r '.upload_url')
-
-if [[ "$uploadUrl" == "null" ]]; then
-    # Try to create a release
-    json=$(create_release)
-
-    releaseId=$(echo $json | jq -r '.id')
-    uploadUrl=$(echo $json | jq -r '.upload_url')
-
-    if [[ "$uploadUrl" == "null" ]]; then
-        echo "create_release failed: $json"
-        exit 2
-    fi
-fi
-
-# Prepare upload url
-uploadUrl=$(echo "${uploadUrl/'{?name,label}'/?name=$BASENAME}")
-
-# Try to delete existing AppImage assets for this PR
-assets=$(get_release_assets $releaseId)
-
-for data in $(echo $assets | jq -r '.[] | @uri'); do
-    json=$(urldecode "$data")
-
-    assetId=$(echo $json | jq -r '.id')
-    name=$(echo $json | jq -r '.name')
-
-    if [[ "$name" == *.AppImage ]]; then
-        echo "Deleting old asset: $name"
-        $(delete_release_asset $assetId)
-    fi
-done
-
-# Upload release asset
-echo "Uploading new asset: $BASENAME"
-
-json=$(upload_release_asset "$uploadUrl")
-browserDownloadUrl=$(echo $json | jq -r '.browser_download_url')
-
-if [[ "$browserDownloadUrl" == "null" ]]; then
-    echo "upload_release_asset failed: $json"
-    exit 3
-fi
-
-if [ $TAG_NAME != "master" ]; then
-    # Create comment in desktop PR
-    curl 2>/dev/null -u $GIT_USERNAME:$GIT_TOKEN -X POST $DESKTOP_API_BASE_URL/issues/$PR/comments -d "{ \"body\" : \"AppImage file: [$BASENAME]($browserDownloadUrl) <br/><br/>To test this change/fix you can simply download above AppImage file and test it. <br/><br/>Please make sure to quit your existing Nextcloud app and backup your data. \" }"
-fi
-
-echo
-echo "AppImage link: $browserDownloadUrl"

admin/osx/CMakeLists.txt

@@ -1,5 +1,7 @@
 
-# Check if varialbe MAC_INSTALLER_BACKGROUND_FILE is defined.
+# 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
+# branded client.
 # Make sure that the MAC_INSTALLER_BACKGROUND_FILE contains the full path, ie.
 # includes CMAKE_SOURCE_DIR or so.
 
@@ -9,9 +11,7 @@ else()
   set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "0")
 endif()
 
-find_package(Qt5 5.12 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(create_mac_pkg.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
+configure_file(macosx.pkgproj ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
 configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)
 configure_file(post_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/post_install.sh)
-configure_file(QtWebEngineProcess.entitlements ${CMAKE_CURRENT_BINARY_DIR}/QtWebEngineProcess.entitlements)

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@-qt@Qt5Core_VERSION@-@MIRALL_VERSION_FULL@@MIRALL_VERSION_SUFFIX@"
+installer="@APPLICATION_SHORTNAME@-@MIRALL_VERSION_FULL@@MIRALL_VERSION_SUFFIX@"
 installer_file="$installer.pkg"
 installer_file_tar="$installer.pkg.tar"
 installer_file_tar_bz2="$installer.pkg.tar.bz2"
@@ -49,7 +49,7 @@ fi
 if [ ! -z "$identity" ]; then
 	echo "Will try to sign the installer"
 	pushd $install_path
-	productsign --timestamp --sign "$identity" "$installer_file" "$installer_file.new"
+	productsign --sign "$identity" "$installer_file" "$installer_file.new"
 	mv "$installer_file".new "$installer_file"
 	popd
 else

admin/osx/gen_sym_files.py

@@ -25,8 +25,6 @@ def extractDeps(macho):
     deps = [macho]
     otool = subprocess.Popen(['otool', '-L', macho], stdout=subprocess.PIPE)
     for l in otool.communicate()[0].splitlines():
-        if 'is not an object file' in l:
-            return []
         m = re.search(r'@[^\s]+', l)
         if m:
             path = resolvePath(m.group(0))

admin/osx/installer-background.svg

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

admin/osx/macdeployqt.py

@@ -0,0 +1,348 @@
+#!/usr/bin/python
+#  This file is part of ownCloud.
+#  It was inspired in large part by the macdeploy script in Clementine
+#  and Tomahawk
+#
+#  ownCloud is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; version 2 of the License.
+#
+#  ownCLoud is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with ownCloud.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import re
+import subprocess
+import commands
+import sys
+from glob import glob
+
+def QueryQMake(attrib):
+    return subprocess.check_output([qmake_path, '-query', attrib]).rstrip('\n')
+
+FRAMEWORK_SEARCH_PATH=[
+    '/Library/Frameworks',
+    os.path.join(os.environ['HOME'], 'Library/Frameworks')
+]
+
+LIBRARY_SEARCH_PATH=['/usr/local/lib', '.']
+
+QT_PLUGINS = [
+    'sqldrivers/libqsqlite.dylib',
+    'platforms/libqcocoa.dylib',
+    'imageformats/libqgif.dylib',
+    'imageformats/libqico.dylib',
+    'imageformats/libqjpeg.dylib',
+    'bearer/libqcorewlanbearer.dylib',
+    'bearer/libqgenericbearer.dylib',
+    'imageformats/libqsvg.dylib',
+    'imageformats/libqmng.dylib',
+]
+
+QT_PLUGINS_SEARCH_PATH=[
+#    os.path.join(os.environ['QTDIR'], 'plugins'),
+    '/usr/local/Cellar/qt/5.2.1/plugins',
+]
+
+
+class Error(Exception):
+  pass
+
+
+class CouldNotFindQtPluginErrorFindFrameworkError(Error):
+  pass
+
+
+class InstallNameToolError(Error):
+  pass
+
+
+class CouldNotFindQtPluginError(Error):
+  pass
+
+
+class CouldNotFindScriptPluginError(Error):
+  pass
+
+class CouldNotFindFrameworkError(Error):
+  pass
+
+if len(sys.argv) < 3:
+  print 'Usage: %s <bundle.app> <path-to-qmake>' % sys.argv[0]
+  exit()
+
+def is_exe(fpath):
+  return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
+
+bundle_dir = sys.argv[1]
+qmake_path = sys.argv[2]
+
+bundle_name = os.path.basename(bundle_dir).split('.')[0]
+
+commands = []
+
+binary_dir = os.path.join(bundle_dir, 'Contents', 'MacOS')
+frameworks_dir = os.path.join(bundle_dir, 'Contents', 'Frameworks')
+commands.append(['mkdir', '-p', frameworks_dir])
+resources_dir = os.path.join(bundle_dir, 'Contents', 'Resources')
+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)];
+
+
+fixed_libraries = []
+fixed_frameworks = []
+
+def WriteQtConf():
+  print "Writing qt.conf..."
+  with open(os.path.join(resources_dir, 'qt.conf'), 'w') as f:
+    f.write("[Paths]\nPlugins = PlugIns\n");
+    f.close()
+
+def GetBrokenLibraries(binary):
+  #print "Checking libs for binary: %s" % binary
+  output = subprocess.Popen(['otool', '-L', binary], stdout=subprocess.PIPE).communicate()[0]
+  broken_libs = {
+      'frameworks': [],
+      'libs': []}
+  for line in [x.split(' ')[0].lstrip() for x in output.split('\n')[1:]]:
+    #print "Checking line: %s" % line
+    if not line:  # skip empty lines
+      continue
+    if os.path.basename(binary) == os.path.basename(line):
+      #print "mnope %s-%s" % (os.path.basename(binary), os.path.basename(line))
+      continue
+    if re.match(r'^\s*/System/', line):
+      continue  # System framework
+    elif re.match(r'^\s*/usr/lib/', line):
+      #print "unix style system lib"
+      continue  # unix style system library
+    elif re.match(r'Breakpad', line):
+      continue  # Manually added by cmake.
+    elif re.match(r'^\s*@executable_path', line) or re.match(r'^\s*@loader_path', line):
+      # Potentially already fixed library
+      if '.framework' in line:
+        relative_path = os.path.join(*line.split('/')[3:])
+        if not os.path.exists(os.path.join(frameworks_dir, relative_path)):
+          broken_libs['frameworks'].append(relative_path)
+      else:
+        relative_path = os.path.join(*line.split('/')[1:])
+        #print "RELPATH %s %s" % (relative_path, os.path.join(binary_dir, relative_path))
+        if not os.path.exists(os.path.join(binary_dir, relative_path)):
+          broken_libs['libs'].append(relative_path)
+    elif re.search(r'\w+\.framework', line):
+      broken_libs['frameworks'].append(line)
+    else:
+      broken_libs['libs'].append(line)
+
+  return broken_libs
+
+def FindFramework(path):
+  search_pathes = FRAMEWORK_SEARCH_PATH
+  search_pathes.insert(0, QueryQMake('QT_INSTALL_LIBS'))
+  for search_path in search_pathes:
+    # The following two lines are needed for a custom built Qt from version 5.5 on, possibly not for the one from the Qt SDK.
+    # Looks like the upstream macdeployqt also had an issue there https://bugreports.qt.io/browse/QTBUG-47868
+    if path.find( "\@rpath/"):
+      path = path.replace("@rpath/", "")
+    abs_path = os.path.join(search_path, path)
+    if os.path.exists(abs_path):
+      return abs_path
+
+  raise CouldNotFindFrameworkError(path)
+
+def FindLibrary(path):
+  if os.path.exists(path):
+    return path
+  search_pathes = LIBRARY_SEARCH_PATH
+  search_pathes.insert(0, QueryQMake('QT_INSTALL_LIBS'))
+  for search_path in search_pathes:
+    abs_path = os.path.join(search_path, path)
+    if os.path.exists(abs_path):
+      return abs_path
+    else: # try harder---look for lib name in library folders
+      newpath = os.path.join(search_path,os.path.basename(path))
+      if os.path.exists(newpath):
+        return newpath
+
+  return ""
+  #raise CouldNotFindFrameworkError(path)
+
+def FixAllLibraries(broken_libs):
+  for framework in broken_libs['frameworks']:
+    FixFramework(framework)
+  for lib in broken_libs['libs']:
+    FixLibrary(lib)
+
+def FixFramework(path):
+  if path in fixed_libraries:
+    return
+  else:
+    fixed_libraries.append(path)
+  abs_path = FindFramework(path)
+  broken_libs = GetBrokenLibraries(abs_path)
+  FixAllLibraries(broken_libs)
+
+  new_path = CopyFramework(abs_path)
+  id = os.sep.join(new_path.split(os.sep)[3:])
+  FixFrameworkId(new_path, id)
+  for framework in broken_libs['frameworks']:
+    FixFrameworkInstallPath(framework, new_path)
+  for library in broken_libs['libs']:
+    FixLibraryInstallPath(library, new_path)
+
+def FixLibrary(path):
+  if path in fixed_libraries or FindSystemLibrary(os.path.basename(path)) is not None:
+    return
+  else:
+    fixed_libraries.append(path)
+  abs_path = FindLibrary(path)
+  if abs_path == "":
+    print "Could not resolve %s, not fixing!" % path
+    return
+  broken_libs = GetBrokenLibraries(abs_path)
+  FixAllLibraries(broken_libs)
+
+  new_path = CopyLibrary(abs_path)
+  FixLibraryId(new_path)
+  for framework in broken_libs['frameworks']:
+    FixFrameworkInstallPath(framework, new_path)
+  for library in broken_libs['libs']:
+    FixLibraryInstallPath(library, new_path)
+
+def FixPlugin(abs_path, subdir):
+  broken_libs = GetBrokenLibraries(abs_path)
+  FixAllLibraries(broken_libs)
+
+  new_path = CopyPlugin(abs_path, subdir)
+  for framework in broken_libs['frameworks']:
+    FixFrameworkInstallPath(framework, new_path)
+  for library in broken_libs['libs']:
+    FixLibraryInstallPath(library, new_path)
+
+def FixBinary(path):
+  broken_libs = GetBrokenLibraries(path)
+  FixAllLibraries(broken_libs)
+  for framework in broken_libs['frameworks']:
+    FixFrameworkInstallPath(framework, path)
+  for library in broken_libs['libs']:
+    FixLibraryInstallPath(library, path)
+
+def CopyLibrary(path):
+  new_path = os.path.join(binary_dir, os.path.basename(path))
+  args = ['ditto', '--arch=x86_64', path, new_path]
+  commands.append(args)
+  args = ['chmod', 'u+w', new_path]
+  commands.append(args)
+  return new_path
+
+def CopyPlugin(path, subdir):
+  new_path = os.path.join(plugins_dir, subdir, os.path.basename(path))
+  args = ['mkdir', '-p', os.path.dirname(new_path)]
+  commands.append(args)
+  args = ['ditto', '--arch=x86_64', path, new_path]
+  commands.append(args)
+  args = ['chmod', 'u+w', new_path]
+  commands.append(args)
+  return new_path
+
+def CopyFramework(path):
+  parts = path.split(os.sep)
+  print "CopyFramework:", path
+  for i, part in enumerate(parts):
+    matchObj = re.match(r'(\w+\.framework)', part)
+    if matchObj:
+      full_path = os.path.join(frameworks_dir, *parts[i:-1])
+      framework = matchObj.group(1)
+      break
+  args = ['mkdir', '-p', full_path]
+  commands.append(args)
+  args = ['ditto', '--arch=x86_64', path, full_path]
+  commands.append(args)
+  args = ['chmod', 'u+w', os.path.join(full_path, parts[-1])]
+  commands.append(args)
+  resources_dir = os.path.join(frameworks_dir, framework, "Resources")
+
+  args = ['mkdir', resources_dir]
+  commands.append(args)
+  args = ['chmod', 'u+w', resources_dir]
+  commands.append(args)
+
+  info_plist = os.path.join(os.path.split(path)[0], '..', '..', 'Contents', 'Info.plist')
+  if not os.path.exists(info_plist):
+    info_plist = os.path.join(os.path.split(path)[0], 'Resources', 'Info.plist')
+  if os.path.exists(info_plist):
+    args = ['cp', '-r', info_plist, resources_dir]
+    commands.append(args)
+  return os.path.join(full_path, parts[-1])
+
+def FixId(path, library_name):
+  id = '@executable_path/../Frameworks/%s' % library_name
+  args = ['install_name_tool', '-id', id, path]
+  commands.append(args)
+
+def FixLibraryId(path):
+  library_name = os.path.basename(path)
+  FixId(path, library_name)
+
+def FixFrameworkId(path, id):
+  FixId(path, id)
+
+def FixInstallPath(library_path, library, new_path):
+  args = ['install_name_tool', '-change', library_path, new_path, library]
+  commands.append(args)
+
+def FindSystemLibrary(library_name):
+  for path in ['/lib', '/usr/lib']:
+    full_path = os.path.join(path, library_name)
+    if os.path.exists(full_path):
+      return full_path
+  return None
+
+def FixLibraryInstallPath(library_path, library):
+  system_library = FindSystemLibrary(os.path.basename(library_path))
+  if system_library is None:
+    new_path = '@executable_path/../MacOS/%s' % os.path.basename(library_path)
+    FixInstallPath(library_path, library, new_path)
+  else:
+    FixInstallPath(library_path, library, system_library)
+
+def FixFrameworkInstallPath(library_path, library):
+  parts = library_path.split(os.sep)
+  for i, part in enumerate(parts):
+    if re.match(r'\w+\.framework', part):
+      full_path = os.path.join(*parts[i:])
+      break
+  new_path = '@executable_path/../Frameworks/%s' % full_path
+  FixInstallPath(library_path, library, new_path)
+
+def FindQtPlugin(name):
+  search_path = QT_PLUGINS_SEARCH_PATH
+  search_path.insert(0, QueryQMake('QT_INSTALL_PLUGINS'))
+  for path in search_path:
+    if os.path.exists(path):
+      if os.path.exists(os.path.join(path, name)):
+        return os.path.join(path, name)
+  raise CouldNotFindQtPluginError(name)
+
+for binary in binaries:
+  FixBinary(binary)
+
+for plugin in QT_PLUGINS:
+  FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
+
+if len(sys.argv) <= 2:
+  print 'Will run %d commands:' % len(commands)
+  for command in commands:
+    print ' '.join(command)
+
+for command in commands:
+  p = subprocess.Popen(command)
+  os.waitpid(p.pid, 0)
+
+WriteQtConf()

admin/osx/macosx.pkgproj

@@ -22,7 +22,7 @@
 									<key>GID</key>
 									<integer>80</integer>
 									<key>PATH</key>
-									<string>@APPLICATION_NAME@.app</string>
+									<string>@APPLICATION_EXECUTABLE@.app</string>
 									<key>PATH_TYPE</key>
 									<integer>3</integer>
 									<key>PERMISSIONS</key>
@@ -497,7 +497,7 @@
 				<key>IDENTIFIER</key>
 				<string>@APPLICATION_REV_DOMAIN_INSTALLER@</string>
 				<key>NAME</key>
-				<string>@APPLICATION_NAME_XML_ESCAPED@</string>
+				<string>@APPLICATION_NAME@</string>
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
@@ -506,6 +506,536 @@
 			<key>UUID</key>
 			<string>7D7219B7-1897-48C3-8533-842BDEC46F71</string>
 		</dict>
+		<dict>
+			<key>PACKAGE_FILES</key>
+			<dict>
+				<key>DEFAULT_INSTALL_LOCATION</key>
+				<string>/</string>
+				<key>HIERARCHY</key>
+				<dict>
+					<key>CHILDREN</key>
+					<array>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Utilities</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Applications</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>509</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Application Support</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Documentation</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Filesystems</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Frameworks</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Input Methods</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Internet Plug-Ins</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchAgents</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchDaemons</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PreferencePanes</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Preferences</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Printers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PrivilegedHelperTools</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickLook</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickTime</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Screen Savers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array>
+										<dict>
+											<key>CHILDREN</key>
+											<array>
+												<dict>
+													<key>CHILDREN</key>
+													<array/>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>Library/ScriptingAdditions/SyncStateFinder.osax/Contents</string>
+													<key>PATH_TYPE</key>
+													<integer>3</integer>
+													<key>PERMISSIONS</key>
+													<integer>493</integer>
+													<key>TYPE</key>
+													<integer>3</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+											</array>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>PATH</key>
+											<string>SyncStateFinder.osax</string>
+											<key>PATH_TYPE</key>
+											<integer>0</integer>
+											<key>PERMISSIONS</key>
+											<integer>493</integer>
+											<key>TYPE</key>
+											<integer>2</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+									</array>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>ScriptingAdditions</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>2</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Scripts</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Services</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Widgets</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>Library</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array>
+										<dict>
+											<key>CHILDREN</key>
+											<array/>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>PATH</key>
+											<string>Extensions</string>
+											<key>PATH_TYPE</key>
+											<integer>0</integer>
+											<key>PERMISSIONS</key>
+											<integer>493</integer>
+											<key>TYPE</key>
+											<integer>1</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+									</array>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Library</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>System</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Shared</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>1023</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Users</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>GID</key>
+					<integer>0</integer>
+					<key>PATH</key>
+					<string>/</string>
+					<key>PATH_TYPE</key>
+					<integer>0</integer>
+					<key>PERMISSIONS</key>
+					<integer>493</integer>
+					<key>TYPE</key>
+					<integer>1</integer>
+					<key>UID</key>
+					<integer>0</integer>
+				</dict>
+				<key>PAYLOAD_TYPE</key>
+				<integer>0</integer>
+				<key>VERSION</key>
+				<integer>2</integer>
+			</dict>
+			<key>PACKAGE_SCRIPTS</key>
+			<dict>
+				<key>POSTINSTALL_PATH</key>
+				<dict/>
+				<key>PREINSTALL_PATH</key>
+				<dict/>
+				<key>RESOURCES</key>
+				<array/>
+			</dict>
+			<key>PACKAGE_SETTINGS</key>
+			<dict>
+				<key>AUTHENTICATION</key>
+				<integer>1</integer>
+				<key>CONCLUSION_ACTION</key>
+				<integer>0</integer>
+				<key>IDENTIFIER</key>
+				<string>com.ownCloud.finderPlugin</string>
+				<key>LOCATION</key>
+				<integer>0</integer>
+				<key>NAME</key>
+				<string>Legacy Finder Plugin (OS X 10.9 or older)</string>
+				<key>OVERWRITE_PERMISSIONS</key>
+				<false/>
+				<key>VERSION</key>
+				<string>@MIRALL_VERSION_FULL@</string>
+			</dict>
+			<key>TYPE</key>
+			<integer>0</integer>
+			<key>UUID</key>
+			<string>39F61FCD-6EAA-4F3A-81C6-25E3F667DFB5</string>
+		</dict>
 	</array>
 	<key>PROJECT</key>
 	<dict>
@@ -573,15 +1103,34 @@
 								<key>UUID</key>
 								<string>9647ADC0-BD53-4D7D-A561-73D383AACDE1</string>
 							</dict>
+							<dict>
+								<key>DESCRIPTION</key>
+								<array/>
+								<key>OPTIONS</key>
+								<dict>
+									<key>HIDDEN</key>
+									<false/>
+									<key>STATE</key>
+									<integer>1</integer>
+								</dict>
+								<key>PACKAGE_UUID</key>
+								<string>39F61FCD-6EAA-4F3A-81C6-25E3F667DFB5</string>
+								<key>TITLE</key>
+								<array/>
+								<key>TOOLTIP</key>
+								<array/>
+								<key>TYPE</key>
+								<integer>0</integer>
+								<key>UUID</key>
+								<string>1D2C47E0-5FD3-4623-B934-1347C66782D0</string>
+							</dict>
 						</array>
 						<key>REMOVED</key>
 						<dict/>
 					</dict>
 				</dict>
 				<key>INSTALLATION TYPE</key>
-                                <integer>1</integer>
-                                <key>MODE</key>
-                                <integer>1</integer>
+				<integer>0</integer>
 			</dict>
 			<key>INSTALLATION_STEPS</key>
 			<array>
@@ -674,7 +1223,7 @@
 						<key>LANGUAGE</key>
 						<string>English</string>
 						<key>VALUE</key>
-						<string>@APPLICATION_NAME_XML_ESCAPED@ Client</string>
+						<string>@APPLICATION_NAME@ Client</string>
 					</dict>
 				</array>
 			</dict>
@@ -701,7 +1250,7 @@
 			<key>BUILD_PATH</key>
 			<dict>
 				<key>PATH</key>
-                                <string>@CMAKE_INSTALL_PREFIX@/.</string>
+				<string>../install/.</string>
 				<key>PATH_TYPE</key>
 				<integer>3</integer>
 			</dict>
@@ -874,7 +1423,7 @@
 				</dict>
 			</array>
 			<key>NAME</key>
-			<string>@APPLICATION_NAME_XML_ESCAPED@ Installer</string>
+			<string>@APPLICATION_NAME@ Installer</string>
 			<key>REFERENCE_FOLDER_PATH</key>
 			<string>@CMAKE_INSTALL_DIR@</string>
 		</dict>