Refactor pre-queue script

[skip ci]

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,30 @@
+name: Bug report
+description: >
+  Did you discover a bug in SABnzbd? Report it here!
+  If you are not 100% certain this is a bug please go to our forums, Reddit or Discord server first.
+labels:
+  - Bug
+body:
+  - type: input
+    attributes:
+      label: SABnzbd version
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Operating system
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Using Docker image
+      options:
+        - linuxserver
+        - hotio
+        - Other
+  - type: textarea
+    attributes:
+      label: Description
+      description: Include error logs directly or link to extended logs on https://pastebin.com/
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Support forum
+    url: https://forums.sabnzbd.org/
+    about: Support questions can be asked on our forums, Reddit or Discord server.
+  - name: Discord
+    url: https://discord.gg/KQzDe7fvNU
+    about: Support questions can be asked on our forums, Reddit or Discord server.
+  - name: Reddit - r/sabnzbd
+    url: https://www.reddit.com/r/sabnzbd
+    about: Support questions can be asked on our forums, Reddit or Discord server.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,10 @@
+name: Feature request
+description: What new feature would you like to have added to SABnzbd?
+labels:
+  - Feature request
+body:
+  - type: textarea
+    attributes:
+      label: Description
+    validations:
+      required: true

.github/renovate.json

@@ -1,36 +1,40 @@
 {
-   "$schema":"https://docs.renovatebot.com/renovate-schema.json",
-   "extends":[
-      "config:base",
-      ":disableDependencyDashboard"
-   ],
-   "schedule":[
-      "before 3am on Monday"
-   ],
-   "ignorePaths":[
-      "tests/**",
-      ".github/workflows/**"
-   ],
-   "pip_requirements":{
-      "fileMatch":[
-         "requirements.txt",
-         "builder/requirements.txt",
-         "builder/osx/requirements.txt"
-      ]
-   },
-   "ignoreDeps":[
-      "jaraco.text"
-   ],
-   "packageRules":[
-      {
-         "matchPackagePatterns":[
-            "*"
-         ],
-         "groupName":"all dependencies",
-         "groupSlug":"all",
-         "automerge":true
-      }
-   ],
-   "automergeStrategy":"squash",
-   "platformAutomerge":true
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base",
+    ":disableDependencyDashboard"
+  ],
+  "schedule": [
+    "before 8am on Monday"
+  ],
+  "ignorePaths": [
+    ".github/workflows/**"
+  ],
+  "pip_requirements": {
+    "fileMatch": [
+      "requirements.txt",
+      "tests/requirements.txt",
+      "builder/requirements.txt",
+      "builder/release-requirements.txt",
+      "builder/osx/requirements.txt"
+    ]
+  },
+  "ignoreDeps": [
+    "jaraco.text",
+    "sabctools",
+    "werkzeug"
+  ],
+  "packageRules": [
+    {
+      "matchPackagePatterns": [
+        "*"
+      ],
+      "groupName": "all dependencies",
+      "groupSlug": "all",
+      "separateMajorMinor": false,
+      "automerge": true
+    }
+  ],
+  "automergeStrategy": "squash",
+  "platformAutomerge": true
 }

.github/stale.yml

@@ -1,23 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 21
-
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - "Feature request"
-  - "Work in progress"
-  - "Bug"
-
-# Label to use when marking an issue as stale
-staleLabel: "Stale"
-
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

.github/workflows/build_release.yml

@@ -4,7 +4,6 @@ on: [push, pull_request]
 
 # Setting PYTHONNODEBUGRANGES reduces binary size
 env:
-  AUTOMATION_GITHUB_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
   PYTHONNODEBUGRANGES: 1
 
 jobs:
@@ -14,10 +13,10 @@ jobs:
     timeout-minutes: 30
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.11 (64bit)
+    - name: Set up Python 3.12 (64bit)
       uses: actions/setup-python@v4
       with:
-        python-version: "3.11"
+        python-version: "3.12"
         architecture: "x64"
     - name: Cache Python virtualenv (64bit)
       uses: syphar/restore-virtualenv@v1.3
@@ -25,16 +24,15 @@ jobs:
       with:
         custom_virtualenv_dir: "venv64"
         custom_cache_key_element: "release"
-        requirement_files: |
-          **/requirements.txt
-          PKG-INFO
+        requirement_files:  "**/requirements.txt"
     - name: Install Python dependencies (64bit)
       if: steps.cache-virtualenv-64bit.outputs.cache-hit != 'true'
+      # Without dependencies to make sure everything is covered in the requirements.txt
       run: |
         python --version
-        pip install --upgrade pip wheel
-        pip install --upgrade -r requirements.txt
-        pip install --upgrade -r builder/requirements.txt
+        python -m pip install --upgrade pip wheel
+        pip install --upgrade -r requirements.txt --no-dependencies
+        pip install --upgrade -r builder/requirements.txt --no-dependencies
     - name: Build Windows standalone binary and installer (64bit)
       run: python builder/package.py installer
     - name: Upload Windows standalone binary (64bit)
@@ -58,16 +56,15 @@ jobs:
       with:
         custom_virtualenv_dir: "venv32"
         custom_cache_key_element: "release"
-        requirement_files: |
-          **/requirements.txt
-          PKG-INFO
+        requirement_files: "**/requirements.txt"
     - name: Install Python dependencies (32bit and legacy)
       if: steps.cache-virtualenv-32bit.outputs.cache-hit != 'true'
+      # We do not care about the extra dependencies for the legacy build
       run: |
         python --version
-        pip install --upgrade pip wheel
-        pip install --upgrade -r requirements.txt
-        pip install --upgrade -r builder/requirements.txt
+        python -m pip install --upgrade pip wheel
+        pip install --upgrade -r requirements.txt --no-dependencies
+        pip install --upgrade -r builder/requirements.txt --no-dependencies
     - name: Build Windows standalone binary (32bit and legacy)
       run: python builder/package.py binary
     - name: Upload Windows standalone binary (32bit and legacy)
@@ -75,9 +72,6 @@ jobs:
       with:
         path: "*-win32-bin.zip"
         name: Windows Windows standalone binary (32bit and legacy)
-    - name: Prepare official release
-      if: env.AUTOMATION_GITHUB_TOKEN && startsWith(github.ref, 'refs/tags/')
-      run: python builder/package.py release
 
   build_macos:
     name: Build macOS binary
@@ -87,7 +81,7 @@ jobs:
       # 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.11.0"
+      PYTHON_VERSION: "3.12.0"
       MACOSX_DEPLOYMENT_TARGET: "10.9"
       # We need to force compile for universal2 support
       CFLAGS: -arch x86_64 -arch arm64
@@ -104,46 +98,39 @@ jobs:
       if: steps.cache-python-download.outputs.cache-hit != 'true'
       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 /
-        unlink /usr/local/bin/python
-        ln -s /usr/local/bin/python3 /usr/local/bin/python
+      run: sudo installer -pkg ~/python.pkg -target /
     - name: Cache Python virtualenv
       uses: syphar/restore-virtualenv@v1.3
       id: cache-virtualenv
       with:
         custom_cache_key_element: "release"
-        requirement_files: |
-          **/requirements.txt
-          PKG-INFO
+        requirement_files: "**/requirements.txt"
     - name: Install Python dependencies
       # We have to manually take a few steps:
       # 1.  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
+      #     https://github.com/pypa/pip/issues/5453
       # 2.  We need to build the PyInstaller bootloader:
       #     https://github.com/pyinstaller/pyinstaller/issues/6235
-      # 3.  TEMPORARY: Add aarch64 for orjson universal2 build, until they provide a wheel
       if: steps.cache-virtualenv.outputs.cache-hit != 'true'
       run: |
         python3 --version
         pip3 install --upgrade pip wheel
-        
-        pip3 install --upgrade -r requirements.txt --no-binary cffi
+    
+        pip3 install --upgrade -r requirements.txt --no-binary cffi --no-dependencies
         
         pip3 uninstall cryptography -y
-        pip3 download -r builder/osx/requirements.txt --platform macosx_10_10_universal2 --only-binary :all: --no-deps --dest .
+        pip3 download -r builder/osx/requirements.txt --platform macosx_10_12_universal2 --only-binary :all: --no-dependencies --dest .
         pip3 install -r builder/osx/requirements.txt --no-cache-dir --no-index --find-links .
-        
-        rustup target add aarch64-apple-darwin
-        
-        PYINSTALLER_COMPILE_BOOTLOADER=1 pip3 install --upgrade -r builder/requirements.txt --no-binary pyinstaller
+
+        PYINSTALLER_COMPILE_BOOTLOADER=1 pip3 install --upgrade -r builder/requirements.txt --no-binary pyinstaller --no-dependencies
     - name: Import macOS codesign certificates
       # Taken from https://github.com/Apple-Actions/import-codesign-certs/pull/27 (comments)
       env:
         CERTIFICATES_P12: ${{ secrets.CERTIFICATES_P12 }}
         CERTIFICATES_P12_PASSWORD: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
         MACOS_KEYCHAIN_TEMP_PASSWORD: ${{ secrets.MACOS_KEYCHAIN_TEMP_PASSWORD }}
+      if: env.CERTIFICATES_P12
       run: |
         echo $CERTIFICATES_P12 | base64 --decode > certificate.p12
         security create-keychain -p "$MACOS_KEYCHAIN_TEMP_PASSWORD" build.keychain 
@@ -173,23 +160,34 @@ jobs:
       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
 
-  release_snap:
-    name: Release Snap
+  release:
+    name: Publish Release
     runs-on: ubuntu-latest
+    needs: [build_windows, build_macos]
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
-    env:
-      SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_TOKEN }}
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
           python-version: "3.x"
+      - name: Download all artifacts
+        uses: actions/download-artifact@v3
+        with:
+          path: dist
+      - name: Move all artifacts to main folder
+        run: find dist -type f -exec mv {} . \;
+      - name: Prepare official release
+        env:
+          AUTOMATION_GITHUB_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
+          REDDIT_TOKEN: ${{ secrets.REDDIT_TOKEN }}
+        run: |
+          pip3 install -r builder/release-requirements.txt
+          python3 builder/release.py
       - name: Release latest available Snap
+        env:
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_TOKEN }}
         run: |
           sudo snap install snapcraft --classic
           python3 snap/local/release_snap.py

.github/workflows/integration_testing.yml

@@ -20,35 +20,42 @@ jobs:
             builder/SABnzbd.spec
             tests
             --line-length=120
-            --target-version=py37
+            --target-version=py38
             --check
             --diff
 
   test:
     name: Test ${{ matrix.name }} - Python ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 15
+    timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-architecture: ["x64"]
+        name: ["Linux"]
         os: [ubuntu-20.04]
         include:
           - name: macOS
             os: macos-latest
-            python-version: "3.11"
+            python-version: "3.12"
+            python-architecture: "x64"
           - name: Windows
             os: windows-latest
-            # lxml is not yet available for Python 3.11, so CI is stuck on 3.10 for now
-            python-version: "3.10"
+            python-version: "3.12"
+            python-architecture: "x64"
+          - name: Windows (32bit)
+            os: windows-latest
+            python-version: "3.8"
+            python-architecture: "x86"
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: Set up Python ${{ matrix.python-version }} ${{ matrix.python-architecture }}
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
-        architecture: "x64"
+        architecture:  ${{ matrix.python-architecture }}
     - name: Install system dependencies
       if: runner.os == 'Linux'
       run: sudo apt-get install unrar p7zip-full par2
@@ -56,15 +63,13 @@ jobs:
       uses: syphar/restore-virtualenv@v1.3
       id: cache-virtualenv
       with:
-        custom_cache_key_element: "ci"
-        requirement_files: |
-          **/requirements.txt
-          PKG-INFO
+        custom_cache_key_element: ci-${{ matrix.python-architecture }}
+        requirement_files: "**/requirements.txt"
     - name: Install Python dependencies
       if: steps.cache-virtualenv.outputs.cache-hit != 'true'
       run: |
         python --version
-        pip install --upgrade pip wheel
+        python -m pip install --upgrade pip wheel
         pip install --upgrade -r requirements.txt
         pip install --upgrade -r tests/requirements.txt
     - name: Test SABnzbd

.github/workflows/stale.yml

@@ -0,0 +1,33 @@
+name: "Close and lock old issues"
+on:
+  schedule:
+    - cron: "30 1 * * *"
+  workflow_dispatch:
+
+jobs:
+  stale:
+    name: "Close stale issues"
+    if: github.repository_owner == 'sabnzbd'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v8
+        with:
+          days-before-stale: 21
+          days-before-close: 7
+          stale-issue-label: "Stale"
+          stale-issue-message: >
+            This issue has been automatically marked as stale because it has not had
+            recent activity. It will be closed if no further activity occurs. Thank you
+            for your contributions.
+          exempt-issue-labels: "Feature request, Work in progress, Bug"
+
+  lock:
+    name: "Lock old issues"
+    if: github.repository_owner == 'sabnzbd'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v4
+        with:
+          log-output: true
+          issue-inactive-days: 60
+          pr-inactive-days: 60

.github/workflows/translations.yml

@@ -20,18 +20,20 @@ jobs:
           python3 tools/extract_pot.py
       - name: Push/pull Transifex translations
         if: env.TX_TOKEN
+        # Add --translation to the push command in order to update Transifex using local translation edits
+        # However, this prevents modifying existing translations in Transifex as they will be overwritten by the push!
         run: |
           curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash
-          ./tx push --source
+          ./tx push --source 
           ./tx pull --all --force
       - 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.15.2
+        uses: stefanzweifel/git-auto-commit-action@v4.16.0
         if: env.TX_TOKEN
         with:
-          commit_message: | 
+          commit_message: |
             Update translatable texts
             [skip ci]
           commit_user_name: SABnzbd Automation

COPYRIGHT.txt

@@ -1,7 +1,7 @@
 
-(c) Copyright 2007-2022 by "The SABnzbd-team" <team@sabnzbd.org>
+(c) Copyright 2007-2023 by The SABnzbd-Team (sabnzbd.org)
 
-The SABnzbd-team is:
+The SABnzbd-Team is:
 
 Active team:
     Safihre

INSTALL.txt

@@ -4,7 +4,7 @@
 0) LICENSE
 -------------------------------------------------------------------------------
 
-(c) Copyright 2007-2022 by "The SABnzbd-team" <team@sabnzbd.org>
+(c) Copyright 2007-2023 by The SABnzbd-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,10 +52,10 @@ 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.7 and above is supported.
+Only Python 3.8 and above is supported.
 
 On Linux systems you need to install:
-    par2 unrar unzip python3-setuptools python3-pip
+    par2 unrar python3-setuptools python3-pip
 
 On non-X86 platforms, for which PyPI does not provide all pre-compiled packages,
 you also need to install these development libraries (exact names might differ per platform):

ISSUES.txt

@@ -16,7 +16,7 @@
       no_penalties = 1
   See: https://sabnzbd.org/wiki/configuration/3.4/special
 
-- Some third-party utilties try to probe SABnzbd API in such a way that you will
+- Some third-party utilities try to probe SABnzbd API in such a way that you will
   often see warnings about unauthenticated access.
   If you are sure these probes are harmless, you can suppress the warnings by
   setting the option "api_warnings" to 0.
@@ -48,11 +48,3 @@
   You can make SABnzbd wait for a mount of the "temporary download folder" by setting
   Config->Special->wait_for_dfolder to 1.
   SABnzbd will appear to hang until the drive is mounted.
-
-- If you experience speed-drops to KB/s when using a VPN, try setting the number of connections
-  to your servers to a total of 7. There is a CPU-usage reduction feature in SABnzbd that
-  gets confused by the way some VPN's handle the state of a connection. Below 8 connections
-  this feature is not active.
-
-- If the queue is paused but one or more jobs have the Force priority, SABnzbd might still
-  download some data from other jobs in the queue if active servers have unused connections.

LICENSE.txt

@@ -1,4 +1,4 @@
-(c) Copyright 2007-2022 by "The SABnzbd-team" <team@sabnzbd.org>
+(c) Copyright 2007-2023 by The SABnzbd-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,10 +0,0 @@
-Metadata-Version: 1.0
-Name: SABnzbd
-Version: 3.7.0
-Summary: SABnzbd-3.7.0
-Home-page: https://sabnzbd.org
-Author: The SABnzbd Team
-Author-email: team@sabnzbd.org
-License: GNU General Public License 2 (GPL2 or later)
-Description: Fully automated Usenet Binary Downloader
-Platform: posix

README.md

@@ -16,7 +16,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.7 and above, often called `python3`)
+- `python` (Python 3.8 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,44 +1,24 @@
-Release Notes - SABnzbd 3.7.0
+Release Notes - SABnzbd 4.2.0 Alpha 2
 =========================================================
 
-## Changes since 3.6.1
-- The queue and history can be filtered using keywords:
-  `cat` and `priority`. For example: `show name cat:tv`.
-- Use shortcut `shift + arrow-key` to navigate the queue/history pages.
-- The backup is now created in a local folder for security.
-- Recurring backups can be configured using the scheduler.
-- Improvements to Deobfuscate Final Filenames.
-- RSS overview shows the rule that accepted the job.
-- Added option to sort the queue by `% downloaded`.
-- Added option to replace underscores with dots in folder names.
-- SABnzbd Host input will be validated before being applied.
-- Moved system load information from the main page to the Status window.
-- Console logging is now written to `stdout` instead of `stderr`.
-- Removed Special settings `enable_meta`, `disable_key`,
-  `replace_illegal`, `osx_speed` and `show_sysload`.
-- Merged Special settings `win_menu` and `osx_menu` into `tray_icon`.
-- macOS/Windows: Use Python 3.11, slightly boosting overall performance.
-- macOS/Windows: Updated UnRar to 6.12.
-- Windows: Updated MultiPar to 1.3.2.5.
+## Changes since 4.1.0
+- Numerous smaller performance improvements were made.
+- Reduced recursive unpacking to 2 levels, instead of 5.
+- IPv6 addresses are preferred during server address selection.
+- Stricter check if `Complete Folder` is inside `Download Folder`.
+- Windows: Reduced size of installer.
+- Windows/macOS: Updated to Python 3.12.
 
-# API changes since 3.6.1
-- Minor improvements in API performance.
-- Removed fields `scripts` and `categories` from `queue` API call.
-- Moved `loadavg` from `queue` to `status` API call.
-
-# Bugfixes since 3.6.1
-- Free Space Detection was too strict when using Direct Unpack.
-- File uploads with special characters would be parsed incorrectly.
-- Passwords from NZB meta-data were tried multiple times.
-- Passwords were not always supplied to the pre-queue script.
-- RSS-feed names were not sanitized when renamed.
-- Make sure short-dates are detected as `YY-MM-DD` in Sorting.
-- Show the custom job name in History when the NZB could not be fetched.
+## Bugfixes since 4.1.0
+- Multi-select in the queue was broken for some users.
+- Prevent crash during saving of configuration.
+- Removing a failed download from the history could break active downloads.
 
 ## 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
-  statistics will be lost.
+- Direct upgrade is possible from version 3.0.0 and newer.
+  Upgrading from older versions will require `Queue repair`.
+- Downgrading from version 4.2.0 or newer to 3.7.2 or older will
+  require `Queue repair` due to changes in the internal data format.
 
 ## Known problems and solutions
 - Read the file "ISSUES.txt"
@@ -50,4 +30,4 @@ Release Notes - SABnzbd 3.7.0
   that automatically verify, repair, extract and clean up posts downloaded
   from Usenet.
 
-  (c) Copyright 2007-2022 by "The SABnzbd-team" \<team@sabnzbd.org\>
+  (c) Copyright 2007-2023 by The SABnzbd-Team (sabnzbd.org)

SABnzbd.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python3 -OO
-# Copyright 2007-2022 The SABnzbd-Team <team@sabnzbd.org>
+# Copyright 2007-2023 The SABnzbd-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,10 @@
 
 import sys
 
-if sys.hexversion < 0x03070000:
-    print("Sorry, requires Python 3.7 or above")
+# Trick to show a better message on older Python
+# releases that don't support walrus operator
+if Python_38_is_required_to_run_SABnzbd := sys.hexversion < 0x03080000:
+    print("Sorry, requires Python 3.8 or above")
     print("You can read more at: https://sabnzbd.org/wiki/installation/install-off-modules")
     sys.exit(1)
 
@@ -40,6 +42,7 @@ import gc
 from typing import List, Dict, Any
 
 try:
+    import sabctools
     import Cheetah
     import feedparser
     import configobj
@@ -76,6 +79,7 @@ from sabnzbd.constants import (
     DEF_LOG_FILE,
     DEF_STD_CONFIG,
     DEF_LOG_CHERRY,
+    CONFIG_BACKUP_HTTPS,
 )
 import sabnzbd.newsunpack
 from sabnzbd.misc import (
@@ -240,7 +244,7 @@ def print_version():
             """
 %s-%s
 
-Copyright (C) 2007-2022 The SABnzbd-Team <team@sabnzbd.org>
+Copyright (C) 2007-2023 The SABnzbd-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
@@ -398,15 +402,13 @@ def get_user_profile_paths():
         return
 
     elif sabnzbd.MACOS:
-        home = os.environ.get("HOME")
-        if home:
+        if home := os.environ.get("HOME"):
             sabnzbd.DIR_LCLDATA = "%s/Library/Application Support/SABnzbd" % home
             sabnzbd.DIR_HOME = home
             return
     else:
         # Unix/Linux
-        home = os.environ.get("HOME")
-        if home:
+        if home := os.environ.get("HOME"):
             sabnzbd.DIR_LCLDATA = "%s/.%s" % (home, DEF_WORKDIR)
             sabnzbd.DIR_HOME = home
             return
@@ -418,25 +420,27 @@ def get_user_profile_paths():
 
 def print_modules():
     """Log all detected optional or external 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)
+    if sabnzbd.decoder.SABCTOOLS_ENABLED:
+        # Yes, we have SABCTools, and it's the correct version, so it's enabled
+        logging.info("SABCTools module (v%s)... found!", sabnzbd.decoder.SABCTOOLS_VERSION)
+        logging.info("SABCTools module is using SIMD set: %s", sabnzbd.decoder.SABCTOOLS_SIMD)
+        logging.info("SABCTools module is linked to OpenSSL: %s", sabnzbd.decoder.SABCTOOLS_OPENSSL_LINKED)
+
+        # Check if we managed to link, warning for now
+        # It won't work on OpenSSL < 1.1.1 anyway, so we skip the check there
+        if not sabnzbd.decoder.SABCTOOLS_OPENSSL_LINKED and ssl.OPENSSL_VERSION_INFO >= (1, 1, 1):
+            logging.warning(
+                "Could not link to OpenSSL library, please report here: "
+                "https://github.com/sabnzbd/sabnzbd/issues/2421"
+            )
     else:
-        # Something wrong with SABYenc, so let's determine and print what:
-        if sabnzbd.decoder.SABYENC_VERSION:
-            # We have a VERSION, thus a SABYenc module, but it's not the correct version
-            logging.error(
-                T("SABYenc disabled: no correct version found! (Found v%s, expecting v%s)"),
-                sabnzbd.decoder.SABYENC_VERSION,
-                sabnzbd.constants.SABYENC_VERSION_REQUIRED,
-            )
-        else:
-            # No SABYenc module at all
-            logging.error(
-                T("SABYenc module... NOT found! Expecting v%s - https://sabnzbd.org/sabyenc"),
-                sabnzbd.constants.SABYENC_VERSION_REQUIRED,
-            )
+        # Wrong SABCTools version, if it was fully missing it would fail to start due to check at the very top
+        logging.error(
+            T("SABCTools disabled: no correct version found! (Found v%s, expecting v%s)"),
+            sabnzbd.decoder.SABCTOOLS_VERSION,
+            sabnzbd.constants.SABCTOOLS_VERSION_REQUIRED,
+        )
+
         # Do not allow downloading
         sabnzbd.NO_DOWNLOADING = True
 
@@ -444,7 +448,8 @@ def print_modules():
 
     if sabnzbd.WIN32 and sabnzbd.newsunpack.MULTIPAR_COMMAND:
         logging.info("MultiPar binary... found (%s)", sabnzbd.newsunpack.MULTIPAR_COMMAND)
-    elif sabnzbd.newsunpack.PAR2_COMMAND:
+
+    if sabnzbd.newsunpack.PAR2_COMMAND:
         logging.info("par2 binary... found (%s)", sabnzbd.newsunpack.PAR2_COMMAND)
     else:
         logging.error(T("par2 binary... NOT found!"))
@@ -466,18 +471,12 @@ def print_modules():
         # Do not allow downloading
         sabnzbd.NO_DOWNLOADING = True
 
-    # If available, we prefer 7zip over unzip
     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!"))
-
-        if sabnzbd.newsunpack.ZIP_COMMAND:
-            logging.info("unzip binary... found (%s)", sabnzbd.newsunpack.ZIP_COMMAND)
-        else:
-            logging.info(T("unzip binary... NOT found!"))
+        logging.warning(T("7za binary... NOT found!"))
 
     if not sabnzbd.WIN32:
         if sabnzbd.newsunpack.NICE_COMMAND:
@@ -625,10 +624,6 @@ def get_webhost(cherryhost, cherryport, https_port):
             except socket.error:
                 cherryhost = cherryhost.strip("[]")
 
-    if ipv6 and ipv4 and not is_localhost(browserhost):
-        sabnzbd.AMBI_LOCALHOST = True
-        logging.info("IPV6 has priority on this system, potential Firefox issue")
-
     if ipv6 and ipv4 and cherryhost == "" and sabnzbd.WIN32:
         helpful_warning(T("Please be aware the 0.0.0.0 hostname will need an IPv6 address for external access"))
 
@@ -757,26 +752,9 @@ def commandline_handler():
     serv_opts = [os.path.normpath(os.path.abspath(sys.argv[0]))]
     upload_nzbs = []
 
-    # macOS binary: get rid of the weird -psn_0_123456 parameter
-    for arg in sys.argv:
-        if arg.startswith("-psn_"):
-            sys.argv.remove(arg)
-            break
-
-    # Ugly hack to remove the extra "SABnzbd*" parameter the Windows binary
-    # gets when it's restarted
-    if len(sys.argv) > 1 and "sabnzbd" in sys.argv[1].lower() and not sys.argv[1].startswith("-"):
-        slice_start = 2
-    else:
-        slice_start = 1
-
-    # Prepend options from env-variable to options
-    info = os.environ.get("SABnzbd", "").split()
-    info.extend(sys.argv[slice_start:])
-
     try:
         opts, args = getopt.getopt(
-            info,
+            sys.argv[1:],
             "phdvncwl:s:f:t:b:2:",
             [
                 "pause",
@@ -859,7 +837,7 @@ def main():
 
     autobrowser = None
     autorestarted = False
-    sabnzbd.MY_FULLNAME = sys.argv[0]
+    sabnzbd.MY_FULLNAME = __file__
     sabnzbd.MY_NAME = os.path.basename(sabnzbd.MY_FULLNAME)
     fork = False
     pause = False
@@ -927,6 +905,7 @@ def main():
                 exit_sab(1)
         elif opt == "--console":
             console_logging = True
+            sabnzbd.RESTART_ARGS.append(opt)
         elif opt in ("-v", "--version"):
             print_version()
             exit_sab(0)
@@ -971,7 +950,7 @@ def main():
     org_dir = os.getcwd()
 
     # Need console logging if requested, for SABnzbd.py and SABnzbd-console.exe
-    console_logging = console_logging or sabnzbd.MY_NAME.lower().find("-console") > 0 or not hasattr(sys, "frozen")
+    console_logging = console_logging or sys.executable.endswith("console.exe") or not hasattr(sys, "frozen")
     console_logging = console_logging and not sabnzbd.DAEMON
 
     LOGLEVELS = (logging.FATAL, logging.WARNING, logging.INFO, logging.DEBUG)
@@ -1192,7 +1171,7 @@ def main():
     # Find encoding; relevant for external processing activities
     logging.info("Preferred encoding = %s", sabnzbd.encoding.CODEPAGE)
 
-    # On Linux/FreeBSD/Unix "UTF-8" is strongly, strongly adviced:
+    # On Linux/FreeBSD/Unix "UTF-8" is strongly, strongly advised:
     if not sabnzbd.WIN32 and not sabnzbd.MACOS and not ("utf-8" in sabnzbd.encoding.CODEPAGE.lower()):
         helpful_warning(
             T(
@@ -1370,7 +1349,6 @@ def main():
             "server.socket_host": cherryhost,
             "server.socket_port": cherryport,
             "server.shutdown_timeout": 0,
-            "log.screen": False,
             "engine.autoreload.on": False,
             "tools.encode.on": True,
             "tools.gzip.on": True,
@@ -1382,13 +1360,11 @@ def main():
     )
 
     # Do we want CherryPy Logging? Cannot be done via the config
+    cherrypy.log.screen = False
+    cherrypy.log.access_log.propagate = False
     if cherrypylogging:
         sabnzbd.WEBLOGFILE = os.path.join(logdir, DEF_LOG_CHERRY)
-        cherrypy.log.screen = True
-        cherrypy.log.access_log.propagate = True
         cherrypy.log.access_file = str(sabnzbd.WEBLOGFILE)
-    else:
-        cherrypy.log.access_log.propagate = False
 
     # Force mimetypes (OS might overwrite them)
     forced_mime_types = {"css": "text/css", "js": "application/javascript"}
@@ -1444,6 +1420,12 @@ def main():
         logging.error(T("Failed to start web-interface: "), exc_info=True)
         abort_and_show_error(browserhost, cherryport)
 
+    # Create a record of the active cert/key/chain files, for use with config.create_config_backup()
+    if enable_https:
+        for setting in CONFIG_BACKUP_HTTPS.values():
+            if full_path := getattr(sabnzbd.cfg, setting).get_path():
+                sabnzbd.CONFIG_BACKUP_HTTPS_OK.append(full_path)
+
     if sabnzbd.WIN32:
         if enable_https:
             mode = "s"
@@ -1595,9 +1577,8 @@ def main():
             if hasattr(sys, "frozen"):
                 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:])
-                    cmd = 'kill -9 %s && open "%s" --args %s' % (os.getpid(), my_name, my_args)
+                    cmd = 'kill -9 %s && open "%s" --args %s' % (os.getpid(), sys.executable, my_args)
                     logging.info("Launching: %s", cmd)
                     os.system(cmd)
                 elif sabnzbd.WIN_SERVICE:
@@ -1614,15 +1595,20 @@ def main():
     # Send our final goodbyes!
     notifier.send_notification("SABnzbd", T("SABnzbd shutdown finished"), "startup")
     logging.info("Leaving SABnzbd")
-    sys.stderr.flush()
-    sys.stdout.flush()
     sabnzbd.pid_file()
 
+    try:
+        sys.stderr.flush()
+        sys.stdout.flush()
+    except AttributeError:
+        # Not supported on Windows binaries
+        pass
+
     if hasattr(sys, "frozen") and sabnzbd.MACOS:
         try:
             AppHelper.stopEventLoop()
         except:
-            # Failing AppHelper libary!
+            # Failing AppHelper library!
             os._exit(0)
     elif sabnzbd.WIN_SERVICE:
         # Do nothing, let service handle it

builder/SABnzbd.spec

@@ -2,43 +2,17 @@
 import os
 import re
 import sys
-import pkginfo
 
 from PyInstaller.building.api import EXE, COLLECT, PYZ
 from PyInstaller.building.build_main import Analysis
 from PyInstaller.building.osx import BUNDLE
 from PyInstaller.utils.hooks import collect_data_files, collect_submodules
 
+from builder.constants import EXTRA_FILES, EXTRA_FOLDERS, RELEASE_VERSION
+
 # Add extra files in the PyInstaller-spec
 extra_pyinstaller_files = []
 
-# Also modify these in "package.py"!
-extra_files = [
-    "README.txt",
-    "INSTALL.txt",
-    "LICENSE.txt",
-    "GPL2.txt",
-    "GPL3.txt",
-    "COPYRIGHT.txt",
-    "ISSUES.txt",
-    "PKG-INFO",
-]
-
-extra_folders = [
-    "scripts/",
-    "licenses/",
-    "locale/",
-    "email/",
-    "interfaces/Glitter/",
-    "interfaces/wizard/",
-    "interfaces/Config/",
-    "scripts/",
-    "icons/",
-]
-
-# Get the version
-RELEASE_VERSION = pkginfo.Develop(".").version
-
 # Add hidden imports
 extra_hiddenimports = ["Cheetah.DummyTransaction", "cheroot.ssl.builtin", "certifi"]
 extra_hiddenimports.extend(collect_submodules("babelfish.converters"))
@@ -48,7 +22,7 @@ extra_hiddenimports.extend(collect_submodules("guessit.data"))
 if sys.platform == "darwin":
     extra_hiddenimports.extend(["objc", "PyObjCTools"])
     # macOS folders
-    extra_folders += ["osx/par2/", "osx/unrar/", "osx/7zip/"]
+    EXTRA_FOLDERS += ["osx/par2/", "osx/unrar/", "osx/7zip/"]
     # Add NZB-icon file
     extra_pyinstaller_files.append(("builder/osx/image/nzbfile.icns", "."))
     # Version information is set differently on macOS
@@ -67,8 +41,8 @@ else:
 
     # Windows
     extra_hiddenimports.append("win32timezone")
-    extra_folders += ["win/multipar/", "win/unrar/", "win/7zip/"]
-    extra_files += ["portable.cmd"]
+    EXTRA_FOLDERS += ["win/multipar/", "win/par2/", "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)
@@ -109,9 +83,9 @@ else:
     )
 
 # Process the extra-files and folders
-for file_item in extra_files:
+for file_item in EXTRA_FILES:
     extra_pyinstaller_files.append((file_item, "."))
-for folder_item in extra_folders:
+for folder_item in EXTRA_FOLDERS:
     extra_pyinstaller_files.append((folder_item, folder_item))
 
 # Add babelfish data files
@@ -122,7 +96,7 @@ pyi_analysis = Analysis(
     ["SABnzbd.py"],
     datas=extra_pyinstaller_files,
     hiddenimports=extra_hiddenimports,
-    excludes=["ujson", "FixTk", "tcl", "tk", "_tkinter", "tkinter", "Tkinter"],
+    excludes=["ujson", "FixTk", "tcl", "tk", "_tkinter", "tkinter", "Tkinter", "pydoc", "pydoc_data.topics"],
 )
 
 pyz = PYZ(pyi_analysis.pure, pyi_analysis.zipped_data)
@@ -139,10 +113,10 @@ exe = EXE(
     [],
     exclude_binaries=True,
     name="SABnzbd",
-    upx=True,
     console=False,
     append_pkg=False,
     icon="icons/sabnzbd.ico",
+    contents_directory=".",
     version=version_info,
     target_arch="universal2",
     entitlements_file="builder/osx/entitlements.plist",
@@ -160,9 +134,9 @@ if sys.platform == "win32":
         [],
         exclude_binaries=True,
         name="SABnzbd-console",
-        upx=True,
         append_pkg=False,
         icon="icons/sabnzbd.ico",
+        contents_directory=".",
         version=version_info,
     )
 
@@ -171,7 +145,6 @@ if sys.platform == "win32":
         pyi_analysis.binaries,
         pyi_analysis.zipfiles,
         pyi_analysis.datas,
-        upx=True,
         name="SABnzbd-console",
     )
 

builder/constants.py

@@ -0,0 +1,67 @@
+#!/usr/bin/python3 -OO
+# Copyright 2008-2017 The SABnzbd-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
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+import os
+
+# Constants
+VERSION_FILE = "sabnzbd/version.py"
+APPDATA_FILE = "linux/org.sabnzbd.sabnzbd.appdata.xml"
+
+# 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", "")
+
+# Import version.py without the sabnzbd overhead
+with open(VERSION_FILE) as version_file:
+    exec(version_file.read())
+RELEASE_VERSION = __version__
+
+# Pre-releases are longer than 6 characters (e.g. 3.1.0Beta1 vs 3.1.0, but also 3.0.11)
+PRERELEASE = len(RELEASE_VERSION) > 5
+
+# Define release name
+RELEASE_NAME = "SABnzbd-%s" % RELEASE_VERSION
+RELEASE_TITLE = "SABnzbd %s" % RELEASE_VERSION
+RELEASE_SRC = RELEASE_NAME + "-src.tar.gz"
+RELEASE_BINARY_32 = RELEASE_NAME + "-win32-bin.zip"
+RELEASE_BINARY_64 = RELEASE_NAME + "-win64-bin.zip"
+RELEASE_INSTALLER = RELEASE_NAME + "-win-setup.exe"
+RELEASE_MACOS = RELEASE_NAME + "-osx.dmg"
+RELEASE_README = "README.mkd"
+
+# Used in package.py and SABnzbd.spec
+EXTRA_FILES = [
+    RELEASE_README,
+    "README.txt",
+    "INSTALL.txt",
+    "LICENSE.txt",
+    "GPL2.txt",
+    "GPL3.txt",
+    "COPYRIGHT.txt",
+    "ISSUES.txt",
+]
+EXTRA_FOLDERS = [
+    "scripts/",
+    "licenses/",
+    "locale/",
+    "email/",
+    "interfaces/Glitter/",
+    "interfaces/wizard/",
+    "interfaces/Config/",
+    "scripts/",
+    "icons/",
+]

builder/make_dmg.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python3 -OO
-# Copyright 2008-2017 The SABnzbd-Team <team@sabnzbd.org>
+# Copyright 2008-2017 The SABnzbd-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
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import os
-import pkginfo
+from constants import RELEASE_VERSION
 
 
 # We need to call dmgbuild from command-line, so here we can setup how
@@ -37,7 +37,7 @@ if __name__ == "__main__":
 
     # Extract version info and set DMG path
     # Create sub-folder to upload later
-    release = pkginfo.Develop(".").version
+    release = RELEASE_VERSION
     prod = "SABnzbd-" + release
     fileDmg = prod + "-osx.dmg"
 

builder/osx/requirements.txt

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

builder/package.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python3 -OO
-# Copyright 2008-2017 The SABnzbd-Team <team@sabnzbd.org>
+# Copyright 2008-2017 The SABnzbd-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
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import glob
-import hashlib
 import platform
 import re
 import sys
@@ -29,42 +28,27 @@ import tarfile
 import urllib.request
 import urllib.error
 import configobj
-import pkginfo
-import github
 from typing import List
 
-
-VERSION_FILE = "sabnzbd/version.py"
-SPEC_FILE = "SABnzbd.spec"
-
-# Also modify these in "SABnzbd.spec"!
-extra_files = [
-    "README.mkd",
-    "INSTALL.txt",
-    "LICENSE.txt",
-    "GPL2.txt",
-    "GPL3.txt",
-    "COPYRIGHT.txt",
-    "ISSUES.txt",
-    "PKG-INFO",
-]
-
-extra_folders = [
-    "scripts/",
-    "licenses/",
-    "locale/",
-    "email/",
-    "interfaces/Glitter/",
-    "interfaces/wizard/",
-    "interfaces/Config/",
-    "scripts/",
-    "icons/",
-]
+from constants import (
+    RELEASE_VERSION,
+    VERSION_FILE,
+    RELEASE_README,
+    RELEASE_NAME,
+    RELEASE_BINARY_32,
+    RELEASE_BINARY_64,
+    RELEASE_INSTALLER,
+    ON_GITHUB_ACTIONS,
+    RELEASE_THIS,
+    RELEASE_SRC,
+    EXTRA_FILES,
+    EXTRA_FOLDERS,
+)
 
 
 # Support functions
 def safe_remove(path):
-    """Remove file without erros if the file doesn't exist
+    """Remove file without errors if the file doesn't exist
     Can also handle folders
     """
     if os.path.exists(path):
@@ -74,11 +58,16 @@ def safe_remove(path):
             os.remove(path)
 
 
-def delete_files_glob(name):
-    """Delete one file or set of files from wild-card spec"""
-    for f in glob.glob(name):
-        if os.path.exists(f):
-            os.remove(f)
+def delete_files_glob(glob_pattern: str, allow_no_matches: bool = False):
+    """Delete one file or set of files from wild-card spec.
+    We expect to match at least 1 file, to force expected behavior"""
+    if files_to_remove := glob.glob(glob_pattern):
+        for path in files_to_remove:
+            if os.path.exists(path):
+                os.remove(path)
+    else:
+        if not allow_no_matches:
+            raise FileNotFoundError(f"No files found that match '{glob_pattern}'")
 
 
 def run_external_command(command: List[str], print_output: bool = True):
@@ -132,13 +121,16 @@ def test_sab_binary(binary_path: str):
 
         # Wait for SAB to respond
         base_url = "http://127.0.0.1:8080/"
-        for _ in range(10):
+        for _ in range(30):
             try:
                 urllib.request.urlopen(base_url, timeout=1).read()
                 break
             except:
                 time.sleep(1)
         else:
+            # Print console output and give some time to print
+            print(sabnzbd_process.stdout.read())
+            time.sleep(1)
             raise urllib.error.URLError("Could not connect to SABnzbd")
 
         # Open a number of API calls and pages, to see if we are really up
@@ -170,10 +162,13 @@ def test_sab_binary(binary_path: str):
 
         # Print logs for verification
         with open(os.path.join(config_dir, "logs", "sabnzbd.log"), "r") as log_file:
-            print(log_file.read())
+            # Wait after printing so the output is nicely displayed in case of problems
+            print(log_text := log_file.read())
+            time.sleep(5)
 
-        # So we have time to print the file before the directory is removed
-        time.sleep(1)
+            # Make sure no extra errors/warnings were reported
+            if "ERROR" in log_text or "WARNING" in log_text:
+                raise RuntimeError("Warning or error reported during execution")
 
 
 if __name__ == "__main__":
@@ -185,32 +180,15 @@ if __name__ == "__main__":
     if not os.path.exists("builder"):
         raise FileNotFoundError("Run from the main SABnzbd source folder: python builder/package.py")
 
-    # Extract version info
-    RELEASE_VERSION = pkginfo.Develop(".").version
-
     # Check if we have the needed certificates
     try:
         import certifi
     except ImportError:
         raise FileNotFoundError("Need certifi module")
 
-    # Define release name
-    RELEASE_NAME = "SABnzbd-%s" % RELEASE_VERSION
-    RELEASE_TITLE = "SABnzbd %s" % RELEASE_VERSION
-    RELEASE_SRC = RELEASE_NAME + "-src.tar.gz"
-    RELEASE_BINARY_32 = RELEASE_NAME + "-win32-bin.zip"
-    RELEASE_BINARY_64 = RELEASE_NAME + "-win64-bin.zip"
-    RELEASE_INSTALLER = RELEASE_NAME + "-win-setup.exe"
-    RELEASE_MACOS = RELEASE_NAME + "-osx.dmg"
-    RELEASE_README = "README.mkd"
-
     # Patch release file
     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
     safe_remove("README.txt")
     shutil.copyfile(RELEASE_README, "README.txt")
@@ -229,7 +207,7 @@ if __name__ == "__main__":
     safe_remove(RELEASE_NAME)
 
     # Copy the specification
-    shutil.copyfile("builder/%s" % SPEC_FILE, SPEC_FILE)
+    shutil.copyfile("builder/SABnzbd.spec", "SABnzbd.spec")
 
     if "binary" in sys.argv or "installer" in sys.argv:
         # Must be run on Windows
@@ -238,8 +216,10 @@ if __name__ == "__main__":
 
         # Check what architecture we are on
         RELEASE_BINARY = RELEASE_BINARY_32
+        BUILDING_64BIT = False
         if platform.architecture()[0] == "64bit":
             RELEASE_BINARY = RELEASE_BINARY_64
+            BUILDING_64BIT = True
 
         # Remove any leftovers
         safe_remove(RELEASE_BINARY)
@@ -251,18 +231,20 @@ if __name__ == "__main__":
         safe_remove("dist/SABnzbd-console")
 
         # Remove unwanted DLL's
-        delete_files_glob("dist/SABnzbd/api-ms-win*.dll")
-        delete_files_glob("dist/SABnzbd/mfc140u.dll")
-        delete_files_glob("dist/SABnzbd/ucrtbase.dll")
+        shutil.rmtree("dist/SABnzbd/Pythonwin")
+        if BUILDING_64BIT:
+            # These are only present on 64bit (Python 3.9+)
+            delete_files_glob("dist/SABnzbd/api-ms-win*.dll", allow_no_matches=True)
+            delete_files_glob("dist/SABnzbd/ucrtbase.dll", allow_no_matches=True)
 
-        # Remove other files we don't need
-        delete_files_glob("dist/SABnzbd/PKG-INFO")
-        delete_files_glob("dist/SABnzbd/win32ui.pyd")
-        delete_files_glob("dist/SABnzbd/winxpgui.pyd")
+            # Remove 32bit external executables
+            delete_files_glob("dist/SABnzbd/win/par2/par2.exe")
+            delete_files_glob("dist/SABnzbd/win/multipar/par2j.exe")
+            delete_files_glob("dist/SABnzbd/win/unrar/UnRAR.exe")
 
         if "installer" in sys.argv:
             # Needs to be run on 64 bit
-            if RELEASE_BINARY != RELEASE_BINARY_64:
+            if not BUILDING_64BIT:
                 raise RuntimeError("Installer should be created on 64bit Python")
 
             # Compile NSIS translations
@@ -271,10 +253,6 @@ if __name__ == "__main__":
             shutil.copyfile("builder/win/NSIS_Installer.nsi", "NSIS_Installer.nsi")
             run_external_command([sys.executable, "tools/make_mo.py", "nsis"])
 
-            # Remove 32bit external executables
-            delete_files_glob("dist/SABnzbd/win/par2/multipar/par2j.exe")
-            delete_files_glob("dist/SABnzbd/win/unrar/UnRAR.exe")
-
             # Run NSIS to build installer
             run_external_command(
                 [
@@ -310,9 +288,8 @@ if __name__ == "__main__":
         # Otherwise the signature of the main application becomes invalid
         if authority:
             files_to_sign = [
-                "osx/par2/par2-sl64",
-                "osx/par2/arm64/par2",
-                "osx/par2/arm64/libomp.dylib",
+                "osx/par2/par2-turbo",
+                "osx/par2/arm64/par2-turbo",
                 "osx/unrar/unrar",
                 "osx/unrar/arm64/unrar",
                 "osx/7zip/7zz",
@@ -435,15 +412,15 @@ if __name__ == "__main__":
         safe_remove(RELEASE_SRC)
 
         # Add extra files and folders need for source dist
-        extra_folders.extend(["sabnzbd/", "po/", "linux/", "tools/", "tests/"])
-        extra_files.extend(["SABnzbd.py", "requirements.txt"])
+        EXTRA_FOLDERS.extend(["sabnzbd/", "po/", "linux/", "tools/", "tests/"])
+        EXTRA_FILES.extend(["SABnzbd.py", "requirements.txt"])
 
         # Copy all folders and files to the new folder
-        for source_folder in extra_folders:
+        for source_folder in EXTRA_FOLDERS:
             shutil.copytree(source_folder, os.path.join(src_folder, source_folder), dirs_exist_ok=True)
 
         # Copy all files
-        for source_file in extra_files:
+        for source_file in EXTRA_FILES:
             shutil.copyfile(source_file, os.path.join(src_folder, source_file))
 
         # Make sure all line-endings are correct
@@ -483,173 +460,6 @@ if __name__ == "__main__":
         # Remove source folder
         safe_remove(src_folder)
 
-        # Calculate hashes for Synology release
-        with open(RELEASE_SRC, "rb") as inp_file:
-            source_data = inp_file.read()
-
-        print("----")
-        print(RELEASE_SRC, "SHA1", hashlib.sha1(source_data).hexdigest())
-        print(RELEASE_SRC, "SHA256", hashlib.sha256(source_data).hexdigest())
-        print(RELEASE_SRC, "MD5", hashlib.md5(source_data).hexdigest())
-        print("----")
-
-    # Release to github
-    if "release" in sys.argv:
-        # Check if tagged as release and check for token
-        gh_token = os.environ.get("AUTOMATION_GITHUB_TOKEN", "")
-        if RELEASE_THIS and gh_token:
-            gh_obj = github.Github(gh_token)
-            gh_repo = gh_obj.get_repo("sabnzbd/sabnzbd")
-
-            # Read the release notes
-            with open(RELEASE_README, "r") as readme_file:
-                readme_data = readme_file.read()
-
-            # Pre-releases are longer than 6 characters (e.g. 3.1.0Beta1 vs 3.1.0, but also 3.0.11)
-            prerelease = len(RELEASE_VERSION) > 5
-
-            # We have to manually check if we already created this release
-            for release in gh_repo.get_releases():
-                if release.tag_name == RELEASE_VERSION:
-                    gh_release = release
-                    print("Found existing release %s" % gh_release.title)
-                    break
-            else:
-                # Did not find it, so create the release, use the GitHub tag we got as input
-                print("Creating GitHub release SABnzbd %s" % RELEASE_VERSION)
-                gh_release = gh_repo.create_git_release(
-                    tag=RELEASE_VERSION,
-                    name=RELEASE_TITLE,
-                    message=readme_data,
-                    draft=True,
-                    prerelease=prerelease,
-                )
-
-            # Fetch existing assets, as overwriting is not allowed by GitHub
-            gh_assets = gh_release.get_assets()
-
-            # Upload the assets
-            files_to_check = (
-                RELEASE_SRC,
-                RELEASE_BINARY_32,
-                RELEASE_BINARY_64,
-                RELEASE_INSTALLER,
-                RELEASE_MACOS,
-                RELEASE_README,
-            )
-            for file_to_check in files_to_check:
-                if os.path.exists(file_to_check):
-                    # Check if this file was previously uploaded
-                    if gh_assets.totalCount:
-                        for gh_asset in gh_assets:
-                            if gh_asset.name == file_to_check:
-                                print("Removing existing asset %s " % gh_asset.name)
-                                gh_asset.delete_asset()
-                    # Upload the new one
-                    print("Uploading %s to release %s" % (file_to_check, gh_release.title))
-                    gh_release.upload_asset(file_to_check)
-
-            # Check if we now have all files
-            gh_new_assets = gh_release.get_assets()
-            if gh_new_assets.totalCount:
-                all_assets = [gh_asset.name for gh_asset in gh_new_assets]
-
-                # Check if we have all files, using set-comparison
-                if set(files_to_check) == set(all_assets):
-                    print("All assets present, releasing %s" % RELEASE_VERSION)
-                    # Publish release
-                    gh_release.update_release(
-                        tag_name=RELEASE_VERSION,
-                        name=RELEASE_TITLE,
-                        message=readme_data,
-                        draft=False,
-                        prerelease=prerelease,
-                    )
-
-            # Update the website
-            gh_repo_web = gh_obj.get_repo("sabnzbd/sabnzbd.github.io")
-            # Check if the branch already exists, only create one if it doesn't
-            skip_website_update = False
-            try:
-                gh_repo_web.get_branch(RELEASE_VERSION)
-                print("Branch %s on sabnzbd/sabnzbd.github.io already exists, skipping update" % RELEASE_VERSION)
-                skip_website_update = True
-            except github.GithubException:
-                # Create a new branch to have the changes
-                sb = gh_repo_web.get_branch("master")
-                print("Creating branch %s on sabnzbd/sabnzbd.github.io" % RELEASE_VERSION)
-                new_branch = gh_repo_web.create_git_ref(ref="refs/heads/" + RELEASE_VERSION, sha=sb.commit.sha)
-
-            # Update the files
-            if not skip_website_update:
-                # We need bytes version to interact with GitHub
-                RELEASE_VERSION_BYTES = RELEASE_VERSION.encode()
-
-                # Get all the version files
-                latest_txt = gh_repo_web.get_contents("latest.txt")
-                latest_txt_items = latest_txt.decoded_content.split()
-                new_latest_txt_items = latest_txt_items[:2]
-                config_yml = gh_repo_web.get_contents("_config.yml")
-                if prerelease:
-                    # If it's a pre-release, we append to current version in latest.txt
-                    new_latest_txt_items.extend([RELEASE_VERSION_BYTES, latest_txt_items[1]])
-                    # And replace in _config.yml
-                    new_config_yml = re.sub(
-                        b"latest_testing: '[^']*'",
-                        b"latest_testing: '%s'" % RELEASE_VERSION_BYTES,
-                        config_yml.decoded_content,
-                    )
-                else:
-                    # New stable release, replace the version
-                    new_latest_txt_items[0] = RELEASE_VERSION_BYTES
-                    # And replace in _config.yml
-                    new_config_yml = re.sub(
-                        b"latest_testing: '[^']*'",
-                        b"latest_testing: ''",
-                        config_yml.decoded_content,
-                    )
-                    new_config_yml = re.sub(
-                        b"latest_stable: '[^']*'",
-                        b"latest_stable: '%s'" % RELEASE_VERSION_BYTES,
-                        new_config_yml,
-                    )
-                    # Also update the wiki-settings, these only use x.x notation
-                    new_config_yml = re.sub(
-                        b"wiki_version: '[^']*'",
-                        b"wiki_version: '%s'" % RELEASE_VERSION_BYTES[:3],
-                        new_config_yml,
-                    )
-
-                # Update the files
-                print("Updating latest.txt")
-                gh_repo_web.update_file(
-                    "latest.txt",
-                    "Release %s: latest.txt" % RELEASE_VERSION,
-                    b"\n".join(new_latest_txt_items),
-                    latest_txt.sha,
-                    RELEASE_VERSION,
-                )
-                print("Updating _config.yml")
-                gh_repo_web.update_file(
-                    "_config.yml",
-                    "Release %s: _config.yml" % RELEASE_VERSION,
-                    new_config_yml,
-                    config_yml.sha,
-                    RELEASE_VERSION,
-                )
-
-                # Create pull-request
-                print("Creating pull request in sabnzbd/sabnzbd.github.io for the update")
-                gh_repo_web.create_pull(
-                    title=RELEASE_VERSION,
-                    base="master",
-                    body="Automated update of release files",
-                    head=RELEASE_VERSION,
-                )
-        else:
-            print("To push release to GitHub, first tag the commit.")
-            print("Or missing the AUTOMATION_GITHUB_TOKEN, cannot push to GitHub without it.")
-
     # Reset!
     run_git_command(["reset", "--hard"])
     run_git_command(["clean", "-f"])

builder/release-requirements.txt

@@ -0,0 +1,2 @@
+PyGithub==2.1.1
+praw==7.7.1

builder/release.py

@@ -0,0 +1,265 @@
+#!/usr/bin/python3 -OO
+# Copyright 2008-2017 The SABnzbd-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
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+import hashlib
+import json
+import os
+import re
+import xml.etree.ElementTree as ET
+
+import github
+import praw
+
+from constants import (
+    RELEASE_VERSION,
+    PRERELEASE,
+    RELEASE_SRC,
+    RELEASE_BINARY_32,
+    RELEASE_BINARY_64,
+    RELEASE_INSTALLER,
+    RELEASE_MACOS,
+    RELEASE_README,
+    RELEASE_THIS,
+    RELEASE_TITLE,
+    APPDATA_FILE,
+)
+
+# Verify we have all assets
+files_to_check = (
+    RELEASE_SRC,
+    RELEASE_BINARY_32,
+    RELEASE_BINARY_64,
+    RELEASE_INSTALLER,
+    RELEASE_MACOS,
+    RELEASE_README,
+)
+for file_to_check in files_to_check:
+    if not os.path.exists(file_to_check):
+        raise RuntimeError("Not all release files are present!")
+print("All release files are present")
+
+# Verify that appdata file is updated
+if not PRERELEASE:
+    if not isinstance(ET.parse(APPDATA_FILE).find(f"./releases/release[@version='{RELEASE_VERSION}']"), ET.Element):
+        raise RuntimeError(f"Could not find {RELEASE_VERSION} in {APPDATA_FILE}")
+
+# Calculate hashes for Synology release
+with open(RELEASE_SRC, "rb") as inp_file:
+    source_data = inp_file.read()
+
+print("---- Synology spksrc digest hashes ---- ")
+print(RELEASE_SRC, "SHA1", hashlib.sha1(source_data).hexdigest())
+print(RELEASE_SRC, "SHA256", hashlib.sha256(source_data).hexdigest())
+print(RELEASE_SRC, "MD5", hashlib.md5(source_data).hexdigest())
+print("----")
+
+# Check if tagged as release and check for token
+gh_token = os.environ.get("AUTOMATION_GITHUB_TOKEN", "")
+if RELEASE_THIS and gh_token:
+    gh_obj = github.Github(gh_token)
+    gh_repo = gh_obj.get_repo("sabnzbd/sabnzbd")
+
+    # Read the release notes
+    with open(RELEASE_README, "r") as readme_file:
+        readme_data = readme_file.read()
+
+    # We have to manually check if we already created this release
+    for release in gh_repo.get_releases():
+        if release.tag_name == RELEASE_VERSION:
+            gh_release = release
+            print("Found existing release %s" % gh_release.title)
+            break
+    else:
+        # Did not find it, so create the release, use the GitHub tag we got as input
+        print("Creating GitHub release SABnzbd %s" % RELEASE_VERSION)
+        gh_release = gh_repo.create_git_release(
+            tag=RELEASE_VERSION,
+            name=RELEASE_TITLE,
+            message=readme_data,
+            draft=True,
+            prerelease=PRERELEASE,
+        )
+
+    # Fetch existing assets, as overwriting is not allowed by GitHub
+    gh_assets = gh_release.get_assets()
+
+    # Upload the assets
+    for file_to_check in files_to_check:
+        if os.path.exists(file_to_check):
+            # Check if this file was previously uploaded
+            if gh_assets.totalCount:
+                for gh_asset in gh_assets:
+                    if gh_asset.name == file_to_check:
+                        print("Removing existing asset %s " % gh_asset.name)
+                        gh_asset.delete_asset()
+            # Upload the new one
+            print("Uploading %s to release %s" % (file_to_check, gh_release.title))
+            gh_release.upload_asset(file_to_check)
+
+    # Check if we now have all files
+    gh_new_assets = gh_release.get_assets()
+    if gh_new_assets.totalCount:
+        all_assets = [gh_asset.name for gh_asset in gh_new_assets]
+
+        # Check if we have all files, using set-comparison
+        if set(files_to_check) == set(all_assets):
+            print("All assets present, releasing %s" % RELEASE_VERSION)
+            # Publish release
+            gh_release.update_release(
+                tag_name=RELEASE_VERSION,
+                name=RELEASE_TITLE,
+                message=readme_data,
+                draft=False,
+                prerelease=PRERELEASE,
+            )
+
+    # Update the website
+    gh_repo_web = gh_obj.get_repo("sabnzbd/sabnzbd.github.io")
+    # Check if the branch already exists, only create one if it doesn't
+    skip_website_update = False
+    try:
+        gh_repo_web.get_branch(RELEASE_VERSION)
+        print("Branch %s on sabnzbd/sabnzbd.github.io already exists, skipping update" % RELEASE_VERSION)
+        skip_website_update = True
+    except github.GithubException:
+        # Create a new branch to have the changes
+        sb = gh_repo_web.get_branch("master")
+        print("Creating branch %s on sabnzbd/sabnzbd.github.io" % RELEASE_VERSION)
+        new_branch = gh_repo_web.create_git_ref(ref="refs/heads/" + RELEASE_VERSION, sha=sb.commit.sha)
+
+    # Update the files
+    if not skip_website_update:
+        # We need bytes version to interact with GitHub
+        RELEASE_VERSION_BYTES = RELEASE_VERSION.encode()
+
+        # Get all the version files
+        latest_txt = gh_repo_web.get_contents("latest.txt")
+        latest_txt_items = latest_txt.decoded_content.split()
+        new_latest_txt_items = latest_txt_items[:2]
+        config_yml = gh_repo_web.get_contents("_config.yml")
+        if PRERELEASE:
+            # If it's a pre-release, we append to current version in latest.txt
+            new_latest_txt_items.extend([RELEASE_VERSION_BYTES, latest_txt_items[1]])
+            # And replace in _config.yml
+            new_config_yml = re.sub(
+                b"latest_testing: '[^']*'",
+                b"latest_testing: '%s'" % RELEASE_VERSION_BYTES,
+                config_yml.decoded_content,
+            )
+        else:
+            # New stable release, replace the version
+            new_latest_txt_items[0] = RELEASE_VERSION_BYTES
+            # And replace in _config.yml
+            new_config_yml = re.sub(
+                b"latest_testing: '[^']*'",
+                b"latest_testing: ''",
+                config_yml.decoded_content,
+            )
+            new_config_yml = re.sub(
+                b"latest_stable: '[^']*'",
+                b"latest_stable: '%s'" % RELEASE_VERSION_BYTES,
+                new_config_yml,
+            )
+            # Also update the wiki-settings, these only use x.x notation
+            new_config_yml = re.sub(
+                b"wiki_version: '[^']*'",
+                b"wiki_version: '%s'" % RELEASE_VERSION_BYTES[:3],
+                new_config_yml,
+            )
+
+        # Update the files
+        print("Updating latest.txt")
+        gh_repo_web.update_file(
+            "latest.txt",
+            "Release %s: latest.txt" % RELEASE_VERSION,
+            b"\n".join(new_latest_txt_items),
+            latest_txt.sha,
+            RELEASE_VERSION,
+        )
+        print("Updating _config.yml")
+        gh_repo_web.update_file(
+            "_config.yml",
+            "Release %s: _config.yml" % RELEASE_VERSION,
+            new_config_yml,
+            config_yml.sha,
+            RELEASE_VERSION,
+        )
+
+        # Create pull-request
+        print("Creating pull request in sabnzbd/sabnzbd.github.io for the update")
+        update_pr = gh_repo_web.create_pull(
+            title="Release %s" % RELEASE_VERSION,
+            base="master",
+            body="Automated update of release files",
+            head=RELEASE_VERSION,
+        )
+
+        # Merge pull-request
+        print("Merging pull request in sabnzbd/sabnzbd.github.io for the update")
+        update_pr.merge(merge_method="squash")
+
+    # Only with GitHub success we proceed to Reddit
+    if reddit_token := os.environ.get("REDDIT_TOKEN", ""):
+        # Token format (without whitespace):
+        # {
+        #     "client_id":"XXX",
+        #     "client_secret":"XXX",
+        #     "user_agent":"SABnzbd release script",
+        #     "username":"Safihre",
+        #     "password":"XXX"
+        # }
+        credentials = json.loads(reddit_token)
+        reddit = praw.Reddit(**credentials)
+
+        subreddit_sabnzbd = reddit.subreddit("sabnzbd")
+        subreddit_usenet = reddit.subreddit("usenet")
+
+        # Read the release notes
+        with open(RELEASE_README, "r") as readme_file:
+            readme_lines = readme_file.readlines()
+
+        # Put the download link after the title
+        readme_lines[2] = "## https://sabnzbd.org/downloads\n"
+
+        # Use the header in the readme as title
+        title = readme_lines[0]
+        release_notes_text = "".join(readme_lines[2:])
+        print("Posting release notes to Reddit")
+
+        # Only stable releases to r/usenet
+        if not PRERELEASE:
+            # Get correct flair-id (required by r/usenet)
+            for flair in subreddit_usenet.flair.link_templates.user_selectable():
+                if flair["flair_text"] == "News":
+                    print("Posting to r/usenet")
+                    submission = subreddit_usenet.submit(
+                        title, selftext=release_notes_text, flair_id=flair["flair_template_id"]
+                    )
+                    break
+            else:
+                raise ValueError("Could not locate flair_text for posting to r/usenet")
+
+        # Post always to r/SABnzbd
+        print("Posting to r/sabnzbd")
+        subreddit_sabnzbd.submit(title, selftext=release_notes_text)
+
+    else:
+        print("Missing REDDIT_TOKEN")
+
+else:
+    print("To push release to GitHub, first tag the commit.")
+    print("Or missing the AUTOMATION_GITHUB_TOKEN, cannot push to GitHub without it.")

builder/requirements.txt

@@ -1,22 +1,28 @@
 # Basic build requirements
 # Note that not all sub-dependencies are listed, but only ones we know could cause trouble
-pyinstaller==5.6.1
-pyinstaller-hooks-contrib==2022.10
-altgraph==0.17.3
-wrapt==1.14.1
-setuptools==65.5.0
-pkginfo==1.8.3
-PyGithub==1.56
-charset-normalizer==3.0.0
+pyinstaller==6.2.0
+packaging==23.2
+pyinstaller-hooks-contrib==2023.10
+altgraph==0.17.4
+wrapt==1.16.0
+setuptools==68.2.2
 certifi
 
-# orjson does not support 32bit Windows, exclude it based on Python-version
-# This way we also test ujson on Python 3.7 and 3.8 in the CI-tests
-orjson==3.8.0; python_version > '3.8'
+# Required on 32bit Windows, exclude it based on Python-version
+importlib_metadata==6.8.0; python_version < '3.10'
+importlib_resources==6.1.1; python_version < '3.10'
+zipp==3.17.0; python_version < '3.10'
+
+# orjson does not support 32bit Windows, also exclude based on Python-version
+orjson==3.9.10; python_version > '3.8'
+
+# For the Windows build
+pefile==2023.2.7; sys_platform == 'win32'
+pywin32-ctypes==0.2.2; sys_platform == 'win32'
 
 # For the macOS build
-dmgbuild==1.5.2; sys_platform == 'darwin'
-mac-alias==2.2.0; sys_platform == 'darwin'
-macholib==1.16.2; sys_platform == 'darwin'
-ds-store==1.3.0; sys_platform == 'darwin'
+dmgbuild==1.6.1; sys_platform == 'darwin'
+mac-alias==2.2.2; sys_platform == 'darwin'
+macholib==1.16.3; sys_platform == 'darwin'
+ds-store==1.3.1; sys_platform == 'darwin'
 PyNaCl==1.5.0; sys_platform == 'darwin'

builder/win/NSIS_Installer.nsi

@@ -1,6 +1,6 @@
 ; -*- coding: utf-8 -*-
 ;
-; Copyright 2008-2015 The SABnzbd-Team <team@sabnzbd.org>
+; Copyright 2008-2015 The SABnzbd-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
@@ -32,7 +32,7 @@ Unicode true
 
 ;------------------------------------------------------------------
 ;
-; Marco for removing existing and the current installation
+; Macro for removing existing and the current installation
 ; It shared by the installer and the uninstaller.
 ;
 !define RemovePrev "!insertmacro RemovePrev"
@@ -56,7 +56,7 @@ Unicode true
   CRCCheck on ; (can be off)
   AutoCloseWindow false ; (can be true for the window go away automatically at end)
   ShowInstDetails hide ; (can be show to have them shown, or nevershow to disable)
-  SetDateSave off ; (can be on to have files restored to their orginal date)
+  SetDateSave off ; (can be on to have files restored to their original date)
   WindowIcon on
   SpaceTexts none
 
@@ -66,7 +66,6 @@ Unicode true
   RequestExecutionLevel admin
   FileErrorText "If you have no admin rights, try to install into a user directory."
 
-
 ;------------------------------------------------------------------
 ;Variables
   Var MUI_TEMP
@@ -169,29 +168,33 @@ Unicode true
 Section "SABnzbd" SecDummy
 
   SetOutPath "$INSTDIR"
+  SetShellVarContext all
 
   ;------------------------------------------------------------------
   ; Make sure old versions are gone (reg-key already read in onInt)
   StrCmp $PREV_INST_DIR "" noPrevInstallRemove
     ${RemovePrev} "$PREV_INST_DIR"
+    Goto continueSetupAfterRemove
+
+  ;------------------------------------------------------------------
+  ; Add firewall rules for new installs
   noPrevInstallRemove:
+    liteFirewallW::AddRule "$INSTDIR\SABnzbd.exe" "SABnzbd"
+    liteFirewallW::AddRule "$INSTDIR\SABnzbd-console.exe" "SABnzbd-console"
+
+  continueSetupAfterRemove:
 
   ; add files / whatever that need to be installed here.
   File /r "dist\SABnzbd\*"
 
   ;------------------------------------------------------------------
-  ; Add firewall rules
-  liteFirewallW::AddRule "$INSTDIR\SABnzbd.exe" "SABnzbd"
-  liteFirewallW::AddRule "$INSTDIR\SABnzbd-console.exe" "SABnzbd-console"
-
-  ;------------------------------------------------------------------
-  ; Add to registery
+  ; Add to registry
   WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\SABnzbd" "" "$INSTDIR"
   WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\SABnzbd" "Installer Language" "$(MsgLangCode)"
   WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "DisplayName" "SABnzbd ${SAB_VERSION}"
   WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "UninstallString" '"$INSTDIR\uninstall.exe"'
   WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "DisplayVersion" '${SAB_VERSION}'
-  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "Publisher" 'The SABnzbd Team'
+  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "Publisher" 'The SABnzbd-Team'
   WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "HelpLink" 'https://forums.sabnzbd.org/'
   WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "URLInfoAbout" 'https://sabnzbd.org/wiki/'
   WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "URLUpdateInfo" 'https://sabnzbd.org/'
@@ -248,7 +251,7 @@ Function .onInit
   ; Change settings based on if SAB was already installed
   ReadRegStr $PREV_INST_DIR HKEY_LOCAL_MACHINE "SOFTWARE\SABnzbd" ""
   StrCmp $PREV_INST_DIR "" noPrevInstall
-    ; We want to use the user's costom dir if he used one
+    ; We want to use the user's custom dir if he used one
     StrCmp $PREV_INST_DIR "$PROGRAMFILES\SABnzbd" noSpecialDir
       StrCmp $PREV_INST_DIR "$PROGRAMFILES64\SABnzbd" noSpecialDir
         ; Set what the user had before
@@ -257,10 +260,18 @@ Function .onInit
 
     ;------------------------------------------------------------------
     ; Check what the user has currently set for install options
+    SetShellVarContext current
+    IfFileExists "$SMPROGRAMS\Startup\SABnzbd.lnk" 0 endCheckStartup
+      SectionSetFlags ${startup} 1
+    SetShellVarContext all
     IfFileExists "$SMPROGRAMS\Startup\SABnzbd.lnk" 0 endCheckStartup
       SectionSetFlags ${startup} 1
     endCheckStartup:
 
+    SetShellVarContext current
+    IfFileExists "$DESKTOP\SABnzbd.lnk" endCheckDesktop 0
+      SectionSetFlags ${desktop} 0 ; SAB is installed but desktop-icon not, so uncheck it
+    SetShellVarContext all
     IfFileExists "$DESKTOP\SABnzbd.lnk" endCheckDesktop 0
       SectionSetFlags ${desktop} 0 ; SAB is installed but desktop-icon not, so uncheck it
     endCheckDesktop:
@@ -328,12 +339,11 @@ FunctionEnd
 UninstallText $(MsgUninstall)
 
 Section "un.$(MsgDelProgram)" Uninstall
-;make sure sabnzbd.exe isnt running..if so shut it down
+;make sure sabnzbd.exe isn't running..if so shut it down
   ${nsProcess::KillProcess} "SABnzbd.exe" $R0
   ${nsProcess::Unload}
   DetailPrint "Process Killed"
 
-
   ; add delete commands to delete whatever files/registry keys/etc you installed here.
   Delete "$INSTDIR\uninstall.exe"
   DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\SABnzbd"
@@ -341,6 +351,26 @@ Section "un.$(MsgDelProgram)" Uninstall
 
   ${RemovePrev} "$INSTDIR"
 
+  ; Remove firewall entries
+  liteFirewallW::RemoveRule "$INSTDIR\SABnzbd.exe" "SABnzbd"
+  liteFirewallW::RemoveRule "$INSTDIR\SABnzbd-console.exe" "SABnzbd-console"
+
+  SetShellVarContext all
+
+  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+
+  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - SafeMode.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - Documentation.url"
+  RMDir  "$SMPROGRAMS\$MUI_TEMP"
+
+  Delete "$SMPROGRAMS\Startup\SABnzbd.lnk"
+
+  Delete "$DESKTOP\SABnzbd.lnk"
+
+  SetShellVarContext current
+
   !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
 
   Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd.lnk"

interfaces/Config/templates/_inc_footer_uc.tmpl

@@ -15,7 +15,7 @@
                         <!--#if not $windows#-->
                         <div class="checkbox">
                             <label>
-                                <input type="checkbox" id="show_hidden_folders"> <span>$T('systemFolders')</span>
+                                <input type="checkbox" id="show_hidden_folders"> <span>$T('hiddenFolders')</span>
                             </label>
                         </div>
                         <!--#end if#-->

interfaces/Config/templates/_inc_header_uc.tmpl

@@ -34,6 +34,9 @@
     <link rel="stylesheet" type="text/css" href="${root}staticcfg/bootstrap/css/bootstrap.min.css?v=$version" />
     <link rel="stylesheet" type="text/css" href="${root}staticcfg/css/chartist.min.css" />
     <link rel="stylesheet" type="text/css" href="${root}staticcfg/css/style.css?v=$version" />
+    <!--#if $color_scheme not in ('Light', '') #-->
+    <link rel="stylesheet" type="text/css" href="${root}staticcfg/css/${color_scheme}.css?v=$version"/>
+    <!--#end if#-->
 
     <link rel="shortcut icon" href="${root}staticcfg/ico/favicon.ico?v=$version" />
 
@@ -67,14 +70,14 @@
     <script type="text/javascript" src="${root}staticcfg/js/script.js?v=$version"></script>
     <script type="text/javascript">
         // Set default functions for the autocomplete everywhere
-        \$.extend(\$.fn.typeahead.defaults, {
+        jQuery.extend(jQuery.fn.typeahead.defaults, {
             source: function (query, process) {
-                // If there's no seperator, it must be a relative path
+                // If there's no separator, it must be a relative path
                 if(query.split(folderSeperator).length < 2 && this.\$element.data('initialdir')) {
                     query  = this.\$element.data('initialdir') + folderSeperator + query;
                 }
                 // Get info from the API
-                return \$.get(folderBrowseUrl + '&compact=1&term=' + query, function (data) {
+                return jQuery.get(folderBrowseUrl + '&compact=1&term=' + query, function (data) {
                     return process(data);
                 });
             },
@@ -181,7 +184,7 @@
                     </a>
                 </li>
                 <li>
-                    <a href="$helpuri$help_uri" target="_blank">
+                    <a href="$help_uri" target="_blank">
                         <span class="glyphicon glyphicon-question-sign"></span>
                         <strong>$T('menu-help')</strong>
                     </a>

interfaces/Config/templates/config.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Config"#-->
-<!--#set global $help_uri="configuration/3.7/configure"#-->
+<!--#set global $help_uri = $confighelpuri + "configure"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#from sabnzbd.encoding import CODEPAGE#-->
@@ -25,7 +25,7 @@
                 </tr>
                 <tr>
                     <th scope="row">$T('pythonVersion'): </th>
-                    <td>$sys.version[:120] [$CODEPAGE]</td>
+                    <td>$sys.version [$CODEPAGE]</td>
                 </tr>
                 <tr>
                     <th scope="row">OpenSSL:</th>
@@ -43,41 +43,23 @@
                 <!--#end if#-->
                 <!--#if not $windows and not $macos#-->
                 <tr>
-                    <th scope="row">$T('opt-multicore-par2')</th>
+                    <th scope="row">Par2cmdline-turbo:</th>
                     <td>
-                        <!--#if $have_mt_par2#-->
+                        <!--#if $have_par2_turbo#-->
                         <span class="glyphicon glyphicon-ok"></span>
                         <!--#else#-->
-                        <span class="label label-warning">$T('notAvailable')</span> $T('explain-getpar2mt')
-                        <a href="${helpuri}installation/multicore-par2" target="_blank">${helpuri}installation/multicore-par2</a>
+                        <span class="label label-warning">$T('notAvailable')</span> $T('explain-getpar2turbo')<br>
+                        <a href="https://sabnzbd.org/wiki/installation/par2cmdline-turbo" target="_blank">https://sabnzbd.org/wiki/installation/par2cmdline-turbo</a>
                         <!--#end if#-->
                     </td>
                 </tr>
                 <!--#end if#-->
-                <!--#if not $have_sabyenc#-->
-                <tr>
-                    <th scope="row">SABYenc:</th>
-                    <td>
-                        <span class="label label-danger">$T('notAvailable')</span>
-                        <a href="$helpuri$help_uri#no_sabyenc" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
-                    </td>
-                </tr>
-                <!--#end if#-->
-                <!--#if not $have_unzip and not $have_7zip #-->
-                <tr>
-                    <th scope="row">$T('opt-enable_unzip'):</th>
-                    <td>
-                        <span class="label label-warning">$T('notAvailable')</span>
-                        <a href="${helpuri}installation/install-off-modules#toc8" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
-                    </td>
-                </tr>
-                <!--#end if#-->
                 <!--#if not $have_7zip #-->
                 <tr>
                     <th scope="row">$T('opt-enable_7zip'):</th>
                     <td>
                         <span class="label label-warning">$T('notAvailable')</span>
-                        <a href="${helpuri}installation/install-off-modules#toc8" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+                        <a href="https://sabnzbd.org/wiki/installation/install-off-modules#toc8" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
                     </td>
                 </tr>
                 <!--#end if#-->
@@ -123,8 +105,8 @@
 </div>
 
 <div class="colmask">
-    <div class="padding alt">
-        <h5 class="copyright">Copyright &copy; 2007-2022 The SABnzbd Team &lt;<a href="mailto:team@sabnzbd.org">team@sabnzbd.org</a>&gt;</h5>
+    <div class="padding">
+        <h5 class="copyright">Copyright &copy; 2007-2023 The SABnzbd-Team (<a href="https://sabnzbd.org/" target="_blank">sabnzbd.org</a>)</h5>
         <p class="copyright"><small>$T('yourRights')</small></p>
     </div>
 

interfaces/Config/templates/config_cat.tmpl

@@ -1,15 +1,16 @@
 <!--#set global $pane="Categories"#-->
-<!--#set global $help_uri="configuration/3.7/categories"#-->
+<!--#set global $help_uri = $confighelpuri + "categories"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <div class="colmask">
     <div class="section">
-        <div class="padTable"> <a class="main-helplink" href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+        <div class="padTable">
+            <a class="main-helplink" href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
             <p>$T('explain-catTags2')<br/>$T('explain-catTags')</p>
             <hr>
             <h5 class="darkred"><strong>$T('explain-relFolder'):</strong> <span class="path">$defdir</span></h5>
             <!--#for $cur, $slot in enumerate($slotinfo)#-->
                 <!--#set $cansort = $slot.name != '*' and $slot.name != ''#-->
-                <form action="save" method="get" <!--#if $cansort#-->class="sorting-row"<!--#end if#-->>
+                <form action="save" method="post" <!--#if $cansort#-->class="sorting-row"<!--#end if#-->>
                     <table class="catTable">
                         <!--#if $cur == 0#-->
                         <tr>
@@ -104,29 +105,29 @@
 </div>
 <script type="text/javascript" src="${root}staticcfg/js/jquery-ui.min.js"></script>
 <script type="text/javascript">
-    \$(document).ready(function() {
-        \$('.delCat').click(function() {
-            var theForm = \$(this).closest("form");
+    jQuery(document).ready(function() {
+        jQuery('.delCat').click(function() {
+            var theForm = jQuery(this).closest("form");
             theForm.attr("action", "delete").submit();
         });
 
         // Add autocomplete and file-browser
-        \$('.fileBrowserSmall').typeahead({appendTo: 'body'}).fileBrowser();
+        jQuery('.fileBrowserSmall').typeahead({appendTo: 'body'}).fileBrowser();
 
         // Make categories sortable
-        \$('.padTable').sortable({
+        jQuery('.padTable').sortable({
             items: '.sorting-row',
             containment: '.colmask',
             axis: 'y',
             update: function(event, ui) {
-                \$('.Categories form.sorting-row').each(function(index, elm) {
+                jQuery('.Categories form.sorting-row').each(function(index, elm) {
                     // Update order of all elements
-                    if(index != elm.order.value) {
+                    if(index !== elm.order.value) {
                         elm.order.value = index
                         // Submit changed order
                         var data = {}
-                        \$(elm).extractFormDataTo(data);
-                        \$.ajax({
+                        jQuery(elm).extractFormDataTo(data);
+                        jQuery.ajax({
                             type: "GET",
                             url: window.location.pathname + 'save',
                             data: data,

interfaces/Config/templates/config_folders.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Folders"#-->
-<!--#set global $help_uri="configuration/3.7/folders"#-->
+<!--#set global $help_uri = $confighelpuri + "folders"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -14,7 +14,7 @@
     <input type="hidden" id="ajax" name="ajax" value="1" />
     <div class="section">
         <div class="col2">
-            <h3>$T('userFolders') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('userFolders') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             <p>$T('explain-folderConfig')</p>
         </div><!-- /col2 -->
         <div class="col1">
@@ -35,7 +35,8 @@
                 <div class="field-pair">
                     <label class="config" for="complete_dir">$T('opt-complete_dir')</label>
                     <input type="text" name="complete_dir" id="complete_dir" value="$complete_dir" data-initialdir="$my_home" />
-                    <span class="desc">$T('explain-complete_dir')</span>
+                    <a class="btn btn-default" href="${root}config/sorting/"><span class="glyphicon glyphicon-sort-by-alphabet"></span> $T('cmenu-sorting')</a>
+                    <span class="desc">$T('explain-complete_dir') <br/> $T('explain-complete_dir-sorting')</span>
                 </div>
                 <div class="field-pair advanced-settings">
                     <label class="config" for="complete_free">$T('opt-complete_free')</label>
@@ -57,7 +58,7 @@
                 <div class="field-pair">
                     <label class="config" for="dirscan_dir">$T('opt-dirscan_dir')</label>
                     <input type="text" name="dirscan_dir" id="dirscan_dir" value="$dirscan_dir" data-initialdir="$my_home" />
-                    <span class="desc">$T('explain-dirscan_dir')</span>
+                    <span class="desc">$T('explain-dirscan_dir').replace(".nzb", $file_exts)</span>
                 </div>
                 <div class="field-pair advanced-settings">
                     <label class="config" for="dirscan_speed">$T('opt-dirscan_speed')</label>
@@ -90,7 +91,7 @@
     </div><!-- /section -->
     <div class="section advanced-settings">
         <div class="col2">
-            <h3>$T('systemFolders') <a href="$helpuri$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('systemFolders') <a href="$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             <p>$T('explain-folderConfig')</p>
         </div><!-- /col2 -->
         <div class="col1">
@@ -112,6 +113,7 @@
                 <div class="field-pair">
                     <label class="config" for="log_dir">$T('opt-log_dir')</label>
                     <input type="text" name="log_dir" id="log_dir" value="$log_dir" data-initialdir="$my_lcldata" />
+                    <a class="btn btn-default" id="purge_log_files" href="${root}"><span class="glyphicon glyphicon-trash"></span> $T('purge_log_files')</a>
                     <span class="desc">$T('explain-log_dir')</span>
                 </div>
                 <div class="field-pair">
@@ -131,7 +133,19 @@
 <script type="text/javascript">
     jQuery(document).ready(function() {
         // Add autocomplete and file-browser
-        \$('.col1 input[name$="_dir"]').typeahead().fileBrowser();
+        jQuery('.col1 input[name$="_dir"]').typeahead().fileBrowser();
+
+        jQuery('#purge_log_files').click(function () {
+            if ( confirm("$T('confirm')") ) {
+                $.ajax({
+                    type: "POST",
+                    url: "../../api",
+                    data: {mode: 'config', name: 'purge_log_files', output: 'json', apikey: jQuery('#apikey').val()}
+                })
+            } else {
+                return false;
+            }
+        })
     })
 </script>
 <!--#include $webdir + "/_inc_footer_uc.tmpl"#-->

interfaces/Config/templates/config_general.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="General"#-->
-<!--#set global $help_uri="configuration/3.7/general"#-->
+<!--#set global $help_uri = $confighelpuri + "general"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -14,7 +14,7 @@
         <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>
+                <h3>$T('webServer') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
                 <p><b>$T('restartRequired')</b></p>
             </div><!-- /col2 -->
             <div class="col1">
@@ -102,7 +102,7 @@
         </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>
+                <h3>$T('security') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
                 <p><b>$T('restartRequired')</b></p>
             </div><!-- /col2 -->
             <div class="col1">
@@ -156,7 +156,7 @@
         </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>
+                <h3>$T('cmenu-switches') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
@@ -192,7 +192,7 @@
         </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>
+                <h3>$T('tuning') <a href="$help_uri#toc2" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
@@ -230,7 +230,7 @@
         <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>
+                <h3>$T('backup') <a href="$help_uri#toc3" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
@@ -264,41 +264,41 @@
 </div>
 
 <script type="text/javascript">
-\$(document).ready(function(){
+jQuery(document).ready(function(){
     // Show the message about translating when it's non-English
     function hideOrShowTranslate() {
-        if(\$('#language').val() == 'en') {
-            \$('.alert-translate').hide()
+        if(jQuery('#language').val() === 'en') {
+            jQuery('.alert-translate').hide()
         } else {
-            \$('.alert-translate').show()
+            jQuery('.alert-translate').show()
         }
     }
-    \$('#language').on('change', function() {
+    jQuery('#language').on('change', function() {
         // Show message
         hideOrShowTranslate()
         // Re-load page on submit
-        \$('.fullform').submit(function() {
+        jQuery('.fullform').submit(function() {
             // Skip the fancy stuff, just submit
             this.submit()
         })
-        // No JSON reponse
-        \$('#ajax').val('')
+        // No JSON response
+        jQuery('#ajax').val('')
     })
     hideOrShowTranslate()
 
     // Highlight in case user is not safe
     // So when exposed to internet and no password, no external limit or no username/password
-    var safeCheck = \$('#host, #inet_exposure, #${pid}_wu, #${pid}_wp')
+    var safeCheck = jQuery('#host, #inet_exposure, #${pid}_wu, #${pid}_wp')
     function checkSafety() {
-        if(\$('#host').val() != 'localhost' && \$('#host').val() != '127.0.0.1') {
+        if(jQuery('#host').val() !== 'localhost' && jQuery('#host').val() !== '127.0.0.1') {
             // No limitation on local-network
-            if(\$('#inet_exposure').val() > 3) {
+            if(jQuery('#inet_exposure').val() > 3) {
                 // And no username and password?
-                if(!\$('#${pid}_wu').val() || !\$('#${pid}_wp').val()) {
+                if(!jQuery('#${pid}_wu').val() || !jQuery('#${pid}_wp').val()) {
                     // Add warning icon if not there already
-                    if(!\$('.host-warning').length) {
+                    if(!jQuery('.host-warning').length) {
                         safeCheck.after('<span class="glyphicon glyphicon-alert host-warning"></span>')
-                        \$('.host-warning').tooltip({'title': '$T('checkSafety')'})
+                        jQuery('.host-warning').tooltip({'title': '$T('checkSafety')'})
                         safeCheck.addClass('host-warning-highlight')
                     }
                     return
@@ -306,57 +306,57 @@
             }
         }
         // Remove warnings
-        \$('.host-warning').remove()
+        jQuery('.host-warning').remove()
         safeCheck.removeClass('host-warning-highlight')
     }
     checkSafety()
     safeCheck.on('change', checkSafety)
 
     // Click functions
-    \$('#apikey, #nzbkey').click(function () { \$(this).select() });
+    jQuery('#apikey, #nzbkey').click(function () { jQuery(this).select() });
 
-    \$('#generate_new_apikey').click(function () {
+    jQuery('#generate_new_apikey').click(function () {
       if (confirm("$T('confirm')")) {
         $.ajax({
           type: "POST",
           url: "../../api",
-          data: {mode:'config', name:'set_apikey', apikey: \$('#apikey').val()},
+          data: {mode:'config', name:'set_apikey', apikey: jQuery('#apikey').val()},
           success: function(msg){
-            \$('#apikey').val(msg);
+            jQuery('#apikey').val(msg);
             document.location = document.location;
           }
         });
       }
     });
-    \$('#generate_new_nzbkey').click(function () {
+    jQuery('#generate_new_nzbkey').click(function () {
       if (confirm("$T('confirm')")) {
         $.ajax({
           type: "POST",
           url: "../../api",
-          data: { mode:'config', name:'set_nzbkey', apikey: \$('#apikey').val() },
+          data: { mode:'config', name:'set_nzbkey', apikey: jQuery('#apikey').val() },
           success: function(msg){
-            \$('#nzbkey').val(msg);
+            jQuery('#nzbkey').val(msg);
             document.location = document.location;
           }
         });
       }
     });
 
-    \$('.show_qrcode').click(function (e) {
+    jQuery('.show_qrcode').click(function (e) {
         // Show in modal
-        \$('#modal_qr .modal-dialog').width(330)
-        \$('#modal_qr .modal-body').html('').qrcode({
+        jQuery('#modal_qr .modal-dialog').width(330)
+        jQuery('#modal_qr .modal-body').html('').qrcode({
             "size": 280,
             "color": "#3a3",
-            "text": \$(this).attr('rel')
+            "text": jQuery(this).attr('rel')
         });
-        \$('#modal_qr').modal('show');
+        jQuery('#modal_qr').modal('show');
 
         // No save on this button click
         e.preventDefault();
     });
 
-    \$('.generate_cert').click(function(e) {
+    jQuery('.generate_cert').click(function(e) {
         if(!confirm('$T('explain-new-cert')')) {
             return;
         }
@@ -365,7 +365,7 @@
         $.ajax({
             type: "POST",
             url: "../../api",
-            data: { mode: 'config', name: 'regenerate_certs', apikey: \$('#apikey').val() },
+            data: { mode: 'config', name: 'regenerate_certs', apikey: jQuery('#apikey').val() },
             success: function(msg) {
                 do_restart()
             }
@@ -375,35 +375,35 @@
     })
 
     // Only allow re-generate if default certs
-    if(\$('#https_cert').val() != 'server.cert') {
-        \$('.generate_cert').attr('disabled', 'disabled')
+    if(jQuery('#https_cert').val() !== '$def_https_cert_file') {
+        jQuery('.generate_cert').attr('disabled', 'disabled')
     }
 
     // Parse the text
-    var bandwidthLimit = \$('#bandwidth_max').val()
+    var bandwidthLimit = jQuery('#bandwidth_max').val()
     if(bandwidthLimit) {
         var bandwithLimitNumber = parseFloat(bandwidthLimit)
         var bandwithLimitText = bandwidthLimit.replace(/[^a-zA-Z]+/g, '');
         if(bandwithLimitNumber) {
-            \$('#bandwidth_max_value').val(bandwithLimitNumber)
-            \$('#bandwidth_max_dropdown').val(bandwithLimitText)
+            jQuery('#bandwidth_max_value').val(bandwithLimitNumber)
+            jQuery('#bandwidth_max_dropdown').val(bandwithLimitText)
         }
     }
 
     // Update the value
-    \$('#bandwidth_max_value, #bandwidth_max_dropdown').on('change', function() {
-        if(\$('#bandwidth_max_value').val()) {
-            \$('#bandwidth_max').val(\$('#bandwidth_max_value').val() + \$('#bandwidth_max_dropdown').val())
+    jQuery('#bandwidth_max_value, #bandwidth_max_dropdown').on('change', function() {
+        if(jQuery('#bandwidth_max_value').val()) {
+            jQuery('#bandwidth_max').val(jQuery('#bandwidth_max_value').val() + jQuery('#bandwidth_max_dropdown').val())
         } else {
-            \$('#bandwidth_max').val('')
+            jQuery('#bandwidth_max').val('')
         }
     })
 
-    \$('#create_backup').click(function () {
+    jQuery('#create_backup').click(function () {
         $.ajax({
           type: "POST",
           url: "../../api",
-          data: {mode:'config', name:'create_backup', output:'json', apikey: \$('#apikey').val()},
+          data: {mode:'config', name:'create_backup', output:'json', apikey: jQuery('#apikey').val()},
           success: function(data) {
               if(data.value.result) {
                   alert("$T('backup'):\n" + data.value.message)

interfaces/Config/templates/config_notify.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Email"#-->
-<!--#set global $help_uri="configuration/3.7/notifications"#-->
+<!--#set global $help_uri = $confighelpuri + "notifications"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#def show_notify_checkboxes($section_label)#-->
@@ -17,7 +17,7 @@
     <div class="col2-cats" <!--#if int($getVar($section_label + '_enable')) > 0 then '' else 'style="display:none"'#-->>
         <hr>
         <b>$T('affectedCat')</b><br/>
-        <select name="${section_label}_cats" multiple="multiple" class="multiple_cats">
+        <select name="${section_label}_cats" multiple="multiple" class="multiple_cats" size="$len($categories)">
             <!--#for $ct in $categories#-->
                 <option value="$ct" <!--#if $ct in $getVar($section_label + '_cats') then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
             <!--#end for#-->
@@ -33,10 +33,10 @@
     <input type="hidden" id="ajax" name="ajax" value="1" />
     <div class="section" id="email">
         <div class="col2">
-            <h3>$T('cmenu-email') <a href="$helpuri$help_uri#toc0" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('cmenu-email') <a href="$help_uri#toc0" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             <div class="col2-cats" <!--#if int($email_endjob) > 0 then '' else 'style="display:none"'#-->>
                 <b>$T('affectedCat')</b><br/>
-                <select name="email_cats" multiple="multiple" class="multiple_cats">
+                <select name="email_cats" multiple="multiple" class="multiple_cats" size="$len($categories)">
                     <!--#for $ct in $categories#-->
                         <option value="$ct" <!--#if $ct in $email_cats then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
                     <!--#end for#-->
@@ -153,7 +153,7 @@
     <!--#if $have_ntfosd#-->
     <div class="section">
         <div class="col2">
-            <h3>$T('section-OSD') <a href="$helpuri$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('section-OSD') <a href="$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             <table>
                 <tr>
                     <td><input type="checkbox" name="ntfosd_enable" id="ntfosd_enable" value="1" <!--#if int($ntfosd_enable) > 0 then 'checked="checked"' else ""#--> /></td>
@@ -178,14 +178,14 @@
     <!--#end if#-->
     <div class="section" id="nscript">
         <div class="col2">
-            <h3>$T('section-NScript') <a href="$helpuri$help_uri#nscript" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('section-NScript') <a href="$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>
                     <td><label for="nscript_enable"> $T('opt-nscript_enable')</label></td>
                 </tr>
             </table>
-            <em>$T('explain-nscript_enable')</em><br><a href="$helpuri$help_uri#nscript" target="_blank">$T('readwiki')</a>
+            <em>$T('explain-nscript_enable')</em><br><a href="$help_uri#nscript" target="_blank">$T('readwiki')</a>
             $show_cat_box('nscript')
         </div>
         <div class="col1" <!--#if int($nscript_enable) > 0 then '' else 'style="display:none"'#-->>
@@ -367,24 +367,24 @@
 </div><!-- /colmask -->
 
 <script type="text/javascript">
-\$(document).ready(function(){
+jQuery(document).ready(function(){
     // Expand on enable
-    \$('.col2 input[name$="enable"]').change(function() {
+    jQuery('.col2 input[name$="enable"]').change(function() {
         if(this.checked) {
-            \$(this).parents('.section').find('.col1').show()
-            \$(this).parents('.col2').find('.col2-cats').show()
+            jQuery(this).parents('.section').find('.col1').show()
+            jQuery(this).parents('.col2').find('.col2-cats').show()
         } else {
-            \$(this).parents('.section').find('.col1').hide()
-            \$(this).parents('.col2').find('.col2-cats').hide()
+            jQuery(this).parents('.section').find('.col1').hide()
+            jQuery(this).parents('.col2').find('.col2-cats').hide()
         }
-        \$('form').submit()
+        jQuery('form').submit()
         addRowColor()
     })
-    \$('#email_endjob').change(function() {
-        if(\$(this).val() > 0) {
-            \$(this).parents('.section').find('.col2-cats').show()
+    jQuery('#email_endjob').change(function() {
+        if(jQuery(this).val() > 0) {
+            jQuery(this).parents('.section').find('.col2-cats').show()
         } else {
-            \$(this).parents('.section').find('.col2-cats').hide()
+            jQuery(this).parents('.section').find('.col2-cats').hide()
         }
     })
 
@@ -393,27 +393,27 @@
     **/
     function testNotification(buttonObj) {
         // Confirm?
-        if(\$(buttonObj).attr('rel')) {
-            if(!confirm(\$(buttonObj).attr('rel'))) return false;
+        if(jQuery(buttonObj).attr('rel')) {
+            if(!confirm(jQuery(buttonObj).attr('rel'))) return false;
         }
         // Disable button and get the data
-        \$(buttonObj).attr("disabled", "disabled")
-        \$(buttonObj).find('span').toggleClass('glyphicon-comment glyphicon-refresh spin-glyphicon')
+        jQuery(buttonObj).attr("disabled", "disabled")
+        jQuery(buttonObj).find('span').toggleClass('glyphicon-comment glyphicon-refresh spin-glyphicon')
         var data = { mode: buttonObj.id, apikey: '$apikey', output: 'json' };
-        \$(buttonObj).parents('.section').extractFormDataTo(data);
+        jQuery(buttonObj).parents('.section').extractFormDataTo(data);
 
         // Clear up the box
-        resultBox = \$(buttonObj).parents('.section').find('.result-box .alert');
+        resultBox = jQuery(buttonObj).parents('.section').find('.result-box .alert');
 
         // Get the request
-        \$.ajax({
+        jQuery.ajax({
             type: "GET",
             url: "../../api",
             data: data
         }).then(function(data) {
             // Remove disabled and make the box
-            \$(buttonObj).removeAttr("disabled")
-            \$(buttonObj).find('span').toggleClass('glyphicon-comment glyphicon-refresh spin-glyphicon')
+            jQuery(buttonObj).removeAttr("disabled")
+            jQuery(buttonObj).find('span').toggleClass('glyphicon-comment glyphicon-refresh spin-glyphicon')
             resultBox.removeClass('alert-success alert-danger').show()
             if(data.status) {
                 resultBox.addClass('alert-success')
@@ -426,7 +426,7 @@
             }
         })
     }
-    \$('#test_email, #test_notif, #test_windows, #test_pushbullet, #test_pushover, #test_prowl, #test_osd, #test_nscript').click(function () {
+    jQuery('#test_email, #test_notif, #test_windows, #test_pushbullet, #test_pushover, #test_prowl, #test_osd, #test_nscript').click(function () {
         testNotification(this)
     })
 });

interfaces/Config/templates/config_rss.tmpl

@@ -1,12 +1,12 @@
 <!--#set global $pane="RSS"#-->
-<!--#set global $help_uri="configuration/3.7/rss"#-->
+<!--#set global $help_uri = $confighelpuri + "rss"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <!--#import html#-->
 <div class="colmask">
     <!--#if not $active_feed#-->
     <div class="section">
         <div class="padTable">
-            <a class="main-helplink" href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+            <a class="main-helplink" href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
             <p>$T('explain-RSS')</p>
             <form action="add_rss_feed" method="post" autocomplete="off">
                 <input type="hidden" name="apikey" value="$apikey" />
@@ -105,7 +105,7 @@
     <!--#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>
+            <a class="main-helplink" href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
             <h2 class="nomargin activeRSS">
                 <a href="${root}config/rss/">$T('cmenu-rss')</a> &raquo;
                 $active_feed
@@ -551,43 +551,43 @@ function urlencode(str) {
     return encodeURIComponent(str).replace(/!/g, '%21').replace(/'/g, '%27').replace(/\(/g, '%28').replace(/\)/g, '%29').replace(/\*/g, '%2A').replace(/%20/g, '+');
 }
 
-\$(document).ready(function(){
-    \$('.favicon').each(function(i, theContainer) {
+jQuery(document).ready(function(){
+    jQuery('.favicon').each(function(i, theContainer) {
         // Easy favicon grabber
-        var favUrl = '//' + \$(theContainer).data('domain') + '/favicon.ico'
+        var favUrl = '//' + jQuery(theContainer).data('domain') + '/favicon.ico'
 
         // Does the image exist? Otherwise place a glyphicon
         var testFavImg = new Image();
         testFavImg.src = favUrl;
         testFavImg.onerror = function (evt){
-            \$(theContainer).append('<span class="glyphicon glyphicon-list"></span>')
+            jQuery(theContainer).append('<span class="glyphicon glyphicon-list"></span>')
         }
     })
 
-    \$('.tabs a').click(function (e) {
+    jQuery('.tabs a').click(function (e) {
         e.preventDefault()
-        \$(this).tab('show')
+        jQuery(this).tab('show')
     })
 
-    \$('.editFeed').click(function(){
-        var oldURI = \$(this).prev().val();
-        var whichFeed = \$(this).attr("rel");
+    jQuery('.editFeed').click(function(){
+        var oldURI = jQuery(this).prev().val();
+        var whichFeed = jQuery(this).attr("rel");
 
         // Fill the values
-        \$('#feed_edit_name_label').text(whichFeed)
-        \$('#feed_edit_old_name').val(whichFeed)
-        \$('#feed_edit_new_name').val(whichFeed)
-        \$('#feed_edit_url').val(oldURI)
+        jQuery('#feed_edit_name_label').text(whichFeed)
+        jQuery('#feed_edit_old_name').val(whichFeed)
+        jQuery('#feed_edit_new_name').val(whichFeed)
+        jQuery('#feed_edit_url').val(oldURI)
 
         // Show the modal
-        \$('#rss_edit_modal').modal('show');
+        jQuery('#rss_edit_modal').modal('show');
     });
 
-    \$('.delFeed').click(function(e){
+    jQuery('.delFeed').click(function(e){
         e.preventDefault();
         if ( confirm("$T('confirm')") ) {
-            var whichFeed = \$(this).attr("rel");
-            \$.ajax({
+            var whichFeed = jQuery(this).attr("rel");
+            jQuery.ajax({
                 type: "POST",
                 url: "del_rss_feed",
                 data: {feed: whichFeed, apikey: "$apikey" }
@@ -600,9 +600,9 @@ function urlencode(str) {
         }
     });
 
-    \$('.toggleFeedCheckbox').click(function(){
-        var whichFeed = \$(this).attr("rel");
-        \$.ajax({
+    jQuery('.toggleFeedCheckbox').click(function(){
+        var whichFeed = jQuery(this).attr("rel");
+        jQuery.ajax({
             type: "POST",
             url: "toggle_rss_feed",
             data: {feed: whichFeed, apikey: "$apikey" }
@@ -615,34 +615,34 @@ function urlencode(str) {
     });
 
     // Only the Accept filter needs all the options
-    \$('form[action="upd_rss_filter"]').find('select[name="filter_type"]').change(function() {
-        \$(this).parent().parent().find('select:not([name="filter_type"])').attr('disabled', \$(this).val() != "A" && \$(this).val() != "S")
+    jQuery('form[action="upd_rss_filter"]').find('select[name="filter_type"]').change(function() {
+        jQuery(this).parent().parent().find('select:not([name="filter_type"])').attr('disabled', jQuery(this).val() !== "A" && jQuery(this).val() !== "S")
     })
     // Trigger on-load for all
-    \$('.disabled_options_rule').find('td select:not([name="filter_type"])').attr('disabled', true)
+    jQuery('.disabled_options_rule').find('td select:not([name="filter_type"])').attr('disabled', true)
 
     function setActiveIcon(objButton) {
         // Let's make it look like things are happening!
-        \$(objButton).attr('disabled', true)
-        \$(objButton).find('span').remove()
-        \$(objButton).prepend('<span class="glyphicon glyphicon-transfer"></span>')
+        jQuery(objButton).attr('disabled', true)
+        jQuery(objButton).find('span').remove()
+        jQuery(objButton).prepend('<span class="glyphicon glyphicon-transfer"></span>')
     }
 
     // Enable sorting and set default
-    if (\$('#rss-tab-matched table').length) {
-        \$('#rss-tab-matched table').tablesort().data('tablesort').sort(\$('#rss-tab-matched th.default-sort'), 'desc');
+    if (jQuery('#rss-tab-matched table').length) {
+        jQuery('#rss-tab-matched table').tablesort().data('tablesort').sort(jQuery('#rss-tab-matched th.default-sort'), 'desc');
     }
-    if (\$('#rss-tab-not-matched table').length) {
-        \$('#rss-tab-not-matched table').tablesort().data('tablesort').sort(\$('#rss-tab-not-matched th.default-sort'), 'desc');
+    if (jQuery('#rss-tab-not-matched table').length) {
+        jQuery('#rss-tab-not-matched table').tablesort().data('tablesort').sort(jQuery('#rss-tab-not-matched th.default-sort'), 'desc');
     }
-    if (\$('#rss-tab-done table').length) {
-        \$('#rss-tab-done table').tablesort().data('tablesort').sort(\$('#rss-tab-done th.default-sort'), 'desc');
+    if (jQuery('#rss-tab-done table').length) {
+        jQuery('#rss-tab-done table').tablesort().data('tablesort').sort(jQuery('#rss-tab-done th.default-sort'), 'desc');
     }
 
-    \$('.testFeed').click(function(){
+    jQuery('.testFeed').click(function(){
         setActiveIcon(this)
-        var whichFeed = \$(this).attr("rel");
-        \$.ajax({
+        var whichFeed = jQuery(this).attr("rel");
+        jQuery.ajax({
             type: "POST",
             url: "test_rss_feed",
             data: {feed: whichFeed, apikey: "$apikey" }
@@ -654,34 +654,34 @@ function urlencode(str) {
         });
     });
 
-    \$('.cleanFeed').click(function(){
+    jQuery('.cleanFeed').click(function(){
         setActiveIcon(this)
-        var theForm = \$(this).closest("form");
+        var theForm = jQuery(this).closest("form");
         theForm.attr("action", "clean_rss_jobs").submit();
     });
 
-    \$('.evalFeed').click(function(){
+    jQuery('.evalFeed').click(function(){
         setActiveIcon(this)
-        var theForm = \$(this).closest("form");
+        var theForm = jQuery(this).closest("form");
         theForm.attr("action", "eval_rss_feed").submit();
     });
 
-    \$('.delFilter').click(function(){
-        var theForm = \$(this).closest("form");
+    jQuery('.delFilter').click(function(){
+        var theForm = jQuery(this).closest("form");
         theForm.attr("action", "del_rss_filter").submit();
     });
 
-    \$('form[action="download"]').ajaxForm({
+    jQuery('form[action="download"]').ajaxForm({
         datatype: 'json',
         beforeSubmit: function (_, form) {
-            \$(form).find('button').attr("disabled", "disabled")
+            jQuery(form).find('button').attr("disabled", "disabled")
             // Remove icon and add new one
-            \$(form).find('button span').remove()
-            \$(form).find('button').prepend('<span class="glyphicon glyphicon-transfer"></span>')
+            jQuery(form).find('button span').remove()
+            jQuery(form).find('button').prepend('<span class="glyphicon glyphicon-transfer"></span>')
         },
         success: function (_, _, _, form) {
             // Set success
-            \$(form).find('button').html('<span class="glyphicon glyphicon-ok"></span> $T('rss-added')')
+            jQuery(form).find('button').html('<span class="glyphicon glyphicon-ok"></span> $T('rss-added')')
         }
     });
 

interfaces/Config/templates/config_scheduling.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Scheduling"#-->
-<!--#set global $help_uri="configuration/3.7/scheduling"#-->
+<!--#set global $help_uri = $confighelpuri + "scheduling"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <%
@@ -15,7 +15,7 @@ else:
 <div class="colmask">
     <div class="section">
         <div class="col2">
-            <h3>$T('addSchedule') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('addSchedule') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
         </div><!-- /col2 -->
         <form action="addSchedule" method="post" autocomplete="off">
         <input type="hidden" id="apikey" name="apikey" value="$apikey" />
@@ -112,32 +112,32 @@ else:
     </div><!-- /section -->
 </div><!-- /colmask -->
 <script type="text/javascript">
-    \$('#action').on('change', function() {
+    jQuery('#action').on('change', function() {
         // Set the action
-        \$('#arguments').val((\$(this).find('option:selected').data('action')))
+        jQuery('#arguments').val((jQuery(this).find('option:selected').data('action')))
 
         // Is it speedlimit?
-        if(\$(this).find('option:selected').val() == 'speedlimit') {
-            \$('#hidden_arguments').show()
-            \$('#hidden_arguments input').attr('placeholder', 'Bytes/s, "1M" = 1 MB/s, "500K" = 500 KB/s')
+        if(jQuery(this).find('option:selected').val() === 'speedlimit') {
+            jQuery('#hidden_arguments').show()
+            jQuery('#hidden_arguments input').attr('placeholder', 'Bytes/s, "1M" = 1 MB/s, "500K" = 500 KB/s')
         } else {
-            \$('#hidden_arguments').hide()
-            \$('#hidden_arguments input').attr('placeholder', '')
+            jQuery('#hidden_arguments').hide()
+            jQuery('#hidden_arguments input').attr('placeholder', '')
         }
 
         /* Arguments - since we only have speedlimit with arguments, disabled for now
-        if(\$(this).find('option:selected').data('noarg')) {
-            \$('#hidden_arguments').hide()
+        if(jQuery(this).find('option:selected').data('noarg')) {
+            jQuery('#hidden_arguments').hide()
         } else {
-            \$('#hidden_arguments').show()
+            jQuery('#hidden_arguments').show()
         }*/
     })
 
-    \$('[name="schedenabled"]').click(function() {
-        \$.ajax({
+    jQuery('[name="schedenabled"]').click(function() {
+        jQuery.ajax({
             type: "POST",
             url: "toggleSchedule",
-            data: {line: \$(this).val(), apikey: "$apikey" }
+            data: {line: jQuery(this).val(), apikey: "$apikey" }
         }).done(function() {
             // Let us leave!
             formWasSubmitted = true;

interfaces/Config/templates/config_server.tmpl

@@ -1,17 +1,25 @@
 <!--#set global $pane="Servers"#-->
-<!--#set global $help_uri="configuration/3.7/servers"#-->
+<!--#set global $help_uri = $confighelpuri + "servers"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#import json#-->
 <!--#import datetime#-->
 
-<script type="text/javascript" xmlns="http://www.w3.org/1999/html">
+<script type="text/javascript">
     // Define variable needed for the server-statistics
     var serverBandwithData = {}
     var serverArticleTries = {}
     var serverArticleFailed = {}
+
+    // Keep track of all used hostnames
+    var hostnames = ""
 </script>
 
+<div class="server-frame">
+    <a href="#">&times;</a>
+    <iframe></iframe>
+</div>
+
 <div class="colmask">
     <div class="padding alt section">
         <button type="button" class="btn btn-default" id="addServerButton"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
@@ -29,7 +37,7 @@
     </div>
     <div class="section" id="addServerContent" style="display: none;">
         <div class="col2">
-            <h3>$T('addServer') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+            <h3>$T('addServer') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
         </div>
         <div class="col1">
             <form action="addServer" method="post" autocomplete="off" onsubmit="removeObfuscation();">
@@ -51,25 +59,25 @@
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="port">$T('srv-port')</label>
-                        <input type="number" name="port" id="port" size="8" value="119" min="0" />
+                        <input type="number" name="port" id="port" size="8" value="563" min="0" />
                     </div>
                     <div class="field-pair">
                         <label class="config" for="ssl">$T('srv-ssl')</label>
-                        <input type="checkbox" name="ssl" id="ssl" value="1" />
+                        <input type="checkbox" name="ssl" id="ssl" value="1" checked />
                         <span class="desc">$T('explain-ssl')</span>
                     </div>
                     <!-- Tricks to avoid browser auto-fill, fixed on-submit with javascript -->
                     <div class="field-pair">
-                        <label class="config" for="${pid}_00">$T('srv-username')</label>
-                        <input type="text" name="${pid}_00" id="${pid}_00" data-hide="username" />
+                        <label class="config" for="${pid}_000">$T('srv-username')</label>
+                        <input type="text" name="${pid}_000" id="${pid}_000" data-hide="username" />
                     </div>
                     <div class="field-pair">
-                        <label class="config" for="${pid}_01">$T('srv-password')</label>
-                        <input type="text" name="${pid}_01" id="${pid}_01" data-hide="password" />
+                        <label class="config" for="${pid}_001">$T('srv-password')</label>
+                        <input type="text" name="${pid}_001" id="${pid}_001" data-hide="password" />
                     </div>
                     <div class="field-pair">
                         <label class="config" for="connections">$T('srv-connections')</label>
-                        <input type="number" name="connections" id="connections" min="1" max="1000" value="8" required />
+                        <input type="number" name="connections" id="connections" min="1" max="500" value="8" required />
                     </div>
                     <div class="field-pair">
                         <label class="config" for="priority">$T('srv-priority')</label>
@@ -96,7 +104,7 @@
                         <label class="config" for="ssl_ciphers">$T('opt-ssl_ciphers')</label>
                         <input type="text" name="ssl_ciphers" id="ssl_ciphers" />
                         <span class="desc">$T('explain-ssl_ciphers') <br>$T('readwiki')
-                        <a href="${helpuri}advanced/ssl-ciphers" target="_blank">${helpuri}advanced/ssl-ciphers</a></span>
+                        <a href="https://sabnzbd.org/wiki/advanced/ssl-ciphers" target="_blank">https://sabnzbd.org/wiki/advanced/ssl-ciphers</a></span>
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="send_group">$T('srv-send_group')</label>
@@ -147,11 +155,11 @@
             <input type="hidden" name="apikey" value="$apikey" />
             <input type="hidden" name="output" value="json" />
             <input type="hidden" name="server" value="$server['name']" />
-            <input type="hidden" id="ajax" name="ajax" value=1 />
+            <input type="hidden" name="ajax" value=1 />
 
             <div class="section <!--#if int($server['enable']) == 0 then 'server-disabled' else ""#-->">
                 <div class="col2 <!--#if int($server['enable']) == 0 then 'server-disabled' else ""#-->">
-                    <h3 title="$server['displayname']">$server['displayname'] <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                    <h3 title="$server['displayname']">$server['displayname'] <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
                     <!--#if int($server['enable']) != 0 #-->
                         <!--#if $last_prio != $server['priority'] and $cur_prio_color+1 < len($prio_colors) #-->
                             <!--#set $cur_prio_color = $cur_prio_color+1 #-->
@@ -200,7 +208,7 @@
                         </div>
                         <div class="field-pair">
                             <label class="config" for="connections$cur">$T('srv-connections')</label>
-                            <input type="number" name="connections" id="connections$cur" value="$server['connections']" min="1" max="1000" required />
+                            <input type="number" name="connections" id="connections$cur" value="$server['connections']" min="1" max="500" required />
                         </div>
                         <div class="field-pair">
                             <label class="config" for="priority$cur">$T('srv-priority')</label>
@@ -225,10 +233,10 @@
                             <span class="desc">$T('explain-ssl_verify').replace('. ', '.<br/>')</span>
                         </div>
                         <div class="field-pair advanced-settings">
-                            <label class="config" for="ssl_ciphers">$T('opt-ssl_ciphers')</label>
-                            <input type="text" name="ssl_ciphers" id="ssl_ciphers" value="$server['ssl_ciphers']" />
+                            <label class="config" for="ssl_ciphers$cur">$T('opt-ssl_ciphers')</label>
+                            <input type="text" name="ssl_ciphers" id="ssl_ciphers$cur" value="$server['ssl_ciphers']" />
                             <span class="desc">$T('explain-ssl_ciphers') <br>$T('readwiki')
-                            <a href="${helpuri}advanced/ssl-ciphers" target="_blank">${helpuri}advanced/ssl-ciphers</a></span>
+                            <a href="https://sabnzbd.org/wiki/advanced/ssl-ciphers" target="_blank">https://sabnzbd.org/wiki/advanced/ssl-ciphers</a></span>
                         </div>
                         <div class="field-pair advanced-settings">
                             <label class="config" for="required$cur">$T('srv-required')</label>
@@ -301,6 +309,9 @@
                             serverBandwithData[${cur}] = <!--#echo json.dumps($server['amounts'][4])#-->
                             serverArticleTries[${cur}] = <!--#echo json.dumps($server['amounts'][5])#-->
                             serverArticleFailed[${cur}] = <!--#echo json.dumps($server['amounts'][6])#-->
+                            <!--#if int($server['enable']) != 0#-->
+                            hostnames += ",$server['host']"
+                            <!--#end if#-->
                         </script>
                     <!--#end if#-->
                 </div>
@@ -338,8 +349,8 @@
 
     function showCharts() {
         // Get the constants
-        const startDate = new Date(\$('#chart-start').val())
-        const endDate = new Date(\$('#chart-end').val())
+        const startDate = new Date(jQuery('#chart-start').val())
+        const endDate = new Date(jQuery('#chart-end').val())
         const oneDay = 24 * 60 * 60 * 1000
         const nrDays = Math.round((endDate-startDate)/oneDay)
 
@@ -350,8 +361,8 @@
         var maxBandwith = 0
 
         // For each chart
-        \$('.server-chart').each(function(j, elemn) {
-            const server_id = \$(elemn).data('serverid')
+        jQuery('.server-chart').each(function(j, elemn) {
+            const server_id = jQuery(elemn).data('serverid')
             var totalBandwithThisRange = 0
             var totalArticlesTriedThisRange = 0
             var totalArticlesFailedThisRange = 0
@@ -394,7 +405,7 @@
             }
 
             // Update the text value
-            \$('#server-bandwith-value-' + server_id).text(filesize(totalBandwithThisRange, {round: 1}))
+            jQuery('#server-bandwith-value-' + server_id).text(filesize(totalBandwithThisRange, {round: 1}))
 
             // Calculate article success ratio, if available
             var articleRatio = Math.round(100 * (1 - totalArticlesFailedThisRange/totalArticlesTriedThisRange))
@@ -402,17 +413,17 @@
             // If values were missing
             if(!isNaN(articleRatio)) {
                 // Use filesize to convert to unit-display
-                \$('#server-article-value-' + server_id).text('$T("srv-articles-tried")'.replace('%f', articleRatio).replace('%d', filesize(totalArticlesTriedThisRange, {unix: true, round: 0, spacer: "", base: 1})))
+                jQuery('#server-article-value-' + server_id).text('$T("srv-articles-tried")'.replace('%f', articleRatio).replace('%d', filesize(totalArticlesTriedThisRange, {unix: true, round: 0, spacer: "", base: 1})))
                 // If we have a low value, we link them to the website
-                if(articleRatio > 60) \$('#server-article-not-complete-' + server_id).hide()
+                if(articleRatio > 60) jQuery('#server-article-not-complete-' + server_id).hide()
             } else {
-                \$('#server-article-value-' + server_id).text('$T("notAvailable")')
-                \$('#server-article-not-complete-' + server_id).hide()
+                jQuery('#server-article-value-' + server_id).text('$T("notAvailable")')
+                jQuery('#server-article-not-complete-' + server_id).hide()
             }
 
             // Save bandwidth data in a very ugly way, but we need to do this
             // so we can calculate the maximum Y-axis for all graphs
-            \$(elemn).data("chart-data", data)
+            jQuery(elemn).data("chart-data", data)
         })
 
         // Set the maximum
@@ -420,11 +431,11 @@
         chartOptions.axisY.low = 0
 
         // Update all the axis with the largest value and draw the graph
-        \$('.server-chart').each(function(j, elemn) {
-            const server_id = \$(elemn).data('serverid')
+        jQuery('.server-chart').each(function(j, elemn) {
+            const server_id = jQuery(elemn).data('serverid')
 
             // Show the chart
-            chart = new Chartist.Line('#server-chart-'+server_id, \$(elemn).data("chart-data"), chartOptions)
+            chart = new Chartist.Line('#server-chart-'+server_id, jQuery(elemn).data("chart-data"), chartOptions)
             chart.on('created', function(context) {
                 // Make sure to add this as the first child so it's at the bottom
                 context.svg.elem('rect', {
@@ -436,15 +447,15 @@
                     stroke: '#b9b9b9',
                     'stroke-width': '1px'
                 }, '', context.svg, true)
-                \$('#server-chart-'+server_id+' .ct-label.ct-vertical').each(function(index, elmn) {
+                jQuery('#server-chart-'+server_id+' .ct-label.ct-vertical').each(function(index, elmn) {
                     elmn.innerHTML = filesize(elmn.innerHTML, {round: 1}).replace(' ','')
                 })
             });
         })
 
         // Limit input to sensible values
-        \$('#chart-start').attr("max", \$('#chart-end').val())
-        \$('#chart-end').attr("min", \$('#chart-start').val())
+        jQuery('#chart-start').attr("max", jQuery('#chart-end').val())
+        jQuery('#chart-end').attr("min", jQuery('#chart-start').val())
     }
 
     // Need to mitigate timezone effects!
@@ -457,12 +468,12 @@
     /**
         When finished loading
     **/
-    \$(document).ready(function(){
+    jQuery(document).ready(function(){
         // Exception when change of priority, reload
-        \$('input[name="priority"], input[name="displayname"]').on('change', function() {
-            \$('.fullform').submit(function() {
+        jQuery('input[name="priority"], input[name="displayname"]').on('change', function() {
+            jQuery('.fullform').submit(function() {
                 // No ajax this time
-                \$('input[name="ajax"]').val('')
+                jQuery('input[name="ajax"]').val('')
                 // Skip the fancy stuff, just submit
                 this.submit()
             })
@@ -471,7 +482,7 @@
         /**
             Update charts when changed
         **/
-        \$('#chart-start, #chart-end').on('change', function(elemn) {
+        jQuery('#chart-start, #chart-end').on('change', function(elemn) {
             showCharts()
 
             // Lets us leave (needs to be called after the change event)
@@ -486,16 +497,16 @@
         /**
             Click events
         **/
-        \$('.showserver').click(function () {
-            if(\$(this).parent().hasClass('server-disabled')) {
-                \$(this).parent().parent().toggleClass('server-disabled')
+        jQuery('.showserver').click(function () {
+            if(jQuery(this).parent().hasClass('server-disabled')) {
+                jQuery(this).parent().parent().toggleClass('server-disabled')
             }
-            \$(this).parent().next().toggle();
-            \$(this).parent().next().next().toggle();
-            if (\$(this).text().indexOf("$T('showDetails')") > 0) {
-                \$(this).html(\$(this).html().replace("$T('showDetails')", "$T('hideDetails')"));
+            jQuery(this).parent().next().toggle();
+            jQuery(this).parent().next().next().toggle();
+            if (jQuery(this).text().indexOf("$T('showDetails')") > 0) {
+                jQuery(this).html(jQuery(this).html().replace("$T('showDetails')", "$T('hideDetails')"));
             } else {
-                \$(this).html(\$(this).html().replace("$T('hideDetails')", "$T('showDetails')"));
+                jQuery(this).html(jQuery(this).html().replace("$T('hideDetails')", "$T('showDetails')"));
                 // Recalculate the charts if changed while details were open
                 showCharts()
             }
@@ -503,24 +514,24 @@
             addRowColor()
         });
 
-        \$('#addServerButton').click(function(){
-            \$('#addServerContent').show();
+        jQuery('#addServerButton').click(function(){
+            jQuery('#addServerContent').show();
             // Add coloring
             addRowColor()
         });
 
-        \$('[name="ssl"]').click(function() {
+        jQuery('[name="ssl"]').click(function() {
             // Use CSS transitions to do some highlighting
-            var portBox = \$(this).parent().parent().find('[name="port"]')
+            var portBox = jQuery(this).parent().parent().find('[name="port"]')
             if(this.checked) {
                 // Enabled SSL change port when not already a custom port
-                if(portBox.val() == '119') {
+                if(portBox.val() === '119') {
                     portBox.val('563')
                     portBox.addClass('port-highlight')
                 }
             } else {
                 // Remove SSL port
-                if(portBox.val() == '563') {
+                if(portBox.val() === '563') {
                     portBox.val('119')
                     portBox.addClass('port-highlight')
                 }
@@ -529,16 +540,16 @@
         })
 
         // Testing servers
-        \$('.testServer').click(function(event){
+        jQuery('.testServer').click(function(event){
             removeObfuscation()
-            var theButton = \$(this)
+            var theButton = jQuery(this)
             var resultBox = theButton.parents('.col1').find('.result-box .alert');
             theButton.attr("disabled", "disabled")
             theButton.find('span').toggleClass('glyphicon-sort glyphicon-refresh spin-glyphicon')
-            \$.ajax({
+            jQuery.ajax({
                 type: "POST",
                 url: "../../api",
-                data: "mode=config&name=test_server&" + \$(this).parents('form:first').serialize()
+                data: "mode=config&name=test_server&" + jQuery(this).parents('form:first').serialize()
             }).then(function(data) {
                 // Let's replace the link
                 msg = data.value.message.replace('https://sabnzbd.org/certificate-errors', '<a href="https://sabnzbd.org/certificate-errors" class="alert-link" target="_blank">https://sabnzbd.org/certificate-errors</a>')
@@ -549,7 +560,7 @@
                 theButton.removeAttr("disabled")
                 theButton.find('span').toggleClass('glyphicon-sort glyphicon-refresh spin-glyphicon')
 
-                // Succes or not?
+                // Success or not?
                 if(data.value.result) {
                     resultBox.addClass('alert-success')
                     resultBox.prepend('<span class="glyphicon glyphicon-ok-sign"></span> ')
@@ -560,9 +571,9 @@
             });
         });
 
-        \$('.delServer').click(function(){
+        jQuery('.delServer').click(function(){
             if( confirm("$T('confirm')") ) {
-                \$(this).parents('form:first').attr('action','delServer').submit();
+                jQuery(this).parents('form:first').attr('action','delServer').submit();
                 // Let us leave!
                 formWasSubmitted = true;
                 formHasChanged = false;
@@ -571,9 +582,9 @@
             return false;
         });
 
-        \$('.clrServer').click(function(){
+        jQuery('.clrServer').click(function(){
             if( confirm("$T('confirm')") ) {
-                \$(this).parents('form:first').attr('action','clrServer').submit();
+                jQuery(this).parents('form:first').attr('action','clrServer').submit();
                 // Let us leave!
                 formWasSubmitted = true;
                 formHasChanged = false;
@@ -582,9 +593,9 @@
             return false;
         });
 
-        \$('.toggleServerCheckbox').click(function(){
-            var whichServer = \$(this).attr("name");
-            \$.ajax({
+        jQuery('.toggleServerCheckbox').click(function(){
+            var whichServer = jQuery(this).attr("name");
+            jQuery.ajax({
                 type: "POST",
                 url: "toggleServer",
                 data: {server: whichServer, apikey: "$apikey" }
@@ -595,6 +606,35 @@
                 setTimeout(function() { location.reload(); }, 100)
             });
         });
+
+        // Show text-ad if there is space
+        if((jQuery("body").width() - jQuery("#content").width())/2 > (jQuery('.Servers .server-frame').width() + 40)) {
+            // Do not show if dismissed previously
+            if(localStorage.getItem("server-frame-hide-$version") === null) {
+                // Let the page on the server tell us if we need to show
+                function receiveMessage(event) {
+                    // Check origin of message for security reasons
+                    if(event.origin === 'https://sabnzbd.org') {
+                        if(event.data === 'show_server') {
+                            jQuery('.Servers .server-frame').show()
+                            jQuery('.Servers .server-frame a').click(function () {
+                                localStorage.setItem("server-frame-hide-$version", "hide")
+                                jQuery('.Servers .server-frame').hide()
+                            })
+                        }
+                        if(event.data === 'hide_server') {
+                            // Hide and don't load anymore untill the next release
+                            jQuery('.Servers .server-frame').hide()
+                            localStorage.setItem("server-frame-hide-$version", "hide")
+                        }
+                    }
+                }
+                window.addEventListener("message", receiveMessage, false);
+
+                // NOTE: The hash-part cannot be seen by the server, so we don't know which hostnames you use!
+                jQuery('.Servers .server-frame iframe').attr("src", "https://sabnzbd.org/servers#$active_lang" + hostnames)
+            }
+        }
     });
 </script>
 

interfaces/Config/templates/config_special.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Special"#-->
-<!--#set global $help_uri="configuration/3.7/special"#-->
+<!--#set global $help_uri = $confighelpuri + "special"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -10,7 +10,7 @@
         </div>
         <div class="section">
             <div class="col2">
-                <h3>$T('sptag-boolean') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('sptag-boolean') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
@@ -33,7 +33,7 @@
         </div><!-- /section -->
         <div class="section">
             <div class="col2">
-                <h3>$T('sptag-entries') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('sptag-entries') <a href="$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>

interfaces/Config/templates/config_switches.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Switches"#-->
-<!--#set global $help_uri="configuration/3.7/switches"#-->
+<!--#set global $help_uri = $confighelpuri + "switches"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -14,19 +14,10 @@
         <input type="hidden" name="output" value="json" />
         <div class="section advanced-settings">
             <div class="col2">
-                <h3>$T('swtag-server') <a href="$helpuri$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-server') <a href="$help_uri#toc1" 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="load_balancing">$T('opt-load_balancing')</label>
-                        <select name="load_balancing" id="load_balancing">
-                            <option value="0" <!--#if $load_balancing == 0 then 'selected="selected"' else ""#--> >$T('no-load-balancing')</option>
-                            <option value="1" <!--#if $load_balancing == 1 then 'selected="selected"' else ""#--> >$T('load-balancing')</option>
-                            <option value="2" <!--#if $load_balancing == 2 then 'selected="selected"' else ""#--> >$T('load-balancing-happy-eyeballs')</option>
-                        </select>
-                        <span class="desc">$T('explain-load_balancing')</span>
-                    </div>
                     <div class="field-pair">
                         <label class="config" for="max_art_tries">$T('opt-max_art_tries')</label>
                         <input type="number" name="max_art_tries" id="max_art_tries" value="$max_art_tries" min="2" max="2000" />
@@ -46,11 +37,11 @@
         </div><!-- /section -->
         <div class="section">
             <div class="col2">
-                <h3>$T('swtag-queue') <a href="$helpuri$help_uri#toc2" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-queue') <a href="$help_uri#toc2" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
-                    <div class="field-pair">
+                    <div class="field-pair advanced-settings">
                         <label class="config" for="pre_script">$T('opt-pre_script')</label>
                         <select name="pre_script" id="pre_script">
                         <!--#for $sc in $scripts#-->
@@ -63,6 +54,19 @@
                         </select>
                         <span class="desc">$T('explain-pre_script')</span>
                     </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="end_queue_script">$T('opt-end_queue_script')</label>
+                        <select name="end_queue_script" id="end_queue_script">
+                        <!--#for $sc in $scripts#-->
+                            <!--#if $sc.lower() == $end_queue_script.lower()#-->
+                                <option value="$sc" selected="selected">$Tspec($sc)</option>
+                            <!--#else#-->
+                                <option value="$sc">$Tspec($sc)</option>
+                            <!--#end if#-->
+                        <!--#end for#-->
+                        </select>
+                        <span class="desc">$T('explain-end_queue_script')</span>
+                    </div>
                     <div class="field-pair">
                         <label class="config" for="propagation_delay">$T('opt-propagation_delay')</label>
                         <input type="number" name="propagation_delay" id="propagation_delay" value="$propagation_delay" /> <i>$T('minutes')</i>
@@ -165,7 +169,7 @@
         </div><!-- /section -->
         <div class="section">
             <div class="col2">
-                <h3>$T('swtag-pp') <a href="$helpuri$help_uri#toc3" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-pp') <a href="$help_uri#toc3" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
@@ -233,11 +237,6 @@
                         <input type="checkbox" name="script_can_fail" id="script_can_fail" value="1" <!--#if int($script_can_fail) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-script_can_fail')</span>
                     </div>
-                    <div class="field-pair advanced-settings">
-                        <label class="config" for="new_nzb_on_failure">$T('opt-new_nzb_on_failure')</label>
-                        <input type="checkbox" name="new_nzb_on_failure" id="new_nzb_on_failure" value="1" <!--#if int($new_nzb_on_failure) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-new_nzb_on_failure')</span>
-                    </div>
                     <div class="field-pair">
                         <label class="config" for="ignore_samples">$T('opt-ignore_samples')</label>
                         <input type="checkbox" name="ignore_samples" id="ignore_samples" value="1" <!--#if int($ignore_samples) > 0 then 'checked="checked"' else ""#--> />
@@ -274,7 +273,7 @@
         </div><!-- /section -->
         <div class="section advanced-settings">
             <div class="col2">
-                <h3>$T('swtag-naming') <a href="$helpuri$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-naming') <a href="$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
@@ -314,7 +313,7 @@
         </div><!-- /section -->
         <div class="section">
             <div class="col2">
-                <h3>$T('swtag-quota') <a href="$helpuri$help_uri#toc5" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+                <h3>$T('swtag-quota') <a href="$help_uri#toc5" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
             <div class="col1">
                 <fieldset>
@@ -353,14 +352,14 @@
 </div><!-- /colmask -->
 
 <script type="text/javascript">
-\$(document).ready(function() {
-    \$('#history_retention_select, #history_retention_number').on('change', updateHistoryRetention)
+jQuery(document).ready(function() {
+    jQuery('#history_retention_select, #history_retention_number').on('change', updateHistoryRetention)
     function updateHistoryRetention() {
-        var retention_setting = \$('#history_retention')
-        var retention_select = \$('#history_retention_select').val()
-        var retention_number = \$('#history_retention_number')
+        var retention_setting = jQuery('#history_retention')
+        var retention_select = jQuery('#history_retention_select').val()
+        var retention_number = jQuery('#history_retention_number')
         // Keep all or keep none
-        if(retention_select == "0" || retention_select == "-1") {
+        if(retention_select === "0" || retention_select === "-1") {
             retention_number.hide()
             retention_number.val('')
             retention_number.attr('placeholder', '')
@@ -386,24 +385,24 @@
         }
     }
     // Set the history-retention settig
-    var retention_setting_value = \$('#history_retention').val()
+    var retention_setting_value = jQuery('#history_retention').val()
     if(parseInt(retention_setting_value) > 0) {
         // Days or number?
         if(retention_setting_value.indexOf("d") !== -1) {
-            \$('#history_retention_select').val("d")
+            jQuery('#history_retention_select').val("d")
         } else {
-            \$('#history_retention_select').val("n")
+            jQuery('#history_retention_select').val("n")
         }
-        \$('#history_retention_number').val(parseInt(retention_setting_value))
+        jQuery('#history_retention_number').val(parseInt(retention_setting_value))
     } else {
         // Keep all or keep none
-        \$('#history_retention_select').val(retention_setting_value)
-        \$('#history_retention_number').hide()
+        jQuery('#history_retention_select').val(retention_setting_value)
+        jQuery('#history_retention_number').hide()
     }
 
-    \$('.restoreDefaults').click(function(e) {
+    jQuery('.restoreDefaults').click(function(e) {
         // Get section name
-        var sectionName = \$(this).parents('.section').find('.col2 h3').text().trim()
+        var sectionName = jQuery(this).parents('.section').find('.col2 h3').text().trim()
 
         // Confirm?
         if(!confirm("$T('explain-restoreDefaults') \""+sectionName+"\"\n$T('confirm')")) return false
@@ -411,11 +410,11 @@
 
         // Need to get all the input values, so same way as saving normally
         var key_container = {}
-        \$(this).parents('.section').extractFormDataTo(key_container);
+        jQuery(this).parents('.section').extractFormDataTo(key_container);
         key_container = Object.keys(key_container)
 
         // Send request
-        \$.ajax({
+        jQuery.ajax({
             type: "GET",
             url: "../../api",
             data: "mode=set_config_default&apikey=${apikey}&output=json&keyword=" + key_container.join('&keyword=')

interfaces/Config/templates/login/main.tmpl

@@ -15,6 +15,9 @@
 
     <link rel="stylesheet" type="text/css" href="../staticcfg/bootstrap/css/bootstrap.min.css?v=$version" />
     <link rel="stylesheet" type="text/css" href="../staticcfg/css/login.css?v=$version" />
+    <!--#if $color_scheme not in ('Light', '') #-->
+    <link rel="stylesheet" type="text/css" href="../staticcfg/css/${color_scheme}.css?v=$version"/>
+    <!--#end if#-->
 
     <script type="text/javascript" src="../staticcfg/js/jquery-3.5.1.min.js?v=$version"></script>
     <script type="text/javascript" src="../staticcfg/bootstrap/js/bootstrap.min.js?v=$version"></script>
@@ -47,14 +50,14 @@
         </div>
         <script type="text/javascript">
             // Tooltip
-            \$('[data-toggle="tooltip"]').tooltip()
+            jQuery('[data-toggle="tooltip"]').tooltip()
             // Try-catch in case somebody disabled localstorage
             try {
                 // Set what was done previously
-                \$('input[type="checkbox"]').prop('checked', localStorage.getItem("remember_me") === 'true')
+                jQuery('input[type="checkbox"]').prop('checked', localStorage.getItem("remember_me") === 'true')
                 // Store if we change something
-                \$('input[type="checkbox"]').on('change', function() {
-                    localStorage.setItem("remember_me", \$(this).is(':checked'));
+                jQuery('input[type="checkbox"]').on('change', function() {
+                    localStorage.setItem("remember_me", jQuery(this).is(':checked'));
                 })
             } catch(err) { }
         </script>

interfaces/Config/templates/staticcfg/css/Auto.css

@@ -0,0 +1 @@
+@import url('Night.css') screen and (prefers-color-scheme: dark);

interfaces/Config/templates/staticcfg/css/Night.css

@@ -0,0 +1,319 @@
+body {
+    background-color: black;
+    color: #EBEBEB !important;
+}
+
+a:not(.btn) {
+    color: #63a7e1;
+}
+
+.btn {
+    box-shadow: 1px 1px 1px rgba(255, 255, 255, .1) !important;
+}
+
+.btn:not(.btn-danger),
+.btn-default,
+input,
+select,
+textarea,
+.advanced-button,
+.list-group-item  {
+    border-color: #252525 !important;
+}
+
+#addFeed,
+#addFeedContent,
+.section {
+    border-bottom: 1px solid #555555;
+}
+
+.col2 p,
+.col2-cats {
+    color: #AAA;
+}
+
+.col2 h3 {
+    background: none repeat scroll 0 0 #555555;
+}
+
+.catTable,
+.dropdown-menu,
+.dropdown-menu .divider,
+.even,
+.Key tr:nth-child(odd),
+.language:hover,
+.navbar-default .navbar-nav>.open>a,
+.navbar-default .navbar-nav>.open>a:focus,
+.navbar-default .navbar-nav>.open>a:hover,
+.navbar-default .navbar-nav>li>a.active,
+.navbar-default .navbar-nav>li>a:hover,
+.navbar-logo:hover,
+.quoteBlock,
+.selected,
+.server-disabled,
+#serverResponse,
+.table>tbody>tr:nth-child(odd),
+.table-striped>tbody>tr:nth-child(odd),
+ul.tabs li.active a,
+select[disabled],
+select:hover {
+    background-color: #444444 !important;
+    color: #EBEBEB !important;
+}
+
+.correct {
+    border: 2px solid #00cc22 !important;
+}
+
+.failed,
+.required-star,
+.error-text {
+    color: #ff3333 !important;
+}
+
+.unselected,
+.selected {
+    border: 1px solid #EBEBEB !important;
+    color: #EBEBEB !important;
+}
+
+.incorrect {
+    border: 2px solid #ff3333 !important;
+}
+
+.disabled-text {
+    color: #777 !important;
+}
+
+#rightGreyText,
+small {
+    color: #c7c7c7 !important;
+}
+
+.Categories form.sorting-row:nth-child(2n-1) tr,
+.advanced-button,
+.advanced-buttonSeperator,
+.alt,
+.infoTableSeperator.alt,
+.btn:not(.btn-danger),
+.btn-default.disabled:active,
+.btn-default.disabled:focus,
+.btn-default.disabled:hover,
+a.btn.btn-default,
+select.form-control,
+.form-control[disabled],
+.input-group-addon,
+#inner,
+.navbar-default,
+.search-box input,
+.select,
+.table-striped>tbody>tr:nth-child(even),
+.table>tbody>tr:nth-child(even),
+.tab-pane tr:nth-child(odd),
+textarea,
+ul.tabs a.active,
+a.list-group-item,
+.dropdown-menu>li>a,
+input[type="text"],
+input[type="email"],
+input[type="url"],
+input[type="date"],
+input[type="number"],
+input[type="password"],
+input[disabled],
+textarea,
+select {
+    background-color: #555555;
+    color: #EBEBEB;
+}
+
+.btn:hover:not(.btn-danger),
+.btn-default:hover,
+.tab-content .catTable tr:hover td,
+input:hover,
+textarea:hover,
+a.list-group-item:hover,
+select:hover,
+textarea:hover,
+input[type="date"]:hover,
+input[type="datetime"]:hover,
+input[type="datetime-local"]:hover,
+input[type="email"]:hover,
+input[type="month"]:hover,
+input[type="number"]:hover,
+input[type="password"]:hover,
+input[type="search"]:hover,
+input[type="tel"]:hover,
+input[type="text"]:hover,
+input[type="time"]:hover,
+input[type="url"]:hover,
+input[type="week"]:hover,
+textarea:focus,
+select:focus,
+input[type="date"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="email"]:focus,
+input[type="month"]:focus,
+input[type="number"]:focus,
+input[type="password"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="text"]:focus,
+input[type="time"]:focus,
+input[type="url"]:focus,
+input[type="week"]:focus {
+    background-color: #666;
+    color: #EBEBEB;
+}
+
+.btn-default:focus,
+.form-control:focus,
+input:focus,
+textarea:focus,
+select:focus {
+    border-color: #707070 !important;
+    outline: initial !important;
+    box-shadow: 0 0 0 0.25rem rgba(255, 255, 255, 0.3) !important;
+}
+
+.modal-backdrop {
+    background-color: #262626 !important;
+}
+
+.Key tr {
+    border: none;
+}
+
+.table>tbody>tr>td,
+.table>tbody>tr>th,
+.infoTableSeperator,
+.modal-footer,
+.data-row {
+    border-top: 1px solid #555555;
+}
+
+hr {
+    border-top: 1px solid #555555;
+}
+
+.btn-danger {
+    border-color: #7b2b28;
+}
+
+.tab-content .catTable tbody,
+ul.tabs a,
+.colmask,
+#subscriptions,
+.RSS form[action="add_rss_feed"] tr:nth-child(even),
+.Config .table {
+    border: 1px solid #555555 !important;
+}
+
+.Categories form:first-of-type tr:last-of-type,
+.default,
+.dropdown-menu>li>a:focus,
+.dropdown-menu>li>a:hover {
+    background-color: #696969;
+}
+
+.activeRSS,
+.activeRSS a,
+.activeRSS a:visited,
+.btn-default,
+.checkbox label,
+.feed-row td,
+.help-block,
+#content,
+.navbar-default .navbar-nav>li>a,
+.navbar-default .navbar-nav>li>a>.glyphicon,
+.path,
+.Servers .ct-label,
+.time,
+.main-restarting.in,
+#search-dropdown .dropdown-header,
+ul.tabs a,
+a.wizard-advanced-settings,
+.quoteBlock a,
+a.main-helplink,
+col2 h3 a,
+.text-center a,
+.text-center a:hover {
+    color: #EBEBEB;
+}
+
+.container,
+#content {
+    background-color: unset !important;
+}
+
+#content>div.colmask>div:nth-child(3) {
+    border-bottom: 1px solid #555555 !important;
+}
+
+.Servers .ct-series-a .ct-line,
+.Servers .ct-series-a .ct-point {
+    stroke: #EBEBEB;
+}
+
+#inner,
+.colmask {
+    background-color: #303030;
+}
+
+.modal-header {
+    background-color: #3C3C3C;
+}
+
+.modal-content,
+.modal-body,
+.modal-footer {
+    background-color: #727272;
+}
+
+#modal_qr .modal-body {
+    background-color: #EBEBEB;
+}
+
+.form-signin .btn.btn-default {
+    color: black;
+}
+
+.rss-icon-svg {
+    fill: white;
+}
+
+.rss-symbol {
+    fill: #555555;
+}
+
+/* Placeholders - Will not work if grouped! */
+::-webkit-input-placeholder {
+    color: #EBEBEB !important;
+}
+
+::-moz-placeholder {
+    color: #EBEBEB !important;
+    opacity: 1 !important;
+}
+
+:-ms-input-placeholder {
+    color: #EBEBEB !important;
+}
+
+.tooltip-inner {
+    background-color: #E4E4E4 !important;
+    color: #000 !important;
+}
+/* for login */
+.tooltip.bottom .tooltip-arrow {
+    border-bottom-color: #E4E4E4 !important;
+}
+/* config>general - host-warning */
+.tooltip.top .tooltip-arrow {
+    border-top-color: #E4E4E4 !important;
+}
+
+.Special .glyphicon-asterisk {
+    color: #E4E4E4 !important;
+}

interfaces/Config/templates/staticcfg/css/login.css

@@ -7,7 +7,10 @@ body {
     border-radius: 0 !important;
 }
 
-.btn, .btn:hover, .btn:active, .btn:focus {
+.btn,
+.btn:hover,
+.btn:active,
+.btn:focus {
     box-shadow: 1px 1px 1px rgba(0,0,0,.1) !important;
     background-color: white !important;
 }
@@ -38,7 +41,7 @@ body {
 }
 
 .text-center a:hover {
-    color: black !important;
+    color: black;
 }
 
 .form-signin .alert {

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

@@ -89,15 +89,20 @@ body {
     display: block;
     position: static;
     float: right;
-    color: black !important;
+    color: black;
     padding: 0px;
     font-size: 1.2em;
 }
 .example {
     background-color: #fefeee;
 }
+.presets strong {
+    display: inline-block;
+    width: 75px;
+}
 .presets {
     margin-bottom: -6px;
+    max-width: 60%;
 }
 .presets input {
     margin: 2px 0;
@@ -172,8 +177,8 @@ input[type="checkbox"]+.desc {
     background-color: #F8F8F8;
 }
 .field-pair:last-child,
-.no-field-pair-bg {
-    background-color: transparent;
+.field-pair.no-field-pair-bg {
+    background-color: transparent !important;
 }
 .alt,
 .infoTableSeperator.alt {
@@ -220,10 +225,38 @@ input[type='checkbox'] {
     padding: 0;
     margin-left: 5px;
 }
-textarea:hover, input[type="date"]:hover, input[type="datetime"]:hover, input[type="datetime-local"]:hover, input[type="email"]:hover, input[type="month"]:hover, input[type="number"]:hover, input[type="password"]:hover, input[type="search"]:hover, input[type="tel"]:hover, input[type="text"]:hover, input[type="time"]:hover, input[type="url"]:hover, input[type="week"]:hover, textarea:focus, input[type="date"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="email"]:focus, input[type="month"]:focus, input[type="number"]:focus, input[type="password"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="text"]:focus, input[type="time"]:focus, input[type="url"]:focus, input[type="week"]:focus {
+textarea:hover,
+input[type="date"]:hover,
+input[type="datetime"]:hover,
+input[type="datetime-local"]:hover,
+input[type="email"]:hover,
+input[type="month"]:hover,
+input[type="number"]:hover,
+input[type="password"]:hover,
+input[type="search"]:hover,
+input[type="tel"]:hover,
+input[type="text"]:hover,
+input[type="time"]:hover,
+input[type="url"]:hover,
+input[type="week"]:hover,
+textarea:focus,
+input[type="date"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="email"]:focus,
+input[type="month"]:focus,
+input[type="number"]:focus,
+input[type="password"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="text"]:focus,
+input[type="time"]:focus,
+input[type="url"]:focus,
+input[type="week"]:focus {
     background-color: #fffff0;
     border: 1px solid #aaa;
 }
+
 .col1 input[type='checkbox'] {
     position: absolute;
     top: auto!important;
@@ -326,6 +359,49 @@ tr.separator {
     margin: 5px;
 }
 
+.Sorting .explain-pattern {
+    border: none;
+    width: 100%;
+}
+.Sorting .pattern-table {
+    border:1px solid #ccc;
+}
+.Sorting .sorter-switch {
+    margin-right: 0.2em;
+}
+.Sorting .sorter-switch-container {
+    margin: 10px 0px;
+    height: 1.5em;
+    display: block;
+}
+.Sorting .sorter-placeholder {
+    position: relative;
+}
+.Sorting .sorter-placeholder:after {
+    content: "\e034";
+    font-family: "Glyphicons Halflings";
+    background: unset;
+    text-align: center;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 30px;
+    border-radius: 15px;
+    border: 1px dashed #444;
+}
+.Sorting .glyphicon-option-vertical {
+    margin-top: 1.5em;
+    margin-right: 0.2em;
+    cursor: move;
+}
+.Sorting form:not(.sorting-row) .glyphicon-option-vertical {
+    visibility: hidden;
+}
+.Sorting .sorting-quick-setup {
+    padding: 1.5em 2em 3em
+}
+
 .RSS .rss-section input[type="text"] {
     max-width: 180px;
 }
@@ -421,6 +497,9 @@ tr.separator {
 .align-center {
     text-align: center;
 }
+.valign-top {
+    vertical-align: top;
+}
 .nowrap {
     white-space: nowrap;
 }
@@ -784,6 +863,7 @@ select {
     vertical-align:middle;
     max-width: 100%;
     min-height: 34px;
+    min-width: 55px;
     font-size: 13px;
     background-color: white;
 }
@@ -930,7 +1010,7 @@ input[type="checkbox"] {
 }
 */
 .navbar-default .navbar-nav>li>a {
-    color: black !important;
+    color: black;
 }
 
 .navbar-default .navbar-nav>li>a:hover,
@@ -967,6 +1047,32 @@ input[type="checkbox"] {
     margin: 10px 0px;
 }
 
+.Servers .server-frame {
+    position: relative;
+    width: 220px;
+    height: 325px;
+    margin-bottom: -325px;
+    left: -240px;
+    display: none;
+}
+
+.Servers .server-frame a {
+    color: black !important;
+    text-decoration: none !important;
+    opacity: 0.8;
+    font-size: 2em;
+    font-family: arial, sans-serif !important;
+    position: absolute;
+    right: 5px;
+    top: -5px;
+}
+
+.Servers .server-frame iframe {
+    width: 100%;
+    height: 100%;
+    border: 0;
+}
+
 .Servers .col2 .label {
     margin-top: 8px;
     font-size: 0.85em;
@@ -1248,6 +1354,12 @@ html[dir="rtl"] .Scheduling form[action="addSchedule"] input[type="checkbox"] {
         padding: 0px 15px 10px;
         width: inherit;
     }
+    .Sorting .glyphicon-option-vertical {
+        display: none;
+    }
+    .Sorting .sorter h3 {
+        cursor: move;
+    }
 }
 
 @media screen and (max-width: 768px) {

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

@@ -109,13 +109,13 @@
                 // Remove start
                 self.currentBrowserPath = self.currentBrowserPath.replace(self.element.data('initialdir')+folderSeperator, '');
                 // If it's identical to the initial dir the replacement won't work
-                if(self.currentBrowserPath == self.element.data('initialdir')) {
+                if(self.currentBrowserPath === self.element.data('initialdir')) {
                     self.currentBrowserPath = '';
                 }
             }
 
             // Changed?
-            if(self.element.val() != self.currentBrowserPath) {
+            if(self.element.val() !== self.currentBrowserPath) {
                 self.element.val(self.currentBrowserPath);
                 formHasChanged = true;
             }
@@ -157,7 +157,7 @@
             var list = $('<div class="list-group">').appendTo(self.fileBrowserDialog);
             $.each(data.paths, function (i, entry) {
                 // Title for first one
-                if(i == 0) {
+                if(i === 0) {
                     self.fileBrowserDialog.prepend($('<h4>').text(entry.current_path))
                     return
                 }
@@ -166,7 +166,7 @@
                     self.browse(entry.path, endpoint); }
                 ).text(entry.name);
                 // Back image
-                if(entry.name == '..') {
+                if(entry.name === '..') {
                     $('<span class="glyphicon glyphicon-arrow-left"></span> ').prependTo(link);
                 } else {
                     $('<span class="glyphicon glyphicon-folder-open"></span> ').prependTo(link);
@@ -203,7 +203,12 @@ $.fn.extractFormDataTo = function(target) {
     var selects = $("select", this);
 
     selects.each(function (i,elem) {
-        target[elem.name] = elem.value;
+        if (elem.selectedOptions.length > 1) {
+            // Handle <select multiple="multiple">
+            target[elem.name] = Array.from(elem.selectedOptions).map(({ value }) => value).toString();
+        } else {
+            target[elem.name] = elem.value;
+        }
     });
 
     return this;
@@ -234,8 +239,8 @@ function do_restart() {
     $('.main-restarting').show()
 
     // What template
-    var switchedHTTPS = ($('#enable_https').is(':checked') == ($('#enable_https').data('original') === undefined))
-    var portsUnchanged  = ($('#port').val() == $('#port').data('original')) && ($('#https_port').val() == $('#https_port').data('original'))
+    var switchedHTTPS = ($('#enable_https').is(':checked') === ($('#enable_https').data('original') === undefined))
+    var portsUnchanged  = ($('#port').val() === $('#port').data('original')) && ($('#https_port').val() === $('#https_port').data('original'))
 
     // Are we on settings page or did nothing change?
     if(!$('body').hasClass('General') || (!switchedHTTPS && portsUnchanged)) {
@@ -243,7 +248,7 @@ function do_restart() {
         var urlTotal = window.location.origin + urlBase
     } else {
         // Protocol and port depend on http(s) setting
-        if($('#enable_https').is(':checked') && (window.location.protocol == 'https:' || !$('#https_port').val())) {
+        if($('#enable_https').is(':checked') && (window.location.protocol === 'https:' || !$('#https_port').val())) {
             // Https on and we visited this page from HTTPS
             var urlProtocol = 'https:';
             var urlPort = $('#https_port').val() ? $('#https_port').val() : $('#port').val();
@@ -292,7 +297,7 @@ function do_restart() {
 
             // Exception if we go from HTTPS to HTTP
             // (this is not allowed by browsers and all of the above will be ignored)
-            if(window.location.protocol != urlProtocol) {
+            if(window.location.protocol !== urlProtocol) {
                 // Saftey redirect after 20 sec
                 setTimeout(function() {
                     location.href = urlTotal;
@@ -424,7 +429,7 @@ $(document).ready(function () {
         $('.advanced-settings').toggle()
         addRowColor()
     })
-    if(localStorage.getItem('advanced-settings') == 'true') {
+    if(localStorage.getItem('advanced-settings') === 'true') {
         $('.advanced-settings').show()
         $('#advanced-settings-button').prop('checked', true)
         addRowColor()

interfaces/Glitter/licenses/LICENSE-CC.txt

@@ -9,7 +9,7 @@ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE B
 
 1. Definitions
 
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("syncing") will be considered an Adaptation for the purpose of this License.
    2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License.
    3. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
    4. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
@@ -44,7 +44,7 @@ The above rights may be exercised in all media and formats whether now known or
 
 5. Representations, Warranties and Disclaimer
 
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
 
 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 

interfaces/Glitter/templates/include_history.tmpl

@@ -1,5 +1,10 @@
 <div class="history" id="history-tab" data-bind="visible: hasHistory() || displayTabbed()" style="display: none">
-    <h2>$T('menu-history')</h2>
+    <div class="history-header">
+        <h2>$T('menu-history')</h2>
+        <a href="#" data-bind="click: history.showMultiEdit">
+            <span class="glyphicon glyphicon-tasks" data-tooltip="true" data-placement="left" title="$T('Glitter-multiOperations')"></span>
+        </a>
+    </div>
     <table class="table table-hover history-table paginated">
         <thead>
             <tr>
@@ -55,7 +60,10 @@
                 <!-- /ko -->
                 <td class="history-completedon row-wrap-text" data-bind="text: completedOn(), attr: { 'data-timestamp': completed }" onclick="showDetails(this)"></td>
                 <td class="delete">
-                    <div class="dropdown">
+                    <label data-bind="visible: parent.isMultiEditing()">
+                        <input type="checkbox" name="multiedit" title="$T('Glitter-multiSelect')" data-bind="click: parent.addMultiEdit, attr: { 'id': 'multiedit_' + id } " />
+                    </label>
+                    <div class="dropdown" data-bind="visible: !parent.isMultiEditing()">
                         <a href="#" data-toggle="dropdown" data-bind="click: updateAllHistoryInfo">
                             <span class="caret"></span>
                         </a>
@@ -124,7 +132,20 @@
     <div class="multioperations-selector" id="history-options">
         <a href="#" class="hover-button" title="$T('link-retryAll')" data-tooltip="true" data-placement="left" data-bind="click: history.retryAllFailed"><span class="glyphicon glyphicon-repeat"></span></a>
         <a href="#" class="hover-button" title="$T('showAllHis') / $T('showFailedHis')" data-tooltip="true" data-placement="left" data-bind="click: history.toggleShowFailed, css: { 'history-options-show-failed': history.showFailed }"><span class="glyphicon glyphicon-exclamation-sign"></span></a>
-        <a href="#modal-purge-history" class="hover-button" title="$T('purgeHist')" data-toggle="modal" data-tooltip="true" data-placement="left"><span class="glyphicon glyphicon-trash"></span></a>
+
+        <div data-bind="visible: history.isMultiEditing()">
+            <span class="label label-default" data-bind="text: history.multiEditItems().length">0</span>
+            <label for="multiedit-checkall-history">
+                <input type="checkbox" name="multieditCheckAll" id="multiedit-checkall-history" title="$T('Glitter-checkAll')" data-bind="click: history.checkAllJobs" data-tooltip="true" data-placement="top" />
+            </label>
+        </div>
+
+        <a href="#" class="hover-button" data-bind="visible: history.isMultiEditing(), click: history.doMultiDelete">
+            <span class="glyphicon glyphicon-trash"></span>
+        </a>
+        <a href="#modal-purge-history" class="hover-button" title="$T('purgeHist')" data-bind="visible: !history.isMultiEditing()" data-toggle="modal" data-tooltip="true" data-placement="left">
+            <span class="glyphicon glyphicon-trash"></span>
+        </a>
     </div>
 
     <div class="info-container history-info">

interfaces/Glitter/templates/include_menu.tmpl

@@ -102,26 +102,15 @@
                     <li class="divider"></li>
                     <li class="dropdown-header"><span class="glyphicon glyphicon-off"></span> $T('Glitter-onFinish'):</li>
                     <li>
-                        <!-- ko if: queue.scriptsListLoaded -->
                         <select data-bind="value: finishaction, event: { change: setOnQueueFinish }" class="form-control">
                             <option value=""></option>
-                            <optgroup label="$T('eoq-actions')">
-                                <option value="shutdown_program">$T('shutdownSab')</option>
-                                <!--#if $power_options#-->
-                                <option value="shutdown_pc">$T('shutdownPc')</option>
-                                <option value="standby_pc">$T('standbyPc')</option>
-                                <option value="hibernate_pc">$T('hibernatePc')</option>
-                                <!--#end if#-->
-                            </optgroup>
-                            <optgroup label="$T('eoq-scripts')" data-bind="visible: queue.scriptsList().length > 1">
-                                <!-- ko foreach: queue.scriptsList -->
-                                    <!-- ko if: \$data.scriptValue != 'None' -->
-                                        <option data-bind="text: \$data.scriptText, attr: { value: 'script_'+\$data.scriptValue } " ></option>
-                                    <!-- /ko -->
-                                <!-- /ko -->
-                            </optgroup>
+                            <option value="shutdown_program">$T('shutdownSab')</option>
+                            <!--#if $power_options#-->
+                            <option value="shutdown_pc">$T('shutdownPc')</option>
+                            <option value="standby_pc">$T('standbyPc')</option>
+                            <option value="hibernate_pc">$T('hibernatePc')</option>
+                            <!--#end if#-->
                         </select>
-                        <!-- /ko -->
                     </li>
                 </ul>
             </li>

interfaces/Glitter/templates/include_overlays.tmpl

@@ -1,6 +1,6 @@
 <!--#from sabnzbd.constants import VALID_ARCHIVES, VALID_NZB_FILES#-->
 <!--#set $file_exts = ', '.join(VALID_NZB_FILES + VALID_ARCHIVES)#-->
-<!-- Notifcation box -->
+<!-- Notification box -->
 <div class="main-notification-box" style="display: none">
     <div class="main-notification-box-uploading">
         <span class="glyphicon glyphicon-open"></span> $T('Glitter-notification-uploading') <span class="main-notification-box-file-count"></span>
@@ -123,11 +123,9 @@
                                 <span data-bind="text: statusInfo.loadavg"></span>
                             </div>
                         </div>
-                        <div class="row" data-bind="visible: statusInfo.delayed_decoder() > 5 || statusInfo.delayed_assembler() > 5">
+                        <div class="row" data-bind="visible: 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>
@@ -227,15 +225,20 @@
                                 </div>
                                 <div class="row" data-bind="visible: serverssl">
                                     <div class="col-sm-6">$T('srv-ssl')</div>
-                                    <div class="col-sm-6">
-                                        <span class="glyphicon glyphicon-ok"></span> <span data-bind="text: serversslinfo"></span>
+                                    <div class="col-sm-6 col-dot-overflow">
+                                        <span class="glyphicon glyphicon-ok"></span>
+                                        <span data-bind="text: serversslinfo"></span>
                                     </div>
                                 </div>
                                 <div class="row">
                                     <div class="col-sm-6"># $T('connections')</div>
                                     <div class="col-sm-6">
                                         <span data-bind="text: serverconnections().length"></span> /
-                                        <span data-bind="text: servertotalconn"></span>
+                                        <span data-bind="text: servertotalconn"></span><br>
+                                        <!-- ko if: serveripaddress() -->
+                                        <span data-bind="text: servercanonname"></span><br>
+                                        <span data-bind="text: serveripaddress"></span>
+                                        <!-- /ko -->
                                     </div>
                                 </div>
                                 <div class="row">
@@ -251,11 +254,11 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="row" data-bind="visible: !isFinite(serveractiveconn())">
+                                <div class="row" data-bind="visible: serverwarning()">
                                     <div class="col-sm-12">
                                         <div class="alert alert-warning">
                                             <span class="glyphicon glyphicon-info-sign"></span>
-                                            <span data-bind="text: serveractiveconn()"></span>
+                                            <span data-bind="text: serverwarning()"></span>
                                         </div>
                                     </div>
                                 </div>
@@ -456,6 +459,8 @@
                             <div class="form-group form-checkbox">
                                 <label class="col-sm-6 control-label">
                                     $T("Glitter-keyboardShortcuts")
+                                    <span class="glyphicon glyphicon-question-sign" data-tooltip="true" data-placement="top" data-html="true"
+                                        data-original-title="P: $T('link-pause')<br>A: $T('Glitter-addNZB')<br>S: $T('Glitter-statusInterfaceOptions')<br>C: $T('menu-config')<br>$T('Glitter-keyboardShortcuts-arrows')"></span>
                                 </label>
                                 <div class="col-sm-4">
                                     <input type="checkbox" name="keyboardShortcuts" value="true" data-bind="checked: keyboardShortcuts" />
@@ -530,7 +535,15 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label">$T('priority')</label>
                     <div class="col-sm-6">
-                        <select name="Priority" class="form-control" data-bind="options: queue.priorityOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: '$T('default')'"></select>
+                        <!-- This list is different from the one during download! -->
+                        <select name="Priority" class="form-control">
+                            <option value="-100">$T('default')</option>
+                            <option value="2">$T('pr-force')</option>
+                            <option value="1">$T('pr-high')</option>
+                            <option value="0">$T('pr-normal')</option>
+                            <option value="-1">$T('pr-low')</option>
+                            <option value="-2" >$T('pr-paused')</option>
+                        </select>
                         <span class="glyphicon glyphicon-sort-by-attributes-alt"></span>
                     </div>
                 </div>
@@ -705,7 +718,7 @@
                     </tbody>
                 </table>
                 <hr/>
-                <p><small>Copyright (C) 2007-2021 The SABnzbd Team &lt;team@sabnzbd.org&gt;<br/>$T('yourRights') </small></p>
+                <p><small>Copyright (C) 2007-2021 The SABnzbd-Team (<a href="https://sabnzbd.org/" target="_blank">sabnzbd.org</a>)<br/>$T('yourRights') </small></p>
             </div>
         </div>
     </div>

interfaces/Glitter/templates/include_queue.tmpl

@@ -171,8 +171,8 @@
 
     <form class="multioperations-selector" data-bind="visible: (hasQueue() && queue.isMultiEditing())" style="display: none;">
         <div class="add-nzb-inputbox add-nzb-inputbox-small add-nzb-inputbox-options">
-            <label for="multiedit-checkall">
-                <input type="checkbox" name="multieditCheckAll" id="multiedit-checkall" title="$T('Glitter-checkAll')" data-bind="click: queue.checkAllJobs" data-tooltip="true" data-placement="top" />
+            <label for="multiedit-checkall-queue">
+                <input type="checkbox" name="multieditCheckAll" id="multiedit-checkall-queue" title="$T('Glitter-checkAll')" data-bind="click: queue.checkAllJobs" data-tooltip="true" data-placement="top" />
             </label>
             <a href="#" class="hover-button" data-bind="click: queue.doMultiDelete">
                 <span class="glyphicon glyphicon-trash"></span>

interfaces/Glitter/templates/main.tmpl

@@ -67,6 +67,7 @@
             glitterTranslate.fetch = "$T('Glitter-fetch')";
             glitterTranslate.checking = "$T('post-Checking')";
             glitterTranslate.misingArt = "$T('missingArt')";
+            glitterTranslate.fetchingURL = "$T('Glitter-addFromURL')"
             glitterTranslate.chooseFile = "$T('Glitter-chooseFile')";
             glitterTranslate.orphanedJobsMsg = "$T('explain-orphans')";
             glitterTranslate.useCache = "$T('explain-cache_limitstr').replace("64M", "256M").replace("128M", "512M")";
@@ -116,7 +117,7 @@
             glitterTranslate.priority['Stop'] = "$T('pr-stop')";
         </script>
 
-        <!-- Inclusion is faster than external scripts. We load momentJS locale seperatly so failure won't break anything -->
+        <!-- Inclusion is faster than external scripts. We load momentJS locale separately so failure won't break anything -->
         <script type="text/javascript">
             <!--#include raw $webdir + "/static/javascripts/jquery-3.5.1.min.js"#-->
             <!--#include raw $webdir + "/static/javascripts/jquery-ui.min.js"#-->
@@ -145,10 +146,10 @@
                         <a href="#queue-tab" data-toggle="tab">$T('menu-queue') <span class="badge" data-bind="text: queue.totalItems"></span></a>
                     </li>
                     <li>
-                        <a href="#history-tab" data-toggle="tab">$T('menu-history')<span class="badge" data-bind="text: history.totalItems"></span></a>
+                        <a href="#history-tab" data-toggle="tab">$T('menu-history') <span class="badge badge-info" data-bind="text: history.ppItems, visible: history.ppItems"></span><span class="badge" data-bind="text: history.totalItems"></span></a>
                     </li>
                     <li>
-                        <a href="#queue-messages" data-toggle="tab">$T('warnings')<span class="badge" data-bind="text: hasMessages, css: { 'badge-warning':  hasMessages() }"></span></a>
+                        <a href="#queue-messages" data-toggle="tab">$T('warnings') <span class="badge" data-bind="text: hasMessages, css: { 'badge-warning':  hasMessages() }"></span></a>
                     </li>
                 </ul>
             </div>

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

@@ -58,11 +58,11 @@ function convertHTMLtoText(htmltxt) {
 // Function to re-write 0:09:21=>9:21, 0:10:10=>10:10, 0:00:30=>0:30
 function rewriteTime(timeString) {
     // Remove "0:0" from start
-    if(timeString.substring(0,3) == '0:0') {
+    if(timeString.substring(0,3) === '0:0') {
         timeString = timeString.substring(3)
     }
     // Remove "0:" from start
-    else if(timeString.substring(0,2) == '0:') {
+    else if(timeString.substring(0,2) === '0:') {
         timeString = timeString.substring(2)
     }
     return timeString
@@ -71,13 +71,13 @@ function rewriteTime(timeString) {
 // How to display the date-time?
 function displayDateTime(inDate, outFormat, inFormat) {
     // What input?
-    if(inDate == '') {
+    if(inDate === '') {
         var theMoment = moment()
     } else {
         var theMoment = moment.utc(inDate, inFormat)
     }
     // Special format or regular format?
-    if(outFormat == 'fromNow') {
+    if(outFormat === 'fromNow') {
         return theMoment.fromNow()
     } else {
         return theMoment.local().format(outFormat)
@@ -155,7 +155,7 @@ function setCheckAllState(checkSelector, rangeSelector) {
     var nrChecks = allChecks.filter(":checked");
     if(nrChecks.length === 0) {
         $(checkSelector).prop({'checked': false, 'indeterminate': false})
-    } else if(nrChecks.length == allChecks.length) {
+    } else if(nrChecks.length === allChecks.length) {
         $(checkSelector).prop({'checked': true, 'indeterminate': false})
     } else {
         $(checkSelector).prop({'checked': false, 'indeterminate': true})

interfaces/Glitter/templates/static/javascripts/glitter.filelist.pagination.js

@@ -57,7 +57,7 @@ function Fileslisting(parent) {
             $.each(response.files, function(index, slot) {
                 // Existing or updating?
                 var existingItem = ko.utils.arrayFirst(self.fileItems(), function(i) {
-                    return i.nzf_id() == slot.nzf_id;
+                    return i.nzf_id() === slot.nzf_id;
                 });
 
                 if(existingItem) {
@@ -76,7 +76,7 @@ function Fileslisting(parent) {
             }
 
             // Check if we show/hide completed
-            if(localStorageGetItem('showCompletedFiles') == 'No') {
+            if(localStorageGetItem('showCompletedFiles') === 'No') {
                 $('.item-files-table tr.files-done').hide();
                 $('#filelist-showcompleted').removeClass('hover-button')
             }
@@ -217,8 +217,8 @@ function FileslistingModel(parent, data) {
     self.nzf_id = ko.observable(data.nzf_id);
     self.file_age = ko.observable(data.age);
     self.mb = ko.observable(data.mb);
-    self.canselect = ko.observable(data.status != "finished" && data.status != "queued");
-    self.isdone =  ko.observable(data.status == "finished");
+    self.canselect = ko.observable(data.status !== "finished" && data.status !== "queued");
+    self.isdone =  ko.observable(data.status === "finished");
     self.percentage = ko.observable(self.isdone() ? fixPercentages(100) : fixPercentages((100 - (data.mbleft / data.mb * 100)).toFixed(0)));
 
     // Update internally
@@ -227,8 +227,8 @@ function FileslistingModel(parent, data) {
         self.nzf_id(data.nzf_id)
         self.file_age(data.age)
         self.mb(data.mb)
-        self.canselect(data.status != "finished" && data.status != "queued")
-        self.isdone(data.status == "finished")
+        self.canselect(data.status !== "finished" && data.status !== "queued")
+        self.isdone(data.status === "finished")
         // Data is given in MB, would always show 0% for small files even if completed
         self.percentage(self.isdone() ? fixPercentages(100) : fixPercentages((100 - (data.mbleft / data.mb * 100)).toFixed(0)))
     }
@@ -266,7 +266,7 @@ function paginationModel(parent) {
         // Return object for adding
         return {
             page: pageNr,
-            isCurrent: pageNr == self.currentPage(),
+            isCurrent: pageNr === self.currentPage(),
             isDots: false,
             onclick: function(data) {
                 self.moveToPage(data.page);
@@ -356,7 +356,7 @@ function paginationModel(parent) {
             }
 
             // Change of number of pages?
-            if(newNrPages != self.nrPages()) {
+            if(newNrPages !== self.nrPages()) {
                 // Update
                 self.nrPages(newNrPages);
             }

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

@@ -13,7 +13,10 @@ function HistoryListModel(parent) {
     self.searchTerm = ko.observable('').extend({ rateLimit: { timeout: 400, method: "notifyWhenChangesStop" } });
     self.paginationLimit = ko.observable(10).extend({ persist: 'historyPaginationLimit' });
     self.totalItems = ko.observable(0);
+    self.ppItems = ko.observable(0);
     self.pagination = new paginationModel(self);
+    self.isMultiEditing = ko.observable(false).extend({ persist: 'historyIsMultiEditing' });
+    self.multiEditItems = ko.observableArray([]);
 
     // Download history info
     self.downloadedToday = ko.observable();
@@ -40,7 +43,7 @@ function HistoryListModel(parent) {
         var newItems = [];
         $.each(data.slots, function(index, slot) {
             var existingItem = ko.utils.arrayFirst(self.historyItems(), function(i) {
-                return i.historyStatus.nzo_id() == slot.nzo_id;
+                return i.historyStatus.nzo_id() === slot.nzo_id;
             });
             // Set index in the results
             slot.index = index
@@ -56,7 +59,7 @@ function HistoryListModel(parent) {
         });
 
         // Remove all items
-        if(itemIds.length == self.paginationLimit()) {
+        if(itemIds.length === self.paginationLimit()) {
             // Replace it, so only 1 Knockout DOM-update!
             self.historyItems(newItems);
             newItems = [];
@@ -65,7 +68,7 @@ function HistoryListModel(parent) {
             $.each(itemIds, function() {
                 var id = this.toString();
                 self.historyItems.remove(ko.utils.arrayFirst(self.historyItems(), function(i) {
-                    return i.historyStatus.nzo_id() == id;
+                    return i.historyStatus.nzo_id() === id;
                 }));
             });
         }
@@ -79,7 +82,7 @@ function HistoryListModel(parent) {
             if(self.parent.queue.multiEditItems().length > 0) {
                 $.each(newItems, function() {
                     var currentItem = this;
-                    self.parent.queue.multiEditItems.remove(function(inList) { return inList.id == currentItem.nzo_id; })
+                    self.parent.queue.multiEditItems.remove(function(inList) { return inList.id === currentItem.id; })
                 })
             }
         }
@@ -93,6 +96,7 @@ function HistoryListModel(parent) {
             History information
         ***/
         self.totalItems(data.noofslots);
+        self.ppItems(data.ppslots)
         self.downloadedToday(data.day_size);
         self.downloadedWeek(data.week_size);
         self.downloadedMonth(data.month_size);
@@ -110,6 +114,8 @@ function HistoryListModel(parent) {
                 value: newValue
             })
         }
+        // Update pagination and counters
+        self.parent.refresh(true)
     });
 
     // Retry a job
@@ -142,7 +148,7 @@ function HistoryListModel(parent) {
     // Searching in history (rate-limited in declaration)
     self.searchTerm.subscribe(function() {
         // Go back to page 1
-        if(self.pagination.currentPage() != 1) {
+        if(self.pagination.currentPage() !== 1) {
             // This forces a refresh
             self.pagination.moveToPage(1);
         } else {
@@ -154,13 +160,13 @@ function HistoryListModel(parent) {
     // Clear searchterm
     self.clearSearchTerm = function(data, event) {
         // Was it escape key or click?
-        if(event.type == 'mousedown' || (event.keyCode && event.keyCode == 27)) {
+        if(event.type === 'mousedown' || (event.keyCode && event.keyCode === 27)) {
             // Set the loader so it doesn't flicker and then switch
             self.isLoading(true)
             self.searchTerm('');
         }
         // Was it click and the field is empty? Then we focus on the field
-        if(event.type == 'mousedown' && self.searchTerm() == '') {
+        if(event.type === 'mousedown' && self.searchTerm() === '') {
             $(event.target).parents('.search-box').find('input[type="text"]').focus()
             return;
         }
@@ -203,28 +209,28 @@ function HistoryListModel(parent) {
         var del_files, value;
 
         // Purge failed
-        if(whatToRemove == 'history-purge-failed') {
+        if(whatToRemove === 'history-purge-failed') {
             del_files = 0;
             value = 'failed';
         }
         // Also remove files
-        if(whatToRemove == 'history-purgeremove-failed') {
+        if(whatToRemove === 'history-purgeremove-failed') {
             del_files = 1;
             value = 'failed';
         }
         // Remove completed
-        if(whatToRemove == 'history-purge-completed') {
+        if(whatToRemove === 'history-purge-completed') {
             del_files = 0;
             value = 'completed';
         }
         // Remove the ones on this page
-        if(whatToRemove == 'history-purge-page') {
+        if(whatToRemove === 'history-purge-page') {
             // List all the ID's
             var strIDs = '';
             $.each(self.historyItems(), function(index) {
                 // Only append when it's a download that can be deleted
                 if(!this.processingDownload() && !this.processingWaiting()) {
-                    strIDs = strIDs + this.nzo_id + ',';
+                    strIDs = strIDs + this.id + ',';
                 }
             })
             // Send the command
@@ -253,6 +259,124 @@ function HistoryListModel(parent) {
             $("#modal-purge-history").modal('hide');
         });
     };
+
+    // Show the input checkbox
+    self.showMultiEdit = function() {
+        self.isMultiEditing(!self.isMultiEditing())
+        self.multiEditItems.removeAll();
+        $('.history-table input[name="multiedit"], #multiedit-checkall-history').prop({'checked': false, 'indeterminate': false})
+    }
+
+    // Add to the list
+    self.addMultiEdit = function(item, event) {
+        // Is it a shift-click?
+        if(event.shiftKey) {
+            checkShiftRange('.history-table input[name="multiedit"]');
+        }
+
+        // Add or remove from the list?
+        if(event.currentTarget.checked) {
+            // Add item
+            self.multiEditItems.push(item);
+        } else {
+            // Go over them all to know which one to remove
+            self.multiEditItems.remove(function(inList) { return inList.id == item.id; })
+        }
+
+        // Update check-all buton state
+        setCheckAllState('#multiedit-checkall-history', '.history-table input[name="multiedit"]')
+        return true;
+    }
+
+    // Check all
+    self.checkAllJobs = function(item, event) {
+        // Get which ones we care about
+        var allChecks = $('.history-table input[name="multiedit"]').filter(':not(:disabled):visible');
+
+        // We need to re-evaltuate the state of this check-all
+        // Otherwise the 'inderterminate' will be overwritten by the click event!
+        setCheckAllState('#multiedit-checkall-history', '.history-table input[name="multiedit"]')
+
+        // Now we can check what happend
+        // For when some are checked, or all are checked (but not partly)
+        if(event.target.indeterminate || (event.target.checked && !event.target.indeterminate)) {
+            var allActive = allChecks.filter(":checked")
+            // First remove the from the list
+            if(allActive.length == self.multiEditItems().length) {
+                // Just remove all
+                self.multiEditItems.removeAll();
+                // Remove the check
+                allActive.prop('checked', false)
+            } else {
+                // Remove them seperate
+                allActive.each(function() {
+                    // Go over them all to know which one to remove
+                    var item = ko.dataFor(this)
+                    self.multiEditItems.remove(function(inList) { return inList.id == item.id; })
+                    // Remove the check of this one
+                    this.checked = false;
+                })
+            }
+        } else {
+            // None are checked, so check and add them all
+            allChecks.prop('checked', true)
+            allChecks.each(function() { self.multiEditItems.push(ko.dataFor(this)) })
+            event.target.checked = true
+        }
+        // Set state of all the check-all's
+        setCheckAllState('#multiedit-checkall-history', '.history-table input[name="multiedit"]')
+        return true;
+    }
+
+    // Delete all selected
+    self.doMultiDelete = function() {
+        // Anything selected?
+        if(self.multiEditItems().length < 1) return;
+
+        // Need confirm
+        if(!self.parent.confirmDeleteHistory() || confirm(glitterTranslate.removeDown)) {
+            // List all the ID's
+            var strIDs = '';
+            $.each(self.multiEditItems(), function(index) {
+                strIDs = strIDs + this.id + ',';
+            })
+
+            // Show notification
+            showNotification('.main-notification-box-removing-multiple', 0, self.multiEditItems().length)
+
+            // Remove
+            callAPI({
+                mode: 'history',
+                name: 'delete',
+                del_files: 1,
+                value: strIDs
+            }).then(function(response) {
+                if(response.status) {
+                    // Make sure the queue doesnt flicker and then fade-out
+                    // Make sure no flickering (if there are more items left) and then remove
+                    self.isLoading(self.totalItems() > 1)
+                    self.parent.refresh();
+                    // Empty it
+                    self.multiEditItems.removeAll();
+                    // Hide notification
+                    hideNotification()
+                }
+            })
+        }
+    }
+
+    // On change of page we need to check all those that were in the list!
+    self.historyItems.subscribe(function() {
+        // We need to wait until the unit is actually finished rendering
+        setTimeout(function() {
+            $.each(self.multiEditItems(), function(index) {
+                $('#multiedit_' + this.id).prop('checked', true);
+            })
+
+            // Update check-all buton state
+            setCheckAllState('#multiedit-checkall-history', '.history-table input[name="multiedit"]')
+        }, 100)
+    }, null, "arrayChange")
 }
 
 /**
@@ -266,7 +390,7 @@ function HistoryModel(parent, data) {
     // If we update the full set every time it uses lot of CPU
     // The Status/Actionline/scriptline/completed we do update every time
     // When clicked on the more-info button we load the rest again
-    self.nzo_id = data.nzo_id;
+    self.id = data.nzo_id;
     self.index = data.index;
     self.updateAllHistory = false;
     self.hasDropdown = ko.observable(false);
@@ -303,14 +427,14 @@ function HistoryModel(parent, data) {
 
     // Waiting?
     self.processingWaiting = ko.pureComputed(function() {
-        return(self.status() == 'Queued')
+        return(self.status() === 'Queued')
     })
 
     // Processing or done?
     self.processingDownload = ko.pureComputed(function() {
         var status = self.status();
         // When we can cancel
-        if (status === 'Extracting' || status === 'Verifying' || status == 'Repairing' || status === 'Running') {
+        if (status === 'Extracting' || status === 'Verifying' || status === 'Repairing' || status === 'Running') {
             return 2
         }
         // These cannot be cancelled
@@ -344,7 +468,7 @@ function HistoryModel(parent, data) {
                     try {
                         // Extract the Download section
                         var downloadLog = ko.utils.arrayFirst(self.historyStatus.stage_log(), function(item) {
-                            return item.name() == 'Download'
+                            return item.name() === 'Download'
                         });
                         // Extract the speed
                         return downloadLog.actions()[0].match(/(\S*\s\S+)(?=<br\/>)/)[0]
@@ -353,7 +477,7 @@ function HistoryModel(parent, data) {
                 return;
             case 'category':
                 // Exception for *
-                if(self.historyStatus.category() == "*")
+                if(self.historyStatus.category() === "*")
                     return glitterTranslate.defaultText
                 return self.historyStatus.category();
             case 'size':
@@ -375,7 +499,7 @@ function HistoryModel(parent, data) {
     // Re-try button
     self.retry = function() {
         // Set JOB-id
-        $('#modal-retry-job input[name="retry_job_id"]').val(self.nzo_id)
+        $('#modal-retry-job input[name="retry_job_id"]').val(self.id)
         // Set password
         $('#retry_job_password').val(self.historyStatus.password())
         // Open modal
@@ -424,10 +548,10 @@ function HistoryModel(parent, data) {
         // Confirm?
         if(!self.parent.parent.confirmDeleteHistory() || confirm(glitterTranslate.deleteMsg + ":\n" + item.historyStatus.name() + "\n\n" + glitterTranslate.removeDow1)) {
             // Are we still processing and it can be stopped?
-            if(item.processingDownload() == 2) {
+            if(item.processingDownload() === 2) {
                 callAPI({
                     mode: 'cancel_pp',
-                    value: self.nzo_id
+                    value: self.id
                 })
                 // All we can do is wait
             } else {
@@ -436,12 +560,13 @@ function HistoryModel(parent, data) {
                     mode: 'history',
                     name: 'delete',
                     del_files: 1,
-                    value: self.nzo_id
+                    value: self.id
                 }).then(function(response) {
                     if(response.status) {
                         // Make sure no flickering (if there are more items left) and then remove
                         self.parent.isLoading(self.parent.totalItems() > 1)
                         self.parent.historyItems.remove(self);
+                        self.parent.multiEditItems.remove(function(inList) { return inList.id === self.id; })
                         self.parent.parent.refresh();
                     }
                 });

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

@@ -62,7 +62,6 @@ function ViewModel() {
     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.loadavg = ko.observable();
     self.statusInfo.pystone = ko.observable();
@@ -91,7 +90,7 @@ function ViewModel() {
         var speedLimitNumber = Math.round(speedLimitNumberFull * 10) / 10;
 
         // Fix it for lower than 1MB/s
-        if (bandwithLimitText == 'M' && speedLimitNumber < 1) {
+        if (bandwithLimitText === 'M' && speedLimitNumber < 1) {
             bandwithLimitText = 'K';
             speedLimitNumber = Math.round(speedLimitNumberFull * 1024);
         }
@@ -151,7 +150,7 @@ function ViewModel() {
         /***
             Possible login failure?
         ***/
-        if (response.hasOwnProperty('error') && response.error == 'Missing authentication') {
+        if (response.hasOwnProperty('error') && response.error === 'Missing authentication') {
             // Restart
             document.location = document.location;
         }
@@ -172,7 +171,7 @@ function ViewModel() {
         self.diskSpaceLeft1(response.queue.diskspace1_norm)
 
         // Same sizes? Then it's all 1 disk!
-        if (response.queue.diskspace1 != response.queue.diskspace2) {
+        if (response.queue.diskspace1 !== response.queue.diskspace2) {
             self.diskSpaceLeft2(response.queue.diskspace2_norm)
         } else {
             self.diskSpaceLeft2('')
@@ -197,7 +196,7 @@ function ViewModel() {
             Spark line
         ***/
         // Break the speed if empty queue
-        if (response.queue.sizeleft == '0 B') {
+        if (response.queue.sizeleft === '0 B') {
             response.queue.kbpersec = 0;
             response.queue.speed = '0';
         }
@@ -216,9 +215,9 @@ function ViewModel() {
         self.speedHistory.push(parseInt(response.queue.kbpersec));
 
         // Is sparkline visible? Not on small mobile devices..
-        if ($('.sparkline-container').css('display') != 'none') {
+        if ($('.sparkline-container').css('display') !== 'none') {
             // Make sparkline
-            if (self.speedHistory.length == 1) {
+            if (self.speedHistory.length === 1) {
                 // We only use speedhistory from SAB if we use global settings
                 // Otherwise SAB doesn't know the refresh rate
                 if (!self.useGlobalOptions()) {
@@ -253,7 +252,7 @@ function ViewModel() {
             Speedlimit
         ***/
         // Nothing or 0 means 100%
-        if(response.queue.speedlimit == '' || response.queue.speedlimit == '0') {
+        if(response.queue.speedlimit === '' || response.queue.speedlimit === '0') {
             self.speedLimitInt(100)
         } else {
             self.speedLimitInt(parseInt(response.queue.speedlimit));
@@ -276,7 +275,7 @@ function ViewModel() {
 
         // Paused main queue
         if (self.downloadsPaused()) {
-            if (response.queue.pause_int == '0') {
+            if (response.queue.pause_int === '0') {
                 timeString = glitterTranslate.paused;
             } else {
                 var pauseSplit = response.queue.pause_int.split(/:/);
@@ -345,7 +344,7 @@ function ViewModel() {
             .done(self.updateQueue)
             .fail(function(response) {
                 // Catch the failure of authorization error
-                if (response.status == 401) {
+                if (response.status === 401) {
                     // Stop refresh and reload
                     clearInterval(self.interval)
                     location.reload();
@@ -395,7 +394,7 @@ function ViewModel() {
                 api_request[keyword] = parsed_query[keyword]
             }
             // Special case for priority, dirty replace of string by numeric value
-            if (keyword == "priority" && api_request["priority"]) {
+            if (keyword === "priority" && api_request["priority"]) {
                 for (const prio_name in self.queue.priorityName) {
                     api_request["priority"] = api_request["priority"].replace(prio_name, self.queue.priorityName[prio_name])
 
@@ -513,7 +512,7 @@ function ViewModel() {
     // Update the warnings
     self.nrWarnings.subscribe(function(newValue) {
         // Really any change?
-        if (newValue == self.allWarnings().length) return;
+        if (newValue === self.allWarnings().length) return;
 
         // Get all warnings
         callAPI({
@@ -535,7 +534,7 @@ function ViewModel() {
                         type: glitterTranslate.status[warning.type].slice(0, -1),
                         text: convertHTMLtoText(warning.text).replace(/ /g, '\u00A0').replace(/(?:\r\n|\r|\n)/g, '<br />'),
                         timestamp: warning.time,
-                        css: (warning.type == "ERROR" ? "danger" : warning.type == "WARNING" ? "warning" : "info"),
+                        css: (warning.type === "ERROR" ? "danger" : warning.type === "WARNING" ? "warning" : "info"),
                         clear: self.clearWarnings
                     };
                     self.allWarnings.push(warningData)
@@ -555,7 +554,7 @@ function ViewModel() {
     // Clear messages
     self.clearMessages = function(whatToRemove) {
         // Remove specifc type of messages
-        self.allMessages.remove(function(item) { return item.index == whatToRemove });
+        self.allMessages.remove(function(item) { return item.index === whatToRemove });
         // Now so we don't show again today
         localStorageSetItem(whatToRemove, Date.now())
     }
@@ -566,7 +565,7 @@ function ViewModel() {
         if (!self.speedLimitInt()) return;
 
         // Update
-        if (self.speedLimitInt() != newValue) {
+        if (self.speedLimitInt() !== newValue) {
             callAPI({
                 mode: "config",
                 name: "speedlimit",
@@ -639,11 +638,17 @@ function ViewModel() {
             return false;
         }
 
+        // Disable the buttons to prevent multiple uploads
+        let submit_buttons = $(form).find("input[type='submit']")
+        submit_buttons.attr("disabled", true)
+
         // Upload file using the method we also use for drag-and-drop
         if ($(form.nzbFile)[0].files[0]) {
             self.addNZBFromFile($(form.nzbFile)[0].files);
             // Hide modal, upload will reset the form
             $("#modal-add-nzb").modal("hide");
+            // Re-enable the buttons
+            submit_buttons.attr("disabled", false)
         } else if ($(form.nzbURL).val()) {
             // Or add URL
             var theCall = {
@@ -657,7 +662,7 @@ function ViewModel() {
             }
 
             // Optional, otherwise they get mis-labeled if left empty
-            if ($('#modal-add-nzb select[name="Category"]').val() != '*') theCall.cat = $('#modal-add-nzb select[name="Category"]').val()
+            if ($('#modal-add-nzb select[name="Category"]').val() !== '*') theCall.cat = $('#modal-add-nzb select[name="Category"]').val()
             if ($('#modal-add-nzb select[name="Processing"]').val()) theCall.pp = $('#modal-add-nzb select[name="Category"]').val()
 
             // Add
@@ -667,10 +672,16 @@ function ViewModel() {
                 $("#modal-add-nzb").modal("hide");
                 form.reset()
                 $('#nzbname').val('')
+                submit_buttons.attr("disabled", false)
             });
         }
     }
 
+    // default to url input when modal is shown
+    $('#modal-add-nzb').on('shown.bs.modal', function() {
+      $('input[name="nzbURL"]').focus();
+    })
+
     // From the upload or filedrop
     self.addNZBFromFile = function(files, fileindex) {
         // First file
@@ -681,7 +692,7 @@ function ViewModel() {
         fileindex++
 
         // Check if it's maybe a folder, we can't handle those
-        if (!file.type && file.size % 4096 == 0) return;
+        if (!file.type && file.size % 4096 === 0) return;
 
         // Add notification
         showNotification('.main-notification-box-uploading', 0, fileindex)
@@ -697,7 +708,7 @@ function ViewModel() {
         data.append("apikey", apiKey);
 
         // Optional, otherwise they get mis-labeled if left empty
-        if ($('#modal-add-nzb select[name="Category"]').val() != '*') data.append("cat", $('#modal-add-nzb select[name="Category"]').val());
+        if ($('#modal-add-nzb select[name="Category"]').val() !== '*') data.append("cat", $('#modal-add-nzb select[name="Category"]').val());
         if ($('#modal-add-nzb select[name="Processing"]').val()) data.append("pp", $('#modal-add-nzb select[name="Processing"]').val());
 
         // Add this one
@@ -729,10 +740,10 @@ function ViewModel() {
     // Load status info
     self.loadStatusInfo = function(item, event) {
         // Full refresh? Only on click and for the status-screen
-        var statusFullRefresh = (event != undefined) && $('#options-status').hasClass('active');
+        var statusFullRefresh = (event !== undefined) && $('#options-status').hasClass('active');
 
         // Measure performance? Takes a while
-        var statusPerformance = (event != undefined) && $(event.currentTarget).hasClass('diskspeed-button');
+        var statusPerformance = (event !== undefined) && $(event.currentTarget).hasClass('diskspeed-button');
 
         // Make it spin if the user requested it otherwise we don't,
         // because browsers use a lot of CPU for the animation
@@ -754,7 +765,6 @@ function ViewModel() {
             // Update basic
             self.statusInfo.folders(data.status.folders)
             self.statusInfo.loadavg(data.status.loadavg)
-            self.statusInfo.delayed_decoder(data.status.delayed_decoder)
             self.statusInfo.delayed_assembler(data.status.delayed_assembler)
 
             // Update the full set if the data is available
@@ -773,43 +783,7 @@ function ViewModel() {
             }
 
             // Update the servers
-            if (self.statusInfo.servers().length != data.status.servers.length) {
-                // Empty them, in case of update
-                self.statusInfo.servers([])
-
-                // Initial add
-                $.each(data.status.servers, function() {
-                    self.statusInfo.servers.push({
-                        'servername': ko.observable(this.servername),
-                        'serveroptional': ko.observable(this.serveroptional),
-                        'serverpriority': ko.observable(this.serverpriority),
-                        'servertotalconn': ko.observable(this.servertotalconn),
-                        'serverssl': ko.observable(this.serverssl),
-                        'serversslinfo': ko.observable(this.serversslinfo),
-                        'serveractiveconn': ko.observable(this.serveractiveconn),
-                        'servererror': ko.observable(this.servererror),
-                        'serveractive': ko.observable(this.serveractive),
-                        'serverconnections': ko.observableArray(this.serverconnections),
-                        'serverbps': ko.observable(this.serverbps)
-                    })
-                })
-            } else {
-                // Update
-                $.each(data.status.servers, function(index) {
-                    var activeServer = self.statusInfo.servers()[index];
-                    activeServer.servername(this.servername),
-                        activeServer.serveroptional(this.serveroptional),
-                        activeServer.serverpriority(this.serverpriority),
-                        activeServer.servertotalconn(this.servertotalconn),
-                        activeServer.serverssl(this.serverssl),
-                        activeServer.serversslinfo(this.serversslinfo),
-                        activeServer.serveractiveconn(this.serveractiveconn),
-                        activeServer.servererror(this.servererror),
-                        activeServer.serveractive(this.serveractive),
-                        activeServer.serverconnections(this.serverconnections),
-                        activeServer.serverbps(this.serverbps)
-                })
-            }
+            ko.mapping.fromJS(data.status.servers, {}, self.statusInfo.servers)
 
             // Add tooltips to possible new items
             if (!isMobile) $('#modal-options [data-tooltip="true"]').tooltip({ trigger: 'hover', container: 'body' })
@@ -825,7 +799,7 @@ function ViewModel() {
         var nzbSize = $(event.target).data('size')
 
         // Maybe it was a click on the icon?
-        if (nzbSize == undefined) {
+        if (nzbSize === undefined) {
             nzbSize = $(event.target.parentElement).data('size')
         }
 
@@ -907,7 +881,7 @@ function ViewModel() {
         $('#options-orphans [data-tooltip="true"]').tooltip('hide')
 
         // Show notification on delete
-        if ($(htmlElement.currentTarget).data('action') == 'delete_orphan') {
+        if ($(htmlElement.currentTarget).data('action') === 'delete_orphan') {
             showNotification('.main-notification-box-removing', 1000)
         } else {
             // Adding back to queue
@@ -1121,7 +1095,7 @@ function ViewModel() {
         // Reformat and set categories
         self.queue.categoriesList($.map(response.config.categories, function(cat) {
             // Default?
-            if(cat.name == '*') return { catValue: '*', catText: glitterTranslate.defaultText };
+            if(cat.name === '*') return { catValue: '*', catText: glitterTranslate.defaultText };
             return { catValue: cat.name, catText: cat.name };
         }))
 
@@ -1133,14 +1107,10 @@ function ViewModel() {
                 // Reformat script-list
                 self.queue.scriptsList($.map(script_response.scripts, function(script) {
                     // None?
-                    if(script == 'None') return { scriptValue: 'None', scriptText: glitterTranslate.noneText };
+                    if(script === 'None') return { scriptValue: 'None', scriptText: glitterTranslate.noneText };
                     return { scriptValue: script, scriptText: script };
                 }))
-                self.queue.scriptsListLoaded(true)
             })
-        } else {
-            // We can already continue
-            self.queue.scriptsListLoaded(true)
         }
 
 
@@ -1217,7 +1187,7 @@ function ViewModel() {
         // Orphaned folders? If user clicked away we check again in 5 days
         if (self.statusInfo.folders().length >= 3 && orphanMsg) {
             // Check if not already there
-            if (!ko.utils.arrayFirst(self.allMessages(), function(item) { return item.index == 'OrphanedMsg' })) {
+            if (!ko.utils.arrayFirst(self.allMessages(), function(item) { return item.index === 'OrphanedMsg' })) {
                 self.allMessages.push({
                     index: 'OrphanedMsg',
                     type: glitterTranslate.status['INFO'],
@@ -1229,7 +1199,7 @@ function ViewModel() {
         } else {
             // Remove any message, if it was there
             self.allMessages.remove(function(item) {
-                return item.index == 'OrphanedMsg';
+                return item.index === 'OrphanedMsg';
             })
         }
     })
@@ -1259,29 +1229,51 @@ function ViewModel() {
             window.location.href = './config/';
         });
         $(document).bind('keydown', 's', function(e) {
+            // Update the data
+            self.loadStatusInfo(true, true)
             // avoid modal clashes
             if (!$('.modal-dialog').is(':visible')) {
                 $('#modal-options').modal('show');
             }
         });
         $(document).bind('keydown', 'shift+left', function(e) {
-            $('#history-tab.active > ul.pagination li.active').prev().click();
-            $('#queue-tab.active > ul.pagination li.active').prev().click();
+            if($("body").hasClass("container-tabbed")) {
+                $('#history-tab.active > ul.pagination li.active').prev().click();
+                $('#queue-tab.active > ul.pagination li.active').prev().click();
+            } else {
+                $('#history-tab > ul.pagination li.active').prev().click();
+                $('#queue-tab > ul.pagination li.active').prev().click();
+            }
             e.preventDefault();
         });
         $(document).bind('keydown', 'shift+right', function(e) {
-            $('#history-tab.active > ul.pagination li.active').next().click();
-            $('#queue-tab.active > ul.pagination li.active').next().click();
+            if($("body").hasClass("container-tabbed")) {
+                $('#history-tab.active > ul.pagination li.active').next().click();
+                $('#queue-tab.active > ul.pagination li.active').next().click();
+            } else {
+                $('#history-tab > ul.pagination li.active').next().click();
+                $('#queue-tab > ul.pagination li.active').next().click();
+            }
             e.preventDefault();
         });
         $(document).bind('keydown', 'shift+up', function(e) {
-            $('#history-tab.active > ul.pagination li').first().click();
-            $('#queue-tab.active > ul.pagination li').first().click();
+            if($("body").hasClass("container-tabbed")) {
+                $('#history-tab.active > ul.pagination li').first().click();
+                $('#queue-tab.active > ul.pagination li').first().click();
+            } else {
+                $('#history-tab > ul.pagination li').first().click();
+                $('#queue-tab > ul.pagination li').first().click();
+            }
             e.preventDefault();
         });
         $(document).bind('keydown', 'shift+down', function(e) {
-            $('#history-tab.active > ul.pagination li').last().click();
-            $('#queue-tab.active > ul.pagination li').last().click();
+            if($("body").hasClass("container-tabbed")) {
+                $('#history-tab.active > ul.pagination li').last().click();
+                $('#queue-tab.active > ul.pagination li').last().click();
+            } else {
+                $('#history-tab > ul.pagination li').last().click();
+                $('#queue-tab > ul.pagination li').last().click();
+            }
             e.preventDefault();
         });
     }
@@ -1312,6 +1304,12 @@ function ViewModel() {
     // And refresh now!
     self.refresh()
 
-    // Activate tooltips
-    if (!isMobile) $('[data-tooltip="true"]').tooltip({ trigger: 'hover', container: 'body' })
+    // Special options for (non) mobile
+    if (isMobile) {
+        // Disable accept parameter on file inputs, as it doesn't work on mobile Safari
+        $("input[accept!=''][accept]").attr("accept","")
+    } else {
+        // Activate tooltips
+        $('[data-tooltip="true"]').tooltip({ trigger: 'hover', container: 'body' })
+    }
 }

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

@@ -37,7 +37,6 @@ function QueueListModel(parent) {
     self.multiEditItems = ko.observableArray([]);
     self.categoriesList = ko.observableArray([]);
     self.scriptsList = ko.observableArray([]);
-    self.scriptsListLoaded = ko.observable(false);
     self.searchTerm = ko.observable('').extend({ rateLimit: { timeout: 400, method: "notifyWhenChangesStop" } });
     self.paginationLimit = ko.observable(20).extend({ persist: 'queuePaginationLimit' });
     self.pagination = new paginationModel(self);
@@ -75,7 +74,7 @@ function QueueListModel(parent) {
         $.each(data.slots, function() {
             var item = this;
             var existingItem = ko.utils.arrayFirst(self.queueItems(), function(i) {
-                return i.id == item.nzo_id;
+                return i.id === item.nzo_id;
             });
 
             if(existingItem) {
@@ -88,7 +87,7 @@ function QueueListModel(parent) {
         });
 
         // Remove all items if there's any
-        if(itemIds.length == self.paginationLimit()) {
+        if(itemIds.length === self.paginationLimit()) {
             // Replace it, so only 1 Knockout DOM-update!
             self.queueItems(newItems);
             newItems = [];
@@ -97,7 +96,7 @@ function QueueListModel(parent) {
             $.each(itemIds, function() {
                 var id = this.toString();
                 self.queueItems.remove(ko.utils.arrayFirst(self.queueItems(), function(i) {
-                    return i.id == id;
+                    return i.id === id;
                 }));
             });
         }
@@ -159,6 +158,8 @@ function QueueListModel(parent) {
                 value: newValue
             })
         }
+        // Update pagination and counters
+        self.parent.refresh(true)
     });
 
     // Do we show search box. So it doesn't dissapear when nothing is found
@@ -169,7 +170,7 @@ function QueueListModel(parent) {
     // Searching in queue (rate-limited in decleration)
     self.searchTerm.subscribe(function() {
         // Go back to page 1
-        if(self.pagination.currentPage() != 1) {
+        if(self.pagination.currentPage() !== 1) {
             // This forces a refresh
             self.pagination.moveToPage(1);
         } else {
@@ -181,12 +182,12 @@ function QueueListModel(parent) {
     // Clear searchterm
     self.clearSearchTerm = function(data, event) {
         // Was it escape key or click?
-        if(event.type == 'mousedown' || (event.keyCode && event.keyCode == 27)) {
+        if(event.type === 'mousedown' || (event.keyCode && event.keyCode === 27)) {
             self.isLoading(true)
             self.searchTerm('');
         }
         // Was it click and the field is empty? Then we focus on the field
-        if(event.type == 'mousedown' && self.searchTerm() == '') {
+        if(event.type === 'mousedown' && self.searchTerm() === '') {
             $(event.target).parents('.search-box').find('input[type="text"]').focus()
             return;
         }
@@ -253,7 +254,7 @@ function QueueListModel(parent) {
         // Reset form and remove all checked ones
         $form[0].reset();
         self.multiEditItems.removeAll();
-        $('.delete input[name="multiedit"], #multiedit-checkall').prop({'checked': false, 'indeterminate': false})
+        $('.queue-table input[name="multiedit"], #multiedit-checkall-queue').prop({'checked': false, 'indeterminate': false})
 
         // Is the multi-edit in view?
         if(($form.offset().top + $form.outerHeight(true)) > ($(window).scrollTop()+$(window).height())) {
@@ -283,7 +284,7 @@ function QueueListModel(parent) {
         }
 
         // Update check-all buton state
-        setCheckAllState('#multiedit-checkall', '.queue-table input[name="multiedit"]')
+        setCheckAllState('#multiedit-checkall-queue', '.queue-table input[name="multiedit"]')
         return true;
     }
 
@@ -294,7 +295,7 @@ function QueueListModel(parent) {
 
         // We need to re-evaltuate the state of this check-all
         // Otherwise the 'inderterminate' will be overwritten by the click event!
-        setCheckAllState('#multiedit-checkall', '.queue-table input[name="multiedit"]')
+        setCheckAllState('#multiedit-checkall-queue', '.queue-table input[name="multiedit"]')
 
         // Now we can check what happend
         // For when some are checked, or all are checked (but not partly)
@@ -326,7 +327,7 @@ function QueueListModel(parent) {
             self.doMultiEditUpdate()
         }
         // Set state of all the check-all's
-        setCheckAllState('#multiedit-checkall', '.queue-table input[name="multiedit"]')
+        setCheckAllState('#multiedit-checkall-queue', '.queue-table input[name="multiedit"]')
         return true;
     }
 
@@ -343,57 +344,64 @@ function QueueListModel(parent) {
         var newStatus = $('.multioperations-selector input[name="multiedit-status"]:checked').val()
 
         // List all the ID's
-        var  strIDs = '';
+        var strIDs = '';
         $.each(self.multiEditItems(), function(index) {
             strIDs = strIDs + this.id + ',';
         })
 
+        // All non-category updates need to only happen after a category update
+        function nonCatUpdates() {
+            if(newScript !== '') {
+                callAPI({
+                    mode: 'change_script',
+                    value: strIDs,
+                    value2: newScript
+                })
+            }
+            if(newPrior !== '') {
+                callAPI({
+                    mode: 'queue',
+                    name: 'priority',
+                    value: strIDs,
+                    value2: newPrior
+                })
+            }
+            if(newProc !== '') {
+                callAPI({
+                    mode: 'change_opts',
+                    value: strIDs,
+                    value2: newProc
+                })
+            }
+            if(newStatus) {
+                callAPI({
+                    mode: 'queue',
+                    name: newStatus,
+                    value: strIDs
+                })
+            }
+
+            // Wat a little and do the refresh
+            // Only if anything changed!
+            if(newStatus || newProc !== '' || newPrior !== '' || newScript !== '' || newCat !== '') {
+                setTimeout(parent.refresh, 100)
+            }
+        }
+
         // What is changed?
-        if(newCat != '') {
+        if(newCat !== '') {
             callAPI({
                 mode: 'change_cat',
                 value: strIDs,
                 value2: newCat
-            })
-        }
-        if(newScript != '') {
-            callAPI({
-                mode: 'change_script',
-                value: strIDs,
-                value2: newScript
-            })
-        }
-        if(newPrior != '') {
-            callAPI({
-                mode: 'queue',
-                name: 'priority',
-                value: strIDs,
-                value2: newPrior
-            })
-        }
-        if(newProc != '') {
-            callAPI({
-                mode: 'change_opts',
-                value: strIDs,
-                value2: newProc
-            })
-        }
-        if(newStatus) {
-            callAPI({
-                mode: 'queue',
-                name: newStatus,
-                value: strIDs
-            })
+            }).then(nonCatUpdates)
+        } else {
+            nonCatUpdates()
         }
 
-        // Wat a little and do the refresh
-        // Only if anything changed!
-        if(newStatus || newProc != '' || newPrior != '' || newScript != '' || newCat != '') {
-            setTimeout(parent.refresh, 100)
-        }
     }
 
-    // Selete all selected
+    // Delete all selected
     self.doMultiDelete = function() {
         // Anything selected?
         if(self.multiEditItems().length < 1) return;
@@ -438,7 +446,7 @@ function QueueListModel(parent) {
             })
 
             // Update check-all buton state
-            setCheckAllState('#multiedit-checkall', '.queue-table input[name="multiedit"]')
+            setCheckAllState('#multiedit-checkall-queue', '.queue-table input[name="multiedit"]')
         }, 100)
     }, null, "arrayChange")
 }
@@ -458,8 +466,8 @@ function QueueModel(parent, data) {
     self.index = ko.observable(data.index);
     self.status = ko.observable(data.status);
     self.labels = ko.observableArray(data.labels);
-    self.isGrabbing = ko.observable(data.status == 'Grabbing' || data.avg_age == '-')
-    self.isFetchingBlocks = data.status == 'Fetching' || data.priority == 'Repair' // No need to update
+    self.isGrabbing = ko.observable(data.status === 'Grabbing' || data.avg_age === '-')
+    self.isFetchingBlocks = data.status === 'Fetching' || data.priority === 'Repair' // No need to update
     self.totalMB = ko.observable(parseFloat(data.mb));
     self.remainingMB = ko.observable(parseFloat(data.mbleft))
     self.missingMB = ko.observable(parseFloat(data.mbmissing))
@@ -470,7 +478,7 @@ function QueueModel(parent, data) {
     self.priority = ko.observable(parent.priorityName[data.priority]);
     self.script = ko.observable(data.script);
     self.unpackopts = ko.observable(parseInt(data.unpackopts)) // UnpackOpts fails if not parseInt'd!
-    self.pausedStatus = ko.observable(data.status == 'Paused');
+    self.pausedStatus = ko.observable(data.status === 'Paused');
     self.timeLeft = ko.observable(data.timeleft);
 
     // Initially empty
@@ -481,7 +489,7 @@ function QueueModel(parent, data) {
     // Color of the progress bar
     self.progressColor = ko.computed(function() {
         // Checking
-        if(self.status() == 'Checking') {
+        if(self.status() === 'Checking') {
             return '#58A9FA'
         }
         // Check for missing data, the value is arbitrary! (2%)
@@ -489,7 +497,7 @@ function QueueModel(parent, data) {
             return '#F8A34E'
         }
         // Set to grey, only when not Force download
-        if((self.parent.parent.downloadsPaused() && self.priority() != 2) || self.pausedStatus()) {
+        if((self.parent.parent.downloadsPaused() && self.priority() !== 2) || self.pausedStatus()) {
             return '#B7B7B7'
         }
         // Nothing
@@ -498,6 +506,9 @@ function QueueModel(parent, data) {
 
     // MB's
     self.progressText = ko.pureComputed(function() {
+        if(self.isGrabbing()) {
+            return glitterTranslate.fetchingURL
+        }
         return (self.totalMB() - self.remainingMB()).toFixed(0) + " MB / " + (self.totalMB() * 1).toFixed(0) + " MB";
     })
 
@@ -517,15 +528,15 @@ function QueueModel(parent, data) {
     })
     self.statusText = ko.computed(function() {
         // Checking
-        if(self.status() == 'Checking') {
+        if(self.status() === 'Checking') {
             return glitterTranslate.checking
         }
         // Grabbing
-        if(self.status() == 'Grabbing') {
+        if(self.status() === 'Grabbing') {
             return glitterTranslate.fetch
         }
         // Pausing status
-        if((self.parent.parent.downloadsPaused() && self.priority() != 2) || self.pausedStatus()) {
+        if((self.parent.parent.downloadsPaused() && self.priority() !== 2) || self.pausedStatus()) {
             return glitterTranslate.paused;
         }
         // Just the time
@@ -535,7 +546,7 @@ function QueueModel(parent, data) {
     // Icon to better show force-priority
     self.queueIcon = ko.computed(function() {
         // Force comes first
-        if(self.priority() == 2) {
+        if(self.priority() === 2) {
             return 'glyphicon-forward'
         }
         if(self.pausedStatus()) {
@@ -549,17 +560,17 @@ function QueueModel(parent, data) {
         switch(param) {
             case 'category':
                 // Exception for *
-                if(self.category() == "*")
+                if(self.category() === "*")
                     return glitterTranslate.defaultText
                 return self.category();
             case 'priority':
                 // Onload-exception
-                if(self.priority() == undefined) return;
-                return ko.utils.arrayFirst(self.parent.priorityOptions(), function(item) { return item.value == self.priority()}).name;
+                if(self.priority() === undefined) return;
+                return ko.utils.arrayFirst(self.parent.priorityOptions(), function(item) { return item.value === self.priority()}).name;
             case 'processing':
                 // Onload-exception
-                if(self.unpackopts() == undefined) return;
-                return ko.utils.arrayFirst(self.parent.processingOptions(), function(item) { return item.value == self.unpackopts()}).name;
+                if(self.unpackopts() === undefined) return;
+                return ko.utils.arrayFirst(self.parent.processingOptions(), function(item) { return item.value === self.unpackopts()}).name;
             case 'scripts':
                 return self.script();
             case 'age':
@@ -575,7 +586,7 @@ function QueueModel(parent, data) {
         self.password(data.password);
         self.index(data.index);
         self.status(data.status)
-        self.isGrabbing(data.status == 'Grabbing' || data.avg_age == '-')
+        self.isGrabbing(data.status === 'Grabbing' || data.avg_age === '-')
         self.totalMB(parseFloat(data.mb));
         self.remainingMB(parseFloat(data.mbleft));
         self.missingMB(parseFloat(data.mbmissing))
@@ -586,12 +597,12 @@ function QueueModel(parent, data) {
         self.priority(parent.priorityName[data.priority]);
         self.script(data.script);
         self.unpackopts(parseInt(data.unpackopts)) // UnpackOpts fails if not parseInt'd!
-        self.pausedStatus(data.status == 'Paused');
+        self.pausedStatus(data.status === 'Paused');
         self.timeLeft(data.timeleft);
 
         // Did the label-list change?
         // Otherwise KO will send updates to all texts during refresh()
-        if(self.rawLabels != data.labels.toString()) {
+        if(self.rawLabels !== data.labels.toString()) {
             // Update
             self.labels(data.labels);
             self.rawLabels = data.labels.toString();
@@ -628,7 +639,7 @@ function QueueModel(parent, data) {
     // Do on change
     self.nameForEdit.subscribe(function(newName) {
         // Anything change or empty?
-        if(!newName || self.name() == newName) return;
+        if(!newName || self.name() === newName) return;
 
         // Rename would abort Direct Unpack, so ask if user is sure
         if(self.direct_unpack() && !confirm(glitterTranslate.renameAbort)) return;
@@ -718,7 +729,7 @@ function QueueModel(parent, data) {
                 // Make sure no flickering (if there are more items left) and then remove
                 self.parent.isLoading(self.parent.totalItems() > 1)
                 parent.queueItems.remove(itemToDelete);
-                parent.multiEditItems.remove(function(inList) { return inList.id == itemToDelete.id; })
+                parent.multiEditItems.remove(function(inList) { return inList.id === itemToDelete.id; })
                 self.parent.parent.refresh();
                 // Hide notifcation
                 hideNotification()

interfaces/Glitter/templates/static/javascripts/search-query-parser.js

@@ -35,7 +35,12 @@ function search_query_parse(string, options) {
         var exclusion = {};
         var terms = [];
         // Get a list of search terms respecting single and double quotes
+        var regex = /(\S+:'(?:[^'\\]|\\.)*')|(\S+:"(?:[^"\\]|\\.)*")|\S+|\S+:\S+/g;
+        /*
+        Removed exclusion matching for SABnzbd, original regex:
         var regex = /(\S+:'(?:[^'\\]|\\.)*')|(\S+:"(?:[^"\\]|\\.)*")|(-?"(?:[^"\\]|\\.)*")|(-?'(?:[^'\\]|\\.)*')|\S+|\S+:\S+/g;
+        See: https://github.com/sabnzbd/sabnzbd/issues/2342
+         */
         var match;
         while ((match = regex.exec(string)) !== null) {
             var term = match[0];
@@ -67,10 +72,15 @@ function search_query_parse(string, options) {
                 });
             } else {
                 var isExcludedTerm = false;
+                /*
+                    Removed for SABnzbd
+                    See: https://github.com/sabnzbd/sabnzbd/issues/2342
+
                 if (term[0] === '-') {
                     isExcludedTerm = true;
                     term = term.slice(1);
                 }
+                */
 
                 // Strip surrounding quotes
                 term = term.replace(/^\"|\"$|^\'|\'$/g, '');

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

@@ -442,7 +442,7 @@ tbody>tr>td:last-child {
 .container-tabbed #queue-tab,
 .container-tabbed #queue-tab,
 .container-tabbed #queue-messages,
-.container-tabbed .history h2,
+.container-tabbed .history-header h2,
 .container-tabbed .queue h2,
 .history-queue-swicher {
     display: none;
@@ -494,6 +494,10 @@ tbody>tr>td:last-child {
     background-color: #d9534f !important;
 }
 
+.history-queue-swicher .badge-info {
+    background-color: #58A9FA !important;
+}
+
 .history-queue-swicher .badge {
     margin-left: 4px;
 }
@@ -986,8 +990,27 @@ tr.queue-item>td:first-child>a {
     position: relative;
 }
 
-.history h2 {
+.history-header {
     clear: left;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+}
+
+.history-header a {
+    align-self: center;
+    margin-right: 2px;
+    font-size: 12px;
+}
+
+.container-tabbed .history-header {
+    display: inline;
+}
+
+.container-tabbed .history-header a {
+    position: absolute;
+    right: 0;
+    top: 10px;
 }
 
 .history-table {
@@ -1085,6 +1108,18 @@ tr.queue-item>td:first-child>a {
     display: inline-block;
 }
 
+#history-options div {
+    display: inline-block;
+    margin-left: 5px;
+}
+
+#history-options input[name="multieditCheckAll"] {
+    vertical-align: middle;
+    position: relative;
+    top: -1px;
+    margin-left: 8px;
+} 
+
 #history-options .hover-button span {
     top: 2px;
 }

interfaces/wizard/README.TXT

@@ -1,5 +1,5 @@
 #
-# Copyright 2009 The SABnzbd-Team <team@sabnzbd.org>
+# Copyright 2009 The SABnzbd-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

interfaces/wizard/inc_top.tmpl

@@ -5,6 +5,9 @@
         <title>$T('wizard-quickstart')</title>
         <link rel="stylesheet" type="text/css" href="../staticcfg/bootstrap/css/bootstrap.min.css?v=$version"/>
         <link rel="stylesheet" type="text/css" href="static/style.css?v=$version"/>
+        <!--#if $color_scheme not in ('Light', '') #-->
+        <link rel="stylesheet" type="text/css" href="../staticcfg/css/${color_scheme}.css?v=$version"/>
+        <!--#end if#-->
         <link rel="shortcut icon" href="../staticcfg/ico/favicon.ico?v=$version" />
         <script type="text/javascript" src="../staticcfg/js/jquery-3.5.1.min.js?v=$version"></script>
         <script type="text/javascript" src="../staticcfg/bootstrap/js/bootstrap.min.js?v=$version"></script>

interfaces/wizard/one.html

@@ -15,6 +15,8 @@
 
                 <br /><br />
 
+                <input type="hidden" name="server" value="$server" />
+
                 <div class="row">
                     <div class="col-md-7 form-horizontal">
                         <div class="form-group">
@@ -46,7 +48,7 @@
                         <div class="form-group">
                             <div class="col-sm-4"></div>
                             <div class="col-sm-8">
-                                <a href="#" onclick="\$('#server-hidden-settings').removeClass('hidden');\$(this).parent().parent().hide()">
+                                <a href="#" class="wizard-advanced-settings" onclick="\$('#server-hidden-settings').removeClass('hidden');\$(this).parent().parent().hide()">
                                     <span class="glyphicon glyphicon-cog"></span> $T('button-advanced')
                                 </a>
                             </div>
@@ -55,7 +57,7 @@
                             <div class="form-group">
                                 <label for="port" class="col-sm-4 control-label">$T('srv-port')</label>
                                 <div class="col-sm-8">
-                                    <input type="number" class="form-control" name="port" id="port" value="<!--#if $port then $port else '119' #-->" />
+                                    <input type="number" class="form-control" name="port" id="port" value="<!--#if $port then $port else '563' #-->" />
                                 </div>
                             </div>
                             <div class="form-group">

interfaces/wizard/static/javascript/checkserver.js

@@ -56,12 +56,12 @@ $(document).ready(function() {
     $('#ssl').click(function() {
         if(this.checked) {
             // Enabled SSL change port when not already a custom port
-            if($('#port').val() == '119') {
+            if($('#port').val() === '119') {
                 $('#port').val('563')
             }
         } else {
             // Remove SSL port
-            if($('#port').val() == '563') {
+            if($('#port').val() === '563') {
                 $('#port').val('119')
             }
         }

interfaces/wizard/static/style.css

@@ -171,10 +171,10 @@ label {
 * {
     border-radius: 0 !important;
 }
-#content a,
-#content a:hover,
-#content a:active,
-#content a:visited,
+a,
+a:hover,
+a:active,
+a:visited,
 #serverResponse {
     color: #555;
 }

interfaces/wizard/two.html

@@ -32,7 +32,7 @@
             </div>
 
             <hr/>
-            <p>$T('wizard-tip-wiki') <a target="_blank" href="$helpuri">$T('menu-wiki')</a> <span class="glyphicon glyphicon-info-sign"></span></p>
+            <p>$T('wizard-tip-wiki') <a target="_blank" href="https://sabnzbd.org/wiki/">$T('menu-wiki')</a> <span class="glyphicon glyphicon-info-sign"></span></p>
 
         </div>
         <hr />

licenses/License-kronos.txt

@@ -1,5 +1,5 @@
 Kronos.py is written by Irmen de Jong.
-Retreived from:
+Retrieved from:
 http://www.razorvine.net/download/kronos.py
 
 Quote from the module:

linux/org.sabnzbd.sabnzbd.appdata.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2022 The SABnzbd-Team <team@sabnzbd.org> -->
+<!-- Copyright 2022-2023 The SABnzbd-Team (sabnzbd.org) -->
 <component type="desktop-application">
   <id>org.sabnzbd.sabnzbd</id>
   <metadata_license>MIT</metadata_license>
@@ -23,18 +23,37 @@
   </categories>
   <url type="homepage">https://sabnzbd.org</url>
   <url type="bugtracker">https://github.com/sabnzbd/sabnzbd/issues</url>
+  <url type="vcs-browser">https://github.com/sabnzbd/sabnzbd</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>
+  <url type="contact">https://sabnzbd.org/live-chat.html</url>
+  <releases>
+    <release version="4.2.0" date="2023-11-26" type="stable"/>
+    <release version="4.1.0" date="2023-09-26" type="stable"/>
+    <release version="4.0.3" date="2023-06-16" type="stable"/>
+    <release version="4.0.2" date="2023-06-09" type="stable"/>
+    <release version="4.0.1" date="2023-05-01" type="stable"/>
+    <release version="4.0.0" date="2023-04-28" type="stable"/>
+    <release version="3.7.2" date="2023-02-05" type="stable"/>
+  </releases>
   <launchable type="desktop-id">sabnzbd.desktop</launchable>
   <provides>
     <mediatype>application/x-nzb</mediatype>
     <mediatype>application/x-compressed-nzb</mediatype>
   </provides>
+  <supports>
+    <control>pointing</control>
+    <control>keyboard</control>
+    <control>touch</control>
+  </supports>
+  <recommends>
+    <display_length compare="ge">small</display_length>
+    <internet>always</internet>
+  </recommends>
   <project_license>GPL-2.0-or-later</project_license>
-  <developer_name>The SABnzbd-team</developer_name>
+  <developer_name>The SABnzbd-Team</developer_name>
   <screenshots>
     <screenshot type="default">
       <image>https://sabnzbd.org/images/landing/screenshots/interface.png</image>

osx/par2/LICENSE

@@ -1,10 +0,0 @@
-par2SL version 1.0, Copyright (C) 2003 Peter Brian Clements.
-Adapted for use with MacPar deLuxe by Gerard Putter.
-
-This program is compatible with Mac OS X Snow Leopard or later.
-It uses Grand Central Dispatch to optimize the speed and processor load.
-
-This is free software, and you are welcome to 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. See COPYING for details.

osx/par2/arm64/LICENSE.txt

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

@@ -1,28 +0,0 @@
-# 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,10 @@
 #
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\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,12 +1,11 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
-"Language-Team: Czech (https://www.transifex.com/sabnzbd/teams/111101/cs/)\n"
+"Language-Team: Czech (https://app.transifex.com/sabnzbd/teams/111101/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/email/da.po

@@ -1,16 +1,15 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\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"
+"Language-Team: Danish (https://app.transifex.com/sabnzbd/teams/111101/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/email/de.po

@@ -1,16 +1,15 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\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"
+"Language-Team: German (https://app.transifex.com/sabnzbd/teams/111101/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/email/es.po

@@ -1,16 +1,15 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\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"
+"Language-Team: Spanish (https://app.transifex.com/sabnzbd/teams/111101/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/email/fi.po

@@ -1,16 +1,15 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\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"
+"Language-Team: Finnish (https://app.transifex.com/sabnzbd/teams/111101/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/email/fr.po

@@ -1,16 +1,15 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\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"
+"Language-Team: French (https://app.transifex.com/sabnzbd/teams/111101/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/email/he.po

@@ -1,16 +1,15 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 # 
 # Translators:
 # ION, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\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"
+"Language-Team: Hebrew (https://app.transifex.com/sabnzbd/teams/111101/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/email/nb.po

@@ -1,16 +1,15 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\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"
+"Language-Team: Norwegian Bokmål (https://app.transifex.com/sabnzbd/teams/111101/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/email/nl.po

@@ -1,16 +1,15 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\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"
+"Language-Team: Dutch (https://app.transifex.com/sabnzbd/teams/111101/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/email/pl.po

@@ -1,16 +1,15 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\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"
+"Language-Team: Polish (https://app.transifex.com/sabnzbd/teams/111101/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/email/pt_BR.po

@@ -1,16 +1,15 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\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"
+"Language-Team: Portuguese (Brazil) (https://app.transifex.com/sabnzbd/teams/111101/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/email/ro.po

@@ -1,16 +1,15 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\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"
+"Language-Team: Romanian (https://app.transifex.com/sabnzbd/teams/111101/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/email/ru.po

@@ -1,16 +1,15 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\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"
+"Language-Team: Russian (https://app.transifex.com/sabnzbd/teams/111101/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/email/sr.po

@@ -1,16 +1,15 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\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"
+"Language-Team: Serbian (https://app.transifex.com/sabnzbd/teams/111101/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/email/sv.po

@@ -1,16 +1,15 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\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"
+"Language-Team: Swedish (https://app.transifex.com/sabnzbd/teams/111101/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/email/zh_CN.po

@@ -1,16 +1,15 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\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"
+"Language-Team: Chinese (China) (https://app.transifex.com/sabnzbd/teams/111101/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/main/SABnzbd.pot

@@ -1,11 +1,10 @@
 #
 # SABnzbd Translation Template file MAIN
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: team@sabnzbd.org\n"
 "Language-Team: SABnzbd <team@sabnzbd.org>\n"
@@ -35,12 +34,7 @@ msgstr ""
 
 #. Error message
 #: SABnzbd.py
-msgid "SABYenc disabled: no correct version found! (Found v%s, expecting v%s)"
-msgstr ""
-
-#. Error message
-#: SABnzbd.py
-msgid "SABYenc module... NOT found! Expecting v%s - https://sabnzbd.org/sabyenc"
+msgid "SABCTools disabled: no correct version found! (Found v%s, expecting v%s)"
 msgstr ""
 
 #. Error message
@@ -58,14 +52,11 @@ msgstr ""
 msgid "unrar binary... NOT found"
 msgstr ""
 
+#. Warning message
 #: SABnzbd.py
 msgid "7za binary... NOT found!"
 msgstr ""
 
-#: SABnzbd.py
-msgid "unzip binary... NOT found!"
-msgstr ""
-
 #. Error message
 #: SABnzbd.py
 msgid "Essential modules are missing, downloading cannot start."
@@ -139,11 +130,6 @@ msgstr ""
 msgid "Restarting because of crashed downloader"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/__init__.py
-msgid "Restarting because of crashed decoder"
-msgstr ""
-
 #. Warning message
 #: sabnzbd/__init__.py
 msgid "Restarting because of crashed assembler"
@@ -163,7 +149,7 @@ msgid "Test Notification"
 msgstr ""
 
 #: sabnzbd/api.py
-msgid "&nbsp;Resolving address"
+msgid "Resolving address"
 msgstr ""
 
 #. No value, used in dropdown menus
@@ -247,10 +233,6 @@ msgstr ""
 msgid "Incorrect parameter"
 msgstr ""
 
-#: sabnzbd/cfg.py
-msgid "UNC path \"%s\" not allowed here"
-msgstr ""
-
 #: sabnzbd/cfg.py
 msgid "%s is not a valid email address"
 msgstr ""
@@ -259,7 +241,7 @@ msgstr ""
 msgid "Server address required"
 msgstr ""
 
-#: sabnzbd/cfg.py, sabnzbd/utils/servertests.py
+#: sabnzbd/cfg.py, sabnzbd/newswrapper.py
 msgid "Invalid server address."
 msgstr ""
 
@@ -277,7 +259,20 @@ msgid "Permissions setting of %s might deny SABnzbd access to the files and fold
 msgstr ""
 
 #: sabnzbd/cfg.py
-msgid "Error: Queue not empty, cannot change folder."
+msgid "UNC path \"%s\" not allowed here"
+msgstr ""
+
+#: sabnzbd/cfg.py
+msgid "Queue not empty, cannot change folder."
+msgstr ""
+
+#: sabnzbd/cfg.py
+msgid "The Completed Download Folder cannot be the same or a subfolder of the Temporary Download Folder"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/cfg.py
+msgid "Do not use a folder in the application folder as your Scripts Folder, it might be emptied during updates."
 msgstr ""
 
 #. Warning message
@@ -325,7 +320,7 @@ msgstr ""
 msgid "Failed to close database, see log"
 msgstr ""
 
-#. Error message
+#. Warning message
 #: sabnzbd/database.py
 msgid "Invalid stage logging in history for %s"
 msgstr ""
@@ -389,11 +384,10 @@ msgid "Paused"
 msgstr ""
 
 #. Warning message
-#: sabnzbd/downloader.py, sabnzbd/interface.py, sabnzbd/skintext.py
+#: sabnzbd/downloader.py, sabnzbd/skintext.py
 msgid "You must set a maximum bandwidth before you can set a bandwidth limit"
 msgstr ""
 
-#. Warning message
 #: sabnzbd/downloader.py
 msgid "Cannot connect to server %s [%s]"
 msgstr ""
@@ -417,19 +411,21 @@ msgstr ""
 msgid "Failed to initialize %s@%s with reason: %s"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "Too many connections to server %s"
-msgstr ""
-
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "Probable account sharing"
-msgstr ""
-
 #. Error message
 #: sabnzbd/downloader.py
-msgid "Failed login for server %s"
+msgid "Fatal error in Downloader"
+msgstr ""
+
+#: sabnzbd/downloader.py
+msgid "Too many connections to server %s [%s]"
+msgstr ""
+
+#: sabnzbd/downloader.py
+msgid "Login from too many different IP addresses to server %s [%s] - https://sabnzbd.org/multiple-adresses"
+msgstr ""
+
+#: sabnzbd/downloader.py
+msgid "Failed login for server %s [%s]"
 msgstr ""
 
 #. Error message
@@ -569,12 +565,22 @@ msgstr ""
 
 #. Warning message
 #: sabnzbd/filesystem.py
-msgid "%s is not writable with special character filenames. This can cause problems."
+msgid "%s is not writable at all. This blocks downloads."
 msgstr ""
 
 #. Warning message
 #: sabnzbd/filesystem.py
-msgid "%s is not writable at all. This blocks downloads."
+msgid "Cannot write a long filename to %s. This can cause problems."
+msgstr ""
+
+#. Warning message
+#: sabnzbd/filesystem.py
+msgid "Cannot write a unicode filename to %s. This can cause problems."
+msgstr ""
+
+#. Warning message
+#: sabnzbd/filesystem.py
+msgid "%s is not writable with special character filenames. This can cause problems."
 msgstr ""
 
 #: sabnzbd/interface.py
@@ -602,7 +608,7 @@ msgstr ""
 msgid "API Key incorrect, Use the api key from Config->General in your 3rd party program:"
 msgstr ""
 
-#: sabnzbd/interface.py, sabnzbd/newswrapper.py, sabnzbd/utils/servertests.py
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
 msgid "Authentication failed, check username/password."
 msgstr ""
 
@@ -611,18 +617,10 @@ msgstr ""
 msgid "Unsuccessful login attempt from %s"
 msgstr ""
 
-#: sabnzbd/interface.py
-msgid "The Completed Download Folder cannot be the same or a subfolder of the Temporary Download Folder"
-msgstr ""
-
 #: sabnzbd/interface.py
 msgid "Invalid backup archive"
 msgstr ""
 
-#: sabnzbd/interface.py
-msgid "Warning: LOCALHOST is ambiguous, use numerical IP-address."
-msgstr ""
-
 #: sabnzbd/interface.py
 msgid "Server address \"%s:%s\" is not valid."
 msgstr ""
@@ -730,11 +728,22 @@ msgstr ""
 msgid "Python script \"%s\" does not have execute (+x) permission set"
 msgstr ""
 
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Series Sorting"
+msgstr ""
+
+#: sabnzbd/misc.py
+msgid "Date Sorting"
+msgstr ""
+
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Movie Sorting"
+msgstr ""
+
 #: sabnzbd/newsunpack.py, sabnzbd/postproc.py
 msgid "Running script"
 msgstr ""
 
-#. Warning message
 #: sabnzbd/newsunpack.py
 msgid "Unpack nesting too deep [%s]"
 msgstr ""
@@ -822,19 +831,6 @@ msgstr ""
 msgid "Corrupt RAR file"
 msgstr ""
 
-#: sabnzbd/newsunpack.py
-msgid "%s files in %s"
-msgstr ""
-
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "Error \"%s\" while running unzip() on %s"
-msgstr ""
-
-#: sabnzbd/newsunpack.py
-msgid "No 7za binary found, cannot unpack \"%s\""
-msgstr ""
-
 #: sabnzbd/newsunpack.py
 msgid "Trying 7zip with password \"%s\""
 msgstr ""
@@ -1086,6 +1082,18 @@ msgstr ""
 msgid "NZB added to queue"
 msgstr ""
 
+#: sabnzbd/nzbqueue.py, sabnzbd/nzbstuff.py
+msgid "Ignoring duplicate NZB \"%s\""
+msgstr ""
+
+#: sabnzbd/nzbqueue.py, sabnzbd/nzbstuff.py
+msgid "Failing duplicate NZB \"%s\""
+msgstr ""
+
+#: sabnzbd/nzbqueue.py, sabnzbd/nzbstuff.py
+msgid "Duplicate NZB"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (error: %s)"
@@ -1100,26 +1108,6 @@ msgstr ""
 msgid "Pre-queue script marked job as failed"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Ignoring duplicate NZB \"%s\""
-msgstr ""
-
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Failing duplicate NZB \"%s\""
-msgstr ""
-
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Duplicate NZB"
-msgstr ""
-
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Pausing duplicate NZB \"%s\""
-msgstr ""
-
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Unwanted Extension in file %s (%s)"
@@ -1138,6 +1126,10 @@ msgstr ""
 msgid "DUPLICATE"
 msgstr ""
 
+#: sabnzbd/nzbstuff.py
+msgid "ALTERNATIVE"
+msgstr ""
+
 #: sabnzbd/nzbstuff.py
 msgid "ENCRYPTED"
 msgstr ""
@@ -1183,6 +1175,10 @@ msgstr ""
 msgid "%s articles had non-matching duplicates"
 msgstr ""
 
+#: sabnzbd/nzbstuff.py
+msgid "Pausing duplicate NZB \"%s\""
+msgstr ""
+
 #. Footer: indicator of warnings
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Warnings"
@@ -1412,11 +1408,11 @@ msgid "Running user script %s"
 msgstr ""
 
 #: sabnzbd/postproc.py
-msgid "Ran %s"
+msgid "Script exit code is %s"
 msgstr ""
 
 #: sabnzbd/postproc.py
-msgid "Script exit code is %s"
+msgid "Ran %s"
 msgstr ""
 
 #: sabnzbd/postproc.py, sabnzbd/skintext.py
@@ -1748,32 +1744,32 @@ msgstr ""
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Pause low prioirty jobs"
+msgid "Pause low priority jobs"
 msgstr ""
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Pause normal prioirty jobs"
+msgid "Pause normal priority jobs"
 msgstr ""
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Pause high prioirty jobs"
+msgid "Pause high priority jobs"
 msgstr ""
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Resume low prioirty jobs"
+msgid "Resume low priority jobs"
 msgstr ""
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Resume normal prioirty jobs"
+msgid "Resume normal priority jobs"
 msgstr ""
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Resume high prioirty jobs"
+msgid "Resume high priority jobs"
 msgstr ""
 
 #. Config->Scheduler
@@ -2053,10 +2049,6 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Download Dir"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Are you sure you want to shutdown SABnzbd?"
 msgstr ""
@@ -2141,11 +2133,6 @@ msgstr ""
 msgid "Retry"
 msgstr ""
 
-#. Queue end-of-queue selection box
-#: sabnzbd/skintext.py
-msgid "Actions"
-msgstr ""
-
 #. Queue page table, script selection menu
 #: sabnzbd/skintext.py
 msgid "Scripts"
@@ -2341,10 +2328,6 @@ msgstr ""
 msgid "Download speed limited by"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "CPU"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Disk speed"
 msgstr ""
@@ -2419,24 +2402,16 @@ msgstr ""
 msgid "When your IP address changes or SABnzbd is restarted the session will expire."
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Enable Unzip"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Enable 7zip"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Multicore Par2"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Secure (SSL) connections from SABnzbd to newsservers and HTTPS websites will be encrypted, however, validating a server's identity using its certificates is not possible. OpenSSL 1.0.2 or above and up-to-date local CA certificates are required."
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Speed up repairs by installing multicore Par2, it is available for many platforms."
+msgid "Speed up repairs by installing par2cmdline-turbo, it is available for many platforms."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -2759,6 +2734,10 @@ msgstr ""
 msgid "Location to store finished, fully processed downloads.<br /><i>Can be overruled by user-defined categories.</i>"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Use Sorting to automatically organize and rename your completed downloads."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Minimum Free Space for Completed Download Folder"
 msgstr ""
@@ -2789,7 +2768,7 @@ msgid "Watched Folder"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Folder to monitor for .nzb files.<br /><i>Also scans .zip .rar and .tar.gz archives for .nzb files.</i>"
+msgid "Folder to monitor for .nzb files."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -2828,6 +2807,10 @@ msgstr ""
 msgid "System Folders"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Hidden Folders"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Administrative Folder"
 msgstr ""
@@ -2856,6 +2839,10 @@ msgstr ""
 msgid "Location of log files for SABnzbd.<br /><i>Requires SABnzbd restart!</i>"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Purge Logs"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid ".nzb Backup Folder"
 msgstr ""
@@ -3000,14 +2987,6 @@ msgstr ""
 msgid "When the user script returns a non-zero exit code, the job will be flagged as failed."
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "On failure, try alternative NZB"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Some servers provide an alternative NZB when a download fails."
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Enable folder rename"
 msgstr ""
@@ -3024,6 +3003,14 @@ msgstr ""
 msgid "Used before an NZB enters the queue."
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "On queue finish script"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Executed after the queue finishes downloading."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Extra PAR2 Parameters"
 msgstr ""
@@ -3243,26 +3230,6 @@ msgstr ""
 msgid "When during download it becomes clear that too much data is missing, abort the job"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Server IP address selection"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "First IP address"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Randomly selected IP address"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Quickest IP address, preferring IPv6"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Useful if a newsserver has more than one IPv4/IPv6 address"
-msgstr ""
-
 #. Caption - Button: Add server
 #: sabnzbd/skintext.py
 msgid "Add Server"
@@ -3455,6 +3422,10 @@ msgstr ""
 msgid "Force Download"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Apply filters"
+msgstr ""
+
 #. Config->RSS edit button
 #: sabnzbd/skintext.py
 msgid "Edit"
@@ -3809,20 +3780,6 @@ msgstr ""
 msgid "Indexer Categories / Groups"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Select at least 1 category."
-msgstr ""
-
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Series Sorting"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Enable TV Sorting"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Pattern Key"
 msgstr ""
@@ -3831,23 +3788,10 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Apply filters"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Presets"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Movie Sorting"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Enable Movie Sorting"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Affected Categories"
 msgstr ""
@@ -3864,26 +3808,6 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "1x05 Season Folder"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "S01E05 Season Folder"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "1x05 Episode Folder"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "S01E05 Episode Folder"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Job Name as Filename"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr ""
@@ -3932,10 +3856,6 @@ msgstr ""
 msgid "Episode_Name"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "File Extension"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Extension"
 msgstr ""
@@ -3977,7 +3897,15 @@ msgid "Sort String"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Multi-part label"
+msgid "Multi-part Label"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Show folder"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Season folder"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3988,25 +3916,12 @@ msgstr ""
 msgid "No folders"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Date Sorting"
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Enable Date Sorting"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Show Name folder"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Year-Month Folders"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Daily Folders"
+msgid "Series"
 msgstr ""
 
 #. Note for title expression in Sorting that does case adjustment
@@ -4038,6 +3953,58 @@ msgstr ""
 msgid "GuessIt_Property"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Minimum Filesize"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Affected Job Types"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "All"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Series with air dates"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Movies"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Other / Unknown"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "<p>Use Sorters to automatically organize your completed downloads. For example, put all episodes from a series in a season-specific folder. Or, put movies in a folder named after the movie.</p><p>Sorters are tried in order of appearance and can be reordered by dragging and dropping.<br/>The first active sorter that matches both the affected category and job type is applied.</p><p>More options are available when Advanced Settings is checked.<br/>Detailed information can be found on the Wiki.</p>"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Add Sorter"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Remove Sorter"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Test Data"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Quick start"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Move and rename all episodes in the \"tv\" category to a show-specific folder"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Move and rename all movies in the \"movies\" category to a movie-specific folder"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Rarely used options. For their meaning and explanation, click on the Help button to go to the Wiki page.<br>Don't change these without checking the Wiki first, as some have serious side-effects.<br>The default values are between parentheses."
 msgstr ""
@@ -4265,6 +4232,10 @@ msgstr ""
 msgid "Keyboard shortcuts"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Shift+Arrow key: Browse Queue and History pages"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "How long or untill when do you want to pause? (in English!)"
 msgstr ""
@@ -4429,7 +4400,7 @@ msgstr ""
 
 #. Error message
 #: sabnzbd/sorting.py
-msgid "Failed to rename: %s to %s"
+msgid "Failed to rename %s to %s"
 msgstr ""
 
 #. Error message
@@ -4494,10 +4465,6 @@ msgstr ""
 msgid "Unknown SSL protocol: Try disabling SSL or connecting on a different port."
 msgstr ""
 
-#: sabnzbd/utils/servertests.py
-msgid "Server quit during login sequence."
-msgstr ""
-
 #: sabnzbd/utils/servertests.py
 msgid "Server requires username and password."
 msgstr ""

po/main/cs.po

@@ -1,17 +1,16 @@
 # SABnzbd Translation Template file MAIN
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 # 
 # Translators:
-# Pavel C <quoing_transifex@mess.cz>, 2021
-# Safihre <safihre@sabnzbd.org>, 2022
+# Pavel C <quoing_transifex@mess.cz>, 2023
+# Safihre <safihre@sabnzbd.org>, 2023
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
-"Last-Translator: Safihre <safihre@sabnzbd.org>, 2022\n"
-"Language-Team: Czech (https://www.transifex.com/sabnzbd/teams/111101/cs/)\n"
+"Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
+"Language-Team: Czech (https://app.transifex.com/sabnzbd/teams/111101/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,18 +37,12 @@ msgstr "Nezdařilo se spustit webové rozhraní"
 msgid "Cannot find web template: %s, trying standard template"
 msgstr "Šablona pro web nebyla nalezena: %s, zkouším standardní šablonu"
 
-#. Error message
-#: SABnzbd.py
-msgid "SABYenc disabled: no correct version found! (Found v%s, expecting v%s)"
-msgstr ""
-"SABYenc vypnut: Nenalezena správná verze! (Nalezena v%s, očekávána v%s)"
-
 #. Error message
 #: SABnzbd.py
 msgid ""
-"SABYenc module... NOT found! Expecting v%s - https://sabnzbd.org/sabyenc"
+"SABCTools disabled: no correct version found! (Found v%s, expecting v%s)"
 msgstr ""
-"Modul SABYenc... nebyl nalezen! Očekávána v%s - https://sabnzbd.org/sabyenc"
+"SABCTools vypnut: Nenalezena správná verze! (Nalezena v%s, očekávána v%s)"
 
 #. Error message
 #: SABnzbd.py
@@ -66,14 +59,11 @@ msgstr "Nalezen UNRAR verze %s, doporučujeme verzi %s nebo vyšší. <br />"
 msgid "unrar binary... NOT found"
 msgstr "Program unrar... nenalezen!"
 
+#. Warning message
 #: SABnzbd.py
 msgid "7za binary... NOT found!"
 msgstr "Program 7za... nenalezen!"
 
-#: SABnzbd.py
-msgid "unzip binary... NOT found!"
-msgstr "Program unizip... nenalezen!"
-
 #. Error message
 #: SABnzbd.py
 msgid "Essential modules are missing, downloading cannot start."
@@ -157,11 +147,6 @@ msgstr "Restartuji protože postprocessor selhal"
 msgid "Restarting because of crashed downloader"
 msgstr "Restartuji protože selhal downloader"
 
-#. Warning message
-#: sabnzbd/__init__.py
-msgid "Restarting because of crashed decoder"
-msgstr "Restartuji protože selhal decoder"
-
 #. Warning message
 #: sabnzbd/__init__.py
 msgid "Restarting because of crashed assembler"
@@ -181,7 +166,7 @@ msgid "Test Notification"
 msgstr "Otestovat notifikace"
 
 #: sabnzbd/api.py
-msgid "&nbsp;Resolving address"
+msgid "Resolving address"
 msgstr "Překládám adresu"
 
 #. No value, used in dropdown menus
@@ -273,10 +258,6 @@ msgstr "Kvóta přesažena, pozastavuji stahování"
 msgid "Incorrect parameter"
 msgstr "Nesprávný parametr"
 
-#: sabnzbd/cfg.py
-msgid "UNC path \"%s\" not allowed here"
-msgstr "UNC cesta \"%s\" zde není povolena"
-
 #: sabnzbd/cfg.py
 msgid "%s is not a valid email address"
 msgstr "%s není validní emailová adresa"
@@ -285,7 +266,7 @@ msgstr "%s není validní emailová adresa"
 msgid "Server address required"
 msgstr "Adresa serveru je vyžadována"
 
-#: sabnzbd/cfg.py, sabnzbd/utils/servertests.py
+#: sabnzbd/cfg.py, sabnzbd/newswrapper.py
 msgid "Invalid server address."
 msgstr ""
 
@@ -305,8 +286,25 @@ msgid ""
 msgstr ""
 
 #: sabnzbd/cfg.py
-msgid "Error: Queue not empty, cannot change folder."
-msgstr "Chyba: Fronta nené prázdná, nelze změnit složku."
+msgid "UNC path \"%s\" not allowed here"
+msgstr "UNC cesta \"%s\" zde není povolena"
+
+#: sabnzbd/cfg.py
+msgid "Queue not empty, cannot change folder."
+msgstr "Fronta nené prázdná, nelze změnit složku."
+
+#: sabnzbd/cfg.py
+msgid ""
+"The Completed Download Folder cannot be the same or a subfolder of the "
+"Temporary Download Folder"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/cfg.py
+msgid ""
+"Do not use a folder in the application folder as your Scripts Folder, it "
+"might be emptied during updates."
+msgstr ""
 
 #. Warning message
 #: sabnzbd/config.py
@@ -353,7 +351,7 @@ msgstr "Spustění SQL příkazu selhalo, zkontrolujte log"
 msgid "Failed to close database, see log"
 msgstr "Nezdařilo se uzavření databáze, zkontrolujte log"
 
-#. Error message
+#. Warning message
 #: sabnzbd/database.py
 msgid "Invalid stage logging in history for %s"
 msgstr ""
@@ -422,13 +420,12 @@ msgid "Paused"
 msgstr "Pozastaveno"
 
 #. Warning message
-#: sabnzbd/downloader.py, sabnzbd/interface.py, sabnzbd/skintext.py
+#: sabnzbd/downloader.py, sabnzbd/skintext.py
 msgid "You must set a maximum bandwidth before you can set a bandwidth limit"
 msgstr ""
 "Musíte nastavit maximální rychlost linky předtím než začnete nastavovat "
 "limity pro přenos"
 
-#. Warning message
 #: sabnzbd/downloader.py
 msgid "Cannot connect to server %s [%s]"
 msgstr "Nelze se připojit k serveru %s [%s]"
@@ -452,20 +449,24 @@ msgstr ""
 msgid "Failed to initialize %s@%s with reason: %s"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "Too many connections to server %s"
-msgstr "Příliš mnoho spojení k serveru %s"
-
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "Probable account sharing"
-msgstr "Pravděpodobné sdílení účtu"
-
 #. Error message
 #: sabnzbd/downloader.py
-msgid "Failed login for server %s"
-msgstr "Přihlášení k serveru %s se nezdařilo"
+msgid "Fatal error in Downloader"
+msgstr ""
+
+#: sabnzbd/downloader.py
+msgid "Too many connections to server %s [%s]"
+msgstr "Příliš mnoho spojení k serveru %s [%s]"
+
+#: sabnzbd/downloader.py
+msgid ""
+"Login from too many different IP addresses to server %s [%s] - "
+"https://sabnzbd.org/multiple-adresses"
+msgstr ""
+
+#: sabnzbd/downloader.py
+msgid "Failed login for server %s [%s]"
+msgstr "Přihlášení k serveru %s se nezdařilo [%s]"
 
 #. Error message
 #: sabnzbd/downloader.py
@@ -604,14 +605,24 @@ msgstr "Načítání %s selhalo"
 
 #. Warning message
 #: sabnzbd/filesystem.py
-msgid ""
-"%s is not writable with special character filenames. This can cause "
-"problems."
+msgid "%s is not writable at all. This blocks downloads."
 msgstr ""
 
 #. Warning message
 #: sabnzbd/filesystem.py
-msgid "%s is not writable at all. This blocks downloads."
+msgid "Cannot write a long filename to %s. This can cause problems."
+msgstr ""
+
+#. Warning message
+#: sabnzbd/filesystem.py
+msgid "Cannot write a unicode filename to %s. This can cause problems."
+msgstr ""
+
+#. Warning message
+#: sabnzbd/filesystem.py
+msgid ""
+"%s is not writable with special character filenames. This can cause "
+"problems."
 msgstr ""
 
 #: sabnzbd/interface.py
@@ -647,7 +658,7 @@ msgstr ""
 "Nesprávný API klíč, použijte api klíč z Nastavení->Obecné ve vašem programu "
 "třetí strany:"
 
-#: sabnzbd/interface.py, sabnzbd/newswrapper.py, sabnzbd/utils/servertests.py
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
 msgid "Authentication failed, check username/password."
 msgstr "Přihlášené selhalo, zkontrolujte jméno a heslo."
 
@@ -656,21 +667,10 @@ msgstr "Přihlášené selhalo, zkontrolujte jméno a heslo."
 msgid "Unsuccessful login attempt from %s"
 msgstr "Nezdařený pokus o přihlášení od %s"
 
-#: sabnzbd/interface.py
-msgid ""
-"The Completed Download Folder cannot be the same or a subfolder of the "
-"Temporary Download Folder"
-msgstr ""
-
 #: sabnzbd/interface.py
 msgid "Invalid backup archive"
 msgstr ""
 
-#: sabnzbd/interface.py
-msgid "Warning: LOCALHOST is ambiguous, use numerical IP-address."
-msgstr ""
-"Upozornění: LOCALHOST je nejednoznačný, použijte numerickou IP adresu."
-
 #: sabnzbd/interface.py
 msgid "Server address \"%s:%s\" is not valid."
 msgstr "Adresa serveru \"%s:%s\" není správná."
@@ -783,11 +783,22 @@ msgstr ""
 msgid "Python script \"%s\" does not have execute (+x) permission set"
 msgstr "Python skript \"%s\" nemá nastaveno právo spuštění (+x)"
 
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Series Sorting"
+msgstr ""
+
+#: sabnzbd/misc.py
+msgid "Date Sorting"
+msgstr ""
+
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Movie Sorting"
+msgstr ""
+
 #: sabnzbd/newsunpack.py, sabnzbd/postproc.py
 msgid "Running script"
 msgstr "Běžící skript"
 
-#. Warning message
 #: sabnzbd/newsunpack.py
 msgid "Unpack nesting too deep [%s]"
 msgstr ""
@@ -876,19 +887,6 @@ msgstr "Nepoužitelný RAR soubor"
 msgid "Corrupt RAR file"
 msgstr "Porušený RAR soubor"
 
-#: sabnzbd/newsunpack.py
-msgid "%s files in %s"
-msgstr "%s souborů v %s"
-
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "Error \"%s\" while running unzip() on %s"
-msgstr "Chyba \"%s\" během běhu unzip() na %s"
-
-#: sabnzbd/newsunpack.py
-msgid "No 7za binary found, cannot unpack \"%s\""
-msgstr "7za nebylo nalezeno, nemohu rozbalit \"%s\""
-
 #: sabnzbd/newsunpack.py
 msgid "Trying 7zip with password \"%s\""
 msgstr "Zkouším 7zip s heslem \"%s\""
@@ -1151,6 +1149,18 @@ msgstr "Nelze nahrát %s, detekován porušený soubor"
 msgid "NZB added to queue"
 msgstr "NZB přidáno do fronty"
 
+#: sabnzbd/nzbqueue.py, sabnzbd/nzbstuff.py
+msgid "Ignoring duplicate NZB \"%s\""
+msgstr "Ignoruji duplikátní NZB \"%s\""
+
+#: sabnzbd/nzbqueue.py, sabnzbd/nzbstuff.py
+msgid "Failing duplicate NZB \"%s\""
+msgstr "Nezdařilo se duplikovat NZB \"%s\""
+
+#: sabnzbd/nzbqueue.py, sabnzbd/nzbstuff.py
+msgid "Duplicate NZB"
+msgstr "Duplikátní NZB"
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (error: %s)"
@@ -1165,26 +1175,6 @@ msgstr "Prázdný NZB soubor %s"
 msgid "Pre-queue script marked job as failed"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Ignoring duplicate NZB \"%s\""
-msgstr "Ignoruji duplikátní NZB \"%s\""
-
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Failing duplicate NZB \"%s\""
-msgstr "Nezdařilo se duplikovat NZB \"%s\""
-
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Duplicate NZB"
-msgstr "Duplikátní NZB"
-
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Pausing duplicate NZB \"%s\""
-msgstr "Pozastavuji duplikátní NZB \"%s\""
-
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Unwanted Extension in file %s (%s)"
@@ -1203,6 +1193,10 @@ msgstr "Chyba při importu %s"
 msgid "DUPLICATE"
 msgstr "DUPLIKÁT"
 
+#: sabnzbd/nzbstuff.py
+msgid "ALTERNATIVE"
+msgstr ""
+
 #: sabnzbd/nzbstuff.py
 msgid "ENCRYPTED"
 msgstr "ŠIFROVANÉ"
@@ -1248,6 +1242,10 @@ msgstr ""
 msgid "%s articles had non-matching duplicates"
 msgstr ""
 
+#: sabnzbd/nzbstuff.py
+msgid "Pausing duplicate NZB \"%s\""
+msgstr "Pozastavuji duplikátní NZB \"%s\""
+
 #. Footer: indicator of warnings
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Warnings"
@@ -1483,14 +1481,14 @@ msgstr "Nezdařilo se přesunout soubory"
 msgid "Running user script %s"
 msgstr "Spouštím uživatelský skript %s"
 
-#: sabnzbd/postproc.py
-msgid "Ran %s"
-msgstr "Spuštěno %s"
-
 #: sabnzbd/postproc.py
 msgid "Script exit code is %s"
 msgstr "Navratový kód skriptu je %s"
 
+#: sabnzbd/postproc.py
+msgid "Ran %s"
+msgstr "Spuštěno %s"
+
 #: sabnzbd/postproc.py, sabnzbd/skintext.py
 msgid "More"
 msgstr "Více"
@@ -1821,32 +1819,32 @@ msgstr "Odstranit dokončené úkoly"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Pause low prioirty jobs"
+msgid "Pause low priority jobs"
 msgstr "Pozastavit úkoly s nízkou prioritou"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Pause normal prioirty jobs"
+msgid "Pause normal priority jobs"
 msgstr "Pozastavit úkoly s normální prioritou"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Pause high prioirty jobs"
+msgid "Pause high priority jobs"
 msgstr "Pozastavit úkoly s vysokou prioritou"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Resume low prioirty jobs"
+msgid "Resume low priority jobs"
 msgstr ""
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Resume normal prioirty jobs"
+msgid "Resume normal priority jobs"
 msgstr ""
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Resume high prioirty jobs"
+msgid "Resume high priority jobs"
 msgstr "Obnovit úkoly s vysokou prioritou"
 
 #. Config->Scheduler
@@ -2126,10 +2124,6 @@ msgstr "Speciální"
 msgid "Search"
 msgstr "Vyhledávání"
 
-#: sabnzbd/skintext.py
-msgid "Download Dir"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Are you sure you want to shutdown SABnzbd?"
 msgstr ""
@@ -2214,11 +2208,6 @@ msgstr "Jméno"
 msgid "Retry"
 msgstr "Opakovat"
 
-#. Queue end-of-queue selection box
-#: sabnzbd/skintext.py
-msgid "Actions"
-msgstr "Akce"
-
 #. Queue page table, script selection menu
 #: sabnzbd/skintext.py
 msgid "Scripts"
@@ -2416,10 +2405,6 @@ msgstr "DNS server / DNS dotazy"
 msgid "Download speed limited by"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "CPU"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Disk speed"
 msgstr ""
@@ -2506,18 +2491,10 @@ msgid ""
 "expire."
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Enable Unzip"
-msgstr "Povolit Unzip"
-
 #: sabnzbd/skintext.py
 msgid "Enable 7zip"
 msgstr "Povolit 7zip"
 
-#: sabnzbd/skintext.py
-msgid "Multicore Par2"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
 "Secure (SSL) connections from SABnzbd to newsservers and HTTPS websites will"
@@ -2528,7 +2505,7 @@ msgstr ""
 
 #: sabnzbd/skintext.py
 msgid ""
-"Speed up repairs by installing multicore Par2, it is available for many "
+"Speed up repairs by installing par2cmdline-turbo, it is available for many "
 "platforms."
 msgstr ""
 
@@ -2881,6 +2858,11 @@ msgid ""
 "overruled by user-defined categories.</i>"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid ""
+"Use Sorting to automatically organize and rename your completed downloads."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Minimum Free Space for Completed Download Folder"
 msgstr ""
@@ -2916,9 +2898,7 @@ msgid "Watched Folder"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid ""
-"Folder to monitor for .nzb files.<br /><i>Also scans .zip .rar and .tar.gz "
-"archives for .nzb files.</i>"
+msgid "Folder to monitor for .nzb files."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -2957,6 +2937,10 @@ msgstr ""
 msgid "System Folders"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Hidden Folders"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Administrative Folder"
 msgstr ""
@@ -2991,6 +2975,10 @@ msgid ""
 "Location of log files for SABnzbd.<br /><i>Requires SABnzbd restart!</i>"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Purge Logs"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid ".nzb Backup Folder"
 msgstr ""
@@ -3152,14 +3140,6 @@ msgid ""
 "as failed."
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "On failure, try alternative NZB"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Some servers provide an alternative NZB when a download fails."
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Enable folder rename"
 msgstr ""
@@ -3178,6 +3158,14 @@ msgstr ""
 msgid "Used before an NZB enters the queue."
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "On queue finish script"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Executed after the queue finishes downloading."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Extra PAR2 Parameters"
 msgstr ""
@@ -3410,26 +3398,6 @@ msgid ""
 "the job"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Server IP address selection"
-msgstr "Výběr IP adresy serveru"
-
-#: sabnzbd/skintext.py
-msgid "First IP address"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Randomly selected IP address"
-msgstr "Náhodně vybraná IP adresa"
-
-#: sabnzbd/skintext.py
-msgid "Quickest IP address, preferring IPv6"
-msgstr "Nejrychlejší IP adresa, preferuj IPv6"
-
-#: sabnzbd/skintext.py
-msgid "Useful if a newsserver has more than one IPv4/IPv6 address"
-msgstr ""
-
 #. Caption - Button: Add server
 #: sabnzbd/skintext.py
 msgid "Add Server"
@@ -3633,6 +3601,10 @@ msgstr ""
 msgid "Force Download"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Apply filters"
+msgstr ""
+
 #. Config->RSS edit button
 #: sabnzbd/skintext.py
 msgid "Edit"
@@ -3995,20 +3967,6 @@ msgstr ""
 msgid "Indexer Categories / Groups"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Select at least 1 category."
-msgstr ""
-
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Series Sorting"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Enable TV Sorting"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Pattern Key"
 msgstr ""
@@ -4017,23 +3975,10 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Apply filters"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Presets"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Movie Sorting"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Enable Movie Sorting"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Affected Categories"
 msgstr ""
@@ -4050,26 +3995,6 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "1x05 Season Folder"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "S01E05 Season Folder"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "1x05 Episode Folder"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "S01E05 Episode Folder"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Job Name as Filename"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr ""
@@ -4118,10 +4043,6 @@ msgstr ""
 msgid "Episode_Name"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "File Extension"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Extension"
 msgstr ""
@@ -4163,7 +4084,15 @@ msgid "Sort String"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Multi-part label"
+msgid "Multi-part Label"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Show folder"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Season folder"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -4174,25 +4103,12 @@ msgstr ""
 msgid "No folders"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Date Sorting"
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Enable Date Sorting"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Show Name folder"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Year-Month Folders"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Daily Folders"
+msgid "Series"
 msgstr ""
 
 #. Note for title expression in Sorting that does case adjustment
@@ -4224,6 +4140,69 @@ msgstr ""
 msgid "GuessIt_Property"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Minimum Filesize"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Affected Job Types"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "All"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Series with air dates"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Movies"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Other / Unknown"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"<p>Use Sorters to automatically organize your completed downloads. For "
+"example, put all episodes from a series in a season-specific folder. Or, put"
+" movies in a folder named after the movie.</p><p>Sorters are tried in order "
+"of appearance and can be reordered by dragging and dropping.<br/>The first "
+"active sorter that matches both the affected category and job type is "
+"applied.</p><p>More options are available when Advanced Settings is "
+"checked.<br/>Detailed information can be found on the Wiki.</p>"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Add Sorter"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Remove Sorter"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Test Data"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Quick start"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Move and rename all episodes in the \"tv\" category to a show-specific "
+"folder"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Move and rename all movies in the \"movies\" category to a movie-specific "
+"folder"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid ""
 "Rarely used options. For their meaning and explanation, click on the Help "
@@ -4457,6 +4436,10 @@ msgstr ""
 msgid "Keyboard shortcuts"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Shift+Arrow key: Browse Queue and History pages"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "How long or untill when do you want to pause? (in English!)"
 msgstr ""
@@ -4625,8 +4608,8 @@ msgstr ""
 
 #. Error message
 #: sabnzbd/sorting.py
-msgid "Failed to rename: %s to %s"
-msgstr "Nezdařilo se přejmenovat: %s na %s"
+msgid "Failed to rename %s to %s"
+msgstr ""
 
 #. Error message
 #: sabnzbd/sorting.py
@@ -4691,10 +4674,6 @@ msgid ""
 "Unknown SSL protocol: Try disabling SSL or connecting on a different port."
 msgstr ""
 
-#: sabnzbd/utils/servertests.py
-msgid "Server quit during login sequence."
-msgstr ""
-
 #: sabnzbd/utils/servertests.py
 msgid "Server requires username and password."
 msgstr ""

po/main/da.po

@@ -1,16 +1,15 @@
 # SABnzbd Translation Template file MAIN
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 # 
 # Translators:
-# Safihre <safihre@sabnzbd.org>, 2022
+# Safihre <safihre@sabnzbd.org>, 2023
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
-"Last-Translator: Safihre <safihre@sabnzbd.org>, 2022\n"
-"Language-Team: Danish (https://www.transifex.com/sabnzbd/teams/111101/da/)\n"
+"Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
+"Language-Team: Danish (https://app.transifex.com/sabnzbd/teams/111101/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,19 +36,13 @@ msgstr "Kunne ikke starte web-interface"
 msgid "Cannot find web template: %s, trying standard template"
 msgstr "Kan ikke finde webskabeloner: %s, forsøger med standardskabelon"
 
-#. Error message
-#: SABnzbd.py
-msgid "SABYenc disabled: no correct version found! (Found v%s, expecting v%s)"
-msgstr ""
-"SABYenc deaktiveret: Der blev ikke fundet nogen korrekt version (Fandt v%s, "
-"forventede v%s)"
-
 #. Error message
 #: SABnzbd.py
 msgid ""
-"SABYenc module... NOT found! Expecting v%s - https://sabnzbd.org/sabyenc"
+"SABCTools disabled: no correct version found! (Found v%s, expecting v%s)"
 msgstr ""
-"SABYenc modul... IKKE fundet! Forventede v%s - https://sabnzbd.org/sabyenc"
+"SABCTools deaktiveret: Der blev ikke fundet nogen korrekt version (Fandt "
+"v%s, forventede v%s)"
 
 #. Error message
 #: SABnzbd.py
@@ -66,14 +59,11 @@ msgstr "Din Unrar version er %s, vi anbefaler version %s eller højere.<br />"
 msgid "unrar binary... NOT found"
 msgstr "unrar binær... IKKE fundet"
 
+#. Warning message
 #: SABnzbd.py
 msgid "7za binary... NOT found!"
 msgstr "7za binær... IKKE fundet!"
 
-#: SABnzbd.py
-msgid "unzip binary... NOT found!"
-msgstr "unzip binær... IKKE fundet!"
-
 #. Error message
 #: SABnzbd.py
 msgid "Essential modules are missing, downloading cannot start."
@@ -157,11 +147,6 @@ msgstr ""
 msgid "Restarting because of crashed downloader"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/__init__.py
-msgid "Restarting because of crashed decoder"
-msgstr ""
-
 #. Warning message
 #: sabnzbd/__init__.py
 msgid "Restarting because of crashed assembler"
@@ -181,8 +166,8 @@ msgid "Test Notification"
 msgstr "Afprøv notifikation"
 
 #: sabnzbd/api.py
-msgid "&nbsp;Resolving address"
-msgstr "&nbsp; Server løsning"
+msgid "Resolving address"
+msgstr "Server løsning"
 
 #. No value, used in dropdown menus
 #: sabnzbd/api.py, sabnzbd/skintext.py
@@ -273,10 +258,6 @@ msgstr "Kvote brugt, pause downloading"
 msgid "Incorrect parameter"
 msgstr "Fejl parameter"
 
-#: sabnzbd/cfg.py
-msgid "UNC path \"%s\" not allowed here"
-msgstr "UNC søgning \"%s\" er ikke tilladt her"
-
 #: sabnzbd/cfg.py
 msgid "%s is not a valid email address"
 msgstr "%s er ikke en godkendt e-mail adresse"
@@ -285,7 +266,7 @@ msgstr "%s er ikke en godkendt e-mail adresse"
 msgid "Server address required"
 msgstr "Kræver serveradresse"
 
-#: sabnzbd/cfg.py, sabnzbd/utils/servertests.py
+#: sabnzbd/cfg.py, sabnzbd/newswrapper.py
 msgid "Invalid server address."
 msgstr "Ugyldig server adresse."
 
@@ -305,8 +286,25 @@ msgid ""
 msgstr ""
 
 #: sabnzbd/cfg.py
-msgid "Error: Queue not empty, cannot change folder."
-msgstr "Fejl: Køen er ikke tom, kan ikke skifte mappe."
+msgid "UNC path \"%s\" not allowed here"
+msgstr "UNC søgning \"%s\" er ikke tilladt her"
+
+#: sabnzbd/cfg.py
+msgid "Queue not empty, cannot change folder."
+msgstr "Køen er ikke tom, kan ikke skifte mappe."
+
+#: sabnzbd/cfg.py
+msgid ""
+"The Completed Download Folder cannot be the same or a subfolder of the "
+"Temporary Download Folder"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/cfg.py
+msgid ""
+"Do not use a folder in the application folder as your Scripts Folder, it "
+"might be emptied during updates."
+msgstr ""
 
 #. Warning message
 #: sabnzbd/config.py
@@ -353,7 +351,7 @@ msgstr "SQL Kommando mislykkedes, se log"
 msgid "Failed to close database, see log"
 msgstr "Det lykkedes ikke at lukke databasen, se log"
 
-#. Error message
+#. Warning message
 #: sabnzbd/database.py
 msgid "Invalid stage logging in history for %s"
 msgstr "Forkert logning i historiken av %s"
@@ -420,13 +418,12 @@ msgid "Paused"
 msgstr "Sat på pause"
 
 #. Warning message
-#: sabnzbd/downloader.py, sabnzbd/interface.py, sabnzbd/skintext.py
+#: sabnzbd/downloader.py, sabnzbd/skintext.py
 msgid "You must set a maximum bandwidth before you can set a bandwidth limit"
 msgstr ""
 "Du skal angive den maksimale båndbredde, før du kan angive en båndbredde "
 "begrænsning"
 
-#. Warning message
 #: sabnzbd/downloader.py
 msgid "Cannot connect to server %s [%s]"
 msgstr "Kan ikke tilslutte til server %s [%s]"
@@ -450,20 +447,24 @@ msgstr ""
 msgid "Failed to initialize %s@%s with reason: %s"
 msgstr "Det lykkedes ikke at initialisere %s@%s med begrundelse %s"
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "Too many connections to server %s"
-msgstr "Alt for mange forbindelser til serveren %s"
-
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "Probable account sharing"
-msgstr "Sandsynligt delt konto"
-
 #. Error message
 #: sabnzbd/downloader.py
-msgid "Failed login for server %s"
-msgstr "Det lykkedes ikke at logge på serveren %s"
+msgid "Fatal error in Downloader"
+msgstr ""
+
+#: sabnzbd/downloader.py
+msgid "Too many connections to server %s [%s]"
+msgstr "Alt for mange forbindelser til serveren %s [%s]"
+
+#: sabnzbd/downloader.py
+msgid ""
+"Login from too many different IP addresses to server %s [%s] - "
+"https://sabnzbd.org/multiple-adresses"
+msgstr ""
+
+#: sabnzbd/downloader.py
+msgid "Failed login for server %s [%s]"
+msgstr "Det lykkedes ikke at logge på serveren %s [%s]"
 
 #. Error message
 #: sabnzbd/downloader.py
@@ -612,14 +613,24 @@ msgstr "Downloadning af %s mislykkedes"
 
 #. Warning message
 #: sabnzbd/filesystem.py
-msgid ""
-"%s is not writable with special character filenames. This can cause "
-"problems."
+msgid "%s is not writable at all. This blocks downloads."
 msgstr ""
 
 #. Warning message
 #: sabnzbd/filesystem.py
-msgid "%s is not writable at all. This blocks downloads."
+msgid "Cannot write a long filename to %s. This can cause problems."
+msgstr ""
+
+#. Warning message
+#: sabnzbd/filesystem.py
+msgid "Cannot write a unicode filename to %s. This can cause problems."
+msgstr ""
+
+#. Warning message
+#: sabnzbd/filesystem.py
+msgid ""
+"%s is not writable with special character filenames. This can cause "
+"problems."
 msgstr ""
 
 #: sabnzbd/interface.py
@@ -655,7 +666,7 @@ msgstr ""
 "Forkert API-nøgle, anvend api-nøglen fra Konfiguration->Generelt i dit "
 "tredjepartsprogram:"
 
-#: sabnzbd/interface.py, sabnzbd/newswrapper.py, sabnzbd/utils/servertests.py
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
 msgid "Authentication failed, check username/password."
 msgstr "Godkendelse mislykkedes, kontrollere brugernavn/adgangskode."
 
@@ -664,20 +675,10 @@ msgstr "Godkendelse mislykkedes, kontrollere brugernavn/adgangskode."
 msgid "Unsuccessful login attempt from %s"
 msgstr "Mislykkede login forsøg fra %s"
 
-#: sabnzbd/interface.py
-msgid ""
-"The Completed Download Folder cannot be the same or a subfolder of the "
-"Temporary Download Folder"
-msgstr ""
-
 #: sabnzbd/interface.py
 msgid "Invalid backup archive"
 msgstr ""
 
-#: sabnzbd/interface.py
-msgid "Warning: LOCALHOST is ambiguous, use numerical IP-address."
-msgstr "Advarsel: Localhost er tvetydig, bruge numerisk IP-adresse."
-
 #: sabnzbd/interface.py
 msgid "Server address \"%s:%s\" is not valid."
 msgstr "Serveradressen \"%s:%s\" er ikke gyldigt."
@@ -788,11 +789,22 @@ msgstr ""
 msgid "Python script \"%s\" does not have execute (+x) permission set"
 msgstr "Python script \"%s\" har ikke udfør (+x) tilladelsessæt"
 
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Series Sorting"
+msgstr "Serie sortering"
+
+#: sabnzbd/misc.py
+msgid "Date Sorting"
+msgstr "Dato sortering"
+
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Movie Sorting"
+msgstr "Film sortering"
+
 #: sabnzbd/newsunpack.py, sabnzbd/postproc.py
 msgid "Running script"
 msgstr "Køre script"
 
-#. Warning message
 #: sabnzbd/newsunpack.py
 msgid "Unpack nesting too deep [%s]"
 msgstr "Udpakning af nesting for dybt [%s]"
@@ -880,19 +892,6 @@ msgstr "Ubrugelig RAR fil"
 msgid "Corrupt RAR file"
 msgstr "Ødelagt RAR fil"
 
-#: sabnzbd/newsunpack.py
-msgid "%s files in %s"
-msgstr "%s filer i %s"
-
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "Error \"%s\" while running unzip() on %s"
-msgstr "Fejl \"%s\" når du køre unzip() på %s"
-
-#: sabnzbd/newsunpack.py
-msgid "No 7za binary found, cannot unpack \"%s\""
-msgstr ""
-
 #: sabnzbd/newsunpack.py
 msgid "Trying 7zip with password \"%s\""
 msgstr "Forsøger 7zip med adgangskode \"%s\""
@@ -1154,6 +1153,18 @@ msgstr "Downloadnings fejl %s, ødelagt fil fundet"
 msgid "NZB added to queue"
 msgstr "NZB tilføjet i køen"
 
+#: sabnzbd/nzbqueue.py, sabnzbd/nzbstuff.py
+msgid "Ignoring duplicate NZB \"%s\""
+msgstr "Ignorerer identiske NZB \"%s\""
+
+#: sabnzbd/nzbqueue.py, sabnzbd/nzbstuff.py
+msgid "Failing duplicate NZB \"%s\""
+msgstr "Fejler dublet NZB \"%s\""
+
+#: sabnzbd/nzbqueue.py, sabnzbd/nzbstuff.py
+msgid "Duplicate NZB"
+msgstr "Dublet NZB"
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (error: %s)"
@@ -1168,26 +1179,6 @@ msgstr "Tom NZB fil %s"
 msgid "Pre-queue script marked job as failed"
 msgstr "Før-kø script job markeret som mislykkedet"
 
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Ignoring duplicate NZB \"%s\""
-msgstr "Ignorerer identiske NZB \"%s\""
-
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Failing duplicate NZB \"%s\""
-msgstr "Fejler dublet NZB \"%s\""
-
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Duplicate NZB"
-msgstr "Dublet NZB"
-
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Pausing duplicate NZB \"%s\""
-msgstr "Pause duplikeret NZB \"%s\""
-
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Unwanted Extension in file %s (%s)"
@@ -1206,6 +1197,10 @@ msgstr "Det lykkedes ikke at importere %s"
 msgid "DUPLICATE"
 msgstr "DUPLIKERE"
 
+#: sabnzbd/nzbstuff.py
+msgid "ALTERNATIVE"
+msgstr ""
+
 #: sabnzbd/nzbstuff.py
 msgid "ENCRYPTED"
 msgstr "KRYPTEREDE"
@@ -1251,6 +1246,10 @@ msgstr "%s artikler manglede"
 msgid "%s articles had non-matching duplicates"
 msgstr "%s artikler havde ikke-matchende dubletter"
 
+#: sabnzbd/nzbstuff.py
+msgid "Pausing duplicate NZB \"%s\""
+msgstr "Pause duplikeret NZB \"%s\""
+
 #. Footer: indicator of warnings
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Warnings"
@@ -1514,14 +1513,14 @@ msgstr "Kunne ikke flytte filer"
 msgid "Running user script %s"
 msgstr "Kør bruger script %s"
 
-#: sabnzbd/postproc.py
-msgid "Ran %s"
-msgstr "Kørte %s"
-
 #: sabnzbd/postproc.py
 msgid "Script exit code is %s"
 msgstr "Script exit kode er %s"
 
+#: sabnzbd/postproc.py
+msgid "Ran %s"
+msgstr "Kørte %s"
+
 #: sabnzbd/postproc.py, sabnzbd/skintext.py
 msgid "More"
 msgstr "Mere"
@@ -1852,32 +1851,32 @@ msgstr "Fjern fuldførte job"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Pause low prioirty jobs"
+msgid "Pause low priority jobs"
 msgstr "Pause lav prioritets jobs"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Pause normal prioirty jobs"
+msgid "Pause normal priority jobs"
 msgstr "Pause normal prioritets jobs"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Pause high prioirty jobs"
+msgid "Pause high priority jobs"
 msgstr "Pause høj prioritets jobs"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Resume low prioirty jobs"
+msgid "Resume low priority jobs"
 msgstr "Genoptag lav prioritets jobs"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Resume normal prioirty jobs"
+msgid "Resume normal priority jobs"
 msgstr "Genoptag normal prioritets jobs"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Resume high prioirty jobs"
+msgid "Resume high priority jobs"
 msgstr "Genoptag høj prioritets jobs"
 
 #. Config->Scheduler
@@ -2157,10 +2156,6 @@ msgstr "Speciel"
 msgid "Search"
 msgstr "Søg"
 
-#: sabnzbd/skintext.py
-msgid "Download Dir"
-msgstr "Download mappe"
-
 #: sabnzbd/skintext.py
 msgid "Are you sure you want to shutdown SABnzbd?"
 msgstr "Er du sikker på du vil lukke SABnzbd?"
@@ -2245,11 +2240,6 @@ msgstr "Navn"
 msgid "Retry"
 msgstr "Forsøg igen"
 
-#. Queue end-of-queue selection box
-#: sabnzbd/skintext.py
-msgid "Actions"
-msgstr "Handlinger"
-
 #. Queue page table, script selection menu
 #: sabnzbd/skintext.py
 msgid "Scripts"
@@ -2447,10 +2437,6 @@ msgstr "Nameserver/DNS Lookup"
 msgid "Download speed limited by"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "CPU"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Disk speed"
 msgstr ""
@@ -2546,18 +2532,10 @@ msgid ""
 msgstr ""
 "Når din IP-adresse ændres eller SABnzbd genstarter, udløber sessionen."
 
-#: sabnzbd/skintext.py
-msgid "Enable Unzip"
-msgstr "Aktivér Unzip"
-
 #: sabnzbd/skintext.py
 msgid "Enable 7zip"
 msgstr "Aktivere 7zip"
 
-#: sabnzbd/skintext.py
-msgid "Multicore Par2"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid ""
 "Secure (SSL) connections from SABnzbd to newsservers and HTTPS websites will"
@@ -2568,11 +2546,9 @@ msgstr ""
 
 #: sabnzbd/skintext.py
 msgid ""
-"Speed up repairs by installing multicore Par2, it is available for many "
+"Speed up repairs by installing par2cmdline-turbo, it is available for many "
 "platforms."
 msgstr ""
-"Fremskynde reparationer ved at installere multicopy Par2, det findes til "
-"mange platforme."
 
 #: sabnzbd/skintext.py
 msgid "Version"
@@ -2938,6 +2914,11 @@ msgstr ""
 "Sted at opbevare færdige, fuldt forarbejdede downloads.<br /><i>Kan "
 "tilsidesættes af bruger-definerede kategorier.</i>"
 
+#: sabnzbd/skintext.py
+msgid ""
+"Use Sorting to automatically organize and rename your completed downloads."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Minimum Free Space for Completed Download Folder"
 msgstr ""
@@ -2975,12 +2956,8 @@ msgid "Watched Folder"
 msgstr "Overvåget Mappe"
 
 #: sabnzbd/skintext.py
-msgid ""
-"Folder to monitor for .nzb files.<br /><i>Also scans .zip .rar and .tar.gz "
-"archives for .nzb files.</i>"
-msgstr ""
-"Mappe til at gennemsøge for. Nzb filer.<br /><i>Skanner også for .zip .rar "
-"og .tar.gz arkiver efter .nzb filer.</i>"
+msgid "Folder to monitor for .nzb files."
+msgstr "Mappe til at gennemsøge for .nzb filer."
 
 #: sabnzbd/skintext.py
 msgid "Watched Folder Scan Speed"
@@ -3020,6 +2997,10 @@ msgstr ""
 msgid "System Folders"
 msgstr "Systemmapper"
 
+#: sabnzbd/skintext.py
+msgid "Hidden Folders"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Administrative Folder"
 msgstr "Administrativ mappe"
@@ -3057,6 +3038,10 @@ msgid ""
 msgstr ""
 "Placering af logfiler for SABnzbd.<br /><i>Kræver genstart af SABnzbd!</i>"
 
+#: sabnzbd/skintext.py
+msgid "Purge Logs"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid ".nzb Backup Folder"
 msgstr ".nzb Backup mappe"
@@ -3229,14 +3214,6 @@ msgstr ""
 "Når bruger scriptet returnerer et non-zero exit code, vil jobbet blive "
 "markeret som mislykkedes."
 
-#: sabnzbd/skintext.py
-msgid "On failure, try alternative NZB"
-msgstr "Ved fejl, prøv alternativ NZB"
-
-#: sabnzbd/skintext.py
-msgid "Some servers provide an alternative NZB when a download fails."
-msgstr "Nogle servere levere en alternativ NZB når et download mislykkes."
-
 #: sabnzbd/skintext.py
 msgid "Enable folder rename"
 msgstr "Aktiver mappe omdøbning"
@@ -3257,6 +3234,14 @@ msgstr "Før kø bruger script"
 msgid "Used before an NZB enters the queue."
 msgstr "Brugt før, en NZB kommer ind i køen."
 
+#: sabnzbd/skintext.py
+msgid "On queue finish script"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Executed after the queue finishes downloading."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Extra PAR2 Parameters"
 msgstr "Ekstra PAR2 parameter"
@@ -3500,26 +3485,6 @@ msgstr ""
 "Når under download det bliver klart, at for meget data mangler, afbryd "
 "jobbet"
 
-#: sabnzbd/skintext.py
-msgid "Server IP address selection"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "First IP address"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Randomly selected IP address"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Quickest IP address, preferring IPv6"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Useful if a newsserver has more than one IPv4/IPv6 address"
-msgstr "Nyttigt, hvis en newsserver har mere end én IPv4/IPv6-adresse"
-
 #. Caption - Button: Add server
 #: sabnzbd/skintext.py
 msgid "Add Server"
@@ -3728,6 +3693,10 @@ msgstr "Læs Feed"
 msgid "Force Download"
 msgstr "Gennemtving download"
 
+#: sabnzbd/skintext.py
+msgid "Apply filters"
+msgstr "Anvend filtre"
+
 #. Config->RSS edit button
 #: sabnzbd/skintext.py
 msgid "Edit"
@@ -4096,20 +4065,6 @@ msgstr "Mappe/Søgesti"
 msgid "Indexer Categories / Groups"
 msgstr "Indekseringen kategorier/grupper"
 
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Select at least 1 category."
-msgstr ""
-
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Series Sorting"
-msgstr "Serie sortering"
-
-#: sabnzbd/skintext.py
-msgid "Enable TV Sorting"
-msgstr "Aktivere TV sortering"
-
 #: sabnzbd/skintext.py
 msgid "Pattern Key"
 msgstr "Hjælp til Sorteringsstræng"
@@ -4118,23 +4073,10 @@ msgstr "Hjælp til Sorteringsstræng"
 msgid "Clear"
 msgstr "Ryd"
 
-#: sabnzbd/skintext.py
-msgid "Apply filters"
-msgstr "Anvend filtre"
-
 #: sabnzbd/skintext.py
 msgid "Presets"
 msgstr "Forudindstillinger"
 
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Movie Sorting"
-msgstr "Film sortering"
-
-#: sabnzbd/skintext.py
-msgid "Enable Movie Sorting"
-msgstr "Aktivere filmsortering"
-
 #: sabnzbd/skintext.py
 msgid "Affected Categories"
 msgstr "Påvirkede Kategorier"
@@ -4151,26 +4093,6 @@ msgstr "Mønster"
 msgid "Result"
 msgstr "Resultat"
 
-#: sabnzbd/skintext.py
-msgid "1x05 Season Folder"
-msgstr "1x05 Sæsonmappe"
-
-#: sabnzbd/skintext.py
-msgid "S01E05 Season Folder"
-msgstr "S01E05 Sæsonmappe"
-
-#: sabnzbd/skintext.py
-msgid "1x05 Episode Folder"
-msgstr "1x05 Episodemappe"
-
-#: sabnzbd/skintext.py
-msgid "S01E05 Episode Folder"
-msgstr "S01E05 Episodemappe"
-
-#: sabnzbd/skintext.py
-msgid "Job Name as Filename"
-msgstr "Job Navn som Filnavn"
-
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr "Titel"
@@ -4219,10 +4141,6 @@ msgstr "Episode.Navn"
 msgid "Episode_Name"
 msgstr "Episode_Navn"
 
-#: sabnzbd/skintext.py
-msgid "File Extension"
-msgstr "Filtype"
-
 #: sabnzbd/skintext.py
 msgid "Extension"
 msgstr "Endelse"
@@ -4264,8 +4182,16 @@ msgid "Sort String"
 msgstr "Sorteringsstreng"
 
 #: sabnzbd/skintext.py
-msgid "Multi-part label"
-msgstr "Multi-del etikette"
+msgid "Multi-part Label"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Show folder"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Season folder"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "In folders"
@@ -4275,26 +4201,13 @@ msgstr "I mappe"
 msgid "No folders"
 msgstr "Ingen mappe"
 
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Date Sorting"
-msgstr "Dato sortering"
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
+msgstr "Job Navn som Filnavn"
 
 #: sabnzbd/skintext.py
-msgid "Enable Date Sorting"
-msgstr "Aktivere datosortering"
-
-#: sabnzbd/skintext.py
-msgid "Show Name folder"
-msgstr "Vis Navn på mappe"
-
-#: sabnzbd/skintext.py
-msgid "Year-Month Folders"
-msgstr "År-Måned mapper"
-
-#: sabnzbd/skintext.py
-msgid "Daily Folders"
-msgstr "Daglige mapper"
+msgid "Series"
+msgstr ""
 
 #. Note for title expression in Sorting that does case adjustment
 #: sabnzbd/skintext.py
@@ -4325,6 +4238,69 @@ msgstr ""
 msgid "GuessIt_Property"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Minimum Filesize"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Affected Job Types"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "All"
+msgstr "Alle"
+
+#: sabnzbd/skintext.py
+msgid "Series with air dates"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Movies"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Other / Unknown"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"<p>Use Sorters to automatically organize your completed downloads. For "
+"example, put all episodes from a series in a season-specific folder. Or, put"
+" movies in a folder named after the movie.</p><p>Sorters are tried in order "
+"of appearance and can be reordered by dragging and dropping.<br/>The first "
+"active sorter that matches both the affected category and job type is "
+"applied.</p><p>More options are available when Advanced Settings is "
+"checked.<br/>Detailed information can be found on the Wiki.</p>"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Add Sorter"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Remove Sorter"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Test Data"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Quick start"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Move and rename all episodes in the \"tv\" category to a show-specific "
+"folder"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Move and rename all movies in the \"movies\" category to a movie-specific "
+"folder"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid ""
 "Rarely used options. For their meaning and explanation, click on the Help "
@@ -4564,6 +4540,10 @@ msgstr "Bekræft Historik-fjernelse"
 msgid "Keyboard shortcuts"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Shift+Arrow key: Browse Queue and History pages"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "How long or untill when do you want to pause? (in English!)"
 msgstr "Hvor længe eller indtil hvornår du vil standse? (på engelsk!)"
@@ -4738,8 +4718,8 @@ msgstr ""
 
 #. Error message
 #: sabnzbd/sorting.py
-msgid "Failed to rename: %s to %s"
-msgstr "Det lykkedes ikke at omdøbe: %s til %s"
+msgid "Failed to rename %s to %s"
+msgstr ""
 
 #. Error message
 #: sabnzbd/sorting.py
@@ -4806,10 +4786,6 @@ msgstr ""
 "Ukendt SSL protokol: Prøv at deaktivere SSL eller forbinder på en anden "
 "port."
 
-#: sabnzbd/utils/servertests.py
-msgid "Server quit during login sequence."
-msgstr "Server afslut under login-sekvens."
-
 #: sabnzbd/utils/servertests.py
 msgid "Server requires username and password."
 msgstr "Serveren kræver brugernavn og adgangskode."

po/main/de.po

@@ -1,24 +1,24 @@
 # SABnzbd Translation Template file MAIN
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
-#
+# Copyright 2007-2023 The SABnzbd-Team
+# 
 # Translators:
 # C E <githubce@eiselt.ch>, 2020
 # Nikolai Bohl <n.kay01@gmail.com>, 2020
-# reloxx13 <reloxx@interia.pl>, 2021
 # Ben Hecht <benjamin.hecht@me.com>, 2021
 # Manuel C. Senn, 2021
 # Andreas Kames, 2021
 # Simon W., 2021
 # Nils Briggen, 2022
-# Safihre <safihre@sabnzbd.org>, 2022
-#
+# reloxx13 <reloxx@interia.pl>, 2022
+# kameb, 2023
+# Safihre <safihre@sabnzbd.org>, 2023
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
-"Last-Translator: Safihre <safihre@sabnzbd.org>, 2022\n"
-"Language-Team: German (https://www.transifex.com/sabnzbd/teams/111101/de/)\n"
+"Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
+"Language-Team: German (https://app.transifex.com/sabnzbd/teams/111101/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,19 +47,13 @@ msgstr ""
 "Konnte Web-Vorlage nicht finden: %s Versuche die Standard-Vorlage zu "
 "verwenden."
 
-#. Error message
-#: SABnzbd.py
-msgid "SABYenc disabled: no correct version found! (Found v%s, expecting v%s)"
-msgstr ""
-"SABYenc deaktiviert: Keine korrekte Version gefunden! (Gefunden v%s, "
-"Erwartet v%s)"
-
 #. Error message
 #: SABnzbd.py
 msgid ""
-"SABYenc module... NOT found! Expecting v%s - https://sabnzbd.org/sabyenc"
+"SABCTools disabled: no correct version found! (Found v%s, expecting v%s)"
 msgstr ""
-"SABYenc Modul... Nicht gefunden! Erwarte v%s - https://sabnzbd.org/sabyenc"
+"SABCTools deaktiviert: Keine korrekte Version gefunden! (Gefunden v%s, "
+"Erwartet v%s)"
 
 #. Error message
 #: SABnzbd.py
@@ -77,14 +71,11 @@ msgstr ""
 msgid "unrar binary... NOT found"
 msgstr "unrar-Programmdatei nicht gefunden!"
 
+#. Warning message
 #: SABnzbd.py
 msgid "7za binary... NOT found!"
 msgstr "7za-Programmdatei nicht gefunden"
 
-#: SABnzbd.py
-msgid "unzip binary... NOT found!"
-msgstr "unzip-Programmdatei nicht gefunden!"
-
 #. Error message
 #: SABnzbd.py
 msgid "Essential modules are missing, downloading cannot start."
@@ -172,11 +163,6 @@ msgstr "Neustart aufgrund eines abgestürzten Nachbearbeitungsprozesses"
 msgid "Restarting because of crashed downloader"
 msgstr "Neustart aufgrund eines abgestürzten Downloaders"
 
-#. Warning message
-#: sabnzbd/__init__.py
-msgid "Restarting because of crashed decoder"
-msgstr "Neustart aufgrund eines abgestürzten Decoders"
-
 #. Warning message
 #: sabnzbd/__init__.py
 msgid "Restarting because of crashed assembler"
@@ -196,8 +182,8 @@ msgid "Test Notification"
 msgstr "Benachrichtigungen testen"
 
 #: sabnzbd/api.py
-msgid "&nbsp;Resolving address"
-msgstr "&nbsp;Adresse wird aufgelöst …"
+msgid "Resolving address"
+msgstr "Adresse wird aufgelöst …"
 
 #. No value, used in dropdown menus
 #: sabnzbd/api.py, sabnzbd/skintext.py
@@ -291,10 +277,6 @@ msgstr "Kontingent aufgebraucht, Downloads werden angehalten"
 msgid "Incorrect parameter"
 msgstr "Fehlerhafter Parameter"
 
-#: sabnzbd/cfg.py
-msgid "UNC path \"%s\" not allowed here"
-msgstr "UNC-Pfad \"%s\" ist hier nicht erlaubt"
-
 #: sabnzbd/cfg.py
 msgid "%s is not a valid email address"
 msgstr "%s ist keine gültige E-Mail-Adresse"
@@ -303,7 +285,7 @@ msgstr "%s ist keine gültige E-Mail-Adresse"
 msgid "Server address required"
 msgstr "Server-Adresse wird benötigt"
 
-#: sabnzbd/cfg.py, sabnzbd/utils/servertests.py
+#: sabnzbd/cfg.py, sabnzbd/newswrapper.py
 msgid "Invalid server address."
 msgstr "Ungültige Server-Adresse."
 
@@ -325,10 +307,28 @@ msgstr ""
 "erstellten Dateien und Ordner von SABnzbd verweigern."
 
 #: sabnzbd/cfg.py
-msgid "Error: Queue not empty, cannot change folder."
+msgid "UNC path \"%s\" not allowed here"
+msgstr "UNC-Pfad \"%s\" ist hier nicht erlaubt"
+
+#: sabnzbd/cfg.py
+msgid "Queue not empty, cannot change folder."
+msgstr ""
+"Ordner kann nicht geändert werden, da die Warteschlange nicht leer ist."
+
+#: sabnzbd/cfg.py
+msgid ""
+"The Completed Download Folder cannot be the same or a subfolder of the "
+"Temporary Download Folder"
+msgstr ""
+"Der \"Abgeschlossene Downloads\"-Ordner darf kein Unterordner des "
+"\"Temporäre Downloads\"-Ordners sein."
+
+#. Warning message
+#: sabnzbd/cfg.py
+msgid ""
+"Do not use a folder in the application folder as your Scripts Folder, it "
+"might be emptied during updates."
 msgstr ""
-"Fehler: Ordner kann nicht geändert werden, da die Warteschlange nicht leer "
-"ist."
 
 #. Warning message
 #: sabnzbd/config.py
@@ -349,7 +349,7 @@ msgstr "Kann keine Sicherungsdatei erstellen für %s"
 #. Warning message
 #: sabnzbd/config.py
 msgid "Could not restore backup"
-msgstr ""
+msgstr "Backup konnte nicht wiederhergestellt werden"
 
 #. Error message
 #: sabnzbd/config.py
@@ -378,7 +378,7 @@ msgid "Failed to close database, see log"
 msgstr ""
 "Fehler beim Schliessen der Datenbank. Beachten Sie das Nachrichtenprotokoll."
 
-#. Error message
+#. Warning message
 #: sabnzbd/database.py
 msgid "Invalid stage logging in history for %s"
 msgstr "Ungültiges Stufen-Protokoll im Verlauf für %s"
@@ -449,13 +449,12 @@ msgid "Paused"
 msgstr "Angehalten"
 
 #. Warning message
-#: sabnzbd/downloader.py, sabnzbd/interface.py, sabnzbd/skintext.py
+#: sabnzbd/downloader.py, sabnzbd/skintext.py
 msgid "You must set a maximum bandwidth before you can set a bandwidth limit"
 msgstr ""
 "Bevor ein Bandbreitenlimit gesetzt werden kann, muss die maximale Bandbreite"
 " festgelegt werden"
 
-#. Warning message
 #: sabnzbd/downloader.py
 msgid "Cannot connect to server %s [%s]"
 msgstr "Verbindung zum Server %s kann nicht hergestellt werden. %s"
@@ -479,20 +478,26 @@ msgstr "Es gibt keine aktiven Server!"
 msgid "Failed to initialize %s@%s with reason: %s"
 msgstr "Fehler %s@%s zu initialisieren, aus folgendem Grund: %s"
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "Too many connections to server %s"
-msgstr "Zu viele Verbindungen zu Server %s"
-
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "Probable account sharing"
-msgstr "Möglicherweise wird das Konto geteilt"
-
 #. Error message
 #: sabnzbd/downloader.py
-msgid "Failed login for server %s"
-msgstr "Anmelden beim Server fehlgeschlagen. %s"
+msgid "Fatal error in Downloader"
+msgstr ""
+
+#: sabnzbd/downloader.py
+msgid "Too many connections to server %s [%s]"
+msgstr "Zu viele Verbindungen zu Server %s [%s]"
+
+#: sabnzbd/downloader.py
+msgid ""
+"Login from too many different IP addresses to server %s [%s] - "
+"https://sabnzbd.org/multiple-adresses"
+msgstr ""
+"Von zu vielen unteschiedlichen IP Adressen beim Server eingeloggt %s[%s] "
+"https://sabnzbd.org/multiple-adresses"
+
+#: sabnzbd/downloader.py
+msgid "Failed login for server %s [%s]"
+msgstr "Anmelden beim Server fehlgeschlagen. %s [%s]"
 
 #. Error message
 #: sabnzbd/downloader.py
@@ -641,6 +646,21 @@ msgstr "Fehler beim Speichern von %s"
 msgid "Loading %s failed"
 msgstr "Fehler beim Laden von %s"
 
+#. Warning message
+#: sabnzbd/filesystem.py
+msgid "%s is not writable at all. This blocks downloads."
+msgstr "%s ist nicht beschreibbar. Downloads sind dadurch blockiert."
+
+#. Warning message
+#: sabnzbd/filesystem.py
+msgid "Cannot write a long filename to %s. This can cause problems."
+msgstr ""
+
+#. Warning message
+#: sabnzbd/filesystem.py
+msgid "Cannot write a unicode filename to %s. This can cause problems."
+msgstr ""
+
 #. Warning message
 #: sabnzbd/filesystem.py
 msgid ""
@@ -650,11 +670,6 @@ msgstr ""
 "Dateinamen mit Umlaute können nicht in %s gespeichert werden. Dies kann zu "
 "Problemen führen."
 
-#. Warning message
-#: sabnzbd/filesystem.py
-msgid "%s is not writable at all. This blocks downloads."
-msgstr "%s ist nicht beschreibbar. Downloads sind dadurch blockiert."
-
 #: sabnzbd/interface.py
 msgid "Refused connection from:"
 msgstr "Abgelehnte Verbindung von:"
@@ -688,7 +703,7 @@ msgstr ""
 "API-Schlüssel ungültig. Bitte API-Schlüssel aus Einstellungen->Allgemein in "
 "die externe Anwendung eingeben:"
 
-#: sabnzbd/interface.py, sabnzbd/newswrapper.py, sabnzbd/utils/servertests.py
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
 msgid "Authentication failed, check username/password."
 msgstr ""
 "Authentifizierung fehlgeschlagen. Überprüfen Sie Benutzername und Passwort."
@@ -698,23 +713,10 @@ msgstr ""
 msgid "Unsuccessful login attempt from %s"
 msgstr "Fehlerhafter Login Versuch von %s"
 
-#: sabnzbd/interface.py
-msgid ""
-"The Completed Download Folder cannot be the same or a subfolder of the "
-"Temporary Download Folder"
-msgstr ""
-"Der \"Abgeschlossene Downloads\"-Ordner darf kein Unterordner des "
-"\"Temporäre Downloads\"-Ordners sein."
-
 #: sabnzbd/interface.py
 msgid "Invalid backup archive"
 msgstr "Invalides Backup Archiv"
 
-#: sabnzbd/interface.py
-msgid "Warning: LOCALHOST is ambiguous, use numerical IP-address."
-msgstr ""
-"Warnung: localhost ist mehrdeutig. Verwenden Sie eine numerische IP-Adresse."
-
 #: sabnzbd/interface.py
 msgid "Server address \"%s:%s\" is not valid."
 msgstr "Server-Adresse \"%s:%s\" ist ungültig."
@@ -830,11 +832,22 @@ msgstr "[%s] Der Befehl in build_command ist nicht definiert."
 msgid "Python script \"%s\" does not have execute (+x) permission set"
 msgstr "Dem Pythonskript \"%s\" fehlen die Ausführungsrechte (+x)"
 
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Series Sorting"
+msgstr "Sortieren von TV-Serien"
+
+#: sabnzbd/misc.py
+msgid "Date Sorting"
+msgstr "Sortieren nach Datum"
+
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Movie Sorting"
+msgstr "Film Sortierung"
+
 #: sabnzbd/newsunpack.py, sabnzbd/postproc.py
 msgid "Running script"
 msgstr "Ausführen des Skripts"
 
-#. Warning message
 #: sabnzbd/newsunpack.py
 msgid "Unpack nesting too deep [%s]"
 msgstr "Entpacken zu tief verschachtelt [%s]"
@@ -924,19 +937,6 @@ msgstr "RAR-Datei beschädigt"
 msgid "Corrupt RAR file"
 msgstr "Defekte RAR Datei"
 
-#: sabnzbd/newsunpack.py
-msgid "%s files in %s"
-msgstr "%s Dateien in %s"
-
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "Error \"%s\" while running unzip() on %s"
-msgstr "Fehler \"%s\" beim Ausführen von unzip auf %s"
-
-#: sabnzbd/newsunpack.py
-msgid "No 7za binary found, cannot unpack \"%s\""
-msgstr "Keine 7za Binary gefunden, entpacken von \"%s\" nicht möglich"
-
 #: sabnzbd/newsunpack.py
 msgid "Trying 7zip with password \"%s\""
 msgstr "Versuche 7zip mit Passwort \"%s\""
@@ -1203,6 +1203,18 @@ msgstr "Fehler beim Laden von %s. Beschädigte Datei gefunden."
 msgid "NZB added to queue"
 msgstr "NZB zur Warteschlange hinzugefügt"
 
+#: sabnzbd/nzbqueue.py, sabnzbd/nzbstuff.py
+msgid "Ignoring duplicate NZB \"%s\""
+msgstr "Doppelte NZB \"%s\" wird ignoriert"
+
+#: sabnzbd/nzbqueue.py, sabnzbd/nzbstuff.py
+msgid "Failing duplicate NZB \"%s\""
+msgstr "kopieren der NZB \"%s\" fehlgeschlagen"
+
+#: sabnzbd/nzbqueue.py, sabnzbd/nzbstuff.py
+msgid "Duplicate NZB"
+msgstr "Doppelte NZB"
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (error: %s)"
@@ -1219,26 +1231,6 @@ msgstr ""
 "Das Vorwarteschlangen (pre-queue) Skript hat die Downloadaufgabe als "
 "gescheitert markiert"
 
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Ignoring duplicate NZB \"%s\""
-msgstr "Doppelte NZB \"%s\" wird ignoriert"
-
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Failing duplicate NZB \"%s\""
-msgstr "kopieren der NZB \"%s\" fehlgeschlagen"
-
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Duplicate NZB"
-msgstr "Doppelte NZB"
-
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Pausing duplicate NZB \"%s\""
-msgstr "Doppelt vorhandene NZB \"%s\" angehalten"
-
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Unwanted Extension in file %s (%s)"
@@ -1257,6 +1249,10 @@ msgstr "Fehler beim Importieren von %s"
 msgid "DUPLICATE"
 msgstr "DUPLIKAT"
 
+#: sabnzbd/nzbstuff.py
+msgid "ALTERNATIVE"
+msgstr ""
+
 #: sabnzbd/nzbstuff.py
 msgid "ENCRYPTED"
 msgstr "VERSCHLÜSSELT"
@@ -1303,6 +1299,10 @@ msgstr "%s Artikel fehlten"
 msgid "%s articles had non-matching duplicates"
 msgstr "%s Artikel hatten nicht übereinstimmende Duplikate"
 
+#: sabnzbd/nzbstuff.py
+msgid "Pausing duplicate NZB \"%s\""
+msgstr "Doppelt vorhandene NZB \"%s\" angehalten"
+
 #. Footer: indicator of warnings
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Warnings"
@@ -1578,14 +1578,14 @@ msgstr "Dateien verschieben fehlgeschlagen"
 msgid "Running user script %s"
 msgstr "Ausführen des Benutzer-Skripts %s"
 
-#: sabnzbd/postproc.py
-msgid "Ran %s"
-msgstr "%s ausgeführt"
-
 #: sabnzbd/postproc.py
 msgid "Script exit code is %s"
 msgstr "Exit-Code des Skripts ist %s"
 
+#: sabnzbd/postproc.py
+msgid "Ran %s"
+msgstr "%s ausgeführt"
+
 #: sabnzbd/postproc.py, sabnzbd/skintext.py
 msgid "More"
 msgstr "Mehr"
@@ -1916,32 +1916,32 @@ msgstr "Abgeschlossene Aufträge entfernen"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Pause low prioirty jobs"
+msgid "Pause low priority jobs"
 msgstr "Aufträge mit niedriger Priorität pausieren"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Pause normal prioirty jobs"
+msgid "Pause normal priority jobs"
 msgstr "Aufträge mit normaler Priorität pausieren"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Pause high prioirty jobs"
+msgid "Pause high priority jobs"
 msgstr "Aufträge mit hoher Priorität pausieren"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Resume low prioirty jobs"
+msgid "Resume low priority jobs"
 msgstr "Aufträge mit niedriger Priorität fortsetzen"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Resume normal prioirty jobs"
+msgid "Resume normal priority jobs"
 msgstr "Aufträge mit normaler Priorität fortsetzen"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Resume high prioirty jobs"
+msgid "Resume high priority jobs"
 msgstr "Aufträge mit hoher Priorität fortsetzen"
 
 #. Config->Scheduler
@@ -2221,10 +2221,6 @@ msgstr "Spezial"
 msgid "Search"
 msgstr "Suchen"
 
-#: sabnzbd/skintext.py
-msgid "Download Dir"
-msgstr "Downloads"
-
 #: sabnzbd/skintext.py
 msgid "Are you sure you want to shutdown SABnzbd?"
 msgstr "Möchten Sie SABnzbd wirklich beenden?"
@@ -2309,11 +2305,6 @@ msgstr "Name"
 msgid "Retry"
 msgstr "Erneut versuchen"
 
-#. Queue end-of-queue selection box
-#: sabnzbd/skintext.py
-msgid "Actions"
-msgstr "Aktionen"
-
 #. Queue page table, script selection menu
 #: sabnzbd/skintext.py
 msgid "Scripts"
@@ -2514,10 +2505,6 @@ msgstr "DNS-Server"
 msgid "Download speed limited by"
 msgstr "Downloadgeschwindigkeit begrenzt durch"
 
-#: sabnzbd/skintext.py
-msgid "CPU"
-msgstr "CPU"
-
 #: sabnzbd/skintext.py
 msgid "Disk speed"
 msgstr "Festplattengeschwindigkeit"
@@ -2619,18 +2606,10 @@ msgstr ""
 "Falls sich deine IP Adresse ändert oder SABnzbd neu startet, wird deine "
 "Session ungültig"
 
-#: sabnzbd/skintext.py
-msgid "Enable Unzip"
-msgstr "unzip aktivieren"
-
 #: sabnzbd/skintext.py
 msgid "Enable 7zip"
 msgstr "7zip aktivieren"
 
-#: sabnzbd/skintext.py
-msgid "Multicore Par2"
-msgstr "Multicore Par2"
-
 #: sabnzbd/skintext.py
 msgid ""
 "Secure (SSL) connections from SABnzbd to newsservers and HTTPS websites will"
@@ -2645,11 +2624,9 @@ msgstr ""
 
 #: sabnzbd/skintext.py
 msgid ""
-"Speed up repairs by installing multicore Par2, it is available for many "
+"Speed up repairs by installing par2cmdline-turbo, it is available for many "
 "platforms."
 msgstr ""
-"Erhöhe Reparaturgeschwindigkeit durch installation von Multicore Par2, "
-"verfügbar auf vielen Plattformen."
 
 #: sabnzbd/skintext.py
 msgid "Version"
@@ -3038,6 +3015,11 @@ msgstr ""
 "Hier werden fertige, verarbeitete Downloads abgelegt.<br /><i>Kann von "
 "benutzerdefinierten Kategorien ausser Kraft gesetzt werden.</i>"
 
+#: sabnzbd/skintext.py
+msgid ""
+"Use Sorting to automatically organize and rename your completed downloads."
+msgstr "Benutze Sortieren um deine Dateien zu orgenisieren und umzubennenen"
+
 #: sabnzbd/skintext.py
 msgid "Minimum Free Space for Completed Download Folder"
 msgstr "Minimaler freier Speicherplatz des abgeschlossene Downloads-Ordners"
@@ -3081,12 +3063,8 @@ msgid "Watched Folder"
 msgstr "Überwachter Ordner"
 
 #: sabnzbd/skintext.py
-msgid ""
-"Folder to monitor for .nzb files.<br /><i>Also scans .zip .rar and .tar.gz "
-"archives for .nzb files.</i>"
-msgstr ""
-"Ordner, der auf neue NZB-Dateien überwacht werden soll.<br /><i>Erkennt auch"
-" ZIP-, RAR- und TAR.GZ-Archive mit NZB-Dateien.</i>"
+msgid "Folder to monitor for .nzb files."
+msgstr "Ordner, der auf neue .nzb Dateien überwacht werden soll."
 
 #: sabnzbd/skintext.py
 msgid "Watched Folder Scan Speed"
@@ -3126,6 +3104,10 @@ msgstr ""
 msgid "System Folders"
 msgstr "System-Ordner"
 
+#: sabnzbd/skintext.py
+msgid "Hidden Folders"
+msgstr "Versteckte Ordner"
+
 #: sabnzbd/skintext.py
 msgid "Administrative Folder"
 msgstr "Administrativer Ordner"
@@ -3170,6 +3152,10 @@ msgstr ""
 "Hier werden Protokoll-Dateien von SABnzbd abgelegt.<br /><i>Benötigt einen "
 "Neustart von SABnzbd!</i>"
 
+#: sabnzbd/skintext.py
+msgid "Purge Logs"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid ".nzb Backup Folder"
 msgstr "NZB-Backup-Ordner"
@@ -3351,16 +3337,6 @@ msgstr ""
 "Wenn das Benutzerskript einen Exit-Code ausgibt, der nicht \"0\" ist, wird "
 "der Auftrag als fehlgeschlagen markiert."
 
-#: sabnzbd/skintext.py
-msgid "On failure, try alternative NZB"
-msgstr "Nach einem Fehler ein alternatives NZB laden"
-
-#: sabnzbd/skintext.py
-msgid "Some servers provide an alternative NZB when a download fails."
-msgstr ""
-"Manche Server stellen ein alternatives NZB zur Verfügung, falls ein Download"
-" fehlschlägt."
-
 #: sabnzbd/skintext.py
 msgid "Enable folder rename"
 msgstr "Ordner-Umbenennung aktivieren"
@@ -3382,6 +3358,14 @@ msgid "Used before an NZB enters the queue."
 msgstr ""
 "Wird verwendet, bevor eine NZB-Datei zur Warteschlange hinzugefügt wird."
 
+#: sabnzbd/skintext.py
+msgid "On queue finish script"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Executed after the queue finishes downloading."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Extra PAR2 Parameters"
 msgstr "Zusätzliche PAR2-Parameter"
@@ -3644,26 +3628,6 @@ msgstr ""
 "Job abbrechen falls während des Downloads klar wird, dass zuviele Daten "
 "fehlen"
 
-#: sabnzbd/skintext.py
-msgid "Server IP address selection"
-msgstr "Auswahl der Server-IP-Adresse"
-
-#: sabnzbd/skintext.py
-msgid "First IP address"
-msgstr "Erste IP-Adresse"
-
-#: sabnzbd/skintext.py
-msgid "Randomly selected IP address"
-msgstr "Zufällig ausgewählte IP-Adresse"
-
-#: sabnzbd/skintext.py
-msgid "Quickest IP address, preferring IPv6"
-msgstr "Schnellste IP-Adresse, IPv6 bevorzugt"
-
-#: sabnzbd/skintext.py
-msgid "Useful if a newsserver has more than one IPv4/IPv6 address"
-msgstr "Nützlich, wenn ein Newsserver mehr als eine IPv4/IPv6-Adresse hat"
-
 #. Caption - Button: Add server
 #: sabnzbd/skintext.py
 msgid "Add Server"
@@ -3878,6 +3842,10 @@ msgstr "Feed lesen"
 msgid "Force Download"
 msgstr "Download erzwingen"
 
+#: sabnzbd/skintext.py
+msgid "Apply filters"
+msgstr "Filter übernehmen"
+
 #. Config->RSS edit button
 #: sabnzbd/skintext.py
 msgid "Edit"
@@ -4253,20 +4221,6 @@ msgstr "Ordner/Pfad"
 msgid "Indexer Categories / Groups"
 msgstr "Indexer Kategorien/Gruppen"
 
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Select at least 1 category."
-msgstr "Wähle mindestens 1 Kategorie"
-
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Series Sorting"
-msgstr "Sortieren von TV-Serien"
-
-#: sabnzbd/skintext.py
-msgid "Enable TV Sorting"
-msgstr "TV-Sortierung aktivieren"
-
 #: sabnzbd/skintext.py
 msgid "Pattern Key"
 msgstr "Muster-Schlüssel"
@@ -4275,23 +4229,10 @@ msgstr "Muster-Schlüssel"
 msgid "Clear"
 msgstr "Löschen"
 
-#: sabnzbd/skintext.py
-msgid "Apply filters"
-msgstr "Filter übernehmen"
-
 #: sabnzbd/skintext.py
 msgid "Presets"
 msgstr "Voreinstellungen"
 
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Movie Sorting"
-msgstr "Film Sortierung"
-
-#: sabnzbd/skintext.py
-msgid "Enable Movie Sorting"
-msgstr "Film-Sortierung aktivieren"
-
 #: sabnzbd/skintext.py
 msgid "Affected Categories"
 msgstr "Betroffene Kategorien"
@@ -4308,26 +4249,6 @@ msgstr "Muster"
 msgid "Result"
 msgstr "Resultat"
 
-#: sabnzbd/skintext.py
-msgid "1x05 Season Folder"
-msgstr "1x05 Staffel-Ordner"
-
-#: sabnzbd/skintext.py
-msgid "S01E05 Season Folder"
-msgstr "S01E05 Staffel-Ordner"
-
-#: sabnzbd/skintext.py
-msgid "1x05 Episode Folder"
-msgstr "1x05 Episoden-Ordner"
-
-#: sabnzbd/skintext.py
-msgid "S01E05 Episode Folder"
-msgstr "S01E05 Episoden-Ordner"
-
-#: sabnzbd/skintext.py
-msgid "Job Name as Filename"
-msgstr "Aufgabe Name als Ordnername"
-
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr "Titel"
@@ -4376,10 +4297,6 @@ msgstr "Episoden.Name"
 msgid "Episode_Name"
 msgstr "Episoden_Name"
 
-#: sabnzbd/skintext.py
-msgid "File Extension"
-msgstr "Dateiendung"
-
 #: sabnzbd/skintext.py
 msgid "Extension"
 msgstr "Endung"
@@ -4421,8 +4338,16 @@ msgid "Sort String"
 msgstr "Sortieranweisung"
 
 #: sabnzbd/skintext.py
-msgid "Multi-part label"
-msgstr "Markierung für mehrere Teile"
+msgid "Multi-part Label"
+msgstr "Multi-part Kennzeichnung"
+
+#: sabnzbd/skintext.py
+msgid "Show folder"
+msgstr "Zeige Ordner"
+
+#: sabnzbd/skintext.py
+msgid "Season folder"
+msgstr "Staffelordner"
 
 #: sabnzbd/skintext.py
 msgid "In folders"
@@ -4432,26 +4357,13 @@ msgstr "In Ordnern"
 msgid "No folders"
 msgstr "Keine Ordner"
 
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Date Sorting"
-msgstr "Sortieren nach Datum"
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
+msgstr "Aufgabe Name als Ordnername"
 
 #: sabnzbd/skintext.py
-msgid "Enable Date Sorting"
-msgstr "Sortieren nach Datum aktivieren"
-
-#: sabnzbd/skintext.py
-msgid "Show Name folder"
-msgstr "Ordner mit Name der Sendung"
-
-#: sabnzbd/skintext.py
-msgid "Year-Month Folders"
-msgstr "Jahr-Monat-Ordner"
-
-#: sabnzbd/skintext.py
-msgid "Daily Folders"
-msgstr "Tägliche Ordner"
+msgid "Series"
+msgstr "Serien"
 
 #. Note for title expression in Sorting that does case adjustment
 #: sabnzbd/skintext.py
@@ -4482,6 +4394,81 @@ msgstr "GuessIt.Eigenschaft"
 msgid "GuessIt_Property"
 msgstr "GuessIt_Eigenschaft"
 
+#: sabnzbd/skintext.py
+msgid "Minimum Filesize"
+msgstr "Minimale Dateigröße"
+
+#: sabnzbd/skintext.py
+msgid "Affected Job Types"
+msgstr "Betroffener Aufgabentyp"
+
+#: sabnzbd/skintext.py
+msgid "All"
+msgstr "Alle"
+
+#: sabnzbd/skintext.py
+msgid "Series with air dates"
+msgstr "Serien mit Ausstrahlungsdatum"
+
+#: sabnzbd/skintext.py
+msgid "Movies"
+msgstr "Filme"
+
+#: sabnzbd/skintext.py
+msgid "Other / Unknown"
+msgstr "Andere / Unbekannte"
+
+#: sabnzbd/skintext.py
+msgid ""
+"<p>Use Sorters to automatically organize your completed downloads. For "
+"example, put all episodes from a series in a season-specific folder. Or, put"
+" movies in a folder named after the movie.</p><p>Sorters are tried in order "
+"of appearance and can be reordered by dragging and dropping.<br/>The first "
+"active sorter that matches both the affected category and job type is "
+"applied.</p><p>More options are available when Advanced Settings is "
+"checked.<br/>Detailed information can be found on the Wiki.</p>"
+msgstr ""
+"<p>Benutze die Sortierer, um deine fertigen Downloads zu orgenisieren. Zum "
+"Beispiel verschiebe alle Seriendateien in den Serien eigenen Ordner oder "
+"Verschiege alle Filme in den Filme eigenen Ordner.</p><p>Die Sortierer "
+"werden der Reihe nach bearbeitet und könne durch ziehen und ablegen "
+"umsortiert werden.<br/>Der erste Aktive Sortierer der sowohl zur Kategorie "
+"als auch zum Aufgabentyp passt wird angewendet.</p><p>Wenn erweiterte "
+"Einstellungen aktiviert sind, sind noch mehr Einstellungen möglich.<br/> "
+"Weitere informationen sind in der WIki zu finden.</p>"
+
+#: sabnzbd/skintext.py
+msgid "Add Sorter"
+msgstr "Sortierer hinzufügen"
+
+#: sabnzbd/skintext.py
+msgid "Remove Sorter"
+msgstr "Sortierer entfernen"
+
+#: sabnzbd/skintext.py
+msgid "Test Data"
+msgstr "Testdaten"
+
+#: sabnzbd/skintext.py
+msgid "Quick start"
+msgstr "Schnellstart"
+
+#: sabnzbd/skintext.py
+msgid ""
+"Move and rename all episodes in the \"tv\" category to a show-specific "
+"folder"
+msgstr ""
+"Bennene alle Episodendateien in der Kategorie \"tv\" um und veschiebe sie in"
+" den Serien eigenen Ordner"
+
+#: sabnzbd/skintext.py
+msgid ""
+"Move and rename all movies in the \"movies\" category to a movie-specific "
+"folder"
+msgstr ""
+"Bennene alle Filmdateien in der Kategorie \"filme\" um und veschiebe sie in "
+"den Filme eigenen Ordner"
+
 #: sabnzbd/skintext.py
 msgid ""
 "Rarely used options. For their meaning and explanation, click on the Help "
@@ -4721,6 +4708,10 @@ msgstr "Löschen von Verlaufeinträgen bestätigen"
 msgid "Keyboard shortcuts"
 msgstr "Tastaturkürzel"
 
+#: sabnzbd/skintext.py
+msgid "Shift+Arrow key: Browse Queue and History pages"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "How long or untill when do you want to pause? (in English!)"
 msgstr "Wie lange oder bis wann möchtest du pausieren? (in Englisch!)"
@@ -4897,8 +4888,8 @@ msgstr ""
 
 #. Error message
 #: sabnzbd/sorting.py
-msgid "Failed to rename: %s to %s"
-msgstr "Umbenennen von %s nach %s fehlgeschlagen."
+msgid "Failed to rename %s to %s"
+msgstr "Fehler beim umbennenen von %s nach %s"
 
 #. Error message
 #: sabnzbd/sorting.py
@@ -4969,10 +4960,6 @@ msgstr ""
 "Unbekanntes SSL-Protokoll: SSL deaktivieren oder alternativen Port "
 "versuchen."
 
-#: sabnzbd/utils/servertests.py
-msgid "Server quit during login sequence."
-msgstr "Sever beendet beim Anmeldeverlauf."
-
 #: sabnzbd/utils/servertests.py
 msgid "Server requires username and password."
 msgstr "Server benötigt ein Benutzername und ein Passwort."

po/main/en.po

@@ -124,4 +124,7 @@ msgid "0 is highest priority, 100 is the lowest priority"
 msgstr "0 is highest priority, 99 is the lowest priority"
 
 msgid "Filter out sample files (e.g. video samples)."
-msgstr "Filter out sample files (e.g. video samples/proofs)."
+msgstr "Filter out sample files (e.g. video samples/proofs)."
+
+msgid "Pre-queue user script"
+msgstr "Pre-queue script"

po/main/es.po

@@ -1,18 +1,17 @@
 # SABnzbd Translation Template file MAIN
-# Copyright 2007-2022 The SABnzbd-Team
-#   team@sabnzbd.org
+# Copyright 2007-2023 The SABnzbd-Team
 # 
 # Translators:
 # Ester Molla Aragones <moarages@gmail.com>, 2020
-# 1024mb <angelb2203@gmail.com>, 2020
-# Safihre <safihre@sabnzbd.org>, 2022
+# 1024mb <angelb2203@gmail.com>, 2023
+# Safihre <safihre@sabnzbd.org>, 2023
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.7.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.0Alpha2\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
-"Last-Translator: Safihre <safihre@sabnzbd.org>, 2022\n"
-"Language-Team: Spanish (https://www.transifex.com/sabnzbd/teams/111101/es/)\n"
+"Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
+"Language-Team: Spanish (https://app.transifex.com/sabnzbd/teams/111101/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,20 +40,13 @@ msgstr ""
 "No se puede encontrar la plantilla web: %s, intentando con la plantilla "
 "estandar"
 
-#. Error message
-#: SABnzbd.py
-msgid "SABYenc disabled: no correct version found! (Found v%s, expecting v%s)"
-msgstr ""
-"SABYenc deshabilitado: ¡no se ha encontrado la versión correcta! (Se ha "
-"encontrado la v%s, se esperaba la v%s)"
-
 #. Error message
 #: SABnzbd.py
 msgid ""
-"SABYenc module... NOT found! Expecting v%s - https://sabnzbd.org/sabyenc"
+"SABCTools disabled: no correct version found! (Found v%s, expecting v%s)"
 msgstr ""
-"Módulo SABYenc... ¡NO encontrado! Se esperaba la v%s - "
-"https://sabnzbd.org/sabyenc"
+"SABCTools deshabilitado: ¡no se ha encontrado la versión correcta! (Se ha "
+"encontrado la v%s, se esperaba la v%s)"
 
 #. Error message
 #: SABnzbd.py
@@ -71,14 +63,11 @@ msgstr "Su versión UnRAR es %s, recomendamos la versión %s o superior. <br />"
 msgid "unrar binary... NOT found"
 msgstr "unrar binario... NO encontrado"
 
+#. Warning message
 #: SABnzbd.py
 msgid "7za binary... NOT found!"
 msgstr "No se encontró el binario de 7za"
 
-#: SABnzbd.py
-msgid "unzip binary... NOT found!"
-msgstr "unzip binario... NO encontrado!"
-
 #. Error message
 #: SABnzbd.py
 msgid "Essential modules are missing, downloading cannot start."
@@ -114,6 +103,8 @@ msgid ""
 "Current umask (%o) might deny SABnzbd access to the files and folders it "
 "creates."
 msgstr ""
+"La umask actual (%o) podría denegarle acceso a SABnzbd a los archivos y "
+"carpetas que este crea."
 
 #. Warning message
 #: SABnzbd.py
@@ -158,22 +149,17 @@ msgstr "Error grave al guardar estado"
 #. Warning message
 #: sabnzbd/__init__.py
 msgid "Restarting because of crashed postprocessor"
-msgstr ""
+msgstr "Reiniciando a causa de un posprocesador colgado"
 
 #. Warning message
 #: sabnzbd/__init__.py
 msgid "Restarting because of crashed downloader"
-msgstr ""
-
-#. Warning message
-#: sabnzbd/__init__.py
-msgid "Restarting because of crashed decoder"
-msgstr ""
+msgstr "Reiniciando debido al cuelgue del descargador"
 
 #. Warning message
 #: sabnzbd/__init__.py
 msgid "Restarting because of crashed assembler"
-msgstr ""
+msgstr "Reiniciando debido al cuelgue del ensamblador"
 
 #. Warning message
 #: sabnzbd/__init__.py
@@ -189,8 +175,8 @@ msgid "Test Notification"
 msgstr "Notificación de prueba"
 
 #: sabnzbd/api.py
-msgid "&nbsp;Resolving address"
-msgstr "&nbsp;Resolviendo sitio"
+msgid "Resolving address"
+msgstr "Resolviendo sitio"
 
 #. No value, used in dropdown menus
 #: sabnzbd/api.py, sabnzbd/skintext.py
@@ -287,10 +273,6 @@ msgstr "Quota gastado, pausando cola"
 msgid "Incorrect parameter"
 msgstr "Parámetro incorrecto"
 
-#: sabnzbd/cfg.py
-msgid "UNC path \"%s\" not allowed here"
-msgstr "Ruta de acceso UNC \"%s\" no permitido aqui"
-
 #: sabnzbd/cfg.py
 msgid "%s is not a valid email address"
 msgstr "%s no es una dirección de correo electrónico válida."
@@ -299,7 +281,7 @@ msgstr "%s no es una dirección de correo electrónico válida."
 msgid "Server address required"
 msgstr "Se necesita la dirección del servidor"
 
-#: sabnzbd/cfg.py, sabnzbd/utils/servertests.py
+#: sabnzbd/cfg.py, sabnzbd/newswrapper.py
 msgid "Invalid server address."
 msgstr "Dirección del servidor no válida."
 
@@ -319,8 +301,25 @@ msgid ""
 msgstr ""
 
 #: sabnzbd/cfg.py
-msgid "Error: Queue not empty, cannot change folder."
-msgstr "Error: Cola no esta vacía, no se puede cambiar el directorio"
+msgid "UNC path \"%s\" not allowed here"
+msgstr "Ruta de acceso UNC \"%s\" no permitido aqui"
+
+#: sabnzbd/cfg.py
+msgid "Queue not empty, cannot change folder."
+msgstr "Cola no esta vacía, no se puede cambiar el directorio"
+
+#: sabnzbd/cfg.py
+msgid ""
+"The Completed Download Folder cannot be the same or a subfolder of the "
+"Temporary Download Folder"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/cfg.py
+msgid ""
+"Do not use a folder in the application folder as your Scripts Folder, it "
+"might be emptied during updates."
+msgstr ""
 
 #. Warning message
 #: sabnzbd/config.py
@@ -370,7 +369,7 @@ msgstr "Comando SQL ha fallado, vea el registro"
 msgid "Failed to close database, see log"
 msgstr "No se pudo cerrar el base de datos, vea el registro"
 
-#. Error message
+#. Warning message
 #: sabnzbd/database.py
 msgid "Invalid stage logging in history for %s"
 msgstr "Registro de etapa invalido para transferencia terminada %s"
@@ -440,13 +439,12 @@ msgid "Paused"
 msgstr "En pausa"
 
 #. Warning message
-#: sabnzbd/downloader.py, sabnzbd/interface.py, sabnzbd/skintext.py
+#: sabnzbd/downloader.py, sabnzbd/skintext.py
 msgid "You must set a maximum bandwidth before you can set a bandwidth limit"
 msgstr ""
 "Debe establecer un ancho de banda máximo antes de poder establecer un límite"
 " de ancho de banda"
 
-#. Warning message
 #: sabnzbd/downloader.py
 msgid "Cannot connect to server %s [%s]"
 msgstr "Error en inicio de conexion a servidor %s [%s]"
@@ -470,20 +468,24 @@ msgstr ""
 msgid "Failed to initialize %s@%s with reason: %s"
 msgstr "Error al inicializar %s@%s con la razón: %s"
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "Too many connections to server %s"
-msgstr "Demasiadas conexiones con el servidor %s"
-
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "Probable account sharing"
-msgstr "Compartiendo de cuenta probable"
-
 #. Error message
 #: sabnzbd/downloader.py
-msgid "Failed login for server %s"
-msgstr "Registraccion fallo para servidor %s"
+msgid "Fatal error in Downloader"
+msgstr ""
+
+#: sabnzbd/downloader.py
+msgid "Too many connections to server %s [%s]"
+msgstr "Demasiadas conexiones con el servidor %s [%s]"
+
+#: sabnzbd/downloader.py
+msgid ""
+"Login from too many different IP addresses to server %s [%s] - "
+"https://sabnzbd.org/multiple-adresses"
+msgstr ""
+
+#: sabnzbd/downloader.py
+msgid "Failed login for server %s [%s]"
+msgstr "Registraccion fallo para servidor %s [%s]"
 
 #. Error message
 #: sabnzbd/downloader.py
@@ -633,14 +635,24 @@ msgstr "Cargar de %s no se pudo completar."
 
 #. Warning message
 #: sabnzbd/filesystem.py
-msgid ""
-"%s is not writable with special character filenames. This can cause "
-"problems."
+msgid "%s is not writable at all. This blocks downloads."
 msgstr ""
 
 #. Warning message
 #: sabnzbd/filesystem.py
-msgid "%s is not writable at all. This blocks downloads."
+msgid "Cannot write a long filename to %s. This can cause problems."
+msgstr ""
+
+#. Warning message
+#: sabnzbd/filesystem.py
+msgid "Cannot write a unicode filename to %s. This can cause problems."
+msgstr ""
+
+#. Warning message
+#: sabnzbd/filesystem.py
+msgid ""
+"%s is not writable with special character filenames. This can cause "
+"problems."
 msgstr ""
 
 #: sabnzbd/interface.py
@@ -676,7 +688,7 @@ msgstr ""
 "Clave de API erróneo, favor ingresar la clave correcta desde Config->General"
 " en tu aplicacion externa:"
 
-#: sabnzbd/interface.py, sabnzbd/newswrapper.py, sabnzbd/utils/servertests.py
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
 msgid "Authentication failed, check username/password."
 msgstr "Autenticación fallida, compruebe el usuario o la contraseña."
 
@@ -685,20 +697,10 @@ msgstr "Autenticación fallida, compruebe el usuario o la contraseña."
 msgid "Unsuccessful login attempt from %s"
 msgstr "Intento fallido de inicio de sesión desde %s"
 
-#: sabnzbd/interface.py
-msgid ""
-"The Completed Download Folder cannot be the same or a subfolder of the "
-"Temporary Download Folder"
-msgstr ""
-
 #: sabnzbd/interface.py
 msgid "Invalid backup archive"
 msgstr ""
 
-#: sabnzbd/interface.py
-msgid "Warning: LOCALHOST is ambiguous, use numerical IP-address."
-msgstr "Alerta: LOCALHOST es ambiguo, use dirección de IP numérica"
-
 #: sabnzbd/interface.py
 msgid "Server address \"%s:%s\" is not valid."
 msgstr "La dirección del servidor «%s:%s» no es válida."
@@ -816,11 +818,22 @@ msgstr ""
 "La secuencia de comandos Python \"%s\" no tiene configurado el permiso de "
 "ejecutar (+x)"
 
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Series Sorting"
+msgstr "Ordenación de Series"
+
+#: sabnzbd/misc.py
+msgid "Date Sorting"
+msgstr "Ordenar por fecha"
+
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Movie Sorting"
+msgstr "Clasificación de películas"
+
 #: sabnzbd/newsunpack.py, sabnzbd/postproc.py
 msgid "Running script"
 msgstr "Ejecutando script"
 
-#. Warning message
 #: sabnzbd/newsunpack.py
 msgid "Unpack nesting too deep [%s]"
 msgstr ""
@@ -912,19 +925,6 @@ msgstr "Archivo RAR inutilizable"
 msgid "Corrupt RAR file"
 msgstr "Fichero RAR corrupto"
 
-#: sabnzbd/newsunpack.py
-msgid "%s files in %s"
-msgstr "%s archivos en %s"
-
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "Error \"%s\" while running unzip() on %s"
-msgstr "Error \"%s\" al ejecutar unzip() sobre %s"
-
-#: sabnzbd/newsunpack.py
-msgid "No 7za binary found, cannot unpack \"%s\""
-msgstr "No se ha encontrado el binario 7za, no se puede descomprimir \"%s\""
-
 #: sabnzbd/newsunpack.py
 msgid "Trying 7zip with password \"%s\""
 msgstr "Tratando 7zip con la contraseña \"%s\""
@@ -1196,6 +1196,18 @@ msgstr "Error al cargar %s, archivo corrupto"
 msgid "NZB added to queue"
 msgstr "NZB añadido a la cola"
 
+#: sabnzbd/nzbqueue.py, sabnzbd/nzbstuff.py
+msgid "Ignoring duplicate NZB \"%s\""
+msgstr "Ignorando NZB Duplicado \"%s\""
+
+#: sabnzbd/nzbqueue.py, sabnzbd/nzbstuff.py
+msgid "Failing duplicate NZB \"%s\""
+msgstr "Fallo al duplicar NZB \"%s\""
+
+#: sabnzbd/nzbqueue.py, sabnzbd/nzbstuff.py
+msgid "Duplicate NZB"
+msgstr "Duplicar NZB"
+
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (error: %s)"
@@ -1212,26 +1224,6 @@ msgstr ""
 "La secuencia de comandos de la cola preestablecida ha marcado la tarea como "
 "fallida"
 
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Ignoring duplicate NZB \"%s\""
-msgstr "Ignorando NZB Duplicado \"%s\""
-
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Failing duplicate NZB \"%s\""
-msgstr "Fallo al duplicar NZB \"%s\""
-
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Duplicate NZB"
-msgstr "Duplicar NZB"
-
-#. Warning message
-#: sabnzbd/nzbstuff.py
-msgid "Pausing duplicate NZB \"%s\""
-msgstr "Pausando NZB duplicados \"%s\""
-
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Unwanted Extension in file %s (%s)"
@@ -1250,6 +1242,10 @@ msgstr "Error importando %s"
 msgid "DUPLICATE"
 msgstr "DUPLICADO"
 
+#: sabnzbd/nzbstuff.py
+msgid "ALTERNATIVE"
+msgstr ""
+
 #: sabnzbd/nzbstuff.py
 msgid "ENCRYPTED"
 msgstr "ENCRIPTADO"
@@ -1295,6 +1291,10 @@ msgstr "%s artículos no encontrados"
 msgid "%s articles had non-matching duplicates"
 msgstr "%s artículos contenían duplicados inconexos"
 
+#: sabnzbd/nzbstuff.py
+msgid "Pausing duplicate NZB \"%s\""
+msgstr "Pausando NZB duplicados \"%s\""
+
 #. Footer: indicator of warnings
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Warnings"
@@ -1567,14 +1567,14 @@ msgstr "Error al mover ficheros"
 msgid "Running user script %s"
 msgstr "Ejecutando script de usuario %s"
 
-#: sabnzbd/postproc.py
-msgid "Ran %s"
-msgstr "Se ejecutó %s"
-
 #: sabnzbd/postproc.py
 msgid "Script exit code is %s"
 msgstr "El código de retorno del Script es %s"
 
+#: sabnzbd/postproc.py
+msgid "Ran %s"
+msgstr "Se ejecutó %s"
+
 #: sabnzbd/postproc.py, sabnzbd/skintext.py
 msgid "More"
 msgstr "Más"
@@ -1907,32 +1907,32 @@ msgstr "Eliminar trabajos completados"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Pause low prioirty jobs"
+msgid "Pause low priority jobs"
 msgstr "Pausar trabajos de prioridad baja"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Pause normal prioirty jobs"
+msgid "Pause normal priority jobs"
 msgstr "Pausar trabajos de prioridad normal"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Pause high prioirty jobs"
+msgid "Pause high priority jobs"
 msgstr "Pausar trabajos de prioridad alta"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Resume low prioirty jobs"
+msgid "Resume low priority jobs"
 msgstr "Reanudar trabajos de prioridad baja"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Resume normal prioirty jobs"
+msgid "Resume normal priority jobs"
 msgstr "Reanudar trabajos de prioridad normal"
 
 #. Config->Scheduler
 #: sabnzbd/skintext.py
-msgid "Resume high prioirty jobs"
+msgid "Resume high priority jobs"
 msgstr "Reanudar trabajos de prioridad alta"
 
 #. Config->Scheduler
@@ -2212,10 +2212,6 @@ msgstr "Especial"
 msgid "Search"
 msgstr "Buscar"
 
-#: sabnzbd/skintext.py
-msgid "Download Dir"
-msgstr "Dir de Descarga"
-
 #: sabnzbd/skintext.py
 msgid "Are you sure you want to shutdown SABnzbd?"
 msgstr "¿Seguro que deseas detener SABnzbd?"
@@ -2300,11 +2296,6 @@ msgstr "Nombre"
 msgid "Retry"
 msgstr "Reintentar"
 
-#. Queue end-of-queue selection box
-#: sabnzbd/skintext.py
-msgid "Actions"
-msgstr "Acciones"
-
 #. Queue page table, script selection menu
 #: sabnzbd/skintext.py
 msgid "Scripts"
@@ -2505,10 +2496,6 @@ msgstr "Nombre del servidor / Búsqueda de DNS"
 msgid "Download speed limited by"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "CPU"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Disk speed"
 msgstr ""
@@ -2605,18 +2592,10 @@ msgid ""
 "expire."
 msgstr "Cuando tu dirección IP cambie o reinicies SABnzbd, la sesión caduca."
 
-#: sabnzbd/skintext.py
-msgid "Enable Unzip"
-msgstr "Habilitar Unzip"
-
 #: sabnzbd/skintext.py
 msgid "Enable 7zip"
 msgstr "Habilitar 7zip"
 
-#: sabnzbd/skintext.py
-msgid "Multicore Par2"
-msgstr "Multicore Par2"
-
 #: sabnzbd/skintext.py
 msgid ""
 "Secure (SSL) connections from SABnzbd to newsservers and HTTPS websites will"
@@ -2633,11 +2612,9 @@ msgstr ""
 
 #: sabnzbd/skintext.py
 msgid ""
-"Speed up repairs by installing multicore Par2, it is available for many "
+"Speed up repairs by installing par2cmdline-turbo, it is available for many "
 "platforms."
 msgstr ""
-"Agilice las reparaciones instalando multicore Par2, está disponible para "
-"muchas plataformas."
 
 #: sabnzbd/skintext.py
 msgid "Version"
@@ -3016,6 +2993,11 @@ msgstr ""
 "Ubicación donde guardar descargas finalizadas, totalmente procesaddas.<br "
 "/><i>Puede ser obviado debido a categorías definidas por el usuario.</i>"
 
+#: sabnzbd/skintext.py
+msgid ""
+"Use Sorting to automatically organize and rename your completed downloads."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Minimum Free Space for Completed Download Folder"
 msgstr ""
@@ -3053,12 +3035,8 @@ msgid "Watched Folder"
 msgstr "Directorio a vigilar"
 
 #: sabnzbd/skintext.py
-msgid ""
-"Folder to monitor for .nzb files.<br /><i>Also scans .zip .rar and .tar.gz "
-"archives for .nzb files.</i>"
-msgstr ""
-"Directorio a monitorizar en busca de ficheros .nzb.<br /><i>También escanea "
-"ficheros .zip .rar y .tar.gz en busca de ficheros .nzb.</i>"
+msgid "Folder to monitor for .nzb files."
+msgstr "Directorio a monitorizar en busca de ficheros .nzb."
 
 #: sabnzbd/skintext.py
 msgid "Watched Folder Scan Speed"
@@ -3098,6 +3076,10 @@ msgstr ""
 msgid "System Folders"
 msgstr "Directorios del sistema"
 
+#: sabnzbd/skintext.py
+msgid "Hidden Folders"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Administrative Folder"
 msgstr "Directorio de administración"
@@ -3137,6 +3119,10 @@ msgstr ""
 "Ubicación de los ficheros de log para SABnzbd.<br /><i>Requiere reiniciar "
 "SABnzbd!</i>"
 
+#: sabnzbd/skintext.py
+msgid "Purge Logs"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid ".nzb Backup Folder"
 msgstr "Directorio de Backups de .nzbs"
@@ -3312,15 +3298,6 @@ msgstr ""
 "Cuando la secuencia de comandos de usuario devuelve un código de salida "
 "distinto de cero, el trabajo se marca como fallido ."
 
-#: sabnzbd/skintext.py
-msgid "On failure, try alternative NZB"
-msgstr "En caso de fallo, intentar con un NZB alternativo"
-
-#: sabnzbd/skintext.py
-msgid "Some servers provide an alternative NZB when a download fails."
-msgstr ""
-"Algunos servidores ofrecen una NZB alternativa cuando falla una descarga ."
-
 #: sabnzbd/skintext.py
 msgid "Enable folder rename"
 msgstr "Habilitar renombrado de directorios"
@@ -3341,6 +3318,14 @@ msgstr "Script de usuario Pre-cola"
 msgid "Used before an NZB enters the queue."
 msgstr "Se usa precediendo a la entrada de un NZB en la cola del sistema."
 
+#: sabnzbd/skintext.py
+msgid "On queue finish script"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Executed after the queue finishes downloading."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Extra PAR2 Parameters"
 msgstr "Parámetros PAR2 extra"
@@ -3595,27 +3580,6 @@ msgstr ""
 "Cuando este bajando, si es claro que mucha data esta faltando, aborte el "
 "trabajo."
 
-#: sabnzbd/skintext.py
-msgid "Server IP address selection"
-msgstr "Selección de la dirección IP del servidor"
-
-#: sabnzbd/skintext.py
-msgid "First IP address"
-msgstr "Primera dirección IP"
-
-#: sabnzbd/skintext.py
-msgid "Randomly selected IP address"
-msgstr "Dirección IP seleccionada aleatoriamente"
-
-#: sabnzbd/skintext.py
-msgid "Quickest IP address, preferring IPv6"
-msgstr "Dirección IP más rápida, con preferencia IPv6"
-
-#: sabnzbd/skintext.py
-msgid "Useful if a newsserver has more than one IPv4/IPv6 address"
-msgstr ""
-"Útil si un servidor de noticias tiene más de una dirección IPv4 / IPv6"
-
 #. Caption - Button: Add server
 #: sabnzbd/skintext.py
 msgid "Add Server"
@@ -3828,6 +3792,10 @@ msgstr "Leer Fuente"
 msgid "Force Download"
 msgstr "Forzar Descarga"
 
+#: sabnzbd/skintext.py
+msgid "Apply filters"
+msgstr "Aplicar filtros"
+
 #. Config->RSS edit button
 #: sabnzbd/skintext.py
 msgid "Edit"
@@ -4200,20 +4168,6 @@ msgstr "Directorio/Ruta"
 msgid "Indexer Categories / Groups"
 msgstr "Categorías Indexer / Grupos"
 
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Select at least 1 category."
-msgstr ""
-
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Series Sorting"
-msgstr "Ordenación de Series"
-
-#: sabnzbd/skintext.py
-msgid "Enable TV Sorting"
-msgstr "Habilitar la ordenación de Series de TV"
-
 #: sabnzbd/skintext.py
 msgid "Pattern Key"
 msgstr "Patrón"
@@ -4222,23 +4176,10 @@ msgstr "Patrón"
 msgid "Clear"
 msgstr "Limpiar"
 
-#: sabnzbd/skintext.py
-msgid "Apply filters"
-msgstr "Aplicar filtros"
-
 #: sabnzbd/skintext.py
 msgid "Presets"
 msgstr "Preajustes"
 
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Movie Sorting"
-msgstr "Clasificación de películas"
-
-#: sabnzbd/skintext.py
-msgid "Enable Movie Sorting"
-msgstr "Habilitar Ordenado de Películas"
-
 #: sabnzbd/skintext.py
 msgid "Affected Categories"
 msgstr "Categorías Afectadas"
@@ -4255,26 +4196,6 @@ msgstr "Patrón"
 msgid "Result"
 msgstr "Resultado"
 
-#: sabnzbd/skintext.py
-msgid "1x05 Season Folder"
-msgstr "1x05 Temporada Directorio"
-
-#: sabnzbd/skintext.py
-msgid "S01E05 Season Folder"
-msgstr "S01E05 Temporada Directorio"
-
-#: sabnzbd/skintext.py
-msgid "1x05 Episode Folder"
-msgstr "1x05 Episodio Directorio"
-
-#: sabnzbd/skintext.py
-msgid "S01E05 Episode Folder"
-msgstr "S01E05 Episodio Directorio"
-
-#: sabnzbd/skintext.py
-msgid "Job Name as Filename"
-msgstr "Nombre de la tarea para el nombre de archivo"
-
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr "Título"
@@ -4323,10 +4244,6 @@ msgstr "Nombre.capítulo"
 msgid "Episode_Name"
 msgstr "Nombre_capítulo"
 
-#: sabnzbd/skintext.py
-msgid "File Extension"
-msgstr "Extensión de archivo"
-
 #: sabnzbd/skintext.py
 msgid "Extension"
 msgstr "Extensión"
@@ -4368,8 +4285,16 @@ msgid "Sort String"
 msgstr "Ordenar cadena"
 
 #: sabnzbd/skintext.py
-msgid "Multi-part label"
-msgstr "Etiqueta"
+msgid "Multi-part Label"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Show folder"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Season folder"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "In folders"
@@ -4379,26 +4304,13 @@ msgstr "En directorios"
 msgid "No folders"
 msgstr "Sin Directorios"
 
-#. Warning message
-#: sabnzbd/skintext.py, sabnzbd/sorting.py
-msgid "Date Sorting"
-msgstr "Ordenar por fecha"
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
+msgstr "Nombre de la tarea para el nombre de archivo"
 
 #: sabnzbd/skintext.py
-msgid "Enable Date Sorting"
-msgstr "Habilitar ordenar por fecha"
-
-#: sabnzbd/skintext.py
-msgid "Show Name folder"
-msgstr "Carpeta de la serie"
-
-#: sabnzbd/skintext.py
-msgid "Year-Month Folders"
-msgstr "Directorios Año-Mes"
-
-#: sabnzbd/skintext.py
-msgid "Daily Folders"
-msgstr "Directorios diarios"
+msgid "Series"
+msgstr ""
 
 #. Note for title expression in Sorting that does case adjustment
 #: sabnzbd/skintext.py
@@ -4429,6 +4341,69 @@ msgstr ""
 msgid "GuessIt_Property"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Minimum Filesize"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Affected Job Types"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "All"
+msgstr "Todos"
+
+#: sabnzbd/skintext.py
+msgid "Series with air dates"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Movies"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Other / Unknown"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"<p>Use Sorters to automatically organize your completed downloads. For "
+"example, put all episodes from a series in a season-specific folder. Or, put"
+" movies in a folder named after the movie.</p><p>Sorters are tried in order "
+"of appearance and can be reordered by dragging and dropping.<br/>The first "
+"active sorter that matches both the affected category and job type is "
+"applied.</p><p>More options are available when Advanced Settings is "
+"checked.<br/>Detailed information can be found on the Wiki.</p>"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Add Sorter"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Remove Sorter"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Test Data"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Quick start"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Move and rename all episodes in the \"tv\" category to a show-specific "
+"folder"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Move and rename all movies in the \"movies\" category to a movie-specific "
+"folder"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid ""
 "Rarely used options. For their meaning and explanation, click on the Help "
@@ -4670,6 +4645,10 @@ msgstr "Confirmar eliminación del historial"
 msgid "Keyboard shortcuts"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Shift+Arrow key: Browse Queue and History pages"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "How long or untill when do you want to pause? (in English!)"
 msgstr "¿Durante cuánto tiempo quieres dejarlo pausado?"
@@ -4847,8 +4826,8 @@ msgstr ""
 
 #. Error message
 #: sabnzbd/sorting.py
-msgid "Failed to rename: %s to %s"
-msgstr "Error al renombrar: %s a %s"
+msgid "Failed to rename %s to %s"
+msgstr ""
 
 #. Error message
 #: sabnzbd/sorting.py
@@ -4915,10 +4894,6 @@ msgstr ""
 "Protocolo SSL desconocido: intente desabilitar el SSL o conectarse a un "
 "puerto diferente."
 
-#: sabnzbd/utils/servertests.py
-msgid "Server quit during login sequence."
-msgstr "El servidor se ha cerrado durante el login"
-
 #: sabnzbd/utils/servertests.py
 msgid "Server requires username and password."
 msgstr "El servidor necesita usuario y contraseña."