Set version to 3.6.0

Closes #2188

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: "weekly"

.github/workflows/black.yml

@@ -1,22 +0,0 @@
-name: Black Code Formatter
-on: [push, pull_request]
-
-jobs:
-  black:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Black Code Formatter
-      uses: lgeiger/black-action@master
-      with:
-          args: >
-            SABnzbd.py
-            sabnzbd
-            scripts
-            tools
-            builder
-            tests
-            --line-length=120
-            --target-version=py36
-            --check
-            --diff

.github/workflows/build_release.yml

@@ -2,50 +2,65 @@ name: Build binaries and source distribution
 
 on: [push, pull_request]
 
+env:
+  AUTOMATION_GITHUB_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
+
 jobs:
   build_windows:
     name: Build Windows binary
     runs-on: windows-latest
-    env:
-      AUTOMATION_GITHUB_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
+    timeout-minutes: 30
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.9 (64bit)
-      uses: actions/setup-python@v2
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.10 (64bit)
+      uses: actions/setup-python@v3
       with:
-        python-version: 3.9
-        architecture: x64
+        python-version: "3.10"
+        architecture: "x64"
+    - name: Cache Python virtualenv (64bit)
+      uses: syphar/restore-virtualenv@v1.2
+      id: cache-virtualenv-64bit
+      with:
+        custom_virtualenv_dir: "venv64"
+        custom_cache_key_element: "release"
+        requirement_files: |
+          **/requirements.txt
+          PKG-INFO
     - name: Install Python dependencies (64bit)
+      if: steps.cache-virtualenv-64bit.outputs.cache-hit != 'true'
       run: |
         python --version
         pip install --upgrade pip wheel
         pip install --upgrade -r requirements.txt
         pip install --upgrade -r builder/requirements.txt
-    - name: Build source distribution
-      run: python builder/package.py source
-    - name: Upload source distribution
-      uses: actions/upload-artifact@v2
-      with:
-        path: "*-src.tar.gz"
-        name: Source distribution
     - name: Build Windows standalone binary and installer (64bit)
       run: python builder/package.py installer
     - name: Upload Windows standalone binary (64bit)
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         path: "*-win64-bin.zip"
         name: Windows Windows standalone binary (64bit)
     - name: Upload Windows installer (64bit)
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         path: "*-win-setup.exe"
         name: Windows installer
     - name: Set up Python 3.8 (32bit and legacy)
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
-        python-version: 3.8
-        architecture: x86
+        python-version: "3.8"
+        architecture: "x86"
+    - name: Cache Python virtualenv (32bit and legacy)
+      uses: syphar/restore-virtualenv@v1.2
+      id: cache-virtualenv-32bit
+      with:
+        custom_virtualenv_dir: "venv32"
+        custom_cache_key_element: "release"
+        requirement_files: |
+          **/requirements.txt
+          PKG-INFO
     - name: Install Python dependencies (32bit and legacy)
+      if: steps.cache-virtualenv-32bit.outputs.cache-hit != 'true'
       run: |
         python --version
         pip install --upgrade pip wheel
@@ -54,7 +69,7 @@ jobs:
     - name: Build Windows standalone binary (32bit and legacy)
       run: python builder/package.py binary
     - name: Upload Windows standalone binary (32bit and legacy)
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         path: "*-win32-bin.zip"
         name: Windows Windows standalone binary (32bit and legacy)
@@ -64,51 +79,107 @@ jobs:
 
   build_macos:
     name: Build macOS binary
-    runs-on: macos-latest
+    runs-on: macos-11
+    timeout-minutes: 30
     env:
       SIGNING_AUTH: ${{ secrets.SIGNING_AUTH }}
       NOTARIZATION_USER: ${{ secrets.NOTARIZATION_USER }}
       NOTARIZATION_PASS: ${{ secrets.NOTARIZATION_PASS }}
-      AUTOMATION_GITHUB_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
       # We need the official Python, because the GA ones only support newer macOS versions
       # The deployment target is picked up by the Python build tools automatically
       # If updated, make sure to also set LSMinimumSystemVersion in SABnzbd.spec
-      PYTHON_VERSION: 3.9.7
-      MACOSX_DEPLOYMENT_TARGET: 10.9
+      PYTHON_VERSION: "3.10.4"
+      MACOSX_DEPLOYMENT_TARGET: "10.9"
+      # We need to force compile for universal2 support
+      CFLAGS: -arch arm64 -arch x86_64
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Cache Python download
       id: cache-python-download
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/python.pkg
         key: macOS-Python-${{ env.PYTHON_VERSION }}
     - name: Get Python
       if: steps.cache-python-download.outputs.cache-hit != 'true'
-      run: curl https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-macosx10.9.pkg -o ~/python.pkg
+      run: curl https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-macos11.pkg -o ~/python.pkg
     - name: Install Python
-      run: sudo installer -pkg ~/python.pkg -target /
+      run: |
+        sudo installer -pkg ~/python.pkg -target /
+        unlink /usr/local/bin/python
+        ln -s /usr/local/bin/python3 /usr/local/bin/python
+    - name: Cache Python virtualenv
+      uses: syphar/restore-virtualenv@v1.2
+      id: cache-virtualenv
+      with:
+        custom_cache_key_element: "release"
+        requirement_files: |
+          **/requirements.txt
+          PKG-INFO
     - name: Install Python dependencies
+      # We have to manually install a few packages:
+      # 1.  cffi will pick up the single-arch libffi from Homebrew, while Apple provides universal2-version
+      #     of libffi with XCode. So we forcefully have to remove the Homebrew one.
+      # 2.  Because building cryptography is hard, and we cannot force pip to fetch universal2 version we
+      #     first install the x86 version (and it's dependencies) and then manually fetch the universal2 build
+      #     https://github.com/pyca/cryptography/issues/5918
+      # 3.  We need to build the PyInstaller bootloader from sources:
+      #     https://github.com/pyinstaller/pyinstaller/issues/6235
+      if: steps.cache-virtualenv.outputs.cache-hit != 'true'
       run: |
         python3 --version
         pip3 install --upgrade pip wheel
+        
+        brew uninstall libffi --ignore-dependencies
+        ARCHFLAGS="-arch x86_64 -arch arm64" pip3 install --upgrade cffi --no-binary cffi
         pip3 install --upgrade -r requirements.txt
-        pip3 install --upgrade -r builder/requirements.txt
+        
+        pip3 uninstall cryptography -y
+        pip3 download -r builder/osx/requirements.txt --platform macosx_10_10_universal2 --only-binary :all: --no-deps --dest .
+        pip3 install -r builder/osx/requirements.txt --no-cache-dir --no-index --find-links .
+        
+        PYINSTALLER_COMPILE_BOOTLOADER=1 pip3 install --upgrade -r builder/requirements.txt --no-binary pyinstaller
     - name: Import macOS codesign certificates
       uses: apple-actions/import-codesign-certs@v1
       if: env.SIGNING_AUTH
       with:
         p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
         p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
+    - name: Build source distribution
+      # Run this on macOS so the line endings are correct by default
+      run: python builder/package.py source
+    - name: Upload source distribution
+      uses: actions/upload-artifact@v3
+      with:
+        path: "*-src.tar.gz"
+        name: Source distribution
     - name: Build macOS binary
       run: |
         python3 builder/package.py app
         python3 builder/make_dmg.py
     - name: Upload macOS binary
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         path: "*-osx.dmg"
         name: macOS binary (not notarized)
     - name: Prepare official release
       if: env.AUTOMATION_GITHUB_TOKEN && startsWith(github.ref, 'refs/tags/')
-      run: python3 builder/package.py release
+      run: python3 builder/package.py release
+
+  release_snap:
+    name: Release Snap
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+    env:
+      SNAP_TOKEN: ${{ secrets.SNAP_TOKEN }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.x"
+      - name: Release latest available Snap
+        run: |
+          sudo snap install snapcraft --classic
+          echo "${SNAP_TOKEN}" | snapcraft login --with -
+          python3 snap/local/release_snap.py

.github/workflows/integration_testing.yml

@@ -3,37 +3,66 @@ name: CI Tests
 on: [push, pull_request]
 
 jobs:
+  black:
+    name: Black Code Formatter
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Black Code Formatter
+        uses: lgeiger/black-action@master
+        with:
+          args: >
+            SABnzbd.py
+            sabnzbd
+            scripts
+            tools
+            builder
+            builder/SABnzbd.spec
+            tests
+            --line-length=120
+            --target-version=py37
+            --check
+            --diff
+
   test:
     name: Test ${{ matrix.name }} - Python ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 15
     strategy:
+      fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
         os: [ubuntu-20.04]
         include:
           - name: macOS
             os: macos-latest
-            python-version: 3.9
+            python-version: "3.10"
           - name: Windows
             os: windows-latest
-            python-version: 3.9
+            python-version: "3.10"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install system dependencies
       if: runner.os == 'Linux'
-      run: sudo apt-get install unrar p7zip-full par2 chromium-chromedriver
+      run: sudo apt-get install unrar p7zip-full par2
+    - name: Cache Python virtualenv
+      uses: syphar/restore-virtualenv@v1.2
+      id: cache-virtualenv
+      with:
+        custom_cache_key_element: "ci"
+        requirement_files: |
+          **/requirements.txt
+          PKG-INFO
     - name: Install Python dependencies
+      if: steps.cache-virtualenv.outputs.cache-hit != 'true'
       run: |
         python --version
-        pip install --upgrade pip
         pip install --upgrade -r requirements.txt
         pip install --upgrade -r tests/requirements.txt
     - name: Test SABnzbd
       run: pytest -s
-
-

.github/workflows/translations.yml

@@ -7,28 +7,32 @@ on:
 
 jobs:
   translations:
+    name: Update translatable texts
     runs-on: ubuntu-latest
+    env:
+      TX_TOKEN: ${{ secrets.TX_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Generate translatable texts
         run: |
           python3 tools/extract_pot.py
       - name: Install Transifex client
+        if: env.TX_TOKEN
         # Sudo is needed to link the "tx"-command
         run: |
           sudo -H python3 -m pip install setuptools wheel
           sudo -H python3 -m pip install transifex-client
       - name: Push/pull Transifex translations
+        if: env.TX_TOKEN
         run: |
           tx push --source --parallel
           tx pull --all --force --parallel
-        env:
-          TX_TOKEN: ${{ secrets.TX_TOKEN }}
       - name: Compile translations to validate them
         run: |
           python3 tools/make_mo.py
       - name: Push translatable and translated texts back to repo
-        uses: stefanzweifel/git-auto-commit-action@v4.5.1
+        uses: stefanzweifel/git-auto-commit-action@v4.14.1
+        if: env.TX_TOKEN
         with:
           commit_message: Update translatable texts
           commit_user_name: SABnzbd Automation

.pyup.yml

@@ -0,0 +1,6 @@
+branch: develop
+schedule: every week
+update: all
+pin: False
+label_prs: dependencies
+branch_prefix: pyup/

.tx/config

@@ -21,4 +21,3 @@ minimum_perc = 0
 source_file = po/nsis/SABnsis.pot
 source_lang = en
 type = PO
-

COPYRIGHT.txt

@@ -1,5 +1,5 @@
 
-(c) Copyright 2007-2021 by "The SABnzbd-team" <team@sabnzbd.org>
+(c) Copyright 2007-2022 by "The SABnzbd-team" <team@sabnzbd.org>
 
 The SABnzbd-team is:
 

INSTALL.txt

@@ -4,7 +4,7 @@
 0) LICENSE
 -------------------------------------------------------------------------------
 
-(c) Copyright 2007-2021 by "The SABnzbd-team" <team@sabnzbd.org>
+(c) Copyright 2007-2022 by "The SABnzbd-team" <team@sabnzbd.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -52,7 +52,7 @@ Specific guides to install from source are available for Windows and macOS:
     https://sabnzbd.org/wiki/installation/install-macos
     https://sabnzbd.org/wiki/installation/install-from-source-windows
 
-Only Python 3.6 and above is supported.
+Only Python 3.7 and above is supported.
 
 On Linux systems you need to install:
     par2 unrar unzip python3-setuptools python3-pip

LICENSE.txt

@@ -1,4 +1,4 @@
-(c) Copyright 2007-2021 by "The SABnzbd-team" <team@sabnzbd.org>
+(c) Copyright 2007-2022 by "The SABnzbd-team" <team@sabnzbd.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 1.0
 Name: SABnzbd
-Version: 3.4.0
-Summary: SABnzbd-3.4.0
+Version: 3.6.0
+Summary: SABnzbd-3.6.0
 Home-page: https://sabnzbd.org
 Author: The SABnzbd Team
 Author-email: team@sabnzbd.org

README.md

@@ -18,7 +18,7 @@ If you want to know more you can head over to our website: https://sabnzbd.org.
 
 SABnzbd has a few dependencies you'll need before you can get running. If you've previously run SABnzbd from one of the various Linux packages, then you likely already have all the needed dependencies. If not, here's what you're looking for:
 
-- `python` (Python 3.6 and higher, often called `python3`)
+- `python` (Python 3.7 and above, often called `python3`)
 - Python modules listed in `requirements.txt`. Install with `python3 -m pip install -r requirements.txt -U`
 - `par2` (Multi-threaded par2 installation guide can be found [here](https://sabnzbd.org/wiki/installation/multicore-par2))
 - `unrar` (make sure you get the "official" non-free version of unrar)

README.mkd

@@ -1,29 +1,57 @@
-Release Notes - SABnzbd 3.4.0
+Release Notes - SABnzbd 3.6.0
 =========================================================
 
-## Changes since 3.3.1
-- Extended `Deobfuscate final filenames` to attempt to set the correct 
-  file extension based on the file signature if the file extension is 
-  not present or meaningless.
-- Added additional pattern keys that can be used in the `Sort String`
-  for Sorting, by using the `guessit` package internally for parsing.
-- If unpacked files contain `.par2` files they will always be read and
-  used to rename any matching files.
-- Regular expressions can be used to specify `Unwanted extensions`.
-- Not all passwords will be tried if a matching one was found.
-- Some interface-only options were added as API-call.
-- The Plush skin has been removed.
+## Changes since 3.5.3
+- Significantly increased performance by using the yEnc-decoding
+  library of @animetosho. Usenet articles are now decoded using
+  specialized CPU instructions (SIMD) on x86 and ARM systems.
+- Create and restore a backup of configuration and database.
+- Show source of lower download speed (CPU or disk).
+- Added keyboard shortcuts (`P`ause, `A`dd, `S`tatus, `C`onfig).
+- Result of the `Deobfuscate` step is listed in History details.
+- `Path` of `Default` category will be used if category doesn't have one.
+- Disabling `api_warnings` prevents showing `Access Denied`
+  information to the external client.
+- Jobs with `Force` priority will always skip the duplicate check.
+- Added `ext_rename_ignore` to add custom extensions that should
+  be ignored during the `Deobfuscate` step.
+- Removed Indexer Feedback Integration.
+- Removed included `Deobfuscate.py` as it is outdated.
+- Show a warning when there are no valid news servers active.
+- Show a warning if the filesystem does not support special characters.
+- Allow multiple parameters to be passed to par2cmdline/Multipar.
+- Linux: Added AppStream metadata, desktop shortcut and MimeInfo.
+- Linux: Added support for bash completion.
+- macOS: Application and included tools fully native on M1 systems.
+- macOS/Windows: Updated UnRar to 6.10 and 7-Zip to 21.07.
+- Windows: Updated MultiPar to v1.3.2.3.
 
-## Bugfixes since 3.3.1
-- Duplicate check based on `.nzb` MD5 was performed before it was calculated.
-- Enforce `local_ranges` for broadcasts (Bonjour/SSDP).
-- Correctly parse the filename in `Content-Disposition` header.
-- `Warning` instead of `Info` when there is a restart due to crashed thread.
-- Only run Direct Unpack if `enable_unrar` is enabled.
+# API changes since 3.5.3
+- Removed several (status) fields from the `queue` API call.
+- Remove unused and undocumented API calls: `addid`, `options`, `rescan`,
+  `osx_icon`, `set_speedlimit`, `get_speedlimit`, `set_colorscheme`.
+- Removed undocumented `xcat` parameter.
+- `None` values in XML API-output are left empty.
+- Adding NZB's would not always return `nzo_ids`.
+- Prevent crash in `history` call during post-processing.
+
+# Bugfixes since 3.5.3
+- Extended timeout when measuring system performance.
+- Interface settings were sometimes reset on page reload.
+- Par2 sets with duplicate names could skip verification and repair.
+- Ignore `.par2` files that could not be parsed.
+- Correctly default to `Glitter - Auto` on new installs.
+- Download speed was not updated when stalled due to disk performance.
+- Prevent traceback when status functions timeout.
+- Prevent crash if not enough repair blocks are available.
+- Prevent crash when there is an unknown `language` setting.
+- Source release had Windows line-endings.
+- Windows: If a job password contained a double quote it
+  would not be picked up by UnRar and unpack would fail.
 
 ## Upgrade notices
-- The download statistics file `totals10.sab` is updated in 3.2.x 
-  version. If you downgrade to 3.1.x or lower, detailed download 
+- The download statistics file `totals10.sab` is updated in 3.2.x
+  version. If you downgrade to 3.1.x or lower, detailed download
   statistics will be lost.
 
 ## Known problems and solutions
@@ -36,4 +64,4 @@ Release Notes - SABnzbd 3.4.0
   that automatically verify, repair, extract and clean up posts downloaded
   from Usenet.
 
-  (c) Copyright 2007-2021 by "The SABnzbd-team" \<team@sabnzbd.org\>
+  (c) Copyright 2007-2022 by "The SABnzbd-team" \<team@sabnzbd.org\>

SABnzbd.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python3 -OO
-# Copyright 2007-2021 The SABnzbd-Team <team@sabnzbd.org>
+# Copyright 2007-2022 The SABnzbd-Team <team@sabnzbd.org>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -17,8 +17,8 @@
 
 import sys
 
-if sys.hexversion < 0x03060000:
-    print("Sorry, requires Python 3.6 or above")
+if sys.hexversion < 0x03070000:
+    print("Sorry, requires Python 3.7 or above")
     print("You can read more at: https://sabnzbd.org/wiki/installation/install-off-modules")
     sys.exit(1)
 
@@ -32,6 +32,7 @@ import signal
 import socket
 import platform
 import subprocess
+import multiprocessing
 import ssl
 import time
 import re
@@ -46,6 +47,9 @@ try:
     import portend
     import cryptography
     import chardet
+    import guessit
+    import puremagic
+    import socks
 except ImportError as e:
     print("Not all required Python modules are available, please check requirements.txt")
     print("Missing module:", e.name)
@@ -60,7 +64,7 @@ from sabnzbd.constants import (
     DEF_TIMEOUT,
     DEF_LOG_ERRFILE,
     DEF_MAIN_TMPL,
-    DEF_STDINTF,
+    DEF_STD_WEB_DIR,
     DEF_WORKDIR,
     DEF_INTERFACES,
     DEF_LANGUAGE,
@@ -70,7 +74,7 @@ from sabnzbd.constants import (
     MAX_WARNINGS,
     RSS_FILE_NAME,
     DEF_LOG_FILE,
-    DEF_STDCONFIG,
+    DEF_STD_CONFIG,
     DEF_LOG_CHERRY,
 )
 import sabnzbd.newsunpack
@@ -87,15 +91,16 @@ from sabnzbd.misc import (
     is_localhost,
     is_lan_addr,
     ip_in_subnet,
+    helpful_warning,
+    set_https_verification,
 )
 from sabnzbd.filesystem import get_ext, real_path, long_path, globber_full, remove_file
 from sabnzbd.panic import panic_tmpl, panic_port, panic_host, panic, launch_a_browser
 import sabnzbd.config as config
 import sabnzbd.cfg
-import sabnzbd.downloader
 import sabnzbd.notifier as notifier
 import sabnzbd.zconfig
-from sabnzbd.getipaddress import localipv4, publicipv4, ipv6
+from sabnzbd.getipaddress import localipv4, publicipv4, ipv6, dnslookup
 from sabnzbd.utils.getperformance import getpystone, getcpu
 import sabnzbd.utils.ssdp as ssdp
 
@@ -106,11 +111,10 @@ try:
     import win32event
     import win32service
     import win32ts
-    import pywintypes
     import servicemanager
     from win32com.shell import shell, shellcon
 
-    from sabnzbd.utils.apireg import get_connection_info, set_connection_info, del_connection_info
+    from sabnzbd.utils.apireg import get_connection_info, set_connection_info
     import sabnzbd.sabtray
 
     win32api.SetConsoleCtrlHandler(sabnzbd.sig_handler, True)
@@ -129,16 +133,6 @@ def guard_loglevel():
     LOG_FLAG = True
 
 
-def warning_helpful(*args, **kwargs):
-    """Wrapper to ignore helpfull warnings if desired"""
-    if sabnzbd.cfg.helpfull_warnings():
-        return logging.warning(*args, **kwargs)
-    return logging.info(*args, **kwargs)
-
-
-logging.warning_helpful = warning_helpful
-
-
 class GUIHandler(logging.Handler):
     """Logging handler collects the last warnings/errors/exceptions
     to be displayed in the web-gui
@@ -246,7 +240,7 @@ def print_version():
             """
 %s-%s
 
-Copyright (C) 2007-2021 The SABnzbd-Team <team@sabnzbd.org>
+Copyright (C) 2007-2022 The SABnzbd-Team <team@sabnzbd.org>
 SABnzbd comes with ABSOLUTELY NO WARRANTY.
 This is free software, and you are welcome to redistribute it
 under certain conditions. It is licensed under the
@@ -331,8 +325,8 @@ def identify_web_template(key, defweb, wdir):
     full_main = real_path(full_dir, DEF_MAIN_TMPL)
 
     if not os.path.exists(full_main):
-        logging.warning_helpful(T("Cannot find web template: %s, trying standard template"), full_main)
-        full_dir = real_path(sabnzbd.DIR_INTERFACES, DEF_STDINTF)
+        helpful_warning(T("Cannot find web template: %s, trying standard template"), full_main)
+        full_dir = real_path(sabnzbd.DIR_INTERFACES, DEF_STD_WEB_DIR)
         full_main = real_path(full_dir, DEF_MAIN_TMPL)
         if not os.path.exists(full_main):
             logging.exception("Cannot find standard template: %s", full_dir)
@@ -403,7 +397,7 @@ def get_user_profile_paths():
         sabnzbd.DIR_HOME = long_path(sabnzbd.DIR_HOME)
         return
 
-    elif sabnzbd.DARWIN:
+    elif sabnzbd.MACOS:
         home = os.environ.get("HOME")
         if home:
             sabnzbd.DIR_LCLDATA = "%s/Library/Application Support/SABnzbd" % home
@@ -427,6 +421,7 @@ def print_modules():
     if sabnzbd.decoder.SABYENC_ENABLED:
         # Yes, we have SABYenc, and it's the correct version, so it's enabled
         logging.info("SABYenc module (v%s)... found!", sabnzbd.decoder.SABYENC_VERSION)
+        logging.info("SABYenc module is using SIMD set: %s", sabnzbd.decoder.SABYENC_SIMD)
     else:
         # Something wrong with SABYenc, so let's determine and print what:
         if sabnzbd.decoder.SABYENC_VERSION:
@@ -463,10 +458,8 @@ def print_modules():
         if sabnzbd.newsunpack.RAR_PROBLEM:
             have_str = "%.2f" % (float(sabnzbd.newsunpack.RAR_VERSION) / 100)
             want_str = "%.2f" % (float(sabnzbd.constants.REC_RAR_VERSION) / 100)
-            logging.warning_helpful(
-                T("Your UNRAR version is %s, we recommend version %s or higher.<br />"), have_str, want_str
-            )
-        elif not (sabnzbd.WIN32 or sabnzbd.DARWIN):
+            helpful_warning(T("Your UNRAR version is %s, we recommend version %s or higher.<br />"), have_str, want_str)
+        elif not (sabnzbd.WIN32 or sabnzbd.MACOS):
             logging.info("UNRAR binary version %.2f", (float(sabnzbd.newsunpack.RAR_VERSION) / 100))
     else:
         logging.error(T("unrar binary... NOT found"))
@@ -474,8 +467,10 @@ def print_modules():
         sabnzbd.NO_DOWNLOADING = True
 
     # If available, we prefer 7zip over unzip
-    if sabnzbd.newsunpack.SEVEN_COMMAND:
-        logging.info("7za binary... found (%s)", sabnzbd.newsunpack.SEVEN_COMMAND)
+    if sabnzbd.newsunpack.SEVENZIP_COMMAND:
+        logging.info("7za binary... found (%s)", sabnzbd.newsunpack.SEVENZIP_COMMAND)
+        if not (sabnzbd.WIN32 or sabnzbd.MACOS):
+            logging.info("7za binary version %s", sabnzbd.newsunpack.SEVENZIP_VERSION)
     else:
         logging.info(T("7za binary... NOT found!"))
 
@@ -622,7 +617,7 @@ def get_webhost(cherryhost, cherryport, https_port):
         browserhost = cherryhost
 
         # Some systems don't like brackets in numerical ipv6
-        if sabnzbd.DARWIN:
+        if sabnzbd.MACOS:
             cherryhost = cherryhost.strip("[]")
         else:
             try:
@@ -635,9 +630,9 @@ def get_webhost(cherryhost, cherryport, https_port):
         logging.info("IPV6 has priority on this system, potential Firefox issue")
 
     if ipv6 and ipv4 and cherryhost == "" and sabnzbd.WIN32:
-        logging.warning_helpful(T("Please be aware the 0.0.0.0 hostname will need an IPv6 address for external access"))
+        helpful_warning(T("Please be aware the 0.0.0.0 hostname will need an IPv6 address for external access"))
 
-    if cherryhost == "localhost" and not sabnzbd.WIN32 and not sabnzbd.DARWIN:
+    if cherryhost == "localhost" and not sabnzbd.WIN32 and not sabnzbd.MACOS:
         # On the Ubuntu family, localhost leads to problems for CherryPy
         ips = ip_extract()
         if "127.0.0.1" in ips and "::1" in ips:
@@ -646,7 +641,7 @@ def get_webhost(cherryhost, cherryport, https_port):
                 browserhost = "127.0.0.1"
 
     # This is to please Chrome on macOS
-    if cherryhost == "localhost" and sabnzbd.DARWIN:
+    if cherryhost == "localhost" and sabnzbd.MACOS:
         cherryhost = "127.0.0.1"
         browserhost = "localhost"
 
@@ -688,9 +683,9 @@ def is_sabnzbd_running(url):
     try:
         url = "%s&mode=version" % url
         # Do this without certificate verification, few installations will have that
-        prev = sabnzbd.set_https_verification(False)
+        prev = set_https_verification(False)
         ver = get_from_url(url)
-        sabnzbd.set_https_verification(prev)
+        set_https_verification(prev)
         return ver and (re.search(r"\d+\.\d+\.", ver) or ver.strip() == sabnzbd.__version__)
     except:
         return False
@@ -718,10 +713,10 @@ def check_for_sabnzbd(url, upload_nzbs, allow_browser=True):
     if is_sabnzbd_running(url):
         # Upload any specified nzb files to the running instance
         if upload_nzbs:
-            prev = sabnzbd.set_https_verification(False)
+            prev = set_https_verification(False)
             for f in upload_nzbs:
                 upload_file_to_sabnzbd(url, f)
-            sabnzbd.set_https_verification(prev)
+            set_https_verification(prev)
         else:
             # Launch the web browser and quit since sabnzbd is already running
             # Trim away everything after the final slash in the URL
@@ -993,12 +988,6 @@ def main():
     logger.setLevel(logging.WARNING)
     logger.addHandler(gui_log)
 
-    # Detect CPU architecture and Windows variant
-    # Use .machine as .processor is not always filled
-    cpu_architecture = platform.uname().machine
-    if sabnzbd.WIN32:
-        sabnzbd.WIN64 = cpu_architecture == "AMD64"
-
     if inifile:
         # INI file given, simplest case
         inifile = evaluate_inipath(inifile)
@@ -1192,7 +1181,7 @@ def main():
     logging.info("Arguments = %s", sabnzbd.CMDLINE)
     logging.info("Python-version = %s", sys.version)
     logging.info("Dockerized = %s", sabnzbd.DOCKER)
-    logging.info("CPU architecture = %s", cpu_architecture)
+    logging.info("CPU architecture = %s", platform.uname().machine)
 
     try:
         logging.info("Platform = %s - %s", os.name, platform.platform())
@@ -1204,14 +1193,24 @@ def main():
     logging.info("Preferred encoding = %s", sabnzbd.encoding.CODEPAGE)
 
     # On Linux/FreeBSD/Unix "UTF-8" is strongly, strongly adviced:
-    if not sabnzbd.WIN32 and not sabnzbd.DARWIN and not ("utf-8" in sabnzbd.encoding.CODEPAGE.lower()):
-        logging.warning_helpful(
+    if not sabnzbd.WIN32 and not sabnzbd.MACOS and not ("utf-8" in sabnzbd.encoding.CODEPAGE.lower()):
+        helpful_warning(
             T(
                 "SABnzbd was started with encoding %s, this should be UTF-8. Expect problems with Unicoded file and directory names in downloads."
             ),
             sabnzbd.encoding.CODEPAGE,
         )
 
+    # Verify umask, we need at least 700
+    if not sabnzbd.WIN32 and sabnzbd.ORG_UMASK > int("077", 8):
+        sabnzbd.misc.helpful_warning(
+            T("Current umask (%o) might deny SABnzbd access to the files and folders it creates."),
+            sabnzbd.ORG_UMASK,
+        )
+
+    # Log JSON module in case of problems
+    logging.debug("JSON-module = %s %s", sabnzbd.api.json.__name__, sabnzbd.api.json.__version__)
+
     # SSL Information
     logging.info("SSL version = %s", ssl.OPENSSL_VERSION)
 
@@ -1235,13 +1234,14 @@ def main():
         logging.debug("Available certificates = %s", repr(ssl.create_default_context().cert_store_stats()))
 
         # List networking
-        logging.debug("Local IPv4 address = %s", localipv4())
-        logging.debug("Public IPv4 address = %s", publicipv4())
-        logging.debug("IPv6 address = %s", ipv6())
+        localipv4()
+        publicipv4()
+        ipv6()
+        dnslookup()
 
-        # Measure and log system performance measured by pystone and - if possible - CPU model
-        logging.debug("CPU Pystone available performance = %s", getpystone())
-        logging.debug("CPU model = %s", getcpu())
+        # Measure basic system performance measured by pystone and - if possible - CPU model
+        getpystone()
+        getcpu()
 
     logging.info("Using INI file %s", inifile)
 
@@ -1252,8 +1252,8 @@ def main():
 
     os.chdir(sabnzbd.DIR_PROG)
 
-    sabnzbd.WEB_DIR = identify_web_template(sabnzbd.cfg.web_dir, DEF_STDINTF, fix_webname(web_dir))
-    sabnzbd.WEB_DIR_CONFIG = identify_web_template(None, DEF_STDCONFIG, "")
+    sabnzbd.WEB_DIR = identify_web_template(sabnzbd.cfg.web_dir, DEF_STD_WEB_DIR, fix_webname(web_dir))
+    sabnzbd.WEB_DIR_CONFIG = identify_web_template(None, DEF_STD_CONFIG, "")
     sabnzbd.WIZARD_DIR = os.path.join(sabnzbd.DIR_INTERFACES, "wizard")
 
     sabnzbd.WEB_COLOR = check_template_scheme(sabnzbd.cfg.web_color(), sabnzbd.WEB_DIR)
@@ -1439,12 +1439,11 @@ def main():
     try:
         cherrypy.engine.start()
     except:
+        # Since the webserver is started by cherrypy in a separate thread, we can't really catch any
+        # start-up errors. This try/except only catches very few errors, the rest is only shown in the console.
         logging.error(T("Failed to start web-interface: "), exc_info=True)
         abort_and_show_error(browserhost, cherryport)
 
-    # Wait for server to become ready
-    cherrypy.engine.wait(cherrypy.process.wspbus.states.STARTED)
-
     if sabnzbd.WIN32:
         if enable_https:
             mode = "s"
@@ -1468,6 +1467,9 @@ def main():
     if sabnzbd.NO_DOWNLOADING:
         return
 
+    # Apply proxy, if configured, before main requests are made
+    sabnzbd.misc.set_socks5_proxy()
+
     # Start all SABnzbd tasks
     logging.info("Starting %s-%s", sabnzbd.MY_NAME, sabnzbd.__version__)
     try:
@@ -1479,7 +1481,7 @@ def main():
     # Upload any nzb/zip/rar/nzb.gz/nzb.bz2 files from file association
     if upload_nzbs:
         for upload_nzb in upload_nzbs:
-            sabnzbd.add_nzbfile(upload_nzb)
+            sabnzbd.nzbparser.add_nzbfile(upload_nzb)
 
     # Set URL for browser
     if enable_https:
@@ -1560,7 +1562,7 @@ def main():
         # 30 sec polling tasks
         if not timer % 10:
             # Keep OS awake (if needed)
-            sabnzbd.keep_awake()
+            sabnzbd.misc.keep_awake()
             # Restart scheduler (if needed)
             sabnzbd.Scheduler.restart(plan_restart=False)
             # Save config (if needed)
@@ -1585,9 +1587,13 @@ def main():
             sys.argv = sabnzbd.RESTART_ARGS
             os.chdir(org_dir)
 
+            # Restore backup
+            if sabnzbd.RESTORE_DATA:
+                config.restore_config_backup(sabnzbd.RESTORE_DATA)
+
             # Binaries require special restart
             if hasattr(sys, "frozen"):
-                if sabnzbd.DARWIN:
+                if sabnzbd.MACOS:
                     # On macOS restart of app instead of embedded python
                     my_name = sabnzbd.MY_FULLNAME.replace("/Contents/MacOS/SABnzbd", "")
                     my_args = " ".join(sys.argv[1:])
@@ -1612,7 +1618,7 @@ def main():
     sys.stdout.flush()
     sabnzbd.pid_file()
 
-    if hasattr(sys, "frozen") and sabnzbd.DARWIN:
+    if hasattr(sys, "frozen") and sabnzbd.MACOS:
         try:
             AppHelper.stopEventLoop()
         except:
@@ -1739,6 +1745,9 @@ def handle_windows_service():
 
 
 if __name__ == "__main__":
+    # Require for freezing
+    multiprocessing.freeze_support()
+
     # We can only register these in the main thread
     signal.signal(signal.SIGINT, sabnzbd.sig_handler)
     signal.signal(signal.SIGTERM, sabnzbd.sig_handler)
@@ -1747,7 +1756,7 @@ if __name__ == "__main__":
         if not handle_windows_service():
             main()
 
-    elif sabnzbd.DARWIN and sabnzbd.FOUNDATION:
+    elif sabnzbd.MACOS and sabnzbd.FOUNDATION:
         # macOS binary runner
         from threading import Thread
         from PyObjCTools import AppHelper

builder/SABnzbd.spec

@@ -1,4 +1,5 @@
 # -*- mode: python -*-
+import os
 import re
 import sys
 import pkginfo
@@ -41,10 +42,11 @@ RELEASE_VERSION = pkginfo.Develop(".").version
 # Add hidden imports
 extra_hiddenimports = ["Cheetah.DummyTransaction", "cheroot.ssl.builtin", "certifi"]
 extra_hiddenimports.extend(collect_submodules("babelfish.converters"))
+extra_hiddenimports.extend(collect_submodules("guessit.data"))
 
 # Add platform specific stuff
 if sys.platform == "darwin":
-    extra_hiddenimports.extend(["pyobjc", "objc", "PyObjCTools"])
+    extra_hiddenimports.extend(["objc", "PyObjCTools"])
     # macOS folders
     extra_folders += ["osx/par2/", "osx/unrar/", "osx/7zip/"]
     # Add NZB-icon file
@@ -66,6 +68,7 @@ else:
     # Windows
     extra_hiddenimports.append("win32timezone")
     extra_folders += ["win/multipar/", "win/unrar/", "win/7zip/"]
+    extra_files += ["portable.cmd"]
 
     # Parse the version info
     version_regexed = re.search(r"(\d+)\.(\d+)\.(\d+)([a-zA-Z]*)(\d*)", RELEASE_VERSION)
@@ -119,11 +122,17 @@ pyi_analysis = Analysis(
     ["SABnzbd.py"],
     datas=extra_pyinstaller_files,
     hiddenimports=extra_hiddenimports,
-    excludes=["FixTk", "tcl", "tk", "_tkinter", "tkinter", "Tkinter"],
+    excludes=["ujson", "FixTk", "tcl", "tk", "_tkinter", "tkinter", "Tkinter"],
 )
 
 pyz = PYZ(pyi_analysis.pure, pyi_analysis.zipped_data)
 
+codesign_identity = os.environ.get("SIGNING_AUTH")
+if not codesign_identity:
+    # PyInstaller needs specifically None, not just an empty value
+    codesign_identity = None
+
+# macOS specific parameters are ignored on other platforms
 exe = EXE(
     pyz,
     pyi_analysis.scripts,
@@ -135,6 +144,9 @@ exe = EXE(
     append_pkg=False,
     icon="icons/sabnzbd.ico",
     version=version_info,
+    target_arch="universal2",
+    entitlements_file="builder/osx/entitlements.plist",
+    codesign_identity=codesign_identity,
 )
 
 coll = COLLECT(exe, pyi_analysis.binaries, pyi_analysis.zipfiles, pyi_analysis.datas, name="SABnzbd")
@@ -186,4 +198,10 @@ if sys.platform == "darwin":
         "LSEnvironment": {"LANG": "en_US.UTF-8", "LC_ALL": "en_US.UTF-8"},
     }
 
-    app = BUNDLE(coll, name="SABnzbd.app", icon="builder/osx/image/sabnzbdplus.icns", info_plist=info_plist)
+    app = BUNDLE(
+        coll,
+        name="SABnzbd.app",
+        icon="builder/osx/image/sabnzbdplus.icns",
+        bundle_identifier="org.sabnzbd.sabnzbd",
+        info_plist=info_plist,
+    )

builder/osx/requirements.txt

@@ -0,0 +1,3 @@
+# Special requirements for macOS universal2 binary release
+# This way dependabot can auto-update them
+cryptography==37.0.2

builder/package.py

@@ -20,13 +20,17 @@ import platform
 import re
 import sys
 import os
+import tempfile
 import time
 import shutil
 import subprocess
 import tarfile
+import urllib.request
+import urllib.error
+import configobj
 import pkginfo
 import github
-from distutils.dir_util import copy_tree
+from typing import List
 
 
 VERSION_FILE = "sabnzbd/version.py"
@@ -76,12 +80,12 @@ def delete_files_glob(name):
             os.remove(f)
 
 
-def run_external_command(command):
+def run_external_command(command: List[str], print_output: bool = True):
     """Wrapper to ease the use of calling external programs"""
     process = subprocess.Popen(command, text=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     output, _ = process.communicate()
     ret = process.wait()
-    if output:
+    if (output and print_output) or ret != 0:
         print(output)
     if ret != 0:
         raise RuntimeError("Command returned non-zero exit code %s!" % ret)
@@ -115,6 +119,62 @@ def patch_version_file(release_name):
         ver.write(version_file)
 
 
+def test_sab_binary(binary_path: str):
+    """Wrapper to have a simple start-up test for the binary"""
+    with tempfile.TemporaryDirectory() as config_dir:
+        sabnzbd_process = subprocess.Popen(
+            [binary_path, "--browser", "0", "--logging", "2", "--config", config_dir],
+            text=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+        )
+
+        # Wait for SAB to respond
+        base_url = "http://127.0.0.1:8080/"
+        for _ in range(10):
+            try:
+                urllib.request.urlopen(base_url, timeout=1).read()
+                break
+            except:
+                time.sleep(1)
+        else:
+            raise urllib.error.URLError("Could not connect to SABnzbd")
+
+        # Open a number of API calls and pages, to see if we are really up
+        pages_to_test = [
+            "",
+            "wizard",
+            "config",
+            "config/server",
+            "config/categories",
+            "config/scheduling",
+            "config/rss",
+            "config/general",
+            "config/folders",
+            "config/switches",
+            "config/sorting",
+            "config/notify",
+            "config/special",
+            "api?mode=version",
+        ]
+        for url in pages_to_test:
+            print("Testing: %s%s" % (base_url, url))
+            if b"500 Internal Server Error" in urllib.request.urlopen(base_url + url, timeout=1).read():
+                raise RuntimeError("Crash in %s" % url)
+
+        # Parse API-key so we can do a graceful shutdown
+        sab_config = configobj.ConfigObj(os.path.join(config_dir, "sabnzbd.ini"))
+        urllib.request.urlopen(base_url + "shutdown/?apikey=" + sab_config["misc"]["api_key"], timeout=10)
+        sabnzbd_process.wait()
+
+        # Print logs for verification
+        with open(os.path.join(config_dir, "logs", "sabnzbd.log"), "r") as log_file:
+            print(log_file.read())
+
+        # So we have time to print the file before the directory is removed
+        time.sleep(1)
+
+
 if __name__ == "__main__":
     # Was any option supplied?
     if len(sys.argv) < 2:
@@ -147,6 +207,7 @@ if __name__ == "__main__":
     patch_version_file(RELEASE_VERSION)
 
     # To draft a release or not to draft a release?
+    ON_GITHUB_ACTIONS = os.environ.get("CI", False)
     RELEASE_THIS = "refs/tags/" in os.environ.get("GITHUB_REF", "")
 
     # Rename release notes file
@@ -185,8 +246,7 @@ if __name__ == "__main__":
         # Run PyInstaller and check output
         run_external_command([sys.executable, "-O", "-m", "PyInstaller", "SABnzbd.spec"])
 
-        # Use special distutils function to merge the main and console directories
-        copy_tree("dist/SABnzbd-console", "dist/SABnzbd")
+        shutil.copytree("dist/SABnzbd-console", "dist/SABnzbd", dirs_exist_ok=True)
         safe_remove("dist/SABnzbd-console")
 
         # Remove unwanted DLL's
@@ -227,11 +287,14 @@ if __name__ == "__main__":
             )
 
         # Rename the folder
-        os.rename("dist/SABnzbd", RELEASE_NAME)
+        shutil.copytree("dist/SABnzbd", RELEASE_NAME)
 
         # Create the archive
         run_external_command(["win/7zip/7za.exe", "a", RELEASE_BINARY, RELEASE_NAME])
 
+        # Test the release, as the very last step to not mess with any release code
+        test_sab_binary("dist/SABnzbd/SABnzbd.exe")
+
     if "app" in sys.argv:
         # Must be run on macOS
         if sys.platform != "darwin":
@@ -242,19 +305,17 @@ if __name__ == "__main__":
         notarization_user = os.environ.get("NOTARIZATION_USER")
         notarization_pass = os.environ.get("NOTARIZATION_PASS")
 
-        # Run PyInstaller and check output
-        run_external_command([sys.executable, "-O", "-m", "PyInstaller", "SABnzbd.spec"])
-
-        # Only continue if we can sign
+        # We need to sign all the included binaries before packaging them
+        # Otherwise the signature of the main application becomes invalid
         if authority:
             files_to_sign = [
-                "dist/SABnzbd.app/Contents/MacOS/osx/par2/par2-sl64",
-                "dist/SABnzbd.app/Contents/MacOS/osx/7zip/7za",
-                "dist/SABnzbd.app/Contents/MacOS/osx/unrar/unrar",
-                "dist/SABnzbd.app/Contents/MacOS/SABnzbd",
-                "dist/SABnzbd.app",
+                "osx/par2/par2-sl64",
+                "osx/par2/arm64/par2",
+                "osx/par2/arm64/libomp.dylib",
+                "osx/unrar/unrar",
+                "osx/unrar/arm64/unrar",
+                "osx/7zip/7zz",
             ]
-
             for file_to_sign in files_to_sign:
                 print("Signing %s with hardended runtime" % file_to_sign)
                 run_external_command(
@@ -267,15 +328,55 @@ if __name__ == "__main__":
                         "runtime",
                         "--entitlements",
                         "builder/osx/entitlements.plist",
-                        "-i",
-                        "org.sabnzbd.sabnzbd",
                         "-s",
                         authority,
                         file_to_sign,
                     ],
+                    print_output=False,
                 )
                 print("Signed %s!" % file_to_sign)
 
+        # Run PyInstaller and check output
+        run_external_command([sys.executable, "-O", "-m", "PyInstaller", "SABnzbd.spec"])
+
+        # Make sure we created a fully universal2 release when releasing or during CI
+        if RELEASE_THIS or ON_GITHUB_ACTIONS:
+            for bin_to_check in glob.glob("dist/SABnzbd.app/Contents/MacOS/**/*.so", recursive=True):
+                print("Checking if binary is universal2: %s" % bin_to_check)
+                file_output = run_external_command(["file", bin_to_check], print_output=False)
+                # Make sure we have both arm64 and x86
+                if not ("x86_64" in file_output and "arm64" in file_output):
+                    raise RuntimeError("Non-universal2 binary found!")
+
+        # Only continue if we can sign
+        if authority:
+            # We use PyInstaller to sign the main SABnzbd executable and the SABnzbd.app
+            files_already_signed = [
+                "dist/SABnzbd.app/Contents/MacOS/SABnzbd",
+                "dist/SABnzbd.app",
+            ]
+            for file_to_check in files_already_signed:
+                print("Checking signature of %s" % file_to_check)
+                sign_result = run_external_command(
+                    [
+                        "codesign",
+                        "-dv",
+                        "-r-",
+                        file_to_check,
+                    ],
+                    print_output=False,
+                ) + run_external_command(
+                    [
+                        "codesign",
+                        "--verify",
+                        "--deep",
+                        file_to_check,
+                    ],
+                    print_output=False,
+                )
+                if authority not in sign_result or "adhoc" in sign_result or "invalid" in sign_result:
+                    raise RuntimeError("Signature of %s seems invalid!" % file_to_check)
+
             # Only notarize for real builds that we want to deploy
             if notarization_user and notarization_pass and RELEASE_THIS:
                 # Prepare zip to upload to notarization service
@@ -288,50 +389,24 @@ if __name__ == "__main__":
 
                 # Upload to Apple
                 print("Sending zip to Apple notarization service")
-                upload_process = run_external_command(
+                upload_result = run_external_command(
                     [
                         "xcrun",
-                        "altool",
-                        "--notarize-app",
-                        "-t",
-                        "osx",
-                        "-f",
+                        "notarytool",
+                        "submit",
                         notarization_zip,
-                        "--primary-bundle-id",
-                        "org.sabnzbd.sabnzbd",
-                        "-u",
+                        "--apple-id",
                         notarization_user,
-                        "-p",
+                        "--team-id",
+                        authority,
+                        "--password",
                         notarization_pass,
+                        "--wait",
                     ],
                 )
 
-                # Extract the notarization ID
-                m = re.match(".*RequestUUID = (.*?)\n", upload_process, re.S)
-                if not m:
-                    raise RuntimeError("No UUID created")
-                uuid = m.group(1)
-
-                print("Checking notarization of UUID: %s (every 30 seconds)" % uuid)
-                notarization_in_progress = True
-                while notarization_in_progress:
-                    time.sleep(30)
-                    check_status = run_external_command(
-                        [
-                            "xcrun",
-                            "altool",
-                            "--notarization-info",
-                            uuid,
-                            "-u",
-                            notarization_user,
-                            "-p",
-                            notarization_pass,
-                        ],
-                    )
-                    notarization_in_progress = "Status: in progress" in check_status
-
                 # Check if success
-                if "Status: success" not in check_status:
+                if "status: accepted" not in upload_result.lower():
                     raise RuntimeError("Failed to notarize..")
 
                 # Staple the notarization!
@@ -344,6 +419,9 @@ if __name__ == "__main__":
         else:
             print("Signing skipped, missing SIGNING_AUTH.")
 
+        # Test the release, as the very last step to not mess with any release code
+        test_sab_binary("dist/SABnzbd.app/Contents/MacOS/SABnzbd")
+
     if "source" in sys.argv:
         # Prepare Source distribution package.
         # We assume the sources are freshly cloned from the repo
@@ -361,7 +439,7 @@ if __name__ == "__main__":
 
         # Copy all folders and files to the new folder
         for source_folder in extra_folders:
-            copy_tree(source_folder, os.path.join(src_folder, source_folder))
+            shutil.copytree(source_folder, os.path.join(src_folder, source_folder), dirs_exist_ok=True)
 
         # Copy all files
         for source_file in extra_files:

builder/requirements.txt

@@ -1,9 +1,21 @@
 # Basic build requirements
-pyinstaller
-setuptools
-pkginfo
+# Note that not all sub-dependencies are listed, but only ones we know could cause trouble
+pyinstaller==5.1
+pyinstaller-hooks-contrib==2022.5
+altgraph==0.17.2
+wrapt==1.14.1
+setuptools==62.3.2
+pkginfo==1.8.2
+PyGithub==1.55
+charset-normalizer==2.0.12
 certifi
-pygithub
 
-# For the OSX build specific
-dmgbuild; sys_platform == 'darwin'
+# orjson does not support 32bit Windows, exclude it based on Python-version
+orjson==3.6.8; python_version > '3.8'
+
+# For the macOS build
+dmgbuild==1.5.2; sys_platform == 'darwin'
+mac-alias==2.2.0; sys_platform == 'darwin'
+macholib==1.16; sys_platform == 'darwin'
+ds-store==1.3.0; sys_platform == 'darwin'
+PyNaCl==1.5.0; sys_platform == 'darwin'

interfaces/Config/templates/_inc_footer_uc.tmpl

@@ -12,7 +12,7 @@
                     <div class="modal-body">
                     </div>
                     <div class="modal-footer">
-                        <!--#if not $nt#-->
+                        <!--#if not $windows#-->
                         <div class="checkbox">
                             <label>
                                 <input type="checkbox" id="show_hidden_folders"> <span>$T('systemFolders')</span>

interfaces/Config/templates/config.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Config"#-->
-<!--#set global $help_uri="configuration/3.4/configure"#-->
+<!--#set global $help_uri="configuration/3.6/configure"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#from sabnzbd.encoding import CODEPAGE#-->
@@ -41,7 +41,7 @@
                     </td>
                 </tr>
                 <!--#end if#-->
-                <!--#if not $nt and not $darwin#-->
+                <!--#if not $windows and not $macos#-->
                 <tr>
                     <th scope="row">$T('opt-multicore-par2')</th>
                     <td>
@@ -124,7 +124,7 @@
 
 <div class="colmask">
     <div class="padding alt">
-        <h5 class="copyright">Copyright &copy; 2007-2021 The SABnzbd Team &lt;<a href="mailto:team@sabnzbd.org">team@sabnzbd.org</a>&gt;</h5>
+        <h5 class="copyright">Copyright &copy; 2007-2022 The SABnzbd Team &lt;<a href="mailto:team@sabnzbd.org">team@sabnzbd.org</a>&gt;</h5>
         <p class="copyright"><small>$T('yourRights')</small></p>
     </div>
 

interfaces/Config/templates/config_cat.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Categories"#-->
-<!--#set global $help_uri="configuration/3.4/categories"#-->
+<!--#set global $help_uri="configuration/3.6/categories"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <div class="colmask">
     <div class="section">
@@ -111,7 +111,7 @@
         });
 
         // Add autocomplete and file-browser
-        \$('.fileBrowserSmall').typeahead().fileBrowser();
+        \$('.fileBrowserSmall').typeahead({appendTo: 'body'}).fileBrowser();
 
         // Make categories sortable
         \$('.padTable').sortable({

interfaces/Config/templates/config_folders.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Folders"#-->
-<!--#set global $help_uri="configuration/3.4/folders"#-->
+<!--#set global $help_uri="configuration/3.6/folders"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -47,7 +47,7 @@
                     <input type="checkbox" name="fulldisk_autoresume" id="fulldisk_autoresume" value="1" <!--#if int($fulldisk_autoresume) > 0 then 'checked="checked"' else ""#--> />
                     <span class="desc">$T('explain-fulldisk_autoresume')</span>
                 </div>
-                <!--#if not $nt#-->
+                <!--#if not $windows#-->
                 <div class="field-pair advanced-settings">
                     <label class="config" for="permissions">$T('opt-permissions')</label>
                     <input type="text" name="permissions" id="permissions" value="$permissions" class="smaller_input" />

interfaces/Config/templates/config_general.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="General"#-->
-<!--#set global $help_uri="configuration/3.4/general"#-->
+<!--#set global $help_uri="configuration/3.6/general"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -9,215 +9,247 @@
         </label>
     </div>
     <form action="saveGeneral" method="post" name="fullform" class="fullform" autocomplete="off">
-    <input type="hidden" id="apikey" name="apikey" value="$apikey" />
-    <input type="hidden" id="ajax" name="ajax" value="1" />
-    <input type="hidden" name="output" value="json" />
-    <div class="section">
-        <div class="col2">
-            <h3>$T('webServer') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-            <p><b>$T('restartRequired')</b></p>
-        </div><!-- /col2 -->
-        <div class="col1">
-            <fieldset>
-                <div class="field-pair">
-                    <label class="config" for="host">$T('opt-host')</label>
-                    <input type="text" name="host" id="host" value="$host" />
-                    <span class="desc">$T('explain-host')</span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="port">$T('opt-port')</label>
-                    <input type="number" name="port" id="port" value="$port" size="8" data-original="$port" />
-                    <span class="desc">$T('explain-port')</span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="enable_https">$T('opt-enable_https')</label>
-                    <input type="checkbox" name="enable_https" id="enable_https" value="1" <!--#if int($enable_https) > 0 then 'checked="checked" data-original="1"' else ""#-->/>
-                    <span class="desc">$T('explain-enable_https')</span>
-                    <span class="desc"><span class="label label-warning">$T('warning').upper()</span> $T('explain-enable_https_warning')</span>
-                </div>
-                <div class="field-pair advanced-settings">
-                    <label class="config" for="web_dir">$T('opt-web_dir')</label>
-                    <select name="web_dir" id="web_dir">
-                    <!--#for $webline in $web_list#-->
-                        <!--#if $webline.lower() == $web_dir.lower()#-->
-                            <option value="$webline" selected="selected">$webline</option>
-                        <!--#else#-->
-                            <option value="$webline">$webline</option>
-                        <!--#end if#-->
-                    <!--#end for#-->
-                    </select>
-                    <span class="desc">$T('explain-web_dir')&nbsp;&nbsp;<a href="$caller_url">$caller_url</a></span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="language">$T('opt-language')</label>
-                    <select name="language" id="language" class="select">
-                    <!--#for $webline in $lang_list#-->
-                        <!--#if $webline[0].lower() == $language.lower()#-->
-                            <option value="$webline[0]" selected="selected">$webline[1]</option>
-                        <!--#else#-->
-                            <option value="$webline[0]">$webline[1]</option>
-                        <!--#end if#-->
-                    <!--#end for#-->
-                    </select>
-                    <span class="desc">$T('explain-language')</span>
-                    <div class="alert alert-info alert-translate">
-                       $T('explain-ask-language') <a href="https://sabnzbd.org/wiki/translate" target="_blank" class="alert-link">https://sabnzbd.org/wiki/translate</a>
+        <input type="hidden" id="apikey" name="apikey" value="$apikey" />
+        <input type="hidden" id="ajax" name="ajax" value="1" />
+        <input type="hidden" name="output" value="json" />
+        <div class="section">
+            <div class="col2">
+                <h3>$T('webServer') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <p><b>$T('restartRequired')</b></p>
+            </div><!-- /col2 -->
+            <div class="col1">
+                <fieldset>
+                    <div class="field-pair">
+                        <label class="config" for="host">$T('opt-host')</label>
+                        <input type="text" name="host" id="host" value="$host" />
+                        <span class="desc">$T('explain-host')</span>
                     </div>
-                </div>
-                <div class="field-pair advanced-settings">
-                    <h5 class="darkred nomargin">$T('base-folder'): <span class="path">$my_lcldata</span></h5>
-                </div>
-                <div class="field-pair advanced-settings">
-                    <label class="config" for="https_port">$T('opt-https_port')</label>
-                    <input type="number" name="https_port" id="https_port" value="$https_port" size="8" data-original="$https_port" />
-                    <span class="desc">$T('explain-https_port')</span>
-                </div>
-                <div class="field-pair advanced-settings">
-                    <label class="config" for="https_cert">$T('opt-https_cert')</label>
-                    <input type="text" name="https_cert" id="https_cert" value="$https_cert" />
-                    <button class="btn btn-default generate_cert" title="$T('explain-new-cert')">
-                        <span class="glyphicon glyphicon-repeat"></span>
-                    </button>
-                    <span class="desc">$T('explain-https_cert')</span>
-                </div>
-                <div class="field-pair advanced-settings">
-                    <label class="config" for="https_key">$T('opt-https_key')</label>
-                    <input type="text" name="https_key" id="https_key" value="$https_key" />
-                    <button class="btn btn-default generate_cert" title="$T('explain-new-cert')">
-                        <span class="glyphicon glyphicon-repeat"></span>
-                    </button>
-                    <span class="desc">$T('explain-https_key')</span>
-                </div>
-                <div class="field-pair advanced-settings">
-                    <label class="config" for="https_chain">$T('opt-https_chain')</label>
-                    <input type="text" name="https_chain" id="https_chain" value="$https_chain" />
-                    <span class="desc">$T('explain-https_chain')</span>
-                </div>
-                <div class="field-pair">
-                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                    <button class="btn btn-default sabnzbd_restart"><span class="glyphicon glyphicon-refresh"></span> $T('button-restart') SABnzbd</button>
-                </div>
-            </fieldset>
-        </div>
-    </div>
-    <div class="section">
-        <div class="col2">
-            <h3>$T('security') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-            <p><b>$T('restartRequired')</b></p>
-        </div><!-- /col2 -->
-        <div class="col1">
-            <fieldset>
-                <!-- Tricks to avoid browser auto-fill, fixed on-submit with javascript -->
-                <div class="field-pair">
-                    <label class="config" for="${pid}_wu">$T('opt-web_username')</label>
-                    <input type="text" name="${pid}_wu" id="${pid}_wu" value="$username" data-hide="username" />
-                    <span class="desc">$T('explain-web_username')</span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="${pid}_wp">$T('opt-web_password')</label>
-                    <input type="text" name="${pid}_wp" id="${pid}_wp" value="$password" data-hide="password" />
-                    <span class="desc">$T('explain-web_password')</span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="inet_exposure">$T('opt-inet_exposure')</label>
-                        <select name="inet_exposure" id="inet_exposure" class="select">
-                            <optgroup label="API">
-                                <option value="0" <!--#if $inet_exposure == 0 then 'selected="selected"' else ""#-->>$T('inet-local')</option>
-                                <option value="1" <!--#if $inet_exposure == 1 then 'selected="selected"' else ""#-->>$T('inet-nzb')</option>
-                                <option value="2" <!--#if $inet_exposure == 2 then 'selected="selected"' else ""#-->>$T('inet-api')</option>
-                                <option value="3" <!--#if $inet_exposure == 3 then 'selected="selected"' else ""#-->>$T('inet-fullapi')</option>
-                            </optgroup>
-                            <optgroup label="$T('inet-fullapi') &amp; $T('opt-web_dir')">
-                                <option value="4" <!--#if $inet_exposure == 4 then 'selected="selected"' else ""#-->>$T('inet-ui')</option>
-                                <option value="5" <!--#if $inet_exposure == 5 then 'selected="selected"' else ""#-->>$T('inet-ui') - $T('inet-external_login')</option>
-                            </optgroup>
+                    <div class="field-pair">
+                        <label class="config" for="port">$T('opt-port')</label>
+                        <input type="number" name="port" id="port" value="$port" size="8" data-original="$port" />
+                        <span class="desc">$T('explain-port')</span>
+                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="enable_https">$T('opt-enable_https')</label>
+                        <input type="checkbox" name="enable_https" id="enable_https" value="1" <!--#if int($enable_https) > 0 then 'checked="checked" data-original="1"' else ""#-->/>
+                        <span class="desc">$T('explain-enable_https')</span>
+                        <span class="desc"><span class="label label-warning">$T('warning').upper()</span> $T('explain-enable_https_warning')</span>
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="web_dir">$T('opt-web_dir')</label>
+                        <select name="web_dir" id="web_dir">
+                        <!--#for $webline in $web_list#-->
+                            <!--#if $webline.lower() == $web_dir.lower()#-->
+                                <option value="$webline" selected="selected">$webline</option>
+                            <!--#else#-->
+                                <option value="$webline">$webline</option>
+                            <!--#end if#-->
+                        <!--#end for#-->
                         </select>
-                    <span class="desc">$T('explain-inet_exposure')</span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="apikey_display">$T('opt-apikey')</label>
-                    <input type="text" id="apikey_display" class="fileBrowserField" value="$apikey" readonly />
-                    <button class="btn btn-default show_qrcode" title="$T('explain-qr-code')" rel="$apikey" ><span class="glyphicon glyphicon-qrcode"></span></button>
-                    <button class="btn btn-default generate_key" id="generate_new_apikey" title="$T('button-apikey')"><span class="glyphicon glyphicon-repeat"></span></button>
-                    <span class="desc">$T('explain-apikey')</span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="nzbkey">$T('opt-nzbkey')</label>
-                    <input type="text" id="nzbkey" class="fileBrowserField" value="$nzb_key" readonly />
-                    <button class="btn btn-default show_qrcode" title="$T('explain-qr-code')" rel="$nzb_key" ><span class="glyphicon glyphicon-qrcode"></span></button>
-                    <button class="btn btn-default generate_key" id="generate_new_nzbkey" title="$T('button-apikey')"><span class="glyphicon glyphicon-repeat"></span></button>
-                    <span class="desc">$T('explain-nzbkey')</span>
-                </div>
-                <div class="field-pair">
-                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                </div>
-            </fieldset>
-        </div><!-- /col1 -->
-    </div><!-- /section -->
-    <div class="section">
-        <div class="col2">
-            <h3>$T('cmenu-switches') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-        </div><!-- /col2 -->
-        <div class="col1">
-            <fieldset>
-                <div class="field-pair">
-                    <label class="config" for="auto_browser">$T('opt-auto_browser')</label>
-                    <input type="checkbox" name="auto_browser" id="auto_browser" value="1" <!--#if int($auto_browser) > 0 then 'checked="checked"' else ""#--> />
-                    <span class="desc">$T('explain-auto_browser')</span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="check_new_rel">$T('opt-check_new_rel')</label>
-                    <select name="check_new_rel" id="check_new_rel">
-                        <option value="0" <!--#if $check_new_rel == 0 then 'selected="selected"' else ""#--> >$T('off')</option>
-                        <option value="1" <!--#if $check_new_rel == 1 then 'selected="selected"' else ""#--> >$T('on')</option>
-                        <option value="2" <!--#if $check_new_rel == 2 then 'selected="selected"' else ""#--> >$T('also-test')</option>
-                    </select>
-                    <span class="desc">$T('explain-check_new_rel')</span>
-                </div>
-                <div class="field-pair advanced-settings <!--#if int($certificate_validation) == 0 then "disabled" else ""#-->">
-                    <label class="config" for="enable_https_verification">$T('opt-enable_https_verification')</label>
-                    <input type="checkbox" name="enable_https_verification" id="enable_https_verification" value="1" <!--#if int($enable_https_verification) > 0 then 'checked="checked"' else ""#--> <!--#if int($certificate_validation) == 0 then "disabled=\"disabled\"" else ""#--> />
-                    <span class="desc">$T('explain-enable_https_verification')</span>
-                </div>
-                <div class="field-pair">
-                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                </div>
-            </fieldset>
-        </div><!-- /col1 -->
-    </div><!-- /section -->
-    <div class="section">
-        <div class="col2">
-            <h3>$T('tuning') <a href="$helpuri$help_uri#toc2" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-        </div><!-- /col2 -->
-        <div class="col1">
-            <fieldset>
-                <div class="field-pair value-and-select">
-                    <label class="config" for="bandwidth_max_value">$T('opt-bandwidth_max')</label>
-                    <input type="number" name="bandwidth_max_value" id="bandwidth_max_value" class="smaller_input" />
-                    <select name="bandwidth_max_dropdown" id="bandwidth_max_dropdown">
-                        <option value="">B/s</option>
-                        <option value="K">KB/s</option>
-                        <option value="M" selected>MB/s</option>
-                    </select>
-                    <input type="hidden" name="bandwidth_max" id="bandwidth_max" value="$bandwidth_max" />
-                </div>
-                <div class="field-pair advanced-settings">
-                    <label class="config" for="bandwidth_perc">$T('opt-bandwidth_perc')</label>
-                    <input type="number" name="bandwidth_perc" id="bandwidth_perc" value="$bandwidth_perc" step="10" min="0" max="100"/>
-                    <span class="desc">$T('explain-bandwidth_perc')</span>
-                </div>
-                <div class="field-pair advanced-settings">
-                    <label class="config" for="cache_limit">$T('opt-cache_limitstr')</label>
-                    <input type="text" name="cache_limit" id="cache_limit" value="$cache_limit" class="smaller_input" />
-                    <span class="desc">$T('explain-cache_limitstr').replace("64M", "256M").replace("128M", "512M")</span>
-                </div>
-                <div class="field-pair">
-                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                </div>
-            </fieldset>
-        </div><!-- /col1 -->
-    </div><!-- /section -->
+                        <span class="desc">$T('explain-web_dir')&nbsp;&nbsp;<a href="$caller_url">$caller_url</a></span>
+                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="language">$T('opt-language')</label>
+                        <select name="language" id="language" class="select">
+                        <!--#for $webline in $lang_list#-->
+                            <!--#if $webline[0].lower() == $language.lower()#-->
+                                <option value="$webline[0]" selected="selected">$webline[1]</option>
+                            <!--#else#-->
+                                <option value="$webline[0]">$webline[1]</option>
+                            <!--#end if#-->
+                        <!--#end for#-->
+                        </select>
+                        <span class="desc">$T('explain-language')</span>
+                        <div class="alert alert-info alert-translate">
+                           $T('explain-ask-language') <a href="https://sabnzbd.org/wiki/translate" target="_blank" class="alert-link">https://sabnzbd.org/wiki/translate</a>
+                        </div>
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <h5 class="darkred nomargin">$T('base-folder'): <span class="path">$my_lcldata</span></h5>
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="https_port">$T('opt-https_port')</label>
+                        <input type="number" name="https_port" id="https_port" value="$https_port" size="8" data-original="$https_port" />
+                        <span class="desc">$T('explain-https_port')</span>
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="https_cert">$T('opt-https_cert')</label>
+                        <input type="text" name="https_cert" id="https_cert" value="$https_cert" />
+                        <button class="btn btn-default generate_cert" title="$T('explain-new-cert')">
+                            <span class="glyphicon glyphicon-repeat"></span>
+                        </button>
+                        <span class="desc">$T('explain-https_cert')</span>
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="https_key">$T('opt-https_key')</label>
+                        <input type="text" name="https_key" id="https_key" value="$https_key" />
+                        <button class="btn btn-default generate_cert" title="$T('explain-new-cert')">
+                            <span class="glyphicon glyphicon-repeat"></span>
+                        </button>
+                        <span class="desc">$T('explain-https_key')</span>
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="https_chain">$T('opt-https_chain')</label>
+                        <input type="text" name="https_chain" id="https_chain" value="$https_chain" />
+                        <span class="desc">$T('explain-https_chain')</span>
+                    </div>
+                    <div class="field-pair">
+                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
+                        <button class="btn btn-default sabnzbd_restart"><span class="glyphicon glyphicon-refresh"></span> $T('button-restart') SABnzbd</button>
+                    </div>
+                </fieldset>
+            </div>
+        </div>
+        <div class="section">
+            <div class="col2">
+                <h3>$T('security') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <p><b>$T('restartRequired')</b></p>
+            </div><!-- /col2 -->
+            <div class="col1">
+                <fieldset>
+                    <!-- Tricks to avoid browser auto-fill, fixed on-submit with javascript -->
+                    <div class="field-pair">
+                        <label class="config" for="${pid}_wu">$T('opt-web_username')</label>
+                        <input type="text" name="${pid}_wu" id="${pid}_wu" value="$username" data-hide="username" />
+                        <span class="desc">$T('explain-web_username')</span>
+                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="${pid}_wp">$T('opt-web_password')</label>
+                        <input type="text" name="${pid}_wp" id="${pid}_wp" value="$password" data-hide="password" />
+                        <span class="desc">$T('explain-web_password')</span>
+                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="inet_exposure">$T('opt-inet_exposure')</label>
+                            <select name="inet_exposure" id="inet_exposure" class="select">
+                                <optgroup label="API">
+                                    <option value="0" <!--#if $inet_exposure == 0 then 'selected="selected"' else ""#-->>$T('inet-local')</option>
+                                    <option value="1" <!--#if $inet_exposure == 1 then 'selected="selected"' else ""#-->>$T('inet-nzb')</option>
+                                    <option value="2" <!--#if $inet_exposure == 2 then 'selected="selected"' else ""#-->>$T('inet-api')</option>
+                                    <option value="3" <!--#if $inet_exposure == 3 then 'selected="selected"' else ""#-->>$T('inet-fullapi')</option>
+                                </optgroup>
+                                <optgroup label="$T('inet-fullapi') &amp; $T('opt-web_dir')">
+                                    <option value="4" <!--#if $inet_exposure == 4 then 'selected="selected"' else ""#-->>$T('inet-ui')</option>
+                                    <option value="5" <!--#if $inet_exposure == 5 then 'selected="selected"' else ""#-->>$T('inet-ui') - $T('inet-external_login')</option>
+                                </optgroup>
+                            </select>
+                        <span class="desc">$T('explain-inet_exposure')</span>
+                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="apikey_display">$T('opt-apikey')</label>
+                        <input type="text" id="apikey_display" class="fileBrowserField" value="$apikey" readonly />
+                        <button class="btn btn-default show_qrcode" title="$T('explain-qr-code')" rel="$apikey" ><span class="glyphicon glyphicon-qrcode"></span></button>
+                        <button class="btn btn-default generate_key" id="generate_new_apikey" title="$T('button-apikey')"><span class="glyphicon glyphicon-repeat"></span></button>
+                        <span class="desc">$T('explain-apikey')</span>
+                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="nzbkey">$T('opt-nzbkey')</label>
+                        <input type="text" id="nzbkey" class="fileBrowserField" value="$nzb_key" readonly />
+                        <button class="btn btn-default show_qrcode" title="$T('explain-qr-code')" rel="$nzb_key" ><span class="glyphicon glyphicon-qrcode"></span></button>
+                        <button class="btn btn-default generate_key" id="generate_new_nzbkey" title="$T('button-apikey')"><span class="glyphicon glyphicon-repeat"></span></button>
+                        <span class="desc">$T('explain-nzbkey')</span>
+                    </div>
+                    <div class="field-pair">
+                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
+                    </div>
+                </fieldset>
+            </div><!-- /col1 -->
+        </div><!-- /section -->
+        <div class="section">
+            <div class="col2">
+                <h3>$T('cmenu-switches') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            </div><!-- /col2 -->
+            <div class="col1">
+                <fieldset>
+                    <div class="field-pair">
+                        <label class="config" for="auto_browser">$T('opt-auto_browser')</label>
+                        <input type="checkbox" name="auto_browser" id="auto_browser" value="1" <!--#if int($auto_browser) > 0 then 'checked="checked"' else ""#--> />
+                        <span class="desc">$T('explain-auto_browser')</span>
+                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="check_new_rel">$T('opt-check_new_rel')</label>
+                        <select name="check_new_rel" id="check_new_rel">
+                            <option value="0" <!--#if $check_new_rel == 0 then 'selected="selected"' else ""#--> >$T('off')</option>
+                            <option value="1" <!--#if $check_new_rel == 1 then 'selected="selected"' else ""#--> >$T('on')</option>
+                            <option value="2" <!--#if $check_new_rel == 2 then 'selected="selected"' else ""#--> >$T('also-test')</option>
+                        </select>
+                        <span class="desc">$T('explain-check_new_rel')</span>
+                    </div>
+                    <div class="field-pair advanced-settings <!--#if int($certificate_validation) == 0 then "disabled" else ""#-->">
+                        <label class="config" for="enable_https_verification">$T('opt-enable_https_verification')</label>
+                        <input type="checkbox" name="enable_https_verification" id="enable_https_verification" value="1" <!--#if int($enable_https_verification) > 0 then 'checked="checked"' else ""#--> <!--#if int($certificate_validation) == 0 then "disabled=\"disabled\"" else ""#--> />
+                        <span class="desc">$T('explain-enable_https_verification')</span>
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="socks5_proxy_url">$T('opt-socks5_proxy_url')</label>
+                        <input type="text" name="socks5_proxy_url" id="socks5_proxy_url" value="$socks5_proxy_url" autocomplete="off" placeholder="socks5://user:pass@hostname:port" />
+                        <span class="desc">$T('explain-socks5_proxy_url') <br/>$T('readwiki')</span>
+                    </div>
+                    <div class="field-pair">
+                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
+                    </div>
+                </fieldset>
+            </div><!-- /col1 -->
+        </div><!-- /section -->
+        <div class="section">
+            <div class="col2">
+                <h3>$T('tuning') <a href="$helpuri$help_uri#toc2" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            </div><!-- /col2 -->
+            <div class="col1">
+                <fieldset>
+                    <div class="field-pair value-and-select">
+                        <label class="config" for="bandwidth_max_value">$T('opt-bandwidth_max')</label>
+                        <input type="number" name="bandwidth_max_value" id="bandwidth_max_value" class="smaller_input" />
+                        <select name="bandwidth_max_dropdown" id="bandwidth_max_dropdown">
+                            <option value="">B/s</option>
+                            <option value="K">KB/s</option>
+                            <option value="M" selected>MB/s</option>
+                        </select>
+                        <input type="hidden" name="bandwidth_max" id="bandwidth_max" value="$bandwidth_max" />
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="bandwidth_perc">$T('opt-bandwidth_perc')</label>
+                        <input type="number" name="bandwidth_perc" id="bandwidth_perc" value="$bandwidth_perc" step="10" min="0" max="100"/>
+                        <span class="desc">$T('explain-bandwidth_perc')</span>
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="cache_limit">$T('opt-cache_limitstr')</label>
+                        <input type="text" name="cache_limit" id="cache_limit" value="$cache_limit" class="smaller_input" />
+                        <span class="desc">$T('explain-cache_limitstr').replace("64M", "256M").replace("128M", "512M")</span>
+                    </div>
+                    <div class="field-pair">
+                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
+                    </div>
+                </fieldset>
+            </div><!-- /col1 -->
+        </div><!-- /section -->
+    </form>
 
+    <form action="uploadConfig" method="post" name="fullform" class="fullform" autocomplete="off" enctype="multipart/form-data">
+        <input type="hidden" name="apikey" value="$apikey" />
+        <input type="hidden" name="ajax" value="1" />
+        <input type="hidden" name="output" value="json" />
+        <div class="section">
+            <div class="col2">
+                <h3>$T('backup') <a href="$helpuri$help_uri#toc3" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <p><b>$T('restartRequired')</b></p>
+            </div><!-- /col2 -->
+            <div class="col1">
+                <fieldset>
+                    <div class="field-pair">
+                        <label class="config" for="download_backup">$T('download-backup')</label>
+                        <span class="desc"><a class="btn btn-default" href="../backup/?apikey=$apikey" target="_blank" id="download_backup"><span class="glyphicon glyphicon-download-alt"></span> $T('download-backup')</a></span>
+                    </div>
+                    <div class="field-pair">
+                        <label class="config" for="config_backup_file">$T('restore-backup')</label>
+                        <input type="file" accept=".zip" name="config_backup_file" id="config_backup_file" />
+                        <span class="desc">$T('explain-admin_backup')</span>
+                    </div>
+                    <div class="field-pair">
+                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-open"></span> $T('restore-backup')</button>
+                    </div>
+                </fieldset>
+            </div>
+        </div>
     </form>
 </div><!-- /colmask -->
 

interfaces/Config/templates/config_notify.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Email"#-->
-<!--#set global $help_uri="configuration/3.4/notifications"#-->
+<!--#set global $help_uri="configuration/3.6/notifications"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#def show_notify_checkboxes($section_label)#-->
@@ -22,6 +22,7 @@
                 <option value="$ct" <!--#if $ct in $getVar($section_label + '_cats') then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
             <!--#end for#-->
         </select>
+        <p>$T('defaultNotifiesAll')</p>
     </div>
 <!--#end def#-->
 
@@ -40,6 +41,7 @@
                         <option value="$ct" <!--#if $ct in $email_cats then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
                     <!--#end for#-->
                 </select>
+                <p>$T('defaultNotifiesAll')</p>
             </div>
         </div>
         <div class="col1">
@@ -47,9 +49,9 @@
                 <div class="field-pair">
                     <label class="config" for="email_endjob">$T('opt-email_endjob')</label>
                     <select name="email_endjob" id="email_endjob">
-                        <option value="0" <!--#if int($email_endjob) == "0" then 'selected="selected"' else ""#--> >$T('email-never')</option>
-                        <option value="1" <!--#if int($email_endjob) == "1" then 'selected="selected"' else ""#--> >$T('email-always')</option>
-                        <option value="2" <!--#if int($email_endjob) == "2" then 'selected="selected"' else ""#--> >$T('email-errorOnly')</option>
+                        <option value="0" <!--#if int($email_endjob) == 0 then 'selected="selected"' else ""#--> >$T('email-never')</option>
+                        <option value="1" <!--#if int($email_endjob) == 1 then 'selected="selected"' else ""#--> >$T('email-always')</option>
+                        <option value="2" <!--#if int($email_endjob) == 2 then 'selected="selected"' else ""#--> >$T('email-errorOnly')</option>
                     </select>
                 </div>
                 <div class="field-pair">
@@ -122,7 +124,7 @@
        </div>
     </div>
     <!--#end if#-->
-    <!--#if $nt#-->
+    <!--#if $windows#-->
     <div class="section">
         <div class="col2">
             <h3>$T('section-AC')</h3>
@@ -176,7 +178,7 @@
     <!--#end if#-->
     <div class="section" id="nscript">
         <div class="col2">
-            <h3>$T('section-NScript')</h3>
+            <h3>$T('section-NScript') <a href="$helpuri$help_uri#nscript" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             <table>
                 <tr>
                     <td><input type="checkbox" name="nscript_enable" id="nscript_enable" value="1" <!--#if int($nscript_enable) > 0 then 'checked="checked"' else ""#--> /></td>

interfaces/Config/templates/config_rss.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="RSS"#-->
-<!--#set global $help_uri="configuration/3.4/rss"#-->
+<!--#set global $help_uri="configuration/3.6/rss"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <!--#import html#-->
 <div class="colmask">
@@ -53,7 +53,7 @@
                                 </td>
                                 <td class="title">
                                     <a href="?feed=$rss[$feed_item]['link']" class="subscription-title path feed <!--#if int($rss[$feed_item]['enable']) != 0 then 'feed_enabled' else 'feed_disabled'#-->">
-                                         $feed_item
+                                         $feed_item_html
                                     </a>
                                 </td>
                                 <td class="controls">
@@ -102,7 +102,7 @@
     </div>
     <!--#end if#-->
     <!--#if $active_feed#-->
-    <!--#set $feed = $active_feed#-->
+    <!--#set $feed = html.unescape($active_feed)#-->
     <div class="section rss-section">
         <div class="padTable">
             <a class="main-helplink" href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
@@ -113,12 +113,12 @@
             <!--#if $error#-->
             <div class="alert alert-danger">
                 <span class="glyphicon glyphicon-exclamation-sign"></span>
-                <!--#echo html.escape($error)#-->
+                $error
             </div>
             <!--#end if#-->
             <form action="upd_rss_feed" method="post">
                 <input type="hidden" name="apikey" value="$apikey" />
-                <input type="hidden" name="feed" value="$feed" />
+                <input type="hidden" name="feed" value="$active_feed" />
                 <input type="hidden" name="uri" value="$rss[$feed]['uris']" />
                 <table class="catTable">
                     <thead>
@@ -210,7 +210,7 @@
             <form action="upd_rss_filter" method="post">
                 <input type="hidden" name="apikey" value="$apikey" />
                 <input type="hidden" name="index" value="$rss[$feed]['filtercount']" />
-                <input type="hidden" name="feed" value="$feed" />
+                <input type="hidden" name="feed" value="$active_feed" />
                 <table class="catTable">
                     <tbody>
                         <tr>
@@ -286,7 +286,7 @@
                 <form action="upd_rss_filter" method="post" autocomplete="off">
                     <input type="hidden" name="apikey" value="$apikey" />
                     <input type="hidden" name="index" value="$fnum" />
-                    <input type="hidden" name="feed" value="$feed" />
+                    <input type="hidden" name="feed" value="$active_feed" />
                     <table class="catTable">
                         <tbody>
                             <tr class="<!--#if $odd then " alt " else " "#--> <!--#if $filter[3]!="A" and $filter[3]!="S" then 'disabled_options_rule' else ""#-->">
@@ -302,8 +302,8 @@
                                         <option value="M" <!--#if $filter[3]=="M" then 'selected="selected"' else ""#-->> $T('rss-must')</option>
                                         <option value="R" <!--#if $filter[3]=="R" then 'selected="selected"' else ""#-->> $T('rss-reject')</option>
                                         <option value="C" <!--#if $filter[3]=="C" then 'selected="selected"' else ""#-->> $T('rss-mustcat')</option>
-                                        <option value=">" <!--#if $filter[3]==">" then 'selected="selected"' else ""#-->> $T('rss-atleast')</option>
-                                        <option value="<" <!--#if $filter[3]=="<" then 'selected="selected"' else ""#-->> $T('rss-atmost')</option>
+                                        <option value=">" <!--#if $filter[3]=="&gt;" then 'selected="selected"' else ""#-->> $T('rss-atleast')</option>
+                                        <option value="<" <!--#if $filter[3]=="&lt;" then 'selected="selected"' else ""#-->> $T('rss-atmost')</option>
                                         <option value="F" <!--#if $filter[3]=="F" then 'selected="selected"' else ""#-->> $T('rss-from')</option>
                                         <option value="S" <!--#if $filter[3]=="S" then 'selected="selected"' else ""#-->> $T('rss-from-show') ($T('rss-accept'))</option>
                                     </select>
@@ -363,13 +363,13 @@
             <!--#end for#-->
             <form action="download_rss_feed" method="post">
                 <input type="hidden" name="apikey" value="$apikey" />
-                <input type="hidden" name="feed" value="$feed" />
+                <input type="hidden" name="feed" value="$active_feed" />
                 <div class="padding">
-                    <button type="button" class="btn btn-default testFeed" rel="$feed"><span class="glyphicon glyphicon-sort"></span> $T('button-preFeed')</button>
+                    <button type="button" class="btn btn-default testFeed" rel="$active_feed"><span class="glyphicon glyphicon-sort"></span> $T('button-preFeed')</button>
                     <button type="submit" class="btn btn-default Save"><span class="glyphicon glyphicon-forward"></span> $T('button-forceFeed')</button>
                     <button type="button" class="btn btn-default cleanFeed"><span class="glyphicon glyphicon-trash"></span> $T('button-clear') $T('rss-done')</button>
                     <!--#if $evalButton#-->
-                      <button type="button" class="btn btn-default evalFeed" rel="$feed"><span class="glyphicon glyphicon-ok-circle"></span> $T('button-evalFeed')</button>
+                      <button type="button" class="btn btn-default evalFeed" rel="$active_feed"><span class="glyphicon glyphicon-ok-circle"></span> $T('button-evalFeed')</button>
                     <!--#end if#-->
                 </div>
             </form>
@@ -402,7 +402,7 @@
                     <tr class="infoTableSeperator">
                         <td>
                             <form action="download" method="get">
-                                <input type="hidden" value="$feed" name="feed" />
+                                <input type="hidden" value="$active_feed" name="feed" />
                                 <input type="hidden" name="apikey" value="$apikey" />
                                 <input type="hidden" name="url" value="$job['url']" />
                                 <input type="hidden" name="nzbname" value="$job['nzbname']" />
@@ -446,7 +446,7 @@
                     <tr class="infoTableSeperator">
                         <td>
                             <form action="download" method="get">
-                                <input type="hidden" value="$feed" name="feed" />
+                                <input type="hidden" value="$active_feed" name="feed" />
                                 <input type="hidden" name="apikey" value="$apikey" />
                                 <input type="hidden" name="url" value="$job['url']" />
                                 <input type="hidden" name="nzbname" value="$job['nzbname']" />
@@ -475,7 +475,7 @@
         <div class="tab-pane padTable" id="rss-tab-done">
             <!--#if $downloaded#-->
             <form action="clean_rss_jobs" method="post">
-                <input type="hidden" value="$feed" name="feed" />
+                <input type="hidden" value="$active_feed" name="feed" />
                 <input type="hidden" name="apikey" value="$apikey" />
                 <table class="catTable">
                     <thead>

interfaces/Config/templates/config_scheduling.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Scheduling"#-->
-<!--#set global $help_uri="configuration/3.4s/scheduling"#-->
+<!--#set global $help_uri="configuration/3.6/scheduling"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <%

interfaces/Config/templates/config_server.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Servers"#-->
-<!--#set global $help_uri="configuration/3.4/servers"#-->
+<!--#set global $help_uri="configuration/3.6/servers"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#import json#-->
@@ -103,6 +103,11 @@
                         <input type="checkbox" name="send_group" id="send_group" value="1" />
                         <span class="desc">$T('srv-explain-send_group')</span>
                     </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="required">$T('srv-required')</label>
+                        <input type="checkbox" name="required" id="required" value="1" />
+                        <span class="desc">$T('explain-required')</span>
+                    </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="optional">$T('srv-optional')</label>
                         <input type="checkbox" name="optional" id="optional" value="1" />
@@ -225,6 +230,11 @@
                             <span class="desc">$T('explain-ssl_ciphers') <br>$T('readwiki')
                             <a href="${helpuri}advanced/ssl-ciphers" target="_blank">${helpuri}advanced/ssl-ciphers</a></span>
                         </div>
+                        <div class="field-pair advanced-settings">
+                            <label class="config" for="required$cur">$T('srv-required')</label>
+                            <input type="checkbox" name="required" id="required$cur" value="1" <!--#if int($server['required']) != 0 then 'checked="checked"' else ""#--> />
+                            <span class="desc">$T('explain-required')</span>
+                        </div>
                         <div class="field-pair advanced-settings">
                             <label class="config" for="optional$cur">$T('srv-optional')</label>
                             <input type="checkbox" name="optional" id="optional$cur" value="1" <!--#if int($server['optional']) != 0 then 'checked="checked"' else ""#--> />

interfaces/Config/templates/config_sorting.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Sorting"#-->
-<!--#set global $help_uri="configuration/3.4/sorting"#-->
+<!--#set global $help_uri="configuration/3.6/sorting"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -11,12 +11,13 @@
                 <h3>$T('seriesSorting') <a href="$helpuri$help_uri#toc0" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
                 <p>
                     <b>$T('affectedCat')</b><br/>
-                    <select name="tv_categories" multiple="multiple" class="multiple_cats">
+                    <select name="tv_categories" multiple="multiple" class="multiple_cats" required="required">
                         <!--#for $ct in $categories#-->
                         <option value="$ct" <!--#if $ct in $tv_categories then 'selected="selected"' else ""#--> >$Tspec($ct)</option>
                         <!--#end for#-->
                     </select>
                 </p>
+                <p>$T('selectOneCat')</p>
             </div>
             <!-- /col2 -->
             <div class="col1">
@@ -223,12 +224,13 @@
                 <h3>$T('movieSort') <a href="$helpuri$help_uri#toc6" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
                 <p>
                     <b>$T('affectedCat')</b><br/>
-                    <select name="movie_categories" multiple="multiple" class="multiple_cats">
+                    <select name="movie_categories" multiple="multiple" class="multiple_cats" required="required">
                         <!--#for $ct in $categories#-->
                         <option value="$ct" <!--#if $ct in $movie_categories then 'selected="selected"' else ""#--> >$Tspec($ct)</option>
                         <!--#end for#-->
                     </select>
                 </p>
+                <p>$T('selectOneCat')</p>
             </div>
             <!-- /col2 -->
             <div class="col1">
@@ -240,10 +242,6 @@
                         <label class="config wide" for="enable_movie_sorting">$T('opt-movieSort')</label>
                         <input type="checkbox" name="enable_movie_sorting" id="enable_movie_sorting" value="1" <!--#if int($enable_movie_sorting)> 0 then 'checked="checked"' else ""#--> />
                     </div>
-                    <div class="field-pair">
-                        <label class="config wide" for="movie_extra_folder">$T('opt-movieExtra')</label>
-                        <input type="checkbox" name="movie_extra_folder" id="movie_extra_folder" value="1" <!--#if int($movie_extra_folder)> 0 then 'checked="checked"' else ""#--> />
-                    </div>
                     <div class="field-pair">
                         <label class="config" for="moviefoldername">$T('sortString')</label>
                         <input type="text" name="movie_sort_string" id="moviefoldername" value="$movie_sort_string" /><button class="btn btn-default clearBtn" type="button"><span class="glyphicon glyphicon-remove"></span> $T('button-clear')</button>
@@ -255,9 +253,9 @@
                     <div class="field-pair">
                         <label class="config">$T('presetSort')</label>
                         <div class="presets float-left">
-                            <input type="button" class="btn btn-default" onclick="movieSet('%title (%y)/%title (%y).%ext',' CD%1');movieExtraFolder(false)" value="$T('button-inFolders')" />
-                            <input type="button" class="btn btn-default" onclick="movieSet('%title (%y).%ext',' CD%1');movieExtraFolder(true)" value="$T('button-noFolders')" />
-                            <input type="button" class="btn btn-default" onclick="movieSet('%0decade/%title (%y).%ext',' CD%1');movieExtraFolder(true)" value="$T('decade')" />
+                            <input type="button" class="btn btn-default" onclick="movieSet('%title (%y)/%title (%y).%ext',' CD%1');" value="$T('button-inFolders')" />
+                            <input type="button" class="btn btn-default" onclick="movieSet('%title (%y).%ext',' CD%1');" value="$T('button-noFolders')" />
+                            <input type="button" class="btn btn-default" onclick="movieSet('%0decade/%title (%y).%ext',' CD%1');" value="$T('decade')" />
                             <input type="button" class="btn btn-default" onclick="movieSet('%dn.%ext')" value="$T('button-FileLikeFolder')" />
                         </div>
                     </div>
@@ -419,12 +417,13 @@
                 <h3>$T('dateSorting') <a href="$helpuri$help_uri#toc9" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
                 <p>
                     <b>$T('affectedCat')</b><br/>
-                    <select name="date_categories" multiple="multiple" class="multiple_cats">
+                    <select name="date_categories" multiple="multiple" class="multiple_cats" required="required">
                         <!--#for $ct in $categories#-->
                         <option value="$ct" <!--#if $ct in $date_categories then 'selected="selected"' else ""#--> >$Tspec($ct)</option>
                         <!--#end for#-->
                     </select>
                 </p>
+                <p>$T('selectOneCat')</p>
             </div>
             <!-- /col2 -->
             <div class="col1">
@@ -639,10 +638,6 @@
       new_previewmovie();
   }
 
-  function movieExtraFolder(value) {
-      \$('#movie_extra_folder').attr("checked", value);
-  }
-
   function dateSet(val) {
       \$('#datefoldername').val(val);
       new_previewdate();

interfaces/Config/templates/config_special.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Special"#-->
-<!--#set global $help_uri="configuration/3.4/special"#-->
+<!--#set global $help_uri="configuration/3.6/special"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">

interfaces/Config/templates/config_switches.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Switches"#-->
-<!--#set global $help_uri="configuration/3.4/switches"#-->
+<!--#set global $help_uri="configuration/3.6/switches"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -178,7 +178,7 @@
                         <input type="checkbox" name="enable_all_par" id="enable_all_par" value="1" <!--#if int($enable_all_par) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-enable_all_par').replace('. ', '.<br/>')</span>
                     </div>
-                    <!--#if not $nt#-->
+                    <!--#if not $windows#-->
                     <div class="field-pair advanced-settings <!--#if not $have_nice then "disabled" else "" #-->">
                         <label class="config" for="nice">$T('opt-nice')</label>
                         <input type="text" name="nice" id="nice" value="$nice" <!--#if not $have_nice then 'readonly="readonly" disabled="disabled"' else "" #--> />
@@ -297,7 +297,7 @@
                         <input type="checkbox" name="replace_dots" id="replace_dots" value="1" <!--#if int($replace_dots) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-replace_dots')</span>
                     </div>
-                    <!--#if not $nt#-->
+                    <!--#if not $windows#-->
                     <div class="field-pair">
                         <label class="config" for="sanitize_safe">$T('opt-sanitize_safe')</label>
                         <input type="checkbox" name="sanitize_safe" id="sanitize_safe" value="1" <!--#if int($sanitize_safe) > 0 then 'checked="checked"' else ""#--> />
@@ -348,149 +348,11 @@
                 </fieldset>
             </div><!-- /col1 -->
         </div><!-- /section -->
-        <div class="section">
-            <div class="col2">
-                <h3>$T('swtag-indexing') <a href="$helpuri$help_uri#toc6" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-            </div><!-- /col2 -->
-            <div class="col1">
-                <fieldset>
-                    <div class="field-pair">
-                        <label class="config" for="rating_enable">$T('opt-rating_enable')</label>
-                        <input type="checkbox" name="rating_enable" id="rating_enable" value="1" <!--#if int($rating_enable) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-rating_enable').replace('. ', '.<br/>')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="rating_api_key">$T('opt-rating_api_key')</label>
-                        <input type="text" name="rating_api_key" id="rating_api_key" value="$rating_api_key" />
-                        <span class="desc">$T('explain-rating_api_key')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="rating_filter_enable">$T('opt-rating_filter_enable')</label>
-                        <input type="checkbox" name="rating_filter_enable" id="rating_filter_enable" value="1" <!--#if int($rating_filter_enable) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-rating_filter_enable')</span>
-                    </div>
-                    <div class="field-pair" id="rating_filter_abort">
-                        <label class="config">$T('opt-rating_filter_abort_if')</label>
-                        <div class="rating-filter">
-                            <p>
-                                <label for="rating_filter_abort_video">$T('opt-rating_filter_video')</label>
-                                <select name="rating_filter_abort_video" id="rating_filter_abort_video">
-                                    <option value="0" <!--#if $rating_filter_abort_video == 0 then 'selected="selected"' else ""#--> >$T('notUsed')</option>
-                                    <!--#for $val in $range(1, 10)#--><option value="$val" <!--#if $rating_filter_abort_video == $val then 'selected="selected"' else ""#--> >$val $T('orLess')</option><!--#end for#-->
-                                </select>
-                            </p>
-                            <p>
-                                <label for="rating_filter_abort_audio">$T('opt-rating_filter_audio')</label>
-                                <select name="rating_filter_abort_audio" id="rating_filter_abort_audio">
-                                    <option value="0" <!--#if $rating_filter_abort_audio == 0 then 'selected="selected"' else ""#--> >$T('notUsed')</option>
-                                    <!--#for $val in $range(1, 10)#--><option value="$val" <!--#if $rating_filter_abort_audio == $val then 'selected="selected"' else ""#--> >$val $T('orLess')</option><!--#end for#-->
-                                </select>
-                            </p>
-                            <p>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_abort_encrypted" name="rating_filter_abort_encrypted" <!--#if int($rating_filter_abort_encrypted) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_abort_encrypted">$T('opt-rating_filter_passworded')</label>
-                                </span>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_abort_encrypted_confirm" name="rating_filter_abort_encrypted_confirm" <!--#if int($rating_filter_abort_encrypted_confirm) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_abort_encrypted_confirm">$T('opt-rating_filter_confirmed')</label>
-                                </span>
-                            </p>
-                            <p>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_abort_spam" name="rating_filter_abort_spam" <!--#if int($rating_filter_abort_spam) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_abort_spam">$T('opt-rating_filter_spam')</label>
-                                </span>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_abort_spam_confirm" name="rating_filter_abort_spam_confirm" <!--#if int($rating_filter_abort_spam_confirm) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_abort_spam_confirm">$T('opt-rating_filter_confirmed')</label>
-                                </span>
-                            </p>
-                            <p>
-                                <input type="checkbox" value="1" id="rating_filter_abort_downvoted" name="rating_filter_abort_downvoted" <!--#if int($rating_filter_abort_downvoted) > 0 then 'checked="checked"' else ""#--> />
-                                <label for="rating_filter_abort_downvoted">$T('opt-rating_filter_downvoted')</label>
-                            </p>
-                            <p>
-                                <label for="rating_filter_abort_keywords">$T('opt-rating_filter_keywords')</label>
-                                <input type="text" name="rating_filter_abort_keywords" id="rating_filter_abort_keywords" value="$rating_filter_abort_keywords"/>
-                                <span class="desc">$T('explain-rating_filter_keywords')</span>
-                            </p>
-                        </div>
-                    </div>
-                    <div class="field-pair" id="rating_filter_pause">
-                        <label class="config">$T('opt-rating_filter_pause_if')</label>
-                        <div class="rating-filter">
-                            <p>
-                                <label for="rating_filter_pause_video">$T('opt-rating_filter_video')</label>
-                                <select name="rating_filter_pause_video" id="rating_filter_pause_video">
-                                    <option value="0" <!--#if $rating_filter_pause_video == 0 then 'selected="selected"' else ""#--> >$T('notUsed')</option>
-                                    <!--#for $val in $range(1, 10)#--><option value="$val" <!--#if $rating_filter_pause_video == $val then 'selected="selected"' else ""#--> >$val $T('orLess')</option><!--#end for#-->
-                                </select>
-                            </p>
-                            <p>
-                                <label for="rating_filter_pause_audio">$T('opt-rating_filter_audio')</label>
-                                <select name="rating_filter_pause_audio" id="rating_filter_pause_audio">
-                                    <option value="0" <!--#if $rating_filter_pause_audio == 0 then 'selected="selected"' else ""#--> >$T('notUsed')</option>
-                                    <!--#for $val in $range(1, 10)#--><option value="$val" <!--#if $rating_filter_pause_audio == $val then 'selected="selected"' else ""#--> >$val $T('orLess') </option><!--#end for#-->
-                                </select>
-                            </p>
-                            <p>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_pause_encrypted" name="rating_filter_pause_encrypted" <!--#if int($rating_filter_pause_encrypted) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_pause_encrypted">$T('opt-rating_filter_passworded')</label>
-                                </span>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_pause_encrypted_confirm" name="rating_filter_pause_encrypted_confirm" <!--#if int($rating_filter_pause_encrypted_confirm) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_pause_encrypted_confirm">$T('opt-rating_filter_confirmed')</label>
-                                </span>
-                            </p>
-                            <p>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_pause_spam" name="rating_filter_pause_spam" <!--#if int($rating_filter_pause_spam) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_pause_spam">$T('opt-rating_filter_spam')</label>
-                                </span>
-                                <span>
-                                    <input type="checkbox" value="1" id="rating_filter_pause_spam_confirm" name="rating_filter_pause_spam_confirm" <!--#if int($rating_filter_pause_spam_confirm) > 0 then 'checked="checked"' else ""#--> />
-                                    <label for="rating_filter_pause_spam_confirm">$T('opt-rating_filter_confirmed')</label>
-                                </span>
-                            </p>
-                            <p>
-                                <input type="checkbox" value="1" id="rating_filter_pause_downvoted" name="rating_filter_pause_downvoted" <!--#if int($rating_filter_pause_downvoted) > 0 then 'checked="checked"' else ""#--> />
-                                <label for="rating_filter_pause_downvoted">$T('opt-rating_filter_downvoted')</label>
-                            </p>
-                            <p>
-                                <label for="rating_filter_pause_keywords">$T('opt-rating_filter_keywords')</label>
-                                <input type="text" name="rating_filter_pause_keywords" id="rating_filter_pause_keywords" value="$rating_filter_pause_keywords"/>
-                                <span class="desc">$T('explain-rating_filter_keywords')</span>
-                            </p>
-                        </div>
-                    </div>
-                    <div class="field-pair">
-                        <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                    </div>
-                </fieldset>
-            </div><!-- /col1 -->
-        </div><!-- /section -->
     </form>
 </div><!-- /colmask -->
 
 <script type="text/javascript">
 \$(document).ready(function() {
-    if (!\$('#rating_filter_enable').is(":checked")) {
-        \$("#rating_filter_abort").hide();
-        \$("#rating_filter_pause").hide();
-    }
-    \$('#rating_filter_enable').change(function () {
-        if (\$(this).is(":checked")) {
-            \$("#rating_filter_abort").show();
-            \$("#rating_filter_pause").show();
-        }
-        else {
-            \$("#rating_filter_abort").hide();
-            \$("#rating_filter_pause").hide();
-        }
-    });
-
     \$('#history_retention_select, #history_retention_number').on('change', updateHistoryRetention)
     function updateHistoryRetention() {
         var retention_setting = \$('#history_retention')

interfaces/Config/templates/staticcfg/css/style.css

@@ -139,6 +139,9 @@ label.wide,
     font-size: 12px;
     font-style: italic;
 }
+.desc .btn {
+    font-style: normal;
+}
 .desc.narrow {
     margin: 0 0 0 200px!important;
 }
@@ -724,41 +727,6 @@ ul.tabs li.active a {
 .checkbox-days label {
     padding: 2px 20px;
 }
-.rating-filter  {
-    float:  left;
-}
-.rating-filter p  {
-    margin:  0 0 10px 0;
-}
-.rating-filter select  {
-    vertical-align: middle;
-}
-.rating-filter input  {
-    vertical-align: middle;
-     margin-top: -1px;
-}
-.rating-filter label  {
-    display: inline-block;
-     padding-left: 0px;
-     width: 100px;
-}
-.rating-filter input[type="checkbox"]  {
-    display: inline;
-}
-.rating-filter input[type="checkbox"] + label  {
-    padding-left: 20px;
-    padding-top: 5px;
-     width: auto;
-}
-.rating-filter p > span:first-child  {
-    float: left;
-     width: 130px;
-}
-.rating-filter .desc  {
-    display: block;
-     margin: 0px;
-     padding-left: 103px;
-}
 
 /** EDITS 2015 **/
 * {

interfaces/Config/templates/staticcfg/js/script.js

@@ -215,7 +215,7 @@ $.fn.extractFormDataTo = function(target) {
  * (c) 2015 SABnzbd Team, Inc. All rights reserved.
  */
 function config_success() {
-    $('.saveButton').each(function () {
+    $('.saveButton[disabled=disabled]').each(function () {
         $(this).removeAttr("disabled").html('<span class="glyphicon glyphicon-ok"></span> '+configTranslate.saveChanges);
     });
     // Let us leave!
@@ -223,7 +223,7 @@ function config_success() {
     formHasChanged = false;
 }
 function config_failure() {
-    $('.saveButton').each(function () {
+    $('.saveButton[disabled=disabled]').each(function () {
         $(this).removeAttr("disabled").addClass('btn-danger').html('<span class="glyphicon glyphicon-remove"></span> '+configTranslate.failed);
     });
     // Can't go yet..
@@ -345,8 +345,9 @@ $(document).ready(function () {
         datatype: 'json',
         // But first remove Obfuscation!
         beforeSerialize: removeObfuscation,
-        beforeSubmit: function () {
-            $('.saveButton').each(function () {
+        beforeSubmit: function (arr, form, options) {
+            // Only in the current form
+            form.find('.saveButton').each(function () {
                 $(this).attr("disabled", "disabled").removeClass('btn-danger').html('<span class="glyphicon glyphicon-transfer"></span> ' + configTranslate.saving);
             });
         },
@@ -407,7 +408,7 @@ $(document).ready(function () {
     $('input[type="checkbox"]').parents('label').addClass('config-hover')
 
     // Disable sections
-    var checkDisabled = '#rating_enable, #enable_tv_sorting, #enable_movie_sorting, #enable_date_sorting'
+    var checkDisabled = '#enable_tv_sorting, #enable_movie_sorting, #enable_date_sorting'
 
     $(checkDisabled).on('change', function() {
         $(this).parent().nextAll().toggleClass('disabled')

interfaces/Glitter/templates/include_history.tmpl

@@ -41,102 +41,11 @@
                         </span>
                     </div>
                 </td>
-                <td class="name" data-bind="css: { 'name-has-ratings' : historyStatus.has_rating }">
+                <td class="name">
                     <div class="row-wrap-text">
                         <a class="retry-buttontext" href="#" data-bind="visible: (failed() && canRetry()), click: retry">$T('button-retry')</a>
                         <span data-bind="text: historyStatus.name, attr: { 'title': historyStatus.name() }"></span>
                     </div>
-
-                    <!-- ko if: historyStatus.has_rating -->
-                    <div class="dropdown history-ratings">
-                        <a href="#" class="name-icons hover-button" data-toggle="dropdown" onclick="keepOpen(this)">
-                            <span class="glyphicon glyphicon-thumbs-up"></span> <span data-bind="text: historyStatus.rating_avg_vote_up"></span>
-                            <span class="glyphicon glyphicon-thumbs-down"></span> <span data-bind="text: historyStatus.rating_avg_vote_down"></span>
-                        </a>
-                        <ul class="dropdown-menu history-ratings-menu">
-                            <li>
-                                <form class="history-ratings-basic">
-                                    <label>
-                                        <input type="radio" value="up" data-bind="attr: { 'name': 'ratings-status-'+nzo_id, 'checked': historyStatus.rating_user_vote() == 1 }, event: { change: setUserVote }" />
-                                        <span class="glyphicon glyphicon-thumbs-up"></span>
-                                        <span data-bind="text: historyStatus.rating_avg_vote_up"></span>
-                                    </label>
-                                    <label>
-                                        <input type="radio" value="down" data-bind="attr: { 'name': 'ratings-status-'+nzo_id, 'checked': historyStatus.rating_user_vote() == 2 }, event: { change: setUserVote }" />
-                                        <span class="glyphicon glyphicon-thumbs-down"></span>
-                                        <span data-bind="text: historyStatus.rating_avg_vote_down"></span>
-                                    </label>
-                                    <label>
-                                        <span class="glyphicon glyphicon-facetime-video"></span>
-                                        <select name="ratings-video" data-bind="value: historyStatus.rating_user_video, event: { change: setUserRating }, disable: historyStatus.rating_user_video">
-                                            <option value="">&nbsp;</option>
-                                            <option value="1">1</option>
-                                            <option value="2">2</option>
-                                            <option value="3">3</option>
-                                            <option value="4">4</option>
-                                            <option value="5">5</option>
-                                            <option value="6">6</option>
-                                            <option value="7">7</option>
-                                            <option value="8">8</option>
-                                            <option value="9">9</option>
-                                            <option value="10">10</option>
-                                        </select>
-                                    </label>
-                                    <label>
-                                        <span class="glyphicon glyphicon-volume-up"></span>
-                                        <select name="ratings-audio" data-bind="value: historyStatus.rating_user_audio, event: { change: setUserRating }, disable: historyStatus.rating_user_audio">
-                                            <option value="">&nbsp;</option>
-                                            <option value="1">1</option>
-                                            <option value="2">2</option>
-                                            <option value="3">3</option>
-                                            <option value="4">4</option>
-                                            <option value="5">5</option>
-                                            <option value="6">6</option>
-                                            <option value="7">7</option>
-                                            <option value="8">8</option>
-                                            <option value="9">9</option>
-                                            <option value="10">10</option>
-                                        </select>
-                                    </label>
-                                    <!-- ko if: historyStatus.url_info -->
-                                    <a href="#" target="_blank" data-bind="attr: { 'href':historyStatus.url_info }" title="$T('Glitter-openInfoURL')"><span class="glyphicon glyphicon-globe"></span></a>
-                                    <!-- /ko -->
-                                </form>
-                            </li>
-                            <li class="divider"></li>
-                            <li>
-                                <form class="history-ratings-report" data-bind="submit: setUserReport">
-                                    <strong>$T('report')</strong>
-                                    <br />
-                                    <label>
-                                        <input type="radio" name="rating_flag" value="spam" /> $T('spam')
-                                    </label>
-                                    <br />
-                                    <label>
-                                        <input type="radio" name="rating_flag" value="encrypted" /> $T('encrypted')
-                                    </label>
-                                    <br />
-                                    <label>
-                                        <input type="radio" name="rating_flag" value="expired" /> $T('expired')
-                                        <select name="ratings-report-expired-server" class="ratings-report-hidden form-control" data-bind="options: \$parent.servers, optionsText: 'host', optionsValue: 'host', optionsCaption: '$T('nzo-all')'"></select>
-                                    </label>
-                                    <br />
-                                    <label>
-                                        <input type="radio" name="rating_flag" value="other" /> $T('otherProblem')
-                                        <input type="text" class="form-control ratings-report-hidden" name="ratings-report-other" />
-                                    </label>
-                                    <br />
-                                    <label>
-                                        <input type="radio" name="rating_flag" value="comment" /> $T('comment')
-                                        <input type="text" class="form-control ratings-report-hidden" name="ratings-report-comment" />
-                                    </label>
-                                    <br />
-                                    <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> $T('send')</button>
-                                </form>
-                            </li>
-                        </ul>
-                    </div>
-                    <!-- /ko -->
                 </td>
                 <td class="status row-wrap-text" data-bind="text: statusText()" onclick="showDetails(this)"></td>
                 <!-- ko foreach: parent.parent.extraHistoryColumns -->

interfaces/Glitter/templates/include_overlays.tmpl

@@ -85,6 +85,11 @@
                 </ul>
                 <div class="tab-content">
                     <div class="tab-pane fade in active" id="options-status">
+                        <div class="row" data-bind="visible: statusInfo.active_socks5_proxy">
+                            <div class="col-sm-6">$T('opt-socks5_proxy_url') &nbsp </div>
+                            <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: statusInfo.active_socks5_proxy"></div>
+                            <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
+                        </div>
                         <div class="row">
                             <div class="col-sm-6">$T('dashboard-localIP4') &nbsp; </div>
                             <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: !statusInfo.localipv4() ? '$T('dashboard-connectionError')' : statusInfo.localipv4(), css: { 'options-bad-status' : !statusInfo.localipv4() }"></div>
@@ -102,7 +107,7 @@
                         </div>
                         <div class="row">
                             <div class="col-sm-6">$T('dashboard-NameserverDNS') &nbsp; </div>
-                            <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: !statusInfo.dnslookup() ? '$T('dashboard-connectionError')' : statusInfo.dnslookup(), css: { 'options-bad-status' : (statusInfo.dnslookup() != 'OK') }"></div>
+                            <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: !statusInfo.dnslookup() ? '$T('dashboard-connectionError')' : 'OK', css: { 'options-bad-status' : !statusInfo.dnslookup() }"></div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <hr/>
@@ -112,30 +117,39 @@
                                 <span data-bind="text: cacheSize"></span> (<span data-bind="text: cacheArticles"></span> $T('Glitter-articles'))
                             </div>
                         </div>
+                        <div class="row" data-bind="visible: statusInfo.delayed_decoder() > 5 || statusInfo.delayed_assembler() > 5">
+                            <div class="col-sm-6">$T('dashboard-delayed') &nbsp; </div>
+                            <div class="col-sm-6">
+                                <span data-bind="visible: statusInfo.delayed_decoder() > 5">$T('dashboard-delayed-cpu')</span>
+                                <small data-bind="visible: statusInfo.delayed_decoder() > 5">(<span data-bind="text: statusInfo.delayed_decoder"></span>x)</small>
+                                <span data-bind="visible: statusInfo.delayed_assembler() > 5">$T('dashboard-delayed-disk')</span>
+                                <small data-bind="visible: statusInfo.delayed_assembler() > 5">(<span data-bind="text: statusInfo.delayed_assembler"></span>x)</small>
+                            </div>
+                        </div>
                         <div class="row">
                             <div class="col-sm-6">$T('dashboard-systemPerformance') &nbsp; </div>
-                            <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
+                            <div class="col-sm-6 col-dot-overflow" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.pystone"></span>
                                 <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
-                                <small data-bind="truncatedText: statusInfo.cpumodel, length: 25, attr: { 'data-original-title': statusInfo.cpumodel }" data-tooltip="true"></small>
+                                <small title="$cpumodel $cpusimd" data-tooltip="true">$cpumodel $cpusimd</small>
                             </div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
                             <div class="col-sm-6">$T('dashboard-downloadDirSpeed') &nbsp; </div>
-                            <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
+                            <div class="col-sm-6 col-dot-overflow" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.downloaddirspeed()"></span> MB/s
                                 <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
-                                <small>(<span data-bind="truncatedText: statusInfo.downloaddir, length: 24, attr: { 'data-original-title': statusInfo.downloaddir }" data-tooltip="true"></span>)</small>
+                                <small data-bind="text: statusInfo.downloaddir, attr: { 'data-original-title': statusInfo.downloaddir }" data-tooltip="true"></small>
                             </div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
                             <div class="col-sm-6">$T('dashboard-completeDirSpeed') &nbsp; </div>
-                            <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
+                            <div class="col-sm-6 col-dot-overflow" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.completedirspeed()"></span> MB/s
                                 <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
-                                <small>(<span data-bind="truncatedText: statusInfo.completedir, length: 24, attr: { 'data-original-title': statusInfo.completedir }" data-tooltip="true"></span>)</small>
+                                <small data-bind="text: statusInfo.completedir, attr: { 'data-original-title': statusInfo.completedir }" data-tooltip="true"></small>
                             </div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
@@ -144,7 +158,7 @@
                             <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.internetbandwidth()"></span> MB/s
                                 <a href="#" class="diskspeed-button" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
-                                <small>(<span data-bind="text: statusInfo.internetbandwidth()*8"></span> Mbps)</small>
+                                <small><span data-bind="text: statusInfo.internetbandwidth()*8"></span> Mbps</small>
                             </div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
@@ -154,7 +168,6 @@
                                 <a href="#" class="btn btn-default" data-bind="click: testDownload" data-size="100MB" data-tooltip="true" data-placement="top" title="$T('dashboard-testDownload-explain')"><span class="glyphicon glyphicon-download-alt"></span> 100 MB</a>
                                 <a href="#" class="btn btn-default" data-bind="click: testDownload" data-size="1000MB" data-tooltip="true" data-placement="top" title="$T('dashboard-testDownload-explain')"><span class="glyphicon glyphicon-download-alt"></span> 1 GB</a>
                                 <a href="#" class="btn btn-default" data-bind="click: testDownload" data-size="10GB" data-tooltip="true" data-placement="top" title="$T('dashboard-testDownload-explain')"><span class="glyphicon glyphicon-download-alt"></span> 10 GB</a>
-
                             </div>
                         </div>
                         <hr />
@@ -177,7 +190,7 @@
                             <div class="col-sm-6">
                                 <div class="input-group" data-tooltip="true" data-placement="top" title="$T('logging')">
                                     <span class="input-group-addon"><span class="glyphicon glyphicon-comment"></span></span>
-                                    <select class="form-control" data-bind="value: statusInfo.loglevel">
+                                    <select class="form-control" data-bind="value: loglevel">
                                         <option value="0">$T('log-errWarn')</option>
                                         <option value="1">$T('log-info')</option>
                                         <option value="2">$T('log-debug')</option>
@@ -348,7 +361,6 @@
                                     </select>
                                 </div>
                             </div>
-                            <div class="options-switch"></div>
                             <div class="form-group">
                                 <label class="col-sm-6 control-label">$T('Glitter-dateFormat')</label>
                                 <div class="col-sm-4">
@@ -435,6 +447,14 @@
                                     <input type="checkbox" name="confirmDeleteHistory" value="true" data-bind="checked: confirmDeleteHistory" />
                                 </div>
                             </div>
+                            <div class="form-group form-checkbox">
+                                <label class="col-sm-6 control-label">
+                                    $T("Glitter-keyboardShortcuts")
+                                </label>
+                                <div class="col-sm-4">
+                                    <input type="checkbox" name="keyboardShortcuts" value="true" data-bind="checked: keyboardShortcuts" />
+                                </div>
+                            </div>
                         </form>
                     </div>
                 </div>

interfaces/Glitter/templates/main.tmpl

@@ -70,7 +70,6 @@
             glitterTranslate.tooLarge = "$T('Glitter-tooLarge')";
             glitterTranslate.unwanted = "$T('Glitter-unwanted')";
             glitterTranslate.incomplete = "$T('Glitter-incomplete')";
-            glitterTranslate.filtered = "$T('Glitter-filtered')";
             glitterTranslate.waitSec = "$T('Glitter-waitSec')";
             glitterTranslate.checking = "$T('post-Checking')";
             glitterTranslate.misingArt = "$T('missingArt')";
@@ -103,6 +102,7 @@
             glitterTranslate.status['Repair'] = "$T('stage-repair')";
             glitterTranslate.status['Filejoin'] = "$T('stage-filejoin')";
             glitterTranslate.status['Unpack'] = "$T('stage-unpack')";
+            glitterTranslate.status['Deobfuscate'] = "$T('stage-deobfuscate')";
             glitterTranslate.status['Script'] = "$T('stage-script')";
             glitterTranslate.status['Source'] = "$T('stage-source')";
             glitterTranslate.status['Servers'] = "$T('stage-servers')";

interfaces/Glitter/templates/static/javascripts/glitter.basic.js

@@ -24,7 +24,7 @@ if(isMobile) {
 }
 
 // Basic API-call
-function callAPI(data) {
+function callAPI(data, timeout = 10000) {
     // Fill basis var's
     data.output = "json";
     data.apikey = apiKey;
@@ -33,24 +33,7 @@ function callAPI(data) {
         type: "GET",
         cache: false,
         data: data,
-        timeout: 10000 // Wait a little longer on mobile connections
-    });
-
-    return $.when(ajaxQuery);
-}
-
-// Special API call
-function callSpecialAPI(url, data) {
-    // Did we get input?
-    if(data == undefined) data = {};
-    // Fill basis var's
-    data.output = "json";
-    data.apikey = apiKey;
-    var ajaxQuery = $.ajax({
-        url: url,
-        type: "GET",
-        cache: false,
-        data: data
+        timeout: timeout
     });
 
     return $.when(ajaxQuery);

interfaces/Glitter/templates/static/javascripts/glitter.history.js

@@ -449,103 +449,4 @@ function HistoryModel(parent, data) {
 
         }
     };
-
-    // User voting
-    self.setUserVote = function(item, event) {
-        // Send vote
-        callAPI({
-            mode: 'queue',
-            name: 'rating',
-            type: 'vote',
-            setting: $(event.target).val(),
-            value: self.nzo_id
-        }).then(function(response) {
-            // Update all info
-            self.updateAllHistory = true;
-            self.parent.parent.refresh(true)
-        })
-    }
-
-    // User rating
-    self.setUserRating = function(item, event) {
-        // Audio or video
-        var changeWhat = 'audio';
-        if($(event.target).attr('name') == 'ratings-video') {
-            changeWhat = 'video';
-        }
-
-        // Only on user-event, not the auto-fired ones
-        if(!event.originalEvent) return;
-
-        // Send vote
-        callAPI({
-            mode: 'queue',
-            name: 'rating',
-            type: changeWhat,
-            setting: $(event.target).val(),
-            value: self.nzo_id
-        }).then(function(response) {
-            // Update all info
-            self.updateAllHistory = true;
-            self.parent.parent.refresh(true)
-        })
-    }
-
-    // User comment
-    self.setUserReport = function(form) {
-        // What are we reporting?
-        var userReport = $(form).find('input[name="rating_flag"]:checked').val();
-        var userDetail = '';
-
-        // Anything selected?
-        if(!userReport) {
-            alert(glitterTranslate.noSelect)
-            return;
-        }
-
-        // Extra info?
-        if(userReport == 'comment') userDetail = $(form).find('input[name="ratings-report-comment"]').val();
-        if(userReport == 'other') userDetail = $(form).find('input[name="ratings-report-other"]').val();
-
-        // Exception for servers
-        if(userReport == 'expired') {
-            // Which server?
-            userDetail = $(form).find('select[name="ratings-report-expired-server"]').val();
-
-            // All?
-            if(userDetail == "") {
-                // Loop over all servers
-                $.each(parent.parent.servers, function(index, server) {
-                    // Set timeout because simultanious requests don't work (yet)
-                    setTimeout(function() {
-                        submitUserReport(server.name)
-                    }, index * 1500)
-                })
-
-            } else {
-                // Just the one server
-                submitUserReport(userDetail)
-            }
-        } else {
-            submitUserReport(userDetail)
-        }
-
-        // After all, close it
-        form.reset();
-        $(form).parent().parent().dropdown('toggle');
-        alert(glitterTranslate.sendThanks)
-
-        function submitUserReport(theDetail) {
-            // Send note
-            callAPI({
-                mode: 'queue',
-                name: 'rating',
-                type: 'flag',
-                setting: userReport,
-                detail: theDetail,
-                value: self.nzo_id
-            })
-        }
-        return false
-    }
 }

interfaces/Glitter/templates/static/javascripts/glitter.main.js

@@ -18,10 +18,11 @@ function ViewModel() {
     self.displayFullWidth = ko.observable(false).extend({ persist: 'displayFullWidth' });
     self.confirmDeleteQueue = ko.observable(true).extend({ persist: 'confirmDeleteQueue' });
     self.confirmDeleteHistory = ko.observable(true).extend({ persist: 'confirmDeleteHistory' });
+    self.keyboardShortcuts = ko.observable(true).extend({ persist: 'keyboardShortcuts' });
     self.extraQueueColumns = ko.observableArray([]).extend({ persist: 'extraColumns' });
     self.extraHistoryColumns = ko.observableArray([]).extend({ persist: 'extraHistoryColumns' });
     self.showActiveConnections = ko.observable(false).extend({ persist: 'showActiveConnections' });
-    self.speedMetrics = { K: "KB/s", M: "MB/s", G: "GB/s" };
+    self.speedMetrics = { '': "B/s", K: "KB/s", M: "MB/s", G: "GB/s" };
 
     // Set information varibales
     self.title = ko.observable();
@@ -43,6 +44,7 @@ function ViewModel() {
     self.systemLoad = ko.observable();
     self.cacheSize = ko.observable();
     self.cacheArticles = ko.observable();
+    self.loglevel = ko.observable();
     self.nrWarnings = ko.observable(0);
     self.allWarnings = ko.observableArray([]);
     self.allMessages = ko.observableArray([]);
@@ -55,13 +57,14 @@ function ViewModel() {
     self.statusInfo = {};
     self.statusInfo.folders = ko.observableArray([]);
     self.statusInfo.servers = ko.observableArray([]);
+    self.statusInfo.active_socks5_proxy = ko.observable();
     self.statusInfo.localipv4 = ko.observable();
     self.statusInfo.publicipv4 = ko.observable();
     self.statusInfo.ipv6 = ko.observable();
     self.statusInfo.dnslookup = ko.observable();
+    self.statusInfo.delayed_decoder = ko.observable();
+    self.statusInfo.delayed_assembler = ko.observable();
     self.statusInfo.pystone = ko.observable();
-    self.statusInfo.cpumodel = ko.observable();
-    self.statusInfo.loglevel = ko.observable();
     self.statusInfo.downloaddir = ko.observable();
     self.statusInfo.downloaddirspeed = ko.observable();
     self.statusInfo.completedir = ko.observable();
@@ -596,37 +599,6 @@ function ViewModel() {
         }
     })
 
-    // Save the rest in config if global-settings
-    var saveInterfaceSettings = function(newValue) {
-        if(self.useGlobalOptions()) {
-            var interfaceSettings = {
-                "dateFormat": self.dateFormat,
-                "extraQueueColumns": self.extraQueueColumns,
-                "extraHistoryColumns": self.extraHistoryColumns,
-                "displayCompact": self.displayCompact,
-                "displayFullWidth": self.displayFullWidth,
-                "displayTabbed": self.displayTabbed,
-                "confirmDeleteQueue": self.confirmDeleteQueue,
-                "confirmDeleteHistory": self.confirmDeleteHistory
-            };
-            callAPI({
-                mode: "set_config",
-                section: "misc",
-                keyword: "interface_settings",
-                value: ko.toJSON(interfaceSettings)
-            })
-        }
-    }
-
-    self.dateFormat.subscribe(saveInterfaceSettings);
-    self.extraQueueColumns.subscribe(saveInterfaceSettings);
-    self.extraHistoryColumns.subscribe(saveInterfaceSettings);
-    self.displayCompact.subscribe(saveInterfaceSettings);
-    self.displayFullWidth.subscribe(saveInterfaceSettings);
-    self.displayTabbed.subscribe(saveInterfaceSettings);
-    self.confirmDeleteQueue.subscribe(saveInterfaceSettings);
-    self.confirmDeleteHistory.subscribe(saveInterfaceSettings);
-
     /***
          Add NZB's
     ***/
@@ -753,48 +725,34 @@ function ViewModel() {
             self.hasPerformanceInfo(false)
         }
 
-        // Load the custom status info
+        // Load the custom status info, allowing for longer timeouts
         callAPI({
             mode: 'status',
+            skip_dashboard: (!statusFullRefresh)*1,
             calculate_performance: statusPerformance*1,
-            skip_dashboard: (!statusFullRefresh)*1
-        }).then(function(data) {
+        }, 30000).then(function(data) {
             // Update basic
-            self.statusInfo.loglevel(data.status.loglevel)
             self.statusInfo.folders(data.status.folders)
+            self.statusInfo.delayed_decoder(data.status.delayed_decoder)
+            self.statusInfo.delayed_assembler(data.status.delayed_assembler)
 
-            // Update the full set
-            if(statusFullRefresh) {
+            // Update the full set if the data is available
+            if("dnslookup" in data.status) {
                 self.statusInfo.pystone(data.status.pystone)
-                self.statusInfo.cpumodel(data.status.cpumodel)
                 self.statusInfo.downloaddir(data.status.downloaddir)
                 self.statusInfo.downloaddirspeed(data.status.downloaddirspeed)
                 self.statusInfo.completedir(data.status.completedir)
                 self.statusInfo.completedirspeed(data.status.completedirspeed)
                 self.statusInfo.internetbandwidth(data.status.internetbandwidth)
                 self.statusInfo.dnslookup(data.status.dnslookup)
+                self.statusInfo.active_socks5_proxy(data.status.active_socks5_proxy)
                 self.statusInfo.localipv4(data.status.localipv4)
                 self.statusInfo.publicipv4(data.status.publicipv4)
                 self.statusInfo.ipv6(data.status.ipv6 || glitterTranslate.noneText)
-                // Loaded disk info
-                self.hasPerformanceInfo(true)
             }
 
             // Update the servers
             if(self.statusInfo.servers().length != data.status.servers.length) {
-                // Only now we can subscribe to the log-level-changes! (only at start)
-                if(self.statusInfo.servers().length == 0) {
-                    self.statusInfo.loglevel.subscribe(function(newValue) {
-                        // Update log-level
-                        callAPI({
-                            mode: "set_config",
-                            section: "logging",
-                            keyword: "log_level",
-                            value: newValue
-                        });
-                    })
-                }
-
                 // Empty them, in case of update
                 self.statusInfo.servers([])
 
@@ -837,6 +795,7 @@ function ViewModel() {
 
             // Stop it spin
             self.hasStatusInfo(true)
+            self.hasPerformanceInfo(true)
         });
     }
 
@@ -1079,6 +1038,32 @@ function ViewModel() {
         }
     }
 
+    self.globalInterfaceSettings = [
+        'dateFormat',
+        'extraQueueColumns',
+        'extraHistoryColumns',
+        'displayCompact',
+        'displayFullWidth',
+        'displayTabbed',
+        'confirmDeleteQueue',
+        'confirmDeleteHistory',
+        'keyboardShortcuts'
+    ]
+
+    // Save the rest in config if global-settings
+    var saveInterfaceSettings = function(newValue) {
+        var interfaceSettings = {}
+        for (const setting of self.globalInterfaceSettings) {
+            interfaceSettings[setting] = self[setting]
+        }
+        callAPI({
+            mode: "set_config",
+            section: "misc",
+            keyword: "interface_settings",
+            value: ko.toJSON(interfaceSettings)
+        })
+    }
+
     // Get the speed-limit, refresh rate and server names
     callAPI({
         mode: 'get_config'
@@ -1089,23 +1074,22 @@ function ViewModel() {
             if(!response.config.misc.refresh_rate) response.config.misc.refresh_rate = 1;
             self.refreshRate(response.config.misc.refresh_rate.toString());
 
-            // Set history limit
+            // Set history and queue limit
             self.history.paginationLimit(response.config.misc.history_limit.toString())
-
-            // Set queue limit
             self.queue.paginationLimit(response.config.misc.queue_limit.toString())
 
             // Import the rest of the settings
             if(response.config.misc.interface_settings) {
                 var interfaceSettings = JSON.parse(response.config.misc.interface_settings);
-                self.dateFormat(interfaceSettings['dateFormat']);
-                self.extraQueueColumns(interfaceSettings['extraQueueColumns']);
-                self.extraHistoryColumns(interfaceSettings['extraHistoryColumns']);
-                self.displayCompact(interfaceSettings['displayCompact']);
-                self.displayFullWidth(interfaceSettings['displayFullWidth']);
-                self.displayTabbed(interfaceSettings['displayTabbed']);
-                self.confirmDeleteQueue(interfaceSettings['confirmDeleteQueue']);
-                self.confirmDeleteHistory(interfaceSettings['confirmDeleteHistory']);
+                for (const setting of self.globalInterfaceSettings){
+                    if(setting in interfaceSettings) {
+                        self[setting](interfaceSettings[setting]);
+                    }
+                }
+            }
+            // Only subscribe now to prevent collisions between localStorage and config settings updates
+            for (const setting of self.globalInterfaceSettings) {
+                self[setting].subscribe(saveInterfaceSettings);
             }
         }
 
@@ -1113,9 +1097,23 @@ function ViewModel() {
         if(!response.config.misc.bandwidth_max) response.config.misc.bandwidth_max = false;
         self.bandwithLimit(response.config.misc.bandwidth_max);
 
-        // Save servers (for reporting functionality of OZnzb)
+        // Save servers (for reporting functionality)
         self.servers = response.config.servers;
 
+        // Already set if we are using a proxy
+        if(response.config.misc.socks5_proxy_url) self.statusInfo.active_socks5_proxy(true)
+
+        // Set logging and only then subscribe to changes
+        self.loglevel(response.config.logging.log_level);
+        self.loglevel.subscribe(function(newValue) {
+            callAPI({
+                mode: "set_config",
+                section: "logging",
+                keyword: "log_level",
+                value: newValue
+            });
+        })
+
         // Update message
         if(newRelease) {
             self.allMessages.push({
@@ -1203,6 +1201,31 @@ function ViewModel() {
         });
     }
 
+    document.onkeydown = function(e) {
+        if(self.keyboardShortcuts()) {
+            // Ignore if the user used a combination
+            if(e.altKey || e.metaKey || e.ctrlKey) return;
+
+            // Do not act if the user is typing something
+            if($("input:focus, textarea:focus").length === 0) {
+                if (e.code === 'KeyP') {
+                    self.pauseToggle();
+                }
+                if (e.code === 'KeyA') {
+                    $('#modal-add-nzb').modal('show');
+                }
+                if (e.code === 'KeyC') {
+                    window.location.href = './config/';
+                }
+                if (e.code === 'KeyS') {
+                    self.loadStatusInfo(true, true)
+                    $('#modal-options').modal('show');
+                }
+            }
+
+        }
+    }
+
     /***
         Date-stuff
     ***/
@@ -1231,4 +1254,4 @@ function ViewModel() {
 
     // Activate tooltips
     if(!isMobile) $('[data-tooltip="true"]').tooltip({ trigger: 'hover', container: 'body' })
-}
+}

interfaces/Glitter/templates/static/javascripts/glitter.queue.js

@@ -531,11 +531,10 @@ function QueueModel(parent, data) {
         return self.name()
     })
     self.missingText = ko.pureComputed(function() {
-        // Check for missing data, the value is arbitrary! (1%)
-        if(self.missingMB()/self.totalMB() > 0.01) {
+        // Check for missing data, can show 0 if article-size is smaller than 500K, but we accept that
+        if(self.missingMB()) {
             return self.missingMB().toFixed(0) + ' MB ' + glitterTranslate.misingArt
         }
-        return;
     })
     self.statusText = ko.computed(function() {
         // Checking

interfaces/Glitter/templates/static/javascripts/knockout-extensions.js

@@ -1,15 +1,3 @@
-ko.bindingHandlers.truncatedText = {
-    update: function(element, valueAccessor, allBindingsAccessor) {
-        var value = ko.utils.unwrapObservable(valueAccessor());
-        if (!value) return
-        var length = ko.utils.unwrapObservable(allBindingsAccessor().length) || ko.bindingHandlers.truncatedText.defaultLength,
-            truncatedValue = value.length > length ? convertHTMLtoText(value.substring(0, Math.min(value.length, length))) + "…" : convertHTMLtoText(value);
-        ko.bindingHandlers.html.update(element, function() {
-            return truncatedValue;
-        });
-    },
-    defaultLength: 15
-};
 ko.bindingHandlers.truncatedTextCenter = {
     update: function(element, valueAccessor, allBindingsAccessor) {
         var value = ko.utils.unwrapObservable(valueAccessor())

interfaces/Glitter/templates/static/stylesheets/colorschemes/Night.css

@@ -94,7 +94,8 @@ legend,
 .nav-tabs>li.active>a,
 .nav-tabs>li.active>a:focus,
 .nav-tabs>li.active>a:hover,
-.nav-tabs>li>a:hover {
+.nav-tabs>li>a:hover,
+.nav-tabs>li>a:focus {
     background-color: #ddd;
     color: #555 !important;
     box-shadow: 0px -1px 1px 1px rgba(0,0,0,0.15);

interfaces/Glitter/templates/static/stylesheets/glitter.css

@@ -1009,10 +1009,6 @@ tr.queue-item>td:first-child>a {
     font-weight: bold;
 }
 
-.history-table td.name.name-has-ratings .row-wrap-text {
-    max-width: calc(100% - 80px) ;
-}
-
 .history-failed-download:hover .retry-button .glyphicon:before,
 .retry-button:hover .glyphicon:before {
     content: " \e030 ";
@@ -1077,83 +1073,6 @@ tr.queue-item>td:first-child>a {
 .history-status-hidden {
     display: none;
 }
-
-.history-ratings {
-    display: inline-block;
-}
-
-.history-ratings.open a {
-    opacity: 1;
-}
-
-.history-ratings .name-icons {
-    float: none !important;
-}
-
-.history-ratings-menu {
-    width: 300px;
-    padding: 10px;
-    margin-top: 4px !important;
-}
-
-.history-ratings-menu .divider {
-    background-color: black;
-}
-
-.history-ratings-menu label {
-    margin-right: 12px;
-    font-weight: normal;
-}
-
-.history-ratings-basic input[type="radio"] {
-    display: none;
-}
-
-.history-ratings-basic input[type="radio"]+span {
-    opacity: 0.6;
-    cursor: pointer;
-    font-size: 1.3em;
-    font-weight: bold;
-    top: 3px;
-    margin-left: 3px;
-}
-
-.history-ratings-basic input[type="radio"]+span+span {
-    opacity: 0.3;
-}
-
-.history-ratings-basic input[type="radio"]:checked+span,
-.history-ratings-basic input[type="radio"]:checked+span+span {
-    opacity: 1;
-}
-
-.history-ratings-basic .history-ratings-spacer {
-    margin-left: 10px;
-}
-
-.history-ratings-basic select {
-    margin-left: 3px;
-    background-color: transparent;
-    border: 1px solid #ccc;
-}
-
-.history-ratings-basic select:disabled {
-    background-color: #F5F5F5;
-}
-
-.history-ratings-report label {
-    width: 100%;
-}
-
-.history-ratings-report .ratings-report-hidden {
-    display: none;
-}
-
-.history-ratings-report input[type="radio"]:checked+input,
-.history-ratings-report input[type="radio"]:checked+select {
-    display: block;
-}
-
 #history-options {
     margin-top: 0;
     margin-left: 10px;
@@ -1370,6 +1289,12 @@ tr.queue-item>td:first-child>a {
     padding-top: 3px;
 }
 
+#modal-options .col-dot-overflow {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
 #modal-options #options-status .glyphicon:not(.glyphicon-comment) {
     margin-right: 5px;
     margin-left: 3px;
@@ -1954,10 +1879,6 @@ input[name="nzbURL"] {
     #feedback-slider {
         display: none;
     }
-
-    .glyphicon-facetime-video {
-        top: 2px;
-    }
 }
 
 @media only screen and (min-device-width:768px) and (max-device-width:1024px) and (orientation:portrait) {
@@ -2036,7 +1957,6 @@ a:focus {
     text-decoration: none;
 }
 
-.glyphicon-volume-up,
 .glyphicon-trash {
     top: 2px;
 }
@@ -2105,15 +2025,6 @@ a:focus {
     content: '';
 }
 
-.history-ratings-menu:after {
-    right: inherit !important;
-    left: 23px;
-}
-.history-ratings-menu:before {
-    right: inherit !important;
-    left: 22px;
-}
-
 .open > .dropdown-menu {
     opacity: 1;
     visibility: visible;

interfaces/Glitter/templates/static/stylesheets/glitter.mobile.css

@@ -180,14 +180,6 @@ tr.queue-item>td:first-child>a {
     min-width: 0px;
 }
 
-.history-table .history-ratings {
-    display: none;
-}
-
-.name-has-ratings .row-wrap-text {
-    max-width: calc(100% - 1px) !important;
-}
-
 .history-table .delete .dropdown-menu {
     width: 100%;
     left: 0;

interfaces/wizard/index.html

@@ -26,12 +26,13 @@
             </div>
             <hr />
             <div class="row">
-                <div class="col-xs-4 text-center">
+                <div class="col-md-4 text-center">
                     <a class="btn btn-danger" href="../shutdown/?apikey=$apikey&amp;pid=$pid"><span class="glyphicon glyphicon-remove"></span> $T('wizard-exit')</a>
                 </div>
-                <div class="col-xs-4 text-center">
+                <div class="col-md-4 text-center">
+                    <a class="btn btn-default" href="../config/general/#config_backup_file"><span class="glyphicon glyphicon-open"></span> $T('restore-backup')</a>
                 </div>
-                <div class="col-xs-4 text-center">
+                <div class="col-md-4 text-center">
                     <button class="btn btn-default">$T('wizard-start') <span class="glyphicon glyphicon-chevron-right"></span></button>
                 </div>
             </div>

linux/org.sabnzbd.sabnzbd.appdata.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2022 The SABnzbd-Team <team@sabnzbd.org> -->
+<component type="desktop-application">
+  <id>org.sabnzbd.sabnzbd</id>
+  <metadata_license>MIT</metadata_license>
+  <name>SABnzbd</name>
+  <summary>Free and easy binary newsreader</summary>
+  <description>
+    <p>
+      SABnzbd is a free and Open Source web-based binary newsreader,
+      with support for the popular nzb file format. It greatly simplifies
+      the process of downloading from Usenet, thanks to a friendly
+      web-based user interface and advanced built-in post-processing
+      options including the ability to automatically verify, repair,
+      extract and clean up downloaded posts. It runs anywhere, comes in
+      over a dozen languages, and integrates with a host of tools, apps
+      and services that help automate the download process.
+    </p>
+  </description>
+  <categories>
+    <category>Network</category>
+    <category>FileTransfer</category>
+  </categories>
+  <url type="homepage">https://sabnzbd.org</url>
+  <url type="bugtracker">https://github.com/sabnzbd/sabnzbd/issues</url>
+  <url type="translate">https://sabnzbd.org/wiki/translate</url>
+  <url type="donation">https://sabnzbd.org/donate</url>
+  <url type="help">https://sabnzbd.org/wiki/</url>
+  <url type="faq">https://sabnzbd.org/wiki/faq</url>
+  <url type="contact">https://forums.sabnzbd.org</url>
+  <launchable type="desktop-id">sabnzbd.desktop</launchable>
+  <provides>
+    <mediatype>application/x-nzb</mediatype>
+    <mediatype>application/x-compressed-nzb</mediatype>
+  </provides>
+  <project_license>GPL-2.0-or-later</project_license>
+  <developer_name>The SABnzbd-team</developer_name>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://sabnzbd.org/images/landing/screenshots/interface.png</image>
+      <caption>Web interface</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/night-mode.png</image>
+      <caption>Night mode</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://sabnzbd.org/images/landing/screenshots/config.png</image>
+      <caption>Easy configuration</caption>
+    </screenshot>
+  </screenshots>
+  <content_rating type="oars-1.1"/>
+</component>

linux/org.sabnzbd.sabnzbd.sharedmimeinfo

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-compressed-nzb">
+    <sub-class-of type="application/x-nzb"/>
+    <comment>NewzBin Usenet index (compressed)</comment>
+    <glob pattern="*.nzb.gz"/>
+    <glob pattern="*.nzb.bz2"/>
+  </mime-type>
+</mime-info>

linux/sabnzbd.bash-completion

@@ -0,0 +1,63 @@
+# bash completion for sabnzbd
+
+_sabnzbd()
+{
+    local cur prev words cword split
+    # list all options here
+    local all_options="-f --config-file --pidfile -t --templates --pid -l --logging -w --weblogging -d --daemon -h
+                       --help -v --version -c --clean -p --pause --repair --repair-all --no-login --log-all --console
+                       --disable-file-log --new -b --browser --ipv6_hosting --inet_exposure --https -s --server"
+    _init_completion -s || return
+
+    # handle options that take arguments
+    case $prev in
+        # 0..1
+        --browser|--ipv6_hosting|-!(-*)[b])
+            COMPREPLY=( $(compgen -W '{0..1}' -- "$cur") )
+            return
+            ;;
+        # -1..2
+        --logging|-!(-*)[l])
+            COMPREPLY=( $(compgen -W '{-1..2}' -- "$cur") )
+            return
+            ;;
+        # 0..5
+        --inet_exposure)
+            COMPREPLY=( $(compgen -W '{0..5}' -- "$cur") )
+            return
+            ;;
+        # directory path
+        --templates|--pid|-!(-*)[t])
+            compopt +o nospace
+            _filedir -d
+            return
+            ;;
+        # file path
+        --config-file|--pidfile|-!(-*)[f])
+            compopt +o nospace
+            _filedir
+            return
+            ;;
+        # port number
+        --https)
+            COMPREPLY=( $(compgen -W '{0..65535}' -- "$cur") )
+            return
+            ;;
+        # host:port
+        --server|-!(-*)[s])
+            # suggest possible formats
+            COMPREPLY=( $(compgen -W 'hostname :port hostname:port ipv4 ipv4:port [ipv6] [ipv6]:port' -- "$cur") )
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $(compgen -W "$all_options" -- "$cur") )
+    else
+        _filedir '@(nzb|nzb.gz|nzb.bz2|zip|rar|7z)'
+    fi
+
+} &&
+complete -F _sabnzbd SABnzbd.py sabnzbd sabnzbdplus

linux/sabnzbd.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=SABnzbd
+GenericName=Binary newsreader
+Comment=Download from Usenet
+Exec=/opt/sabnzbd/SABnzbd.py --browser 1 %F
+Icon=sabnzbd
+Terminal=false
+Type=Application
+Categories=Network;FileTransfer;
+Keywords=usenet;binaries;download;nzb;nntp;newsreader;
+MimeType=application/x-nzb;application/x-compressed-nzb;

osx/7zip/License.txt

@@ -1,17 +1,21 @@
-  7-Zip source code
-  ~~~~~~~~~~~~~~~~~
+  7-Zip
+  ~~~~~
   License for use and distribution
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-  7-Zip Copyright (C) 1999-2016 Igor Pavlov.
+  7-Zip Copyright (C) 1999-2021 Igor Pavlov.
 
-  Licenses for files are:
+  The licenses for 7zz file are:
 
-    1) CPP/7zip/Compress/Rar* files:  GNU LGPL + unRAR restriction
-    2) All other files:  GNU LGPL
+         - The "GNU LGPL" as main license for most of the code
+         - The "GNU LGPL" with "unRAR license restriction" for some code
+         - The "BSD 3-clause License" for some code
 
-  The GNU LGPL + unRAR restriction means that you must follow both 
-  GNU LGPL rules and unRAR restriction rules.
+  Redistributions in binary form must reproduce related license information from this file.
+
+  Note:
+    You can use 7-Zip on any computer, including a computer in a commercial
+    organization. You don't need to register or pay for 7-Zip.
 
 
   GNU LGPL information
@@ -27,26 +31,57 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-    USA
+    You can receive a copy of the GNU Lesser General Public License from
+    http://www.gnu.org/
 
 
-  unRAR restriction
-  -----------------
 
-    The decompression engine for RAR archives was developed using source 
+
+  BSD 3-clause License
+  --------------------
+
+    The "BSD 3-clause License" is used for the code in 7z.dll that implements LZFSE data decompression.
+    That code was derived from the code in the "LZFSE compression library" developed by Apple Inc,
+    that also uses the "BSD 3-clause License":
+
+    ----
+    Copyright (c) 2015-2016, Apple Inc. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+    1.  Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+    2.  Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer
+        in the documentation and/or other materials provided with the distribution.
+
+    3.  Neither the name of the copyright holder(s) nor the names of any contributors may be used to endorse or promote products derived
+        from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    ----
+
+
+
+
+  unRAR license restriction
+  -------------------------
+
+    The decompression engine for RAR archives was developed using source
     code of unRAR program.
     All copyrights to original unRAR code are owned by Alexander Roshal.
 
     The license for original unRAR code has the following restriction:
 
-    The unRAR sources cannot be used to re-create the RAR compression algorithm, 
-    which is proprietary. Distribution of modified unRAR sources in separate form 
-    or as a part of other software is permitted, provided that it is clearly
-    stated in the documentation and source comments that the code may
-    not be used to develop a RAR (WinRAR) compatible archiver.
+      The unRAR sources cannot be used to re-create the RAR compression algorithm,
+      which is proprietary. Distribution of modified unRAR sources in separate form
+      or as a part of other software is permitted, provided that it is clearly
+      stated in the documentation and source comments that the code may
+      not be used to develop a RAR (WinRAR) compatible archiver.
 
 
   --

osx/par2/arm64/LICENSE.txt

@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

osx/par2/arm64/README.md

@@ -0,0 +1,28 @@
+# Creating `par2` for M1 systems
+
+Compiled on an M1 system using these steps.
+
+If you do not use llvm and `clang++` it will not include multithreading support.
+
+However, I was unable to statically link the `libomp` library inside the `par2` executable.
+I extracted it from the llvm libs folder and modified `par2` to look for the `libomp.dylib` in the same folder using `install_name_tool`.
+
+Ref: https://stackoverflow.com/questions/4677044/how-to-use-dylib-in-mac-os-x-c
+
+```shell
+brew install automake
+brew install llvm
+echo 'export PATH="/opt/homebrew/opt/llvm/bin:$PATH"' >> ~/.zshrc
+
+# Restart terminal and clone/download par2cmdline sources
+
+./automake.sh
+CPPFLAGS="-I/opt/homebrew/opt/llvm/include" LDFLAGS="-L/opt/homebrew/opt/llvm/lib" CXX="clang++" ./configure
+make clean
+make
+make check
+
+# Do magic to copy and modify the OpenMP library
+cp /opt/homebrew/opt/llvm/lib/libomp.dylib .
+install_name_tool -change /opt/homebrew/opt/llvm/lib/libomp.dylib @executable_path/libomp.dylib ./par2
+```

po/email/SABemail.pot

@@ -1,11 +1,11 @@
 #
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: team@sabnzbd.org\n"
 "Language-Team: SABnzbd <team@sabnzbd.org>\n"

po/email/cs.po

@@ -1,10 +1,10 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Language-Team: Czech (https://www.transifex.com/sabnzbd/teams/111101/cs/)\n"
 "MIME-Version: 1.0\n"

po/email/da.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Danish (https://www.transifex.com/sabnzbd/teams/111101/da/)\n"

po/email/de.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: German (https://www.transifex.com/sabnzbd/teams/111101/de/)\n"

po/email/es.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/sabnzbd/teams/111101/es/)\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: email/email.tmpl:1
 msgid ""

po/email/fi.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Finnish (https://www.transifex.com/sabnzbd/teams/111101/fi/)\n"

po/email/fr.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: French (https://www.transifex.com/sabnzbd/teams/111101/fr/)\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: email/email.tmpl:1
 msgid ""

po/email/he.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: ION, 2020\n"
 "Language-Team: Hebrew (https://www.transifex.com/sabnzbd/teams/111101/he/)\n"

po/email/nb.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/sabnzbd/teams/111101/nb/)\n"

po/email/nl.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Dutch (https://www.transifex.com/sabnzbd/teams/111101/nl/)\n"

po/email/pl.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Polish (https://www.transifex.com/sabnzbd/teams/111101/pl/)\n"

po/email/pt_BR.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/sabnzbd/teams/111101/pt_BR/)\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: email/email.tmpl:1
 msgid ""

po/email/ro.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Romanian (https://www.transifex.com/sabnzbd/teams/111101/ro/)\n"

po/email/ru.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Russian (https://www.transifex.com/sabnzbd/teams/111101/ru/)\n"

po/email/sr.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Serbian (https://www.transifex.com/sabnzbd/teams/111101/sr/)\n"

po/email/sv.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Swedish (https://www.transifex.com/sabnzbd/teams/111101/sv/)\n"

po/email/zh_CN.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/sabnzbd/teams/111101/zh_CN/)\n"

po/nsis/SABnsis.pot

@@ -1,11 +1,11 @@
 #
 # SABnzbd Translation Template file NSIS
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: team@sabnzbd.org\n"
 "Language-Team: SABnzbd <team@sabnzbd.org>\n"

po/nsis/cs.po

@@ -1,11 +1,15 @@
 # SABnzbd Translation Template file NSIS
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
+# Translators:
+# Pavel C <quoing_transifex@mess.cz>, 2022
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
+"Last-Translator: Pavel C <quoing_transifex@mess.cz>, 2022\n"
 "Language-Team: Czech (https://www.transifex.com/sabnzbd/teams/111101/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +23,7 @@ msgstr ""
 
 #: builder/win/NSIS_Installer.nsi
 msgid "Support the project, Donate!"
-msgstr ""
+msgstr "Podpořte projekt!"
 
 #: builder/win/NSIS_Installer.nsi
 msgid "Please close \"SABnzbd.exe\" first"

po/nsis/da.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file NSIS
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Danish (https://www.transifex.com/sabnzbd/teams/111101/da/)\n"

po/nsis/de.po

@@ -1,16 +1,16 @@
 # SABnzbd Translation Template file NSIS
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# Ben Hecht <benjamin.hecht@me.com>, 2021
+# Simon W., 2021
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
-"Last-Translator: Ben Hecht <benjamin.hecht@me.com>, 2021\n"
+"Last-Translator: Simon W., 2021\n"
 "Language-Team: German (https://www.transifex.com/sabnzbd/teams/111101/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,7 +52,7 @@ msgid ""
 "The installer only supports Windows 8.1 and above, use the standalone legacy"
 " version to run on older Windows version."
 msgstr ""
-"Der Installer unterstützt nur Windows 8.1 und höher. Benutze die Standalone "
+"Der Installer unterstützt nur Windows 8.1 und höher. Benutze die standalone "
 "Version für ältere Windows Versionen."
 
 #: builder/win/NSIS_Installer.nsi

po/nsis/es.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file NSIS
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -8,7 +8,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Ester Molla Aragones <moarages@gmail.com>, 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/sabnzbd/teams/111101/es/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: builder/win/NSIS_Installer.nsi
 msgid "Show Release Notes"

po/nsis/fi.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file NSIS
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Finnish (https://www.transifex.com/sabnzbd/teams/111101/fi/)\n"

po/nsis/fr.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file NSIS
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -8,7 +8,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Fred L <88com88@gmail.com>, 2021\n"
 "Language-Team: French (https://www.transifex.com/sabnzbd/teams/111101/fr/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: builder/win/NSIS_Installer.nsi
 msgid "Show Release Notes"

po/nsis/he.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file NSIS
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -8,7 +8,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: ION, 2021\n"
 "Language-Team: Hebrew (https://www.transifex.com/sabnzbd/teams/111101/he/)\n"

po/nsis/nb.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file NSIS
-# Copyright 2011-2021 The SABnzbd-Team
+# Copyright 2007-2022 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-develop\n"
+"Project-Id-Version: SABnzbd-3.6.0RC2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/sabnzbd/teams/111101/nb/)\n"