Set version to 4.2.2

* better docker detections: works for Ubuntu 18.04 and 22.04

* DOCKER = False, needed for non-POSIX

---------

Co-authored-by: sander <san.d.erjonkers+github@gmail.com>

.github/dependabot.yml

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

.github/renovate.json

@@ -7,18 +7,20 @@
   "schedule": [
     "before 8am on Monday"
   ],
+  "ignorePaths": [
+    ".github/workflows/**"
+  ],
   "pip_requirements": {
     "fileMatch": [
       "requirements.txt",
       "tests/requirements.txt",
       "builder/requirements.txt",
-      "builder/release-requirements.txt"
+      "builder/release-requirements.txt",
+      "builder/osx/requirements.txt"
     ]
   },
   "ignoreDeps": [
     "jaraco.text",
-    "jaraco.context",
-    "jaraco.collections",
     "sabctools",
     "werkzeug",
     "pyinstaller"

.github/workflows/build_release.yml

@@ -12,15 +12,21 @@ jobs:
     runs-on: windows-latest
     timeout-minutes: 30
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Set up Python 3.12 (64bit)
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: "3.12"
         architecture: "x64"
-        cache: pip
-        cache-dependency-path: "**/requirements.txt"
+    - name: Cache Python virtualenv (64bit)
+      uses: syphar/restore-virtualenv@v1.3
+      id: cache-virtualenv-64bit
+      with:
+        custom_virtualenv_dir: "venv64"
+        custom_cache_key_element: "release"
+        requirement_files:  "**/requirements.txt"
     - name: Install Python dependencies (64bit)
+      if: steps.cache-virtualenv-64bit.outputs.cache-hit != 'true'
       # Without dependencies to make sure everything is covered in the requirements.txt
       run: |
         python --version
@@ -30,23 +36,29 @@ jobs:
     - name: Build Windows standalone binary and installer (64bit)
       run: python builder/package.py installer
     - name: Upload Windows standalone binary (64bit)
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         path: "*-win64-bin.zip"
         name: Windows standalone binary (64bit)
     - name: Upload Windows installer (64bit)
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         path: "*-win-setup.exe"
         name: Windows installer
     - name: Set up Python 3.8 (32bit and legacy)
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: "3.8"
         architecture: "x86"
-        cache: pip
-        cache-dependency-path: "**/requirements.txt"
+    - name: Cache Python virtualenv (32bit and legacy)
+      uses: syphar/restore-virtualenv@v1.3
+      id: cache-virtualenv-32bit
+      with:
+        custom_virtualenv_dir: "venv32"
+        custom_cache_key_element: "release"
+        requirement_files: "**/requirements.txt"
     - name: Install Python dependencies (32bit and legacy)
+      if: steps.cache-virtualenv-32bit.outputs.cache-hit != 'true'
       # We do not care about the extra dependencies for the legacy build
       run: |
         python --version
@@ -56,52 +68,61 @@ jobs:
     - name: Build Windows standalone binary (32bit and legacy)
       run: python builder/package.py binary
     - name: Upload Windows standalone binary (32bit and legacy)
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         path: "*-win32-bin.zip"
         name: Windows standalone binary (32bit and legacy)
 
   build_macos:
     name: Build macOS binary
-    runs-on: macos-14
+    runs-on: macos-11
     timeout-minutes: 30
     env:
       # 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.12.3"
+      PYTHON_VERSION: "3.12.1"
       MACOSX_DEPLOYMENT_TARGET: "10.9"
       # We need to force compile for universal2 support
       CFLAGS: -arch x86_64 -arch arm64
       ARCHFLAGS: -arch x86_64 -arch arm64
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python 3.12
-      # Only use this for the caching of pip packages!
-      uses: actions/setup-python@v5
-      with:
-        python-version: "3.12"
-        cache: pip
-        cache-dependency-path: "**/requirements.txt"
+    - uses: actions/checkout@v3
     - name: Cache Python download
       id: cache-python-download
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~/python.pkg
         key: cache-macOS-Python-${{ env.PYTHON_VERSION }}
-    - name: Get Python from python.org
+    - 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}-macos11.pkg -o ~/python.pkg
     - name: Install Python
       run: sudo installer -pkg ~/python.pkg -target /
+    - name: Cache Python virtualenv
+      uses: syphar/restore-virtualenv@v1.3
+      id: cache-virtualenv
+      with:
+        custom_cache_key_element: "release"
+        requirement_files: "**/requirements.txt"
     - name: Install Python dependencies
       # We have to manually take a few steps:
-      # 1.  We need to build the PyInstaller bootloader:
+      # 1.  Because building cryptography is hard, and we cannot force pip to fetch universal2 version we
+      #     first install the x86 version (and it's dependencies) and then manually fetch the universal2 build
+      #     https://github.com/pypa/pip/issues/5453
+      # 2.  We need to build the PyInstaller bootloader:
       #     https://github.com/pyinstaller/pyinstaller/issues/6235
+      if: steps.cache-virtualenv.outputs.cache-hit != 'true'
       run: |
         python3 --version
         pip3 install --upgrade pip wheel
-        pip3 install --upgrade -r requirements.txt --no-binary cffi,CT3,PyYAML --no-dependencies
+    
+        pip3 install --upgrade -r requirements.txt --no-binary cffi --no-dependencies
+        
+        pip3 uninstall cryptography -y
+        pip3 download -r builder/osx/requirements.txt --platform macosx_10_12_universal2 --only-binary :all: --no-dependencies --dest .
+        pip3 install -r builder/osx/requirements.txt --no-cache-dir --no-index --find-links .
+
         PYINSTALLER_COMPILE_BOOTLOADER=1 pip3 install --upgrade -r builder/requirements.txt --no-binary pyinstaller --no-dependencies
     - name: Import macOS codesign certificates
       # Taken from https://github.com/Apple-Actions/import-codesign-certs/pull/27 (comments)
@@ -122,7 +143,7 @@ jobs:
       # Run this on macOS so the line endings are correct by default
       run: python builder/package.py source
     - name: Upload source distribution
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         path: "*-src.tar.gz"
         name: Source distribution
@@ -135,7 +156,7 @@ jobs:
         python3 builder/package.py app
         python3 builder/make_dmg.py
     - name: Upload macOS binary
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         path: "*-osx.dmg"
         name: macOS binary (not notarized)
@@ -146,13 +167,13 @@ jobs:
     needs: [build_windows, build_macos]
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
         with:
           python-version: "3.x"
       - name: Download all artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           path: dist
       - name: Move all artifacts to main folder

.github/workflows/integration_testing.yml

@@ -7,7 +7,7 @@ jobs:
     name: Black Code Formatter
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Black Code Formatter
         uses: lgeiger/black-action@master
         with:
@@ -50,22 +50,27 @@ jobs:
             python-architecture: "x86"
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }} ${{ matrix.python-architecture }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
         architecture:  ${{ matrix.python-architecture }}
-        cache: pip
-        cache-dependency-path: "**/requirements.txt"
     - name: Install system dependencies
       if: runner.os == 'Linux'
       run: sudo apt-get install unrar p7zip-full par2
+    - name: Cache Python virtualenv
+      uses: syphar/restore-virtualenv@v1.3
+      id: cache-virtualenv
+      with:
+        custom_cache_key_element: ci-${{ matrix.python-architecture }}
+        requirement_files: "**/requirements.txt"
     - name: Install Python dependencies
+      if: steps.cache-virtualenv.outputs.cache-hit != 'true'
       run: |
         python --version
         python -m pip install --upgrade pip wheel
-        pip install --upgrade -r requirements.txt --no-dependencies
+        pip install --upgrade -r requirements.txt
         pip install --upgrade -r tests/requirements.txt
     - name: Test SABnzbd
       run: pytest -s

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
     if: github.repository_owner == 'sabnzbd'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v8
         with:
           days-before-stale: 21
           days-before-close: 7
@@ -26,7 +26,7 @@ jobs:
     if: github.repository_owner == 'sabnzbd'
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v5
+      - uses: dessant/lock-threads@v4
         with:
           log-output: true
           issue-inactive-days: 60

.github/workflows/translations.yml

@@ -12,7 +12,7 @@ jobs:
     env:
       TX_TOKEN: ${{ secrets.TX_TOKEN }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           token: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
       - name: Generate translatable texts
@@ -30,7 +30,7 @@ jobs:
         run: |
           python3 tools/make_mo.py
       - name: Push translatable and translated texts back to repo
-        uses: stefanzweifel/git-auto-commit-action@v5.0.1
+        uses: stefanzweifel/git-auto-commit-action@v4.16.0
         if: env.TX_TOKEN
         with:
           commit_message: |

README.mkd

@@ -1,38 +1,67 @@
-Release Notes - SABnzbd 4.3.0 Release Candidate 2
+Release Notes - SABnzbd 4.2.2
 =========================================================
 
-This is the second release candidate of SABnzbd 4.3.0.
+This is the second bug-fix release of SABnzbd 4.2.0.
 
-## Key changes since 4.2.0
+## Bug-fixes and changes since 4.2.1:
 
-* **Archive:**
-    * When jobs are removed from the History, they are moved to the Archive.
-    * Keep your History clean and still be able to reliably use Duplicate Detection.
+* **Bug-fixes:**
+    * RSS readout could result in a crash if Duplicate Detection was enabled.
+    * Passwords were not always correctly parsed.
+    * Warnings could show even if `helpful_warnings` was disabled.
+    * Duplicate Detection would trigger again on URLs if they were resumed.
+    * Windows: Fatal crash could occur if ran as Service or on older Windows versions.
 
-* **Apprise Integrated:**
-    * Send notifications using Apprise to almost any notification service.
-    * Supported notifications: https://github.com/caronc/apprise/wiki
-    * Notification Script `SABnzbd-notify.py` is no longer needed.
+* **Changes:**
+    * Parsing of filenames from the NZB was extended to allow more exotic formatting.
+    * Windows: Installer will automatically shutdown SABnzbd if it is running.
 
-* **Added IPv6-staging option:**
-    * Enable `ipv6_staging` in Config - Specials to get additional IPv6 features:
-        * Add IPv6 hostnames during address selection.
-        * Internet Bandwidth is measured separately for IPv4 and IPv6.
+## Bug-fixes and changes since 4.2.0:
 
-* **Other:**
-    * The `text` output format is removed from the API, `json` is the default.
-    * Handling of multiple inputs to several API methods was improved.
-    * File browser dialog is available to select file paths in the Config.
-    * Users will be warned if they configure an Indexer as a Server.
-    * Windows/macOS: Updated Python to 3.12.3, Multipar to v1.3.3.2,
-      Unrar to 7.00 and 7zip to 24.03.
+* **Bug-fixes:**
+    * New downloads did not appear in the History after the update to 4.2.0.
 
-## Bug fixes since 4.2.0
+* **Changes:**
+    * The external IPv6-address is shown, instead of the internal address.
+    * Windows: Network drives as `Download Folder` are no longer blocked, only warned against.
 
-* Incorrect warnings of unknown status codes could be thrown.
-* Watched Folder would not work if Socks5 proxy was active.
-* Prevent crash on invalid Server Expiration Date.
-* Windows: Installer could create duplicate shortcuts.
+## Key changes since 4.1.0
+
+* **Duplicate detection workflow overhaul:**
+    * `Series Duplicate Detection` was replaced by `Smart Duplicate Detection`
+      that can also detect `Movie` and `Daily Show` duplicates.
+    * Additionally, duplicates will also be detected if they are still in the queue.
+    * More information: https://sabnzbd.org/wiki/duplicate-detection
+
+* **Interface changes:**
+    * Added ability to filter the Queue and History by `status`.
+    * RSS-feed that provided the download is shown in History details.
+    * macOS/Windows 10 & 11: Added `Open Folder` button to `Job/Queue finished` notifications.
+      Clicking any type of notification will now open a browser with SABnzbd.
+
+* **Performance and usability improvements:**
+    * Numerous smaller performance improvements were made.
+    * Server IP-address selection was optimized.
+    * The `Internet Bandwidth` test was made more reliable.
+    * macOS/Windows: Updated to Python 3.12 and par2cmdline-turbo v1.1.1.
+
+* **Configuration changes:**
+    * The `On queue finish script` is now set in Switches.
+    * Reduced recursive unpacking to 2 levels, instead of 5.
+    * Duplicate detection related Pre-queue script input parameters were removed.
+      You will need to update your Pre-queue script.
+      More information: https://sabnzbd.org/wiki/configuration/4.2/scripts/pre-queue-scripts
+    * Stricter check if `Complete Folder` is inside `Download Folder`.
+    * Windows: Prevent use of network drive as `Download Folder`.
+
+## Bug fixes since 4.1.0
+
+* Fixed an issue where the multi-select option in the queue was not working for some users.
+* Prevented a crash that would occur during the saving of configuration settings.
+* Jobs with larger articles could stall the queue for several minutes.
+* Ensured that server warnings are always displayed to users.
+* If `weblogging` was enabled, output was also written to regular log.
+* Fixed an issue where removing a failed download from the History could break active downloads.
 
 ## Upgrade notices
 

builder/osx/requirements.txt

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

builder/release-requirements.txt

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

builder/release.py

@@ -233,7 +233,7 @@ if RELEASE_THIS and gh_token:
             readme_lines = readme_file.readlines()
 
         # Put the download link after the title
-        readme_lines[2] = "## https://sabnzbd.org/downloads\n\n"
+        readme_lines[2] = "## https://sabnzbd.org/downloads\n"
 
         # Use the header in the readme as title
         title = readme_lines[0]

builder/requirements.txt

@@ -1,19 +1,20 @@
 # Basic build requirements
 # Note that not all sub-dependencies are listed, but only ones we know could cause trouble
 pyinstaller==5.13.2
-packaging==24.0
-pyinstaller-hooks-contrib==2024.4
+packaging==23.2
+pyinstaller-hooks-contrib==2024.0
 altgraph==0.17.4
 wrapt==1.16.0
-setuptools==69.5.1
+setuptools==69.0.3
+certifi
 
 # Required on 32bit Windows, exclude it based on Python-version
-importlib_metadata==7.1.0; python_version < '3.10'
-importlib_resources==6.4.0; python_version < '3.10'
-zipp==3.18.1; python_version < '3.10'
+importlib_metadata==7.0.1; python_version < '3.10'
+importlib_resources==6.1.1; python_version < '3.10'
+zipp==3.17.0; python_version < '3.10'
 
 # orjson does not support 32bit Windows, also exclude based on Python-version
-orjson==3.10.1; python_version > '3.8'
+orjson==3.9.12; python_version > '3.8'
 
 # For the Windows build
 pefile==2023.2.7; sys_platform == 'win32'

builder/win/NSIS_Installer.nsi

@@ -40,27 +40,6 @@ Unicode true
   ; Remove the whole dir
   ; Users should not be putting stuff here!
   RMDir /r "${idir}"
-
-  ; Remove any shortuts, starting with current user ones (from old installs)
-  SetShellVarContext current
-  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
-  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - SafeMode.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - Documentation.url"
-  RMDir  "$SMPROGRAMS\$MUI_TEMP"
-  Delete "$SMPROGRAMS\Startup\SABnzbd.lnk"
-  Delete "$DESKTOP\SABnzbd.lnk"
-
-  SetShellVarContext all
-  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
-  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - SafeMode.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - Documentation.url"
-  RMDir  "$SMPROGRAMS\$MUI_TEMP"
-  Delete "$SMPROGRAMS\Startup\SABnzbd.lnk"
-  Delete "$DESKTOP\SABnzbd.lnk"
 !macroend
 
 ;------------------------------------------------------------------
@@ -69,6 +48,7 @@ Unicode true
   OutFile "${SAB_FILE}"
   InstallDir "$PROGRAMFILES\SABnzbd"
 
+
 ;------------------------------------------------------------------
 ; Some default compiler settings (uncomment and change at will):
   SetCompress auto ; (can be off or force)
@@ -161,7 +141,6 @@ Unicode true
   !insertmacro MUI_LANGUAGE "Polish"
   !insertmacro MUI_LANGUAGE "Swedish"
   !insertmacro MUI_LANGUAGE "Danish"
-  !insertmacro MUI_LANGUAGE "Italian"
   !insertmacro MUI_LANGUAGE "Norwegian"
   !insertmacro MUI_LANGUAGE "Romanian"
   !insertmacro MUI_LANGUAGE "Spanish"
@@ -305,18 +284,16 @@ Function .onInit
     ;------------------------------------------------------------------
     ; Check what the user has currently set for install options
     SetShellVarContext current
-    IfFileExists "$SMPROGRAMS\Startup\SABnzbd.lnk" 0 endCheckStartupCurrent
+    IfFileExists "$SMPROGRAMS\Startup\SABnzbd.lnk" 0 endCheckStartup
       SectionSetFlags ${startup} 1
-    endCheckStartupCurrent:
     SetShellVarContext all
     IfFileExists "$SMPROGRAMS\Startup\SABnzbd.lnk" 0 endCheckStartup
       SectionSetFlags ${startup} 1
     endCheckStartup:
 
     SetShellVarContext current
-    IfFileExists "$DESKTOP\SABnzbd.lnk" endCheckDesktopCurrent 0
+    IfFileExists "$DESKTOP\SABnzbd.lnk" endCheckDesktop 0
       SectionSetFlags ${desktop} 0 ; SAB is installed but desktop-icon not, so uncheck it
-    endCheckDesktopCurrent:
     SetShellVarContext all
     IfFileExists "$DESKTOP\SABnzbd.lnk" endCheckDesktop 0
       SectionSetFlags ${desktop} 0 ; SAB is installed but desktop-icon not, so uncheck it
@@ -379,6 +356,34 @@ Section "un.$(MsgDelProgram)" Uninstall
   liteFirewallW::RemoveRule "$INSTDIR\SABnzbd.exe" "SABnzbd"
   liteFirewallW::RemoveRule "$INSTDIR\SABnzbd-console.exe" "SABnzbd-console"
 
+  SetShellVarContext all
+
+  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+
+  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - SafeMode.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd - Documentation.url"
+  RMDir  "$SMPROGRAMS\$MUI_TEMP"
+
+  Delete "$SMPROGRAMS\Startup\SABnzbd.lnk"
+
+  Delete "$DESKTOP\SABnzbd.lnk"
+
+  SetShellVarContext current
+
+  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+
+  Delete "$SMPROGRAMS\$MUI_TEMP\SABnzbd.lnk"
+  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"
+
   ${unregisterExtension} ".nzb" "NZB File"
   ${RefreshShellIcons}
 

interfaces/Config/templates/_inc_footer_uc.tmpl

@@ -12,13 +12,13 @@
                     <div class="modal-body">
                     </div>
                     <div class="modal-footer">
-
+                        <!--#if not $windows#-->
                         <div class="checkbox">
                             <label>
                                 <input type="checkbox" id="show_hidden_folders"> <span>$T('hiddenFolders')</span>
                             </label>
                         </div>
-
+                        <!--#end if#-->
                         <button type="button" class="btn btn-danger" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span> $T('cancel')</button>
                         <button type="button" class="btn btn-default" id="filebrowser_modal_accept"><span class="glyphicon glyphicon-ok"></span> $T('rss-accept')</button>
                     </div>

interfaces/Config/templates/_inc_header_uc.tmpl

@@ -70,7 +70,27 @@
     <script type="text/javascript" src="${root}staticcfg/js/script.js?v=$version"></script>
     <script type="text/javascript">
         // Set default functions for the autocomplete everywhere
-
+        jQuery.extend(jQuery.fn.typeahead.defaults, {
+            source: function (query, process) {
+                // If there's no separator, it must be a relative path
+                if(query.split(folderSeperator).length < 2 && this.\$element.data('initialdir')) {
+                    query  = this.\$element.data('initialdir') + folderSeperator + query;
+                }
+                // Get info from the API
+                return jQuery.get(folderBrowseUrl + '&compact=1&term=' + query, function (data) {
+                    return process(data);
+                });
+            },
+            updater: function(item) {
+                // Is it a relative path?
+                if(item.indexOf(this.\$element.data('initialdir')) === 0) {
+                    // Remove start
+                    return item.replace(this.\$element.data('initialdir')+folderSeperator, '');
+                }
+                // Full path
+                return item
+            }
+        })
 
         // to top right away
         if(window.location.hash) {

interfaces/Config/templates/config_folders.tmpl

@@ -77,7 +77,7 @@
                 </div>
                 <div class="field-pair advanced-settings">
                     <label class="config" for="password_file">$T('opt-password_file')</label>
-                    <input type="text" name="password_file" id="password_file" value="$password_file" class="fileBrowserField" data-initialdir="$my_home" data-files="1" />
+                    <input type="text" name="password_file" id="password_file" value="$password_file" />
                     <span class="desc">$T('explain-password_file')</span>
                 </div>
                 <div class="field-pair">
@@ -133,7 +133,7 @@
 <script type="text/javascript">
     jQuery(document).ready(function() {
         // Add autocomplete and file-browser
-        jQuery('.col1 input[name$="_dir"], #password_file').typeahead().fileBrowser();
+        jQuery('.col1 input[name$="_dir"]').typeahead().fileBrowser();
 
         jQuery('#purge_log_files').click(function () {
             if ( confirm("$T('confirm')") ) {

interfaces/Config/templates/config_general.tmpl

@@ -74,7 +74,7 @@
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="https_cert">$T('opt-https_cert')</label>
-                        <input type="text" name="https_cert" id="https_cert" value="$https_cert" class="fileBrowserField" data-initialdir="$my_lcldata" data-files="1" />
+                        <input type="text" name="https_cert" id="https_cert" value="$https_cert" />
                         <button class="btn btn-default generate_cert" title="$T('explain-new-cert')">
                             <span class="glyphicon glyphicon-repeat"></span>
                         </button>
@@ -82,7 +82,7 @@
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="https_key">$T('opt-https_key')</label>
-                        <input type="text" name="https_key" id="https_key" value="$https_key" class="fileBrowserField" data-initialdir="$my_lcldata" data-files="1" />
+                        <input type="text" name="https_key" id="https_key" value="$https_key" />
                         <button class="btn btn-default generate_cert" title="$T('explain-new-cert')">
                             <span class="glyphicon glyphicon-repeat"></span>
                         </button>
@@ -90,7 +90,7 @@
                     </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="https_chain">$T('opt-https_chain')</label>
-                        <input type="text" name="https_chain" id="https_chain" value="$https_chain" class="fileBrowserField" data-initialdir="$my_lcldata" data-files="1" />
+                        <input type="text" name="https_chain" id="https_chain" value="$https_chain" />
                         <span class="desc">$T('explain-https_chain')</span>
                     </div>
                     <div class="field-pair">
@@ -136,14 +136,14 @@
                     </div>
                     <div class="field-pair">
                         <label class="config" for="apikey_display">$T('opt-apikey')</label>
-                        <input type="text" id="apikey_display" value="$apikey" readonly />
+                        <input type="text" id="apikey_display" class="fileBrowserField" value="$apikey" readonly />
                         <button class="btn btn-default show_qrcode" title="$T('explain-qr-code')" rel="$apikey" ><span class="glyphicon glyphicon-qrcode"></span></button>
                         <button class="btn btn-default generate_key" id="generate_new_apikey" title="$T('button-apikey')"><span class="glyphicon glyphicon-repeat"></span></button>
                         <span class="desc">$T('explain-apikey')</span>
                     </div>
                     <div class="field-pair">
                         <label class="config" for="nzbkey">$T('opt-nzbkey')</label>
-                        <input type="text" id="nzbkey" value="$nzb_key" readonly />
+                        <input type="text" id="nzbkey" class="fileBrowserField" value="$nzb_key" readonly />
                         <button class="btn btn-default show_qrcode" title="$T('explain-qr-code')" rel="$nzb_key" ><span class="glyphicon glyphicon-qrcode"></span></button>
                         <button class="btn btn-default generate_key" id="generate_new_nzbkey" title="$T('button-apikey')"><span class="glyphicon glyphicon-repeat"></span></button>
                         <span class="desc">$T('explain-nzbkey')</span>
@@ -341,9 +341,6 @@ jQuery(document).ready(function(){
       }
     });
 
-    // Add autocomplete and file-browser
-    jQuery('.fileBrowserField').typeahead().fileBrowser();
-
     jQuery('.show_qrcode').click(function (e) {
         // Show in modal
         jQuery('#modal_qr .modal-dialog').width(330)

interfaces/Config/templates/config_notify.tmpl

@@ -2,8 +2,6 @@
 <!--#set global $help_uri = $confighelpuri + "notifications"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
-<!--#import apprise#-->
-
 <!--#def show_notify_checkboxes($section_label)#-->
     <!--#for $type in $notify_types#-->
         <div class="field-pair">
@@ -178,51 +176,6 @@
        </div>
     </div>
     <!--#end if#-->
-    <div class="section" id="apprise">
-        <div class="col2">
-            <h3>Apprise <a href="$help_uri#apprise" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-            <table>
-                <tr>
-                    <td><input type="checkbox" name="apprise_enable" id="apprise_enable" value="1" <!--#if int($apprise_enable) > 0 then 'checked="checked"' else ""#--> /></td>
-                    <td><label for="apprise_enable"> $T('opt-apprise_enable')</label></td>
-                </tr>
-            </table>
-            <em>$T('explain-apprise_enable')</em><br>
-            <p>$T('version'): ${apprise.__version__}</p>
-
-            $show_cat_box('apprise')
-        </div>
-        <div class="col1" <!--#if int($apprise_enable) > 0 then '' else 'style="display:none"'#-->>
-            <fieldset>
-                <div class="field-pair">
-                    <label class="config" for="apprise_urls">$T('opt-apprise_urls')</label>
-                    <input type="text" name="apprise_urls" id="apprise_urls" value="$apprise_urls" />
-                    <span class="desc">$T('explain-apprise_urls'). <br>$T('readwiki')</span>
-                </div>
-                <div class="field-pair">
-                    <span class="desc">$T('explain-apprise_extra_urls')</span>
-                </div>
-                <!--#set $section_label = 'apprise'#-->
-                <!--#for $type in $notify_types#-->
-                    <div class="field-pair">
-                        <label class="config" for="${section_label}_target_${type}">
-                            $T($notify_types[$type]).replace('/', ' / ')
-                        </label>
-                        <input type="checkbox" name="${section_label}_target_${type}_enable" id="${section_label}_target_${type}_enable" value="1" <!--#if int($getVar($section_label + '_target_' + $type + '_enable')) > 0 then 'checked="checked"' else ""#--> />
-                        <input type="text" name="${section_label}_target_${type}" id="${section_label}_target_${type}" value="$getVar($section_label + '_target_' + $type)"  placeholder="$T('opt-apprise_urls')" />
-                    </div>
-                <!--#end for#-->
-
-                <div class="field-pair no-field-pair-bg">
-                   <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                   <button class="btn btn-default" type="button" id="test_apprise"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
-                </div>
-                <div class="field-pair result-box">
-                    <div class="alert"></div>
-                </div>
-           </fieldset>
-       </div>
-    </div>
     <div class="section" id="nscript">
         <div class="col2">
             <h3>$T('section-NScript') <a href="$help_uri#nscript" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
@@ -473,7 +426,7 @@ jQuery(document).ready(function(){
             }
         })
     }
-    jQuery('#test_email, #test_notif, #test_windows, #test_apprise, #test_pushbullet, #test_pushover, #test_prowl, #test_osd, #test_nscript').click(function () {
+    jQuery('#test_email, #test_notif, #test_windows, #test_pushbullet, #test_pushover, #test_prowl, #test_osd, #test_nscript').click(function () {
         testNotification(this)
     })
 });

interfaces/Config/templates/config_server.tmpl

@@ -106,6 +106,11 @@
                         <span class="desc">$T('explain-ssl_ciphers') <br>$T('readwiki')
                         <a href="https://sabnzbd.org/wiki/advanced/ssl-ciphers" target="_blank">https://sabnzbd.org/wiki/advanced/ssl-ciphers</a></span>
                     </div>
+                    <div class="field-pair advanced-settings">
+                        <label class="config" for="send_group">$T('srv-send_group')</label>
+                        <input type="checkbox" name="send_group" id="send_group" value="1" />
+                        <span class="desc">$T('srv-explain-send_group')</span>
+                    </div>
                     <div class="field-pair advanced-settings">
                         <label class="config" for="required">$T('srv-required')</label>
                         <input type="checkbox" name="required" id="required" value="1" />
@@ -131,7 +136,7 @@
                         <textarea name="notes" id="notes" rows="3" cols="50"></textarea>
                     </div>
                     <div class="field-pair no-field-pair-bg">
-                        <button class="btn btn-default addNewServer" disabled><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
+                        <button class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
                         <button class="btn btn-default testServer" type="button"><span class="glyphicon glyphicon-sort"></span> $T('button-testServer')</button>
                     </div>
                     <div class="field-pair result-box">
@@ -243,6 +248,11 @@
                             <input type="checkbox" name="optional" id="optional$cur" value="1" <!--#if int($server['optional']) != 0 then 'checked="checked"' else ""#--> />
                             <span class="desc">$T('explain-optional')</span>
                         </div>
+                        <div class="field-pair advanced-settings">
+                            <label class="config" for="send_group$cur">$T('srv-send_group')</label>
+                            <input type="checkbox" name="send_group" id="send_group$cur" value="1" <!--#if int($server['send_group']) != 0 then 'checked="checked"' else ""#--> />
+                            <span class="desc">$T('srv-explain-send_group')</span>
+                        </div>
                         <div class="field-pair advanced-settings">
                             <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']" />
@@ -554,19 +564,9 @@
                 if(data.value.result) {
                     resultBox.addClass('alert-success')
                     resultBox.prepend('<span class="glyphicon glyphicon-ok-sign"></span> ')
-
-                    // Allow adding the new server if we are in the new-server section
-                    if(theButton.parents("form[action='addServer']").length) {
-                        jQuery(".addNewServer").removeAttr("disabled")
-                    }
                 } else {
                     resultBox.addClass('alert-danger')
                     resultBox.prepend('<span class="glyphicon glyphicon-exclamation-sign"></span> ')
-
-                    // Disable the adding of new server, just to be sure
-                    if(theButton.parents("form[action='addServer']").length) {
-                        jQuery(".addNewServer").attr("disabled", "disabled")
-                    }
                 }
             });
         });

interfaces/Config/templates/config_switches.tmpl

@@ -93,7 +93,7 @@
                             <option value="0" <!--#if int($no_dupes) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
                             <option value="4" <!--#if int($no_dupes) == 4 then 'selected="selected"' else ""#--> >$T('nodupes-tag')</option>
                             <option value="2" <!--#if int($no_dupes) == 2 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
-                            <option value="3" <!--#if int($no_dupes) == 3 then 'selected="selected"' else ""#--> >$T('fail-to-history')</option>
+                            <option value="3" <!--#if int($no_dupes) == 3 then 'selected="selected"' else ""#--> >$T('nodupes-fail')</option>
                             <option value="1" <!--#if int($no_dupes) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-ignore')</option>
                         </select>
                         <span class="desc">
@@ -107,7 +107,7 @@
                             <option value="0" <!--#if int($no_smart_dupes) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
                             <option value="4" <!--#if int($no_smart_dupes) == 4 then 'selected="selected"' else ""#--> >$T('nodupes-tag')</option>
                             <option value="2" <!--#if int($no_smart_dupes) == 2 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
-                            <option value="3" <!--#if int($no_smart_dupes) == 3 then 'selected="selected"' else ""#--> >$T('fail-to-history')</option>
+                            <option value="3" <!--#if int($no_smart_dupes) == 3 then 'selected="selected"' else ""#--> >$T('nodupes-fail')</option>
                             <option value="1" <!--#if int($no_smart_dupes) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-ignore')</option>
                         </select>
                         <span class="desc">
@@ -125,7 +125,7 @@
                         <select name="pause_on_pwrar" id="pause_on_pwrar">
                             <option value="0" <!--#if int($pause_on_pwrar) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
                             <option value="1" <!--#if int($pause_on_pwrar) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
-                            <option value="2" <!--#if int($pause_on_pwrar) == 2 then 'selected="selected"' else ""#--> >$T('fail-to-history')</option>
+                            <option value="2" <!--#if int($pause_on_pwrar) == 2 then 'selected="selected"' else ""#--> >$T('abort')</option>
                         </select>
                         <span class="desc">$T('explain-pause_on_pwrar')</span>
                     </div>
@@ -143,7 +143,7 @@
                         <select name="action_on_unwanted_extensions" id="action_on_unwanted_extensions">
                             <option value="0" <!--#if int($action_on_unwanted_extensions) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
                             <option value="1" <!--#if int($action_on_unwanted_extensions) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
-                            <option value="2" <!--#if int($action_on_unwanted_extensions) == 2 then 'selected="selected"' else ""#--> >$T('fail-to-history')</option>
+                            <option value="2" <!--#if int($action_on_unwanted_extensions) == 2 then 'selected="selected"' else ""#--> >$T('abort')</option>
                         </select>
                         <span class="desc">$T('explain-action_on_unwanted_extensions')</span>
                     </div>
@@ -259,17 +259,16 @@
                         <span class="desc">$T('explain-cleanup_list')</span>
                     </div>
                     <div class="field-pair">
-                        <label class="config" for="history_retention_option">$T('opt-history_retention')</label>
-                        <select name="history_retention_option" id="history_retention_option">
-                            <option value="all" <!--#if $auto_sort == "all" then 'selected="selected"' else ""#-->>$T('history_retention-all')</option>
-                            <option value="number-archive" <!--#if $history_retention_option == "number-archive" then 'selected="selected"' else ""#-->>$T('history_retention-number-archive')</option>
-                            <option value="number-delete" <!--#if $history_retention_option == "number-delete" then 'selected="selected"' else ""#-->>$T('history_retention-number-delete')</option>
-                            <option value="days-archive" <!--#if $history_retention_option == "days-archive" then 'selected="selected"' else ""#-->>$T('history_retention-days-archive')</option>
-                            <option value="days-delete" <!--#if $history_retention_option == "days-delete" then 'selected="selected"' else ""#-->>$T('history_retention-days-delete')</option>
-                            <option value="all-archive" <!--#if $history_retention_option == "all-archive" then 'selected="selected"' else ""#-->>$T('history_retention-archive')</option>
-                            <option value="all-delete" <!--#if $history_retention_option == "all-delete" then 'selected="selected"' else ""#-->>$T('history_retention-none')</option>
+                        <label class="config" for="history_retention_select">$T('opt-history_retention')</label>
+                        <input type="hidden" name="history_retention" id="history_retention" value="$history_retention">
+                        <select name="history_retention_select" id="history_retention_select">
+                            <option value="0">$T('history_retention-all')</option>
+                            <option value="n">$T('history_retention-number')</option>
+                            <option value="d">$T('history_retention-days')</option>
+                            <option value="-1">$T('history_retention-none')</option>
                         </select>
-                        <input type="number" id="history_retention_number" name="history_retention_number" min="1" value="$history_retention_number">
+                        <input type="number" id="history_retention_number" name="history_retention_number" min="1">
+                        <span class="desc">$T('explain-history_retention').replace('. ', '.<br/>')</span>
                     </div>
                     <div class="field-pair">
                         <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
@@ -360,24 +359,52 @@
 
 <script type="text/javascript">
 jQuery(document).ready(function() {
-    jQuery('#history_retention_option').on('change', updateHistoryRetention)
+    jQuery('#history_retention_select, #history_retention_number').on('change', updateHistoryRetention)
     function updateHistoryRetention() {
-        var retention_option = jQuery('#history_retention_option').val()
+        var retention_setting = jQuery('#history_retention')
+        var retention_select = jQuery('#history_retention_select').val()
         var retention_number = jQuery('#history_retention_number')
-
-        if(retention_option === "number-archive" || retention_option === "number-delete") {
-            retention_number.show()
-            retention_number.attr('placeholder', '$T('history_retention-limit')')
-        } else if(retention_option === "days-archive" || retention_option === "days-delete") {
-            retention_number.show()
-            retention_number.attr('placeholder', '$T('days').capitalize()')
-        } else {
+        // Keep all or keep none
+        if(retention_select === "0" || retention_select === "-1") {
             retention_number.hide()
             retention_number.val('')
             retention_number.attr('placeholder', '')
+            retention_setting.val(retention_select)
+        } else {
+            retention_number.show()
+            // Days or number?
+            if(retention_select.indexOf("d") !== -1) {
+                retention_number.attr('placeholder', '$T('days').capitalize()')
+                if(retention_number.val()) {
+                    retention_setting.val(retention_number.val() + 'd')
+                } else if(parseInt(retention_setting.val()) > 0) {
+                    retention_number.val(parseInt(retention_setting.val()))
+                }
+            } else {
+                retention_number.attr('placeholder', '$T('history_retention-limit')')
+                if(retention_number.val()) {
+                    retention_setting.val(retention_number.val())
+                } else if(parseInt(retention_setting.val()) > 0) {
+                    retention_number.val(parseInt(retention_setting.val()))
+                }
+            }
         }
     }
-    updateHistoryRetention()
+    // Set the history-retention settig
+    var retention_setting_value = jQuery('#history_retention').val()
+    if(parseInt(retention_setting_value) > 0) {
+        // Days or number?
+        if(retention_setting_value.indexOf("d") !== -1) {
+            jQuery('#history_retention_select').val("d")
+        } else {
+            jQuery('#history_retention_select').val("n")
+        }
+        jQuery('#history_retention_number').val(parseInt(retention_setting_value))
+    } else {
+        // Keep all or keep none
+        jQuery('#history_retention_select').val(retention_setting_value)
+        jQuery('#history_retention_number').hide()
+    }
 
     jQuery('.restoreDefaults').click(function(e) {
         // Get section name

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

@@ -288,9 +288,18 @@ col2 h3 a,
     fill: #555555;
 }
 
-::placeholder {
+/* Placeholders - Will not work if grouped! */
+::-webkit-input-placeholder {
+    color: #EBEBEB !important;
+}
+
+::-moz-placeholder {
+    color: #EBEBEB !important;
+    opacity: 1 !important;
+}
+
+:-ms-input-placeholder {
     color: #EBEBEB !important;
-    opacity: 0.5;
 }
 
 .tooltip-inner {

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

@@ -60,7 +60,6 @@
         // Initialize
         this.element = $(element);
         this.initialDir = null;
-        this.showFiles = false;
         this.currentBrowserPath = null;
         this.currentRequest = null;
         this.fileBrowserDialog = $('#filebrowser_modal .modal-body');
@@ -100,11 +99,6 @@
             this.initialDir = this.element.data('initialdir') + folderSeperator + this.element.val();
         }
 
-        // Are we selecting files or folders
-        if(this.element.data('files')) {
-            this.showFiles = true
-        }
-
         // Browse
         this.browse(this.initialDir , folderBrowseUrl);
 
@@ -150,20 +144,12 @@
         // Still loading
         if (this.currentRequest) this.currentRequest.abort();
 
-        // Show hidden folders
-        var params = { name: path}
-        if($('#show_hidden_folders').is(':checked')) {
-            params['show_hidden_folders'] = "1"
-        }
-
-        // Show files?
-        if(this.showFiles) {
-            params['show_files'] = "1"
-        }
+        // Show hidden folders on Linux?
+        var extraHidden = $('#show_hidden_folders').is(':checked') ? '&show_hidden_folders=1' : '';
 
         // Get current folders
         this.currentBrowserPath = path;
-        this.currentRequest = $.getJSON(endpoint, params, function (data) {
+        this.currentRequest = $.getJSON(endpoint + extraHidden, { name: path }, function (data) {
             // Clean
             self.fileBrowserDialog.empty();
 
@@ -177,21 +163,11 @@
                 }
                 // Regular link
                 link = $('<a class="list-group-item" href="javascript:void(0)" />').click(function () {
-                    // Are we looking for files and did we select a file?
-                    if(self.showFiles && !entry.dir) {
-                        // Trigger selection
-                        self.currentBrowserPath = entry.path
-                        $('#filebrowser_modal_accept').click()
-                    } else {
-                        self.browse(entry.path, endpoint);
-                    }
-                }).text(entry.name);
-
+                    self.browse(entry.path, endpoint); }
+                ).text(entry.name);
                 // Back image
                 if(entry.name === '..') {
                     $('<span class="glyphicon glyphicon-arrow-left"></span> ').prependTo(link);
-                } else if(!entry.dir) {
-                    $('<span class="glyphicon glyphicon-file"></span> ').prependTo(link);
                 } else {
                     $('<span class="glyphicon glyphicon-folder-open"></span> ').prependTo(link);
                 }
@@ -331,7 +307,7 @@ function do_restart() {
     });
 }
 
-// Remove obfuscation
+// Remove obfusication
 function removeObfuscation() {
     $('input[data-hide]').each(function(index, objInput) {
         $(objInput).attr('name', $(objInput).data('hide'))
@@ -347,36 +323,6 @@ function addRowColor() {
     })
 }
 
-// Set default functions for the autocomplete everywhere
-jQuery.extend(jQuery.fn.typeahead.defaults, {
-    source: function (query, process) {
-        // If there's no separator, it must be a relative path
-        if(query.split(folderSeperator).length < 2 && this.$element.data('initialdir')) {
-            query  = this.$element.data('initialdir') + folderSeperator + query;
-        }
-        var params = { compact: "1", name: query }
-        if($('#show_hidden_folders').is(':checked')) {
-            params['show_hidden_folders'] = "1"
-        }
-        if(this.$element.data('files')) {
-            params['show_files'] = "1"
-        }
-        // Get info from the API
-        return jQuery.get(folderBrowseUrl, params, function (data) {
-            return process(data["paths"]);
-        });
-    },
-    updater: function(item) {
-        // Is it a relative path?
-        if(item.indexOf(this.$element.data('initialdir')) === 0) {
-            // Remove start
-            return item.replace(this.$element.data('initialdir') + folderSeperator, '');
-        }
-        // Full path
-        return item
-    }
-})
-
 $(document).ready(function () {
     /**
         Restart function

interfaces/Glitter/templates/include_history.tmpl

@@ -1,7 +1,7 @@
-<div class="history" id="history-tab">
+<div class="history" id="history-tab" data-bind="visible: hasHistory() || displayTabbed()" style="display: none">
     <div class="history-header">
-        <h2>$T('menu-history') <small data-bind="visible: history.showArchive()">($T('archive'))</small></h2>
-        <a href="#" data-bind="click: history.showMultiEdit, visible: hasHistory()">
+        <h2>$T('menu-history')</h2>
+        <a href="#" data-bind="click: history.showMultiEdit">
             <span class="glyphicon glyphicon-tasks" data-tooltip="true" data-placement="left" title="$T('Glitter-multiOperations')"></span>
         </a>
     </div>
@@ -18,16 +18,7 @@
                 <th style="width: 60px;"></th>
             </tr>
         </thead>
-        <!-- ko if: !hasHistory() -->
-        <tbody class="no-downloads">
-            <tr>
-                <td colspan="6" data-bind="attr: { 'colspan': 5 + extraHistoryColumns().length }">
-                    <span>$T('empty')</span>
-                </td>
-            </tr>
-        </tbody>
-        <!-- /ko -->
-        <tbody data-bind="foreach: history.historyItems, visible: hasHistory()" style="display: none;">
+        <tbody data-bind="foreach: history.historyItems">
             <tr class="history-item" data-bind="css: {'history-failed-download':failed()}">
                 <td>
                     <div data-bind="visible: processingWaiting()">
@@ -117,7 +108,7 @@
                         </div>
                         <!-- /ko -->
                     </div>
-                    <a href="#" data-bind="click: parent.triggerRemoveDownload">
+                    <a href="#" data-bind="click: deleteSlot">
                         <span class="hover-button glyphicon glyphicon-trash" data-bind="css: { 'glyphicon-stop' : processingDownload() == 2, disabled : processingDownload() == 1 }, attr: { title: processingDownload() == 2 ? '$T('abort')' : '$T('nzo-delete')' }"></span>
                     </a>
                 </td>
@@ -139,21 +130,20 @@
     </ul>
 
     <div class="multioperations-selector" id="history-options">
-        <a href="#" class="hover-button history-archive" title="$T('showArchive') / $T('showAllHis')" data-tooltip="true" data-placement="top" data-bind="click: history.toggleShowArchive, css: { 'history-options-show-failed': history.showArchive }"><svg viewBox="6 6 36 36" height="14" width="14" class="archive-icon"><path d="M41.09 10.45l-2.77-3.36c-.56-.66-1.39-1.09-2.32-1.09h-24c-.93 0-1.76.43-2.31 1.09l-2.77 3.36c-.58.7-.92 1.58-.92 2.55v25c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4v-25c0-.97-.34-1.85-.91-2.55zm-17.09 24.55l-11-11h7v-4h8v4h7l-11 11zm-13.75-25l1.63-2h24l1.87 2h-27.5z"/></svg></a>
-        <a href="#" class="hover-button" title="$T('showFailedHis') / $T('showAllHis')" data-tooltip="true" data-placement="top" data-bind="click: history.toggleShowFailed, css: { 'history-options-show-failed': history.showFailed }"><span class="glyphicon glyphicon-exclamation-sign"></span></a>
-        <a href="#" class="hover-button" title="$T('link-retryAll')" data-tooltip="true" data-placement="top" data-bind="click: history.retryAllFailed"><span class="glyphicon glyphicon-repeat"></span></a>
+        <a href="#" class="hover-button" title="$T('link-retryAll')" data-tooltip="true" data-placement="left" data-bind="click: history.retryAllFailed"><span class="glyphicon glyphicon-repeat"></span></a>
+        <a href="#" class="hover-button" title="$T('showAllHis') / $T('showFailedHis')" data-tooltip="true" data-placement="left" data-bind="click: history.toggleShowFailed, css: { 'history-options-show-failed': history.showFailed }"><span class="glyphicon glyphicon-exclamation-sign"></span></a>
 
-        <div data-bind="visible: (history.isMultiEditing() && hasHistory())">
+        <div data-bind="visible: history.isMultiEditing()">
             <span class="label label-default" data-bind="text: history.multiEditItems().length">0</span>
             <label for="multiedit-checkall-history">
                 <input type="checkbox" name="multieditCheckAll" id="multiedit-checkall-history" title="$T('Glitter-checkAll')" data-bind="click: history.checkAllJobs" data-tooltip="true" data-placement="top" />
             </label>
         </div>
 
-        <a href="#" class="hover-button" title="$T('nzo-delete')" data-bind="visible: (history.isMultiEditing() && hasHistory()), click: history.doMultiDelete"  data-tooltip="true" data-placement="top">
+        <a href="#" class="hover-button" data-bind="visible: history.isMultiEditing(), click: history.doMultiDelete">
             <span class="glyphicon glyphicon-trash"></span>
         </a>
-        <a href="#modal-purge-history" class="hover-button" title="$T('purgeHist')" data-bind="visible: !(history.isMultiEditing() && hasHistory())" data-toggle="modal" data-tooltip="true" data-placement="top">
+        <a href="#modal-purge-history" class="hover-button" title="$T('purgeHist')" data-bind="visible: !history.isMultiEditing()" data-toggle="modal" data-tooltip="true" data-placement="left">
             <span class="glyphicon glyphicon-trash"></span>
         </a>
     </div>
@@ -165,3 +155,9 @@
         <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_overlays.tmpl

@@ -635,59 +635,6 @@
     </div>
 </div>
 
-<div id="modal-delete-queue-job" class="modal modal-delete-job fade" tabindex="-1">
-    <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 row-wrap-text">$T('removeNZB-Files')</h4>
-            </div>
-            <form data-bind="submit: queue.removeDownloads">
-                <div class="modal-body">
-                    $T('confirm-delete')
-
-                    <ul data-bind="foreach: queue.deleteItems">
-                        <li data-bind="text: name"></li>
-                    </ul>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">$T('cancel')</button>
-                    <button type="submit" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> $T('nzo-delete')</button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
-
-<div id="modal-delete-history-job" class="modal modal-delete-job fade" tabindex="-1">
-    <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 row-wrap-text">$T('nzo-delete')</h4>
-            </div>
-            <form data-bind="submit: history.removeDownloads">
-                <div class="modal-body">
-                    $T('confirm-delete')
-
-                    <ul data-bind="foreach: history.deleteItems">
-                        <li data-bind="text: historyStatus.name"></li>
-                    </ul>
-                </div>
-                <div class="modal-footer">
-                     <div class="checkbox">
-                        <label>
-                            <input type="checkbox" data-bind="checked: history.showArchive()"> <span>$T('permanently-delete')</span>
-                        </label>
-                    </div>
-                    <button type="button" class="btn btn-default" data-dismiss="modal">$T('cancel')</button>
-                    <button type="submit" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> $T('nzo-delete')</button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
-
 <div id="modal-retry-job" class="modal modal-small fade" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content">
@@ -793,18 +740,11 @@
                 <button type="button" class="btn btn-danger" data-bind="click: history.emptyHistory" data-action="history-purge-completed"><span class="glyphicon glyphicon-floppy-saved"></span> $T('purgeCompl')</button><hr />
                 <button type="button" class="btn btn-danger" data-bind="click: history.emptyHistory" data-action="history-purge-page"><span class="glyphicon glyphicon-check"></span> $T('purgePage') <span class="label label-default" data-bind="text: history.historyItems().length"></span></button>
             </div>
-            <div class="modal-footer">
-                <div class="checkbox">
-                    <label>
-                        <input type="checkbox" data-bind="checked: history.showArchive()"> <span>$T('permanently-delete')</span>
-                    </label>
-                </div>
-            </div>
         </div>
     </div>
 </div>
 
-<div id="modal-custom-pause" class="modal modal-small fade" tabindex="-1">
+<div id="modal_custom_pause" class="modal modal-small fade" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">

interfaces/Glitter/templates/include_queue.tmpl

@@ -163,7 +163,7 @@
                         <!-- /ko -->
                     </div>
                     <!-- /ko -->
-                    <a href="#" class="hover-button" title="$T('removeNZB-Files')" data-bind="click: parent.triggerRemoveDownload"><span class="glyphicon glyphicon-trash"></span></a>
+                    <a href="#" class="hover-button" title="$T('removeNZB-Files')" data-bind="click: removeDownload"><span class="glyphicon glyphicon-trash"></span></a>
                 </td>
             </tr>
         </tbody>
@@ -174,7 +174,7 @@
             <label for="multiedit-checkall-queue">
                 <input type="checkbox" name="multieditCheckAll" id="multiedit-checkall-queue" title="$T('Glitter-checkAll')" data-bind="click: queue.checkAllJobs" data-tooltip="true" data-placement="top" />
             </label>
-            <a href="#" class="hover-button" title="$T('removeNZB-Files')" data-bind="click: queue.doMultiDelete" data-tooltip="true" data-placement="top">
+            <a href="#" class="hover-button" data-bind="click: queue.doMultiDelete">
                 <span class="glyphicon glyphicon-trash"></span>
             </a>
         </div>

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

@@ -9,12 +9,10 @@ function HistoryListModel(parent) {
     self.lastUpdate = 0;
     self.historyItems = ko.observableArray([])
     self.showFailed = ko.observable(false).extend({ persist: 'historyShowFailed' });
-    self.showArchive = ko.observable(false).extend({ persist: 'historyShowArchive' });
     self.isLoading = ko.observable(false).extend({ rateLimit: 100 });
     self.searchTerm = ko.observable('').extend({ rateLimit: { timeout: 400, method: "notifyWhenChangesStop" } });
     self.paginationLimit = ko.observable(10).extend({ persist: 'historyPaginationLimit' });
     self.totalItems = ko.observable(0);
-    self.deleteItems = ko.observableArray([]);
     self.ppItems = ko.observable(0);
     self.pagination = new paginationModel(self);
     self.isMultiEditing = ko.observable(false).extend({ persist: 'historyIsMultiEditing' });
@@ -120,27 +118,6 @@ function HistoryListModel(parent) {
         self.parent.refresh(true)
     });
 
-    self.triggerRemoveDownload = function(items) {
-        // Show and fill modal
-        self.deleteItems.removeAll()
-
-        // Single or multiple items?
-        if(items.length) {
-            ko.utils.arrayPushAll(self.deleteItems, items)
-        } else {
-            self.deleteItems.push(items)
-        }
-
-        // Show modal or delete right away
-        if(self.parent.confirmDeleteHistory()) {
-            // Open modal if desired
-            $('#modal-delete-history-job').modal("show")
-        } else {
-            // Otherwise just submit right away
-            $('#modal-delete-history-job form').submit()
-        }
-    }
-
     // Retry a job
     self.retryJob = function(form) {
         // Adding a extra retry file happens through this special function
@@ -199,17 +176,10 @@ function HistoryListModel(parent) {
 
     // Toggle showing failed
     self.toggleShowFailed = function(data, event) {
+        // Set the loader so it doesn't flicker and then switch
+        self.isLoading(true)
         self.showFailed(!self.showFailed())
-        // Force hide tooltip so it doesn't linger
-        $('#history-options a').tooltip('hide')
-        // Force refresh
-        self.parent.refresh(true)
-    }
-
-    // Toggle showing archive
-    self.toggleShowArchive = function(data, event) {
-        self.showArchive(!self.showArchive())
-        // Force hide tooltip so it doesn't linger
+        // Forde hide tooltip so it doesn't linger
         $('#history-options a').tooltip('hide')
         // Force refresh
         self.parent.refresh(true)
@@ -231,9 +201,11 @@ function HistoryListModel(parent) {
 
     // Empty history options
     self.emptyHistory = function(data, event) {
+        // Make sure no flickering
+        self.isLoading(true)
+
         // What event?
         var whatToRemove = $(event.target).data('action');
-        var skipArchive = $('#modal-purge-history input[type="checkbox"]').prop("checked")
         var del_files, value;
 
         // Purge failed
@@ -266,7 +238,6 @@ function HistoryListModel(parent) {
                 mode: 'history',
                 name: 'delete',
                 del_files: 1,
-                archive: (!skipArchive) * 1,
                 value: strIDs
             }).then(function() {
                 // Clear search, refresh and hide
@@ -281,9 +252,8 @@ function HistoryListModel(parent) {
         callAPI({
             mode: 'history',
             name: 'delete',
-            del_files: del_files,
-            archive: (!skipArchive) * 1,
-            value: value
+            value: value,
+            del_files: del_files
         }).then(function() {
             self.parent.refresh();
             $("#modal-purge-history").modal('hide');
@@ -358,67 +328,42 @@ function HistoryListModel(parent) {
         return true;
     }
 
-    // Remove downloads from history
-    self.removeDownloads = function(form) {
-        // Hide modal and show notification
-        $('#modal-delete-history-job').modal("hide")
-        showNotification('.main-notification-box-removing')
-
-        var strIDsPP = '';
-        var strIDsHistory = '';
-        $.each(self.deleteItems(), function(index) {
-            // Split in jobs that need post-processing aborted, and jobs that need to be deleted
-            if(this.processingDownload() === 2) {
-                strIDsPP = strIDsPP + this.id + ',';
-                // These items should not be listed in the deletedItems later on
-                // as active post-processing aren't removed from the history output
-                self.deleteItems.remove(this)
-            } else {
-                strIDsHistory = strIDsHistory + this.id + ',';
-            }
-        })
-
-        // Trigger post-processing aborting
-        if(strIDsPP !== "") {
-            callAPI({
-                mode: 'cancel_pp',
-                value: strIDsPP
-            }).then(function(response) {
-                // Only hide and refresh
-                self.parent.refresh();
-                hideNotification()
-            });
-        }
-        if(strIDsHistory !== "") {
-            var skipArchive = $('#modal-delete-history-job input[type="checkbox"]').prop("checked")
-            callAPI({
-                mode: 'history',
-                name: 'delete',
-                del_files: 1,
-                archive: (!skipArchive) * 1,
-                value: strIDsHistory
-            }).then(function(response) {
-                self.historyItems.removeAll(self.deleteItems());
-                self.multiEditItems.removeAll(self.deleteItems())
-                self.parent.refresh();
-                hideNotification()
-            });
-        }
-    };
-
     // Delete all selected
     self.doMultiDelete = function() {
         // Anything selected?
         if(self.multiEditItems().length < 1) return;
 
-        // Trigger modal
-        self.triggerRemoveDownload(self.multiEditItems())
-    }
+        // Need confirm
+        if(!self.parent.confirmDeleteHistory() || confirm(glitterTranslate.removeDown)) {
+            // List all the ID's
+            var strIDs = '';
+            $.each(self.multiEditItems(), function(index) {
+                strIDs = strIDs + this.id + ',';
+            })
 
-    // Focus on the confirm button
-    $('#modal-delete-history-job').on("shown.bs.modal", function() {
-        $('#modal-delete-history-job .btn[type="submit"]').focus()
-    })
+            // Show notification
+            showNotification('.main-notification-box-removing-multiple', 0, self.multiEditItems().length)
+
+            // Remove
+            callAPI({
+                mode: 'history',
+                name: 'delete',
+                del_files: 1,
+                value: strIDs
+            }).then(function(response) {
+                if(response.status) {
+                    // Make sure the queue doesnt flicker and then fade-out
+                    // Make sure no flickering (if there are more items left) and then remove
+                    self.isLoading(self.totalItems() > 1)
+                    self.parent.refresh();
+                    // Empty it
+                    self.multiEditItems.removeAll();
+                    // Hide notification
+                    hideNotification()
+                }
+            })
+        }
+    }
 
     // On change of page we need to check all those that were in the list!
     self.historyItems.subscribe(function() {
@@ -597,4 +542,36 @@ function HistoryModel(parent, data) {
             return false;
         })
     }
+
+    // Delete button
+    self.deleteSlot = function(item, event) {
+        // Confirm?
+        if(!self.parent.parent.confirmDeleteHistory() || confirm(glitterTranslate.deleteMsg + ":\n" + item.historyStatus.name() + "\n\n" + glitterTranslate.removeDow1)) {
+            // Are we still processing and it can be stopped?
+            if(item.processingDownload() === 2) {
+                callAPI({
+                    mode: 'cancel_pp',
+                    value: self.id
+                })
+                // All we can do is wait
+            } else {
+                // Delete the item
+                callAPI({
+                    mode: 'history',
+                    name: 'delete',
+                    del_files: 1,
+                    value: self.id
+                }).then(function(response) {
+                    if(response.status) {
+                        // Make sure no flickering (if there are more items left) and then remove
+                        self.parent.isLoading(self.parent.totalItems() > 1)
+                        self.parent.historyItems.remove(self);
+                        self.parent.multiEditItems.remove(function(inList) { return inList.id === self.id; })
+                        self.parent.parent.refresh();
+                    }
+                });
+            }
+
+        }
+    };
 }

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

@@ -120,7 +120,8 @@ function ViewModel() {
 
     // Dynamic history length check
     self.hasHistory = ko.pureComputed(function() {
-        return (self.history.historyItems().length > 0 || self.history.searchTerm() || self.history.isLoading())
+        // We also 'have history' if we can't find any results of the search or there are no failed ones
+        return (self.history.historyItems().length > 0 || self.history.searchTerm() || self.history.showFailed() || self.history.isLoading())
     })
 
     self.hasWarnings = ko.pureComputed(function() {
@@ -363,7 +364,6 @@ function ViewModel() {
             failed_only: self.history.showFailed() * 1,
             start: self.history.pagination.currentStart(),
             limit: parseInt(self.history.paginationLimit()),
-            archive: self.history.showArchive() * 1,
             last_history_update: self.history.lastUpdate
         }
         if (self.history.searchTerm()) {
@@ -431,16 +431,18 @@ function ViewModel() {
             return;
         }
         // Show modal
-        $('#modal-custom-pause').modal('show')
-    }
+        $('#modal_custom_pause').modal('show')
+
+        // Focus on the input field
+        $('#modal_custom_pause').on('shown.bs.modal', function() {
+            $('#customPauseInput').focus()
+        })
 
-    $('#modal-custom-pause').on('shown.bs.modal', function() {
-        // Focus on the input field when opening the modal
-        $('#customPauseInput').focus()
-    }).on('hide.bs.modal', function() {
         // Reset on modal close
-        self.pauseCustom('');
-    })
+        $('#modal_custom_pause').on('hide.bs.modal', function() {
+            self.pauseCustom('');
+        })
+    }
 
     // Update on changes
     self.pauseCustom.subscribe(function(newValue) {
@@ -453,7 +455,7 @@ function ViewModel() {
         // At least 3 charaters
         if (newValue.length < 3) {
             $('#customPauseOutput').text('').data('time', 0)
-            $('#modal-custom-pause .btn-default').addClass('disabled')
+            $('#modal_custom_pause .btn-default').addClass('disabled')
             return;
         }
 
@@ -478,11 +480,11 @@ function ViewModel() {
             var pauseDuration = Math.round((pauseParsed - Date.parse('now')) / 1000 / 60);
             $('#customPauseOutput').html('<span class="glyphicon glyphicon-pause"></span> ' + glitterTranslate.pauseFor + ' ' + pauseDuration + ' ' + glitterTranslate.minutes)
             $('#customPauseOutput').data('time', pauseDuration)
-            $('#modal-custom-pause .btn-default').removeClass('disabled')
+            $('#modal_custom_pause .btn-default').removeClass('disabled')
         } else if (newValue) {
             // No..
             $('#customPauseOutput').text(glitterTranslate.pausePromptFail)
-            $('#modal-custom-pause .btn-default').addClass('disabled')
+            $('#modal_custom_pause .btn-default').addClass('disabled')
         }
     })
 
@@ -501,7 +503,7 @@ function ViewModel() {
                 // Refresh and close the modal
                 self.refresh()
                 self.downloadsPaused(true);
-                $('#modal-custom-pause').modal('hide')
+                $('#modal_custom_pause').modal('hide')
             });
         }
     }

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

@@ -32,7 +32,6 @@ function QueueListModel(parent) {
     // External var's
     self.queueItems = ko.observableArray([]);
     self.totalItems = ko.observable(0);
-    self.deleteItems = ko.observableArray([]);
     self.isMultiEditing = ko.observable(false).extend({ persist: 'queueIsMultiEditing' });
     self.isLoading = ko.observable(false).extend({ rateLimit: 100 });
     self.multiEditItems = ko.observableArray([]);
@@ -148,27 +147,6 @@ function QueueListModel(parent) {
 
     }
 
-    self.triggerRemoveDownload = function(items) {
-        // Show and fill modal
-        self.deleteItems.removeAll()
-
-        // Single or multiple items?
-        if(items.length) {
-            ko.utils.arrayPushAll(self.deleteItems, items)
-        } else {
-            self.deleteItems.push(items)
-        }
-
-        // Show modal or delete right away
-        if(self.parent.confirmDeleteQueue()) {
-            // Open modal if desired
-            $('#modal-delete-queue-job').modal("show")
-        } else {
-            // Otherwise just submit right away
-            $('#modal-delete-queue-job form').submit()
-        }
-    }
-
     // Save pagination state
     self.paginationLimit.subscribe(function(newValue) {
         // Save in config if global
@@ -423,43 +401,41 @@ function QueueListModel(parent) {
 
     }
 
-    // Remove downloads from queue
-    self.removeDownloads = function(form) {
-        // Hide modal and show notification
-        $('#modal-delete-queue-job').modal("hide")
-        showNotification('.main-notification-box-removing')
-
-        var strIDs = '';
-        $.each(self.deleteItems(), function(index) {
-            strIDs = strIDs + this.id + ',';
-        })
-
-        callAPI({
-            mode: 'queue',
-            name: 'delete',
-            del_files: 1,
-            value: strIDs
-        }).then(function(response) {
-            self.queueItems.removeAll(self.deleteItems());
-            self.multiEditItems.removeAll(self.deleteItems())
-            self.parent.refresh();
-            hideNotification()
-        });
-    };
-
     // Delete all selected
     self.doMultiDelete = function() {
         // Anything selected?
         if(self.multiEditItems().length < 1) return;
 
-        // Trigger modal
-        self.triggerRemoveDownload(self.multiEditItems())
-    }
+        // Need confirm
+        if(!self.parent.confirmDeleteQueue() || confirm(glitterTranslate.removeDown)) {
+            // List all the ID's
+            var strIDs = '';
+            $.each(self.multiEditItems(), function(index) {
+                strIDs = strIDs + this.id + ',';
+            })
 
-    // Focus on the confirm button
-    $('#modal-delete-queue-job').on("shown.bs.modal", function() {
-        $('#modal-delete-queue-job .btn[type="submit"]').focus()
-    })
+            // Show notification
+            showNotification('.main-notification-box-removing-multiple', 0, self.multiEditItems().length)
+
+            // Remove
+            callAPI({
+                mode: 'queue',
+                name: 'delete',
+                del_files: 1,
+                value: strIDs
+            }).then(function(response) {
+                if(response.status) {
+                    // Make sure the queue doesnt flicker and then fade-out
+                    self.isLoading(true)
+                    self.parent.refresh()
+                    // Empty it
+                    self.multiEditItems.removeAll();
+                    // Hide notification
+                    hideNotification()
+                }
+            })
+        }
+    }
 
     // On change of page we need to check all those that were in the list!
     self.queueItems.subscribe(function() {
@@ -735,5 +711,29 @@ function QueueModel(parent, data) {
         })
     }
 
+    // Remove 1 download from queue
+    self.removeDownload = function(item, event) {
+        // Confirm and remove
+        if(!self.parent.parent.confirmDeleteQueue() || confirm(glitterTranslate.deleteMsg + ":\n" + item.name() + "\n\n" + glitterTranslate.removeDow1)) {
+            var itemToDelete = this;
 
+            // Show notification
+            showNotification('.main-notification-box-removing')
+
+            callAPI({
+                mode: 'queue',
+                name: 'delete',
+                del_files: 1,
+                value: item.id
+            }).then(function(response) {
+                // 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()
+            });
+        }
+    };
 }

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

@@ -206,8 +206,7 @@ tbody .caret {
 .info-container,
 #modal-options .options-status-box small,
 #modal-options #options-status small,
-#modal-options .tab-content h4,
-h2 small {
+#modal-options .tab-content h4 {
     color: #D6D6D6;
 }
 
@@ -273,11 +272,16 @@ button:focus {
     outline: initial;
 }
 
-.archive-icon {
-    fill: #EBEBEB;
+/* Placeholders - Will not work if grouped! */
+::-webkit-input-placeholder {
+   color: #EBEBEB !important;
 }
 
-::placeholder {
-    color: #EBEBEB !important;
-    opacity: 0.5 !important;
+::-moz-placeholder {
+   color: #EBEBEB !important;
+   opacity: 1 !important;
+}
+
+:-ms-input-placeholder {
+   color: #EBEBEB !important;
 }

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

@@ -690,10 +690,6 @@ tbody.no-downloads tr td {
     border-bottom: 1px solid #F0F0F0 !important;
 }
 
-tbody.no-downloads tr td>span {
-    opacity: 0.7;
-}
-
 tbody.no-downloads tr td a {
     line-height: 2em;
     font-size: 1.5em;
@@ -1107,26 +1103,20 @@ tr.queue-item>td:first-child>a {
 }
 
 #history-options .hover-button {
-    padding: 7px;
+    padding: 7px 8px 7px 8px;
     line-height: 1.428571429;
     display: inline-block;
 }
 
-#history-options .hover-button.history-archive {
-    line-height: 1em;
-    vertical-align: middle;
-}
-
 #history-options div {
     display: inline-block;
-    vertical-align: middle;
     margin-left: 5px;
 }
 
 #history-options input[name="multieditCheckAll"] {
     vertical-align: middle;
     position: relative;
-    top: -2px;
+    top: -1px;
     margin-left: 8px;
 } 
 
@@ -1196,10 +1186,6 @@ tr.queue-item>td:first-child>a {
     color:  red !important;
 }
 
-.history-options-show-failed .archive-icon {
-    fill: #2bbd43;
-}
-
 .processing-download {
     width: 16px;
     height: 18px;
@@ -1535,34 +1521,6 @@ input[name="nzbURL"] {
     transition : border 500ms ease-out;
 }
 
-/* DELETE MODAL */
-.modal-delete-job ul {
-    margin-top: 10px;
-}
-
-.modal-delete-job li {
-    word-break: break-all;
-}
-
-.modal-delete-job .checkbox {
-    float: left;
-    margin: 8px 5px 0px;
-}
-
-#modal-purge-history .checkbox {
-    margin: 0;
-}
-
-.modal-delete-job .checkbox input,
-#modal-purge-history .checkbox input {
-    margin-top: 3px;
-}
-
-.modal-delete-job .checkbox input+span,
-#modal-purge-history .checkbox input+span {
-    font-weight: bold;
-}
-
 /* HELP MODAL */
 
 #modal-help .modal-body {

linux/org.sabnzbd.sabnzbd.appdata.xml

@@ -30,7 +30,7 @@
   <url type="faq">https://sabnzbd.org/wiki/faq</url>
   <url type="contact">https://sabnzbd.org/live-chat.html</url>
   <releases>
-    <release version="4.2.2" date="2024-02-01" type="stable"/>
+    <release version="4.2.2" date="2024-01-31" type="stable"/>
     <release version="4.2.1" date="2024-01-05" type="stable"/>
     <release version="4.2.0" date="2024-01-03" type="stable"/>
     <release version="4.1.0" date="2023-09-26" type="stable"/>
@@ -51,13 +51,11 @@
     <control>touch</control>
   </supports>
   <recommends>
-    <display_length compare="ge">640</display_length>
+    <display_length compare="ge">small</display_length>
     <internet>always</internet>
   </recommends>
   <project_license>GPL-2.0-or-later</project_license>
-  <developer id="org.sabnzbd">
-    <name>The SABnzbd-Team</name>
-  </developer>
+  <developer_name>The SABnzbd-Team</developer_name>
   <screenshots>
     <screenshot type="default">
       <image>https://sabnzbd.org/images/landing/screenshots/interface.png</image>

osx/7zip/License.txt

@@ -1,144 +1,88 @@
-  7-Zip for Linux and macOS
-  ~~~~~~~~~~~~~~~~~~~~~~~~~
-  License for use and distribution
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  7-Zip Copyright (C) 1999-2024 Igor Pavlov.
-
-  The licenses for 7zz and 7zzs files are:
-
-         - The "GNU LGPL" as main license for most of the code
-         - The "GNU LGPL" with "unRAR license restriction" for some code
-         - The "BSD 3-clause License" for some code
-         - The "BSD 2-clause License" for some code
-
-  Redistributions in binary form must reproduce related license information from this file.
-
-  Note:
-    You can use 7-Zip on any computer, including a computer in a commercial
-    organization. You don't need to register or pay for 7-Zip.
-
-
-GNU LGPL information
---------------------
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You can receive a copy of the GNU Lesser General Public License from
-    http://www.gnu.org/
-
-
-
-
-BSD 3-clause License in 7-Zip code
-----------------------------------
-
-  The "BSD 3-clause License" is used for the following code in 7z.dll
-    1) LZFSE data decompression.
-       That code was derived from the code in the "LZFSE compression library" developed by Apple Inc,
-       that also uses the "BSD 3-clause License".
-    2) ZSTD data decompression.
-       that code was developed using original zstd decoder code as reference code.
-       The original zstd decoder code was developed by Facebook Inc,
-       that also uses the "BSD 3-clause License".
-
-  Copyright (c) 2015-2016, Apple Inc. All rights reserved.
-  Copyright (c) Facebook, Inc. All rights reserved.
-  Copyright (c) 2023-2024 Igor Pavlov.
-
-Text of the "BSD 3-clause License"
-----------------------------------
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may
-   be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-
-
-
-BSD 2-clause License in 7-Zip code
-----------------------------------
-
-  The "BSD 2-clause License" is used for the XXH64 code in 7-Zip.
-
-  XXH64 code in 7-Zip was derived from the original XXH64 code developed by Yann Collet.
-
-  Copyright (c) 2012-2021 Yann Collet.
-  Copyright (c) 2023-2024 Igor Pavlov.
-
-Text of the "BSD 2-clause License"
-----------------------------------
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----
-
-
-
-
-unRAR license restriction
--------------------------
-
-The decompression engine for RAR archives was developed using source
-code of unRAR program.
-All copyrights to original unRAR code are owned by Alexander Roshal.
-
-The license for original unRAR code has the following restriction:
-
-  The unRAR sources cannot be used to re-create the RAR compression algorithm,
-  which is proprietary. Distribution of modified unRAR sources in separate form
-  or as a part of other software is permitted, provided that it is clearly
-  stated in the documentation and source comments that the code may
-  not be used to develop a RAR (WinRAR) compatible archiver.
-
---
+  7-Zip
+  ~~~~~
+  License for use and distribution
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  7-Zip Copyright (C) 1999-2021 Igor Pavlov.
+
+  The licenses for 7zz file are:
+
+         - The "GNU LGPL" as main license for most of the code
+         - The "GNU LGPL" with "unRAR license restriction" for some code
+         - The "BSD 3-clause License" for some code
+
+  Redistributions in binary form must reproduce related license information from this file.
+
+  Note:
+    You can use 7-Zip on any computer, including a computer in a commercial
+    organization. You don't need to register or pay for 7-Zip.
+
+
+  GNU LGPL information
+  --------------------
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You can receive a copy of the GNU Lesser General Public License from
+    http://www.gnu.org/
+
+
+
+
+  BSD 3-clause License
+  --------------------
+
+    The "BSD 3-clause License" is used for the code in 7z.dll that implements LZFSE data decompression.
+    That code was derived from the code in the "LZFSE compression library" developed by Apple Inc,
+    that also uses the "BSD 3-clause License":
+
+    ----
+    Copyright (c) 2015-2016, Apple Inc. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+    1.  Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+    2.  Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer
+        in the documentation and/or other materials provided with the distribution.
+
+    3.  Neither the name of the copyright holder(s) nor the names of any contributors may be used to endorse or promote products derived
+        from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    ----
+
+
+
+
+  unRAR license restriction
+  -------------------------
+
+    The decompression engine for RAR archives was developed using source
+    code of unRAR program.
+    All copyrights to original unRAR code are owned by Alexander Roshal.
+
+    The license for original unRAR code has the following restriction:
+
+      The unRAR sources cannot be used to re-create the RAR compression algorithm,
+      which is proprietary. Distribution of modified unRAR sources in separate form
+      or as a part of other software is permitted, provided that it is clearly
+      stated in the documentation and source comments that the code may
+      not be used to develop a RAR (WinRAR) compatible archiver.
+
+
+  --
+  Igor Pavlov

po/email/SABemail.pot

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC1\n"
+"Project-Id-Version: SABnzbd-4.2.2RC1\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

@@ -3,7 +3,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Language-Team: Czech (https://app.transifex.com/sabnzbd/teams/111101/cs/)\n"
 "MIME-Version: 1.0\n"

po/email/da.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Danish (https://app.transifex.com/sabnzbd/teams/111101/da/)\n"

po/email/de.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: German (https://app.transifex.com/sabnzbd/teams/111101/de/)\n"

po/email/es.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Spanish (https://app.transifex.com/sabnzbd/teams/111101/es/)\n"

po/email/fi.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Finnish (https://app.transifex.com/sabnzbd/teams/111101/fi/)\n"

po/email/fr.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: French (https://app.transifex.com/sabnzbd/teams/111101/fr/)\n"

po/email/he.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: ION, 2020\n"
 "Language-Team: Hebrew (https://app.transifex.com/sabnzbd/teams/111101/he/)\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
 #: email/email.tmpl:1
 msgid ""

po/email/it.po

@@ -3,7 +3,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Language-Team: Italian (https://app.transifex.com/sabnzbd/teams/111101/it/)\n"
 "MIME-Version: 1.0\n"

po/email/nb.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\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://app.transifex.com/sabnzbd/teams/111101/nb/)\n"

po/email/nl.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Dutch (https://app.transifex.com/sabnzbd/teams/111101/nl/)\n"

po/email/pl.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Polish (https://app.transifex.com/sabnzbd/teams/111101/pl/)\n"

po/email/pt_BR.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Portuguese (Brazil) (https://app.transifex.com/sabnzbd/teams/111101/pt_BR/)\n"

po/email/ro.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Romanian (https://app.transifex.com/sabnzbd/teams/111101/ro/)\n"

po/email/ru.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Russian (https://app.transifex.com/sabnzbd/teams/111101/ru/)\n"

po/email/sr.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Serbian (https://app.transifex.com/sabnzbd/teams/111101/sr/)\n"

po/email/sv.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Swedish (https://app.transifex.com/sabnzbd/teams/111101/sv/)\n"

po/email/zh_CN.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Chinese (China) (https://app.transifex.com/sabnzbd/teams/111101/zh_CN/)\n"

po/main/SABnzbd.pot

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC1\n"
+"Project-Id-Version: SABnzbd-4.2.2RC1\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: team@sabnzbd.org\n"
 "Language-Team: SABnzbd <team@sabnzbd.org>\n"
@@ -148,62 +148,6 @@ msgstr ""
 msgid "Test Notification"
 msgstr ""
 
-#: sabnzbd/api.py
-msgid "The hostname is not set."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "There are no connections set. Please set at least one connection."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Password masked in ******, please re-enter"
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Invalid server details"
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Could not connect to %s on port %s. It appears that %s operates as a web server (port 80), possibly an indexer, not a usenet server. You have to fill a usenet server."
-msgstr ""
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Server address \"%s:%s\" is not valid."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Timed out: Try enabling SSL or connecting on a different port."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Timed out"
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Unknown SSL protocol: Try disabling SSL or connecting on a different port."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Server requires username and password."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Connection Successful!"
-msgstr ""
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Authentication failed, check username/password."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Too many connections, please pause downloading or try again later"
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Could not determine connection result (%s)"
-msgstr ""
-
 #: sabnzbd/api.py
 msgid "Resolving address"
 msgstr ""
@@ -468,11 +412,6 @@ msgstr ""
 msgid "Fatal error in Downloader"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "%s@%s: Received unknown status code %s for article %s"
-msgstr ""
-
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
 msgstr ""
@@ -665,6 +604,10 @@ msgstr ""
 msgid "API Key incorrect, Use the api key from Config->General in your 3rd party program:"
 msgstr ""
 
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
+msgid "Authentication failed, check username/password."
+msgstr ""
+
 #. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
@@ -674,6 +617,10 @@ msgstr ""
 msgid "Invalid backup archive"
 msgstr ""
 
+#: sabnzbd/interface.py
+msgid "Server address \"%s:%s\" is not valid."
+msgstr ""
+
 #. Config->RSS, tab header
 #: sabnzbd/interface.py, sabnzbd/skintext.py
 msgid "Feed"
@@ -1011,10 +958,6 @@ msgstr ""
 msgid "Wiki"
 msgstr ""
 
-#: sabnzbd/newswrapper.py
-msgid "Failed to connect: %s %s@%s:%s (%s)"
-msgstr ""
-
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1082,20 +1025,6 @@ msgstr ""
 msgid "Failed to send Prowl message"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "One or more Apprise URLs could not be loaded."
-msgstr ""
-
-#: sabnzbd/notifier.py
-msgid "Failed to send one or more Apprise Notifications"
-msgstr ""
-
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "Failed to send Apprise message"
-msgstr ""
-
 #. Error message
 #: sabnzbd/notifier.py
 msgid "Bad response from Pushover (%s): %s"
@@ -1336,7 +1265,7 @@ msgstr ""
 msgid "Queue First 10 Items"
 msgstr ""
 
-#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+#: sabnzbd/osxmenu.py
 msgid "Empty"
 msgstr ""
 
@@ -2224,11 +2153,6 @@ msgstr ""
 msgid "Delete all items from the queue?"
 msgstr ""
 
-#. Delete confirmation popup
-#: sabnzbd/skintext.py
-msgid "Are you sure you want to remove these jobs?"
-msgstr ""
-
 #. Queue page button
 #: sabnzbd/skintext.py
 msgid "Purge NZBs"
@@ -2249,11 +2173,6 @@ msgstr ""
 msgid "Remove NZB & Delete Files"
 msgstr ""
 
-#. Checkbox if job should be added to Archive
-#: sabnzbd/skintext.py
-msgid "Permanently delete (skip archive)"
-msgstr ""
-
 #. Caption for missing articles in Queue
 #: sabnzbd/skintext.py
 msgid "Missing articles"
@@ -2273,10 +2192,6 @@ msgstr ""
 msgid "Reset Quota now"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Archive"
-msgstr ""
-
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2297,11 +2212,6 @@ msgstr ""
 msgid "Show All"
 msgstr ""
 
-#. Button showing all archived jobs
-#: sabnzbd/skintext.py
-msgid "Show Archive"
-msgstr ""
-
 #. History table header - Size of the download quota
 #: sabnzbd/skintext.py
 msgid "Size"
@@ -2688,32 +2598,24 @@ msgstr ""
 msgid "History Retention"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Automatically delete completed jobs from History. Beware that Duplicate Detection and some external tools rely on History information."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Keep all jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Move jobs to the archive if the history exceeds specified number of jobs"
+msgid "Keep maximum number of completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Delete jobs if the history exceeds specified number of jobs"
+msgid "Keep completed jobs maximum number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Move jobs to the archive after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete jobs after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Move all completed jobs to archive"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete all completed jobs"
+msgid "Do not keep any completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3037,16 +2939,17 @@ msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
+#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort post-processing"
+msgid "Abort"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3456,6 +3359,14 @@ msgstr ""
 msgid "Bandwidth"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Send Group"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Send group command before requesting articles."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Personal notes"
 msgstr ""
@@ -3830,29 +3741,6 @@ msgstr ""
 msgid "Device to which message should be sent"
 msgstr ""
 
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Enable Apprise notifications"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Send notifications using Apprise to almost any notification service"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Default Apprise URLs"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Use a comma and/or space to identify more than one URL."
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Override the default URLs for specific notification types below, if desired."
-msgstr ""
-
 #. Header for Notification Script notification section
 #: sabnzbd/skintext.py
 msgid "Notification Script"
@@ -4558,3 +4446,47 @@ msgstr ""
 msgid "Trying to fetch NZB from %s"
 msgstr ""
 
+#: sabnzbd/utils/servertests.py
+msgid "The hostname is not set."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "There are no connections set. Please set at least one connection."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Password masked in ******, please re-enter"
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Invalid server details"
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out: Try enabling SSL or connecting on a different port."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out"
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Unknown SSL protocol: Try disabling SSL or connecting on a different port."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Server requires username and password."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Connection Successful!"
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Too many connections, please pause downloading or try again later"
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Could not determine connection result (%s)"
+msgstr ""
+

po/main/cs.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Czech (https://app.transifex.com/sabnzbd/teams/111101/cs/)\n"
@@ -165,66 +165,6 @@ msgstr "Email funční"
 msgid "Test Notification"
 msgstr "Otestovat notifikace"
 
-#: sabnzbd/api.py
-msgid "The hostname is not set."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "There are no connections set. Please set at least one connection."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Password masked in ******, please re-enter"
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Invalid server details"
-msgstr ""
-
-#: sabnzbd/api.py
-msgid ""
-"Could not connect to %s on port %s. It appears that %s operates as a web "
-"server (port 80), possibly an indexer, not a usenet server. You have to fill"
-" a usenet server."
-msgstr ""
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Server address \"%s:%s\" is not valid."
-msgstr "Adresa serveru \"%s:%s\" není správná."
-
-#: sabnzbd/api.py
-msgid "Timed out: Try enabling SSL or connecting on a different port."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Timed out"
-msgstr ""
-
-#: sabnzbd/api.py
-msgid ""
-"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Server requires username and password."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Connection Successful!"
-msgstr ""
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Authentication failed, check username/password."
-msgstr "Přihlášené selhalo, zkontrolujte jméno a heslo."
-
-#: sabnzbd/api.py
-msgid "Too many connections, please pause downloading or try again later"
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Could not determine connection result (%s)"
-msgstr ""
-
 #: sabnzbd/api.py
 msgid "Resolving address"
 msgstr "Překládám adresu"
@@ -510,11 +450,6 @@ msgstr ""
 msgid "Fatal error in Downloader"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "%s@%s: Received unknown status code %s for article %s"
-msgstr ""
-
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
 msgstr "Příliš mnoho spojení k serveru %s [%s]"
@@ -719,6 +654,10 @@ msgstr ""
 "Nesprávný API klíč, použijte api klíč z Nastavení->Obecné ve vašem programu "
 "třetí strany:"
 
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
+msgid "Authentication failed, check username/password."
+msgstr "Přihlášené selhalo, zkontrolujte jméno a heslo."
+
 #. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
@@ -728,6 +667,10 @@ msgstr "Nezdařený pokus o přihlášení od %s"
 msgid "Invalid backup archive"
 msgstr ""
 
+#: sabnzbd/interface.py
+msgid "Server address \"%s:%s\" is not valid."
+msgstr "Adresa serveru \"%s:%s\" není správná."
+
 #. Config->RSS, tab header
 #: sabnzbd/interface.py, sabnzbd/skintext.py
 msgid "Feed"
@@ -1080,10 +1023,6 @@ msgstr "Server %s používá nedůvěryhodný certifikát [%s]"
 msgid "Wiki"
 msgstr "Wiki"
 
-#: sabnzbd/newswrapper.py
-msgid "Failed to connect: %s %s@%s:%s (%s)"
-msgstr ""
-
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1154,20 +1093,6 @@ msgstr "Nepodařilo se odeslat macOS oznámení"
 msgid "Failed to send Prowl message"
 msgstr "Nepodařilo se odeslat Prowl zprávu"
 
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "One or more Apprise URLs could not be loaded."
-msgstr ""
-
-#: sabnzbd/notifier.py
-msgid "Failed to send one or more Apprise Notifications"
-msgstr ""
-
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "Failed to send Apprise message"
-msgstr ""
-
 #. Error message
 #: sabnzbd/notifier.py
 msgid "Bad response from Pushover (%s): %s"
@@ -1410,7 +1335,7 @@ msgstr "Vypnout"
 msgid "Queue First 10 Items"
 msgstr "Fronta prvních 10 položek"
 
-#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+#: sabnzbd/osxmenu.py
 msgid "Empty"
 msgstr "Prázdný"
 
@@ -2304,11 +2229,6 @@ msgstr "Skripty"
 msgid "Delete all items from the queue?"
 msgstr "Smazat všechny položky z fronty?"
 
-#. Delete confirmation popup
-#: sabnzbd/skintext.py
-msgid "Are you sure you want to remove these jobs?"
-msgstr ""
-
 #. Queue page button
 #: sabnzbd/skintext.py
 msgid "Purge NZBs"
@@ -2329,11 +2249,6 @@ msgstr "Odstranit NZB"
 msgid "Remove NZB & Delete Files"
 msgstr "Odstranit NZB a smazat soubory"
 
-#. Checkbox if job should be added to Archive
-#: sabnzbd/skintext.py
-msgid "Permanently delete (skip archive)"
-msgstr ""
-
 #. Caption for missing articles in Queue
 #: sabnzbd/skintext.py
 msgid "Missing articles"
@@ -2353,10 +2268,6 @@ msgstr "ručně"
 msgid "Reset Quota now"
 msgstr "Vynulovat kvótu"
 
-#: sabnzbd/skintext.py
-msgid "Archive"
-msgstr ""
-
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2377,11 +2288,6 @@ msgstr "Zobrazit neúspěšné"
 msgid "Show All"
 msgstr "Zobrazit vše"
 
-#. Button showing all archived jobs
-#: sabnzbd/skintext.py
-msgid "Show Archive"
-msgstr ""
-
 #. History table header - Size of the download quota
 #: sabnzbd/skintext.py
 msgid "Size"
@@ -2799,34 +2705,27 @@ msgstr ""
 msgid "History Retention"
 msgstr "Retence historie"
 
+#: sabnzbd/skintext.py
+msgid ""
+"Automatically delete completed jobs from History. Beware that Duplicate "
+"Detection and some external tools rely on History information."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Keep all jobs"
 msgstr "Zachovat všechny úkoly"
 
 #: sabnzbd/skintext.py
-msgid ""
-"Move jobs to the archive if the history exceeds specified number of jobs"
-msgstr ""
+msgid "Keep maximum number of completed jobs"
+msgstr "Maximální počet dokončených úkolů"
 
 #: sabnzbd/skintext.py
-msgid "Delete jobs if the history exceeds specified number of jobs"
-msgstr ""
+msgid "Keep completed jobs maximum number of days"
+msgstr "Počet dnů pro zachování dokončených ukolů "
 
 #: sabnzbd/skintext.py
-msgid "Move jobs to the archive after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete jobs after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Move all completed jobs to archive"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete all completed jobs"
-msgstr ""
+msgid "Do not keep any completed jobs"
+msgstr "Nauchovávat dokončené úkoly"
 
 #: sabnzbd/skintext.py
 msgid "Jobs"
@@ -3182,16 +3081,17 @@ msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
+#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort post-processing"
+msgid "Abort"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3627,6 +3527,14 @@ msgstr ""
 msgid "Bandwidth"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Send Group"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Send group command before requesting articles."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Personal notes"
 msgstr ""
@@ -4007,30 +3915,6 @@ msgstr ""
 msgid "Device to which message should be sent"
 msgstr ""
 
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Enable Apprise notifications"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Send notifications using Apprise to almost any notification service"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Default Apprise URLs"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Use a comma and/or space to identify more than one URL."
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid ""
-"Override the default URLs for specific notification types below, if desired."
-msgstr ""
-
 #. Header for Notification Script notification section
 #: sabnzbd/skintext.py
 msgid "Notification Script"
@@ -4764,3 +4648,48 @@ msgstr ""
 #: sabnzbd/urlgrabber.py
 msgid "Trying to fetch NZB from %s"
 msgstr "Zkouším stáhnout NZB z %s"
+
+#: sabnzbd/utils/servertests.py
+msgid "The hostname is not set."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "There are no connections set. Please set at least one connection."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Password masked in ******, please re-enter"
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Invalid server details"
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out: Try enabling SSL or connecting on a different port."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out"
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid ""
+"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Server requires username and password."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Connection Successful!"
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Too many connections, please pause downloading or try again later"
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Could not determine connection result (%s)"
+msgstr ""

po/main/da.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Danish (https://app.transifex.com/sabnzbd/teams/111101/da/)\n"
@@ -165,69 +165,6 @@ msgstr "E-mail afsendelse mislykkedes"
 msgid "Test Notification"
 msgstr "Afprøv notifikation"
 
-#: sabnzbd/api.py
-msgid "The hostname is not set."
-msgstr "Værtsnavnet er ikke indstillet."
-
-#: sabnzbd/api.py
-msgid "There are no connections set. Please set at least one connection."
-msgstr "Der er ingen forbindelser angivet. Angiv mindst én forbindelse."
-
-#: sabnzbd/api.py
-msgid "Password masked in ******, please re-enter"
-msgstr "Adgangskode maskeret med ******, forsøg igen"
-
-#: sabnzbd/api.py
-msgid "Invalid server details"
-msgstr "Ugyldige serverdetaljer"
-
-#: sabnzbd/api.py
-msgid ""
-"Could not connect to %s on port %s. It appears that %s operates as a web "
-"server (port 80), possibly an indexer, not a usenet server. You have to fill"
-" a usenet server."
-msgstr ""
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Server address \"%s:%s\" is not valid."
-msgstr "Serveradressen \"%s:%s\" er ikke gyldigt."
-
-#: sabnzbd/api.py
-msgid "Timed out: Try enabling SSL or connecting on a different port."
-msgstr "Timeout: Forsøg at aktivere SSL eller tilslut via en anden port."
-
-#: sabnzbd/api.py
-msgid "Timed out"
-msgstr "Timeout"
-
-#: sabnzbd/api.py
-msgid ""
-"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
-msgstr ""
-"Ukendt SSL protokol: Prøv at deaktivere SSL eller forbinder på en anden "
-"port."
-
-#: sabnzbd/api.py
-msgid "Server requires username and password."
-msgstr "Serveren kræver brugernavn og adgangskode."
-
-#: sabnzbd/api.py
-msgid "Connection Successful!"
-msgstr "Tilslutning lykkedes!"
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Authentication failed, check username/password."
-msgstr "Godkendelse mislykkedes, kontrollere brugernavn/adgangskode."
-
-#: sabnzbd/api.py
-msgid "Too many connections, please pause downloading or try again later"
-msgstr ""
-"Alt for mange forbindelser, pause en download eller forsøg igen senere"
-
-#: sabnzbd/api.py
-msgid "Could not determine connection result (%s)"
-msgstr "Det lykkedes ikke at tilslutte (%s)"
-
 #: sabnzbd/api.py
 msgid "Resolving address"
 msgstr "Server løsning"
@@ -511,11 +448,6 @@ msgstr "Det lykkedes ikke at initialisere %s@%s med begrundelse %s"
 msgid "Fatal error in Downloader"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "%s@%s: Received unknown status code %s for article %s"
-msgstr ""
-
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
 msgstr "Alt for mange forbindelser til serveren %s [%s]"
@@ -730,6 +662,10 @@ msgstr ""
 "Forkert API-nøgle, anvend api-nøglen fra Konfiguration->Generelt i dit "
 "tredjepartsprogram:"
 
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
+msgid "Authentication failed, check username/password."
+msgstr "Godkendelse mislykkedes, kontrollere brugernavn/adgangskode."
+
 #. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
@@ -739,6 +675,10 @@ msgstr "Mislykkede login forsøg fra %s"
 msgid "Invalid backup archive"
 msgstr ""
 
+#: sabnzbd/interface.py
+msgid "Server address \"%s:%s\" is not valid."
+msgstr "Serveradressen \"%s:%s\" er ikke gyldigt."
+
 #. Config->RSS, tab header
 #: sabnzbd/interface.py, sabnzbd/skintext.py
 msgid "Feed"
@@ -1087,10 +1027,6 @@ msgstr "Server %s bruger et upålidelig certifikat [%s]"
 msgid "Wiki"
 msgstr "Wiki"
 
-#: sabnzbd/newswrapper.py
-msgid "Failed to connect: %s %s@%s:%s (%s)"
-msgstr ""
-
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1161,20 +1097,6 @@ msgstr ""
 msgid "Failed to send Prowl message"
 msgstr "Kunne ikke sende Prowl besked"
 
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "One or more Apprise URLs could not be loaded."
-msgstr ""
-
-#: sabnzbd/notifier.py
-msgid "Failed to send one or more Apprise Notifications"
-msgstr ""
-
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "Failed to send Apprise message"
-msgstr ""
-
 #. Error message
 #: sabnzbd/notifier.py
 msgid "Bad response from Pushover (%s): %s"
@@ -1417,7 +1339,7 @@ msgstr "Afslut"
 msgid "Queue First 10 Items"
 msgstr "Kø (de første 10 poster)"
 
-#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+#: sabnzbd/osxmenu.py
 msgid "Empty"
 msgstr "Tom"
 
@@ -2339,11 +2261,6 @@ msgstr "Scripts"
 msgid "Delete all items from the queue?"
 msgstr "Fjern alt fra køen?"
 
-#. Delete confirmation popup
-#: sabnzbd/skintext.py
-msgid "Are you sure you want to remove these jobs?"
-msgstr ""
-
 #. Queue page button
 #: sabnzbd/skintext.py
 msgid "Purge NZBs"
@@ -2364,11 +2281,6 @@ msgstr "Fjern NZB"
 msgid "Remove NZB & Delete Files"
 msgstr "Fjern NZB & slet filer"
 
-#. Checkbox if job should be added to Archive
-#: sabnzbd/skintext.py
-msgid "Permanently delete (skip archive)"
-msgstr ""
-
 #. Caption for missing articles in Queue
 #: sabnzbd/skintext.py
 msgid "Missing articles"
@@ -2388,10 +2300,6 @@ msgstr "manuelt"
 msgid "Reset Quota now"
 msgstr "Nulstil kvota nu"
 
-#: sabnzbd/skintext.py
-msgid "Archive"
-msgstr ""
-
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2412,11 +2320,6 @@ msgstr "Vis mislykket"
 msgid "Show All"
 msgstr "Vis Alt"
 
-#. Button showing all archived jobs
-#: sabnzbd/skintext.py
-msgid "Show Archive"
-msgstr ""
-
 #. History table header - Size of the download quota
 #: sabnzbd/skintext.py
 msgid "Size"
@@ -2849,34 +2752,27 @@ msgstr ""
 msgid "History Retention"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid ""
+"Automatically delete completed jobs from History. Beware that Duplicate "
+"Detection and some external tools rely on History information."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Keep all jobs"
 msgstr "Behold alle jobs"
 
 #: sabnzbd/skintext.py
-msgid ""
-"Move jobs to the archive if the history exceeds specified number of jobs"
-msgstr ""
+msgid "Keep maximum number of completed jobs"
+msgstr "Behold maximal antal af gennemførte jobs"
 
 #: sabnzbd/skintext.py
-msgid "Delete jobs if the history exceeds specified number of jobs"
-msgstr ""
+msgid "Keep completed jobs maximum number of days"
+msgstr "Behold gennemførte jobs maximal antal af dage"
 
 #: sabnzbd/skintext.py
-msgid "Move jobs to the archive after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete jobs after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Move all completed jobs to archive"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete all completed jobs"
-msgstr ""
+msgid "Do not keep any completed jobs"
+msgstr "Behold ikke gennemførte jobs"
 
 #: sabnzbd/skintext.py
 msgid "Jobs"
@@ -3251,19 +3147,20 @@ msgstr ""
 msgid "Discard"
 msgstr "Kassér"
 
-#. Four way switch for duplicates
-#: sabnzbd/skintext.py
-msgid "Tag job"
-msgstr "Marker job"
-
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
 msgid "Fail job (move to History)"
 msgstr "Mislykkes job (flyt til historik)"
 
+#. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Abort post-processing"
-msgstr ""
+msgid "Tag job"
+msgstr "Marker job"
+
+#. Three way switch for encrypted posts
+#: sabnzbd/skintext.py
+msgid "Abort"
+msgstr "Afbryd"
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3714,6 +3611,14 @@ msgstr "Tester serverdetaljer..."
 msgid "Bandwidth"
 msgstr "Båndbredde"
 
+#: sabnzbd/skintext.py
+msgid "Send Group"
+msgstr "Send gruppe"
+
+#: sabnzbd/skintext.py
+msgid "Send group command before requesting articles."
+msgstr "Send gruppe kommandoen, før du anmoder om artikler."
+
 #: sabnzbd/skintext.py
 msgid "Personal notes"
 msgstr "Personlige notater"
@@ -4098,30 +4003,6 @@ msgstr "Enhed"
 msgid "Device to which message should be sent"
 msgstr "Enhed som meddelse skal sendes til"
 
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Enable Apprise notifications"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Send notifications using Apprise to almost any notification service"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Default Apprise URLs"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Use a comma and/or space to identify more than one URL."
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid ""
-"Override the default URLs for specific notification types below, if desired."
-msgstr ""
-
 #. Header for Notification Script notification section
 #: sabnzbd/skintext.py
 msgid "Notification Script"
@@ -4873,3 +4754,51 @@ msgstr "URL hentning mislykkedes; %s"
 #: sabnzbd/urlgrabber.py
 msgid "Trying to fetch NZB from %s"
 msgstr "Forsøger at hente NZB fra %s"
+
+#: sabnzbd/utils/servertests.py
+msgid "The hostname is not set."
+msgstr "Værtsnavnet er ikke indstillet."
+
+#: sabnzbd/utils/servertests.py
+msgid "There are no connections set. Please set at least one connection."
+msgstr "Der er ingen forbindelser angivet. Angiv mindst én forbindelse."
+
+#: sabnzbd/utils/servertests.py
+msgid "Password masked in ******, please re-enter"
+msgstr "Adgangskode maskeret med ******, forsøg igen"
+
+#: sabnzbd/utils/servertests.py
+msgid "Invalid server details"
+msgstr "Ugyldige serverdetaljer"
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out: Try enabling SSL or connecting on a different port."
+msgstr "Timeout: Forsøg at aktivere SSL eller tilslut via en anden port."
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out"
+msgstr "Timeout"
+
+#: sabnzbd/utils/servertests.py
+msgid ""
+"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
+msgstr ""
+"Ukendt SSL protokol: Prøv at deaktivere SSL eller forbinder på en anden "
+"port."
+
+#: sabnzbd/utils/servertests.py
+msgid "Server requires username and password."
+msgstr "Serveren kræver brugernavn og adgangskode."
+
+#: sabnzbd/utils/servertests.py
+msgid "Connection Successful!"
+msgstr "Tilslutning lykkedes!"
+
+#: sabnzbd/utils/servertests.py
+msgid "Too many connections, please pause downloading or try again later"
+msgstr ""
+"Alt for mange forbindelser, pause en download eller forsøg igen senere"
+
+#: sabnzbd/utils/servertests.py
+msgid "Could not determine connection result (%s)"
+msgstr "Det lykkedes ikke at tilslutte (%s)"

po/main/de.po

@@ -11,14 +11,14 @@
 # Nils Briggen, 2022
 # reloxx13 <reloxx@interia.pl>, 2022
 # kameb, 2023
+# Safihre <safihre@sabnzbd.org>, 2023
 # HandyDandy04, 2024
-# Safihre <safihre@sabnzbd.org>, 2024
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
-"Last-Translator: Safihre <safihre@sabnzbd.org>, 2024\n"
+"Last-Translator: HandyDandy04, 2024\n"
 "Language-Team: German (https://app.transifex.com/sabnzbd/teams/111101/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -182,75 +182,6 @@ msgstr "E-Mail erfolgreich versendet"
 msgid "Test Notification"
 msgstr "Benachrichtigungen testen"
 
-#: sabnzbd/api.py
-msgid "The hostname is not set."
-msgstr "Der Hostname wurde nicht angegeben"
-
-#: sabnzbd/api.py
-msgid "There are no connections set. Please set at least one connection."
-msgstr ""
-"Keine Verbindungen angegeben. Bitte geben Sie mindestens eine Verbindung "
-"ein."
-
-#: sabnzbd/api.py
-msgid "Password masked in ******, please re-enter"
-msgstr "Passwort ist als ****** maskiert. Bitte erneut eingeben."
-
-#: sabnzbd/api.py
-msgid "Invalid server details"
-msgstr "Ungültige Server-Angaben"
-
-#: sabnzbd/api.py
-msgid ""
-"Could not connect to %s on port %s. It appears that %s operates as a web "
-"server (port 80), possibly an indexer, not a usenet server. You have to fill"
-" a usenet server."
-msgstr ""
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Server address \"%s:%s\" is not valid."
-msgstr "Server-Adresse \"%s:%s\" ist ungültig."
-
-#: sabnzbd/api.py
-msgid "Timed out: Try enabling SSL or connecting on a different port."
-msgstr ""
-"Zeitüberschreitung: Versuche es mit eingeschalteten SSL oder einen anderen "
-"Port."
-
-#: sabnzbd/api.py
-msgid "Timed out"
-msgstr "Zeitüberschreitung"
-
-#: sabnzbd/api.py
-msgid ""
-"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
-msgstr ""
-"Unbekanntes SSL-Protokoll: SSL deaktivieren oder alternativen Port "
-"versuchen."
-
-#: sabnzbd/api.py
-msgid "Server requires username and password."
-msgstr "Server benötigt ein Benutzername und ein Passwort."
-
-#: sabnzbd/api.py
-msgid "Connection Successful!"
-msgstr "Verbindung erfolgreich hergestellt!"
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Authentication failed, check username/password."
-msgstr ""
-"Authentifizierung fehlgeschlagen. Überprüfen Sie Benutzername und Passwort."
-
-#: sabnzbd/api.py
-msgid "Too many connections, please pause downloading or try again later"
-msgstr ""
-"Zu viele Verbindungen. Bitte halten Sie die Downloads an oder versuchen Sie "
-"es später erneut."
-
-#: sabnzbd/api.py
-msgid "Could not determine connection result (%s)"
-msgstr "Die Verbindung konnte nicht überprüft werden. (%s)"
-
 #: sabnzbd/api.py
 msgid "Resolving address"
 msgstr "Adresse wird aufgelöst …"
@@ -550,11 +481,6 @@ msgstr "Fehler %s@%s zu initialisieren, aus folgendem Grund: %s"
 msgid "Fatal error in Downloader"
 msgstr "Schwerer Fehler im Downloader"
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "%s@%s: Received unknown status code %s for article %s"
-msgstr ""
-
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
 msgstr "Zu viele Verbindungen zu Server %s [%s]"
@@ -779,6 +705,11 @@ msgstr ""
 "API-Schlüssel ungültig. Bitte API-Schlüssel aus Einstellungen->Allgemein in "
 "die externe Anwendung eingeben:"
 
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
+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"
@@ -788,6 +719,10 @@ msgstr "Fehlerhafter Login Versuch von %s"
 msgid "Invalid backup archive"
 msgstr "Invalides Backup Archiv"
 
+#: sabnzbd/interface.py
+msgid "Server address \"%s:%s\" is not valid."
+msgstr "Server-Adresse \"%s:%s\" ist ungültig."
+
 #. Config->RSS, tab header
 #: sabnzbd/interface.py, sabnzbd/skintext.py
 msgid "Feed"
@@ -1150,10 +1085,6 @@ msgstr "Der Server %s verwendet ein nicht vertrauenswürdiges Zertifikat [%s]"
 msgid "Wiki"
 msgstr "Wiki"
 
-#: sabnzbd/newswrapper.py
-msgid "Failed to connect: %s %s@%s:%s (%s)"
-msgstr ""
-
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1224,20 +1155,6 @@ msgstr "Senden von macOS Benachrichtigung fehlgeschlagen"
 msgid "Failed to send Prowl message"
 msgstr "Prowl-Nachricht konnte nicht versendet werden"
 
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "One or more Apprise URLs could not be loaded."
-msgstr ""
-
-#: sabnzbd/notifier.py
-msgid "Failed to send one or more Apprise Notifications"
-msgstr ""
-
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "Failed to send Apprise message"
-msgstr ""
-
 #. Error message
 #: sabnzbd/notifier.py
 msgid "Bad response from Pushover (%s): %s"
@@ -1483,7 +1400,7 @@ msgstr "Beenden"
 msgid "Queue First 10 Items"
 msgstr "Warteschlange mit den 10 obersten Einträgen"
 
-#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+#: sabnzbd/osxmenu.py
 msgid "Empty"
 msgstr "Leer"
 
@@ -2418,11 +2335,6 @@ msgstr "Skripte"
 msgid "Delete all items from the queue?"
 msgstr "Alle Elemente in der Warteschlange löschen?"
 
-#. Delete confirmation popup
-#: sabnzbd/skintext.py
-msgid "Are you sure you want to remove these jobs?"
-msgstr ""
-
 #. Queue page button
 #: sabnzbd/skintext.py
 msgid "Purge NZBs"
@@ -2443,11 +2355,6 @@ msgstr "NZB löschen"
 msgid "Remove NZB & Delete Files"
 msgstr "NZBs und Dateien löschen"
 
-#. Checkbox if job should be added to Archive
-#: sabnzbd/skintext.py
-msgid "Permanently delete (skip archive)"
-msgstr ""
-
 #. Caption for missing articles in Queue
 #: sabnzbd/skintext.py
 msgid "Missing articles"
@@ -2467,10 +2374,6 @@ msgstr "Manuell"
 msgid "Reset Quota now"
 msgstr "Kontingent jetzt zurücksetzen"
 
-#: sabnzbd/skintext.py
-msgid "Archive"
-msgstr ""
-
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2491,11 +2394,6 @@ msgstr "Nur Fehlgeschlagene"
 msgid "Show All"
 msgstr "Alle anzeigen"
 
-#. Button showing all archived jobs
-#: sabnzbd/skintext.py
-msgid "Show Archive"
-msgstr ""
-
 #. History table header - Size of the download quota
 #: sabnzbd/skintext.py
 msgid "Size"
@@ -2954,34 +2852,29 @@ msgstr ""
 msgid "History Retention"
 msgstr "Verlaufsgröße"
 
+#: sabnzbd/skintext.py
+msgid ""
+"Automatically delete completed jobs from History. Beware that Duplicate "
+"Detection and some external tools rely on History information."
+msgstr ""
+"Fertige Aufträge automatisch aus dem Verlauf entfernen. Duplikatserkennung "
+"und manche externe Skripte benötigen Informationen aus dem Verlauf."
+
 #: sabnzbd/skintext.py
 msgid "Keep all jobs"
 msgstr "Alle Aufträge behalten"
 
 #: sabnzbd/skintext.py
-msgid ""
-"Move jobs to the archive if the history exceeds specified number of jobs"
-msgstr ""
+msgid "Keep maximum number of completed jobs"
+msgstr "Behalte maximale Anzahl an abgeschlossenen Aufträgen"
 
 #: sabnzbd/skintext.py
-msgid "Delete jobs if the history exceeds specified number of jobs"
-msgstr ""
+msgid "Keep completed jobs maximum number of days"
+msgstr "Behalte abgeschlossene Aufträge maximal X Tage"
 
 #: sabnzbd/skintext.py
-msgid "Move jobs to the archive after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete jobs after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Move all completed jobs to archive"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete all completed jobs"
-msgstr ""
+msgid "Do not keep any completed jobs"
+msgstr "Fertige Aufträge nicht behalten"
 
 #: sabnzbd/skintext.py
 msgid "Jobs"
@@ -3063,7 +2956,7 @@ msgstr "NZB Dateien hinzufügen "
 
 #: sabnzbd/skintext.py
 msgid "API (no Config)"
-msgstr "API (ohne Einstellungen)"
+msgstr "API (kein Einstellungen)"
 
 #: sabnzbd/skintext.py
 msgid "Full API"
@@ -3383,19 +3276,20 @@ msgstr ""
 msgid "Discard"
 msgstr "Verwerfen"
 
-#. Four way switch for duplicates
-#: sabnzbd/skintext.py
-msgid "Tag job"
-msgstr "Markiere Auftrag"
-
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
 msgid "Fail job (move to History)"
 msgstr "Aufgabe abgebrochen (verschoben in die Historie)"
 
+#. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Abort post-processing"
-msgstr ""
+msgid "Tag job"
+msgstr "Markiere Auftrag"
+
+#. Three way switch for encrypted posts
+#: sabnzbd/skintext.py
+msgid "Abort"
+msgstr "Abbrechen"
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3876,6 +3770,14 @@ msgstr "Server-Angaben werden überprüft …"
 msgid "Bandwidth"
 msgstr "Bandbreite"
 
+#: sabnzbd/skintext.py
+msgid "Send Group"
+msgstr "Gruppe senden"
+
+#: sabnzbd/skintext.py
+msgid "Send group command before requesting articles."
+msgstr "Gruppen-Befehl senden, bevor Artikeln angefordert werden."
+
 #: sabnzbd/skintext.py
 msgid "Personal notes"
 msgstr "Persönliche Notizen"
@@ -4266,30 +4168,6 @@ msgstr "Gerät"
 msgid "Device to which message should be sent"
 msgstr "Geräte, welche die Benachrichtigungen empfangen sollen"
 
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Enable Apprise notifications"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Send notifications using Apprise to almost any notification service"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Default Apprise URLs"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Use a comma and/or space to identify more than one URL."
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid ""
-"Override the default URLs for specific notification types below, if desired."
-msgstr ""
-
 #. Header for Notification Script notification section
 #: sabnzbd/skintext.py
 msgid "Notification Script"
@@ -5056,3 +4934,56 @@ msgstr "Abrufen der URL fehlgeschlagen; %s"
 #: sabnzbd/urlgrabber.py
 msgid "Trying to fetch NZB from %s"
 msgstr "NZB-Datei wird versucht von %s abzurufen"
+
+#: sabnzbd/utils/servertests.py
+msgid "The hostname is not set."
+msgstr "Der Hostname wurde nicht angegeben"
+
+#: sabnzbd/utils/servertests.py
+msgid "There are no connections set. Please set at least one connection."
+msgstr ""
+"Keine Verbindungen angegeben. Bitte geben Sie mindestens eine Verbindung "
+"ein."
+
+#: sabnzbd/utils/servertests.py
+msgid "Password masked in ******, please re-enter"
+msgstr "Passwort ist als ****** maskiert. Bitte erneut eingeben."
+
+#: sabnzbd/utils/servertests.py
+msgid "Invalid server details"
+msgstr "Ungültige Server-Angaben"
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out: Try enabling SSL or connecting on a different port."
+msgstr ""
+"Zeitüberschreitung: Versuche es mit eingeschalteten SSL oder einen anderen "
+"Port."
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out"
+msgstr "Zeitüberschreitung"
+
+#: sabnzbd/utils/servertests.py
+msgid ""
+"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
+msgstr ""
+"Unbekanntes SSL-Protokoll: SSL deaktivieren oder alternativen Port "
+"versuchen."
+
+#: sabnzbd/utils/servertests.py
+msgid "Server requires username and password."
+msgstr "Server benötigt ein Benutzername und ein Passwort."
+
+#: sabnzbd/utils/servertests.py
+msgid "Connection Successful!"
+msgstr "Verbindung erfolgreich hergestellt!"
+
+#: sabnzbd/utils/servertests.py
+msgid "Too many connections, please pause downloading or try again later"
+msgstr ""
+"Zu viele Verbindungen. Bitte halten Sie die Downloads an oder versuchen Sie "
+"es später erneut."
+
+#: sabnzbd/utils/servertests.py
+msgid "Could not determine connection result (%s)"
+msgstr "Die Verbindung konnte nicht überprüft werden. (%s)"

po/main/es.po

@@ -8,7 +8,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Spanish (https://app.transifex.com/sabnzbd/teams/111101/es/)\n"
@@ -174,69 +174,6 @@ msgstr "Email exitoso"
 msgid "Test Notification"
 msgstr "Notificación de prueba"
 
-#: sabnzbd/api.py
-msgid "The hostname is not set."
-msgstr "El hostname no está definido."
-
-#: sabnzbd/api.py
-msgid "There are no connections set. Please set at least one connection."
-msgstr "No se han configurado conexiones. Configure al menos una conexión."
-
-#: sabnzbd/api.py
-msgid "Password masked in ******, please re-enter"
-msgstr "Contraseña protejido por ******, favor reingresar"
-
-#: sabnzbd/api.py
-msgid "Invalid server details"
-msgstr "Detalles de servidor invalidos"
-
-#: sabnzbd/api.py
-msgid ""
-"Could not connect to %s on port %s. It appears that %s operates as a web "
-"server (port 80), possibly an indexer, not a usenet server. You have to fill"
-" a usenet server."
-msgstr ""
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Server address \"%s:%s\" is not valid."
-msgstr "La dirección del servidor «%s:%s» no es válida."
-
-#: sabnzbd/api.py
-msgid "Timed out: Try enabling SSL or connecting on a different port."
-msgstr "Tiempo agotado: Trate conectar en puerto diferente o encender SSL."
-
-#: sabnzbd/api.py
-msgid "Timed out"
-msgstr "Tiempo agotado"
-
-#: sabnzbd/api.py
-msgid ""
-"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
-msgstr ""
-"Protocolo SSL desconocido: intente desabilitar el SSL o conectarse a un "
-"puerto diferente."
-
-#: sabnzbd/api.py
-msgid "Server requires username and password."
-msgstr "El servidor necesita usuario y contraseña."
-
-#: sabnzbd/api.py
-msgid "Connection Successful!"
-msgstr "¡Conexión exitosa!"
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Authentication failed, check username/password."
-msgstr "Autenticación fallida, compruebe el usuario o la contraseña."
-
-#: sabnzbd/api.py
-msgid "Too many connections, please pause downloading or try again later"
-msgstr ""
-"Demasiadas conexiones; pause las descargas o inténtelo de nuevo más tarde"
-
-#: sabnzbd/api.py
-msgid "Could not determine connection result (%s)"
-msgstr "No se pudo determinar el resultado de la conexión (%s)"
-
 #: sabnzbd/api.py
 msgid "Resolving address"
 msgstr "Resolviendo sitio"
@@ -532,11 +469,6 @@ msgstr "Error al inicializar %s@%s con la razón: %s"
 msgid "Fatal error in Downloader"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "%s@%s: Received unknown status code %s for article %s"
-msgstr ""
-
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
 msgstr "Demasiadas conexiones con el servidor %s [%s]"
@@ -752,6 +684,10 @@ msgstr ""
 "Clave de API erróneo, favor ingresar la clave correcta desde Config->General"
 " en tu aplicacion externa:"
 
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
+msgid "Authentication failed, check username/password."
+msgstr "Autenticación fallida, compruebe el usuario o la contraseña."
+
 #. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
@@ -761,6 +697,10 @@ msgstr "Intento fallido de inicio de sesión desde %s"
 msgid "Invalid backup archive"
 msgstr ""
 
+#: sabnzbd/interface.py
+msgid "Server address \"%s:%s\" is not valid."
+msgstr "La dirección del servidor «%s:%s» no es válida."
+
 #. Config->RSS, tab header
 #: sabnzbd/interface.py, sabnzbd/skintext.py
 msgid "Feed"
@@ -1127,10 +1067,6 @@ msgstr "El servidor %s utiliza un certificado que no es de confianza [%s]"
 msgid "Wiki"
 msgstr "Wiki"
 
-#: sabnzbd/newswrapper.py
-msgid "Failed to connect: %s %s@%s:%s (%s)"
-msgstr ""
-
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1201,20 +1137,6 @@ msgstr "Fallo al enviar la notificación macOS"
 msgid "Failed to send Prowl message"
 msgstr "No se pudo enviar el mensaje de Prowl"
 
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "One or more Apprise URLs could not be loaded."
-msgstr ""
-
-#: sabnzbd/notifier.py
-msgid "Failed to send one or more Apprise Notifications"
-msgstr ""
-
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "Failed to send Apprise message"
-msgstr ""
-
 #. Error message
 #: sabnzbd/notifier.py
 msgid "Bad response from Pushover (%s): %s"
@@ -1462,7 +1384,7 @@ msgstr "Salir"
 msgid "Queue First 10 Items"
 msgstr "Encolar los primeros 10 elementos"
 
-#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+#: sabnzbd/osxmenu.py
 msgid "Empty"
 msgstr "Vacía"
 
@@ -2395,11 +2317,6 @@ msgstr "Scripts"
 msgid "Delete all items from the queue?"
 msgstr "¿Eliminar todos los elementos de la cola?"
 
-#. Delete confirmation popup
-#: sabnzbd/skintext.py
-msgid "Are you sure you want to remove these jobs?"
-msgstr ""
-
 #. Queue page button
 #: sabnzbd/skintext.py
 msgid "Purge NZBs"
@@ -2420,11 +2337,6 @@ msgstr "Eliminar NZB"
 msgid "Remove NZB & Delete Files"
 msgstr "Eliminar NZB y Eliminar Ficheros"
 
-#. Checkbox if job should be added to Archive
-#: sabnzbd/skintext.py
-msgid "Permanently delete (skip archive)"
-msgstr ""
-
 #. Caption for missing articles in Queue
 #: sabnzbd/skintext.py
 msgid "Missing articles"
@@ -2444,10 +2356,6 @@ msgstr "manual"
 msgid "Reset Quota now"
 msgstr "Reinicializar Quota ahora"
 
-#: sabnzbd/skintext.py
-msgid "Archive"
-msgstr ""
-
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2468,11 +2376,6 @@ msgstr "Mostrar los Fallidos"
 msgid "Show All"
 msgstr "Mostrar Todo"
 
-#. Button showing all archived jobs
-#: sabnzbd/skintext.py
-msgid "Show Archive"
-msgstr ""
-
 #. History table header - Size of the download quota
 #: sabnzbd/skintext.py
 msgid "Size"
@@ -2916,34 +2819,30 @@ msgstr ""
 msgid "History Retention"
 msgstr "Historial de retención"
 
+#: sabnzbd/skintext.py
+msgid ""
+"Automatically delete completed jobs from History. Beware that Duplicate "
+"Detection and some external tools rely on History information."
+msgstr ""
+"Elimina tareas completas de forma automática del historial. Tenga en cuenta "
+"que la detección de duplicados y algunas herramientas externas dependen de "
+"la información del historial."
+
 #: sabnzbd/skintext.py
 msgid "Keep all jobs"
 msgstr "Mantener todas las tareas"
 
 #: sabnzbd/skintext.py
-msgid ""
-"Move jobs to the archive if the history exceeds specified number of jobs"
-msgstr ""
+msgid "Keep maximum number of completed jobs"
+msgstr "Mantener un máximo de tareas completas"
 
 #: sabnzbd/skintext.py
-msgid "Delete jobs if the history exceeds specified number of jobs"
-msgstr ""
+msgid "Keep completed jobs maximum number of days"
+msgstr "Mantener las tareas completas un máximo de días"
 
 #: sabnzbd/skintext.py
-msgid "Move jobs to the archive after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete jobs after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Move all completed jobs to archive"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete all completed jobs"
-msgstr ""
+msgid "Do not keep any completed jobs"
+msgstr "No mantener ninguna tarea completa"
 
 #: sabnzbd/skintext.py
 msgid "Jobs"
@@ -3324,19 +3223,20 @@ msgstr ""
 msgid "Discard"
 msgstr "Descartar"
 
-#. Four way switch for duplicates
-#: sabnzbd/skintext.py
-msgid "Tag job"
-msgstr "Etiquetar tarea"
-
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
 msgid "Fail job (move to History)"
 msgstr "Tarea fallida (mover a historial)"
 
+#. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Abort post-processing"
-msgstr ""
+msgid "Tag job"
+msgstr "Etiquetar tarea"
+
+#. Three way switch for encrypted posts
+#: sabnzbd/skintext.py
+msgid "Abort"
+msgstr "Abortar"
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3802,6 +3702,14 @@ msgstr "Testeando información del servidor"
 msgid "Bandwidth"
 msgstr "Ancho de Banda"
 
+#: sabnzbd/skintext.py
+msgid "Send Group"
+msgstr "Enviar Group"
+
+#: sabnzbd/skintext.py
+msgid "Send group command before requesting articles."
+msgstr "Enviar comando group antes de solicitar los artículos."
+
 #: sabnzbd/skintext.py
 msgid "Personal notes"
 msgstr "Notas personales"
@@ -4189,30 +4097,6 @@ msgstr "Dispositivo"
 msgid "Device to which message should be sent"
 msgstr "Dispositivo al que enviar el mensaje"
 
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Enable Apprise notifications"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Send notifications using Apprise to almost any notification service"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Default Apprise URLs"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Use a comma and/or space to identify more than one URL."
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid ""
-"Override the default URLs for specific notification types below, if desired."
-msgstr ""
-
 #. Header for Notification Script notification section
 #: sabnzbd/skintext.py
 msgid "Notification Script"
@@ -4970,3 +4854,51 @@ msgstr "Error al recuperar la URL; %s"
 #: sabnzbd/urlgrabber.py
 msgid "Trying to fetch NZB from %s"
 msgstr "Tratando de buscar NZB de %s"
+
+#: sabnzbd/utils/servertests.py
+msgid "The hostname is not set."
+msgstr "El hostname no está definido."
+
+#: sabnzbd/utils/servertests.py
+msgid "There are no connections set. Please set at least one connection."
+msgstr "No se han configurado conexiones. Configure al menos una conexión."
+
+#: sabnzbd/utils/servertests.py
+msgid "Password masked in ******, please re-enter"
+msgstr "Contraseña protejido por ******, favor reingresar"
+
+#: sabnzbd/utils/servertests.py
+msgid "Invalid server details"
+msgstr "Detalles de servidor invalidos"
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out: Try enabling SSL or connecting on a different port."
+msgstr "Tiempo agotado: Trate conectar en puerto diferente o encender SSL."
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out"
+msgstr "Tiempo agotado"
+
+#: sabnzbd/utils/servertests.py
+msgid ""
+"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
+msgstr ""
+"Protocolo SSL desconocido: intente desabilitar el SSL o conectarse a un "
+"puerto diferente."
+
+#: sabnzbd/utils/servertests.py
+msgid "Server requires username and password."
+msgstr "El servidor necesita usuario y contraseña."
+
+#: sabnzbd/utils/servertests.py
+msgid "Connection Successful!"
+msgstr "¡Conexión exitosa!"
+
+#: sabnzbd/utils/servertests.py
+msgid "Too many connections, please pause downloading or try again later"
+msgstr ""
+"Demasiadas conexiones; pause las descargas o inténtelo de nuevo más tarde"
+
+#: sabnzbd/utils/servertests.py
+msgid "Could not determine connection result (%s)"
+msgstr "No se pudo determinar el resultado de la conexión (%s)"

po/main/fi.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Finnish (https://app.transifex.com/sabnzbd/teams/111101/fi/)\n"
@@ -167,67 +167,6 @@ msgstr "Sähköpostitus onnistui"
 msgid "Test Notification"
 msgstr "Testaa ilmoitusta"
 
-#: sabnzbd/api.py
-msgid "The hostname is not set."
-msgstr "Isäntänimeä ei ole asetettu."
-
-#: sabnzbd/api.py
-msgid "There are no connections set. Please set at least one connection."
-msgstr "Yhteyksiä ei ole asetettu. Aktivoi ainakin yksi yhteys."
-
-#: sabnzbd/api.py
-msgid "Password masked in ******, please re-enter"
-msgstr "Salasana on piilotettu ******, syötä uudelleen"
-
-#: sabnzbd/api.py
-msgid "Invalid server details"
-msgstr "Virheelliset palvelimen tiedot"
-
-#: sabnzbd/api.py
-msgid ""
-"Could not connect to %s on port %s. It appears that %s operates as a web "
-"server (port 80), possibly an indexer, not a usenet server. You have to fill"
-" a usenet server."
-msgstr ""
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Server address \"%s:%s\" is not valid."
-msgstr "Palvelimen osoite \"%s:%s\" ei ole kelvollinen."
-
-#: sabnzbd/api.py
-msgid "Timed out: Try enabling SSL or connecting on a different port."
-msgstr "Aikakatkaistu: Yritä laittaa SSL päälle tai yhdistä toiseen porttiin."
-
-#: sabnzbd/api.py
-msgid "Timed out"
-msgstr "Aikakatkaistiin"
-
-#: sabnzbd/api.py
-msgid ""
-"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
-msgstr ""
-"Tuntematon SSL protokolla: Kokeile ottaa SSL käytöstä tai vaihda porttia."
-
-#: sabnzbd/api.py
-msgid "Server requires username and password."
-msgstr "Palvelin vaatii käyttäjänimen ja salasanan."
-
-#: sabnzbd/api.py
-msgid "Connection Successful!"
-msgstr "Yhdistäminen onnistui!"
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Authentication failed, check username/password."
-msgstr "Varmennus epäonnistui, tarkista käyttäjänimi/salasana."
-
-#: sabnzbd/api.py
-msgid "Too many connections, please pause downloading or try again later"
-msgstr "Liikaa yhteyksiä, keskeytä lataaminen tai yritä myöhemmin uudelleen"
-
-#: sabnzbd/api.py
-msgid "Could not determine connection result (%s)"
-msgstr "Yhteystestin lopputulosta ei voitu määrittää (%s)"
-
 #: sabnzbd/api.py
 msgid "Resolving address"
 msgstr "Selvitetään osoitetta"
@@ -506,11 +445,6 @@ msgstr "Alustaminen epäonnistui kohteessa %s@%s syy: %s"
 msgid "Fatal error in Downloader"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "%s@%s: Received unknown status code %s for article %s"
-msgstr ""
-
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
 msgstr "Liikaa yhteyksiä palvelimelle %s [%s]"
@@ -725,6 +659,10 @@ msgstr ""
 "API avain virheellinen, käytä Asetukset->Yleiset löytyvää api avainta "
 "käyttämääsi kolmannen osapuolen ohjelmaan:"
 
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
+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"
@@ -734,6 +672,10 @@ msgstr ""
 msgid "Invalid backup archive"
 msgstr ""
 
+#: sabnzbd/interface.py
+msgid "Server address \"%s:%s\" is not valid."
+msgstr "Palvelimen osoite \"%s:%s\" ei ole kelvollinen."
+
 #. Config->RSS, tab header
 #: sabnzbd/interface.py, sabnzbd/skintext.py
 msgid "Feed"
@@ -1079,10 +1021,6 @@ msgstr "Palvelin %s käyttää epäluotettavaa sertifikaattia [%s]"
 msgid "Wiki"
 msgstr "Wiki"
 
-#: sabnzbd/newswrapper.py
-msgid "Failed to connect: %s %s@%s:%s (%s)"
-msgstr ""
-
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1153,20 +1091,6 @@ msgstr ""
 msgid "Failed to send Prowl message"
 msgstr "Prowl viestin lähetys epäonnistui"
 
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "One or more Apprise URLs could not be loaded."
-msgstr ""
-
-#: sabnzbd/notifier.py
-msgid "Failed to send one or more Apprise Notifications"
-msgstr ""
-
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "Failed to send Apprise message"
-msgstr ""
-
 #. Error message
 #: sabnzbd/notifier.py
 msgid "Bad response from Pushover (%s): %s"
@@ -1409,7 +1333,7 @@ msgstr "Lopeta"
 msgid "Queue First 10 Items"
 msgstr "Vie ensimmäiset 10 kohdetta jonoon"
 
-#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+#: sabnzbd/osxmenu.py
 msgid "Empty"
 msgstr "Tyhjä"
 
@@ -2331,11 +2255,6 @@ msgstr "Skriptit"
 msgid "Delete all items from the queue?"
 msgstr "Poistetaanko kaikki kohteet jonosta?"
 
-#. Delete confirmation popup
-#: sabnzbd/skintext.py
-msgid "Are you sure you want to remove these jobs?"
-msgstr ""
-
 #. Queue page button
 #: sabnzbd/skintext.py
 msgid "Purge NZBs"
@@ -2356,11 +2275,6 @@ msgstr "Poista NZB"
 msgid "Remove NZB & Delete Files"
 msgstr "Poista NZB ja tiedostot"
 
-#. Checkbox if job should be added to Archive
-#: sabnzbd/skintext.py
-msgid "Permanently delete (skip archive)"
-msgstr ""
-
 #. Caption for missing articles in Queue
 #: sabnzbd/skintext.py
 msgid "Missing articles"
@@ -2380,10 +2294,6 @@ msgstr "käsikäyttöinen"
 msgid "Reset Quota now"
 msgstr "Resetoi latausrajoitus nyt"
 
-#: sabnzbd/skintext.py
-msgid "Archive"
-msgstr ""
-
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2404,11 +2314,6 @@ msgstr "Näytä epäonnistuneet"
 msgid "Show All"
 msgstr "Näytä kaikki"
 
-#. Button showing all archived jobs
-#: sabnzbd/skintext.py
-msgid "Show Archive"
-msgstr ""
-
 #. History table header - Size of the download quota
 #: sabnzbd/skintext.py
 msgid "Size"
@@ -2847,33 +2752,26 @@ msgstr ""
 msgid "History Retention"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid ""
+"Automatically delete completed jobs from History. Beware that Duplicate "
+"Detection and some external tools rely on History information."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Keep all jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid ""
-"Move jobs to the archive if the history exceeds specified number of jobs"
+msgid "Keep maximum number of completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Delete jobs if the history exceeds specified number of jobs"
+msgid "Keep completed jobs maximum number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Move jobs to the archive after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete jobs after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Move all completed jobs to archive"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete all completed jobs"
+msgid "Do not keep any completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3258,17 +3156,18 @@ msgstr "Hylkää"
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
+#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort post-processing"
-msgstr ""
+msgid "Abort"
+msgstr "Peruuta"
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3718,6 +3617,14 @@ msgstr "Testataan pavelimen tietoja..."
 msgid "Bandwidth"
 msgstr "Kaista"
 
+#: sabnzbd/skintext.py
+msgid "Send Group"
+msgstr "Lähetä ryhmä"
+
+#: sabnzbd/skintext.py
+msgid "Send group command before requesting articles."
+msgstr "Lähettää ryhmäkomennon ennen artikkeleiden pyytämistä."
+
 #: sabnzbd/skintext.py
 msgid "Personal notes"
 msgstr "Henkilökohtaiset huomautukset"
@@ -4102,30 +4009,6 @@ msgstr "Laite"
 msgid "Device to which message should be sent"
 msgstr "Laite johon viesti lähetetään"
 
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Enable Apprise notifications"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Send notifications using Apprise to almost any notification service"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Default Apprise URLs"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Use a comma and/or space to identify more than one URL."
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid ""
-"Override the default URLs for specific notification types below, if desired."
-msgstr ""
-
 #. Header for Notification Script notification section
 #: sabnzbd/skintext.py
 msgid "Notification Script"
@@ -4881,3 +4764,49 @@ msgstr "Osoitteen nouto epäonnistui; %s"
 #: sabnzbd/urlgrabber.py
 msgid "Trying to fetch NZB from %s"
 msgstr "Yritetään noutaa NZB osoitteesta %s"
+
+#: sabnzbd/utils/servertests.py
+msgid "The hostname is not set."
+msgstr "Isäntänimeä ei ole asetettu."
+
+#: sabnzbd/utils/servertests.py
+msgid "There are no connections set. Please set at least one connection."
+msgstr "Yhteyksiä ei ole asetettu. Aktivoi ainakin yksi yhteys."
+
+#: sabnzbd/utils/servertests.py
+msgid "Password masked in ******, please re-enter"
+msgstr "Salasana on piilotettu ******, syötä uudelleen"
+
+#: sabnzbd/utils/servertests.py
+msgid "Invalid server details"
+msgstr "Virheelliset palvelimen tiedot"
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out: Try enabling SSL or connecting on a different port."
+msgstr "Aikakatkaistu: Yritä laittaa SSL päälle tai yhdistä toiseen porttiin."
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out"
+msgstr "Aikakatkaistiin"
+
+#: sabnzbd/utils/servertests.py
+msgid ""
+"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
+msgstr ""
+"Tuntematon SSL protokolla: Kokeile ottaa SSL käytöstä tai vaihda porttia."
+
+#: sabnzbd/utils/servertests.py
+msgid "Server requires username and password."
+msgstr "Palvelin vaatii käyttäjänimen ja salasanan."
+
+#: sabnzbd/utils/servertests.py
+msgid "Connection Successful!"
+msgstr "Yhdistäminen onnistui!"
+
+#: sabnzbd/utils/servertests.py
+msgid "Too many connections, please pause downloading or try again later"
+msgstr "Liikaa yhteyksiä, keskeytä lataaminen tai yritä myöhemmin uudelleen"
+
+#: sabnzbd/utils/servertests.py
+msgid "Could not determine connection result (%s)"
+msgstr "Yhteystestin lopputulosta ei voitu määrittää (%s)"

po/main/fr.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Fred L <88com88@gmail.com>, 2024\n"
 "Language-Team: French (https://app.transifex.com/sabnzbd/teams/111101/fr/)\n"
@@ -176,76 +176,6 @@ msgstr "L'envoi de l'e-mail a réussi"
 msgid "Test Notification"
 msgstr "Test de Notification"
 
-#: sabnzbd/api.py
-msgid "The hostname is not set."
-msgstr "Le nom d'hôte n'est pas défini."
-
-#: sabnzbd/api.py
-msgid "There are no connections set. Please set at least one connection."
-msgstr ""
-"Aucune connexion n'est configurée. Veuillez définir au moins une connexion."
-
-#: sabnzbd/api.py
-msgid "Password masked in ******, please re-enter"
-msgstr "Mot de passe masqué en ******, veuillez le ressaisir."
-
-#: sabnzbd/api.py
-msgid "Invalid server details"
-msgstr "Paramètres serveur incorrects"
-
-#: sabnzbd/api.py
-msgid ""
-"Could not connect to %s on port %s. It appears that %s operates as a web "
-"server (port 80), possibly an indexer, not a usenet server. You have to fill"
-" a usenet server."
-msgstr ""
-"Impossible de se connecter à %s sur le port %s. Il semble que %s fonctionne "
-"comme un serveur web (port 80), peut-être un indexeur, et non comme un "
-"serveur Usenet. Vous devez spécifier un serveur Usenet."
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Server address \"%s:%s\" is not valid."
-msgstr "L' adresse du serveur \"%s:%s\" n'est pas valide."
-
-#: sabnzbd/api.py
-msgid "Timed out: Try enabling SSL or connecting on a different port."
-msgstr ""
-"Délai dépassé : essayez d'activer SSL ou de vous connecter sur un port "
-"différent."
-
-#: sabnzbd/api.py
-msgid "Timed out"
-msgstr "Délai dépassé"
-
-#: sabnzbd/api.py
-msgid ""
-"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
-msgstr ""
-"Protocole SSL inconnu: essayez de désactiver SSL ou de vous connecter sur un"
-" autre port."
-
-#: sabnzbd/api.py
-msgid "Server requires username and password."
-msgstr "Le serveur requiert un identifiant et un mot de passe."
-
-#: sabnzbd/api.py
-msgid "Connection Successful!"
-msgstr "Connexion réussie!"
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Authentication failed, check username/password."
-msgstr "Echec d'authentification, vérifiez les identifiant/mot de passe."
-
-#: sabnzbd/api.py
-msgid "Too many connections, please pause downloading or try again later"
-msgstr ""
-"Trop de connexions, veuillez mettre en pause le téléchargement ou essayer "
-"plus tard"
-
-#: sabnzbd/api.py
-msgid "Could not determine connection result (%s)"
-msgstr "Impossible de déterminer le résultat de la connexion (%s)"
-
 #: sabnzbd/api.py
 msgid "Resolving address"
 msgstr "Résolution de l'adresse"
@@ -546,11 +476,6 @@ msgstr "Échec d'initialisation de %s@%s pour la raison suivante : %s"
 msgid "Fatal error in Downloader"
 msgstr "Erreur fatale dans le Téléchargeur"
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "%s@%s: Received unknown status code %s for article %s"
-msgstr "%s@%s a reçu le code d'état inconnu %s pour l'article %s"
-
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
 msgstr "Trop de connexions au serveur %s [%s]"
@@ -775,6 +700,10 @@ msgstr ""
 "Clé API incorrecte, utilisez la clé API de la configuration générale dans "
 "votre application tierce :"
 
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
+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"
@@ -784,6 +713,10 @@ msgstr "Echec de la tentative de connexion de %s"
 msgid "Invalid backup archive"
 msgstr "Archives de sauvegarde non valides"
 
+#: sabnzbd/interface.py
+msgid "Server address \"%s:%s\" is not valid."
+msgstr "L' adresse du serveur \"%s:%s\" n'est pas valide."
+
 #. Config->RSS, tab header
 #: sabnzbd/interface.py, sabnzbd/skintext.py
 msgid "Feed"
@@ -1146,10 +1079,6 @@ msgstr "Le serveur %s utilise un certificat peu fiable [%s]"
 msgid "Wiki"
 msgstr "Wiki"
 
-#: sabnzbd/newswrapper.py
-msgid "Failed to connect: %s %s@%s:%s (%s)"
-msgstr "Échec de la connexion : %s %s@%s:%s (%s)"
-
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1220,20 +1149,6 @@ msgstr "Échec de l'envoi de la notification macOS"
 msgid "Failed to send Prowl message"
 msgstr "Échec d'envoi du message Prowl"
 
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "One or more Apprise URLs could not be loaded."
-msgstr "Une ou plusieurs URL Apprise n'ont pas pu être chargées."
-
-#: sabnzbd/notifier.py
-msgid "Failed to send one or more Apprise Notifications"
-msgstr "Échec de l'envoi d'une ou plusieurs notifications Apprise."
-
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "Failed to send Apprise message"
-msgstr "Échec d'envoi du message Apprise"
-
 #. Error message
 #: sabnzbd/notifier.py
 msgid "Bad response from Pushover (%s): %s"
@@ -1476,7 +1391,7 @@ msgstr "Quitter"
 msgid "Queue First 10 Items"
 msgstr "Mettre en file d'attente les 10 premiers articles"
 
-#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+#: sabnzbd/osxmenu.py
 msgid "Empty"
 msgstr "Vide"
 
@@ -2411,11 +2326,6 @@ msgstr "Scripts"
 msgid "Delete all items from the queue?"
 msgstr "Supprimer tous les éléments de la file d'attente ?"
 
-#. Delete confirmation popup
-#: sabnzbd/skintext.py
-msgid "Are you sure you want to remove these jobs?"
-msgstr "Êtes-vous sûr de vouloir supprimer ces tâches ?"
-
 #. Queue page button
 #: sabnzbd/skintext.py
 msgid "Purge NZBs"
@@ -2436,11 +2346,6 @@ msgstr "Supprimer NZB"
 msgid "Remove NZB & Delete Files"
 msgstr "Supprimer le NZB & supprimer les fichiers"
 
-#. Checkbox if job should be added to Archive
-#: sabnzbd/skintext.py
-msgid "Permanently delete (skip archive)"
-msgstr "Supprimer définitivement (ignorer l'archivage)"
-
 #. Caption for missing articles in Queue
 #: sabnzbd/skintext.py
 msgid "Missing articles"
@@ -2460,10 +2365,6 @@ msgstr "manuel"
 msgid "Reset Quota now"
 msgstr "Réinitialiser le quota maintenant"
 
-#: sabnzbd/skintext.py
-msgid "Archive"
-msgstr "Archives"
-
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2484,11 +2385,6 @@ msgstr "Afficher les échoués"
 msgid "Show All"
 msgstr "Afficher Tout"
 
-#. Button showing all archived jobs
-#: sabnzbd/skintext.py
-msgid "Show Archive"
-msgstr "Afficher les archives"
-
 #. History table header - Size of the download quota
 #: sabnzbd/skintext.py
 msgid "Size"
@@ -2946,38 +2842,30 @@ msgstr ""
 msgid "History Retention"
 msgstr "Conservation de l'historique"
 
+#: sabnzbd/skintext.py
+msgid ""
+"Automatically delete completed jobs from History. Beware that Duplicate "
+"Detection and some external tools rely on History information."
+msgstr ""
+"Supprimer automatiquement les tâches terminées de l'historique. Attention, "
+"la Détection des Doublons et certains outils externes s'appuient sur les "
+"informations de l'historique."
+
 #: sabnzbd/skintext.py
 msgid "Keep all jobs"
 msgstr "Conserver toutes les tâches"
 
 #: sabnzbd/skintext.py
-msgid ""
-"Move jobs to the archive if the history exceeds specified number of jobs"
-msgstr ""
-"Déplacez les tâches vers les archives si l'historique dépasse le nombre de "
-"tâches spécifié"
+msgid "Keep maximum number of completed jobs"
+msgstr "Nombre maximum de tâches complétées historisées"
 
 #: sabnzbd/skintext.py
-msgid "Delete jobs if the history exceeds specified number of jobs"
-msgstr ""
-"Supprimer les tâches si l'historique dépasse le nombre de tâches spécifié"
+msgid "Keep completed jobs maximum number of days"
+msgstr "Durée maximale d'historisation des tâches complétées"
 
 #: sabnzbd/skintext.py
-msgid "Move jobs to the archive after specified number of days"
-msgstr ""
-"Déplacer les tâches vers les archives après le nombre de jours spécifié"
-
-#: sabnzbd/skintext.py
-msgid "Delete jobs after specified number of days"
-msgstr "Supprimer les tâches après le nombre de jours spécifié"
-
-#: sabnzbd/skintext.py
-msgid "Move all completed jobs to archive"
-msgstr "Déplacer tous les tâches terminées vers les archives"
-
-#: sabnzbd/skintext.py
-msgid "Delete all completed jobs"
-msgstr "Supprimer toutes les tâches terminées"
+msgid "Do not keep any completed jobs"
+msgstr "Ne conserver aucune tâche terminée"
 
 #: sabnzbd/skintext.py
 msgid "Jobs"
@@ -3380,19 +3268,20 @@ msgstr ""
 msgid "Discard"
 msgstr "Rejeter"
 
-#. Four way switch for duplicates
-#: sabnzbd/skintext.py
-msgid "Tag job"
-msgstr "Taguer la tâche"
-
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
 msgid "Fail job (move to History)"
 msgstr "Faire échouer la tâche (déplacer vers l'historique)"
 
+#. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Abort post-processing"
-msgstr "Abandonner le post-traitement"
+msgid "Tag job"
+msgstr "Taguer la tâche"
+
+#. Three way switch for encrypted posts
+#: sabnzbd/skintext.py
+msgid "Abort"
+msgstr "Annuler"
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3871,6 +3760,14 @@ msgstr "Test des détails du serveur en cours..."
 msgid "Bandwidth"
 msgstr "Bande passante"
 
+#: sabnzbd/skintext.py
+msgid "Send Group"
+msgstr "Envoyer 'Group'"
+
+#: sabnzbd/skintext.py
+msgid "Send group command before requesting articles."
+msgstr "Envoyer la commande 'group' avant la demande des articles."
+
 #: sabnzbd/skintext.py
 msgid "Personal notes"
 msgstr "Notes personnelles"
@@ -4261,34 +4158,6 @@ msgstr "Appareil"
 msgid "Device to which message should be sent"
 msgstr "Appareil sur lequel le message doit être envoyé"
 
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Enable Apprise notifications"
-msgstr "Activer les notifications Apprise"
-
-#: sabnzbd/skintext.py
-msgid "Send notifications using Apprise to almost any notification service"
-msgstr ""
-"Envoyer des notifications en utilisant Apprise vers presque n'importe quel "
-"service de notification"
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Default Apprise URLs"
-msgstr "URLs par défaut d'Apprise"
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Use a comma and/or space to identify more than one URL."
-msgstr "Utilisez une virgule et/ou un espace pour identifier plusieurs URL."
-
-#: sabnzbd/skintext.py
-msgid ""
-"Override the default URLs for specific notification types below, if desired."
-msgstr ""
-"Remplacez les URL par défaut pour les types de notifications spécifiques ci-"
-"dessous, si vous le souhaitez."
-
 #. Header for Notification Script notification section
 #: sabnzbd/skintext.py
 msgid "Notification Script"
@@ -5064,3 +4933,55 @@ msgstr "Échec de récupération de l'URL ; %s"
 #: sabnzbd/urlgrabber.py
 msgid "Trying to fetch NZB from %s"
 msgstr "Essai de récupération du NZB depuis %s"
+
+#: sabnzbd/utils/servertests.py
+msgid "The hostname is not set."
+msgstr "Le nom d'hôte n'est pas défini."
+
+#: sabnzbd/utils/servertests.py
+msgid "There are no connections set. Please set at least one connection."
+msgstr ""
+"Aucune connexion n'est configurée. Veuillez définir au moins une connexion."
+
+#: sabnzbd/utils/servertests.py
+msgid "Password masked in ******, please re-enter"
+msgstr "Mot de passe masqué en ******, veuillez le ressaisir."
+
+#: sabnzbd/utils/servertests.py
+msgid "Invalid server details"
+msgstr "Paramètres serveur incorrects"
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out: Try enabling SSL or connecting on a different port."
+msgstr ""
+"Délai dépassé : essayez d'activer SSL ou de vous connecter sur un port "
+"différent."
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out"
+msgstr "Délai dépassé"
+
+#: sabnzbd/utils/servertests.py
+msgid ""
+"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
+msgstr ""
+"Protocole SSL inconnu: essayez de désactiver SSL ou de vous connecter sur un"
+" autre port."
+
+#: sabnzbd/utils/servertests.py
+msgid "Server requires username and password."
+msgstr "Le serveur requiert un identifiant et un mot de passe."
+
+#: sabnzbd/utils/servertests.py
+msgid "Connection Successful!"
+msgstr "Connexion réussie!"
+
+#: sabnzbd/utils/servertests.py
+msgid "Too many connections, please pause downloading or try again later"
+msgstr ""
+"Trop de connexions, veuillez mettre en pause le téléchargement ou essayer "
+"plus tard"
+
+#: sabnzbd/utils/servertests.py
+msgid "Could not determine connection result (%s)"
+msgstr "Impossible de déterminer le résultat de la connexion (%s)"

po/main/he.po

@@ -3,19 +3,19 @@
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2023
-# ION, 2024
+# ION, 2023
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
-"Last-Translator: ION, 2024\n"
+"Last-Translator: ION, 2023\n"
 "Language-Team: Hebrew (https://app.transifex.com/sabnzbd/teams/111101/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
 #. Notification - Status page, table column header, actual message
 #: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
@@ -164,66 +164,6 @@ msgstr "דוא״ל הצליח"
 msgid "Test Notification"
 msgstr "בחן התראה"
 
-#: sabnzbd/api.py
-msgid "The hostname is not set."
-msgstr "שם המארח לא נקבע."
-
-#: sabnzbd/api.py
-msgid "There are no connections set. Please set at least one connection."
-msgstr "אין חיבורים שנקבעו. אנא קבע לפחות חיבור אחד."
-
-#: sabnzbd/api.py
-msgid "Password masked in ******, please re-enter"
-msgstr "סיסמאות מוסוות באמצעות ******, אנא הכנס מחדש"
-
-#: sabnzbd/api.py
-msgid "Invalid server details"
-msgstr "פרטי שרת בלתי תקפים"
-
-#: sabnzbd/api.py
-msgid ""
-"Could not connect to %s on port %s. It appears that %s operates as a web "
-"server (port 80), possibly an indexer, not a usenet server. You have to fill"
-" a usenet server."
-msgstr ""
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Server address \"%s:%s\" is not valid."
-msgstr "כתובת השרת \"%s:%s\" אינה תקפה."
-
-#: sabnzbd/api.py
-msgid "Timed out: Try enabling SSL or connecting on a different port."
-msgstr "פסק זמן חלף: נסה לאפשר SSL או להתחבר על פתחה שונה."
-
-#: sabnzbd/api.py
-msgid "Timed out"
-msgstr "אזל הזמן"
-
-#: sabnzbd/api.py
-msgid ""
-"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
-msgstr "פרוטוקול SSL בלתי ידוע: נסה להשבית SSL או להתחבר על פתחה שונה."
-
-#: sabnzbd/api.py
-msgid "Server requires username and password."
-msgstr ".השרת דורש שם משתמש וסיסמה"
-
-#: sabnzbd/api.py
-msgid "Connection Successful!"
-msgstr "חיבור מוצלח!"
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Authentication failed, check username/password."
-msgstr "אימות נכשל, בדוק שם משתמש/סיסמה."
-
-#: sabnzbd/api.py
-msgid "Too many connections, please pause downloading or try again later"
-msgstr "יותר מדי חיבורים, אנא השהה הורדה או נסה שוב מאוחר יותר"
-
-#: sabnzbd/api.py
-msgid "Could not determine connection result (%s)"
-msgstr "(%s) לא היה ניתן לקבוע תוצאת חיבור"
-
 #: sabnzbd/api.py
 msgid "Resolving address"
 msgstr "פותר כתובת"
@@ -340,7 +280,7 @@ msgstr ""
 #. Warning message
 #: sabnzbd/cfg.py
 msgid "Network path \"%s\" should not be used here"
-msgstr "נתיב הרשת \"%s\" לא אמור להיות בשימוש כאן"
+msgstr ""
 
 #: sabnzbd/cfg.py
 msgid "Queue not empty, cannot change folder."
@@ -509,11 +449,6 @@ msgstr "כישלון באתחול %s@%s עם סיבה: %s"
 msgid "Fatal error in Downloader"
 msgstr "שגיאה גורלית במורידן"
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "%s@%s: Received unknown status code %s for article %s"
-msgstr ""
-
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
 msgstr "יותר מדי חיבורים לשרת %s [%s]"
@@ -728,6 +663,10 @@ msgid ""
 "program:"
 msgstr "מפתח API שגוי, השתמש במפתח ה־API מתצורה->כללי בתוכנית הצד השלישי שלך:"
 
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
+msgid "Authentication failed, check username/password."
+msgstr "אימות נכשל, בדוק שם משתמש/סיסמה."
+
 #. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
@@ -737,6 +676,10 @@ msgstr "ניסיון כניסה בלתי מוצלח מן %s"
 msgid "Invalid backup archive"
 msgstr "ארכיון בלתי תקף של גיבוי"
 
+#: sabnzbd/interface.py
+msgid "Server address \"%s:%s\" is not valid."
+msgstr "כתובת השרת \"%s:%s\" אינה תקפה."
+
 #. Config->RSS, tab header
 #: sabnzbd/interface.py, sabnzbd/skintext.py
 msgid "Feed"
@@ -799,7 +742,6 @@ msgstr "הקודם"
 msgid ""
 "To prevent all helpful warnings, disable Special setting 'helpful_warnings'."
 msgstr ""
-"כדי למנוע את כל האזהרות המועילות, השבת את ההגדרה המיוחדת 'helpful_warnings'."
 
 #: sabnzbd/misc.py
 msgid "d"
@@ -1086,10 +1028,6 @@ msgstr "השרת %s משתמש בתעודה בלתי מהימנה [%s]"
 msgid "Wiki"
 msgstr "וויקי"
 
-#: sabnzbd/newswrapper.py
-msgid "Failed to connect: %s %s@%s:%s (%s)"
-msgstr ""
-
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1140,7 +1078,7 @@ msgstr "הודעות אחרות"
 #. Notification action
 #: sabnzbd/notifier.py
 msgid "Open folder"
-msgstr "פתח תיקייה"
+msgstr ""
 
 #. Notification action
 #: sabnzbd/notifier.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
@@ -1160,20 +1098,6 @@ msgstr "כישלון בשליחת התראת macOS"
 msgid "Failed to send Prowl message"
 msgstr "כישלון בשליחת הודעת Prowl"
 
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "One or more Apprise URLs could not be loaded."
-msgstr "כתובת Apprise אחת או יותר לא יכלו להיטען."
-
-#: sabnzbd/notifier.py
-msgid "Failed to send one or more Apprise Notifications"
-msgstr "כישלון בשליחת התראת Apprise אחת או יותר"
-
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "Failed to send Apprise message"
-msgstr "כישלון בשליחת הודעת Apprise"
-
 #. Error message
 #: sabnzbd/notifier.py
 msgid "Bad response from Pushover (%s): %s"
@@ -1416,7 +1340,7 @@ msgstr "צא"
 msgid "Queue First 10 Items"
 msgstr "הוסף לתור 10 פריטים ראשונים"
 
-#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+#: sabnzbd/osxmenu.py
 msgid "Empty"
 msgstr "ריק"
 
@@ -2186,7 +2110,7 @@ msgstr "פורום"
 #. Main menu item
 #: sabnzbd/skintext.py
 msgid "Live Chat"
-msgstr "צ'אט חי"
+msgstr ""
 
 #. Main menu item
 #: sabnzbd/skintext.py
@@ -2342,11 +2266,6 @@ msgstr "תסריטים"
 msgid "Delete all items from the queue?"
 msgstr "למחוק את כל הפריטים מהתור?"
 
-#. Delete confirmation popup
-#: sabnzbd/skintext.py
-msgid "Are you sure you want to remove these jobs?"
-msgstr ""
-
 #. Queue page button
 #: sabnzbd/skintext.py
 msgid "Purge NZBs"
@@ -2367,11 +2286,6 @@ msgstr "הסר NZB"
 msgid "Remove NZB & Delete Files"
 msgstr "הסר NZB ומחק קבצים"
 
-#. Checkbox if job should be added to Archive
-#: sabnzbd/skintext.py
-msgid "Permanently delete (skip archive)"
-msgstr ""
-
 #. Caption for missing articles in Queue
 #: sabnzbd/skintext.py
 msgid "Missing articles"
@@ -2391,10 +2305,6 @@ msgstr "ידני"
 msgid "Reset Quota now"
 msgstr "אפס מכסה כעת"
 
-#: sabnzbd/skintext.py
-msgid "Archive"
-msgstr ""
-
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2415,11 +2325,6 @@ msgstr "הראה נכשלים"
 msgid "Show All"
 msgstr "הראה הכל"
 
-#. Button showing all archived jobs
-#: sabnzbd/skintext.py
-msgid "Show Archive"
-msgstr ""
-
 #. History table header - Size of the download quota
 #: sabnzbd/skintext.py
 msgid "Size"
@@ -2702,11 +2607,11 @@ msgstr "פתחה אשר SABnzbd צריך להאזין אליה."
 
 #: sabnzbd/skintext.py
 msgid "Web Interface Theme"
-msgstr "ערכת נושא של ממשק רשת"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Choose a theme."
-msgstr "בחר ערכת נושא."
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "SABnzbd Username"
@@ -2859,34 +2764,29 @@ msgstr ""
 msgid "History Retention"
 msgstr "שימור היסטוריה"
 
+#: sabnzbd/skintext.py
+msgid ""
+"Automatically delete completed jobs from History. Beware that Duplicate "
+"Detection and some external tools rely on History information."
+msgstr ""
+"מחק באופן אוטומטי עבודות שלמות מההיסטוריה. שים לב ששימור כפול ומספר כלים "
+"חיצוניים מסתמכים על מידע היסטוריה."
+
 #: sabnzbd/skintext.py
 msgid "Keep all jobs"
 msgstr "שמור את כל העבודות"
 
 #: sabnzbd/skintext.py
-msgid ""
-"Move jobs to the archive if the history exceeds specified number of jobs"
-msgstr ""
+msgid "Keep maximum number of completed jobs"
+msgstr "שמור מספר מרבי של עבודות שלמות"
 
 #: sabnzbd/skintext.py
-msgid "Delete jobs if the history exceeds specified number of jobs"
-msgstr ""
+msgid "Keep completed jobs maximum number of days"
+msgstr "שמור מספר ימים מרבי של עבודות שלמות"
 
 #: sabnzbd/skintext.py
-msgid "Move jobs to the archive after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete jobs after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Move all completed jobs to archive"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete all completed jobs"
-msgstr ""
+msgid "Do not keep any completed jobs"
+msgstr "אל תשמור עבודות שלמות כלשהן"
 
 #: sabnzbd/skintext.py
 msgid "Jobs"
@@ -3260,19 +3160,20 @@ msgstr "עקוף גילוי שכפולים חכם אם PROPER, REAL או REPACK
 msgid "Discard"
 msgstr "השלך"
 
-#. Four way switch for duplicates
-#: sabnzbd/skintext.py
-msgid "Tag job"
-msgstr "הצמד תג לעבודה"
-
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
 msgid "Fail job (move to History)"
 msgstr "הכשל עבודה (העבר להיסטוריה)"
 
+#. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Abort post-processing"
-msgstr "בטל בתר־עיבוד"
+msgid "Tag job"
+msgstr "הצמד תג לעבודה"
+
+#. Three way switch for encrypted posts
+#: sabnzbd/skintext.py
+msgid "Abort"
+msgstr "בטל"
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3725,6 +3626,14 @@ msgstr "בוחן פרטי שרת…"
 msgid "Bandwidth"
 msgstr "רוחב פס"
 
+#: sabnzbd/skintext.py
+msgid "Send Group"
+msgstr "שלח קבוצה"
+
+#: sabnzbd/skintext.py
+msgid "Send group command before requesting articles."
+msgstr "פקודת שלח קבוצה לפני בקשת מאמרים."
+
 #: sabnzbd/skintext.py
 msgid "Personal notes"
 msgstr "הערות אישיות"
@@ -4110,32 +4019,6 @@ msgstr "התקן"
 msgid "Device to which message should be sent"
 msgstr "מכשיר אליו הודעה תישלח"
 
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Enable Apprise notifications"
-msgstr "אפשר התראות Apprise"
-
-#: sabnzbd/skintext.py
-msgid "Send notifications using Apprise to almost any notification service"
-msgstr "שלח התראות ע״י שימוש בשירות Apprise אל כמעט כל שירות התראות"
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Default Apprise URLs"
-msgstr "כתובות Apprise ברירות מחדל"
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Use a comma and/or space to identify more than one URL."
-msgstr "השתמש בפסיק, ברווח או בשניהם כדי לזהות יותר מכתובת אחת."
-
-#: sabnzbd/skintext.py
-msgid ""
-"Override the default URLs for specific notification types below, if desired."
-msgstr ""
-"דרוס את כתובות ברירות המחדל עבור סוגי התראה מסויימים שמצויינים למטה, אם תרצה"
-" בכך."
-
 #. Header for Notification Script notification section
 #: sabnzbd/skintext.py
 msgid "Notification Script"
@@ -4622,8 +4505,6 @@ msgid ""
 "When you Retry a job, 'Duplicate Detection' and 'Abort jobs that cannot be "
 "completed' are disabled."
 msgstr ""
-"כשאתה מנסה שוב עבודה, העבודות 'גילוי שכפולים' ו'בטל עבודות שאינן יכולות "
-"להיות שלמות' מושבתות."
 
 #: sabnzbd/skintext.py
 msgid "View Script Log"
@@ -4893,3 +4774,48 @@ msgstr "משיכת כתובת נכשלה; %s"
 #: sabnzbd/urlgrabber.py
 msgid "Trying to fetch NZB from %s"
 msgstr "מנסה למשוך קובץ NZB מן %s"
+
+#: sabnzbd/utils/servertests.py
+msgid "The hostname is not set."
+msgstr "שם המארח לא נקבע."
+
+#: sabnzbd/utils/servertests.py
+msgid "There are no connections set. Please set at least one connection."
+msgstr "אין חיבורים שנקבעו. אנא קבע לפחות חיבור אחד."
+
+#: sabnzbd/utils/servertests.py
+msgid "Password masked in ******, please re-enter"
+msgstr "סיסמאות מוסוות באמצעות ******, אנא הכנס מחדש"
+
+#: sabnzbd/utils/servertests.py
+msgid "Invalid server details"
+msgstr "פרטי שרת בלתי תקפים"
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out: Try enabling SSL or connecting on a different port."
+msgstr "פסק זמן חלף: נסה לאפשר SSL או להתחבר על פתחה שונה."
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out"
+msgstr "אזל הזמן"
+
+#: sabnzbd/utils/servertests.py
+msgid ""
+"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
+msgstr "פרוטוקול SSL בלתי ידוע: נסה להשבית SSL או להתחבר על פתחה שונה."
+
+#: sabnzbd/utils/servertests.py
+msgid "Server requires username and password."
+msgstr ".השרת דורש שם משתמש וסיסמה"
+
+#: sabnzbd/utils/servertests.py
+msgid "Connection Successful!"
+msgstr "חיבור מוצלח!"
+
+#: sabnzbd/utils/servertests.py
+msgid "Too many connections, please pause downloading or try again later"
+msgstr "יותר מדי חיבורים, אנא השהה הורדה או נסה שוב מאוחר יותר"
+
+#: sabnzbd/utils/servertests.py
+msgid "Could not determine connection result (%s)"
+msgstr "(%s) לא היה ניתן לקבוע תוצאת חיבור"

po/main/it.po

@@ -3,7 +3,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Language-Team: Italian (https://app.transifex.com/sabnzbd/teams/111101/it/)\n"
 "MIME-Version: 1.0\n"
@@ -155,66 +155,6 @@ msgstr ""
 msgid "Test Notification"
 msgstr ""
 
-#: sabnzbd/api.py
-msgid "The hostname is not set."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "There are no connections set. Please set at least one connection."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Password masked in ******, please re-enter"
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Invalid server details"
-msgstr ""
-
-#: sabnzbd/api.py
-msgid ""
-"Could not connect to %s on port %s. It appears that %s operates as a web "
-"server (port 80), possibly an indexer, not a usenet server. You have to fill"
-" a usenet server."
-msgstr ""
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Server address \"%s:%s\" is not valid."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Timed out: Try enabling SSL or connecting on a different port."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Timed out"
-msgstr ""
-
-#: sabnzbd/api.py
-msgid ""
-"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Server requires username and password."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Connection Successful!"
-msgstr ""
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Authentication failed, check username/password."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Too many connections, please pause downloading or try again later"
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Could not determine connection result (%s)"
-msgstr ""
-
 #: sabnzbd/api.py
 msgid "Resolving address"
 msgstr ""
@@ -492,11 +432,6 @@ msgstr ""
 msgid "Fatal error in Downloader"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "%s@%s: Received unknown status code %s for article %s"
-msgstr ""
-
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
 msgstr ""
@@ -697,6 +632,10 @@ msgid ""
 "program:"
 msgstr ""
 
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
+msgid "Authentication failed, check username/password."
+msgstr ""
+
 #. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
@@ -706,6 +645,10 @@ msgstr ""
 msgid "Invalid backup archive"
 msgstr ""
 
+#: sabnzbd/interface.py
+msgid "Server address \"%s:%s\" is not valid."
+msgstr ""
+
 #. Config->RSS, tab header
 #: sabnzbd/interface.py, sabnzbd/skintext.py
 msgid "Feed"
@@ -1050,10 +993,6 @@ msgstr ""
 msgid "Wiki"
 msgstr ""
 
-#: sabnzbd/newswrapper.py
-msgid "Failed to connect: %s %s@%s:%s (%s)"
-msgstr ""
-
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1124,20 +1063,6 @@ msgstr ""
 msgid "Failed to send Prowl message"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "One or more Apprise URLs could not be loaded."
-msgstr ""
-
-#: sabnzbd/notifier.py
-msgid "Failed to send one or more Apprise Notifications"
-msgstr ""
-
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "Failed to send Apprise message"
-msgstr ""
-
 #. Error message
 #: sabnzbd/notifier.py
 msgid "Bad response from Pushover (%s): %s"
@@ -1380,7 +1305,7 @@ msgstr ""
 msgid "Queue First 10 Items"
 msgstr ""
 
-#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+#: sabnzbd/osxmenu.py
 msgid "Empty"
 msgstr ""
 
@@ -2274,11 +2199,6 @@ msgstr ""
 msgid "Delete all items from the queue?"
 msgstr ""
 
-#. Delete confirmation popup
-#: sabnzbd/skintext.py
-msgid "Are you sure you want to remove these jobs?"
-msgstr ""
-
 #. Queue page button
 #: sabnzbd/skintext.py
 msgid "Purge NZBs"
@@ -2299,11 +2219,6 @@ msgstr ""
 msgid "Remove NZB & Delete Files"
 msgstr ""
 
-#. Checkbox if job should be added to Archive
-#: sabnzbd/skintext.py
-msgid "Permanently delete (skip archive)"
-msgstr ""
-
 #. Caption for missing articles in Queue
 #: sabnzbd/skintext.py
 msgid "Missing articles"
@@ -2323,10 +2238,6 @@ msgstr ""
 msgid "Reset Quota now"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "Archive"
-msgstr ""
-
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2347,11 +2258,6 @@ msgstr ""
 msgid "Show All"
 msgstr ""
 
-#. Button showing all archived jobs
-#: sabnzbd/skintext.py
-msgid "Show Archive"
-msgstr ""
-
 #. History table header - Size of the download quota
 #: sabnzbd/skintext.py
 msgid "Size"
@@ -2769,33 +2675,26 @@ msgstr ""
 msgid "History Retention"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid ""
+"Automatically delete completed jobs from History. Beware that Duplicate "
+"Detection and some external tools rely on History information."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Keep all jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid ""
-"Move jobs to the archive if the history exceeds specified number of jobs"
+msgid "Keep maximum number of completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Delete jobs if the history exceeds specified number of jobs"
+msgid "Keep completed jobs maximum number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Move jobs to the archive after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete jobs after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Move all completed jobs to archive"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete all completed jobs"
+msgid "Do not keep any completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3150,16 +3049,17 @@ msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
+#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort post-processing"
+msgid "Abort"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3595,6 +3495,14 @@ msgstr ""
 msgid "Bandwidth"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Send Group"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Send group command before requesting articles."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Personal notes"
 msgstr ""
@@ -3975,30 +3883,6 @@ msgstr ""
 msgid "Device to which message should be sent"
 msgstr ""
 
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Enable Apprise notifications"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Send notifications using Apprise to almost any notification service"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Default Apprise URLs"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Use a comma and/or space to identify more than one URL."
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid ""
-"Override the default URLs for specific notification types below, if desired."
-msgstr ""
-
 #. Header for Notification Script notification section
 #: sabnzbd/skintext.py
 msgid "Notification Script"
@@ -4732,3 +4616,48 @@ msgstr ""
 #: sabnzbd/urlgrabber.py
 msgid "Trying to fetch NZB from %s"
 msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "The hostname is not set."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "There are no connections set. Please set at least one connection."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Password masked in ******, please re-enter"
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Invalid server details"
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out: Try enabling SSL or connecting on a different port."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out"
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid ""
+"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Server requires username and password."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Connection Successful!"
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Too many connections, please pause downloading or try again later"
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Could not determine connection result (%s)"
+msgstr ""

po/main/nb.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Norwegian Bokmål (https://app.transifex.com/sabnzbd/teams/111101/nb/)\n"
@@ -163,69 +163,6 @@ msgstr "E-post sendning lykkes"
 msgid "Test Notification"
 msgstr "Test varslingen"
 
-#: sabnzbd/api.py
-msgid "The hostname is not set."
-msgstr "Du har ikke stilt inn vertsnavn."
-
-#: sabnzbd/api.py
-msgid "There are no connections set. Please set at least one connection."
-msgstr "Ingen tilkoblinger er aktivert. Du må aktivere minst en tilkobling."
-
-#: sabnzbd/api.py
-msgid "Password masked in ******, please re-enter"
-msgstr "Passordet er skjult med ******, prøv igjen"
-
-#: sabnzbd/api.py
-msgid "Invalid server details"
-msgstr "Ugyldige server-innstillinger"
-
-#: sabnzbd/api.py
-msgid ""
-"Could not connect to %s on port %s. It appears that %s operates as a web "
-"server (port 80), possibly an indexer, not a usenet server. You have to fill"
-" a usenet server."
-msgstr ""
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Server address \"%s:%s\" is not valid."
-msgstr "Serveradressen \"%s:%s\" er ikke gyldig."
-
-#: sabnzbd/api.py
-msgid "Timed out: Try enabling SSL or connecting on a different port."
-msgstr "Tidsavbrudd: Prøv å aktivere SSL eller bruk en annen port."
-
-#: sabnzbd/api.py
-msgid "Timed out"
-msgstr "Tidsavbrudd"
-
-#: sabnzbd/api.py
-msgid ""
-"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
-msgstr ""
-"Ukjent SSL-protokoll: Prøv å deaktivere SSL eller koble til på en annen "
-"port."
-
-#: sabnzbd/api.py
-msgid "Server requires username and password."
-msgstr "Server krever brukernavn og passord."
-
-#: sabnzbd/api.py
-msgid "Connection Successful!"
-msgstr "Tilkobling lyktes!"
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Authentication failed, check username/password."
-msgstr "Godkjenning mislyktes, kontroller brukernavn og passord."
-
-#: sabnzbd/api.py
-msgid "Too many connections, please pause downloading or try again later"
-msgstr ""
-"For mange tilkoblinger, sett nedlasting på pause eller prøv igjen senere"
-
-#: sabnzbd/api.py
-msgid "Could not determine connection result (%s)"
-msgstr "Kunne ikke koble til (%s)"
-
 #: sabnzbd/api.py
 msgid "Resolving address"
 msgstr "Løs adresse"
@@ -503,11 +440,6 @@ msgstr "Feilet å starte %s@%s grunnet: %s"
 msgid "Fatal error in Downloader"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "%s@%s: Received unknown status code %s for article %s"
-msgstr ""
-
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
 msgstr "For mange tilkoblinger til server %s [%s]"
@@ -722,6 +654,10 @@ msgstr ""
 "API-nøkkel er feil, bruk API-nøkkel fra Konfigurasjon->Generelt i ditt "
 "tredjepartsprogram:"
 
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
+msgid "Authentication failed, check username/password."
+msgstr "Godkjenning mislyktes, kontroller brukernavn og passord."
+
 #. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
@@ -731,6 +667,10 @@ msgstr "Mislykket påloggingsforsøk fra %s"
 msgid "Invalid backup archive"
 msgstr ""
 
+#: sabnzbd/interface.py
+msgid "Server address \"%s:%s\" is not valid."
+msgstr "Serveradressen \"%s:%s\" er ikke gyldig."
+
 #. Config->RSS, tab header
 #: sabnzbd/interface.py, sabnzbd/skintext.py
 msgid "Feed"
@@ -1077,10 +1017,6 @@ msgstr ""
 msgid "Wiki"
 msgstr "Wiki"
 
-#: sabnzbd/newswrapper.py
-msgid "Failed to connect: %s %s@%s:%s (%s)"
-msgstr ""
-
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1151,20 +1087,6 @@ msgstr ""
 msgid "Failed to send Prowl message"
 msgstr "Klarte ikke å sende Prowl melding"
 
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "One or more Apprise URLs could not be loaded."
-msgstr ""
-
-#: sabnzbd/notifier.py
-msgid "Failed to send one or more Apprise Notifications"
-msgstr ""
-
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "Failed to send Apprise message"
-msgstr ""
-
 #. Error message
 #: sabnzbd/notifier.py
 msgid "Bad response from Pushover (%s): %s"
@@ -1407,7 +1329,7 @@ msgstr "Avslutte"
 msgid "Queue First 10 Items"
 msgstr "Kø (10 første)"
 
-#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+#: sabnzbd/osxmenu.py
 msgid "Empty"
 msgstr "Tom"
 
@@ -2329,11 +2251,6 @@ msgstr "Skripts"
 msgid "Delete all items from the queue?"
 msgstr "Slett alt fra køen?"
 
-#. Delete confirmation popup
-#: sabnzbd/skintext.py
-msgid "Are you sure you want to remove these jobs?"
-msgstr ""
-
 #. Queue page button
 #: sabnzbd/skintext.py
 msgid "Purge NZBs"
@@ -2354,11 +2271,6 @@ msgstr "Fjern NZB"
 msgid "Remove NZB & Delete Files"
 msgstr "Fjern NZB & slett filer"
 
-#. Checkbox if job should be added to Archive
-#: sabnzbd/skintext.py
-msgid "Permanently delete (skip archive)"
-msgstr ""
-
 #. Caption for missing articles in Queue
 #: sabnzbd/skintext.py
 msgid "Missing articles"
@@ -2378,10 +2290,6 @@ msgstr "manuelt"
 msgid "Reset Quota now"
 msgstr "Nullstill kvote nå"
 
-#: sabnzbd/skintext.py
-msgid "Archive"
-msgstr ""
-
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2402,11 +2310,6 @@ msgstr "Vis Mislykkede"
 msgid "Show All"
 msgstr "Vis alle"
 
-#. Button showing all archived jobs
-#: sabnzbd/skintext.py
-msgid "Show Archive"
-msgstr ""
-
 #. History table header - Size of the download quota
 #: sabnzbd/skintext.py
 msgid "Size"
@@ -2839,33 +2742,26 @@ msgstr ""
 msgid "History Retention"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid ""
+"Automatically delete completed jobs from History. Beware that Duplicate "
+"Detection and some external tools rely on History information."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Keep all jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid ""
-"Move jobs to the archive if the history exceeds specified number of jobs"
+msgid "Keep maximum number of completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Delete jobs if the history exceeds specified number of jobs"
+msgid "Keep completed jobs maximum number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Move jobs to the archive after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete jobs after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Move all completed jobs to archive"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete all completed jobs"
+msgid "Do not keep any completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3241,17 +3137,18 @@ msgstr "Forkast"
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
+#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort post-processing"
-msgstr ""
+msgid "Abort"
+msgstr "Avbryt"
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3697,6 +3594,14 @@ msgstr "Tester serverinstillinger..."
 msgid "Bandwidth"
 msgstr "Båndbredde"
 
+#: sabnzbd/skintext.py
+msgid "Send Group"
+msgstr "Send gruppe"
+
+#: sabnzbd/skintext.py
+msgid "Send group command before requesting articles."
+msgstr "Send gruppekommando før du ber om artikler."
+
 #: sabnzbd/skintext.py
 msgid "Personal notes"
 msgstr "Persolige notater"
@@ -4081,30 +3986,6 @@ msgstr "Enhet"
 msgid "Device to which message should be sent"
 msgstr "Enheten meldingen skal sendes til"
 
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Enable Apprise notifications"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Send notifications using Apprise to almost any notification service"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Default Apprise URLs"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Use a comma and/or space to identify more than one URL."
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid ""
-"Override the default URLs for specific notification types below, if desired."
-msgstr ""
-
 #. Header for Notification Script notification section
 #: sabnzbd/skintext.py
 msgid "Notification Script"
@@ -4853,3 +4734,51 @@ msgstr "URL henting mislyktes; %s"
 #: sabnzbd/urlgrabber.py
 msgid "Trying to fetch NZB from %s"
 msgstr "Forsøker å hente NZB fra %s"
+
+#: sabnzbd/utils/servertests.py
+msgid "The hostname is not set."
+msgstr "Du har ikke stilt inn vertsnavn."
+
+#: sabnzbd/utils/servertests.py
+msgid "There are no connections set. Please set at least one connection."
+msgstr "Ingen tilkoblinger er aktivert. Du må aktivere minst en tilkobling."
+
+#: sabnzbd/utils/servertests.py
+msgid "Password masked in ******, please re-enter"
+msgstr "Passordet er skjult med ******, prøv igjen"
+
+#: sabnzbd/utils/servertests.py
+msgid "Invalid server details"
+msgstr "Ugyldige server-innstillinger"
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out: Try enabling SSL or connecting on a different port."
+msgstr "Tidsavbrudd: Prøv å aktivere SSL eller bruk en annen port."
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out"
+msgstr "Tidsavbrudd"
+
+#: sabnzbd/utils/servertests.py
+msgid ""
+"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
+msgstr ""
+"Ukjent SSL-protokoll: Prøv å deaktivere SSL eller koble til på en annen "
+"port."
+
+#: sabnzbd/utils/servertests.py
+msgid "Server requires username and password."
+msgstr "Server krever brukernavn og passord."
+
+#: sabnzbd/utils/servertests.py
+msgid "Connection Successful!"
+msgstr "Tilkobling lyktes!"
+
+#: sabnzbd/utils/servertests.py
+msgid "Too many connections, please pause downloading or try again later"
+msgstr ""
+"For mange tilkoblinger, sett nedlasting på pause eller prøv igjen senere"
+
+#: sabnzbd/utils/servertests.py
+msgid "Could not determine connection result (%s)"
+msgstr "Kunne ikke koble til (%s)"

po/main/nl.po

@@ -8,7 +8,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2024\n"
 "Language-Team: Dutch (https://app.transifex.com/sabnzbd/teams/111101/nl/)\n"
@@ -171,73 +171,6 @@ msgstr "E-mail verzonden"
 msgid "Test Notification"
 msgstr "Test melding"
 
-#: sabnzbd/api.py
-msgid "The hostname is not set."
-msgstr "Geen hostnaam opgegeven."
-
-#: sabnzbd/api.py
-msgid "There are no connections set. Please set at least one connection."
-msgstr ""
-"Er zijn geen verbindingen opgegeven. Er is minimaal één verbinding nodig."
-
-#: sabnzbd/api.py
-msgid "Password masked in ******, please re-enter"
-msgstr "Wachtwoord gemaskeerd met ******, voer opnieuw in"
-
-#: sabnzbd/api.py
-msgid "Invalid server details"
-msgstr "Ongeldige servergegevens"
-
-#: sabnzbd/api.py
-msgid ""
-"Could not connect to %s on port %s. It appears that %s operates as a web "
-"server (port 80), possibly an indexer, not a usenet server. You have to fill"
-" a usenet server."
-msgstr ""
-"Kon geen verbinding maken met %s op poort %s. Het lijkt erop dat %s "
-"functioneert als een webserver (poort 80), mogelijk een indexer, geen "
-"usenetserver. Vul een usenetserver in."
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Server address \"%s:%s\" is not valid."
-msgstr "Serveradres \"%s:%s\" is niet geldig."
-
-#: sabnzbd/api.py
-msgid "Timed out: Try enabling SSL or connecting on a different port."
-msgstr ""
-"Tijdslimiet overschreden. Probeer met SSL aan of gebruik een andere poort."
-
-#: sabnzbd/api.py
-msgid "Timed out"
-msgstr "Tijdslimiet overschreden"
-
-#: sabnzbd/api.py
-msgid ""
-"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
-msgstr ""
-"Onbekend SSL protocol: probeer het zonder SSL of probeer een andere poort."
-
-#: sabnzbd/api.py
-msgid "Server requires username and password."
-msgstr "Server heeft een gebruikersnaam en een wachtwoord nodig."
-
-#: sabnzbd/api.py
-msgid "Connection Successful!"
-msgstr "Succesvol verbonden!"
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Authentication failed, check username/password."
-msgstr "Inloggen mislukt, controleer gebruikersnaam en wachtwoord."
-
-#: sabnzbd/api.py
-msgid "Too many connections, please pause downloading or try again later"
-msgstr ""
-"Te veel verbindingen, onderbreek het downloaden of probeer later nog eens."
-
-#: sabnzbd/api.py
-msgid "Could not determine connection result (%s)"
-msgstr "Kan verbindingsresultaat niet bepalen (%s)"
-
 #: sabnzbd/api.py
 msgid "Resolving address"
 msgstr "Adres opzoeken"
@@ -540,11 +473,6 @@ msgstr "Initialisatie van %s@%s mislukt, vanwege: %s"
 msgid "Fatal error in Downloader"
 msgstr "Onherstelbare fout in de Downloader"
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "%s@%s: Received unknown status code %s for article %s"
-msgstr "%s@%s: Onbekende statuscode %s ontvangen voor artikel %s"
-
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
 msgstr "Te veel verbindingen met server %s [%s]"
@@ -769,6 +697,10 @@ msgstr ""
 "API-sleutel incorrect; vul de API-sleutel van 'Configuratie' => 'Algemeen' "
 "in bij het externe programma:"
 
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
+msgid "Authentication failed, check username/password."
+msgstr "Inloggen mislukt, controleer gebruikersnaam en wachtwoord."
+
 #. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
@@ -778,6 +710,10 @@ msgstr "Mislukte login poging van %s"
 msgid "Invalid backup archive"
 msgstr "Ongeldig backup bestand"
 
+#: sabnzbd/interface.py
+msgid "Server address \"%s:%s\" is not valid."
+msgstr "Serveradres \"%s:%s\" is niet geldig."
+
 #. Config->RSS, tab header
 #: sabnzbd/interface.py, sabnzbd/skintext.py
 msgid "Feed"
@@ -1136,10 +1072,6 @@ msgstr "Server %s gebruikt een niet betrouwbaar certificaat [%s]"
 msgid "Wiki"
 msgstr "Wiki"
 
-#: sabnzbd/newswrapper.py
-msgid "Failed to connect: %s %s@%s:%s (%s)"
-msgstr "Kon geen verbinding maken: %s %s@%s:%s (%s)"
-
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1210,20 +1142,6 @@ msgstr "Kon macOS notificatie niet verzenden"
 msgid "Failed to send Prowl message"
 msgstr "Verzenden van Prowl-bericht mislukt"
 
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "One or more Apprise URLs could not be loaded."
-msgstr "Eén of meerdere Apprise-URL's konden niet worden geladen."
-
-#: sabnzbd/notifier.py
-msgid "Failed to send one or more Apprise Notifications"
-msgstr "Kon één of meerdere Apprise-meldingen niet verzenden"
-
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "Failed to send Apprise message"
-msgstr "Verzenden van Apprise-bericht mislukt"
-
 #. Error message
 #: sabnzbd/notifier.py
 msgid "Bad response from Pushover (%s): %s"
@@ -1466,7 +1384,7 @@ msgstr "Afsluiten"
 msgid "Queue First 10 Items"
 msgstr "Wachtrij Eerste 10 Items"
 
-#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+#: sabnzbd/osxmenu.py
 msgid "Empty"
 msgstr "Leeg"
 
@@ -2393,11 +2311,6 @@ msgstr "Scripts"
 msgid "Delete all items from the queue?"
 msgstr "Verwijder alle downloads uit de wachtrij?"
 
-#. Delete confirmation popup
-#: sabnzbd/skintext.py
-msgid "Are you sure you want to remove these jobs?"
-msgstr "Weet je zeker dat je deze downloads wilt verwijderen?"
-
 #. Queue page button
 #: sabnzbd/skintext.py
 msgid "Purge NZBs"
@@ -2418,11 +2331,6 @@ msgstr "Verwijder download"
 msgid "Remove NZB & Delete Files"
 msgstr "Verwijder download incl. bestanden"
 
-#. Checkbox if job should be added to Archive
-#: sabnzbd/skintext.py
-msgid "Permanently delete (skip archive)"
-msgstr "Permanent verwijderen (archief overslaan)"
-
 #. Caption for missing articles in Queue
 #: sabnzbd/skintext.py
 msgid "Missing articles"
@@ -2442,10 +2350,6 @@ msgstr "handmatig"
 msgid "Reset Quota now"
 msgstr "Quotum nu resetten"
 
-#: sabnzbd/skintext.py
-msgid "Archive"
-msgstr "Archief"
-
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2466,11 +2370,6 @@ msgstr "Toon mislukte"
 msgid "Show All"
 msgstr "Toon Alles"
 
-#. Button showing all archived jobs
-#: sabnzbd/skintext.py
-msgid "Show Archive"
-msgstr "Toon archief"
-
 #. History table header - Size of the download quota
 #: sabnzbd/skintext.py
 msgid "Size"
@@ -2925,39 +2824,30 @@ msgstr ""
 msgid "History Retention"
 msgstr "Geschiedenis bewaren"
 
+#: sabnzbd/skintext.py
+msgid ""
+"Automatically delete completed jobs from History. Beware that Duplicate "
+"Detection and some external tools rely on History information."
+msgstr ""
+"Automatisch verwijderen van voltooide downloads. Let er op dat Dubbele "
+"Download Detectie en andere externe tools Geschiedenis informatie nodig "
+"hebben."
+
 #: sabnzbd/skintext.py
 msgid "Keep all jobs"
 msgstr "Behoud alle downloads"
 
 #: sabnzbd/skintext.py
-msgid ""
-"Move jobs to the archive if the history exceeds specified number of jobs"
-msgstr ""
-"Verplaats voltooide downloads naar het archief als de geschiedenis het "
-"opgegeven aantal voltooide downloads overschrijdt."
+msgid "Keep maximum number of completed jobs"
+msgstr "Maximum aantal voltooide downloads"
 
 #: sabnzbd/skintext.py
-msgid "Delete jobs if the history exceeds specified number of jobs"
-msgstr ""
-"Verwijder voltooide downloads als de geschiedenis het opgegeven aantal "
-"voltooide downloads overschrijdt."
+msgid "Keep completed jobs maximum number of days"
+msgstr "Behoud voltooide downloads maximaal aantal dagen"
 
 #: sabnzbd/skintext.py
-msgid "Move jobs to the archive after specified number of days"
-msgstr ""
-"Verplaats voltooide downloads naar het archief na het opgegeven aantal dagen"
-
-#: sabnzbd/skintext.py
-msgid "Delete jobs after specified number of days"
-msgstr "Verwijder voltooide downloads na het opgegeven aantal dagen"
-
-#: sabnzbd/skintext.py
-msgid "Move all completed jobs to archive"
-msgstr "Verplaats alle voltooide downloadsnaar het archief"
-
-#: sabnzbd/skintext.py
-msgid "Delete all completed jobs"
-msgstr "Verwijder alle voltooide downloads"
+msgid "Do not keep any completed jobs"
+msgstr "Behoud geen enkele download"
 
 #: sabnzbd/skintext.py
 msgid "Jobs"
@@ -3347,19 +3237,20 @@ msgstr ""
 msgid "Discard"
 msgstr "Verwerpen"
 
-#. Four way switch for duplicates
-#: sabnzbd/skintext.py
-msgid "Tag job"
-msgstr "Label download"
-
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
 msgid "Fail job (move to History)"
 msgstr "Keur download af"
 
+#. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Abort post-processing"
-msgstr "Nabewerking afbreken"
+msgid "Tag job"
+msgstr "Label download"
+
+#. Three way switch for encrypted posts
+#: sabnzbd/skintext.py
+msgid "Abort"
+msgstr "Afbreken"
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3835,6 +3726,14 @@ msgstr "Server instellingen aan het testen..."
 msgid "Bandwidth"
 msgstr "Bandbreedte"
 
+#: sabnzbd/skintext.py
+msgid "Send Group"
+msgstr "Verzend groep"
+
+#: sabnzbd/skintext.py
+msgid "Send group command before requesting articles."
+msgstr "Verzend de groepsnaam naar de server."
+
 #: sabnzbd/skintext.py
 msgid "Personal notes"
 msgstr "Persoonlijke aantekeningen"
@@ -4109,7 +4008,7 @@ msgstr "Prowl"
 #. Prowl settings
 #: sabnzbd/skintext.py
 msgid "Enable Prowl notifications"
-msgstr "Prowl meldingen activeren"
+msgstr "Prowl berichten activeren"
 
 #. Prowl settings
 #: sabnzbd/skintext.py
@@ -4224,33 +4123,6 @@ msgstr "Apparaat"
 msgid "Device to which message should be sent"
 msgstr "Apparaat dat de berichten moet ontvangen"
 
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Enable Apprise notifications"
-msgstr "Apprise-meldingen activeren"
-
-#: sabnzbd/skintext.py
-msgid "Send notifications using Apprise to almost any notification service"
-msgstr ""
-"Stuur meldingen met behulp van Apprise naar bijna elke bestaande service."
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Default Apprise URLs"
-msgstr "Standaard Apprise-URL's"
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Use a comma and/or space to identify more than one URL."
-msgstr "Gebruik een komma en/of spatie om meer dan één URL op te geven."
-
-#: sabnzbd/skintext.py
-msgid ""
-"Override the default URLs for specific notification types below, if desired."
-msgstr ""
-"Overschrijf hieronder, indien gewenst, de standaard-URL's voor specifieke "
-"meldingstypen."
-
 #. Header for Notification Script notification section
 #: sabnzbd/skintext.py
 msgid "Notification Script"
@@ -5017,3 +4889,52 @@ msgstr "URL ophalen mislukt; %s"
 #: sabnzbd/urlgrabber.py
 msgid "Trying to fetch NZB from %s"
 msgstr "Probeer NZB op te halen van %s"
+
+#: sabnzbd/utils/servertests.py
+msgid "The hostname is not set."
+msgstr "Geen hostnaam opgegeven."
+
+#: sabnzbd/utils/servertests.py
+msgid "There are no connections set. Please set at least one connection."
+msgstr ""
+"Er zijn geen verbindingen opgegeven. Er is minimaal één verbinding nodig."
+
+#: sabnzbd/utils/servertests.py
+msgid "Password masked in ******, please re-enter"
+msgstr "Wachtwoord gemaskeerd met ******, voer opnieuw in"
+
+#: sabnzbd/utils/servertests.py
+msgid "Invalid server details"
+msgstr "Ongeldige servergegevens"
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out: Try enabling SSL or connecting on a different port."
+msgstr ""
+"Tijdslimiet overschreden. Probeer met SSL aan of gebruik een andere poort."
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out"
+msgstr "Tijdslimiet overschreden"
+
+#: sabnzbd/utils/servertests.py
+msgid ""
+"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
+msgstr ""
+"Onbekend SSL protocol: probeer het zonder SSL of probeer een andere poort."
+
+#: sabnzbd/utils/servertests.py
+msgid "Server requires username and password."
+msgstr "Server heeft een gebruikersnaam en een wachtwoord nodig."
+
+#: sabnzbd/utils/servertests.py
+msgid "Connection Successful!"
+msgstr "Succesvol verbonden!"
+
+#: sabnzbd/utils/servertests.py
+msgid "Too many connections, please pause downloading or try again later"
+msgstr ""
+"Te veel verbindingen, onderbreek het downloaden of probeer later nog eens."
+
+#: sabnzbd/utils/servertests.py
+msgid "Could not determine connection result (%s)"
+msgstr "Kan verbindingsresultaat niet bepalen (%s)"

po/main/pl.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Polish (https://app.transifex.com/sabnzbd/teams/111101/pl/)\n"
@@ -159,72 +159,6 @@ msgstr "Wiadomość wysłana"
 msgid "Test Notification"
 msgstr "Powiadomienie testowe"
 
-#: sabnzbd/api.py
-msgid "The hostname is not set."
-msgstr "Nie ustawiono nazwy hosta."
-
-#: sabnzbd/api.py
-msgid "There are no connections set. Please set at least one connection."
-msgstr ""
-"Nie ustawiono maksymalnej liczby połączeń. Proszę umożliwić przynajmniej "
-"jedno połączenie."
-
-#: sabnzbd/api.py
-msgid "Password masked in ******, please re-enter"
-msgstr "Hasło ukryte za ******, proszę wprowadzić je ponownie"
-
-#: sabnzbd/api.py
-msgid "Invalid server details"
-msgstr "Niewłaściwe dane serwera"
-
-#: sabnzbd/api.py
-msgid ""
-"Could not connect to %s on port %s. It appears that %s operates as a web "
-"server (port 80), possibly an indexer, not a usenet server. You have to fill"
-" a usenet server."
-msgstr ""
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Server address \"%s:%s\" is not valid."
-msgstr "Nieprawidłowy adres serwera \"%s:%s\"."
-
-#: sabnzbd/api.py
-msgid "Timed out: Try enabling SSL or connecting on a different port."
-msgstr ""
-"Upłynął limit czasu odpowiedzi: spróbuj włączyć SSL lub połącz się z innym "
-"portem."
-
-#: sabnzbd/api.py
-msgid "Timed out"
-msgstr "Upłynął limit czasu odpowiedzi."
-
-#: sabnzbd/api.py
-msgid ""
-"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Server requires username and password."
-msgstr "Serwer wymaga podania nazwy użytkownika i hasła."
-
-#: sabnzbd/api.py
-msgid "Connection Successful!"
-msgstr "Połączenie udane!"
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Authentication failed, check username/password."
-msgstr "Błąd połączenia, sprawdź nazwę użytkownika i hasło."
-
-#: sabnzbd/api.py
-msgid "Too many connections, please pause downloading or try again later"
-msgstr ""
-"Zbyt wiele połączeń, proszę wstrzymać pobieranie lub spróbować ponownie "
-"później"
-
-#: sabnzbd/api.py
-msgid "Could not determine connection result (%s)"
-msgstr "Nie można określić wyniku połączenia (%s)"
-
 #: sabnzbd/api.py
 msgid "Resolving address"
 msgstr "Rozwiązywanie adresu"
@@ -504,11 +438,6 @@ msgstr "Błąd podczas inicjalizacji %s@%s: %s"
 msgid "Fatal error in Downloader"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "%s@%s: Received unknown status code %s for article %s"
-msgstr ""
-
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
 msgstr "Zbyt wiele połączeń do serwera %s [%s]"
@@ -725,6 +654,10 @@ msgstr ""
 "Klucz API jest nieprawidłowy, użyj klucza API z sekcji Konfiguracja->Ogólne "
 "w zewnętrznym programie:"
 
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
+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"
@@ -734,6 +667,10 @@ msgstr ""
 msgid "Invalid backup archive"
 msgstr ""
 
+#: sabnzbd/interface.py
+msgid "Server address \"%s:%s\" is not valid."
+msgstr "Nieprawidłowy adres serwera \"%s:%s\"."
+
 #. Config->RSS, tab header
 #: sabnzbd/interface.py, sabnzbd/skintext.py
 msgid "Feed"
@@ -1082,10 +1019,6 @@ msgstr ""
 msgid "Wiki"
 msgstr "Wiki"
 
-#: sabnzbd/newswrapper.py
-msgid "Failed to connect: %s %s@%s:%s (%s)"
-msgstr ""
-
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1156,20 +1089,6 @@ msgstr ""
 msgid "Failed to send Prowl message"
 msgstr "Błąd wysyłania wiadomości Prowl"
 
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "One or more Apprise URLs could not be loaded."
-msgstr ""
-
-#: sabnzbd/notifier.py
-msgid "Failed to send one or more Apprise Notifications"
-msgstr ""
-
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "Failed to send Apprise message"
-msgstr ""
-
 #. Error message
 #: sabnzbd/notifier.py
 msgid "Bad response from Pushover (%s): %s"
@@ -1412,7 +1331,7 @@ msgstr "Zakończ"
 msgid "Queue First 10 Items"
 msgstr "Zakolejkuj 10 pierwszych"
 
-#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+#: sabnzbd/osxmenu.py
 msgid "Empty"
 msgstr "Brak"
 
@@ -2338,11 +2257,6 @@ msgstr "Skrypty"
 msgid "Delete all items from the queue?"
 msgstr "Usunąć wszystkie obiekty z kolejki?"
 
-#. Delete confirmation popup
-#: sabnzbd/skintext.py
-msgid "Are you sure you want to remove these jobs?"
-msgstr ""
-
 #. Queue page button
 #: sabnzbd/skintext.py
 msgid "Purge NZBs"
@@ -2363,11 +2277,6 @@ msgstr "Usuń NZB"
 msgid "Remove NZB & Delete Files"
 msgstr "Usuń NZB i pliki"
 
-#. Checkbox if job should be added to Archive
-#: sabnzbd/skintext.py
-msgid "Permanently delete (skip archive)"
-msgstr ""
-
 #. Caption for missing articles in Queue
 #: sabnzbd/skintext.py
 msgid "Missing articles"
@@ -2387,10 +2296,6 @@ msgstr "ręcznie"
 msgid "Reset Quota now"
 msgstr "Resetuj limit"
 
-#: sabnzbd/skintext.py
-msgid "Archive"
-msgstr ""
-
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2411,11 +2316,6 @@ msgstr "Pokaż nieudane"
 msgid "Show All"
 msgstr "Pokaż wszystko"
 
-#. Button showing all archived jobs
-#: sabnzbd/skintext.py
-msgid "Show Archive"
-msgstr ""
-
 #. History table header - Size of the download quota
 #: sabnzbd/skintext.py
 msgid "Size"
@@ -2850,33 +2750,26 @@ msgstr ""
 msgid "History Retention"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid ""
+"Automatically delete completed jobs from History. Beware that Duplicate "
+"Detection and some external tools rely on History information."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Keep all jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid ""
-"Move jobs to the archive if the history exceeds specified number of jobs"
+msgid "Keep maximum number of completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Delete jobs if the history exceeds specified number of jobs"
+msgid "Keep completed jobs maximum number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Move jobs to the archive after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete jobs after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Move all completed jobs to archive"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete all completed jobs"
+msgid "Do not keep any completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3252,17 +3145,18 @@ msgstr "Odrzuć"
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
+#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort post-processing"
-msgstr ""
+msgid "Abort"
+msgstr "Przerwij"
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3709,6 +3603,14 @@ msgstr "Testuję serwer..."
 msgid "Bandwidth"
 msgstr "Przepustowość"
 
+#: sabnzbd/skintext.py
+msgid "Send Group"
+msgstr "Wyślij GROUP"
+
+#: sabnzbd/skintext.py
+msgid "Send group command before requesting articles."
+msgstr "Wyślij polecenie GROUP przed żądaniem artykułu"
+
 #: sabnzbd/skintext.py
 msgid "Personal notes"
 msgstr "Notatki osobiste"
@@ -4093,30 +3995,6 @@ msgstr "Urządzenie"
 msgid "Device to which message should be sent"
 msgstr "Urządzenie, do którego mają być wysyłane powiadomienia"
 
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Enable Apprise notifications"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Send notifications using Apprise to almost any notification service"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Default Apprise URLs"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Use a comma and/or space to identify more than one URL."
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid ""
-"Override the default URLs for specific notification types below, if desired."
-msgstr ""
-
 #. Header for Notification Script notification section
 #: sabnzbd/skintext.py
 msgid "Notification Script"
@@ -4863,3 +4741,54 @@ msgstr "Pobieranie URL nie powiodło się; %s"
 #: sabnzbd/urlgrabber.py
 msgid "Trying to fetch NZB from %s"
 msgstr "Próba pobrania NZB z %s"
+
+#: sabnzbd/utils/servertests.py
+msgid "The hostname is not set."
+msgstr "Nie ustawiono nazwy hosta."
+
+#: sabnzbd/utils/servertests.py
+msgid "There are no connections set. Please set at least one connection."
+msgstr ""
+"Nie ustawiono maksymalnej liczby połączeń. Proszę umożliwić przynajmniej "
+"jedno połączenie."
+
+#: sabnzbd/utils/servertests.py
+msgid "Password masked in ******, please re-enter"
+msgstr "Hasło ukryte za ******, proszę wprowadzić je ponownie"
+
+#: sabnzbd/utils/servertests.py
+msgid "Invalid server details"
+msgstr "Niewłaściwe dane serwera"
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out: Try enabling SSL or connecting on a different port."
+msgstr ""
+"Upłynął limit czasu odpowiedzi: spróbuj włączyć SSL lub połącz się z innym "
+"portem."
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out"
+msgstr "Upłynął limit czasu odpowiedzi."
+
+#: sabnzbd/utils/servertests.py
+msgid ""
+"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Server requires username and password."
+msgstr "Serwer wymaga podania nazwy użytkownika i hasła."
+
+#: sabnzbd/utils/servertests.py
+msgid "Connection Successful!"
+msgstr "Połączenie udane!"
+
+#: sabnzbd/utils/servertests.py
+msgid "Too many connections, please pause downloading or try again later"
+msgstr ""
+"Zbyt wiele połączeń, proszę wstrzymać pobieranie lub spróbować ponownie "
+"później"
+
+#: sabnzbd/utils/servertests.py
+msgid "Could not determine connection result (%s)"
+msgstr "Nie można określić wyniku połączenia (%s)"

po/main/pt_BR.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Portuguese (Brazil) (https://app.transifex.com/sabnzbd/teams/111101/pt_BR/)\n"
@@ -168,69 +168,6 @@ msgstr "E-mail enviado com sucesso"
 msgid "Test Notification"
 msgstr "Notificação de teste"
 
-#: sabnzbd/api.py
-msgid "The hostname is not set."
-msgstr "O nome do host não foi definido."
-
-#: sabnzbd/api.py
-msgid "There are no connections set. Please set at least one connection."
-msgstr "Não há conexões definidas. Por favor, defina pelo menos uma conexão."
-
-#: sabnzbd/api.py
-msgid "Password masked in ******, please re-enter"
-msgstr "Senha mascarada em ******, digite novamente"
-
-#: sabnzbd/api.py
-msgid "Invalid server details"
-msgstr "Detalhes inválidos do servidor"
-
-#: sabnzbd/api.py
-msgid ""
-"Could not connect to %s on port %s. It appears that %s operates as a web "
-"server (port 80), possibly an indexer, not a usenet server. You have to fill"
-" a usenet server."
-msgstr ""
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Server address \"%s:%s\" is not valid."
-msgstr "Endereço de servidor \"%s:%s\" não é válido."
-
-#: sabnzbd/api.py
-msgid "Timed out: Try enabling SSL or connecting on a different port."
-msgstr ""
-"Tempo esgotado: Tente habilitar o SSL ou conectar em uma porta diferente."
-
-#: sabnzbd/api.py
-msgid "Timed out"
-msgstr "Tempo esgotado"
-
-#: sabnzbd/api.py
-msgid ""
-"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Server requires username and password."
-msgstr "Servidor requer usuário e senha."
-
-#: sabnzbd/api.py
-msgid "Connection Successful!"
-msgstr "Conexão com Sucesso!"
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Authentication failed, check username/password."
-msgstr "Falha de autenticação, verifique usuário / senha."
-
-#: sabnzbd/api.py
-msgid "Too many connections, please pause downloading or try again later"
-msgstr ""
-"Excesso de conexões, por favor pause o download ou tente novamente mais "
-"tarde"
-
-#: sabnzbd/api.py
-msgid "Could not determine connection result (%s)"
-msgstr "Não foi possível determinar o resultado da conexão (%s)"
-
 #: sabnzbd/api.py
 msgid "Resolving address"
 msgstr "Resolvendo endereço"
@@ -518,11 +455,6 @@ msgstr "Falha ao iniciar %s@%s devido as seguintes razões: %s"
 msgid "Fatal error in Downloader"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "%s@%s: Received unknown status code %s for article %s"
-msgstr ""
-
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
 msgstr "Excesso de conexões ao servidor %s [%s]"
@@ -737,6 +669,10 @@ msgstr ""
 "Chave de API incorreta. Use a chave de API de Configuração->Geral em seu "
 "programa de terceiros:"
 
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
+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"
@@ -746,6 +682,10 @@ msgstr ""
 msgid "Invalid backup archive"
 msgstr ""
 
+#: sabnzbd/interface.py
+msgid "Server address \"%s:%s\" is not valid."
+msgstr "Endereço de servidor \"%s:%s\" não é válido."
+
 #. Config->RSS, tab header
 #: sabnzbd/interface.py, sabnzbd/skintext.py
 msgid "Feed"
@@ -1091,10 +1031,6 @@ msgstr ""
 msgid "Wiki"
 msgstr "Wiki"
 
-#: sabnzbd/newswrapper.py
-msgid "Failed to connect: %s %s@%s:%s (%s)"
-msgstr ""
-
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1165,20 +1101,6 @@ msgstr ""
 msgid "Failed to send Prowl message"
 msgstr "Falha ao enviar mensagem Prowl"
 
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "One or more Apprise URLs could not be loaded."
-msgstr ""
-
-#: sabnzbd/notifier.py
-msgid "Failed to send one or more Apprise Notifications"
-msgstr ""
-
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "Failed to send Apprise message"
-msgstr ""
-
 #. Error message
 #: sabnzbd/notifier.py
 msgid "Bad response from Pushover (%s): %s"
@@ -1421,7 +1343,7 @@ msgstr "Sair"
 msgid "Queue First 10 Items"
 msgstr "Fila dos primeiros 10 items"
 
-#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+#: sabnzbd/osxmenu.py
 msgid "Empty"
 msgstr "Esvaziar"
 
@@ -2349,11 +2271,6 @@ msgstr "Scripts"
 msgid "Delete all items from the queue?"
 msgstr "Eliminar todos os itens da fila?"
 
-#. Delete confirmation popup
-#: sabnzbd/skintext.py
-msgid "Are you sure you want to remove these jobs?"
-msgstr ""
-
 #. Queue page button
 #: sabnzbd/skintext.py
 msgid "Purge NZBs"
@@ -2374,11 +2291,6 @@ msgstr "Remover NZB"
 msgid "Remove NZB & Delete Files"
 msgstr "Remover NZB & Excluir Arquivos"
 
-#. Checkbox if job should be added to Archive
-#: sabnzbd/skintext.py
-msgid "Permanently delete (skip archive)"
-msgstr ""
-
 #. Caption for missing articles in Queue
 #: sabnzbd/skintext.py
 msgid "Missing articles"
@@ -2398,10 +2310,6 @@ msgstr "manual"
 msgid "Reset Quota now"
 msgstr "Redefinir Quota agora"
 
-#: sabnzbd/skintext.py
-msgid "Archive"
-msgstr ""
-
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2422,11 +2330,6 @@ msgstr "Mostrar Falhados"
 msgid "Show All"
 msgstr "Mostrar Todos"
 
-#. Button showing all archived jobs
-#: sabnzbd/skintext.py
-msgid "Show Archive"
-msgstr ""
-
 #. History table header - Size of the download quota
 #: sabnzbd/skintext.py
 msgid "Size"
@@ -2860,33 +2763,26 @@ msgstr ""
 msgid "History Retention"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid ""
+"Automatically delete completed jobs from History. Beware that Duplicate "
+"Detection and some external tools rely on History information."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Keep all jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid ""
-"Move jobs to the archive if the history exceeds specified number of jobs"
+msgid "Keep maximum number of completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Delete jobs if the history exceeds specified number of jobs"
+msgid "Keep completed jobs maximum number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Move jobs to the archive after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete jobs after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Move all completed jobs to archive"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete all completed jobs"
+msgid "Do not keep any completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3262,17 +3158,18 @@ msgstr "Descartar"
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
+#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort post-processing"
-msgstr ""
+msgid "Abort"
+msgstr "Cancelar"
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3720,6 +3617,14 @@ msgstr "Testando detalhes do servidor..."
 msgid "Bandwidth"
 msgstr "Largura de banda"
 
+#: sabnzbd/skintext.py
+msgid "Send Group"
+msgstr "Enviar Grupo"
+
+#: sabnzbd/skintext.py
+msgid "Send group command before requesting articles."
+msgstr "Enviar comando do grupo antes de solicitar artigos."
+
 #: sabnzbd/skintext.py
 msgid "Personal notes"
 msgstr "Notas pessoais"
@@ -4104,30 +4009,6 @@ msgstr "Dispositivo"
 msgid "Device to which message should be sent"
 msgstr "Dispositivo para qual a mensagem deve ser enviada"
 
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Enable Apprise notifications"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Send notifications using Apprise to almost any notification service"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Default Apprise URLs"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Use a comma and/or space to identify more than one URL."
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid ""
-"Override the default URLs for specific notification types below, if desired."
-msgstr ""
-
 #. Header for Notification Script notification section
 #: sabnzbd/skintext.py
 msgid "Notification Script"
@@ -4874,3 +4755,51 @@ msgstr "A busca da URL falhou; %s"
 #: sabnzbd/urlgrabber.py
 msgid "Trying to fetch NZB from %s"
 msgstr "Tentando obter NZB de %s"
+
+#: sabnzbd/utils/servertests.py
+msgid "The hostname is not set."
+msgstr "O nome do host não foi definido."
+
+#: sabnzbd/utils/servertests.py
+msgid "There are no connections set. Please set at least one connection."
+msgstr "Não há conexões definidas. Por favor, defina pelo menos uma conexão."
+
+#: sabnzbd/utils/servertests.py
+msgid "Password masked in ******, please re-enter"
+msgstr "Senha mascarada em ******, digite novamente"
+
+#: sabnzbd/utils/servertests.py
+msgid "Invalid server details"
+msgstr "Detalhes inválidos do servidor"
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out: Try enabling SSL or connecting on a different port."
+msgstr ""
+"Tempo esgotado: Tente habilitar o SSL ou conectar em uma porta diferente."
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out"
+msgstr "Tempo esgotado"
+
+#: sabnzbd/utils/servertests.py
+msgid ""
+"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Server requires username and password."
+msgstr "Servidor requer usuário e senha."
+
+#: sabnzbd/utils/servertests.py
+msgid "Connection Successful!"
+msgstr "Conexão com Sucesso!"
+
+#: sabnzbd/utils/servertests.py
+msgid "Too many connections, please pause downloading or try again later"
+msgstr ""
+"Excesso de conexões, por favor pause o download ou tente novamente mais "
+"tarde"
+
+#: sabnzbd/utils/servertests.py
+msgid "Could not determine connection result (%s)"
+msgstr "Não foi possível determinar o resultado da conexão (%s)"

po/main/ro.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Romanian (https://app.transifex.com/sabnzbd/teams/111101/ro/)\n"
@@ -168,71 +168,6 @@ msgstr "Email reuşit"
 msgid "Test Notification"
 msgstr "Notificări Test"
 
-#: sabnzbd/api.py
-msgid "The hostname is not set."
-msgstr "Numele gazdei nu este setat."
-
-#: sabnzbd/api.py
-msgid "There are no connections set. Please set at least one connection."
-msgstr ""
-"Nu sunt conexiuni stabilite. Vă rugăm să stabiliţi cel puţin o conexiune."
-
-#: sabnzbd/api.py
-msgid "Password masked in ******, please re-enter"
-msgstr "Parolă ascunsă în ******, Vă rugăm să re-introduceţi"
-
-#: sabnzbd/api.py
-msgid "Invalid server details"
-msgstr "Detalii server invalide"
-
-#: sabnzbd/api.py
-msgid ""
-"Could not connect to %s on port %s. It appears that %s operates as a web "
-"server (port 80), possibly an indexer, not a usenet server. You have to fill"
-" a usenet server."
-msgstr ""
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Server address \"%s:%s\" is not valid."
-msgstr "Adresa server \"%s:%s\" nu este validă"
-
-#: sabnzbd/api.py
-msgid "Timed out: Try enabling SSL or connecting on a different port."
-msgstr ""
-"A depăşit timpul alocat : Încercaţi să activaţi SSL sau conectarea pe un "
-"port diferit."
-
-#: sabnzbd/api.py
-msgid "Timed out"
-msgstr "A depăşit timpul alocat"
-
-#: sabnzbd/api.py
-msgid ""
-"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Server requires username and password."
-msgstr "Serverul necesită nume utilizator şi parolă"
-
-#: sabnzbd/api.py
-msgid "Connection Successful!"
-msgstr "Conexiune Reuşită!"
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Authentication failed, check username/password."
-msgstr "Autentificare nereuşită, verifică nume utilizator/parolă."
-
-#: sabnzbd/api.py
-msgid "Too many connections, please pause downloading or try again later"
-msgstr ""
-"Prea multe conexiuni, vă rugăm să întrerupeţi descărcarea sau să încercaţi "
-"din nou mai târziu"
-
-#: sabnzbd/api.py
-msgid "Could not determine connection result (%s)"
-msgstr "Nu pot determina reultatul conexiunii (%s)"
-
 #: sabnzbd/api.py
 msgid "Resolving address"
 msgstr "Reolvare adresă"
@@ -524,11 +459,6 @@ msgstr "Nu am putu inițializa %s@%s din cauza următorului motiv: %s"
 msgid "Fatal error in Downloader"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "%s@%s: Received unknown status code %s for article %s"
-msgstr ""
-
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
 msgstr "Prea multe conexiuni la serverul %s [%s]"
@@ -743,6 +673,10 @@ msgstr ""
 "Cheie API incorectă, Folosiţi cheia api din Configurare->General în "
 "programul dumneavoastră terţ:"
 
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
+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"
@@ -752,6 +686,10 @@ msgstr "Încercare de conectare nereușită de la %s"
 msgid "Invalid backup archive"
 msgstr ""
 
+#: sabnzbd/interface.py
+msgid "Server address \"%s:%s\" is not valid."
+msgstr "Adresa server \"%s:%s\" nu este validă"
+
 #. Config->RSS, tab header
 #: sabnzbd/interface.py, sabnzbd/skintext.py
 msgid "Feed"
@@ -1107,10 +1045,6 @@ msgstr "Serverul %s utilizează un certificat nesigur [%s]"
 msgid "Wiki"
 msgstr "Wiki"
 
-#: sabnzbd/newswrapper.py
-msgid "Failed to connect: %s %s@%s:%s (%s)"
-msgstr ""
-
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1181,20 +1115,6 @@ msgstr "Eșuare la trimiterea notificării macOS"
 msgid "Failed to send Prowl message"
 msgstr "Nu am putu trimite mesajul Prowl"
 
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "One or more Apprise URLs could not be loaded."
-msgstr ""
-
-#: sabnzbd/notifier.py
-msgid "Failed to send one or more Apprise Notifications"
-msgstr ""
-
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "Failed to send Apprise message"
-msgstr ""
-
 #. Error message
 #: sabnzbd/notifier.py
 msgid "Bad response from Pushover (%s): %s"
@@ -1437,7 +1357,7 @@ msgstr "Ieșire"
 msgid "Queue First 10 Items"
 msgstr "Pune la Coadă Primele 10 Obiecte"
 
-#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+#: sabnzbd/osxmenu.py
 msgid "Empty"
 msgstr "Gol"
 
@@ -2367,11 +2287,6 @@ msgstr "Script-uri"
 msgid "Delete all items from the queue?"
 msgstr "Ştergeţi toate obiectele din coadă?"
 
-#. Delete confirmation popup
-#: sabnzbd/skintext.py
-msgid "Are you sure you want to remove these jobs?"
-msgstr ""
-
 #. Queue page button
 #: sabnzbd/skintext.py
 msgid "Purge NZBs"
@@ -2392,11 +2307,6 @@ msgstr "Şterge NZB"
 msgid "Remove NZB & Delete Files"
 msgstr "Şterge NZB & Fişiere Şterse"
 
-#. Checkbox if job should be added to Archive
-#: sabnzbd/skintext.py
-msgid "Permanently delete (skip archive)"
-msgstr ""
-
 #. Caption for missing articles in Queue
 #: sabnzbd/skintext.py
 msgid "Missing articles"
@@ -2416,10 +2326,6 @@ msgstr "manual"
 msgid "Reset Quota now"
 msgstr "Resetează Cota acum"
 
-#: sabnzbd/skintext.py
-msgid "Archive"
-msgstr ""
-
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2440,11 +2346,6 @@ msgstr "Arată Nereuşite"
 msgid "Show All"
 msgstr "Arată toate"
 
-#. Button showing all archived jobs
-#: sabnzbd/skintext.py
-msgid "Show Archive"
-msgstr ""
-
 #. History table header - Size of the download quota
 #: sabnzbd/skintext.py
 msgid "Size"
@@ -2879,33 +2780,26 @@ msgstr ""
 msgid "History Retention"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid ""
+"Automatically delete completed jobs from History. Beware that Duplicate "
+"Detection and some external tools rely on History information."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Keep all jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid ""
-"Move jobs to the archive if the history exceeds specified number of jobs"
+msgid "Keep maximum number of completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Delete jobs if the history exceeds specified number of jobs"
+msgid "Keep completed jobs maximum number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Move jobs to the archive after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete jobs after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Move all completed jobs to archive"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete all completed jobs"
+msgid "Do not keep any completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3280,17 +3174,18 @@ msgstr "Ignoră"
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
+#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort post-processing"
-msgstr ""
+msgid "Abort"
+msgstr "Renunță"
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3741,6 +3636,14 @@ msgstr "Testez detalii server..."
 msgid "Bandwidth"
 msgstr "Descărcat"
 
+#: sabnzbd/skintext.py
+msgid "Send Group"
+msgstr "Trimite Grup"
+
+#: sabnzbd/skintext.py
+msgid "Send group command before requesting articles."
+msgstr "Trimite comanda group înainte de a cere articole."
+
 #: sabnzbd/skintext.py
 msgid "Personal notes"
 msgstr "Note personale"
@@ -4125,30 +4028,6 @@ msgstr "Dispozitiv"
 msgid "Device to which message should be sent"
 msgstr "Dispozitiv la care să se trimită mesajul"
 
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Enable Apprise notifications"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Send notifications using Apprise to almost any notification service"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Default Apprise URLs"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Use a comma and/or space to identify more than one URL."
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid ""
-"Override the default URLs for specific notification types below, if desired."
-msgstr ""
-
 #. Header for Notification Script notification section
 #: sabnzbd/skintext.py
 msgid "Notification Script"
@@ -4896,3 +4775,53 @@ msgstr "Descărcare URL nereuşită; %s"
 #: sabnzbd/urlgrabber.py
 msgid "Trying to fetch NZB from %s"
 msgstr "Încerc să descarc NZB de la %s"
+
+#: sabnzbd/utils/servertests.py
+msgid "The hostname is not set."
+msgstr "Numele gazdei nu este setat."
+
+#: sabnzbd/utils/servertests.py
+msgid "There are no connections set. Please set at least one connection."
+msgstr ""
+"Nu sunt conexiuni stabilite. Vă rugăm să stabiliţi cel puţin o conexiune."
+
+#: sabnzbd/utils/servertests.py
+msgid "Password masked in ******, please re-enter"
+msgstr "Parolă ascunsă în ******, Vă rugăm să re-introduceţi"
+
+#: sabnzbd/utils/servertests.py
+msgid "Invalid server details"
+msgstr "Detalii server invalide"
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out: Try enabling SSL or connecting on a different port."
+msgstr ""
+"A depăşit timpul alocat : Încercaţi să activaţi SSL sau conectarea pe un "
+"port diferit."
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out"
+msgstr "A depăşit timpul alocat"
+
+#: sabnzbd/utils/servertests.py
+msgid ""
+"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Server requires username and password."
+msgstr "Serverul necesită nume utilizator şi parolă"
+
+#: sabnzbd/utils/servertests.py
+msgid "Connection Successful!"
+msgstr "Conexiune Reuşită!"
+
+#: sabnzbd/utils/servertests.py
+msgid "Too many connections, please pause downloading or try again later"
+msgstr ""
+"Prea multe conexiuni, vă rugăm să întrerupeţi descărcarea sau să încercaţi "
+"din nou mai târziu"
+
+#: sabnzbd/utils/servertests.py
+msgid "Could not determine connection result (%s)"
+msgstr "Nu pot determina reultatul conexiunii (%s)"

po/main/ru.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Russian (https://app.transifex.com/sabnzbd/teams/111101/ru/)\n"
@@ -163,68 +163,6 @@ msgstr "Электронное письмо успешно отправлено"
 msgid "Test Notification"
 msgstr "Тестовое уведомление"
 
-#: sabnzbd/api.py
-msgid "The hostname is not set."
-msgstr "Не задано имя компьютера."
-
-#: sabnzbd/api.py
-msgid "There are no connections set. Please set at least one connection."
-msgstr "Подключения не настроены. Добавьте хотя бы одно подключение."
-
-#: sabnzbd/api.py
-msgid "Password masked in ******, please re-enter"
-msgstr "Пароль скрыт под ******. Повторите пароль."
-
-#: sabnzbd/api.py
-msgid "Invalid server details"
-msgstr "Недопустимые данные сервера"
-
-#: sabnzbd/api.py
-msgid ""
-"Could not connect to %s on port %s. It appears that %s operates as a web "
-"server (port 80), possibly an indexer, not a usenet server. You have to fill"
-" a usenet server."
-msgstr ""
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Server address \"%s:%s\" is not valid."
-msgstr "Адрес сервера «%s:%s» является недопустимым."
-
-#: sabnzbd/api.py
-msgid "Timed out: Try enabling SSL or connecting on a different port."
-msgstr "Тайм-аут. Попробуйте включить SSL или использовать другой порт."
-
-#: sabnzbd/api.py
-msgid "Timed out"
-msgstr "Время ожидания истекло"
-
-#: sabnzbd/api.py
-msgid ""
-"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Server requires username and password."
-msgstr "Для сервера требуется имя пользователя и пароль."
-
-#: sabnzbd/api.py
-msgid "Connection Successful!"
-msgstr "Подключение установлено!"
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Authentication failed, check username/password."
-msgstr "Ошибка проверки подлинности. Проверьте имя и пароль."
-
-#: sabnzbd/api.py
-msgid "Too many connections, please pause downloading or try again later"
-msgstr ""
-"Слишком много подключений. Приостановите загрузку или повторите попытку "
-"позже"
-
-#: sabnzbd/api.py
-msgid "Could not determine connection result (%s)"
-msgstr "Не удалось определить результат подключения (%s)"
-
 #: sabnzbd/api.py
 msgid "Resolving address"
 msgstr "Разрешение адреса"
@@ -502,11 +440,6 @@ msgstr ""
 msgid "Fatal error in Downloader"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "%s@%s: Received unknown status code %s for article %s"
-msgstr ""
-
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
 msgstr ""
@@ -721,6 +654,10 @@ msgstr ""
 "Неправильный ключ API. Используйте в сторонней программе ключ API из раздела"
 " «Настройка -> Общие»:"
 
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
+msgid "Authentication failed, check username/password."
+msgstr "Ошибка проверки подлинности. Проверьте имя и пароль."
+
 #. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
@@ -730,6 +667,10 @@ msgstr ""
 msgid "Invalid backup archive"
 msgstr ""
 
+#: sabnzbd/interface.py
+msgid "Server address \"%s:%s\" is not valid."
+msgstr "Адрес сервера «%s:%s» является недопустимым."
+
 #. Config->RSS, tab header
 #: sabnzbd/interface.py, sabnzbd/skintext.py
 msgid "Feed"
@@ -1077,10 +1018,6 @@ msgstr ""
 msgid "Wiki"
 msgstr "Вики-сайт"
 
-#: sabnzbd/newswrapper.py
-msgid "Failed to connect: %s %s@%s:%s (%s)"
-msgstr ""
-
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1151,20 +1088,6 @@ msgstr ""
 msgid "Failed to send Prowl message"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "One or more Apprise URLs could not be loaded."
-msgstr ""
-
-#: sabnzbd/notifier.py
-msgid "Failed to send one or more Apprise Notifications"
-msgstr ""
-
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "Failed to send Apprise message"
-msgstr ""
-
 #. Error message
 #: sabnzbd/notifier.py
 msgid "Bad response from Pushover (%s): %s"
@@ -1407,7 +1330,7 @@ msgstr "Выйти"
 msgid "Queue First 10 Items"
 msgstr "Первые 10 элементов очереди"
 
-#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+#: sabnzbd/osxmenu.py
 msgid "Empty"
 msgstr "Пусто"
 
@@ -2331,11 +2254,6 @@ msgstr "Сценарии"
 msgid "Delete all items from the queue?"
 msgstr "Удалить из очереди все элементы?"
 
-#. Delete confirmation popup
-#: sabnzbd/skintext.py
-msgid "Are you sure you want to remove these jobs?"
-msgstr ""
-
 #. Queue page button
 #: sabnzbd/skintext.py
 msgid "Purge NZBs"
@@ -2356,11 +2274,6 @@ msgstr "Удалить NZB"
 msgid "Remove NZB & Delete Files"
 msgstr "Удалить NZB и стереть файлы"
 
-#. Checkbox if job should be added to Archive
-#: sabnzbd/skintext.py
-msgid "Permanently delete (skip archive)"
-msgstr ""
-
 #. Caption for missing articles in Queue
 #: sabnzbd/skintext.py
 msgid "Missing articles"
@@ -2380,10 +2293,6 @@ msgstr "вручную"
 msgid "Reset Quota now"
 msgstr "Сбросить квоту"
 
-#: sabnzbd/skintext.py
-msgid "Archive"
-msgstr ""
-
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2404,11 +2313,6 @@ msgstr "Показать неудачные"
 msgid "Show All"
 msgstr "Показать все"
 
-#. Button showing all archived jobs
-#: sabnzbd/skintext.py
-msgid "Show Archive"
-msgstr ""
-
 #. History table header - Size of the download quota
 #: sabnzbd/skintext.py
 msgid "Size"
@@ -2839,33 +2743,26 @@ msgstr ""
 msgid "History Retention"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid ""
+"Automatically delete completed jobs from History. Beware that Duplicate "
+"Detection and some external tools rely on History information."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Keep all jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid ""
-"Move jobs to the archive if the history exceeds specified number of jobs"
+msgid "Keep maximum number of completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Delete jobs if the history exceeds specified number of jobs"
+msgid "Keep completed jobs maximum number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Move jobs to the archive after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete jobs after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Move all completed jobs to archive"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete all completed jobs"
+msgid "Do not keep any completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3244,16 +3141,17 @@ msgstr "Отменить"
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
+#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort post-processing"
+msgid "Abort"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3698,6 +3596,14 @@ msgstr "Данные проверки сервера..."
 msgid "Bandwidth"
 msgstr "Трафик"
 
+#: sabnzbd/skintext.py
+msgid "Send Group"
+msgstr "Отправлять группу"
+
+#: sabnzbd/skintext.py
+msgid "Send group command before requesting articles."
+msgstr "Отправлять команду группы перед запросом статей."
+
 #: sabnzbd/skintext.py
 msgid "Personal notes"
 msgstr ""
@@ -4089,30 +3995,6 @@ msgstr ""
 msgid "Device to which message should be sent"
 msgstr ""
 
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Enable Apprise notifications"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Send notifications using Apprise to almost any notification service"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Default Apprise URLs"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Use a comma and/or space to identify more than one URL."
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid ""
-"Override the default URLs for specific notification types below, if desired."
-msgstr ""
-
 #. Header for Notification Script notification section
 #: sabnzbd/skintext.py
 msgid "Notification Script"
@@ -4859,3 +4741,50 @@ msgstr "Не удалось загрузить URL: %s"
 #: sabnzbd/urlgrabber.py
 msgid "Trying to fetch NZB from %s"
 msgstr "Попытка загрузить NZB с %s"
+
+#: sabnzbd/utils/servertests.py
+msgid "The hostname is not set."
+msgstr "Не задано имя компьютера."
+
+#: sabnzbd/utils/servertests.py
+msgid "There are no connections set. Please set at least one connection."
+msgstr "Подключения не настроены. Добавьте хотя бы одно подключение."
+
+#: sabnzbd/utils/servertests.py
+msgid "Password masked in ******, please re-enter"
+msgstr "Пароль скрыт под ******. Повторите пароль."
+
+#: sabnzbd/utils/servertests.py
+msgid "Invalid server details"
+msgstr "Недопустимые данные сервера"
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out: Try enabling SSL or connecting on a different port."
+msgstr "Тайм-аут. Попробуйте включить SSL или использовать другой порт."
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out"
+msgstr "Время ожидания истекло"
+
+#: sabnzbd/utils/servertests.py
+msgid ""
+"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Server requires username and password."
+msgstr "Для сервера требуется имя пользователя и пароль."
+
+#: sabnzbd/utils/servertests.py
+msgid "Connection Successful!"
+msgstr "Подключение установлено!"
+
+#: sabnzbd/utils/servertests.py
+msgid "Too many connections, please pause downloading or try again later"
+msgstr ""
+"Слишком много подключений. Приостановите загрузку или повторите попытку "
+"позже"
+
+#: sabnzbd/utils/servertests.py
+msgid "Could not determine connection result (%s)"
+msgstr "Не удалось определить результат подключения (%s)"

po/main/sr.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Serbian (https://app.transifex.com/sabnzbd/teams/111101/sr/)\n"
@@ -161,67 +161,6 @@ msgstr "Упешно слање е-поште"
 msgid "Test Notification"
 msgstr "Probno obaveštenje"
 
-#: sabnzbd/api.py
-msgid "The hostname is not set."
-msgstr "Име хоста није унето."
-
-#: sabnzbd/api.py
-msgid "There are no connections set. Please set at least one connection."
-msgstr "Везе нису подешене. Подесити макар једну везу."
-
-#: sabnzbd/api.py
-msgid "Password masked in ******, please re-enter"
-msgstr "Лозинка сакривена испод ******, поновите унос"
-
-#: sabnzbd/api.py
-msgid "Invalid server details"
-msgstr "Погрешни детаљи сервера"
-
-#: sabnzbd/api.py
-msgid ""
-"Could not connect to %s on port %s. It appears that %s operates as a web "
-"server (port 80), possibly an indexer, not a usenet server. You have to fill"
-" a usenet server."
-msgstr ""
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Server address \"%s:%s\" is not valid."
-msgstr "Adresa servera \"%s:%s\" je neispravna"
-
-#: sabnzbd/api.py
-msgid "Timed out: Try enabling SSL or connecting on a different port."
-msgstr ""
-"Истекло време: Покушајте да упалите SSL или да се привежете на други порт."
-
-#: sabnzbd/api.py
-msgid "Timed out"
-msgstr "Време је истекло"
-
-#: sabnzbd/api.py
-msgid ""
-"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Server requires username and password."
-msgstr "Серверу су потребни име и лозинка."
-
-#: sabnzbd/api.py
-msgid "Connection Successful!"
-msgstr "Успешно привезивање!"
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Authentication failed, check username/password."
-msgstr "Аутентификација погрешна, проверити име/лозинку."
-
-#: sabnzbd/api.py
-msgid "Too many connections, please pause downloading or try again later"
-msgstr "Превише конекција, паузирајте преузимање или поновите касније"
-
-#: sabnzbd/api.py
-msgid "Could not determine connection result (%s)"
-msgstr "Nemoguće odrediti rezultate konekcije (%s)"
-
 #: sabnzbd/api.py
 msgid "Resolving address"
 msgstr "Решавање адресе"
@@ -500,11 +439,6 @@ msgstr "Neuspešna inicijalizacija %s@%s iz razloga: %s"
 msgid "Fatal error in Downloader"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "%s@%s: Received unknown status code %s for article %s"
-msgstr ""
-
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
 msgstr "Previše konekcija ka serveru %s [%s]"
@@ -717,6 +651,10 @@ msgid ""
 msgstr ""
 "API кључ је погрешан, унети у спољни програм API кључ из Подешавања->Опште:"
 
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
+msgid "Authentication failed, check username/password."
+msgstr "Аутентификација погрешна, проверити име/лозинку."
+
 #. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
@@ -726,6 +664,10 @@ msgstr ""
 msgid "Invalid backup archive"
 msgstr ""
 
+#: sabnzbd/interface.py
+msgid "Server address \"%s:%s\" is not valid."
+msgstr "Adresa servera \"%s:%s\" je neispravna"
+
 #. Config->RSS, tab header
 #: sabnzbd/interface.py, sabnzbd/skintext.py
 msgid "Feed"
@@ -1072,10 +1014,6 @@ msgstr ""
 msgid "Wiki"
 msgstr "Вики"
 
-#: sabnzbd/newswrapper.py
-msgid "Failed to connect: %s %s@%s:%s (%s)"
-msgstr ""
-
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1146,20 +1084,6 @@ msgstr ""
 msgid "Failed to send Prowl message"
 msgstr "Неуспешно слање Prowl поруке"
 
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "One or more Apprise URLs could not be loaded."
-msgstr ""
-
-#: sabnzbd/notifier.py
-msgid "Failed to send one or more Apprise Notifications"
-msgstr ""
-
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "Failed to send Apprise message"
-msgstr ""
-
 #. Error message
 #: sabnzbd/notifier.py
 msgid "Bad response from Pushover (%s): %s"
@@ -1402,7 +1326,7 @@ msgstr "Излаз"
 msgid "Queue First 10 Items"
 msgstr "У ред прве 10 ставке"
 
-#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+#: sabnzbd/osxmenu.py
 msgid "Empty"
 msgstr "Празно"
 
@@ -2324,11 +2248,6 @@ msgstr "Скрипте"
 msgid "Delete all items from the queue?"
 msgstr "Обрисати све ставке са реда?"
 
-#. Delete confirmation popup
-#: sabnzbd/skintext.py
-msgid "Are you sure you want to remove these jobs?"
-msgstr ""
-
 #. Queue page button
 #: sabnzbd/skintext.py
 msgid "Purge NZBs"
@@ -2349,11 +2268,6 @@ msgstr "Уклони NZB"
 msgid "Remove NZB & Delete Files"
 msgstr "Уклони NZB и обриши датотеке"
 
-#. Checkbox if job should be added to Archive
-#: sabnzbd/skintext.py
-msgid "Permanently delete (skip archive)"
-msgstr ""
-
 #. Caption for missing articles in Queue
 #: sabnzbd/skintext.py
 msgid "Missing articles"
@@ -2373,10 +2287,6 @@ msgstr "ручно"
 msgid "Reset Quota now"
 msgstr "Ресетуј квоту"
 
-#: sabnzbd/skintext.py
-msgid "Archive"
-msgstr ""
-
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2397,11 +2307,6 @@ msgstr "Прикажи погрешне"
 msgid "Show All"
 msgstr "Прикажи све"
 
-#. Button showing all archived jobs
-#: sabnzbd/skintext.py
-msgid "Show Archive"
-msgstr ""
-
 #. History table header - Size of the download quota
 #: sabnzbd/skintext.py
 msgid "Size"
@@ -2830,33 +2735,26 @@ msgstr ""
 msgid "History Retention"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid ""
+"Automatically delete completed jobs from History. Beware that Duplicate "
+"Detection and some external tools rely on History information."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Keep all jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid ""
-"Move jobs to the archive if the history exceeds specified number of jobs"
+msgid "Keep maximum number of completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Delete jobs if the history exceeds specified number of jobs"
+msgid "Keep completed jobs maximum number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Move jobs to the archive after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete jobs after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Move all completed jobs to archive"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete all completed jobs"
+msgid "Do not keep any completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3230,17 +3128,18 @@ msgstr "Одбаци"
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
+#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort post-processing"
-msgstr ""
+msgid "Abort"
+msgstr "Прекини"
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3684,6 +3583,14 @@ msgstr "Пробам детаље сервера..."
 msgid "Bandwidth"
 msgstr "Проток"
 
+#: sabnzbd/skintext.py
+msgid "Send Group"
+msgstr "Пошаљи 'Group'"
+
+#: sabnzbd/skintext.py
+msgid "Send group command before requesting articles."
+msgstr "Послати команду 'group' пре тражења артикла."
+
 #: sabnzbd/skintext.py
 msgid "Personal notes"
 msgstr "Lične zabeleške"
@@ -4067,30 +3974,6 @@ msgstr "Уређај"
 msgid "Device to which message should be sent"
 msgstr "Uređaj na koji bi poruka trebala biti poslata"
 
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Enable Apprise notifications"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Send notifications using Apprise to almost any notification service"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Default Apprise URLs"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Use a comma and/or space to identify more than one URL."
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid ""
-"Override the default URLs for specific notification types below, if desired."
-msgstr ""
-
 #. Header for Notification Script notification section
 #: sabnzbd/skintext.py
 msgid "Notification Script"
@@ -4836,3 +4719,49 @@ msgstr "Погрешно учитавање УРЛ-а; %s"
 #: sabnzbd/urlgrabber.py
 msgid "Trying to fetch NZB from %s"
 msgstr "Pokušaj da se učita NZB sa %s"
+
+#: sabnzbd/utils/servertests.py
+msgid "The hostname is not set."
+msgstr "Име хоста није унето."
+
+#: sabnzbd/utils/servertests.py
+msgid "There are no connections set. Please set at least one connection."
+msgstr "Везе нису подешене. Подесити макар једну везу."
+
+#: sabnzbd/utils/servertests.py
+msgid "Password masked in ******, please re-enter"
+msgstr "Лозинка сакривена испод ******, поновите унос"
+
+#: sabnzbd/utils/servertests.py
+msgid "Invalid server details"
+msgstr "Погрешни детаљи сервера"
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out: Try enabling SSL or connecting on a different port."
+msgstr ""
+"Истекло време: Покушајте да упалите SSL или да се привежете на други порт."
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out"
+msgstr "Време је истекло"
+
+#: sabnzbd/utils/servertests.py
+msgid ""
+"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Server requires username and password."
+msgstr "Серверу су потребни име и лозинка."
+
+#: sabnzbd/utils/servertests.py
+msgid "Connection Successful!"
+msgstr "Успешно привезивање!"
+
+#: sabnzbd/utils/servertests.py
+msgid "Too many connections, please pause downloading or try again later"
+msgstr "Превише конекција, паузирајте преузимање или поновите касније"
+
+#: sabnzbd/utils/servertests.py
+msgid "Could not determine connection result (%s)"
+msgstr "Nemoguće odrediti rezultate konekcije (%s)"

po/main/sv.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2023\n"
 "Language-Team: Swedish (https://app.transifex.com/sabnzbd/teams/111101/sv/)\n"
@@ -161,67 +161,6 @@ msgstr "E-mail sändning lyckades"
 msgid "Test Notification"
 msgstr "Testa notifikation"
 
-#: sabnzbd/api.py
-msgid "The hostname is not set."
-msgstr "Adressen är inte angiven."
-
-#: sabnzbd/api.py
-msgid "There are no connections set. Please set at least one connection."
-msgstr ""
-"Inga anslutningar är aktiverade. Var vänlig aktivera minst en anslutning."
-
-#: sabnzbd/api.py
-msgid "Password masked in ******, please re-enter"
-msgstr "Lösenordet är dolt med ******, försök igen"
-
-#: sabnzbd/api.py
-msgid "Invalid server details"
-msgstr "Ogiltiga serverdetaljer"
-
-#: sabnzbd/api.py
-msgid ""
-"Could not connect to %s on port %s. It appears that %s operates as a web "
-"server (port 80), possibly an indexer, not a usenet server. You have to fill"
-" a usenet server."
-msgstr ""
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Server address \"%s:%s\" is not valid."
-msgstr "Serveradressen \"%s:%s\" är ej giltig."
-
-#: sabnzbd/api.py
-msgid "Timed out: Try enabling SSL or connecting on a different port."
-msgstr "Timeout: Försök aktivera SSL eller anslut via en annan port."
-
-#: sabnzbd/api.py
-msgid "Timed out"
-msgstr "Timeout"
-
-#: sabnzbd/api.py
-msgid ""
-"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
-msgstr ""
-
-#: sabnzbd/api.py
-msgid "Server requires username and password."
-msgstr "Servern kräver användarnamn och lösenord."
-
-#: sabnzbd/api.py
-msgid "Connection Successful!"
-msgstr "Anslutning lyckades!"
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Authentication failed, check username/password."
-msgstr "Autentisering misslyckades, kontrollera användarnamn och lösenord."
-
-#: sabnzbd/api.py
-msgid "Too many connections, please pause downloading or try again later"
-msgstr "För många anslutningar, pausa en nedladdning eller försök igen senare"
-
-#: sabnzbd/api.py
-msgid "Could not determine connection result (%s)"
-msgstr "Det gick inte att ansluta (%s)"
-
 #: sabnzbd/api.py
 msgid "Resolving address"
 msgstr "Lösa adress"
@@ -500,11 +439,6 @@ msgstr "Misslyckades att initiera %s@%s med orsak %s"
 msgid "Fatal error in Downloader"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "%s@%s: Received unknown status code %s for article %s"
-msgstr ""
-
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
 msgstr "För många anslutningar till servern %s [%s]"
@@ -719,6 +653,10 @@ msgstr ""
 "API-nyckel felaktig, använd api-nyckeln från Konfiguration-> Allmänt i ditt "
 "tredjepartsprogram:"
 
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
+msgid "Authentication failed, check username/password."
+msgstr "Autentisering misslyckades, kontrollera användarnamn och lösenord."
+
 #. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
@@ -728,6 +666,10 @@ msgstr ""
 msgid "Invalid backup archive"
 msgstr ""
 
+#: sabnzbd/interface.py
+msgid "Server address \"%s:%s\" is not valid."
+msgstr "Serveradressen \"%s:%s\" är ej giltig."
+
 #. Config->RSS, tab header
 #: sabnzbd/interface.py, sabnzbd/skintext.py
 msgid "Feed"
@@ -1076,10 +1018,6 @@ msgstr ""
 msgid "Wiki"
 msgstr "Wiki"
 
-#: sabnzbd/newswrapper.py
-msgid "Failed to connect: %s %s@%s:%s (%s)"
-msgstr ""
-
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1150,20 +1088,6 @@ msgstr ""
 msgid "Failed to send Prowl message"
 msgstr "Misslyckades att skicka Prowlmeddelande"
 
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "One or more Apprise URLs could not be loaded."
-msgstr ""
-
-#: sabnzbd/notifier.py
-msgid "Failed to send one or more Apprise Notifications"
-msgstr ""
-
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "Failed to send Apprise message"
-msgstr ""
-
 #. Error message
 #: sabnzbd/notifier.py
 msgid "Bad response from Pushover (%s): %s"
@@ -1406,7 +1330,7 @@ msgstr "Avsluta"
 msgid "Queue First 10 Items"
 msgstr "Kö (10 första sakerna)"
 
-#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+#: sabnzbd/osxmenu.py
 msgid "Empty"
 msgstr "Tom"
 
@@ -2330,11 +2254,6 @@ msgstr "Skript"
 msgid "Delete all items from the queue?"
 msgstr "Ta bort alla saker från kön?"
 
-#. Delete confirmation popup
-#: sabnzbd/skintext.py
-msgid "Are you sure you want to remove these jobs?"
-msgstr ""
-
 #. Queue page button
 #: sabnzbd/skintext.py
 msgid "Purge NZBs"
@@ -2355,11 +2274,6 @@ msgstr "Ta bort NZB"
 msgid "Remove NZB & Delete Files"
 msgstr "Ta bort NZB och filer"
 
-#. Checkbox if job should be added to Archive
-#: sabnzbd/skintext.py
-msgid "Permanently delete (skip archive)"
-msgstr ""
-
 #. Caption for missing articles in Queue
 #: sabnzbd/skintext.py
 msgid "Missing articles"
@@ -2379,10 +2293,6 @@ msgstr "manuell"
 msgid "Reset Quota now"
 msgstr "Återställ Kvot nu"
 
-#: sabnzbd/skintext.py
-msgid "Archive"
-msgstr ""
-
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2403,11 +2313,6 @@ msgstr "Visa Misslyckade"
 msgid "Show All"
 msgstr "Visa alla"
 
-#. Button showing all archived jobs
-#: sabnzbd/skintext.py
-msgid "Show Archive"
-msgstr ""
-
 #. History table header - Size of the download quota
 #: sabnzbd/skintext.py
 msgid "Size"
@@ -2839,33 +2744,26 @@ msgstr ""
 msgid "History Retention"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid ""
+"Automatically delete completed jobs from History. Beware that Duplicate "
+"Detection and some external tools rely on History information."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Keep all jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid ""
-"Move jobs to the archive if the history exceeds specified number of jobs"
+msgid "Keep maximum number of completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Delete jobs if the history exceeds specified number of jobs"
+msgid "Keep completed jobs maximum number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Move jobs to the archive after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete jobs after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Move all completed jobs to archive"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete all completed jobs"
+msgid "Do not keep any completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3240,17 +3138,18 @@ msgstr "Kasta"
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
+#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort post-processing"
-msgstr ""
+msgid "Abort"
+msgstr "Avbryt"
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3696,6 +3595,14 @@ msgstr "Testar serverdetaljer..."
 msgid "Bandwidth"
 msgstr "Bandbredd"
 
+#: sabnzbd/skintext.py
+msgid "Send Group"
+msgstr "Skicka grupp"
+
+#: sabnzbd/skintext.py
+msgid "Send group command before requesting articles."
+msgstr "Skicka gruppkommando innan du begär artiklar."
+
 #: sabnzbd/skintext.py
 msgid "Personal notes"
 msgstr "Personliga noteringar"
@@ -4080,30 +3987,6 @@ msgstr "Enhet"
 msgid "Device to which message should be sent"
 msgstr "Enheter där meddelande skall skickas"
 
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Enable Apprise notifications"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Send notifications using Apprise to almost any notification service"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Default Apprise URLs"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Use a comma and/or space to identify more than one URL."
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid ""
-"Override the default URLs for specific notification types below, if desired."
-msgstr ""
-
 #. Header for Notification Script notification section
 #: sabnzbd/skintext.py
 msgid "Notification Script"
@@ -4850,3 +4733,49 @@ msgstr "URL hämtning misslyckades; %s"
 #: sabnzbd/urlgrabber.py
 msgid "Trying to fetch NZB from %s"
 msgstr "Försöker att hämta NZB från %s"
+
+#: sabnzbd/utils/servertests.py
+msgid "The hostname is not set."
+msgstr "Adressen är inte angiven."
+
+#: sabnzbd/utils/servertests.py
+msgid "There are no connections set. Please set at least one connection."
+msgstr ""
+"Inga anslutningar är aktiverade. Var vänlig aktivera minst en anslutning."
+
+#: sabnzbd/utils/servertests.py
+msgid "Password masked in ******, please re-enter"
+msgstr "Lösenordet är dolt med ******, försök igen"
+
+#: sabnzbd/utils/servertests.py
+msgid "Invalid server details"
+msgstr "Ogiltiga serverdetaljer"
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out: Try enabling SSL or connecting on a different port."
+msgstr "Timeout: Försök aktivera SSL eller anslut via en annan port."
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out"
+msgstr "Timeout"
+
+#: sabnzbd/utils/servertests.py
+msgid ""
+"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
+msgstr ""
+
+#: sabnzbd/utils/servertests.py
+msgid "Server requires username and password."
+msgstr "Servern kräver användarnamn och lösenord."
+
+#: sabnzbd/utils/servertests.py
+msgid "Connection Successful!"
+msgstr "Anslutning lyckades!"
+
+#: sabnzbd/utils/servertests.py
+msgid "Too many connections, please pause downloading or try again later"
+msgstr "För många anslutningar, pausa en nedladdning eller försök igen senare"
+
+#: sabnzbd/utils/servertests.py
+msgid "Could not determine connection result (%s)"
+msgstr "Det gick inte att ansluta (%s)"

po/main/zh_CN.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
 "Last-Translator: Kangwei Li <lkw20010211@gmail.com>, 2023\n"
 "Language-Team: Chinese (China) (https://app.transifex.com/sabnzbd/teams/111101/zh_CN/)\n"
@@ -160,66 +160,6 @@ msgstr "成功发送电子邮件"
 msgid "Test Notification"
 msgstr "测试通知"
 
-#: sabnzbd/api.py
-msgid "The hostname is not set."
-msgstr "主机名未设置。"
-
-#: sabnzbd/api.py
-msgid "There are no connections set. Please set at least one connection."
-msgstr "未设置连接。请设置至少一个连接。"
-
-#: sabnzbd/api.py
-msgid "Password masked in ******, please re-enter"
-msgstr "密码会以 ****** 显示，请重新输入"
-
-#: sabnzbd/api.py
-msgid "Invalid server details"
-msgstr "服务器信息无效"
-
-#: sabnzbd/api.py
-msgid ""
-"Could not connect to %s on port %s. It appears that %s operates as a web "
-"server (port 80), possibly an indexer, not a usenet server. You have to fill"
-" a usenet server."
-msgstr ""
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Server address \"%s:%s\" is not valid."
-msgstr "服务器地址 \"%s:%s\" 无效。"
-
-#: sabnzbd/api.py
-msgid "Timed out: Try enabling SSL or connecting on a different port."
-msgstr "超时: 请尝试启用 SSL 或连接其他端口。"
-
-#: sabnzbd/api.py
-msgid "Timed out"
-msgstr "超时"
-
-#: sabnzbd/api.py
-msgid ""
-"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
-msgstr "未知的 SSL 协议：尝试禁用 SSL 或者连接不同的端口。"
-
-#: sabnzbd/api.py
-msgid "Server requires username and password."
-msgstr "服务器需要用户名与密码。"
-
-#: sabnzbd/api.py
-msgid "Connection Successful!"
-msgstr "连接成功!"
-
-#: sabnzbd/api.py, sabnzbd/interface.py
-msgid "Authentication failed, check username/password."
-msgstr "身份认证失败，请检查用户名/密码。"
-
-#: sabnzbd/api.py
-msgid "Too many connections, please pause downloading or try again later"
-msgstr "连接数过多，请先暂停下载或稍后再试"
-
-#: sabnzbd/api.py
-msgid "Could not determine connection result (%s)"
-msgstr "无法判断连接结果 (%s)"
-
 #: sabnzbd/api.py
 msgid "Resolving address"
 msgstr "正在解析地址"
@@ -497,11 +437,6 @@ msgstr "无法初始化 %s@%s，原因为: %s"
 msgid "Fatal error in Downloader"
 msgstr ""
 
-#. Warning message
-#: sabnzbd/downloader.py
-msgid "%s@%s: Received unknown status code %s for article %s"
-msgstr ""
-
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
 msgstr "服务器 %s 连接数过多 [%s]"
@@ -712,6 +647,10 @@ msgid ""
 "program:"
 msgstr "API Key 不正确，请在第三方程序中使用“配置”->“常规”中的 api key:"
 
+#: sabnzbd/interface.py, sabnzbd/utils/servertests.py
+msgid "Authentication failed, check username/password."
+msgstr "身份认证失败，请检查用户名/密码。"
+
 #. Warning message
 #: sabnzbd/interface.py
 msgid "Unsuccessful login attempt from %s"
@@ -721,6 +660,10 @@ msgstr "%s 中有失败的登陆请求"
 msgid "Invalid backup archive"
 msgstr ""
 
+#: sabnzbd/interface.py
+msgid "Server address \"%s:%s\" is not valid."
+msgstr "服务器地址 \"%s:%s\" 无效。"
+
 #. Config->RSS, tab header
 #: sabnzbd/interface.py, sabnzbd/skintext.py
 msgid "Feed"
@@ -1065,10 +1008,6 @@ msgstr "%s 服务器使用了不受信任的证书 [%s]"
 msgid "Wiki"
 msgstr "Wiki"
 
-#: sabnzbd/newswrapper.py
-msgid "Failed to connect: %s %s@%s:%s (%s)"
-msgstr ""
-
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1139,20 +1078,6 @@ msgstr ""
 msgid "Failed to send Prowl message"
 msgstr "无法发送 Prowl 消息"
 
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "One or more Apprise URLs could not be loaded."
-msgstr ""
-
-#: sabnzbd/notifier.py
-msgid "Failed to send one or more Apprise Notifications"
-msgstr ""
-
-#. Warning message
-#: sabnzbd/notifier.py
-msgid "Failed to send Apprise message"
-msgstr ""
-
 #. Error message
 #: sabnzbd/notifier.py
 msgid "Bad response from Pushover (%s): %s"
@@ -1395,7 +1320,7 @@ msgstr "退出"
 msgid "Queue First 10 Items"
 msgstr "将前十项加入队列"
 
-#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
+#: sabnzbd/osxmenu.py
 msgid "Empty"
 msgstr "清空"
 
@@ -2317,11 +2242,6 @@ msgstr "脚本"
 msgid "Delete all items from the queue?"
 msgstr "删除队列中全部项?"
 
-#. Delete confirmation popup
-#: sabnzbd/skintext.py
-msgid "Are you sure you want to remove these jobs?"
-msgstr ""
-
 #. Queue page button
 #: sabnzbd/skintext.py
 msgid "Purge NZBs"
@@ -2342,11 +2262,6 @@ msgstr "移除 NZB"
 msgid "Remove NZB & Delete Files"
 msgstr "移除 NZB 并删除文件"
 
-#. Checkbox if job should be added to Archive
-#: sabnzbd/skintext.py
-msgid "Permanently delete (skip archive)"
-msgstr ""
-
 #. Caption for missing articles in Queue
 #: sabnzbd/skintext.py
 msgid "Missing articles"
@@ -2366,10 +2281,6 @@ msgstr "手动"
 msgid "Reset Quota now"
 msgstr "立即重置配额"
 
-#: sabnzbd/skintext.py
-msgid "Archive"
-msgstr ""
-
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2390,11 +2301,6 @@ msgstr "只显示失败项"
 msgid "Show All"
 msgstr "显示全部项"
 
-#. Button showing all archived jobs
-#: sabnzbd/skintext.py
-msgid "Show Archive"
-msgstr ""
-
 #. History table header - Size of the download quota
 #: sabnzbd/skintext.py
 msgid "Size"
@@ -2812,33 +2718,26 @@ msgstr "下载后应删除的文件扩展名列表。<br />例如: <b>nfo</b>
 msgid "History Retention"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid ""
+"Automatically delete completed jobs from History. Beware that Duplicate "
+"Detection and some external tools rely on History information."
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Keep all jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid ""
-"Move jobs to the archive if the history exceeds specified number of jobs"
+msgid "Keep maximum number of completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Delete jobs if the history exceeds specified number of jobs"
+msgid "Keep completed jobs maximum number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Move jobs to the archive after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete jobs after specified number of days"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Move all completed jobs to archive"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Delete all completed jobs"
+msgid "Do not keep any completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3191,20 +3090,21 @@ msgstr ""
 msgid "Discard"
 msgstr "舍弃"
 
-#. Four way switch for duplicates
-#: sabnzbd/skintext.py
-msgid "Tag job"
-msgstr ""
-
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
 msgid "Fail job (move to History)"
 msgstr "失败的任务 (移动到历史)"
 
+#. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Abort post-processing"
+msgid "Tag job"
 msgstr ""
 
+#. Three way switch for encrypted posts
+#: sabnzbd/skintext.py
+msgid "Abort"
+msgstr "中止"
+
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
 msgstr "侦测到不需要的扩展名时的操作"
@@ -3638,6 +3538,14 @@ msgstr "正在测试服务器详细情况..."
 msgid "Bandwidth"
 msgstr "带宽"
 
+#: sabnzbd/skintext.py
+msgid "Send Group"
+msgstr "发送 Group 命令"
+
+#: sabnzbd/skintext.py
+msgid "Send group command before requesting articles."
+msgstr "请求文章之前发送 group 命令。"
+
 #: sabnzbd/skintext.py
 msgid "Personal notes"
 msgstr "注释"
@@ -4020,30 +3928,6 @@ msgstr "设备"
 msgid "Device to which message should be sent"
 msgstr "信息发送的目标设备"
 
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Enable Apprise notifications"
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid "Send notifications using Apprise to almost any notification service"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Default Apprise URLs"
-msgstr ""
-
-#. Apprise settings
-#: sabnzbd/skintext.py
-msgid "Use a comma and/or space to identify more than one URL."
-msgstr ""
-
-#: sabnzbd/skintext.py
-msgid ""
-"Override the default URLs for specific notification types below, if desired."
-msgstr ""
-
 #. Header for Notification Script notification section
 #: sabnzbd/skintext.py
 msgid "Notification Script"
@@ -4785,3 +4669,48 @@ msgstr "URL 装取失败; %s"
 #: sabnzbd/urlgrabber.py
 msgid "Trying to fetch NZB from %s"
 msgstr "正在尝试从 %s 装取 NZB"
+
+#: sabnzbd/utils/servertests.py
+msgid "The hostname is not set."
+msgstr "主机名未设置。"
+
+#: sabnzbd/utils/servertests.py
+msgid "There are no connections set. Please set at least one connection."
+msgstr "未设置连接。请设置至少一个连接。"
+
+#: sabnzbd/utils/servertests.py
+msgid "Password masked in ******, please re-enter"
+msgstr "密码会以 ****** 显示，请重新输入"
+
+#: sabnzbd/utils/servertests.py
+msgid "Invalid server details"
+msgstr "服务器信息无效"
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out: Try enabling SSL or connecting on a different port."
+msgstr "超时: 请尝试启用 SSL 或连接其他端口。"
+
+#: sabnzbd/utils/servertests.py
+msgid "Timed out"
+msgstr "超时"
+
+#: sabnzbd/utils/servertests.py
+msgid ""
+"Unknown SSL protocol: Try disabling SSL or connecting on a different port."
+msgstr "未知的 SSL 协议：尝试禁用 SSL 或者连接不同的端口。"
+
+#: sabnzbd/utils/servertests.py
+msgid "Server requires username and password."
+msgstr "服务器需要用户名与密码。"
+
+#: sabnzbd/utils/servertests.py
+msgid "Connection Successful!"
+msgstr "连接成功!"
+
+#: sabnzbd/utils/servertests.py
+msgid "Too many connections, please pause downloading or try again later"
+msgstr "连接数过多，请先暂停下载或稍后再试"
+
+#: sabnzbd/utils/servertests.py
+msgid "Could not determine connection result (%s)"
+msgstr "无法判断连接结果 (%s)"

po/nsis/SABnsis.pot

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC1\n"
+"Project-Id-Version: SABnzbd-4.2.2RC1\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: team@sabnzbd.org\n"
 "Language-Team: SABnzbd <team@sabnzbd.org>\n"

po/nsis/cs.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Pavel C <quoing_transifex@mess.cz>, 2022\n"
 "Language-Team: Czech (https://app.transifex.com/sabnzbd/teams/111101/cs/)\n"

po/nsis/da.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Danish (https://app.transifex.com/sabnzbd/teams/111101/da/)\n"

po/nsis/de.po

@@ -5,13 +5,12 @@
 # Safihre <safihre@sabnzbd.org>, 2020
 # reloxx13 <reloxx@interia.pl>, 2022
 # HandyDandy04, 2024
-# Lorenz B, 2024
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
-"Last-Translator: Lorenz B, 2024\n"
+"Last-Translator: HandyDandy04, 2024\n"
 "Language-Team: German (https://app.transifex.com/sabnzbd/teams/111101/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,8 +40,8 @@ msgid ""
 "The installer only supports 64-bit Windows, use the standalone version to "
 "run on 32-bit Windows."
 msgstr ""
-"Der Installer unterstützt nur Windows 64-bit. Benutze die Standalone Version"
-" für Windows 32-bit."
+"Der Installer unterstützt nur Windows 64-Bit. Benutze die Portable Version "
+"für Windows 32-Bit."
 
 #: builder/win/NSIS_Installer.nsi
 msgid ""

po/nsis/es.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Ester Molla Aragones <moarages@gmail.com>, 2020\n"
 "Language-Team: Spanish (https://app.transifex.com/sabnzbd/teams/111101/es/)\n"

po/nsis/fi.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Finnish (https://app.transifex.com/sabnzbd/teams/111101/fi/)\n"

po/nsis/fr.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Fred L <88com88@gmail.com>, 2024\n"
 "Language-Team: French (https://app.transifex.com/sabnzbd/teams/111101/fr/)\n"

po/nsis/he.po

@@ -3,19 +3,19 @@
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# ION, 2024
+# ION, 2021
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
-"Last-Translator: ION, 2024\n"
+"Last-Translator: ION, 2021\n"
 "Language-Team: Hebrew (https://app.transifex.com/sabnzbd/teams/111101/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
 #: builder/win/NSIS_Installer.nsi
 msgid "Show Release Notes"
@@ -53,7 +53,7 @@ msgstr ""
 
 #: builder/win/NSIS_Installer.nsi
 msgid "Shutting down SABnzbd"
-msgstr "מכבה את SABnzbd"
+msgstr ""
 
 #: builder/win/NSIS_Installer.nsi
 msgid "This will uninstall SABnzbd from your system"

po/nsis/it.po

@@ -3,7 +3,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0Beta1\n"
+"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Language-Team: Italian (https://app.transifex.com/sabnzbd/teams/111101/it/)\n"
 "MIME-Version: 1.0\n"

po/nsis/nb.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC1\n"
+"Project-Id-Version: SABnzbd-4.2.1\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://app.transifex.com/sabnzbd/teams/111101/nb/)\n"

po/nsis/nl.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2024\n"
 "Language-Team: Dutch (https://app.transifex.com/sabnzbd/teams/111101/nl/)\n"

po/nsis/pl.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Polish (https://app.transifex.com/sabnzbd/teams/111101/pl/)\n"

po/nsis/pt_BR.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Portuguese (Brazil) (https://app.transifex.com/sabnzbd/teams/111101/pt_BR/)\n"

po/nsis/ro.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Romanian (https://app.transifex.com/sabnzbd/teams/111101/ro/)\n"

po/nsis/ru.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Russian (https://app.transifex.com/sabnzbd/teams/111101/ru/)\n"

po/nsis/sr.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Serbian (https://app.transifex.com/sabnzbd/teams/111101/sr/)\n"

po/nsis/sv.po

@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Petter Ramme, 2024\n"
 "Language-Team: Swedish (https://app.transifex.com/sabnzbd/teams/111101/sv/)\n"

po/nsis/zh_CN.po

@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.3.0RC1\n"
+"Project-Id-Version: SABnzbd-4.2.1\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Chinese (China) (https://app.transifex.com/sabnzbd/teams/111101/zh_CN/)\n"

requirements.txt

@@ -1,37 +1,36 @@
 # Main requirements
 # Note that not all sub-dependencies are listed, but only ones we know could cause trouble
-apprise==1.7.6
 sabctools==8.1.0
-CT3==3.3.3.post1
+cheetah3==3.2.6.post1
 cffi==1.16.0
-pycparser==2.22
+pycparser==2.21
 feedparser==6.0.11
 configobj==5.0.8
-cheroot==10.0.1
+cheroot==10.0.0
 six==1.16.0
 cherrypy==18.9.0
-jaraco.functools==4.0.1
+jaraco.functools==4.0.0
 jaraco.collections==5.0.0
 jaraco.text==3.8.1 # Newer version introduces irrelevant extra dependencies
-jaraco.classes==3.4.0
+jaraco.classes==3.3.0
 jaraco.context==4.3.0
 more-itertools==10.2.0
 zc.lockfile==3.0.post1
-python-dateutil==2.9.0.post0
-tempora==5.5.1
-pytz==2024.1
+python-dateutil==2.8.2
+tempora==5.5.0
+pytz==2023.3.post1
 sgmllib3k==1.0.0
 portend==3.2.0
 chardet==5.2.0
 PySocks==1.7.1
-puremagic==1.21
+puremagic==1.15
 guessit==3.8.0
 babelfish==0.6.0
 rebulk==3.2.0
 
 # Recent cryptography versions require Rust. If you run into issues compiling this
 # SABnzbd will also work with older pre-Rust versions such as cryptography==3.3.2
-cryptography==42.0.5
+cryptography==41.0.7
 
 # We recommend using "orjson" as it is 2x as fast as "ujson". However, it requires
 # Rust so SABnzbd works just as well with "ujson" or the Python built in "json" module
@@ -39,36 +38,16 @@ ujson==5.9.0
 
 # Windows system integration
 pywin32==306; sys_platform == 'win32'
-windows-toasts==1.1.0; sys_platform == 'win32' and python_version > '3.8'
-winrt-runtime==2.0.0b2; sys_platform == 'win32' and python_version > '3.8'
-winrt-Windows.Data.Xml.Dom==2.0.0b2; sys_platform == 'win32' and python_version > '3.8'
-winrt-Windows.Foundation==2.0.0b2; sys_platform == 'win32' and python_version > '3.8'
-winrt-Windows.Foundation.Collections==2.0.0b2; sys_platform == 'win32' and python_version > '3.8'
-winrt-Windows.UI.Notifications==2.0.0b2; sys_platform == 'win32' and python_version > '3.8'
+toasts-winrt==1.0.0; sys_platform == 'win32'
+windows-toasts==1.0.2; sys_platform == 'win32'
 
 # macOS system calls
-pyobjc-core==10.2; sys_platform == 'darwin'
-pyobjc-framework-Cocoa==10.2; sys_platform == 'darwin'
+pyobjc-core==10.1; sys_platform == 'darwin'
+pyobjc-framework-Cocoa==10.1; sys_platform == 'darwin'
 
 # Linux notifications
 notify2==0.3.1; sys_platform != 'win32' and sys_platform != 'darwin'
 
-# Apprise Requirements
-requests==2.31.0
-requests-oauthlib==2.0.0
-PyYAML==6.0.1
-markdown==3.6
-paho-mqtt==2.0.0
-
-# Requests Requirements
-charset_normalizer==3.3.2
-idna==3.7
-urllib3==2.2.1
-certifi==2024.2.2
-oauthlib==3.2.2
-PyJWT==2.8.0
-blinker==1.7.0
-
 # Optional support for *nix tray icon.
 # Note that pygobject depends on pycairo, which requires pkg-config and cairo headers.
 # See https://pycairo.readthedocs.io/en/latest/getting_started.html
@@ -78,4 +57,4 @@ blinker==1.7.0
 # Optional support for system power management on *nix.
 # Requires libdbus-1-dev to be installed.
 # Uncomment line below or manually install after installing requirements.
-# dbus-python; sys_platform != 'win32' and sys_platform != 'darwin'
+# dbus-python; sys_platform != 'win32' and sys_platform != 'darwin'

sabnzbd/__init__.py

@@ -290,11 +290,6 @@ def initialize(pause_downloader=False, clean_up=False, repair=0):
         cfg.no_smart_dupes.set(cfg.no_series_dupes())
         cfg.no_series_dupes.set(0)
 
-    # Convert history retention setting
-    if cfg.history_retention():
-        misc.convert_history_retention()
-        cfg.history_retention.set("")
-
     # Add hostname to the whitelist
     if not cfg.host_whitelist():
         cfg.host_whitelist.set(socket.gethostname())

sabnzbd/cfg.py

@@ -403,9 +403,7 @@ unwanted_extensions = OptionList("misc", "unwanted_extensions", validation=lower
 action_on_unwanted_extensions = OptionNumber("misc", "action_on_unwanted_extensions", 0)
 unwanted_extensions_mode = OptionNumber("misc", "unwanted_extensions_mode", 0)
 new_nzb_on_failure = OptionBool("misc", "new_nzb_on_failure", False)
-history_retention = OptionStr("misc", "history_retention", "0")  # Kept for converting to split option
-history_retention_option = OptionStr("misc", "history_retention_option", "all")
-history_retention_number = OptionNumber("misc", "history_retention_number", minval=1)
+history_retention = OptionStr("misc", "history_retention", "0")
 
 quota_size = OptionStr("misc", "quota_size")
 quota_day = OptionStr("misc", "quota_day")
@@ -450,7 +448,7 @@ enable_filejoin = OptionBool("misc", "enable_filejoin", True)
 enable_tsjoin = OptionBool("misc", "enable_tsjoin", True)
 overwrite_files = OptionBool("misc", "overwrite_files", False)
 ignore_unrar_dates = OptionBool("misc", "ignore_unrar_dates", False)
-backup_for_duplicates = OptionBool("misc", "backup_for_duplicates", False)
+backup_for_duplicates = OptionBool("misc", "backup_for_duplicates", True)
 empty_postproc = OptionBool("misc", "empty_postproc", False)
 wait_for_dfolder = OptionBool("misc", "wait_for_dfolder", False)
 rss_filenames = OptionBool("misc", "rss_filenames", False)
@@ -463,7 +461,6 @@ tray_icon = OptionBool("misc", "tray_icon", True)
 allow_incomplete_nzb = OptionBool("misc", "allow_incomplete_nzb", False)
 enable_broadcast = OptionBool("misc", "enable_broadcast", True)
 ipv6_hosting = OptionBool("misc", "ipv6_hosting", False)
-ipv6_staging = OptionBool("misc", "ipv6_staging", False)
 api_warnings = OptionBool("misc", "api_warnings", True, protect=True)
 no_penalties = OptionBool("misc", "no_penalties", False)
 x_frame_options = OptionBool("misc", "x_frame_options", True)
@@ -615,35 +612,6 @@ pushbullet_prio_error = OptionBool("pushbullet", "pushbullet_prio_error", False)
 pushbullet_prio_queue_done = OptionBool("pushbullet", "pushbullet_prio_queue_done", False)
 pushbullet_prio_other = OptionBool("pushbullet", "pushbullet_prio_other", True)
 
-# [apprise]
-apprise_enable = OptionBool("apprise", "apprise_enable")
-apprise_cats = OptionList("apprise", "apprise_cats", ["*"])
-apprise_urls = OptionStr("apprise", "apprise_urls")
-apprise_target_startup = OptionStr("apprise", "apprise_target_startup")
-apprise_target_startup_enable = OptionBool("apprise", "apprise_target_startup_enable", False)
-apprise_target_download = OptionStr("apprise", "apprise_target_download")
-apprise_target_download_enable = OptionBool("apprise", "apprise_target_download_enable", False)
-apprise_target_pause_resume = OptionStr("apprise", "apprise_target_pause_resume")
-apprise_target_pause_resume_enable = OptionBool("apprise", "apprise_target_pause_resume_enable", False)
-apprise_target_pp = OptionStr("apprise", "apprise_target_pp")
-apprise_target_pp_enable = OptionBool("apprise", "apprise_target_pp_enable", False)
-apprise_target_complete = OptionStr("apprise", "apprise_target_complete")
-apprise_target_complete_enable = OptionBool("apprise", "apprise_target_complete_enable", True)
-apprise_target_failed = OptionStr("apprise", "apprise_target_failed")
-apprise_target_failed_enable = OptionBool("apprise", "apprise_target_failed_enable", True)
-apprise_target_disk_full = OptionStr("apprise", "apprise_target_disk_full")
-apprise_target_disk_full_enable = OptionBool("apprise", "apprise_target_disk_full_enable", False)
-apprise_target_new_login = OptionStr("apprise", "apprise_target_new_login")
-apprise_target_new_login_enable = OptionBool("apprise", "apprise_target_new_login_enable", True)
-apprise_target_warning = OptionStr("apprise", "apprise_target_warning")
-apprise_target_warning_enable = OptionBool("apprise", "apprise_target_warning_enable", False)
-apprise_target_error = OptionStr("apprise", "apprise_target_error")
-apprise_target_error_enable = OptionBool("apprise", "apprise_target_error_enable", False)
-apprise_target_queue_done = OptionStr("apprise", "apprise_target_queue_done")
-apprise_target_query_done_enable = OptionBool("apprise", "apprise_target_queue_done_enable", False)
-apprise_target_other = OptionStr("apprise", "apprise_target_other")
-apprise_target_other_enable = OptionBool("apprise", "apprise_target_other_enable", True)
-
 # [nscript]
 nscript_enable = OptionBool("nscript", "nscript_enable")
 nscript_cats = OptionList("nscript", "nscript_cats", ["*"])

sabnzbd/config.py

@@ -447,6 +447,7 @@ class ConfigServer:
         self.expire_date = OptionStr(name, "expire_date", add=False)
         self.quota = OptionStr(name, "quota", add=False)
         self.usage_at_start = OptionNumber(name, "usage_at_start", add=False)
+        self.send_group = OptionBool(name, "send_group", False, add=False)
         self.priority = OptionNumber(name, "priority", 0, 0, 99, add=False)
         self.notes = OptionStr(name, "notes", add=False)
 
@@ -472,6 +473,7 @@ class ConfigServer:
             "ssl",
             "ssl_verify",
             "ssl_ciphers",
+            "send_group",
             "enable",
             "required",
             "optional",
@@ -514,6 +516,7 @@ class ConfigServer:
         output_dict["expire_date"] = self.expire_date()
         output_dict["quota"] = self.quota()
         output_dict["usage_at_start"] = self.usage_at_start()
+        output_dict["send_group"] = self.send_group()
         output_dict["priority"] = self.priority()
         output_dict["notes"] = self.notes()
         return output_dict

sabnzbd/constants.py

@@ -75,7 +75,6 @@ DEF_LOG_CHERRY = "cherrypy.log"
 DEF_ARTICLE_CACHE_DEFAULT = "500M"
 DEF_ARTICLE_CACHE_MAX = "1G"
 DEF_TIMEOUT = 60
-DEF_TEST_TIMEOUT = 5
 DEF_SCANRATE = 5
 DEF_HTTPS_CERT_FILE = "server.cert"
 DEF_HTTPS_KEY_FILE = "server.key"

sabnzbd/database.py

@@ -27,7 +27,7 @@ import sys
 import threading
 import sqlite3
 from sqlite3 import Connection, Cursor
-from typing import Optional, List, Sequence, Dict, Any, Tuple, Union
+from typing import Optional, List, Sequence, Dict, Any, Tuple
 
 import sabnzbd
 import sabnzbd.cfg
@@ -38,7 +38,7 @@ from sabnzbd.encoding import ubtou, utob
 from sabnzbd.misc import int_conv, caller_name, opts_to_pp, to_units
 from sabnzbd.filesystem import remove_file, clip_path
 
-DB_LOCK = threading.Lock()
+DB_LOCK = threading.RLock()
 
 
 class HistoryDB:
@@ -50,74 +50,66 @@ class HistoryDB:
 
     # These class attributes will be accessed directly because
     # they need to be shared by all instances
-    db_path = None  # Full path to history database
-    startup_done = False
+    db_path = None  # Will contain full path to history database
+    done_cleaning = False  # Ensure we only do one Vacuum per session
 
     @synchronized(DB_LOCK)
     def __init__(self):
         """Determine database path and create connection"""
         self.connection: Optional[Connection] = None
         self.cursor: Optional[Cursor] = None
+        if not HistoryDB.db_path:
+            HistoryDB.db_path = os.path.join(sabnzbd.cfg.admin_dir.get_path(), DB_HISTORY_NAME)
         self.connect()
 
     def connect(self):
         """Create a connection to the database"""
-        if not HistoryDB.db_path:
-            HistoryDB.db_path = os.path.join(sabnzbd.cfg.admin_dir.get_path(), DB_HISTORY_NAME)
-        create_table = not HistoryDB.startup_done and not os.path.exists(HistoryDB.db_path)
-
+        create_table = not os.path.exists(HistoryDB.db_path)
         self.connection = sqlite3.connect(HistoryDB.db_path)
-        self.connection.isolation_level = None  # autocommit attribute only introduced in Python 3.12
         self.connection.row_factory = sqlite3.Row
         self.cursor = self.connection.cursor()
-
-        # Perform initialization only once
-        if not HistoryDB.startup_done:
-            if create_table:
-                self.create_history_db()
-
+        if create_table:
+            self.create_history_db()
+        elif not HistoryDB.done_cleaning:
+            # Run VACUUM on sqlite
             # When an object (table, index, or trigger) is dropped from the database, it leaves behind empty space
             # http://www.sqlite.org/lang_vacuum.html
+            HistoryDB.done_cleaning = True
             self.execute("VACUUM")
 
-            # See if we need to perform any updates
-            self.execute("PRAGMA user_version;")
-            try:
-                version = self.cursor.fetchone()["user_version"]
-            except (IndexError, TypeError):
-                version = 0
+        self.execute("PRAGMA user_version;")
+        try:
+            version = self.cursor.fetchone()["user_version"]
+        except (IndexError, TypeError):
+            version = 0
 
-            # Add any new columns added since last DB version
-            # Use "and" to stop when database has been reset due to corruption
-            if version < 1:
-                _ = (
-                    self.execute("PRAGMA user_version = 1;")
-                    and self.execute("ALTER TABLE history ADD COLUMN series TEXT;")
-                    and self.execute("ALTER TABLE history ADD COLUMN md5sum TEXT;")
-                )
-            if version < 2:
-                _ = self.execute("PRAGMA user_version = 2;") and self.execute(
-                    "ALTER TABLE history ADD COLUMN password TEXT;"
-                )
-            if version < 3:
-                # Transfer data to new column (requires WHERE-hack), original column should be removed later
-                _ = (
-                    self.execute("PRAGMA user_version = 3;")
-                    and self.execute("ALTER TABLE history ADD COLUMN duplicate_key TEXT;")
-                    and self.execute("UPDATE history SET duplicate_key = series WHERE 1 = 1;")
-                )
-            if version < 4:
-                _ = self.execute("PRAGMA user_version = 4;") and self.execute(
-                    "ALTER TABLE history ADD COLUMN archive INTEGER;"
-                )
+        # Add any new columns added since last DB version
+        # Use "and" to stop when database has been reset due to corruption
+        if version < 1:
+            _ = (
+                self.execute("PRAGMA user_version = 1;", save=True)
+                and self.execute("ALTER TABLE history ADD COLUMN series TEXT;", save=True)
+                and self.execute("ALTER TABLE history ADD COLUMN md5sum TEXT;", save=True)
+            )
+        if version < 2:
+            _ = self.execute("PRAGMA user_version = 2;", save=True) and self.execute(
+                "ALTER TABLE history ADD COLUMN password TEXT;", save=True
+            )
+        if version < 3:
+            # Transfer data to new column (requires WHERE-hack), original column should be removed later
+            _ = (
+                self.execute("PRAGMA user_version = 3;", save=True)
+                and self.execute("ALTER TABLE history ADD COLUMN duplicate_key TEXT;", save=True)
+                and self.execute("UPDATE history SET duplicate_key = series WHERE 1 = 1;", save=True)
+            )
 
-            HistoryDB.startup_done = True
-
-    def execute(self, command: str, args: Sequence = ()) -> bool:
+    def execute(self, command: str, args: Sequence = (), save: bool = False) -> bool:
         """Wrapper for executing SQL commands"""
         for tries in (4, 3, 2, 1, 0):
             try:
                 self.cursor.execute(command, args)
+                if save:
+                    self.connection.commit()
                 return True
             except:
                 error = str(sys.exc_info()[1])
@@ -137,7 +129,6 @@ class HistoryDB:
                         remove_file(HistoryDB.db_path)
                     except:
                         pass
-                    HistoryDB.startup_done = False
                     self.connect()
                     # Return False in case of "duplicate column" error
                     # because the column addition in connect() must be terminated
@@ -150,7 +141,6 @@ class HistoryDB:
                     try:
                         self.connection.rollback()
                     except:
-                        # Can fail in case of automatic rollback
                         logging.debug("Rollback Failed:", exc_info=True)
             return False
 
@@ -186,12 +176,12 @@ class HistoryDB:
             "series" TEXT,
             "md5sum" TEXT,
             "password" TEXT,
-            "duplicate_key" TEXT,
-            "archive" INTEGER
+            "duplicate_key" TEXT
         )
-        """
+        """,
+            save=True,
         )
-        self.execute("PRAGMA user_version = 4;")
+        self.execute("PRAGMA user_version = 3;", save=True)
 
     def close(self):
         """Close database connection"""
@@ -202,32 +192,15 @@ class HistoryDB:
             logging.error(T("Failed to close database, see log"))
             logging.info("Traceback: ", exc_info=True)
 
-    def archive(self, job: str):
-        """Move job to the archive"""
-        self.execute("""UPDATE history SET archive = 1 WHERE nzo_id = ?""", (job,))
-        logging.info("[%s] Moved job %s to archive", caller_name(), job)
-
-    def remove(self, job: str):
-        """Permanently remove job from the history"""
-        self.execute("""DELETE FROM history WHERE nzo_id = ?""", (job,))
-        logging.info("[%s] Removing job %s from history", caller_name(), job)
-
-    def archive_with_status(self, status: str, search: Optional[str] = None):
-        """Archive all jobs with a specific status, optional with `search` pattern"""
+    def remove_completed(self, search=None):
+        """Remove all completed jobs from the database, optional with `search` pattern"""
         search = convert_search(search)
-        logging.info("Archiving all jobs with status=%s", status)
-        self.execute(
-            """UPDATE history SET archive = 1 WHERE archive IS NULL AND name LIKE ? AND status = ?""",
-            (search, status),
+        logging.info("Removing all completed jobs from history")
+        return self.execute(
+            """DELETE FROM history WHERE name LIKE ? AND status = ?""", (search, Status.COMPLETED), save=True
         )
 
-    def remove_with_status(self, status: str, search: Optional[str] = None):
-        """Remove all jobs from the database with a specific status, optional with `search` pattern"""
-        search = convert_search(search)
-        logging.info("Removing all jobs with status=%s", status)
-        self.execute("""DELETE FROM history WHERE name LIKE ? AND status = ?""", (search, status))
-
-    def get_failed_paths(self, search: Optional[str] = None) -> List[str]:
+    def get_failed_paths(self, search=None):
         """Return list of all storage paths of failed jobs (may contain non-existing or empty paths)"""
         search = convert_search(search)
         fetch_ok = self.execute(
@@ -238,53 +211,58 @@ class HistoryDB:
         else:
             return []
 
-    def auto_history_purge(self):
-        """Archive or remove history items based on the configured history-retention"""
-        history_retention_option = sabnzbd.cfg.history_retention_option()
-        to_keep = sabnzbd.cfg.history_retention_number()
+    def remove_failed(self, search=None):
+        """Remove all failed jobs from the database, optional with `search` pattern"""
+        search = convert_search(search)
+        logging.info("Removing all failed jobs from history")
+        return self.execute(
+            """DELETE FROM history WHERE name LIKE ? AND status = ?""", (search, Status.FAILED), save=True
+        )
 
-        if history_retention_option == "all":
+    def remove_history(self, jobs=None):
+        """Remove all jobs in the list `jobs`, empty list will remove all completed jobs"""
+        if jobs is None:
+            self.remove_completed()
+        else:
+            if not isinstance(jobs, list):
+                jobs = [jobs]
+
+            for job in jobs:
+                self.execute("""DELETE FROM history WHERE nzo_id = ?""", (job,), save=True)
+                logging.info("[%s] Removing job %s from history", caller_name(), job)
+
+    def auto_history_purge(self):
+        """Remove history items based on the configured history-retention"""
+        if sabnzbd.cfg.history_retention() == "0":
             return
-        elif history_retention_option == "number-archive":
-            # Archive if more than X jobs
-            logging.info("Archiving all but last %s completed jobs", to_keep)
-            self.execute(
-                """UPDATE history SET archive = 1 WHERE status = ? AND  archive IS NULL AND id NOT IN (
-                    SELECT id FROM history WHERE status = ? AND archive IS NULL ORDER BY completed DESC LIMIT ?
-                )""",
-                (Status.COMPLETED, Status.COMPLETED, to_keep),
-            )
-        elif history_retention_option == "number-delete":
-            # Delete if more than X jobs
-            logging.info("Removing all but last %s completed jobs from history", to_keep)
-            self.execute(
-                """DELETE FROM history WHERE status = ? AND id NOT IN (
-                    SELECT id FROM history WHERE status = ? ORDER BY completed DESC LIMIT ?
-                )""",
-                (Status.COMPLETED, Status.COMPLETED, to_keep),
-            )
-        elif history_retention_option == "days-archive":
-            # Archive jobs older dan X days
-            seconds_to_keep = int(time.time()) - to_keep * 86400
-            logging.info("Archiving completed jobs older than %s days from history", to_keep)
-            self.execute(
-                """UPDATE history SET archive = 1 WHERE status = ? AND archive IS NULL AND completed < ?""",
-                (Status.COMPLETED, seconds_to_keep),
-            )
-        elif history_retention_option == "days-delete":
-            # Delete jobs older dan X days
-            seconds_to_keep = int(time.time()) - to_keep * 86400
-            logging.info("Removing completed jobs older than %s days from history", to_keep)
-            self.execute(
-                """DELETE FROM history WHERE status = ? AND completed < ?""",
-                (Status.COMPLETED, seconds_to_keep),
-            )
-        elif history_retention_option == "all-archive":
-            # Archive all non-failed ones
-            self.archive_with_status(Status.COMPLETED)
-        elif history_retention_option == "all-delete":
+
+        if sabnzbd.cfg.history_retention() == "-1":
             # Delete all non-failed ones
-            self.remove_with_status(Status.COMPLETED)
+            self.remove_completed()
+
+        if "d" in sabnzbd.cfg.history_retention():
+            # How many days to keep?
+            days_to_keep = int_conv(sabnzbd.cfg.history_retention().strip()[:-1])
+            seconds_to_keep = int(time.time()) - days_to_keep * 86400
+            if days_to_keep > 0:
+                logging.info("Removing completed jobs older than %s days from history", days_to_keep)
+                return self.execute(
+                    """DELETE FROM history WHERE status = ? AND completed < ?""",
+                    (Status.COMPLETED, seconds_to_keep),
+                    save=True,
+                )
+        else:
+            # How many to keep?
+            to_keep = int_conv(sabnzbd.cfg.history_retention())
+            if to_keep > 0:
+                logging.info("Removing all but last %s completed jobs from history", to_keep)
+                return self.execute(
+                    """DELETE FROM history WHERE status = ? AND id NOT IN (
+                        SELECT id FROM history WHERE status = ? ORDER BY completed DESC LIMIT ?
+                    )""",
+                    (Status.COMPLETED, Status.COMPLETED, to_keep),
+                    save=True,
+                )
 
     def add_history_db(self, nzo, storage: str, postproc_time: int, script_output: str, script_line: str):
         """Add a new job entry to the database"""
@@ -296,6 +274,7 @@ class HistoryDB:
             downloaded, fail_message, url_info, bytes, duplicate_key, md5sum, password)
             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
             t,
+            save=True,
         )
         logging.info("Added job %s to history", nzo.final_name)
 
@@ -303,7 +282,6 @@ class HistoryDB:
         self,
         start: Optional[int] = None,
         limit: Optional[int] = None,
-        archive: Optional[bool] = None,
         search: Optional[str] = None,
         categories: Optional[List[str]] = None,
         statuses: Optional[List[str]] = None,
@@ -313,13 +291,9 @@ class HistoryDB:
         command_args = [convert_search(search)]
 
         post = ""
-        if archive:
-            post += " AND archive = 1"
-        else:
-            post += " AND archive IS NULL"
         if categories:
             categories = ["*" if c == "Default" else c for c in categories]
-            post += " AND (category = ?"
+            post = " AND (category = ?"
             post += " OR category = ? " * (len(categories) - 1)
             post += ")"
             command_args.extend(categories)
@@ -593,7 +567,6 @@ def unpack_history_info(item: sqlite3.Row) -> Dict[str, Any]:
     # The action line and loaded is only available for items in the postproc queue
     item["action_line"] = ""
     item["loaded"] = False
-    item["archive"] = bool(item["archive"])
 
     # Retry and retry for failed URL-fetch
     item["retry"] = int_conv(item["status"] == Status.FAILED and item["path"] and os.path.exists(item["path"]))

sabnzbd/decoder.py

@@ -209,7 +209,7 @@ def decode_uu(article: Article, raw_data: bytes) -> bytes:
     """Try to uu-decode an article. The raw_data may or may not contain headers.
     If there are headers, they will be separated from the body by at least one
     empty line. In case of no headers, the first line seems to always be the nntp
-    response code (220/222) directly followed by the msg body."""
+    response code (222) directly followed by the msg body."""
     if not raw_data:
         logging.debug("No data to decode")
         raise BadUu
@@ -232,7 +232,7 @@ def decode_uu(article: Article, raw_data: bytes) -> bytes:
         uu_start = raw_data[:limit].index(b"") + 1
     except ValueError:
         # No empty line, look for a response code instead
-        if raw_data[0].startswith(b"220 ") or raw_data[0].startswith(b"222 "):
+        if raw_data[0].startswith(b"222 "):
             uu_start = 1
         else:
             # Invalid data?