Set version to 3.3.0

Relates to #1902

.github/workflows/black.yml

@@ -7,14 +7,16 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Black Code Formatter
-      uses: lgeiger/black-action@v1.0.1
+      uses: lgeiger/black-action@master
       with:
           args: >
             SABnzbd.py
             sabnzbd
             scripts
             tools
+            builder
             tests
             --line-length=120
-            --target-version=py35
+            --target-version=py36
             --check
+            --diff

.github/workflows/build_release.yml

@@ -0,0 +1,114 @@
+name: Build binaries and source distribution
+
+on: [push, pull_request]
+
+jobs:
+  build_windows:
+    name: Build Windows binary
+    runs-on: windows-latest
+    env:
+      AUTOMATION_GITHUB_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.9 (64bit)
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.9
+        architecture: x64
+    - name: Install Python dependencies (64bit)
+      run: |
+        python --version
+        pip install --upgrade pip wheel
+        pip install --upgrade -r requirements.txt
+        pip install --upgrade -r builder/requirements.txt
+    - name: Build source distribution
+      run: python builder/package.py source
+    - name: Upload source distribution
+      uses: actions/upload-artifact@v2
+      with:
+        path: "*-src.tar.gz"
+        name: Source distribution
+    - name: Build Windows standalone binary and installer (64bit)
+      run: python builder/package.py installer
+    - name: Upload Windows standalone binary (64bit)
+      uses: actions/upload-artifact@v2
+      with:
+        path: "*-win64-bin.zip"
+        name: Windows Windows standalone binary (64bit)
+    - name: Upload Windows installer (64bit)
+      uses: actions/upload-artifact@v2
+      with:
+        path: "*-win-setup.exe"
+        name: Windows installer
+    - name: Set up Python 3.8 (32bit and legacy)
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+        architecture: x86
+    - name: Install Python dependencies (32bit and legacy)
+      run: |
+        python --version
+        pip install --upgrade pip wheel
+        pip install --upgrade -r requirements.txt
+        pip install --upgrade -r builder/requirements.txt
+    - name: Build Windows standalone binary (32bit and legacy)
+      run: python builder/package.py binary
+    - name: Upload Windows standalone binary (32bit and legacy)
+      uses: actions/upload-artifact@v2
+      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
+    runs-on: macos-latest
+    env:
+      SIGNING_AUTH: ${{ secrets.SIGNING_AUTH }}
+      NOTARIZATION_USER: ${{ secrets.NOTARIZATION_USER }}
+      NOTARIZATION_PASS: ${{ secrets.NOTARIZATION_PASS }}
+      AUTOMATION_GITHUB_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
+      # We need the official Python, because the GA ones only support newer macOS versions
+      # The deployment target is picked up by the Python build tools automatically
+      # If updated, make sure to also set LSMinimumSystemVersion in SABnzbd.spec
+      PYTHON_VERSION: 3.9.5
+      MACOSX_DEPLOYMENT_TARGET: 10.9
+    steps:
+    - uses: actions/checkout@v2
+    - name: Cache Python download
+      id: cache-python-download
+      uses: actions/cache@v2
+      with:
+        path: ~/python.pkg
+        key: macOS-Python-${{ env.PYTHON_VERSION }}
+    - name: Get Python
+      if: steps.cache-python-download.outputs.cache-hit != 'true'
+      run: curl https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-macosx10.9.pkg -o ~/python.pkg
+    - name: Install Python
+      run: sudo installer -pkg ~/python.pkg -target /
+    - name: Install Python dependencies
+      run: |
+        python3 --version
+        pip3 install --upgrade pip wheel
+        pip3 install --upgrade -r requirements.txt
+        pip3 install --upgrade -r builder/requirements.txt
+    - name: Import macOS codesign certificates
+      uses: apple-actions/import-codesign-certs@v1
+      if: env.SIGNING_AUTH
+      with:
+        p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
+        p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
+    - name: Build macOS binary
+      run: |
+        python3 builder/package.py app
+        python3 builder/make_dmg.py
+    - name: Upload macOS binary
+      uses: actions/upload-artifact@v2
+      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

.github/workflows/integration_testing.yml

@@ -0,0 +1,39 @@
+name: CI Tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: Test ${{ matrix.name }} - Python ${{ matrix.python-version }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        python-version: [3.6, 3.7, 3.8, 3.9]
+        os: [ubuntu-20.04]
+        include:
+          - name: macOS
+            os: macos-latest
+            python-version: 3.9
+          - name: Windows
+            os: windows-latest
+            python-version: 3.9
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install system dependencies
+      if: runner.os == 'Linux'
+      run: sudo apt-get install unrar p7zip-full par2 chromium-chromedriver
+    - name: Install Python dependencies
+      run: |
+        python --version
+        pip install --upgrade pip
+        pip install --upgrade -r requirements.txt
+        pip install --upgrade -r tests/requirements.txt
+    - name: Test SABnzbd
+      run: pytest -s
+
+

.github/workflows/translations.yml

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

.gitignore

@@ -31,6 +31,9 @@ SABnzbd-*/
 *.wp[ru]
 .idea
 
+# VScode
+.vscode/
+
 # Testing folders
 .cache
 .xprocess

.lgtm.yml

@@ -1,7 +0,0 @@
-path_classifiers:
-  oldinterfaces:
-    - interfaces/smpl
-    - interfaces/Plush
-  library:
-    - "*knockout*"
-    - "**/*min*"

.travis.yml

@@ -1,46 +0,0 @@
-matrix:
-  include:
-  # On Linux we test all supported Python versions
-  # On macOS we only test the semi-recent version that is included
-  - os: linux
-    language: python
-    python: "3.5"
-  - os: linux
-    language: python
-    python: "3.6"
-  - os: linux
-    language: python
-    python: "3.7"
-  - os: linux
-    language: python
-    python: "3.8"
-  - os: osx
-    addons:
-      chrome: stable
-    env:
-      - HOMEBREW_NO_AUTO_UPDATE=1
-
-install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      LATEST_CHROMEDRIVER=$(curl -s https://chromedriver.storage.googleapis.com/LATEST_RELEASE) &&
-      wget --no-verbose -O /tmp/chromedriver.zip https://chromedriver.storage.googleapis.com/$LATEST_CHROMEDRIVER/chromedriver_mac64.zip &&
-      sudo unzip /tmp/chromedriver.zip chromedriver -d /usr/local/bin/;
-    else
-      sudo add-apt-repository ppa:jcfp -y;
-      sudo apt-get update -q;
-      sudo apt-get install unrar p7zip-full par2 chromium-chromedriver -y;
-      ln -s /usr/lib/chromium-browser/chromedriver ~/bin/chromedriver;
-    fi;
-  - python3 --version
-  - python3 -m pip install --upgrade pip
-  - python3 -m pip install --upgrade wheel
-  - python3 -m pip install --upgrade -r requirements.txt
-  - python3 -m pip install --upgrade -r tests/requirements.txt
-
-script:
-  - python3 -m pytest -s
-
-notifications:
-  email:
-    on_success: never
-    on_failure: change

.tx/config

@@ -0,0 +1,24 @@
+[main]
+host = https://www.transifex.com
+
+[sabnzbd-translations.po-main-sabnzbd-pot--develop]
+file_filter = po/main/<lang>.po
+minimum_perc = 0
+source_file = po/main/SABnzbd.pot
+source_lang = en
+type = PO
+
+[sabnzbd-translations.po-email-sabemail-pot--develop]
+file_filter = po/email/<lang>.po
+minimum_perc = 0
+source_file = po/email/SABemail.pot
+source_lang = en
+type = PO
+
+[sabnzbd-translations.po-nsis-sabnsis-pot--develop]
+file_filter = po/nsis/<lang>.po
+minimum_perc = 0
+source_file = po/nsis/SABnsis.pot
+source_lang = en
+type = PO
+

ABOUT.txt

@@ -1,16 +0,0 @@
-*******************************************
-*** This is SABnzbd 3.0.1               ***
-*******************************************
-
-SABnzbd is an open-source cross-platform binary newsreader.
-It simplifies the process of downloading from Usenet dramatically,
-thanks to its friendly web-based user interface and advanced
-built-in post-processing options that automatically verify, repair,
-extract and clean up posts downloaded from Usenet.
-SABnzbd also has a fully customizable user interface,
-and offers a complete API for third-party applications to hook into.
-
-There is an extensive Wiki on the use of SABnzbd.
-https://sabnzbd.org/wiki/
-
-Please also read the file "ISSUES.txt"

COPYRIGHT.txt

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

INSTALL.txt

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

ISSUES.txt

@@ -14,15 +14,15 @@
   For these the server blocking method is not very favourable.
   There is an INI-only option that will limit blocks to 1 minute.
       no_penalties = 1
-  See: https://sabnzbd.org/wiki/configuration/3.0/special
+  See: https://sabnzbd.org/wiki/configuration/3.3/special
 
 - Some third-party utilties 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.
-  See: https://sabnzbd.org/wiki/configuration/3.0/special
+  See: https://sabnzbd.org/wiki/configuration/3.3/special
 
-- On OSX you may encounter downloaded files with foreign characters.
+- On macOS you may encounter downloaded files with foreign characters.
   The par2 repair may fail when the files were created on a Windows system.
   The problem is caused by the PAR2 utility and we cannot fix this now.
   This does not apply to files inside RAR files.
@@ -33,25 +33,14 @@
   We cannot solve this problem, because the Operating System (read Windows)
   prevents the removal.
 
-- Memory usage can sometimes have high peaks. This makes using SABnzbd on very low
-  memory systems (e.g. a NAS device or a router) a challenge.
-  In particular on Synology (SynoCommunity) the device may report that SABnzbd is using
-  a lot of memory even when idle. In this case the memory is usually not actually used by
-  SABnzbd and will be available if required by other apps or the system. More information
-  can be found in the discussion here: https://github.com/SynoCommunity/spksrc/issues/2856
-
-- SABnzbd is not compatible with some software firewall versions.
-  The Microsoft Windows Firewall works fine, but remember to tell this
-  firewall that SABnzbd is allowed to talk to other computers.
-
 - When SABnzbd cannot send notification emails, check your virus scanner,
   firewall or security suite. It may be blocking outgoing email.
 
-- When you are using external drives or network shares on OSX or Linux
+- When you are using external drives or network shares on macOS or Linux
   make sure that the drives are mounted.
   The operating system will simply redirect your files to alternative locations.
   You may have trouble finding the files when mounting the drive later.
-  On OSX, SABnzbd will not create new folders in /Volumes.
+  On macOS, SABnzbd will not create new folders in /Volumes.
   The result will be a failed job that can be retried once the volume has been mounted.
 
 - If you use a mounted drive as "temporary download folder", it must be present when SABnzbd

LICENSE.txt

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

PKG-INFO

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

README.md

@@ -1,11 +1,11 @@
 SABnzbd - The automated Usenet download tool
 ============================================
 
-[![Travis CI](https://travis-ci.org/sabnzbd/sabnzbd.svg?branch=develop)](https://travis-ci.org/sabnzbd/sabnzbd)
-[![AppVeryor](https://ci.appveyor.com/api/projects/status/github/sabnzbd/sabnzbd?svg=true&branch=develop)](https://ci.appveyor.com/project/Safihre/sabnzbd)
-[![Snap Status](https://build.snapcraft.io/badge/sabnzbd/sabnzbd.svg)](https://snapcraft.io/sabnzbd)
+![CI tests](https://github.com/sabnzbd/sabnzbd/workflows/CI%20Tests/badge.svg)
+![Build binaries](https://github.com/sabnzbd/sabnzbd/workflows/Build%20binaries%20and%20source%20distribution/badge.svg)
 [![License](https://img.shields.io/badge/license-GPL%20v2-blue.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
 
+
 SABnzbd is an Open Source Binary Newsreader written in Python.
 
 It's totally free, easy to use, and works practically everywhere.
@@ -18,7 +18,7 @@ If you want to know more you can head over to our website: https://sabnzbd.org.
 
 SABnzbd has a few dependencies you'll need before you can get running. If you've previously run SABnzbd from one of the various Linux packages, then you likely already have all the needed dependencies. If not, here's what you're looking for:
 
-- `python` (Python 3.5 and higher, often called `python3`)
+- `python` (Python 3.6 and higher, often called `python3`)
 - Python modules listed in `requirements.txt`
 - `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,64 +1,48 @@
-Release Notes - SABnzbd 3.0.1
+Release Notes - SABnzbd 3.3.0 
 =========================================================
 
-## Bugfixes since 3.0.0
-- Basic Authentication resulted in crash. 
-- Permissions were not set correctly when creating directories.
-- Windows: base SSL certificate bundle was not included.
+## Changes since 3.2.1
+- The `External internet access` will automatically detect local network
+  and no longer requires local network ranges to be defined. Custom ranges 
+  can still be defined through `local_ranges` in Special settings.
+- Allow setting `inet_exposure` from the command line.
+- Support prefix and netmask for Special setting `local_ranges`.
+- The `Unwanted extensions` detection can be set to `Whitelist`-mode. 
+  This will block or pause all jobs with non-matching extensions.
+- Servers article statistics are shown in K, G, M-notation.
+- Resolution added as a pattern key (`%r`) for Sorting.
+- Optimized performance of par2 file parsing.
+- CPU usage optimizations in the download process.
+- Revised handling of categories, scripts, and priorities when adding NZB's.
+- Download statistics are also shown when no History is shown.
+- Confirm rename if Direct Unpack is active for the job.
+- Obfuscated-RAR detection will always be performed.
+- All requests will be logged, not just API calls.
+- Stability improvement to encrypted RAR-detection.
+- Allow missing extensions in `Unwanted extensions` detection.
+- Removed Special setting `max_art_opt`.
+- Add notification that Plush will be removed in 3.4.0.
+- Windows/macOS: Update UnRar to 6.0.1.
+- Windows: Update Multipar to 1.3.1.7 (adds faster verification).
 
-## About the new major version
-We have been working for months to upgrade the SABnzbd code from Python 2 to Python 3.
-Although it might not sound like a big change, we had to rewrite almost every part of
-the code. We also included a number of new features, listed below.
-
-## Big changes in 3.0.0
-- Python 3.5 and above are the only supported versions of Python.
-- Cache handling is greatly improved, resulting in more stable speeds on some systems.
-- Articles failing with CRC errors are now retried on other servers.
-- SFV files, even obfuscated, will be used for renaming when there are no par2 files.
-- Fully obfuscated RAR-sets with no verification files are detected and extracted.
-- Built-in internet bandwidth test.
-- Windows Service support was changed. The service will need to be reinstalled!
-  Documentation: https://sabnzbd.org/wiki/advanced/sabnzbd-as-a-windows-service
-- The Windows installer is 64-bit only, for 32-bit please use the standalone package.
-
-## Other changes since 2.3.9
-- Files inside an NZB that are fully identical are now skipped automatically.
-- Folders of jobs that failed post-processing are renamed to `_FAILED_`.
-- Blocking of unwanted extensions that are directly inside an NZB.
-- In Python 3 OpenSSL 1.1.1 is used for Windows and macOS, as a result 
-  newsservers manually set to `RC4-MD5` cipher can no longer connect. 
-  Documentation: https://sabnzbd.org/wiki/advanced/ssl-ciphers
-- TLS1.3 support for newsserver connections.
-- SABYenc, par2 and unrar are now required to start downloading.
-- Growl-support was removed.
-- The `smpl` skin was removed.
-- Using the API with `output=text` to add NZB's will report the `nzo_ids` instead of `ok`.
-- Queue-item labels are no longer part of the name but separated in API-property `labels`.
-- API-calls `tapi` and `qstatus` were removed.
-- On Windows only Multipar is available for repair.
-- Linux tray icon support was improved.
-- On Linux special permission bits are removed from files after download.
-- macOS features such as the menu and notifications now use native code.
-
-## Bugfixes since 2.3.9
-- Resolved potential security issue in FAT-filesystem check and Nice and IONice Parameters.
-  More information: https://github.com/sabnzbd/sabnzbd/security/advisories/GHSA-9x87-96gg-33w2
-- Sample removal did not work if only 1 sample file was present.
-- Crash on badly formatted RSS-feeds or readout during editing.
-- Only really run pre-queue-script when it is set.
-- Always report API `paused` status as a boolean.
-- Automatic aborting of jobs that can't be completed would sometimes not trigger.
-- Windows systems could enter standby state during downloading.
-- Some errors thrown by unrar were not caught.
-- Files and sockets were not always closed correctly.
-- Unwanted extension check was overly aggressively deleting folders
+## Bugfixes since 3.2.1
+- Prevent failed post-processing if job name ends in multiple dots or spaces.
+- Failing articles could result in jobs being stuck at 99%.
+- Jobs could be stuck in the queue or duplicate if they had missing articles.
+- Prevent jobs getting stuck at 99% due to unreliable servers.
+- CRC/yEnc errors would be counted twice as bad articles.
+- Some NZB files would incorrectly be marked as empty.
+- API-call `history` would not filter active post-processing by `nzo_ids`.
+- Login page could be accessed even if `External internet access` was set
+  to `No access`. Any other calls would still be blocked.
+- Ignore duplicate files inside messy NZB's.
+- Windows: `Deobfuscate final filenames` could fail to deobfuscate.
+- macOS: Disk space would be incorrect for very large disks.
 
 ## Upgrade notices
-- When upgrading from 2.x.x or older the queue will be converted. Job order,
-  settings and data will be preserved, but if you decide to go back to 2.x.x
-  your queue cannot be downgraded again. But you can restore the jobs by going
-  to the Status page and running Queue Repair.
+- The download statistics file `totals10.sab` is updated in 3.2.x 
+  version. If you downgrade to 3.1.x or lower, detailed download 
+  statistics will be lost.
 
 ## Known problems and solutions
 - Read the file "ISSUES.txt"
@@ -70,4 +54,4 @@ the code. We also included a number of new features, listed below.
   that automatically verify, repair, extract and clean up posts downloaded
   from Usenet.
 
-  (c) Copyright 2007-2020 by "The SABnzbd-team" \<team@sabnzbd.org\>
+  (c) Copyright 2007-2021 by "The SABnzbd-team" \<team@sabnzbd.org\>

SABnzbd.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python3 -OO
-# Copyright 2007-2020 The SABnzbd-Team <team@sabnzbd.org>
+# Copyright 2007-2021 The SABnzbd-Team <team@sabnzbd.org>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -17,9 +17,9 @@
 
 import sys
 
-if sys.hexversion < 0x03050000:
-    print("Sorry, requires Python 3.5 or above")
-    print("You can read more at: https://sabnzbd.org/python3")
+if sys.hexversion < 0x03060000:
+    print("Sorry, requires Python 3.6 or above")
+    print("You can read more at: https://sabnzbd.org/wiki/installation/install-off-modules")
     sys.exit(1)
 
 import logging
@@ -34,6 +34,8 @@ import subprocess
 import ssl
 import time
 import re
+import gc
+from typing import List, Dict, Any
 
 try:
     import Cheetah
@@ -46,7 +48,7 @@ try:
 except ImportError as e:
     print("Not all required Python modules are available, please check requirements.txt")
     print("Missing module:", e.name)
-    print("You can read more at: https://sabnzbd.org/python3")
+    print("You can read more at: https://sabnzbd.org/wiki/installation/install-off-modules")
     print("If you still experience problems, remove all .pyc files in this folder and subfolders")
     sys.exit(1)
 
@@ -60,21 +62,24 @@ from sabnzbd.misc import (
     exit_sab,
     split_host,
     create_https_certificates,
-    windows_variant,
     ip_extract,
     set_serv_parms,
     get_serv_parms,
     get_from_url,
     upload_file_to_sabnzbd,
+    is_localhost,
+    is_lan_addr,
 )
 from sabnzbd.filesystem import get_ext, real_path, long_path, globber_full, remove_file
 from sabnzbd.panic import panic_tmpl, panic_port, panic_host, panic, launch_a_browser
-import sabnzbd.scheduler as scheduler
 import sabnzbd.config as config
 import sabnzbd.cfg
 import sabnzbd.downloader
 import sabnzbd.notifier as notifier
 import sabnzbd.zconfig
+from sabnzbd.getipaddress import localipv4, publicipv4, ipv6
+from sabnzbd.utils.getperformance import getpystone, getcpu
+import sabnzbd.utils.ssdp as ssdp
 
 try:
     import win32api
@@ -84,9 +89,13 @@ try:
     import win32service
     import win32ts
     import pywintypes
+    import servicemanager
+    from win32com.shell import shell, shellcon
+
+    from sabnzbd.utils.apireg import get_connection_info, set_connection_info, del_connection_info
+    import sabnzbd.sabtray
 
     win32api.SetConsoleCtrlHandler(sabnzbd.sig_handler, True)
-    from sabnzbd.utils.apireg import get_connection_info, set_connection_info, del_connection_info
 except ImportError:
     if sabnzbd.WIN32:
         print("Sorry, requires Python module PyWin32.")
@@ -97,41 +106,67 @@ LOG_FLAG = False
 
 
 def guard_loglevel():
-    """ Callback function for guarding loglevel """
+    """Callback function for guarding loglevel"""
     global LOG_FLAG
     LOG_FLAG = True
 
 
+def warning_helpful(*args, **kwargs):
+    """Wrapper to ignore helpfull warnings if desired"""
+    if sabnzbd.cfg.helpfull_warnings():
+        return logging.warning(*args, **kwargs)
+    return logging.info(*args, **kwargs)
+
+
+logging.warning_helpful = warning_helpful
+
+
 class GUIHandler(logging.Handler):
-    """ Logging handler collects the last warnings/errors/exceptions
-        to be displayed in the web-gui
+    """Logging handler collects the last warnings/errors/exceptions
+    to be displayed in the web-gui
     """
 
     def __init__(self, size):
-        """ Initializes the handler """
+        """Initializes the handler"""
         logging.Handler.__init__(self)
-        self.size = size
-        self.store = []
+        self._size: int = size
+        self.store: List[Dict[str, Any]] = []
 
-    def emit(self, record):
-        """ Emit a record by adding it to our private queue """
-        if record.levelname == "WARNING":
-            sabnzbd.LAST_WARNING = record.msg % record.args
-        else:
-            sabnzbd.LAST_ERROR = record.msg % record.args
-
-        if len(self.store) >= self.size:
-            # Loose the oldest record
-            self.store.pop(0)
+    def emit(self, record: logging.LogRecord):
+        """Emit a record by adding it to our private queue"""
+        # If % is part of the msg, this could fail
         try:
-            # Append traceback, if available
-            warning = {"type": record.levelname, "text": record.msg % record.args, "time": int(time.time())}
-            if record.exc_info:
-                warning["text"] = "%s\n%s" % (warning["text"], traceback.format_exc())
-            self.store.append(warning)
-        except UnicodeDecodeError:
-            # Catch elusive Unicode conversion problems
-            pass
+            parsed_msg = record.msg % record.args
+        except TypeError:
+            parsed_msg = record.msg + str(record.args)
+
+        warning = {
+            "type": record.levelname,
+            "text": parsed_msg,
+            "time": int(time.time()),
+            "origin": "%s%d" % (record.filename, record.lineno),
+        }
+
+        # Append traceback, if available
+        if record.exc_info:
+            warning["text"] = "%s\n%s" % (warning["text"], traceback.format_exc())
+
+        # Do not notify the same notification within 1 minute from the same source
+        # This prevents endless looping if the notification service itself throws an error/warning
+        # We don't check based on message content, because if it includes a timestamp it's not unique
+        if not any(
+            stored_warning["origin"] == warning["origin"] and stored_warning["time"] + DEF_TIMEOUT > time.time()
+            for stored_warning in self.store
+        ):
+            if record.levelno == logging.WARNING:
+                sabnzbd.notifier.send_notification(T("Warning"), parsed_msg, "warning")
+            else:
+                sabnzbd.notifier.send_notification(T("Error"), parsed_msg, "error")
+
+        # Loose the oldest record
+        if len(self.store) >= self._size:
+            self.store.pop(0)
+        self.store.append(warning)
 
     def clear(self):
         self.store = []
@@ -140,7 +175,7 @@ class GUIHandler(logging.Handler):
         return len(self.store)
 
     def content(self):
-        """ Return an array with last records """
+        """Return an array with last records"""
         return self.store
 
 
@@ -151,34 +186,36 @@ def print_help():
     print("Options marked [*] are stored in the config file")
     print()
     print("Options:")
-    print("  -f  --config-file <ini>  Location of config file")
-    print("  -s  --server <srv:port>  Listen on server:port [*]")
-    print("  -t  --templates <templ>  Template directory [*]")
+    print("  -f  --config-file <ini>     Location of config file")
+    print("  -s  --server <srv:port>     Listen on server:port [*]")
+    print("  -t  --templates <templ>     Template directory [*]")
     print()
-    print("  -l  --logging <-1..2>     Set logging level (-1=off, 0= least, 2= most) [*]")
-    print("  -w  --weblogging         Enable cherrypy access logging")
+    print("  -l  --logging <-1..2>       Set logging level (-1=off, 0=least,2= most) [*]")
+    print("  -w  --weblogging            Enable cherrypy access logging")
     print()
-    print("  -b  --browser <0..1>     Auto browser launch (0= off, 1= on) [*]")
+    print("  -b  --browser <0..1>        Auto browser launch (0= off, 1= on) [*]")
     if sabnzbd.WIN32:
-        print("  -d  --daemon             Use when run as a service")
+        print("  -d  --daemon                Use when run as a service")
     else:
-        print("  -d  --daemon             Fork daemon process")
-        print("      --pid <path>         Create a PID file in the given folder (full path)")
-        print("      --pidfile <path>     Create a PID file with the given name (full path)")
+        print("  -d  --daemon                Fork daemon process")
+        print("      --pid <path>            Create a PID file in the given folder (full path)")
+        print("      --pidfile <path>        Create a PID file with the given name (full path)")
     print()
-    print("  -h  --help               Print this message")
-    print("  -v  --version            Print version information")
-    print("  -c  --clean              Remove queue, cache and logs")
-    print("  -p  --pause              Start in paused mode")
-    print("      --repair             Add orphaned jobs from the incomplete folder to the queue")
-    print("      --repair-all         Try to reconstruct the queue from the incomplete folder")
-    print("                           with full data reconstruction")
-    print("      --https <port>       Port to use for HTTPS server")
-    print("      --ipv6_hosting <0|1> Listen on IPv6 address [::1] [*]")
-    print("      --no-login           Start with username and password reset")
-    print("      --log-all            Log all article handling (for developers)")
-    print("      --disable-file-log   Logging is only written to console")
-    print("      --new                Run a new instance of SABnzbd")
+    print("  -h  --help                  Print this message")
+    print("  -v  --version               Print version information")
+    print("  -c  --clean                 Remove queue, cache and logs")
+    print("  -p  --pause                 Start in paused mode")
+    print("      --repair                Add orphaned jobs from the incomplete folder to the queue")
+    print("      --repair-all            Try to reconstruct the queue from the incomplete folder")
+    print("                              with full data reconstruction")
+    print("      --https <port>          Port to use for HTTPS server")
+    print("      --ipv6_hosting <0|1>    Listen on IPv6 address [::1] [*]")
+    print("      --inet_exposure <0..5>  Set external internet access [*]")
+    print("      --no-login              Start with username and password reset")
+    print("      --log-all               Log all article handling (for developers)")
+    print("      --disable-file-log      Logging is only written to console")
+    print("      --console               Force logging to console")
+    print("      --new                   Run a new instance of SABnzbd")
     print()
     print("NZB (or related) file:")
     print("  NZB or compressed NZB file, with extension .nzb, .zip, .rar, .7z, .gz, or .bz2")
@@ -191,7 +228,7 @@ def print_version():
             """
 %s-%s
 
-Copyright (C) 2007-2020 The SABnzbd-Team <team@sabnzbd.org>
+Copyright (C) 2007-2021 The SABnzbd-Team <team@sabnzbd.org>
 SABnzbd comes with ABSOLUTELY NO WARRANTY.
 This is free software, and you are welcome to redistribute it
 under certain conditions. It is licensed under the
@@ -204,7 +241,7 @@ GNU GENERAL PUBLIC LICENSE Version 2 or (at your option) any later version.
 
 
 def daemonize():
-    """ Daemonize the process, based on various StackOverflow answers """
+    """Daemonize the process, based on various StackOverflow answers"""
     try:
         pid = os.fork()
         if pid > 0:
@@ -233,7 +270,7 @@ def daemonize():
 
     # Get log file  path and remove the log file if it got too large
     log_path = os.path.join(sabnzbd.cfg.log_dir.get_path(), DEF_LOG_ERRFILE)
-    if os.path.exists(log_path) and os.path.getsize(log_path) > sabnzbd.cfg.log_size.get_int():
+    if os.path.exists(log_path) and os.path.getsize(log_path) > sabnzbd.cfg.log_size():
         remove_file(log_path)
 
     # Replace file descriptors for stdin, stdout, and stderr
@@ -246,7 +283,7 @@ def daemonize():
 
 
 def abort_and_show_error(browserhost, cherryport, err=""):
-    """ Abort program because of CherryPy troubles """
+    """Abort program because of CherryPy troubles"""
     logging.error(T("Failed to start web-interface") + " : " + str(err))
     if not sabnzbd.DAEMON:
         if "49" in err:
@@ -258,7 +295,7 @@ def abort_and_show_error(browserhost, cherryport, err=""):
 
 
 def identify_web_template(key, defweb, wdir):
-    """ Determine a correct web template set, return full template path """
+    """Determine a correct web template set, return full template path"""
     if wdir is None:
         try:
             wdir = fix_webname(key())
@@ -276,7 +313,7 @@ def identify_web_template(key, defweb, wdir):
     full_main = real_path(full_dir, DEF_MAIN_TMPL)
 
     if not os.path.exists(full_main):
-        logging.warning(T("Cannot find web template: %s, trying standard template"), full_main)
+        logging.warning_helpful(T("Cannot find web template: %s, trying standard template"), full_main)
         full_dir = real_path(sabnzbd.DIR_INTERFACES, DEF_STDINTF)
         full_main = real_path(full_dir, DEF_MAIN_TMPL)
         if not os.path.exists(full_main):
@@ -289,7 +326,7 @@ def identify_web_template(key, defweb, wdir):
 
 
 def check_template_scheme(color, web_dir):
-    """ Check existence of color-scheme """
+    """Check existence of color-scheme"""
     if color and os.path.exists(os.path.join(web_dir, "static", "stylesheets", "colorschemes", color + ".css")):
         return color
     elif color and os.path.exists(os.path.join(web_dir, "static", "stylesheets", "colorschemes", color)):
@@ -315,12 +352,11 @@ def fix_webname(name):
         return name
 
 
-def get_user_profile_paths(vista_plus):
-    """ Get the default data locations on Windows"""
+def get_user_profile_paths():
+    """Get the default data locations on Windows"""
     if sabnzbd.DAEMON:
         # In daemon mode, do not try to access the user profile
         # just assume that everything defaults to the program dir
-        sabnzbd.DIR_APPDATA = sabnzbd.DIR_PROG
         sabnzbd.DIR_LCLDATA = sabnzbd.DIR_PROG
         sabnzbd.DIR_HOME = sabnzbd.DIR_PROG
         if sabnzbd.WIN32:
@@ -332,30 +368,19 @@ def get_user_profile_paths(vista_plus):
         return
     elif sabnzbd.WIN32:
         try:
-            from win32com.shell import shell, shellcon
-
-            path = shell.SHGetFolderPath(0, shellcon.CSIDL_APPDATA, None, 0)
-            sabnzbd.DIR_APPDATA = os.path.join(path, DEF_WORKDIR)
             path = shell.SHGetFolderPath(0, shellcon.CSIDL_LOCAL_APPDATA, None, 0)
             sabnzbd.DIR_LCLDATA = os.path.join(path, DEF_WORKDIR)
             sabnzbd.DIR_HOME = os.environ["USERPROFILE"]
         except:
             try:
-                if vista_plus:
-                    root = os.environ["AppData"]
-                    user = os.environ["USERPROFILE"]
-                    sabnzbd.DIR_APPDATA = "%s\\%s" % (root.replace("\\Roaming", "\\Local"), DEF_WORKDIR)
-                    sabnzbd.DIR_HOME = user
-                else:
-                    root = os.environ["USERPROFILE"]
-                    sabnzbd.DIR_APPDATA = "%s\\%s" % (root, DEF_WORKDIR)
-                    sabnzbd.DIR_HOME = root
-                sabnzbd.DIR_LCLDATA = sabnzbd.DIR_APPDATA
+                root = os.environ["AppData"]
+                user = os.environ["USERPROFILE"]
+                sabnzbd.DIR_LCLDATA = "%s\\%s" % (root.replace("\\Roaming", "\\Local"), DEF_WORKDIR)
+                sabnzbd.DIR_HOME = user
             except:
                 pass
 
         # Long-path everything
-        sabnzbd.DIR_APPDATA = long_path(sabnzbd.DIR_APPDATA)
         sabnzbd.DIR_LCLDATA = long_path(sabnzbd.DIR_LCLDATA)
         sabnzbd.DIR_HOME = long_path(sabnzbd.DIR_HOME)
         return
@@ -363,16 +388,14 @@ def get_user_profile_paths(vista_plus):
     elif sabnzbd.DARWIN:
         home = os.environ.get("HOME")
         if home:
-            sabnzbd.DIR_APPDATA = "%s/Library/Application Support/SABnzbd" % home
-            sabnzbd.DIR_LCLDATA = sabnzbd.DIR_APPDATA
+            sabnzbd.DIR_LCLDATA = "%s/Library/Application Support/SABnzbd" % home
             sabnzbd.DIR_HOME = home
             return
     else:
         # Unix/Linux
         home = os.environ.get("HOME")
         if home:
-            sabnzbd.DIR_APPDATA = "%s/.%s" % (home, DEF_WORKDIR)
-            sabnzbd.DIR_LCLDATA = sabnzbd.DIR_APPDATA
+            sabnzbd.DIR_LCLDATA = "%s/.%s" % (home, DEF_WORKDIR)
             sabnzbd.DIR_HOME = home
             return
 
@@ -382,7 +405,7 @@ def get_user_profile_paths(vista_plus):
 
 
 def print_modules():
-    """ Log all detected optional or external 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)
@@ -419,10 +442,12 @@ def print_modules():
         logging.info("UNRAR binary... found (%s)", sabnzbd.newsunpack.RAR_COMMAND)
 
         # Report problematic unrar
-        if sabnzbd.newsunpack.RAR_PROBLEM and not sabnzbd.cfg.ignore_wrong_unrar():
+        if sabnzbd.newsunpack.RAR_PROBLEM:
             have_str = "%.2f" % (float(sabnzbd.newsunpack.RAR_VERSION) / 100)
             want_str = "%.2f" % (float(sabnzbd.constants.REC_RAR_VERSION) / 100)
-            logging.warning(T("Your UNRAR version is %s, we recommend version %s or higher.<br />"), have_str, want_str)
+            logging.warning_helpful(
+                T("Your UNRAR version is %s, we recommend version %s or higher.<br />"), have_str, want_str
+            )
         elif not (sabnzbd.WIN32 or sabnzbd.DARWIN):
             logging.info("UNRAR binary version %.2f", (float(sabnzbd.newsunpack.RAR_VERSION) / 100))
     else:
@@ -457,7 +482,7 @@ def print_modules():
 
 
 def all_localhosts():
-    """ Return all unique values of localhost in order of preference """
+    """Return all unique values of localhost in order of preference"""
     ips = ["127.0.0.1"]
     try:
         # Check whether IPv6 is available and enabled
@@ -485,7 +510,7 @@ def all_localhosts():
 
 
 def check_resolve(host):
-    """ Return True if 'host' resolves """
+    """Return True if 'host' resolves"""
     try:
         socket.getaddrinfo(host, None)
     except socket.error:
@@ -495,8 +520,8 @@ def check_resolve(host):
 
 
 def get_webhost(cherryhost, cherryport, https_port):
-    """ Determine the webhost address and port,
-        return (host, port, browserhost)
+    """Determine the webhost address and port,
+    return (host, port, browserhost)
     """
     if cherryhost == "0.0.0.0" and not check_resolve("127.0.0.1"):
         cherryhost = ""
@@ -520,7 +545,7 @@ def get_webhost(cherryhost, cherryport, https_port):
             # Valid user defined name?
             info = socket.getaddrinfo(cherryhost, None)
         except socket.error:
-            if cherryhost not in ("localhost", "127.0.0.1", "::1"):
+            if not is_localhost(cherryhost):
                 cherryhost = "0.0.0.0"
             try:
                 info = socket.getaddrinfo(localhost, None)
@@ -573,7 +598,7 @@ def get_webhost(cherryhost, cherryport, https_port):
         browserhost = localhost
 
     else:
-        # If on Vista and/or APIPA, use numerical IP, to help FireFoxers
+        # If on APIPA, use numerical IP, to help FireFoxers
         if ipv6 and ipv4:
             cherryhost = hostip
         browserhost = cherryhost
@@ -587,12 +612,12 @@ def get_webhost(cherryhost, cherryport, https_port):
             except socket.error:
                 cherryhost = cherryhost.strip("[]")
 
-    if ipv6 and ipv4 and (browserhost not in ("localhost", "127.0.0.1", "[::1]", "::1")):
+    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:
-        logging.warning(T("Please be aware the 0.0.0.0 hostname will need an IPv6 address for external access"))
+        logging.warning_helpful(T("Please be aware the 0.0.0.0 hostname will need an IPv6 address for external access"))
 
     if cherryhost == "localhost" and not sabnzbd.WIN32 and not sabnzbd.DARWIN:
         # On the Ubuntu family, localhost leads to problems for CherryPy
@@ -602,7 +627,7 @@ def get_webhost(cherryhost, cherryport, https_port):
             if ips[0] != "127.0.0.1":
                 browserhost = "127.0.0.1"
 
-    # This is to please Chrome on OSX
+    # This is to please Chrome on macOS
     if cherryhost == "localhost" and sabnzbd.DARWIN:
         cherryhost = "127.0.0.1"
         browserhost = "localhost"
@@ -628,7 +653,7 @@ def get_webhost(cherryhost, cherryport, https_port):
 
 
 def attach_server(host, port, cert=None, key=None, chain=None):
-    """ Define and attach server, optionally HTTPS """
+    """Define and attach server, optionally HTTPS"""
     if sabnzbd.cfg.ipv6_hosting() or "::1" not in host:
         http_server = cherrypy._cpserver.Server()
         http_server.bind_addr = (host, port)
@@ -641,7 +666,7 @@ def attach_server(host, port, cert=None, key=None, chain=None):
 
 
 def is_sabnzbd_running(url):
-    """ Return True when there's already a SABnzbd instance running. """
+    """Return True when there's already a SABnzbd instance running."""
     try:
         url = "%s&mode=version" % url
         # Do this without certificate verification, few installations will have that
@@ -654,7 +679,7 @@ def is_sabnzbd_running(url):
 
 
 def find_free_port(host, currentport):
-    """ Return a free port, 0 when nothing is free """
+    """Return a free port, 0 when nothing is free"""
     n = 0
     while n < 10 and currentport <= 49151:
         try:
@@ -667,8 +692,8 @@ def find_free_port(host, currentport):
 
 
 def check_for_sabnzbd(url, upload_nzbs, allow_browser=True):
-    """ Check for a running instance of sabnzbd on this port
-        allow_browser==True|None will launch the browser, False will not.
+    """Check for a running instance of sabnzbd on this port
+    allow_browser==True|None will launch the browser, False will not.
     """
     if allow_browser is None:
         allow_browser = True
@@ -690,10 +715,10 @@ def check_for_sabnzbd(url, upload_nzbs, allow_browser=True):
 
 
 def evaluate_inipath(path):
-    """ Derive INI file path from a partial path.
-        Full file path: if file does not exist the name must contain a dot
-        but not a leading dot.
-        foldername is enough, the standard name will be appended.
+    """Derive INI file path from a partial path.
+    Full file path: if file does not exist the name must contain a dot
+    but not a leading dot.
+    foldername is enough, the standard name will be appended.
     """
     path = os.path.normpath(os.path.abspath(path))
     inipath = os.path.join(path, DEF_INI_FILE)
@@ -710,16 +735,16 @@ def evaluate_inipath(path):
 
 
 def commandline_handler():
-    """ Split win32-service commands are true parameters
-        Returns:
-            service, sab_opts, serv_opts, upload_nzbs
+    """Split win32-service commands are true parameters
+    Returns:
+        service, sab_opts, serv_opts, upload_nzbs
     """
     service = ""
     sab_opts = []
     serv_opts = [os.path.normpath(os.path.abspath(sys.argv[0]))]
     upload_nzbs = []
 
-    # OSX binary: get rid of the weird -psn_0_123456 parameter
+    # macOS binary: get rid of the weird -psn_0_123456 parameter
     for arg in sys.argv:
         if arg.startswith("-psn_"):
             sys.argv.remove(arg)
@@ -751,10 +776,9 @@ def commandline_handler():
                 "server=",
                 "templates",
                 "ipv6_hosting=",
-                "template2",
+                "inet_exposure=",
                 "browser=",
                 "config-file=",
-                "force",
                 "disable-file-log",
                 "version",
                 "https=",
@@ -808,7 +832,7 @@ def commandline_handler():
 
 
 def get_f_option(opts):
-    """ Return value of the -f option """
+    """Return value of the -f option"""
     for opt, arg in opts:
         if opt == "-f":
             return arg
@@ -833,18 +857,17 @@ def main():
     cherrypylogging = None
     clean_up = False
     logging_level = None
+    console_logging = False
     no_file_log = False
     web_dir = None
-    vista_plus = False
-    win64 = False
     repair = 0
     no_login = False
     sabnzbd.RESTART_ARGS = [sys.argv[0]]
     pid_path = None
     pid_file = None
     new_instance = False
-    osx_console = False
     ipv6_hosting = None
+    inet_exposure = None
 
     _service, sab_opts, _serv_opts, upload_nzbs = commandline_handler()
 
@@ -889,6 +912,8 @@ def main():
             if logging_level < -1 or logging_level > 2:
                 print_help()
                 exit_sab(1)
+        elif opt == "--console":
+            console_logging = True
         elif opt in ("-v", "--version"):
             print_version()
             exit_sab(0)
@@ -922,6 +947,8 @@ def main():
             new_instance = True
         elif opt == "--ipv6_hosting":
             ipv6_hosting = arg
+        elif opt == "--inet_exposure":
+            inet_exposure = arg
 
     sabnzbd.MY_FULLNAME = os.path.normpath(os.path.abspath(sabnzbd.MY_FULLNAME))
     sabnzbd.MY_NAME = os.path.basename(sabnzbd.MY_FULLNAME)
@@ -930,8 +957,8 @@ def main():
     sabnzbd.DIR_LANGUAGE = real_path(sabnzbd.DIR_PROG, DEF_LANGUAGE)
     org_dir = os.getcwd()
 
-    # Need console logging for SABnzbd.py and SABnzbd-console.exe
-    console_logging = (not hasattr(sys, "frozen")) or (sabnzbd.MY_NAME.lower().find("-console") > 0)
+    # 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 and not sabnzbd.DAEMON
 
     LOGLEVELS = (logging.FATAL, logging.WARNING, logging.INFO, logging.DEBUG)
@@ -948,17 +975,18 @@ def main():
     logger.setLevel(logging.WARNING)
     logger.addHandler(gui_log)
 
-    # Detect Windows variant
+    # Detect CPU architecture and Windows variant
+    # Use .machine as .processor is not always filled
+    cpu_architecture = platform.uname().machine
     if sabnzbd.WIN32:
-        vista_plus, win64 = windows_variant()
-        sabnzbd.WIN64 = win64
+        sabnzbd.WIN64 = cpu_architecture == "AMD64"
 
     if inifile:
         # INI file given, simplest case
         inifile = evaluate_inipath(inifile)
     else:
         # No ini file given, need profile data
-        get_user_profile_paths(vista_plus)
+        get_user_profile_paths()
         # Find out where INI file is
         inifile = os.path.abspath(os.path.join(sabnzbd.DIR_LCLDATA, DEF_INI_FILE))
 
@@ -1106,7 +1134,7 @@ def main():
     try:
         if not no_file_log:
             rollover_log = logging.handlers.RotatingFileHandler(
-                sabnzbd.LOGFILE, "a+", sabnzbd.cfg.log_size.get_int(), sabnzbd.cfg.log_backups()
+                sabnzbd.LOGFILE, "a+", sabnzbd.cfg.log_size(), sabnzbd.cfg.log_backups()
             )
             rollover_log.setFormatter(logging.Formatter(logformat))
             logger.addHandler(rollover_log)
@@ -1128,32 +1156,38 @@ def main():
         if no_file_log:
             logging.info("Console logging only")
 
+    # Start SABnzbd
     logging.info("--------------------------------")
-    logging.info("%s-%s (rev=%s)", sabnzbd.MY_NAME, sabnzbd.__version__, sabnzbd.__baseline__)
-    logging.info("Full executable path = %s", sabnzbd.MY_FULLNAME)
-    if sabnzbd.WIN32:
-        suffix = ""
-        if win64:
-            suffix = "(win64)"
+    logging.info("%s-%s", sabnzbd.MY_NAME, sabnzbd.__version__)
+
+    # See if we can get version from git when running an unknown revision
+    if sabnzbd.__baseline__ == "unknown":
         try:
-            logging.info("Platform = %s %s", platform.platform(), suffix)
+            sabnzbd.__baseline__ = sabnzbd.misc.run_command(
+                ["git", "rev-parse", "--short", "HEAD"], cwd=sabnzbd.DIR_PROG
+            ).strip()
         except:
-            logging.info("Platform = %s <unknown>", suffix)
-    else:
-        logging.info("Platform = %s", os.name)
-    logging.info("Python-version = %s", sys.version)
+            pass
+    logging.info("Commit = %s", sabnzbd.__baseline__)
+
+    logging.info("Full executable path = %s", sabnzbd.MY_FULLNAME)
     logging.info("Arguments = %s", sabnzbd.CMDLINE)
-    if sabnzbd.DOCKER:
-        logging.info("Running inside a docker container")
-    else:
-        logging.info("Not inside a docker container")
+    logging.info("Python-version = %s", sys.version)
+    logging.info("Dockerized = %s", sabnzbd.DOCKER)
+    logging.info("CPU architecture = %s", cpu_architecture)
+
+    try:
+        logging.info("Platform = %s - %s", os.name, platform.platform())
+    except:
+        # Can fail on special platforms (like Snapcraft or embedded)
+        pass
 
     # 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:
     if not sabnzbd.WIN32 and not sabnzbd.DARWIN and not ("utf-8" in sabnzbd.encoding.CODEPAGE.lower()):
-        logging.warning(
+        logging.warning_helpful(
             T(
                 "SABnzbd was started with encoding %s, this should be UTF-8. Expect problems with Unicoded file and directory names in downloads."
             ),
@@ -1168,55 +1202,35 @@ def main():
     if importlib.util.find_spec("certifi") is not None:
         import certifi
 
-        os.environ["SSL_CERT_FILE"] = certifi.where()
-        logging.info("Certifi version: %s", certifi.__version__)
-        logging.info("Loaded additional certificates from: %s", os.environ["SSL_CERT_FILE"])
+        try:
+            os.environ["SSL_CERT_FILE"] = certifi.where()
+            logging.info("Certifi version = %s", certifi.__version__)
+            logging.info("Loaded additional certificates from %s", os.environ["SSL_CERT_FILE"])
+        except:
+            # Sometimes the certificate file is blocked
+            logging.warning(T("Could not load additional certificates from certifi package"))
+            logging.info("Traceback: ", exc_info=True)
 
     # Extra startup info
     if sabnzbd.cfg.log_level() > 1:
         # List the number of certificates available (can take up to 1.5 seconds)
-        ctx = ssl.create_default_context()
-        logging.debug("Available certificates: %s", repr(ctx.cert_store_stats()))
+        logging.debug("Available certificates = %s", repr(ssl.create_default_context().cert_store_stats()))
 
-        # Show IPv4/IPv6 address
-        from sabnzbd.getipaddress import localipv4, publicipv4, ipv6
-
-        mylocalipv4 = localipv4()
-        if mylocalipv4:
-            logging.debug("My local IPv4 address = %s", mylocalipv4)
-        else:
-            logging.debug("Could not determine my local IPv4 address")
-
-        mypublicipv4 = publicipv4()
-        if mypublicipv4:
-            logging.debug("My public IPv4 address = %s", mypublicipv4)
-        else:
-            logging.debug("Could not determine my public IPv4 address")
-
-        myipv6 = ipv6()
-        if myipv6:
-            logging.debug("My IPv6 address = %s", myipv6)
-        else:
-            logging.debug("Could not determine my IPv6 address")
+        # List networking
+        logging.debug("Local IPv4 address = %s", localipv4())
+        logging.debug("Public IPv4 address = %s", publicipv4())
+        logging.debug("IPv6 address = %s", ipv6())
 
         # Measure and log system performance measured by pystone and - if possible - CPU model
-        from sabnzbd.utils.getperformance import getpystone, getcpu
-
-        pystoneperf = getpystone()
-        if pystoneperf:
-            logging.debug("CPU Pystone available performance = %s", pystoneperf)
-        else:
-            logging.debug("CPU Pystone available performance could not be calculated")
-        cpumodel = getcpu()  # Linux only
-        if cpumodel:
-            logging.debug("CPU model = %s", cpumodel)
+        logging.debug("CPU Pystone available performance = %s", getpystone())
+        logging.debug("CPU model = %s", getcpu())
 
     logging.info("Using INI file %s", inifile)
 
     if autobrowser is not None:
         sabnzbd.cfg.autobrowser.set(autobrowser)
 
-    sabnzbd.initialize(pause, clean_up, evalSched=True, repair=repair)
+    sabnzbd.initialize(pause, clean_up, repair=repair)
 
     os.chdir(sabnzbd.DIR_PROG)
 
@@ -1228,10 +1242,8 @@ def main():
     sabnzbd.cfg.web_color.set(sabnzbd.WEB_COLOR)
 
     # Handle the several tray icons
-    if sabnzbd.cfg.win_menu() and not sabnzbd.DAEMON:
+    if sabnzbd.cfg.win_menu() and not sabnzbd.DAEMON and not sabnzbd.WIN_SERVICE:
         if sabnzbd.WIN32:
-            import sabnzbd.sabtray
-
             sabnzbd.WINTRAY = sabnzbd.sabtray.SABTrayThread()
         elif sabnzbd.LINUX_POWER and os.environ.get("DISPLAY"):
             try:
@@ -1320,6 +1332,10 @@ def main():
         sabnzbd.cfg.username.set("")
         sabnzbd.cfg.password.set("")
 
+    # Overwrite inet_exposure from command-line for VPS-setups
+    if inet_exposure:
+        sabnzbd.cfg.inet_exposure.set(inet_exposure)
+
     mime_gzip = (
         "text/*",
         "application/javascript",
@@ -1392,6 +1408,7 @@ def main():
 
     # Make available from both URLs
     main_page = sabnzbd.interface.MainPage()
+    cherrypy.Application.relative_urls = "server"
     cherrypy.tree.mount(main_page, "/", config=appconfig)
     cherrypy.tree.mount(main_page, sabnzbd.cfg.url_base(), config=appconfig)
 
@@ -1460,26 +1477,45 @@ def main():
         check_latest_version()
     autorestarted = False
 
-    # ZeroConfig/Bonjour needs a ip. Lets try to find it.
-    try:
-        z_host = socket.gethostbyname(socket.gethostname())
-    except socket.gaierror:
-        z_host = cherryhost
-    sabnzbd.zconfig.set_bonjour(z_host, cherryport)
+    # Start SSDP and Bonjour if SABnzbd isn't listening on localhost only
+    if sabnzbd.cfg.enable_broadcast() and not is_localhost(cherryhost):
+        # Try to find a LAN IP address for SSDP/Bonjour
+        if is_lan_addr(cherryhost):
+            # A specific listening address was configured, use that
+            external_host = cherryhost
+        else:
+            # Fall back to the IPv4 address of the LAN interface
+            external_host = localipv4()
+        logging.debug("Using %s as host address for Bonjour and SSDP", external_host)
+
+        if is_lan_addr(external_host):
+            sabnzbd.zconfig.set_bonjour(external_host, cherryport)
+
+            # Set URL for browser for external hosts
+            ssdp_url = "%s://%s:%s%s" % (
+                ("https" if enable_https else "http"),
+                external_host,
+                cherryport,
+                sabnzbd.cfg.url_base(),
+            )
+            ssdp.start_ssdp(
+                external_host,
+                "SABnzbd",
+                ssdp_url,
+                "SABnzbd %s" % sabnzbd.__version__,
+                "SABnzbd Team",
+                "https://sabnzbd.org/",
+                "SABnzbd %s" % sabnzbd.__version__,
+                ssdp_broadcast_interval=sabnzbd.cfg.ssdp_broadcast_interval(),
+            )
 
     # Have to keep this running, otherwise logging will terminate
     timer = 0
     while not sabnzbd.SABSTOP:
-        if sabnzbd.LAST_WARNING:
-            msg = sabnzbd.LAST_WARNING
-            sabnzbd.LAST_WARNING = None
-            sabnzbd.notifier.send_notification(T("Warning"), msg, "warning")
-        if sabnzbd.LAST_ERROR:
-            msg = sabnzbd.LAST_ERROR
-            sabnzbd.LAST_ERROR = None
-            sabnzbd.notifier.send_notification(T("Error"), msg, "error")
-
-        time.sleep(3)
+        # Wait to be awoken or every 3 seconds
+        with sabnzbd.SABSTOP_CONDITION:
+            sabnzbd.SABSTOP_CONDITION.wait(3)
+        timer += 1
 
         # Check for loglevel changes
         if LOG_FLAG:
@@ -1489,60 +1525,61 @@ def main():
             if console_logging:
                 console.setLevel(level)
 
-        # 30 sec polling tasks
-        if timer > 9:
+        # 300 sec polling tasks
+        if not timer % 100:
+            if sabnzbd.LOG_ALL:
+                logging.debug("Triggering Python garbage collection")
+            gc.collect()
             timer = 0
+
+        # 30 sec polling tasks
+        if not timer % 10:
             # Keep OS awake (if needed)
             sabnzbd.keep_awake()
             # Restart scheduler (if needed)
-            scheduler.restart()
+            sabnzbd.Scheduler.restart(plan_restart=False)
             # Save config (if needed)
             config.save_config()
             # Check the threads
             if not sabnzbd.check_all_tasks():
                 autorestarted = True
                 sabnzbd.TRIGGER_RESTART = True
-        else:
-            timer += 1
 
         # 3 sec polling tasks
         # Check for auto-restart request
         # Or special restart cases like Mac and WindowsService
         if sabnzbd.TRIGGER_RESTART:
-            # Shutdown
+            logging.info("Performing triggered restart")
             sabnzbd.shutdown_program()
 
-            if sabnzbd.downloader.Downloader.do.paused:
+            # Add arguments and make sure we are in the right directory
+            if sabnzbd.Downloader.paused:
                 sabnzbd.RESTART_ARGS.append("-p")
             if autorestarted:
                 sabnzbd.RESTART_ARGS.append("--autorestarted")
             sys.argv = sabnzbd.RESTART_ARGS
-
             os.chdir(org_dir)
-            # If OSX frozen restart of app instead of embedded python
-            if hasattr(sys, "frozen") and sabnzbd.DARWIN:
-                # [[NSProcessInfo processInfo] processIdentifier]]
-                # logging.info("%s" % (NSProcessInfo.processInfo().processIdentifier()))
-                my_pid = os.getpid()
-                my_name = sabnzbd.MY_FULLNAME.replace("/Contents/MacOS/SABnzbd", "")
-                my_args = " ".join(sys.argv[1:])
-                cmd = 'kill -9 %s && open "%s" --args %s' % (my_pid, my_name, my_args)
-                logging.info("Launching: ", cmd)
-                os.system(cmd)
-            elif sabnzbd.WIN_SERVICE:
-                # Use external service handler to do the restart
-                # Wait 5 seconds to clean up
-                subprocess.Popen("timeout 5 & sc start SABnzbd", shell=True)
+
+            # Binaries require special restart
+            if hasattr(sys, "frozen"):
+                if sabnzbd.DARWIN:
+                    # 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)
+                    logging.info("Launching: %s", cmd)
+                    os.system(cmd)
+                elif sabnzbd.WIN_SERVICE:
+                    # Use external service handler to do the restart
+                    # Wait 5 seconds to clean up
+                    subprocess.Popen("timeout 5 & sc start SABnzbd", shell=True)
+                elif sabnzbd.WIN32:
+                    # Just a simple restart of the exe
+                    os.execv(sys.executable, ['"%s"' % arg for arg in sys.argv])
             else:
+                # CherryPy has special logic to include interpreter options such as "-OO"
                 cherrypy.engine._do_execv()
 
-    config.save_config()
-
-    if sabnzbd.WINTRAY:
-        sabnzbd.WINTRAY.terminate = True
-    if sabnzbd.WIN32:
-        del_connection_info()
-
     # Send our final goodbyes!
     notifier.send_notification("SABnzbd", T("SABnzbd shutdown finished"), "startup")
     logging.info("Leaving SABnzbd")
@@ -1569,10 +1606,9 @@ def main():
 
 
 if sabnzbd.WIN32:
-    import servicemanager
 
     class SABnzbd(win32serviceutil.ServiceFramework):
-        """ Win32 Service Handler """
+        """Win32 Service Handler"""
 
         _svc_name_ = "SABnzbd"
         _svc_display_name_ = "SABnzbd Binary Newsreader"
@@ -1632,13 +1668,14 @@ https://sabnzbd.org/wiki/advanced/sabnzbd-as-a-windows-service
 
 
 def handle_windows_service():
-    """ Handle everything for Windows Service
-        Returns True when any service commands were detected or
-        when we have started as a service.
+    """Handle everything for Windows Service
+    Returns True when any service commands were detected or
+    when we have started as a service.
     """
-    # Detect if running as Windows Service (only Vista and above!)
+    # Detect if running as Windows Service
     # Adapted from https://stackoverflow.com/a/55248281/5235502
-    if win32ts.ProcessIdToSessionId(win32api.GetCurrentProcessId()) == 0:
+    # Only works when run from the exe-files
+    if hasattr(sys, "frozen") and win32ts.ProcessIdToSessionId(win32api.GetCurrentProcessId()) == 0:
         servicemanager.Initialize()
         servicemanager.PrepareToHostSingle(SABnzbd)
         servicemanager.StartServiceCtrlDispatcher()
@@ -1686,8 +1723,7 @@ if __name__ == "__main__":
             main()
 
     elif sabnzbd.DARWIN and sabnzbd.FOUNDATION:
-
-        # OSX binary runner
+        # macOS binary runner
         from threading import Thread
         from PyObjCTools import AppHelper
         from AppKit import NSApplication
@@ -1695,12 +1731,10 @@ if __name__ == "__main__":
 
         # Need to run the main application in separate thread because the eventLoop
         # has to be in the main thread. The eventLoop is required for the menu.
-        # This code is made with trial-and-error, please improve!
+        # This code is made with trial-and-error, please feel free to improve!
         class startApp(Thread):
             def run(self):
-                logging.info("[osx] sabApp Starting - starting main thread")
                 main()
-                logging.info("[osx] sabApp Stopping - main thread quit ")
                 AppHelper.stopEventLoop()
 
         sabApp = startApp()

appveyor.yml

@@ -1,15 +0,0 @@
-environment:
-  # We only test the latest Python version
-  matrix:
-    - PYTHON: "C:\\Python38-x64"
-
-install:
-  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-  - python --version
-  - python -m pip install --upgrade pip
-  - python -m pip install --upgrade wheel
-  - python -m pip install --upgrade -r requirements.txt
-  - python -m pip install --upgrade -r tests/requirements.txt
-
-build_script:
-  - python -m pytest -s

builder/SABnzbd.spec

@@ -0,0 +1,184 @@
+# -*- mode: python -*-
+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
+
+# 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/Plush/",
+    "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"]
+
+# Add platform specific stuff
+if sys.platform == "darwin":
+    extra_hiddenimports.extend(["pyobjc", "objc", "PyObjCTools"])
+    # macOS folders
+    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
+    version_info = None
+else:
+    # Build would fail on non-Windows
+    from PyInstaller.utils.win32.versioninfo import (
+        VSVersionInfo,
+        FixedFileInfo,
+        StringFileInfo,
+        StringTable,
+        StringStruct,
+        VarFileInfo,
+        VarStruct,
+    )
+
+    # Windows
+    extra_hiddenimports.append("win32timezone")
+    extra_folders += ["win/multipar/", "win/unrar/", "win/7zip/"]
+
+    # Parse the version info
+    version_regexed = re.search(r"(\d+)\.(\d+)\.(\d+)([a-zA-Z]*)(\d*)", RELEASE_VERSION)
+    version_tuple = (int(version_regexed.group(1)), int(version_regexed.group(2)), int(version_regexed.group(3)), 0)
+
+    # Detailed instructions are in the PyInstaller documentation
+    # We don't include the alpha/beta/rc in the counters
+    version_info = VSVersionInfo(
+        ffi=FixedFileInfo(
+            filevers=version_tuple,
+            prodvers=version_tuple,
+            mask=0x3F,
+            flags=0x0,
+            OS=0x40004,
+            fileType=0x1,
+            subtype=0x0,
+            date=(0, 0),
+        ),
+        kids=[
+            StringFileInfo(
+                [
+                    StringTable(
+                        "040904B0",
+                        [
+                            StringStruct("Comments", f"SABnzbd {RELEASE_VERSION}"),
+                            StringStruct("CompanyName", "The SABnzbd-Team"),
+                            StringStruct("FileDescription", f"SABnzbd {RELEASE_VERSION}"),
+                            StringStruct("FileVersion", RELEASE_VERSION),
+                            StringStruct("LegalCopyright", "The SABnzbd-Team"),
+                            StringStruct("ProductName", f"SABnzbd {RELEASE_VERSION}"),
+                            StringStruct("ProductVersion", RELEASE_VERSION),
+                        ],
+                    )
+                ]
+            ),
+            VarFileInfo([VarStruct("Translation", [1033, 1200])]),
+        ],
+    )
+
+# Process the extra-files and folders
+for file_item in extra_files:
+    extra_pyinstaller_files.append((file_item, "."))
+for folder_item in extra_folders:
+    extra_pyinstaller_files.append((folder_item, folder_item))
+
+pyi_analysis = Analysis(
+    ["SABnzbd.py"],
+    datas=extra_pyinstaller_files,
+    hiddenimports=extra_hiddenimports,
+    excludes=["FixTk", "tcl", "tk", "_tkinter", "tkinter", "Tkinter"],
+)
+
+pyz = PYZ(pyi_analysis.pure, pyi_analysis.zipped_data)
+
+exe = EXE(
+    pyz,
+    pyi_analysis.scripts,
+    [],
+    exclude_binaries=True,
+    name="SABnzbd",
+    upx=True,
+    console=False,
+    append_pkg=False,
+    icon="icons/sabnzbd.ico",
+    version=version_info,
+)
+
+coll = COLLECT(exe, pyi_analysis.binaries, pyi_analysis.zipfiles, pyi_analysis.datas, name="SABnzbd")
+
+# We need to run again for the console-app
+if sys.platform == "win32":
+    # Enable console=True for this one
+    console_exe = EXE(
+        pyz,
+        pyi_analysis.scripts,
+        [],
+        exclude_binaries=True,
+        name="SABnzbd-console",
+        upx=True,
+        append_pkg=False,
+        icon="icons/sabnzbd.ico",
+        version=version_info,
+    )
+
+    console_coll = COLLECT(
+        console_exe,
+        pyi_analysis.binaries,
+        pyi_analysis.zipfiles,
+        pyi_analysis.datas,
+        upx=True,
+        name="SABnzbd-console",
+    )
+
+# Build the APP on macOS
+if sys.platform == "darwin":
+    info_plist = {
+        "NSUIElement": 1,
+        "NSPrincipalClass": "NSApplication",
+        "CFBundleShortVersionString": RELEASE_VERSION,
+        "NSHumanReadableCopyright": "The SABnzbd-Team",
+        "CFBundleIdentifier": "org.sabnzbd.sabnzbd",
+        "CFBundleDocumentTypes": [
+            {
+                "CFBundleTypeExtensions": ["nzb"],
+                "CFBundleTypeIconFile": "nzbfile.icns",
+                "CFBundleTypeMIMETypes": ["text/nzb"],
+                "CFBundleTypeName": "NZB File",
+                "CFBundleTypeRole": "Viewer",
+                "LSTypeIsPackage": 0,
+                "NSPersistentStoreTypeKey": "Binary",
+            }
+        ],
+        "LSMinimumSystemVersion": "10.9",
+        "LSEnvironment": {"LANG": "en_US.UTF-8", "LC_ALL": "en_US.UTF-8"},
+    }
+
+    app = BUNDLE(coll, name="SABnzbd.app", icon="builder/osx/image/sabnzbdplus.icns", info_plist=info_plist)

builder/make_dmg.py

@@ -0,0 +1,206 @@
+#!/usr/bin/python3 -OO
+# Copyright 2008-2017 The SABnzbd-Team <team@sabnzbd.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# 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
+import pkginfo
+
+
+# We need to call dmgbuild from command-line, so here we can setup how
+if __name__ == "__main__":
+    # Check for DMGBuild
+    try:
+        import dmgbuild
+    except:
+        print("Requires dmgbuild-module, use pip install dmgbuild")
+        exit()
+
+    # Make sure we are in the src folder
+    if not os.path.exists("builder"):
+        raise FileNotFoundError("Run from the main SABnzbd source folder: python builder/package.py")
+
+    # Check if signing is possible
+    authority = os.environ.get("SIGNING_AUTH")
+
+    # Extract version info and set DMG path
+    # Create sub-folder to upload later
+    release = pkginfo.Develop(".").version
+    prod = "SABnzbd-" + release
+    fileDmg = prod + "-osx.dmg"
+
+    # Path to app file
+    apppath = "dist/SABnzbd.app"
+
+    # Copy Readme
+    readmepath = os.path.join(apppath, "Contents/Resources/README.txt")
+
+    # Path to background and the icon
+    backgroundpath = "builder/osx/image/sabnzbd_new_bg.png"
+    iconpath = "builder/osx/image/sabnzbdplus.icns"
+
+    # Make DMG
+    print("Building DMG")
+    dmgbuild.build_dmg(
+        filename=fileDmg,
+        volume_name=prod,
+        settings_file="builder/make_dmg.py",
+        defines={"app": apppath, "readme": readmepath, "background": backgroundpath, "iconpath": iconpath},
+    )
+
+    # Resign APP
+    if authority:
+        print("Siging DMG")
+        os.system('codesign --deep -f -i "org.sabnzbd.SABnzbd" -s "%s" "%s"' % (authority, fileDmg))
+        print("Signed!")
+    else:
+        print("Signing skipped, missing SIGNING_AUTH.")
+    exit()
+
+
+### START OF DMGBUILD SETTINGS
+### COPIED AND MODIFIED FROM THE EXAMPLE ONLINE
+application = defines.get("app", "AppName.app")
+readme = defines.get("readme", "ReadMe.rtf")
+appname = os.path.basename(application)
+
+# .. Basics ....................................................................
+
+# Volume format (see hdiutil create -help)
+format = defines.get("format", "UDBZ")
+
+# Volume size (must be large enough for your files)
+size = defines.get("size", "100M")
+
+# Files to include
+files = [application, readme]
+
+# Symlinks to create
+symlinks = {"Applications": "/Applications"}
+
+# Volume icon
+#
+# You can either define icon, in which case that icon file will be copied to the
+# image, *or* you can define badge_icon, in which case the icon file you specify
+# will be used to badge the system's Removable Disk icon
+#
+badge_icon = defines.get("iconpath", "")
+
+# Where to put the icons
+icon_locations = {readme: (70, 160), appname: (295, 220), "Applications": (510, 220)}
+
+# .. Window configuration ......................................................
+
+# Window position in ((x, y), (w, h)) format
+window_rect = ((100, 100), (660, 360))
+
+# Background
+#
+# This is a STRING containing any of the following:
+#
+#    #3344ff          - web-style RGB color
+#    #34f             - web-style RGB color, short form (#34f == #3344ff)
+#    rgb(1,0,0)       - RGB color, each value is between 0 and 1
+#    hsl(120,1,.5)    - HSL (hue saturation lightness) color
+#    hwb(300,0,0)     - HWB (hue whiteness blackness) color
+#    cmyk(0,1,0,0)    - CMYK color
+#    goldenrod        - X11/SVG named color
+#    builtin-arrow    - A simple built-in background with a blue arrow
+#    /foo/bar/baz.png - The path to an image file
+#
+# Other color components may be expressed either in the range 0 to 1, or
+# as percentages (e.g. 60% is equivalent to 0.6).
+background = defines.get("background", "builtin-arrow")
+
+show_status_bar = False
+show_tab_view = False
+show_toolbar = False
+show_pathbar = False
+show_sidebar = False
+sidebar_width = 0
+
+# Select the default view; must be one of
+#
+#    'icon-view'
+#    'list-view'
+#    'column-view'
+#    'coverflow'
+#
+default_view = "icon-view"
+
+# General view configuration
+show_icon_preview = False
+
+# Set these to True to force inclusion of icon/list view settings (otherwise
+# we only include settings for the default view)
+include_icon_view_settings = "auto"
+include_list_view_settings = "auto"
+
+# .. Icon view configuration ...................................................
+
+arrange_by = None
+grid_offset = (0, 0)
+grid_spacing = 50
+scroll_position = (0, 0)
+label_pos = "bottom"  # or 'right'
+text_size = 16
+icon_size = 64
+
+# .. List view configuration ...................................................
+
+# Column names are as follows:
+#
+#   name
+#   date-modified
+#   date-created
+#   date-added
+#   date-last-opened
+#   size
+#   kind
+#   label
+#   version
+#   comments
+#
+list_icon_size = 16
+list_text_size = 12
+list_scroll_position = (0, 0)
+list_sort_by = "name"
+list_use_relative_dates = True
+list_calculate_all_sizes = (False,)
+list_columns = ("name", "date-modified", "size", "kind", "date-added")
+list_column_widths = {
+    "name": 300,
+    "date-modified": 181,
+    "date-created": 181,
+    "date-added": 181,
+    "date-last-opened": 181,
+    "size": 97,
+    "kind": 115,
+    "label": 100,
+    "version": 75,
+    "comments": 300,
+}
+list_column_sort_directions = {
+    "name": "ascending",
+    "date-modified": "descending",
+    "date-created": "descending",
+    "date-added": "descending",
+    "date-last-opened": "descending",
+    "size": "descending",
+    "kind": "ascending",
+    "label": "ascending",
+    "version": "ascending",
+    "comments": "ascending",
+}

builder/osx/entitlements.plist

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

builder/package.py

@@ -0,0 +1,550 @@
+#!/usr/bin/python3 -OO
+# Copyright 2008-2017 The SABnzbd-Team <team@sabnzbd.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# 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 glob
+import platform
+import re
+import sys
+import os
+import time
+import shutil
+import subprocess
+import tarfile
+import pkginfo
+import github
+from distutils.dir_util import copy_tree
+
+
+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/Plush/",
+    "interfaces/Glitter/",
+    "interfaces/wizard/",
+    "interfaces/Config/",
+    "scripts/",
+    "icons/",
+]
+
+
+# Support functions
+def safe_remove(path):
+    """Remove file without erros if the file doesn't exist
+    Can also handle folders
+    """
+    if os.path.exists(path):
+        if os.path.isdir(path):
+            shutil.rmtree(path)
+        else:
+            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 run_external_command(command):
+    """Wrapper to ease the use of calling external programs"""
+    process = subprocess.Popen(command, text=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    output, _ = process.communicate()
+    ret = process.wait()
+    if output:
+        print(output)
+    if ret != 0:
+        raise RuntimeError("Command returned non-zero exit code %s!" % ret)
+    return output
+
+
+def run_git_command(parms):
+    """Run git command, raise error if it failed"""
+    return run_external_command(["git"] + parms)
+
+
+def patch_version_file(release_name):
+    """Patch in the Git commit hash, but only when this is
+    an unmodified checkout
+    """
+    git_output = run_git_command(["log", "-1"])
+    for line in git_output.split("\n"):
+        if "commit " in line:
+            commit = line.split(" ")[1].strip()
+            break
+    else:
+        raise TypeError("Commit hash not found")
+
+    with open(VERSION_FILE, "r") as ver:
+        version_file = ver.read()
+
+    version_file = re.sub(r'__baseline__\s*=\s*"[^"]*"', '__baseline__ = "%s"' % commit, version_file)
+    version_file = re.sub(r'__version__\s*=\s*"[^"]*"', '__version__ = "%s"' % release_name, version_file)
+
+    with open(VERSION_FILE, "w") as ver:
+        ver.write(version_file)
+
+
+if __name__ == "__main__":
+    # Was any option supplied?
+    if len(sys.argv) < 2:
+        raise TypeError("Please specify what to do")
+
+    # Make sure we are in the src folder
+    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?
+    RELEASE_THIS = "refs/tags/" in os.environ.get("GITHUB_REF", "")
+
+    # Rename release notes file
+    safe_remove("README.txt")
+    shutil.copyfile(RELEASE_README, "README.txt")
+
+    # Compile translations
+    if not os.path.exists("locale"):
+        run_external_command([sys.executable, "tools/make_mo.py"])
+
+        # Check again if translations exist, fail otherwise
+        if not os.path.exists("locale"):
+            raise FileNotFoundError("Failed to compile language files")
+
+    # Make sure we remove any existing build-folders
+    safe_remove("build")
+    safe_remove("dist")
+    safe_remove(RELEASE_NAME)
+
+    # Copy the specification
+    shutil.copyfile("builder/%s" % SPEC_FILE, SPEC_FILE)
+
+    if "binary" in sys.argv or "installer" in sys.argv:
+        # Must be run on Windows
+        if sys.platform != "win32":
+            raise RuntimeError("Binary should be created on Windows")
+
+        # Check what architecture we are on
+        RELEASE_BINARY = RELEASE_BINARY_32
+        if platform.architecture()[0] == "64bit":
+            RELEASE_BINARY = RELEASE_BINARY_64
+
+        # Remove any leftovers
+        safe_remove(RELEASE_BINARY)
+
+        # Run PyInstaller and check output
+        run_external_command([sys.executable, "-O", "-m", "PyInstaller", "SABnzbd.spec"])
+
+        # Use special distutils function to merge the main and console directories
+        copy_tree("dist/SABnzbd-console", "dist/SABnzbd")
+        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")
+
+        # 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")
+
+        if "installer" in sys.argv:
+            # Needs to be run on 64 bit
+            if RELEASE_BINARY != RELEASE_BINARY_64:
+                raise RuntimeError("Installer should be created on 64bit Python")
+
+            # Compile NSIS translations
+            safe_remove("NSIS_Installer.nsi")
+            safe_remove("NSIS_Installer.nsi.tmp")
+            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(
+                [
+                    "makensis.exe",
+                    "/V3",
+                    "/DSAB_PRODUCT=%s" % RELEASE_NAME,
+                    "/DSAB_VERSION=%s" % RELEASE_VERSION,
+                    "/DSAB_FILE=%s" % RELEASE_INSTALLER,
+                    "NSIS_Installer.nsi.tmp",
+                ]
+            )
+
+        # Rename the folder
+        os.rename("dist/SABnzbd", RELEASE_NAME)
+
+        # Create the archive
+        run_external_command(["win/7zip/7za.exe", "a", RELEASE_BINARY, RELEASE_NAME])
+
+    if "app" in sys.argv:
+        # Must be run on macOS
+        if sys.platform != "darwin":
+            raise RuntimeError("App should be created on macOS")
+
+        # Who will sign and notarize this?
+        authority = os.environ.get("SIGNING_AUTH")
+        notarization_user = os.environ.get("NOTARIZATION_USER")
+        notarization_pass = os.environ.get("NOTARIZATION_PASS")
+
+        # Run PyInstaller and check output
+        run_external_command([sys.executable, "-O", "-m", "PyInstaller", "SABnzbd.spec"])
+
+        # Only continue if we can sign
+        if authority:
+            files_to_sign = [
+                "dist/SABnzbd.app/Contents/MacOS/osx/par2/par2-sl64",
+                "dist/SABnzbd.app/Contents/MacOS/osx/7zip/7za",
+                "dist/SABnzbd.app/Contents/MacOS/osx/unrar/unrar",
+                "dist/SABnzbd.app/Contents/MacOS/SABnzbd",
+                "dist/SABnzbd.app",
+            ]
+
+            for file_to_sign in files_to_sign:
+                print("Signing %s with hardended runtime" % file_to_sign)
+                run_external_command(
+                    [
+                        "codesign",
+                        "--deep",
+                        "--force",
+                        "--timestamp",
+                        "--options",
+                        "runtime",
+                        "--entitlements",
+                        "builder/osx/entitlements.plist",
+                        "-i",
+                        "org.sabnzbd.sabnzbd",
+                        "-s",
+                        authority,
+                        file_to_sign,
+                    ],
+                )
+                print("Signed %s!" % file_to_sign)
+
+            # Only notarize for real builds that we want to deploy
+            if notarization_user and notarization_pass and RELEASE_THIS:
+                # Prepare zip to upload to notarization service
+                print("Creating zip to send to Apple notarization service")
+                # We need to use ditto, otherwise the signature gets lost!
+                notarization_zip = RELEASE_NAME + ".zip"
+                run_external_command(
+                    ["ditto", "-c", "-k", "--sequesterRsrc", "--keepParent", "dist/SABnzbd.app", notarization_zip]
+                )
+
+                # Upload to Apple
+                print("Sending zip to Apple notarization service")
+                upload_process = run_external_command(
+                    [
+                        "xcrun",
+                        "altool",
+                        "--notarize-app",
+                        "-t",
+                        "osx",
+                        "-f",
+                        notarization_zip,
+                        "--primary-bundle-id",
+                        "org.sabnzbd.sabnzbd",
+                        "-u",
+                        notarization_user,
+                        "-p",
+                        notarization_pass,
+                    ],
+                )
+
+                # Extract the notarization ID
+                m = re.match(".*RequestUUID = (.*?)\n", upload_process, re.S)
+                if not m:
+                    raise RuntimeError("No UUID created")
+                uuid = m.group(1)
+
+                print("Checking notarization of UUID: %s (every 30 seconds)" % uuid)
+                notarization_in_progress = True
+                while notarization_in_progress:
+                    time.sleep(30)
+                    check_status = run_external_command(
+                        [
+                            "xcrun",
+                            "altool",
+                            "--notarization-info",
+                            uuid,
+                            "-u",
+                            notarization_user,
+                            "-p",
+                            notarization_pass,
+                        ],
+                    )
+                    notarization_in_progress = "Status: in progress" in check_status
+
+                # Check if success
+                if "Status: success" not in check_status:
+                    raise RuntimeError("Failed to notarize..")
+
+                # Staple the notarization!
+                print("Approved! Stapling the result to the app")
+                run_external_command(["xcrun", "stapler", "staple", "dist/SABnzbd.app"])
+            elif notarization_user and notarization_pass:
+                print("Notarization skipped, tag commit to trigger notarization!")
+            else:
+                print("Notarization skipped, NOTARIZATION_USER or NOTARIZATION_PASS missing.")
+        else:
+            print("Signing skipped, missing SIGNING_AUTH.")
+
+    if "source" in sys.argv:
+        # Prepare Source distribution package.
+        # We assume the sources are freshly cloned from the repo
+        # Make sure all source files are Unix format
+        src_folder = "srcdist"
+        safe_remove(src_folder)
+        os.mkdir(src_folder)
+
+        # Remove any leftovers
+        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"])
+
+        # Copy all folders and files to the new folder
+        for source_folder in extra_folders:
+            copy_tree(source_folder, os.path.join(src_folder, source_folder))
+
+        # Copy all 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
+        for input_filename in glob.glob("%s/**/*.*" % src_folder, recursive=True):
+            base, ext = os.path.splitext(input_filename)
+            if ext.lower() not in (".py", ".txt", ".css", ".js", ".tmpl", ".sh", ".cmd"):
+                continue
+            print(input_filename)
+
+            with open(input_filename, "rb") as input_data:
+                data = input_data.read()
+            data = data.replace(b"\r", b"")
+            with open(input_filename, "wb") as output_data:
+                output_data.write(data)
+
+        # Create tar.gz file for source distro
+        with tarfile.open(RELEASE_SRC, "w:gz") as tar_output:
+            for root, dirs, files in os.walk(src_folder):
+                for _file in files:
+                    input_path = os.path.join(root, _file)
+                    if sys.platform == "win32":
+                        tar_path = input_path.replace("srcdist\\", RELEASE_NAME + "/").replace("\\", "/")
+                    else:
+                        tar_path = input_path.replace("srcdist/", RELEASE_NAME + "/")
+                    tarinfo = tar_output.gettarinfo(input_path, tar_path)
+                    tarinfo.uid = 0
+                    tarinfo.gid = 0
+                    if _file in ("SABnzbd.py", "Sample-PostProc.sh", "make_mo.py", "msgfmt.py"):
+                        # Force Linux/OSX scripts as executable
+                        tarinfo.mode = 0o755
+                    else:
+                        tarinfo.mode = 0o644
+
+                    with open(input_path, "rb") as f:
+                        tar_output.addfile(tarinfo, f)
+
+        # Remove source folder
+        safe_remove(src_folder)
+
+    # 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)
+
+            # 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/requirements.txt

@@ -0,0 +1,9 @@
+# Basic build requirements
+pyinstaller==4.2
+setuptools
+pkginfo
+certifi
+pygithub
+
+# For the OSX build specific
+dmgbuild; sys_platform == 'darwin'

builder/win/NSIS_Installer.nsi

@@ -0,0 +1,405 @@
+; -*- coding: utf-8 -*-
+;
+; Copyright 2008-2015 The SABnzbd-Team <team@sabnzbd.org>
+;
+; This program is free software; you can redistribute it and/or
+; modify it under the terms of the GNU General Public License
+; 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.
+
+Unicode true
+
+!addplugindir builder\win\nsis\Plugins
+!addincludedir builder\win\nsis\Include
+
+!include "MUI2.nsh"
+!include "registerExtension.nsh"
+!include "FileFunc.nsh"
+!include "LogicLib.nsh"
+!include "WinVer.nsh"
+!include "nsProcess.nsh"
+!include "x64.nsh"
+!include "servicelib.nsh"
+
+;------------------------------------------------------------------
+;
+; Marco for removing existing and the current installation
+; It shared by the installer and the uninstaller.
+;
+!define RemovePrev "!insertmacro RemovePrev"
+!macro RemovePrev idir
+  ; Remove the whole dir
+  ; Users should not be putting stuff here!
+  RMDir /r "${idir}"
+!macroend
+
+;------------------------------------------------------------------
+; Define names of the product
+  Name "${SAB_PRODUCT}"
+  OutFile "${SAB_FILE}"
+  InstallDir "$PROGRAMFILES\SABnzbd"
+
+
+;------------------------------------------------------------------
+; Some default compiler settings (uncomment and change at will):
+  SetCompress auto ; (can be off or force)
+  SetDatablockOptimize on ; (can be off)
+  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)
+  WindowIcon on
+  SpaceTexts none
+
+
+;------------------------------------------------------------------
+; Vista/Win7 redirects $SMPROGRAMS to all users without this
+  RequestExecutionLevel admin
+  FileErrorText "If you have no admin rights, try to install into a user directory."
+
+
+;------------------------------------------------------------------
+;Variables
+  Var MUI_TEMP
+  Var STARTMENU_FOLDER
+  Var PREV_INST_DIR
+
+;------------------------------------------------------------------
+;Interface Settings
+
+  !define MUI_ABORTWARNING
+
+  ;Show all languages, despite user's codepage
+  !define MUI_LANGDLL_ALLLANGUAGES
+
+  !define MUI_ICON "dist\SABnzbd\icons\sabnzbd.ico"
+
+
+;--------------------------------
+;Pages
+
+  !insertmacro MUI_PAGE_LICENSE "dist\SABnzbd\LICENSE.txt"
+  !define MUI_COMPONENTSPAGE_NODESC
+  !insertmacro MUI_PAGE_COMPONENTS
+
+  !insertmacro MUI_PAGE_DIRECTORY
+
+  ;Start Menu Folder Page Configuration
+  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
+  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\SABnzbd"
+  !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+  !define MUI_STARTMENUPAGE_DEFAULTFOLDER "SABnzbd"
+  ;Remember the installer language
+  !define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
+  !define MUI_LANGDLL_REGISTRY_KEY "Software\SABnzbd"
+  !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
+
+  !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
+
+  !insertmacro MUI_PAGE_INSTFILES
+  ; !define MUI_FINISHPAGE_RUN
+  ; !define MUI_FINISHPAGE_RUN_FUNCTION PageFinishRun
+  ; !define MUI_FINISHPAGE_RUN_TEXT $(MsgRunSAB)
+  !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt"
+  !define MUI_FINISHPAGE_SHOWREADME_TEXT $(MsgShowRelNote)
+  !define MUI_FINISHPAGE_LINK $(MsgSupportUs)
+  !define MUI_FINISHPAGE_LINK_LOCATION "https://sabnzbd.org/donate"
+
+  !insertmacro MUI_PAGE_FINISH
+
+  !insertmacro MUI_UNPAGE_CONFIRM
+  !define MUI_UNPAGE_COMPONENTSPAGE_NODESC
+  !insertmacro MUI_UNPAGE_COMPONENTS
+  !insertmacro MUI_UNPAGE_INSTFILES
+
+;------------------------------------------------------------------
+; Run as user-level at end of install
+; DOES NOT WORK
+; Function PageFinishRun
+;   !insertmacro UAC_AsUser_ExecShell "" "$INSTDIR\SABnzbd.exe" "" "" ""
+; FunctionEnd
+
+
+;------------------------------------------------------------------
+; Set supported languages
+;
+; If you edit this list you also need to edit apireg.py in SABnzbd!
+;
+  !insertmacro MUI_LANGUAGE "English" ;first language is the default language
+  !insertmacro MUI_LANGUAGE "French"
+  !insertmacro MUI_LANGUAGE "German"
+  !insertmacro MUI_LANGUAGE "Dutch"
+  !insertmacro MUI_LANGUAGE "Finnish"
+  !insertmacro MUI_LANGUAGE "Polish"
+  !insertmacro MUI_LANGUAGE "Swedish"
+  !insertmacro MUI_LANGUAGE "Danish"
+  !insertmacro MUI_LANGUAGE "Norwegian"
+  !insertmacro MUI_LANGUAGE "Romanian"
+  !insertmacro MUI_LANGUAGE "Spanish"
+  !insertmacro MUI_LANGUAGE "PortugueseBR"
+  !insertmacro MUI_LANGUAGE "Serbian"
+  !insertmacro MUI_LANGUAGE "Hebrew"
+  !insertmacro MUI_LANGUAGE "Russian"
+  !insertmacro MUI_LANGUAGE "Czech"
+  !insertmacro MUI_LANGUAGE "SimpChinese"
+
+
+
+;------------------------------------------------------------------
+;Reserve Files
+  ;If you are using solid compression, files that are required before
+  ;the actual installation should be stored first in the data block,
+  ;because this will make your installer start faster.
+
+  !insertmacro MUI_RESERVEFILE_LANGDLL
+
+
+;------------------------------------------------------------------
+; SECTION main program
+;
+Section "SABnzbd" SecDummy
+
+  SetOutPath "$INSTDIR"
+
+  ;------------------------------------------------------------------
+  ; Make sure old versions are gone (reg-key already read in onInt)
+  StrCmp $PREV_INST_DIR "" noPrevInstallRemove
+    ${RemovePrev} "$PREV_INST_DIR"
+  noPrevInstallRemove:
+
+  ; 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
+  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" "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/'
+  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "Comments" 'The automated Usenet download tool'
+  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "DisplayIcon" '$INSTDIR\icons\sabnzbd.ico'
+  WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "EstimatedSize"  25674
+  WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "NoRepair" -1
+  WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd" "NoModify" -1
+  ; write out uninstaller
+  WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+    ;Create shortcuts
+    CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\SABnzbd.lnk" "$INSTDIR\SABnzbd.exe"
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\SABnzbd - SafeMode.lnk" "$INSTDIR\SABnzbd.exe" "--server 127.0.0.1:8080 -b1 --no-login"
+    WriteINIStr "$SMPROGRAMS\$STARTMENU_FOLDER\SABnzbd - Documentation.url" "InternetShortcut" "URL" "https://sabnzbd.org/wiki/"
+    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+  !insertmacro MUI_STARTMENU_WRITE_END
+SectionEnd ; end of default section
+
+Section $(MsgIcon) desktop
+  CreateShortCut "$DESKTOP\SABnzbd.lnk" "$INSTDIR\SABnzbd.exe"
+SectionEnd ; end of desktop icon section
+
+Section $(MsgAssoc) assoc
+  ${registerExtension} "$INSTDIR\icons\nzb.ico" "$INSTDIR\SABnzbd.exe" ".nzb" "NZB File"
+  ${RefreshShellIcons}
+SectionEnd ; end of file association section
+
+Section /o $(MsgRunAtStart) startup
+  CreateShortCut "$SMPROGRAMS\Startup\SABnzbd.lnk" "$INSTDIR\SABnzbd.exe" "-b0"
+SectionEnd ;
+
+;------------------------------------------------------------------
+Function .onInit
+  ; We need to modify the dir here for X64
+  ${If} ${RunningX64}
+      StrCpy $INSTDIR "$PROGRAMFILES64\SABnzbd"
+  ${Else}
+      MessageBox MB_OK $(MsgOnly64bit)
+      ExecShell "open" "https://sabnzbd.org/downloads"
+      Abort
+  ${EndIf}
+
+  ; Python 3.9 no longer supports Windows 7
+  ${If} ${AtMostWin8}
+      MessageBox MB_OK $(MsgNoWin7)
+      ExecShell "open" "https://sabnzbd.org/downloads"
+      Abort
+  ${EndIf}
+
+  ;------------------------------------------------------------------
+  ; 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
+    StrCmp $PREV_INST_DIR "$PROGRAMFILES\SABnzbd" noSpecialDir
+      StrCmp $PREV_INST_DIR "$PROGRAMFILES64\SABnzbd" noSpecialDir
+        ; Set what the user had before
+        StrCpy $INSTDIR "$PREV_INST_DIR"
+    noSpecialDir:
+
+    ;------------------------------------------------------------------
+    ; Check what the user has currently set for install options
+    IfFileExists "$SMPROGRAMS\Startup\SABnzbd.lnk" 0 endCheckStartup
+      SectionSetFlags ${startup} 1
+    endCheckStartup:
+
+    IfFileExists "$DESKTOP\SABnzbd.lnk" endCheckDesktop 0
+      SectionSetFlags ${desktop} 0 ; SAB is installed but desktop-icon not, so uncheck it
+    endCheckDesktop:
+
+    Push $1
+    ReadRegStr $1 HKCR ".nzb" ""  ; read current file association
+    StrCmp "$1" "NZB File" noPrevInstall 0
+      SectionSetFlags ${assoc} 0 ; Uncheck it when it wasn't checked before
+  noPrevInstall:
+
+  ;--------------------------------
+  ; Display language chooser
+  !insertmacro MUI_LANGDLL_DISPLAY
+
+  ;------------------------------------------------------------------
+  ; make sure user terminates sabnzbd.exe or else abort
+  ;
+  loop:
+    ${nsProcess::FindProcess} "SABnzbd.exe" $R0
+    StrCmp $R0 0 0 endcheck
+    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION $(MsgCloseSab) IDOK loop IDCANCEL exitinstall
+    exitinstall:
+      ${nsProcess::Unload}
+      Abort
+  endcheck:
+
+  ;------------------------------------------------------------------
+  ; make sure both services aren't running
+  ;
+  !insertmacro SERVICE "running" "SABnzbd" ""
+  Pop $0 ;response
+  !insertmacro SERVICE "running" "SABHelper" ""
+  Pop $1
+  ${If} $0 == true
+  ${OrIf} $1 == true
+    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION $(MsgCloseSab) IDOK loop IDCANCEL exitinstall
+    ; exitinstall already defined above
+  ${EndIf}
+
+  ;------------------------------------------------------------------
+  ; Tell users about the service change
+  ;
+  !insertmacro SERVICE "installed" "SABHelper" ""
+  Pop $0 ;response
+  ${If} $0 == true
+    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION $(MsgServChange) IDOK removeservices IDCANCEL exitinstall
+    ; exitinstall already defined above
+    removeservices:
+        !insertmacro SERVICE "delete" "SABHelper" ""
+        !insertmacro SERVICE "delete" "SABnzbd" ""
+  ${EndIf}
+
+FunctionEnd
+
+;------------------------------------------------------------------
+; Show the shortcuts at end of install so user can start SABnzbd
+; This is instead of us trying to run SAB from the installer
+;
+Function .onInstSuccess
+  ExecShell "open" "$SMPROGRAMS\$STARTMENU_FOLDER"
+FunctionEnd
+
+;--------------------------------
+; begin uninstall settings/section
+UninstallText $(MsgUninstall)
+
+Section "un.$(MsgDelProgram)" Uninstall
+;make sure sabnzbd.exe isnt 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"
+  DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\SABnzbd"
+
+  ${RemovePrev} "$INSTDIR"
+
+  !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"
+
+  DeleteRegKey HKEY_CURRENT_USER  "Software\SABnzbd"
+
+  ${unregisterExtension} ".nzb" "NZB File"
+  ${RefreshShellIcons}
+
+SectionEnd ; end of uninstall section
+
+Section /o "un.$(MsgDelSettings)" DelSettings
+  DetailPrint "Uninstall settings $LOCALAPPDATA"
+  Delete "$LOCALAPPDATA\sabnzbd\sabnzbd.ini"
+  RMDir /r "$LOCALAPPDATA\sabnzbd"
+SectionEnd
+
+; eof
+
+;--------------------------------
+;Language strings
+  LangString MsgShowRelNote ${LANG_ENGLISH} "Show Release Notes"
+
+  LangString MsgSupportUs   ${LANG_ENGLISH} "Support the project, Donate!"
+
+  LangString MsgCloseSab    ${LANG_ENGLISH} "Please close $\"SABnzbd.exe$\" first"
+
+  LangString MsgServChange  ${LANG_ENGLISH} "The SABnzbd Windows Service changed in SABnzbd 3.0.0. $\nYou will need to reinstall the SABnzbd service. $\n$\nClick `OK` to remove the existing services or `Cancel` to cancel this upgrade."
+
+  LangString MsgOnly64bit   ${LANG_ENGLISH} "The installer only supports 64-bit Windows, use the standalone version to run on 32-bit Windows."
+
+  LangString MsgNoWin7      ${LANG_ENGLISH} "The installer only supports Windows 8.1 and above, use the standalone legacy version to run on older Windows version."
+
+  LangString MsgUninstall   ${LANG_ENGLISH} "This will uninstall SABnzbd from your system"
+
+  LangString MsgRunAtStart  ${LANG_ENGLISH} "Run at startup"
+
+  LangString MsgIcon        ${LANG_ENGLISH} "Desktop Icon"
+
+  LangString MsgAssoc       ${LANG_ENGLISH} "NZB File association"
+
+  LangString MsgDelProgram  ${LANG_ENGLISH} "Delete Program"
+
+  LangString MsgDelSettings ${LANG_ENGLISH} "Delete Settings"
+
+  LangString MsgRemoveOld   ${LANG_ENGLISH} "You cannot overwrite an existing installation. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade."
+
+  LangString MsgRemoveOld2  ${LANG_ENGLISH} "Your settings and data will be preserved."
+
+  LangString MsgLangCode    ${LANG_ENGLISH} "en"
+
+Function un.onInit
+  !insertmacro MUI_UNGETLANGUAGE
+FunctionEnd

builder/win/nsis/Include/nsProcess.nsh

@@ -0,0 +1,28 @@
+!define nsProcess::FindProcess `!insertmacro nsProcess::FindProcess`
+
+!macro nsProcess::FindProcess _FILE _ERR
+	nsProcess::_FindProcess /NOUNLOAD `${_FILE}`
+	Pop ${_ERR}
+!macroend
+
+
+!define nsProcess::KillProcess `!insertmacro nsProcess::KillProcess`
+
+!macro nsProcess::KillProcess _FILE _ERR
+	nsProcess::_KillProcess /NOUNLOAD `${_FILE}`
+	Pop ${_ERR}
+!macroend
+
+!define nsProcess::CloseProcess `!insertmacro nsProcess::CloseProcess`
+
+!macro nsProcess::CloseProcess _FILE _ERR
+	nsProcess::_CloseProcess /NOUNLOAD `${_FILE}`
+	Pop ${_ERR}
+!macroend
+
+
+!define nsProcess::Unload `!insertmacro nsProcess::Unload`
+
+!macro nsProcess::Unload
+	nsProcess::_Unload
+!macroend

builder/win/nsis/Include/registerExtension.nsh

@@ -0,0 +1,53 @@
+!define registerExtension "!insertmacro registerExtension"
+!define unregisterExtension "!insertmacro unregisterExtension"
+!define SHCNE_ASSOCCHANGED 0x8000000
+!define SHCNF_IDLIST 0
+
+; Source = http://nsis.sourceforge.net/File_Association
+; Patched for SABnzbd by swi-tch
+
+!macro registerExtension icon executable extension description
+       Push "${icon}"  ; "full path to icon.ico"
+       Push "${executable}"  ; "full path to my.exe"
+       Push "${extension}"   ;  ".mkv"
+       Push "${description}" ;  "MKV File"
+       Call registerExtension
+!macroend
+
+; back up old value of .opt
+Function registerExtension
+!define Index "Line${__LINE__}"
+  pop $R0 ; ext name
+  pop $R1
+  pop $R2
+  pop $R3
+  push $1
+  push $0
+  DeleteRegKey HKEY_CURRENT_USER "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\$R1"
+  WriteRegStr HKCR $R1 "" $R0
+	WriteRegStr HKCR $R0 "" $R0
+	WriteRegStr HKCR "$R0\shell" "" "open"
+	WriteRegStr HKCR "$R0\DefaultIcon" "" "$R3,0"
+  WriteRegStr HKCR "$R0\shell\open\command" "" '"$R2" "%1"'
+  WriteRegStr HKCR "$R0\shell\edit" "" "Edit $R0"
+  WriteRegStr HKCR "$R0\shell\edit\command" "" '"$R2" "%1"'
+  pop $0
+  pop $1
+!undef Index
+System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
+FunctionEnd
+
+!macro unregisterExtension extension description
+       Push "${extension}"   ;  ".mkv"
+       Push "${description}"   ;  "MKV File"
+       Call un.unregisterExtension
+!macroend
+
+Function un.unregisterExtension
+  pop $R1 ; description
+  pop $R0 ; extension
+!define Index "Line${__LINE__}"
+  DeleteRegKey HKCR $R0
+!undef Index
+System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
+FunctionEnd

builder/win/nsis/Include/servicelib.nsh

@@ -0,0 +1,411 @@
+; NSIS SERVICE LIBRARY - servicelib.nsh
+; Version 1.8.1 - Jun 21th, 2013
+; Questions/Comments - dselkirk@hotmail.com
+;
+; Description:
+;   Provides an interface to window services
+;
+; Inputs:
+;   action     - systemlib action ie. create, delete, start, stop, pause,
+;              continue, installed, running, status
+;   name       - name of service to manipulate
+;   param      - action parameters; usage: var1=value1;var2=value2;...etc.
+;                 (don't forget to add a ';' after the last value!)
+;
+; Actions:
+;   create     - creates a new windows service
+;              Parameters:
+;                path        - path to service executable
+;                autostart   - automatically start with system ie. 1|0
+;                interact    - interact with the desktop ie. 1|0
+;                depend      - service dependencies
+;                user        - user that runs the service
+;                password    - password of the above user
+;                display     - display name in service's console
+;                description - Description of service
+;                starttype   - start type (supersedes autostart)
+;                servicetype - service type (supersedes interact)
+;
+;   delete     - deletes a windows service
+;   start      - start a stopped windows service
+;   stop       - stops a running windows service
+;   pause      - pauses a running windows service
+;   continue   - continues a paused windows service
+;   installed  - is the provided service installed
+;              Parameters:
+;                action      - if true then invokes the specified action
+;   running    - is the provided service running
+;              Parameters:
+;                action      - if true then invokes the specified action
+;   status     - check the status of the provided service
+;
+; Usage:
+;   Method 1:
+;     Push "action"
+;     Push "name"
+;     Push "param"
+;     Call Service
+;     Pop $0 ;response
+;
+;   Method 2:
+;     !insertmacro SERVICE "action" "name" "param"
+;
+; History:
+;   1.0 - 09/15/2003 - Initial release
+;   1.1 - 09/16/2003 - Changed &l to i, thx brainsucker
+;   1.2 - 02/29/2004 - Fixed documentation.
+;   1.3 - 01/05/2006 - Fixed interactive flag and pop order (Kichik)
+;   1.4 - 12/07/2006 - Added display and depend, fixed datatypes (Vitoco)
+;   1.5 - 06/25/2008 - Added description of service.(DeSafe.com/liuqixing#gmail.com)
+;   1.5.1 - 06/12/2009 - Added use of __UNINSTALL__
+;   1.6 - 08/02/2010 - Fixed description implementation (Anders)
+;   1.7 - 04/11/2010 - Added get running service process id (Nico)
+;   1.8 - 24/03/2011 - Added starttype and servicetype (Sergius)
+;   1.8.1 - 21/06/2013 - Added dynamic ASCII & Unicode support (Zinthose)
+
+!ifndef SERVICELIB
+  !define SERVICELIB
+
+  !define SC_MANAGER_ALL_ACCESS         0x3F
+  !define SC_STATUS_PROCESS_INFO        0x0
+  !define SERVICE_ALL_ACCESS            0xF01FF
+
+  !define SERVICE_CONTROL_STOP          1
+  !define SERVICE_CONTROL_PAUSE         2
+  !define SERVICE_CONTROL_CONTINUE      3
+
+  !define SERVICE_STOPPED               0x1
+  !define SERVICE_START_PENDING         0x2
+  !define SERVICE_STOP_PENDING          0x3
+  !define SERVICE_RUNNING               0x4
+  !define SERVICE_CONTINUE_PENDING      0x5
+  !define SERVICE_PAUSE_PENDING         0x6
+  !define SERVICE_PAUSED                0x7
+
+  !define SERVICE_KERNEL_DRIVER         0x00000001
+  !define SERVICE_FILE_SYSTEM_DRIVER    0x00000002
+  !define SERVICE_WIN32_OWN_PROCESS     0x00000010
+  !define SERVICE_WIN32_SHARE_PROCESS   0x00000020
+  !define SERVICE_INTERACTIVE_PROCESS   0x00000100
+
+
+  !define SERVICE_BOOT_START            0x00000000
+  !define SERVICE_SYSTEM_START          0x00000001
+  !define SERVICE_AUTO_START            0x00000002
+  !define SERVICE_DEMAND_START          0x00000003
+  !define SERVICE_DISABLED              0x00000004
+
+  ## Added by Zinthose for Native Unicode Support
+  !ifdef NSIS_UNICODE
+    !define APITAG "W"
+  !else
+    !define APITAG "A"
+  !endif
+
+  !macro SERVICE ACTION NAME PARAM
+    Push '${ACTION}'
+    Push '${NAME}'
+    Push '${PARAM}'
+    !ifdef __UNINSTALL__
+        Call un.Service
+    !else
+        Call Service
+    !endif
+  !macroend
+
+  !macro FUNC_GETPARAM
+    Push $0
+    Push $1
+    Push $2
+    Push $3
+    Push $4
+    Push $5
+    Push $6
+    Push $7
+    Exch 8
+    Pop $1 ;name
+    Exch 8
+    Pop $2 ;source
+    StrCpy $0 ""
+    StrLen $7 $2
+    StrCpy $3 0
+    lbl_loop:
+      IntCmp $3 $7 0 0 lbl_done
+      StrLen $4 "$1="
+      StrCpy $5 $2 $4 $3
+      StrCmp $5 "$1=" 0 lbl_next
+      IntOp $5 $3 + $4
+      StrCpy $3 $5
+      lbl_loop2:
+        IntCmp $3 $7 0 0 lbl_done
+        StrCpy $6 $2 1 $3
+        StrCmp $6 ";" 0 lbl_next2
+        IntOp $6 $3 - $5
+        StrCpy $0 $2 $6 $5
+        Goto lbl_done
+        lbl_next2:
+        IntOp $3 $3 + 1
+        Goto lbl_loop2
+      lbl_next:
+      IntOp $3 $3 + 1
+      Goto lbl_loop
+    lbl_done:
+    Pop $5
+    Pop $4
+    Pop $3
+    Pop $2
+    Pop $1
+    Exch 2
+    Pop $6
+    Pop $7
+    Exch $0
+  !macroend
+
+  !macro CALL_GETPARAM VAR NAME DEFAULT LABEL
+    Push $1
+    Push ${NAME}
+    Call ${UN}GETPARAM
+    Pop $6
+    StrCpy ${VAR} "${DEFAULT}"
+    StrCmp $6 "" "${LABEL}" 0
+    StrCpy ${VAR} $6
+  !macroend
+
+  !macro FUNC_SERVICE UN
+    Push $0
+    Push $1
+    Push $2
+    Push $3
+    Push $4
+    Push $5
+    Push $6
+    Push $7
+    Exch 8
+    Pop $1 ;param
+    Exch 8
+    Pop $2 ;name
+    Exch 8
+    Pop $3 ;action
+    ;$0 return
+    ;$4 OpenSCManager
+    ;$5 OpenService
+
+    StrCpy $0 "false"
+    System::Call 'advapi32::OpenSCManager${APITAG}(n, n, i ${SC_MANAGER_ALL_ACCESS}) i.r4'
+    IntCmp $4 0 lbl_done
+    StrCmp $3 "create" lbl_create
+    System::Call 'advapi32::OpenService${APITAG}(i r4, t r2, i ${SERVICE_ALL_ACCESS}) i.r5'
+    IntCmp $5 0 lbl_done
+
+    lbl_select:
+    StrCmp $3 "delete" lbl_delete
+    StrCmp $3 "start" lbl_start
+    StrCmp $3 "stop" lbl_stop
+    StrCmp $3 "pause" lbl_pause
+    StrCmp $3 "continue" lbl_continue
+    StrCmp $3 "installed" lbl_installed
+    StrCmp $3 "running" lbl_running
+    StrCmp $3 "status" lbl_status
+    StrCmp $3 "processid" lbl_processid
+    Goto lbl_done
+
+    ; create service
+    lbl_create:
+      Push $R1 ;depend
+      Push $R2 ;user
+      Push $R3 ;password
+      Push $R4 ;servicetype/interact
+      Push $R5 ;starttype/autostart
+      Push $R6 ;path
+      Push $R7 ;display
+      Push $R8 ;description
+
+      !insertmacro CALL_GETPARAM $R1 "depend" "n" "lbl_depend"
+        StrCpy $R1 't "$R1"'
+      lbl_depend:
+      StrCmp $R1 "n" 0 lbl_machine ;old name of depend param
+      !insertmacro CALL_GETPARAM $R1 "machine" "n" "lbl_machine"
+        StrCpy $R1 't "$R1"'
+      lbl_machine:
+
+      !insertmacro CALL_GETPARAM $R2 "user" "n" "lbl_user"
+        StrCpy $R2 't "$R2"'
+      lbl_user:
+
+      !insertmacro CALL_GETPARAM $R3 "password" "n" "lbl_password"
+        StrCpy $R3 't "$R3"'
+      lbl_password:
+
+      !insertmacro CALL_GETPARAM $R4 "interact" "${SERVICE_WIN32_OWN_PROCESS}" "lbl_interact"
+        StrCpy $6 ${SERVICE_WIN32_OWN_PROCESS}
+        IntCmp $R4 0 +2
+        IntOp $6 $6 | ${SERVICE_INTERACTIVE_PROCESS}
+        StrCpy $R4 $6
+      lbl_interact:
+
+      !insertmacro CALL_GETPARAM $R4 "servicetype" "$R4" "lbl_servicetype"
+      lbl_servicetype:
+
+      !insertmacro CALL_GETPARAM $R5 "autostart" "${SERVICE_DEMAND_START}" "lbl_autostart"
+        StrCpy $6 ${SERVICE_DEMAND_START}
+        IntCmp $R5 0 +2
+        StrCpy $6 ${SERVICE_AUTO_START}
+        StrCpy $R5 $6
+      lbl_autostart:
+
+      !insertmacro CALL_GETPARAM $R5 "starttype" "$R5" "lbl_starttype"
+      lbl_starttype:
+
+      !insertmacro CALL_GETPARAM $R6 "path" "n" "lbl_path"
+      lbl_path:
+
+      !insertmacro CALL_GETPARAM $R7 "display" "$2" "lbl_display"
+      lbl_display:
+
+      !insertmacro CALL_GETPARAM $R8 "description" "$2" "lbl_description"
+      lbl_description:
+
+      System::Call 'advapi32::CreateService${APITAG}(i r4, t r2, t R7, i ${SERVICE_ALL_ACCESS}, \
+                                             i R4, i R5, i 0, t R6, n, n, $R1, $R2, $R3) i.r6'
+
+      ; write description of service (SERVICE_CONFIG_DESCRIPTION)
+      System::Call 'advapi32::ChangeServiceConfig2${APITAG}(ir6,i1,*t "$R8")i.R7'
+      strcmp $R7 "error" 0 lbl_descriptioncomplete
+      WriteRegStr HKLM "SYSTEM\CurrentControlSet\Services\$2" "Description" $R8
+      lbl_descriptioncomplete:
+
+      Pop $R8
+      Pop $R7
+      Pop $R6
+      Pop $R5
+      Pop $R4
+      Pop $R3
+      Pop $R2
+      Pop $R1
+      StrCmp $6 0 lbl_done lbl_good
+
+    ; delete service
+    lbl_delete:
+      System::Call 'advapi32::DeleteService(i r5) i.r6'
+      StrCmp $6 0 lbl_done lbl_good
+
+    ; start service
+    lbl_start:
+      System::Call 'advapi32::StartService${APITAG}(i r5, i 0, i 0) i.r6'
+      StrCmp $6 0 lbl_done lbl_good
+
+    ; stop service
+    lbl_stop:
+      Push $R1
+      System::Call '*(i,i,i,i,i,i,i) i.R1'
+      System::Call 'advapi32::ControlService(i r5, i ${SERVICE_CONTROL_STOP}, i $R1) i'
+      System::Free $R1
+      Pop $R1
+      StrCmp $6 0 lbl_done lbl_good
+
+    ; pause service
+    lbl_pause:
+      Push $R1
+      System::Call '*(i,i,i,i,i,i,i) i.R1'
+      System::Call 'advapi32::ControlService(i r5, i ${SERVICE_CONTROL_PAUSE}, i $R1) i'
+      System::Free $R1
+      Pop $R1
+      StrCmp $6 0 lbl_done lbl_good
+
+    ; continue service
+    lbl_continue:
+      Push $R1
+      System::Call '*(i,i,i,i,i,i,i) i.R1'
+      System::Call 'advapi32::ControlService(i r5, i ${SERVICE_CONTROL_CONTINUE}, i $R1) i'
+      System::Free $R1
+      Pop $R1
+      StrCmp $6 0 lbl_done lbl_good
+
+    ; is installed
+    lbl_installed:
+      !insertmacro CALL_GETPARAM $7 "action" "" "lbl_good"
+        StrCpy $3 $7
+        Goto lbl_select
+
+    ; is service running
+    lbl_running:
+      Push $R1
+      System::Call '*(i,i,i,i,i,i,i) i.R1'
+      System::Call 'advapi32::QueryServiceStatus(i r5, i $R1) i'
+      System::Call '*$R1(i, i.r6)'
+      System::Free $R1
+      Pop $R1
+      IntFmt $6 "0x%X" $6
+      StrCmp $6 ${SERVICE_RUNNING} 0 lbl_done
+      !insertmacro CALL_GETPARAM $7 "action" "" "lbl_good"
+        StrCpy $3 $7
+        Goto lbl_select
+
+    lbl_status:
+      Push $R1
+      System::Call '*(i,i,i,i,i,i,i) i.R1'
+      System::Call 'advapi32::QueryServiceStatus(i r5, i $R1) i'
+      System::Call '*$R1(i, i .r6)'
+      System::Free $R1
+      Pop $R1
+      IntFmt $6 "0x%X" $6
+      StrCpy $0 "running"
+      IntCmp $6 ${SERVICE_RUNNING} lbl_done
+      StrCpy $0 "stopped"
+      IntCmp $6 ${SERVICE_STOPPED} lbl_done
+      StrCpy $0 "start_pending"
+      IntCmp $6 ${SERVICE_START_PENDING} lbl_done
+      StrCpy $0 "stop_pending"
+      IntCmp $6 ${SERVICE_STOP_PENDING} lbl_done
+      StrCpy $0 "running"
+      IntCmp $6 ${SERVICE_RUNNING} lbl_done
+      StrCpy $0 "continue_pending"
+      IntCmp $6 ${SERVICE_CONTINUE_PENDING} lbl_done
+      StrCpy $0 "pause_pending"
+      IntCmp $6 ${SERVICE_PAUSE_PENDING} lbl_done
+      StrCpy $0 "paused"
+      IntCmp $6 ${SERVICE_PAUSED} lbl_done
+      StrCpy $0 "unknown"
+      Goto lbl_done
+
+    lbl_processid:
+      Push $R1
+      Push $R2
+      System::Call '*(i,i,i,i,i,i,i,i,i) i.R1'
+      System::Call '*(i 0) i.R2'
+      System::Call "advapi32::QueryServiceStatusEx(i r5, i ${SC_STATUS_PROCESS_INFO}, i $R1, i 36, i $R2) i"
+      System::Call "*$R1(i,i,i,i,i,i,i, i .r0)"
+      System::Free $R2
+      System::Free $R1
+      Pop $R2
+      Pop $R1
+      Goto lbl_done
+
+    lbl_good:
+    StrCpy $0 "true"
+    lbl_done:
+    IntCmp $5 0 +2
+    System::Call 'advapi32::CloseServiceHandle(i r5) n'
+    IntCmp $4 0 +2
+    System::Call 'advapi32::CloseServiceHandle(i r4) n'
+    Pop $4
+    Pop $3
+    Pop $2
+    Pop $1
+    Exch 3
+    Pop $5
+    Pop $7
+    Pop $6
+    Exch $0
+  !macroend
+
+  Function Service
+    !insertmacro FUNC_SERVICE ""
+  FunctionEnd
+
+  Function GetParam
+    !insertmacro FUNC_GETPARAM
+  FunctionEnd
+
+  !undef APITAG
+!endif

interfaces/Config/templates/_inc_header_uc.tmpl

@@ -4,7 +4,7 @@
     #set global $root = '../../'#
 #end if#
 <!DOCTYPE HTML>
-<html lang="$active_lang">
+<html lang="$active_lang" #if $rtl#dir="rtl"#end if#>
 <head>
     <title>
         SABnzbd $T('menu-config')

interfaces/Config/templates/config.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Config"#-->
-<!--#set global $help_uri="configuration/3.0/configure"#-->
+<!--#set global $help_uri="configuration/3.3/configure"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#from sabnzbd.encoding import CODEPAGE#-->
@@ -9,7 +9,7 @@
             <tbody>
                 <tr>
                     <th scope="row">$T('version'): </th>
-                    <td>$version [$build]</td>
+                    <td>$version [<a href="https://github.com/sabnzbd/sabnzbd/commit/$build" target="_blank">$build</a>]</td>
                 </tr>
                 <tr>
                     <th scope="row">$T('uptime'): </th>
@@ -124,7 +124,7 @@
 
 <div class="colmask">
     <div class="padding alt">
-        <h5 class="copyright">Copyright &copy; 2007-2020 The SABnzbd Team &lt;<a href="mailto:team@sabnzbd.org">team@sabnzbd.org</a>&gt;</h5>
+        <h5 class="copyright">Copyright &copy; 2007-2021 The SABnzbd Team &lt;<a href="mailto:team@sabnzbd.org">team@sabnzbd.org</a>&gt;</h5>
         <p class="copyright"><small>$T('yourRights')</small></p>
     </div>
 

interfaces/Config/templates/config_cat.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Categories"#-->
-<!--#set global $help_uri="configuration/3.0/categories"#-->
+<!--#set global $help_uri="configuration/3.3/categories"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <div class="colmask">
     <div class="section">

interfaces/Config/templates/config_folders.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Folders"#-->
-<!--#set global $help_uri="configuration/3.0/folders"#-->
+<!--#set global $help_uri="configuration/3.3/folders"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -28,7 +28,7 @@
                 </div>
                 <div class="field-pair advanced-settings">
                     <label class="config" for="download_free">$T('opt-download_free')</label>
-                    <input type="text" name="download_free" id="download_free" value="$download_free" class="smaller_input"  />
+                    <input type="text" name="download_free" id="download_free" value="$download_free" class="smaller_input" />
                     <span class="desc">$T('explain-download_free')</span>
                 </div>
                 <div class="field-pair">
@@ -36,6 +36,16 @@
                     <input type="text" name="complete_dir" id="complete_dir" value="$complete_dir" data-initialdir="$my_home" />
                     <span class="desc">$T('explain-complete_dir')</span>
                 </div>
+                <div class="field-pair advanced-settings">
+                    <label class="config" for="complete_free">$T('opt-complete_free')</label>
+                    <input type="text" name="complete_free" id="complete_free" value="$complete_free" class="smaller_input" />
+                    <span class="desc">$T('explain-download_free') <br>$T('explain-complete_free')</span>
+                </div>
+                <div class="field-pair advanced-settings">
+                    <label class="config" for="fulldisk_autoresume">$T('opt-fulldisk_autoresume')</label>
+                    <input type="checkbox" name="fulldisk_autoresume" id="fulldisk_autoresume" value="1" <!--#if int($fulldisk_autoresume) > 0 then 'checked="checked"' else ""#--> />
+                    <span class="desc">$T('explain-fulldisk_autoresume')</span>
+                </div>
                 <!--#if not $nt#-->
                 <div class="field-pair advanced-settings">
                     <label class="config" for="permissions">$T('opt-permissions')</label>

interfaces/Config/templates/config_general.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="General"#-->
-<!--#set global $help_uri="configuration/3.0/general"#-->
+<!--#set global $help_uri="configuration/3.3/general"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -32,6 +32,7 @@
                     <label class="config" for="enable_https">$T('opt-enable_https')</label>
                     <input type="checkbox" name="enable_https" id="enable_https" value="1" <!--#if int($enable_https) > 0 then 'checked="checked" data-original="1"' else ""#-->/>
                     <span class="desc">$T('explain-enable_https')</span>
+                    <span class="desc"><span class="label label-warning">$T('warning').upper()</span> $T('explain-enable_https_warning')</span>
                 </div>
                 <div class="field-pair advanced-settings">
                     <label class="config" for="web_dir">$T('opt-web_dir')</label>
@@ -130,12 +131,7 @@
                                 <option value="5" <!--#if $inet_exposure == 5 then 'selected="selected"' else ""#-->>$T('inet-ui') - $T('inet-external_login')</option>
                             </optgroup>
                         </select>
-                    <span class="desc">$T('explain-inet_exposure').replace('. ','.<br><span class="label label-warning">'+$T('warning').upper()+'</span> ')</span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="local_ranges">$T('opt-local_ranges')</label>
-                    <input type="text" name="local_ranges" id="local_ranges" value="$local_ranges" />
-                    <span class="desc">$T('explain-local_ranges')</span>
+                    <span class="desc">$T('explain-inet_exposure')</span>
                 </div>
                 <div class="field-pair">
                     <label class="config" for="apikey_display">$T('opt-apikey')</label>
@@ -259,17 +255,18 @@
 
     // 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, #local_ranges, #inet_exposure, #${pid}_wu, #${pid}_wp')
+    var safeCheck = \$('#host, #inet_exposure, #${pid}_wu, #${pid}_wp')
     function checkSafety() {
         if(\$('#host').val() != 'localhost' && \$('#host').val() != '127.0.0.1') {
             // No limitation on local-network
-            if(!\$('#local_ranges').val() || \$('#inet_exposure').val() > 3) {
+            if(\$('#inet_exposure').val() > 3) {
                 // And no username and password?
                 if(!\$('#${pid}_wu').val() || !\$('#${pid}_wp').val()) {
                     // Add warning icon if not there already
                     if(!\$('.host-warning').length) {
                         safeCheck.after('<span class="glyphicon glyphicon-alert host-warning"></span>')
                         \$('.host-warning').tooltip({'title': '$T('checkSafety')'})
+                        safeCheck.addClass('host-warning-highlight')
                     }
                     return
                 }

interfaces/Config/templates/config_notify.tmpl

@@ -1,12 +1,12 @@
 <!--#set global $pane="Email"#-->
-<!--#set global $help_uri="configuration/3.0/notifications"#-->
+<!--#set global $help_uri="configuration/3.3/notifications"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#def show_notify_checkboxes($section_label)#-->
-    <!--#for $type in $notify_keys#-->
+    <!--#for $type in $notify_types#-->
         <div class="field-pair">
             <label class="config wide" for="${section_label}_prio_$type">
-                $T($notify_texts[$type]).replace('/', ' / ')  <!--#if $type == 'download'#--> / $T('link-pause') / $T('link-resume')<!--#end if#-->
+                $T($notify_types[$type]).replace('/', ' / ')
             </label>
             <input type="checkbox" name="${section_label}_prio_$type" id="${section_label}_prio_$type" value="1" <!--#if int($getVar($section_label + '_prio_' + $type)) > 0 then 'checked="checked"' else ""#--> />
         </div>
@@ -232,10 +232,10 @@
                     <span class="desc">$T('explain-prowl_apikey')</span>
                 </div>
                 <!--#set $section_label = 'prowl'#-->
-                <!--#for $type in $notify_keys#-->
+                <!--#for $type in $notify_types#-->
                     <div class="field-pair">
                         <label class="config" for="${section_label}_prio_$type">
-                            $T($notify_texts[$type]).replace('/', ' / ') <!--#if $type == 'download'#--> / $T('link-pause') / $T('link-resume')<!--#end if#-->
+                            $T($notify_types[$type]).replace('/', ' / ')
                         </label>
                         <select name="${section_label}_prio_$type" id="${section_label}_prio_$type">
                             <option value="-3" <!--#if $getVar($section_label + '_prio_' + $type) == -3 then 'selected="selected"' else ""#--> >$T('prowl-off')</option>
@@ -298,10 +298,10 @@
                     <span class="desc">$T('explain-pushover_emergency_expire')</span>
                 </div>
                 <!--#set $section_label = 'pushover'#-->
-                <!--#for $type in $notify_keys#-->
+                <!--#for $type in $notify_types#-->
                     <div class="field-pair">
                         <label class="config" for="${section_label}_prio_$type">
-                            $T($notify_texts[$type]).replace('/', ' / ') <!--#if $type == 'download'#--> / $T('link-pause') / $T('link-resume')<!--#end if#-->
+                            $T($notify_types[$type]).replace('/', ' / ')
                         </label>
                         <select name="${section_label}_prio_$type" id="${section_label}_prio_$type">
                             <option value="-3" <!--#if $getVar($section_label + '_prio_' + $type) == -3 then 'selected="selected"' else ""#--> >$T('pushover-off')</option>

interfaces/Config/templates/config_rss.tmpl

@@ -1,6 +1,7 @@
 <!--#set global $pane="RSS"#-->
-<!--#set global $help_uri="configuration/3.0/rss"#-->
+<!--#set global $help_uri="configuration/3.3/rss"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
+<!--#import html#-->
 <div class="colmask">
     <!--#if not $active_feed#-->
     <div class="section">
@@ -9,21 +10,21 @@
             <p>$T('explain-RSS')</p>
             <form action="add_rss_feed" method="post" autocomplete="off">
                 <input type="hidden" name="apikey" value="$apikey" />
-                <table class="catTable">
+                <table class="catTable addRssTable">
                     <tr>
                         <th>&nbsp;</th>
                         <th>$T('name')</th>
-                        <th>$T('feed') URL</th>
+                        <th>$T('feed') URLs</th>
                         <th>&nbsp;</th>
                     </tr>
                     <tr class="even">
                         <td>
                             <input type="checkbox" name="enable" value="1" checked />
                         </td>
-                        <td>
-                            <input type="text" name="feed" class="smaller_input" value="$feed" />
+                        <td class="new-feed-title">
+                            <input type="text" name="feed" value="$feed" />
                         </td>
-                        <td>
+                        <td class="new-feed-url">
                             <input type="text" name="uri" placeholder="$T('addMultipleFeeds')" />
                         </td>
                         <td class="nowrap">
@@ -45,9 +46,10 @@
                         <!--#set $odd = False#-->
                         <!--#for $feed_item in $feeds#-->
                             <!--#set $odd = not $odd#-->
+                            <!--#set $feed_item_html = html.escape($feed_item)#-->
                             <tr class="data-row <!--#if $odd then " alt " else " "#-->">
                                 <td class="chk">
-                                    <input type="checkbox" class="toggleFeedCheckbox" name="enable" value="1" <!--#if int($rss[$feed_item]['enable']) !=0 then 'checked="checked"' else ""#--> rel="$feed_item" />
+                                    <input type="checkbox" class="toggleFeedCheckbox" name="enable" value="1" <!--#if int($rss[$feed_item]['enable']) !=0 then 'checked="checked"' else ""#--> rel="$feed_item_html" />
                                 </td>
                                 <td class="title">
                                     <a href="?feed=$rss[$feed_item]['link']" class="subscription-title path feed <!--#if int($rss[$feed_item]['enable']) != 0 then 'feed_enabled' else 'feed_disabled'#-->">
@@ -55,10 +57,10 @@
                                     </a>
                                 </td>
                                 <td class="controls">
-                                    <button type="button" class="btn btn-default testFeed" rel="$feed_item"><span class="glyphicon glyphicon-sort"></span> $T('button-preFeed')</button>
+                                    <button type="button" class="btn btn-default testFeed" rel="$feed_item_html"><span class="glyphicon glyphicon-sort"></span> $T('button-preFeed')</button>
                                     <input type="hidden" name="uri" value="$rss[$feed_item]['uris']" />
-                                    <button type="button" class="btn btn-default editFeed" rel="$feed_item"><span class="glyphicon glyphicon-pencil"></span> $T('Edit')</button>
-                                    <button type="button" class="btn btn-default delFeed" rel="$feed_item"><span class="glyphicon glyphicon-trash"></span></button>
+                                    <button type="button" class="btn btn-default editFeed" rel="$feed_item_html"><span class="glyphicon glyphicon-pencil"></span> $T('rss-edit')</button>
+                                    <button type="button" class="btn btn-default delFeed" rel="$feed_item_html"><span class="glyphicon glyphicon-trash"></span></button>
                                 </td>
                             </tr>
                             <!--#for $uri_index, $uri in enumerate($rss[$feed_item]['uri'])#-->
@@ -90,7 +92,7 @@
                         <label class="config narrow" for="rss_rate">$T('opt-rss_rate')</label>
                         <input type="number" name="rss_rate" id="rss_rate" value="$rss_rate" min="15" max="1440" />
                         <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> $T('button-save')</button>
-                        <span class="config narrow">&nbsp;&nbsp;$T('Next scan at:')&nbsp;$rss_next</span>
+                        <span class="config narrow">&nbsp;&nbsp;$T('rss-nextscan'): $rss_next</span>
                         <span class="desc narrow">$T('explain-rss_rate')</span>
                     </div>
                 </fieldset>
@@ -106,12 +108,12 @@
             <a class="main-helplink" href="$helpuri$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;
-                <a href="$rss[$active_feed]['uri']" onclick="window.open(this.href); return false;">$active_feed</a>
+                $active_feed
             </h2>
             <!--#if $error#-->
             <div class="alert alert-danger">
                 <span class="glyphicon glyphicon-exclamation-sign"></span>
-                $error
+                <!--#echo html.escape($error)#-->
             </div>
             <!--#end if#-->
             <form action="upd_rss_feed" method="post">
@@ -508,9 +510,37 @@
         </div>
         <!--#end if#-->
     </div>
-
 </div>
 <!-- /colmask -->
+
+<form method="post" action="save_rss_feed" class="modal fade" id="rss_edit_modal">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                <h4 class="modal-title">$T('Edit') <span id="feed_edit_name_label"></span></h4>
+            </div>
+            <div class="modal-body">
+                <div class="form-group">
+                    <label for="feed_edit_new_name">$T('name')</label>
+                    <input type="text" class="form-control" name="feed_new_name" id="feed_edit_new_name" placeholder="$T('name')" size="">
+                </div>
+                <div class="form-group">
+                    <label for="feed_edit_url">$T('feed') URLs</label>
+                    <input type="text" class="form-control" name="uri" id="feed_edit_url" placeholder="$T('feed') URLs" size="">
+                    <span class="help-block">$T('addMultipleFeeds')</span>
+                </div>
+                <input type="hidden" name="feed" id="feed_edit_old_name" />
+                <input type="hidden" name="apikey" value="$apikey" />
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-danger" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span> $T('cancel')</button>
+                <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> $T('rss-accept')</button>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</form><!-- /.modal -->
+
 <script type="text/javascript" src="${root}staticcfg/js/jquery.tablesort.min.js"></script>
 <script type="text/javascript">
 function urlencode(str) {
@@ -537,20 +567,16 @@ function urlencode(str) {
 
     \$('.editFeed').click(function(){
         var oldURI = \$(this).prev().val();
-        var newURI = prompt("$T('feed') URL. \n$T('addMultipleFeeds').", oldURI );
-        if(newURI != "" && newURI !== null) {
-            var whichFeed = \$(this).attr("rel");
-            var isEnabled = \$('.toggleFeedCheckbox[rel="'+whichFeed+'"]').attr('checked') == "checked"? 1 : 0;
-            \$.ajax({
-              type: "POST",
-              url: "save_rss_feed",
-              data: {feed: whichFeed, uri: newURI, enable: isEnabled, apikey: "$apikey" }
-            }).done(function( msg ) {
-              location.reload();
-            });
-        } else {
-            return false;
-        }
+        var whichFeed = \$(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)
+
+        // Show the modal
+        \$('#rss_edit_modal').modal('show');
     });
 
     \$('.delFeed').click(function(e){

interfaces/Config/templates/config_scheduling.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Scheduling"#-->
-<!--#set global $help_uri="configuration/3.0/scheduling"#-->
+<!--#set global $help_uri="configuration/3.3/scheduling"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <%
@@ -50,7 +50,7 @@ else:
                     <select name="action" id="action">
                         <optgroup label="$T('sch-action')">
                             <!--#for $action in $actions#-->
-                                <option value="$action" data-action="" data-noarg="<!--#if $action is 'speedlimit' then 0 else 1#-->">$actions_lng[$action]</option>
+                                <option value="$action" data-action="" data-noarg="<!--#if $action == 'speedlimit' then 0 else 1#-->">$actions_lng[$action]</option>
                             <!--#end for#-->
                         </optgroup>
                         <optgroup label="$T('cmenu-servers')">

interfaces/Config/templates/config_server.tmpl

@@ -1,49 +1,15 @@
 <!--#set global $pane="Servers"#-->
-<!--#set global $help_uri="configuration/3.0/servers"#-->
+<!--#set global $help_uri="configuration/3.3/servers"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
-<!--
-    We need to find how many months we have recorded so far, so we
-    loop over all the dates to find the lowest value and then use
-    this to calculate the date-selector and maximum value per month.
--->
 <!--#import json#-->
 <!--#import datetime#-->
-<!--#import sabnzbd.misc#-->
 
-<!--#set month_names = [$T('January'), $T('February'), $T('March'), $T('April'), $T('May'), $T('June'), $T('July'), $T('August'), $T('September'), $T('October'), $T('November'), $T('December')] #-->
-<!--#set min_date = datetime.date.today()#-->
-<!--#set max_data_all = {}#-->
-
-<!--#for $server in $servers #-->
-    <!--#if 'amounts' in $server#-->
-        <!--#set max_data_server = {}#-->
-        <!--#for date in $server['amounts'][4]#-->
-            <!--#set split_date = $date.split('-')#-->
-            <!--#set min_date = min(min_date, datetime.date(int(split_date[0]), int(split_date[1]), 1))#-->
-
-            <!--#set month_date = $date[:7]#-->
-            <!--#if $month_date not in $max_data_server#-->
-                <!--#set max_data_server[$month_date] = 0#-->
-             <!--#end if#-->
-             <!--#set max_data_server[$month_date] = max(max_data_server[$month_date], $server['amounts'][4][$date])#-->
-        <!--#end for#-->
-
-        <!--#for month_date in max_data_server#-->
-            <!--#if $month_date not in $max_data_all#-->
-                <!--#set max_data_all[$month_date] = 0#-->
-             <!--#end if#-->
-             <!--#set max_data_all[$month_date] = max(max_data_all[$month_date], max_data_server[$month_date])#-->
-        <!--#end for#-->
-    <!--#end if#-->
-<!--#end for#-->
-
-<!--#set months_recorded = list(sabnzbd.misc.monthrange(min_date, datetime.date.today()))#-->
-<!--#$months_recorded.reverse()#-->
-
-<script type="text/javascript">
-    // Define variable needed for the server-plots
-    var serverData = {}
+<script type="text/javascript" xmlns="http://www.w3.org/1999/html">
+    // Define variable needed for the server-statistics
+    var serverBandwithData = {}
+    var serverArticleTries = {}
+    var serverArticleFailed = {}
 </script>
 
 <div class="colmask">
@@ -53,21 +19,13 @@
             <input type="checkbox" id="advanced-settings-button" name="advanced-settings-button"> $T('button-advanced')
         </label>
 
-        <!--#if $months_recorded#-->
         <div class="advanced-buttonSeperator"></div>
-        <div class="chart-selector-container" title="$T('srv-bandwidth')">
+        <div class="chart-selector-container" title="$T('selectedDates')">
             <span class="glyphicon glyphicon-signal"></span>
-            <select name="chart-selector" id="chart-selector">
-                <!--#for $cur_date in months_recorded#-->
-                    <!--#set month_date = '%d-%02d' % ($cur_date.year, $cur_date.month)#-->
-                    <!--#if $month_date not in $max_data_all#-->
-                        <!--#set max_data_all[$month_date] = 0#-->
-                     <!--#end if#-->
-                    <option value="$month_date" data-max="$max_data_all[$month_date]">$month_names[$cur_date.month-1] $cur_date.year</option>
-                <!--#end for#-->
-            </select>
+            <!--#set today = datetime.date.today()#-->
+            <input type="date" name="chart-start" id="chart-start" value="<!--#echo (today-datetime.timedelta(days=30)).strftime('%Y-%m-%d')#-->"> -
+            <input type="date" name="chart-end" id="chart-end" value="<!--#echo today.strftime('%Y-%m-%d')#-->">
         </div>
-        <!--#end if#-->
     </div>
     <div class="section" id="addServerContent" style="display: none;">
         <div class="col2">
@@ -82,6 +40,10 @@
                         <input type="checkbox" name="enable" id="enable" value="1" checked="checked" />
                         <span class="desc">$T('srv-enable')</span>
                     </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="displayname">$T('srv-displayname')</label>
+                        <input type="text" name="displayname" id="displayname" />
+                    </div>
                     <div class="field-pair">
                         <label class="config" for="host">$T('srv-host')</label>
                         <input type="text" name="host" id="host" required />
@@ -106,7 +68,7 @@
                     </div>
                     <div class="field-pair">
                         <label class="config" for="connections">$T('srv-connections')</label>
-                        <input type="number" name="connections" id="connections" min="1" max="100" value="8" required />
+                        <input type="number" name="connections" id="connections" min="1" max="1000" value="8" required />
                     </div>
                     <div class="field-pair">
                         <label class="config" for="priority">$T('srv-priority')</label>
@@ -146,8 +108,14 @@
                         <span class="desc">$T('explain-optional')</span>
                     </div>
                     <div class="field-pair advanced-settings">
-                        <label class="config" for="displayname">$T('srv-displayname')</label>
-                        <input type="text" name="displayname" id="displayname" />
+                        <label class="config" for="expire_date">$T('srv-expire_date')</label>
+                        <input type="date" name="expire_date" id="expire_date" />
+                        <span class="desc">$T('srv-explain-expire_date')</span>
+                    </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="quota">$T('swtag-quota')</label>
+                        <input type="text" name="quota" id="quota" class="smaller_input" />
+                        <span class="desc">$T('srv-explain-quota')</span>
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="notes">$T('srv-notes')</label>
@@ -176,7 +144,7 @@
 
             <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>$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="$helpuri$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 #-->
@@ -197,6 +165,10 @@
                 <div class="col1" style="display:none;">
                     <input type="hidden" name="enable" id="enable$cur" value="$int($server['enable'])" />
                     <fieldset>
+                        <div class="field-pair advanced-settings">
+                            <label class="config" for="displayname$cur">$T('srv-displayname')</label>
+                            <input type="text" name="displayname" id="displayname$cur" value="$server['displayname']" />
+                        </div>
                         <div class="field-pair">
                             <label class="config" for="host$cur">$T('srv-host')</label>
                             <input type="text" name="host" id="host$cur" value="$server['host']" required />
@@ -221,7 +193,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="100" required />
+                            <input type="number" name="connections" id="connections$cur" value="$server['connections']" min="1" max="1000" required />
                         </div>
                         <div class="field-pair">
                             <label class="config" for="priority$cur">$T('srv-priority')</label>
@@ -262,8 +234,14 @@
                             <span class="desc">$T('srv-explain-send_group')</span>
                         </div>
                         <div class="field-pair advanced-settings">
-                            <label class="config" for="displayname$cur">$T('srv-displayname')</label>
-                            <input type="text" name="displayname" id="displayname$cur" value="$server['displayname']" />
+                            <label class="config" for="expire_date$cur">$T('srv-expire_date')</label>
+                            <input type="date" name="expire_date" id="expire_date$cur"  value="$server['expire_date']" />
+                            <span class="desc">$T('srv-explain-expire_date')</span>
+                        </div>
+                        <div class="field-pair advanced-settings">
+                            <label class="config" for="quota$cur">$T('swtag-quota')</label>
+                            <input type="text" name="quota" id="quota$cur" value="$server['quota']" class="smaller_input" />
+                            <span class="desc">$T('srv-explain-quota')</span>
                         </div>
                         <div class="field-pair advanced-settings">
                             <label class="config" for="notes$cur">$T('srv-notes')</label>
@@ -282,19 +260,34 @@
                 <div class="col1" style="display:block;">
                     <!--#if 'amounts' in $server#-->
                         <div class="server-amounts-text">
-                            <b>$T('srv-bandwidth'):</b><br/>
-                            $T('total'): $(server['amounts'][0])B<br/>
-                            $T('today'): $(server['amounts'][3])B<br/>
-                            $T('thisWeek'): $(server['amounts'][2])B<br/>
-                            $T('thisMonth'): $(server['amounts'][1])B<br/>
-                            <span id="server-data-label-${cur}"></span>: <span id="server-data-value-${cur}"></span>
+                            <p>
+                                <b>$T('srv-bandwidth'):</b><br/>
+                                $T('total'): $(server['amounts'][0])B<br/>
+                                $T('today'): $(server['amounts'][3])B<br/>
+                                $T('thisWeek'): $(server['amounts'][2])B<br/>
+                                $T('thisMonth'): $(server['amounts'][1])B<br/>
+                                $T('selectedDates'): <span id="server-bandwith-value-${cur}"></span>
+                            </p>
+
+                            <p title="$T('readwiki')">
+                                <b>$T('srv-article-availability'):</b><br/>
+                                $T('selectedDates'): <span id="server-article-value-${cur}"></span>
+                            </p>
+                            <!--#if $server['expire_date']#-->
+                            <p><b>$T('srv-expire_date'):</b> $(server['expire_date'])</p>
+                            <!--#end if#-->
+                            <!--#if $server['quota']#-->
+                            <p><b>$T('quota-left'):</b> $(server['quota_left'])B</p>
+                            <!--#end if#-->
                         </div>
-                        <div class="server-chart" data-serverid="${cur}"s>
+                        <div class="server-chart" data-serverid="${cur}">
                             <div id="server-chart-${cur}" class="ct-chart"></div>
                         </div>
                         <script type="text/javascript">
                             // Server data
-                            serverData[${cur}] = <!--#echo json.dumps($server['amounts'][4])#-->
+                            serverBandwithData[${cur}] = <!--#echo json.dumps($server['amounts'][4])#-->
+                            serverArticleTries[${cur}] = <!--#echo json.dumps($server['amounts'][5])#-->
+                            serverArticleFailed[${cur}] = <!--#echo json.dumps($server['amounts'][6])#-->
                         </script>
                     <!--#end if#-->
                 </div>
@@ -331,58 +324,91 @@
     }
 
     function showCharts() {
-        // This month
-        var theMonth = \$('#chart-selector').val()
-        var thisDay = new Date()
+        // Get the constants
+        const startDate = new Date(\$('#chart-start').val())
+        const endDate = new Date(\$('#chart-end').val())
+        const oneDay = 24 * 60 * 60 * 1000
+        const nrDays = Math.round((endDate-startDate)/oneDay)
 
-        // What month are we doing?
-        var inputDate = new Date(theMonth+'-01')
-        var baseDate = new Date(inputDate.getUTCFullYear(), inputDate.getUTCMonth(), 1)
-        var maxDaysInMonth = new Date(baseDate.getFullYear(), baseDate.getMonth()+1, 0).getDate()
+        // Show only maximum 10 labels to avoid cluttering
+        const labelStep = Math.round(nrDays/10)
 
-        // Set the new maximum
-        chartOptions.axisY.high = \$('#chart-selector :selected').data('max');
-        chartOptions.axisY.low = 0
+        // Save largest value
+        var maxBandwith = 0
 
         // For each chart
-        \$('.server-chart').each(function(i, elemn) {
-            var server_id = \$(elemn).data('serverid')
+        \$('.server-chart').each(function(j, elemn) {
+            const server_id = \$(elemn).data('serverid')
+            var totalBandwithThisRange = 0
+            var totalArticlesTriedThisRange = 0
+            var totalArticlesFailedThisRange = 0
 
             // Fill the data array
             var data = {
                 labels: [],
                 series: [[]]
             };
-            var totalThisMonth = 0
-            for(var i = 1; i < maxDaysInMonth+1; i++) {
+
+            for(var i = 0; i < nrDays+1; i++) {
+                // Update the date
+                const checkDate = new Date(startDate)
+                checkDate.setDate(checkDate.getDate() + i);
+
                 // Add X-label
-                if(i % 3 == 1) {
-                    data['labels'].push(i)
+                if(i % labelStep === 0) {
+                    data['labels'].push(checkDate.getDate())
                 } else {
                     data['labels'].push(NaN)
                 }
 
-                // Get formatted date
-                baseDate.setDate(i)
-                var dateCheck = toFormattedDate(baseDate)
+                // Date we can check in the array
+                const dateCheck = toFormattedDate(checkDate)
 
                 // Add data if we have it
-                if(dateCheck in serverData[server_id]) {
-                    data['series'][0].push(serverData[server_id][dateCheck])
-                    totalThisMonth += serverData[server_id][dateCheck]
-                } else if(thisDay.getYear() == baseDate.getYear() && thisDay.getMonth() == baseDate.getMonth() && thisDay.getDate() < i) {
-                    data['series'][0].push(NaN)
+                if(dateCheck in serverBandwithData[server_id]) {
+                    data['series'][0].push(serverBandwithData[server_id][dateCheck])
+                    totalBandwithThisRange += serverBandwithData[server_id][dateCheck]
+                    maxBandwith = Math.max(maxBandwith, serverBandwithData[server_id][dateCheck])
                 } else {
                     data['series'][0].push(0)
                 }
+
+                // Article stats
+                if(dateCheck in serverArticleTries[server_id]) {
+                    totalArticlesTriedThisRange += serverArticleTries[server_id][dateCheck]
+                    totalArticlesFailedThisRange += serverArticleFailed[server_id][dateCheck]
+                }
             }
 
             // Update the text value
-            \$('#server-data-label-' + server_id).text(\$('#chart-selector :selected').text())
-            \$('#server-data-value-' + server_id).text(filesize(totalThisMonth, {round: 1}))
+            \$('#server-bandwith-value-' + server_id).text(filesize(totalBandwithThisRange, {round: 1}))
+
+            // Calculate article success ratio, if available
+            var articleRatio = Math.round(100 * (1 - totalArticlesFailedThisRange/totalArticlesTriedThisRange))
+
+            // 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})))
+            } else {
+                \$('#server-article-value-' + server_id).text('$T("notAvailable")')
+            }
+
+            // 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)
+        })
+
+        // Set the maximum
+        chartOptions.axisY.high = maxBandwith
+        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')
 
             // Show the chart
-            chart = new Chartist.Line('#server-chart-'+server_id, data, chartOptions);
+            chart = new Chartist.Line('#server-chart-'+server_id, \$(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', {
@@ -391,7 +417,7 @@
                     width: context.chartRect.width(),
                     height: context.chartRect.height()+2,
                     fill: 'none',
-                    stroke: '#B9B9B9',
+                    stroke: '#b9b9b9',
                     'stroke-width': '1px'
                 }, '', context.svg, true)
                 \$('#server-chart-'+server_id+' .ct-label.ct-vertical').each(function(index, elmn) {
@@ -399,6 +425,10 @@
                 })
             });
         })
+
+        // Limit input to sensible values
+        \$('#chart-start').attr("max", \$('#chart-end').val())
+        \$('#chart-end').attr("min", \$('#chart-start').val())
     }
 
     // Need to mitigate timezone effects!
@@ -425,7 +455,7 @@
         /**
             Update charts when changed
         **/
-        \$('#chart-selector').on('change', function(elemn) {
+        \$('#chart-start, #chart-end').on('change', function(elemn) {
             showCharts()
 
             // Lets us leave (needs to be called after the change event)

interfaces/Config/templates/config_sorting.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Sorting"#-->
-<!--#set global $help_uri="configuration/3.0/sorting"#-->
+<!--#set global $help_uri="configuration/3.3/sorting"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -130,6 +130,11 @@
                                     <td>%e_n</td>
                                     <td>$T('ep-us-name')</td>
                                 </tr>
+                                <tr>
+                                    <td class="align-right"><b>$T('Resolution'):</b></td>
+                                    <td>%r</td>
+                                    <td>1080p</td>
+                                </tr>
                                 <tr>
                                     <td class="align-right"><b>$T('fileExt'):</b></td>
                                     <td>%ext</td>
@@ -245,6 +250,11 @@
                                     <td>%y</td>
                                     <td>2009</td>
                                 </tr>
+                                <tr>
+                                    <td class="align-right"><b>$T('Resolution'):</b></td>
+                                    <td>%r</td>
+                                    <td>1080p</td>
+                                </tr>
                                 <tr>
                                     <td class="align-right"><b>$T('extension'):</b></td>
                                     <td>%ext</td>
@@ -407,6 +417,11 @@
                                     <td>%0decade</td>
                                     <td>2000</td>
                                 </tr>
+                                <tr>
+                                    <td class="align-right"><b>$T('Resolution'):</b></td>
+                                    <td>%r</td>
+                                    <td>1080p</td>
+                                </tr>
                                 <tr>
                                     <td class="align-right"><b>$T('orgFilename'):</b></td>
                                     <td>%fn</td>

interfaces/Config/templates/config_special.tmpl

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

interfaces/Config/templates/config_switches.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Switches"#-->
-<!--#set global $help_uri="configuration/3.0/switches"#-->
+<!--#set global $help_uri="configuration/3.3/switches"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -120,6 +120,10 @@
                     </div>
                     <div class="field-pair">
                         <label class="config" for="unwanted_extensions">$T('opt-unwanted_extensions')</label>
+                        <select name="unwanted_extensions_mode" id="unwanted_extensions_mode">
+                            <option value="0" <!--#if int($unwanted_extensions_mode) == 0 then 'selected="selected"' else ""#--> >$T('unwanted_extensions_blacklist')</option>
+                            <option value="1" <!--#if int($unwanted_extensions_mode) == 1 then 'selected="selected"' else ""#--> >$T('unwanted_extensions_whitelist')</option>
+                        </select>
                         <input type="text" name="unwanted_extensions" id="unwanted_extensions" value="$unwanted_extensions"/>
                         <span class="desc">$T('explain-unwanted_extensions')</span>
                     </div>
@@ -136,8 +140,8 @@
                         <label class="config" for="auto_sort">$T('opt-auto_sort')</label>
                         <select name="auto_sort" id="auto_sort">
                             <option value="">$T('default')</option>
-                            <option value="avg_age asc" <!--#if $auto_sort == "avg_age asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortAgeAsc')</option>
-                            <option value="avg_age desc" <!--#if $auto_sort == "avg_age desc" then 'selected="selected"' else ""#--> >$T('Glitter-sortAgeDesc')</option>
+                            <option value="avg_age desc" <!--#if $auto_sort == "avg_age desc" then 'selected="selected"' else ""#--> >$T('Glitter-sortAgeAsc')</option>
+                            <option value="avg_age asc" <!--#if $auto_sort == "avg_age asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortAgeDesc')</option>
                             <option value="name asc" <!--#if $auto_sort == "name asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortNameAsc')</option>
                             <option value="name desc" <!--#if $auto_sort == "name desc" then 'selected="selected"' else ""#--> >$T('Glitter-sortNameDesc')</option>
                             <option value="size asc" <!--#if $auto_sort == "size asc" then 'selected="selected"' else ""#--> >$T('Glitter-sortSizeAsc')</option>
@@ -237,6 +241,11 @@
                         <input type="checkbox" name="ignore_samples" id="ignore_samples" value="1" <!--#if int($ignore_samples) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-ignore_samples') $T('igsam-del').</span>
                     </div>
+                    <div class="field-pair">
+                        <label class="config" for="deobfuscate_final_filenames">$T('opt-deobfuscate_final_filenames')</label>
+                        <input type="checkbox" name="deobfuscate_final_filenames" id="deobfuscate_final_filenames" value="1" <!--#if int($deobfuscate_final_filenames) > 0 then 'checked="checked"' else ""#--> />
+                        <span class="desc">$T('explain-deobfuscate_final_filenames')</span>
+                    </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="enable_meta">$T('opt-enable_meta')</label>
                         <input type="checkbox" name="enable_meta" id="enable_meta" value="1" <!--#if int($enable_meta) > 0 then 'checked="checked"' else ""#--> />

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

@@ -550,26 +550,31 @@ tr.separator {
     padding-right: 13px;
 }
 /* --  */
+.RSS .addRssTable,
+.RSS .addRssTable input[type="text"] {
+    width: 100%;
+}
+.RSS .addRssTable .new-feed-title {
+    max-width: 250px;
+}
+.RSS .addRssTable .new-feed-url {
+    width: 70%;
+}
 h2.activeRSS {
     margin-bottom: 10px;
 }
-.activeRSS a, .activeRSS a:visited {
-    text-decoration: none;
+.activeRSS a,
+.activeRSS a:visited {
     color: #000;
-}
-.activeRSS a:hover {
-    color: #4b4742;
-}
-.activeRSS a:first-of-type {
-    text-decoration: underline!important;
+    text-decoration: underline !important;
 }
 .favicon {
-    background-position: center center!important;
-    background-size: 16px 16px;
+    background-position: center center !important;
+    background-size: 22px 22px;
     opacity: 1;
     top: -1px;
-    height: 16px;
-    width: 16px;
+    height: 22px;
+    width: 22px;
     float: left;
     margin: 0 6px 0 2px;
     text-align: center;
@@ -589,6 +594,7 @@ h2.activeRSS {
 }
 #subscriptions {
     border: 1px solid #E5E5E5;
+    width: 100%;
 }
 .data-row {
     border-top: 1px solid #E5E5E5;
@@ -600,6 +606,7 @@ h2.activeRSS {
 #subscriptions .chk {
     padding: 8px 5px 5px;
     vertical-align: middle;
+    width: 40px;
 }
 #subscriptions .title {
     font-weight: bold;
@@ -607,10 +614,11 @@ h2.activeRSS {
     width: auto;
 }
 #subscriptions .favicon {
-    margin-left: 8px;
+    margin-left: 7px;
+    margin-top: -2px;
 }
-.ie6 .subscription-title {
-    width: 20em;
+#subscriptions .glyphicon {
+    margin-top: 3px;
 }
 .subscription-title,
 .subscription-title:hover {
@@ -795,6 +803,7 @@ input[type="submit"]:hover {
 input[type="text"],
 input[type="email"],
 input[type="url"],
+input[type="date"],
 input[type="number"],
 input[type="password"],
 textarea,
@@ -1094,6 +1103,10 @@ input[type="checkbox"] {
     font-size: 1.2em;
 }
 
+.host-warning-highlight {
+    border-color: #F0AD4E !important;
+}
+
 .fileBrowser .glyphicon {
     margin-right: 2px;
     top: 1px;
@@ -1172,6 +1185,31 @@ input[type="checkbox"] {
     100% { transform: rotate(359deg); }
 }
 
+/***
+    RTL Fixes
+***/
+html[dir="rtl"] .col1 input[type='checkbox'],
+html[dir="rtl"] .col2 h3 a {
+    left: 5px;
+}
+
+html[dir="rtl"] .modal-header .close {
+    float: left;
+}
+
+html[dir="rtl"] .field-pair {
+    position: relative;
+}
+
+html[dir="rtl"] .Sorting .presets.float-left,
+html[dir="rtl"] .checkbox-days {
+    float: none;
+}
+
+html[dir="rtl"] .Scheduling form[action="addSchedule"] input[type="checkbox"] {
+    right: 5px;
+}
+
 @media screen and (min-width: 1200px) {
     .Categories input[name="dir"] {
         max-width: 240px !important;

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

@@ -264,13 +264,13 @@ function do_restart() {
     $.ajax({ url: '../../config/restart?apikey=' + sabSession,
         complete: function() {
             // Keep counter of failures
-            var failureCounter = 0;
+            var loopCounter = 0;
 
             // Now we try until we can connect
-            var refreshInterval = setInterval(function() {
-                // We skip the first one
-                if(failureCounter == 0) {
-                    failureCounter = failureCounter+1;
+            setInterval(function() {
+                loopCounter = loopCounter+1;
+                // We skip the first one so we give it time to shutdown
+                if(loopCounter < 2) {
                     return
                 }
                 $.ajax({ url: urlTotal,
@@ -279,17 +279,16 @@ function do_restart() {
                         location.href = urlTotal;
                     },
                     error: function(status, text) {
-                        failureCounter = failureCounter+1;
-                        // Too many failuers and we give up
-                        if(failureCounter >= 6) {
+                        // Too many failures and we give up
+                        if(loopCounter >= 10) {
                             // If the port has changed 'Access-Control-Allow-Origin' header will not allow
-                            // us to check if the server is back up. So after 7 failures we redirect
+                            // us to check if the server is back up. So after 10 failures (20 sec) we redirect
                             // anyway in the hopes it works anyway..
                             location.href = urlTotal;
                         }
                     }
                 })
-            }, 4000)
+            }, 2000)
 
             // Exception if we go from HTTPS to HTTP
             // (this is not allowed by browsers and all of the above will be ignored)

interfaces/Glitter/templates/include_history.tmpl

@@ -5,8 +5,10 @@
             <tr>
                 <th style="width: 25px;"></th>
                 <th></th>
-                <th class="table-status-header" data-bind="css: { 'table-header-status-smaller' : extraHistoryColumn }"></th>
-                <th class="table-header-extra" data-bind="css: { 'table-extra-header-visible' : extraHistoryColumn }"></th>
+                <th class="table-status-header" data-bind="css: { 'table-header-status-smaller' : extraHistoryColumns().length }"></th>
+                <!-- ko foreach: extraHistoryColumns -->
+                <th class="table-header-extra"></th>
+                <!-- /ko -->
                 <th style="width: 130px;"></th>
                 <th style="width: 60px;"></th>
             </tr>
@@ -137,10 +139,11 @@
                     <!-- /ko -->
                 </td>
                 <td class="status row-wrap-text" data-bind="text: statusText()" onclick="showDetails(this)"></td>
+                <!-- ko foreach: parent.parent.extraHistoryColumns -->
                 <td class="row-extra-text" onclick="showDetails(this)">
-                    <div class="row-wrap-text" data-bind="text: extraText">
-                    </div>
+                    <div class="row-wrap-text" data-bind="text: \$parent.showColumn(\$data)"></div>
                 </td>
+                <!-- /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">
@@ -221,4 +224,10 @@
         <span data-bind="text: history.downloadedMonth"></span>B $T('Glitter-thisMonth')
         <span data-bind="text: history.downloadedTotal"></span>B $T('Glitter-total')
     </div>
+</div>
+<div class="info-container history-info" data-bind="visible: !hasHistory() && !displayTabbed()" style="display: none">
+    <span class="glyphicon glyphicon-save"></span>
+    <span data-bind="text: history.downloadedToday"></span>B $T('Glitter-today')
+    <span data-bind="text: history.downloadedMonth"></span>B $T('Glitter-thisMonth')
+    <span data-bind="text: history.downloadedTotal"></span>B $T('Glitter-total')
 </div>

interfaces/Glitter/templates/include_messages.tmpl

@@ -26,13 +26,15 @@
             <!-- /ko -->
             <!-- ko foreach: allMessages -->
                 <tr>
-                    <td class="table-messages-label">
+                    <td class="table-messages-label" data-bind="attr: { 'colspan': 1 + !\$data.hasOwnProperty('clear') }">
                         <span class="label" data-bind="css: 'label-' + css, text: type"></span>
                         <span class="queue-message-text" data-bind="html: text"></span>
                     </td>
+                    <!-- ko if: \$data.hasOwnProperty("clear") -->
                     <td class="table-messages-remove">
-                        <!-- ko if: \$data.hasOwnProperty("clear") --><a href="#" data-bind="click: clear"  class="hover-button"><span class="glyphicon glyphicon-remove"></span></a><!-- /ko -->
+                        <a href="#" data-bind="click: clear"  class="hover-button"><span class="glyphicon glyphicon-remove"></span></a>
                     </td>
+                    <!-- /ko -->
                 </tr>
             <!-- /ko -->
             <!-- ko if: !hasMessages() && displayTabbed() -->

interfaces/Glitter/templates/include_overlays.tmpl

@@ -86,34 +86,34 @@
                 <div class="tab-content">
                     <div class="tab-pane fade in active" id="options-status">
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-localIP4')</div>
+                            <div class="col-sm-6">$T('dashboard-localIP4') &nbsp; </div>
                             <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: !statusInfo.localipv4() ? '$T('dashboard-connectionError')' : statusInfo.localipv4(), css: { 'options-bad-status' : !statusInfo.localipv4() }"></div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-publicIP4')</div>
+                            <div class="col-sm-6">$T('dashboard-publicIP4') &nbsp; </div>
                             <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: !statusInfo.publicipv4() ? '$T('dashboard-connectionError')' : statusInfo.publicipv4(), css: { 'options-bad-status ' : !statusInfo.publicipv4() }"></div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-IP6')</div>
+                            <div class="col-sm-6">$T('dashboard-IP6') &nbsp; </div>
                             <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: statusInfo.ipv6"></div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-NameserverDNS')</div>
+                            <div class="col-sm-6">$T('dashboard-NameserverDNS') &nbsp; </div>
                             <div class="col-sm-6" data-bind="visible: hasStatusInfo, text: !statusInfo.dnslookup() ? '$T('dashboard-connectionError')' : statusInfo.dnslookup(), css: { 'options-bad-status' : (statusInfo.dnslookup() != 'OK') }"></div>
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <hr/>
                         <div class="row">
-                            <div class="col-sm-6">$T('cache')</div>
+                            <div class="col-sm-6">$T('cache') &nbsp; </div>
                             <div class="col-sm-6">
                                 <span data-bind="text: cacheSize"></span> (<span data-bind="text: cacheArticles"></span> $T('Glitter-articles'))
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-systemPerformance')</div>
+                            <div class="col-sm-6">$T('dashboard-systemPerformance') &nbsp; </div>
                             <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.pystone"></span>
                                 <a href="#" data-bind="click: testDiskSpeed" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
@@ -122,7 +122,7 @@
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-downloadDirSpeed')</div>
+                            <div class="col-sm-6">$T('dashboard-downloadDirSpeed') &nbsp; </div>
                             <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.downloaddirspeed()"></span> MB/s
                                 <a href="#" class="diskspeed-button" data-bind="click: testDiskSpeed" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
@@ -131,7 +131,7 @@
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-completeDirSpeed')</div>
+                            <div class="col-sm-6">$T('dashboard-completeDirSpeed') &nbsp; </div>
                             <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.completedirspeed()"></span> MB/s
                                 <a href="#" class="diskspeed-button" data-bind="click: testDiskSpeed" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
@@ -140,7 +140,7 @@
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
-                            <div class="col-sm-6">$T('dashboard-internetBandwidth')</div>
+                            <div class="col-sm-6">$T('dashboard-internetBandwidth') &nbsp; </div>
                             <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.internetbandwidth()"></span> MB/s
                                 <a href="#" class="diskspeed-button" data-bind="click: testDiskSpeed" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
@@ -149,10 +149,12 @@
                             <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row test-download">
-                            <div class="col-sm-6">$T('dashboard-testDownload')</div>
+                            <div class="col-sm-6">$T('dashboard-testDownload') &nbsp; </div>
                             <div class="col-sm-6">
                                 <a href="#" class="btn btn-default" data-bind="click: testDownload" data-size="100MB" data-tooltip="true" data-placement="top" title="$T('dashboard-testDownload-explain')"><span class="glyphicon glyphicon-download-alt"></span> 100 MB</a>
-                                <a href="#" class="btn btn-default" data-bind="click: testDownload" data-size="1000MB" data-tooltip="true" data-placement="top" title="$T('dashboard-testDownload-explain')"><span class="glyphicon glyphicon-download-alt"></span> 1000 MB</a>
+                                <a href="#" class="btn btn-default" data-bind="click: testDownload" data-size="1000MB" data-tooltip="true" data-placement="top" title="$T('dashboard-testDownload-explain')"><span class="glyphicon glyphicon-download-alt"></span> 1 GB</a>
+                                <a href="#" class="btn btn-default" data-bind="click: testDownload" data-size="10GB" data-tooltip="true" data-placement="top" title="$T('dashboard-testDownload-explain')"><span class="glyphicon glyphicon-download-alt"></span> 10 GB</a>
+
                             </div>
                         </div>
                         <hr />
@@ -217,6 +219,10 @@
                                         <span data-bind="text: servertotalconn"></span>
                                     </div>
                                 </div>
+                                <div class="row">
+                                    <div class="col-sm-6">$T('Glitter-speed')</div>
+                                    <div class="col-sm-6"><span data-bind="text: serverbps"></span>B/s</div>
+                                </div>
                                 <div class="row" data-bind="visible: servererror()">
                                     <div class="col-sm-12">
                                         <div class="alert alert-danger">
@@ -367,8 +373,7 @@
                                     <span class="label label-warning">&gt; 1200 pixels</span>
                                 </label>
                                 <div class="col-sm-4">
-                                    <select name="general-extra-column" class="form-control" data-bind="value: extraQueueColumn">
-                                        <option value="">$T('none')</option>
+                                    <select name="general-extra-column" class="form-control-multiselect form-control" data-bind="selectedOptions: extraQueueColumns" multiple="true">
                                         <option value="category">$T('category')</option>
                                         <option value="priority">$T('priority')</option>
                                         <option value="processing">$T('swtag-pp')</option>
@@ -383,8 +388,7 @@
                                     <span class="label label-warning">&gt; 1200 pixels</span>
                                 </label>
                                 <div class="col-sm-4">
-                                    <select name="general-extra-column" class="form-control" data-bind="value: extraHistoryColumn">
-                                        <option value="">$T('none')</option>
+                                    <select name="general-extra-column" class="form-control-multiselect form-control" data-bind="selectedOptions: extraHistoryColumns" multiple="true">
                                         <option value="category">$T('category')</option>
                                         <option value="size">$T('size')</option>
                                         <option value="speed">$T('Glitter-speed')</option>
@@ -399,6 +403,14 @@
                                     <input type="checkbox" name="displayCompact" value="true" data-bind="checked: displayCompact" />
                                 </div>
                             </div>
+                            <div class="form-group form-checkbox">
+                                <label class="col-sm-6 control-label">
+                                    $T("Glitter-displayFullWidth")
+                                </label>
+                                <div class="col-sm-4">
+                                    <input type="checkbox" name="displayFullWidth" value="true" data-bind="checked: displayFullWidth" />
+                                </div>
+                            </div>
                             <div class="form-group form-checkbox">
                                 <label class="col-sm-6 control-label">
                                     $T("Glitter-displayTabbed")
@@ -434,14 +446,14 @@
 
 <div id="modal-add-nzb" class="modal fade" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content">
+        <form class="modal-content" data-bind="submit: addNZB">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal">&times;</button>
                 <h4 class="modal-title">$T('Glitter-addNZB')</h4>
             </div>
-            <div class="modal-body">
+            <div class="modal-body form-horizontal">
                 <div class="row">
-                    <form data-bind="submit: addNZBFromURL" class="col-sm-6">
+                    <div class="col-sm-6">
                         <fieldset>
                             <legend class="row-wrap-text">$T('Glitter-addFromURL')</legend>
                             <div class="input-group" data-tooltip="true" data-placement="bottom" title="$file_exts">
@@ -451,8 +463,8 @@
                                 </span>
                             </div>
                         </fieldset>
-                    </form>
-                    <form data-bind="submit: addNZBFromFileForm" class="col-sm-6">
+                    </div>
+                    <div class="col-sm-6">
                         <fieldset>
                             <legend class="row-wrap-text">$T('Glitter-addFromFile')</legend>
                             <div class="input-group" data-tooltip="true" data-placement="bottom" title="$file_exts">
@@ -466,37 +478,53 @@
                                 </span>
                             </div>
                         </fieldset>
-                    </form>
-                </div>
-                <div class="clearfix"></div>
-                <hr />
-                <div class="row form-horizontal">
-                    <label class="col-sm-6 control-label">$T('Glitter-addnzbFilename')</label>
-                    <div class="col-sm-6">
-                        <input type="text" name="nzbname" id="nzbname" placeholder="$T('name')" class="form-control" />
                     </div>
                 </div>
-                <hr />
                 <div class="clearfix"></div>
-                <div class="add-nzb-inputbox" title="$T('category')" data-tooltip="true" data-placement="left">
-                    <span class="glyphicon glyphicon-tag"></span>
-                    <select name="Category" class="form-control" data-bind="options: queue.categoriesList, optionsValue: 'catValue', optionsText: 'catText',"></select>
+                <hr />
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">$T('name')</label>
+                    <div class="col-sm-6">
+                        <input type="text" name="nzbname" id="nzbname" placeholder="$T('Glitter-addnzbFilename')" class="form-control" />
+                    </div>
                 </div>
-                <div class="add-nzb-inputbox" title="$T('priority')" data-tooltip="true" data-placement="left">
-                    <span class="glyphicon glyphicon-sort-by-attributes-alt"></span>
-                    <select name="Priority" class="form-control" data-bind="options: queue.priorityOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: '$T('default')'"></select>
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">$T('srv-password')</label>
+                    <div class="col-sm-6">
+                        <input type="text" name="password" id="password" placeholder="$T('srv-optional')" class="form-control" />
+                    </div>
                 </div>
-                <div class="add-nzb-inputbox" title="$T('swtag-pp')" data-tooltip="true" data-placement="left">
-                    <span class="glyphicon glyphicon-check"></span>
-                    <select name="Processing" class="form-control" data-bind="options: queue.processingOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: '$T('default')'"></select>
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">$T('category')</label>
+                    <div class="col-sm-6">
+                        <select name="Category" class="form-control" data-bind="options: queue.categoriesList, optionsValue: 'catValue', optionsText: 'catText',"></select>
+                        <span class="glyphicon glyphicon-tag"></span>
+                    </div>
                 </div>
-                <div class="add-nzb-inputbox" title="$T('eoq-scripts')" data-tooltip="true" data-placement="left">
-                    <span class="glyphicon glyphicon-flash"></span>
-                    <select name="Post-processing" class="form-control" data-bind="options: queue.scriptsList, optionsCaption: '$T('default')'"></select>
+                <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>
+                        <span class="glyphicon glyphicon-sort-by-attributes-alt"></span>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">$T('swtag-pp')</label>
+                    <div class="col-sm-6">
+                        <select name="Processing" class="form-control" data-bind="options: queue.processingOptions, optionsValue: 'value', optionsText: 'name', optionsCaption: '$T('default')'"></select>
+                        <span class="glyphicon glyphicon-check"></span>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">$T('eoq-scripts')</label>
+                    <div class="col-sm-6">
+                        <select name="Post-processing" class="form-control" data-bind="options: queue.scriptsList, optionsCaption: '$T('default')', enable: (queue.scriptsList().length > 1)"></select>
+                        <span class="glyphicon glyphicon-flash"></span>
+                    </div>
                 </div>
                 <div class="clearfix"></div>
             </div>
-        </div>
+        </form>
     </div>
 </div>
 
@@ -651,7 +679,7 @@
                     </tbody>
                 </table>
                 <hr/>
-                <p><small>Copyright (C) 2007-2020 The SABnzbd Team &lt;team@sabnzbd.org&gt;<br/>$T('yourRights') </small></p>
+                <p><small>Copyright (C) 2007-2021 The SABnzbd Team &lt;team@sabnzbd.org&gt;<br/>$T('yourRights') </small></p>
             </div>
         </div>
     </div>

interfaces/Glitter/templates/include_queue.tmpl

@@ -67,8 +67,10 @@
             <tr>
                 <th style="width: 25px;"></th>
                 <th></th>
-                <th class="table-header-extra" data-bind="css: { 'table-extra-header-visible' : extraQueueColumn }"></th>
-                <th class="table-header-progress" data-bind="css: { 'table-header-progress-smaller' : extraQueueColumn }"></th>
+                <!-- ko foreach: extraQueueColumns -->
+                <th class="table-header-extra"></th>
+                <!-- /ko -->
+                <th class="table-header-progress" data-bind="css: { 'table-header-progress-smaller' : extraQueueColumns().length }"></th>
                 <th style="width: 85px;"></th>
                 <th style="width: 60px;"></th>
             </tr>
@@ -76,7 +78,7 @@
         <!-- ko if: !hasQueue() -->
         <tbody class="no-downloads">
             <tr>
-                <td colspan="6">
+                <td colspan="6" data-bind="attr: { 'colspan': 5 + extraQueueColumns().length }">
                     <a href="#modal-add-nzb" class="hover-button" data-toggle="modal">
                         <span title="$T('Glitter-dragAndDrop')" data-tooltip="true"><span class="glyphicon glyphicon-plus-sign"></span> $T('Glitter-addNZB')</span>
                     </a>
@@ -107,7 +109,7 @@
                     <form data-bind="submit: editingNameSubmit">
                         <input type="text" data-bind="value: nameForEdit, visible: editingName(), hasfocus: editingName" />
                     </form>
-                    <div class="name-icons direct-unpack hover-button" data-bind="visible: direct_unpack">
+                    <div class="name-icons direct-unpack hover-button" data-bind="visible: direct_unpack() && !editingName()">
                         <span class="glyphicon glyphicon-compressed"></span> <span data-bind="text: direct_unpack"></span>
                     </div>
                     <div class="name-options" data-bind="visible: !editingName(), css: { disabled: isGrabbing() }">
@@ -118,10 +120,11 @@
                         <small data-bind="text: avg_age"></small>
                     </div>
                 </td>
+                <!-- ko foreach: parent.parent.extraQueueColumns -->
                 <td class="row-extra-text">
-                    <div class="row-wrap-text" data-bind="text: extraText">
-                    </div>
+                    <div class="row-wrap-text" data-bind="text: \$parent.showColumn(\$data)"></div>
                 </td>
+                <!-- /ko -->
                 <td class="progress-indicator">
                     <div class="progress">
                         <div class="progress-bar progress-bar-info" data-bind="attr: { 'style': 'width: ' + percentage() + '%; background-color: ' + progressColor() + ';' }">

interfaces/Glitter/templates/main.tmpl

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--#set $active_lang=$active_lang.replace('_', '-').lower()#-->
-<html lang="$active_lang" id="sabnzbd" data-bind="filedrop: { overlaySelector: '.main-filedrop', onFileDrop: addNZBFromFile }">
+<html lang="$active_lang" <!--#if $rtl#-->dir="rtl"<!--#end if#--> id="sabnzbd" data-bind="filedrop: { overlaySelector: '.main-filedrop', onFileDrop: addNZBFromFile }">
     <head>
         <!--
                 Glitter V2
@@ -36,7 +36,7 @@
         <link rel="stylesheet" type="text/css" href="./static/bootstrap/css/bootstrap.min.css?v=$version" />
         <link rel="stylesheet" type="text/css" href="./static/stylesheets/glitter.css?v=$version" />
         <link rel="stylesheet" type="text/css" href="./static/stylesheets/glitter.mobile.css?v=$version" media="all and (max-width: 768px)" />
-        <!--#if $color_scheme not in ('Default', '') #-->
+        <!--#if $color_scheme not in ('Light', '') #-->
         <link rel="stylesheet" type="text/css" href="./static/stylesheets/colorschemes/${color_scheme}.css?v=$version"/>
         <!--#end if#-->
 
@@ -52,15 +52,17 @@
             var glitterTranslate = new Object();
             glitterTranslate.paused = "$T('post-Paused')";
             glitterTranslate.left = "$T('Glitter-left')";
-            glitterTranslate.clearWarn = "$T('Glitter-confirmClearWarnings')";
+            glitterTranslate.clearWarn = "$T('confirm')";
             glitterTranslate.pausePromptFail = "$T('Glitter-pausePromptFail')"
             glitterTranslate.pauseFor = "$T('pauseFor')"
             glitterTranslate.minutes = "$T('mins')"
             glitterTranslate.shutdown = "$T('shutdownOK?')";
             glitterTranslate.restart = "$T('explain-Restart') $T('explain-needNewLogin')".replace(/\<br(\s*\/|)\>/g, '\n');
             glitterTranslate.repair = "$T('explain-Repair')".replace(/<br \/>/g, "\n").replace(/&quot;/g,'"');
-            glitterTranslate.removeDown = "$T('Glitter-confirmClearDownloads')";
-            glitterTranslate.removeDow1 = "$T('Glitter-confirmClear1Download')";
+            glitterTranslate.deleteMsg = "$T('nzo-delete')";
+            glitterTranslate.removeDown = "$T('confirm')";
+            glitterTranslate.removeDow1 = "$T('confirm')";
+            glitterTranslate.renameAbort = "$T('Glitter-confirmAbortDirectUnpack')\n$T('confirm')";
             glitterTranslate.retryAll = "$T('link-retryAll')?";
             glitterTranslate.fetch = "$T('Glitter-fetch')";
             glitterTranslate.encrypted = "$T('Glitter-encrypted')";

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

@@ -152,11 +152,8 @@ function Fileslisting(parent) {
 
         // Activate with this weird URL "API"
         callSpecialAPI("./nzb/" + self.currentItem.id + "/bulk_operation/", dataToSend).then(function() {
-            // Fade it out
-            $('.item-files-table input:checked:not(:disabled)').parents('tr').fadeOut(fadeOnDeleteDuration, function() {
-                // Set state of the check-all
-                setCheckAllState('#modal-item-files .multioperations-selector input[type="checkbox"]', '#modal-item-files .files-sortable input')
-            })
+            // Set state of the check-all
+            setCheckAllState('#modal-item-files .multioperations-selector input[type="checkbox"]', '#modal-item-files .files-sortable input')
         })
     }
 

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

@@ -333,10 +333,10 @@ function HistoryModel(parent, data) {
         return self.script_line();
     });
 
-    // Extra history column
-    self.extraText = ko.pureComputed(function() {
+    // Extra history columns
+    self.showColumn = function(param) {
         // Picked anything?
-        switch(self.parent.parent.extraHistoryColumn()) {
+        switch(param) {
             case 'speed':
                 // Anything to calculate?
                 if(self.historyStatus.bytes() > 0 && self.historyStatus.download_time() > 0) {
@@ -359,7 +359,7 @@ function HistoryModel(parent, data) {
                 return self.historyStatus.size();
         }
         return;
-    })
+    };
 
     // Format completion time
     self.completedOn = ko.pureComputed(function() {
@@ -421,7 +421,7 @@ function HistoryModel(parent, data) {
     // Delete button
     self.deleteSlot = function(item, event) {
         // Confirm?
-        if(!self.parent.parent.confirmDeleteHistory() || confirm(glitterTranslate.removeDow1)) {
+        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) {
                 callAPI({
@@ -438,13 +438,10 @@ function HistoryModel(parent, data) {
                     value: self.nzo_id
                 }).then(function(response) {
                     if(response.status) {
-                        // Fade and remove
-                        $(event.currentTarget).parent().parent().fadeOut(fadeOnDeleteDuration, function() {
-                            // 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.parent.refresh();
-                        })
+                        // 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.parent.refresh();
                     }
                 });
             }

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

@@ -15,10 +15,11 @@ function ViewModel() {
     self.dateFormat = ko.observable('fromNow').extend({ persist: 'pageDateFormat' });
     self.displayTabbed = ko.observable().extend({ persist: 'displayTabbed' });
     self.displayCompact = ko.observable(false).extend({ persist: 'displayCompact' });
+    self.displayFullWidth = ko.observable(false).extend({ persist: 'displayFullWidth' });
     self.confirmDeleteQueue = ko.observable(true).extend({ persist: 'confirmDeleteQueue' });
     self.confirmDeleteHistory = ko.observable(true).extend({ persist: 'confirmDeleteHistory' });
-    self.extraQueueColumn = ko.observable('').extend({ persist: 'extraColumn' });
-    self.extraHistoryColumn = ko.observable('').extend({ persist: 'extraHistoryColumn' });
+    self.extraQueueColumns = ko.observableArray([]).extend({ persist: 'extraColumns' });
+    self.extraHistoryColumns = ko.observableArray([]).extend({ persist: 'extraHistoryColumns' });
     self.showActiveConnections = ko.observable(false).extend({ persist: 'showActiveConnections' });
     self.speedMetrics = { K: "KB/s", M: "MB/s", G: "GB/s" };
 
@@ -628,6 +629,37 @@ function ViewModel() {
         }
     })
 
+    // Save the rest in config if global-settings
+    var saveInterfaceSettings = function(newValue) {
+        if(self.useGlobalOptions()) {
+            var interfaceSettings = {
+                "dateFormat": self.dateFormat,
+                "extraQueueColumns": self.extraQueueColumns,
+                "extraHistoryColumns": self.extraHistoryColumns,
+                "displayCompact": self.displayCompact,
+                "displayFullWidth": self.displayFullWidth,
+                "displayTabbed": self.displayTabbed,
+                "confirmDeleteQueue": self.confirmDeleteQueue,
+                "confirmDeleteHistory": self.confirmDeleteHistory
+            };
+            callAPI({
+                mode: "set_config",
+                section: "misc",
+                keyword: "interface_settings",
+                value: ko.toJSON(interfaceSettings)
+            })
+        }
+    }
+
+    self.dateFormat.subscribe(saveInterfaceSettings);
+    self.extraQueueColumns.subscribe(saveInterfaceSettings);
+    self.extraHistoryColumns.subscribe(saveInterfaceSettings);
+    self.displayCompact.subscribe(saveInterfaceSettings);
+    self.displayFullWidth.subscribe(saveInterfaceSettings);
+    self.displayTabbed.subscribe(saveInterfaceSettings);
+    self.confirmDeleteQueue.subscribe(saveInterfaceSettings);
+    self.confirmDeleteHistory.subscribe(saveInterfaceSettings);
+
     /***
          Add NZB's
     ***/
@@ -639,54 +671,47 @@ function ViewModel() {
         if(fileName) $('.btn-file em').text(fileName)
     }
 
-    // From the upload
-    self.addNZBFromFileForm = function(form) {
+    // Add NZB form
+    self.addNZB = function(form) {
         // Anything?
-        if(!$(form.nzbFile)[0].files[0]) {
-            $('.btn-file').attr('style', 'border-color: red !important')
-            setTimeout(function() { $('.btn-file').css('border-color', '') }, 2000)
+        if(!$(form.nzbFile)[0].files[0] && !$(form.nzbURL).val()) {
+            $('.btn-file, input[name="nzbURL"]').attr('style', 'border-color: red !important')
+            setTimeout(function() { $('.btn-file, input[name="nzbURL"]').css('border-color', '') }, 2000)
             return false;
         }
 
-        // Upload
-        self.addNZBFromFile($(form.nzbFile)[0].files);
-
-        // Hide modal, upload will reset the form
-        $("#modal-add-nzb").modal("hide");
-    }
-    // From URL
-    self.addNZBFromURL = function(form) {
-        // Anything?
-        if(!$(form.nzbURL).val()) {
-            $(form.nzbURL).attr('style', 'border-color: red !important')
-            setTimeout(function() { $(form.nzbURL).css('border-color', '') }, 2000)
-            return false;
-        }
-
-        // Build request
-        var theCall = {
-            mode: "addurl",
-            name: $(form.nzbURL).val(),
-            nzbname: $('#nzbname').val(),
-            script: $('#modal-add-nzb select[name="Post-processing"]').val(),
-            priority: $('#modal-add-nzb select[name="Priority"]').val(),
-            pp: $('#modal-add-nzb select[name="Processing"]').val()
-        }
-
-        // 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="Processing"]').val()) theCall.pp = $('#modal-add-nzb select[name="Category"]').val()
-
-        // Add
-        callAPI(theCall).then(function(r) {
-            // Hide and reset/refresh
-            self.refresh()
+        // 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");
-            form.reset()
-            $('#nzbname').val('')
-        });
+        } else if($(form.nzbURL).val()) {
+            // Or add URL
+            var theCall = {
+                mode: "addurl",
+                name: $(form.nzbURL).val(),
+                nzbname: $('#nzbname').val(),
+                password: $('#password').val(),
+                script: $('#modal-add-nzb select[name="Post-processing"]').val(),
+                priority: $('#modal-add-nzb select[name="Priority"]').val(),
+                pp: $('#modal-add-nzb select[name="Processing"]').val()
+            }
 
+            // 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="Processing"]').val()) theCall.pp = $('#modal-add-nzb select[name="Category"]').val()
+
+            // Add
+            callAPI(theCall).then(function(r) {
+                // Hide and reset/refresh
+                self.refresh()
+                $("#modal-add-nzb").modal("hide");
+                form.reset()
+                $('#nzbname').val('')
+            });
+        }
     }
+
     // From the upload or filedrop
     self.addNZBFromFile = function(files, fileindex) {
         // First file
@@ -707,6 +732,7 @@ function ViewModel() {
         data.append("name", file);
         data.append("mode", "addfile");
         data.append("nzbname", $('#nzbname').val());
+        data.append("password", $('#password').val());
         data.append("script", $('#modal-add-nzb select[name="Post-processing"]').val())
         data.append("priority", $('#modal-add-nzb select[name="Priority"]').val())
         data.append("apikey", apiKey);
@@ -732,14 +758,13 @@ function ViewModel() {
                 // Refresh
                 self.refresh();
                 // Hide notification
-                hideNotification('.main-notification-box-uploading')
+                hideNotification(true)
                 // Reset the form
                 $('#modal-add-nzb form').trigger('reset');
                 $('#nzbname').val('')
                 $('.btn-file em').html(glitterTranslate.chooseFile + '…')
             }
         });
-
     }
 
     // Load status info
@@ -747,8 +772,11 @@ function ViewModel() {
         // Full refresh? Only on click and for the status-screen
         var statusFullRefresh = (event != undefined) && $('#options-status').hasClass('active');
 
-        // Make it spin
-        self.hasStatusInfo(false)
+        // Make it spin if the user requested it otherwise we don't,
+        // because browsers use a lot of CPU for the animation
+        if(statusFullRefresh) {
+            self.hasStatusInfo(false)
+        }
 
         // Load the custom status info
         callAPI({ mode: 'fullstatus', skip_dashboard: (!statusFullRefresh)*1 }).then(function(data) {
@@ -800,7 +828,8 @@ function ViewModel() {
                         'serveractiveconn': ko.observable(this.serveractiveconn),
                         'servererror': ko.observable(this.servererror),
                         'serveractive': ko.observable(this.serveractive),
-                        'serverconnections': ko.observableArray(this.serverconnections)
+                        'serverconnections': ko.observableArray(this.serverconnections),
+                        'serverbps': ko.observable(this.serverbps)
                     })
                 })
             } else {
@@ -816,7 +845,8 @@ function ViewModel() {
                     activeServer.serveractiveconn(this.serveractiveconn),
                     activeServer.servererror(this.servererror),
                     activeServer.serveractive(this.serveractive),
-                    activeServer.serverconnections(this.serverconnections)
+                    activeServer.serverconnections(this.serverconnections),
+                    activeServer.serverbps(this.serverbps)
                 })
             }
 
@@ -888,10 +918,9 @@ function ViewModel() {
                 clearInterval(connectionRefresh)
                 return
             }
-            // Only when we show them
-            if(self.showActiveConnections()) {
-                self.loadStatusInfo()
-            }
+            // Update the server stats (speed/connections)
+            self.loadStatusInfo()
+
         }, self.refreshRate() * 1000)
     })
 
@@ -935,8 +964,6 @@ function ViewModel() {
         callSpecialAPI("./status/" + $(htmlElement.currentTarget).data('action'), {
             name: $("<div/>").html(folder).text()
         }).then(function() {
-            // Remove item and load status data
-            $(htmlElement.currentTarget).parent().parent().fadeOut(fadeOnDeleteDuration)
             // Refresh
             self.loadStatusInfo(true, true)
             // Hide notification
@@ -977,6 +1004,11 @@ function ViewModel() {
         $('body').toggleClass('container-compact')
     })
 
+    // Toggle full width
+    self.displayFullWidth.subscribe(function() {
+        $('body').toggleClass('container-full-width')
+    })
+
     // Toggle Glitter's tabbed modus
     self.displayTabbed.subscribe(function() {
         $('body').toggleClass('container-tabbed')
@@ -1047,6 +1079,11 @@ function ViewModel() {
         $('body').addClass('container-compact')
     }
 
+    if(localStorageGetItem('displayFullWidth') === 'true') {
+        // Add extra class
+        $('body').addClass('container-full-width')
+    }
+
     // Tabbed layout?
     if(localStorageGetItem('displayTabbed') === 'true') {
         $('body').addClass('container-tabbed')
@@ -1067,6 +1104,19 @@ function ViewModel() {
 
             // Set queue limit
             self.queue.paginationLimit(response.config.misc.queue_limit.toString())
+
+            // Import the rest of the settings
+            if(response.config.misc.interface_settings) {
+                var interfaceSettings = JSON.parse(response.config.misc.interface_settings);
+                self.dateFormat(interfaceSettings['dateFormat']);
+                self.extraQueueColumns(interfaceSettings['extraQueueColumns']);
+                self.extraHistoryColumns(interfaceSettings['extraHistoryColumns']);
+                self.displayCompact(interfaceSettings['displayCompact']);
+                self.displayFullWidth(interfaceSettings['displayFullWidth']);
+                self.displayTabbed(interfaceSettings['displayTabbed']);
+                self.confirmDeleteQueue(interfaceSettings['confirmDeleteQueue']);
+                self.confirmDeleteHistory(interfaceSettings['confirmDeleteHistory']);
+            }
         }
 
         // Set bandwidth limit

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

@@ -228,11 +228,11 @@ function QueueListModel(parent) {
         switch($(event.currentTarget).data('action')) {
             case 'sortAgeAsc':
                 sort = 'avg_age';
-                dir = 'asc';
+                dir = 'desc';
                 break;
             case 'sortAgeDesc':
                 sort = 'avg_age';
-                dir = 'desc';
+                dir = 'asc';
                 break;
             case 'sortNameAsc':
                 sort = 'name';
@@ -440,7 +440,6 @@ function QueueListModel(parent) {
                 if(response.status) {
                     // Make sure the queue doesnt flicker and then fade-out
                     self.isLoading(true)
-                    $('.delete input:checked').parents('tr').fadeOut(fadeOnDeleteDuration)
                     self.parent.refresh()
                     // Empty it
                     self.multiEditItems.removeAll();
@@ -567,10 +566,9 @@ function QueueModel(parent, data) {
         return 'glyphicon-pause'
     })
 
-    // Extra queue column
-    self.extraText = ko.pureComputed(function() {
-        // Picked anything?
-        switch(self.parent.parent.extraQueueColumn()) {
+    // Extra queue columns
+    self.showColumn = function(param) {
+        switch(param) {
             case 'category':
                 // Exception for *
                 if(self.category() == "*")
@@ -590,7 +588,7 @@ function QueueModel(parent, data) {
                 return self.avg_age();
         }
         return;
-    })
+    };
 
     // Every update
     self.updateFromData = function(data) {
@@ -654,6 +652,9 @@ function QueueModel(parent, data) {
         // Anything change or empty?
         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;
+
         // Send rename
         callAPI({
                 mode: 'queue',
@@ -726,7 +727,7 @@ function QueueModel(parent, data) {
     // Remove 1 download from queue
     self.removeDownload = function(item, event) {
         // Confirm and remove
-        if(!self.parent.parent.confirmDeleteQueue() || confirm(glitterTranslate.removeDow1)) {
+        if(!self.parent.parent.confirmDeleteQueue() || confirm(glitterTranslate.deleteMsg + ":\n" + item.name() + "\n\n" + glitterTranslate.removeDow1)) {
             var itemToDelete = this;
 
             // Show notification
@@ -738,17 +739,14 @@ function QueueModel(parent, data) {
                 del_files: 1,
                 value: item.id
             }).then(function(response) {
-                // Fade and remove
-                $(event.currentTarget).parent().parent().fadeOut(fadeOnDeleteDuration, function() {
-                    // 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; })
-                    self.parent.parent.refresh();
-                    // Hide notifcation
-                    hideNotification(true)
-                })
+                // 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; })
+                self.parent.parent.refresh();
+                // Hide notifcation
+                hideNotification(true)
             });
         }
     };
-}
+}

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

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

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

@@ -55,6 +55,10 @@ legend,
     opacity: 0.7;
 }
 
+.form-control[disabled] {
+    opacity: 0.65;
+}
+
 .progress {
     background-color: #DADADA;
 }
@@ -126,6 +130,10 @@ select.form-control,
 .main-content .btn-default,
 .modal-body .btn-default,
 .modal-footer .btn-default,
+.btn-default.disabled:hover,
+.btn-default.disabled:active,
+.btn-default.disabled:focus,
+.form-control[disabled],
 #modal-options .options-function-box .input-group-addon {
     background-color: #555555;
     color: #EBEBEB;
@@ -157,6 +165,8 @@ tbody>tr:last-child td,
 input,
 input.form-control,
 .input-group-addon,
+.search-box input:focus,
+.search-box input:valid,
 select.form-control,
 #modal-options .table-server-connections th,
 .main-content .btn-default,
@@ -248,6 +258,13 @@ hr {
     border-top: none;
 }
 
+.form-control:focus,
+input[type="submit"]:focus,
+button:focus {
+    box-shadow: 0 0 0 0.25rem rgba(255, 255, 255, 0.3) !important;
+    outline: initial;
+}
+
 /* Placeholders - Will not work if grouped! */
 ::-webkit-input-placeholder {
    color: #EBEBEB !important;

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

@@ -852,18 +852,24 @@ tr.queue-item>td:first-child>a {
 
 .multioperations-selector .add-nzb-inputbox {
     width: 20%;
+    float: left;
+}
+
+.multioperations-selector .add-nzb-inputbox select {
+    display: inline-block;
+    width: calc(100% - 30px);
+    margin: 5px 0px 5px 2px;
 }
 
 .multioperations-selector .add-nzb-inputbox-small {
     width: 80px;
     float: right;
     padding-left: 0;
-    padding-top: 2px;
+    padding-top: 12px;
 }
 
 .multioperations-selector .add-nzb-inputbox-small .label {
-    vertical-align: text-bottom;
-    margin-left: 2px;
+    margin-left: 5px;
 }
 
 .multioperations-selector .add-nzb-inputbox-small span {
@@ -884,7 +890,7 @@ tr.queue-item>td:first-child>a {
 
 .multioperations-selector .add-nzb-inputbox-options {
     width: auto;
-    padding-right: 6px;
+    padding-right: 7px;
 }
 
 .multioperations-selector .add-nzb-inputbox-small label[for="multiedit-pause"],
@@ -1276,7 +1282,8 @@ tr.queue-item>td:first-child>a {
     min-height: 270px;
 }
 
-#modal-options .form-group {
+#modal-options .form-group,
+#modal-add-nzb .form-group {
     margin-bottom: 5px;
 }
 
@@ -1388,7 +1395,8 @@ tr.queue-item>td:first-child>a {
     padding-bottom: 0;
 }
 
-#modal-options .col-sm-6 {
+#modal-options .col-sm-6,
+#modal-add-nzb .col-sm-6 {
     padding-bottom: 3px;
 }
 
@@ -1520,25 +1528,14 @@ tr.queue-item>td:first-child>a {
     margin-bottom: 5px;
 }
 
-#modal-add-nzb .add-nzb-inputbox:nth-child(even) select {
-    width: 100%;
+#modal-add-nzb .col-sm-6:first-of-type label {
+    text-align: right;
 }
 
-.add-nzb-inputbox {
-    float: left;
-    width: 50%;
-    margin: 5px 0px;
-    padding-left: 20px;
-}
-
-.add-nzb-inputbox select {
+#modal-add-nzb select {
+    width: calc(100% - 35px);
     display: inline-block;
-    width: calc(100% - 10px);
-}
-
-.add-nzb-inputbox span {
-    display: inline-block;
-    margin: 8px 2px 0px -20px;
+    margin-right: 5px;
 }
 
 .btn-file {
@@ -1738,7 +1735,6 @@ input[name="nzbURL"] {
 .container-compact .search-box .form-control {
     height: 28px;
 }
-
 .container-compact,
 .container-compact .dropdown-menu,
 .container-compact .btn,
@@ -1764,6 +1760,9 @@ input[name="nzbURL"] {
 .container-compact .form-control {
     height: 29px;
 }
+.container-compact .form-control-multiselect {
+    height: 60px;
+}
 .container-compact .modal-header {
     padding: 5px 12px;
 }
@@ -1843,18 +1842,22 @@ input[name="nzbURL"] {
     padding-top: 5px;
 }
 
+.container-full-width .container {
+    width: calc(100% - 60px);
+}
+
 /***
     Dynamic sizing
 ***/
 @media screen and (min-width: 1200px) {
-    .queue-table .table-extra-header-visible,
-    .history-table .table-extra-header-visible {
-        width: 10%;
+    .queue-table .table-header-extra,
+    .history-table .table-header-extra {
+        width: 6%;
     }
 
     .queue-table .table-header-progress-smaller,
     .history-table .table-header-progress-smaller {
-        width: 35%;
+        width: 25%;
     }
 
     #options-interface .label {
@@ -1976,6 +1979,45 @@ input[name="nzbURL"] {
     }
 }
 
+/***
+    RTL Fixes
+***/
+
+html[dir="rtl"] .navbar-nav {
+    padding-right: 0;
+}
+
+html[dir="rtl"] .queue h2,
+html[dir="rtl"] .history h2 {
+    float: right;
+}
+
+html[dir="rtl"] .dropdown-menu {
+    text-align: right;
+    direction: rtl;
+}
+
+html[dir="rtl"] .speedlimit-dropdown,
+html[dir="rtl"] .progress-indicator,
+html[dir="rtl"] #modal-item-filelist,
+html[dir="rtl"] #modal-item-files .modal-title,
+html[dir="rtl"] .info-container-box,
+html[dir="rtl"] .queue-table,
+html[dir="rtl"] .history-table {
+    direction: ltr;
+}
+
+html[dir="rtl"] .search-box a {
+    right: initial;
+    left: 8px;
+}
+
+html[dir="rtl"] .navbar-logo,
+html[dir="rtl"] .info-container,
+html[dir="rtl"] .modal-header .close,
+html[dir="rtl"] #modal-options .modal-header a {
+    float: left;
+}
 
 /***
     Bootstrap overwrites

interfaces/Plush/templates/_inc_header.tmpl

@@ -103,6 +103,7 @@
         <span id="warning_box"><b><a href="${path}status/#tabs-warnings" id="last_warning"><span id="have_warnings">$have_warnings</span> $T('warnings')</a></b></span>
         #if $pane=="Main"#
           #if $new_release#&sdot; <a href="$new_rel_url" id="new_release" target="_blank">$T('Plush-updateAvailable').replace(' ','&nbsp;')</a>#end if#
+        <a href="${path}config/general/#web_dir"><strong style="color: red">This skin will be removed in SABnzbd 3.4.0! <br>We recommend using the Glitter skin.</strong></a>
         #end if#
       </div>
     </div>

interfaces/Plush/templates/_inc_modals.tmpl

@@ -28,7 +28,7 @@
     </table>
     <div class="sabnzbd_logo main_sprite_container sprite_sabnzbdplus_logo"></div>
     <p><strong>SABnzbd $T('version'):</strong> $version</p>
-    <p><small>Copyright (C) 2008-2020 The SABnzbd Team &lt;team@sabnzbd.org&gt;</small></p>
+    <p><small>Copyright (C) 2008-2021 The SABnzbd Team &lt;team@sabnzbd.org&gt;</small></p>
     <p><small>$T('yourRights')</small></p>
   </div>
 

interfaces/Plush/templates/static/javascripts/plush.js

@@ -306,8 +306,8 @@ jQuery(function($){
   $('#queue_sort_list .queue_sort').click(function(event) {
     var sort, dir;
     switch ($(this).attr('id')) {
-      case 'sortAgeAsc':    sort='avg_age'; dir='asc';  break;
-      case 'sortAgeDesc':   sort='avg_age'; dir='desc'; break;
+      case 'sortAgeAsc':    sort='avg_age'; dir='desc';  break;
+      case 'sortAgeDesc':   sort='avg_age'; dir='asc'; break;
       case 'sortNameAsc':   sort='name';    dir='asc';  break;
       case 'sortNameDesc':  sort='name';    dir='desc'; break;
       case 'sortSizeAsc':   sort='size';    dir='asc';  break;

interfaces/Plush/templates/status.tmpl

@@ -91,40 +91,7 @@
 
 
   <div id="tabs-connections">
-  <a href="refresh_conn?apikey=$apikey" class="juiButton">$T('Plush-button-refresh')</a>
   <a href="disconnect?apikey=$apikey" class="juiButton">$T('link-forceDisc')</a>
-  <hr>
-  <!--#if $servers#-->
-    <!--#set $count=0#-->
-    <!--#for $server in $servers#-->
-      <!--#set $count=$count+1#-->
-      <p>$T('swtag-server'): <strong>$server[0]</strong></p>
-      <p>$T('Priority') = $server[7]&nbsp;&nbsp;<!--#if int($server[8]) != 0#-->$T('optional').capitalize()<!--#else#-->$T('enabled').capitalize()<!--#end if#--></p>
-      <p># $T('connections'): $server[2]</p>
-      <!--#if not $server[5]#-->
-        <a href="./unblock_server?server=$server[0]&apikey=$apikey" class="juiButton">$T('server-blocked')</a>
-        &nbsp;&nbsp;$server[6]
-      <!--#end if#-->
-      <!--#if $server[3]#-->
-        <table class="rssTable">
-          <tr>
-            <th>$T('article-id')</th>
-            <th>$T('filename')</th>
-            <th>$T('file-set')</th>
-          </tr>
-        <!--#set $odd = False#-->
-        <!--#for $thrd in $server[3]#-->
-        <!--#set $odd = not $odd#-->
-          <tr class="<!--#if $odd then "odd" else "even"#-->">
-            <td>$thrd[1]</td><td>$thrd[2]</td><td>$thrd[3]</td></tr>
-        <!--#end for#-->
-        </table>
-      <!--#end if#-->
-      <br/><hr/><br/>
-    <!--#end for#-->
-  <!--#else#-->
-    <p>$T('none')</p>
-  <!--#end if#-->
   </div>
 
   <div id="tabs-dashboard">

linux/sabnzbd@.service

@@ -18,7 +18,7 @@ After=network-online.target
 
 [Service]
 Environment="PYTHONIOENCODING=utf-8"
-ExecStart=/opt/sabnzbd/SABnzbd.py --logging 1 --browser 0
+ExecStart=/opt/sabnzbd/SABnzbd.py --disable-file-log --logging 1 --browser 0
 User=%I
 Type=simple
 Restart=on-failure

po/email/SABemail.pot

@@ -1,11 +1,11 @@
 #
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2020 The SABnzbd-Team
+# Copyright 2011-2021 The SABnzbd-Team
 #   team@sabnzbd.org
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.0.0-develop\n"
+"Project-Id-Version: SABnzbd-3.3.0-develop\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

@@ -0,0 +1,114 @@
+# SABnzbd Translation Template file EMAIL
+# Copyright 2011-2021 The SABnzbd-Team
+#   team@sabnzbd.org
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: SABnzbd-3.3.0-develop\n"
+"PO-Revision-Date: 2020-06-27 15:56+0000\n"
+"Language-Team: Czech (https://www.transifex.com/sabnzbd/teams/111101/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+
+#: email/email.tmpl:1
+msgid ""
+"##\n"
+"## Default Email template for SABnzbd\n"
+"## This a Cheetah template\n"
+"## Documentation: http://sabnzbd.wikidot.com/email-templates\n"
+"##\n"
+"## Newlines and whitespace are significant!\n"
+"##\n"
+"## These are the email headers\n"
+"To: $to\n"
+"From: $from\n"
+"Date: $date\n"
+"Subject: SABnzbd has <!--#if $status then \"completed\" else \"failed\" #--> job $name\n"
+"X-priority: 5\n"
+"X-MS-priority: 5\n"
+"## After this comes the body, the empty line is required!\n"
+"\n"
+"Hi,\n"
+"<!--#if $status #-->\n"
+"SABnzbd has downloaded \"$name\" <!--#if $msgid==\"\" then \"\" else \"(newzbin #\" + $msgid + \")\"#-->\n"
+"<!--#else#-->\n"
+"SABnzbd has failed to download \"$name\" <!--#if $msgid==\"\" then \"\" else \"(newzbin #\" + $msgid + \")\"#-->\n"
+"<!--#end if#-->\n"
+"Finished at $end_time\n"
+"Downloaded $size\n"
+"\n"
+"Results of the job:\n"
+"<!--#for $stage in $stages #-->\n"
+"Stage $stage <!--#slurp#-->\n"
+"<!--#for $result in $stages[$stage]#-->\n"
+"    $result <!--#slurp#-->\n"
+"<!--#end for#-->\n"
+"<!--#end for#-->\n"
+"<!--#if $script!=\"\" #-->\n"
+"Output from user script \"$script\" (Exit code = $script_ret):\n"
+"$script_output\n"
+"<!--#end if#-->\n"
+"<!--#if $status #-->\n"
+"Enjoy!\n"
+"<!--#else#-->\n"
+"Sorry!\n"
+"<!--#end if#-->\n"
+msgstr ""
+
+#: email/rss.tmpl:1
+msgid ""
+"##\n"
+"## RSS Email template for SABnzbd\n"
+"## This a Cheetah template\n"
+"## Documentation: http://sabnzbd.wikidot.com/email-templates\n"
+"##\n"
+"## Newlines and whitespace are significant!\n"
+"##\n"
+"## These are the email headers\n"
+"To: $to\n"
+"From: $from\n"
+"Date: $date\n"
+"Subject: SABnzbd has added $amount jobs to the queue\n"
+"X-priority: 5\n"
+"X-MS-priority: 5\n"
+"## After this comes the body, the empty line is required!\n"
+"\n"
+"Hi,\n"
+"\n"
+"SABnzbd has added $amount job(s) to the queue.\n"
+"They are from RSS feed \"$feed\".\n"
+"<!--#for $job in $jobs#-->\n"
+"    $job <!--#slurp#-->\n"
+"<!--#end for#-->\n"
+"\n"
+"Bye\n"
+msgstr ""
+
+#: email/badfetch.tmpl:1
+msgid ""
+"##\n"
+"## Bad URL Fetch Email template for SABnzbd\n"
+"## This a Cheetah template\n"
+"## Documentation: http://sabnzbd.wikidot.com/email-templates\n"
+"##\n"
+"## Newlines and whitespace are significant!\n"
+"##\n"
+"## These are the email headers\n"
+"To: $to\n"
+"From: $from\n"
+"Date: $date\n"
+"Subject: SABnzbd failed to fetch an NZB\n"
+"X-priority: 5\n"
+"X-MS-priority: 5\n"
+"## After this comes the body, the empty line is required!\n"
+"\n"
+"Hi,\n"
+"\n"
+"SABnzbd has failed to retrieve the NZB from $url.\n"
+"The error message was: $msg\n"
+"\n"
+"Bye\n"
+msgstr ""

po/email/da.po

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

po/email/de.po

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

po/email/es.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2020 The SABnzbd-Team
+# Copyright 2011-2021 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.0.0-develop\n"
+"Project-Id-Version: SABnzbd-3.3.0-develop\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"

po/email/fi.po

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

po/email/fr.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2020 The SABnzbd-Team
+# Copyright 2011-2021 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.0.0-develop\n"
+"Project-Id-Version: SABnzbd-3.3.0-develop\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"

po/email/he.po

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

po/email/nb.po

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

po/email/nl.po

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

po/email/pl.po

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

po/email/pt_BR.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file EMAIL
-# Copyright 2011-2020 The SABnzbd-Team
+# Copyright 2011-2021 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.0.0-develop\n"
+"Project-Id-Version: SABnzbd-3.3.0-develop\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"

po/email/ro.po

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

po/email/ru.po

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

po/email/sr.po

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

po/email/sv.po

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

po/email/zh_CN.po

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

po/main/SABnzbd.pot

@@ -1,11 +1,11 @@
 #
 # SABnzbd Translation Template file MAIN
-# Copyright 2011-2020 The SABnzbd-Team
+# Copyright 2011-2021 The SABnzbd-Team
 #   team@sabnzbd.org
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.0.0-develop\n"
+"Project-Id-Version: SABnzbd-3.3.0-develop\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: team@sabnzbd.org\n"
 "Language-Team: SABnzbd <team@sabnzbd.org>\n"
@@ -13,6 +13,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Notification - Status page, table column header, actual message
+#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
+msgid "Warning"
+msgstr ""
+
+#. Notification
+#: SABnzbd.py, sabnzbd/notifier.py
+msgid "Error"
+msgstr ""
+
 #. Error message
 #: SABnzbd.py
 msgid "Failed to start web-interface"
@@ -76,6 +86,11 @@ msgstr ""
 msgid "SABnzbd was started with encoding %s, this should be UTF-8. Expect problems with Unicoded file and directory names in downloads."
 msgstr ""
 
+#. Warning message
+#: SABnzbd.py
+msgid "Could not load additional certificates from certifi package"
+msgstr ""
+
 #. Warning message
 #: SABnzbd.py
 msgid "Disabled HTTPS because of missing CERT and KEY files"
@@ -95,16 +110,6 @@ msgstr ""
 msgid "SABnzbd %s started"
 msgstr ""
 
-#. Notification - Status page, table column header, actual message
-#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
-msgid "Warning"
-msgstr ""
-
-#. Notification
-#: SABnzbd.py, sabnzbd/notifier.py
-msgid "Error"
-msgstr ""
-
 #: SABnzbd.py, sabnzbd/interface.py
 msgid "SABnzbd shutdown finished"
 msgstr ""
@@ -148,6 +153,11 @@ msgstr ""
 msgid "Loading %s failed"
 msgstr ""
 
+#. Warning message
+#: sabnzbd/__init__.py
+msgid "Cannot access PID file %s"
+msgstr ""
+
 #: sabnzbd/api.py, sabnzbd/emailer.py
 msgid "Email succeeded"
 msgstr ""
@@ -201,12 +211,12 @@ msgstr ""
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Paused job \"%s\" because of encrypted RAR file (if supplied, all passwords were tried)"
+msgid "Paused job \"%s\" because of encrypted RAR file (if supplied, all passwords were tried)"
 msgstr ""
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Aborted job \"%s\" because of encrypted RAR file (if supplied, all passwords were tried)"
+msgid "Aborted job \"%s\" because of encrypted RAR file (if supplied, all passwords were tried)"
 msgstr ""
 
 #: sabnzbd/assembler.py
@@ -215,7 +225,7 @@ msgstr ""
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
+msgid "In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
 msgstr ""
 
 #: sabnzbd/assembler.py
@@ -228,12 +238,12 @@ msgstr ""
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Paused job \"%s\" because of rating (%s)"
+msgid "Paused job \"%s\" because of rating (%s)"
 msgstr ""
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Aborted job \"%s\" because of rating (%s)"
+msgid "Aborted job \"%s\" because of rating (%s)"
 msgstr ""
 
 #: sabnzbd/assembler.py
@@ -287,6 +297,10 @@ msgstr ""
 msgid "Server address required"
 msgstr ""
 
+#: sabnzbd/cfg.py
+msgid "%s is not a valid script"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/config.py
 msgid "Configuration locked, cannot save settings"
@@ -319,10 +333,6 @@ msgstr ""
 msgid "UNC path \"%s\" not allowed here"
 msgstr ""
 
-#: sabnzbd/config.py
-msgid "Error: Path length should be below %s."
-msgstr ""
-
 #: sabnzbd/config.py
 msgid "Error: Queue not empty, cannot change folder."
 msgstr ""
@@ -455,6 +465,16 @@ msgstr ""
 msgid "Shutting down"
 msgstr ""
 
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s is expiring in %s day(s)"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s has used the specified quota"
+msgstr ""
+
 #: sabnzbd/emailer.py
 msgid "Failed to connect to mail server"
 msgstr ""
@@ -547,6 +567,15 @@ msgstr ""
 msgid "Failed moving %s to %s"
 msgstr ""
 
+#. Error message
+#: sabnzbd/filesystem.py
+msgid "Blocked attempt to create directory %s"
+msgstr ""
+
+#: sabnzbd/interface.py
+msgid "Refused connection from:"
+msgstr ""
+
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr ""
@@ -576,6 +605,7 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr ""
 
+#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr ""
@@ -589,6 +619,10 @@ msgstr ""
 msgid "&nbsp<br />SABnzbd shutdown finished.<br />Wait for about 5 second and then click the button below.<br /><br /><strong><a href=\"..\">Refresh</a></strong><br />"
 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 "Warning: LOCALHOST is ambiguous, use numerical IP-address."
 msgstr ""
@@ -670,6 +704,15 @@ msgstr ""
 msgid "m"
 msgstr ""
 
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Update Available!"
+msgstr ""
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Failed to upload file: %s"
+msgstr ""
+
 #. Error message
 #: sabnzbd/misc.py
 msgid "Error creating SSL key and certificate"
@@ -680,19 +723,25 @@ msgstr ""
 msgid "Your password file contains more than 30 passwords, testing all these passwords takes a lot of time. Try to only list useful passwords."
 msgstr ""
 
+#. Warning message
+#: sabnzbd/misc.py
+msgid "Failed to read the password file %s"
+msgstr ""
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "[%s] The command in build_command is undefined."
+msgstr ""
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Python script \"%s\" does not have execute (+x) permission set"
+msgstr ""
+
 #: sabnzbd/newsunpack.py, sabnzbd/postproc.py
 msgid "Running script"
 msgstr ""
 
-#: sabnzbd/newsunpack.py, sabnzbd/postproc.py
-msgid "PostProcessing was aborted (%s)"
-msgstr ""
-
-#. PP phase "script" - Notification Script settings
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Script"
-msgstr ""
-
 #. Warning message
 #: sabnzbd/newsunpack.py
 msgid "Unpack nesting too deep [%s]"
@@ -754,11 +803,6 @@ msgstr ""
 msgid "Unpacking"
 msgstr ""
 
-#. PP phase "unpack"
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Unpack"
-msgstr ""
-
 #: sabnzbd/newsunpack.py
 msgid "Unpacking failed, unable to find %s"
 msgstr ""
@@ -931,16 +975,6 @@ msgstr ""
 msgid "Checking"
 msgstr ""
 
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "[%s] The command in build_command is undefined."
-msgstr ""
-
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "Python script \"%s\" does not have execute (+x) permission set"
-msgstr ""
-
 #: sabnzbd/newsunpack.py
 msgid "Trying SFV verification"
 msgstr ""
@@ -971,6 +1005,16 @@ msgstr ""
 msgid "Startup/Shutdown"
 msgstr ""
 
+#. Notification - Pause downloading - Four way switch for duplicates - Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Pause"
+msgstr ""
+
+#. Notification - Resume downloading - Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Resume"
+msgstr ""
+
 #. Notification - Config->RSS after adding to queue
 #: sabnzbd/notifier.py, sabnzbd/skintext.py
 msgid "Added NZB"
@@ -1080,15 +1124,12 @@ msgstr ""
 msgid "%s -> Unknown encoding"
 msgstr ""
 
-#: sabnzbd/nzbstuff.py
-msgid "%s => missing from all servers, discarding"
-msgstr ""
-
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
 msgstr ""
 
+#. Warning message
 #: sabnzbd/nzbstuff.py, sabnzbd/urlgrabber.py
 msgid "Empty NZB file %s"
 msgstr ""
@@ -1193,10 +1234,6 @@ msgstr ""
 msgid "Idle"
 msgstr ""
 
-#: sabnzbd/osxmenu.py
-msgid "Configuration"
-msgstr ""
-
 #. Main menu item
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Queue"
@@ -1221,18 +1258,9 @@ msgstr ""
 msgid "Limit Speed"
 msgstr ""
 
-#. Pause downloading - Four way switch for duplicates - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
-msgid "Pause"
-msgstr ""
-
-#: sabnzbd/osxmenu.py
-msgid "min."
-msgstr ""
-
-#. Resume downloading - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
-msgid "Resume"
+#. One minute
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+msgid "min"
 msgstr ""
 
 #. #: Config->Scheduler
@@ -1281,10 +1309,6 @@ msgstr ""
 msgid "History Last 10 Items"
 msgstr ""
 
-#: sabnzbd/osxmenu.py
-msgid "New release available"
-msgstr ""
-
 #: sabnzbd/osxmenu.py
 msgid "Go to wizard"
 msgstr ""
@@ -1404,6 +1428,10 @@ msgstr ""
 msgid "Download failed - Not on your server(s)"
 msgstr ""
 
+#: sabnzbd/postproc.py
+msgid "Post-processing"
+msgstr ""
+
 #: sabnzbd/postproc.py
 msgid "Moving"
 msgstr ""
@@ -1447,6 +1475,10 @@ msgstr ""
 msgid "see logfile"
 msgstr ""
 
+#: sabnzbd/postproc.py
+msgid "Post-processing was aborted"
+msgstr ""
+
 #: sabnzbd/postproc.py
 msgid "Download Failed"
 msgstr ""
@@ -1465,10 +1497,6 @@ msgstr ""
 msgid "Cannot create final folder %s"
 msgstr ""
 
-#: sabnzbd/postproc.py
-msgid "Post-processing"
-msgstr ""
-
 #: sabnzbd/postproc.py
 msgid "[%s] No par2 sets"
 msgstr ""
@@ -1501,6 +1529,15 @@ msgstr ""
 msgid "RAR files failed to verify"
 msgstr ""
 
+#: sabnzbd/postproc.py
+msgid "Trying RAR renamer"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/postproc.py
+msgid "No matching earlier rar file for %s"
+msgstr ""
+
 #. Error message
 #: sabnzbd/postproc.py
 msgid "Removing %s failed"
@@ -1521,6 +1558,11 @@ msgstr ""
 msgid "Error while shutting down system"
 msgstr ""
 
+#. Error message
+#: sabnzbd/powersup.py
+msgid "Received a DBus exception %s"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/rating.py
 msgid "Indexer id (%s) not found for ratings file"
@@ -1543,10 +1585,6 @@ msgstr ""
 msgid "Incorrect RSS feed description \"%s\""
 msgstr ""
 
-#: sabnzbd/rss.py
-msgid "Failed to retrieve RSS from %s: %s"
-msgstr ""
-
 #: sabnzbd/rss.py
 msgid "Do not have valid authentication for feed %s"
 msgstr ""
@@ -1555,10 +1593,15 @@ msgstr ""
 msgid "Server side error (server code %s); could not get %s on %s"
 msgstr ""
 
+#: sabnzbd/rss.py
+msgid "Failed to retrieve RSS from %s: %s"
+msgstr ""
+
 #: sabnzbd/rss.py, sabnzbd/urlgrabber.py
 msgid "Server %s uses an untrusted HTTPS certificate"
 msgstr ""
 
+#. Warning message
 #: sabnzbd/rss.py
 msgid "RSS Feed %s was empty"
 msgstr ""
@@ -1647,6 +1690,16 @@ msgstr ""
 msgid "Join files"
 msgstr ""
 
+#. PP phase "unpack"
+#: sabnzbd/skintext.py
+msgid "Unpack"
+msgstr ""
+
+#. PP phase "script" - Notification Script settings
+#: sabnzbd/skintext.py
+msgid "Script"
+msgstr ""
+
 #. PP Source of the NZB (path or URL) - Where to find the SABnzbd sourcecode
 #: sabnzbd/skintext.py
 msgid "Source"
@@ -1871,11 +1924,6 @@ msgstr ""
 msgid "hours"
 msgstr ""
 
-#. One minute
-#: sabnzbd/skintext.py
-msgid "min"
-msgstr ""
-
 #. Multiple minutes
 #: sabnzbd/skintext.py
 msgid "mins"
@@ -1971,6 +2019,10 @@ msgstr ""
 msgid "This month"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Selected date range"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Today"
 msgstr ""
@@ -1979,6 +2031,14 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Custom"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Speed"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "on"
 msgstr ""
@@ -2777,6 +2837,10 @@ msgstr ""
 msgid "Enable accessing the interface from a HTTPS address."
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Modern web browsers and other clients will not accept self-signed certificates and will give a warning and/or won't connect at all."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "HTTPS Port"
 msgstr ""
@@ -2926,20 +2990,12 @@ msgstr ""
 msgid "API Key QR Code"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "List of local network ranges"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "All local network addresses start with these prefixes (often \"192.168.1.\")"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "You can set access rights for systems outside your local network. Requires List of local network ranges to be defined."
+msgid "You can set access rights for systems outside your local network."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3006,6 +3062,23 @@ msgstr ""
 msgid "Location to store finished, fully processed downloads.<br /><i>Can be overruled by user-defined categories.</i>"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Minimum Free Space for Completed Download Folder"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Will not work if a category folder is on a different disk."
+msgstr ""
+
+#. Auto-resume download on the reset day
+#: sabnzbd/skintext.py
+msgid "Auto resume"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Downloading will automatically resume if the minimum free space is available again.<br />Applies to both the Temporary and Complete Download Folder.<br />Checked every few minutes."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Permissions for completed downloads"
 msgstr ""
@@ -3127,7 +3200,7 @@ msgid "Post-Process Only Verified Jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Only perform post-processing on jobs that passed all PAR2 checks."
+msgid "Only unpack and run scripts on jobs that passed the verification stage. If turned off, all jobs will be marked as Completed even if they are incomplete."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3187,7 +3260,7 @@ msgid "Action when unwanted extension detected"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected in RAR files"
+msgid "Action when an unwanted extension is detected"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3195,7 +3268,15 @@ msgid "Unwanted extensions"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
+msgid "Blacklist"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Whitelist"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3347,6 +3428,14 @@ msgstr ""
 msgid "Delete after download"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Deobfuscate final filenames"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "If filenames of (large) files in the final folder look obfuscated or meaningless they will be renamed to the job name."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "HTTPS certificate verification"
 msgstr ""
@@ -3388,11 +3477,6 @@ msgstr ""
 msgid "On which day of the month or week (1=Monday) does your ISP reset the quota? (Optionally with hh:mm)"
 msgstr ""
 
-#. Auto-resume download on the reset day
-#: sabnzbd/skintext.py
-msgid "Auto resume"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Should downloading resume after the quota is reset?"
 msgstr ""
@@ -3540,6 +3624,18 @@ msgstr ""
 msgid "Timeout"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Account expiration date"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Warn 5 days in advance of account expiration date."
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Quota for this account, counted from the time it is set. In bytes, optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few minutes."
+msgstr ""
+
 #. Server's retention time in days
 #: sabnzbd/skintext.py
 msgid "Retention time"
@@ -3629,6 +3725,14 @@ msgstr ""
 msgid "Personal notes"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Article availability"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "%f% available of %d requested articles"
+msgstr ""
+
 #. Config->Scheduling
 #: sabnzbd/skintext.py
 msgid "Add Schedule"
@@ -3673,6 +3777,16 @@ msgstr ""
 msgid "Force Download"
 msgstr ""
 
+#. Config->RSS edit button
+#: sabnzbd/skintext.py
+msgid "Edit"
+msgstr ""
+
+#. Config->RSS when will be the next RSS scan
+#: sabnzbd/skintext.py
+msgid "Next scan at"
+msgstr ""
+
 #. Config->RSS table column header
 #: sabnzbd/skintext.py
 msgid "Filter"
@@ -3822,7 +3936,7 @@ msgstr ""
 msgid "Enable NotifyOSD"
 msgstr ""
 
-#. Header for OSX Notfication Center section
+#. Header for macOS Notfication Center section
 #: sabnzbd/skintext.py
 msgid "Notification Center"
 msgstr ""
@@ -4354,11 +4468,11 @@ msgid "Date format"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Extra queue column"
+msgid "Extra queue columns"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Extra history column"
+msgid "Extra history columns"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -4442,7 +4556,7 @@ msgid "View Script Log"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Update Available!"
+msgid "Renaming the job will abort Direct Unpack."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -4453,20 +4567,16 @@ msgstr ""
 msgid "Glitter has some (new) features you might like!"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Custom"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Compact layout"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Tabbed layout <br/>(separate queue and history)"
+msgid "Always use full screen width"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Speed"
+msgid "Tabbed layout <br/>(separate queue and history)"
 msgstr ""
 
 #: sabnzbd/skintext.py

po/main/da.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file MAIN
-# Copyright 2011-2020 The SABnzbd-Team
+# Copyright 2011-2021 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.0.0-develop\n"
+"Project-Id-Version: SABnzbd-3.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Danish (https://www.transifex.com/sabnzbd/teams/111101/da/)\n"
@@ -17,6 +17,16 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. Notification - Status page, table column header, actual message
+#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
+msgid "Warning"
+msgstr "Advarsel"
+
+#. Notification
+#: SABnzbd.py, sabnzbd/notifier.py
+msgid "Error"
+msgstr "Fejl"
+
 #. Error message
 #: SABnzbd.py
 msgid "Failed to start web-interface"
@@ -92,6 +102,11 @@ msgstr ""
 "SABnzbd blev startet med kodning %s, dette bør være UTF-8. Forvent problemer"
 " med Unicoded fil- og mappenavne i downloads."
 
+#. Warning message
+#: SABnzbd.py
+msgid "Could not load additional certificates from certifi package"
+msgstr ""
+
 #. Warning message
 #: SABnzbd.py
 msgid "Disabled HTTPS because of missing CERT and KEY files"
@@ -111,16 +126,6 @@ msgstr "Kunne ikke starte web-grænseflade: "
 msgid "SABnzbd %s started"
 msgstr "SABnzbd %s startet"
 
-#. Notification - Status page, table column header, actual message
-#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
-msgid "Warning"
-msgstr "Advarsel"
-
-#. Notification
-#: SABnzbd.py, sabnzbd/notifier.py
-msgid "Error"
-msgstr "Fejl"
-
 #: SABnzbd.py, sabnzbd/interface.py
 msgid "SABnzbd shutdown finished"
 msgstr "SABnzbd lukning udført"
@@ -164,6 +169,11 @@ msgstr "Fejl i tempfile.mkstemp"
 msgid "Loading %s failed"
 msgstr "Downloadning af %s mislykkedes"
 
+#. Warning message
+#: sabnzbd/__init__.py
+msgid "Cannot access PID file %s"
+msgstr ""
+
 #: sabnzbd/api.py, sabnzbd/emailer.py
 msgid "Email succeeded"
 msgstr "E-mail afsendelse mislykkedes"
@@ -218,20 +228,20 @@ msgstr "Fatal fejl i Assembler"
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Paused job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Paused job \"%s\" because of encrypted RAR file (if supplied, all passwords "
+"were tried)"
 msgstr ""
-"Advarsel: Pauset job \"%s\" på grund af krypterede RAR fil (hvis oplyst, "
-"alle adgangskoder blev forsøgt)"
+"Pauset job \"%s\" på grund af krypterede RAR fil (hvis oplyst, alle "
+"adgangskoder blev forsøgt)"
 
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Aborted job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Aborted job \"%s\" because of encrypted RAR file (if supplied, all passwords"
+" were tried)"
 msgstr ""
-"Advarsel: Afbrudt job \"%s\" på grund af krypterede RAR fil (hvis oplyst, "
-"alle adgangskoder blev forsøgt)"
+"Afbrudt job \"%s\" på grund af krypterede RAR fil (hvis oplyst, alle "
+"adgangskoder blev forsøgt)"
 
 #: sabnzbd/assembler.py
 msgid "Aborted, encryption detected"
@@ -239,8 +249,8 @@ msgstr "Afbrudt, kryptering registreret"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
-msgstr "Advarsel: I \"%s\" uønsket extension i RAR fil. Uønsket fil er \"%s\" "
+msgid "In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
+msgstr "I \"%s\" uønsket extension i RAR fil. Uønsket fil er \"%s\" "
 
 #: sabnzbd/assembler.py
 msgid "Unwanted extension is in rar file %s"
@@ -252,13 +262,13 @@ msgstr "Afbrudt, uønsket extension fundet"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Paused job \"%s\" because of rating (%s)"
-msgstr "ADVARSEL: Pause job \"%s\" på grund af rating (%s)"
+msgid "Paused job \"%s\" because of rating (%s)"
+msgstr "Pause job \"%s\" på grund af rating (%s)"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Aborted job \"%s\" because of rating (%s)"
-msgstr "ADVARSEL: Afbrudt job \"%s\" på grund af rating (%s)"
+msgid "Aborted job \"%s\" because of rating (%s)"
+msgstr "Afbrudt job \"%s\" på grund af rating (%s)"
 
 #: sabnzbd/assembler.py
 msgid "Aborted, rating filter matched (%s)"
@@ -311,6 +321,10 @@ msgstr "%s er ikke en godkendt e-mail adresse"
 msgid "Server address required"
 msgstr "Kræver serveradresse"
 
+#: sabnzbd/cfg.py
+msgid "%s is not a valid script"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/config.py
 msgid "Configuration locked, cannot save settings"
@@ -343,10 +357,6 @@ msgstr "%s er ikke et korrekt ciffer værdi"
 msgid "UNC path \"%s\" not allowed here"
 msgstr "UNC søgning \"%s\" er ikke tilladt her"
 
-#: sabnzbd/config.py
-msgid "Error: Path length should be below %s."
-msgstr "Fejl: Sti længde bør være under %s."
-
 #: sabnzbd/config.py
 msgid "Error: Queue not empty, cannot change folder."
 msgstr "Fejl: Køen er ikke tom, kan ikke skifte mappe."
@@ -484,6 +494,16 @@ msgstr "Suspect fejl i downloader"
 msgid "Shutting down"
 msgstr "Påbegynder lukning af SABnzbd"
 
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s is expiring in %s day(s)"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s has used the specified quota"
+msgstr ""
+
 #: sabnzbd/emailer.py
 msgid "Failed to connect to mail server"
 msgstr "Det lykkedes ikke at tilslutte mailserver"
@@ -587,6 +607,15 @@ msgstr "Oprettelse af (%s) mislykkedes"
 msgid "Failed moving %s to %s"
 msgstr "Det lykkedes ikke at flytte %s til %s"
 
+#. Error message
+#: sabnzbd/filesystem.py
+msgid "Blocked attempt to create directory %s"
+msgstr ""
+
+#: sabnzbd/interface.py
+msgid "Refused connection from:"
+msgstr ""
+
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr ""
@@ -628,6 +657,7 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Godkendelse mislykkedes, kontrollere brugernavn/adgangskode."
 
+#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr "Mislykkede login forsøg fra %s"
@@ -647,6 +677,12 @@ msgstr ""
 "derefter på knappen nedenunder..<br /><br /><strong><a "
 "href=\"..\">Opdater</a></strong><br />"
 
+#: 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 "Warning: LOCALHOST is ambiguous, use numerical IP-address."
 msgstr "Advarsel: Localhost er tvetydig, bruge numerisk IP-adresse."
@@ -729,6 +765,15 @@ msgstr "h"
 msgid "m"
 msgstr "m"
 
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Update Available!"
+msgstr "Opdatering tilgængelig!"
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Failed to upload file: %s"
+msgstr ""
+
 #. Error message
 #: sabnzbd/misc.py
 msgid "Error creating SSL key and certificate"
@@ -741,19 +786,25 @@ msgid ""
 "passwords takes a lot of time. Try to only list useful passwords."
 msgstr ""
 
+#. Warning message
+#: sabnzbd/misc.py
+msgid "Failed to read the password file %s"
+msgstr ""
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "[%s] The command in build_command is undefined."
+msgstr ""
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Python script \"%s\" does not have execute (+x) permission set"
+msgstr "Python script \"%s\" har ikke udfør (+x) tilladelsessæt"
+
 #: sabnzbd/newsunpack.py, sabnzbd/postproc.py
 msgid "Running script"
 msgstr "Køre script"
 
-#: sabnzbd/newsunpack.py, sabnzbd/postproc.py
-msgid "PostProcessing was aborted (%s)"
-msgstr "Efterbehandling blev afbrudt (%s)"
-
-#. PP phase "script" - Notification Script settings
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Script"
-msgstr "Script"
-
 #. Warning message
 #: sabnzbd/newsunpack.py
 msgid "Unpack nesting too deep [%s]"
@@ -815,11 +866,6 @@ msgstr "Udpakning mislykkedes, arkivet kræver adgangskode"
 msgid "Unpacking"
 msgstr "Udpakker"
 
-#. PP phase "unpack"
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Unpack"
-msgstr "Udpak"
-
 #: sabnzbd/newsunpack.py
 msgid "Unpacking failed, unable to find %s"
 msgstr "Udpakning mislykkedes, kunne ikke finde %s"
@@ -997,16 +1043,6 @@ msgstr "Tjekker ekstra filer"
 msgid "Checking"
 msgstr "Kontrollerer"
 
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "[%s] The command in build_command is undefined."
-msgstr ""
-
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "Python script \"%s\" does not have execute (+x) permission set"
-msgstr "Python script \"%s\" har ikke udfør (+x) tilladelsessæt"
-
 #: sabnzbd/newsunpack.py
 msgid "Trying SFV verification"
 msgstr "Forsøger SFV verifikation"
@@ -1039,6 +1075,19 @@ msgstr "Wiki"
 msgid "Startup/Shutdown"
 msgstr "Start/lukning"
 
+#. Notification - Pause downloading - Four way switch for duplicates -
+#. Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Pause"
+msgstr "Pause"
+
+#. Notification - Resume downloading - Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Resume"
+msgstr "Genoptag"
+
 #. Notification - Config->RSS after adding to queue
 #: sabnzbd/notifier.py, sabnzbd/skintext.py
 msgid "Added NZB"
@@ -1148,15 +1197,12 @@ msgstr "NZB tilføjet i køen"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Ukendt kodning"
 
-#: sabnzbd/nzbstuff.py
-msgid "%s => missing from all servers, discarding"
-msgstr "%s => mangler fra alle servere, afviser"
-
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
 msgstr "Ødelagt NZB fil %s, springer over (årsag=%s, linje=%s)"
 
+#. Warning message
 #: sabnzbd/nzbstuff.py, sabnzbd/urlgrabber.py
 msgid "Empty NZB file %s"
 msgstr "Tom NZB fil %s"
@@ -1262,10 +1308,6 @@ msgstr "Advarsler"
 msgid "Idle"
 msgstr "Inaktiv"
 
-#: sabnzbd/osxmenu.py
-msgid "Configuration"
-msgstr "Opsætning"
-
 #. Main menu item
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Queue"
@@ -1290,21 +1332,10 @@ msgstr "Tøm historik"
 msgid "Limit Speed"
 msgstr "Hastighedsbegrænsning"
 
-#. Pause downloading - Four way switch for duplicates - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Pause"
-msgstr "Pause"
-
-#: sabnzbd/osxmenu.py
-msgid "min."
-msgstr "min."
-
-#. Resume downloading - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Resume"
-msgstr "Genoptag"
+#. One minute
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+msgid "min"
+msgstr "minut"
 
 #. #: Config->Scheduler
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
@@ -1353,10 +1384,6 @@ msgstr "Tom"
 msgid "History Last 10 Items"
 msgstr "Historik (de 10 seneste poster)"
 
-#: sabnzbd/osxmenu.py
-msgid "New release available"
-msgstr "Ny version tilgængelig"
-
 #: sabnzbd/osxmenu.py
 msgid "Go to wizard"
 msgstr "Gå til guiden"
@@ -1509,6 +1536,10 @@ msgstr "Overførslen kan mislykkes, kun %s af det krævede %s tilgængelig"
 msgid "Download failed - Not on your server(s)"
 msgstr "Download mislykkedes - ikke på din server (e)"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing"
+msgstr "Efterbehandling"
+
 #: sabnzbd/postproc.py
 msgid "Moving"
 msgstr "Flytter"
@@ -1552,6 +1583,10 @@ msgstr "Efterbehandling mislykkedes for %s (%s)"
 msgid "see logfile"
 msgstr "se logfil"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing was aborted"
+msgstr ""
+
 #: sabnzbd/postproc.py
 msgid "Download Failed"
 msgstr "Download mislykkedes"
@@ -1570,10 +1605,6 @@ msgstr "Overførsel fuldført"
 msgid "Cannot create final folder %s"
 msgstr "Kan ikke oprette endelig mappe %s"
 
-#: sabnzbd/postproc.py
-msgid "Post-processing"
-msgstr "Efterbehandling"
-
 #: sabnzbd/postproc.py
 msgid "[%s] No par2 sets"
 msgstr "[%s] Ingen par2 sæt"
@@ -1606,6 +1637,15 @@ msgstr "RAR filer kontrolleres med succes"
 msgid "RAR files failed to verify"
 msgstr "RAR filer kunne ikke bekræfte"
 
+#: sabnzbd/postproc.py
+msgid "Trying RAR renamer"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/postproc.py
+msgid "No matching earlier rar file for %s"
+msgstr ""
+
 #. Error message
 #: sabnzbd/postproc.py
 msgid "Removing %s failed"
@@ -1626,6 +1666,11 @@ msgstr "Det lykkedes ikke systemet at gå i standby"
 msgid "Error while shutting down system"
 msgstr "Fejl ved lukning af system"
 
+#. Error message
+#: sabnzbd/powersup.py
+msgid "Received a DBus exception %s"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/rating.py
 msgid "Indexer id (%s) not found for ratings file"
@@ -1652,10 +1697,6 @@ msgstr ""
 msgid "Incorrect RSS feed description \"%s\""
 msgstr "Forkert RSS-feed beskrivelse \"%s\""
 
-#: sabnzbd/rss.py
-msgid "Failed to retrieve RSS from %s: %s"
-msgstr "Mislykkedes at hente RSS fra %s: %s"
-
 #: sabnzbd/rss.py
 msgid "Do not have valid authentication for feed %s"
 msgstr "Har ikke gyldig godkendelse til feed %s"
@@ -1664,10 +1705,15 @@ msgstr "Har ikke gyldig godkendelse til feed %s"
 msgid "Server side error (server code %s); could not get %s on %s"
 msgstr "Server fejl (server kode %s); kunne ikke få %s på %s"
 
+#: sabnzbd/rss.py
+msgid "Failed to retrieve RSS from %s: %s"
+msgstr "Mislykkedes at hente RSS fra %s: %s"
+
 #: sabnzbd/rss.py, sabnzbd/urlgrabber.py
 msgid "Server %s uses an untrusted HTTPS certificate"
 msgstr "Server %s bruger et upålideligt HTTPS-certifikat"
 
+#. Warning message
 #: sabnzbd/rss.py
 msgid "RSS Feed %s was empty"
 msgstr "RSS Feed %s er tom"
@@ -1757,6 +1803,16 @@ msgstr "Downloader"
 msgid "Join files"
 msgstr "Sammenlægger filer"
 
+#. PP phase "unpack"
+#: sabnzbd/skintext.py
+msgid "Unpack"
+msgstr "Udpak"
+
+#. PP phase "script" - Notification Script settings
+#: sabnzbd/skintext.py
+msgid "Script"
+msgstr "Script"
+
 #. PP Source of the NZB (path or URL) - Where to find the SABnzbd sourcecode
 #: sabnzbd/skintext.py
 msgid "Source"
@@ -1981,11 +2037,6 @@ msgstr "time"
 msgid "hours"
 msgstr "timer"
 
-#. One minute
-#: sabnzbd/skintext.py
-msgid "min"
-msgstr "minut"
-
 #. Multiple minutes
 #: sabnzbd/skintext.py
 msgid "mins"
@@ -2081,6 +2132,10 @@ msgstr "Denne uge"
 msgid "This month"
 msgstr "Denne måned"
 
+#: sabnzbd/skintext.py
+msgid "Selected date range"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Today"
 msgstr "I dag"
@@ -2089,6 +2144,14 @@ msgstr "I dag"
 msgid "Total"
 msgstr "Totalt"
 
+#: sabnzbd/skintext.py
+msgid "Custom"
+msgstr "Tilpasse"
+
+#: sabnzbd/skintext.py
+msgid "Speed"
+msgstr "Hastighed"
+
 #: sabnzbd/skintext.py
 msgid "on"
 msgstr "på"
@@ -2921,6 +2984,12 @@ msgstr "ikke installeret"
 msgid "Enable accessing the interface from a HTTPS address."
 msgstr "Aktiver adgang til interface fra en HTTPS-adresse."
 
+#: sabnzbd/skintext.py
+msgid ""
+"Modern web browsers and other clients will not accept self-signed "
+"certificates and will give a warning and/or won't connect at all."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "HTTPS Port"
 msgstr "HTTPS Port"
@@ -3090,28 +3159,13 @@ msgstr "Generere Ny Nøgle"
 msgid "API Key QR Code"
 msgstr "API nøgle QR kode"
 
-#: sabnzbd/skintext.py
-msgid "List of local network ranges"
-msgstr "Liste over lokale netværk intervaller"
-
-#: sabnzbd/skintext.py
-msgid ""
-"All local network addresses start with these prefixes (often \"192.168.1.\")"
-msgstr ""
-"Alle lokale netværksadresser starter med disse præfikser (ofte "
-"\"192.168.1.\")"
-
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Eksterne internetadgang"
 
 #: sabnzbd/skintext.py
-msgid ""
-"You can set access rights for systems outside your local network. Requires "
-"List of local network ranges to be defined."
+msgid "You can set access rights for systems outside your local network."
 msgstr ""
-"Du kan angive adgangsrettigheder for systemer uden for dit lokale netværk. "
-"Kræver liste over lokale netværks intervaller, skal defineres."
 
 #: sabnzbd/skintext.py
 msgid "No access"
@@ -3193,6 +3247,26 @@ msgstr ""
 "Sted at opbevare færdige, fuldt forarbejdede downloads.<br /><i>Kan "
 "tilsidesættes af bruger-definerede kategorier.</i>"
 
+#: sabnzbd/skintext.py
+msgid "Minimum Free Space for Completed Download Folder"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Will not work if a category folder is on a different disk."
+msgstr ""
+
+#. Auto-resume download on the reset day
+#: sabnzbd/skintext.py
+msgid "Auto resume"
+msgstr "Automatisk genoptag"
+
+#: sabnzbd/skintext.py
+msgid ""
+"Downloading will automatically resume if the minimum free space is available"
+" again.<br />Applies to both the Temporary and Complete Download Folder.<br "
+"/>Checked every few minutes."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Permissions for completed downloads"
 msgstr "Tilladelser til fuldførte overførsler"
@@ -3338,8 +3412,11 @@ msgid "Post-Process Only Verified Jobs"
 msgstr "Efterbehandling kun verificerede jobs"
 
 #: sabnzbd/skintext.py
-msgid "Only perform post-processing on jobs that passed all PAR2 checks."
-msgstr "Kun udføre efterbehandling af jobs som har bestået PAR2 kontrollen."
+msgid ""
+"Only unpack and run scripts on jobs that passed the verification stage. If "
+"turned off, all jobs will be marked as Completed even if they are "
+"incomplete."
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Action when encrypted RAR is downloaded"
@@ -3409,18 +3486,26 @@ msgid "Action when unwanted extension detected"
 msgstr "Aktion når uønsket extension er fundet"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected in RAR files"
-msgstr "Aktion når uønsket extension er fundet i RAR fil"
+msgid "Action when an unwanted extension is detected"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Uønsket extension"
 
 #: sabnzbd/skintext.py
-msgid ""
-"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
+msgid "Blacklist"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Whitelist"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
+" <b>exe, com</b>"
 msgstr ""
-"Vis alle uønskede extensions. For eksempel: <b>exe</b> or <b>exe, com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -3589,6 +3674,16 @@ msgstr "Filtrerer prøve filer (f.eks. video eksempler)."
 msgid "Delete after download"
 msgstr "Fjern efter download"
 
+#: sabnzbd/skintext.py
+msgid "Deobfuscate final filenames"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"If filenames of (large) files in the final folder look obfuscated or "
+"meaningless they will be renamed to the job name."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "HTTPS certificate verification"
 msgstr "verifikation HTTPS certifikat"
@@ -3637,11 +3732,6 @@ msgstr ""
 "På hvilken dag i måneden eller ugen (1 = mandag) nulstiller din "
 "internetudbyder kvota? (Valgfrit med tt: mm)"
 
-#. Auto-resume download on the reset day
-#: sabnzbd/skintext.py
-msgid "Auto resume"
-msgstr "Automatisk genoptag"
-
 #: sabnzbd/skintext.py
 msgid "Should downloading resume after the quota is reset?"
 msgstr "Skal download genoptages efter kvotaen er nulstillet?"
@@ -3796,6 +3886,21 @@ msgstr "Adgangskode"
 msgid "Timeout"
 msgstr "Tidsudløb"
 
+#: sabnzbd/skintext.py
+msgid "Account expiration date"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Warn 5 days in advance of account expiration date."
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Quota for this account, counted from the time it is set. In bytes, "
+"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
+" minutes."
+msgstr ""
+
 #. Server's retention time in days
 #: sabnzbd/skintext.py
 msgid "Retention time"
@@ -3888,6 +3993,14 @@ msgstr "Send gruppe kommandoen, før du anmoder om artikler."
 msgid "Personal notes"
 msgstr "Personlige notater"
 
+#: sabnzbd/skintext.py
+msgid "Article availability"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "%f% available of %d requested articles"
+msgstr ""
+
 #. Config->Scheduling
 #: sabnzbd/skintext.py
 msgid "Add Schedule"
@@ -3940,6 +4053,16 @@ msgstr "Læs Feed"
 msgid "Force Download"
 msgstr "Gennemtving download"
 
+#. Config->RSS edit button
+#: sabnzbd/skintext.py
+msgid "Edit"
+msgstr ""
+
+#. Config->RSS when will be the next RSS scan
+#: sabnzbd/skintext.py
+msgid "Next scan at"
+msgstr ""
+
 #. Config->RSS table column header
 #: sabnzbd/skintext.py
 msgid "Filter"
@@ -4089,7 +4212,7 @@ msgstr "Notifikation sendt!"
 msgid "Enable NotifyOSD"
 msgstr "Aktiver NotifyOSD"
 
-#. Header for OSX Notfication Center section
+#. Header for macOS Notfication Center section
 #: sabnzbd/skintext.py
 msgid "Notification Center"
 msgstr "Notification Center"
@@ -4641,12 +4764,12 @@ msgid "Date format"
 msgstr "Datoformat"
 
 #: sabnzbd/skintext.py
-msgid "Extra queue column"
-msgstr "Ekstra kø kolonne"
+msgid "Extra queue columns"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Extra history column"
-msgstr "Ekstra kolonne historie"
+msgid "Extra history columns"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "page"
@@ -4729,8 +4852,8 @@ msgid "View Script Log"
 msgstr "Vis scriptlog"
 
 #: sabnzbd/skintext.py
-msgid "Update Available!"
-msgstr "Opdatering tilgængelig!"
+msgid "Renaming the job will abort Direct Unpack."
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid ""
@@ -4744,21 +4867,17 @@ msgstr ""
 msgid "Glitter has some (new) features you might like!"
 msgstr "Glitter har nogle (nye) egenskaber, du kan lide!"
 
-#: sabnzbd/skintext.py
-msgid "Custom"
-msgstr "Tilpasse"
-
 #: sabnzbd/skintext.py
 msgid "Compact layout"
 msgstr "Kompakt layout"
 
 #: sabnzbd/skintext.py
-msgid "Tabbed layout <br/>(separate queue and history)"
-msgstr "Tabbed layout <br/>(separat kø og historie)"
+msgid "Always use full screen width"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Speed"
-msgstr "Hastighed"
+msgid "Tabbed layout <br/>(separate queue and history)"
+msgstr "Tabbed layout <br/>(separat kø og historie)"
 
 #: sabnzbd/skintext.py
 msgid "Confirm Queue Deletions"

po/main/de.po

@@ -1,16 +1,19 @@
 # SABnzbd Translation Template file MAIN
-# Copyright 2011-2020 The SABnzbd-Team
+# Copyright 2011-2021 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
-# N S <reloxx@interia.pl>, 2020
-# Safihre <safihre@sabnzbd.org>, 2020
+# 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
+# Safihre <safihre@sabnzbd.org>, 2021
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.0.0-develop\n"
+"Project-Id-Version: SABnzbd-3.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
-"Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
+"Last-Translator: Safihre <safihre@sabnzbd.org>, 2021\n"
 "Language-Team: German (https://www.transifex.com/sabnzbd/teams/111101/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +21,16 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. Notification - Status page, table column header, actual message
+#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
+msgid "Warning"
+msgstr "Achtung"
+
+#. Notification
+#: SABnzbd.py, sabnzbd/notifier.py
+msgid "Error"
+msgstr "Fehler"
+
 #. Error message
 #: SABnzbd.py
 msgid "Failed to start web-interface"
@@ -97,6 +110,11 @@ msgstr ""
 "sein. Es werden Probleme mit Unicode codierten Dateien und "
 "Ordnerbezeichnungen in Downloads erwartet."
 
+#. Warning message
+#: SABnzbd.py
+msgid "Could not load additional certificates from certifi package"
+msgstr "Konnte weitere Zertifikate vom Paket certifi nicht laden."
+
 #. Warning message
 #: SABnzbd.py
 msgid "Disabled HTTPS because of missing CERT and KEY files"
@@ -117,16 +135,6 @@ msgstr "Fehler beim Starten der Web-Oberfläche: "
 msgid "SABnzbd %s started"
 msgstr "SABnzbd %s gestartet"
 
-#. Notification - Status page, table column header, actual message
-#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
-msgid "Warning"
-msgstr "Achtung"
-
-#. Notification
-#: SABnzbd.py, sabnzbd/notifier.py
-msgid "Error"
-msgstr "Fehler"
-
 #: SABnzbd.py, sabnzbd/interface.py
 msgid "SABnzbd shutdown finished"
 msgstr "SABnzbd wurde beendet"
@@ -170,6 +178,11 @@ msgstr "Fehler in tempfile.mkstemp"
 msgid "Loading %s failed"
 msgstr "Fehler beim Laden von %s"
 
+#. Warning message
+#: sabnzbd/__init__.py
+msgid "Cannot access PID file %s"
+msgstr "Zugriff auf PID Datei %s nicht möglich"
+
 #: sabnzbd/api.py, sabnzbd/emailer.py
 msgid "Email succeeded"
 msgstr "E-Mail erfolgreich versendet"
@@ -225,20 +238,20 @@ msgstr "Schwerer Fehler im Assembler"
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Paused job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Paused job \"%s\" because of encrypted RAR file (if supplied, all passwords "
+"were tried)"
 msgstr ""
-"ACHTUNG: \"%s\" wurde angehalten, da es ein verschlüsseltes RAR Archiv "
-"enthält (falls unterstützt, wurden alle Passwörter ausprobiert)"
+"\"%s\" wurde angehalten, da es ein verschlüsseltes RAR Archiv enthält (falls"
+" unterstützt, wurden alle Passwörter ausprobiert)"
 
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Aborted job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Aborted job \"%s\" because of encrypted RAR file (if supplied, all passwords"
+" were tried)"
 msgstr ""
-"ACHTUNG: \"%s\" wurde abgebrochen, da es ein verschlüsseltes RAR Archiv "
-"enthält (falls unterstützt, wurden alle Passwörter ausprobiert)"
+" \"%s\" wurde abgebrochen, da es ein verschlüsseltes RAR Archiv enthält "
+"(falls unterstützt, wurden alle Passwörter ausprobiert)"
 
 #: sabnzbd/assembler.py
 msgid "Aborted, encryption detected"
@@ -246,9 +259,8 @@ msgstr "Abgebrochen, Verschlüsselung vorhanden"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
-msgstr ""
-"WARNUNG: Unerwünschter Typ \"%s\" in RAR Datei. Unerwünschte Datei ist %s "
+msgid "In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
+msgstr "Unerwünschter Typ \"%s\" in RAR Datei. Unerwünschte Datei ist %s "
 
 #: sabnzbd/assembler.py
 msgid "Unwanted extension is in rar file %s"
@@ -260,13 +272,13 @@ msgstr "Abgebrochen, unerwünschte Dateieindung gefunden"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Paused job \"%s\" because of rating (%s)"
-msgstr "WARNUNG: Aufgabe \"%s\" aufgrund der Bewertung (%s) pausiert."
+msgid "Paused job \"%s\" because of rating (%s)"
+msgstr "Aufgabe \"%s\" aufgrund der Bewertung (%s) pausiert."
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Aborted job \"%s\" because of rating (%s)"
-msgstr "Warnung: Aufgabe \"%s\" aufgrund der Bewertung (%s) abgebrochen"
+msgid "Aborted job \"%s\" because of rating (%s)"
+msgstr "Aufgabe \"%s\" aufgrund der Bewertung (%s) abgebrochen"
 
 #: sabnzbd/assembler.py
 msgid "Aborted, rating filter matched (%s)"
@@ -321,6 +333,10 @@ msgstr "%s ist keine gültige E-Mail-Adresse"
 msgid "Server address required"
 msgstr "Server-Adresse wird benötigt"
 
+#: sabnzbd/cfg.py
+msgid "%s is not a valid script"
+msgstr "%s ist kein gültiges Script"
+
 #. Warning message
 #: sabnzbd/config.py
 msgid "Configuration locked, cannot save settings"
@@ -354,10 +370,6 @@ msgstr "%s ist kein gültiger Oktal-Wert"
 msgid "UNC path \"%s\" not allowed here"
 msgstr "UNC-Pfad \"%s\" ist hier nicht erlaubt"
 
-#: sabnzbd/config.py
-msgid "Error: Path length should be below %s."
-msgstr "Fehler: Dateipfadlänge sollte kürzer als %s sein."
-
 #: sabnzbd/config.py
 msgid "Error: Queue not empty, cannot change folder."
 msgstr ""
@@ -502,6 +514,16 @@ msgstr "Vermute Fehler im Downloader"
 msgid "Shutting down"
 msgstr "Wird beendet …"
 
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s is expiring in %s day(s)"
+msgstr "Server %s läuft in %s tag(en) ab"
+
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s has used the specified quota"
+msgstr "Server %s hat die angegebene Quote verbraucht"
+
 #: sabnzbd/emailer.py
 msgid "Failed to connect to mail server"
 msgstr "Verbindung zum Mail-Server konnte nicht hergestellt werden"
@@ -607,6 +629,15 @@ msgstr "Erstellen von %s fehlgeschlagen"
 msgid "Failed moving %s to %s"
 msgstr "Verschieben von %s nach %s fehlgeschlagen"
 
+#. Error message
+#: sabnzbd/filesystem.py
+msgid "Blocked attempt to create directory %s"
+msgstr "Versuch das Verzeichnis %s zu erstellen wurde blockiert"
+
+#: sabnzbd/interface.py
+msgid "Refused connection from:"
+msgstr "Abgelehnte Verbindung von:"
+
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr "Verbindung vom Host \"%s\" abgelehnt von:"
@@ -649,6 +680,7 @@ msgid "Authentication failed, check username/password."
 msgstr ""
 "Authentifizierung fehlgeschlagen. Überprüfen Sie Benutzername und Passwort."
 
+#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr "Fehlerhafter Login Versuch von %s"
@@ -668,6 +700,14 @@ msgstr ""
 " danach auf folgenden Knopf.<br /><br /><strong><a "
 "href=\"..\">Aktualisieren</a></strong><br />"
 
+#: 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 "Warning: LOCALHOST is ambiguous, use numerical IP-address."
 msgstr ""
@@ -753,6 +793,15 @@ msgstr "h"
 msgid "m"
 msgstr "m"
 
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Update Available!"
+msgstr "Neue Version verfügbar!"
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Failed to upload file: %s"
+msgstr "Hochladen fehlgeschlagen: %s"
+
 #. Error message
 #: sabnzbd/misc.py
 msgid "Error creating SSL key and certificate"
@@ -768,19 +817,25 @@ msgstr ""
 "Passwörter dauert sehr lange. Versuchen Sie, nur nützliche Passwörter "
 "aufzulisten."
 
+#. Warning message
+#: sabnzbd/misc.py
+msgid "Failed to read the password file %s"
+msgstr "Die Passwortdatei %s konnte nicht gelesen werden"
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "[%s] The command in build_command is undefined."
+msgstr "[%s] Der Befehl in build_command ist nicht definiert."
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Python script \"%s\" does not have execute (+x) permission set"
+msgstr "Dem Pythonskript \"%s\" fehlen die Ausführungsrechte (+x)"
+
 #: sabnzbd/newsunpack.py, sabnzbd/postproc.py
 msgid "Running script"
 msgstr "Ausführen des Skripts"
 
-#: sabnzbd/newsunpack.py, sabnzbd/postproc.py
-msgid "PostProcessing was aborted (%s)"
-msgstr "Nachbearbeitung wurde abgebrochen (%s)"
-
-#. PP phase "script" - Notification Script settings
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Script"
-msgstr "Skript"
-
 #. Warning message
 #: sabnzbd/newsunpack.py
 msgid "Unpack nesting too deep [%s]"
@@ -842,11 +897,6 @@ msgstr "Entpacken fehlgeschlagen. Archiv benötigt ein Passwort."
 msgid "Unpacking"
 msgstr "Entpacken"
 
-#. PP phase "unpack"
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Unpack"
-msgstr "Entpacken"
-
 #: sabnzbd/newsunpack.py
 msgid "Unpacking failed, unable to find %s"
 msgstr "Entpacken fehlgeschlagen. Konnte %s nicht finden."
@@ -1028,16 +1078,6 @@ msgstr "Überprüfe zusätzliche Dateien"
 msgid "Checking"
 msgstr "Wird überprüft"
 
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "[%s] The command in build_command is undefined."
-msgstr "[%s] Der Befehl in build_command ist nicht definiert."
-
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "Python script \"%s\" does not have execute (+x) permission set"
-msgstr "Dem Pythonskript \"%s\" fehlen die Ausführungsrechte (+x)"
-
 #: sabnzbd/newsunpack.py
 msgid "Trying SFV verification"
 msgstr "Versuche SFV-Überprüfung"
@@ -1073,6 +1113,19 @@ msgstr "Wiki"
 msgid "Startup/Shutdown"
 msgstr "Starten/Beenden"
 
+#. Notification - Pause downloading - Four way switch for duplicates -
+#. Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Pause"
+msgstr "Anhalten"
+
+#. Notification - Resume downloading - Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Resume"
+msgstr "Fortsetzen"
+
 #. Notification - Config->RSS after adding to queue
 #: sabnzbd/notifier.py, sabnzbd/skintext.py
 msgid "Added NZB"
@@ -1182,15 +1235,12 @@ msgstr "NZB zur Warteschlange hinzugefügt"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Unbekannte Kodierung"
 
-#: sabnzbd/nzbstuff.py
-msgid "%s => missing from all servers, discarding"
-msgstr "%s wurde auf keinem Server gefunden und daher übersprungen"
-
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
 msgstr "Ungültige NZB-Datei %s wird übersprungen: %s auf Zeile %s"
 
+#. Warning message
 #: sabnzbd/nzbstuff.py, sabnzbd/urlgrabber.py
 msgid "Empty NZB file %s"
 msgstr "Leere NZB-Datei %s"
@@ -1299,10 +1349,6 @@ msgstr "Warnungen"
 msgid "Idle"
 msgstr "Leerlauf"
 
-#: sabnzbd/osxmenu.py
-msgid "Configuration"
-msgstr "Einstellungen"
-
 #. Main menu item
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Queue"
@@ -1327,21 +1373,10 @@ msgstr "Verlauf leeren"
 msgid "Limit Speed"
 msgstr "Geschwindigkeit begrenzen"
 
-#. Pause downloading - Four way switch for duplicates - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Pause"
-msgstr "Anhalten"
-
-#: sabnzbd/osxmenu.py
-msgid "min."
-msgstr "Min."
-
-#. Resume downloading - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Resume"
-msgstr "Fortsetzen"
+#. One minute
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+msgid "min"
+msgstr "Minuten"
 
 #. #: Config->Scheduler
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
@@ -1390,10 +1425,6 @@ msgstr "Leer"
 msgid "History Last 10 Items"
 msgstr "Verlauf mit den letzten 10 Einträgen"
 
-#: sabnzbd/osxmenu.py
-msgid "New release available"
-msgstr "Neue Version verfügbar"
-
 #: sabnzbd/osxmenu.py
 msgid "Go to wizard"
 msgstr "Assistent öffnen"
@@ -1558,6 +1589,10 @@ msgstr ""
 msgid "Download failed - Not on your server(s)"
 msgstr "Download fehlgeschlagen - Nicht auf deinem/n Server/n vorhanden"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing"
+msgstr "Nachbearbeitung"
+
 #: sabnzbd/postproc.py
 msgid "Moving"
 msgstr "Verschiebevorgang"
@@ -1601,6 +1636,10 @@ msgstr "Nachbearbeitung von %s fehlgeschlagen (%s)"
 msgid "see logfile"
 msgstr "Beachten Sie die Protokolldatei"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing was aborted"
+msgstr "Nachbearbeitung wurde abgebrochen"
+
 #: sabnzbd/postproc.py
 msgid "Download Failed"
 msgstr "Download Fehlgeschlagen"
@@ -1619,10 +1658,6 @@ msgstr "Download fertig"
 msgid "Cannot create final folder %s"
 msgstr "Konnte Download-Ordner %s nicht anlegen"
 
-#: sabnzbd/postproc.py
-msgid "Post-processing"
-msgstr "Nachbearbeitung"
-
 #: sabnzbd/postproc.py
 msgid "[%s] No par2 sets"
 msgstr "[%s] Keine PAR2-Sätze"
@@ -1655,6 +1690,15 @@ msgstr "RAR-Datei erfolgreich überprüft"
 msgid "RAR files failed to verify"
 msgstr "RAR-Datei konnten nicht überprüft werden"
 
+#: sabnzbd/postproc.py
+msgid "Trying RAR renamer"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/postproc.py
+msgid "No matching earlier rar file for %s"
+msgstr "Keine zugehörige frühere RAR-Datei für %s"
+
 #. Error message
 #: sabnzbd/postproc.py
 msgid "Removing %s failed"
@@ -1675,6 +1719,11 @@ msgstr "Fehler beim Wechsel in den Bereitschaftsmodus"
 msgid "Error while shutting down system"
 msgstr "Fehler beim Herunterfahren des Systems"
 
+#. Error message
+#: sabnzbd/powersup.py
+msgid "Received a DBus exception %s"
+msgstr "DBus-Ausnahmefehler empfangen %s "
+
 #. Warning message
 #: sabnzbd/rating.py
 msgid "Indexer id (%s) not found for ratings file"
@@ -1701,10 +1750,6 @@ msgstr ""
 msgid "Incorrect RSS feed description \"%s\""
 msgstr "Ungültige RSS-Feed-Beschreibung \"%s\""
 
-#: sabnzbd/rss.py
-msgid "Failed to retrieve RSS from %s: %s"
-msgstr "Abrufen des RSS-Feeds von %s fehlgeschlagen: %s"
-
 #: sabnzbd/rss.py
 msgid "Do not have valid authentication for feed %s"
 msgstr "Keine gültige Berechtigung für Feed %s"
@@ -1713,10 +1758,15 @@ msgstr "Keine gültige Berechtigung für Feed %s"
 msgid "Server side error (server code %s); could not get %s on %s"
 msgstr "Server-Fehler (Code %s); konnte %s von %s nicht laden"
 
+#: sabnzbd/rss.py
+msgid "Failed to retrieve RSS from %s: %s"
+msgstr "Abrufen des RSS-Feeds von %s fehlgeschlagen: %s"
+
 #: sabnzbd/rss.py, sabnzbd/urlgrabber.py
 msgid "Server %s uses an untrusted HTTPS certificate"
 msgstr "Der Server %s nutzt ein nicht vertrauenswürdiges HTTPS-Zertifikat"
 
+#. Warning message
 #: sabnzbd/rss.py
 msgid "RSS Feed %s was empty"
 msgstr "RSS-Feed %s war leer"
@@ -1806,6 +1856,16 @@ msgstr "Herunterladen"
 msgid "Join files"
 msgstr "Dateien zusammenfügen"
 
+#. PP phase "unpack"
+#: sabnzbd/skintext.py
+msgid "Unpack"
+msgstr "Entpacken"
+
+#. PP phase "script" - Notification Script settings
+#: sabnzbd/skintext.py
+msgid "Script"
+msgstr "Skript"
+
 #. PP Source of the NZB (path or URL) - Where to find the SABnzbd sourcecode
 #: sabnzbd/skintext.py
 msgid "Source"
@@ -2030,11 +2090,6 @@ msgstr "Stunde"
 msgid "hours"
 msgstr "Stunden"
 
-#. One minute
-#: sabnzbd/skintext.py
-msgid "min"
-msgstr "Minuten"
-
 #. Multiple minutes
 #: sabnzbd/skintext.py
 msgid "mins"
@@ -2130,6 +2185,10 @@ msgstr "Diese Woche"
 msgid "This month"
 msgstr "Dieser Monat"
 
+#: sabnzbd/skintext.py
+msgid "Selected date range"
+msgstr "Ausgewählter Datumsbereich"
+
 #: sabnzbd/skintext.py
 msgid "Today"
 msgstr "Heute"
@@ -2138,6 +2197,14 @@ msgstr "Heute"
 msgid "Total"
 msgstr "Gesamt"
 
+#: sabnzbd/skintext.py
+msgid "Custom"
+msgstr "Benutzerdefiniert"
+
+#: sabnzbd/skintext.py
+msgid "Speed"
+msgstr "Geschwindigkeit"
+
 #: sabnzbd/skintext.py
 msgid "on"
 msgstr "An"
@@ -2985,6 +3052,15 @@ msgstr "nicht installiert"
 msgid "Enable accessing the interface from a HTTPS address."
 msgstr "Zugriff auf die Oberfläche über HTTPS-Adressen erlauben"
 
+#: sabnzbd/skintext.py
+msgid ""
+"Modern web browsers and other clients will not accept self-signed "
+"certificates and will give a warning and/or won't connect at all."
+msgstr ""
+"Moderne Webbrowser und andere Clients akzeptieren keine selbstsignierten "
+"Zertifikate und geben eine Warnung aus und/oder stellen gar keine Verbindung"
+" her."
+
 #: sabnzbd/skintext.py
 msgid "HTTPS Port"
 msgstr "HTTPS-Port"
@@ -3163,28 +3239,14 @@ msgstr "Neuen Schlüssel generieren"
 msgid "API Key QR Code"
 msgstr "API-Key OR-Code"
 
-#: sabnzbd/skintext.py
-msgid "List of local network ranges"
-msgstr "Liste der lokalen Netzwerkadressenbereiche"
-
-#: sabnzbd/skintext.py
-msgid ""
-"All local network addresses start with these prefixes (often \"192.168.1.\")"
-msgstr ""
-"Alle lokalen Netzwerkadressen starten mit diesen Präfixen (oft "
-"\"192.168.1.1\")"
-
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Externer Internetzugriff"
 
 #: sabnzbd/skintext.py
-msgid ""
-"You can set access rights for systems outside your local network. Requires "
-"List of local network ranges to be defined."
+msgid "You can set access rights for systems outside your local network."
 msgstr ""
-"Du kannst Zugriffsrechte für Systeme ausserhalb deines Netzwerkes setzen. "
-"Benötigt die Definition einer Liste von lokalen Netzwerkbereichen."
+"Du kannst Zugriffsrechte für Systeme ausserhalb deines Netzwerkes setzen."
 
 #: sabnzbd/skintext.py
 msgid "No access"
@@ -3268,6 +3330,31 @@ msgstr ""
 "Hier werden fertige, verarbeitete Downloads abgelegt.<br /><i>Kann von "
 "benutzerdefinierten Kategorien ausser Kraft gesetzt werden.</i>"
 
+#: sabnzbd/skintext.py
+msgid "Minimum Free Space for Completed Download Folder"
+msgstr "Minimaler freier Speicherplatz im Download Ordner"
+
+#: sabnzbd/skintext.py
+msgid "Will not work if a category folder is on a different disk."
+msgstr ""
+"Funktioniert nicht, wenn sich der Kategorie Ordner auf einer anderen "
+"Festplatte befindet."
+
+#. Auto-resume download on the reset day
+#: sabnzbd/skintext.py
+msgid "Auto resume"
+msgstr "Automatisch fortsetzen"
+
+#: sabnzbd/skintext.py
+msgid ""
+"Downloading will automatically resume if the minimum free space is available"
+" again.<br />Applies to both the Temporary and Complete Download Folder.<br "
+"/>Checked every few minutes."
+msgstr ""
+"Das Herunterladen wird automatisch fortgesetzt, wenn der minimale freie Speicherplatz wieder verfügbar ist. <br />\n"
+"Gilt sowohl für den temporären als auch für den Download Ordner.<br />\n"
+"Wird alle paar Minuten überprüft."
+
 #: sabnzbd/skintext.py
 msgid "Permissions for completed downloads"
 msgstr "Rechte für fertige Downloads"
@@ -3418,10 +3505,14 @@ msgid "Post-Process Only Verified Jobs"
 msgstr "Nur überprüfte Aufträge nachbearbeiten"
 
 #: sabnzbd/skintext.py
-msgid "Only perform post-processing on jobs that passed all PAR2 checks."
+msgid ""
+"Only unpack and run scripts on jobs that passed the verification stage. If "
+"turned off, all jobs will be marked as Completed even if they are "
+"incomplete."
 msgstr ""
-"Die Nachbearbeitung nur für Aufträge durchführen,<br />die alle "
-"PAR2-Überprüfungen bestanden haben."
+"Entpacken und starten von Skripten nur bei verifizierten Jobs. Wenn "
+"ausgeschaltet werden alle Jobs als vollständig markiert, selbst wenn sie "
+"unvollständig sind."
 
 #: sabnzbd/skintext.py
 msgid "Action when encrypted RAR is downloaded"
@@ -3494,19 +3585,26 @@ msgid "Action when unwanted extension detected"
 msgstr "Aktion bei ungewollter Dateienendung"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected in RAR files"
-msgstr "Aktion bei ungewollter Dateiendung innerhalb RAR-Archiven"
+msgid "Action when an unwanted extension is detected"
+msgstr "Aktion bei ungewollter Dateienendung"
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Ungewollte Dateiendungen"
 
+#: sabnzbd/skintext.py
+msgid "Blacklist"
+msgstr "Blacklist"
+
+#: sabnzbd/skintext.py
+msgid "Whitelist"
+msgstr "Whitelist"
+
 #: sabnzbd/skintext.py
 msgid ""
-"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
+"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
+" <b>exe, com</b>"
 msgstr ""
-"Liste aller ungewollter Dateiendungen. Zum Beispiel: <b>exe</b> or <b>exe, "
-"com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -3685,6 +3783,18 @@ msgstr "Beispieldateien herausfiltern (z.B. Videoausschnitte)"
 msgid "Delete after download"
 msgstr "Nach dem Download löschen"
 
+#: sabnzbd/skintext.py
+msgid "Deobfuscate final filenames"
+msgstr "Entschleiere finale Dateinamen"
+
+#: sabnzbd/skintext.py
+msgid ""
+"If filenames of (large) files in the final folder look obfuscated or "
+"meaningless they will be renamed to the job name."
+msgstr ""
+"Dateinamen von (großen) Dateien im Zielordner werden in den Auftragsnamen "
+"umbenannt, wenn sie verschleiert oder bedeutungslos aussehen."
+
 #: sabnzbd/skintext.py
 msgid "HTTPS certificate verification"
 msgstr "HTTPS Zertifikat Überprüfung"
@@ -3733,11 +3843,6 @@ msgstr ""
 "An welchem Tag des Monats oder der Woche (1=Montag) setzt Ihr ISP das "
 "Kontingent zurück (optional mit hh:mm)?"
 
-#. Auto-resume download on the reset day
-#: sabnzbd/skintext.py
-msgid "Auto resume"
-msgstr "Automatisch fortsetzen"
-
 #: sabnzbd/skintext.py
 msgid "Should downloading resume after the quota is reset?"
 msgstr ""
@@ -3901,6 +4006,21 @@ msgstr "Passwort"
 msgid "Timeout"
 msgstr "Zeitüberschreitung"
 
+#: sabnzbd/skintext.py
+msgid "Account expiration date"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Warn 5 days in advance of account expiration date."
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Quota for this account, counted from the time it is set. In bytes, "
+"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
+" minutes."
+msgstr ""
+
 #. Server's retention time in days
 #: sabnzbd/skintext.py
 msgid "Retention time"
@@ -3994,6 +4114,14 @@ msgstr "Gruppen-Befehl senden, bevor Artikeln angefordert werden."
 msgid "Personal notes"
 msgstr "Persönliche Notizen"
 
+#: sabnzbd/skintext.py
+msgid "Article availability"
+msgstr "Verfügbarkeit der Artikel"
+
+#: sabnzbd/skintext.py
+msgid "%f% available of %d requested articles"
+msgstr "%f vorhanden von %d angefragten Artikeln"
+
 #. Config->Scheduling
 #: sabnzbd/skintext.py
 msgid "Add Schedule"
@@ -4046,6 +4174,16 @@ msgstr "Feed lesen"
 msgid "Force Download"
 msgstr "Download erzwingen"
 
+#. Config->RSS edit button
+#: sabnzbd/skintext.py
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#. Config->RSS when will be the next RSS scan
+#: sabnzbd/skintext.py
+msgid "Next scan at"
+msgstr "Nächster scan um"
+
 #. Config->RSS table column header
 #: sabnzbd/skintext.py
 msgid "Filter"
@@ -4197,7 +4335,7 @@ msgstr "Benachrichtigung gesendet!"
 msgid "Enable NotifyOSD"
 msgstr "NotifyOSD aktivieren"
 
-#. Header for OSX Notfication Center section
+#. Header for macOS Notfication Center section
 #: sabnzbd/skintext.py
 msgid "Notification Center"
 msgstr "Benachrichtigungscenter"
@@ -4751,12 +4889,12 @@ msgid "Date format"
 msgstr "Datumsformat"
 
 #: sabnzbd/skintext.py
-msgid "Extra queue column"
-msgstr "Extra Warteschlangen-Spalte"
+msgid "Extra queue columns"
+msgstr "Weitere Warteschlangen Spalten"
 
 #: sabnzbd/skintext.py
-msgid "Extra history column"
-msgstr "Extra Verlauf-Spalte"
+msgid "Extra history columns"
+msgstr "Weitere Verlauf Spalten"
 
 #: sabnzbd/skintext.py
 msgid "page"
@@ -4839,8 +4977,8 @@ msgid "View Script Log"
 msgstr "Skript-Protokoll anzeigen"
 
 #: sabnzbd/skintext.py
-msgid "Update Available!"
-msgstr "Neue Version verfügbar!"
+msgid "Renaming the job will abort Direct Unpack."
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid ""
@@ -4854,21 +4992,17 @@ msgstr ""
 msgid "Glitter has some (new) features you might like!"
 msgstr "Glitter hat ein paar (neue) Feature die du bestimmt magst!"
 
-#: sabnzbd/skintext.py
-msgid "Custom"
-msgstr "Benutzerdefiniert"
-
 #: sabnzbd/skintext.py
 msgid "Compact layout"
 msgstr "Kompaktes Layout"
 
 #: sabnzbd/skintext.py
-msgid "Tabbed layout <br/>(separate queue and history)"
-msgstr "Tab Layout <br/>(separate Warteschlange und Verlauf)"
+msgid "Always use full screen width"
+msgstr "Benutze die volle Fensterbreite"
 
 #: sabnzbd/skintext.py
-msgid "Speed"
-msgstr "Geschwindigkeit"
+msgid "Tabbed layout <br/>(separate queue and history)"
+msgstr "Tab Layout <br/>(separate Warteschlange und Verlauf)"
 
 #: sabnzbd/skintext.py
 msgid "Confirm Queue Deletions"

po/main/fi.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file MAIN
-# Copyright 2011-2020 The SABnzbd-Team
+# Copyright 2011-2021 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.0.0-develop\n"
+"Project-Id-Version: SABnzbd-3.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Finnish (https://www.transifex.com/sabnzbd/teams/111101/fi/)\n"
@@ -17,6 +17,16 @@ msgstr ""
 "Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. Notification - Status page, table column header, actual message
+#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
+msgid "Warning"
+msgstr "Varoitus"
+
+#. Notification
+#: SABnzbd.py, sabnzbd/notifier.py
+msgid "Error"
+msgstr "Virhe"
+
 #. Error message
 #: SABnzbd.py
 msgid "Failed to start web-interface"
@@ -92,6 +102,11 @@ msgstr ""
 "Unicode-merkkejä tiedosto- ja kansionimissä sisältävät lataukset voivat "
 "aiheuttaa ongelmia."
 
+#. Warning message
+#: SABnzbd.py
+msgid "Could not load additional certificates from certifi package"
+msgstr ""
+
 #. Warning message
 #: SABnzbd.py
 msgid "Disabled HTTPS because of missing CERT and KEY files"
@@ -112,16 +127,6 @@ msgstr "Web-käyttöliittymän käynnistys epäonnistui : "
 msgid "SABnzbd %s started"
 msgstr "SABnzbd %s käynnistetty"
 
-#. Notification - Status page, table column header, actual message
-#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
-msgid "Warning"
-msgstr "Varoitus"
-
-#. Notification
-#: SABnzbd.py, sabnzbd/notifier.py
-msgid "Error"
-msgstr "Virhe"
-
 #: SABnzbd.py, sabnzbd/interface.py
 msgid "SABnzbd shutdown finished"
 msgstr "SABnzbd sammutus valmis"
@@ -165,6 +170,11 @@ msgstr "Virhe tiedostossa tempfile.mkstemp"
 msgid "Loading %s failed"
 msgstr "Kohteen %s lataaminen epäonnistui"
 
+#. Warning message
+#: sabnzbd/__init__.py
+msgid "Cannot access PID file %s"
+msgstr ""
+
 #: sabnzbd/api.py, sabnzbd/emailer.py
 msgid "Email succeeded"
 msgstr "Sähköpostitus onnistui"
@@ -219,15 +229,15 @@ msgstr "Vakava virhe kohteessa Assembler"
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Paused job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Paused job \"%s\" because of encrypted RAR file (if supplied, all passwords "
+"were tried)"
 msgstr ""
 
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Aborted job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Aborted job \"%s\" because of encrypted RAR file (if supplied, all passwords"
+" were tried)"
 msgstr ""
 
 #: sabnzbd/assembler.py
@@ -236,10 +246,8 @@ msgstr "Peruutettu, salattu arkisto tunnistettu"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
+msgid "In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
 msgstr ""
-"Varoitus: Latauksessa \"%s\" ei toivottu tiedostopääte RAR arkistossa. Ei "
-"toivottu tiedosto on %s "
 
 #: sabnzbd/assembler.py
 msgid "Unwanted extension is in rar file %s"
@@ -251,13 +259,13 @@ msgstr "Peruutettu, ei toivottu tiedostopääte havaittu"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Paused job \"%s\" because of rating (%s)"
-msgstr "VAROITUS : Keskeytetty lataus \"%s\", koska luokituksena (%s)"
+msgid "Paused job \"%s\" because of rating (%s)"
+msgstr ""
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Aborted job \"%s\" because of rating (%s)"
-msgstr "VAROITUS : Peruutettiin lataus \"%s\", koska luokituksena on (%s)"
+msgid "Aborted job \"%s\" because of rating (%s)"
+msgstr ""
 
 #: sabnzbd/assembler.py
 msgid "Aborted, rating filter matched (%s)"
@@ -310,6 +318,10 @@ msgstr "%s ei ole kelvollinen sähköpostiosoite"
 msgid "Server address required"
 msgstr "Palvelimen osoite vaaditaan"
 
+#: sabnzbd/cfg.py
+msgid "%s is not a valid script"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/config.py
 msgid "Configuration locked, cannot save settings"
@@ -342,10 +354,6 @@ msgstr "%s ei ole oikea oktaalinen arvo"
 msgid "UNC path \"%s\" not allowed here"
 msgstr "TUNT polku \"%s\" ei ole sallittu"
 
-#: sabnzbd/config.py
-msgid "Error: Path length should be below %s."
-msgstr "Virhe: Polun pituus täytyy olla alle %s."
-
 #: sabnzbd/config.py
 msgid "Error: Queue not empty, cannot change folder."
 msgstr "Virhe: Jono ei ole tyhjä, kansiota ei voida vaihtaa."
@@ -482,6 +490,16 @@ msgstr "Mahdollinen virhe lataajassa"
 msgid "Shutting down"
 msgstr "Sammutetaan"
 
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s is expiring in %s day(s)"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s has used the specified quota"
+msgstr ""
+
 #: sabnzbd/emailer.py
 msgid "Failed to connect to mail server"
 msgstr "Postipalvelimeen yhdistäminen epäonnistui"
@@ -585,6 +603,15 @@ msgstr "Kohteen (%s) luominen epäonnistui"
 msgid "Failed moving %s to %s"
 msgstr "Kohteen %s siirtäminen kohteeseen %s epäonnistui"
 
+#. Error message
+#: sabnzbd/filesystem.py
+msgid "Blocked attempt to create directory %s"
+msgstr ""
+
+#: sabnzbd/interface.py
+msgid "Refused connection from:"
+msgstr ""
+
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr ""
@@ -626,6 +653,7 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Varmennus epäonnistui, tarkista käyttäjänimi/salasana."
 
+#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr ""
@@ -645,6 +673,12 @@ msgstr ""
 "sitten alapuolella olevaa nappia.<br /><br /><strong><a "
 "href=\"..\">Päivitä</a></strong><br />"
 
+#: 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 "Warning: LOCALHOST is ambiguous, use numerical IP-address."
 msgstr "Varoitus: LOCALHOST on hämärä, käytä numeerista IP-osoitetta."
@@ -727,6 +761,15 @@ msgstr "t"
 msgid "m"
 msgstr "m"
 
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Update Available!"
+msgstr "Päivitys saatavilla!"
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Failed to upload file: %s"
+msgstr ""
+
 #. Error message
 #: sabnzbd/misc.py
 msgid "Error creating SSL key and certificate"
@@ -739,19 +782,25 @@ msgid ""
 "passwords takes a lot of time. Try to only list useful passwords."
 msgstr ""
 
+#. Warning message
+#: sabnzbd/misc.py
+msgid "Failed to read the password file %s"
+msgstr ""
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "[%s] The command in build_command is undefined."
+msgstr ""
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Python script \"%s\" does not have execute (+x) permission set"
+msgstr ""
+
 #: sabnzbd/newsunpack.py, sabnzbd/postproc.py
 msgid "Running script"
 msgstr "Ajetaan skripti"
 
-#: sabnzbd/newsunpack.py, sabnzbd/postproc.py
-msgid "PostProcessing was aborted (%s)"
-msgstr "Jälkikäsittely peruutettiin (%s)"
-
-#. PP phase "script" - Notification Script settings
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Script"
-msgstr "Skripti"
-
 #. Warning message
 #: sabnzbd/newsunpack.py
 msgid "Unpack nesting too deep [%s]"
@@ -813,11 +862,6 @@ msgstr "Purkaminen epäonnistui, arkisto vaatii salasanan"
 msgid "Unpacking"
 msgstr "Puretaan"
 
-#. PP phase "unpack"
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Unpack"
-msgstr "Pura"
-
 #: sabnzbd/newsunpack.py
 msgid "Unpacking failed, unable to find %s"
 msgstr "Purkaminen epäonnistui, %s ei löydy"
@@ -992,16 +1036,6 @@ msgstr ""
 msgid "Checking"
 msgstr "Tarkistetaan"
 
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "[%s] The command in build_command is undefined."
-msgstr ""
-
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "Python script \"%s\" does not have execute (+x) permission set"
-msgstr ""
-
 #: sabnzbd/newsunpack.py
 msgid "Trying SFV verification"
 msgstr "Yritetään SFV varmennusta"
@@ -1034,6 +1068,19 @@ msgstr "Wiki"
 msgid "Startup/Shutdown"
 msgstr "Käynnistys/Sammutus"
 
+#. Notification - Pause downloading - Four way switch for duplicates -
+#. Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Pause"
+msgstr "Keskeytä"
+
+#. Notification - Resume downloading - Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Resume"
+msgstr "Jatka"
+
 #. Notification - Config->RSS after adding to queue
 #: sabnzbd/notifier.py, sabnzbd/skintext.py
 msgid "Added NZB"
@@ -1143,15 +1190,12 @@ msgstr "NZB lisätty jonoon"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Tuntematon koodaus"
 
-#: sabnzbd/nzbstuff.py
-msgid "%s => missing from all servers, discarding"
-msgstr "%s => puuttuu kaikilta palvelimilta, hylätään"
-
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
 msgstr "Virheellinen NZB tiedosto %s, ohitetaan (syy=%s, rivi=%s)"
 
+#. Warning message
 #: sabnzbd/nzbstuff.py, sabnzbd/urlgrabber.py
 msgid "Empty NZB file %s"
 msgstr "Tyhjä NZB tiedosto %s"
@@ -1257,10 +1301,6 @@ msgstr "Varoitukset"
 msgid "Idle"
 msgstr "Toimeton"
 
-#: sabnzbd/osxmenu.py
-msgid "Configuration"
-msgstr "Asetukset"
-
 #. Main menu item
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Queue"
@@ -1285,21 +1325,10 @@ msgstr "Tyhjennä historia"
 msgid "Limit Speed"
 msgstr "Nopeusrajoitus"
 
-#. Pause downloading - Four way switch for duplicates - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Pause"
-msgstr "Keskeytä"
-
-#: sabnzbd/osxmenu.py
-msgid "min."
-msgstr "min."
-
-#. Resume downloading - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Resume"
-msgstr "Jatka"
+#. One minute
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+msgid "min"
+msgstr "minuutti"
 
 #. #: Config->Scheduler
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
@@ -1348,10 +1377,6 @@ msgstr "Tyhjä"
 msgid "History Last 10 Items"
 msgstr "Vie viimeiset 10 kohdetta historiaan"
 
-#: sabnzbd/osxmenu.py
-msgid "New release available"
-msgstr "Uusi versio saatavilla"
-
 #: sabnzbd/osxmenu.py
 msgid "Go to wizard"
 msgstr "Mene velhoon"
@@ -1504,6 +1529,10 @@ msgstr "Lataaminen saattaa epäonnistua, vain %s osaa %s osasta saatavilla"
 msgid "Download failed - Not on your server(s)"
 msgstr "Lataus epäonnistui - Ei ole palvelimilla"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing"
+msgstr "Jälkikäsittely"
+
 #: sabnzbd/postproc.py
 msgid "Moving"
 msgstr "Siirretään"
@@ -1547,6 +1576,10 @@ msgstr "Jälkikäsittely epäonnistui kohteelle %s (%s)"
 msgid "see logfile"
 msgstr "katso lokitiedosto"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing was aborted"
+msgstr ""
+
 #: sabnzbd/postproc.py
 msgid "Download Failed"
 msgstr "Lataus epäonnistui"
@@ -1565,10 +1598,6 @@ msgstr "Lataus valmistui"
 msgid "Cannot create final folder %s"
 msgstr "Ei voitu luoda lopullista kansiota %s"
 
-#: sabnzbd/postproc.py
-msgid "Post-processing"
-msgstr "Jälkikäsittely"
-
 #: sabnzbd/postproc.py
 msgid "[%s] No par2 sets"
 msgstr "[%s] Ei par2 arkistoja"
@@ -1601,6 +1630,15 @@ msgstr "RAR arkistot varmennettiin onnistuneesti"
 msgid "RAR files failed to verify"
 msgstr "RAR arkistoja ei voitu varmentaa"
 
+#: sabnzbd/postproc.py
+msgid "Trying RAR renamer"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/postproc.py
+msgid "No matching earlier rar file for %s"
+msgstr ""
+
 #. Error message
 #: sabnzbd/postproc.py
 msgid "Removing %s failed"
@@ -1621,6 +1659,11 @@ msgstr "Järjestelmän valmiustilaan laittaminen epäonnistui"
 msgid "Error while shutting down system"
 msgstr "Virhe sammutettaessa järjestelmää"
 
+#. Error message
+#: sabnzbd/powersup.py
+msgid "Received a DBus exception %s"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/rating.py
 msgid "Indexer id (%s) not found for ratings file"
@@ -1645,10 +1688,6 @@ msgstr ""
 msgid "Incorrect RSS feed description \"%s\""
 msgstr "Virheellinen RSS syötteen kuvaus \"%s\""
 
-#: sabnzbd/rss.py
-msgid "Failed to retrieve RSS from %s: %s"
-msgstr "RSS noutaminen epäonnistui kohteesta %s: %s"
-
 #: sabnzbd/rss.py
 msgid "Do not have valid authentication for feed %s"
 msgstr "Ei ole käyttöoikeutta syötteeseen %s"
@@ -1657,10 +1696,15 @@ msgstr "Ei ole käyttöoikeutta syötteeseen %s"
 msgid "Server side error (server code %s); could not get %s on %s"
 msgstr "Palvelinpään virhe (virhekoodi %s); ei voitu noutaa %s kohteesta %s"
 
+#: sabnzbd/rss.py
+msgid "Failed to retrieve RSS from %s: %s"
+msgstr "RSS noutaminen epäonnistui kohteesta %s: %s"
+
 #: sabnzbd/rss.py, sabnzbd/urlgrabber.py
 msgid "Server %s uses an untrusted HTTPS certificate"
 msgstr "Palvelin %s käyttää epäluotettavaa HTTPS sertifikaattia"
 
+#. Warning message
 #: sabnzbd/rss.py
 msgid "RSS Feed %s was empty"
 msgstr "RSS syöte %s oli tyhjä"
@@ -1750,6 +1794,16 @@ msgstr "Lataa"
 msgid "Join files"
 msgstr "Yhdistä tiedostot"
 
+#. PP phase "unpack"
+#: sabnzbd/skintext.py
+msgid "Unpack"
+msgstr "Pura"
+
+#. PP phase "script" - Notification Script settings
+#: sabnzbd/skintext.py
+msgid "Script"
+msgstr "Skripti"
+
 #. PP Source of the NZB (path or URL) - Where to find the SABnzbd sourcecode
 #: sabnzbd/skintext.py
 msgid "Source"
@@ -1974,11 +2028,6 @@ msgstr "tunti"
 msgid "hours"
 msgstr "tuntia"
 
-#. One minute
-#: sabnzbd/skintext.py
-msgid "min"
-msgstr "minuutti"
-
 #. Multiple minutes
 #: sabnzbd/skintext.py
 msgid "mins"
@@ -2074,6 +2123,10 @@ msgstr "Tällä viikolla"
 msgid "This month"
 msgstr "Tässä kuussa"
 
+#: sabnzbd/skintext.py
+msgid "Selected date range"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Today"
 msgstr "Tänään"
@@ -2082,6 +2135,14 @@ msgstr "Tänään"
 msgid "Total"
 msgstr "Yhteensä"
 
+#: sabnzbd/skintext.py
+msgid "Custom"
+msgstr "Mukautettu"
+
+#: sabnzbd/skintext.py
+msgid "Speed"
+msgstr "Nopeus"
+
 #: sabnzbd/skintext.py
 msgid "on"
 msgstr "käytössä"
@@ -2915,6 +2976,12 @@ msgstr "ei asennettu"
 msgid "Enable accessing the interface from a HTTPS address."
 msgstr "Ota käyttöön käyttöliittymän käyttäminen HTTPS-osoitteesta."
 
+#: sabnzbd/skintext.py
+msgid ""
+"Modern web browsers and other clients will not accept self-signed "
+"certificates and will give a warning and/or won't connect at all."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "HTTPS Port"
 msgstr "HTTPS portti"
@@ -3091,25 +3158,12 @@ msgstr "Luo uusi avain"
 msgid "API Key QR Code"
 msgstr "API avaimen QR-koodi"
 
-#: sabnzbd/skintext.py
-msgid "List of local network ranges"
-msgstr "Lista paikallisista verkko-osoitealueista"
-
-#: sabnzbd/skintext.py
-msgid ""
-"All local network addresses start with these prefixes (often \"192.168.1.\")"
-msgstr ""
-"Kaikki paikalliset verkko-osoitteet alkavat näillä etuliitteillä (yleensä "
-"\"192.168.1.\")"
-
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Ulkoinen ohjelman käyttö"
 
 #: sabnzbd/skintext.py
-msgid ""
-"You can set access rights for systems outside your local network. Requires "
-"List of local network ranges to be defined."
+msgid "You can set access rights for systems outside your local network."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3194,6 +3248,26 @@ msgstr ""
 "Sijainti jonne tallennetaan valmistuneet ja täysin käsitellyt ladatut "
 "kohteet.<br /><i>Käyttäjän asettamat kategoriat voivat kumota tämän.</i>"
 
+#: sabnzbd/skintext.py
+msgid "Minimum Free Space for Completed Download Folder"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Will not work if a category folder is on a different disk."
+msgstr ""
+
+#. Auto-resume download on the reset day
+#: sabnzbd/skintext.py
+msgid "Auto resume"
+msgstr "Jatka automaattisesti"
+
+#: sabnzbd/skintext.py
+msgid ""
+"Downloading will automatically resume if the minimum free space is available"
+" again.<br />Applies to both the Temporary and Complete Download Folder.<br "
+"/>Checked every few minutes."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Permissions for completed downloads"
 msgstr "Käyttöoikeudet valmistuneille latauksille"
@@ -3340,10 +3414,11 @@ msgid "Post-Process Only Verified Jobs"
 msgstr "Jälkikäsittele vain onnistuneet lataukset"
 
 #: sabnzbd/skintext.py
-msgid "Only perform post-processing on jobs that passed all PAR2 checks."
+msgid ""
+"Only unpack and run scripts on jobs that passed the verification stage. If "
+"turned off, all jobs will be marked as Completed even if they are "
+"incomplete."
 msgstr ""
-"Suorittaa jälkikäsittelyn vain niille latauksille jotka läpäisevät kaikki "
-"PAR2 tarkistukset."
 
 #: sabnzbd/skintext.py
 msgid "Action when encrypted RAR is downloaded"
@@ -3410,19 +3485,26 @@ msgid "Action when unwanted extension detected"
 msgstr "Toiminto kun havaitaan ei toivottu tiedostopääte"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected in RAR files"
-msgstr "Toiminto kun ei toivottu tiedostopääte havaitaan RAR arkistossa"
+msgid "Action when an unwanted extension is detected"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Ei toivotut tiedostopäätteet"
 
 #: sabnzbd/skintext.py
-msgid ""
-"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
+msgid "Blacklist"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Whitelist"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
+" <b>exe, com</b>"
 msgstr ""
-"Lista ei toivotuista tiedostopäätteistä. Esimerkiksi: <b>exe</b> tai <b>exe,"
-" com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -3594,6 +3676,16 @@ msgstr "Ohittaa näytetiedostot (esim. videonäytteet)."
 msgid "Delete after download"
 msgstr "Poista lataamisen jälkeen"
 
+#: sabnzbd/skintext.py
+msgid "Deobfuscate final filenames"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"If filenames of (large) files in the final folder look obfuscated or "
+"meaningless they will be renamed to the job name."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "HTTPS certificate verification"
 msgstr "HTTPS sertfikaatin varmennus"
@@ -3642,11 +3734,6 @@ msgstr ""
 "Minä päivänä kuusta tai viikosta (1=Maanantai) palveluntarjoajasi resetoi "
 "rajoituksen? (Voit syöttää kellonajan perään hh:mm)"
 
-#. Auto-resume download on the reset day
-#: sabnzbd/skintext.py
-msgid "Auto resume"
-msgstr "Jatka automaattisesti"
-
 #: sabnzbd/skintext.py
 msgid "Should downloading resume after the quota is reset?"
 msgstr "Pitäisikö latauksia jatkaa kun latausrajoitus on resetoitu?"
@@ -3800,6 +3887,21 @@ msgstr "Salasana"
 msgid "Timeout"
 msgstr "Aikakatkaisu"
 
+#: sabnzbd/skintext.py
+msgid "Account expiration date"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Warn 5 days in advance of account expiration date."
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Quota for this account, counted from the time it is set. In bytes, "
+"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
+" minutes."
+msgstr ""
+
 #. Server's retention time in days
 #: sabnzbd/skintext.py
 msgid "Retention time"
@@ -3891,6 +3993,14 @@ msgstr "Lähettää ryhmäkomennon ennen artikkeleiden pyytämistä."
 msgid "Personal notes"
 msgstr "Henkilökohtaiset huomautukset"
 
+#: sabnzbd/skintext.py
+msgid "Article availability"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "%f% available of %d requested articles"
+msgstr ""
+
 #. Config->Scheduling
 #: sabnzbd/skintext.py
 msgid "Add Schedule"
@@ -3943,6 +4053,16 @@ msgstr "Lue syöte"
 msgid "Force Download"
 msgstr "Pakota lataus"
 
+#. Config->RSS edit button
+#: sabnzbd/skintext.py
+msgid "Edit"
+msgstr ""
+
+#. Config->RSS when will be the next RSS scan
+#: sabnzbd/skintext.py
+msgid "Next scan at"
+msgstr ""
+
 #. Config->RSS table column header
 #: sabnzbd/skintext.py
 msgid "Filter"
@@ -4092,7 +4212,7 @@ msgstr "Ilmoitus lähetetty!"
 msgid "Enable NotifyOSD"
 msgstr "NotifyOSD käytössä"
 
-#. Header for OSX Notfication Center section
+#. Header for macOS Notfication Center section
 #: sabnzbd/skintext.py
 msgid "Notification Center"
 msgstr "Ilmoituskeskus"
@@ -4646,12 +4766,12 @@ msgid "Date format"
 msgstr "Päivämäärän muoto"
 
 #: sabnzbd/skintext.py
-msgid "Extra queue column"
-msgstr "Ylimääräisen jonon sarake"
+msgid "Extra queue columns"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Extra history column"
-msgstr "Ylimääräinen historiasarake"
+msgid "Extra history columns"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "page"
@@ -4734,8 +4854,8 @@ msgid "View Script Log"
 msgstr "Näytä skriptien loki"
 
 #: sabnzbd/skintext.py
-msgid "Update Available!"
-msgstr "Päivitys saatavilla!"
+msgid "Renaming the job will abort Direct Unpack."
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid ""
@@ -4750,21 +4870,17 @@ msgid "Glitter has some (new) features you might like!"
 msgstr ""
 "Glitter-teemassa on muutamia (uusia) ominaisuuksia joista saatat pitää!"
 
-#: sabnzbd/skintext.py
-msgid "Custom"
-msgstr "Mukautettu"
-
 #: sabnzbd/skintext.py
 msgid "Compact layout"
 msgstr "Tiivis käyttöliittymä"
 
 #: sabnzbd/skintext.py
-msgid "Tabbed layout <br/>(separate queue and history)"
-msgstr "Välilehditetty käyttöliittymä <br/>(erillinen jono ja historia)"
+msgid "Always use full screen width"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Speed"
-msgstr "Nopeus"
+msgid "Tabbed layout <br/>(separate queue and history)"
+msgstr "Välilehditetty käyttöliittymä <br/>(erillinen jono ja historia)"
 
 #: sabnzbd/skintext.py
 msgid "Confirm Queue Deletions"

po/main/fr.po

@@ -1,16 +1,16 @@
 # SABnzbd Translation Template file MAIN
-# Copyright 2011-2020 The SABnzbd-Team
+# Copyright 2011-2021 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# Fred L <88com88@gmail.com>, 2020
+# Fred L <88com88@gmail.com>, 2021
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.0.0-develop\n"
+"Project-Id-Version: SABnzbd-3.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
-"Last-Translator: Fred L <88com88@gmail.com>, 2020\n"
+"Last-Translator: Fred L <88com88@gmail.com>, 2021\n"
 "Language-Team: French (https://www.transifex.com/sabnzbd/teams/111101/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,16 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. Notification - Status page, table column header, actual message
+#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
+msgid "Warning"
+msgstr "Avertissement"
+
+#. Notification
+#: SABnzbd.py, sabnzbd/notifier.py
+msgid "Error"
+msgstr "Erreur"
+
 #. Error message
 #: SABnzbd.py
 msgid "Failed to start web-interface"
@@ -99,6 +109,13 @@ msgstr ""
 "Attendez-vous à des problèmes avec les noms de fichiers et de répertoires "
 "Unicode dans les téléchargements."
 
+#. Warning message
+#: SABnzbd.py
+msgid "Could not load additional certificates from certifi package"
+msgstr ""
+"Impossible de charger les certificats supplémentaires à partir du package "
+"certifi"
+
 #. Warning message
 #: SABnzbd.py
 msgid "Disabled HTTPS because of missing CERT and KEY files"
@@ -118,16 +135,6 @@ msgstr "Impossible de démarrer l'interface web : "
 msgid "SABnzbd %s started"
 msgstr "SABnzbd %s démarré"
 
-#. Notification - Status page, table column header, actual message
-#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
-msgid "Warning"
-msgstr "Avertissement"
-
-#. Notification
-#: SABnzbd.py, sabnzbd/notifier.py
-msgid "Error"
-msgstr "Erreur"
-
 #: SABnzbd.py, sabnzbd/interface.py
 msgid "SABnzbd shutdown finished"
 msgstr "Arrêt de SABnzbd terminé"
@@ -171,6 +178,11 @@ msgstr "Échec dans tempfile.mkstemp"
 msgid "Loading %s failed"
 msgstr "Echec du chargement de %s"
 
+#. Warning message
+#: sabnzbd/__init__.py
+msgid "Cannot access PID file %s"
+msgstr "Impossible d'accéder au fichier PID %s"
+
 #: sabnzbd/api.py, sabnzbd/emailer.py
 msgid "Email succeeded"
 msgstr "L'envoi de l'e-mail a réussi"
@@ -225,20 +237,20 @@ msgstr "Erreur fatale dans l'assembleur"
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Paused job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Paused job \"%s\" because of encrypted RAR file (if supplied, all passwords "
+"were tried)"
 msgstr ""
-"ATTENTION : la tâche \"%s\" a été mise en pause à cause d'un fichier RAR "
-"chiffré (tous les mots de passe fournis ont été essayés)"
+"La tâche \"%s\" a été mise en pause à cause d'un fichier RAR chiffré (tous "
+"les mots de passe fournis ont été essayés)"
 
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Aborted job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Aborted job \"%s\" because of encrypted RAR file (if supplied, all passwords"
+" were tried)"
 msgstr ""
-"ATTENTION : la tâche \"%s\" a été abandonnée à cause d'un fichier RAR "
-"chiffré (tous les mots de passe fournis ont été essayés)"
+"La tâche \"%s\" a été abandonnée à cause d'un fichier RAR chiffré (tous les "
+"mots de passe fournis ont été essayés)"
 
 #: sabnzbd/assembler.py
 msgid "Aborted, encryption detected"
@@ -246,10 +258,10 @@ msgstr "Interrompu, cryptage détecté"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
+msgid "In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
 msgstr ""
-"AVERTISSEMENT : Le fichier RAR\"%s\" contient une extension indésirable. Le "
-"fichier indésirable est %s "
+"Le fichier RAR \"%s\" contient une extension indésirable. Le fichier "
+"indésirable est %s "
 
 #: sabnzbd/assembler.py
 msgid "Unwanted extension is in rar file %s"
@@ -261,13 +273,13 @@ msgstr "Interrompu, extension indésirable détectée"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Paused job \"%s\" because of rating (%s)"
-msgstr "AVERTISSEMENT : Tâche \"%s\" mise en pause à cause du classement (%s)"
+msgid "Paused job \"%s\" because of rating (%s)"
+msgstr "Tâche \"%s\" mise en pause à cause du classement (%s)"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Aborted job \"%s\" because of rating (%s)"
-msgstr "AVERTISSEMENT : tâche \"%s\" annulée à cause du classement (%s)"
+msgid "Aborted job \"%s\" because of rating (%s)"
+msgstr "Tâche \"%s\" annulée à cause du classement (%s)"
 
 #: sabnzbd/assembler.py
 msgid "Aborted, rating filter matched (%s)"
@@ -324,6 +336,10 @@ msgstr "%s n'est pas une adresse email valide"
 msgid "Server address required"
 msgstr "Adresse du serveur requise"
 
+#: sabnzbd/cfg.py
+msgid "%s is not a valid script"
+msgstr "%s n'est pas un script valide"
+
 #. Warning message
 #: sabnzbd/config.py
 msgid "Configuration locked, cannot save settings"
@@ -356,10 +372,6 @@ msgstr "%s n'est pas une valeur octale correcte"
 msgid "UNC path \"%s\" not allowed here"
 msgstr "Le chemin UNC \"%s\" n'est pas autorisé ici"
 
-#: sabnzbd/config.py
-msgid "Error: Path length should be below %s."
-msgstr "Erreur : la longueur du chemin doit être inférieure à %s."
-
 #: sabnzbd/config.py
 msgid "Error: Queue not empty, cannot change folder."
 msgstr ""
@@ -503,6 +515,16 @@ msgstr "Erreur suspecte dans le téléchargeur"
 msgid "Shutting down"
 msgstr "Arrêt en cours..."
 
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s is expiring in %s day(s)"
+msgstr "Le serveur %s expirera dans %s jour(s)"
+
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s has used the specified quota"
+msgstr "Le serveur %s a utilisé le quota spécifié"
+
 #: sabnzbd/emailer.py
 msgid "Failed to connect to mail server"
 msgstr "Échec de connexion au serveur de messagerie"
@@ -608,6 +630,15 @@ msgstr "Échec lors de la création de (%s)"
 msgid "Failed moving %s to %s"
 msgstr "Échec lors du déplacement de %s vers %s"
 
+#. Error message
+#: sabnzbd/filesystem.py
+msgid "Blocked attempt to create directory %s"
+msgstr "Tentative bloquée de création du répertoire %s"
+
+#: sabnzbd/interface.py
+msgid "Refused connection from:"
+msgstr "Connexion refusée de:"
+
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr "Connexion refusée avec le nom d'hôte \"%s\" à partir de :"
@@ -649,6 +680,7 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Echec d'authentification, vérifiez les identifiant/mot de passe."
 
+#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr "Echec de la tentative de connexion de %s"
@@ -668,6 +700,14 @@ msgstr ""
 "secondes avant de cliquer sur le bouton ci-dessous.<br /><br /><strong><a "
 "href=\"..\">Rafraîchir</a></strong><br />"
 
+#: sabnzbd/interface.py
+msgid ""
+"The Completed Download Folder cannot be the same or a subfolder of the "
+"Temporary Download Folder"
+msgstr ""
+"Le dossier des téléchargements terminés ne peut pas être le même dossier que"
+" les téléchargements temporaires, ni être l'un de ses sous-dossiers"
+
 #: sabnzbd/interface.py
 msgid "Warning: LOCALHOST is ambiguous, use numerical IP-address."
 msgstr ""
@@ -753,6 +793,15 @@ msgstr "h"
 msgid "m"
 msgstr "m"
 
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Update Available!"
+msgstr "Mise à Jour disponible!"
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Failed to upload file: %s"
+msgstr "Échec de l'upload du fichier : %s"
+
 #. Error message
 #: sabnzbd/misc.py
 msgid "Error creating SSL key and certificate"
@@ -768,19 +817,27 @@ msgstr ""
 " ces mots de passe prend beaucoup de temps. Essayez de n'y lister que les "
 "mots de passe utiles."
 
+#. Warning message
+#: sabnzbd/misc.py
+msgid "Failed to read the password file %s"
+msgstr "Échec de lecture du fichier de mot de passe %s"
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "[%s] The command in build_command is undefined."
+msgstr "[%s] La commande dans build_command n'est pas définie."
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Python script \"%s\" does not have execute (+x) permission set"
+msgstr ""
+"Le script Python \"%s\" n'est pas configuré avec les permissions d’exécution"
+" (+x)"
+
 #: sabnzbd/newsunpack.py, sabnzbd/postproc.py
 msgid "Running script"
 msgstr "Exécution du script"
 
-#: sabnzbd/newsunpack.py, sabnzbd/postproc.py
-msgid "PostProcessing was aborted (%s)"
-msgstr "Post-traitement interrompu (%s)"
-
-#. PP phase "script" - Notification Script settings
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Script"
-msgstr "Script"
-
 #. Warning message
 #: sabnzbd/newsunpack.py
 msgid "Unpack nesting too deep [%s]"
@@ -842,11 +899,6 @@ msgstr "Échec de l'extraction, l'archive nécessite un mot de passe"
 msgid "Unpacking"
 msgstr "Extraction"
 
-#. PP phase "unpack"
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Unpack"
-msgstr "Décompresser"
-
 #: sabnzbd/newsunpack.py
 msgid "Unpacking failed, unable to find %s"
 msgstr "Échec de l'extraction, %s n'a pas été trouvé"
@@ -1028,18 +1080,6 @@ msgstr "Vérification des fichiers supplémentaires"
 msgid "Checking"
 msgstr "Vérification"
 
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "[%s] The command in build_command is undefined."
-msgstr "[%s] La commande dans build_command n'est pas définie."
-
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "Python script \"%s\" does not have execute (+x) permission set"
-msgstr ""
-"Le script Python \"%s\" n'est pas configuré avec les permissions d’exécution"
-" (+x)"
-
 #: sabnzbd/newsunpack.py
 msgid "Trying SFV verification"
 msgstr "Essai vérification SFV"
@@ -1075,6 +1115,19 @@ msgstr "Wiki"
 msgid "Startup/Shutdown"
 msgstr "Démarrage/Arrêt"
 
+#. Notification - Pause downloading - Four way switch for duplicates -
+#. Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Pause"
+msgstr "Mettre en pause"
+
+#. Notification - Resume downloading - Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Resume"
+msgstr "Reprendre"
+
 #. Notification - Config->RSS after adding to queue
 #: sabnzbd/notifier.py, sabnzbd/skintext.py
 msgid "Added NZB"
@@ -1184,15 +1237,12 @@ msgstr "NZB ajouté à la file d'attente"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Encodage inconnu"
 
-#: sabnzbd/nzbstuff.py
-msgid "%s => missing from all servers, discarding"
-msgstr "%s => absent de tous les serveurs, rejeté"
-
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
 msgstr "Fichier NZB invalide %s, ignoré (raison=%s, ligne=%s)"
 
+#. Warning message
 #: sabnzbd/nzbstuff.py, sabnzbd/urlgrabber.py
 msgid "Empty NZB file %s"
 msgstr "Fichier NZB %s vide"
@@ -1298,10 +1348,6 @@ msgstr "Avertissements"
 msgid "Idle"
 msgstr "A l'arrêt"
 
-#: sabnzbd/osxmenu.py
-msgid "Configuration"
-msgstr "Configuration"
-
 #. Main menu item
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Queue"
@@ -1326,21 +1372,10 @@ msgstr "Vider l'historique"
 msgid "Limit Speed"
 msgstr "Limiter la vitesse"
 
-#. Pause downloading - Four way switch for duplicates - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Pause"
-msgstr "Mettre en pause"
-
-#: sabnzbd/osxmenu.py
-msgid "min."
-msgstr "min."
-
-#. Resume downloading - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Resume"
-msgstr "Reprendre"
+#. One minute
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+msgid "min"
+msgstr "min"
 
 #. #: Config->Scheduler
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
@@ -1389,10 +1424,6 @@ msgstr "Vide"
 msgid "History Last 10 Items"
 msgstr "Historique des 10 derniers articles"
 
-#: sabnzbd/osxmenu.py
-msgid "New release available"
-msgstr "Nouvelle version disponible"
-
 #: sabnzbd/osxmenu.py
 msgid "Go to wizard"
 msgstr "Aller à l'assistant"
@@ -1557,6 +1588,10 @@ msgstr ""
 msgid "Download failed - Not on your server(s)"
 msgstr "Le téléchargement a échoué - absent de vos serveur(s)"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing"
+msgstr "Post-traitement"
+
 #: sabnzbd/postproc.py
 msgid "Moving"
 msgstr "Déplacement"
@@ -1600,6 +1635,10 @@ msgstr "Échec du post-traitement pour %s (%s)"
 msgid "see logfile"
 msgstr "voir le journal"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing was aborted"
+msgstr "Le post-traitement a été interrompu"
+
 #: sabnzbd/postproc.py
 msgid "Download Failed"
 msgstr "Échec du téléchargement"
@@ -1618,10 +1657,6 @@ msgstr "Téléchargement terminé"
 msgid "Cannot create final folder %s"
 msgstr "Impossible de créer le dossier final %s"
 
-#: sabnzbd/postproc.py
-msgid "Post-processing"
-msgstr "Post-traitement"
-
 #: sabnzbd/postproc.py
 msgid "[%s] No par2 sets"
 msgstr "[%s] Pas de fichiers par2"
@@ -1654,6 +1689,15 @@ msgstr "Fichiers RAR vérifiés avec succès"
 msgid "RAR files failed to verify"
 msgstr "Echec lors de la vérification des fichiers RAR"
 
+#: sabnzbd/postproc.py
+msgid "Trying RAR renamer"
+msgstr "Essai avec le renommeur RAR"
+
+#. Warning message
+#: sabnzbd/postproc.py
+msgid "No matching earlier rar file for %s"
+msgstr "Aucun fichier rar antérieur correspondant pour %s"
+
 #. Error message
 #: sabnzbd/postproc.py
 msgid "Removing %s failed"
@@ -1674,6 +1718,11 @@ msgstr "Échec de la mise en veille"
 msgid "Error while shutting down system"
 msgstr "Erreur lors de l'arrêt du système"
 
+#. Error message
+#: sabnzbd/powersup.py
+msgid "Received a DBus exception %s"
+msgstr "Exception DBus reçue %s"
+
 #. Warning message
 #: sabnzbd/rating.py
 msgid "Indexer id (%s) not found for ratings file"
@@ -1700,10 +1749,6 @@ msgstr ""
 msgid "Incorrect RSS feed description \"%s\""
 msgstr "Description du flux RSS incorrecte \"%s\""
 
-#: sabnzbd/rss.py
-msgid "Failed to retrieve RSS from %s: %s"
-msgstr "Échec de la récupération RSS de %s : %s"
-
 #: sabnzbd/rss.py
 msgid "Do not have valid authentication for feed %s"
 msgstr "Vous n'avez pas d'authentification valide pour ce flux %s"
@@ -1713,10 +1758,15 @@ msgid "Server side error (server code %s); could not get %s on %s"
 msgstr ""
 "Erreur du côté serveur (code serveur %s) ; n'a pas pu obtenir %s sur %s"
 
+#: sabnzbd/rss.py
+msgid "Failed to retrieve RSS from %s: %s"
+msgstr "Échec de la récupération RSS de %s : %s"
+
 #: sabnzbd/rss.py, sabnzbd/urlgrabber.py
 msgid "Server %s uses an untrusted HTTPS certificate"
 msgstr "Le serveur %s utilise un certificat de sécurité HTTPS non authentifié"
 
+#. Warning message
 #: sabnzbd/rss.py
 msgid "RSS Feed %s was empty"
 msgstr "Le flux RSS %s était vide"
@@ -1806,6 +1856,16 @@ msgstr "Télécharger"
 msgid "Join files"
 msgstr "Concaténer"
 
+#. PP phase "unpack"
+#: sabnzbd/skintext.py
+msgid "Unpack"
+msgstr "Décompresser"
+
+#. PP phase "script" - Notification Script settings
+#: sabnzbd/skintext.py
+msgid "Script"
+msgstr "Script"
+
 #. PP Source of the NZB (path or URL) - Where to find the SABnzbd sourcecode
 #: sabnzbd/skintext.py
 msgid "Source"
@@ -2030,11 +2090,6 @@ msgstr "heure"
 msgid "hours"
 msgstr "heures"
 
-#. One minute
-#: sabnzbd/skintext.py
-msgid "min"
-msgstr "min"
-
 #. Multiple minutes
 #: sabnzbd/skintext.py
 msgid "mins"
@@ -2130,6 +2185,10 @@ msgstr "Cette semaine"
 msgid "This month"
 msgstr "Ce mois"
 
+#: sabnzbd/skintext.py
+msgid "Selected date range"
+msgstr "Plage de dates sélectionnée"
+
 #: sabnzbd/skintext.py
 msgid "Today"
 msgstr "Aujourd'hui"
@@ -2138,6 +2197,14 @@ msgstr "Aujourd'hui"
 msgid "Total"
 msgstr "Total"
 
+#: sabnzbd/skintext.py
+msgid "Custom"
+msgstr "Personnalisé"
+
+#: sabnzbd/skintext.py
+msgid "Speed"
+msgstr "Vitesse"
+
 #: sabnzbd/skintext.py
 msgid "on"
 msgstr "oui"
@@ -2986,6 +3053,15 @@ msgstr "non installé"
 msgid "Enable accessing the interface from a HTTPS address."
 msgstr "Active l'accès à l'interface via une adresse HTTPS."
 
+#: sabnzbd/skintext.py
+msgid ""
+"Modern web browsers and other clients will not accept self-signed "
+"certificates and will give a warning and/or won't connect at all."
+msgstr ""
+"Les navigateurs web modernes et les autres clients n'accepteront pas les "
+"certificats auto-signés et donneront un avertissement et / ou ne se "
+"connecteront pas du tout."
+
 #: sabnzbd/skintext.py
 msgid "HTTPS Port"
 msgstr "Port HTTPS"
@@ -3164,28 +3240,15 @@ msgstr "Générer une nouvelle clé"
 msgid "API Key QR Code"
 msgstr "Clé API code QR"
 
-#: sabnzbd/skintext.py
-msgid "List of local network ranges"
-msgstr "Liste des plages de réseau local"
-
-#: sabnzbd/skintext.py
-msgid ""
-"All local network addresses start with these prefixes (often \"192.168.1.\")"
-msgstr ""
-"Toutes les adresses de réseau local commencent par ces préfixes (souvent "
-"\"192.168.1.\" )"
-
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Accès Internet externe"
 
 #: sabnzbd/skintext.py
-msgid ""
-"You can set access rights for systems outside your local network. Requires "
-"List of local network ranges to be defined."
+msgid "You can set access rights for systems outside your local network."
 msgstr ""
-"Vous pouvez définir les droits d'accès pour les systèmes en dehors de votre "
-"réseau local. Requiert la liste des plages de réseaux locaux à définir."
+"Vous pouvez définir des droits d'accès pour les systèmes en dehors de votre "
+"réseau local."
 
 #: sabnzbd/skintext.py
 msgid "No access"
@@ -3269,6 +3332,31 @@ msgstr ""
 "Emplacement des téléchargements terminés et post-traités.<br /><i>Peut être "
 "outrepassé par les catégories définies par l'utilisateur.</i>"
 
+#: sabnzbd/skintext.py
+msgid "Minimum Free Space for Completed Download Folder"
+msgstr "Espace libre minimum pour le dossier des téléchargements terminés"
+
+#: sabnzbd/skintext.py
+msgid "Will not work if a category folder is on a different disk."
+msgstr ""
+"Ne fonctionnera pas si un dossier de catégorie se trouve sur un autre "
+"disque."
+
+#. Auto-resume download on the reset day
+#: sabnzbd/skintext.py
+msgid "Auto resume"
+msgstr "Reprise auto"
+
+#: sabnzbd/skintext.py
+msgid ""
+"Downloading will automatically resume if the minimum free space is available"
+" again.<br />Applies to both the Temporary and Complete Download Folder.<br "
+"/>Checked every few minutes."
+msgstr ""
+"Le téléchargement reprendra automatiquement si l'espace libre minimum est à "
+"nouveau disponible.<br />S'applique aux dossiers de téléchargements "
+"temporaires et terminés.<br />Vérifié toutes les quelques minutes."
+
 #: sabnzbd/skintext.py
 msgid "Permissions for completed downloads"
 msgstr "Permissions pour le dossier de téléchargements terminés"
@@ -3419,10 +3507,14 @@ msgid "Post-Process Only Verified Jobs"
 msgstr "Ne post-traiter que les tâches vérifiées"
 
 #: sabnzbd/skintext.py
-msgid "Only perform post-processing on jobs that passed all PAR2 checks."
+msgid ""
+"Only unpack and run scripts on jobs that passed the verification stage. If "
+"turned off, all jobs will be marked as Completed even if they are "
+"incomplete."
 msgstr ""
-"Limite le post-traitement aux tâches qui ont passé avec succès toutes les "
-"vérifications PAR2."
+"Décompresser et lancer les scripts uniquement sur les tâches qui ont passé "
+"l'étape de vérification. Si désactivé, toutes les tâches seront marquées "
+"comme Terminées même si elles sont incomplètes."
 
 #: sabnzbd/skintext.py
 msgid "Action when encrypted RAR is downloaded"
@@ -3495,19 +3587,28 @@ msgid "Action when unwanted extension detected"
 msgstr "Action si une extension indésirable est détecté"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected in RAR files"
-msgstr "Action si une extension indésirable est détecté dans les fichiers RAR"
+msgid "Action when an unwanted extension is detected"
+msgstr "Action lorsqu'une extension indésirable est détectée"
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Extensions indésirables"
 
+#: sabnzbd/skintext.py
+msgid "Blacklist"
+msgstr "Liste noire"
+
+#: sabnzbd/skintext.py
+msgid "Whitelist"
+msgstr "Liste blanche"
+
 #: sabnzbd/skintext.py
 msgid ""
-"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
+"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
+" <b>exe, com</b>"
 msgstr ""
-"Afficher toutes les extensions indésirables. Par exemple :  <b>exe</b> or "
-"<b>exe, com</b>"
+"Sélectionnez un mode et listez toutes les extensions (non) souhaitées. Par "
+"exemple: <b>exe</b> ou <b>exe, com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -3689,6 +3790,18 @@ msgstr "Exclure les fichiers échantillons (par ex. les samples vidéo)."
 msgid "Delete after download"
 msgstr "Supprimer après téléchargement"
 
+#: sabnzbd/skintext.py
+msgid "Deobfuscate final filenames"
+msgstr "Désobfusquer les noms de fichiers finaux"
+
+#: sabnzbd/skintext.py
+msgid ""
+"If filenames of (large) files in the final folder look obfuscated or "
+"meaningless they will be renamed to the job name."
+msgstr ""
+"Si les noms de fichiers (volumineux) dans le dossier final semblent obscurs "
+"ou dénués de sens, ils seront renommés avec le nom de la tâche."
+
 #: sabnzbd/skintext.py
 msgid "HTTPS certificate verification"
 msgstr "Vérification du certificat HTTPS"
@@ -3737,11 +3850,6 @@ msgstr ""
 "A quel jour du mois ou de la semaine (1=lundi) votre fournisseur "
 "réinitialise le quota ? (Optionnel avec hh:mm)"
 
-#. Auto-resume download on the reset day
-#: sabnzbd/skintext.py
-msgid "Auto resume"
-msgstr "Reprise auto"
-
 #: sabnzbd/skintext.py
 msgid "Should downloading resume after the quota is reset?"
 msgstr ""
@@ -3902,6 +4010,24 @@ msgstr "Mot de passe"
 msgid "Timeout"
 msgstr "Délai d'expiration"
 
+#: sabnzbd/skintext.py
+msgid "Account expiration date"
+msgstr "Date d'expiration du compte"
+
+#: sabnzbd/skintext.py
+msgid "Warn 5 days in advance of account expiration date."
+msgstr "Avertir 5 jours avant la date d'expiration du compte."
+
+#: sabnzbd/skintext.py
+msgid ""
+"Quota for this account, counted from the time it is set. In bytes, "
+"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
+" minutes."
+msgstr ""
+"Quota pour ce compte calculé à partir du moment où il est défini. En octets,"
+" éventuellement suivi de K,M,G.<br />Avertir quand il atteint 0, vérifié "
+"toutes les quelques minutes."
+
 #. Server's retention time in days
 #: sabnzbd/skintext.py
 msgid "Retention time"
@@ -3997,6 +4123,14 @@ msgstr "Envoyer la commande 'group' avant la demande des articles."
 msgid "Personal notes"
 msgstr "Notes personnelles"
 
+#: sabnzbd/skintext.py
+msgid "Article availability"
+msgstr "Disponibilité de l'article"
+
+#: sabnzbd/skintext.py
+msgid "%f% available of %d requested articles"
+msgstr "%f% disponibles sur %d articles demandés"
+
 #. Config->Scheduling
 #: sabnzbd/skintext.py
 msgid "Add Schedule"
@@ -4050,6 +4184,16 @@ msgstr "Lire le flux RSS"
 msgid "Force Download"
 msgstr "Forcer le téléchargement"
 
+#. Config->RSS edit button
+#: sabnzbd/skintext.py
+msgid "Edit"
+msgstr "Modifier"
+
+#. Config->RSS when will be the next RSS scan
+#: sabnzbd/skintext.py
+msgid "Next scan at"
+msgstr "Prochain scan à"
+
 #. Config->RSS table column header
 #: sabnzbd/skintext.py
 msgid "Filter"
@@ -4202,7 +4346,7 @@ msgstr "Notification envoyée !"
 msgid "Enable NotifyOSD"
 msgstr "Activer NotifyOSD"
 
-#. Header for OSX Notfication Center section
+#. Header for macOS Notfication Center section
 #: sabnzbd/skintext.py
 msgid "Notification Center"
 msgstr "Centre de notification"
@@ -4759,12 +4903,12 @@ msgid "Date format"
 msgstr "Format de la date"
 
 #: sabnzbd/skintext.py
-msgid "Extra queue column"
-msgstr "Colonne de file d'attente supplémentaire"
+msgid "Extra queue columns"
+msgstr "Colonnes de file d'attente supplémentaires"
 
 #: sabnzbd/skintext.py
-msgid "Extra history column"
-msgstr "Colonne d'historique additionnelle"
+msgid "Extra history columns"
+msgstr "Colonnes d'historique supplémentaires"
 
 #: sabnzbd/skintext.py
 msgid "page"
@@ -4847,8 +4991,8 @@ msgid "View Script Log"
 msgstr "Afficher le journal des scripts"
 
 #: sabnzbd/skintext.py
-msgid "Update Available!"
-msgstr "Mise à Jour disponible!"
+msgid "Renaming the job will abort Direct Unpack."
+msgstr "Renommer la tâche annulera la Décompression Directe."
 
 #: sabnzbd/skintext.py
 msgid ""
@@ -4864,21 +5008,17 @@ msgid "Glitter has some (new) features you might like!"
 msgstr ""
 "Glitter a des (nouvelles) fonctionnalités que vous devriez apprécier !"
 
-#: sabnzbd/skintext.py
-msgid "Custom"
-msgstr "Personnalisé"
-
 #: sabnzbd/skintext.py
 msgid "Compact layout"
 msgstr "Affichage compact"
 
 #: sabnzbd/skintext.py
-msgid "Tabbed layout <br/>(separate queue and history)"
-msgstr "Mise en page par onglets <br/>(file d'attente et historique séparés)"
+msgid "Always use full screen width"
+msgstr "Toujours utiliser la largeur totale de l'écran"
 
 #: sabnzbd/skintext.py
-msgid "Speed"
-msgstr "Vitesse"
+msgid "Tabbed layout <br/>(separate queue and history)"
+msgstr "Mise en page par onglets <br/>(file d'attente et historique séparés)"
 
 #: sabnzbd/skintext.py
 msgid "Confirm Queue Deletions"

po/main/nb.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file MAIN
-# Copyright 2011-2020 The SABnzbd-Team
+# Copyright 2011-2021 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.0.0-develop\n"
+"Project-Id-Version: SABnzbd-3.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/sabnzbd/teams/111101/nb/)\n"
@@ -17,6 +17,16 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. Notification - Status page, table column header, actual message
+#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
+msgid "Warning"
+msgstr "Advarsel"
+
+#. Notification
+#: SABnzbd.py, sabnzbd/notifier.py
+msgid "Error"
+msgstr "Feil"
+
 #. Error message
 #: SABnzbd.py
 msgid "Failed to start web-interface"
@@ -90,6 +100,11 @@ msgstr ""
 "SABnzbd ble startet med koding %s, dette burde være UTF-8. Forvent problemer"
 " med Unicode filer- og katalognavn i nedlastinger."
 
+#. Warning message
+#: SABnzbd.py
+msgid "Could not load additional certificates from certifi package"
+msgstr ""
+
 #. Warning message
 #: SABnzbd.py
 msgid "Disabled HTTPS because of missing CERT and KEY files"
@@ -109,16 +124,6 @@ msgstr "Kunne ikke starte webgrensesnittet: "
 msgid "SABnzbd %s started"
 msgstr "SABnzbd %s startet"
 
-#. Notification - Status page, table column header, actual message
-#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
-msgid "Warning"
-msgstr "Advarsel"
-
-#. Notification
-#: SABnzbd.py, sabnzbd/notifier.py
-msgid "Error"
-msgstr "Feil"
-
 #: SABnzbd.py, sabnzbd/interface.py
 msgid "SABnzbd shutdown finished"
 msgstr "SABnzbd er nå avsluttet"
@@ -162,6 +167,11 @@ msgstr "Feil i tempfil.mkstemp"
 msgid "Loading %s failed"
 msgstr "Lasting av %s mislyktes"
 
+#. Warning message
+#: sabnzbd/__init__.py
+msgid "Cannot access PID file %s"
+msgstr ""
+
 #: sabnzbd/api.py, sabnzbd/emailer.py
 msgid "Email succeeded"
 msgstr "E-post sendning lykkes"
@@ -216,15 +226,15 @@ msgstr "Kritisk feil i Assembler"
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Paused job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Paused job \"%s\" because of encrypted RAR file (if supplied, all passwords "
+"were tried)"
 msgstr ""
 
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Aborted job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Aborted job \"%s\" because of encrypted RAR file (if supplied, all passwords"
+" were tried)"
 msgstr ""
 
 #: sabnzbd/assembler.py
@@ -233,8 +243,8 @@ msgstr "Avbrutt, kryptering funnet"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
-msgstr "ADVARSEL: I \"%s\" uønsket filtype i RAR fil. Uønsket fil er %s "
+msgid "In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
+msgstr ""
 
 #: sabnzbd/assembler.py
 msgid "Unwanted extension is in rar file %s"
@@ -246,13 +256,13 @@ msgstr "Avbryt, uønsket forlenging oppdaget"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Paused job \"%s\" because of rating (%s)"
-msgstr "ADVARSEL: Pauset jobb \"%s\" grunnet rangeringen (%s)"
+msgid "Paused job \"%s\" because of rating (%s)"
+msgstr ""
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Aborted job \"%s\" because of rating (%s)"
-msgstr "ADVARSEL: Avbrøt jobb \"%s\" grunnet rangering (%s)"
+msgid "Aborted job \"%s\" because of rating (%s)"
+msgstr ""
 
 #: sabnzbd/assembler.py
 msgid "Aborted, rating filter matched (%s)"
@@ -305,6 +315,10 @@ msgstr "%s er ikke en godkjent e-post-adresse"
 msgid "Server address required"
 msgstr "Krever server-adresse"
 
+#: sabnzbd/cfg.py
+msgid "%s is not a valid script"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/config.py
 msgid "Configuration locked, cannot save settings"
@@ -337,10 +351,6 @@ msgstr "%s er ikke en korrekt oktal verdi"
 msgid "UNC path \"%s\" not allowed here"
 msgstr "UNC-sti \"%s\" er ikke tillatt her"
 
-#: sabnzbd/config.py
-msgid "Error: Path length should be below %s."
-msgstr "Feil: Fillengde bør være kortere enn %s."
-
 #: sabnzbd/config.py
 msgid "Error: Queue not empty, cannot change folder."
 msgstr "Feil: Køen er ikke tom, kan ikke bytte mappe."
@@ -476,6 +486,16 @@ msgstr "Mistenker feil i nedlaster"
 msgid "Shutting down"
 msgstr "Starter avslutning av SABnzbd.."
 
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s is expiring in %s day(s)"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s has used the specified quota"
+msgstr ""
+
 #: sabnzbd/emailer.py
 msgid "Failed to connect to mail server"
 msgstr "Kunne ikke koble til mailserver"
@@ -579,6 +599,15 @@ msgstr "Opprettelse av (%s) mislyktes"
 msgid "Failed moving %s to %s"
 msgstr "Kunne ikke flytte %s til %s"
 
+#. Error message
+#: sabnzbd/filesystem.py
+msgid "Blocked attempt to create directory %s"
+msgstr ""
+
+#: sabnzbd/interface.py
+msgid "Refused connection from:"
+msgstr ""
+
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr ""
@@ -620,6 +649,7 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Godkjenning mislyktes, kontroller brukernavn og passord."
 
+#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr "Mislykket påloggingsforsøk fra %s"
@@ -639,6 +669,12 @@ msgstr ""
 "deretter på knappen under.<br /><br /><strong><a href=\"..\">Last på "
 "nytt</a></strong><br />"
 
+#: 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 "Warning: LOCALHOST is ambiguous, use numerical IP-address."
 msgstr "Advarsel: LOCALHOST er tvetydig, bruk numerisk IP-adresse."
@@ -721,6 +757,15 @@ msgstr "h"
 msgid "m"
 msgstr "m"
 
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Update Available!"
+msgstr "Oppdatering tilgjengelig"
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Failed to upload file: %s"
+msgstr ""
+
 #. Error message
 #: sabnzbd/misc.py
 msgid "Error creating SSL key and certificate"
@@ -733,19 +778,25 @@ msgid ""
 "passwords takes a lot of time. Try to only list useful passwords."
 msgstr ""
 
+#. Warning message
+#: sabnzbd/misc.py
+msgid "Failed to read the password file %s"
+msgstr ""
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "[%s] The command in build_command is undefined."
+msgstr ""
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Python script \"%s\" does not have execute (+x) permission set"
+msgstr ""
+
 #: sabnzbd/newsunpack.py, sabnzbd/postproc.py
 msgid "Running script"
 msgstr "Kjører skript"
 
-#: sabnzbd/newsunpack.py, sabnzbd/postproc.py
-msgid "PostProcessing was aborted (%s)"
-msgstr "Etterbehandling ble avbrutt (%s)"
-
-#. PP phase "script" - Notification Script settings
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Script"
-msgstr "Skript"
-
 #. Warning message
 #: sabnzbd/newsunpack.py
 msgid "Unpack nesting too deep [%s]"
@@ -807,11 +858,6 @@ msgstr "Utpakking mislyktes, arkivet krever passord"
 msgid "Unpacking"
 msgstr "Utpakker"
 
-#. PP phase "unpack"
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Unpack"
-msgstr "Utpakking"
-
 #: sabnzbd/newsunpack.py
 msgid "Unpacking failed, unable to find %s"
 msgstr "Utpakking mislyktes, kunne ikke finne %s"
@@ -987,16 +1033,6 @@ msgstr ""
 msgid "Checking"
 msgstr "Undersøker"
 
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "[%s] The command in build_command is undefined."
-msgstr ""
-
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "Python script \"%s\" does not have execute (+x) permission set"
-msgstr ""
-
 #: sabnzbd/newsunpack.py
 msgid "Trying SFV verification"
 msgstr "Prøver SFV-verifisering"
@@ -1029,6 +1065,19 @@ msgstr "Wiki"
 msgid "Startup/Shutdown"
 msgstr "Oppstart/avsluttning"
 
+#. Notification - Pause downloading - Four way switch for duplicates -
+#. Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Pause"
+msgstr "Stans midlertidig"
+
+#. Notification - Resume downloading - Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Resume"
+msgstr "Gjenoppta"
+
 #. Notification - Config->RSS after adding to queue
 #: sabnzbd/notifier.py, sabnzbd/skintext.py
 msgid "Added NZB"
@@ -1138,15 +1187,12 @@ msgstr "NZB er lagt til i køen"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Ukjent koding"
 
-#: sabnzbd/nzbstuff.py
-msgid "%s => missing from all servers, discarding"
-msgstr "%s => mangler på alle servere, fjerner"
-
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
 msgstr "Feilaktig NZB fil %s, hopper over (årsak=%s, linje=%s)"
 
+#. Warning message
 #: sabnzbd/nzbstuff.py, sabnzbd/urlgrabber.py
 msgid "Empty NZB file %s"
 msgstr "Tom NZB-fil %s"
@@ -1252,10 +1298,6 @@ msgstr "Advarsler"
 msgid "Idle"
 msgstr "Ledig"
 
-#: sabnzbd/osxmenu.py
-msgid "Configuration"
-msgstr "Konfigurasjon"
-
 #. Main menu item
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Queue"
@@ -1280,21 +1322,10 @@ msgstr "Slett historikk"
 msgid "Limit Speed"
 msgstr "Hastighetsbegrensning"
 
-#. Pause downloading - Four way switch for duplicates - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Pause"
-msgstr "Stans midlertidig"
-
-#: sabnzbd/osxmenu.py
-msgid "min."
-msgstr "min."
-
-#. Resume downloading - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Resume"
-msgstr "Gjenoppta"
+#. One minute
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+msgid "min"
+msgstr "minutt"
 
 #. #: Config->Scheduler
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
@@ -1343,10 +1374,6 @@ msgstr "Tom"
 msgid "History Last 10 Items"
 msgstr "Historikk (10 siste)"
 
-#: sabnzbd/osxmenu.py
-msgid "New release available"
-msgstr "Ny utgave er tilgjengelig"
-
 #: sabnzbd/osxmenu.py
 msgid "Go to wizard"
 msgstr "Gå til guiden"
@@ -1499,6 +1526,10 @@ msgstr "Nedlasting kan feile, kun %s av kravet på %s tilgjengelig"
 msgid "Download failed - Not on your server(s)"
 msgstr "Nedlastning feilet - Finnes ikke på din(e) server(e)"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing"
+msgstr "Etterbehandling"
+
 #: sabnzbd/postproc.py
 msgid "Moving"
 msgstr "Flytter"
@@ -1542,6 +1573,10 @@ msgstr "Etterbehandling mislyktes for %s (%s)"
 msgid "see logfile"
 msgstr "se loggfil"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing was aborted"
+msgstr ""
+
 #: sabnzbd/postproc.py
 msgid "Download Failed"
 msgstr "Nedlasting mislyktes"
@@ -1560,10 +1595,6 @@ msgstr "Nedlasting ferdig"
 msgid "Cannot create final folder %s"
 msgstr "Kan ikke opprette mappe %s"
 
-#: sabnzbd/postproc.py
-msgid "Post-processing"
-msgstr "Etterbehandling"
-
 #: sabnzbd/postproc.py
 msgid "[%s] No par2 sets"
 msgstr "[%s] Ingen par2 deler"
@@ -1596,6 +1627,15 @@ msgstr ""
 msgid "RAR files failed to verify"
 msgstr ""
 
+#: sabnzbd/postproc.py
+msgid "Trying RAR renamer"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/postproc.py
+msgid "No matching earlier rar file for %s"
+msgstr ""
+
 #. Error message
 #: sabnzbd/postproc.py
 msgid "Removing %s failed"
@@ -1616,6 +1656,11 @@ msgstr "Kunne ikke sette systemet i ventemodus"
 msgid "Error while shutting down system"
 msgstr "Feil under avslutting av systemet"
 
+#. Error message
+#: sabnzbd/powersup.py
+msgid "Received a DBus exception %s"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/rating.py
 msgid "Indexer id (%s) not found for ratings file"
@@ -1640,10 +1685,6 @@ msgstr ""
 msgid "Incorrect RSS feed description \"%s\""
 msgstr "Feilaktig RSS-kilde beskrivelse \"%s\""
 
-#: sabnzbd/rss.py
-msgid "Failed to retrieve RSS from %s: %s"
-msgstr "Kunne ikke hente RSS-kilde fra %s: %s"
-
 #: sabnzbd/rss.py
 msgid "Do not have valid authentication for feed %s"
 msgstr "Ugyldig autentisering for nyhetsstrøm %s"
@@ -1652,10 +1693,15 @@ msgstr "Ugyldig autentisering for nyhetsstrøm %s"
 msgid "Server side error (server code %s); could not get %s on %s"
 msgstr "Serverside-feil (serverkode %s); kunne ikke hente %s på %s"
 
+#: sabnzbd/rss.py
+msgid "Failed to retrieve RSS from %s: %s"
+msgstr "Kunne ikke hente RSS-kilde fra %s: %s"
+
 #: sabnzbd/rss.py, sabnzbd/urlgrabber.py
 msgid "Server %s uses an untrusted HTTPS certificate"
 msgstr "Server %s bruker et usikkert HTTP sertifikat"
 
+#. Warning message
 #: sabnzbd/rss.py
 msgid "RSS Feed %s was empty"
 msgstr "RSS-kilde %s var tom"
@@ -1745,6 +1791,16 @@ msgstr "Nedlastning"
 msgid "Join files"
 msgstr "Slå sammen filer"
 
+#. PP phase "unpack"
+#: sabnzbd/skintext.py
+msgid "Unpack"
+msgstr "Utpakking"
+
+#. PP phase "script" - Notification Script settings
+#: sabnzbd/skintext.py
+msgid "Script"
+msgstr "Skript"
+
 #. PP Source of the NZB (path or URL) - Where to find the SABnzbd sourcecode
 #: sabnzbd/skintext.py
 msgid "Source"
@@ -1969,11 +2025,6 @@ msgstr "time"
 msgid "hours"
 msgstr "timer"
 
-#. One minute
-#: sabnzbd/skintext.py
-msgid "min"
-msgstr "minutt"
-
 #. Multiple minutes
 #: sabnzbd/skintext.py
 msgid "mins"
@@ -2069,6 +2120,10 @@ msgstr "Denne uken"
 msgid "This month"
 msgstr "Denne måneden"
 
+#: sabnzbd/skintext.py
+msgid "Selected date range"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Today"
 msgstr "I dag"
@@ -2077,6 +2132,14 @@ msgstr "I dag"
 msgid "Total"
 msgstr "Totalt"
 
+#: sabnzbd/skintext.py
+msgid "Custom"
+msgstr "Tilpasse"
+
+#: sabnzbd/skintext.py
+msgid "Speed"
+msgstr "Hastighet"
+
 #: sabnzbd/skintext.py
 msgid "on"
 msgstr "på"
@@ -2909,6 +2972,12 @@ msgstr "(ikke installert)"
 msgid "Enable accessing the interface from a HTTPS address."
 msgstr "Aktiverer tilgangen til webgrensesnittet med HTTPS adresse."
 
+#: sabnzbd/skintext.py
+msgid ""
+"Modern web browsers and other clients will not accept self-signed "
+"certificates and will give a warning and/or won't connect at all."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "HTTPS Port"
 msgstr "HTTPS-port"
@@ -3077,24 +3146,12 @@ msgstr "Generer Ny Nøkkel"
 msgid "API Key QR Code"
 msgstr "API-nøkkel QR-kode"
 
-#: sabnzbd/skintext.py
-msgid "List of local network ranges"
-msgstr "Liste over lokale nettverksområder"
-
-#: sabnzbd/skintext.py
-msgid ""
-"All local network addresses start with these prefixes (often \"192.168.1.\")"
-msgstr ""
-"Alle lokale nettverksadresser starter med disse prefix (ofte \"192.168.1.\")"
-
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Ekstern internettilgang"
 
 #: sabnzbd/skintext.py
-msgid ""
-"You can set access rights for systems outside your local network. Requires "
-"List of local network ranges to be defined."
+msgid "You can set access rights for systems outside your local network."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3178,6 +3235,26 @@ msgstr ""
 "Plass for å lagre bearbeidede og ferdige nedlastinger.<br /><i>Kan "
 "overstyres av brukerdefinerte kategorier.</i>"
 
+#: sabnzbd/skintext.py
+msgid "Minimum Free Space for Completed Download Folder"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Will not work if a category folder is on a different disk."
+msgstr ""
+
+#. Auto-resume download on the reset day
+#: sabnzbd/skintext.py
+msgid "Auto resume"
+msgstr "Gjenoppta automatisk"
+
+#: sabnzbd/skintext.py
+msgid ""
+"Downloading will automatically resume if the minimum free space is available"
+" again.<br />Applies to both the Temporary and Complete Download Folder.<br "
+"/>Checked every few minutes."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Permissions for completed downloads"
 msgstr "Rettigheter for ferdige nedlastinger"
@@ -3321,8 +3398,11 @@ msgid "Post-Process Only Verified Jobs"
 msgstr "Etterbehandle kun verifiserte nedlastinger"
 
 #: sabnzbd/skintext.py
-msgid "Only perform post-processing on jobs that passed all PAR2 checks."
-msgstr "Etterbehandle kun nedlastinger som har passert PAR2 kontrollen."
+msgid ""
+"Only unpack and run scripts on jobs that passed the verification stage. If "
+"turned off, all jobs will be marked as Completed even if they are "
+"incomplete."
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Action when encrypted RAR is downloaded"
@@ -3388,19 +3468,26 @@ msgid "Action when unwanted extension detected"
 msgstr "Handling når uønsket filtype oppdaget"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected in RAR files"
-msgstr "Handling når uønsket filtype blir oppdaget i RAR filer."
+msgid "Action when an unwanted extension is detected"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Uønsket filtyper"
 
 #: sabnzbd/skintext.py
-msgid ""
-"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
+msgid "Blacklist"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Whitelist"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
+" <b>exe, com</b>"
 msgstr ""
-"Skriv alle uønskende filtyper. For eksempel: <b>exe</b>  eller <b>exe, "
-"com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -3567,6 +3654,16 @@ msgstr "Filtrere ut sample-filer (ex. video samplinger)."
 msgid "Delete after download"
 msgstr "Fjern etter nedlasting"
 
+#: sabnzbd/skintext.py
+msgid "Deobfuscate final filenames"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"If filenames of (large) files in the final folder look obfuscated or "
+"meaningless they will be renamed to the job name."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "HTTPS certificate verification"
 msgstr ""
@@ -3613,11 +3710,6 @@ msgstr ""
 "På hvilken dag i måneden eller uken (1=mandag) resetter til nettilbyder "
 "kvoten? (Valgfritt med tt:mm)"
 
-#. Auto-resume download on the reset day
-#: sabnzbd/skintext.py
-msgid "Auto resume"
-msgstr "Gjenoppta automatisk"
-
 #: sabnzbd/skintext.py
 msgid "Should downloading resume after the quota is reset?"
 msgstr "Skal nedlasting starte på nytt etter at kvoten er resatt?"
@@ -3772,6 +3864,21 @@ msgstr "Passord"
 msgid "Timeout"
 msgstr "Tidsavbrudd"
 
+#: sabnzbd/skintext.py
+msgid "Account expiration date"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Warn 5 days in advance of account expiration date."
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Quota for this account, counted from the time it is set. In bytes, "
+"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
+" minutes."
+msgstr ""
+
 #. Server's retention time in days
 #: sabnzbd/skintext.py
 msgid "Retention time"
@@ -3863,6 +3970,14 @@ msgstr "Send gruppekommando før du ber om artikler."
 msgid "Personal notes"
 msgstr "Persolige notater"
 
+#: sabnzbd/skintext.py
+msgid "Article availability"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "%f% available of %d requested articles"
+msgstr ""
+
 #. Config->Scheduling
 #: sabnzbd/skintext.py
 msgid "Add Schedule"
@@ -3915,6 +4030,16 @@ msgstr "Les kilde"
 msgid "Force Download"
 msgstr "Tving nedlasting"
 
+#. Config->RSS edit button
+#: sabnzbd/skintext.py
+msgid "Edit"
+msgstr ""
+
+#. Config->RSS when will be the next RSS scan
+#: sabnzbd/skintext.py
+msgid "Next scan at"
+msgstr ""
+
 #. Config->RSS table column header
 #: sabnzbd/skintext.py
 msgid "Filter"
@@ -4064,7 +4189,7 @@ msgstr "Varsel sendt!"
 msgid "Enable NotifyOSD"
 msgstr "Aktiver NotifyOSD"
 
-#. Header for OSX Notfication Center section
+#. Header for macOS Notfication Center section
 #: sabnzbd/skintext.py
 msgid "Notification Center"
 msgstr "Varselsenter"
@@ -4613,11 +4738,11 @@ msgid "Date format"
 msgstr "Datoformat"
 
 #: sabnzbd/skintext.py
-msgid "Extra queue column"
-msgstr "Ekstra kø-kolonne"
+msgid "Extra queue columns"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Extra history column"
+msgid "Extra history columns"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -4701,8 +4826,8 @@ msgid "View Script Log"
 msgstr "Se skriptlogg"
 
 #: sabnzbd/skintext.py
-msgid "Update Available!"
-msgstr "Oppdatering tilgjengelig"
+msgid "Renaming the job will abort Direct Unpack."
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid ""
@@ -4715,21 +4840,17 @@ msgid "Glitter has some (new) features you might like!"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Custom"
-msgstr "Tilpasse"
+msgid "Compact layout"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Compact layout"
+msgid "Always use full screen width"
 msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Tabbed layout <br/>(separate queue and history)"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Speed"
-msgstr "Hastighet"
-
 #: sabnzbd/skintext.py
 msgid "Confirm Queue Deletions"
 msgstr "Bekreft Sletting av Kø"

po/main/nl.po

@@ -1,15 +1,15 @@
 # SABnzbd Translation Template file MAIN
-# Copyright 2011-2020 The SABnzbd-Team
+# Copyright 2011-2021 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
-# Safihre <safihre@sabnzbd.org>, 2020
+# Safihre <safihre@sabnzbd.org>, 2021
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.0.0-develop\n"
+"Project-Id-Version: SABnzbd-3.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
-"Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
+"Last-Translator: Safihre <safihre@sabnzbd.org>, 2021\n"
 "Language-Team: Dutch (https://www.transifex.com/sabnzbd/teams/111101/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,16 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. Notification - Status page, table column header, actual message
+#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
+msgid "Warning"
+msgstr "Waarschuwing"
+
+#. Notification
+#: SABnzbd.py, sabnzbd/notifier.py
+msgid "Error"
+msgstr "Fout"
+
 #. Error message
 #: SABnzbd.py
 msgid "Failed to start web-interface"
@@ -94,6 +104,11 @@ msgstr ""
 "bij het downloaden, problemen krijgen met Unicode namen van bestanden en "
 "mappen."
 
+#. Warning message
+#: SABnzbd.py
+msgid "Could not load additional certificates from certifi package"
+msgstr "Extra certificaten uit het certifi pakket konden niet geladen worden"
+
 #. Warning message
 #: SABnzbd.py
 msgid "Disabled HTTPS because of missing CERT and KEY files"
@@ -113,16 +128,6 @@ msgstr "Webinterface kon niet gestart worden: "
 msgid "SABnzbd %s started"
 msgstr "SABnzbd %s is gestart"
 
-#. Notification - Status page, table column header, actual message
-#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#. Notification
-#: SABnzbd.py, sabnzbd/notifier.py
-msgid "Error"
-msgstr "Fout"
-
 #: SABnzbd.py, sabnzbd/interface.py
 msgid "SABnzbd shutdown finished"
 msgstr "SABnzbd is afgesloten"
@@ -166,6 +171,11 @@ msgstr "Probleem met tempfile.mkstemp"
 msgid "Loading %s failed"
 msgstr "Inlezen van %s mislukt"
 
+#. Warning message
+#: sabnzbd/__init__.py
+msgid "Cannot access PID file %s"
+msgstr "Kan het PID bestand %s niet benaderen"
+
 #: sabnzbd/api.py, sabnzbd/emailer.py
 msgid "Email succeeded"
 msgstr "E-mail verzonden"
@@ -220,20 +230,20 @@ msgstr "Onherstelbare fout in de Assembler"
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Paused job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Paused job \"%s\" because of encrypted RAR file (if supplied, all passwords "
+"were tried)"
 msgstr ""
-"WAARSCHUWING: Download \"%s\" is gepauzeerd vanwege een versleuteld RAR "
-"bestand (indien aanwezig, zijn alle wachtwoorden geprobeerd)"
+"Download \"%s\" is gepauzeerd vanwege een versleuteld RAR bestand (indien "
+"aanwezig, zijn alle wachtwoorden geprobeerd)"
 
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Aborted job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Aborted job \"%s\" because of encrypted RAR file (if supplied, all passwords"
+" were tried)"
 msgstr ""
-"WAARSCHUWING: Download \"%s\" is afgebroken vanwege een versleuteld RAR "
-"bestand (indien aanwezig, zijn alle wachtwoorden"
+"Download \"%s\" is afgebroken vanwege een versleuteld RAR bestand (indien "
+"aanwezig, zijn alle wachtwoorden geprobeerd)."
 
 #: sabnzbd/assembler.py
 msgid "Aborted, encryption detected"
@@ -241,10 +251,8 @@ msgstr "Afgebroken, versleuteling ontdekt"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
-msgstr ""
-"WAARSCHUWING: Ongewenste extensie ontdekt in \"%s\". Het ongewenste bestand "
-"is \"%s\" "
+msgid "In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
+msgstr "Ongewenste extensie ontdekt in \"%s\". Het ongewenste bestand is \"%s\" "
 
 #: sabnzbd/assembler.py
 msgid "Unwanted extension is in rar file %s"
@@ -256,13 +264,13 @@ msgstr "Afgebroken, ongewenste extensie ontdekt"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Paused job \"%s\" because of rating (%s)"
-msgstr "WAARSCHUWING: Download '%s' gepauzeerd vanwege rating (%s)"
+msgid "Paused job \"%s\" because of rating (%s)"
+msgstr "Download '%s' gepauzeerd vanwege rating (%s)"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Aborted job \"%s\" because of rating (%s)"
-msgstr "WAARSCHUWING: Download '%s' afgebroken vanwege rating (%s)"
+msgid "Aborted job \"%s\" because of rating (%s)"
+msgstr "Download '%s' afgebroken vanwege rating (%s)"
 
 #: sabnzbd/assembler.py
 msgid "Aborted, rating filter matched (%s)"
@@ -319,6 +327,10 @@ msgstr "%s is geen geldig e-mailadres"
 msgid "Server address required"
 msgstr "Serveradres verplicht"
 
+#: sabnzbd/cfg.py
+msgid "%s is not a valid script"
+msgstr "%s is geen geldig script."
+
 #. Warning message
 #: sabnzbd/config.py
 msgid "Configuration locked, cannot save settings"
@@ -351,10 +363,6 @@ msgstr "%s is geen correct octaal getal"
 msgid "UNC path \"%s\" not allowed here"
 msgstr "UNC-pad '%s' hier niet toegestaan."
 
-#: sabnzbd/config.py
-msgid "Error: Path length should be below %s."
-msgstr "Fout: het opgegeven pad mag niet langer zijn dan %s."
-
 #: sabnzbd/config.py
 msgid "Error: Queue not empty, cannot change folder."
 msgstr "Fout: Wachtrij is niet leeg, andere map kiezen niet mogelijk."
@@ -498,6 +506,16 @@ msgstr "Vedachte fout in downloader"
 msgid "Shutting down"
 msgstr "Afsluiten"
 
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s is expiring in %s day(s)"
+msgstr "Server %s verloopt over %s dag(en)."
+
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s has used the specified quota"
+msgstr "Het beschikbare quotum voor server %s is verbruikt. "
+
 #: sabnzbd/emailer.py
 msgid "Failed to connect to mail server"
 msgstr "Verbinding met e-mailserver mislukt"
@@ -601,6 +619,15 @@ msgstr "Aanmaken (%s) mislukt"
 msgid "Failed moving %s to %s"
 msgstr "Verplaatsen van %s naar %s mislukt"
 
+#. Error message
+#: sabnzbd/filesystem.py
+msgid "Blocked attempt to create directory %s"
+msgstr "Poging om map %s aan te maken geblokkeerd"
+
+#: sabnzbd/interface.py
+msgid "Refused connection from:"
+msgstr "Verbinding geweigerd van: "
+
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr "Verbinding met hostnaam \"%s\" geweigerd van:"
@@ -642,6 +669,7 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Inloggen mislukt, controleer gebruikersnaam en wachtwoord."
 
+#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr "Mislukte login progin bij %s"
@@ -661,6 +689,14 @@ msgstr ""
 "dan op onderstaande knop.<br /><br /><strong><a "
 "href=\"..\">Verversen</a></strong><br />"
 
+#: sabnzbd/interface.py
+msgid ""
+"The Completed Download Folder cannot be the same or a subfolder of the "
+"Temporary Download Folder"
+msgstr ""
+"De Map voor verwerkte downloads mag niet een map in de Tijdelijke download "
+"map zijn."
+
 #: sabnzbd/interface.py
 msgid "Warning: LOCALHOST is ambiguous, use numerical IP-address."
 msgstr "Let op: LOCALHOST is niet eenduidig, gebruik een numeriek IP-adres."
@@ -745,6 +781,15 @@ msgstr "h"
 msgid "m"
 msgstr "m"
 
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Update Available!"
+msgstr "Update beschikbaar!"
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Failed to upload file: %s"
+msgstr "Kon het volgende bestand niet uploaden: %s"
+
 #. Error message
 #: sabnzbd/misc.py
 msgid "Error creating SSL key and certificate"
@@ -760,19 +805,25 @@ msgstr ""
 "deze wachtwoorden kost heel veel tijd. Zorg ervoor dat je alleen maar "
 "nuttige wachtwoorden in dit bestand zet."
 
+#. Warning message
+#: sabnzbd/misc.py
+msgid "Failed to read the password file %s"
+msgstr "Kan het wachtwoord bestand niet uitlezen %s"
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "[%s] The command in build_command is undefined."
+msgstr "[%s] Het commando in build_command is ongedefinieerd"
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Python script \"%s\" does not have execute (+x) permission set"
+msgstr "Python-script '%s' heeft geen uitvoerpermissie (+x)"
+
 #: sabnzbd/newsunpack.py, sabnzbd/postproc.py
 msgid "Running script"
 msgstr "Script uitvoeren"
 
-#: sabnzbd/newsunpack.py, sabnzbd/postproc.py
-msgid "PostProcessing was aborted (%s)"
-msgstr "Nabewerking is afgebroken (%s)"
-
-#. PP phase "script" - Notification Script settings
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Script"
-msgstr "Script"
-
 #. Warning message
 #: sabnzbd/newsunpack.py
 msgid "Unpack nesting too deep [%s]"
@@ -834,11 +885,6 @@ msgstr "Uitpakken mislukt, archief vereist wachtwoord"
 msgid "Unpacking"
 msgstr "Uitpakken"
 
-#. PP phase "unpack"
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Unpack"
-msgstr "Uitpakken"
-
 #: sabnzbd/newsunpack.py
 msgid "Unpacking failed, unable to find %s"
 msgstr "Uitpakken mislukt, kan %s niet vinden"
@@ -1016,16 +1062,6 @@ msgstr "Controleren van extra bestanden"
 msgid "Checking"
 msgstr "Controleren"
 
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "[%s] The command in build_command is undefined."
-msgstr "[%s] Het commando in build_command is ongedefinieerd"
-
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "Python script \"%s\" does not have execute (+x) permission set"
-msgstr "Python-script '%s' heeft geen uitvoerpermissie (+x)"
-
 #: sabnzbd/newsunpack.py
 msgid "Trying SFV verification"
 msgstr "Probeer SFV-verificatie"
@@ -1061,6 +1097,19 @@ msgstr "Wiki"
 msgid "Startup/Shutdown"
 msgstr "Opstarten/Afsluiten"
 
+#. Notification - Pause downloading - Four way switch for duplicates -
+#. Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Pause"
+msgstr "Pauze"
+
+#. Notification - Resume downloading - Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Resume"
+msgstr "Doorgaan"
+
 #. Notification - Config->RSS after adding to queue
 #: sabnzbd/notifier.py, sabnzbd/skintext.py
 msgid "Added NZB"
@@ -1170,15 +1219,12 @@ msgstr "Download aan wachtrij toegevoegd"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Onbekende codering"
 
-#: sabnzbd/nzbstuff.py
-msgid "%s => missing from all servers, discarding"
-msgstr "%s => ontbreekt op alle servers, overslaan"
-
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
 msgstr "Foutief NZB-bestand %s, overslaan (reden=%s, regel=%s)"
 
+#. Warning message
 #: sabnzbd/nzbstuff.py, sabnzbd/urlgrabber.py
 msgid "Empty NZB file %s"
 msgstr "NZB-bestand %s is leeg"
@@ -1284,10 +1330,6 @@ msgstr "Meldingen"
 msgid "Idle"
 msgstr "Rust"
 
-#: sabnzbd/osxmenu.py
-msgid "Configuration"
-msgstr "Instellingen"
-
 #. Main menu item
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Queue"
@@ -1312,21 +1354,10 @@ msgstr "Wis de volledige geschiedenis"
 msgid "Limit Speed"
 msgstr "Beperk snelheid"
 
-#. Pause downloading - Four way switch for duplicates - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Pause"
-msgstr "Pauze"
-
-#: sabnzbd/osxmenu.py
-msgid "min."
-msgstr "min."
-
-#. Resume downloading - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Resume"
-msgstr "Doorgaan"
+#. One minute
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+msgid "min"
+msgstr "min"
 
 #. #: Config->Scheduler
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
@@ -1375,10 +1406,6 @@ msgstr "Leeg"
 msgid "History Last 10 Items"
 msgstr "Geschiedenis Laaste 10 Items"
 
-#: sabnzbd/osxmenu.py
-msgid "New release available"
-msgstr "Nieuwe versie beschikbaar"
-
 #: sabnzbd/osxmenu.py
 msgid "Go to wizard"
 msgstr "Ga naar Wizard"
@@ -1536,6 +1563,10 @@ msgstr ""
 msgid "Download failed - Not on your server(s)"
 msgstr "Download mislukt - Niet meer op je server(s)"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing"
+msgstr "Nabewerking"
+
 #: sabnzbd/postproc.py
 msgid "Moving"
 msgstr "Verplaatsen"
@@ -1579,6 +1610,10 @@ msgstr "Nabewerking van %s mislukt (%s)"
 msgid "see logfile"
 msgstr "zie logbestand"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing was aborted"
+msgstr "Nabewerking is afgebroken"
+
 #: sabnzbd/postproc.py
 msgid "Download Failed"
 msgstr "Download mislukt"
@@ -1597,10 +1632,6 @@ msgstr "Download voltooid"
 msgid "Cannot create final folder %s"
 msgstr "Kan bestemmingsmap %s niet maken"
 
-#: sabnzbd/postproc.py
-msgid "Post-processing"
-msgstr "Nabewerking"
-
 #: sabnzbd/postproc.py
 msgid "[%s] No par2 sets"
 msgstr "[%s] Geen par2 groepen"
@@ -1633,6 +1664,15 @@ msgstr "RAR bestanden zijn succesvol geverifieerd"
 msgid "RAR files failed to verify"
 msgstr "RAR bestanden zijn niet verifieerbaar"
 
+#: sabnzbd/postproc.py
+msgid "Trying RAR renamer"
+msgstr "RAR-hernoeming wordt geprobeerd"
+
+#. Warning message
+#: sabnzbd/postproc.py
+msgid "No matching earlier rar file for %s"
+msgstr "Geen voorgaand rar-bestand gevonden bij %s"
+
 #. Error message
 #: sabnzbd/postproc.py
 msgid "Removing %s failed"
@@ -1653,6 +1693,11 @@ msgstr "Kan het systeem niet in standby krijgen"
 msgid "Error while shutting down system"
 msgstr "Fout bij het afsluiten van het systeem"
 
+#. Error message
+#: sabnzbd/powersup.py
+msgid "Received a DBus exception %s"
+msgstr "DBus foutmelding %s "
+
 #. Warning message
 #: sabnzbd/rating.py
 msgid "Indexer id (%s) not found for ratings file"
@@ -1679,10 +1724,6 @@ msgstr ""
 msgid "Incorrect RSS feed description \"%s\""
 msgstr "Foutieve RSS-feed definitie \"%s\""
 
-#: sabnzbd/rss.py
-msgid "Failed to retrieve RSS from %s: %s"
-msgstr "Kan RSS-feed \"%s\" niet lezen vanwege: \"%s\""
-
 #: sabnzbd/rss.py
 msgid "Do not have valid authentication for feed %s"
 msgstr "Geen geldige inlog gegevens beschikbaar voor RSS-feed %s"
@@ -1691,10 +1732,15 @@ msgstr "Geen geldige inlog gegevens beschikbaar voor RSS-feed %s"
 msgid "Server side error (server code %s); could not get %s on %s"
 msgstr "Server fout (code is %s); kon geen %s van %s krijgen"
 
+#: sabnzbd/rss.py
+msgid "Failed to retrieve RSS from %s: %s"
+msgstr "Kan RSS-feed \"%s\" niet lezen vanwege: \"%s\""
+
 #: sabnzbd/rss.py, sabnzbd/urlgrabber.py
 msgid "Server %s uses an untrusted HTTPS certificate"
 msgstr "Server %s gebruikt een onbetrouwbaar HTTPS-certificaat"
 
+#. Warning message
 #: sabnzbd/rss.py
 msgid "RSS Feed %s was empty"
 msgstr "RSS-feed %s is leeg"
@@ -1784,6 +1830,16 @@ msgstr "Download"
 msgid "Join files"
 msgstr "Samenvoegen"
 
+#. PP phase "unpack"
+#: sabnzbd/skintext.py
+msgid "Unpack"
+msgstr "Uitpakken"
+
+#. PP phase "script" - Notification Script settings
+#: sabnzbd/skintext.py
+msgid "Script"
+msgstr "Script"
+
 #. PP Source of the NZB (path or URL) - Where to find the SABnzbd sourcecode
 #: sabnzbd/skintext.py
 msgid "Source"
@@ -2008,11 +2064,6 @@ msgstr "uur"
 msgid "hours"
 msgstr "uren"
 
-#. One minute
-#: sabnzbd/skintext.py
-msgid "min"
-msgstr "min"
-
 #. Multiple minutes
 #: sabnzbd/skintext.py
 msgid "mins"
@@ -2108,6 +2159,10 @@ msgstr "Deze Week"
 msgid "This month"
 msgstr "Deze Maand"
 
+#: sabnzbd/skintext.py
+msgid "Selected date range"
+msgstr "Datumbereik"
+
 #: sabnzbd/skintext.py
 msgid "Today"
 msgstr "Vandaag"
@@ -2116,6 +2171,14 @@ msgstr "Vandaag"
 msgid "Total"
 msgstr "Totaal"
 
+#: sabnzbd/skintext.py
+msgid "Custom"
+msgstr "Aangepast"
+
+#: sabnzbd/skintext.py
+msgid "Speed"
+msgstr "Snelheid"
+
 #: sabnzbd/skintext.py
 msgid "on"
 msgstr "aan"
@@ -2961,6 +3024,15 @@ msgstr "niet geinstalleerd"
 msgid "Enable accessing the interface from a HTTPS address."
 msgstr "Webinterface beschikbaar via HTTPS"
 
+#: sabnzbd/skintext.py
+msgid ""
+"Modern web browsers and other clients will not accept self-signed "
+"certificates and will give a warning and/or won't connect at all."
+msgstr ""
+"Self-signed (onofficiële) certificaten worden door moderne webbrowsers en "
+"andere programma's meestal niet geaccepteerd waardoor deze een foutmelding "
+"geven of helemaal niet kunnen verbinden."
+
 #: sabnzbd/skintext.py
 msgid "HTTPS Port"
 msgstr "HTTPS Poort"
@@ -3056,7 +3128,7 @@ msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "History Retention"
-msgstr "Geschiedenis Bewaren"
+msgstr "Geschiedenis bewaren"
 
 #: sabnzbd/skintext.py
 msgid ""
@@ -3138,28 +3210,14 @@ msgstr "Maak een nieuwe sleutel"
 msgid "API Key QR Code"
 msgstr "QR-code van de API-sleutel"
 
-#: sabnzbd/skintext.py
-msgid "List of local network ranges"
-msgstr "Lijst van lokale netwerk bereiken"
-
-#: sabnzbd/skintext.py
-msgid ""
-"All local network addresses start with these prefixes (often \"192.168.1.\")"
-msgstr ""
-"Alle lokale netwerk adressen die beginnen met deze reeks (vaak "
-"\"192.168.1.\")"
-
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Externe toegang"
 
 #: sabnzbd/skintext.py
-msgid ""
-"You can set access rights for systems outside your local network. Requires "
-"List of local network ranges to be defined."
+msgid "You can set access rights for systems outside your local network."
 msgstr ""
 "Je kunt toegangsrechten instellen voor systemen buiten je lokale netwerk. "
-"Hiervoor geef je een lijst van netwerk-bereiken in."
 
 #: sabnzbd/skintext.py
 msgid "No access"
@@ -3235,6 +3293,29 @@ msgid ""
 "overruled by user-defined categories.</i>"
 msgstr "(kan aangepast worden door de categorieën)."
 
+#: sabnzbd/skintext.py
+msgid "Minimum Free Space for Completed Download Folder"
+msgstr "Minimale vrije ruimte voor verwerkte downloads map"
+
+#: sabnzbd/skintext.py
+msgid "Will not work if a category folder is on a different disk."
+msgstr "Werkt niet als een categorie-pad naar een andere schijf verwijst."
+
+#. Auto-resume download on the reset day
+#: sabnzbd/skintext.py
+msgid "Auto resume"
+msgstr "Automatisch doorgaan"
+
+#: sabnzbd/skintext.py
+msgid ""
+"Downloading will automatically resume if the minimum free space is available"
+" again.<br />Applies to both the Temporary and Complete Download Folder.<br "
+"/>Checked every few minutes."
+msgstr ""
+"Het downloaden zal automatisch hervat worden als de minimale vrije ruimte "
+"weer beschikbaar is.<br />Is van toepassing op zowel de tijdelijke als "
+"verwerkte download map.<br />Wordt elke paar minuten gecontroleerd."
+
 #: sabnzbd/skintext.py
 msgid "Permissions for completed downloads"
 msgstr "Toegangsrechten voor verwerkte downloads"
@@ -3382,10 +3463,14 @@ msgid "Post-Process Only Verified Jobs"
 msgstr "Verwerk alleen correct geverifieerde downloads"
 
 #: sabnzbd/skintext.py
-msgid "Only perform post-processing on jobs that passed all PAR2 checks."
+msgid ""
+"Only unpack and run scripts on jobs that passed the verification stage. If "
+"turned off, all jobs will be marked as Completed even if they are "
+"incomplete."
 msgstr ""
-"Voer de nabewerking alleen uit op downloads die de PAR2 controles hebben "
-"doorlopen."
+"Uitpakken en scripts worden alleen uitgevoerd op opdrachten die succesvol "
+"geverifieerd zijn. Als deze optie uitgeschakeld is zullen alle opdrachten "
+"gemarkeerd worden als succesvol, zelfs als dat niet zo is."
 
 #: sabnzbd/skintext.py
 msgid "Action when encrypted RAR is downloaded"
@@ -3458,20 +3543,28 @@ msgid "Action when unwanted extension detected"
 msgstr "Actie bij ontdekken van ongewenste extensie"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected in RAR files"
-msgstr ""
-"Actie wanneer een ongewenste extensie wordt gevonden in een RAR-bestand"
+msgid "Action when an unwanted extension is detected"
+msgstr "Actie bij ontdekken van een ongewenste extensie"
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Ongewenste extensies"
 
+#: sabnzbd/skintext.py
+msgid "Blacklist"
+msgstr "Blacklist"
+
+#: sabnzbd/skintext.py
+msgid "Whitelist"
+msgstr "Whitelist"
+
 #: sabnzbd/skintext.py
 msgid ""
-"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
+"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
+" <b>exe, com</b>"
 msgstr ""
-"Lijst van alle ongewenste extensies. Voorbeeld: <b>exe</b> or <b>exe, "
-"com</b>"
+"Kies een stand en voer een lijst van alle (on)gewenste extensies in. "
+"Voorbeeld: <b>exe</b> or <b>exe, com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -3495,7 +3588,7 @@ msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "On failure, try alternative NZB"
-msgstr "Bij mislukking: probeer alternatieve NZB"
+msgstr "Bij mislukte download: probeer alternatieve NZB"
 
 #: sabnzbd/skintext.py
 msgid "Some servers provide an alternative NZB when a download fails."
@@ -3645,6 +3738,19 @@ msgstr "Wat te doen met \"sample\"-bestanden?"
 msgid "Delete after download"
 msgstr "Verwijderen na download"
 
+#: sabnzbd/skintext.py
+msgid "Deobfuscate final filenames"
+msgstr "Verbeter bestandsnamen van voltooide downloads"
+
+#: sabnzbd/skintext.py
+msgid ""
+"If filenames of (large) files in the final folder look obfuscated or "
+"meaningless they will be renamed to the job name."
+msgstr ""
+"Als bestandsnamen van (grote) bestanden na een voltooide download onlogisch "
+"of verhaspelt lijken (obfuscated), worden ze vervangen door de naam van de "
+"download."
+
 #: sabnzbd/skintext.py
 msgid "HTTPS certificate verification"
 msgstr "HTTPS certificaatverificatie"
@@ -3693,11 +3799,6 @@ msgstr ""
 "Op welke dag van de maand of week (1=maandag) wordt het quotum gereset? "
 "(Eventueel met hh:mm)"
 
-#. Auto-resume download on the reset day
-#: sabnzbd/skintext.py
-msgid "Auto resume"
-msgstr "Automatisch doorgaan"
-
 #: sabnzbd/skintext.py
 msgid "Should downloading resume after the quota is reset?"
 msgstr ""
@@ -3859,6 +3960,25 @@ msgstr "Wachtwoord"
 msgid "Timeout"
 msgstr "Tijdslimiet"
 
+#: sabnzbd/skintext.py
+msgid "Account expiration date"
+msgstr "Verloopdatum"
+
+#: sabnzbd/skintext.py
+msgid "Warn 5 days in advance of account expiration date."
+msgstr "Ontvang 5 dagen voor de verloopdatum een waarschuwing."
+
+#: sabnzbd/skintext.py
+msgid ""
+"Quota for this account, counted from the time it is set. In bytes, "
+"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
+" minutes."
+msgstr ""
+"Quotum voor dit account, wordt geteld vanaf het moment dat het voor het "
+"eerst ingesteld wordt. In bytes, in K,M,G notatie.<br />Er wordt een "
+"waarschuwing gegeven als het quotum bereikt is, dit wordt elke paar minuten "
+"gecontroleerd."
+
 #. Server's retention time in days
 #: sabnzbd/skintext.py
 msgid "Retention time"
@@ -3955,6 +4075,14 @@ msgstr "Verzend de groepsnaam naar de server."
 msgid "Personal notes"
 msgstr "Persoonlijke aantekeningen"
 
+#: sabnzbd/skintext.py
+msgid "Article availability"
+msgstr "Beschikbaarheid van artikelen"
+
+#: sabnzbd/skintext.py
+msgid "%f% available of %d requested articles"
+msgstr "%f% van %d opgevraagde artikelen"
+
 #. Config->Scheduling
 #: sabnzbd/skintext.py
 msgid "Add Schedule"
@@ -4007,6 +4135,16 @@ msgstr "Uitlezen"
 msgid "Force Download"
 msgstr "Forceer download"
 
+#. Config->RSS edit button
+#: sabnzbd/skintext.py
+msgid "Edit"
+msgstr "Wijzigen"
+
+#. Config->RSS when will be the next RSS scan
+#: sabnzbd/skintext.py
+msgid "Next scan at"
+msgstr "Wordt uitgevoerd om"
+
 #. Config->RSS table column header
 #: sabnzbd/skintext.py
 msgid "Filter"
@@ -4159,7 +4297,7 @@ msgstr "Melding verzonden"
 msgid "Enable NotifyOSD"
 msgstr "NotifyOSD activeren"
 
-#. Header for OSX Notfication Center section
+#. Header for macOS Notfication Center section
 #: sabnzbd/skintext.py
 msgid "Notification Center"
 msgstr "Berichtencentrum"
@@ -4712,12 +4850,12 @@ msgid "Date format"
 msgstr "Datumnotatie"
 
 #: sabnzbd/skintext.py
-msgid "Extra queue column"
-msgstr "Extra kolom aan wachtrij toevoegen"
+msgid "Extra queue columns"
+msgstr "Extra kolommen aan wachtrij toevoegen"
 
 #: sabnzbd/skintext.py
-msgid "Extra history column"
-msgstr "Extra kolom aan geschiedenis toevoegen"
+msgid "Extra history columns"
+msgstr "Extra kolommen aan geschiedenis toevoegen"
 
 #: sabnzbd/skintext.py
 msgid "page"
@@ -4800,8 +4938,8 @@ msgid "View Script Log"
 msgstr "Toon Script resultaat"
 
 #: sabnzbd/skintext.py
-msgid "Update Available!"
-msgstr "Update beschikbaar!"
+msgid "Renaming the job will abort Direct Unpack."
+msgstr "Als je de naam wijzigt zal het Direct Uitpakken gestopt worden."
 
 #: sabnzbd/skintext.py
 msgid ""
@@ -4815,21 +4953,17 @@ msgstr ""
 msgid "Glitter has some (new) features you might like!"
 msgstr "Glitter heeft enkele (nieuwe) functies die je mogelijk aanspreken!"
 
-#: sabnzbd/skintext.py
-msgid "Custom"
-msgstr "Aangepast"
-
 #: sabnzbd/skintext.py
 msgid "Compact layout"
 msgstr "Compacte weergave"
 
 #: sabnzbd/skintext.py
-msgid "Tabbed layout <br/>(separate queue and history)"
-msgstr "Weergave in tabs <br/>(wachtrij en geschiedenis apart weergeven)"
+msgid "Always use full screen width"
+msgstr "Gebruik de volledige schermbreedte"
 
 #: sabnzbd/skintext.py
-msgid "Speed"
-msgstr "Snelheid"
+msgid "Tabbed layout <br/>(separate queue and history)"
+msgstr "Weergave in tabs <br/>(wachtrij en geschiedenis apart weergeven)"
 
 #: sabnzbd/skintext.py
 msgid "Confirm Queue Deletions"

po/main/pl.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file MAIN
-# Copyright 2011-2020 The SABnzbd-Team
+# Copyright 2011-2021 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.0.0-develop\n"
+"Project-Id-Version: SABnzbd-3.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Polish (https://www.transifex.com/sabnzbd/teams/111101/pl/)\n"
@@ -17,6 +17,16 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
+#. Notification - Status page, table column header, actual message
+#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
+msgid "Warning"
+msgstr "Ostrzeżenie"
+
+#. Notification
+#: SABnzbd.py, sabnzbd/notifier.py
+msgid "Error"
+msgstr "Błąd"
+
 #. Error message
 #: SABnzbd.py
 msgid "Failed to start web-interface"
@@ -85,6 +95,11 @@ msgid ""
 "with Unicoded file and directory names in downloads."
 msgstr ""
 
+#. Warning message
+#: SABnzbd.py
+msgid "Could not load additional certificates from certifi package"
+msgstr ""
+
 #. Warning message
 #: SABnzbd.py
 msgid "Disabled HTTPS because of missing CERT and KEY files"
@@ -104,16 +119,6 @@ msgstr "Nie udało się uruchomić interfejsu WWW: "
 msgid "SABnzbd %s started"
 msgstr "Uruchomiono SABnzbd %s"
 
-#. Notification - Status page, table column header, actual message
-#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
-msgid "Warning"
-msgstr "Ostrzeżenie"
-
-#. Notification
-#: SABnzbd.py, sabnzbd/notifier.py
-msgid "Error"
-msgstr "Błąd"
-
 #: SABnzbd.py, sabnzbd/interface.py
 msgid "SABnzbd shutdown finished"
 msgstr "SABnzbd został wyłączony"
@@ -157,6 +162,11 @@ msgstr "Błąd w tempfile.mkstemp"
 msgid "Loading %s failed"
 msgstr "Nie udało się wczytać %s"
 
+#. Warning message
+#: sabnzbd/__init__.py
+msgid "Cannot access PID file %s"
+msgstr ""
+
 #: sabnzbd/api.py, sabnzbd/emailer.py
 msgid "Email succeeded"
 msgstr "Wiadomość wysłana"
@@ -211,15 +221,15 @@ msgstr "Błąd krytyczny w module składającym"
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Paused job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Paused job \"%s\" because of encrypted RAR file (if supplied, all passwords "
+"were tried)"
 msgstr ""
 
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Aborted job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Aborted job \"%s\" because of encrypted RAR file (if supplied, all passwords"
+" were tried)"
 msgstr ""
 
 #: sabnzbd/assembler.py
@@ -228,10 +238,8 @@ msgstr "Przerwano, wykryto szyfrowanie"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
+msgid "In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
 msgstr ""
-"UWAGA: Plik z niepożądanym rozszerzeniem wewnątrz pliku RAR \"%s\". "
-"Niepożądany plik to %s "
 
 #: sabnzbd/assembler.py
 msgid "Unwanted extension is in rar file %s"
@@ -243,13 +251,13 @@ msgstr "Przerwano, wykryto niepożądane rozszerzenie"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Paused job \"%s\" because of rating (%s)"
-msgstr "UWAGA: Zadanie \"%s\" zostało wstrzymane z powodu oceny (%s)"
+msgid "Paused job \"%s\" because of rating (%s)"
+msgstr ""
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Aborted job \"%s\" because of rating (%s)"
-msgstr "UWAGA: Zadanie \"%s\" zostało przerwane z powodu oceny (%s)"
+msgid "Aborted job \"%s\" because of rating (%s)"
+msgstr ""
 
 #: sabnzbd/assembler.py
 msgid "Aborted, rating filter matched (%s)"
@@ -302,6 +310,10 @@ msgstr "%s nie jest prawidłowym adresem email"
 msgid "Server address required"
 msgstr "Wymagane jest podanie adresu serwera"
 
+#: sabnzbd/cfg.py
+msgid "%s is not a valid script"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/config.py
 msgid "Configuration locked, cannot save settings"
@@ -334,10 +346,6 @@ msgstr "%s nie jest prawidłową wartością w systemie ósemkowym"
 msgid "UNC path \"%s\" not allowed here"
 msgstr "Ścieżka UNC \"%s\" niedozwolona"
 
-#: sabnzbd/config.py
-msgid "Error: Path length should be below %s."
-msgstr "Błąd: Długość ścieżki powinna być mniejsza niż %s"
-
 #: sabnzbd/config.py
 msgid "Error: Queue not empty, cannot change folder."
 msgstr "Błąd: Kolejka nie jest pusta, nie można zmienić katalogu."
@@ -475,6 +483,16 @@ msgstr "Nieobsługiwany błąd w module pobierania"
 msgid "Shutting down"
 msgstr "Wyłączanie"
 
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s is expiring in %s day(s)"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s has used the specified quota"
+msgstr ""
+
 #: sabnzbd/emailer.py
 msgid "Failed to connect to mail server"
 msgstr "Błąd połączenia z serwerem pocztowym"
@@ -580,6 +598,15 @@ msgstr "Nie udało się utworzyć (%s)"
 msgid "Failed moving %s to %s"
 msgstr "Nie udało się przenieść %s do %s"
 
+#. Error message
+#: sabnzbd/filesystem.py
+msgid "Blocked attempt to create directory %s"
+msgstr ""
+
+#: sabnzbd/interface.py
+msgid "Refused connection from:"
+msgstr ""
+
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr ""
@@ -621,6 +648,7 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Błąd połączenia, sprawdź nazwę użytkownika i hasło."
 
+#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr ""
@@ -640,6 +668,12 @@ msgstr ""
 "następnie kliknij na przycisk poniżej.<br /><br /><strong><a "
 "href=\"..\">Odśwież</a></strong><br />"
 
+#: 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 "Warning: LOCALHOST is ambiguous, use numerical IP-address."
 msgstr "Uwaga: LOCALHOST jest niejednoznaczne, użyj adresu IP."
@@ -722,6 +756,15 @@ msgstr "g"
 msgid "m"
 msgstr "m"
 
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Update Available!"
+msgstr "Dostępna aktualizacja!"
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Failed to upload file: %s"
+msgstr ""
+
 #. Error message
 #: sabnzbd/misc.py
 msgid "Error creating SSL key and certificate"
@@ -734,19 +777,25 @@ msgid ""
 "passwords takes a lot of time. Try to only list useful passwords."
 msgstr ""
 
+#. Warning message
+#: sabnzbd/misc.py
+msgid "Failed to read the password file %s"
+msgstr ""
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "[%s] The command in build_command is undefined."
+msgstr ""
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Python script \"%s\" does not have execute (+x) permission set"
+msgstr ""
+
 #: sabnzbd/newsunpack.py, sabnzbd/postproc.py
 msgid "Running script"
 msgstr "Uruchamianie skryptu"
 
-#: sabnzbd/newsunpack.py, sabnzbd/postproc.py
-msgid "PostProcessing was aborted (%s)"
-msgstr "Przetwarzanie końcowe zostało przerwane (%s)"
-
-#. PP phase "script" - Notification Script settings
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Script"
-msgstr "Skrypt"
-
 #. Warning message
 #: sabnzbd/newsunpack.py
 msgid "Unpack nesting too deep [%s]"
@@ -808,11 +857,6 @@ msgstr "Rozpakowywanie nie powiodło się, archiwum wymaga podania hasła"
 msgid "Unpacking"
 msgstr "Rozpakowywanie"
 
-#. PP phase "unpack"
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Unpack"
-msgstr "Rozpakuj"
-
 #: sabnzbd/newsunpack.py
 msgid "Unpacking failed, unable to find %s"
 msgstr "Rozpakowywanie nie powiodło się, nie można znaleźć %s"
@@ -990,16 +1034,6 @@ msgstr ""
 msgid "Checking"
 msgstr "Sprawdzanie"
 
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "[%s] The command in build_command is undefined."
-msgstr ""
-
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "Python script \"%s\" does not have execute (+x) permission set"
-msgstr ""
-
 #: sabnzbd/newsunpack.py
 msgid "Trying SFV verification"
 msgstr "Próba weryfikacji SFV"
@@ -1032,6 +1066,19 @@ msgstr "Wiki"
 msgid "Startup/Shutdown"
 msgstr "Uruchomienie/Wyłączenie"
 
+#. Notification - Pause downloading - Four way switch for duplicates -
+#. Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Pause"
+msgstr "Wstrzymaj"
+
+#. Notification - Resume downloading - Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Resume"
+msgstr "Wznów"
+
 #. Notification - Config->RSS after adding to queue
 #: sabnzbd/notifier.py, sabnzbd/skintext.py
 msgid "Added NZB"
@@ -1141,15 +1188,12 @@ msgstr "NZB dodany do kolejki"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Nieznane kodowanie"
 
-#: sabnzbd/nzbstuff.py
-msgid "%s => missing from all servers, discarding"
-msgstr "%s => nie znaleziono na żadnym serwerze, porzucam"
-
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
 msgstr "Nieprawidłowy plik NZB %s, pomijam (powód=%s, linia=%s)"
 
+#. Warning message
 #: sabnzbd/nzbstuff.py, sabnzbd/urlgrabber.py
 msgid "Empty NZB file %s"
 msgstr "Pusty plik NZB %s"
@@ -1255,10 +1299,6 @@ msgstr "Ostrzeżenia"
 msgid "Idle"
 msgstr "Bezczynny"
 
-#: sabnzbd/osxmenu.py
-msgid "Configuration"
-msgstr "Konfiguracja"
-
 #. Main menu item
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Queue"
@@ -1283,21 +1323,10 @@ msgstr "Wyczyść historię"
 msgid "Limit Speed"
 msgstr "Ogranicz prędkość"
 
-#. Pause downloading - Four way switch for duplicates - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Pause"
-msgstr "Wstrzymaj"
-
-#: sabnzbd/osxmenu.py
-msgid "min."
-msgstr "min."
-
-#. Resume downloading - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Resume"
-msgstr "Wznów"
+#. One minute
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+msgid "min"
+msgstr "minuta"
 
 #. #: Config->Scheduler
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
@@ -1346,10 +1375,6 @@ msgstr "Brak"
 msgid "History Last 10 Items"
 msgstr "10 ostatnich"
 
-#: sabnzbd/osxmenu.py
-msgid "New release available"
-msgstr "Dostępne jest nowe wydanie"
-
 #: sabnzbd/osxmenu.py
 msgid "Go to wizard"
 msgstr "Uruchom kreatora konfiguracji"
@@ -1506,6 +1531,10 @@ msgstr "Pobieranie może się nie udać, dostępne jedynie %s z wymaganych %s"
 msgid "Download failed - Not on your server(s)"
 msgstr "Pobieranie nieudane - Dane niedostępne na skonfigurowanych serwerach"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing"
+msgstr "Przetwarzanie końcowe"
+
 #: sabnzbd/postproc.py
 msgid "Moving"
 msgstr "Przenoszenie"
@@ -1549,6 +1578,10 @@ msgstr "Przetwarzanie końcowe nie powiodło się dla %s (%s)"
 msgid "see logfile"
 msgstr "sprawdź logi"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing was aborted"
+msgstr ""
+
 #: sabnzbd/postproc.py
 msgid "Download Failed"
 msgstr "Pobieranie nie powiodło się"
@@ -1567,10 +1600,6 @@ msgstr "Zakończono pobieranie"
 msgid "Cannot create final folder %s"
 msgstr "Nie można utworzyć ostatecznego katalogu %s"
 
-#: sabnzbd/postproc.py
-msgid "Post-processing"
-msgstr "Przetwarzanie końcowe"
-
 #: sabnzbd/postproc.py
 msgid "[%s] No par2 sets"
 msgstr "[%s} Brak zestawów par2"
@@ -1603,6 +1632,15 @@ msgstr ""
 msgid "RAR files failed to verify"
 msgstr ""
 
+#: sabnzbd/postproc.py
+msgid "Trying RAR renamer"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/postproc.py
+msgid "No matching earlier rar file for %s"
+msgstr ""
+
 #. Error message
 #: sabnzbd/postproc.py
 msgid "Removing %s failed"
@@ -1623,6 +1661,11 @@ msgstr "Wstrzymanie systemu nie powiodło się"
 msgid "Error while shutting down system"
 msgstr "Wyłączenie systemu nie powiodło się"
 
+#. Error message
+#: sabnzbd/powersup.py
+msgid "Received a DBus exception %s"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/rating.py
 msgid "Indexer id (%s) not found for ratings file"
@@ -1647,10 +1690,6 @@ msgstr ""
 msgid "Incorrect RSS feed description \"%s\""
 msgstr "Nieprawidłowy opis kanału RSS \"%s\""
 
-#: sabnzbd/rss.py
-msgid "Failed to retrieve RSS from %s: %s"
-msgstr "Nie udało się pobrać RSS z %s: %s"
-
 #: sabnzbd/rss.py
 msgid "Do not have valid authentication for feed %s"
 msgstr "Brak poprawnego uwierzytelnienia dla kanału %s"
@@ -1659,10 +1698,15 @@ msgstr "Brak poprawnego uwierzytelnienia dla kanału %s"
 msgid "Server side error (server code %s); could not get %s on %s"
 msgstr "Błąd po stronie serwera (kod: %s); nie udało się pobrać %s z %s"
 
+#: sabnzbd/rss.py
+msgid "Failed to retrieve RSS from %s: %s"
+msgstr "Nie udało się pobrać RSS z %s: %s"
+
 #: sabnzbd/rss.py, sabnzbd/urlgrabber.py
 msgid "Server %s uses an untrusted HTTPS certificate"
 msgstr "Serwer %s używa niezaufanego certyfikatu HTTPS"
 
+#. Warning message
 #: sabnzbd/rss.py
 msgid "RSS Feed %s was empty"
 msgstr "Kanał RSS %s był pusty"
@@ -1752,6 +1796,16 @@ msgstr "Pobierz"
 msgid "Join files"
 msgstr "Połącz pliki"
 
+#. PP phase "unpack"
+#: sabnzbd/skintext.py
+msgid "Unpack"
+msgstr "Rozpakuj"
+
+#. PP phase "script" - Notification Script settings
+#: sabnzbd/skintext.py
+msgid "Script"
+msgstr "Skrypt"
+
 #. PP Source of the NZB (path or URL) - Where to find the SABnzbd sourcecode
 #: sabnzbd/skintext.py
 msgid "Source"
@@ -1976,11 +2030,6 @@ msgstr "godzina"
 msgid "hours"
 msgstr "godziny"
 
-#. One minute
-#: sabnzbd/skintext.py
-msgid "min"
-msgstr "minuta"
-
 #. Multiple minutes
 #: sabnzbd/skintext.py
 msgid "mins"
@@ -2076,6 +2125,10 @@ msgstr "Ten tydzień"
 msgid "This month"
 msgstr "Ten miesiąc"
 
+#: sabnzbd/skintext.py
+msgid "Selected date range"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Today"
 msgstr "Dzisiaj"
@@ -2084,6 +2137,14 @@ msgstr "Dzisiaj"
 msgid "Total"
 msgstr "Razem"
 
+#: sabnzbd/skintext.py
+msgid "Custom"
+msgstr "Własny"
+
+#: sabnzbd/skintext.py
+msgid "Speed"
+msgstr "Prędkość"
+
 #: sabnzbd/skintext.py
 msgid "on"
 msgstr "włączone"
@@ -2913,6 +2974,12 @@ msgstr "nie zainstalowane"
 msgid "Enable accessing the interface from a HTTPS address."
 msgstr "Włącz dostęp do interfejsu przez HTTPS"
 
+#: sabnzbd/skintext.py
+msgid ""
+"Modern web browsers and other clients will not accept self-signed "
+"certificates and will give a warning and/or won't connect at all."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "HTTPS Port"
 msgstr "Port HTTPS"
@@ -3082,25 +3149,12 @@ msgstr "Utwórz nowy klucz"
 msgid "API Key QR Code"
 msgstr "Kod QR klucza API"
 
-#: sabnzbd/skintext.py
-msgid "List of local network ranges"
-msgstr "Lista zakresów sieci lokalnych"
-
-#: sabnzbd/skintext.py
-msgid ""
-"All local network addresses start with these prefixes (often \"192.168.1.\")"
-msgstr ""
-"Wszystkie lokalne adresy sieciowe zaczynają się od tych prefiksów (często "
-"\"192.168.1.\")"
-
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Dostęp z zewnątrz"
 
 #: sabnzbd/skintext.py
-msgid ""
-"You can set access rights for systems outside your local network. Requires "
-"List of local network ranges to be defined."
+msgid "You can set access rights for systems outside your local network."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3185,6 +3239,26 @@ msgstr ""
 "Miejsce przechowywania ukończonych, przetworzonych plików. <br /><i>Może "
 "zostać zmienione przez ustawienia kategorii.</i>"
 
+#: sabnzbd/skintext.py
+msgid "Minimum Free Space for Completed Download Folder"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Will not work if a category folder is on a different disk."
+msgstr ""
+
+#. Auto-resume download on the reset day
+#: sabnzbd/skintext.py
+msgid "Auto resume"
+msgstr "Automatyczne wznawianie"
+
+#: sabnzbd/skintext.py
+msgid ""
+"Downloading will automatically resume if the minimum free space is available"
+" again.<br />Applies to both the Temporary and Complete Download Folder.<br "
+"/>Checked every few minutes."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Permissions for completed downloads"
 msgstr "Uprawnienia dla ukończonych plików"
@@ -3329,10 +3403,11 @@ msgid "Post-Process Only Verified Jobs"
 msgstr "Przetwarzanie końcowe tylko dla zweryfikowanych zadań"
 
 #: sabnzbd/skintext.py
-msgid "Only perform post-processing on jobs that passed all PAR2 checks."
+msgid ""
+"Only unpack and run scripts on jobs that passed the verification stage. If "
+"turned off, all jobs will be marked as Completed even if they are "
+"incomplete."
 msgstr ""
-"Uruchom przetwarzanie końcowe tylko dla zadań, które zostały sprawdzone przy"
-" użyciu PAR2"
 
 #: sabnzbd/skintext.py
 msgid "Action when encrypted RAR is downloaded"
@@ -3398,20 +3473,26 @@ msgid "Action when unwanted extension detected"
 msgstr "Działanie dla niepożądanych rozszerzeń"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected in RAR files"
+msgid "Action when an unwanted extension is detected"
 msgstr ""
-"Działanie, które zostanie podjęte po wykryciu w pliku RAR niepożądanego "
-"rozszerzenia"
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Niepożądane rozszerzenia"
 
 #: sabnzbd/skintext.py
-msgid ""
-"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
+msgid "Blacklist"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Whitelist"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
+" <b>exe, com</b>"
 msgstr ""
-"Lista niepożądanych rozszerzeń. Przykład: <b>exe</b> lub <b>exe, com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -3580,6 +3661,16 @@ msgstr "Działania, które zostaną podjęte dla plików próbek (np. próbek wi
 msgid "Delete after download"
 msgstr "Usuń po pobraniu"
 
+#: sabnzbd/skintext.py
+msgid "Deobfuscate final filenames"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"If filenames of (large) files in the final folder look obfuscated or "
+"meaningless they will be renamed to the job name."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "HTTPS certificate verification"
 msgstr ""
@@ -3626,11 +3717,6 @@ msgstr ""
 "W którym dniu miesiąca lub tygodnia (1=poniedziałek) twój dostawca resetuje "
 "limit pobierania (opcjonalnie z gg:mm)"
 
-#. Auto-resume download on the reset day
-#: sabnzbd/skintext.py
-msgid "Auto resume"
-msgstr "Automatyczne wznawianie"
-
 #: sabnzbd/skintext.py
 msgid "Should downloading resume after the quota is reset?"
 msgstr "Czy pobieranie powinno zostać automatycznie wznowione w dniu resetu"
@@ -3786,6 +3872,21 @@ msgstr "Hasło"
 msgid "Timeout"
 msgstr "Limit czasu odpowiedzi"
 
+#: sabnzbd/skintext.py
+msgid "Account expiration date"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Warn 5 days in advance of account expiration date."
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Quota for this account, counted from the time it is set. In bytes, "
+"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
+" minutes."
+msgstr ""
+
 #. Server's retention time in days
 #: sabnzbd/skintext.py
 msgid "Retention time"
@@ -3877,6 +3978,14 @@ msgstr "Wyślij polecenie GROUP przed żądaniem artykułu"
 msgid "Personal notes"
 msgstr "Notatki osobiste"
 
+#: sabnzbd/skintext.py
+msgid "Article availability"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "%f% available of %d requested articles"
+msgstr ""
+
 #. Config->Scheduling
 #: sabnzbd/skintext.py
 msgid "Add Schedule"
@@ -3929,6 +4038,16 @@ msgstr "Pobierz kanał"
 msgid "Force Download"
 msgstr "Wymuś pobranie"
 
+#. Config->RSS edit button
+#: sabnzbd/skintext.py
+msgid "Edit"
+msgstr ""
+
+#. Config->RSS when will be the next RSS scan
+#: sabnzbd/skintext.py
+msgid "Next scan at"
+msgstr ""
+
 #. Config->RSS table column header
 #: sabnzbd/skintext.py
 msgid "Filter"
@@ -4078,7 +4197,7 @@ msgstr "Wysłano powiadomienie!"
 msgid "Enable NotifyOSD"
 msgstr "Włącz NotifyOSD"
 
-#. Header for OSX Notfication Center section
+#. Header for macOS Notfication Center section
 #: sabnzbd/skintext.py
 msgid "Notification Center"
 msgstr "Centrum powiadomień"
@@ -4627,11 +4746,11 @@ msgid "Date format"
 msgstr "Format daty"
 
 #: sabnzbd/skintext.py
-msgid "Extra queue column"
-msgstr "Dodatkowa kolumna kolejki"
+msgid "Extra queue columns"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Extra history column"
+msgid "Extra history columns"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -4715,8 +4834,8 @@ msgid "View Script Log"
 msgstr "Zobacz log skryptu"
 
 #: sabnzbd/skintext.py
-msgid "Update Available!"
-msgstr "Dostępna aktualizacja!"
+msgid "Renaming the job will abort Direct Unpack."
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid ""
@@ -4729,21 +4848,17 @@ msgid "Glitter has some (new) features you might like!"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Custom"
-msgstr "Własny"
+msgid "Compact layout"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Compact layout"
+msgid "Always use full screen width"
 msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Tabbed layout <br/>(separate queue and history)"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Speed"
-msgstr "Prędkość"
-
 #: sabnzbd/skintext.py
 msgid "Confirm Queue Deletions"
 msgstr "Potwierdzaj usuwanie z kolejki"

po/main/pt_BR.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file MAIN
-# Copyright 2011-2020 The SABnzbd-Team
+# Copyright 2011-2021 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.0.0-develop\n"
+"Project-Id-Version: SABnzbd-3.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/sabnzbd/teams/111101/pt_BR/)\n"
@@ -17,6 +17,16 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. Notification - Status page, table column header, actual message
+#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
+msgid "Warning"
+msgstr "Alerta"
+
+#. Notification
+#: SABnzbd.py, sabnzbd/notifier.py
+msgid "Error"
+msgstr "Erro"
+
 #. Error message
 #: SABnzbd.py
 msgid "Failed to start web-interface"
@@ -89,6 +99,11 @@ msgid ""
 "with Unicoded file and directory names in downloads."
 msgstr ""
 
+#. Warning message
+#: SABnzbd.py
+msgid "Could not load additional certificates from certifi package"
+msgstr ""
+
 #. Warning message
 #: SABnzbd.py
 msgid "Disabled HTTPS because of missing CERT and KEY files"
@@ -108,16 +123,6 @@ msgstr "Falha ao iniciar a interface web "
 msgid "SABnzbd %s started"
 msgstr "SABnzbd %s iniciado"
 
-#. Notification - Status page, table column header, actual message
-#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
-msgid "Warning"
-msgstr "Alerta"
-
-#. Notification
-#: SABnzbd.py, sabnzbd/notifier.py
-msgid "Error"
-msgstr "Erro"
-
 #: SABnzbd.py, sabnzbd/interface.py
 msgid "SABnzbd shutdown finished"
 msgstr "Encerramento do SABnzbd concluído"
@@ -161,6 +166,11 @@ msgstr "Falha em tempfile.mkstemp"
 msgid "Loading %s failed"
 msgstr "Falha ao carregar %s"
 
+#. Warning message
+#: sabnzbd/__init__.py
+msgid "Cannot access PID file %s"
+msgstr ""
+
 #: sabnzbd/api.py, sabnzbd/emailer.py
 msgid "Email succeeded"
 msgstr "E-mail enviado com sucesso"
@@ -215,15 +225,15 @@ msgstr "Erro fatal no Assembler"
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Paused job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Paused job \"%s\" because of encrypted RAR file (if supplied, all passwords "
+"were tried)"
 msgstr ""
 
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Aborted job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Aborted job \"%s\" because of encrypted RAR file (if supplied, all passwords"
+" were tried)"
 msgstr ""
 
 #: sabnzbd/assembler.py
@@ -232,10 +242,8 @@ msgstr "Cancelado, criptografia detectada"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
+msgid "In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
 msgstr ""
-"ATENÇÃO: Extensão indesejada no arquivo RAR em \"%s\". O arquivo não "
-"desejado é %s "
 
 #: sabnzbd/assembler.py
 msgid "Unwanted extension is in rar file %s"
@@ -247,13 +255,13 @@ msgstr "Cancelado, extensão indesejada detectada"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Paused job \"%s\" because of rating (%s)"
-msgstr "ATENÇÃO: Tarefa \"%s\" em pausa em razão de pontuação (%s)"
+msgid "Paused job \"%s\" because of rating (%s)"
+msgstr ""
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Aborted job \"%s\" because of rating (%s)"
-msgstr "ATENÇÃO: Tarefa \"%s\" interrompida em razão de pontuação (%s)"
+msgid "Aborted job \"%s\" because of rating (%s)"
+msgstr ""
 
 #: sabnzbd/assembler.py
 msgid "Aborted, rating filter matched (%s)"
@@ -306,6 +314,10 @@ msgstr "%s não é um endereço de e-mail válido"
 msgid "Server address required"
 msgstr "Endereço do servidor necessário"
 
+#: sabnzbd/cfg.py
+msgid "%s is not a valid script"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/config.py
 msgid "Configuration locked, cannot save settings"
@@ -338,10 +350,6 @@ msgstr "%s não é um valor octal correto"
 msgid "UNC path \"%s\" not allowed here"
 msgstr "O caminho UNC \"%s\" não é permitido aqui"
 
-#: sabnzbd/config.py
-msgid "Error: Path length should be below %s."
-msgstr "Erro: Tamanho do caminho deve ser menor que %s."
-
 #: sabnzbd/config.py
 msgid "Error: Queue not empty, cannot change folder."
 msgstr "Erro: A fila não está vazia. Não será possível mudar de pasta."
@@ -481,6 +489,16 @@ msgstr "Erro suspeito no downloader"
 msgid "Shutting down"
 msgstr "Encerrando"
 
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s is expiring in %s day(s)"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s has used the specified quota"
+msgstr ""
+
 #: sabnzbd/emailer.py
 msgid "Failed to connect to mail server"
 msgstr "Falha ao conectar ao servidor de e-mail"
@@ -584,6 +602,15 @@ msgstr "Falha ao criar (%s)"
 msgid "Failed moving %s to %s"
 msgstr "Falha ao mover %s para %s"
 
+#. Error message
+#: sabnzbd/filesystem.py
+msgid "Blocked attempt to create directory %s"
+msgstr ""
+
+#: sabnzbd/interface.py
+msgid "Refused connection from:"
+msgstr ""
+
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr ""
@@ -625,6 +652,7 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Falha de autenticação, verifique usuário / senha."
 
+#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr ""
@@ -644,6 +672,12 @@ msgstr ""
 "segundos e, em seguida, clique no botão abaixo.<br /><br /><strong><a "
 "href=\"..\">Atualizar</a></strong><br />"
 
+#: 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 "Warning: LOCALHOST is ambiguous, use numerical IP-address."
 msgstr "Atenção: LOCALHOST é ambíguo, use endereço IP numérico."
@@ -726,6 +760,15 @@ msgstr "h"
 msgid "m"
 msgstr "m"
 
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Update Available!"
+msgstr "Atualização Disponível!"
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Failed to upload file: %s"
+msgstr ""
+
 #. Error message
 #: sabnzbd/misc.py
 msgid "Error creating SSL key and certificate"
@@ -738,19 +781,25 @@ msgid ""
 "passwords takes a lot of time. Try to only list useful passwords."
 msgstr ""
 
+#. Warning message
+#: sabnzbd/misc.py
+msgid "Failed to read the password file %s"
+msgstr ""
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "[%s] The command in build_command is undefined."
+msgstr ""
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Python script \"%s\" does not have execute (+x) permission set"
+msgstr ""
+
 #: sabnzbd/newsunpack.py, sabnzbd/postproc.py
 msgid "Running script"
 msgstr "Executando script"
 
-#: sabnzbd/newsunpack.py, sabnzbd/postproc.py
-msgid "PostProcessing was aborted (%s)"
-msgstr "O pós-processamento foi cancelado (%s)"
-
-#. PP phase "script" - Notification Script settings
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Script"
-msgstr "Script"
-
 #. Warning message
 #: sabnzbd/newsunpack.py
 msgid "Unpack nesting too deep [%s]"
@@ -812,11 +861,6 @@ msgstr "A descompactação falhou. O arquivo exige uma senha"
 msgid "Unpacking"
 msgstr "Descompactando"
 
-#. PP phase "unpack"
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Unpack"
-msgstr "Descompactar"
-
 #: sabnzbd/newsunpack.py
 msgid "Unpacking failed, unable to find %s"
 msgstr "A descompactação falhou. Não foi possível encontrar %s"
@@ -991,16 +1035,6 @@ msgstr ""
 msgid "Checking"
 msgstr "Verificando"
 
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "[%s] The command in build_command is undefined."
-msgstr ""
-
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "Python script \"%s\" does not have execute (+x) permission set"
-msgstr ""
-
 #: sabnzbd/newsunpack.py
 msgid "Trying SFV verification"
 msgstr "Tentando verificação SFV"
@@ -1033,6 +1067,19 @@ msgstr "Wiki"
 msgid "Startup/Shutdown"
 msgstr "Inicialização/Encerramento"
 
+#. Notification - Pause downloading - Four way switch for duplicates -
+#. Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Pause"
+msgstr "Pausar"
+
+#. Notification - Resume downloading - Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Resume"
+msgstr "Continuar"
+
 #. Notification - Config->RSS after adding to queue
 #: sabnzbd/notifier.py, sabnzbd/skintext.py
 msgid "Added NZB"
@@ -1142,15 +1189,12 @@ msgstr "NZB adicionado à fila"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Codificação desconhecida"
 
-#: sabnzbd/nzbstuff.py
-msgid "%s => missing from all servers, discarding"
-msgstr "%s => faltando em todos os servidores. Descartando"
-
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
 msgstr "Arquivo NZB %s inválido. Pulando (razão=%s, linha=%s)"
 
+#. Warning message
 #: sabnzbd/nzbstuff.py, sabnzbd/urlgrabber.py
 msgid "Empty NZB file %s"
 msgstr "Arquivo NZB %s vazio"
@@ -1256,10 +1300,6 @@ msgstr "Alertas"
 msgid "Idle"
 msgstr "Inativo"
 
-#: sabnzbd/osxmenu.py
-msgid "Configuration"
-msgstr "Configuração"
-
 #. Main menu item
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Queue"
@@ -1284,21 +1324,10 @@ msgstr "Limpar Histórico"
 msgid "Limit Speed"
 msgstr "Limitar Velocidade"
 
-#. Pause downloading - Four way switch for duplicates - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Pause"
-msgstr "Pausar"
-
-#: sabnzbd/osxmenu.py
-msgid "min."
-msgstr "min."
-
-#. Resume downloading - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Resume"
-msgstr "Continuar"
+#. One minute
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+msgid "min"
+msgstr "min"
 
 #. #: Config->Scheduler
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
@@ -1347,10 +1376,6 @@ msgstr "Esvaziar"
 msgid "History Last 10 Items"
 msgstr "Histórico dos últimos 10 items"
 
-#: sabnzbd/osxmenu.py
-msgid "New release available"
-msgstr "Nova versão disponível"
-
 #: sabnzbd/osxmenu.py
 msgid "Go to wizard"
 msgstr "Ir para o assistente"
@@ -1508,6 +1533,10 @@ msgstr ""
 msgid "Download failed - Not on your server(s)"
 msgstr "O download falhou - Não está em seu(s) servidor(s)"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing"
+msgstr "Pós-processamento"
+
 #: sabnzbd/postproc.py
 msgid "Moving"
 msgstr "Movendo"
@@ -1551,6 +1580,10 @@ msgstr "O pós-processamento falhou para %s (%s)"
 msgid "see logfile"
 msgstr "veja o arquivo de log"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing was aborted"
+msgstr ""
+
 #: sabnzbd/postproc.py
 msgid "Download Failed"
 msgstr "O download falhou"
@@ -1569,10 +1602,6 @@ msgstr "Download concluído"
 msgid "Cannot create final folder %s"
 msgstr "Não é possível criar a pasta final %s"
 
-#: sabnzbd/postproc.py
-msgid "Post-processing"
-msgstr "Pós-processamento"
-
 #: sabnzbd/postproc.py
 msgid "[%s] No par2 sets"
 msgstr "[%s] Nenhum conjunto par2"
@@ -1605,6 +1634,15 @@ msgstr ""
 msgid "RAR files failed to verify"
 msgstr ""
 
+#: sabnzbd/postproc.py
+msgid "Trying RAR renamer"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/postproc.py
+msgid "No matching earlier rar file for %s"
+msgstr ""
+
 #. Error message
 #: sabnzbd/postproc.py
 msgid "Removing %s failed"
@@ -1625,6 +1663,11 @@ msgstr "Falha ao colocar o sistema em espera"
 msgid "Error while shutting down system"
 msgstr "Erro ao desligar o sistema"
 
+#. Error message
+#: sabnzbd/powersup.py
+msgid "Received a DBus exception %s"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/rating.py
 msgid "Indexer id (%s) not found for ratings file"
@@ -1649,10 +1692,6 @@ msgstr ""
 msgid "Incorrect RSS feed description \"%s\""
 msgstr "Descrição de feed RSS incorreta \"%s\""
 
-#: sabnzbd/rss.py
-msgid "Failed to retrieve RSS from %s: %s"
-msgstr "Falha ao obter RSS de %s: %s"
-
 #: sabnzbd/rss.py
 msgid "Do not have valid authentication for feed %s"
 msgstr "Não há autenticação válida para o feed %s"
@@ -1662,10 +1701,15 @@ msgid "Server side error (server code %s); could not get %s on %s"
 msgstr ""
 "Erro do servidor (código do servidor %s); não foi possível obter %s de %s"
 
+#: sabnzbd/rss.py
+msgid "Failed to retrieve RSS from %s: %s"
+msgstr "Falha ao obter RSS de %s: %s"
+
 #: sabnzbd/rss.py, sabnzbd/urlgrabber.py
 msgid "Server %s uses an untrusted HTTPS certificate"
 msgstr "Servidor %s usa um certificado HTTPS não confiável"
 
+#. Warning message
 #: sabnzbd/rss.py
 msgid "RSS Feed %s was empty"
 msgstr "O feed RSS %s estava vazio"
@@ -1755,6 +1799,16 @@ msgstr "Download"
 msgid "Join files"
 msgstr "Unir arquivos"
 
+#. PP phase "unpack"
+#: sabnzbd/skintext.py
+msgid "Unpack"
+msgstr "Descompactar"
+
+#. PP phase "script" - Notification Script settings
+#: sabnzbd/skintext.py
+msgid "Script"
+msgstr "Script"
+
 #. PP Source of the NZB (path or URL) - Where to find the SABnzbd sourcecode
 #: sabnzbd/skintext.py
 msgid "Source"
@@ -1979,11 +2033,6 @@ msgstr "hora"
 msgid "hours"
 msgstr "horas"
 
-#. One minute
-#: sabnzbd/skintext.py
-msgid "min"
-msgstr "min"
-
 #. Multiple minutes
 #: sabnzbd/skintext.py
 msgid "mins"
@@ -2079,6 +2128,10 @@ msgstr "Esta semana"
 msgid "This month"
 msgstr "Este mês"
 
+#: sabnzbd/skintext.py
+msgid "Selected date range"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Today"
 msgstr "Hoje"
@@ -2087,6 +2140,14 @@ msgstr "Hoje"
 msgid "Total"
 msgstr "Total"
 
+#: sabnzbd/skintext.py
+msgid "Custom"
+msgstr "Personalizado"
+
+#: sabnzbd/skintext.py
+msgid "Speed"
+msgstr "Velocidade"
+
 #: sabnzbd/skintext.py
 msgid "on"
 msgstr "ligado"
@@ -2918,6 +2979,12 @@ msgstr "não instalado"
 msgid "Enable accessing the interface from a HTTPS address."
 msgstr "Ativar acesso à interface por um endereço HTTPS."
 
+#: sabnzbd/skintext.py
+msgid ""
+"Modern web browsers and other clients will not accept self-signed "
+"certificates and will give a warning and/or won't connect at all."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "HTTPS Port"
 msgstr "Porta HTTPS"
@@ -3087,25 +3154,12 @@ msgstr "Gerar Nova Chave"
 msgid "API Key QR Code"
 msgstr "API Key QR Code"
 
-#: sabnzbd/skintext.py
-msgid "List of local network ranges"
-msgstr "Lista de intervalos de rede local"
-
-#: sabnzbd/skintext.py
-msgid ""
-"All local network addresses start with these prefixes (often \"192.168.1.\")"
-msgstr ""
-"Todas os endereços da rede local começam com esse prefixo (geralmente "
-"\"192.168.1.\")"
-
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Acesso externo da Internet"
 
 #: sabnzbd/skintext.py
-msgid ""
-"You can set access rights for systems outside your local network. Requires "
-"List of local network ranges to be defined."
+msgid "You can set access rights for systems outside your local network."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3189,6 +3243,26 @@ msgstr ""
 "Local para armazenar downloads concluídos, totalmente processados​​.<br "
 "/><i>Pode ser anulado por categorias definidas pelo usuário.</i>"
 
+#: sabnzbd/skintext.py
+msgid "Minimum Free Space for Completed Download Folder"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Will not work if a category folder is on a different disk."
+msgstr ""
+
+#. Auto-resume download on the reset day
+#: sabnzbd/skintext.py
+msgid "Auto resume"
+msgstr "Retomar automaticamente"
+
+#: sabnzbd/skintext.py
+msgid ""
+"Downloading will automatically resume if the minimum free space is available"
+" again.<br />Applies to both the Temporary and Complete Download Folder.<br "
+"/>Checked every few minutes."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Permissions for completed downloads"
 msgstr "Permissões para downloads concluídos"
@@ -3334,10 +3408,11 @@ msgid "Post-Process Only Verified Jobs"
 msgstr "Pós-processar apenas os trabalhos verificados"
 
 #: sabnzbd/skintext.py
-msgid "Only perform post-processing on jobs that passed all PAR2 checks."
+msgid ""
+"Only unpack and run scripts on jobs that passed the verification stage. If "
+"turned off, all jobs will be marked as Completed even if they are "
+"incomplete."
 msgstr ""
-"Realizar pós-processamento apenas em trabalhos que passaram todas as "
-"verificações PAR2."
 
 #: sabnzbd/skintext.py
 msgid "Action when encrypted RAR is downloaded"
@@ -3402,19 +3477,26 @@ msgid "Action when unwanted extension detected"
 msgstr "Ação quando extensão indesejada for detectada"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected in RAR files"
-msgstr "Ação quando uma extensão indesejada é detectada em arquivos RAR"
+msgid "Action when an unwanted extension is detected"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Extensões indesejadas"
 
 #: sabnzbd/skintext.py
-msgid ""
-"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
+msgid "Blacklist"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Whitelist"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
+" <b>exe, com</b>"
 msgstr ""
-"Lista todas as extensões indesejadas. Por exemplo: <b>exe</b> ou <b>exe, "
-"com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -3584,6 +3666,16 @@ msgstr "Exclui arquivos de amostra. Exemplo: amostras de vídeo."
 msgid "Delete after download"
 msgstr "Excluir após download"
 
+#: sabnzbd/skintext.py
+msgid "Deobfuscate final filenames"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"If filenames of (large) files in the final folder look obfuscated or "
+"meaningless they will be renamed to the job name."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "HTTPS certificate verification"
 msgstr ""
@@ -3630,11 +3722,6 @@ msgstr ""
 "Em que dia do mês ou da semana (1 = segunda-feira) seu provedor de Internet "
 "redefine sua quota? (Opcionalmente com hh: mm)"
 
-#. Auto-resume download on the reset day
-#: sabnzbd/skintext.py
-msgid "Auto resume"
-msgstr "Retomar automaticamente"
-
 #: sabnzbd/skintext.py
 msgid "Should downloading resume after the quota is reset?"
 msgstr "O download deve retomar quando a quota for restabelecida?"
@@ -3789,6 +3876,21 @@ msgstr "Senha"
 msgid "Timeout"
 msgstr "Tempo limite"
 
+#: sabnzbd/skintext.py
+msgid "Account expiration date"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Warn 5 days in advance of account expiration date."
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Quota for this account, counted from the time it is set. In bytes, "
+"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
+" minutes."
+msgstr ""
+
 #. Server's retention time in days
 #: sabnzbd/skintext.py
 msgid "Retention time"
@@ -3880,6 +3982,14 @@ msgstr "Enviar comando do grupo antes de solicitar artigos."
 msgid "Personal notes"
 msgstr "Notas pessoais"
 
+#: sabnzbd/skintext.py
+msgid "Article availability"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "%f% available of %d requested articles"
+msgstr ""
+
 #. Config->Scheduling
 #: sabnzbd/skintext.py
 msgid "Add Schedule"
@@ -3932,6 +4042,16 @@ msgstr "Ler Feed"
 msgid "Force Download"
 msgstr "Forçar Download"
 
+#. Config->RSS edit button
+#: sabnzbd/skintext.py
+msgid "Edit"
+msgstr ""
+
+#. Config->RSS when will be the next RSS scan
+#: sabnzbd/skintext.py
+msgid "Next scan at"
+msgstr ""
+
 #. Config->RSS table column header
 #: sabnzbd/skintext.py
 msgid "Filter"
@@ -4081,7 +4201,7 @@ msgstr "Notificação Enviada!"
 msgid "Enable NotifyOSD"
 msgstr "Habilitar NotifyOSD"
 
-#. Header for OSX Notfication Center section
+#. Header for macOS Notfication Center section
 #: sabnzbd/skintext.py
 msgid "Notification Center"
 msgstr "Centro de Notificações"
@@ -4630,11 +4750,11 @@ msgid "Date format"
 msgstr "Formato da data"
 
 #: sabnzbd/skintext.py
-msgid "Extra queue column"
-msgstr "Coluna extra da fila"
+msgid "Extra queue columns"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Extra history column"
+msgid "Extra history columns"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -4718,8 +4838,8 @@ msgid "View Script Log"
 msgstr "Exibir Log do Script"
 
 #: sabnzbd/skintext.py
-msgid "Update Available!"
-msgstr "Atualização Disponível!"
+msgid "Renaming the job will abort Direct Unpack."
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid ""
@@ -4732,21 +4852,17 @@ msgid "Glitter has some (new) features you might like!"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Custom"
-msgstr "Personalizado"
+msgid "Compact layout"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Compact layout"
+msgid "Always use full screen width"
 msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Tabbed layout <br/>(separate queue and history)"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Speed"
-msgstr "Velocidade"
-
 #: sabnzbd/skintext.py
 msgid "Confirm Queue Deletions"
 msgstr "Confirmar Exclusões da Fila"

po/main/ro.po

@@ -1,15 +1,16 @@
 # SABnzbd Translation Template file MAIN
-# Copyright 2011-2020 The SABnzbd-Team
+# Copyright 2011-2021 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
+# Eduard Baniceru <war4peace@gmail.com>, 2021
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.0.0-develop\n"
+"Project-Id-Version: SABnzbd-3.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
-"Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
+"Last-Translator: Eduard Baniceru <war4peace@gmail.com>, 2021\n"
 "Language-Team: Romanian (https://www.transifex.com/sabnzbd/teams/111101/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +18,16 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
+#. Notification - Status page, table column header, actual message
+#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
+msgid "Warning"
+msgstr "Avertisment"
+
+#. Notification
+#: SABnzbd.py, sabnzbd/notifier.py
+msgid "Error"
+msgstr "Eroare"
+
 #. Error message
 #: SABnzbd.py
 msgid "Failed to start web-interface"
@@ -31,12 +42,15 @@ msgstr "Nu se poate găsi şablon web:%s, se încearcă şablon standard"
 #: SABnzbd.py
 msgid "SABYenc disabled: no correct version found! (Found v%s, expecting v%s)"
 msgstr ""
+"SABYenc dezactivat: nu s-a găsit o versiune corectă! (Găsită v%s, se "
+"așteaptă v%s)"
 
 #. Error message
 #: SABnzbd.py
 msgid ""
 "SABYenc module... NOT found! Expecting v%s - https://sabnzbd.org/sabyenc"
 msgstr ""
+"Modul SABYenc... NEgăsit! Se așteaptă v%s - https://sabnzbd.org/sabyenc"
 
 #. Error message
 #: SABnzbd.py
@@ -66,7 +80,7 @@ msgstr "binar unzip... Negăsit!"
 #. Error message
 #: SABnzbd.py
 msgid "Essential modules are missing, downloading cannot start."
-msgstr ""
+msgstr "Lipsesc module esențiale, descărcarea nu poate începe."
 
 #. Warning message
 #: SABnzbd.py
@@ -88,6 +102,13 @@ msgid ""
 "SABnzbd was started with encoding %s, this should be UTF-8. Expect problems "
 "with Unicoded file and directory names in downloads."
 msgstr ""
+"SABnzbd a fost pornit cu encodarea %s, aceasta trebuie să fie UTF-8. Pot "
+"apărea probleme cu denumiri de fișiere și directoare Unicode în descărcări."
+
+#. Warning message
+#: SABnzbd.py
+msgid "Could not load additional certificates from certifi package"
+msgstr "Nu pot încărca certificate adiționale din pachetul certifi"
 
 #. Warning message
 #: SABnzbd.py
@@ -97,7 +118,7 @@ msgstr "Dezactivează HTTPS din cauza lipsei fişierelor CERT şi KEY"
 #. Warning message
 #: SABnzbd.py
 msgid "Disabled HTTPS because of invalid CERT and KEY files"
-msgstr ""
+msgstr "HTTPS dezactivat din cauza fișierelor invalide CERT și KEY"
 
 #. Error message
 #: SABnzbd.py
@@ -108,16 +129,6 @@ msgstr "Nu am putu porni interfața web: "
 msgid "SABnzbd %s started"
 msgstr "SABnzbd %s pornit"
 
-#. Notification - Status page, table column header, actual message
-#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
-msgid "Warning"
-msgstr "Avertisment"
-
-#. Notification
-#: SABnzbd.py, sabnzbd/notifier.py
-msgid "Error"
-msgstr "Eroare"
-
 #: SABnzbd.py, sabnzbd/interface.py
 msgid "SABnzbd shutdown finished"
 msgstr "Închidere SABnzbd terminată"
@@ -161,6 +172,11 @@ msgstr "Eroare în tempfile.mkstemp"
 msgid "Loading %s failed"
 msgstr "Încărcarea %s nereuşită"
 
+#. Warning message
+#: sabnzbd/__init__.py
+msgid "Cannot access PID file %s"
+msgstr "Nu pot accesa fișierul PID %s"
+
 #: sabnzbd/api.py, sabnzbd/emailer.py
 msgid "Email succeeded"
 msgstr "Email reuşit"
@@ -215,16 +231,20 @@ msgstr "Eroare fatală în  Assembler"
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Paused job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Paused job \"%s\" because of encrypted RAR file (if supplied, all passwords "
+"were tried)"
 msgstr ""
+"Sarcina „%s” a fost întreruptă din cauza fișierului RAR criptat (toate "
+"parolele oferite au fost încercate)"
 
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Aborted job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Aborted job \"%s\" because of encrypted RAR file (if supplied, all passwords"
+" were tried)"
 msgstr ""
+"Sarcina „%s” a fost anulată din cauza fișierului RAR criptat (toate parolele"
+" oferite au fost încercate)"
 
 #: sabnzbd/assembler.py
 msgid "Aborted, encryption detected"
@@ -232,10 +252,8 @@ msgstr "Terminat, encriptare detectată"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
-msgstr ""
-"ATENȚIE: În fișierul RAR \"%s\" sunt extensii nedorite. Fișierul nedorit "
-"este %s "
+msgid "In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
+msgstr "Extensie nedorită în fișierul RAR al „%s”. Fișierul nedorit este %s"
 
 #: sabnzbd/assembler.py
 msgid "Unwanted extension is in rar file %s"
@@ -247,13 +265,13 @@ msgstr "Oprit, extensii nedorite detectate"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Paused job \"%s\" because of rating (%s)"
-msgstr "ATENȚIE: Sarcina \"%s\" întrearuptă datorită ratingului (%s)"
+msgid "Paused job \"%s\" because of rating (%s)"
+msgstr "Sarcina \"%s\" întreruptă datorită ratingului (%s)"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Aborted job \"%s\" because of rating (%s)"
-msgstr "ATENȚIE: Sarcina \"%s\" anulată datorită ratingului (%s)"
+msgid "Aborted job \"%s\" because of rating (%s)"
+msgstr "Sarcina \"%s\" anulată datorită ratingului (%s)"
 
 #: sabnzbd/assembler.py
 msgid "Aborted, rating filter matched (%s)"
@@ -263,11 +281,13 @@ msgstr "Abandonat, filtru de rating potrivit (%s)"
 #: sabnzbd/assembler.py
 msgid "Job \"%s\" is probably encrypted due to RAR with same name inside this RAR"
 msgstr ""
+"Sarcina „%s” este probabil criptată din cauza unui RAR cu același nume în "
+"acest RAR"
 
 #. Warning message
 #: sabnzbd/assembler.py
 msgid "Job \"%s\" is probably encrypted: \"password\" in filename \"%s\""
-msgstr ""
+msgstr "Sarcina „%s” este probabil criptată: „parolă” în fișierul „%s”"
 
 #: sabnzbd/assembler.py
 msgid "video"
@@ -306,10 +326,14 @@ msgstr "%s nu este o adresă email validă"
 msgid "Server address required"
 msgstr "Adresă server necesară"
 
+#: sabnzbd/cfg.py
+msgid "%s is not a valid script"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/config.py
 msgid "Configuration locked, cannot save settings"
-msgstr ""
+msgstr "Configurație blocată, nu pot salva setările"
 
 #. Error message
 #: sabnzbd/config.py
@@ -338,10 +362,6 @@ msgstr "%s nu este o valoare octală corectă"
 msgid "UNC path \"%s\" not allowed here"
 msgstr "cale UNC \"%s\" nu este premisă aici"
 
-#: sabnzbd/config.py
-msgid "Error: Path length should be below %s."
-msgstr "Eroare: Lungimea cale ar trebuie să fie sub %s."
-
 #: sabnzbd/config.py
 msgid "Error: Queue not empty, cannot change folder."
 msgstr "Eroare: Coada nu este goală, nu pot schimba dosar."
@@ -375,11 +395,11 @@ msgstr "Jurnal istoric stagii invalid pentru %s"
 #. Warning message
 #: sabnzbd/decoder.py
 msgid "Decoder failure: Out of memory"
-msgstr ""
+msgstr "Eroare decodare: lipsă memorie"
 
 #: sabnzbd/decoder.py
 msgid "UUencode detected, only yEnc encoding is supported [%s]"
-msgstr ""
+msgstr "UUencode detectat, este suportată doar codarea yEnc [%s]"
 
 #. Warning message
 #: sabnzbd/decoder.py
@@ -388,7 +408,7 @@ msgstr "Eroare Necunoscută în timpul decodării %s"
 
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid "Direct Unpack"
-msgstr ""
+msgstr "Dezarhivare directă"
 
 #. PP status - History: job status
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
@@ -402,13 +422,16 @@ msgstr "Dezarhivat %s fişierele/dosarele în %s"
 #. Warning message
 #: sabnzbd/directunpacker.py
 msgid "Direct Unpack was automatically enabled."
-msgstr ""
+msgstr "Dezarhivarea directă a fost activată automat."
 
 #: sabnzbd/directunpacker.py, sabnzbd/skintext.py
 msgid ""
 "Jobs will start unpacking during the downloading to reduce post-processing "
 "time. Only works for jobs that do not need repair."
 msgstr ""
+"Sarcinile vor începe dezarhivarea pe parcursul descărcării pentru a reduce "
+"timpul de postprocesare, Funcționează doar pentru sarcinile care nu necesită"
+" reparare."
 
 #. Error message
 #: sabnzbd/dirscanner.py
@@ -480,6 +503,16 @@ msgstr "Eroare suspectă în sistemul de descprcare"
 msgid "Shutting down"
 msgstr "Închidere"
 
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s is expiring in %s day(s)"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s has used the specified quota"
+msgstr ""
+
 #: sabnzbd/emailer.py
 msgid "Failed to connect to mail server"
 msgstr "Conectare server mail nereuşită"
@@ -583,9 +616,18 @@ msgstr "Facere nereuşită (%s)"
 msgid "Failed moving %s to %s"
 msgstr "Mutare %s în %s nereuşită"
 
+#. Error message
+#: sabnzbd/filesystem.py
+msgid "Blocked attempt to create directory %s"
+msgstr ""
+
+#: sabnzbd/interface.py
+msgid "Refused connection from:"
+msgstr ""
+
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
-msgstr ""
+msgstr "Conectare refuzată cu gazda „%s” de la:"
 
 #: sabnzbd/interface.py
 msgid "User logged in to the web interface"
@@ -624,9 +666,10 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Autentificare nereuşită, verifică nume utilizator/parolă."
 
+#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
-msgstr ""
+msgstr "Încercare de conectare nereușită de la %s"
 
 #. Bytes (used as postfix, as in "GB", "TB")
 #: sabnzbd/interface.py, sabnzbd/skintext.py
@@ -643,6 +686,14 @@ msgstr ""
 " secunde şi apoi faceţi clic pe butonul de mai jos.<br /><br /><strong><a "
 "href=\"..\">Reîmprospătează</a></strong><br />"
 
+#: sabnzbd/interface.py
+msgid ""
+"The Completed Download Folder cannot be the same or a subfolder of the "
+"Temporary Download Folder"
+msgstr ""
+"Directorul de descărcări finalizate nu poate fi același, sau un subdirector "
+"al directorului de descărcări temporare"
+
 #: sabnzbd/interface.py
 msgid "Warning: LOCALHOST is ambiguous, use numerical IP-address."
 msgstr "Atenţie:LOCALHOST este ambiguu, folosiţi o adresă IP numerică"
@@ -700,6 +751,8 @@ msgstr "Server nedefinit!"
 msgid ""
 "Category folder cannot be a subfolder of the Temporary Download Folder."
 msgstr ""
+"Directorul de categorii nu poate fi un subdirector al directorului de "
+"descărcări temporare."
 
 #: sabnzbd/interface.py, sabnzbd/skintext.py
 msgid "ERROR:"
@@ -725,6 +778,15 @@ msgstr "h"
 msgid "m"
 msgstr "m"
 
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Update Available!"
+msgstr "Actualizare Disponibilă!"
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Failed to upload file: %s"
+msgstr "Eșuare la încărcarea fișierului: %s"
+
 #. Error message
 #: sabnzbd/misc.py
 msgid "Error creating SSL key and certificate"
@@ -736,20 +798,28 @@ msgid ""
 "Your password file contains more than 30 passwords, testing all these "
 "passwords takes a lot of time. Try to only list useful passwords."
 msgstr ""
+"Fișierul tău cu parole conține peste 30 de parole, verificarea tuturor "
+"necesită mult timp. Listează doar parolele utile."
+
+#. Warning message
+#: sabnzbd/misc.py
+msgid "Failed to read the password file %s"
+msgstr "Eșuare la citirea fișierului cu parole %s"
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "[%s] The command in build_command is undefined."
+msgstr "[%s] Comanda din build_command este nedefinită."
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Python script \"%s\" does not have execute (+x) permission set"
+msgstr "Scriptul Python „%s” nu are permisiuni de executare (+x)"
 
 #: sabnzbd/newsunpack.py, sabnzbd/postproc.py
 msgid "Running script"
 msgstr "Rulare script"
 
-#: sabnzbd/newsunpack.py, sabnzbd/postproc.py
-msgid "PostProcessing was aborted (%s)"
-msgstr "Post-Procesarea a fost abandonată (%s)"
-
-#. PP phase "script" - Notification Script settings
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Script"
-msgstr "Script"
-
 #. Warning message
 #: sabnzbd/newsunpack.py
 msgid "Unpack nesting too deep [%s]"
@@ -811,11 +881,6 @@ msgstr "Dezarhivare nereuşită, arhiva necesită o parolă"
 msgid "Unpacking"
 msgstr "Dezarhivare"
 
-#. PP phase "unpack"
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Unpack"
-msgstr "Dezarhivează"
-
 #: sabnzbd/newsunpack.py
 msgid "Unpacking failed, unable to find %s"
 msgstr "Dezarhivare nereuşită, nu pot găsi %s"
@@ -837,11 +902,12 @@ msgstr "EROARE: CRC nereuşit în \"%s\""
 #: sabnzbd/newsunpack.py
 msgid "Unpacking failed, file too large for filesystem (FAT?)"
 msgstr ""
+"Dezarhivare eșuată, fișier prea mare pentru sistemul de fișiere (FAT?)"
 
 #. Error message
 #: sabnzbd/newsunpack.py
 msgid "ERROR: File too large for filesystem (%s)"
-msgstr ""
+msgstr "EROARE: fișier prea mare pentru sistemul de fișiere (%s)"
 
 #. Error message
 #: sabnzbd/newsunpack.py
@@ -872,7 +938,7 @@ msgstr "Fișier RAR ce poate fi folosit"
 
 #: sabnzbd/newsunpack.py
 msgid "Corrupt RAR file"
-msgstr ""
+msgstr "Fișier RAR corupt"
 
 #: sabnzbd/newsunpack.py
 msgid "%s files in %s"
@@ -885,7 +951,7 @@ msgstr "Eroare \"%s\"  în timpul rulării unzip() pe  %s"
 
 #: sabnzbd/newsunpack.py
 msgid "No 7za binary found, cannot unpack \"%s\""
-msgstr ""
+msgstr "Nu s-a găsit binar 7za, nu pot dezarhiva „%s”"
 
 #: sabnzbd/newsunpack.py
 msgid "Trying 7zip with password \"%s\""
@@ -948,6 +1014,8 @@ msgstr "[%s] Verificat în %s, reparare necesară"
 #: sabnzbd/newsunpack.py
 msgid "Invalid par2 files or invalid PAR2 parameters, cannot verify or repair"
 msgstr ""
+"Fișiere par2 invalide sau parametri PAR2 invalizi, nu pot verifica sau "
+"repara"
 
 #: sabnzbd/newsunpack.py
 msgid "Fetching %s blocks..."
@@ -971,7 +1039,7 @@ msgstr "[%s] Reparat în %s"
 
 #: sabnzbd/newsunpack.py
 msgid "Verifying repair"
-msgstr ""
+msgstr "Se verifică repararea"
 
 #. Notification
 #: sabnzbd/newsunpack.py, sabnzbd/notifier.py
@@ -984,23 +1052,13 @@ msgstr "Se verifică"
 
 #: sabnzbd/newsunpack.py
 msgid "Checking extra files"
-msgstr ""
+msgstr "Se verifică fișierele extra"
 
 #. PP status
 #: sabnzbd/newsunpack.py, sabnzbd/skintext.py
 msgid "Checking"
 msgstr "Se verifică"
 
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "[%s] The command in build_command is undefined."
-msgstr ""
-
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "Python script \"%s\" does not have execute (+x) permission set"
-msgstr ""
-
 #: sabnzbd/newsunpack.py
 msgid "Trying SFV verification"
 msgstr "Încerc verificare SFV"
@@ -1014,14 +1072,16 @@ msgid ""
 "Certificate hostname mismatch: the server hostname is not listed in the "
 "certificate. This is a server issue."
 msgstr ""
+"Neportivire certificat: denumirea serverului nu este listată în certificat. "
+"Aceasta este o problemă de server."
 
 #: sabnzbd/newswrapper.py
 msgid "Certificate not valid. This is most probably a server issue."
-msgstr ""
+msgstr "Certificat invalid. Este cel mai probabil o problemă de server."
 
 #: sabnzbd/newswrapper.py
 msgid "Server %s uses an untrusted certificate [%s]"
-msgstr ""
+msgstr "Serverul %s utilizează un certificat nesigur [%s]"
 
 #. Main menu item
 #: sabnzbd/newswrapper.py, sabnzbd/skintext.py
@@ -1033,6 +1093,19 @@ msgstr "Wiki"
 msgid "Startup/Shutdown"
 msgstr "Pornire/Închidere"
 
+#. Notification - Pause downloading - Four way switch for duplicates -
+#. Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Pause"
+msgstr "Pauză"
+
+#. Notification - Resume downloading - Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Resume"
+msgstr "Reia"
+
 #. Notification - Config->RSS after adding to queue
 #: sabnzbd/notifier.py, sabnzbd/skintext.py
 msgid "Added NZB"
@@ -1068,7 +1141,7 @@ msgstr "Indisponibil"
 
 #: sabnzbd/notifier.py
 msgid "Failed to send macOS notification"
-msgstr ""
+msgstr "Eșuare la trimiterea notificării macOS"
 
 #. Warning message
 #: sabnzbd/notifier.py
@@ -1142,22 +1215,19 @@ msgstr "NZB adăugat în coadă"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Codificare Necunoscută"
 
-#: sabnzbd/nzbstuff.py
-msgid "%s => missing from all servers, discarding"
-msgstr "%s => lipsă de pe toate serverele, ignorare"
-
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
 msgstr "Fişier NZB invalid %s, ignorăm (motiv=%s, line=%s)"
 
+#. Warning message
 #: sabnzbd/nzbstuff.py, sabnzbd/urlgrabber.py
 msgid "Empty NZB file %s"
 msgstr "Fişier NZB gol %s"
 
 #: sabnzbd/nzbstuff.py
 msgid "Pre-queue script marked job as failed"
-msgstr ""
+msgstr "Scriptul pre-coadă a marcat sarcina ca nereușită"
 
 #. Warning message
 #: sabnzbd/nzbstuff.py
@@ -1167,12 +1237,12 @@ msgstr "Ignorăm duplicat NZB \"%s\""
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Failing duplicate NZB \"%s\""
-msgstr ""
+msgstr "Eșuare duplicat NZB „%s”"
 
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Duplicate NZB"
-msgstr ""
+msgstr "NZB duplicat"
 
 #. Warning message
 #: sabnzbd/nzbstuff.py
@@ -1182,7 +1252,7 @@ msgstr "Întrerupem duplicat NZB \"%s\""
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Unwanted Extension in file %s (%s)"
-msgstr ""
+msgstr "Extensie nedorită în fișierul %s (%s)"
 
 #: sabnzbd/nzbstuff.py
 msgid "Aborted, cannot be completed"
@@ -1256,10 +1326,6 @@ msgstr "Atenționări"
 msgid "Idle"
 msgstr "Inactiv"
 
-#: sabnzbd/osxmenu.py
-msgid "Configuration"
-msgstr "Configurare"
-
 #. Main menu item
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Queue"
@@ -1284,21 +1350,10 @@ msgstr "Şterge Istoricul"
 msgid "Limit Speed"
 msgstr "Limitare de Viteză"
 
-#. Pause downloading - Four way switch for duplicates - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Pause"
-msgstr "Pauză"
-
-#: sabnzbd/osxmenu.py
-msgid "min."
-msgstr "min."
-
-#. Resume downloading - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Resume"
-msgstr "Reia"
+#. One minute
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+msgid "min"
+msgstr "min"
 
 #. #: Config->Scheduler
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
@@ -1347,10 +1402,6 @@ msgstr "Gol"
 msgid "History Last 10 Items"
 msgstr "Istoric Ultimele 10 Obiecte"
 
-#: sabnzbd/osxmenu.py
-msgid "New release available"
-msgstr "Versiune nouă disponibilă"
-
 #: sabnzbd/osxmenu.py
 msgid "Go to wizard"
 msgstr "Dute la vrăjitor"
@@ -1471,6 +1522,8 @@ msgid ""
 "Unable to bind to port %s on %s. Some other software uses the port or "
 "SABnzbd is already running."
 msgstr ""
+"Nu pot rezerva portul %s pe %s. Alt software utilizează portul sau SABnzbs "
+"rulează deja."
 
 #. Warning message
 #: sabnzbd/panic.py
@@ -1498,6 +1551,8 @@ msgid ""
 "Completed Download Folder %s is on FAT file system, limiting maximum file "
 "size to 4GB"
 msgstr ""
+"Directorul de descărcări finalizate %s se află pe sistem de fișiere FAT, "
+"limitând dimensiunea maximă a fișierului la 4GB"
 
 #: sabnzbd/postproc.py
 msgid "Download might fail, only %s of required %s available"
@@ -1507,6 +1562,10 @@ msgstr "Descărcarea ar putea eşua, doar %s din %s disponibil"
 msgid "Download failed - Not on your server(s)"
 msgstr "Descărcare euată, - Nu este pe serverul(ele) dumneavoastră"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing"
+msgstr "Post-procesare"
+
 #: sabnzbd/postproc.py
 msgid "Moving"
 msgstr "Mutare"
@@ -1550,6 +1609,10 @@ msgstr "Post Procesare Nereuşită pentru %s (%s)"
 msgid "see logfile"
 msgstr "vezi fişier jurnal"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing was aborted"
+msgstr "Post-procesarea a fost întreruptă"
+
 #: sabnzbd/postproc.py
 msgid "Download Failed"
 msgstr "Descărcarea a eșuat"
@@ -1568,10 +1631,6 @@ msgstr "Descărcare terminată"
 msgid "Cannot create final folder %s"
 msgstr "Nu pot crea dosar final %s"
 
-#: sabnzbd/postproc.py
-msgid "Post-processing"
-msgstr "Post-procesare"
-
 #: sabnzbd/postproc.py
 msgid "[%s] No par2 sets"
 msgstr "[%s] Niciun set par2"
@@ -1586,11 +1645,11 @@ msgstr "Verificare reuşită cu fişierele SFV"
 
 #: sabnzbd/postproc.py
 msgid "Trying RAR-based verification"
-msgstr ""
+msgstr "Încerc verificare RAR"
 
 #: sabnzbd/postproc.py
 msgid "[%s] RAR-based verification failed: %s"
-msgstr ""
+msgstr "[%s] verificarea RAR a eșuat: %s"
 
 #: sabnzbd/postproc.py, sabnzbd/skintext.py
 msgid "Passworded"
@@ -1598,10 +1657,19 @@ msgstr "Parolat"
 
 #: sabnzbd/postproc.py
 msgid "RAR files verified successfully"
-msgstr ""
+msgstr "Fișierele RAR verificate cu succes"
 
 #: sabnzbd/postproc.py
 msgid "RAR files failed to verify"
+msgstr "Verificarea fișierelor RAR a eșuat"
+
+#: sabnzbd/postproc.py
+msgid "Trying RAR renamer"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/postproc.py
+msgid "No matching earlier rar file for %s"
 msgstr ""
 
 #. Error message
@@ -1624,6 +1692,11 @@ msgstr "Punere sistem în aşteptare nereuşită"
 msgid "Error while shutting down system"
 msgstr "Eroare la oprirea sistemului"
 
+#. Error message
+#: sabnzbd/powersup.py
+msgid "Received a DBus exception %s"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/rating.py
 msgid "Indexer id (%s) not found for ratings file"
@@ -1648,10 +1721,6 @@ msgstr ""
 msgid "Incorrect RSS feed description \"%s\""
 msgstr "Descriere flux RSS incorectă \"%s\""
 
-#: sabnzbd/rss.py
-msgid "Failed to retrieve RSS from %s: %s"
-msgstr "Descărcare %s: %s din RSS nereuşită"
-
 #: sabnzbd/rss.py
 msgid "Do not have valid authentication for feed %s"
 msgstr "Autentificare invalida pentru flux %s"
@@ -1660,10 +1729,15 @@ msgstr "Autentificare invalida pentru flux %s"
 msgid "Server side error (server code %s); could not get %s on %s"
 msgstr "Eroare la server (codul server %s); nu am putu lua %s în data de %s"
 
+#: sabnzbd/rss.py
+msgid "Failed to retrieve RSS from %s: %s"
+msgstr "Descărcare %s: %s din RSS nereuşită"
+
 #: sabnzbd/rss.py, sabnzbd/urlgrabber.py
 msgid "Server %s uses an untrusted HTTPS certificate"
 msgstr "Serverul %s utilizează un certificat HTTPS nesigur"
 
+#. Warning message
 #: sabnzbd/rss.py
 msgid "RSS Feed %s was empty"
 msgstr "Fluxul RSS %s a fost gol"
@@ -1753,6 +1827,16 @@ msgstr "Descarcă"
 msgid "Join files"
 msgstr "Uneşte fişierele"
 
+#. PP phase "unpack"
+#: sabnzbd/skintext.py
+msgid "Unpack"
+msgstr "Dezarhivează"
+
+#. PP phase "script" - Notification Script settings
+#: sabnzbd/skintext.py
+msgid "Script"
+msgstr "Script"
+
 #. PP Source of the NZB (path or URL) - Where to find the SABnzbd sourcecode
 #: sabnzbd/skintext.py
 msgid "Source"
@@ -1977,11 +2061,6 @@ msgstr "oră"
 msgid "hours"
 msgstr "ore"
 
-#. One minute
-#: sabnzbd/skintext.py
-msgid "min"
-msgstr "min"
-
 #. Multiple minutes
 #: sabnzbd/skintext.py
 msgid "mins"
@@ -2077,6 +2156,10 @@ msgstr "Săptămâna aceasta"
 msgid "This month"
 msgstr "Luna aceasta"
 
+#: sabnzbd/skintext.py
+msgid "Selected date range"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Today"
 msgstr "Azi"
@@ -2085,6 +2168,14 @@ msgstr "Azi"
 msgid "Total"
 msgstr "Total"
 
+#: sabnzbd/skintext.py
+msgid "Custom"
+msgstr "Personalizat"
+
+#: sabnzbd/skintext.py
+msgid "Speed"
+msgstr "Viteză"
+
 #: sabnzbd/skintext.py
 msgid "on"
 msgstr "activat"
@@ -2917,6 +3008,12 @@ msgstr "neinstalat"
 msgid "Enable accessing the interface from a HTTPS address."
 msgstr "Permite acesarea interfeţei de la o adresă HTTPS."
 
+#: sabnzbd/skintext.py
+msgid ""
+"Modern web browsers and other clients will not accept self-signed "
+"certificates and will give a warning and/or won't connect at all."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "HTTPS Port"
 msgstr "Port HTTPS"
@@ -3084,23 +3181,12 @@ msgstr "Generează o Cheie Nouă"
 msgid "API Key QR Code"
 msgstr "Cheie API sau Cod QR"
 
-#: sabnzbd/skintext.py
-msgid "List of local network ranges"
-msgstr "Listă de rețele locale"
-
-#: sabnzbd/skintext.py
-msgid ""
-"All local network addresses start with these prefixes (often \"192.168.1.\")"
-msgstr "Toate rețelele locale încep cu acest prefixe (de regulă \"192.168.1.\")"
-
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Acces extern la internet"
 
 #: sabnzbd/skintext.py
-msgid ""
-"You can set access rights for systems outside your local network. Requires "
-"List of local network ranges to be defined."
+msgid "You can set access rights for systems outside your local network."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3183,6 +3269,26 @@ msgstr ""
 "Locație pentru stocare , a descărcărilor procesate complet.<br /><i>Poate fi"
 " suprascris de categoriile definite de utilizator.</i>"
 
+#: sabnzbd/skintext.py
+msgid "Minimum Free Space for Completed Download Folder"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Will not work if a category folder is on a different disk."
+msgstr ""
+
+#. Auto-resume download on the reset day
+#: sabnzbd/skintext.py
+msgid "Auto resume"
+msgstr "Auto repornire"
+
+#: sabnzbd/skintext.py
+msgid ""
+"Downloading will automatically resume if the minimum free space is available"
+" again.<br />Applies to both the Temporary and Complete Download Folder.<br "
+"/>Checked every few minutes."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Permissions for completed downloads"
 msgstr "Permisiuni pentru descărcări finalizate"
@@ -3326,9 +3432,11 @@ msgid "Post-Process Only Verified Jobs"
 msgstr "Post-Procesează Doar Sarcinile Verificate"
 
 #: sabnzbd/skintext.py
-msgid "Only perform post-processing on jobs that passed all PAR2 checks."
+msgid ""
+"Only unpack and run scripts on jobs that passed the verification stage. If "
+"turned off, all jobs will be marked as Completed even if they are "
+"incomplete."
 msgstr ""
-"Execută post-procesarea doar dacă sarcina a trecut toate verificările PAR2."
 
 #: sabnzbd/skintext.py
 msgid "Action when encrypted RAR is downloaded"
@@ -3395,19 +3503,26 @@ msgid "Action when unwanted extension detected"
 msgstr "Acțiune când se detectează o extensie nedorită"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected in RAR files"
-msgstr "Acțiune când se detectează  extensie nedorită într-un fișier RAR"
+msgid "Action when an unwanted extension is detected"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Extensii nedorite"
 
 #: sabnzbd/skintext.py
-msgid ""
-"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
+msgid "Blacklist"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Whitelist"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
+" <b>exe, com</b>"
 msgstr ""
-"Listă cu toate extensiile nedorite. De exemplu: <b>exe</b> or <b>exe, "
-"com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -3577,6 +3692,16 @@ msgstr "Ignoră fişiere monstră (de ex. monstre video)"
 msgid "Delete after download"
 msgstr "Şterge după descărcare"
 
+#: sabnzbd/skintext.py
+msgid "Deobfuscate final filenames"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"If filenames of (large) files in the final folder look obfuscated or "
+"meaningless they will be renamed to the job name."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "HTTPS certificate verification"
 msgstr ""
@@ -3623,11 +3748,6 @@ msgstr ""
 "În ce zi a lunii sau săptămână (1=Luni) ISP dumneavoastră resetează cota? "
 "(Opțional cu hh:mm)"
 
-#. Auto-resume download on the reset day
-#: sabnzbd/skintext.py
-msgid "Auto resume"
-msgstr "Auto repornire"
-
 #: sabnzbd/skintext.py
 msgid "Should downloading resume after the quota is reset?"
 msgstr "Se reia descărcarea după resetarea cotei?"
@@ -3783,6 +3903,21 @@ msgstr "Parolă"
 msgid "Timeout"
 msgstr "Timp Expirare"
 
+#: sabnzbd/skintext.py
+msgid "Account expiration date"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Warn 5 days in advance of account expiration date."
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Quota for this account, counted from the time it is set. In bytes, "
+"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
+" minutes."
+msgstr ""
+
 #. Server's retention time in days
 #: sabnzbd/skintext.py
 msgid "Retention time"
@@ -3875,6 +4010,14 @@ msgstr "Trimite comanda group înainte de a cere articole."
 msgid "Personal notes"
 msgstr "Note personale"
 
+#: sabnzbd/skintext.py
+msgid "Article availability"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "%f% available of %d requested articles"
+msgstr ""
+
 #. Config->Scheduling
 #: sabnzbd/skintext.py
 msgid "Add Schedule"
@@ -3927,6 +4070,16 @@ msgstr "Citeşte Flux"
 msgid "Force Download"
 msgstr "Descărcare Forţată"
 
+#. Config->RSS edit button
+#: sabnzbd/skintext.py
+msgid "Edit"
+msgstr ""
+
+#. Config->RSS when will be the next RSS scan
+#: sabnzbd/skintext.py
+msgid "Next scan at"
+msgstr ""
+
 #. Config->RSS table column header
 #: sabnzbd/skintext.py
 msgid "Filter"
@@ -4076,7 +4229,7 @@ msgstr "Notificare Trimisă!"
 msgid "Enable NotifyOSD"
 msgstr "Activează NotifyOSD"
 
-#. Header for OSX Notfication Center section
+#. Header for macOS Notfication Center section
 #: sabnzbd/skintext.py
 msgid "Notification Center"
 msgstr "Centru Notificări"
@@ -4623,12 +4776,12 @@ msgid "Date format"
 msgstr "Format dată"
 
 #: sabnzbd/skintext.py
-msgid "Extra queue column"
-msgstr "Coloană extra la Coadă"
+msgid "Extra queue columns"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Extra history column"
-msgstr "Coloană extra de istoric"
+msgid "Extra history columns"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "page"
@@ -4711,8 +4864,8 @@ msgid "View Script Log"
 msgstr "Vezi Jurnal Script"
 
 #: sabnzbd/skintext.py
-msgid "Update Available!"
-msgstr "Actualizare Disponibilă!"
+msgid "Renaming the job will abort Direct Unpack."
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid ""
@@ -4726,21 +4879,17 @@ msgstr ""
 msgid "Glitter has some (new) features you might like!"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Custom"
-msgstr "Personalizat"
-
 #: sabnzbd/skintext.py
 msgid "Compact layout"
 msgstr "Aspect compact"
 
 #: sabnzbd/skintext.py
-msgid "Tabbed layout <br/>(separate queue and history)"
-msgstr "Interfață tabelară <br/>(coadă și istoric separate)"
+msgid "Always use full screen width"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Speed"
-msgstr "Viteză"
+msgid "Tabbed layout <br/>(separate queue and history)"
+msgstr "Interfață tabelară <br/>(coadă și istoric separate)"
 
 #: sabnzbd/skintext.py
 msgid "Confirm Queue Deletions"

po/main/ru.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file MAIN
-# Copyright 2011-2020 The SABnzbd-Team
+# Copyright 2011-2021 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.0.0-develop\n"
+"Project-Id-Version: SABnzbd-3.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Russian (https://www.transifex.com/sabnzbd/teams/111101/ru/)\n"
@@ -17,6 +17,16 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#. Notification - Status page, table column header, actual message
+#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
+msgid "Warning"
+msgstr "Предупреждение"
+
+#. Notification
+#: SABnzbd.py, sabnzbd/notifier.py
+msgid "Error"
+msgstr ""
+
 #. Error message
 #: SABnzbd.py
 msgid "Failed to start web-interface"
@@ -89,6 +99,11 @@ msgid ""
 "with Unicoded file and directory names in downloads."
 msgstr ""
 
+#. Warning message
+#: SABnzbd.py
+msgid "Could not load additional certificates from certifi package"
+msgstr ""
+
 #. Warning message
 #: SABnzbd.py
 msgid "Disabled HTTPS because of missing CERT and KEY files"
@@ -108,16 +123,6 @@ msgstr ""
 msgid "SABnzbd %s started"
 msgstr ""
 
-#. Notification - Status page, table column header, actual message
-#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
-msgid "Warning"
-msgstr "Предупреждение"
-
-#. Notification
-#: SABnzbd.py, sabnzbd/notifier.py
-msgid "Error"
-msgstr ""
-
 #: SABnzbd.py, sabnzbd/interface.py
 msgid "SABnzbd shutdown finished"
 msgstr "Завершение работы SABnzbd закончено"
@@ -161,6 +166,11 @@ msgstr "Ошибка в tempfile.mkstemp"
 msgid "Loading %s failed"
 msgstr "Ошибка загрузки %s"
 
+#. Warning message
+#: sabnzbd/__init__.py
+msgid "Cannot access PID file %s"
+msgstr ""
+
 #: sabnzbd/api.py, sabnzbd/emailer.py
 msgid "Email succeeded"
 msgstr "Электронное письмо успешно отправлено"
@@ -215,15 +225,15 @@ msgstr ""
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Paused job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Paused job \"%s\" because of encrypted RAR file (if supplied, all passwords "
+"were tried)"
 msgstr ""
 
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Aborted job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Aborted job \"%s\" because of encrypted RAR file (if supplied, all passwords"
+" were tried)"
 msgstr ""
 
 #: sabnzbd/assembler.py
@@ -232,7 +242,7 @@ msgstr ""
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
+msgid "In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
 msgstr ""
 
 #: sabnzbd/assembler.py
@@ -245,12 +255,12 @@ msgstr ""
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Paused job \"%s\" because of rating (%s)"
+msgid "Paused job \"%s\" because of rating (%s)"
 msgstr ""
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Aborted job \"%s\" because of rating (%s)"
+msgid "Aborted job \"%s\" because of rating (%s)"
 msgstr ""
 
 #: sabnzbd/assembler.py
@@ -304,6 +314,10 @@ msgstr "%s не является допустимым адресом элект
 msgid "Server address required"
 msgstr "Требуется адрес сервера"
 
+#: sabnzbd/cfg.py
+msgid "%s is not a valid script"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/config.py
 msgid "Configuration locked, cannot save settings"
@@ -336,10 +350,6 @@ msgstr "%s не является правильным восьмеричным
 msgid "UNC path \"%s\" not allowed here"
 msgstr "UNC-путь «%s» здесь не допускается"
 
-#: sabnzbd/config.py
-msgid "Error: Path length should be below %s."
-msgstr ""
-
 #: sabnzbd/config.py
 msgid "Error: Queue not empty, cannot change folder."
 msgstr "Ошибка: очередь не пустая, папку нельзя изменить."
@@ -475,6 +485,16 @@ msgstr ""
 msgid "Shutting down"
 msgstr "Завершение работы"
 
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s is expiring in %s day(s)"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s has used the specified quota"
+msgstr ""
+
 #: sabnzbd/emailer.py
 msgid "Failed to connect to mail server"
 msgstr "Не удалось подключиться к почтовому серверу"
@@ -578,6 +598,15 @@ msgstr "Не удалось создать (%s)"
 msgid "Failed moving %s to %s"
 msgstr "Не удалось переместить %s в %s"
 
+#. Error message
+#: sabnzbd/filesystem.py
+msgid "Blocked attempt to create directory %s"
+msgstr ""
+
+#: sabnzbd/interface.py
+msgid "Refused connection from:"
+msgstr ""
+
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr ""
@@ -619,6 +648,7 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Ошибка проверки подлинности. Проверьте имя и пароль."
 
+#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr ""
@@ -638,6 +668,12 @@ msgstr ""
 "щёлкните ссылку ниже.<br /><br /><strong><a "
 "href=\"..\">Обновить</a></strong><br />"
 
+#: 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 "Warning: LOCALHOST is ambiguous, use numerical IP-address."
 msgstr ""
@@ -722,6 +758,15 @@ msgstr "ч"
 msgid "m"
 msgstr "м"
 
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Update Available!"
+msgstr "Доступно обновление!"
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Failed to upload file: %s"
+msgstr ""
+
 #. Error message
 #: sabnzbd/misc.py
 msgid "Error creating SSL key and certificate"
@@ -734,19 +779,25 @@ msgid ""
 "passwords takes a lot of time. Try to only list useful passwords."
 msgstr ""
 
+#. Warning message
+#: sabnzbd/misc.py
+msgid "Failed to read the password file %s"
+msgstr ""
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "[%s] The command in build_command is undefined."
+msgstr ""
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Python script \"%s\" does not have execute (+x) permission set"
+msgstr ""
+
 #: sabnzbd/newsunpack.py, sabnzbd/postproc.py
 msgid "Running script"
 msgstr "Запуск сценария"
 
-#: sabnzbd/newsunpack.py, sabnzbd/postproc.py
-msgid "PostProcessing was aborted (%s)"
-msgstr "Пост-обработка была прервана (%s)"
-
-#. PP phase "script" - Notification Script settings
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Script"
-msgstr "Сценарий"
-
 #. Warning message
 #: sabnzbd/newsunpack.py
 msgid "Unpack nesting too deep [%s]"
@@ -808,11 +859,6 @@ msgstr "Ошибка распаковки: архив защищён парол
 msgid "Unpacking"
 msgstr "Распаковка"
 
-#. PP phase "unpack"
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Unpack"
-msgstr "Распаковать"
-
 #: sabnzbd/newsunpack.py
 msgid "Unpacking failed, unable to find %s"
 msgstr "Ошибка распаковки: не удаётся найти %s"
@@ -989,16 +1035,6 @@ msgstr ""
 msgid "Checking"
 msgstr "Проверка"
 
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "[%s] The command in build_command is undefined."
-msgstr ""
-
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "Python script \"%s\" does not have execute (+x) permission set"
-msgstr ""
-
 #: sabnzbd/newsunpack.py
 msgid "Trying SFV verification"
 msgstr "Проверка SFV-суммы"
@@ -1031,6 +1067,19 @@ msgstr "Вики-сайт"
 msgid "Startup/Shutdown"
 msgstr "Запуск/остановка"
 
+#. Notification - Pause downloading - Four way switch for duplicates -
+#. Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Pause"
+msgstr "Приостановить"
+
+#. Notification - Resume downloading - Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Resume"
+msgstr "Возобновить"
+
 #. Notification - Config->RSS after adding to queue
 #: sabnzbd/notifier.py, sabnzbd/skintext.py
 msgid "Added NZB"
@@ -1140,15 +1189,12 @@ msgstr "NZB-файл добавлен в очередь"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> неизвестная кодировка"
 
-#: sabnzbd/nzbstuff.py
-msgid "%s => missing from all servers, discarding"
-msgstr "%s => отсутствует на всех серверах, отброшен"
-
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
 msgstr "Недопустимый NZB-файл %s: пропущен (причина — %s, строка — %s)"
 
+#. Warning message
 #: sabnzbd/nzbstuff.py, sabnzbd/urlgrabber.py
 msgid "Empty NZB file %s"
 msgstr "Пустой NZB-файл %s"
@@ -1254,10 +1300,6 @@ msgstr "предупреждений"
 msgid "Idle"
 msgstr "Бездействие"
 
-#: sabnzbd/osxmenu.py
-msgid "Configuration"
-msgstr "Конфигурация"
-
 #. Main menu item
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Queue"
@@ -1282,21 +1324,10 @@ msgstr "Очистить историю"
 msgid "Limit Speed"
 msgstr "Ограничение скорости"
 
-#. Pause downloading - Four way switch for duplicates - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Pause"
-msgstr "Приостановить"
-
-#: sabnzbd/osxmenu.py
-msgid "min."
-msgstr "мин."
-
-#. Resume downloading - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Resume"
-msgstr "Возобновить"
+#. One minute
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+msgid "min"
+msgstr "мин"
 
 #. #: Config->Scheduler
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
@@ -1345,10 +1376,6 @@ msgstr "Пусто"
 msgid "History Last 10 Items"
 msgstr "Последние 10 элементов истории"
 
-#: sabnzbd/osxmenu.py
-msgid "New release available"
-msgstr "Доступна новая версия"
-
 #: sabnzbd/osxmenu.py
 msgid "Go to wizard"
 msgstr "Запустить мастер"
@@ -1503,6 +1530,10 @@ msgstr ""
 msgid "Download failed - Not on your server(s)"
 msgstr ""
 
+#: sabnzbd/postproc.py
+msgid "Post-processing"
+msgstr "Пост-обработка"
+
 #: sabnzbd/postproc.py
 msgid "Moving"
 msgstr "Перемещение"
@@ -1546,6 +1577,10 @@ msgstr "Ошибка пост-обработки для %s (%s)"
 msgid "see logfile"
 msgstr "см. журнал"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing was aborted"
+msgstr ""
+
 #: sabnzbd/postproc.py
 msgid "Download Failed"
 msgstr "Не удалось загрузить"
@@ -1564,10 +1599,6 @@ msgstr "Загрузка завершена"
 msgid "Cannot create final folder %s"
 msgstr "Не удаётся создать конечную папку %s"
 
-#: sabnzbd/postproc.py
-msgid "Post-processing"
-msgstr "Пост-обработка"
-
 #: sabnzbd/postproc.py
 msgid "[%s] No par2 sets"
 msgstr "[%s] Нет PAR2-файлов"
@@ -1600,6 +1631,15 @@ msgstr ""
 msgid "RAR files failed to verify"
 msgstr ""
 
+#: sabnzbd/postproc.py
+msgid "Trying RAR renamer"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/postproc.py
+msgid "No matching earlier rar file for %s"
+msgstr ""
+
 #. Error message
 #: sabnzbd/postproc.py
 msgid "Removing %s failed"
@@ -1620,6 +1660,11 @@ msgstr "Не удалось перевести систему в состоян
 msgid "Error while shutting down system"
 msgstr "Не удалось завершить работу системы"
 
+#. Error message
+#: sabnzbd/powersup.py
+msgid "Received a DBus exception %s"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/rating.py
 msgid "Indexer id (%s) not found for ratings file"
@@ -1644,10 +1689,6 @@ msgstr ""
 msgid "Incorrect RSS feed description \"%s\""
 msgstr "Неправильное описание RSS-ленты «%s»"
 
-#: sabnzbd/rss.py
-msgid "Failed to retrieve RSS from %s: %s"
-msgstr "Не удалось получить RSS-ленту из %s: %s"
-
 #: sabnzbd/rss.py
 msgid "Do not have valid authentication for feed %s"
 msgstr "Неправильные учётные данные для ленты %s"
@@ -1656,10 +1697,15 @@ msgstr "Неправильные учётные данные для ленты %
 msgid "Server side error (server code %s); could not get %s on %s"
 msgstr ""
 
+#: sabnzbd/rss.py
+msgid "Failed to retrieve RSS from %s: %s"
+msgstr "Не удалось получить RSS-ленту из %s: %s"
+
 #: sabnzbd/rss.py, sabnzbd/urlgrabber.py
 msgid "Server %s uses an untrusted HTTPS certificate"
 msgstr ""
 
+#. Warning message
 #: sabnzbd/rss.py
 msgid "RSS Feed %s was empty"
 msgstr "RSS-лента %s была пустой"
@@ -1749,6 +1795,16 @@ msgstr "Загрузить"
 msgid "Join files"
 msgstr "Объединить файлы"
 
+#. PP phase "unpack"
+#: sabnzbd/skintext.py
+msgid "Unpack"
+msgstr "Распаковать"
+
+#. PP phase "script" - Notification Script settings
+#: sabnzbd/skintext.py
+msgid "Script"
+msgstr "Сценарий"
+
 #. PP Source of the NZB (path or URL) - Where to find the SABnzbd sourcecode
 #: sabnzbd/skintext.py
 msgid "Source"
@@ -1973,11 +2029,6 @@ msgstr "час"
 msgid "hours"
 msgstr "часов"
 
-#. One minute
-#: sabnzbd/skintext.py
-msgid "min"
-msgstr "мин"
-
 #. Multiple minutes
 #: sabnzbd/skintext.py
 msgid "mins"
@@ -2073,6 +2124,10 @@ msgstr "за эту неделю"
 msgid "This month"
 msgstr "за этот месяц"
 
+#: sabnzbd/skintext.py
+msgid "Selected date range"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Today"
 msgstr "за сегодня"
@@ -2081,6 +2136,14 @@ msgstr "за сегодня"
 msgid "Total"
 msgstr "всего"
 
+#: sabnzbd/skintext.py
+msgid "Custom"
+msgstr "Другой"
+
+#: sabnzbd/skintext.py
+msgid "Speed"
+msgstr "Скорость"
+
 #: sabnzbd/skintext.py
 msgid "on"
 msgstr "на"
@@ -2910,6 +2973,12 @@ msgstr "не установлено"
 msgid "Enable accessing the interface from a HTTPS address."
 msgstr "Доступ к интерфейсу по протоколу HTTPS."
 
+#: sabnzbd/skintext.py
+msgid ""
+"Modern web browsers and other clients will not accept self-signed "
+"certificates and will give a warning and/or won't connect at all."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "HTTPS Port"
 msgstr "Порт HTTPS"
@@ -3078,23 +3147,12 @@ msgstr "Создать новый ключ"
 msgid "API Key QR Code"
 msgstr "QR-код ключа API"
 
-#: sabnzbd/skintext.py
-msgid "List of local network ranges"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid ""
-"All local network addresses start with these prefixes (often \"192.168.1.\")"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid ""
-"You can set access rights for systems outside your local network. Requires "
-"List of local network ranges to be defined."
+msgid "You can set access rights for systems outside your local network."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3179,6 +3237,26 @@ msgstr ""
 "Место для сохранения готовых, полностью обработанных загрузок.<br /><i>Можно"
 " переопределить в пользовательских категориях.</i>"
 
+#: sabnzbd/skintext.py
+msgid "Minimum Free Space for Completed Download Folder"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Will not work if a category folder is on a different disk."
+msgstr ""
+
+#. Auto-resume download on the reset day
+#: sabnzbd/skintext.py
+msgid "Auto resume"
+msgstr "Автоматически возобновлять"
+
+#: sabnzbd/skintext.py
+msgid ""
+"Downloading will automatically resume if the minimum free space is available"
+" again.<br />Applies to both the Temporary and Complete Download Folder.<br "
+"/>Checked every few minutes."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Permissions for completed downloads"
 msgstr "Права доступа для завершённых загрузок"
@@ -3324,8 +3402,11 @@ msgid "Post-Process Only Verified Jobs"
 msgstr "Обрабатывать только проверенные задания"
 
 #: sabnzbd/skintext.py
-msgid "Only perform post-processing on jobs that passed all PAR2 checks."
-msgstr "Обрабатывать только задания, успешно прошедшие все проверки PAR2."
+msgid ""
+"Only unpack and run scripts on jobs that passed the verification stage. If "
+"turned off, all jobs will be marked as Completed even if they are "
+"incomplete."
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Action when encrypted RAR is downloaded"
@@ -3390,16 +3471,25 @@ msgid "Action when unwanted extension detected"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected in RAR files"
+msgid "Action when an unwanted extension is detected"
 msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Blacklist"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Whitelist"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid ""
-"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
+"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
+" <b>exe, com</b>"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3566,6 +3656,16 @@ msgstr "Отфильтровывать файлы образцов (наприм
 msgid "Delete after download"
 msgstr "Удалить после загрузки"
 
+#: sabnzbd/skintext.py
+msgid "Deobfuscate final filenames"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"If filenames of (large) files in the final folder look obfuscated or "
+"meaningless they will be renamed to the job name."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "HTTPS certificate verification"
 msgstr ""
@@ -3612,11 +3712,6 @@ msgstr ""
 "День месяца или недели (1 — понедельник), когда провайдер сбрасывает квоту. "
 "(дополнительно можно указать чч:мм)"
 
-#. Auto-resume download on the reset day
-#: sabnzbd/skintext.py
-msgid "Auto resume"
-msgstr "Автоматически возобновлять"
-
 #: sabnzbd/skintext.py
 msgid "Should downloading resume after the quota is reset?"
 msgstr "Возобновлять загрузку после сброса квоты?"
@@ -3770,6 +3865,21 @@ msgstr "Пароль"
 msgid "Timeout"
 msgstr "Время ожидания"
 
+#: sabnzbd/skintext.py
+msgid "Account expiration date"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Warn 5 days in advance of account expiration date."
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Quota for this account, counted from the time it is set. In bytes, "
+"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
+" minutes."
+msgstr ""
+
 #. Server's retention time in days
 #: sabnzbd/skintext.py
 msgid "Retention time"
@@ -3861,6 +3971,14 @@ msgstr "Отправлять команду группы перед запрос
 msgid "Personal notes"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Article availability"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "%f% available of %d requested articles"
+msgstr ""
+
 #. Config->Scheduling
 #: sabnzbd/skintext.py
 msgid "Add Schedule"
@@ -3913,6 +4031,16 @@ msgstr "Прочитать ленту"
 msgid "Force Download"
 msgstr "Загрузить принудительно"
 
+#. Config->RSS edit button
+#: sabnzbd/skintext.py
+msgid "Edit"
+msgstr ""
+
+#. Config->RSS when will be the next RSS scan
+#: sabnzbd/skintext.py
+msgid "Next scan at"
+msgstr ""
+
 #. Config->RSS table column header
 #: sabnzbd/skintext.py
 msgid "Filter"
@@ -4069,7 +4197,7 @@ msgstr "Уведомление отправлено"
 msgid "Enable NotifyOSD"
 msgstr "Использовать NotifyOSD"
 
-#. Header for OSX Notfication Center section
+#. Header for macOS Notfication Center section
 #: sabnzbd/skintext.py
 msgid "Notification Center"
 msgstr ""
@@ -4616,11 +4744,11 @@ msgid "Date format"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Extra queue column"
+msgid "Extra queue columns"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Extra history column"
+msgid "Extra history columns"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -4704,8 +4832,8 @@ msgid "View Script Log"
 msgstr "Просмотреть журнал сценария"
 
 #: sabnzbd/skintext.py
-msgid "Update Available!"
-msgstr "Доступно обновление!"
+msgid "Renaming the job will abort Direct Unpack."
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid ""
@@ -4718,21 +4846,17 @@ msgid "Glitter has some (new) features you might like!"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Custom"
-msgstr "Другой"
+msgid "Compact layout"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Compact layout"
+msgid "Always use full screen width"
 msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Tabbed layout <br/>(separate queue and history)"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Speed"
-msgstr "Скорость"
-
 #: sabnzbd/skintext.py
 msgid "Confirm Queue Deletions"
 msgstr "Подтвердите удаление очереди"

po/main/sr.po

@@ -1,5 +1,5 @@
 # SABnzbd Translation Template file MAIN
-# Copyright 2011-2020 The SABnzbd-Team
+# Copyright 2011-2021 The SABnzbd-Team
 #   team@sabnzbd.org
 # 
 # Translators:
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-3.0.0-develop\n"
+"Project-Id-Version: SABnzbd-3.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Serbian (https://www.transifex.com/sabnzbd/teams/111101/sr/)\n"
@@ -17,6 +17,16 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#. Notification - Status page, table column header, actual message
+#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
+msgid "Warning"
+msgstr "Упозорење"
+
+#. Notification
+#: SABnzbd.py, sabnzbd/notifier.py
+msgid "Error"
+msgstr "Грeшкa"
+
 #. Error message
 #: SABnzbd.py
 msgid "Failed to start web-interface"
@@ -87,6 +97,11 @@ msgid ""
 "with Unicoded file and directory names in downloads."
 msgstr ""
 
+#. Warning message
+#: SABnzbd.py
+msgid "Could not load additional certificates from certifi package"
+msgstr ""
+
 #. Warning message
 #: SABnzbd.py
 msgid "Disabled HTTPS because of missing CERT and KEY files"
@@ -106,16 +121,6 @@ msgstr "Neuspešno pokretanje web interfejsa: "
 msgid "SABnzbd %s started"
 msgstr "SABnzbd %s покренут"
 
-#. Notification - Status page, table column header, actual message
-#: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
-msgid "Warning"
-msgstr "Упозорење"
-
-#. Notification
-#: SABnzbd.py, sabnzbd/notifier.py
-msgid "Error"
-msgstr "Грeшкa"
-
 #: SABnzbd.py, sabnzbd/interface.py
 msgid "SABnzbd shutdown finished"
 msgstr "Гашење SABnzbd је завршено"
@@ -159,6 +164,11 @@ msgstr "Грешка у tempfile.mkstemp"
 msgid "Loading %s failed"
 msgstr "Učitavanje %s neuspešno"
 
+#. Warning message
+#: sabnzbd/__init__.py
+msgid "Cannot access PID file %s"
+msgstr ""
+
 #: sabnzbd/api.py, sabnzbd/emailer.py
 msgid "Email succeeded"
 msgstr "Упешно слање е-поште"
@@ -213,15 +223,15 @@ msgstr "Fatalna greška u Assembler-u"
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Paused job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Paused job \"%s\" because of encrypted RAR file (if supplied, all passwords "
+"were tried)"
 msgstr ""
 
 #. Warning message
 #: sabnzbd/assembler.py
 msgid ""
-"WARNING: Aborted job \"%s\" because of encrypted RAR file (if supplied, all "
-"passwords were tried)"
+"Aborted job \"%s\" because of encrypted RAR file (if supplied, all passwords"
+" were tried)"
 msgstr ""
 
 #: sabnzbd/assembler.py
@@ -230,10 +240,8 @@ msgstr "Prekinuto, detektovana enkripcija"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
+msgid "In \"%s\" unwanted extension in RAR file. Unwanted file is %s "
 msgstr ""
-"UPOZORENJE: U \"%s\" pronađena neželjena ekstenzija u RAR datoteci. "
-"Neželjena datoteka je %s "
 
 #: sabnzbd/assembler.py
 msgid "Unwanted extension is in rar file %s"
@@ -245,13 +253,13 @@ msgstr "Prekinuto, detektovana neželjena ekstenzija"
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Paused job \"%s\" because of rating (%s)"
-msgstr "UPOZORENJE: Posao \"%s\" pauziran zbog ocene (%s)"
+msgid "Paused job \"%s\" because of rating (%s)"
+msgstr ""
 
 #. Warning message
 #: sabnzbd/assembler.py
-msgid "WARNING: Aborted job \"%s\" because of rating (%s)"
-msgstr "UPOZORENJE: Posao \"%s\" prekinut zbog ocene (%s)"
+msgid "Aborted job \"%s\" because of rating (%s)"
+msgstr ""
 
 #: sabnzbd/assembler.py
 msgid "Aborted, rating filter matched (%s)"
@@ -304,6 +312,10 @@ msgstr "%s nije ispravna email adresa"
 msgid "Server address required"
 msgstr "Потребна је адреса сервера"
 
+#: sabnzbd/cfg.py
+msgid "%s is not a valid script"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/config.py
 msgid "Configuration locked, cannot save settings"
@@ -336,10 +348,6 @@ msgstr "%s nije ispravna oktalna vrednost"
 msgid "UNC path \"%s\" not allowed here"
 msgstr "UNC путања \"%s\" није дозвољена"
 
-#: sabnzbd/config.py
-msgid "Error: Path length should be below %s."
-msgstr "Greška: Dužina putanje bi trebala biti ispod %s"
-
 #: sabnzbd/config.py
 msgid "Error: Queue not empty, cannot change folder."
 msgstr "Грешка: ред није празан, фасцикла се не може променити."
@@ -476,6 +484,16 @@ msgstr "Sumnja u grešku u programu za download"
 msgid "Shutting down"
 msgstr "Гашење"
 
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s is expiring in %s day(s)"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/downloader.py
+msgid "Server %s has used the specified quota"
+msgstr ""
+
 #: sabnzbd/emailer.py
 msgid "Failed to connect to mail server"
 msgstr "Неуспешно привезивање на сервер е-поште"
@@ -579,6 +597,15 @@ msgstr "Neuspešno kreiranje (%s)"
 msgid "Failed moving %s to %s"
 msgstr "Neuspešno premeštanje %s u %s"
 
+#. Error message
+#: sabnzbd/filesystem.py
+msgid "Blocked attempt to create directory %s"
+msgstr ""
+
+#: sabnzbd/interface.py
+msgid "Refused connection from:"
+msgstr ""
+
 #: sabnzbd/interface.py
 msgid "Refused connection with hostname \"%s\" from:"
 msgstr ""
@@ -618,6 +645,7 @@ msgstr ""
 msgid "Authentication failed, check username/password."
 msgstr "Аутентификација погрешна, проверити име/лозинку."
 
+#. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
 msgstr ""
@@ -637,6 +665,12 @@ msgstr ""
 "кликните на линк испод.<br /><br /><strong><a "
 "href=\"..\">Освежи</a></strong><br />"
 
+#: 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 "Warning: LOCALHOST is ambiguous, use numerical IP-address."
 msgstr "Пажња: LOCALHOST је двосмислен, користите ИП адресе."
@@ -719,6 +753,15 @@ msgstr "с"
 msgid "m"
 msgstr "м"
 
+#: sabnzbd/misc.py, sabnzbd/skintext.py
+msgid "Update Available!"
+msgstr "Нова верзија доступна!"
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Failed to upload file: %s"
+msgstr ""
+
 #. Error message
 #: sabnzbd/misc.py
 msgid "Error creating SSL key and certificate"
@@ -731,19 +774,25 @@ msgid ""
 "passwords takes a lot of time. Try to only list useful passwords."
 msgstr ""
 
+#. Warning message
+#: sabnzbd/misc.py
+msgid "Failed to read the password file %s"
+msgstr ""
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "[%s] The command in build_command is undefined."
+msgstr ""
+
+#. Error message
+#: sabnzbd/misc.py
+msgid "Python script \"%s\" does not have execute (+x) permission set"
+msgstr ""
+
 #: sabnzbd/newsunpack.py, sabnzbd/postproc.py
 msgid "Running script"
 msgstr "Покретање скрипта"
 
-#: sabnzbd/newsunpack.py, sabnzbd/postproc.py
-msgid "PostProcessing was aborted (%s)"
-msgstr "Пост-процесирање је заустављено (%s)"
-
-#. PP phase "script" - Notification Script settings
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Script"
-msgstr "Скрипт"
-
 #. Warning message
 #: sabnzbd/newsunpack.py
 msgid "Unpack nesting too deep [%s]"
@@ -805,11 +854,6 @@ msgstr "Neuspešno raspakivanje, arhiva zahteva lozinku"
 msgid "Unpacking"
 msgstr "Распакивање"
 
-#. PP phase "unpack"
-#: sabnzbd/newsunpack.py, sabnzbd/skintext.py
-msgid "Unpack"
-msgstr "Распакуј"
-
 #: sabnzbd/newsunpack.py
 msgid "Unpacking failed, unable to find %s"
 msgstr "Погрешно распакивање, не може да се нађе %s"
@@ -985,16 +1029,6 @@ msgstr ""
 msgid "Checking"
 msgstr "Провера"
 
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "[%s] The command in build_command is undefined."
-msgstr ""
-
-#. Error message
-#: sabnzbd/newsunpack.py
-msgid "Python script \"%s\" does not have execute (+x) permission set"
-msgstr ""
-
 #: sabnzbd/newsunpack.py
 msgid "Trying SFV verification"
 msgstr "Pokušaj SFV provere"
@@ -1027,6 +1061,19 @@ msgstr "Вики"
 msgid "Startup/Shutdown"
 msgstr "Покретање/Гашење"
 
+#. Notification - Pause downloading - Four way switch for duplicates -
+#. Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Pause"
+msgstr "Пауза"
+
+#. Notification - Resume downloading - Config->Scheduling
+#: sabnzbd/notifier.py, sabnzbd/osxmenu.py, sabnzbd/sabtray.py,
+#: sabnzbd/sabtraylinux.py, sabnzbd/skintext.py
+msgid "Resume"
+msgstr "Настави"
+
 #. Notification - Config->RSS after adding to queue
 #: sabnzbd/notifier.py, sabnzbd/skintext.py
 msgid "Added NZB"
@@ -1136,15 +1183,12 @@ msgstr "NZB додат у ред"
 msgid "%s -> Unknown encoding"
 msgstr "%s -> Непознато енкодирање"
 
-#: sabnzbd/nzbstuff.py
-msgid "%s => missing from all servers, discarding"
-msgstr "%s => фали на свим серверима, одбацивање"
-
 #. Warning message
 #: sabnzbd/nzbstuff.py
 msgid "Invalid NZB file %s, skipping (reason=%s, line=%s)"
 msgstr "Неважећи NZB %s, прескакање (разлог=%s, линија=%s)"
 
+#. Warning message
 #: sabnzbd/nzbstuff.py, sabnzbd/urlgrabber.py
 msgid "Empty NZB file %s"
 msgstr "Празан NZB %s"
@@ -1250,10 +1294,6 @@ msgstr "Упозорења"
 msgid "Idle"
 msgstr "Мирoвање"
 
-#: sabnzbd/osxmenu.py
-msgid "Configuration"
-msgstr "Поставке"
-
 #. Main menu item
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Queue"
@@ -1278,22 +1318,11 @@ msgstr "Очисти хронологију"
 msgid "Limit Speed"
 msgstr "Ограничење брзине"
 
-#. Pause downloading - Four way switch for duplicates - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Pause"
-msgstr "Пауза"
-
-#: sabnzbd/osxmenu.py
-msgid "min."
+#. One minute
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+msgid "min"
 msgstr "мин."
 
-#. Resume downloading - Config->Scheduling
-#: sabnzbd/osxmenu.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py,
-#: sabnzbd/skintext.py
-msgid "Resume"
-msgstr "Настави"
-
 #. #: Config->Scheduler
 #: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Scan watched folder"
@@ -1341,10 +1370,6 @@ msgstr "Празно"
 msgid "History Last 10 Items"
 msgstr "Хронологија задњих 10 ставка"
 
-#: sabnzbd/osxmenu.py
-msgid "New release available"
-msgstr "Ново издање је доступно"
-
 #: sabnzbd/osxmenu.py
 msgid "Go to wizard"
 msgstr "Покрени асистент"
@@ -1497,6 +1522,10 @@ msgstr "Преузимање је можда погрешно. има %s од п
 msgid "Download failed - Not on your server(s)"
 msgstr "Неуспешно преузимање - није на вашем серверу"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing"
+msgstr "Пост-процесирање"
+
 #: sabnzbd/postproc.py
 msgid "Moving"
 msgstr "Премештање"
@@ -1540,6 +1569,10 @@ msgstr "Грешка пост-процесирања за %s (%s)"
 msgid "see logfile"
 msgstr "видети извештај"
 
+#: sabnzbd/postproc.py
+msgid "Post-processing was aborted"
+msgstr ""
+
 #: sabnzbd/postproc.py
 msgid "Download Failed"
 msgstr "Неуспешно преузимање"
@@ -1558,10 +1591,6 @@ msgstr "Преузимање завршено"
 msgid "Cannot create final folder %s"
 msgstr "Немогуће креирање фасцикле %s"
 
-#: sabnzbd/postproc.py
-msgid "Post-processing"
-msgstr "Пост-процесирање"
-
 #: sabnzbd/postproc.py
 msgid "[%s] No par2 sets"
 msgstr "[%s] Нема par2 датотеке"
@@ -1594,6 +1623,15 @@ msgstr ""
 msgid "RAR files failed to verify"
 msgstr ""
 
+#: sabnzbd/postproc.py
+msgid "Trying RAR renamer"
+msgstr ""
+
+#. Warning message
+#: sabnzbd/postproc.py
+msgid "No matching earlier rar file for %s"
+msgstr ""
+
 #. Error message
 #: sabnzbd/postproc.py
 msgid "Removing %s failed"
@@ -1614,6 +1652,11 @@ msgstr "Неуспено постављање система у стању пр
 msgid "Error while shutting down system"
 msgstr "Greška pri gašenju sistema"
 
+#. Error message
+#: sabnzbd/powersup.py
+msgid "Received a DBus exception %s"
+msgstr ""
+
 #. Warning message
 #: sabnzbd/rating.py
 msgid "Indexer id (%s) not found for ratings file"
@@ -1638,10 +1681,6 @@ msgstr ""
 msgid "Incorrect RSS feed description \"%s\""
 msgstr "Погрешан опис RSS фида \"%s\""
 
-#: sabnzbd/rss.py
-msgid "Failed to retrieve RSS from %s: %s"
-msgstr "Неуспешно преузимање RSS од %s: %s"
-
 #: sabnzbd/rss.py
 msgid "Do not have valid authentication for feed %s"
 msgstr "Немам важећу аутентификацију за фид %s"
@@ -1650,10 +1689,15 @@ msgstr "Немам важећу аутентификацију за фид %s"
 msgid "Server side error (server code %s); could not get %s on %s"
 msgstr "Greška na strani servera (kod greške %s); nemoguće dobiti %s na %s"
 
+#: sabnzbd/rss.py
+msgid "Failed to retrieve RSS from %s: %s"
+msgstr "Неуспешно преузимање RSS од %s: %s"
+
 #: sabnzbd/rss.py, sabnzbd/urlgrabber.py
 msgid "Server %s uses an untrusted HTTPS certificate"
 msgstr "Server %s koristi nepouzdan HTTPS sertifikat"
 
+#. Warning message
 #: sabnzbd/rss.py
 msgid "RSS Feed %s was empty"
 msgstr "RSS фид %s је празан"
@@ -1743,6 +1787,16 @@ msgstr "Преузми"
 msgid "Join files"
 msgstr "Прилепити датотеке"
 
+#. PP phase "unpack"
+#: sabnzbd/skintext.py
+msgid "Unpack"
+msgstr "Распакуј"
+
+#. PP phase "script" - Notification Script settings
+#: sabnzbd/skintext.py
+msgid "Script"
+msgstr "Скрипт"
+
 #. PP Source of the NZB (path or URL) - Where to find the SABnzbd sourcecode
 #: sabnzbd/skintext.py
 msgid "Source"
@@ -1967,11 +2021,6 @@ msgstr "сат"
 msgid "hours"
 msgstr "сата(и)"
 
-#. One minute
-#: sabnzbd/skintext.py
-msgid "min"
-msgstr "мин."
-
 #. Multiple minutes
 #: sabnzbd/skintext.py
 msgid "mins"
@@ -2067,6 +2116,10 @@ msgstr "Ове седмице"
 msgid "This month"
 msgstr "Овог месеца"
 
+#: sabnzbd/skintext.py
+msgid "Selected date range"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Today"
 msgstr "Данас"
@@ -2075,6 +2128,14 @@ msgstr "Данас"
 msgid "Total"
 msgstr "Укупно"
 
+#: sabnzbd/skintext.py
+msgid "Custom"
+msgstr "Прилагођено"
+
+#: sabnzbd/skintext.py
+msgid "Speed"
+msgstr "Брзина"
+
 #: sabnzbd/skintext.py
 msgid "on"
 msgstr "укљ."
@@ -2902,6 +2963,12 @@ msgstr "никје инсталирано"
 msgid "Enable accessing the interface from a HTTPS address."
 msgstr "Приступ интерфејсу преко HTTPS адресе."
 
+#: sabnzbd/skintext.py
+msgid ""
+"Modern web browsers and other clients will not accept self-signed "
+"certificates and will give a warning and/or won't connect at all."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "HTTPS Port"
 msgstr "HTTPS порт"
@@ -3067,25 +3134,12 @@ msgstr "Генериши нов кључ"
 msgid "API Key QR Code"
 msgstr "QR Код АПИ кључа"
 
-#: sabnzbd/skintext.py
-msgid "List of local network ranges"
-msgstr "Lista lokalnih mrežnih raspona"
-
-#: sabnzbd/skintext.py
-msgid ""
-"All local network addresses start with these prefixes (often \"192.168.1.\")"
-msgstr ""
-"Sve lokalne mrežne adrese počinju sa sledećim prefiksima (najčešće "
-"\"192.168.1.\")"
-
 #: sabnzbd/skintext.py
 msgid "External internet access"
 msgstr "Екстерни приступ интернету"
 
 #: sabnzbd/skintext.py
-msgid ""
-"You can set access rights for systems outside your local network. Requires "
-"List of local network ranges to be defined."
+msgid "You can set access rights for systems outside your local network."
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3169,6 +3223,26 @@ msgstr ""
 "Смештај завршених, процесираних преузимања.<br /><i>Може се заобићи у "
 "дефинисаним категоријама.</i>"
 
+#: sabnzbd/skintext.py
+msgid "Minimum Free Space for Completed Download Folder"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Will not work if a category folder is on a different disk."
+msgstr ""
+
+#. Auto-resume download on the reset day
+#: sabnzbd/skintext.py
+msgid "Auto resume"
+msgstr "Automatski nastavi"
+
+#: sabnzbd/skintext.py
+msgid ""
+"Downloading will automatically resume if the minimum free space is available"
+" again.<br />Applies to both the Temporary and Complete Download Folder.<br "
+"/>Checked every few minutes."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Permissions for completed downloads"
 msgstr "Дозволе за фасциклу завршених преузимања"
@@ -3314,9 +3388,11 @@ msgid "Post-Process Only Verified Jobs"
 msgstr "Пост-процесирај само проверени послови"
 
 #: sabnzbd/skintext.py
-msgid "Only perform post-processing on jobs that passed all PAR2 checks."
+msgid ""
+"Only unpack and run scripts on jobs that passed the verification stage. If "
+"turned off, all jobs will be marked as Completed even if they are "
+"incomplete."
 msgstr ""
-"Огранићи пост-процесирање само за радове који су прешли све PAR2 провере."
 
 #: sabnzbd/skintext.py
 msgid "Action when encrypted RAR is downloaded"
@@ -3381,18 +3457,26 @@ msgid "Action when unwanted extension detected"
 msgstr "Radnja kada je otkrivena neželjena ekstenzija"
 
 #: sabnzbd/skintext.py
-msgid "Action when an unwanted extension is detected in RAR files"
-msgstr "Radnja kada je otkrivena neželjena ekstenzija u RAR datotekama"
+msgid "Action when an unwanted extension is detected"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Unwanted extensions"
 msgstr "Neželjene ekstenzije"
 
 #: sabnzbd/skintext.py
-msgid ""
-"List all unwanted extensions. For example: <b>exe</b> or <b>exe, com</b>"
+msgid "Blacklist"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Whitelist"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Select a mode and list all (un)wanted extensions. For example: <b>exe</b> or"
+" <b>exe, com</b>"
 msgstr ""
-"Lista svih neželjenih ekstenzija. Na primer: <b>exe</b> or <b>exe, com</b>"
 
 #: sabnzbd/skintext.py
 msgid "Enable SFV-based checks"
@@ -3557,6 +3641,16 @@ msgstr "Филтрирај примерне датотеке (нпр. видео
 msgid "Delete after download"
 msgstr "Обриши после преузимања"
 
+#: sabnzbd/skintext.py
+msgid "Deobfuscate final filenames"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"If filenames of (large) files in the final folder look obfuscated or "
+"meaningless they will be renamed to the job name."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "HTTPS certificate verification"
 msgstr ""
@@ -3603,11 +3697,6 @@ msgstr ""
 "Који дан месеца или недеље (1=понедељак) Ваш провајдер ресетује квоту? "
 "(опционо са hh:mm)"
 
-#. Auto-resume download on the reset day
-#: sabnzbd/skintext.py
-msgid "Auto resume"
-msgstr "Automatski nastavi"
-
 #: sabnzbd/skintext.py
 msgid "Should downloading resume after the quota is reset?"
 msgstr "Да се настави преузимање после ресета квоте?"
@@ -3762,6 +3851,21 @@ msgstr "Лозинка"
 msgid "Timeout"
 msgstr "Време истекло"
 
+#: sabnzbd/skintext.py
+msgid "Account expiration date"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Warn 5 days in advance of account expiration date."
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid ""
+"Quota for this account, counted from the time it is set. In bytes, "
+"optionally follow with K,M,G.<br />Warn when it reaches 0, checked every few"
+" minutes."
+msgstr ""
+
 #. Server's retention time in days
 #: sabnzbd/skintext.py
 msgid "Retention time"
@@ -3853,6 +3957,14 @@ msgstr "Послати команду 'group' пре тражења артикл
 msgid "Personal notes"
 msgstr "Lične zabeleške"
 
+#: sabnzbd/skintext.py
+msgid "Article availability"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "%f% available of %d requested articles"
+msgstr ""
+
 #. Config->Scheduling
 #: sabnzbd/skintext.py
 msgid "Add Schedule"
@@ -3904,6 +4016,16 @@ msgstr "Читај фид"
 msgid "Force Download"
 msgstr "Натерај преузимање"
 
+#. Config->RSS edit button
+#: sabnzbd/skintext.py
+msgid "Edit"
+msgstr ""
+
+#. Config->RSS when will be the next RSS scan
+#: sabnzbd/skintext.py
+msgid "Next scan at"
+msgstr ""
+
 #. Config->RSS table column header
 #: sabnzbd/skintext.py
 msgid "Filter"
@@ -4053,7 +4175,7 @@ msgstr "Обавештење послато!"
 msgid "Enable NotifyOSD"
 msgstr "Упали „NotifyOSD“"
 
-#. Header for OSX Notfication Center section
+#. Header for macOS Notfication Center section
 #: sabnzbd/skintext.py
 msgid "Notification Center"
 msgstr "Центар за обавештења"
@@ -4601,11 +4723,11 @@ msgid "Date format"
 msgstr "Формат датума"
 
 #: sabnzbd/skintext.py
-msgid "Extra queue column"
-msgstr "Ekstra kolona reda"
+msgid "Extra queue columns"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Extra history column"
+msgid "Extra history columns"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -4689,8 +4811,8 @@ msgid "View Script Log"
 msgstr "Види извештај скрипта"
 
 #: sabnzbd/skintext.py
-msgid "Update Available!"
-msgstr "Нова верзија доступна!"
+msgid "Renaming the job will abort Direct Unpack."
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid ""
@@ -4703,21 +4825,17 @@ msgid "Glitter has some (new) features you might like!"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Custom"
-msgstr "Прилагођено"
+msgid "Compact layout"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Compact layout"
+msgid "Always use full screen width"
 msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Tabbed layout <br/>(separate queue and history)"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Speed"
-msgstr "Брзина"
-
 #: sabnzbd/skintext.py
 msgid "Confirm Queue Deletions"
 msgstr "Потврда брисања реда"