KeychainChunk: Fix error handling in ReadJob::slotReadJobDone

Signed-off-by: Michael Schuster <michael@schuster.ms>

.clang-tidy

@@ -1,22 +0,0 @@
-Checks: '-*,
-    cppcoreguidelines-init-variables,
-    modernize-make-*,
-    modernize-redundant-void-arg,
-    modernize-replace-*,
-    modernize-return-braced-init-list,
-    modernize-shrink-to-fit,
-    modernize-use-auto,
-    modernize-use-bool-literals,
-    modernize-use-default-member-init,
-    modernize-use-emplace,
-    modernize-use-noexcept,
-    modernize-use-transparent-functors,
-    modernize-use-uncaught-exceptions,
-'
-WarningsAsErrors: '*'
-HeaderFilterRegex: '.*'
-AnalyzeTemporaryDtors: false
-FormatStyle:     none
-CheckOptions:
-  - key: modernize-use-default-member-init.UseAssignment
-    value: 1

.drone.yml

@@ -1,42 +1,281 @@
 kind: pipeline
+name: qt-5.7
+
+steps:
+- name: build and test
+  image: nextcloudci/client-5.7:client-5.7-4
+  commands:
+    # Install QtKeyChain
+    - /bin/bash -c "
+      source /opt/qt57/bin/qt57-env.sh &&
+      cd /tmp &&
+      git clone https://github.com/frankosterfeld/qtkeychain.git &&
+      cd qtkeychain &&
+      git checkout v0.9.1 &&
+      mkdir build &&
+      cd build &&
+      cmake ../ &&
+      make &&
+      make install"
+    # Build client
+    - /bin/bash -c "
+      source /opt/qt57/bin/qt57-env.sh &&
+      mkdir build &&
+      cd build &&
+      cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1  ../ &&
+      make &&
+      useradd -m -s /bin/bash test &&
+      chown -R test:test . &&
+      su -c 'ctest --output-on-failure' test"
+trigger:
+  branch:
+    - master
+  event:
+    - pull_request
+    - push
+
+---
+kind: pipeline
+name: qt-5.8
+
+steps:
+- name: build and test
+  image: nextcloudci/client-5.8:client-5.8-4
+  commands:
+    # Install QtKeyChain
+    - /bin/bash -c "
+      source /opt/qt58/bin/qt58-env.sh &&
+      cd /tmp &&
+      git clone https://github.com/frankosterfeld/qtkeychain.git &&
+      cd qtkeychain &&
+      git checkout v0.9.1 &&
+      mkdir build &&
+      cd build &&
+      cmake ../ &&
+      make &&
+      make install"
+    # Build client
+    - /bin/bash -c "
+      source /opt/qt58/bin/qt58-env.sh &&
+      mkdir build &&
+      cd build &&
+      cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1  ../ &&
+      make &&
+      useradd -m -s /bin/bash test &&
+      chown -R test:test . &&
+      su -c 'ctest --output-on-failure' test"
+trigger:
+  branch:
+    - master
+  event:
+    - pull_request
+    - push
+
+---
+kind: pipeline
+name: qt-5.9
+
+steps:
+- name: build and test
+  image: nextcloudci/client-5.9:client-5.9-5
+  commands:
+    # Install QtKeyChain
+    - /bin/bash -c "
+      source /opt/qt59/bin/qt59-env.sh &&
+      cd /tmp &&
+      git clone https://github.com/frankosterfeld/qtkeychain.git &&
+      cd qtkeychain &&
+      git checkout v0.9.1 &&
+      mkdir build &&
+      cd build &&
+      cmake ../ &&
+      make &&
+      make install"
+    # Build client
+    - /bin/bash -c "
+      source /opt/qt59/bin/qt59-env.sh &&
+      mkdir build &&
+      cd build &&
+      cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1  ../ &&
+      make &&
+      useradd -m -s /bin/bash test &&
+      chown -R test:test . &&
+      su -c 'ctest --output-on-failure' test"
+trigger:
+  branch:
+    - master
+  event:
+    - pull_request
+    - push
+
+---
+kind: pipeline
+name: qt-5.10
+
+steps:
+- name: build and test
+  image: nextcloudci/client-5.10:client-5.10-3
+  commands:
+    # Install QtKeyChain
+    - /bin/bash -c "
+      export CC=gcc-7 &&
+      export CXX=g++-7 &&
+      source /opt/qt510/bin/qt510-env.sh &&
+      cd /tmp &&
+      git clone https://github.com/frankosterfeld/qtkeychain.git &&
+      cd qtkeychain &&
+      git checkout v0.9.1 &&
+      mkdir build &&
+      cd build &&
+      cmake ../ &&
+      make &&
+      make install"
+    # Build client
+    - /bin/bash -c "
+      export CC=gcc-7 &&
+      export CXX=g++-7 &&
+      source /opt/qt510/bin/qt510-env.sh &&
+      mkdir build &&
+      cd build &&
+      cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
+      make &&
+      useradd -m -s /bin/bash test &&
+      chown -R test:test . &&
+      su -c 'ctest --output-on-failure' test"
+trigger:
+  branch:
+    - master
+  event:
+    - pull_request
+    - push
+
+---
+kind: pipeline
+name: qt-5.11
+
+steps:
+- name: build and test
+  image: nextcloudci/client-5.11:client-5.11-3
+  commands:
+    # Install QtKeyChain
+    - /bin/bash -c "
+      export CC=gcc-7 &&
+      export CXX=g++-7 &&
+      source /opt/qt511/bin/qt511-env.sh &&
+      cd /tmp &&
+      git clone https://github.com/frankosterfeld/qtkeychain.git &&
+      cd qtkeychain &&
+      git checkout v0.9.1 &&
+      mkdir build &&
+      cd build &&
+      cmake ../ &&
+      make &&
+      make install"
+    # Build client
+    - /bin/bash -c "
+      export CC=gcc-7 &&
+      export CXX=g++-7 &&
+      source /opt/qt511/bin/qt511-env.sh &&
+      mkdir build &&
+      cd build &&
+      cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
+      make &&
+      useradd -m -s /bin/bash test &&
+      chown -R test:test . &&
+      su -c 'ctest --output-on-failure' test"
+trigger:
+  branch:
+    - master
+  event:
+    - pull_request
+    - push
+
+---
+kind: pipeline
+name: qt-5.11-clang
+
+steps:
+- name: build and test
+  image: nextcloudci/client-5.11:client-5.11-3
+  commands:
+    # Install QtKeyChain
+    - /bin/bash -c "
+      export CC=clang-6.0 &&
+      export CXX=clang++-6.0 &&
+      source /opt/qt511/bin/qt511-env.sh &&
+      cd /tmp &&
+      git clone https://github.com/frankosterfeld/qtkeychain.git &&
+      cd qtkeychain &&
+      git checkout v0.9.1 &&
+      mkdir build &&
+      cd build &&
+      cmake ../ &&
+      make &&
+      make install"
+    # Build client
+    - /bin/bash -c "
+      export CC=clang-6.0 &&
+      export CXX=clang++-6.0 &&
+      source /opt/qt511/bin/qt511-env.sh &&
+      mkdir build &&
+      cd build &&
+      cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
+      make &&
+      useradd -m -s /bin/bash test &&
+      chown -R test:test . &&
+      su -c 'ctest --output-on-failure' test"
+trigger:
+  branch:
+    - master
+  event:
+    - pull_request
+    - push
+
+---
+kind: pipeline
 name: qt-5.12
 
 steps:
-- name: cmake
-  image: nextcloudci/client-5.12:client-5.12-11
-  volumes:
-    - name: build
-      path: /drone/build
+- name: build and test
+  image: nextcloudci/client-5.12:client-5.12-5
   commands:
-    - cd /drone/build
-    - cmake -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1 -DBUILD_UPDATER=ON -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../src
-- name: compile
-  image: nextcloudci/client-5.12:client-5.12-11
-  volumes:
-    - name: build
-      path: /drone/build
-  commands:
-    - cd /drone/build
-    - make -j$(nproc)
-- name: test
-  image: nextcloudci/client-5.12:client-5.12-11
-  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: {}
-
+    # Install QtKeyChain
+    - /bin/bash -c "
+      export CC=gcc-7 &&
+      export CXX=g++-7 &&
+      export QT_BASE_DIR=/opt/qt5.12.5 &&
+      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:/usr/local/lib:\$LD_LIBRARY_PATH &&
+      export PKG_CONFIG_PATH=\$QT_BASE_DIR/lib/pkgconfig:\$PKG_CONFIG_PATH &&
+      cd /tmp &&
+      git clone https://github.com/frankosterfeld/qtkeychain.git &&
+      cd qtkeychain &&
+      git checkout v0.9.1 &&
+      mkdir build &&
+      cd build &&
+      cmake ../ &&
+      make &&
+      make install"
+    # Build client
+    - /bin/bash -c "
+      export CC=gcc-7 &&
+      export CXX=g++-7 &&
+      export QT_BASE_DIR=/opt/qt5.12.5 &&
+      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:/usr/local/lib:\$LD_LIBRARY_PATH &&
+      export PKG_CONFIG_PATH=\$QT_BASE_DIR/lib/pkgconfig:\$PKG_CONFIG_PATH &&
+      mkdir build &&
+      cd build &&
+      cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
+      make &&
+      useradd -m -s /bin/bash test &&
+      chown -R test:test . &&
+      su -c 'ctest --output-on-failure' test"
 trigger:
   branch:
     - master
-    - stable-*
   event:
     - pull_request
     - push
@@ -46,48 +285,46 @@ kind: pipeline
 name: qt-5.12-clang
 
 steps:
-- name: cmake
-  image: nextcloudci/client-5.12:client-5.12-11
-  volumes:
-    - name: build
-      path: /drone/build
+- name: build and test
+  image: nextcloudci/client-5.12:client-5.12-5
   commands:
-    - cd /drone/build
-    - cmake -GNinja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON DCMAKE_C_COMPILER=clang-10 -DCMAKE_CXX_COMPILER=clang++-10 -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1 -DBUILD_UPDATER=ON -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../src
-- name: compile
-  image: nextcloudci/client-5.12:client-5.12-11
-  volumes:
-    - name: build
-      path: /drone/build
-  commands:
-    - cd /drone/build
-    - ninja
-- name: test
-  image: nextcloudci/client-5.12:client-5.12-11
-  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: nextcloudci/client-5.12:client-5.12-11
-  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: {}
-
+    # Install QtKeyChain
+    - /bin/bash -c "
+      export CC=clang-6.0 &&
+      export CXX=clang++-6.0 &&
+      export QT_BASE_DIR=/opt/qt5.12.5 &&
+      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:/usr/local/lib:\$LD_LIBRARY_PATH &&
+      export PKG_CONFIG_PATH=\$QT_BASE_DIR/lib/pkgconfig:\$PKG_CONFIG_PATH &&
+      cd /tmp &&
+      git clone https://github.com/frankosterfeld/qtkeychain.git &&
+      cd qtkeychain &&
+      git checkout v0.9.1 &&
+      mkdir build &&
+      cd build &&
+      cmake ../ &&
+      make &&
+      make install"
+    # Build client
+    - /bin/bash -c "
+      export CC=clang-6.0 &&
+      export CXX=clang++-6.0 &&
+      export QT_BASE_DIR=/opt/qt5.12.5 &&
+      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:/usr/local/lib:\$LD_LIBRARY_PATH &&
+      export PKG_CONFIG_PATH=\$QT_BASE_DIR/lib/pkgconfig:\$PKG_CONFIG_PATH &&
+      mkdir build &&
+      cd build &&
+      cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 ../ &&
+      make &&
+      useradd -m -s /bin/bash test &&
+      chown -R test:test . &&
+      su -c 'ctest --output-on-failure' test"
 trigger:
   branch:
     - master
-    - stable-*
   event:
     - pull_request
     - push
@@ -98,19 +335,13 @@ name: AppImage
 
 steps:
 - name: build
-  image: nextcloudci/client-5.12:client-5.12-9
-  environment:
-    CI_UPLOAD_GIT_TOKEN:
-      from_secret: CI_UPLOAD_GIT_TOKEN
-    CI_UPLOAD_GIT_USERNAME:
-      from_secret: CI_UPLOAD_GIT_USERNAME
+  image: nextcloudci/client-5.12:client-5.12-5
   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."
+    - /bin/bash -c "./admin/linux/upload-appimage.sh"
 trigger:
   branch:
     - master
-    - stable-*
   event:
     - pull_request
     - push
@@ -130,10 +361,9 @@ steps:
       from_secret: DEBIAN_SECRET_IV
 trigger:
   branch:
-    - master
+    - stable-2.6
   event:
-    - pull_request
-    - push
+    - tag
 ---
 kind: pipeline
 name: Documentation

.github/FUNDING.yml

@@ -1,3 +0,0 @@
-
-# You can add one username per supported platform and one custom link
-custom: https://www.bountysource.com/teams/nextcloud/issues?tracker_ids=74294474

.github/stale.yml

@@ -1,67 +0,0 @@
-
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 28
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 14
-# Issues with these labels will never be considered stale
-exemptLabels:
-    - 1. to develop
-    - 2. to review
-    - 3. to release
-    - 4. to test
-    - accessibility
-    - backport-request
-    - bug
-    - design
-    - enhancement
-    - epic
-    - discussion
-    - documentation
-    - overview
-    - good first issue
-    - feature-request
-    - feature: :arrows_counterclockwise: sync engine
-    - feature: :busts_in_silhouette: sharing
-    - feature: :cloud: system tray
-    - feature: :gear: settings
-    - feature: :inbox_tray: install and update
-    - feature: :key: authentication
-    - feature: :lock: end to end encryption
-    - feature: :memo: versions
-    - feature: :minidisc: external storage
-    - feature: :minidisc: virtual drive
-    - feature: :new: versions
-    - feature: :tongue: language l10n and translations
-    - feature: :wheelchair: accessibility
-    - feature: :white_square_button: nextcloudcmd
-    - feature: :zap: activity and :bell: notification
-    - good first issue
-    - help wanted
-    - high
-    - integration
-    - low
-    - medium
-    - needs info
-    - os: :apple: macOS
-    - os: :door: Windows
-    - os: :penguin: Linux
-    - os: :smiling_imp: FreeBSD
-    - overview
-    - package: appimage
-    - package: debian
-    - package: snap
-    - papercut
-    - regression
-    - security
-    - server
-    - spec
-    - technical debt
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-    This request 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!
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

.github/workflows/rebase.yml

@@ -1,18 +0,0 @@
-on:
-  issue_comment:
-    types: [created]
-name: Automatic Rebase
-jobs:
-  rebase:
-    name: Rebase
-    if: github.event.issue.pull_request != '' && contains(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.3.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitmodules

@@ -1,3 +1,6 @@
+[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

.tx/nextcloud.client-desktop/bg_translation

@@ -199,6 +199,6 @@ X-GNOME-Autostart-Delay=3
 
 # Translations
 Icon[bg_BG]=@APPLICATION_ICON_NAME@
-Name[bg_BG]=@APPLICATION_NAME@ десктоп клиент за синхронизиране
-Comment[bg_BG]=@APPLICATION_NAME@ десктоп клиент за синхронизиране 
+Name[bg_BG]=@APPLICATION_NAME@ клиент за синхронизиране на десктоп
+Comment[bg_BG]=@APPLICATION_NAME@ клиент за синхронизиране на десктоп
 GenericName[bg_BG]=Синхронизиране на папка

.tx/nextcloud.client-desktop/br_translation

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

.tx/nextcloud.client-desktop/ca_translation

@@ -199,6 +199,6 @@ X-GNOME-Autostart-Delay=3
 
 # Translations
 Icon[ca]=@APPLICATION_ICON_NAME@
-Name[ca]=Client de sincronització d'escriptori del @APPLICATION_NAME@ 
-Comment[ca]=Client de sincronització d'escriptori del @APPLICATION_NAME@
-GenericName[ca]=Sincronització de carpetes
+Name[ca]=@APPLICATION_NAME@ client de sincronització d'escriptori
+Comment[ca]=@APPLICATION_NAME@ client de sincronització d'escriptori
+GenericName[ca]=Directori de sincronització

.tx/nextcloud.client-desktop/cs_translation

@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Icon[cs_CZ]=@APPLICATION_ICON_NAME@
+Icon[cs_CZ]=@NAZEV_IKONY_APLIKACE@
 Name[cs_CZ]=@APPLICATION_NAME@ synchronizační klient pro desktop
 Comment[cs_CZ]=@APPLICATION_NAME@ synchronizační klient pro desktop
 GenericName[cs_CZ]=Synchronizace složek

.tx/nextcloud.client-desktop/de_translation

@@ -199,6 +199,6 @@ X-GNOME-Autostart-Delay=3
 
 # Translations
 Icon[de]=@APPLICATION_ICON_NAME@
-Name[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung
-Comment[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung
-GenericName[de]=Synchronisierungsordner
+Name[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
+Comment[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
+GenericName[de]=Synchronisationsordner

.tx/nextcloud.client-desktop/es_AR_translation

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

.tx/nextcloud.client-desktop/et_translation

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

.tx/nextcloud.client-desktop/fa_translation

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

.tx/nextcloud.client-desktop/fi_translation

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

.tx/nextcloud.client-desktop/oc_translation

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

.tx/nextcloud.client-desktop/sv_translation

@@ -199,6 +199,4 @@ X-GNOME-Autostart-Delay=3
 
 # Translations
 Icon[sv]=@APPLICATION_ICON_NAME@
-Name[sv]=@APPLICATION_NAME@ desktopssynkklient 
-Comment[sv]=@APPLICATION_NAME@ desktopssynkroniseringsklient
 GenericName[sv]=Mappsynkronisering

.tx/nextcloud.client-desktop/uk_translation

@@ -201,4 +201,4 @@ X-GNOME-Autostart-Delay=3
 Icon[uk]=@APPLICATION_ICON_NAME@
 Name[uk]=@APPLICATION_NAME@ клієнт для ПК
 Comment[uk]=Клієнт синхронізації @APPLICATION_NAME@ для ПК
-GenericName[uk]=Синхронізація тек
+GenericName[uk]=Синхронізація каталогів

.tx/nextcloud.client-desktop/zh_TW_translation

@@ -198,7 +198,6 @@ X-GNOME-Autostart-Delay=3
 
 
 # Translations
-Icon[zh_TW]=@APPLICATION_ICON_NAME@
 Name[zh_TW]=@APPLICATION_NAME@ 桌面同步客戶端
 Comment[zh_TW]=@APPLICATION_NAME@ 桌面同步客戶端
 GenericName[zh_TW]=資料夾同步

CMakeLists.txt

@@ -123,15 +123,6 @@ 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)
 
@@ -181,9 +172,9 @@ if(APPLE)
 endif()
 
 if(BUILD_CLIENT)
-    if(APPLE AND BUILD_UPDATER)
+    if(APPLE)
         find_package(Sparkle)
-    endif()
+    endif(APPLE)
 
     if(UNIX)
         find_package(INotify REQUIRED)
@@ -228,8 +219,6 @@ if (APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
 endif()
 
-include(SanitizerFlags)
-
 # Handle Translations, pick all client_* files from trans directory.
 file( GLOB TRANS_FILES ${CMAKE_SOURCE_DIR}/translations/client_*.ts)
 set(TRANSLATIONS ${TRANS_FILES})

ChangeLog

@@ -1,127 +1,3 @@
-ChangeLog
-====================
-For details check https://nextcloud.com/blog/category/release.
-
-2.6 Series ChangeLog
-====================
-
-version 2.6.4 (release 2020-03-04)
-* Fix Explorer pinning: Add fallbacks for Shell commands (fixes #1599)
-* WebFlowCredentials: Make username comparison case-insensitive (fix #1741)
-* ActivityListModel: Show full date and time as a Tooltip only
-* Disable HTTP/2 for now due to Qt bug, allow enabling it via env var
-* Fix Explorer integration re-save and hide option on non-Windows
-* l10n: Changes to improve source strings
-* Updater: Add query-parameter 'updatesegment' to the update check
-* Allow Desktop translation merging and custom backport branches
-
-version 2.6.3 (release 2020-02-17)
-* Add UserInfo class and fetch quota via API instead of PropfindJob
-* l10n: Changed grammar and triple dots to ellipsis
-* l10n: Changed spelling of "user name" to "username"
-* Start the client in background if activated by D-Bus
-* Do not install files related to cloud providers under Xenial
-* Make sure that the libcloudprovider integration is using a valid D-Bus path
-* Changed product name to Nextcloud
-* Update autoupdate.rst
-* Use system proxy by default if no config file is present
-* Install libcloudproviders files by default on debian
-* Windows 7 is out of support
-* BugFix: Handle broken shared file error gracefully
-* Fix Explorer integration on Windows and the crash on other systems
-* Welcome to 2020
-* Updated year in legalnotice.cpp
-* apply http2 qt resend patch from owncloud
-
-version 2.6.2 (release 2019-12-24)
-* Revert DEFAULT_REMOTE_POLL_INTERVAL back from 5 seconds to 30 seconds
-* Use user-provided username in displayName() - Fix #836
-* Fix typo
-* Build with libcloudproviders on debian and in the AppImage
-* Fix tests for Windows platform
-* Merge the list of ignored files/symlinks into one Activity notification.
-* Fix clang's variadic macro warnings
-* Add libdbus-1-dev to the build dependencies
-* Compare QDateTime objects more efficient
-* Improve the translation of "Share via …"
-* Upgrade for Qt 5.12.5 in docker-ci
-* Bump Qt 5.12.5 image
-* Add timestamp to Mac installer code signing
-* MacOS build: Avoid the Get-Task-Allow Entitlement (Notarization)
-* Build for Debian stable and oldstable
-* Happy new year
-* Fall back to old login flow on GS as this is not yet ready
-* [stable-2.6] macOS build: Avoid the Get-Task-Allow Entitlement (Notarization)
-* Fix remote wipe keychain storage (issue #1592)
-* Fix copyright year in MacOSXBundleInfo.plist.in for 2019
-* Fix macOS GUI (Qt 5.12)
-* Windows: Workaround for storing >= 4k (4096 bit) client-cert SSL keys
-* Fix Activity List: Add check to avoid first empty entry
-* Fix macOS GUI (Qt 5.12) No. 2 (continuation of #1651)
-* Show date and time in activity log (fixes issue #1683)
-* Login Flow v2 enhancements
-* Activity List: Fix crash and folder opening
-* Fix issue #1237: White text on almost-white background
-* Heavy refactoring: Windows workaround for >= 4k (4096 bit) client-cert SSL keys and large certs
-* Fix date in ActivityWidget and remove unnecessary string conversion
-
-version 2.6.1 (release 2019-11-04)
-* Changed max GUI bandwidth limits
-* Add sync date next to "Synchronized with local folder"
-* Slideshow buttons
-* Fix qt warning about registering a URL sheme first.
-* Issue #1216: added sync-exclude entry for emacs recovery files
-* Race condition in the remote size loading logic
-* Review of msvc/gcc warnings -> code cleanup, prevention of implicit casts, variadic macros
-* Fix double slashes
-* Fixing E2E CSR transmission failure for new connections
-* Fixed missing 'translatable' exclusions, added missing window titles
-* Checks if exclude file is empty before creating the regular expressions.
-* Add server info to menu
-* Fixed grammar
-* Prevent jumping of tray menu
-* Don't run connection wizard when quitting the application
-* Avoiding copying in range-based loops
-* Add a 'Content-Length: 0' header to initial POST requests
-* Remote wipe.
-* Pick from upstream: Update qtmacgoodies for an OSX crash fix #6930
-* fix for issue no. #1351
-* Merge the list of ignored files/symlinks into one Activity notification.
-* Update submodules for Qt 5.12.5 (qtmacgoodies)
-* Fix duplicate items in Apps menu (a bug introduced in #1477)
-* Fix #1182
-* Fix remote wipe when a proxy is configured.
-* Fix updater message: Download link instead of "use the system's update
-
-version 2.6.0 Login flow v2 (release 2019-09-27)
-* Reinstate Debian build in the new Drone config
-* Typo
-* Marking unused strings as unstranslatable
-* Fixes #607
-* Fixes issue #878
-* Fixes issue #1187
-* Displays FileIgnored activities with an info icon
-* Minor text change in the link to help in the tab 'General'.
-* Update Qt 5.5 compatibility patch for Xenial
-* Remove Ubuntu Cosmic and add Eoan package
-* Add proper CA to client side certificate connection
-* Remove dependency on libgnome-keyring0 on Eoan
-* Read .sync_exclude.lst in each subdirectory
-* Updates ChangeLog.
-* Login flow v2
-* Adds SSL client cert storage to webflow + Login Flow v2
-* Windows: Workaround for CredWriteW used by QtKeychain
-* Integrated registry check on windows when hasDarkSystray is called.
-* Logo update
-* Updated .gitignore to integrate unwanted files when working with VSC …
-* Full-Scaled new logo in Windows 10 start menu tile
-* Qt5.5 compatiblity patch for login flow V2 + UI improvement (Use newer digest algorithms in TLS error dialog)
-* Fix for #1382 "linux client crashes for no discernable reason"
-* UI improvement: Message box: Delete / Keep all files
-* Improve wording of the context menu in the file manager extension.
-* Changes wording in the share context menu.
-* Fix White Window issue on Windows by upgrading to Qt 5.12.5
-
 2.5 Series ChangeLog
 ====================
 

NEXTCLOUD.cmake

@@ -6,14 +6,12 @@ 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_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_SERVER_URL "" CACHE STRING "URL for the server to use. If entered the server can only connect to this instance" )
 
 set( LINUX_PACKAGE_SHORTNAME "nextcloud" )
-set( LINUX_APPLICATION_ID "${APPLICATION_REV_DOMAIN}.${LINUX_PACKAGE_SHORTNAME}")
 
 set( THEME_CLASS            "NextcloudTheme" )
+set( APPLICATION_REV_DOMAIN "com.nextcloud.desktopclient" )
 set( WIN_SETUP_BITMAP_PATH  "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
 
 set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-background.png" CACHE STRING "The MacOSX installer background image")
@@ -25,9 +23,6 @@ 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 )
 
 
@@ -36,25 +31,3 @@ set( APPLICATION_WIZARD_HEADER_BACKGROUND_COLOR "#0082c9" CACHE STRING "Hex colo
 set( APPLICATION_WIZARD_HEADER_TITLE_COLOR "#ffffff" CACHE STRING "Hex color of the text in the wizard header")
 option( APPLICATION_WIZARD_USE_CUSTOM_LOGO "Use the logo from ':/client/theme/colored/wizard_logo.png' else the default application icon is used" ON )
 
-
-#
-## 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()

README.md

@@ -61,14 +61,14 @@ For more info: [Wiki/Daily Builds](https://github.com/nextcloud/desktop/wiki/Dai
 ### :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
+file an issue at https://github.com/nextcloud/client/issues. Do not
 contact the authors directly by mail, as this increases the chance
 of your report being lost. :boom:
 
 ### :smiley: :trophy: Pull requests
 
 - If you created a patch :heart_eyes:, please submit a [Pull
-Request](https://github.com/nextcloud/desktop/pulls).
+Request](https://github.com/nextcloud/client/pulls).
 - How to create a pull request? This guide will help you get started: [Opening a pull request](https://opensource.guide/how-to-contribute/#opening-a-pull-request) :heart:
 
 

VERSION.cmake

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

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/Dockerfile

@@ -0,0 +1,23 @@
+# This DockerFile is used to create the image used for Jenkins, the CI system (see Jenkinsfile)
+# It is not meant to be used to create the production packages.
+
+# Distro with Qt 5.6
+FROM ubuntu:yakkety
+
+RUN apt-get update -q && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends \
+        locales \
+        build-essential \
+        clang \
+        ninja-build \
+        cmake \
+        extra-cmake-modules \
+        libsqlite3-dev \
+        libssl-dev \
+        libcmocka-dev \
+        libcloudproviders-dev \
+        qt5-default \
+        qttools5-dev-tools \
+        libqt5webkit5-dev \
+        qt5keychain-dev \
+        kio-dev \
+    && apt-get clean

admin/linux/build-appimage.sh

@@ -6,26 +6,23 @@ mkdir /app
 mkdir /build
 
 #Set Qt-5.12
-export QT_BASE_DIR=/opt/qt5.12.9
+export QT_BASE_DIR=/opt/qt5.12.5
 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 master
+#QtKeyChain 0.9.1
 cd /build
 git clone https://github.com/frankosterfeld/qtkeychain.git
 cd qtkeychain
-git checkout master
+git checkout v0.9.1
 mkdir build
 cd build
 cmake -D CMAKE_INSTALL_PREFIX=/usr ../
@@ -38,7 +35,6 @@ mkdir build-client
 cd build-client
 cmake -D CMAKE_INSTALL_PREFIX=/usr \
     -D NO_SHIBBOLETH=1 \
-    -D BUILD_UPDATER=ON \
     -D QTKEYCHAIN_LIBRARY=/app/usr/lib/x86_64-linux-gnu/libqt5keychain.so \
     -D QTKEYCHAIN_INCLUDE_DIR=/app/usr/include/qt5keychain/ \
     -DMIRALL_VERSION_SUFFIX=PR-$DRONE_PULL_REQUEST \
@@ -66,7 +62,7 @@ rm -rf ./usr/share/caja-python/
 rm -rf ./usr/share/nautilus-python/
 rm -rf ./usr/share/nemo-python/
 
-# Move sync exclude to right location
+# Move sync exlucde to right location
 mv ./etc/Nextcloud/sync-exclude.lst ./usr/bin/
 rm -rf ./etc
 
@@ -86,13 +82,13 @@ 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"
+wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
 chmod a+x linuxdeployqt*.AppImage
 ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract
 rm ./linuxdeployqt-continuous-x86_64.AppImage
 unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=/app/usr/lib/
-./squashfs-root/AppRun ${DESKTOP_FILE} -bundle-non-qt-libs -qmldir=$DRONE_WORKSPACE/src/gui
+./squashfs-root/AppRun ${DESKTOP_FILE} -bundle-non-qt-libs
 
 # Set origin
 ./squashfs-root/usr/bin/patchelf --set-rpath '$ORIGIN/' /app/usr/lib/libnextcloudsync.so.0

admin/linux/debian/README

@@ -0,0 +1,31 @@
+- .pbuilderrc:
+
+  COMPONENTS="main restricted universe multiverse"
+
+  OTHERMIRROR="deb [trusted=yes] file:///${HOME}/pbuilder/deps ./"
+  HOOKDIR="${HOME}/pbuilder/hook.d"
+  BINDMOUNTS="${HOME}/pbuilder/deps"
+
+  EXTRAPACKAGES="apt-utils"
+
+- pbuilder/hook.d/D70setupdeps: hook to create a Packages file for the
+  packages in pbuilder/deps
+
+- pbuilder-dist trusty create --override-config --othermirror "deb [trusted=yes] file:///${HOME}/pbuilder/deps ./"
+
+  The OTHERMIRROR setting in .pbuilderrc is overridden by pbuilder-dist!
+
+- scripts:
+
+  config.sh: basic configuration variables
+
+  create_debdir.sh <tag> <version> <distribution>:
+     create the Debian-conformant source directory and .orig.tar.bz2
+     in the build area
+  build.sh <tag> <version> <distribution> <debuild options...>:
+     call create_debdir.sh and then debuild
+  pbuilder.sh <distribution>:
+     build the existing source package with pbuilder-dist.
+  pbuild.sh <distribution>:
+     build the source packages with build.sh and then call
+     pbuilder.sh

admin/linux/debian/debian.bionic/changelog

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

admin/linux/debian/debian.disco/changelog

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

admin/linux/debian/debian.eoan/changelog

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

admin/linux/debian/debian.eoan/control

@@ -0,0 +1,90 @@
+Source: nextcloud-client
+Section: contrib/devel
+Priority: optional
+Maintainer: István Váradi <ivaradi@varadiistvan.hu>
+Build-Depends: cmake,
+               debhelper,
+               cdbs,
+               dh-python,
+               extra-cmake-modules (>= 5.16),
+               libkf5kio-dev,
+               libcmocka-dev,
+               libcloudproviders-dev,
+               libdbus-1-dev,
+               libhttp-dav-perl,
+               libinotify-dev [kfreebsd-any],
+               libqt5svg5-dev,
+               libqt5webkit5-dev,
+               libsqlite3-dev,
+               libssl-dev (>= 1.1.0),
+               zlib1g-dev,
+               optipng,
+               pkg-kde-tools,
+               python-sphinx | python3-sphinx,
+               python3-all,
+               qt5keychain-dev,
+               qtwebengine5-dev,
+               qtdeclarative5-dev,
+               qttools5-dev,
+               qttools5-dev-tools,
+               xvfb
+Standards-Version: 3.9.8
+Homepage: https://github.com/nextcloud/client_theming
+#Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
+#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
+
+Package: nextcloud-client
+Architecture: any
+Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, nextcloud-client-l10n
+Description: Nextcloud desktop sync client
+ Use the desktop client to keep your files synchronized
+ between your Nextcloud server and your desktop. Select
+ one or more directories on your local machine and always
+ have access to your latest files wherever you are.
+
+Package: libnextcloudsync0
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Nextcloud sync library
+ Used by the Nextcloud desktop client as the synchronization engine.
+
+Package: libnextcloudsync-dev
+Architecture: any
+Section: contrib/libdevel
+Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
+Description: Nextcloud sync library development files
+ The headers and development library for the Nextcloud sync library.
+
+Package: nextcloud-client-l10n
+Architecture: all
+Depends: ${misc:Depends}
+Description: Nextcloud client internatialization files
+ The translation files.
+
+Package: nextcloud-client-nautilus
+Architecture: all
+Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
+Description: Nautilus plugin for Nextcloud
+ This package contains a Nautilus plugin to display
+ synchronization status icons for Nextcloud files.
+
+Package: nextcloud-client-nemo
+Architecture: all
+Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo | nemo-python, nemo, ${misc:Depends}
+Description: Nemo plugin for Nextcloud
+ This package contains a Nemo plugin to display
+ synchronization status icons for Nextcloud files.
+
+Package: nextcloud-client-caja
+Architecture: all
+Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
+Description: Caja plugin for Nextcloud
+ This package contains a Caja plugin to display
+ synchronization status icons for Nextcloud files.
+
+Package: nextcloud-client-dolphin
+Architecture: any
+Depends: dolphin (>= 4:15.12.1), libnextcloudsync0 (= ${binary:Version}), nextcloud-client, ${misc:Depends}, ${shlibs:Depends}
+Description: Dolphin plugin for Nextcloud
+ This package contains a Dolphin plugin to display
+ synchronization status icons for Nextcloud files.

admin/linux/debian/debian.oldstable/changelog

@@ -0,0 +1,48 @@
+nextcloud-client (2.3.3-1.0~oldstable1) oldstable; urgency=medium
+
+  * Debian build support for the forked client.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Mon, 6 Nov 2017 20:20:04 +0100
+
+nextcloud-client (2.3.1-1.0) oldstable; urgency=medium
+
+  * New upstream version
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 23 Mar 2017 19:07:36 +0100
+
+nextcloud-client (2.3.0-1.0) oldstable; urgency=medium
+
+  * New upstream version
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 21 Mar 2017 19:34:13 +0100
+
+nextcloud-client (2.2.4-1.4) oldstable; urgency=medium
+
+  * The locale-specific icon names are correct too
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 7 Feb 2017 19:55:40 +0100
+
+nextcloud-client (2.2.4-1.3) oldstable; urgency=medium
+
+  * Caja syncstate plugin is built.
+  * The syncstate plugin has application-specific name
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Fri, 27 Jan 2017 19:34:18 +0100
+
+nextcloud-client (2.2.4-1.2) oldstable; urgency=medium
+
+  * Fixed appname in the Nemo syncstate extension.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 19 Jan 2017 16:46:50 +0100
+
+nextcloud-client (2.2.4-1.1) oldstable; urgency=medium
+
+  * Added Nautilus and Nemo syncstate extensions.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 17 Jan 2017 19:55:32 +0100
+
+nextcloud-client (2.2.4-1.0) oldstable; urgency=medium
+
+  * Initial release.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Wed, 14 Dec 2016 20:07:46 +0100

admin/linux/debian/debian.oldstable/control

@@ -0,0 +1,84 @@
+Source: nextcloud-client
+Section: contrib/devel
+Priority: optional
+Maintainer: István Váradi <ivaradi@varadiistvan.hu>
+Build-Depends: cmake,
+               debhelper,
+               cdbs,
+               dh-python,
+               extra-cmake-modules (>= 5.16),
+               kdelibs5-dev,
+               kio-dev,
+               libcmocka-dev,
+               libdbus-1-dev,
+               libhttp-dav-perl,
+               libinotify-dev [kfreebsd-any],
+               libqt5webkit5-dev,
+               libqt5svg5-dev,
+               libsqlite3-dev,
+               libssl-dev (>= 1.1.0),
+               zlib1g-dev,
+               optipng,
+               pkg-kde-tools,
+               python-sphinx | python3-sphinx,
+               python3-all,
+               qt5keychain-dev,
+               qtwebengine5-dev,
+               qtdeclarative5-dev,
+               qttools5-dev,
+               qttools5-dev-tools,
+               xvfb
+Standards-Version: 3.9.8
+Homepage: https://github.com/nextcloud/client_theming
+#Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
+#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
+
+Package: nextcloud-client
+Architecture: any
+Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, nextcloud-client-l10n
+Recommends: libgnome-keyring0
+Description: Nextcloud desktop sync client
+ Use the desktop client to keep your files synchronized
+ between your Nextcloud server and your desktop. Select
+ one or more directories on your local machine and always
+ have access to your latest files wherever you are.
+
+Package: libnextcloudsync0
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Nextcloud sync library
+ Used by the Nextcloud desktop client as the synchronization engine.
+
+Package: libnextcloudsync-dev
+Architecture: any
+Section: contrib/libdevel
+Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
+Description: Nextcloud sync library development files
+ The headers and development library for the Nextcloud sync library.
+
+Package: nextcloud-client-l10n
+Architecture: all
+Depends: ${misc:Depends}
+Description: Nextcloud client internatialization files
+ The translation files.
+
+Package: nextcloud-client-nautilus
+Architecture: all
+Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
+Description: Nautilus plugin for Nextcloud
+ This package contains a Nautilus plugin to display
+ synchronization status icons for Nextcloud files.
+
+Package: nextcloud-client-nemo
+Architecture: all
+Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo, nemo, ${misc:Depends}
+Description: Nemo plugin for Nextcloud
+ This package contains a Nemo plugin to display
+ synchronization status icons for Nextcloud files.
+
+Package: nextcloud-client-caja
+Architecture: all
+Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
+Description: Caja plugin for Nextcloud
+ This package contains a Caja plugin to display
+ synchronization status icons for Nextcloud files.

admin/linux/debian/debian.stable/changelog

@@ -0,0 +1,48 @@
+nextcloud-client (2.3.3-1.0~stable1) stable; urgency=medium
+
+  * Debian build support for the forked client.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Mon, 6 Nov 2017 20:20:04 +0100
+
+nextcloud-client (2.3.1-1.0) stable; urgency=medium
+
+  * New upstream version
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 23 Mar 2017 19:07:36 +0100
+
+nextcloud-client (2.3.0-1.0) stable; urgency=medium
+
+  * New upstream version
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 21 Mar 2017 19:34:13 +0100
+
+nextcloud-client (2.2.4-1.4) stable; urgency=medium
+
+  * The locale-specific icon names are correct too
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 7 Feb 2017 19:55:40 +0100
+
+nextcloud-client (2.2.4-1.3) stable; urgency=medium
+
+  * Caja syncstate plugin is built.
+  * The syncstate plugin has application-specific name
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Fri, 27 Jan 2017 19:34:18 +0100
+
+nextcloud-client (2.2.4-1.2) stable; urgency=medium
+
+  * Fixed appname in the Nemo syncstate extension.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 19 Jan 2017 16:46:50 +0100
+
+nextcloud-client (2.2.4-1.1) stable; urgency=medium
+
+  * Added Nautilus and Nemo syncstate extensions.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 17 Jan 2017 19:55:32 +0100
+
+nextcloud-client (2.2.4-1.0) stable; urgency=medium
+
+  * Initial release.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Wed, 14 Dec 2016 20:07:46 +0100

admin/linux/debian/debian.stable/control

@@ -0,0 +1,86 @@
+Source: nextcloud-client
+Section: contrib/devel
+Priority: optional
+Maintainer: István Váradi <ivaradi@varadiistvan.hu>
+Build-Depends: cmake,
+               debhelper,
+               cdbs,
+               dh-python,
+               extra-cmake-modules (>= 5.16),
+               kdelibs5-dev,
+               kio-dev,
+               libavcodec58,
+               libcmocka-dev,
+               libcloudproviders-dev,
+               libdbus-1-dev,
+               libhttp-dav-perl,
+               libinotify-dev [kfreebsd-any],
+               libqt5webkit5-dev,
+               libqt5svg5-dev,
+               libsqlite3-dev,
+               libssl-dev (>= 1.1.0),
+               zlib1g-dev,
+               optipng,
+               pkg-kde-tools,
+               python-sphinx | python3-sphinx,
+               python3-all,
+               qt5keychain-dev,
+               qtwebengine5-dev,
+               qtdeclarative5-dev,
+               qttools5-dev,
+               qttools5-dev-tools,
+               xvfb
+Standards-Version: 3.9.8
+Homepage: https://github.com/nextcloud/client_theming
+#Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
+#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
+
+Package: nextcloud-client
+Architecture: any
+Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, nextcloud-client-l10n
+Recommends: libgnome-keyring0
+Description: Nextcloud desktop sync client
+ Use the desktop client to keep your files synchronized
+ between your Nextcloud server and your desktop. Select
+ one or more directories on your local machine and always
+ have access to your latest files wherever you are.
+
+Package: libnextcloudsync0
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Nextcloud sync library
+ Used by the Nextcloud desktop client as the synchronization engine.
+
+Package: libnextcloudsync-dev
+Architecture: any
+Section: contrib/libdevel
+Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
+Description: Nextcloud sync library development files
+ The headers and development library for the Nextcloud sync library.
+
+Package: nextcloud-client-l10n
+Architecture: all
+Depends: ${misc:Depends}
+Description: Nextcloud client internatialization files
+ The translation files.
+
+Package: nextcloud-client-nautilus
+Architecture: all
+Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
+Description: Nautilus plugin for Nextcloud
+ This package contains a Nautilus plugin to display
+ synchronization status icons for Nextcloud files.
+
+Package: nextcloud-client-nemo
+Architecture: all
+Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo, nemo, ${misc:Depends}
+Description: Nemo plugin for Nextcloud
+ This package contains a Nemo plugin to display
+ synchronization status icons for Nextcloud files.
+
+Package: nextcloud-client-caja
+Architecture: all
+Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
+Description: Caja plugin for Nextcloud
+ This package contains a Caja plugin to display
+ synchronization status icons for Nextcloud files.

admin/linux/debian/debian.xenial/control

@@ -0,0 +1,90 @@
+Source: nextcloud-client
+Section: contrib/devel
+Priority: optional
+Maintainer: István Váradi <ivaradi@varadiistvan.hu>
+Build-Depends: cmake,
+               debhelper,
+               cdbs,
+               dh-python,
+               extra-cmake-modules (>= 5.16),
+               kdelibs5-dev,
+               kio-dev,
+               libcmocka-dev,
+               libhttp-dav-perl,
+               libinotify-dev [kfreebsd-any],
+               libqt5webkit5-dev,
+               libqt5svg5-dev,
+               libsqlite3-dev,
+               libssl-dev (>> 1.0.0),
+               zlib1g-dev,
+               optipng,
+               pkg-kde-tools,
+               python-sphinx | python3-sphinx,
+               python3-all,
+               qt5keychain-dev,
+               qtwebengine5-dev,
+               qtdeclarative5-dev,
+               qttools5-dev,
+               qttools5-dev-tools,
+               xvfb
+Standards-Version: 3.9.8
+Homepage: https://github.com/nextcloud/client_theming
+#Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
+#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
+
+Package: nextcloud-client
+Architecture: any
+Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, nextcloud-client-l10n
+Recommends: libgnome-keyring0
+Description: Nextcloud desktop sync client
+ Use the desktop client to keep your files synchronized
+ between your Nextcloud server and your desktop. Select
+ one or more directories on your local machine and always
+ have access to your latest files wherever you are.
+
+Package: libnextcloudsync0
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Nextcloud sync library
+ Used by the Nextcloud desktop client as the synchronization engine.
+
+Package: libnextcloudsync-dev
+Architecture: any
+Section: contrib/libdevel
+Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
+Description: Nextcloud sync library development files
+ The headers and development library for the Nextcloud sync library.
+
+Package: nextcloud-client-l10n
+Architecture: all
+Depends: ${misc:Depends}
+Description: Nextcloud client internatialization files
+ The translation files.
+
+Package: nextcloud-client-nautilus
+Architecture: all
+Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
+Description: Nautilus plugin for Nextcloud
+ This package contains a Nautilus plugin to display
+ synchronization status icons for Nextcloud files.
+
+Package: nextcloud-client-nemo
+Architecture: all
+Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo | nemo-python, nemo, ${misc:Depends}
+Description: Nemo plugin for Nextcloud
+ This package contains a Nemo plugin to display
+ synchronization status icons for Nextcloud files.
+
+Package: nextcloud-client-caja
+Architecture: all
+Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
+Description: Caja plugin for Nextcloud
+ This package contains a Caja plugin to display
+ synchronization status icons for Nextcloud files.
+
+Package: nextcloud-client-dolphin
+Architecture: any
+Depends: dolphin (>= 4:15.12.1), libnextcloudsync0 (= ${binary:Version}), nextcloud-client, ${misc:Depends}, ${shlibs:Depends}
+Description: Dolphin plugin for Nextcloud
+ This package contains a Dolphin plugin to display
+ synchronization status icons for Nextcloud files.

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

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

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

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

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

@@ -0,0 +1,24 @@
+Binary files nextcloud-client-2.4.0.orig/.git/index and nextcloud-client-2.4.0/.git/index differ
+diff -ruN nextcloud-client-2.4.0.orig/src/CMakeLists.txt nextcloud-client-2.4.0/src/CMakeLists.txt
+--- nextcloud-client-2.4.0.orig/src/CMakeLists.txt	2018-02-01 19:16:38.461162563 +0100
++++ nextcloud-client-2.4.0/src/CMakeLists.txt	2018-02-01 19:20:20.253824030 +0100
+@@ -4,7 +4,7 @@
+ 
+ set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
+ 
+-find_package(Qt5 5.6 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
++find_package(Qt5 5.5 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
+ if (Qt5Core_VERSION VERSION_LESS 5.9.0)
+ message(STATUS "For HTTP/2 support, compile with Qt 5.9 or higher.")
+ endif()
+--- nextcloud-client-2.4.0.orig/admin/osx/CMakeLists.txt	2018-05-22 07:01:48.248646951 +0200
++++ nextcloud-client-2.4.0/admin/osx/CMakeLists.txt	2018-05-22 07:01:51.012689711 +0200
+@@ -11,7 +11,7 @@
+   set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "0")
+ endif()
+ 
+-find_package(Qt5 5.6 COMPONENTS Core REQUIRED)
++find_package(Qt5 5.5 COMPONENTS Core REQUIRED)
+ configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
+ configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
+ configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)

admin/linux/debian/debian/101-sync-inotify.conf

@@ -0,0 +1 @@
+fs.inotify.max_user_watches = 524288

admin/linux/debian/debian/changelog

@@ -0,0 +1,48 @@
+nextcloud-client (2.3.3-1.0~xenial1) xenial; urgency=medium
+
+  * Debian build support for the forked client.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Mon, 6 Nov 2017 20:20:04 +0100
+
+nextcloud-client (2.3.1-1.0~xenial1) xenial; urgency=medium
+
+  * New upstream version
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 23 Mar 2017 19:07:36 +0100
+
+nextcloud-client (2.3.0-1.0~xenial1) xenial; urgency=medium
+
+  * New upstream version
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 21 Mar 2017 19:34:13 +0100
+
+nextcloud-client (2.2.4-1.4~xenial1) xenial; urgency=medium
+
+  * The locale-specific icon names are correct too
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 7 Feb 2017 19:55:40 +0100
+
+nextcloud-client (2.2.4-1.3~xenial1) xenial; urgency=medium
+
+  * Caja syncstate plugin is built.
+  * The syncstate plugin has application-specific name
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Fri, 27 Jan 2017 19:34:18 +0100
+
+nextcloud-client (2.2.4-1.2~xenial1) xenial; urgency=medium
+
+  * Fixed appname in the Nemo syncstate extension.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Thu, 19 Jan 2017 16:46:50 +0100
+
+nextcloud-client (2.2.4-1.1~xenial1) xenial; urgency=medium
+
+  * Added Nautilus and Nemo syncstate extensions.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Tue, 17 Jan 2017 19:55:32 +0100
+
+nextcloud-client (2.2.4-1.0~xenial1) xenial; urgency=medium
+
+  * Initial release.
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  Wed, 14 Dec 2016 20:07:46 +0100

admin/linux/debian/debian/compat

@@ -0,0 +1 @@
+9

admin/linux/debian/debian/control

@@ -0,0 +1,91 @@
+Source: nextcloud-client
+Section: contrib/devel
+Priority: optional
+Maintainer: István Váradi <ivaradi@varadiistvan.hu>
+Build-Depends: cmake,
+               debhelper,
+               cdbs,
+               dh-python,
+               extra-cmake-modules (>= 5.16),
+               kdelibs5-dev,
+               libkf5kio-dev,
+               libcmocka-dev,
+               libcloudproviders-dev,
+               libdbus-1-dev,
+               libhttp-dav-perl,
+               libinotify-dev [kfreebsd-any],
+               libqt5svg5-dev,
+               libqt5webkit5-dev,
+               libsqlite3-dev,
+               libssl-dev (>= 1.1.0),
+               zlib1g-dev,
+               optipng,
+               pkg-kde-tools,
+               python-sphinx | python3-sphinx,
+               python3-all,
+               qt5keychain-dev,
+               qtwebengine5-dev,
+               qtdeclarative5-dev,
+               qttools5-dev,
+               qttools5-dev-tools,
+               xvfb
+Standards-Version: 3.9.8
+Homepage: https://github.com/nextcloud/client_theming
+#Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
+#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
+
+Package: nextcloud-client
+Architecture: any
+Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgnome-keyring0, nextcloud-client-l10n
+Description: Nextcloud desktop sync client
+ Use the desktop client to keep your files synchronized
+ between your Nextcloud server and your desktop. Select
+ one or more directories on your local machine and always
+ have access to your latest files wherever you are.
+
+Package: libnextcloudsync0
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Nextcloud sync library
+ Used by the Nextcloud desktop client as the synchronization engine.
+
+Package: libnextcloudsync-dev
+Architecture: any
+Section: contrib/libdevel
+Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
+Description: Nextcloud sync library development files
+ The headers and development library for the Nextcloud sync library.
+
+Package: nextcloud-client-l10n
+Architecture: all
+Depends: ${misc:Depends}
+Description: Nextcloud client internatialization files
+ The translation files.
+
+Package: nextcloud-client-nautilus
+Architecture: all
+Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
+Description: Nautilus plugin for Nextcloud
+ This package contains a Nautilus plugin to display
+ synchronization status icons for Nextcloud files.
+
+Package: nextcloud-client-nemo
+Architecture: all
+Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo | nemo-python, nemo, ${misc:Depends}
+Description: Nemo plugin for Nextcloud
+ This package contains a Nemo plugin to display
+ synchronization status icons for Nextcloud files.
+
+Package: nextcloud-client-caja
+Architecture: all
+Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
+Description: Caja plugin for Nextcloud
+ This package contains a Caja plugin to display
+ synchronization status icons for Nextcloud files.
+
+Package: nextcloud-client-dolphin
+Architecture: any
+Depends: dolphin (>= 4:15.12.1), libnextcloudsync0 (= ${binary:Version}), nextcloud-client, ${misc:Depends}, ${shlibs:Depends}
+Description: Dolphin plugin for Nextcloud
+ This package contains a Dolphin plugin to display
+ synchronization status icons for Nextcloud files.

admin/linux/debian/debian/copyright

@@ -0,0 +1,3 @@
+Files: *
+Copyright: 2012-2015 ownCloud, inc.; Nuernberg, Germany., 2016 Nextcloud GmbH
+License: GPL-2+

admin/linux/debian/debian/libnextcloudsync-dev.install

@@ -0,0 +1,3 @@
+usr/include
+usr/lib/*/libnextcloudsync.so
+usr/lib/*/nextcloud/libocsync.so

admin/linux/debian/debian/libnextcloudsync0.install

@@ -0,0 +1,3 @@
+etc
+usr/lib/*/libnextcloudsync.so.?*
+usr/lib/*/nextcloud/libocsync.so.?*

admin/linux/debian/debian/nextcloud-client-caja.install

@@ -0,0 +1 @@
+usr/share/caja-python

admin/linux/debian/debian/nextcloud-client-dolphin.install

@@ -0,0 +1,4 @@
+usr/lib/*/libnextclouddolphinpluginhelper.so
+usr/lib/*/qt5/plugins/kf5/overlayicon/nextclouddolphinoverlayplugin.so
+usr/lib/*/qt5/plugins/nextclouddolphinactionplugin.so
+usr/share/kservices5/nextclouddolphinactionplugin.desktop

admin/linux/debian/debian/nextcloud-client-dolphin.lintian-overrides

@@ -0,0 +1,2 @@
+nextcloud-client-dolphin: package-name-doesnt-match-sonames
+nextcloud-client-dolphin: shlib-without-versioned-soname

admin/linux/debian/debian/nextcloud-client-dolphin.triggers

@@ -0,0 +1 @@
+activate-noawait ldconfig

admin/linux/debian/debian/nextcloud-client-l10n.install

@@ -0,0 +1 @@
+usr/share/nextcloud/i18n

admin/linux/debian/debian/nextcloud-client-nautilus.install

@@ -0,0 +1 @@
+usr/share/nautilus-python

admin/linux/debian/debian/nextcloud-client-nemo.install

@@ -0,0 +1 @@
+usr/share/nemo-python

admin/linux/debian/debian/nextcloud-client.install

@@ -0,0 +1,4 @@
+usr/bin
+usr/share/applications
+usr/share/icons
+debian/101-sync-inotify.conf etc/sysctl.d

admin/linux/debian/debian/nextcloud-client.lintian-overrides

@@ -0,0 +1,3 @@
+nextcloud-client: binary-or-shlib-defines-rpath
+nextcloud-client: binary-without-manpage
+nextcloud-client: license-problem-convert-utf-code

admin/linux/debian/debian/rules

@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+
+DEB_SHLIBDEPS_INCLUDE=$(CURDIR)/$(DEB_BUILDDIR)/csync/src
+
+DEB_SRCDIR=.
+DEB_CMAKE_EXTRA_FLAGS = -DCMAKE_SKIP_RPATH=OFF -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON

admin/linux/debian/debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

admin/linux/debian/debian/source/lintian-overrides

@@ -0,0 +1,9 @@
+nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/bootstrap/static/bootstrap.js line length is 22206 characters (>512)
+nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/bootstrap/static/jquery.js
+nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/bootstrap/static/jquery.js line length is 32412 characters (>512)
+nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_com/static/bootstrap.js line length is 22206 characters (>512)
+nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_com/static/jquery.js line length is 32412 characters (>512)
+nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_release/static/bootstrap.js line length is 22206 characters (>512)
+nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_release/static/jquery.js line length is 32412 characters (>512)
+nextcloud-client source: source-is-missing client/doc/ocdoc/_shared_assets/themes/owncloud_org/static/js/jquery-1.11.0.min.js
+nextcloud-client source: license-problem-convert-utf-code

admin/linux/debian/drone-build.sh

@@ -3,24 +3,12 @@
 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 groovy"
-    DEBIAN_DISTRIBUTIONS="buster stretch testing"
-else
-    UBUNTU_DISTRIBUTIONS="focal groovy"
-    DEBIAN_DISTRIBUTIONS="testing"
-fi
+OBS_PACKAGE=nextcloud-client
 
 pull_request=${DRONE_PULL_REQUEST:=master}
 
@@ -43,16 +31,13 @@ fi
 set -x
 
 cd "${DRONE_WORKSPACE}"
-git fetch --tags
-read basever revdate kind <<<$(admin/linux/debian/scripts/git2changelog.py /tmp/tmpchangelog stable)
+read basever 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
+if test "$kind" = "beta"; then
     repo=nextcloud-devs/client-beta
 else
     repo=nextcloud-devs/client
@@ -60,60 +45,79 @@ 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}
+if ! wget http://ppa.launchpad.net/${repo}/ubuntu/pool/main/n/nextcloud-client/nextcloud-client_${basever}.orig.tar.bz2; then
+    cp -a ${DRONE_WORKSPACE} nextcloud-client_${basever}
+    tar cjf nextcloud-client_${basever}.orig.tar.bz2 --exclude .git nextcloud-client_${basever}
+    origsourceopt="-sa"
+fi
 
-cd "${DRONE_WORKSPACE}"
-git config --global user.email "drone@noemail.invalid"
-git config --global user.name "Drone User"
+for distribution in xenial bionic disco eoan stable oldstable; do
+    rm -rf nextcloud-client_${basever}
+    cp -a ${DRONE_WORKSPACE} nextcloud-client_${basever}
 
-for distribution in ${UBUNTU_DISTRIBUTIONS} ${DEBIAN_DISTRIBUTIONS}; do
-    git checkout -- .
-    git clean -xdf
+    cd nextcloud-client_${basever}
 
-    git fetch origin debian/dist/${distribution}/${DRONE_TARGET_BRANCH}
-    git checkout origin/debian/dist/${distribution}/${DRONE_TARGET_BRANCH}
+    cp -a admin/linux/debian/debian .
+    if test -d admin/linux/debian/debian.${distribution}; then
+        tar cf - -C admin/linux/debian/debian.${distribution} . | tar xf - -C debian
+    fi
 
-    git merge ${DRONE_COMMIT}
+    admin/linux/debian/scripts/git2changelog.py /tmp/tmpchangelog ${distribution}
+    cp /tmp/tmpchangelog debian/changelog
+    if test -f admin/linux/debian/debian.${distribution}/changelog; then
+        cat admin/linux/debian/debian.${distribution}/changelog >> debian/changelog
+    else
+        cat admin/linux/debian/debian/changelog >> debian/changelog
+    fi
 
-    admin/linux/debian/scripts/git2changelog.py /tmp/tmpchangelog ${distribution} ${revdate}
-    cat /tmp/tmpchangelog debian/changelog > debian/changelog.new
-    mv debian/changelog.new debian/changelog
+    for p in debian/post-patches/*.patch; do
+        if test -f "${p}"; then
+            echo "Applying ${p}"
+            patch -p1 < "${p}"
+        fi
+    done
 
-    fullver=`head -1 debian/changelog | sed "s:nextcloud-desktop (\([^)]*\)).*:\1:"`
+    fullver=`head -1 debian/changelog | sed "s:nextcloud-client (\([^)]*\)).*:\1:"`
 
     EDITOR=true dpkg-source --commit . local-changes
 
     dpkg-source --build .
-    dpkg-genchanges -S -sa > "../nextcloud-desktop_${fullver}_source.changes"
+    dpkg-genchanges -S ${origsourceopt} > "../nextcloud-client_${fullver}_source.changes"
 
     if test -f ~/.has_ppa_keys; then
         debsign -k7D14AA7B -S
     fi
+
+    cd ..
 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
+    kind=`cat kind`
+
+    if 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
+        for changes in nextcloud-client_*~+([a-z])1_source.changes; do
+            case "${changes}" in
+                *oldstable1*)
+                    ;;
+                *)
+                    dput $PPA $changes > /dev/null
+                    ;;
+            esac
         done
 
-        for distribution in ${DEBIAN_DISTRIBUTIONS}; do
-            pkgsuffix=".${distribution}"
-            pkgvertag="~${distribution}1"
+        for distribution in stable oldstable; do
+            if test "${distribution}" = "oldstable"; then
+                pkgsuffix=".${distribution}"
+                pkgvertag="~${distribution}1"
+            else
+                pkgsuffix=""
+                pkgvertag=""
+            fi
 
             package="${OBS_PACKAGE}${pkgsuffix}"
             OBS_SUBDIR="${OBS_PROJECT}/${package}"
@@ -125,10 +129,10 @@ if test "${pull_request}" = "master"; 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}/
+            cp ../nextcloud-client*.orig.tar.* ${OBS_SUBDIR}/
+            cp ../nextcloud-client_*[0-9.][0-9]${pkgvertag}.dsc ${OBS_SUBDIR}/
+            cp ../nextcloud-client_*[0-9.][0-9]${pkgvertag}.debian.tar* ${OBS_SUBDIR}/
+            cp ../nextcloud-client_*[0-9.][0-9]${pkgvertag}_source.changes ${OBS_SUBDIR}/
             osc add ${OBS_SUBDIR}/*
 
             cd ${OBS_SUBDIR}

admin/linux/debian/scripts/addchange.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+set -e -u
+
+scriptdir=`dirname $0`
+
+DEFAULT_DIST=yakkety
+
+package="nextcloud-client"
+version="$1"
+comment="$2"
+distver="${3:-}"
+
+if test -z "${distver}"; then
+    distver="1"
+fi
+
+packagedir="${scriptdir}/../${package}"
+
+now=`date -R`
+
+tmpfile="/tmp/addchange.$$"
+
+for subdir in "${packagedir}/debian"*; do
+    if test -f "${subdir}/changelog"; then
+        echo "${subdir}"
+        bname=`basename "${subdir}"`
+        dist=`echo "${bname}" | sed 's:debian\.\?::'`
+        if test -z "${dist}"; then
+            dist="${DEFAULT_DIST}"
+        fi
+        if test "${dist}" = "stable"; then
+            versuffix=""
+        else
+            versuffix="~${dist}${distver}"
+        fi
+        cat > "${tmpfile}" <<EOF
+${package} (${version}${versuffix}) ${dist}; urgency=medium
+
+  * ${comment}
+
+ -- István Váradi <ivaradi@varadiistvan.hu>  ${now}
+
+EOF
+        cat "${subdir}/changelog" >> "${tmpfile}"
+        mv "${tmpfile}" "${subdir}/changelog"
+    fi
+done
+
+rm -f "${tmpfile}"

admin/linux/debian/scripts/config.sh

@@ -0,0 +1,26 @@
+# The directory where the sources are found
+SOURCES="${HOME}/sources/nextcloud/client"
+
+# The directory into which the packages should be genereated
+BUILDAREA="${SOURCES}/build-area"
+
+# The directory containing the Git repositories
+GITROOTS="${SOURCES}/git"
+
+# The pbuilder root directory
+PBUILDER_ROOT="${HOME}/pbuilder"
+
+# The dependencies directory for pbuilder
+PBUILDER_DEPS="${PBUILDER_ROOT}/deps"
+
+# The version of the nextcloud-client package
+NEXTCLOUD_CLIENT_VERSION=2.4.0
+
+# The FULL version of the nextcloud-client package
+NEXTCLOUD_CLIENT_FULL_VERSION="${NEXTCLOUD_CLIENT_VERSION}-1.0~@DISTRIBUTION@1"
+
+# The tag of the nextcloud-client package
+NEXTCLOUD_CLIENT_TAG="v${NEXTCLOUD_CLIENT_VERSION}"
+
+# The number of CPUs that can be used for paralel builds
+NUMCPUS=4

admin/linux/debian/scripts/create_debdir.sh

@@ -0,0 +1,89 @@
+#!/bin/bash
+
+set -e -u
+
+scriptdir=`dirname $0`
+scriptdir=`cd "${scriptdir}" && pwd`
+
+. "${scriptdir}/config.sh"
+
+package="nextcloud-client"
+tag="${1}"
+version="${2}"
+distribution="${3}"
+
+gitdir="${GITROOTS}/client"
+packagedir="${BUILDAREA}/${package}_${version}"
+origtarname="${package}_${version}.orig.tar.bz2"
+origtar="${BUILDAREA}/${origtarname}"
+
+archive_submodules()
+{
+    local subdir="${1}"
+    local treeish="${2}"
+
+    local dir="${gitdir}"
+    local destdir="${packagedir}"
+    if test "${subdir}"; then
+        echo "  copying submodule ${subdir}"
+        dir="${dir}/${subdir}"
+        destdir="${destdir}/${subdir}"
+    fi
+
+    mkdir -p "${destdir}"
+
+    (cd "${dir}"; git archive "${treeish}" | tar xf - -C "${destdir}")
+
+    (cd "${dir}"; git ls-tree "${treeish}" -r) | while read mode type object file; do
+        if test "${type}" = "commit"; then
+            sdir="${file}"
+            if test "${subdir}"; then
+                sdir="${subdir}/${sdir}"
+            fi
+            archive_submodules "${sdir}" "${object}"
+        fi
+    done
+}
+
+rm -rf "${packagedir}"
+mkdir -p "${packagedir}"
+
+echo "Updating submodules"
+commit=`cd "${gitdir}"; git rev-parse HEAD`
+(cd "${gitdir}"; git checkout "${tag}"; git submodule update --recursive --init)
+
+echo "Copying sources"
+archive_submodules "" "${tag}"
+
+if test -f "${GITROOTS}/${origtarname}"; then
+    echo "Copying orig archive from ${GITROOTS}"
+    cp -a "${GITROOTS}/${origtarname}" "${BUILDAREA}"
+else
+    echo "Creating orig archive"
+    tar cjf "${origtar}" -C "${BUILDAREA}" "${package}_${version}"
+fi
+
+echo "Restoring Git state"
+(cd "${gitdir}"; git checkout "${commit}")
+cd "${scriptdir}"
+
+echo "Copying Debian files"
+mkdir -p "${packagedir}/debian"
+tar cf - -C "${scriptdir}/../debian" . | tar xf - -C "${packagedir}/debian"
+
+if test -d "${scriptdir}/../debian.${distribution}"; then
+    tar cf - -C "${scriptdir}/../debian.${distribution}" . | tar xf - -C "${packagedir}/debian"
+fi
+
+pushd "${packagedir}"
+for p in debian/post-patches/*.patch; do
+    if test -f "${p}"; then
+        echo "Applying ${p}"
+        patch -p1 < "${p}"
+    fi
+done
+popd
+
+"${scriptdir}/git2changelog.py"  /tmp/git2changelog "${distribution}"
+mv "${packagedir}/debian/changelog" "${packagedir}/debian/changelog.old"
+cat /tmp/git2changelog "${packagedir}/debian/changelog.old" > "${packagedir}/debian/changelog"

admin/linux/debian/scripts/git2changelog.cfg

@@ -6,7 +6,3 @@
 [versionhack]
 commit = bc7e65b39552ac458b2adacf76cbf98735ec29a0
 tag = v2.4.0-beta
-
-[base]
-commit = 56222de768e3def4d504b3f9832d8598b1ec2043
-version = 2.7.0

admin/linux/debian/scripts/git2changelog.py

@@ -1,6 +1,5 @@
 #!//usr/bin/env python2.7
 
-from __future__ import print_function
 import subprocess
 import re
 import sys
@@ -8,11 +7,6 @@ import datetime
 import os
 import ConfigParser
 
-try:
-    long
-except NameError:
-    long = int
-
 distribution="yakkety"
 
 versionTagRE = re.compile("^v([0-9]+((\.[0-9]+)+))(-(.+))?$")
@@ -28,37 +22,39 @@ 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:
+    for line in subprocess.check_output(["git", "show",
+                                         commit + ":VERSION.cmake"]).splitlines():
+        m = re.match("set\( MIRALL_VERSION_([A-Z]+) +([0-9])+ *\)", line)
+        if m is not None:
+            kind=m.group(1)
+            version=m.group(2)
+            if kind=="MAJOR":
+                major=version
+            elif kind=="MINOR":
+                minor=version
+            elif kind=="PATCH":
+                patch=version
+    if major and minor and patch:
+        return major + "." + minor + "." + patch
+    else:
         return None
 
-def collectEntries(baseCommit, baseVersion, kind, finalRevDate, config):
+def collectEntries(baseCommit, baseVersion, kind):
+    scriptdir = os.path.dirname(__file__)
+    configPath = os.path.join(scriptdir, "git2changelog.cfg")
 
     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")
+    if os.path.exists(configPath):
+        config = ConfigParser.SafeConfigParser()
+        config.read(configPath)
+        if config.has_section("versionhack"):
+            if config.has_option("versionhack", "commit") and \
+               config.has_option("versionhack", "tag"):
+                newVersionCommit = config.get("versionhack", "commit")
+                newVersionTag = config.get("versionhack", "tag")
 
     entries = []
 
@@ -77,11 +73,9 @@ def collectEntries(baseCommit, baseVersion, kind, finalRevDate, config):
         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"
+        kind = "beta"
 
         if commit==newVersionCommit:
             result = processVersionTag(newVersionTag)
@@ -113,63 +107,38 @@ def collectEntries(baseCommit, baseVersion, kind, finalRevDate, config):
         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
-        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)
+            version = upstreamVersion + "~" + distribution + "1"
+        print >> f, "nextcloud-client (%s) %s; urgency=medium" % (version, distribution)
+        print >> f
+        print >> f, "  * " + subject
+        print >> f
+        print >> f, " -- %s <%s>  %s" % (name, email, date)
+        print >> f
+    return (latestBaseVersion, latestKind)
 
 if __name__ == "__main__":
-    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
 
-    entries = collectEntries(baseCommit, baseVersion, "alpha", finalRevDate, config)
+    #entries = collectEntries("8aade24147b5313f8241a8b42331442b7f40eef9", "2.2.4", "release")
+    entries = collectEntries("f9b1c724d6ab5431e0cd56b7cd834f2dd48cebb1", "2.4.0", "beta")
+
 
     with open(sys.argv[1], "wt") as f:
-        (baseVersion, revdate, kind) = genChangeLogEntries(f, entries, distribution)
-        print(baseVersion, revdate, kind)
+        (baseVersion, kind) = genChangeLogEntries(f, entries, distribution)
+        print baseVersion, kind

admin/linux/debian/scripts/pbuild.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e -u
+
+scriptdir=`dirname $0`
+scriptdir=`cd "${scriptdir}" && pwd`
+
+. "${scriptdir}/config.sh"
+
+distribution="${1}"
+shift
+
+pushd /
+"${scriptdir}/build.sh" "${distribution}" -S "$@"
+
+"${scriptdir}/pbuilder.sh" "${distribution}" "$@"
+popd

admin/linux/debian/scripts/pbuilder.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e -u
+
+scriptdir=`dirname $0`
+
+. "${scriptdir}/config.sh"
+
+distribution="${1}"
+shift
+
+resultdir="${PBUILDER_ROOT}/${distribution}_result"
+
+rm -f "${PBUILDER_DEPS}/"*.deb
+echo -n > "${PBUILDER_DEPS}/Packages"
+rm -f "${resultdir}/"*
+
+source "${HOME}/.pbuilderrc"
+
+dscversion=`echo ${NEXTCLOUD_CLIENT_FULL_VERSION} | sed "s:@DISTRIBUTION@:${distribution}:g"`
+pbuilder-dist "${distribution}" build --othermirror "${OTHERMIRROR}" --debbuildopts "-j${NUMCPUS}" "$@" "${BUILDAREA}/nextcloud-client_${dscversion}.dsc"

admin/linux/upload-appimage.sh

@@ -1,135 +1,21 @@
 #! /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
+set -xe
 
 cd /build
 
-# AppImage
-export APPIMAGE=$(readlink -f ./Nextcloud*.AppImage)
-export BASENAME=$(basename ${APPIMAGE})
+# Upload AppImage
+APPIMAGE=$(readlink -f ./Nextcloud*.AppImage)
+BASENAME=$(basename ${APPIMAGE})
 
-if ! test -e $APPIMAGE ; then
-    exit 1
+if curl --max-time 900 --upload-file ${APPIMAGE} https://transfer.sh/${BASENAME}
+then
+    echo
+    echo "Get the AppImage at the link above!"
+else
+    echo
+    echo "Upload failed, however this is an optional step."
 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"
+# Don't let the Drone build fail
+exit 0

admin/osx/CMakeLists.txt

@@ -11,9 +11,8 @@ else()
   set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "0")
 endif()
 
-find_package(Qt5 5.12 COMPONENTS Core REQUIRED)
+find_package(Qt5 5.6 COMPONENTS Core REQUIRED)
 configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
 configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
 configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)
 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/QtWebEngineProcess.entitlements

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>com.apple.security.cs.disable-executable-page-protection</key>
-    <true/>
-</dict>
-</plist>

admin/osx/macdeployqt.py

@@ -0,0 +1,365 @@
+#!/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; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  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
+from distutils.version import LooseVersion
+
+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', '/usr/local/Qt-5.12.5/lib', '.']
+
+QT_PLUGINS = [
+    'sqldrivers/libqsqlite.dylib',
+    'platforms/libqcocoa.dylib',
+    'styles/libqmacstyle.dylib',
+    'imageformats/libqgif.dylib',
+    'imageformats/libqico.dylib',
+    'imageformats/libqjpeg.dylib',
+    'imageformats/libqsvg.dylib',
+]
+
+QT_PLUGINS_SEARCH_PATH=[
+#    os.path.join(os.environ['QTDIR'], 'plugins'),
+#    '/usr/local/Cellar/qt/5.2.1/plugins',
+    '/usr/local/Qt-5.12.5/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)];
+
+qt_version = QueryQMake('QT_VERSION')
+print "Using Qt", qt_version
+
+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(source_dylib):
+  parts = source_dylib.split(os.sep)
+  print "CopyFramework:", source_dylib
+  for i, part in enumerate(parts):
+    matchObj = re.match(r'(\w+\.framework)', part)
+    if matchObj:
+      framework = matchObj.group(1)
+      dylib_name = parts[-1]
+      source_path = os.path.join('/', *parts[:i+1])
+      dest_path = os.path.join(frameworks_dir, framework)
+      dest_dylib_path = os.path.join(frameworks_dir, *parts[i:-1])
+      break
+#  if os.path.exists(dest_path):
+#    print dest_path, "already exists, skipping copy..."
+#    return os.path.join(dest_dylib_path, dylib_name)
+
+  args = ['mkdir', '-p', dest_dylib_path]
+  commands.append(args)
+  args = ['ditto', '--arch=x86_64', source_dylib, dest_dylib_path]
+  commands.append(args)
+  args = ['chmod', 'u+w', os.path.join(dest_dylib_path, parts[-1])]
+  commands.append(args)
+  args = ['ln', '-s', '5', os.path.join(dest_path, 'Versions', 'Current')]
+  commands.append(args)
+  args = ['ln', '-s', os.path.join('Versions', 'Current', dylib_name), os.path.join(dest_path, dylib_name)]
+  commands.append(args)
+  args = ['ln', '-s', os.path.join('Versions', 'Current', 'Resources'), os.path.join(dest_path, 'Resources')]
+  commands.append(args)
+  args = ['cp', '-r', os.path.join(source_path, 'Versions', '5', 'Resources'), os.path.join(dest_path, 'Versions', '5')]
+  commands.append(args)
+  args = ['ln', '-s', os.path.join('Versions', 'Current', 'Helpers'), os.path.join(dest_path, 'Helpers')]
+  commands.append(args)
+  args = ['cp', '-r', os.path.join(source_path, 'Versions', '5', 'Helpers'), os.path.join(dest_path, 'Versions', '5')]
+  commands.append(args)
+
+  return os.path.join(dest_dylib_path, dylib_name)
+
+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 LooseVersion(qt_version) >= LooseVersion("5.10.0"):
+  args = ['plutil', '-insert', 'LSMinimumSystemVersion', '-string', '10.10.0', os.path.join(bundle_dir, 'Contents', 'Info.plist')]
+  commands.append(args)
+else:
+  args = ['plutil', '-insert', 'LSMinimumSystemVersion', '-string', '10.7.0', os.path.join(bundle_dir, 'Contents', 'Info.plist')]
+  commands.append(args)
+
+if len(sys.argv) <= 2:
+  print 'Will run %d commands:' % len(commands)
+  for command in commands:
+    print ' '.join(command)
+
+for command in commands:
+  p = subprocess.Popen(command)
+  os.waitpid(p.pid, 0)
+
+WriteQtConf()

admin/qt/patches/README.md

@@ -0,0 +1,20 @@
+## Patches used
+
+There are our patches on top of Qt 5.6.2, which we are currently
+using for our binary packages on Windows and macOS. Most of them
+have been sent upstream and are part of newer Qt releases.
+
+All changes are designed to be upstream, and all those that are
+special hacks to Qt will bear a NOUPSTREAM in their name
+
+You can apply those patches on a git clone using:
+
+```
+git am <client>/admin/qt/patches/qtbase/*.patch
+```
+
+You can update them using:
+
+```
+git format-patch -N --no-signature -o <client>/admin/qt/patches/qtbase/ <v5.x.y>
+```

admin/qt/patches/qtbase/0001-NOUPSTREAM-Fix-force-debug-info-with-macx-clang.patch

@@ -0,0 +1,27 @@
+From 96c34ce85136cbdc16ef83effa8a13137f7ae4c5 Mon Sep 17 00:00:00 2001
+From: Jocelyn Turcotte <jturcotte@woboq.com>
+Date: Fri, 6 Mar 2015 16:12:37 +0100
+Subject: [PATCH] [NOUPSTREAM] Fix -force-debug-info with macx-clang
+
+---
+ mkspecs/common/clang.conf | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
+index e003b94..e9b3291 100644
+--- a/mkspecs/common/clang.conf
++++ b/mkspecs/common/clang.conf
+@@ -21,11 +21,13 @@ QMAKE_CFLAGS_PRECOMPILE          = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_
+ QMAKE_CFLAGS_USE_PRECOMPILE      = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT}
+ QMAKE_CFLAGS_LTCG                = -flto
+ QMAKE_CFLAGS_DISABLE_LTCG        = -fno-lto
++QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = $$QMAKE_CFLAGS_OPTIMIZE -g
+ 
+ QMAKE_CXXFLAGS_PRECOMPILE        = -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+ QMAKE_CXXFLAGS_USE_PRECOMPILE    = $$QMAKE_CFLAGS_USE_PRECOMPILE
+ QMAKE_CXXFLAGS_LTCG              = $$QMAKE_CFLAGS_LTCG
+ QMAKE_CXXFLAGS_DISABLE_LTCG      = $$QMAKE_CFLAGS_DISABLE_LTCG
++QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
+ QMAKE_CXXFLAGS_CXX11             = -std=c++11
+ QMAKE_CXXFLAGS_CXX14             = -std=c++1y
+ QMAKE_CXXFLAGS_CXX1Z             = -std=c++1z

admin/qt/patches/qtbase/0002-Remove-legacy-platform-code-in-QSslSocket-for-OS-X-1.patch

@@ -0,0 +1,148 @@
+From e6bccb1f0d8ca59acb1ffdac74a823c06346e7f3 Mon Sep 17 00:00:00 2001
+From: Daniel Molkentin <daniel@molkentin.de>
+Date: Mon, 16 Nov 2015 15:02:37 +0100
+Subject: [PATCH] Remove legacy platform code in QSslSocket for OS X < 10.5
+
+This avoids manual symbol lookups and makes the code more readable.
+Mark identical code.
+
+Also use smart pointers instead of manual memory management.
+
+(Backport of d42d7781f1cd62c3c7c008859507f24a1ff5bb2a to Qt 5.4)
+
+Change-Id: I62820313dce87de6623cdc87b6e1361200ed7822
+Reviewed-by: Markus Goetz (Woboq GmbH) <markus@woboq.com>
+
+Conflicts:
+	src/network/ssl/qsslsocket_openssl.cpp
+---
+ src/network/ssl/qsslsocket_openssl.cpp | 81 +++++++++++-----------------------
+ src/network/ssl/qsslsocket_p.h         |  6 +--
+ 2 files changed, 26 insertions(+), 61 deletions(-)
+
+diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
+index 82644c1..415f147 100644
+--- a/src/network/ssl/qsslsocket_openssl.cpp
++++ b/src/network/ssl/qsslsocket_openssl.cpp
+@@ -76,14 +76,17 @@
+ 
+ #include <string.h>
+ 
++#ifdef Q_OS_DARWIN
++#  include <private/qcore_mac_p.h>
++#endif
++
++#ifdef Q_OS_OSX
++#  include <Security/Security.h>
++#endif
++
+ QT_BEGIN_NAMESPACE
+ 
+-#if defined(Q_OS_MACX)
+-#define kSecTrustSettingsDomainSystem 2 // so we do not need to include the header file
+-    PtrSecCertificateCopyData QSslSocketPrivate::ptrSecCertificateCopyData = 0;
+-    PtrSecTrustSettingsCopyCertificates QSslSocketPrivate::ptrSecTrustSettingsCopyCertificates = 0;
+-    PtrSecTrustCopyAnchorCertificates QSslSocketPrivate::ptrSecTrustCopyAnchorCertificates = 0;
+-#elif defined(Q_OS_WIN)
++#if defined(Q_OS_WIN)
+     PtrCertOpenSystemStoreW QSslSocketPrivate::ptrCertOpenSystemStoreW = 0;
+     PtrCertFindCertificateInStore QSslSocketPrivate::ptrCertFindCertificateInStore = 0;
+     PtrCertCloseStore QSslSocketPrivate::ptrCertCloseStore = 0;
+@@ -509,23 +512,7 @@ void QSslSocketPrivate::ensureCiphersAndCertsLoaded()
+ 
+ #ifndef QT_NO_LIBRARY
+     //load symbols needed to receive certificates from system store
+-#if defined(Q_OS_MACX)
+-    QLibrary securityLib("/System/Library/Frameworks/Security.framework/Versions/Current/Security");
+-    if (securityLib.load()) {
+-        ptrSecCertificateCopyData = (PtrSecCertificateCopyData) securityLib.resolve("SecCertificateCopyData");
+-        if (!ptrSecCertificateCopyData)
+-            qCWarning(lcSsl, "could not resolve symbols in security library"); // should never happen
+-
+-        ptrSecTrustSettingsCopyCertificates = (PtrSecTrustSettingsCopyCertificates) securityLib.resolve("SecTrustSettingsCopyCertificates");
+-        if (!ptrSecTrustSettingsCopyCertificates) { // method was introduced in Leopard, use legacy method if it's not there
+-            ptrSecTrustCopyAnchorCertificates = (PtrSecTrustCopyAnchorCertificates) securityLib.resolve("SecTrustCopyAnchorCertificates");
+-            if (!ptrSecTrustCopyAnchorCertificates)
+-                qCWarning(lcSsl, "could not resolve symbols in security library"); // should never happen
+-        }
+-    } else {
+-        qCWarning(lcSsl, "could not load security library");
+-    }
+-#elif defined(Q_OS_WIN)
++#if defined(Q_OS_WIN)
+     HINSTANCE hLib = LoadLibraryW(L"Crypt32");
+     if (hLib) {
+ #if defined(Q_OS_WINCE)
+@@ -693,40 +680,22 @@ QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
+     timer.start();
+ #endif
+     QList<QSslCertificate> systemCerts;
+-#if defined(Q_OS_MACX)
+-    CFArrayRef cfCerts;
+-    OSStatus status = 1;
+-
+-    CFDataRef SecCertificateCopyData (
+-       SecCertificateRef certificate
+-    );
+-
+-    if (ptrSecCertificateCopyData) {
+-        if (ptrSecTrustSettingsCopyCertificates)
+-            status = ptrSecTrustSettingsCopyCertificates(kSecTrustSettingsDomainSystem, &cfCerts);
+-        else if (ptrSecTrustCopyAnchorCertificates)
+-            status = ptrSecTrustCopyAnchorCertificates(&cfCerts);
+-        if (!status) {
+-            CFIndex size = CFArrayGetCount(cfCerts);
+-            for (CFIndex i = 0; i < size; ++i) {
+-                SecCertificateRef cfCert = (SecCertificateRef)CFArrayGetValueAtIndex(cfCerts, i);
+-                CFDataRef data;
+-
+-                data = ptrSecCertificateCopyData(cfCert);
+-
+-                if (data == NULL) {
+-                    qCWarning(lcSsl, "error retrieving a CA certificate from the system store");
+-                } else {
+-                    QByteArray rawCert = QByteArray::fromRawData((const char *)CFDataGetBytePtr(data), CFDataGetLength(data));
+-                    systemCerts.append(QSslCertificate::fromData(rawCert, QSsl::Der));
+-                    CFRelease(data);
+-                }
++    // note: also check implementation in openssl_mac.cpp
++#if defined(Q_OS_OSX)
++    // SecTrustSettingsCopyCertificates is not defined on iOS.
++    QCFType<CFArrayRef> cfCerts;
++
++    OSStatus status = SecTrustSettingsCopyCertificates(kSecTrustSettingsDomainSystem, &cfCerts);
++    if (status == noErr ) {
++        const CFIndex size = CFArrayGetCount(cfCerts);
++        for (CFIndex i = 0; i < size; ++i) {
++            SecCertificateRef cfCert = (SecCertificateRef)CFArrayGetValueAtIndex(cfCerts, i);
++            QCFType<CFDataRef> derData = SecCertificateCopyData(cfCert);
++            if (derData == NULL) {
++                qWarning("error retrieving a CA certificate from the system store");
++            } else {
++                systemCerts << QSslCertificate(QByteArray::fromCFData(derData), QSsl::Der);
+             }
+-            CFRelease(cfCerts);
+-        }
+-        else {
+-           // no detailed error handling here
+-           qCWarning(lcSsl, "could not retrieve system CA certificates");
+         }
+     }
+ #elif defined(Q_OS_WIN)
+diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h
+index d651971..17cc7b4 100644
+--- a/src/network/ssl/qsslsocket_p.h
++++ b/src/network/ssl/qsslsocket_p.h
+@@ -151,11 +151,7 @@ public:
+     static bool isMatchingHostname(const QSslCertificate &cert, const QString &peerName);
+     Q_AUTOTEST_EXPORT static bool isMatchingHostname(const QString &cn, const QString &hostname);
+ 
+-#if defined(Q_OS_MACX)
+-    static PtrSecCertificateCopyData ptrSecCertificateCopyData;
+-    static PtrSecTrustSettingsCopyCertificates ptrSecTrustSettingsCopyCertificates;
+-    static PtrSecTrustCopyAnchorCertificates ptrSecTrustCopyAnchorCertificates;
+-#elif defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
++#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
+     static PtrCertOpenSystemStoreW ptrCertOpenSystemStoreW;
+     static PtrCertFindCertificateInStore ptrCertFindCertificateInStore;
+     static PtrCertCloseStore ptrCertCloseStore;

admin/qt/patches/qtbase/0003-QSslSocket-evaluate-CAs-in-all-keychain-categories.patch

@@ -0,0 +1,276 @@
+From 9d1120db0973ea7741b13a6555b20ae61f6d037e Mon Sep 17 00:00:00 2001
+From: Daniel Molkentin <danimo@owncloud.com>
+Date: Wed, 25 Nov 2015 12:37:27 +0100
+Subject: [PATCH] QSslSocket: evaluate CAs in all keychain categories
+
+This will make sure that certs in the domainUser (login),
+and domainAdmin (per machine) keychain are being picked up
+in systemCaCertificates() in addition to the (usually immutable)
+DomainSystem keychain.
+
+Also consider the trust settings on OS X: If a certificate
+is either fully trusted or trusted for the purpose of SSL,
+it will be accepted.
+
+[ChangeLog][Platform Specific Changes] OS X now accepts trusted
+        certificates from the login and system keychains.
+
+(Backport of fe3a84138e266c425f11353f7d8dc28a588af89e)
+
+Task-number: QTBUG-32898
+Change-Id: Ia23083d5af74388eeee31ba07239735cbbe64368
+Reviewed-by: Markus Goetz (Woboq GmbH) <markus@woboq.com>
+---
+ src/network/ssl/qsslsocket.cpp            |   4 +
+ src/network/ssl/qsslsocket_mac_shared.cpp | 148 ++++++++++++++++++++++++++++++
+ src/network/ssl/qsslsocket_openssl.cpp    |  30 +-----
+ src/network/ssl/ssl.pri                   |   4 +-
+ 4 files changed, 158 insertions(+), 28 deletions(-)
+ create mode 100644 src/network/ssl/qsslsocket_mac_shared.cpp
+
+diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
+index 549906a..7b202b0 100644
+--- a/src/network/ssl/qsslsocket.cpp
++++ b/src/network/ssl/qsslsocket.cpp
+@@ -1508,6 +1508,10 @@ QList<QSslCertificate> QSslSocket::defaultCaCertificates()
+     returned by defaultCaCertificates(). You can replace that database
+     with your own with setDefaultCaCertificates().
+ 
++    \note: On OS X, only certificates that are either trusted for all
++    purposes or trusted for the purpose of SSL in the keychain will be
++    returned.
++
+     \sa caCertificates(), defaultCaCertificates(), setDefaultCaCertificates()
+ */
+ QList<QSslCertificate> QSslSocket::systemCaCertificates()
+diff --git a/src/network/ssl/qsslsocket_mac_shared.cpp b/src/network/ssl/qsslsocket_mac_shared.cpp
+new file mode 100644
+index 0000000..60fea4c
+--- /dev/null
++++ b/src/network/ssl/qsslsocket_mac_shared.cpp
+@@ -0,0 +1,148 @@
++/****************************************************************************
++**
++** Copyright (C) 2015 The Qt Company Ltd.
++** Copyright (C) 2015 ownCloud Inc
++** Contact: http://www.qt.io/licensing/
++**
++** This file is part of the QtNetwork module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL21$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and The Qt Company. For licensing terms
++** and conditions see http://www.qt.io/terms-conditions. For further
++** information use the contact form at http://www.qt.io/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 or version 3 as published by the Free
++** Software Foundation and appearing in the file LICENSE.LGPLv21 and
++** LICENSE.LGPLv3 included in the packaging of this file. Please review the
++** following information to ensure the GNU Lesser General Public License
++** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
++** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** As a special exception, The Qt Company gives you certain additional
++** rights. These rights are described in The Qt Company LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++//#define QSSLSOCKET_DEBUG
++//#define QT_DECRYPT_SSL_TRAFFIC
++
++#include "qsslsocket.h"
++
++#ifndef QT_NO_OPENSSL
++#   include "qsslsocket_openssl_p.h"
++#   include "qsslsocket_openssl_symbols_p.h"
++#endif
++
++#include "qsslcertificate_p.h"
++
++#ifdef Q_OS_DARWIN
++#   include <private/qcore_mac_p.h>
++#endif
++
++#include <QtCore/qdebug.h>
++
++#ifdef Q_OS_OSX
++#   include <Security/Security.h>
++#endif
++
++
++QT_BEGIN_NAMESPACE
++
++#ifdef Q_OS_OSX
++namespace {
++
++bool hasTrustedSslServerPolicy(SecPolicyRef policy, CFDictionaryRef props) {
++    QCFType<CFDictionaryRef> policyProps = SecPolicyCopyProperties(policy);
++    // only accept certificates with policies for SSL server validation for now
++    if (CFEqual(CFDictionaryGetValue(policyProps, kSecPolicyOid), kSecPolicyAppleSSL)) {
++        CFBooleanRef policyClient;
++        if (CFDictionaryGetValueIfPresent(policyProps, kSecPolicyClient, reinterpret_cast<const void**>(&policyClient)) &&
++            CFEqual(policyClient, kCFBooleanTrue)) {
++            return false; // no client certs
++        }
++        if (!CFDictionaryContainsKey(props, kSecTrustSettingsResult)) {
++            // as per the docs, no trust settings result implies full trust
++            return true;
++        }
++        CFNumberRef number = static_cast<CFNumberRef>(CFDictionaryGetValue(props, kSecTrustSettingsResult));
++        SecTrustSettingsResult settingsResult;
++        CFNumberGetValue(number, kCFNumberSInt32Type, &settingsResult);
++        switch (settingsResult) {
++        case kSecTrustSettingsResultTrustRoot:
++        case kSecTrustSettingsResultTrustAsRoot:
++            return true;
++        default:
++            return false;
++        }
++    }
++    return false;
++}
++
++bool isCaCertificateTrusted(SecCertificateRef cfCert, int domain)
++{
++    QCFType<CFArrayRef> cfTrustSettings;
++    OSStatus status = SecTrustSettingsCopyTrustSettings(cfCert, domain, &cfTrustSettings);
++    if (status == noErr) {
++        CFIndex size = CFArrayGetCount(cfTrustSettings);
++        // if empty, trust for everything (as per the Security Framework documentation)
++        if (size == 0) {
++            return true;
++        } else {
++            for (CFIndex i = 0; i < size; ++i) {
++                CFDictionaryRef props = static_cast<CFDictionaryRef>(CFArrayGetValueAtIndex(cfTrustSettings, i));
++                if (CFDictionaryContainsKey(props, kSecTrustSettingsPolicy)) {
++                    if (hasTrustedSslServerPolicy((SecPolicyRef)CFDictionaryGetValue(props, kSecTrustSettingsPolicy), props))
++                        return true;
++                }
++            }
++        }
++    } else {
++        qWarning("Error receiving trust for a CA certificate");
++    }
++    return false;
++}
++
++} // anon namespace
++#endif // Q_OS_OSX
++
++QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
++{
++    ensureInitialized();
++
++    QList<QSslCertificate> systemCerts;
++    // SecTrustSettingsCopyCertificates is not defined on iOS.
++#ifdef Q_OS_OSX
++    QCFType<CFArrayRef> cfCerts;
++    // iterate through all enum members, order:
++    // kSecTrustSettingsDomainUser, kSecTrustSettingsDomainAdmin, kSecTrustSettingsDomainSystem
++    for (int dom = kSecTrustSettingsDomainUser; dom <= kSecTrustSettingsDomainSystem; dom++) {
++        OSStatus status = SecTrustSettingsCopyCertificates(dom, &cfCerts);
++        if (status == noErr) {
++            const CFIndex size = CFArrayGetCount(cfCerts);
++            for (CFIndex i = 0; i < size; ++i) {
++                SecCertificateRef cfCert = (SecCertificateRef)CFArrayGetValueAtIndex(cfCerts, i);
++                QCFType<CFDataRef> derData = SecCertificateCopyData(cfCert);
++                if (::isCaCertificateTrusted(cfCert, dom)) {
++                    if (derData == NULL) {
++                        qWarning("Error retrieving a CA certificate from the system store");
++                    } else {
++                        systemCerts << QSslCertificate(QByteArray::fromCFData(derData), QSsl::Der);
++                    }
++                }
++            }
++        }
++    }
++#endif
++    return systemCerts;
++}
++
++QT_END_NAMESPACE
+diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
+index 415f147..7a3cb42 100644
+--- a/src/network/ssl/qsslsocket_openssl.cpp
++++ b/src/network/ssl/qsslsocket_openssl.cpp
+@@ -76,14 +76,6 @@
+ 
+ #include <string.h>
+ 
+-#ifdef Q_OS_DARWIN
+-#  include <private/qcore_mac_p.h>
+-#endif
+-
+-#ifdef Q_OS_OSX
+-#  include <Security/Security.h>
+-#endif
+-
+ QT_BEGIN_NAMESPACE
+ 
+ #if defined(Q_OS_WIN)
+@@ -672,6 +664,7 @@ void QSslSocketPrivate::resetDefaultEllipticCurves()
+     setDefaultSupportedEllipticCurves(curves);
+ }
+ 
++#ifndef Q_OS_DARWIN // Apple implementation in qsslsocket_mac_shared.cpp
+ QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
+ {
+     ensureInitialized();
+@@ -680,25 +673,7 @@ QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
+     timer.start();
+ #endif
+     QList<QSslCertificate> systemCerts;
+-    // note: also check implementation in openssl_mac.cpp
+-#if defined(Q_OS_OSX)
+-    // SecTrustSettingsCopyCertificates is not defined on iOS.
+-    QCFType<CFArrayRef> cfCerts;
+-
+-    OSStatus status = SecTrustSettingsCopyCertificates(kSecTrustSettingsDomainSystem, &cfCerts);
+-    if (status == noErr ) {
+-        const CFIndex size = CFArrayGetCount(cfCerts);
+-        for (CFIndex i = 0; i < size; ++i) {
+-            SecCertificateRef cfCert = (SecCertificateRef)CFArrayGetValueAtIndex(cfCerts, i);
+-            QCFType<CFDataRef> derData = SecCertificateCopyData(cfCert);
+-            if (derData == NULL) {
+-                qWarning("error retrieving a CA certificate from the system store");
+-            } else {
+-                systemCerts << QSslCertificate(QByteArray::fromCFData(derData), QSsl::Der);
+-            }
+-        }
+-    }
+-#elif defined(Q_OS_WIN)
++#if defined(Q_OS_WIN)
+     if (ptrCertOpenSystemStoreW && ptrCertFindCertificateInStore && ptrCertCloseStore) {
+         HCERTSTORE hSystemStore;
+ #if defined(Q_OS_WINCE)
+@@ -775,6 +750,7 @@ QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
+ 
+     return systemCerts;
+ }
++#endif // Q_OS_DARWIN
+ 
+ void QSslSocketBackendPrivate::startClientEncryption()
+ {
+diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
+index 29c47cd..8eb605b 100644
+--- a/src/network/ssl/ssl.pri
++++ b/src/network/ssl/ssl.pri
+@@ -62,7 +62,9 @@ contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
+                ssl/qsslsocket_openssl.cpp \
+                ssl/qsslsocket_openssl_symbols.cpp
+ 
+-android:!android-no-sdk: SOURCES += ssl/qsslsocket_openssl_android.cpp
++    darwin:SOURCES += ssl/qsslsocket_mac_shared.cpp
++
++    android:!android-no-sdk: SOURCES += ssl/qsslsocket_openssl_android.cpp
+ 
+     # Add optional SSL libs
+     # Static linking of OpenSSL with msvc:

admin/win/CMakeLists.txt

@@ -1,8 +0,0 @@
-# MSI package scripts, helper DLL and migration tools
-if(BUILD_WIN_MSI)
-    add_subdirectory(msi)
-endif()
-
-if(BUILD_WIN_MSI OR BUILD_WIN_TOOLS)
-    add_subdirectory(tools)
-endif()

admin/win/msi/CMakeLists.txt

@@ -1,25 +0,0 @@
-if(CMAKE_SIZEOF_VOID_P MATCHES 4)
-    set(MSI_BUILD_ARCH x86)
-else()
-    set(MSI_BUILD_ARCH x64)
-endif()
-
-string(SUBSTRING ${GIT_SHA1} 0 7 GIT_REVISION)
-
-set(VERSION "${MIRALL_VERSION_MAJOR}.${MIRALL_VERSION_MINOR}.${MIRALL_VERSION_PATCH}.${MIRALL_VERSION_BUILD}")
-
-set(MSI_INSTALLER_FILENAME "${APPLICATION_SHORTNAME}-${VERSION}-${MSI_BUILD_ARCH}.msi")
-
-configure_file(OEM.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/OEM.wxi)
-configure_file(collect-transform.xsl.in ${CMAKE_CURRENT_BINARY_DIR}/collect-transform.xsl)
-configure_file(make-msi.bat.in ${CMAKE_CURRENT_BINARY_DIR}/make-msi.bat)
-
-install(FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/OEM.wxi
-        ${CMAKE_CURRENT_BINARY_DIR}/collect-transform.xsl
-        ${CMAKE_CURRENT_BINARY_DIR}/make-msi.bat
-        Platform.wxi
-        Nextcloud.wxs
-        gui/banner.bmp
-        gui/dialog.bmp
-    DESTINATION msi/)

admin/win/msi/Nextcloud.wxs

@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- *
- * Copyright (C) by Michael Schuster <michael@schuster.ms>
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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.
- *
--->
-<?include $(sys.CURRENTDIR)OEM.wxi?>
-<?include $(sys.CURRENTDIR)Platform.wxi?>
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
-    <!--
-         When to change the Product GUID:
-         https://www.firegiant.com/wix/tutorial/upgrades-and-modularization/
-         https://www.firegiant.com/wix/tutorial/upgrades-and-modularization/checking-for-oldies/
-
-         We change the Product Id for every release, to let up-/downgrading always work.
-         But we then should never change the UpgradeCode.
-     -->
-    <Product Name="$(var.AppName)" Manufacturer="$(var.AppVendor)"
-        Id="*" 
-        UpgradeCode="$(var.UpgradeCode)"
-        Language="1033" Codepage="$(var.codepage)" Version="$(var.VerFull)">
-    <Package Id="*" Keywords="Installer" Description="$(var.AppName) $(var.VerDesc)" Manufacturer="$(var.AppVendor)"
-        InstallerVersion="300" Platform="$(var.Platform)" Languages="1033" Compressed="yes" SummaryCodepage="$(var.codepage)" InstallScope="perMachine" />
-
-    <!--
-        Upgrading: Since we always want to allow up-/downgrade, we don't specify a maximum version, thus
-                   leading the WiX linker (light.exe) to trigger the following warning:
-                        warning LGHT1076 : ICE61: This product should remove only older versions of itself. No Maximum version was detected for the current product. (WIX_UPGRADE_DETECTED)
-                   We suppress the warning: light.exe -sw1076
-        
-        If at some point we want to change this behaviour, read the docs:
-        https://www.firegiant.com/wix/tutorial/upgrades-and-modularization/replacing-ourselves/
-        https://www.joyofsetup.com/2010/01/16/major-upgrades-now-easier-than-ever/
-    -->
-    <MajorUpgrade Schedule="afterInstallInitialize" AllowDowngrades="yes" />
-
-    <Media Id="1" Cabinet="$(var.AppShortName).cab" EmbedCab="yes" />
-
-    <!-- If already installed: Use previously chosen path (use 32-bit registry like NSIS does) -->
-    <Property Id="INSTALLDIR">
-        <RegistrySearch Id="RegistryInstallDir" Type="raw" Root="HKLM" Key="Software\$(var.AppVendor)\$(var.AppName)" Win64="no" />
-    </Property>
-
-    <!-- Detect legacy NSIS installation -->
-    <Property Id="NSIS_UNINSTALLEXE">
-        <DirectorySearch Id="LegacyUninstallVersion" Path="[INSTALLDIR]">
-            <FileSearch Name="Uninstall.exe" />
-        </DirectorySearch>
-    </Property>
-
-    <!-- Property to disable update checks -->
-    <Property Id="SKIPAUTOUPDATE" Value="0" />
-
-    <!-- Quit / restart application -->
-    <util:RestartResource ProcessName="$(var.AppExe)" />
-
-    <!-- Helper DLL Custom Actions -->
-    <SetProperty Id="ExecNsisUninstaller" Value="&quot;$(var.AppShortName)&quot; &quot;[NSIS_UNINSTALLEXE]&quot;" Before="ExecNsisUninstaller" Sequence="execute" />
-    <SetProperty Id="RemoveNavigationPaneEntries" Value="&quot;$(var.AppName)&quot;" Before="RemoveNavigationPaneEntries" Sequence="execute" />
-
-    <InstallExecuteSequence>
-        <!-- Install: Remove previous NSIS installation, if detected -->
-        <Custom Action="ExecNsisUninstaller" Before="ProcessComponents">NSIS_UNINSTALLEXE AND NOT Installed</Custom>
-
-        <!-- Uninstall: Remove sync folders from Explorer's Navigation Pane, only effective for the current user (home users) -->
-        <Custom Action="RemoveNavigationPaneEntries" After="RemoveFiles">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
-
-        <!-- Schedule Reboot for the Shell Extensions -->
-        <ScheduleReboot After="InstallFinalize">NOT (DO_NOT_SCHEDULE_REBOOT=1)</ScheduleReboot>
-    </InstallExecuteSequence>
-
-    <!-- "Add or Remove" Programs Entries -->
-    <Property Id="ARPPRODUCTICON">$(var.AppIcon)</Property>
-    <Property Id="ARPHELPLINK">$(var.AppHelpLink)</Property>
-    <Property Id="ARPURLINFOABOUT">$(var.AppInfoLink)</Property>
-
-    <!-- https://www.firegiant.com/wix/tutorial/com-expression-syntax-miscellanea/add-or-remove-programs-entries/ -->
-    <!--
-    <Property Id="ARPNOMODIFY">1</Property>
-    <Property Id="ARPNOREPAIR">1</Property>
-    -->
-
-    <!-- App icon -->
-    <Icon Id="$(var.AppIcon)" SourceFile="$(var.HarvestAppDir)\$(var.AppIcon)" />
-
-    <!-- Custom bitmaps -->
-    <WixVariable Id="WixUIBannerBmp" Value="$(var.UIBannerBmp)" />
-    <WixVariable Id="WixUIDialogBmp" Value="$(var.UIDialogBmp)" />
-
-    <!-- Custom icons -->
-    <!-- https://wixtoolset.org/documentation/manual/v3/wixui/wixui_customizations.html -->
-    <!--
-    <WixVariable Id="WixUIExclamationIco" Value="ui\Exclam.ico" />
-    <WixVariable Id="WixUIInfoIco" Value="ui\Info.ico" />
-    <WixVariable Id="WixUINewIco" Value="ui\New.ico" />
-    <WixVariable Id="WixUIUpIco" Value="ui\Up.ico" />
-    -->
-
-    <!-- Custom license -->
-    <!--
-    <WixVariable Id="WixUILicenseRtf" Value="$(var.AppLicenseRtf)" />
-    -->
-
-    <UI>
-        <UIRef Id="WixUI_FeatureTree" />
-        <UIRef Id="WixUI_ErrorProgressText" />
-
-        <!-- Skip the license page -->
-        <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="CustomizeDlg" Order="3">1</Publish>
-        <!-- Skip the page on the way back too -->
-        <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3">1</Publish>
-
-        <!-- https://wixtoolset.org/documentation/manual/v3/howtos/ui_and_localization/run_program_after_install.html -->        
-        <Publish Dialog="ExitDialog" 
-            Control="Finish" 
-            Event="DoAction" 
-            Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
-
-        <ProgressText Action="ExecNsisUninstaller">Removing previous installation</ProgressText>
-        <ProgressText Action="KillProcess">Trying to terminate application process of previous installation</ProgressText>
-        <ProgressText Action="RemoveNavigationPaneEntries">Removing sync folders from Explorer's Navigation Pane</ProgressText>
-    </UI>
-
-    <!-- "Launch" checkbox -->
-    <Property Id="WixShellExecTarget" Value="[#MainExecutable]" />
-    <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
-    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch $(var.AppName)" />
-    <SetProperty Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1" Before="CostInitialize">NOT (LAUNCH=0)</SetProperty>
-
-    <!-- Components -->
-    <Directory Id="TARGETDIR" Name="SourceDir">
-        <Directory Id="$(var.PlatformProgramFilesFolder)" Name="PFiles">
-            <Directory Id="INSTALLDIR" Name="$(var.AppName)">
-                <!-- Shell Extensions -->
-                <Directory Id="ShellExtDir" Name="shellext" />
-            </Directory>
-        </Directory>
-
-        <Directory Id="ProgramMenuFolder" Name="Programs">
-            <!-- Start Menu Shortcut -->
-            <Component Id="StartMenuIcon" Guid="*" Win64="$(var.PlatformWin64)">
-                <Shortcut Id="StartMenu" Name="$(var.AppName)" Target="[INSTALLDIR]$(var.AppExe)" WorkingDirectory="INSTALLDIR" Icon="$(var.AppIcon)" IconIndex="0" Advertise="no" />
-                <RegistryValue Root="HKCU" Key="Software\$(var.AppVendor)\$(var.AppName)" Name="installedStartMenuShortcut" Type="integer" Value="1" KeyPath="yes"/>
-            </Component>
-        </Directory>
-
-        <Directory Id="DesktopFolder" Name="Desktop">
-            <!-- Desktop Shortcut -->
-            <Component Id="DesktopIcon" Guid="*" Win64="$(var.PlatformWin64)">
-                <Shortcut Id="Desktop" Name="$(var.AppName)" Target="[INSTALLDIR]$(var.AppExe)" WorkingDirectory="INSTALLDIR" Icon="$(var.AppIcon)" IconIndex="0" Advertise="no" />
-                <RegistryValue Root="HKCU" Key="Software\$(var.AppVendor)\$(var.AppName)" Name="installedDesktopShortcut" Type="integer" Value="1" KeyPath="yes"/>
-            </Component>
-        </Directory>
-    </Directory>
-
-    <DirectoryRef Id="TARGETDIR">
-        <!-- Version numbers used to detect existing installation (use 32-bit registry like NSIS does) -->
-        <Component Id="RegistryVersionInfo" Guid="*" Win64="no">
-            <RegistryKey Root="HKLM" Key="Software\$(var.AppVendor)\$(var.AppName)" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
-                <RegistryValue Type="string" Value="[INSTALLDIR]" />
-                <RegistryValue Type="integer" Name="VersionMajor" Value="$(var.VerMajor)" />
-                <RegistryValue Type="integer" Name="VersionMinor" Value="$(var.VerMinor)" />
-                <RegistryValue Type="integer" Name="VersionRevision" Value="$(var.VerRevision)" />
-                <RegistryValue Type="integer" Name="VersionBuild" Value="$(var.VerBuild)" />
-
-                <!-- Save MSI ProductCode to allow being uninstalled by custom tools -->
-                <RegistryValue Type="string" Name="InstallerProductCode" Value="[ProductCode]" />
-            </RegistryKey>
-        </Component>
-
-        <!-- Platform bitness-dependent settings -->
-        <Component Id="RegistryDefaultSettings" Guid="*" Win64="$(var.PlatformWin64)">
-            <RegistryKey Root="HKLM" Key="Software\$(var.AppVendor)\$(var.AppName)">
-                <!-- Property to disable update checks -->
-                <RegistryValue Type="integer" Name="skipUpdateCheck" Value="[SKIPAUTOUPDATE]" />
-            </RegistryKey>
-        </Component>
-    </DirectoryRef>
-
-    <!-- Features -->
-    <Feature Id="Client" Title="$(var.AppName) $(var.PlatformBitness)" Display="collapse" Absent="disallow" ConfigurableDirectory="INSTALLDIR"
-        Description="$(var.AppName) $(var.VerDesc)">
-        <ComponentGroupRef Id="ClientFiles" />
-
-        <ComponentRef Id="RegistryVersionInfo" />
-        <ComponentRef Id="RegistryDefaultSettings" />
-
-        <Feature Id="ShellExtensions" Title="Integration for Windows Explorer"
-            Description="This feature requires a reboot." >
-            <ComponentGroupRef Id="ShellExtensions" />
-
-            <Condition Level="0">(NO_SHELL_EXTENSIONS=1)</Condition>
-        </Feature>
-
-        <Feature Id="StartMenuShortcuts" Title="Start Menu Shortcut">
-            <ComponentRef Id="StartMenuIcon" />
-            <Condition Level="0">(NO_START_MENU_SHORTCUTS=1)</Condition>
-        </Feature>
-
-        <Feature Id="DesktopShortcut" Title="Desktop Shortcut">
-            <ComponentRef Id="DesktopIcon" />
-            <Condition Level="0">(NO_DESKTOP_SHORTCUT=1)</Condition>
-        </Feature>
-    </Feature>
-
-    </Product>
-</Wix>

admin/win/msi/OEM.wxi.in

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- *
- * Copyright (C) by Michael Schuster <michael@schuster.ms>
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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.
- *
--->
-<Include>
-
-    <!-- Changing the Vendor breaks registry (also NSIS) product detection -->
-    <?define AppVendor = "@APPLICATION_VENDOR@" ?>
-
-    <!-- App Defines -->
-    <?define AppName = "@APPLICATION_NAME@" ?>
-    <?define AppShortName = "@APPLICATION_EXECUTABLE@" ?>
-
-    <?define AppIcon = "@APPLICATION_ICON_NAME@.ico" ?>
-    <?define AppExe = "@APPLICATION_EXECUTABLE@.exe" ?>
-
-    <?define AppHelpLink = "https://@APPLICATION_DOMAIN@/" ?>
-    <?define AppInfoLink = "$(var.AppHelpLink)" ?>
-
-    <!-- Custom license: To use it, also remove the "Skip the license page" stuff in the <UI> section
-                         and uncomment <WixVariable Id="WixUILicenseRtf"...
-    <?define AppLicenseRtf = "path\License.rtf" ?>
-    -->
-
-    <!-- App Version -->
-    <?define VerMajor = "@MIRALL_VERSION_MAJOR@" ?>
-    <?define VerMinor = "@MIRALL_VERSION_MINOR@" ?>
-    <?define VerRevision = "@MIRALL_VERSION_PATCH@" ?>
-    <?define VerBuild = "@MIRALL_VERSION_BUILD@" ?>
-    <?define VerStd = "$(var.VerMajor).$(var.VerMinor).$(var.VerRevision)" ?>
-    <?define VerFull = "$(var.VerStd).$(var.VerBuild)" ?>
-
-    <?define VerDesc = "@MIRALL_VERSION_STRING@ (Git revision @GIT_REVISION@)" ?>
-
-    <!-- MSI upgrade support -->
-    <?define UpgradeCode = "@WIN_MSI_UPGRADE_CODE@" ?>
-
-    <!-- UI resources -->
-    <?define UIBannerBmp = "banner.bmp" ?>
-    <?define UIDialogBmp = "dialog.bmp" ?>
-
-</Include>

admin/win/msi/Platform.wxi

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- *
- * Copyright (C) by Michael Schuster <michael@schuster.ms>
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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.
- *
--->
-<Include>
-
-    <!--
-        MSI packages are built either for x86 or x64, we use defines to maintain a single WiX script.
-
-        Some hints:
-        https://www.joyofsetup.com/2010/05/14/working-hard-or-hardly-working/
-        https://stackoverflow.com/questions/18628790/build-wix-3-6-project-targeting-x64
-        https://www.howtobuildsoftware.com/index.php/how-do/1oQ/wix-detect-if-32-or-64-bit-windows-and-define-var
-    -->
-
-    <?if $(var.Platform) = x64 ?>
-    <?define PlatformBitness = "(64-bit)" ?>
-    <?define PlatformWin64 = "yes" ?>
-    <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
-    <?else ?>
-    <?define PlatformBitness = "(32-bit)" ?>
-    <?define PlatformWin64 = "no" ?>
-    <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
-    <?endif ?>
-
-</Include>

admin/win/msi/collect-transform.xsl.in

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
-
-  <xsl:output method="xml" indent="yes" />
-
-  <!-- Copy all attributes and elements to the output. -->
-  <xsl:template match="@*|*">
-    <xsl:copy>
-      <xsl:apply-templates select="@*" />
-      <xsl:apply-templates select="*" />
-    </xsl:copy>
-  </xsl:template>
-
-  <!-- Identify MainExecutable -->
-  <xsl:key name="exe-search" match="wix:File[contains(@Source, '@APPLICATION_EXECUTABLE@.exe')]" use="@Id" />
-  <xsl:template match="wix:File[key('exe-search', @Id)]">
-    <xsl:copy>
-      <xsl:apply-templates select="@*" />
-      <xsl:attribute name="Id">
-        <xsl:text>MainExecutable</xsl:text>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </xsl:copy>
-  </xsl:template>
-
-  <!-- Exclude Shell Extensions -->
-  <xsl:key name="shellext-search" match="wix:Component[contains(wix:File/@Source, 'shellext')]" use="@Id" />
-  <xsl:template match="wix:Component[key('shellext-search', @Id)]" />
-  <xsl:template match="wix:ComponentRef[key('shellext-search', @Id)]" />
-
-  <xsl:key name="shellext-search" match="wix:Directory[contains(@Name, 'shellext')]" use="@Id" />
-  <xsl:template match="wix:Directory[key('shellext-search', @Id)]" />
-
-  <!-- Exclude VC Redist -->
-  <xsl:key name="vc-redist-32-search" match="wix:Component[contains(wix:File/@Source, 'vc_redist.x86.exe')]" use="@Id" />
-  <xsl:template match="wix:Component[key('vc-redist-32-search', @Id)]" />
-  <xsl:template match="wix:ComponentRef[key('vc-redist-32-search', @Id)]" />
-
-  <xsl:key name="vc-redist-64-search" match="wix:Component[contains(wix:File/@Source, 'vc_redist.x64.exe')]" use="@Id" />
-  <xsl:template match="wix:Component[key('vc-redist-64-search', @Id)]" />
-  <xsl:template match="wix:ComponentRef[key('vc-redist-64-search', @Id)]" />
-</xsl:stylesheet>

admin/win/msi/gui/banner.svg

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 462.18754 54.374996"
-   enable-background="new 0 0 196.6 72"
-   xml:space="preserve"
-   inkscape:version="1.0 (4035a4f, 2020-05-01)"
-   sodipodi:docname="banner.svg"
-   width="493"
-   height="58"
-   inkscape:export-filename="/Users/misch/nextcloud/_icon/_msi/banner.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"><metadata
-     id="metadata20"><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 /></cc:Work></rdf:RDF></metadata><defs
-     id="defs18"><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8812"><circle
-         id="circle8814"
-         cx="95.669289"
-         cy="95.669296"
-         r="79.724197"
-         style="fill:#00080d;fill-opacity:1;stroke-width:1" /></clipPath></defs><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1440"
-     inkscape:window-height="812"
-     id="namedview16"
-     showgrid="false"
-     inkscape:zoom="1.3964178"
-     inkscape:cx="264.97589"
-     inkscape:cy="100.72146"
-     inkscape:current-layer="Layer_1"
-     fit-margin-top="10"
-     fit-margin-left="10"
-     fit-margin-right="10"
-     fit-margin-bottom="10"
-     inkscape:window-x="0"
-     inkscape:window-y="23"
-     inkscape:window-maximized="1"
-     units="px"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-page="true"
-     inkscape:document-rotation="0" /><path
-     inkscape:connector-curvature="0"
-     id="path1052"
-     d="m 411.83858,10.876373 c -7.55537,0 -13.95917,5.122046 -15.94393,12.061838 -1.72495,-3.680971 -5.463,-6.259801 -9.76856,-6.259801 -5.92119,0 -10.78856,4.867369 -10.78856,10.78855 0,5.921172 4.86737,10.790763 10.78856,10.790763 4.30556,0 8.04361,-2.580407 9.76856,-6.262024 1.98476,6.94032 8.38856,12.064068 15.94393,12.064068 7.49951,0 13.87065,-5.046471 15.90617,-11.908511 1.75682,3.598038 5.4486,6.106467 9.69302,6.106467 5.92118,0 10.79076,-4.869591 10.79076,-10.790763 0,-5.921181 -4.86958,-10.78855 -10.79076,-10.78855 -4.24442,0 -7.9362,2.506858 -9.69302,6.10425 -2.03552,-6.861503 -8.40666,-11.906287 -15.90617,-11.906287 z m 0,6.333131 c 5.70346,0 10.25968,4.554019 10.25968,10.257456 0,5.703427 -4.55622,10.259672 -10.25968,10.259672 -5.70341,0 -10.25743,-4.556245 -10.25743,-10.259672 0,-5.703437 4.55402,-10.257454 10.25743,-10.257456 z m -25.71249,5.802039 c 2.4988,0 4.45763,1.9566 4.45763,4.455417 0,2.498807 -1.95883,4.457631 -4.45763,4.457631 -2.49882,0 -4.45544,-1.958824 -4.45544,-4.457631 0,-2.498817 1.95662,-4.455417 4.45544,-4.455417 z m 51.31168,0 c 2.49883,0 4.45764,1.9566 4.45764,4.455417 0,2.498807 -1.95883,4.457631 -4.45764,4.457631 -2.49879,0 -4.45541,-1.958824 -4.45541,-4.457631 0,-2.498817 1.95662,-4.455417 4.45541,-4.455417 z"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#0082c9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.56218;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     inkscape:export-filename="Nextcloud Hub logo variants.png"
-     inkscape:export-xdpi="300"
-     inkscape:export-ydpi="300" /></svg>

admin/win/msi/make-msi.bat.in

@@ -1,26 +0,0 @@
-@echo off
-set HarvestAppDir=%~1
-set BuildArch=@MSI_BUILD_ARCH@
-
-if "%HarvestAppDir%" == "" (
-    echo "Missing parameter: Please specify file collection source path (HarvestAppDir)."
-    exit 1
-)
-
-if "%WIX%" == "" (
-    echo "WiX Toolset path not set (environment variable 'WIX'). Please install the WiX Toolset."
-    exit 1
-)
-
-Rem Generate collect.wxs
-"%WIX%\bin\heat.exe" dir "%HarvestAppDir%" -dr INSTALLDIR -sreg -srd -sfrag -ag -cg ClientFiles -var var.HarvestAppDir -platform='%BuildArch%' -t collect-transform.xsl -out collect.wxs
-if %ERRORLEVEL% neq 0 exit %ERRORLEVEL%
-
-Rem Compile en-US (https://www.firegiant.com/wix/tutorial/transforms/morphing-installers/)
-"%WIX%\bin\candle.exe" -dcodepage=1252 -dPlatform=%BuildArch% -arch %BuildArch% -dHarvestAppDir="%HarvestAppDir%" -ext WixUtilExtension NCMsiHelper.wxs WinShellExt.wxs collect.wxs Nextcloud.wxs
-if %ERRORLEVEL% neq 0 exit %ERRORLEVEL%
-
-Rem Link MSI package
-"%WIX%\bin\light.exe" -sw1076 -ext WixUIExtension -ext WixUtilExtension -cultures:en-us NCMsiHelper.wixobj WinShellExt.wixobj collect.wixobj Nextcloud.wixobj -out "@MSI_INSTALLER_FILENAME@"
-
-exit %ERRORLEVEL%

admin/win/nsi/l10n/.tx/config

@@ -0,0 +1,48 @@
+[main]
+host = https://www.transifex.com
+
+[owncloud.client-nsis]
+host = https://www.transifex.com
+source_file = pofiles/messages.pot
+source_lang = en
+type = PO
+minimum_perc = 5
+
+# simple one-to-one language mappings
+trans.ca = pofiles/ca.po
+trans.el = pofiles/el.po
+trans.es_AR = pofiles/es_AR.po
+trans.es = pofiles/es.po
+trans.eu = pofiles/eu.po
+trans.fa = pofiles/fa.po
+trans.fr = pofiles/fr.po
+trans.gl = pofiles/gl.po
+trans.it = pofiles/it.po
+trans.nb_NO = pofiles/nb_NO.po
+trans.nl = pofiles/nl.po
+trans.pl = pofiles/pl.po
+trans.pt_BR = pofiles/pt_BR.po
+trans.ru = pofiles/ru.po
+trans.sl = pofiles/sl.po
+trans.sv = pofiles/sv.po
+trans.tr = pofiles/tr.po
+trans.uk = pofiles/uk.po
+trans.zh_CN = pofiles/zh_CN.po
+trans.zh_TW = pofiles/zh_TW.po
+
+# special handling below
+
+# de_DE holds the formal translation which we want as default
+trans.de_DE = pofiles/de.po
+
+# choose one of the given translations on transifex as default
+trans.pt_PT = pofiles/pt.po
+
+# choose a special language as more generic default
+trans.cs_CZ = pofiles/cs.po
+trans.et_EE = pofiles/et.po
+trans.fi_FI = pofiles/fi.po
+trans.hu_HU = pofiles/hu.po
+trans.ja_JP = pofiles/ja.po
+trans.sk_SK = pofiles/sk.po
+trans.th_TH = pofiles/th.po

admin/win/nsi/l10n/Basque.nsh

@@ -1,3 +1,4 @@
+# Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Erakutsi bertsio-berritze oharrak"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Gelditu beharreko ${APPLICATION_EXECUTABLE} prozesua(k) aurkitu dira.$\nNahi duzu instalatzaileak zure partetik hauek gelditzea?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "${APPLICATION_EXECUTABLE} prozesuak hiltzen."

admin/win/nsi/l10n/Catalan.nsh

@@ -1,3 +1,4 @@
+# Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar les notes de versió"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "S'ha trobat el(s) procés ${APPLICATION_EXECUTABLE} que s'ha d'aturar.$\nVoleu que l'instal·lador l'aturi?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "S'estan matant els processos ${APPLICATION_EXECUTABLE}."

admin/win/nsi/l10n/Czech.nsh

@@ -1,42 +1,43 @@
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Zobrazit poznámky k vydání"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Nalezen proces(y) ${APPLICATION_EXECUTABLE}, které je nutné ukončit .$\nPřejete si, aby je instalátor za vás ukončil?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Ukončuji procesy ${APPLICATION_EXECUTABLE}."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Proces k ukončení nebyl nalezen! "
-StrCpy $PageReinstall_NEW_Field_1 "Starší verze ${APPLICATION_NAME} je nainstalována na tomto systému. Doporučuje se předem tuto verzi odinstalovat. Zvolte operaci, kterou chcete uskutečnit, a klikněte na tlačítko Další pro pokračování."
-StrCpy $PageReinstall_NEW_Field_2 "Odinstalovat před instalací"
-StrCpy $PageReinstall_NEW_Field_3 "Neodinstalovávat"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Již nainstalováno"
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Zobrazit pozn mky k vyd n¡"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Nalezen proces(y) ${APPLICATION_EXECUTABLE}, kter‚ je nutn‚ ukonŸit .$\nPýejete si, aby je instal tor za v s ukonŸil?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "UkonŸuji procesy ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Proces k ukonŸen¡ nebyl nalezen! "
+StrCpy $PageReinstall_NEW_Field_1 "Starç¡ verze ${APPLICATION_NAME} je nainstalov na na tomto syst‚mu. DoporuŸuje se pýedem tuto verzi odinstalovat. Zvolte operaci, kterou chcete uskuteŸnit, a kliknØte na tlaŸ¡tko Dalç¡ pro pokraŸov n¡."
+StrCpy $PageReinstall_NEW_Field_2 "Odinstalovat pýed instalac¡"
+StrCpy $PageReinstall_NEW_Field_3 "Neodinstalov vat"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ji§ nainstalov no"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Zvolte, jak chcete ${APPLICATION_NAME} nainstalovat."
-StrCpy $PageReinstall_OLD_Field_1 "Novější verze aplikace ${APPLICATION_NAME} je již nainstalována. Instalace starší verze se nedoporučuje. Pokud opravdu chcete tuto starší verzi nainstalovat, je lepší nejprve odinstalovat současnou verzi. Zvolte požadovanou operaci a klikněte na Další pro pokračování."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} je již nainstalována.$\n$\nZvolte požadovanou operaci a klikněte na Další pro pokračování."
-StrCpy $PageReinstall_SAME_Field_2 "Přidat či znovu instalovat komponenty"
+StrCpy $PageReinstall_OLD_Field_1 "NovØjç¡ verze aplikace ${APPLICATION_NAME} je ji§ nainstalov na. Instalace starç¡ verze se nedoporuŸuje. Pokud opravdu chcete tuto starç¡ verzi nainstalovat, je lepç¡ nejprve odinstalovat souŸasnou verzi. Zvolte po§adovanou operaci a kliknØte na Dalç¡ pro pokraŸov n¡."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} je ji§ nainstalov na.$\n$\nZvolte po§adovanou operaci a kliknØte na Dalç¡ pro pokraŸov n¡."
+StrCpy $PageReinstall_SAME_Field_2 "Pýidat Ÿi znovu instalovat komponenty"
 StrCpy $PageReinstall_SAME_Field_3 "Odinstalovat ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Odinstalovat ${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Vyberte možnost údržby k provedení."
-StrCpy $SEC_APPLICATION_DETAILS "Instalují se náležitosti ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integrace do průzkumníka Windows"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalace integrace do průzkumníka Windows"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Zástupce v Nabídce Start"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Přidávám zástupce pro ${APPLICATION_NAME} do Nabídky Start."
-StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Zástupce na ploše"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Vytvářím zástupce na ploše"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Zástupce v panelu rychlého spuštění"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Vytvářím zástupce v panelu rychlého spuštění"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Náležitosti ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Zástupce ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Zástupce na ploše pro ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Zástupce rychlého spuštění pro ${APPLICATION_NAME}."
-StrCpy $UNINSTALLER_FILE_Detail "Zapisuji odinstalátor"
-StrCpy $UNINSTALLER_REGISTRY_Detail "Zapisuji instalátor do registrů"
-StrCpy $UNINSTALLER_FINISHED_Detail "Dokončeno"
-StrCpy $UNINSTALL_MESSAGEBOX "Nezdá se, že ${APPLICATION_NAME} je nainstalována v adresáři '$INSTDIR'.$\n$\nChcete pokračovat (nedoporučuje se)?"
-StrCpy $UNINSTALL_ABORT "Odinstalace zrušena uživatelem"
-StrCpy $INIT_NO_QUICK_LAUNCH "Zástupce rychlého spuštění (není k dispozici)"
-StrCpy $INIT_NO_DESKTOP "Zástupce na ploše (přepíše existující)"
-StrCpy $UAC_ERROR_ELEVATE "Nelze zvýšit, chyba:"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Tento instalátor vyžaduje správcovská oprávnění, opakujte znovu"
-StrCpy $INIT_INSTALLER_RUNNING "Instalátor je již spuštěn."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Tento odinstalátor vyžaduje správcovská oprávnění, opakujte znovu"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Služba přihlášení neběží, ukončuji!"
-StrCpy $INIT_UNINSTALLER_RUNNING "Odinstalátor je již spuštěn."
-StrCpy $SectionGroup_Shortcuts "Zástupci"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Vyberte mo§nost £dr§by k proveden¡."
+StrCpy $SEC_APPLICATION_DETAILS "Instaluj¡ se n le§itosti ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integrace do pr…zkumn¡ka Windows"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalace integrace do pr…zkumn¡ka Windows"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Z stupce v Nab¡dce Start"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Pýid v m z stupce pro ${APPLICATION_NAME} do Nab¡dky Start."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Z stupce na ploçe"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Vytv ý¡m z stupce na ploçe"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Z stupce v panelu rychl‚ho spuçtØn¡"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Vytv ý¡m z stupce v panelu rychl‚ho spuçtØn¡"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "N le§itosti ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Z stupce ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Z stupce na ploçe pro ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Z stupce rychl‚ho spuçtØn¡ pro ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_FILE_Detail "Zapisuji odinstal tor"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Zapisuji instal tor do registr…"
+StrCpy $UNINSTALLER_FINISHED_Detail "DokonŸeno"
+StrCpy $UNINSTALL_MESSAGEBOX "Nezd  se, §e ${APPLICATION_NAME} je nainstalov na v adres ýi '$INSTDIR'.$\n$\nChcete pokraŸovat (nedoporuŸuje se)?"
+StrCpy $UNINSTALL_ABORT "Odinstalace zruçena u§ivatelem"
+StrCpy $INIT_NO_QUICK_LAUNCH "Z stupce rychl‚ho spuçtØn¡ (nen¡ k dispozici)"
+StrCpy $INIT_NO_DESKTOP "Z stupce na ploçe (pýep¡çe existuj¡c¡)"
+StrCpy $UAC_ERROR_ELEVATE "Nelze zvìçit, chyba:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Tento instal tor vy§aduje spr vcovsk  opr vnØn¡, opakujte znovu"
+StrCpy $INIT_INSTALLER_RUNNING "Instal tor je ji§ spuçtØn."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Tento odinstal tor vy§aduje spr vcovsk  opr vnØn¡, opakujte znovu"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Slu§ba pýihl çen¡ nebا¡, ukonŸuji!"
+StrCpy $INIT_UNINSTALLER_RUNNING "Odinstal tor je ji§ spuçtØn."
+StrCpy $SectionGroup_Shortcuts "Z stupci"

admin/win/nsi/l10n/Dutch.nsh

@@ -1,14 +1,15 @@
+# Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Toon opmerkingen bij deze versie"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Gevonden ${APPLICATION_EXECUTABLE} proces(sen) moet worden gestopt.$\nWilt u dat het installatieprogramma dat voor u doet?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Stoppen ${APPLICATION_EXECUTABLE} processen."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Het te stoppen proces is niet gevonden!"
-StrCpy $PageReinstall_NEW_Field_1 "Er is een oudere versie van ${APPLICATION_NAME} geïnstalleerd op uw systeem. geadviseerd wordt om de huidige versie te de-installeren voordat de nieuwe versie wordt geïnstalleerd. Selecteer de uit te voeren actie en klik op Verder om door te gaan."
+StrCpy $PageReinstall_NEW_Field_1 "Er is een oudere versie van ${APPLICATION_NAME} geïnstalleerd op uw systeem. geadviseerd wordt om de huidige versie te de-installeren voordat de nieuwe versie wordt geïnstalleerd. Selecteer de uit te voeren actie en klik op Verder om door te gaan."
 StrCpy $PageReinstall_NEW_Field_2 "Verwijder oude versie"
 StrCpy $PageReinstall_NEW_Field_3 "Behoud oude versie"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Al geïnstalleerd"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Al geïnstalleerd"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Kies hoe u ${APPLICATION_NAME} wilt installeren."
-StrCpy $PageReinstall_OLD_Field_1 "Er is al een recentere versie van ${APPLICATION_NAME} geïnstalleerd! Installeren van een oudere versie wordt niet aangeraden. Als u echt de oudere versie wilt installeren, adviseren we de huidige versie eerst te verwijderen. Kies de actie die u wilt uitvoeren en druk op Verder om door te gaan."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is al geïnstalleerd.$\n$\nKies de actie die u uit wil voeren en druk op Verder om door te gaan."
+StrCpy $PageReinstall_OLD_Field_1 "Er is al een recentere versie van ${APPLICATION_NAME} geïnstalleerd! Installeren van een oudere versie wordt niet aangeraden. Als u echt de oudere versie wilt installeren, adviseren we de huidige versie eerst te verwijderen. Kies de actie die u wilt uitvoeren en druk op Verder om door te gaan."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is al geïnstalleerd.$\n$\nKies de actie die u uit wil voeren en druk op Verder om door te gaan."
 StrCpy $PageReinstall_SAME_Field_2 "Toevoegen/herinstalleren componenten"
 StrCpy $PageReinstall_SAME_Field_3 "De-installeer ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "De-installeer ${APPLICATION_NAME}"
@@ -29,7 +30,7 @@ StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Snelstart snelkoppeling voor ${APPL
 StrCpy $UNINSTALLER_FILE_Detail "Wegschrijven Uninstaller"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Wegschrijven installer Registersleutels"
 StrCpy $UNINSTALLER_FINISHED_Detail "Klaar"
-StrCpy $UNINSTALL_MESSAGEBOX "Het lijkt er niet op dat ${APPLICATION_NAME} is geïnstalleerd in de map '$INSTDIR'.$\n$\nToch doorgaan (niet aangeraden)?"
+StrCpy $UNINSTALL_MESSAGEBOX "Het lijkt er niet op dat ${APPLICATION_NAME} is geïnstalleerd in de map '$INSTDIR'.$\n$\nToch doorgaan (niet aangeraden)?"
 StrCpy $UNINSTALL_ABORT "De-installatie afgebroken door de gebruiker"
 StrCpy $INIT_NO_QUICK_LAUNCH "Snelstart snelkoppeling (N/A)"
 StrCpy $INIT_NO_DESKTOP "Bureaublad snelkoppeling (overschrijft huidige)"

admin/win/nsi/l10n/English.nsh

@@ -1,3 +1,4 @@
+# Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Show release notes"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Found ${APPLICATION_EXECUTABLE} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Killing ${APPLICATION_EXECUTABLE} processes."

admin/win/nsi/l10n/Estonian.nsh

@@ -1,42 +1,43 @@
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Näita väljalaske märkmeid"
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Näita väljalaske märkmeid"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Leitud protsess(id) ${processName} mis tuleks peatada. $\nKas soovid, et installer seiskaks need?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "${APPLICATION_EXECUTABLE} protsessi lõpetamine."
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "${APPLICATION_EXECUTABLE} protsessi lõpetamine."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Ei leitud protsessi, mida tappa!"
-StrCpy $PageReinstall_NEW_Field_1 "Üks vanem versioon ${APPLICATION_NAME} on juba paigaldatud. On soovitav see eemaldada enne uue paigaldamist. Vali tehtav toiming ning kliki Jätka."
+StrCpy $PageReinstall_NEW_Field_1 "Üks vanem versioon ${APPLICATION_NAME} on juba paigaldatud. On soovitav see eemaldada enne uue paigaldamist. Vali tehtav toiming ning kliki Jätka."
 StrCpy $PageReinstall_NEW_Field_2 "Eemalda enne paigaldamist"
-StrCpy $PageReinstall_NEW_Field_3 "Ära paigalda"
+StrCpy $PageReinstall_NEW_Field_3 "Ära paigalda"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Juba paigaldatud"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Vali, kuidas sa soovid paigaldada ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "Uuem versioon ${APPLICATION_NAME} on juba paigaldatud! Vanema versiooni paigaldus ei ole soovitatav. Kui tõesti tahad paigaldada vanemat versiooni, siis on parem esmalt eemaldada olemasolev. Vali tehtav toiming ning kliki Jätka."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} on juba paigaldatud.$\n$\nVali toiming, mida sa tahad sooritada ning kliki jätkamiseks nuppu Next."
+StrCpy $PageReinstall_OLD_Field_1 "Uuem versioon ${APPLICATION_NAME} on juba paigaldatud! Vanema versiooni paigaldus ei ole soovitatav. Kui tõesti tahad paigaldada vanemat versiooni, siis on parem esmalt eemaldada olemasolev. Vali tehtav toiming ning kliki Jätka."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} on juba paigaldatud.$\n$\nVali toiming, mida sa tahad sooritada ning kliki jätkamiseks nuppu Next."
 StrCpy $PageReinstall_SAME_Field_2 "Lisa/Taaspaigalda komponente"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalli ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalli ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Vali hooldustegevus, mida sa soovid sooritada."
-StrCpy $SEC_APPLICATION_DETAILS "Paigaldan ${APPLICATION_NAME} põhiosa."
+StrCpy $SEC_APPLICATION_DETAILS "Paigaldan ${APPLICATION_NAME} põhiosa."
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integreerimine Windows Exploreriga"
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Paigalda Windows Exploreriga integreerimine"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start Menüü programmide otsetee"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Lisan ${APPLICATION_NAME} otsetee Start menüüsse."
-StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Töölaua otsetee"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Töölaua otseteede loomine"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start Menüü programmide otsetee"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Lisan ${APPLICATION_NAME} otsetee Start menüüsse."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Töölaua otsetee"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Töölaua otseteede loomine"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Kiirvaliku otsetee"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Kiirvaliku otsetee loomine"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} põhiosa."
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} põhiosa."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} otsetee."
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Töölaua otsetee rakendusele ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Töölaua otsetee rakendusele ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Kiirvaliku otsetee rakendusele ${APPLICATION_NAME}."
 StrCpy $UNINSTALLER_FILE_Detail "Desinstallija kirjutamine"
-StrCpy $UNINSTALLER_REGISTRY_Detail "Kirjutan paigaldaja registri võtmeid"
-StrCpy $UNINSTALLER_FINISHED_Detail "Lõpetatud"
-StrCpy $UNINSTALL_MESSAGEBOX "Ei leia, et ${APPLICATION_NAME} oleks paigaldatud kataloogi '$INSTDIR'.$\n$\nJätkata sellele vaatamata (pole soovitav)?"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Kirjutan paigaldaja registri võtmeid"
+StrCpy $UNINSTALLER_FINISHED_Detail "Lõpetatud"
+StrCpy $UNINSTALL_MESSAGEBOX "Ei leia, et ${APPLICATION_NAME} oleks paigaldatud kataloogi '$INSTDIR'.$\n$\nJätkata sellele vaatamata (pole soovitav)?"
 StrCpy $UNINSTALL_ABORT "Desinstallimine on kasutaja poolt katkestatud"
 StrCpy $INIT_NO_QUICK_LAUNCH "Kiirvaliku otsetee (N/A)"
-StrCpy $INIT_NO_DESKTOP "Ikoon töölaual (kirjutab olemasoleva üle)"
-StrCpy $UAC_ERROR_ELEVATE "Ei suuda ülendada õigusi, viga: "
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "See paigaldaja vajab admini ligipääsu, proovi uuesti"
-StrCpy $INIT_INSTALLER_RUNNING "Paigaldaja on juba käimas."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "See desinstallija vajab admini ligipääsu, proovi uuesti"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Sisselogimisteenus ei tööta, katkestamine!"
-StrCpy $INIT_UNINSTALLER_RUNNING "See desinstallija on juba käimas."
+StrCpy $INIT_NO_DESKTOP "Ikoon töölaual (kirjutab olemasoleva üle)"
+StrCpy $UAC_ERROR_ELEVATE "Ei suuda ülendada õigusi, viga: "
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "See paigaldaja vajab admini ligipääsu, proovi uuesti"
+StrCpy $INIT_INSTALLER_RUNNING "Paigaldaja on juba käimas."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "See desinstallija vajab admini ligipääsu, proovi uuesti"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Sisselogimisteenus ei tööta, katkestamine!"
+StrCpy $INIT_UNINSTALLER_RUNNING "See desinstallija on juba käimas."
 StrCpy $SectionGroup_Shortcuts "Otseteed"

admin/win/nsi/l10n/Farsi.nsh

@@ -1,3 +1,4 @@
+# Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "نمایش پادداشت های انتشار نسخه"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "${APPLICATION_EXECUTABLE} پردازش (ها) که باید متوقف شوند را پیدا کرد. $\nآیا میخواهیم برنامه نصاب این پردازشها را برای شما متوقف کند ؟"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "حذف پردازش‌های ${APPLICATION_EXECUTABLE}."

admin/win/nsi/l10n/Finnish.nsh

@@ -1,42 +1,43 @@
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Näytä julkaisutiedot"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Havaittiin sovelluksen ${APPLICATION_EXECUTABLE} prosessi (tai prosesseja) jotka pitäisi pysäyttää.$\nHaluatko että asennusohjelma pysäyttää nämä puolestasi?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Pysäytetään sovelluksen ${APPLICATION_EXECUTABLE} prosessit."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Tapettavaa prosessia ei löytynyt!"
-StrCpy $PageReinstall_NEW_Field_1 "Vanhempi versio sovelluksesta ${APPLICATION_NAME} on jo asennettu. On suositeltavaa että poistat vanhan asennuksen ensin. Valitse mikä toiminto suoritetaan ja napsauta Seuraava jatkaaksesi."
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Näytä julkaisutiedot"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Havaittiin sovelluksen ${APPLICATION_EXECUTABLE} prosessi (tai prosesseja) jotka pitäisi pysäyttää.$\nHaluatko että asennusohjelma pysäyttää nämä puolestasi?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Pysäytetään sovelluksen ${APPLICATION_EXECUTABLE} prosessit."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Tapettavaa prosessia ei löytynyt!"
+StrCpy $PageReinstall_NEW_Field_1 "Vanhempi versio sovelluksesta ${APPLICATION_NAME} on jo asennettu. On suositeltavaa että poistat vanhan asennuksen ensin. Valitse mikä toiminto suoritetaan ja napsauta Seuraava jatkaaksesi."
 StrCpy $PageReinstall_NEW_Field_2 "Poista ennen asentamista"
-StrCpy $PageReinstall_NEW_Field_3 "Älä poista"
+StrCpy $PageReinstall_NEW_Field_3 "Älä poista"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Asennettu jo"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Valitse miten ${APPLICATION_NAME} asennetaan."
-StrCpy $PageReinstall_OLD_Field_1 "Uudempi versio sovelluksesta ${APPLICATION_NAME} on jo asennettu! Vanhan version asennus ei ole suositeltavaa. Jos todella haluat asentaa vanhemman version, kannattaa poistaa nykyisen version asennus ensin. Valitse minkä toimenpiteen haluat suorittaa ja paina Seuraava jatkaaksesi."
+StrCpy $PageReinstall_OLD_Field_1 "Uudempi versio sovelluksesta ${APPLICATION_NAME} on jo asennettu! Vanhan version asennus ei ole suositeltavaa. Jos todella haluat asentaa vanhemman version, kannattaa poistaa nykyisen version asennus ensin. Valitse minkä toimenpiteen haluat suorittaa ja paina Seuraava jatkaaksesi."
 StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} on jo asennettu.$\n$\nValitse haluamasi toiminto ja napsauta Seuraava jatkaaksesi."
-StrCpy $PageReinstall_SAME_Field_2 "Lisää/uudelleenasenna komponentteja"
+StrCpy $PageReinstall_SAME_Field_2 "Lisää/uudelleenasenna komponentteja"
 StrCpy $PageReinstall_SAME_Field_3 "Poista ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Poista ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Valitse suoritettava huoltotoimenpide."
-StrCpy $SEC_APPLICATION_DETAILS "Asennetaan sovelluksen ${APPLICATION_NAME} välttämättömyyksiä."
+StrCpy $SEC_APPLICATION_DETAILS "Asennetaan sovelluksen ${APPLICATION_NAME} välttämättömyyksiä."
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integraatio Windows Exploreriin"
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Asennetaan integraatiota Windows Exploreriin"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Käynnistä-valikon pikakuvake"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Lisätään ${APPLICATION_NAME}-pikakuvake Käynnistä-valikkoon."
-StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Työpöydän pikakuvake"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Luodaan työpöydän pikakuvakkeet"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Pikakäynnistyksen pikakuvake"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Luodaan pikakuvaketta pikakäynnistykseen"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} välttämättömyydet."
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Käynnistä-valikon pikakuvake"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Lisätään ${APPLICATION_NAME}-pikakuvake Käynnistä-valikkoon."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Työpöydän pikakuvake"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Luodaan työpöydän pikakuvakkeet"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Pikakäynnistyksen pikakuvake"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Luodaan pikakuvaketta pikakäynnistykseen"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} välttämättömyydet."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME}-pikakuvake."
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Sovelluksen ${APPLICATION_NAME} työpyötäpikakuvake."
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Pikakäynnistyksen pikakuvake sovellukselle ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Sovelluksen ${APPLICATION_NAME} työpyötäpikakuvake."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Pikakäynnistyksen pikakuvake sovellukselle ${APPLICATION_NAME}."
 StrCpy $UNINSTALLER_FILE_Detail "Kirjoitetaan poisto-ohjelmaa"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Kirjoitetaan asennusohjelman rekisteriavaimia"
 StrCpy $UNINSTALLER_FINISHED_Detail "Valmis"
-StrCpy $UNINSTALL_MESSAGEBOX "Vaikuttaa siltä että sovellus ${APPLICATION_NAME} on asennettu kansioon '$INSTDIR'.$\n$\nHaluatko jatkaa tästä huolimatta (ei suositeltavaa)?"
-StrCpy $UNINSTALL_ABORT "Poistaminen keskeytettiin käyttäjän toimesta"
-StrCpy $INIT_NO_QUICK_LAUNCH "Pikakäynnistyksen pikakuvake (-)"
-StrCpy $INIT_NO_DESKTOP "Työpöydän pikakuvake (korvaa nykyinen)"
+StrCpy $UNINSTALL_MESSAGEBOX "Vaikuttaa siltä että sovellus ${APPLICATION_NAME} on asennettu kansioon '$INSTDIR'.$\n$\nHaluatko jatkaa tästä huolimatta (ei suositeltavaa)?"
+StrCpy $UNINSTALL_ABORT "Poistaminen keskeytettiin käyttäjän toimesta"
+StrCpy $INIT_NO_QUICK_LAUNCH "Pikakäynnistyksen pikakuvake (-)"
+StrCpy $INIT_NO_DESKTOP "Työpöydän pikakuvake (korvaa nykyinen)"
 StrCpy $UAC_ERROR_ELEVATE "Kohottaminen ei onnistu, virhe:"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Tämä asennusohjelma vaatii ylläpitäjän oikeudet, yritä uudelleen."
-StrCpy $INIT_INSTALLER_RUNNING "Asennusohjelma on jo käynnissä."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Tämä poisto-ohjelma vaatii ylläpitäjän oikeudet, yritä uudelleen."
-StrCpy $UAC_ERROR_LOGON_SERVICE "Kirjautumispalvelu ei ole käynnissä, perutaan!"
-StrCpy $INIT_UNINSTALLER_RUNNING "Poisto-ohjelma on jo käynnissä."
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Tämä asennusohjelma vaatii ylläpitäjän oikeudet, yritä uudelleen."
+StrCpy $INIT_INSTALLER_RUNNING "Asennusohjelma on jo käynnissä."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Tämä poisto-ohjelma vaatii ylläpitäjän oikeudet, yritä uudelleen."
+StrCpy $UAC_ERROR_LOGON_SERVICE "Kirjautumispalvelu ei ole käynnissä, perutaan!"
+StrCpy $INIT_UNINSTALLER_RUNNING "Poisto-ohjelma on jo käynnissä."
 StrCpy $SectionGroup_Shortcuts "Pikakuvakkeet"

admin/win/nsi/l10n/French.nsh

@@ -1,3 +1,4 @@
+# Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Afficher les notes de version"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Les processus ${APPLICATION_EXECUTABLE} en cours d’exécution doivent être stoppés avant de poursuivre.$\nVoulez-vous que le programme d’installation s’en charge pour vous ?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Fermeture des processus ${APPLICATION_EXECUTABLE}."

admin/win/nsi/l10n/Galician.nsh

@@ -1,42 +1,43 @@
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Amosar as notas de publicación"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Atopáronse procesos ${APPLICATION_EXECUTABLE} que teñen que ser detidos.$\nQuere que sexa o instalador quen o(s) deteña?"
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Amosar as notas de publicación"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Atopáronse procesos ${APPLICATION_EXECUTABLE} que teñen que ser detidos.$\nQuere que sexa o instalador quen o(s) deteña?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Matando os procesos ${APPLICATION_EXECUTABLE}."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Non se atopou o proceso para matalo!"
-StrCpy $PageReinstall_NEW_Field_1 "No seu sistema hai instalada unha versión anterior de ${APPLICATION_NAME}. Recomendámoslle que desinstale a versión actual antes de instalar. Seleccione a operación que quere realizar e prema en Seguinte para continuar."
+StrCpy $PageReinstall_NEW_Field_1 "No seu sistema hai instalada unha versión anterior de ${APPLICATION_NAME}. Recomendámoslle que desinstale a versión actual antes de instalar. Seleccione a operación que quere realizar e prema en Seguinte para continuar."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
 StrCpy $PageReinstall_NEW_Field_3 "Non desinstalar"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Xa instalado"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Escolla como quere instalar ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "Ten instalada unha versión actualizada do ${APPLICATION_NAME}! recomendámoslle que non instale unha versión anterior. Se realmente quere instalar esta versión máis antiga, é preferíbel que desinstale a versión actual antes de instalar. Seleccione a operación que quere realizar e prema en Seguinte para continuar."
-StrCpy $PageReinstall_SAME_Field_2 "Engadir/reinstalar compoñentes"
+StrCpy $PageReinstall_OLD_Field_1 "Ten instalada unha versión actualizada do ${APPLICATION_NAME}! recomendámoslle que non instale unha versión anterior. Se realmente quere instalar esta versión máis antiga, é preferíbel que desinstale a versión actual antes de instalar. Seleccione a operación que quere realizar e prema en Seguinte para continuar."
+StrCpy $PageReinstall_SAME_Field_2 "Engadir/reinstalar compoñentes"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalar ${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Escolla a opción de mantemento a realizar."
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Escolla a opción de mantemento a realizar."
 StrCpy $SEC_APPLICATION_DETAILS "Instalando ${APPLICATION_NAME} esenciais."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integración con Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalando a integración con Windows Explorer"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso directo ao programa no menú de inicio"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Engadindo o acceso directo a ${APPLICATION_NAME} no menú de inicio"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integración con Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalando a integración con Windows Explorer"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso directo ao programa no menú de inicio"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Engadindo o acceso directo a ${APPLICATION_NAME} no menú de inicio"
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Acceso directo no escritorio"
 StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Creando os accesos directos no escritorio"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Acceso de inicio rápido"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creando o acceso de inicio rápido"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Acceso de inicio rápido"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Creando o acceso de inicio rápido"
 StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} esenciais."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Acceso directo ao ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Acceso directo no escritorio para "
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Acceso de inicio rápido para ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Acceso de inicio rápido para ${APPLICATION_NAME}."
 StrCpy $UNINSTALLER_FILE_Detail "Escribindo o desinstalador"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Escribindo o instalador nas chaves do rexistro"
 StrCpy $UNINSTALLER_FINISHED_Detail "Rematado"
-StrCpy $UNINSTALL_MESSAGEBOX "Semella que ${APPLICATION_NAME} non está instalado no directorio «$INSTDIR».$\n$\nContinuar aínda así (non recomendado)?"
-StrCpy $UNINSTALL_ABORT "A desinstalación foi interrompida polo usuario."
-StrCpy $INIT_NO_QUICK_LAUNCH "Acceso de inicio rápido (n/d)"
+StrCpy $UNINSTALL_MESSAGEBOX "Semella que ${APPLICATION_NAME} non está instalado no directorio «$INSTDIR».$\n$\nContinuar aínda así (non recomendado)?"
+StrCpy $UNINSTALL_ABORT "A desinstalación foi interrompida polo usuario."
+StrCpy $INIT_NO_QUICK_LAUNCH "Acceso de inicio rápido (n/d)"
 StrCpy $INIT_NO_DESKTOP "Atallo no escritorio (sobrescribe o existente)"
-StrCpy $UAC_ERROR_ELEVATE "Non foi posíbel elevalo, erro:"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Este instalador require acceso de administrador, ténteo de novo"
-StrCpy $INIT_INSTALLER_RUNNING "O instalador xa está en execución."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Este desinstalador require acceso de administrador, ténteo de novo"
-StrCpy $UAC_ERROR_LOGON_SERVICE "O servizo de acceso non está en execución, cancelando!"
-StrCpy $INIT_UNINSTALLER_RUNNING "O desinstalador xa está en execución."
+StrCpy $UAC_ERROR_ELEVATE "Non foi posíbel elevalo, erro:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Este instalador require acceso de administrador, ténteo de novo"
+StrCpy $INIT_INSTALLER_RUNNING "O instalador xa está en execución."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Este desinstalador require acceso de administrador, ténteo de novo"
+StrCpy $UAC_ERROR_LOGON_SERVICE "O servizo de acceso non está en execución, cancelando!"
+StrCpy $INIT_UNINSTALLER_RUNNING "O desinstalador xa está en execución."
 StrCpy $SectionGroup_Shortcuts "Atallos"
 StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."

admin/win/nsi/l10n/German.nsh

@@ -1,42 +1,43 @@
+# Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Release-Informationen anzeigen"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "${APPLICATION_EXECUTABLE} Prozess(e) gefunden, die gestoppt werden müssen.$\nWollen Sie, dass der Installer diese nun für Sie stoppt?"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "${APPLICATION_EXECUTABLE} Prozess(e) gefunden, die gestoppt werden müssen.$\nWollen Sie, dass der Installer diese nun für Sie stoppt?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Stoppe ${APPLICATION_EXECUTABLE} Prozess(e)."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Prozess zum Beenden nicht gefunden!"
-StrCpy $PageReinstall_NEW_Field_1 "Eine ältere Version von  ${APPLICATION_NAME} ist auf Ihrem System installiert. Es wird empfohlen, diese Version zunächst zu entfernen. Wählen Sie unter folgenden Vorgehenweisen und wählen Sie $\"Weiter$\"."
+StrCpy $PageReinstall_NEW_Field_1 "Eine ältere Version von  ${APPLICATION_NAME} ist auf Ihrem System installiert. Es wird empfohlen, diese Version zunächst zu entfernen. Wählen Sie unter folgenden Vorgehenweisen und wählen Sie $\"Weiter$\"."
 StrCpy $PageReinstall_NEW_Field_2 "Vor der Installation entfernen"
 StrCpy $PageReinstall_NEW_Field_3 "Nicht entfernen"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Bereits installiert"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Wählen Sie die Methode, mit der sie ${APPLICATION_NAME} installieren wollen."
-StrCpy $PageReinstall_OLD_Field_1 "Eine neuere Version von  ${APPLICATION_NAME} ist bereits installiert! Es wird nicht empfohlen, eine ältere Version zu installieren. Wollen Sie dies trotzdem tun, so sollten Sie die aktuelle Version zunächst entfernen. Wählen Sie eine Vorgehensweise und wählen dann $\"Weiter$\"."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} ist bereits installiert. $\nWählen Sie eine Vorgehensweise und klicken Sie auf $\"Weiter$\"."
-StrCpy $PageReinstall_SAME_Field_2 "Komponenten hinzufügen"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Wählen Sie die Methode, mit der sie ${APPLICATION_NAME} installieren wollen."
+StrCpy $PageReinstall_OLD_Field_1 "Eine neuere Version von  ${APPLICATION_NAME} ist bereits installiert! Es wird nicht empfohlen, eine ältere Version zu installieren. Wollen Sie dies trotzdem tun, so sollten Sie die aktuelle Version zunächst entfernen. Wählen Sie eine Vorgehensweise und wählen dann $\"Weiter$\"."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} ist bereits installiert. $\nWählen Sie eine Vorgehensweise und klicken Sie auf $\"Weiter$\"."
+StrCpy $PageReinstall_SAME_Field_2 "Komponenten hinzufügen"
 StrCpy $PageReinstall_SAME_Field_3 "${APPLICATION_NAME} entfernen"
 StrCpy $UNINSTALLER_APPDATA_TITLE "${APPLICATION_NAME} entfernen"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Wählen Sie zur Ausführung die Wartungsoption."
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Wählen Sie zur Ausführung die Wartungsoption."
 StrCpy $SEC_APPLICATION_DETAILS "Installiere ${APPLICATION_NAME} Basis."
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integration in den Windows Explorer"
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installiere Integration in den Windows Explorer"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Installiere Verknüpfung im Programmmenü"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Füge Verknüpfung für ${APPLICATION_NAME} dem Startmenü hinzu."
-StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Desktop-Verknüpfung"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Erstellt Desktop-Verknüpfung"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Schnellstart-Verknüpfung"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Erstelle Schnellstart-Verknüpfung"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Installiere Verknüpfung im Programmmenü"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Füge Verknüpfung für ${APPLICATION_NAME} dem Startmenü hinzu."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Desktop-Verknüpfung"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Erstellt Desktop-Verknüpfung"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Schnellstart-Verknüpfung"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Erstelle Schnellstart-Verknüpfung"
 StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} Basis."
-StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} Verknüfung."
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Desktop-Verknüpfung für ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Schnellstart-Verknüpfung für ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} Verknüfung."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Desktop-Verknüpfung für ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Schnellstart-Verknüpfung für ${APPLICATION_NAME}."
 StrCpy $UNINSTALLER_FILE_Detail "Schreibe Uninstaller"
-StrCpy $UNINSTALLER_REGISTRY_Detail "Schreibe Registrierungseinträge"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Schreibe Registrierungseinträge"
 StrCpy $UNINSTALLER_FINISHED_Detail "Abgeschlossen"
 StrCpy $UNINSTALL_MESSAGEBOX "Es scheint, als ob ${APPLICATION_NAME} nicht im Verzeichnis  '$INSTDIR' installiert ist.$\n$\nTrotzdem fortfahren (nicht empfohlen)?"
 StrCpy $UNINSTALL_ABORT "Deinstallation vom Benutzer abgebrochen"
-StrCpy $INIT_NO_QUICK_LAUNCH "Schnellstart-Verknüpfung (Nicht verfügbar)"
-StrCpy $INIT_NO_DESKTOP "Desktop-Verknüpfung (überschreibt vorhandene)"
-StrCpy $UAC_ERROR_ELEVATE "Rechte können nicht erhöht werden, Fehler:"
+StrCpy $INIT_NO_QUICK_LAUNCH "Schnellstart-Verknüpfung (Nicht verfügbar)"
+StrCpy $INIT_NO_DESKTOP "Desktop-Verknüpfung (überschreibt vorhandene)"
+StrCpy $UAC_ERROR_ELEVATE "Rechte können nicht erhöht werden, Fehler:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Dieses Installationsprogramm erfordert Administrator-Rechte, bitte erneut versuchen"
-StrCpy $INIT_INSTALLER_RUNNING "Das Installationsprogramm wird bereits ausgeführt."
+StrCpy $INIT_INSTALLER_RUNNING "Das Installationsprogramm wird bereits ausgeführt."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Das Deinstallationsprogramm erfordert Administrator-Rechte. Bitte erneut versuchen."
-StrCpy $UAC_ERROR_LOGON_SERVICE "Anmeldedienst läuft nicht, abbruch!"
-StrCpy $INIT_UNINSTALLER_RUNNING "Das Deinstallationsprogramm wird bereits ausgeführt."
-StrCpy $SectionGroup_Shortcuts "Verknüpfungen"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Anmeldedienst läuft nicht, abbruch!"
+StrCpy $INIT_UNINSTALLER_RUNNING "Das Deinstallationsprogramm wird bereits ausgeführt."
+StrCpy $SectionGroup_Shortcuts "Verknüpfungen"

admin/win/nsi/l10n/Greek.nsh

@@ -1,42 +1,43 @@
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Εμφάνιση σημειώσεων έκδοσης"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Βρέθηκε η(οι) διεργασία(ες) ${APPLICATION_EXECUTABLE} η(οι) οποία(ες) θα πρέπει να τερματιστεί(ούν).$\nΘα θέλατε να την(τις) τερματίσει ο βοηθός εγκατάστασης για εσάς;"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Τερματισμός διεργασιών ${APPLICATION_EXECUTABLE}."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Δεν βρέθηκε διεργασία για βίαιο τερματισμό!"
-StrCpy $PageReinstall_NEW_Field_1 "Μια παλαιότερη έκδοση της ${APPLICATION_NAME} είναι εγκατεστημένη στο σύστημά σας. Είναι προτεινόμενο να απεγκαταστήσετε την τρέχουσα έκδοση πριν την εγκατάσταση. Επιλέξτε τη διαδικασία που επιθυμείτε να εκτελέσετε και πατήστε Επόμενο για να συνεχίσετε."
-StrCpy $PageReinstall_NEW_Field_2 "Απεγκατάσταση πριν την εγκατάσταση"
-StrCpy $PageReinstall_NEW_Field_3 "Να μην απεγκατασταθεί"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ήδη εγκατεστημένη"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Επιλέξτε πώς θέλετε να εγκαταστήσετε την ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "Μια νεώτερη έκδοση της ${APPLICATION_NAME} είναι ήδη εγκατεστημένη! Δεν συνίσταται να εγκαταστείσετε μια παλαιότερη έκδοση. Εάν θέλετε πραγματικά να εγκαταστήσετε αυτήν την παλαιότερη έκδοση, είναι καλύτερο να απεγκαταστήσετε την τρέχουσα έκδοση πρώτα. Επιλέξτε τη διαδικασία που επιθυμείτε να εκτελέσετε και επιλέξτε Επόμενο για να συνεχίσετε."
-StrCpy $PageReinstall_SAME_Field_1 "Η ${APPLICATION_NAME} ${VERSION} είναι ήδη εγκατεστημένη.$\n$\nΕπιλέξτε τη λειτουργία που επιθυμείτε να εκτελέσετε και επιλέξτε Επόμενο για να συνεχίσετε."
-StrCpy $PageReinstall_SAME_Field_2 "Προσθήκη/ Επανεγκατάσταση συνιστωσών"
-StrCpy $PageReinstall_SAME_Field_3 "Απεγκατάσταση ${APPLICATION_NAME}"
-StrCpy $UNINSTALLER_APPDATA_TITLE "Απεγκατάσταση ${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Επιλέξτε την επιλογή συντήρησης που θα πραγματοποιηθεί."
-StrCpy $SEC_APPLICATION_DETAILS "Εγκατάσταση βάσης ${APPLICATION_NAME} σε εξέλιξη."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Ενσωμάτωση στην Εξερεύνηση των Windows"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Εγκατάσταση ενσωμάτωσης στην Εξερεύνηση των Windows"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Συντόμευση στο Αρχικό Μενού"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Προσθήκη συντόμευσης για την ${APPLICATION_NAME} στο Αρχικό Μενού."
-StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Συντόμευση επιφάνειας εργασίας"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Δημιουργία Συντομεύσεων στην Επιφάνεια Εργασίας"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Συντόμευση Ταχείας Εκκίνησης"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Δημιουργία Συντόμευσης Ταχείας Εκκίνησης"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Βάση ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Συντόμευση ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Συντόμευση επιφάνειας εργασίας της ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Συντόμευση Ταχείας Εκκίνησης της ${APPLICATION_NAME}."
-StrCpy $UNINSTALLER_FILE_Detail "Εγγραφή Εφαρμογής Απεγκατάστασης"
-StrCpy $UNINSTALLER_REGISTRY_Detail "Εγγραφή Κλειδιών μητρώου (Registry) της Εφαρμογής Εγκατάστασης"
-StrCpy $UNINSTALLER_FINISHED_Detail "Ολοκληρώθηκε"
-StrCpy $UNINSTALL_MESSAGEBOX "Δεν φαίνεται να είναι εγκατεστημένηη η ${APPLICATION_NAME} στον κατάλογο '$INSTDIR'.$\n$\nΣυνέχιση παρ' όλα αυτά (δεν συνίσταται);"
-StrCpy $UNINSTALL_ABORT "Η απεγκατάσταση ματαιώθηκε από το χρήστη"
-StrCpy $INIT_NO_QUICK_LAUNCH "Συντόμευση Ταχείας Εκκίνησης (Μ/Δ)"
-StrCpy $INIT_NO_DESKTOP "Συντόμευση Επιφάνειας Εργασίας (αντικαθιστά υπάρχουσα)"
-StrCpy $UAC_ERROR_ELEVATE "Αδυναμία ανύψωσης, σφάλμα:"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Αυτή η εφαρμογή εγκατάστασης απαιτεί πρόσβαση διαχειριστή, δοκιμάστε ξανά"
-StrCpy $INIT_INSTALLER_RUNNING "Η εφαρμογή εγκατάστασης λειτουργεί ήδη."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Αυτή η εφαρμογή απεγκατάστασης απαιτεί πρόσβαση διαχειριστή, δοκιμάστε ξανά"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Η υπηρεσία σύνδεσης δεν εκτελείται, ακύρωση!"
-StrCpy $INIT_UNINSTALLER_RUNNING "Η εφαρμογή απεγκατάστασης λειτουργεί ήδη."
-StrCpy $SectionGroup_Shortcuts "Συντομεύσεις"
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Εμφάνιση σημειώσεων έκδοσης"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Βρέθηκε η(οι) διεργασία(ες) ${APPLICATION_EXECUTABLE} η(οι) οποία(ες) θα πρέπει να τερματιστεί(ούν).$\nΘα θέλατε να την(τις) τερματίσει ο βοηθός εγκατάστασης για εσάς;"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Τερματισμός διεργασιών ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Δεν βρέθηκε διεργασία για βίαιο τερματισμό!"
+StrCpy $PageReinstall_NEW_Field_1 "Μια παλαιότερη έκδοση της ${APPLICATION_NAME} είναι εγκατεστημένη στο σύστημά σας. Είναι προτεινόμενο να απεγκαταστήσετε την τρέχουσα έκδοση πριν την εγκατάσταση. Επιλέξτε τη διαδικασία που επιθυμείτε να εκτελέσετε και πατήστε Επόμενο για να συνεχίσετε."
+StrCpy $PageReinstall_NEW_Field_2 "Απεγκατάσταση πριν την εγκατάσταση"
+StrCpy $PageReinstall_NEW_Field_3 "Να μην απεγκατασταθεί"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ήδη εγκατεστημένη"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Επιλέξτε πώς θέλετε να εγκαταστήσετε την ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "Μια νεώτερη έκδοση της ${APPLICATION_NAME} είναι ήδη εγκατεστημένη! Δεν συνίσταται να εγκαταστείσετε μια παλαιότερη έκδοση. Εάν θέλετε πραγματικά να εγκαταστήσετε αυτήν την παλαιότερη έκδοση, είναι καλύτερο να απεγκαταστήσετε την τρέχουσα έκδοση πρώτα. Επιλέξτε τη διαδικασία που επιθυμείτε να εκτελέσετε και επιλέξτε Επόμενο για να συνεχίσετε."
+StrCpy $PageReinstall_SAME_Field_1 "Η ${APPLICATION_NAME} ${VERSION} είναι ήδη εγκατεστημένη.$\n$\nΕπιλέξτε τη λειτουργία που επιθυμείτε να εκτελέσετε και επιλέξτε Επόμενο για να συνεχίσετε."
+StrCpy $PageReinstall_SAME_Field_2 "Προσθήκη/ Επανεγκατάσταση συνιστωσών"
+StrCpy $PageReinstall_SAME_Field_3 "Απεγκατάσταση ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Απεγκατάσταση ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Επιλέξτε την επιλογή συντήρησης που θα πραγματοποιηθεί."
+StrCpy $SEC_APPLICATION_DETAILS "Εγκατάσταση βάσης ${APPLICATION_NAME} σε εξέλιξη."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Ενσωμάτωση στην Εξερεύνηση των Windows"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Εγκατάσταση ενσωμάτωσης στην Εξερεύνηση των Windows"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Συντόμευση στο Αρχικό Μενού"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Προσθήκη συντόμευσης για την ${APPLICATION_NAME} στο Αρχικό Μενού."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Συντόμευση επιφάνειας εργασίας"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Δημιουργία Συντομεύσεων στην Επιφάνεια Εργασίας"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Συντόμευση Ταχείας Εκκίνησης"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Δημιουργία Συντόμευσης Ταχείας Εκκίνησης"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Βάση ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Συντόμευση ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Συντόμευση επιφάνειας εργασίας της ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Συντόμευση Ταχείας Εκκίνησης της ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_FILE_Detail "Εγγραφή Εφαρμογής Απεγκατάστασης"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Εγγραφή Κλειδιών μητρώου (Registry) της Εφαρμογής Εγκατάστασης"
+StrCpy $UNINSTALLER_FINISHED_Detail "Ολοκληρώθηκε"
+StrCpy $UNINSTALL_MESSAGEBOX "Δεν φαίνεται να είναι εγκατεστημένηη η ${APPLICATION_NAME} στον κατάλογο '$INSTDIR'.$\n$\nΣυνέχιση παρ' όλα αυτά (δεν συνίσταται);"
+StrCpy $UNINSTALL_ABORT "Η απεγκατάσταση ματαιώθηκε από το χρήστη"
+StrCpy $INIT_NO_QUICK_LAUNCH "Συντόμευση Ταχείας Εκκίνησης (Μ/Δ)"
+StrCpy $INIT_NO_DESKTOP "Συντόμευση Επιφάνειας Εργασίας (αντικαθιστά υπάρχουσα)"
+StrCpy $UAC_ERROR_ELEVATE "Αδυναμία ανύψωσης, σφάλμα:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Αυτή η εφαρμογή εγκατάστασης απαιτεί πρόσβαση διαχειριστή, δοκιμάστε ξανά"
+StrCpy $INIT_INSTALLER_RUNNING "Η εφαρμογή εγκατάστασης λειτουργεί ήδη."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Αυτή η εφαρμογή απεγκατάστασης απαιτεί πρόσβαση διαχειριστή, δοκιμάστε ξανά"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Η υπηρεσία σύνδεσης δεν εκτελείται, ακύρωση!"
+StrCpy $INIT_UNINSTALLER_RUNNING "Η εφαρμογή απεγκατάστασης λειτουργεί ήδη."
+StrCpy $SectionGroup_Shortcuts "Συντομεύσεις"

admin/win/nsi/l10n/Hungarian.nsh

@@ -1,3 +1,4 @@
+# Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Kiadási jegyzetek megtekintése"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "A következő folyamatot(okat) meg kell állítani ${APPLICATION_EXECUTABLE}.$\nSzeretné ha a telepítő program megállítani ezeket a folyamatokat?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "${APPLICATION_EXECUTABLE} folyamat kilövése."