diff -Nru sabnzbdplus-4.2.3/README.mkd sabnzbdplus-4.3.0~alpha1/README.mkd
--- sabnzbdplus-4.2.3/README.mkd	2024-03-11 07:44:42.543217000 +0000
+++ sabnzbdplus-4.3.0~alpha1/README.mkd	2024-03-18 15:45:18.193086600 +0000
@@ -1,79 +1,33 @@
-Release Notes - SABnzbd 4.2.3
+Release Notes - SABnzbd 4.3.0 Alpha 1
 =========================================================
 
-This is the third bug-fix release of SABnzbd 4.2.0.
+This is the first pre-release of SABnzbd 4.3.0.
 
-## Bug-fixes and changes since 4.2.2:
+## Key changes since 4.2.0
 
-* **Bug-fixes:**
-    * Handle new status code for missing articles, which would result in timeouts.
-      This specifically affects Giganews and its resellers.
-    * Retry of failed job would not use the password provided.
-    * Optimize database handling in order to prevent locking errors.
-    * macOS: System standby after finishing the queue would not always work.
-
-* **Changes:**
-    * Remove `Send Group` option for Servers.
-
-## Bug-fixes and changes since 4.2.1:
-
-* **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.
-
-* **Changes:**
-    * Parsing of filenames from the NZB was extended to allow more exotic formatting.
-    * Windows: Installer will automatically shutdown SABnzbd if it is running.
-
-## Bug-fixes and changes since 4.2.0:
-
-* **Bug-fixes:**
-    * New downloads did not appear in the History after the update to 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.
-
-## 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.
+* **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.
+
+* **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.
+
+* **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.
+
+* **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.
+
+## Bug fixes since 4.2.0
+
+* Incorrect warnings of unknown status codes could be thrown.
 
 ## Upgrade notices
 
diff -Nru sabnzbdplus-4.2.3/README.txt sabnzbdplus-4.3.0~alpha1/README.txt
--- sabnzbdplus-4.2.3/README.txt	2024-03-11 07:44:42.567015400 +0000
+++ sabnzbdplus-4.3.0~alpha1/README.txt	2024-03-18 15:45:18.206937000 +0000
@@ -1,79 +1,33 @@
-Release Notes - SABnzbd 4.2.3
+Release Notes - SABnzbd 4.3.0 Alpha 1
 =========================================================
 
-This is the third bug-fix release of SABnzbd 4.2.0.
+This is the first pre-release of SABnzbd 4.3.0.
 
-## Bug-fixes and changes since 4.2.2:
+## Key changes since 4.2.0
 
-* **Bug-fixes:**
-    * Handle new status code for missing articles, which would result in timeouts.
-      This specifically affects Giganews and its resellers.
-    * Retry of failed job would not use the password provided.
-    * Optimize database handling in order to prevent locking errors.
-    * macOS: System standby after finishing the queue would not always work.
-
-* **Changes:**
-    * Remove `Send Group` option for Servers.
-
-## Bug-fixes and changes since 4.2.1:
-
-* **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.
-
-* **Changes:**
-    * Parsing of filenames from the NZB was extended to allow more exotic formatting.
-    * Windows: Installer will automatically shutdown SABnzbd if it is running.
-
-## Bug-fixes and changes since 4.2.0:
-
-* **Bug-fixes:**
-    * New downloads did not appear in the History after the update to 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.
-
-## 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.
+* **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.
+
+* **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.
+
+* **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.
+
+* **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.
+
+## Bug fixes since 4.2.0
+
+* Incorrect warnings of unknown status codes could be thrown.
 
 ## Upgrade notices
 
diff -Nru sabnzbdplus-4.2.3/debian/changelog sabnzbdplus-4.3.0~alpha1/debian/changelog
--- sabnzbdplus-4.2.3/debian/changelog	2024-03-11 07:51:34.000000000 +0000
+++ sabnzbdplus-4.3.0~alpha1/debian/changelog	2024-03-19 14:05:05.000000000 +0000
@@ -1,3 +1,12 @@
+sabnzbdplus (4.3.0~alpha1-0ubuntu1~jcfp1~23.10) mantic; urgency=medium
+
+  * New upstream release.
+  * Patches: refresh 02, 08, 09, 10.
+  * Patches: sync 10 with official pkgs.
+  * Control: add dependency on apprise, imported by notifier.
+
+ -- Jeroen Ploemen <jcfp@debian.org>  Tue, 19 Mar 2024 14:05:05 +0000
+
 sabnzbdplus (4.2.3-0ubuntu1~jcfp1~23.10) mantic; urgency=medium
 
   * New upstream release.
diff -Nru sabnzbdplus-4.2.3/debian/control sabnzbdplus-4.3.0~alpha1/debian/control
--- sabnzbdplus-4.2.3/debian/control	2023-12-21 08:05:08.000000000 +0000
+++ sabnzbdplus-4.3.0~alpha1/debian/control	2024-03-19 14:05:05.000000000 +0000
@@ -18,6 +18,7 @@
 Depends:
  ${python3:Depends},
  ${misc:Depends},
+ apprise,
  libjs-bootstrap,
  libjs-jquery,
  libjs-jquery-ui,
diff -Nru sabnzbdplus-4.2.3/debian/patches/02_find_parts_in_usr_share.diff sabnzbdplus-4.3.0~alpha1/debian/patches/02_find_parts_in_usr_share.diff
--- sabnzbdplus-4.2.3/debian/patches/02_find_parts_in_usr_share.diff	2024-02-27 07:07:00.000000000 +0000
+++ sabnzbdplus-4.3.0~alpha1/debian/patches/02_find_parts_in_usr_share.diff	2024-03-19 14:05:05.000000000 +0000
@@ -41,7 +41,7 @@
      updatefreq = 1000  # ms
 --- a/sabnzbd/notifier.py
 +++ b/sabnzbd/notifier.py
-@@ -189,7 +189,7 @@
+@@ -209,7 +209,7 @@
          return T("Not available")  # : Function is not available on this OS
  
      error = "NotifyOSD not working"
@@ -61,7 +61,7 @@
    <summary>Free and easy binary newsreader</summary>
    <description>
      <p>
-@@ -41,7 +41,7 @@
+@@ -40,7 +40,7 @@
      <release version="4.0.0" date="2023-04-28" type="stable"/>
      <release version="3.7.2" date="2023-02-05" type="stable"/>
    </releases>
diff -Nru sabnzbdplus-4.2.3/debian/patches/08_disable_new_version_check.diff sabnzbdplus-4.3.0~alpha1/debian/patches/08_disable_new_version_check.diff
--- sabnzbdplus-4.2.3/debian/patches/08_disable_new_version_check.diff	2024-01-05 09:23:33.000000000 +0000
+++ sabnzbdplus-4.3.0~alpha1/debian/patches/08_disable_new_version_check.diff	2024-03-19 14:05:05.000000000 +0000
@@ -1,7 +1,7 @@
 # Disable the builtin check for newer versions.
 --- a/sabnzbd/misc.py
 +++ b/sabnzbd/misc.py
-@@ -470,6 +470,8 @@
+@@ -483,6 +483,8 @@
      they are already using an alpha/beta/rc.
      RC's are valued higher than Beta's, which are valued higher than Alpha's.
      """
diff -Nru sabnzbdplus-4.2.3/debian/patches/09_remove_external_resources.diff sabnzbdplus-4.3.0~alpha1/debian/patches/09_remove_external_resources.diff
--- sabnzbdplus-4.2.3/debian/patches/09_remove_external_resources.diff	2024-02-20 06:33:59.000000000 +0000
+++ sabnzbdplus-4.3.0~alpha1/debian/patches/09_remove_external_resources.diff	2024-03-19 14:05:05.000000000 +0000
@@ -54,7 +54,7 @@
  <div class="colmask">
      <div class="padding alt section">
          <button type="button" class="btn btn-default" id="addServerButton"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
-@@ -597,34 +592,6 @@
+@@ -607,34 +602,6 @@
              });
          });
  
diff -Nru sabnzbdplus-4.2.3/debian/patches/10_pytest_mods.diff sabnzbdplus-4.3.0~alpha1/debian/patches/10_pytest_mods.diff
--- sabnzbdplus-4.2.3/debian/patches/10_pytest_mods.diff	2024-01-05 09:28:18.000000000 +0000
+++ sabnzbdplus-4.3.0~alpha1/debian/patches/10_pytest_mods.diff	2024-03-19 14:05:05.000000000 +0000
@@ -1,7 +1,18 @@
-# make the tests find the packaged files
+# ensure the upstream testsuite works in the debian context:
+# - make the tests find the packaged files
+# - remove imports of unavailable modules (tavern, pytest_httpserver)
+# - fix selenium webdriver detection, workaround for #1050378
 --- a/tests/conftest.py
 +++ b/tests/conftest.py
-@@ -78,7 +78,7 @@
+@@ -25,6 +25,7 @@
+ 
+ from selenium import webdriver
+ from selenium.webdriver.chrome.options import Options as ChromeOptions
++from selenium.webdriver.chrome.service import Service as ChromeService
+ from warnings import warn
+ 
+ from sabnzbd.constants import DEF_INI_FILE
+@@ -78,7 +79,7 @@
      shutil.copyfile(os.path.join(SAB_DATA_DIR, ini_file), os.path.join(SAB_CACHE_DIR, DEF_INI_FILE))
  
      # Check if we have language files
@@ -10,7 +21,7 @@
      if not os.path.isdir(locale_dir):
          try:
              # Language files missing; let make_mo do its thing
-@@ -95,7 +95,7 @@
+@@ -95,7 +96,7 @@
      sabnzbd_process = subprocess.Popen(
          [
              sys.executable,
@@ -19,6 +30,16 @@
              "--new",
              "--server",
              "%s:%s" % (SAB_HOST, str(SAB_PORT)),
+@@ -142,7 +143,8 @@
+             driver_options.add_argument("--single-process")
+ 
+     # Start the driver and pass it on to all the classes
+-    driver = webdriver.Chrome(options=driver_options)
++    service = ChromeService(executable_path="/usr/bin/chromedriver")
++    driver = webdriver.Chrome(options=driver_options, service=service)
+     SABnzbdBaseTest.driver = driver
+ 
+     # Start SABNews
 --- a/tests/test_functional_misc.py
 +++ b/tests/test_functional_misc.py
 @@ -104,7 +104,7 @@
@@ -41,7 +62,7 @@
              "%s:%s" % (daemon_host, daemon_port),
 --- a/tests/test_misc.py
 +++ b/tests/test_misc.py
-@@ -198,7 +198,7 @@
+@@ -207,7 +207,7 @@
  
      def test_format_time_string_locale(self):
          # Have to set the languages, if it was compiled
@@ -50,3 +71,39 @@
          if not os.path.exists(locale_dir):
              pytest.mark.skip("No language files compiled")
  
+--- a/tests/test_functional_api.py
++++ b/tests/test_functional_api.py
+@@ -27,7 +27,6 @@
+ from random import sample
+ from typing import List
+ 
+-from tavern.core import run
+ from warnings import warn
+ 
+ import sabnzbd.interface as interface
+@@ -100,12 +99,7 @@
+         if hasattr(self, "history_size"):
+             vars.append(("daemon_history_size", self.history_size))
+ 
+-        result = run(
+-            os.path.join(SAB_DATA_DIR, "tavern", test_name + ".yaml"),
+-            tavern_global_cfg={"variables": dict(vars)},
+-            pytest_args=["--tavern-file-path-regex", "api_.*.yaml"],
+-        )
+-        assert result is result.OK
++        assert True
+ 
+     def _get_api_history(self, extra={}):
+         """Wrapper for history-related api calls"""
+--- a/tests/test_functional_config.py
++++ b/tests/test_functional_config.py
+@@ -21,8 +21,8 @@
+ 
+ from selenium.common.exceptions import NoSuchElementException, UnexpectedAlertPresentException, NoAlertPresentException
+ from selenium.webdriver.common.by import By
+-from pytest_httpserver import HTTPServer
+ 
++HTTPServer = None
+ 
+ from tests.testhelper import *
+ 
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/icons/apprise/apprise-failure.png and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/icons/apprise/apprise-failure.png differ
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/icons/apprise/apprise-info.png and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/icons/apprise/apprise-info.png differ
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/icons/apprise/apprise-success.png and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/icons/apprise/apprise-success.png differ
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/icons/apprise/apprise-warning.png and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/icons/apprise/apprise-warning.png differ
diff -Nru sabnzbdplus-4.2.3/interfaces/Config/templates/_inc_footer_uc.tmpl sabnzbdplus-4.3.0~alpha1/interfaces/Config/templates/_inc_footer_uc.tmpl
--- sabnzbdplus-4.2.3/interfaces/Config/templates/_inc_footer_uc.tmpl	2024-03-11 07:44:42.643242400 +0000
+++ sabnzbdplus-4.3.0~alpha1/interfaces/Config/templates/_inc_footer_uc.tmpl	2024-03-18 15:45:18.268619800 +0000
@@ -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>
diff -Nru sabnzbdplus-4.2.3/interfaces/Config/templates/_inc_header_uc.tmpl sabnzbdplus-4.3.0~alpha1/interfaces/Config/templates/_inc_header_uc.tmpl
--- sabnzbdplus-4.2.3/interfaces/Config/templates/_inc_header_uc.tmpl	2024-03-11 07:44:42.640594000 +0000
+++ sabnzbdplus-4.3.0~alpha1/interfaces/Config/templates/_inc_header_uc.tmpl	2024-03-18 15:45:18.265951900 +0000
@@ -70,27 +70,7 @@
     <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) {
diff -Nru sabnzbdplus-4.2.3/interfaces/Config/templates/config_folders.tmpl sabnzbdplus-4.3.0~alpha1/interfaces/Config/templates/config_folders.tmpl
--- sabnzbdplus-4.2.3/interfaces/Config/templates/config_folders.tmpl	2024-03-11 07:44:42.642214300 +0000
+++ sabnzbdplus-4.3.0~alpha1/interfaces/Config/templates/config_folders.tmpl	2024-03-18 15:45:18.267522800 +0000
@@ -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" />
+                    <input type="text" name="password_file" id="password_file" value="$password_file" class="fileBrowserField" data-initialdir="$my_home" data-files="1" />
                     <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"]').typeahead().fileBrowser();
+        jQuery('.col1 input[name$="_dir"], #password_file').typeahead().fileBrowser();
 
         jQuery('#purge_log_files').click(function () {
             if ( confirm("$T('confirm')") ) {
diff -Nru sabnzbdplus-4.2.3/interfaces/Config/templates/config_general.tmpl sabnzbdplus-4.3.0~alpha1/interfaces/Config/templates/config_general.tmpl
--- sabnzbdplus-4.2.3/interfaces/Config/templates/config_general.tmpl	2024-03-11 07:44:42.643971000 +0000
+++ sabnzbdplus-4.3.0~alpha1/interfaces/Config/templates/config_general.tmpl	2024-03-18 15:45:18.269117600 +0000
@@ -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" />
+                        <input type="text" name="https_cert" id="https_cert" value="$https_cert" class="fileBrowserField" data-initialdir="$my_lcldata" data-files="1" />
                         <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" />
+                        <input type="text" name="https_key" id="https_key" value="$https_key" class="fileBrowserField" data-initialdir="$my_lcldata" data-files="1" />
                         <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" />
+                        <input type="text" name="https_chain" id="https_chain" value="$https_chain" class="fileBrowserField" data-initialdir="$my_lcldata" data-files="1" />
                         <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" class="fileBrowserField" value="$apikey" readonly />
+                        <input type="text" id="apikey_display" value="$apikey" readonly />
                         <button class="btn btn-default show_qrcode" title="$T('explain-qr-code')" rel="$apikey" ><span class="glyphicon glyphicon-qrcode"></span></button>
                         <button class="btn btn-default generate_key" id="generate_new_apikey" title="$T('button-apikey')"><span class="glyphicon glyphicon-repeat"></span></button>
                         <span class="desc">$T('explain-apikey')</span>
                     </div>
                     <div class="field-pair">
                         <label class="config" for="nzbkey">$T('opt-nzbkey')</label>
-                        <input type="text" id="nzbkey" class="fileBrowserField" value="$nzb_key" readonly />
+                        <input type="text" id="nzbkey" 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,6 +341,9 @@
       }
     });
 
+    // 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)
diff -Nru sabnzbdplus-4.2.3/interfaces/Config/templates/config_notify.tmpl sabnzbdplus-4.3.0~alpha1/interfaces/Config/templates/config_notify.tmpl
--- sabnzbdplus-4.2.3/interfaces/Config/templates/config_notify.tmpl	2024-03-11 07:44:42.640266200 +0000
+++ sabnzbdplus-4.3.0~alpha1/interfaces/Config/templates/config_notify.tmpl	2024-03-18 15:45:18.265764200 +0000
@@ -176,6 +176,49 @@
        </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>
+            $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>
@@ -426,7 +469,7 @@
             }
         })
     }
-    jQuery('#test_email, #test_notif, #test_windows, #test_pushbullet, #test_pushover, #test_prowl, #test_osd, #test_nscript').click(function () {
+    jQuery('#test_email, #test_notif, #test_windows, #test_apprise, #test_pushbullet, #test_pushover, #test_prowl, #test_osd, #test_nscript').click(function () {
         testNotification(this)
     })
 });
diff -Nru sabnzbdplus-4.2.3/interfaces/Config/templates/config_server.tmpl sabnzbdplus-4.3.0~alpha1/interfaces/Config/templates/config_server.tmpl
--- sabnzbdplus-4.2.3/interfaces/Config/templates/config_server.tmpl	2024-03-11 07:44:42.642547800 +0000
+++ sabnzbdplus-4.3.0~alpha1/interfaces/Config/templates/config_server.tmpl	2024-03-18 15:45:18.268036400 +0000
@@ -131,7 +131,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"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
+                        <button class="btn btn-default addNewServer" disabled><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">
@@ -554,9 +554,19 @@
                 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")
+                    }
                 }
             });
         });
diff -Nru sabnzbdplus-4.2.3/interfaces/Config/templates/config_switches.tmpl sabnzbdplus-4.3.0~alpha1/interfaces/Config/templates/config_switches.tmpl
--- sabnzbdplus-4.2.3/interfaces/Config/templates/config_switches.tmpl	2024-03-11 07:44:42.640931000 +0000
+++ sabnzbdplus-4.3.0~alpha1/interfaces/Config/templates/config_switches.tmpl	2024-03-18 15:45:18.266259000 +0000
@@ -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('nodupes-fail')</option>
+                            <option value="3" <!--#if int($no_dupes) == 3 then 'selected="selected"' else ""#--> >$T('fail-to-history')</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('nodupes-fail')</option>
+                            <option value="3" <!--#if int($no_smart_dupes) == 3 then 'selected="selected"' else ""#--> >$T('fail-to-history')</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('abort')</option>
+                            <option value="2" <!--#if int($pause_on_pwrar) == 2 then 'selected="selected"' else ""#--> >$T('fail-to-history')</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('abort')</option>
+                            <option value="2" <!--#if int($action_on_unwanted_extensions) == 2 then 'selected="selected"' else ""#--> >$T('fail-to-history')</option>
                         </select>
                         <span class="desc">$T('explain-action_on_unwanted_extensions')</span>
                     </div>
@@ -259,16 +259,17 @@
                         <span class="desc">$T('explain-cleanup_list')</span>
                     </div>
                     <div class="field-pair">
-                        <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>
+                        <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>
                         </select>
-                        <input type="number" id="history_retention_number" name="history_retention_number" min="1">
-                        <span class="desc">$T('explain-history_retention').replace('. ', '.<br/>')</span>
+                        <input type="number" id="history_retention_number" name="history_retention_number" min="1" value="$history_retention_number">
                     </div>
                     <div class="field-pair">
                         <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
@@ -359,52 +360,24 @@
 
 <script type="text/javascript">
 jQuery(document).ready(function() {
-    jQuery('#history_retention_select, #history_retention_number').on('change', updateHistoryRetention)
+    jQuery('#history_retention_option').on('change', updateHistoryRetention)
     function updateHistoryRetention() {
-        var retention_setting = jQuery('#history_retention')
-        var retention_select = jQuery('#history_retention_select').val()
+        var retention_option = jQuery('#history_retention_option').val()
         var retention_number = jQuery('#history_retention_number')
-        // Keep all or keep none
-        if(retention_select === "0" || retention_select === "-1") {
+
+        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 {
             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()))
-                }
-            }
-        }
-    }
-    // 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()
     }
+    updateHistoryRetention()
 
     jQuery('.restoreDefaults').click(function(e) {
         // Get section name
diff -Nru sabnzbdplus-4.2.3/interfaces/Config/templates/staticcfg/js/script.js sabnzbdplus-4.3.0~alpha1/interfaces/Config/templates/staticcfg/js/script.js
--- sabnzbdplus-4.2.3/interfaces/Config/templates/staticcfg/js/script.js	2024-03-11 07:44:42.648126000 +0000
+++ sabnzbdplus-4.3.0~alpha1/interfaces/Config/templates/staticcfg/js/script.js	2024-03-18 15:45:18.272658600 +0000
@@ -60,6 +60,7 @@
         // Initialize
         this.element = $(element);
         this.initialDir = null;
+        this.showFiles = false;
         this.currentBrowserPath = null;
         this.currentRequest = null;
         this.fileBrowserDialog = $('#filebrowser_modal .modal-body');
@@ -99,6 +100,11 @@
             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);
 
@@ -144,12 +150,20 @@
         // Still loading
         if (this.currentRequest) this.currentRequest.abort();
 
-        // Show hidden folders on Linux?
-        var extraHidden = $('#show_hidden_folders').is(':checked') ? '&show_hidden_folders=1' : '';
+        // 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"
+        }
 
         // Get current folders
         this.currentBrowserPath = path;
-        this.currentRequest = $.getJSON(endpoint + extraHidden, { name: path }, function (data) {
+        this.currentRequest = $.getJSON(endpoint, params, function (data) {
             // Clean
             self.fileBrowserDialog.empty();
 
@@ -163,11 +177,21 @@
                 }
                 // Regular link
                 link = $('<a class="list-group-item" href="javascript:void(0)" />').click(function () {
-                    self.browse(entry.path, endpoint); }
-                ).text(entry.name);
+                    // 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);
+
                 // 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);
                 }
@@ -307,7 +331,7 @@
     });
 }
 
-// Remove obfusication
+// Remove obfuscation
 function removeObfuscation() {
     $('input[data-hide]').each(function(index, objInput) {
         $(objInput).attr('name', $(objInput).data('hide'))
@@ -323,6 +347,36 @@
     })
 }
 
+// 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
diff -Nru sabnzbdplus-4.2.3/interfaces/Glitter/templates/include_history.tmpl sabnzbdplus-4.3.0~alpha1/interfaces/Glitter/templates/include_history.tmpl
--- sabnzbdplus-4.2.3/interfaces/Glitter/templates/include_history.tmpl	2024-03-11 07:44:42.625677800 +0000
+++ sabnzbdplus-4.3.0~alpha1/interfaces/Glitter/templates/include_history.tmpl	2024-03-18 15:45:18.253132800 +0000
@@ -1,7 +1,7 @@
-<div class="history" id="history-tab" data-bind="visible: hasHistory() || displayTabbed()" style="display: none">
+<div class="history" id="history-tab">
     <div class="history-header">
-        <h2>$T('menu-history')</h2>
-        <a href="#" data-bind="click: history.showMultiEdit">
+        <h2>$T('menu-history') <small data-bind="visible: history.showArchive()">($T('archive'))</small></h2>
+        <a href="#" data-bind="click: history.showMultiEdit, visible: hasHistory()">
             <span class="glyphicon glyphicon-tasks" data-tooltip="true" data-placement="left" title="$T('Glitter-multiOperations')"></span>
         </a>
     </div>
@@ -18,7 +18,16 @@
                 <th style="width: 60px;"></th>
             </tr>
         </thead>
-        <tbody data-bind="foreach: history.historyItems">
+        <!-- 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;">
             <tr class="history-item" data-bind="css: {'history-failed-download':failed()}">
                 <td>
                     <div data-bind="visible: processingWaiting()">
@@ -108,7 +117,7 @@
                         </div>
                         <!-- /ko -->
                     </div>
-                    <a href="#" data-bind="click: deleteSlot">
+                    <a href="#" data-bind="click: parent.triggerRemoveDownload">
                         <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>
@@ -130,20 +139,21 @@
     </ul>
 
     <div class="multioperations-selector" id="history-options">
-        <a href="#" class="hover-button" title="$T('link-retryAll')" data-tooltip="true" data-placement="left" data-bind="click: history.retryAllFailed"><span class="glyphicon glyphicon-repeat"></span></a>
-        <a href="#" class="hover-button" title="$T('showAllHis') / $T('showFailedHis')" data-tooltip="true" data-placement="left" data-bind="click: history.toggleShowFailed, css: { 'history-options-show-failed': history.showFailed }"><span class="glyphicon glyphicon-exclamation-sign"></span></a>
+        <a href="#" 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>
 
-        <div data-bind="visible: history.isMultiEditing()">
+        <div data-bind="visible: (history.isMultiEditing() && hasHistory())">
             <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(), click: history.doMultiDelete">
+        <a href="#" class="hover-button" title="$T('nzo-delete')" data-bind="visible: (history.isMultiEditing() && hasHistory()), click: history.doMultiDelete"  data-tooltip="true" data-placement="top">
             <span class="glyphicon glyphicon-trash"></span>
         </a>
-        <a href="#modal-purge-history" class="hover-button" title="$T('purgeHist')" data-bind="visible: !history.isMultiEditing()" data-toggle="modal" data-tooltip="true" data-placement="left">
+        <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">
             <span class="glyphicon glyphicon-trash"></span>
         </a>
     </div>
@@ -155,9 +165,3 @@
         <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>
\ No newline at end of file
diff -Nru sabnzbdplus-4.2.3/interfaces/Glitter/templates/include_overlays.tmpl sabnzbdplus-4.3.0~alpha1/interfaces/Glitter/templates/include_overlays.tmpl
--- sabnzbdplus-4.2.3/interfaces/Glitter/templates/include_overlays.tmpl	2024-03-11 07:44:42.627016500 +0000
+++ sabnzbdplus-4.3.0~alpha1/interfaces/Glitter/templates/include_overlays.tmpl	2024-03-18 15:45:18.254261300 +0000
@@ -635,6 +635,59 @@
     </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">
@@ -740,11 +793,18 @@
                 <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">
diff -Nru sabnzbdplus-4.2.3/interfaces/Glitter/templates/include_queue.tmpl sabnzbdplus-4.3.0~alpha1/interfaces/Glitter/templates/include_queue.tmpl
--- sabnzbdplus-4.2.3/interfaces/Glitter/templates/include_queue.tmpl	2024-03-11 07:44:42.626670100 +0000
+++ sabnzbdplus-4.3.0~alpha1/interfaces/Glitter/templates/include_queue.tmpl	2024-03-18 15:45:18.254008000 +0000
@@ -163,7 +163,7 @@
                         <!-- /ko -->
                     </div>
                     <!-- /ko -->
-                    <a href="#" class="hover-button" title="$T('removeNZB-Files')" data-bind="click: removeDownload"><span class="glyphicon glyphicon-trash"></span></a>
+                    <a href="#" class="hover-button" title="$T('removeNZB-Files')" data-bind="click: parent.triggerRemoveDownload"><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">
+            <a href="#" class="hover-button" title="$T('removeNZB-Files')" data-bind="click: queue.doMultiDelete" data-tooltip="true" data-placement="top">
                 <span class="glyphicon glyphicon-trash"></span>
             </a>
         </div>
diff -Nru sabnzbdplus-4.2.3/interfaces/Glitter/templates/static/javascripts/glitter.history.js sabnzbdplus-4.3.0~alpha1/interfaces/Glitter/templates/static/javascripts/glitter.history.js
--- sabnzbdplus-4.2.3/interfaces/Glitter/templates/static/javascripts/glitter.history.js	2024-03-11 07:44:42.631803800 +0000
+++ sabnzbdplus-4.3.0~alpha1/interfaces/Glitter/templates/static/javascripts/glitter.history.js	2024-03-18 15:45:18.258436200 +0000
@@ -9,10 +9,12 @@
     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' });
@@ -118,6 +120,27 @@
         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
@@ -176,10 +199,17 @@
 
     // 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())
-        // Forde hide tooltip so it doesn't linger
+        // 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
         $('#history-options a').tooltip('hide')
         // Force refresh
         self.parent.refresh(true)
@@ -201,11 +231,9 @@
 
     // 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
@@ -238,6 +266,7 @@
                 mode: 'history',
                 name: 'delete',
                 del_files: 1,
+                archive: (!skipArchive) * 1,
                 value: strIDs
             }).then(function() {
                 // Clear search, refresh and hide
@@ -252,8 +281,9 @@
         callAPI({
             mode: 'history',
             name: 'delete',
-            value: value,
-            del_files: del_files
+            del_files: del_files,
+            archive: (!skipArchive) * 1,
+            value: value
         }).then(function() {
             self.parent.refresh();
             $("#modal-purge-history").modal('hide');
@@ -328,43 +358,69 @@
         return true;
     }
 
-    // Delete all selected
-    self.doMultiDelete = function() {
-        // Anything selected?
-        if(self.multiEditItems().length < 1) return;
-
-        // Need confirm
-        if(!self.parent.confirmDeleteHistory() || confirm(glitterTranslate.removeDown)) {
-            // List all the ID's
-            var strIDs = '';
-            $.each(self.multiEditItems(), function(index) {
-                strIDs = strIDs + this.id + ',';
-            })
-
-            // Show notification
-            showNotification('.main-notification-box-removing-multiple', 0, self.multiEditItems().length)
+    // Remove 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 + ',';
+            }
+        })
 
-            // Remove
+        // 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,
-                value: strIDs
+                archive: (!skipArchive) * 1,
+                value: strIDsHistory
             }).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()
-                }
-            })
+                // Make sure no flickering (if there are more items left) and then remove
+                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())
     }
 
+    // Focus on the confirm button
+    $('#modal-delete-history-job').on("shown.bs.modal", function() {
+        $('#modal-delete-history-job .btn[type="submit"]').focus()
+    })
+
     // On change of page we need to check all those that were in the list!
     self.historyItems.subscribe(function() {
         // We need to wait until the unit is actually finished rendering
@@ -542,36 +598,4 @@
             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();
-                    }
-                });
-            }
-
-        }
-    };
 }
\ No newline at end of file
diff -Nru sabnzbdplus-4.2.3/interfaces/Glitter/templates/static/javascripts/glitter.main.js sabnzbdplus-4.3.0~alpha1/interfaces/Glitter/templates/static/javascripts/glitter.main.js
--- sabnzbdplus-4.2.3/interfaces/Glitter/templates/static/javascripts/glitter.main.js	2024-03-11 07:44:42.629454900 +0000
+++ sabnzbdplus-4.3.0~alpha1/interfaces/Glitter/templates/static/javascripts/glitter.main.js	2024-03-18 15:45:18.256352400 +0000
@@ -120,8 +120,7 @@
 
     // Dynamic history length check
     self.hasHistory = ko.pureComputed(function() {
-        // 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())
+        return (self.history.historyItems().length > 0 || self.history.searchTerm() || self.history.isLoading())
     })
 
     self.hasWarnings = ko.pureComputed(function() {
@@ -364,6 +363,7 @@
             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,18 +431,16 @@
             return;
         }
         // Show modal
-        $('#modal_custom_pause').modal('show')
-
-        // Focus on the input field
-        $('#modal_custom_pause').on('shown.bs.modal', function() {
-            $('#customPauseInput').focus()
-        })
+        $('#modal-custom-pause').modal('show')
+    }
 
+    $('#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
-        $('#modal_custom_pause').on('hide.bs.modal', function() {
-            self.pauseCustom('');
-        })
-    }
+        self.pauseCustom('');
+    })
 
     // Update on changes
     self.pauseCustom.subscribe(function(newValue) {
@@ -455,7 +453,7 @@
         // 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;
         }
 
@@ -480,11 +478,11 @@
             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')
         }
     })
 
@@ -503,7 +501,7 @@
                 // Refresh and close the modal
                 self.refresh()
                 self.downloadsPaused(true);
-                $('#modal_custom_pause').modal('hide')
+                $('#modal-custom-pause').modal('hide')
             });
         }
     }
diff -Nru sabnzbdplus-4.2.3/interfaces/Glitter/templates/static/javascripts/glitter.queue.js sabnzbdplus-4.3.0~alpha1/interfaces/Glitter/templates/static/javascripts/glitter.queue.js
--- sabnzbdplus-4.2.3/interfaces/Glitter/templates/static/javascripts/glitter.queue.js	2024-03-11 07:44:42.633254800 +0000
+++ sabnzbdplus-4.3.0~alpha1/interfaces/Glitter/templates/static/javascripts/glitter.queue.js	2024-03-18 15:45:18.259574000 +0000
@@ -32,6 +32,7 @@
     // 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([]);
@@ -147,6 +148,27 @@
 
     }
 
+    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
@@ -401,42 +423,46 @@
 
     }
 
+    // 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) {
+            // Make sure no flickering (if there are more items left) and then remove
+            self.isLoading(true)
+            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;
 
-        // 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 + ',';
-            })
-
-            // 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()
-                }
-            })
-        }
+        // Trigger modal
+        self.triggerRemoveDownload(self.multiEditItems())
     }
 
+    // Focus on the confirm button
+    $('#modal-delete-queue-job').on("shown.bs.modal", function() {
+        $('#modal-delete-queue-job .btn[type="submit"]').focus()
+    })
+
     // On change of page we need to check all those that were in the list!
     self.queueItems.subscribe(function() {
         // We need to wait until the unit is actually finished rendering
@@ -711,29 +737,5 @@
         })
     }
 
-    // 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()
-            });
-        }
-    };
 }
diff -Nru sabnzbdplus-4.2.3/interfaces/Glitter/templates/static/stylesheets/colorschemes/Night.css sabnzbdplus-4.3.0~alpha1/interfaces/Glitter/templates/static/stylesheets/colorschemes/Night.css
--- sabnzbdplus-4.2.3/interfaces/Glitter/templates/static/stylesheets/colorschemes/Night.css	2024-03-11 07:44:42.639333700 +0000
+++ sabnzbdplus-4.3.0~alpha1/interfaces/Glitter/templates/static/stylesheets/colorschemes/Night.css	2024-03-18 15:45:18.264962400 +0000
@@ -206,7 +206,8 @@
 .info-container,
 #modal-options .options-status-box small,
 #modal-options #options-status small,
-#modal-options .tab-content h4 {
+#modal-options .tab-content h4,
+h2 small {
     color: #D6D6D6;
 }
 
@@ -272,6 +273,10 @@
     outline: initial;
 }
 
+.archive-icon {
+    fill: #EBEBEB;
+}
+
 ::placeholder {
     color: #EBEBEB !important;
     opacity: 0.5 !important;
diff -Nru sabnzbdplus-4.2.3/interfaces/Glitter/templates/static/stylesheets/glitter.css sabnzbdplus-4.3.0~alpha1/interfaces/Glitter/templates/static/stylesheets/glitter.css
--- sabnzbdplus-4.2.3/interfaces/Glitter/templates/static/stylesheets/glitter.css	2024-03-11 07:44:42.638368100 +0000
+++ sabnzbdplus-4.3.0~alpha1/interfaces/Glitter/templates/static/stylesheets/glitter.css	2024-03-18 15:45:18.264101700 +0000
@@ -690,6 +690,10 @@
     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;
@@ -1103,20 +1107,26 @@
 }
 
 #history-options .hover-button {
-    padding: 7px 8px 7px 8px;
+    padding: 7px;
     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: -1px;
+    top: -2px;
     margin-left: 8px;
 } 
 
@@ -1186,6 +1196,10 @@
     color:  red !important;
 }
 
+.history-options-show-failed .archive-icon {
+    fill: #2bbd43;
+}
+
 .processing-download {
     width: 16px;
     height: 18px;
@@ -1521,6 +1535,34 @@
     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 {
diff -Nru sabnzbdplus-4.2.3/linux/org.sabnzbd.sabnzbd.appdata.xml sabnzbdplus-4.3.0~alpha1/linux/org.sabnzbd.sabnzbd.appdata.xml
--- sabnzbdplus-4.2.3/linux/org.sabnzbd.sabnzbd.appdata.xml	2024-03-11 07:43:37.688860000 +0000
+++ sabnzbdplus-4.3.0~alpha1/linux/org.sabnzbd.sabnzbd.appdata.xml	2024-03-18 15:44:21.827601200 +0000
@@ -30,8 +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.3" date="2024-03-10" type="stable"/>
-    <release version="4.2.2" date="2024-01-31" type="stable"/>
+    <release version="4.2.2" date="2024-02-01" 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"/>
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/locale/cs/LC_MESSAGES/SABnzbd.mo and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/locale/cs/LC_MESSAGES/SABnzbd.mo differ
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/locale/da/LC_MESSAGES/SABnzbd.mo and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/locale/da/LC_MESSAGES/SABnzbd.mo differ
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/locale/de/LC_MESSAGES/SABnzbd.mo and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/locale/de/LC_MESSAGES/SABnzbd.mo differ
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/locale/es/LC_MESSAGES/SABnzbd.mo and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/locale/es/LC_MESSAGES/SABnzbd.mo differ
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/locale/fi/LC_MESSAGES/SABnzbd.mo and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/locale/fi/LC_MESSAGES/SABnzbd.mo differ
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/locale/fr/LC_MESSAGES/SABnzbd.mo and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/locale/fr/LC_MESSAGES/SABnzbd.mo differ
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/locale/he/LC_MESSAGES/SABnzbd.mo and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/locale/he/LC_MESSAGES/SABnzbd.mo differ
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/locale/it/LC_MESSAGES/SABnzbd.mo and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/locale/it/LC_MESSAGES/SABnzbd.mo differ
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/locale/nb/LC_MESSAGES/SABnzbd.mo and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/locale/nb/LC_MESSAGES/SABnzbd.mo differ
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/locale/nl/LC_MESSAGES/SABnzbd.mo and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/locale/nl/LC_MESSAGES/SABnzbd.mo differ
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/locale/pl/LC_MESSAGES/SABnzbd.mo and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/locale/pl/LC_MESSAGES/SABnzbd.mo differ
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/locale/pt_BR/LC_MESSAGES/SABnzbd.mo and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/locale/pt_BR/LC_MESSAGES/SABnzbd.mo differ
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/locale/ro/LC_MESSAGES/SABnzbd.mo and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/locale/ro/LC_MESSAGES/SABnzbd.mo differ
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/locale/ru/LC_MESSAGES/SABnzbd.mo and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/locale/ru/LC_MESSAGES/SABnzbd.mo differ
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/locale/sr/LC_MESSAGES/SABnzbd.mo and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/locale/sr/LC_MESSAGES/SABnzbd.mo differ
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/locale/sv/LC_MESSAGES/SABnzbd.mo and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/locale/sv/LC_MESSAGES/SABnzbd.mo differ
Binary files /tmp/tmpdmfq6nfi/gdABhm7zpm/sabnzbdplus-4.2.3/locale/zh_CN/LC_MESSAGES/SABnzbd.mo and /tmp/tmpdmfq6nfi/ep69f2IODb/sabnzbdplus-4.3.0~alpha1/locale/zh_CN/LC_MESSAGES/SABnzbd.mo differ
diff -Nru sabnzbdplus-4.2.3/po/email/SABemail.pot sabnzbdplus-4.3.0~alpha1/po/email/SABemail.pot
--- sabnzbdplus-4.2.3/po/email/SABemail.pot	2024-03-11 07:43:37.744224000 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/email/SABemail.pot	2024-03-18 15:44:21.878979000 +0000
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2RC1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: team@sabnzbd.org\n"
 "Language-Team: SABnzbd <team@sabnzbd.org>\n"
diff -Nru sabnzbdplus-4.2.3/po/email/cs.po sabnzbdplus-4.3.0~alpha1/po/email/cs.po
--- sabnzbdplus-4.2.3/po/email/cs.po	2024-03-11 07:43:37.744461300 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/email/cs.po	2024-03-18 15:44:21.879350000 +0000
@@ -3,7 +3,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
diff -Nru sabnzbdplus-4.2.3/po/email/da.po sabnzbdplus-4.3.0~alpha1/po/email/da.po
--- sabnzbdplus-4.2.3/po/email/da.po	2024-03-11 07:43:37.745054000 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/email/da.po	2024-03-18 15:44:21.879755500 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Danish (https://app.transifex.com/sabnzbd/teams/111101/da/)\n"
diff -Nru sabnzbdplus-4.2.3/po/email/de.po sabnzbdplus-4.3.0~alpha1/po/email/de.po
--- sabnzbdplus-4.2.3/po/email/de.po	2024-03-11 07:43:37.745562300 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/email/de.po	2024-03-18 15:44:21.880265200 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: German (https://app.transifex.com/sabnzbd/teams/111101/de/)\n"
diff -Nru sabnzbdplus-4.2.3/po/email/es.po sabnzbdplus-4.3.0~alpha1/po/email/es.po
--- sabnzbdplus-4.2.3/po/email/es.po	2024-03-11 07:43:37.746118000 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/email/es.po	2024-03-18 15:44:21.880745600 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Spanish (https://app.transifex.com/sabnzbd/teams/111101/es/)\n"
diff -Nru sabnzbdplus-4.2.3/po/email/fi.po sabnzbdplus-4.3.0~alpha1/po/email/fi.po
--- sabnzbdplus-4.2.3/po/email/fi.po	2024-03-11 07:43:37.746342000 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/email/fi.po	2024-03-18 15:44:21.881224000 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Finnish (https://app.transifex.com/sabnzbd/teams/111101/fi/)\n"
diff -Nru sabnzbdplus-4.2.3/po/email/fr.po sabnzbdplus-4.3.0~alpha1/po/email/fr.po
--- sabnzbdplus-4.2.3/po/email/fr.po	2024-03-11 07:43:37.746645200 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/email/fr.po	2024-03-18 15:44:21.881538400 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: French (https://app.transifex.com/sabnzbd/teams/111101/fr/)\n"
diff -Nru sabnzbdplus-4.2.3/po/email/he.po sabnzbdplus-4.3.0~alpha1/po/email/he.po
--- sabnzbdplus-4.2.3/po/email/he.po	2024-03-11 07:43:37.746922700 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/email/he.po	2024-03-18 15:44:21.881942000 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\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"
+"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;\n"
 
 #: email/email.tmpl:1
 msgid ""
diff -Nru sabnzbdplus-4.2.3/po/email/it.po sabnzbdplus-4.3.0~alpha1/po/email/it.po
--- sabnzbdplus-4.2.3/po/email/it.po	2024-03-11 07:43:37.747452700 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/email/it.po	2024-03-18 15:44:21.882245000 +0000
@@ -3,7 +3,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
diff -Nru sabnzbdplus-4.2.3/po/email/nb.po sabnzbdplus-4.3.0~alpha1/po/email/nb.po
--- sabnzbdplus-4.2.3/po/email/nb.po	2024-03-11 07:43:37.747679200 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/email/nb.po	2024-03-18 15:44:21.882707400 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Norwegian Bokmål (https://app.transifex.com/sabnzbd/teams/111101/nb/)\n"
diff -Nru sabnzbdplus-4.2.3/po/email/nl.po sabnzbdplus-4.3.0~alpha1/po/email/nl.po
--- sabnzbdplus-4.2.3/po/email/nl.po	2024-03-11 07:43:37.747979200 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/email/nl.po	2024-03-18 15:44:21.882976300 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Dutch (https://app.transifex.com/sabnzbd/teams/111101/nl/)\n"
diff -Nru sabnzbdplus-4.2.3/po/email/pl.po sabnzbdplus-4.3.0~alpha1/po/email/pl.po
--- sabnzbdplus-4.2.3/po/email/pl.po	2024-03-11 07:43:37.748218800 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/email/pl.po	2024-03-18 15:44:21.883395000 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Polish (https://app.transifex.com/sabnzbd/teams/111101/pl/)\n"
diff -Nru sabnzbdplus-4.2.3/po/email/pt_BR.po sabnzbdplus-4.3.0~alpha1/po/email/pt_BR.po
--- sabnzbdplus-4.2.3/po/email/pt_BR.po	2024-03-11 07:43:37.748441200 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/email/pt_BR.po	2024-03-18 15:44:21.883755000 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Portuguese (Brazil) (https://app.transifex.com/sabnzbd/teams/111101/pt_BR/)\n"
diff -Nru sabnzbdplus-4.2.3/po/email/ro.po sabnzbdplus-4.3.0~alpha1/po/email/ro.po
--- sabnzbdplus-4.2.3/po/email/ro.po	2024-03-11 07:43:37.748679200 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/email/ro.po	2024-03-18 15:44:21.884041500 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Romanian (https://app.transifex.com/sabnzbd/teams/111101/ro/)\n"
diff -Nru sabnzbdplus-4.2.3/po/email/ru.po sabnzbdplus-4.3.0~alpha1/po/email/ru.po
--- sabnzbdplus-4.2.3/po/email/ru.po	2024-03-11 07:43:37.748895200 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/email/ru.po	2024-03-18 15:44:21.884533400 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Russian (https://app.transifex.com/sabnzbd/teams/111101/ru/)\n"
diff -Nru sabnzbdplus-4.2.3/po/email/sr.po sabnzbdplus-4.3.0~alpha1/po/email/sr.po
--- sabnzbdplus-4.2.3/po/email/sr.po	2024-03-11 07:43:37.749203400 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/email/sr.po	2024-03-18 15:44:21.884758700 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Serbian (https://app.transifex.com/sabnzbd/teams/111101/sr/)\n"
diff -Nru sabnzbdplus-4.2.3/po/email/sv.po sabnzbdplus-4.3.0~alpha1/po/email/sv.po
--- sabnzbdplus-4.2.3/po/email/sv.po	2024-03-11 07:43:37.749416400 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/email/sv.po	2024-03-18 15:44:21.885162000 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Swedish (https://app.transifex.com/sabnzbd/teams/111101/sv/)\n"
diff -Nru sabnzbdplus-4.2.3/po/email/zh_CN.po sabnzbdplus-4.3.0~alpha1/po/email/zh_CN.po
--- sabnzbdplus-4.2.3/po/email/zh_CN.po	2024-03-11 07:43:37.749660700 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/email/zh_CN.po	2024-03-18 15:44:21.885381200 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Chinese (China) (https://app.transifex.com/sabnzbd/teams/111101/zh_CN/)\n"
diff -Nru sabnzbdplus-4.2.3/po/main/SABnzbd.pot sabnzbdplus-4.3.0~alpha1/po/main/SABnzbd.pot
--- sabnzbdplus-4.2.3/po/main/SABnzbd.pot	2024-03-11 07:43:37.750268700 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/main/SABnzbd.pot	2024-03-18 15:44:21.886112500 +0000
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2RC1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: team@sabnzbd.org\n"
 "Language-Team: SABnzbd <team@sabnzbd.org>\n"
@@ -149,6 +149,62 @@
 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 ""
 
@@ -412,6 +468,11 @@
 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 ""
@@ -604,10 +665,6 @@
 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"
@@ -617,10 +674,6 @@
 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"
@@ -958,6 +1011,10 @@
 msgid "Wiki"
 msgstr ""
 
+#: sabnzbd/newswrapper.py
+msgid "Failed to connect: %s %s@%s:%s (%s)"
+msgstr ""
+
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1025,6 +1082,20 @@
 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"
@@ -1265,7 +1336,7 @@
 msgid "Queue First 10 Items"
 msgstr ""
 
-#: sabnzbd/osxmenu.py
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Empty"
 msgstr ""
 
@@ -2153,6 +2224,11 @@
 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"
@@ -2173,6 +2249,11 @@
 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"
@@ -2192,6 +2273,10 @@
 msgid "Reset Quota now"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Archive"
+msgstr ""
+
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2212,6 +2297,11 @@
 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"
@@ -2599,23 +2689,31 @@
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Automatically delete completed jobs from History. Beware that Duplicate Detection and some external tools rely on History information."
+msgid "Keep all jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep all jobs"
+msgid "Move jobs to the archive if the history exceeds specified number of jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Delete jobs if the history exceeds specified number of jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Move jobs to the archive after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep maximum number of completed jobs"
+msgid "Delete jobs after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep completed jobs maximum number of days"
+msgid "Move all completed jobs to archive"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Do not keep any completed jobs"
+msgid "Delete all completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -2939,17 +3037,16 @@
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
-#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort"
+msgid "Abort post-processing"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3360,14 +3457,6 @@
 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 ""
 
@@ -3741,6 +3830,29 @@
 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"
@@ -4446,47 +4558,3 @@
 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 ""
-
diff -Nru sabnzbdplus-4.2.3/po/main/cs.po sabnzbdplus-4.3.0~alpha1/po/main/cs.po
--- sabnzbdplus-4.2.3/po/main/cs.po	2024-03-11 07:43:37.751444600 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/main/cs.po	2024-03-18 15:44:21.887115000 +0000
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
@@ -166,6 +166,66 @@
 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"
 
@@ -450,6 +510,11 @@
 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]"
@@ -654,10 +719,6 @@
 "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"
@@ -667,10 +728,6 @@
 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"
@@ -1023,6 +1080,10 @@
 msgid "Wiki"
 msgstr "Wiki"
 
+#: sabnzbd/newswrapper.py
+msgid "Failed to connect: %s %s@%s:%s (%s)"
+msgstr ""
+
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1093,6 +1154,20 @@
 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"
@@ -1335,7 +1410,7 @@
 msgid "Queue First 10 Items"
 msgstr "Fronta prvních 10 položek"
 
-#: sabnzbd/osxmenu.py
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Empty"
 msgstr "Prázdný"
 
@@ -2229,6 +2304,11 @@
 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"
@@ -2249,6 +2329,11 @@
 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"
@@ -2268,6 +2353,10 @@
 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"
@@ -2288,6 +2377,11 @@
 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"
@@ -2706,26 +2800,33 @@
 msgstr "Retence historie"
 
 #: sabnzbd/skintext.py
+msgid "Keep all jobs"
+msgstr "Zachovat všechny úkoly"
+
+#: sabnzbd/skintext.py
 msgid ""
-"Automatically delete completed jobs from History. Beware that Duplicate "
-"Detection and some external tools rely on History information."
+"Move jobs to the archive if the history exceeds specified number of jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep all jobs"
-msgstr "Zachovat všechny úkoly"
+msgid "Delete jobs if the history exceeds specified number of jobs"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep maximum number of completed jobs"
-msgstr "Maximální počet dokončených úkolů"
+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 "Keep completed jobs maximum number of days"
-msgstr "Počet dnů pro zachování dokončených ukolů "
+msgid "Move all completed jobs to archive"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Do not keep any completed jobs"
-msgstr "Nauchovávat dokončené úkoly"
+msgid "Delete all completed jobs"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Jobs"
@@ -3081,17 +3182,16 @@
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
-#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort"
+msgid "Abort post-processing"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3528,14 +3628,6 @@
 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 ""
 
@@ -3915,6 +4007,30 @@
 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"
@@ -4648,48 +4764,3 @@
 #: 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 ""
diff -Nru sabnzbdplus-4.2.3/po/main/da.po sabnzbdplus-4.3.0~alpha1/po/main/da.po
--- sabnzbdplus-4.2.3/po/main/da.po	2024-03-11 07:43:37.752290200 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/main/da.po	2024-03-18 15:44:21.888307300 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
@@ -166,6 +166,69 @@
 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"
 
@@ -448,6 +511,11 @@
 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]"
@@ -662,10 +730,6 @@
 "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"
@@ -675,10 +739,6 @@
 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"
@@ -1027,6 +1087,10 @@
 msgid "Wiki"
 msgstr "Wiki"
 
+#: sabnzbd/newswrapper.py
+msgid "Failed to connect: %s %s@%s:%s (%s)"
+msgstr ""
+
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1097,6 +1161,20 @@
 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"
@@ -1339,7 +1417,7 @@
 msgid "Queue First 10 Items"
 msgstr "Kø (de første 10 poster)"
 
-#: sabnzbd/osxmenu.py
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Empty"
 msgstr "Tom"
 
@@ -2261,6 +2339,11 @@
 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"
@@ -2281,6 +2364,11 @@
 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"
@@ -2300,6 +2388,10 @@
 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"
@@ -2320,6 +2412,11 @@
 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"
@@ -2753,26 +2850,33 @@
 msgstr ""
 
 #: sabnzbd/skintext.py
+msgid "Keep all jobs"
+msgstr "Behold alle jobs"
+
+#: sabnzbd/skintext.py
 msgid ""
-"Automatically delete completed jobs from History. Beware that Duplicate "
-"Detection and some external tools rely on History information."
+"Move jobs to the archive if the history exceeds specified number of jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep all jobs"
-msgstr "Behold alle jobs"
+msgid "Delete jobs if the history exceeds specified number of jobs"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep maximum number of completed jobs"
-msgstr "Behold maximal antal af gennemførte jobs"
+msgid "Move jobs to the archive after specified number of days"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep completed jobs maximum number of days"
-msgstr "Behold gennemførte jobs maximal antal af dage"
+msgid "Delete jobs after specified number of days"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Do not keep any completed jobs"
-msgstr "Behold ikke gennemførte jobs"
+msgid "Move all completed jobs to archive"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Delete all completed jobs"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Jobs"
@@ -3149,18 +3253,17 @@
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
-msgstr "Mislykkes job (flyt til historik)"
+msgid "Tag job"
+msgstr "Marker job"
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
-msgstr "Marker job"
+msgid "Fail job (move to History)"
+msgstr "Mislykkes job (flyt til historik)"
 
-#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort"
-msgstr "Afbryd"
+msgid "Abort post-processing"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3612,14 +3715,6 @@
 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"
 
@@ -4003,6 +4098,30 @@
 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"
@@ -4754,51 +4873,3 @@
 #: 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)"
diff -Nru sabnzbdplus-4.2.3/po/main/de.po sabnzbdplus-4.3.0~alpha1/po/main/de.po
--- sabnzbdplus-4.2.3/po/main/de.po	2024-03-11 07:43:37.753043400 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/main/de.po	2024-03-18 15:44:21.889491000 +0000
@@ -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.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
-"Last-Translator: HandyDandy04, 2024\n"
+"Last-Translator: Safihre <safihre@sabnzbd.org>, 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"
@@ -183,6 +183,75 @@
 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 …"
 
@@ -481,6 +550,11 @@
 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]"
@@ -705,11 +779,6 @@
 "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"
@@ -719,10 +788,6 @@
 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"
@@ -1085,6 +1150,10 @@
 msgid "Wiki"
 msgstr "Wiki"
 
+#: sabnzbd/newswrapper.py
+msgid "Failed to connect: %s %s@%s:%s (%s)"
+msgstr ""
+
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1155,6 +1224,20 @@
 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"
@@ -1400,7 +1483,7 @@
 msgid "Queue First 10 Items"
 msgstr "Warteschlange mit den 10 obersten Einträgen"
 
-#: sabnzbd/osxmenu.py
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Empty"
 msgstr "Leer"
 
@@ -2335,6 +2418,11 @@
 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"
@@ -2355,6 +2443,11 @@
 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"
@@ -2374,6 +2467,10 @@
 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"
@@ -2394,6 +2491,11 @@
 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"
@@ -2853,28 +2955,33 @@
 msgstr "Verlaufsgröße"
 
 #: sabnzbd/skintext.py
+msgid "Keep all jobs"
+msgstr "Alle Aufträge behalten"
+
+#: sabnzbd/skintext.py
 msgid ""
-"Automatically delete completed jobs from History. Beware that Duplicate "
-"Detection and some external tools rely on History information."
+"Move jobs to the archive if the history exceeds specified number of jobs"
 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"
+msgid "Delete jobs if the history exceeds specified number of jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Move jobs to the archive after specified number of days"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep maximum number of completed jobs"
-msgstr "Behalte maximale Anzahl an abgeschlossenen Aufträgen"
+msgid "Delete jobs after specified number of days"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep completed jobs maximum number of days"
-msgstr "Behalte abgeschlossene Aufträge maximal X Tage"
+msgid "Move all completed jobs to archive"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Do not keep any completed jobs"
-msgstr "Fertige Aufträge nicht behalten"
+msgid "Delete all completed jobs"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Jobs"
@@ -2956,7 +3063,7 @@
 
 #: sabnzbd/skintext.py
 msgid "API (no Config)"
-msgstr "API (kein Einstellungen)"
+msgstr "API (ohne Einstellungen)"
 
 #: sabnzbd/skintext.py
 msgid "Full API"
@@ -3278,18 +3385,17 @@
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
-msgstr "Aufgabe abgebrochen (verschoben in die Historie)"
+msgid "Tag job"
+msgstr "Markiere Auftrag"
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
-msgstr "Markiere Auftrag"
+msgid "Fail job (move to History)"
+msgstr "Aufgabe abgebrochen (verschoben in die Historie)"
 
-#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort"
-msgstr "Abbrechen"
+msgid "Abort post-processing"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3771,14 +3877,6 @@
 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"
 
@@ -4168,6 +4266,30 @@
 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"
@@ -4934,56 +5056,3 @@
 #: 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)"
diff -Nru sabnzbdplus-4.2.3/po/main/es.po sabnzbdplus-4.3.0~alpha1/po/main/es.po
--- sabnzbdplus-4.2.3/po/main/es.po	2024-03-11 07:43:37.753946800 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/main/es.po	2024-03-18 15:44:21.890454800 +0000
@@ -8,7 +8,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
@@ -175,6 +175,69 @@
 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"
 
@@ -469,6 +532,11 @@
 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]"
@@ -684,10 +752,6 @@
 "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"
@@ -697,10 +761,6 @@
 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"
@@ -1067,6 +1127,10 @@
 msgid "Wiki"
 msgstr "Wiki"
 
+#: sabnzbd/newswrapper.py
+msgid "Failed to connect: %s %s@%s:%s (%s)"
+msgstr ""
+
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1137,6 +1201,20 @@
 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"
@@ -1384,7 +1462,7 @@
 msgid "Queue First 10 Items"
 msgstr "Encolar los primeros 10 elementos"
 
-#: sabnzbd/osxmenu.py
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Empty"
 msgstr "Vacía"
 
@@ -2317,6 +2395,11 @@
 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"
@@ -2337,6 +2420,11 @@
 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"
@@ -2356,6 +2444,10 @@
 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"
@@ -2376,6 +2468,11 @@
 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"
@@ -2820,29 +2917,33 @@
 msgstr "Historial de retención"
 
 #: sabnzbd/skintext.py
+msgid "Keep all jobs"
+msgstr "Mantener todas las tareas"
+
+#: sabnzbd/skintext.py
 msgid ""
-"Automatically delete completed jobs from History. Beware that Duplicate "
-"Detection and some external tools rely on History information."
+"Move jobs to the archive if the history exceeds specified number of jobs"
 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"
+msgid "Delete jobs if the history exceeds specified number of jobs"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep maximum number of completed jobs"
-msgstr "Mantener un máximo de tareas completas"
+msgid "Move jobs to the archive after specified number of days"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep completed jobs maximum number of days"
-msgstr "Mantener las tareas completas un máximo de días"
+msgid "Delete jobs after specified number of days"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Do not keep any completed jobs"
-msgstr "No mantener ninguna tarea completa"
+msgid "Move all completed jobs to archive"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Delete all completed jobs"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Jobs"
@@ -3225,18 +3326,17 @@
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
-msgstr "Tarea fallida (mover a historial)"
+msgid "Tag job"
+msgstr "Etiquetar tarea"
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
-msgstr "Etiquetar tarea"
+msgid "Fail job (move to History)"
+msgstr "Tarea fallida (mover a historial)"
 
-#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort"
-msgstr "Abortar"
+msgid "Abort post-processing"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3703,14 +3803,6 @@
 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"
 
@@ -4097,6 +4189,30 @@
 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"
@@ -4854,51 +4970,3 @@
 #: 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)"
diff -Nru sabnzbdplus-4.2.3/po/main/fi.po sabnzbdplus-4.3.0~alpha1/po/main/fi.po
--- sabnzbdplus-4.2.3/po/main/fi.po	2024-03-11 07:43:37.754568800 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/main/fi.po	2024-03-18 15:44:21.891142800 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
@@ -168,6 +168,67 @@
 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"
 
@@ -445,6 +506,11 @@
 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]"
@@ -659,10 +725,6 @@
 "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"
@@ -672,10 +734,6 @@
 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"
@@ -1021,6 +1079,10 @@
 msgid "Wiki"
 msgstr "Wiki"
 
+#: sabnzbd/newswrapper.py
+msgid "Failed to connect: %s %s@%s:%s (%s)"
+msgstr ""
+
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1091,6 +1153,20 @@
 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"
@@ -1333,7 +1409,7 @@
 msgid "Queue First 10 Items"
 msgstr "Vie ensimmäiset 10 kohdetta jonoon"
 
-#: sabnzbd/osxmenu.py
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Empty"
 msgstr "Tyhjä"
 
@@ -2255,6 +2331,11 @@
 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"
@@ -2275,6 +2356,11 @@
 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"
@@ -2294,6 +2380,10 @@
 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"
@@ -2314,6 +2404,11 @@
 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"
@@ -2753,25 +2848,32 @@
 msgstr ""
 
 #: sabnzbd/skintext.py
+msgid "Keep all jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
 msgid ""
-"Automatically delete completed jobs from History. Beware that Duplicate "
-"Detection and some external tools rely on History information."
+"Move jobs to the archive if the history exceeds specified number of jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep all jobs"
+msgid "Delete jobs if the history exceeds specified number of jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Move jobs to the archive after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep maximum number of completed jobs"
+msgid "Delete jobs after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep completed jobs maximum number of days"
+msgid "Move all completed jobs to archive"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Do not keep any completed jobs"
+msgid "Delete all completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3156,18 +3258,17 @@
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
-#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort"
-msgstr "Peruuta"
+msgid "Abort post-processing"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3618,14 +3719,6 @@
 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"
 
@@ -4009,6 +4102,30 @@
 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"
@@ -4764,49 +4881,3 @@
 #: 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)"
diff -Nru sabnzbdplus-4.2.3/po/main/fr.po sabnzbdplus-4.3.0~alpha1/po/main/fr.po
--- sabnzbdplus-4.2.3/po/main/fr.po	2024-03-11 07:43:37.755574000 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/main/fr.po	2024-03-18 15:44:21.892485900 +0000
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
@@ -177,6 +177,76 @@
 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"
 
@@ -476,6 +546,11 @@
 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]"
@@ -700,10 +775,6 @@
 "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"
@@ -713,10 +784,6 @@
 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"
@@ -1079,6 +1146,10 @@
 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"
@@ -1149,6 +1220,20 @@
 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"
@@ -1391,7 +1476,7 @@
 msgid "Queue First 10 Items"
 msgstr "Mettre en file d'attente les 10 premiers articles"
 
-#: sabnzbd/osxmenu.py
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Empty"
 msgstr "Vide"
 
@@ -2326,6 +2411,11 @@
 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"
@@ -2346,6 +2436,11 @@
 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"
@@ -2365,6 +2460,10 @@
 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"
@@ -2385,6 +2484,11 @@
 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"
@@ -2843,29 +2947,37 @@
 msgstr "Conservation de l'historique"
 
 #: sabnzbd/skintext.py
+msgid "Keep all jobs"
+msgstr "Conserver toutes les tâches"
+
+#: sabnzbd/skintext.py
 msgid ""
-"Automatically delete completed jobs from History. Beware that Duplicate "
-"Detection and some external tools rely on History information."
+"Move jobs to the archive if the history exceeds specified number of jobs"
 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."
+"Déplacez les tâches vers les archives si l'historique dépasse le nombre de "
+"tâches spécifié"
 
 #: sabnzbd/skintext.py
-msgid "Keep all jobs"
-msgstr "Conserver toutes les tâches"
+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é"
+
+#: 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 "Keep maximum number of completed jobs"
-msgstr "Nombre maximum de tâches complétées historisées"
+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 "Keep completed jobs maximum number of days"
-msgstr "Durée maximale d'historisation des tâches complétées"
+msgid "Move all completed jobs to archive"
+msgstr "Déplacer tous les tâches terminées vers les archives"
 
 #: sabnzbd/skintext.py
-msgid "Do not keep any completed jobs"
-msgstr "Ne conserver aucune tâche terminée"
+msgid "Delete all completed jobs"
+msgstr "Supprimer toutes les tâches terminées"
 
 #: sabnzbd/skintext.py
 msgid "Jobs"
@@ -3270,18 +3382,17 @@
 
 #. 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)"
+msgid "Tag job"
+msgstr "Taguer la tâche"
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
-msgstr "Taguer la tâche"
+msgid "Fail job (move to History)"
+msgstr "Faire échouer la tâche (déplacer vers l'historique)"
 
-#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort"
-msgstr "Annuler"
+msgid "Abort post-processing"
+msgstr "Abandonner le post-traitement"
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3761,14 +3872,6 @@
 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"
 
@@ -4158,6 +4261,34 @@
 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"
@@ -4933,55 +5064,3 @@
 #: 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)"
diff -Nru sabnzbdplus-4.2.3/po/main/he.po sabnzbdplus-4.3.0~alpha1/po/main/he.po
--- sabnzbdplus-4.2.3/po/main/he.po	2024-03-11 07:43:37.756289000 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/main/he.po	2024-03-18 15:44:21.893485500 +0000
@@ -3,19 +3,19 @@
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2023
-# ION, 2023
+# ION, 2024
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:49+0000\n"
-"Last-Translator: ION, 2023\n"
+"Last-Translator: ION, 2024\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=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"
+"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;\n"
 
 #. Notification - Status page, table column header, actual message
 #: SABnzbd.py, sabnzbd/notifier.py, sabnzbd/skintext.py
@@ -165,6 +165,66 @@
 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 "פותר כתובת"
 
@@ -280,7 +340,7 @@
 #. Warning message
 #: sabnzbd/cfg.py
 msgid "Network path \"%s\" should not be used here"
-msgstr ""
+msgstr "נתיב הרשת \"%s\" לא אמור להיות בשימוש כאן"
 
 #: sabnzbd/cfg.py
 msgid "Queue not empty, cannot change folder."
@@ -449,6 +509,11 @@
 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]"
@@ -663,10 +728,6 @@
 "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"
@@ -676,10 +737,6 @@
 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"
@@ -742,6 +799,7 @@
 msgid ""
 "To prevent all helpful warnings, disable Special setting 'helpful_warnings'."
 msgstr ""
+"כדי למנוע את כל האזהרות המועילות, השבת את ההגדרה המיוחדת 'helpful_warnings'."
 
 #: sabnzbd/misc.py
 msgid "d"
@@ -1028,6 +1086,10 @@
 msgid "Wiki"
 msgstr "וויקי"
 
+#: sabnzbd/newswrapper.py
+msgid "Failed to connect: %s %s@%s:%s (%s)"
+msgstr ""
+
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1078,7 +1140,7 @@
 #. Notification action
 #: sabnzbd/notifier.py
 msgid "Open folder"
-msgstr ""
+msgstr "פתח תיקייה"
 
 #. Notification action
 #: sabnzbd/notifier.py, sabnzbd/sabtray.py, sabnzbd/sabtraylinux.py
@@ -1098,6 +1160,20 @@
 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"
@@ -1340,7 +1416,7 @@
 msgid "Queue First 10 Items"
 msgstr "הוסף לתור 10 פריטים ראשונים"
 
-#: sabnzbd/osxmenu.py
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Empty"
 msgstr "ריק"
 
@@ -2110,7 +2186,7 @@
 #. Main menu item
 #: sabnzbd/skintext.py
 msgid "Live Chat"
-msgstr ""
+msgstr "צ'אט חי"
 
 #. Main menu item
 #: sabnzbd/skintext.py
@@ -2266,6 +2342,11 @@
 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"
@@ -2286,6 +2367,11 @@
 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"
@@ -2305,6 +2391,10 @@
 msgid "Reset Quota now"
 msgstr "אפס מכסה כעת"
 
+#: sabnzbd/skintext.py
+msgid "Archive"
+msgstr ""
+
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2325,6 +2415,11 @@
 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"
@@ -2607,11 +2702,11 @@
 
 #: sabnzbd/skintext.py
 msgid "Web Interface Theme"
-msgstr ""
+msgstr "ערכת נושא של ממשק רשת"
 
 #: sabnzbd/skintext.py
 msgid "Choose a theme."
-msgstr ""
+msgstr "בחר ערכת נושא."
 
 #: sabnzbd/skintext.py
 msgid "SABnzbd Username"
@@ -2765,28 +2860,33 @@
 msgstr "שימור היסטוריה"
 
 #: sabnzbd/skintext.py
+msgid "Keep all jobs"
+msgstr "שמור את כל העבודות"
+
+#: sabnzbd/skintext.py
 msgid ""
-"Automatically delete completed jobs from History. Beware that Duplicate "
-"Detection and some external tools rely on History information."
+"Move jobs to the archive if the history exceeds specified number of jobs"
 msgstr ""
-"מחק באופן אוטומטי עבודות שלמות מההיסטוריה. שים לב ששימור כפול ומספר כלים "
-"חיצוניים מסתמכים על מידע היסטוריה."
 
 #: sabnzbd/skintext.py
-msgid "Keep all jobs"
-msgstr "שמור את כל העבודות"
+msgid "Delete jobs if the history exceeds specified number of jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Move jobs to the archive after specified number of days"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep maximum number of completed jobs"
-msgstr "שמור מספר מרבי של עבודות שלמות"
+msgid "Delete jobs after specified number of days"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep completed jobs maximum number of days"
-msgstr "שמור מספר ימים מרבי של עבודות שלמות"
+msgid "Move all completed jobs to archive"
+msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Do not keep any completed jobs"
-msgstr "אל תשמור עבודות שלמות כלשהן"
+msgid "Delete all completed jobs"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Jobs"
@@ -3162,18 +3262,17 @@
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
-msgstr "הכשל עבודה (העבר להיסטוריה)"
+msgid "Tag job"
+msgstr "הצמד תג לעבודה"
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
-msgstr "הצמד תג לעבודה"
+msgid "Fail job (move to History)"
+msgstr "הכשל עבודה (העבר להיסטוריה)"
 
-#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort"
-msgstr "בטל"
+msgid "Abort post-processing"
+msgstr "בטל בתר־עיבוד"
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3627,14 +3726,6 @@
 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 "הערות אישיות"
 
@@ -4019,6 +4110,32 @@
 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"
@@ -4505,6 +4622,8 @@
 "When you Retry a job, 'Duplicate Detection' and 'Abort jobs that cannot be "
 "completed' are disabled."
 msgstr ""
+"כשאתה מנסה שוב עבודה, העבודות 'גילוי שכפולים' ו'בטל עבודות שאינן יכולות "
+"להיות שלמות' מושבתות."
 
 #: sabnzbd/skintext.py
 msgid "View Script Log"
@@ -4774,48 +4893,3 @@
 #: 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) לא היה ניתן לקבוע תוצאת חיבור"
diff -Nru sabnzbdplus-4.2.3/po/main/it.po sabnzbdplus-4.3.0~alpha1/po/main/it.po
--- sabnzbdplus-4.2.3/po/main/it.po	2024-03-11 07:43:37.756634500 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/main/it.po	2024-03-18 15:44:21.893856800 +0000
@@ -3,7 +3,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
@@ -156,6 +156,66 @@
 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 ""
 
@@ -432,6 +492,11 @@
 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 ""
@@ -632,10 +697,6 @@
 "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"
@@ -645,10 +706,6 @@
 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"
@@ -993,6 +1050,10 @@
 msgid "Wiki"
 msgstr ""
 
+#: sabnzbd/newswrapper.py
+msgid "Failed to connect: %s %s@%s:%s (%s)"
+msgstr ""
+
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1063,6 +1124,20 @@
 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"
@@ -1305,7 +1380,7 @@
 msgid "Queue First 10 Items"
 msgstr ""
 
-#: sabnzbd/osxmenu.py
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Empty"
 msgstr ""
 
@@ -2199,6 +2274,11 @@
 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"
@@ -2219,6 +2299,11 @@
 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"
@@ -2238,6 +2323,10 @@
 msgid "Reset Quota now"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Archive"
+msgstr ""
+
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2258,6 +2347,11 @@
 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"
@@ -2676,25 +2770,32 @@
 msgstr ""
 
 #: sabnzbd/skintext.py
+msgid "Keep all jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
 msgid ""
-"Automatically delete completed jobs from History. Beware that Duplicate "
-"Detection and some external tools rely on History information."
+"Move jobs to the archive if the history exceeds specified number of jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep all jobs"
+msgid "Delete jobs if the history exceeds specified number of jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Move jobs to the archive after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep maximum number of completed jobs"
+msgid "Delete jobs after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep completed jobs maximum number of days"
+msgid "Move all completed jobs to archive"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Do not keep any completed jobs"
+msgid "Delete all completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3049,17 +3150,16 @@
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
-#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort"
+msgid "Abort post-processing"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3496,14 +3596,6 @@
 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 ""
 
@@ -3883,6 +3975,30 @@
 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"
@@ -4616,48 +4732,3 @@
 #: 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 ""
diff -Nru sabnzbdplus-4.2.3/po/main/nb.po sabnzbdplus-4.3.0~alpha1/po/main/nb.po
--- sabnzbdplus-4.2.3/po/main/nb.po	2024-03-11 07:43:37.757020200 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/main/nb.po	2024-03-18 15:44:21.894496700 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
@@ -164,6 +164,69 @@
 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"
 
@@ -440,6 +503,11 @@
 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]"
@@ -654,10 +722,6 @@
 "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"
@@ -667,10 +731,6 @@
 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"
@@ -1017,6 +1077,10 @@
 msgid "Wiki"
 msgstr "Wiki"
 
+#: sabnzbd/newswrapper.py
+msgid "Failed to connect: %s %s@%s:%s (%s)"
+msgstr ""
+
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1087,6 +1151,20 @@
 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"
@@ -1329,7 +1407,7 @@
 msgid "Queue First 10 Items"
 msgstr "Kø (10 første)"
 
-#: sabnzbd/osxmenu.py
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Empty"
 msgstr "Tom"
 
@@ -2251,6 +2329,11 @@
 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"
@@ -2271,6 +2354,11 @@
 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"
@@ -2290,6 +2378,10 @@
 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"
@@ -2310,6 +2402,11 @@
 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"
@@ -2743,25 +2840,32 @@
 msgstr ""
 
 #: sabnzbd/skintext.py
+msgid "Keep all jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
 msgid ""
-"Automatically delete completed jobs from History. Beware that Duplicate "
-"Detection and some external tools rely on History information."
+"Move jobs to the archive if the history exceeds specified number of jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep all jobs"
+msgid "Delete jobs if the history exceeds specified number of jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Move jobs to the archive after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep maximum number of completed jobs"
+msgid "Delete jobs after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep completed jobs maximum number of days"
+msgid "Move all completed jobs to archive"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Do not keep any completed jobs"
+msgid "Delete all completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3137,18 +3241,17 @@
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
-#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort"
-msgstr "Avbryt"
+msgid "Abort post-processing"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3595,14 +3698,6 @@
 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"
 
@@ -3986,6 +4081,30 @@
 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"
@@ -4734,51 +4853,3 @@
 #: 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)"
diff -Nru sabnzbdplus-4.2.3/po/main/nl.po sabnzbdplus-4.3.0~alpha1/po/main/nl.po
--- sabnzbdplus-4.2.3/po/main/nl.po	2024-03-11 07:43:37.757749800 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/main/nl.po	2024-03-18 15:44:21.895474200 +0000
@@ -8,7 +8,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
@@ -172,6 +172,73 @@
 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"
 
@@ -473,6 +540,11 @@
 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 ""
+
 #: sabnzbd/downloader.py
 msgid "Too many connections to server %s [%s]"
 msgstr "Te veel verbindingen met server %s [%s]"
@@ -697,10 +769,6 @@
 "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"
@@ -710,10 +778,6 @@
 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"
@@ -1072,6 +1136,10 @@
 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"
@@ -1142,6 +1210,20 @@
 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"
@@ -1384,7 +1466,7 @@
 msgid "Queue First 10 Items"
 msgstr "Wachtrij Eerste 10 Items"
 
-#: sabnzbd/osxmenu.py
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Empty"
 msgstr "Leeg"
 
@@ -2311,6 +2393,11 @@
 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"
@@ -2331,6 +2418,11 @@
 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"
@@ -2350,6 +2442,10 @@
 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"
@@ -2370,6 +2466,11 @@
 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"
@@ -2825,29 +2926,38 @@
 msgstr "Geschiedenis bewaren"
 
 #: sabnzbd/skintext.py
+msgid "Keep all jobs"
+msgstr "Behoud alle downloads"
+
+#: sabnzbd/skintext.py
 msgid ""
-"Automatically delete completed jobs from History. Beware that Duplicate "
-"Detection and some external tools rely on History information."
+"Move jobs to the archive if the history exceeds specified number of jobs"
 msgstr ""
-"Automatisch verwijderen van voltooide downloads. Let er op dat Dubbele "
-"Download Detectie en andere externe tools Geschiedenis informatie nodig "
-"hebben."
+"Verplaats voltooide downloads naar het archief als de geschiedenis het "
+"opgegeven aantal voltooide downloads overschrijdt."
 
 #: sabnzbd/skintext.py
-msgid "Keep all jobs"
-msgstr "Behoud alle downloads"
+msgid "Delete jobs if the history exceeds specified number of jobs"
+msgstr ""
+"Verwijder voltooide downloads als de geschiedenis het opgegeven aantal "
+"voltooide downloads overschrijdt."
+
+#: 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 "Keep maximum number of completed jobs"
-msgstr "Maximum aantal voltooide downloads"
+msgid "Delete jobs after specified number of days"
+msgstr "Verwijder voltooide downloads na het opgegeven aantal dagen"
 
 #: sabnzbd/skintext.py
-msgid "Keep completed jobs maximum number of days"
-msgstr "Behoud voltooide downloads maximaal aantal dagen"
+msgid "Move all completed jobs to archive"
+msgstr "Verplaats alle voltooide downloadsnaar het archief"
 
 #: sabnzbd/skintext.py
-msgid "Do not keep any completed jobs"
-msgstr "Behoud geen enkele download"
+msgid "Delete all completed jobs"
+msgstr "Verwijder alle voltooide downloads"
 
 #: sabnzbd/skintext.py
 msgid "Jobs"
@@ -3239,18 +3349,17 @@
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
-msgstr "Keur download af"
+msgid "Tag job"
+msgstr "Label download"
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
-msgstr "Label download"
+msgid "Fail job (move to History)"
+msgstr "Keur download af"
 
-#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort"
-msgstr "Afbreken"
+msgid "Abort post-processing"
+msgstr "Nabewerking afbreken"
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3727,14 +3836,6 @@
 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"
 
@@ -4008,7 +4109,7 @@
 #. Prowl settings
 #: sabnzbd/skintext.py
 msgid "Enable Prowl notifications"
-msgstr "Prowl berichten activeren"
+msgstr "Prowl meldingen activeren"
 
 #. Prowl settings
 #: sabnzbd/skintext.py
@@ -4123,6 +4224,33 @@
 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"
@@ -4889,52 +5017,3 @@
 #: 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)"
diff -Nru sabnzbdplus-4.2.3/po/main/pl.po sabnzbdplus-4.3.0~alpha1/po/main/pl.po
--- sabnzbdplus-4.2.3/po/main/pl.po	2024-03-11 07:43:37.758340800 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/main/pl.po	2024-03-18 15:44:21.896142700 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
@@ -160,6 +160,72 @@
 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"
 
@@ -438,6 +504,11 @@
 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]"
@@ -654,10 +725,6 @@
 "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"
@@ -667,10 +734,6 @@
 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"
@@ -1019,6 +1082,10 @@
 msgid "Wiki"
 msgstr "Wiki"
 
+#: sabnzbd/newswrapper.py
+msgid "Failed to connect: %s %s@%s:%s (%s)"
+msgstr ""
+
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1089,6 +1156,20 @@
 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"
@@ -1331,7 +1412,7 @@
 msgid "Queue First 10 Items"
 msgstr "Zakolejkuj 10 pierwszych"
 
-#: sabnzbd/osxmenu.py
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Empty"
 msgstr "Brak"
 
@@ -2257,6 +2338,11 @@
 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"
@@ -2277,6 +2363,11 @@
 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"
@@ -2296,6 +2387,10 @@
 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"
@@ -2316,6 +2411,11 @@
 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"
@@ -2751,25 +2851,32 @@
 msgstr ""
 
 #: sabnzbd/skintext.py
+msgid "Keep all jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
 msgid ""
-"Automatically delete completed jobs from History. Beware that Duplicate "
-"Detection and some external tools rely on History information."
+"Move jobs to the archive if the history exceeds specified number of jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep all jobs"
+msgid "Delete jobs if the history exceeds specified number of jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep maximum number of completed jobs"
+msgid "Move jobs to the archive after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep completed jobs maximum number of days"
+msgid "Delete jobs after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Do not keep any completed jobs"
+msgid "Move all completed jobs to archive"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Delete all completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3145,18 +3252,17 @@
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
-#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort"
-msgstr "Przerwij"
+msgid "Abort post-processing"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3604,14 +3710,6 @@
 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"
 
@@ -3995,6 +4093,30 @@
 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"
@@ -4741,54 +4863,3 @@
 #: 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)"
diff -Nru sabnzbdplus-4.2.3/po/main/pt_BR.po sabnzbdplus-4.3.0~alpha1/po/main/pt_BR.po
--- sabnzbdplus-4.2.3/po/main/pt_BR.po	2024-03-11 07:43:37.758949300 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/main/pt_BR.po	2024-03-18 15:44:21.896757600 +0000
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
@@ -169,6 +169,69 @@
 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"
 
@@ -455,6 +518,11 @@
 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]"
@@ -669,10 +737,6 @@
 "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"
@@ -682,10 +746,6 @@
 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"
@@ -1031,6 +1091,10 @@
 msgid "Wiki"
 msgstr "Wiki"
 
+#: sabnzbd/newswrapper.py
+msgid "Failed to connect: %s %s@%s:%s (%s)"
+msgstr ""
+
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1101,6 +1165,20 @@
 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"
@@ -1343,7 +1421,7 @@
 msgid "Queue First 10 Items"
 msgstr "Fila dos primeiros 10 items"
 
-#: sabnzbd/osxmenu.py
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Empty"
 msgstr "Esvaziar"
 
@@ -2271,6 +2349,11 @@
 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"
@@ -2291,6 +2374,11 @@
 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"
@@ -2310,6 +2398,10 @@
 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"
@@ -2330,6 +2422,11 @@
 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"
@@ -2764,25 +2861,32 @@
 msgstr ""
 
 #: sabnzbd/skintext.py
+msgid "Keep all jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
 msgid ""
-"Automatically delete completed jobs from History. Beware that Duplicate "
-"Detection and some external tools rely on History information."
+"Move jobs to the archive if the history exceeds specified number of jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep all jobs"
+msgid "Delete jobs if the history exceeds specified number of jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Move jobs to the archive after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep maximum number of completed jobs"
+msgid "Delete jobs after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep completed jobs maximum number of days"
+msgid "Move all completed jobs to archive"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Do not keep any completed jobs"
+msgid "Delete all completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3158,18 +3262,17 @@
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
-#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort"
-msgstr "Cancelar"
+msgid "Abort post-processing"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3618,14 +3721,6 @@
 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"
 
@@ -4009,6 +4104,30 @@
 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"
@@ -4755,51 +4874,3 @@
 #: 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)"
diff -Nru sabnzbdplus-4.2.3/po/main/ro.po sabnzbdplus-4.3.0~alpha1/po/main/ro.po
--- sabnzbdplus-4.2.3/po/main/ro.po	2024-03-11 07:43:37.759632600 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/main/ro.po	2024-03-18 15:44:21.897495500 +0000
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
@@ -169,6 +169,71 @@
 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ă"
 
@@ -459,6 +524,11 @@
 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]"
@@ -673,10 +743,6 @@
 "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"
@@ -686,10 +752,6 @@
 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"
@@ -1045,6 +1107,10 @@
 msgid "Wiki"
 msgstr "Wiki"
 
+#: sabnzbd/newswrapper.py
+msgid "Failed to connect: %s %s@%s:%s (%s)"
+msgstr ""
+
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1115,6 +1181,20 @@
 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"
@@ -1357,7 +1437,7 @@
 msgid "Queue First 10 Items"
 msgstr "Pune la Coadă Primele 10 Obiecte"
 
-#: sabnzbd/osxmenu.py
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Empty"
 msgstr "Gol"
 
@@ -2287,6 +2367,11 @@
 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"
@@ -2307,6 +2392,11 @@
 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"
@@ -2326,6 +2416,10 @@
 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"
@@ -2346,6 +2440,11 @@
 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"
@@ -2781,25 +2880,32 @@
 msgstr ""
 
 #: sabnzbd/skintext.py
+msgid "Keep all jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
 msgid ""
-"Automatically delete completed jobs from History. Beware that Duplicate "
-"Detection and some external tools rely on History information."
+"Move jobs to the archive if the history exceeds specified number of jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep all jobs"
+msgid "Delete jobs if the history exceeds specified number of jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep maximum number of completed jobs"
+msgid "Move jobs to the archive after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep completed jobs maximum number of days"
+msgid "Delete jobs after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Do not keep any completed jobs"
+msgid "Move all completed jobs to archive"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Delete all completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3174,18 +3280,17 @@
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
-#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort"
-msgstr "Renunță"
+msgid "Abort post-processing"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3637,14 +3742,6 @@
 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"
 
@@ -4028,6 +4125,30 @@
 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"
@@ -4775,53 +4896,3 @@
 #: 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)"
diff -Nru sabnzbdplus-4.2.3/po/main/ru.po sabnzbdplus-4.3.0~alpha1/po/main/ru.po
--- sabnzbdplus-4.2.3/po/main/ru.po	2024-03-11 07:43:37.760060800 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/main/ru.po	2024-03-18 15:44:21.897924700 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
@@ -164,6 +164,68 @@
 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 "Разрешение адреса"
 
@@ -440,6 +502,11 @@
 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 ""
@@ -654,10 +721,6 @@
 "Неправильный ключ 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"
@@ -667,10 +730,6 @@
 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"
@@ -1018,6 +1077,10 @@
 msgid "Wiki"
 msgstr "Вики-сайт"
 
+#: sabnzbd/newswrapper.py
+msgid "Failed to connect: %s %s@%s:%s (%s)"
+msgstr ""
+
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1088,6 +1151,20 @@
 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"
@@ -1330,7 +1407,7 @@
 msgid "Queue First 10 Items"
 msgstr "Первые 10 элементов очереди"
 
-#: sabnzbd/osxmenu.py
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Empty"
 msgstr "Пусто"
 
@@ -2254,6 +2331,11 @@
 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"
@@ -2274,6 +2356,11 @@
 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"
@@ -2293,6 +2380,10 @@
 msgid "Reset Quota now"
 msgstr "Сбросить квоту"
 
+#: sabnzbd/skintext.py
+msgid "Archive"
+msgstr ""
+
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2313,6 +2404,11 @@
 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"
@@ -2744,25 +2840,32 @@
 msgstr ""
 
 #: sabnzbd/skintext.py
+msgid "Keep all jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
 msgid ""
-"Automatically delete completed jobs from History. Beware that Duplicate "
-"Detection and some external tools rely on History information."
+"Move jobs to the archive if the history exceeds specified number of jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep all jobs"
+msgid "Delete jobs if the history exceeds specified number of jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep maximum number of completed jobs"
+msgid "Move jobs to the archive after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep completed jobs maximum number of days"
+msgid "Delete jobs after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Do not keep any completed jobs"
+msgid "Move all completed jobs to archive"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Delete all completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3141,17 +3244,16 @@
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
-#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort"
+msgid "Abort post-processing"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3597,14 +3699,6 @@
 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 ""
 
@@ -3995,6 +4089,30 @@
 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"
@@ -4741,50 +4859,3 @@
 #: 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)"
diff -Nru sabnzbdplus-4.2.3/po/main/sr.po sabnzbdplus-4.3.0~alpha1/po/main/sr.po
--- sabnzbdplus-4.2.3/po/main/sr.po	2024-03-11 07:43:37.760678000 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/main/sr.po	2024-03-18 15:44:21.898551500 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
@@ -162,6 +162,67 @@
 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 "Решавање адресе"
 
@@ -439,6 +500,11 @@
 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]"
@@ -651,10 +717,6 @@
 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"
@@ -664,10 +726,6 @@
 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"
@@ -1014,6 +1072,10 @@
 msgid "Wiki"
 msgstr "Вики"
 
+#: sabnzbd/newswrapper.py
+msgid "Failed to connect: %s %s@%s:%s (%s)"
+msgstr ""
+
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1084,6 +1146,20 @@
 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"
@@ -1326,7 +1402,7 @@
 msgid "Queue First 10 Items"
 msgstr "У ред прве 10 ставке"
 
-#: sabnzbd/osxmenu.py
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Empty"
 msgstr "Празно"
 
@@ -2248,6 +2324,11 @@
 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"
@@ -2268,6 +2349,11 @@
 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"
@@ -2287,6 +2373,10 @@
 msgid "Reset Quota now"
 msgstr "Ресетуј квоту"
 
+#: sabnzbd/skintext.py
+msgid "Archive"
+msgstr ""
+
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2307,6 +2397,11 @@
 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"
@@ -2736,25 +2831,32 @@
 msgstr ""
 
 #: sabnzbd/skintext.py
+msgid "Keep all jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
 msgid ""
-"Automatically delete completed jobs from History. Beware that Duplicate "
-"Detection and some external tools rely on History information."
+"Move jobs to the archive if the history exceeds specified number of jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep all jobs"
+msgid "Delete jobs if the history exceeds specified number of jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Move jobs to the archive after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep maximum number of completed jobs"
+msgid "Delete jobs after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep completed jobs maximum number of days"
+msgid "Move all completed jobs to archive"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Do not keep any completed jobs"
+msgid "Delete all completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3128,18 +3230,17 @@
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
-#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort"
-msgstr "Прекини"
+msgid "Abort post-processing"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3584,14 +3685,6 @@
 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"
 
@@ -3974,6 +4067,30 @@
 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"
@@ -4719,49 +4836,3 @@
 #: 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)"
diff -Nru sabnzbdplus-4.2.3/po/main/sv.po sabnzbdplus-4.3.0~alpha1/po/main/sv.po
--- sabnzbdplus-4.2.3/po/main/sv.po	2024-03-11 07:43:37.761081500 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/main/sv.po	2024-03-18 15:44:21.898991000 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
@@ -162,6 +162,67 @@
 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"
 
@@ -439,6 +500,11 @@
 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]"
@@ -653,10 +719,6 @@
 "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"
@@ -666,10 +728,6 @@
 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"
@@ -1018,6 +1076,10 @@
 msgid "Wiki"
 msgstr "Wiki"
 
+#: sabnzbd/newswrapper.py
+msgid "Failed to connect: %s %s@%s:%s (%s)"
+msgstr ""
+
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1088,6 +1150,20 @@
 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"
@@ -1330,7 +1406,7 @@
 msgid "Queue First 10 Items"
 msgstr "Kö (10 första sakerna)"
 
-#: sabnzbd/osxmenu.py
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Empty"
 msgstr "Tom"
 
@@ -2254,6 +2330,11 @@
 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"
@@ -2274,6 +2355,11 @@
 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"
@@ -2293,6 +2379,10 @@
 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"
@@ -2313,6 +2403,11 @@
 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"
@@ -2745,25 +2840,32 @@
 msgstr ""
 
 #: sabnzbd/skintext.py
+msgid "Keep all jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
 msgid ""
-"Automatically delete completed jobs from History. Beware that Duplicate "
-"Detection and some external tools rely on History information."
+"Move jobs to the archive if the history exceeds specified number of jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep all jobs"
+msgid "Delete jobs if the history exceeds specified number of jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Move jobs to the archive after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep maximum number of completed jobs"
+msgid "Delete jobs after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep completed jobs maximum number of days"
+msgid "Move all completed jobs to archive"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Do not keep any completed jobs"
+msgid "Delete all completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3138,18 +3240,17 @@
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
+msgid "Tag job"
 msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
+msgid "Fail job (move to History)"
 msgstr ""
 
-#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort"
-msgstr "Avbryt"
+msgid "Abort post-processing"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3596,14 +3697,6 @@
 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"
 
@@ -3987,6 +4080,30 @@
 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"
@@ -4733,49 +4850,3 @@
 #: 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)"
diff -Nru sabnzbdplus-4.2.3/po/main/zh_CN.po sabnzbdplus-4.3.0~alpha1/po/main/zh_CN.po
--- sabnzbdplus-4.2.3/po/main/zh_CN.po	2024-03-11 07:43:37.761672500 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/main/zh_CN.po	2024-03-18 15:44:21.899778800 +0000
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
@@ -161,6 +161,66 @@
 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 "正在解析地址"
 
@@ -437,6 +497,11 @@
 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]"
@@ -647,10 +712,6 @@
 "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"
@@ -660,10 +721,6 @@
 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"
@@ -1008,6 +1065,10 @@
 msgid "Wiki"
 msgstr "Wiki"
 
+#: sabnzbd/newswrapper.py
+msgid "Failed to connect: %s %s@%s:%s (%s)"
+msgstr ""
+
 #. Notification
 #: sabnzbd/notifier.py
 msgid "Startup/Shutdown"
@@ -1078,6 +1139,20 @@
 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"
@@ -1320,7 +1395,7 @@
 msgid "Queue First 10 Items"
 msgstr "将前十项加入队列"
 
-#: sabnzbd/osxmenu.py
+#: sabnzbd/osxmenu.py, sabnzbd/skintext.py
 msgid "Empty"
 msgstr "清空"
 
@@ -2242,6 +2317,11 @@
 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"
@@ -2262,6 +2342,11 @@
 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"
@@ -2281,6 +2366,10 @@
 msgid "Reset Quota now"
 msgstr "立即重置配额"
 
+#: sabnzbd/skintext.py
+msgid "Archive"
+msgstr ""
+
 #. Button/link hiding History job details
 #: sabnzbd/skintext.py
 msgid "Hide details"
@@ -2301,6 +2390,11 @@
 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"
@@ -2719,25 +2813,32 @@
 msgstr ""
 
 #: sabnzbd/skintext.py
+msgid "Keep all jobs"
+msgstr ""
+
+#: sabnzbd/skintext.py
 msgid ""
-"Automatically delete completed jobs from History. Beware that Duplicate "
-"Detection and some external tools rely on History information."
+"Move jobs to the archive if the history exceeds specified number of jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep all jobs"
+msgid "Delete jobs if the history exceeds specified number of jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep maximum number of completed jobs"
+msgid "Move jobs to the archive after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Keep completed jobs maximum number of days"
+msgid "Delete jobs after specified number of days"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Do not keep any completed jobs"
+msgid "Move all completed jobs to archive"
+msgstr ""
+
+#: sabnzbd/skintext.py
+msgid "Delete all completed jobs"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3092,18 +3193,17 @@
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Fail job (move to History)"
-msgstr "失败的任务 (移动到历史)"
+msgid "Tag job"
+msgstr ""
 
 #. Four way switch for duplicates
 #: sabnzbd/skintext.py
-msgid "Tag job"
-msgstr ""
+msgid "Fail job (move to History)"
+msgstr "失败的任务 (移动到历史)"
 
-#. Three way switch for encrypted posts
 #: sabnzbd/skintext.py
-msgid "Abort"
-msgstr "中止"
+msgid "Abort post-processing"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Action when unwanted extension detected"
@@ -3539,14 +3639,6 @@
 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 "注释"
 
@@ -3928,6 +4020,30 @@
 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"
@@ -4669,48 +4785,3 @@
 #: 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)"
diff -Nru sabnzbdplus-4.2.3/po/nsis/SABnsis.pot sabnzbdplus-4.3.0~alpha1/po/nsis/SABnsis.pot
--- sabnzbdplus-4.2.3/po/nsis/SABnsis.pot	2024-03-11 07:43:37.762014200 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/nsis/SABnsis.pot	2024-03-18 15:44:21.900120500 +0000
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2RC1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: team@sabnzbd.org\n"
 "Language-Team: SABnzbd <team@sabnzbd.org>\n"
diff -Nru sabnzbdplus-4.2.3/po/nsis/cs.po sabnzbdplus-4.3.0~alpha1/po/nsis/cs.po
--- sabnzbdplus-4.2.3/po/nsis/cs.po	2024-03-11 07:43:37.762268300 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/nsis/cs.po	2024-03-18 15:44:21.900629000 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
diff -Nru sabnzbdplus-4.2.3/po/nsis/da.po sabnzbdplus-4.3.0~alpha1/po/nsis/da.po
--- sabnzbdplus-4.2.3/po/nsis/da.po	2024-03-11 07:43:37.762531300 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/nsis/da.po	2024-03-18 15:44:21.901006700 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Danish (https://app.transifex.com/sabnzbd/teams/111101/da/)\n"
diff -Nru sabnzbdplus-4.2.3/po/nsis/de.po sabnzbdplus-4.3.0~alpha1/po/nsis/de.po
--- sabnzbdplus-4.2.3/po/nsis/de.po	2024-03-11 07:43:37.762784200 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/nsis/de.po	2024-03-18 15:44:21.901395300 +0000
@@ -5,12 +5,13 @@
 # Safihre <safihre@sabnzbd.org>, 2020
 # reloxx13 <reloxx@interia.pl>, 2022
 # HandyDandy04, 2024
+# Lorenz B, 2024
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
-"Last-Translator: HandyDandy04, 2024\n"
+"Last-Translator: Lorenz B, 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"
@@ -40,8 +41,8 @@
 "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 Portable Version "
-"für Windows 32-Bit."
+"Der Installer unterstützt nur Windows 64-bit. Benutze die Standalone Version"
+" für Windows 32-bit."
 
 #: builder/win/NSIS_Installer.nsi
 msgid ""
diff -Nru sabnzbdplus-4.2.3/po/nsis/es.po sabnzbdplus-4.3.0~alpha1/po/nsis/es.po
--- sabnzbdplus-4.2.3/po/nsis/es.po	2024-03-11 07:43:37.763204000 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/nsis/es.po	2024-03-18 15:44:21.902081300 +0000
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
diff -Nru sabnzbdplus-4.2.3/po/nsis/fi.po sabnzbdplus-4.3.0~alpha1/po/nsis/fi.po
--- sabnzbdplus-4.2.3/po/nsis/fi.po	2024-03-11 07:43:37.763420300 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/nsis/fi.po	2024-03-18 15:44:21.902284900 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Finnish (https://app.transifex.com/sabnzbd/teams/111101/fi/)\n"
diff -Nru sabnzbdplus-4.2.3/po/nsis/fr.po sabnzbdplus-4.3.0~alpha1/po/nsis/fr.po
--- sabnzbdplus-4.2.3/po/nsis/fr.po	2024-03-11 07:43:37.763647000 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/nsis/fr.po	2024-03-18 15:44:21.902658700 +0000
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
diff -Nru sabnzbdplus-4.2.3/po/nsis/he.po sabnzbdplus-4.3.0~alpha1/po/nsis/he.po
--- sabnzbdplus-4.2.3/po/nsis/he.po	2024-03-11 07:43:37.763864300 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/nsis/he.po	2024-03-18 15:44:21.902909000 +0000
@@ -3,19 +3,19 @@
 # 
 # Translators:
 # Safihre <safihre@sabnzbd.org>, 2020
-# ION, 2021
+# ION, 2024
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
-"Last-Translator: ION, 2021\n"
+"Last-Translator: ION, 2024\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=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"
+"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;\n"
 
 #: builder/win/NSIS_Installer.nsi
 msgid "Show Release Notes"
@@ -53,7 +53,7 @@
 
 #: builder/win/NSIS_Installer.nsi
 msgid "Shutting down SABnzbd"
-msgstr ""
+msgstr "מכבה את SABnzbd"
 
 #: builder/win/NSIS_Installer.nsi
 msgid "This will uninstall SABnzbd from your system"
diff -Nru sabnzbdplus-4.2.3/po/nsis/it.po sabnzbdplus-4.3.0~alpha1/po/nsis/it.po
--- sabnzbdplus-4.2.3/po/nsis/it.po	2024-03-11 07:43:37.764074600 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/nsis/it.po	2024-03-18 15:44:21.903046100 +0000
@@ -3,7 +3,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.2Beta1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
diff -Nru sabnzbdplus-4.2.3/po/nsis/nb.po sabnzbdplus-4.3.0~alpha1/po/nsis/nb.po
--- sabnzbdplus-4.2.3/po/nsis/nb.po	2024-03-11 07:43:37.764267400 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/nsis/nb.po	2024-03-18 15:44:21.903353500 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Norwegian Bokmål (https://app.transifex.com/sabnzbd/teams/111101/nb/)\n"
diff -Nru sabnzbdplus-4.2.3/po/nsis/nl.po sabnzbdplus-4.3.0~alpha1/po/nsis/nl.po
--- sabnzbdplus-4.2.3/po/nsis/nl.po	2024-03-11 07:43:37.764457500 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/nsis/nl.po	2024-03-18 15:44:21.903516500 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
diff -Nru sabnzbdplus-4.2.3/po/nsis/pl.po sabnzbdplus-4.3.0~alpha1/po/nsis/pl.po
--- sabnzbdplus-4.2.3/po/nsis/pl.po	2024-03-11 07:43:37.764670400 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/nsis/pl.po	2024-03-18 15:44:21.903827200 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Polish (https://app.transifex.com/sabnzbd/teams/111101/pl/)\n"
diff -Nru sabnzbdplus-4.2.3/po/nsis/pt_BR.po sabnzbdplus-4.3.0~alpha1/po/nsis/pt_BR.po
--- sabnzbdplus-4.2.3/po/nsis/pt_BR.po	2024-03-11 07:43:37.764887300 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/nsis/pt_BR.po	2024-03-18 15:44:21.904061000 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Portuguese (Brazil) (https://app.transifex.com/sabnzbd/teams/111101/pt_BR/)\n"
diff -Nru sabnzbdplus-4.2.3/po/nsis/ro.po sabnzbdplus-4.3.0~alpha1/po/nsis/ro.po
--- sabnzbdplus-4.2.3/po/nsis/ro.po	2024-03-11 07:43:37.765100500 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/nsis/ro.po	2024-03-18 15:44:21.904290700 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Romanian (https://app.transifex.com/sabnzbd/teams/111101/ro/)\n"
diff -Nru sabnzbdplus-4.2.3/po/nsis/ru.po sabnzbdplus-4.3.0~alpha1/po/nsis/ru.po
--- sabnzbdplus-4.2.3/po/nsis/ru.po	2024-03-11 07:43:37.765283300 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/nsis/ru.po	2024-03-18 15:44:21.904557200 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Russian (https://app.transifex.com/sabnzbd/teams/111101/ru/)\n"
diff -Nru sabnzbdplus-4.2.3/po/nsis/sr.po sabnzbdplus-4.3.0~alpha1/po/nsis/sr.po
--- sabnzbdplus-4.2.3/po/nsis/sr.po	2024-03-11 07:43:37.765471700 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/nsis/sr.po	2024-03-18 15:44:21.904781600 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Serbian (https://app.transifex.com/sabnzbd/teams/111101/sr/)\n"
diff -Nru sabnzbdplus-4.2.3/po/nsis/sv.po sabnzbdplus-4.3.0~alpha1/po/nsis/sv.po
--- sabnzbdplus-4.2.3/po/nsis/sv.po	2024-03-11 07:43:37.765698700 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/nsis/sv.po	2024-03-18 15:44:21.904976000 +0000
@@ -7,7 +7,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\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"
diff -Nru sabnzbdplus-4.2.3/po/nsis/zh_CN.po sabnzbdplus-4.3.0~alpha1/po/nsis/zh_CN.po
--- sabnzbdplus-4.2.3/po/nsis/zh_CN.po	2024-03-11 07:43:37.765914200 +0000
+++ sabnzbdplus-4.3.0~alpha1/po/nsis/zh_CN.po	2024-03-18 15:44:21.905251000 +0000
@@ -6,7 +6,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-4.2.1\n"
+"Project-Id-Version: SABnzbd-4.3.0-develop\n"
 "PO-Revision-Date: 2020-06-27 15:56+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>, 2020\n"
 "Language-Team: Chinese (China) (https://app.transifex.com/sabnzbd/teams/111101/zh_CN/)\n"
diff -Nru sabnzbdplus-4.2.3/requirements.txt sabnzbdplus-4.3.0~alpha1/requirements.txt
--- sabnzbdplus-4.2.3/requirements.txt	2024-03-11 07:44:42.565522700 +0000
+++ sabnzbdplus-4.3.0~alpha1/requirements.txt	2024-03-18 15:45:18.205664400 +0000
@@ -1,7 +1,8 @@
 # Main requirements
 # Note that not all sub-dependencies are listed, but only ones we know could cause trouble
+apprise==1.7.4
 sabctools==8.1.0
-cheetah3==3.2.6.post1
+CT3==3.3.3.post1
 cffi==1.16.0
 pycparser==2.21
 feedparser==6.0.11
@@ -12,25 +13,25 @@
 jaraco.functools==4.0.0
 jaraco.collections==5.0.0
 jaraco.text==3.8.1 # Newer version introduces irrelevant extra dependencies
-jaraco.classes==3.3.0
+jaraco.classes==3.3.1
 jaraco.context==4.3.0
 more-itertools==10.2.0
 zc.lockfile==3.0.post1
-python-dateutil==2.8.2
-tempora==5.5.0
-pytz==2023.3.post1
+python-dateutil==2.9.0.post0
+tempora==5.5.1
+pytz==2024.1
 sgmllib3k==1.0.0
 portend==3.2.0
 chardet==5.2.0
 PySocks==1.7.1
-puremagic==1.15
+puremagic==1.21
 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==41.0.7
+cryptography==42.0.5
 
 # 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
@@ -38,16 +39,36 @@
 
 # Windows system integration
 pywin32==306; sys_platform == 'win32'
-toasts-winrt==1.0.0; sys_platform == 'win32'
-windows-toasts==1.0.2; 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'
 
 # macOS system calls
-pyobjc-core==10.1; sys_platform == 'darwin'
-pyobjc-framework-Cocoa==10.1; sys_platform == 'darwin'
+pyobjc-core==10.2; sys_platform == 'darwin'
+pyobjc-framework-Cocoa==10.2; sys_platform == 'darwin'
 
 # Linux notifications
 notify2==0.3.1; sys_platform != 'win32' and sys_platform != 'darwin'
 
+# Apprise Requirements
+requests==2.31.0
+requests-oauthlib==1.4.0
+PyYAML==6.0.1
+markdown==3.6
+paho-mqtt==2.0.0
+
+# Requests Requirements
+charset_normalizer==3.3.2
+idna==3.6
+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
@@ -57,4 +78,4 @@
 # 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'
\ No newline at end of file
+# dbus-python; sys_platform != 'win32' and sys_platform != 'darwin'
diff -Nru sabnzbdplus-4.2.3/sabnzbd/__init__.py sabnzbdplus-4.3.0~alpha1/sabnzbd/__init__.py
--- sabnzbdplus-4.2.3/sabnzbd/__init__.py	2024-03-11 07:44:42.595179600 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/__init__.py	2024-03-18 15:45:18.227761300 +0000
@@ -290,6 +290,11 @@
         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())
diff -Nru sabnzbdplus-4.2.3/sabnzbd/api.py sabnzbdplus-4.3.0~alpha1/sabnzbd/api.py
--- sabnzbdplus-4.2.3/sabnzbd/api.py	2024-03-11 07:44:42.596778200 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/api.py	2024-03-18 15:45:18.229024200 +0000
@@ -23,11 +23,12 @@
 import logging
 import re
 import gc
+import socket
 import time
 import getpass
 import cherrypy
 from threading import Thread
-from typing import Tuple, Optional, List, Dict, Any
+from typing import Tuple, Optional, List, Dict, Any, Union
 
 # For json.dumps, orjson is magnitudes faster than ujson, but it is harder to
 # compile due to Rust dependency. Since the output is the same, we support all modules.
@@ -53,13 +54,13 @@
     AddNzbFileResult,
     PP_LOOKUP,
     STAGES,
+    DEF_TEST_TIMEOUT,
 )
 import sabnzbd.config as config
 import sabnzbd.cfg as cfg
 from sabnzbd.skintext import SKIN_TEXT
 from sabnzbd.utils.diskspeed import diskspeedmeasure
 from sabnzbd.internetspeed import internetspeed
-from sabnzbd.utils.pathbrowser import folders_at_path
 from sabnzbd.utils.getperformance import getpystone
 from sabnzbd.misc import (
     loadavg,
@@ -73,14 +74,16 @@
     history_updated,
     request_repair,
     change_queue_complete_action,
+    clean_comma_separated_list,
+    match_str,
 )
-from sabnzbd.filesystem import diskspace, get_ext, clip_path, remove_all, list_scripts, purge_log_files
+from sabnzbd.filesystem import diskspace, get_ext, clip_path, remove_all, list_scripts, purge_log_files, pathbrowser
 from sabnzbd.encoding import xml_name, utob
-from sabnzbd.utils.servertests import test_nntp_server_dict
 from sabnzbd.getipaddress import local_ipv4, public_ipv4, public_ipv6, dnslookup, active_socks5_proxy
 from sabnzbd.database import HistoryDB
 from sabnzbd.lang import is_rtl
 from sabnzbd.nzbstuff import NzbObject
+from sabnzbd.newswrapper import NewsWrapper, NNTPPermanentError
 import sabnzbd.emailer
 import sabnzbd.sorting
 
@@ -99,7 +102,7 @@
 _MSG_CONFIG_LOCKED = "Configuration locked"
 
 
-def api_handler(kwargs: Dict[str, Any]):
+def api_handler(kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API Dispatcher"""
     # Clean-up the arguments
     for vr in ("mode", "name", "value", "value2", "value3", "start", "limit", "search"):
@@ -113,13 +116,13 @@
     return response
 
 
-def _api_get_config(name, kwargs):
+def _api_get_config(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts keyword, section"""
     _, data = config.get_dconfig(kwargs.get("section"), kwargs.get("keyword"))
     return report(keyword="config", data=data)
 
 
-def _api_set_config(name, kwargs):
+def _api_set_config(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts keyword, section"""
     if cfg.configlock():
         return report(_MSG_CONFIG_LOCKED)
@@ -140,7 +143,7 @@
     return report(keyword="config", data=data)
 
 
-def _api_set_config_default(name, kwargs):
+def _api_set_config_default(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: Reset requested config variables back to defaults. Currently only for misc-section"""
     if cfg.configlock():
         return report(_MSG_CONFIG_LOCKED)
@@ -155,7 +158,7 @@
     return report()
 
 
-def _api_del_config(name, kwargs):
+def _api_del_config(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts keyword, section"""
     if cfg.configlock():
         return report(_MSG_CONFIG_LOCKED)
@@ -165,19 +168,18 @@
         return report(_MSG_NOT_IMPLEMENTED)
 
 
-def _api_queue(name, kwargs):
+def _api_queue(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: Dispatcher for mode=queue"""
     value = kwargs.get("value", "")
     return _api_queue_table.get(name, (_api_queue_default, 2))[0](value, kwargs)
 
 
-def _api_queue_delete(value, kwargs):
+def _api_queue_delete(value: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts value"""
     if value.lower() == "all":
         removed = sabnzbd.NzbQueue.remove_all(kwargs.get("search"))
         return report(keyword="", data={"status": bool(removed), "nzo_ids": removed})
-    elif value:
-        items = value.split(",")
+    elif items := clean_comma_separated_list(value):
         delete_all_data = int_conv(kwargs.get("del_files"))
         removed = sabnzbd.NzbQueue.remove_multiple(items, delete_all_data=delete_all_data)
         return report(keyword="", data={"status": bool(removed), "nzo_ids": removed})
@@ -185,18 +187,17 @@
         return report(_MSG_NO_VALUE)
 
 
-def _api_queue_delete_nzf(value, kwargs):
+def _api_queue_delete_nzf(value: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts value(=nzo_id), value2(=nzf_ids)"""
-    nzf_ids = kwargs.get("value2")
+    nzf_ids = clean_comma_separated_list(kwargs.get("value2"))
     if value and nzf_ids:
-        nzf_ids = nzf_ids.split(",")
         removed = sabnzbd.NzbQueue.remove_nzfs(value, nzf_ids)
         return report(keyword="", data={"status": bool(removed), "nzf_ids": removed})
     else:
         return report(_MSG_NO_VALUE2)
 
 
-def _api_queue_rename(value, kwargs):
+def _api_queue_rename(value: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts value(=old name), value2(=new name), value3(=password)"""
     value2 = kwargs.get("value2")
     value3 = kwargs.get("value3")
@@ -207,47 +208,46 @@
         return report(_MSG_NO_VALUE2)
 
 
-def _api_queue_change_complete_action(value, kwargs):
+def _api_queue_change_complete_action(value: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts value(=action)"""
     change_queue_complete_action(value)
     return report()
 
 
-def _api_queue_purge(value, kwargs):
+def _api_queue_purge(value: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     removed = sabnzbd.NzbQueue.remove_all(kwargs.get("search"))
     return report(keyword="", data={"status": bool(removed), "nzo_ids": removed})
 
 
-def _api_queue_pause(value, kwargs):
+def _api_queue_pause(value: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts value(=list of nzo_id)"""
-    if value:
-        items = value.split(",")
+    if items := clean_comma_separated_list(value):
         handled = sabnzbd.NzbQueue.pause_multiple_nzo(items)
     else:
         handled = False
     return report(keyword="", data={"status": bool(handled), "nzo_ids": handled})
 
 
-def _api_queue_resume(value, kwargs):
+def _api_queue_resume(value: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts value(=list of nzo_id)"""
-    if value:
-        items = value.split(",")
+    if items := clean_comma_separated_list(value):
         handled = sabnzbd.NzbQueue.resume_multiple_nzo(items)
     else:
         handled = False
     return report(keyword="", data={"status": bool(handled), "nzo_ids": handled})
 
 
-def _api_queue_priority(value, kwargs):
+def _api_queue_priority(value: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts value(=nzo_id), value2(=priority)"""
-    value2 = kwargs.get("value2")
-    if value and value2:
+    nzo_ids = clean_comma_separated_list(value)
+    priority = kwargs.get("value2")
+    if nzo_ids and priority:
         try:
             try:
-                priority = int(value2)
+                priority = int(priority)
             except:
                 return report(_MSG_INT_VALUE)
-            pos = sabnzbd.NzbQueue.set_priority(value, priority)
+            pos = sabnzbd.NzbQueue.set_priority(nzo_ids, priority)
             # Returns the position in the queue, -1 is incorrect job-id
             return report(keyword="position", data=pos)
         except:
@@ -256,7 +256,7 @@
         return report(_MSG_NO_VALUE2)
 
 
-def _api_queue_sort(value, kwargs):
+def _api_queue_sort(value: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts sort, dir"""
     sort = kwargs.get("sort", "")
     direction = kwargs.get("dir", "")
@@ -267,25 +267,19 @@
         return report(_MSG_NO_VALUE2)
 
 
-def _api_queue_default(value, kwargs):
+def _api_queue_default(value: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts sort, dir, start, limit and search terms"""
     start = int_conv(kwargs.get("start"))
     limit = int_conv(kwargs.get("limit"))
     search = kwargs.get("search")
-    categories = kwargs.get("cat") or kwargs.get("category")
-    priorities = kwargs.get("priority")
-    statuses = kwargs.get("status")
-    nzo_ids = kwargs.get("nzo_ids")
-
-    if categories and not isinstance(categories, list):
-        categories = categories.split(",")
-    if priorities and not isinstance(priorities, list):
+    categories = clean_comma_separated_list(kwargs.get("cat") or kwargs.get("category"))
+    priorities = clean_comma_separated_list(kwargs.get("priority"))
+    statuses = clean_comma_separated_list(kwargs.get("status"))
+    nzo_ids = clean_comma_separated_list(kwargs.get("nzo_ids"))
+
+    if priorities:
         # Make sure it's an integer
-        priorities = [int_conv(prio) for prio in priorities.split(",")]
-    if statuses and not isinstance(statuses, list):
-        statuses = statuses.split(",")
-    if nzo_ids and not isinstance(nzo_ids, list):
-        nzo_ids = nzo_ids.split(",")
+        priorities = [int_conv(prio) for prio in priorities]
 
     return report(
         keyword="queue",
@@ -301,12 +295,12 @@
     )
 
 
-def _api_translate(name, kwargs):
+def _api_translate(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts value(=acronym)"""
     return report(keyword="value", data=T(kwargs.get("value", "")))
 
 
-def _api_addfile(name, kwargs):
+def _api_addfile(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts name, pp, script, cat, priority, nzbname"""
     # Normal upload will send the nzb in a kw arg called name or nzbfile
     if not name or isinstance(name, str):
@@ -327,7 +321,7 @@
         return report(_MSG_NO_VALUE)
 
 
-def _api_retry(name, kwargs):
+def _api_retry(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts name, value(=nzo_id), nzbfile(=optional NZB), password (optional)"""
     value = kwargs.get("value")
     # Normal upload will send the nzb in a kw arg called nzbfile
@@ -336,23 +330,21 @@
     password = kwargs.get("password")
     password = password[0] if isinstance(password, list) else password
 
-    nzo_id = retry_job(value, name, password)
-    if nzo_id:
+    if nzo_id := retry_job(value, name, password):
         return report(keyword="", data={"status": True, "nzo_id": nzo_id})
     else:
         return report(_MSG_NO_ITEM)
 
 
-def _api_cancel_pp(name, kwargs):
-    """API: accepts name, value(=nzo_id)"""
-    nzo_id = kwargs.get("value")
-    if sabnzbd.PostProcessor.cancel_pp(nzo_id):
-        return report(keyword="", data={"status": True, "nzo_id": nzo_id})
-    else:
-        return report(_MSG_NO_ITEM)
+def _api_cancel_pp(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
+    """API: accepts name, value(=nzo_ids)"""
+    if nzo_ids := clean_comma_separated_list(kwargs.get("value")):
+        if sabnzbd.PostProcessor.cancel_pp(nzo_ids):
+            return report(keyword="", data={"status": True, "nzo_ids": nzo_ids})
+    return report(_MSG_NO_ITEM)
 
 
-def _api_addlocalfile(name, kwargs):
+def _api_addlocalfile(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts name, pp, script, cat, priority, nzbname"""
     if name:
         if os.path.exists(name):
@@ -379,7 +371,7 @@
         return report(_MSG_NO_VALUE)
 
 
-def _api_switch(name, kwargs):
+def _api_switch(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts value(=first id), value2(=second id)"""
     value = kwargs.get("value")
     value2 = kwargs.get("value2")
@@ -391,70 +383,67 @@
         return report(_MSG_NO_VALUE2)
 
 
-def _api_change_cat(name, kwargs):
+def _api_change_cat(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts value(=nzo_id), value2(=category)"""
-    value = kwargs.get("value")
-    value2 = kwargs.get("value2")
-    if value and value2:
-        nzo_id = value
-        cat = value2
+    nzo_ids = clean_comma_separated_list(kwargs.get("value"))
+    cat = kwargs.get("value2")
+    if nzo_ids and cat:
         if is_none(cat):
             cat = None
-        result = sabnzbd.NzbQueue.change_cat(nzo_id, cat)
+        result = sabnzbd.NzbQueue.change_cat(nzo_ids, cat)
         return report(keyword="status", data=bool(result > 0))
     else:
         return report(_MSG_NO_VALUE)
 
 
-def _api_change_script(name, kwargs):
+def _api_change_script(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts value(=nzo_id), value2(=script)"""
-    value = kwargs.get("value")
-    value2 = kwargs.get("value2")
-    if value and value2:
-        nzo_id = value
-        script = value2
+    nzo_ids = clean_comma_separated_list(kwargs.get("value"))
+    script = kwargs.get("value2")
+    if nzo_ids and script:
         if is_none(script):
             script = None
-        result = sabnzbd.NzbQueue.change_script(nzo_id, script)
+        result = sabnzbd.NzbQueue.change_script(nzo_ids, script)
         return report(keyword="status", data=bool(result > 0))
     else:
         return report(_MSG_NO_VALUE)
 
 
-def _api_change_opts(name, kwargs):
+def _api_change_opts(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts value(=nzo_id), value2(=pp)"""
-    value = kwargs.get("value")
-    value2 = kwargs.get("value2")
-    result = 0
-    if value and value2 and value2.isdigit():
-        result = sabnzbd.NzbQueue.change_opts(value, int(value2))
-    return report(keyword="status", data=bool(result > 0))
+    nzo_ids = clean_comma_separated_list(kwargs.get("value"))
+    pp = kwargs.get("value2")
+    if nzo_ids and pp and pp.isdigit():
+        result = sabnzbd.NzbQueue.change_opts(nzo_ids, int(pp))
+        return report(keyword="status", data=bool(result > 0))
+    return report(_MSG_NO_ITEM)
 
 
-def _api_fullstatus(name, kwargs):
+def _api_fullstatus(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: full history status"""
     status = build_status(
-        calculate_performance=kwargs.get("calculate_performance", 0), skip_dashboard=kwargs.get("skip_dashboard", 1)
+        calculate_performance=int_conv(kwargs.get("calculate_performance", 0)),
+        skip_dashboard=int_conv(kwargs.get("skip_dashboard", 1)),
     )
     return report(keyword="status", data=status)
 
 
-def _api_status(name, kwargs):
+def _api_status(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: Dispatcher for mode=status, passing on the value"""
     value = kwargs.get("value", "")
     return _api_status_table.get(name, (_api_fullstatus, 2))[0](value, kwargs)
 
 
-def _api_unblock_server(value, kwargs):
+def _api_unblock_server(value: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """Unblock a blocked server"""
     sabnzbd.Downloader.unblock(value)
     return report()
 
 
-def _api_delete_orphan(path, kwargs):
+def _api_delete_orphan(value: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """Remove orphaned job"""
-    if path:
-        path = os.path.join(cfg.download_dir.get_path(), path)
+    if value:
+        path = os.path.join(cfg.download_dir.get_path(), value)
         logging.info("Removing orphaned job %s", path)
         remove_all(path, recursive=True)
         return report()
@@ -462,7 +451,7 @@
         return report(_MSG_NO_ITEM)
 
 
-def _api_delete_all_orphan(value, kwargs):
+def _api_delete_all_orphan(value: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """Remove all orphaned jobs"""
     paths = sabnzbd.NzbQueue.scan_jobs(all_jobs=False, action=False)
     for path in paths:
@@ -470,10 +459,10 @@
     return report()
 
 
-def _api_add_orphan(path, kwargs):
+def _api_add_orphan(value: str, kwargs: Dict[str, Union[str, List[str]]]):
     """Add orphaned job"""
-    if path:
-        path = os.path.join(cfg.download_dir.get_path(), path)
+    if value:
+        path = os.path.join(cfg.download_dir.get_path(), value)
         logging.info("Re-adding orphaned job %s", path)
         sabnzbd.NzbQueue.repair_job(path, None, None)
         return report()
@@ -481,7 +470,7 @@
         return report(_MSG_NO_ITEM)
 
 
-def _api_add_all_orphan(value, kwargs):
+def _api_add_all_orphan(value: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """Add all orphaned jobs"""
     paths = sabnzbd.NzbQueue.scan_jobs(all_jobs=False, action=False)
     for path in paths:
@@ -489,39 +478,25 @@
     return report()
 
 
-def _api_history(name, kwargs):
+def _api_history(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts value(=nzo_id), start, limit, search, nzo_ids"""
     value = kwargs.get("value", "")
     start = int_conv(kwargs.get("start"))
     limit = int_conv(kwargs.get("limit"))
     last_history_update = int_conv(kwargs.get("last_history_update", 0))
     search = kwargs.get("search")
-    categories = kwargs.get("cat") or kwargs.get("category")
-    statuses = kwargs.get("status")
+    categories = clean_comma_separated_list(kwargs.get("cat") or kwargs.get("category"))
+    statuses = clean_comma_separated_list(kwargs.get("status"))
     failed_only = int_conv(kwargs.get("failed_only"))
-    nzo_ids = kwargs.get("nzo_ids")
-
-    # Do we need to send anything?
-    if last_history_update == sabnzbd.LAST_HISTORY_UPDATE:
-        return report(keyword="history", data=False)
-
-    if categories and not isinstance(categories, list):
-        categories = categories.split(",")
-
-    if statuses and not isinstance(statuses, list):
-        statuses = statuses.split(",")
-
-    if failed_only:
-        # We ignore any other statuses, having both doesn't make sense
-        statuses = [Status.FAILED]
+    nzo_ids = clean_comma_separated_list(kwargs.get("nzo_ids"))
 
-    if nzo_ids and not isinstance(nzo_ids, list):
-        nzo_ids = nzo_ids.split(",")
-
-    if not limit:
-        limit = cfg.history_limit()
+    archive = True
 
     if name == "delete":
+        # Only skip archive if specifically requested
+        if kwargs.get("archive") == "0":
+            archive = False
+
         special = value.lower()
         del_files = bool(int_conv(kwargs.get("del_files")))
         if special in ("all", "failed", "completed"):
@@ -529,37 +504,60 @@
             if special in ("all", "failed"):
                 if del_files:
                     del_job_files(history_db.get_failed_paths(search))
-                history_db.remove_failed(search)
+                if archive:
+                    history_db.archive_with_status(Status.FAILED, search)
+                else:
+                    history_db.remove_with_status(Status.FAILED, search)
             if special in ("all", "completed"):
-                history_db.remove_completed(search)
+                if archive:
+                    history_db.archive_with_status(Status.COMPLETED, search)
+                else:
+                    history_db.remove_with_status(Status.COMPLETED, search)
             history_updated()
             return report()
         elif value:
-            jobs = value.split(",")
-            for job in jobs:
+            for job in clean_comma_separated_list(value):
                 if sabnzbd.PostProcessor.get_path(job):
+                    # This is always a permanent delete, no archiving
                     sabnzbd.PostProcessor.delete(job, del_files=del_files)
                 else:
                     history_db = sabnzbd.get_db_connection()
                     if del_files:
                         remove_all(history_db.get_incomplete_path(job), recursive=True)
-                    history_db.remove_history(job)
+                    if archive:
+                        history_db.archive(job)
+                    else:
+                        history_db.remove(job)
             history_updated()
             return report()
         else:
             return report(_MSG_NO_VALUE)
     elif not name:
+        # Do we need to send anything?
+        if last_history_update == sabnzbd.LAST_HISTORY_UPDATE:
+            return report(keyword="history", data=False)
+
+        if failed_only:
+            # We ignore any other statuses, having both doesn't make sense
+            statuses = [Status.FAILED]
+
+        if not limit:
+            limit = cfg.history_limit()
+
+        # Only show archive if specifically requested
+        if not int_conv(kwargs.get("archive")):
+            archive = False
+
         history = {}
         grand, month, week, day = sabnzbd.BPSMeter.get_sums()
-        history["total_size"], history["month_size"], history["week_size"], history["day_size"] = (
-            to_units(grand),
-            to_units(month),
-            to_units(week),
-            to_units(day),
-        )
+        history["total_size"] = to_units(grand)
+        history["month_size"] = to_units(month)
+        history["week_size"] = to_units(week)
+        history["day_size"] = to_units(day)
         history["slots"], history["ppslots"], history["noofslots"] = build_history(
             start=start,
             limit=limit,
+            archive=archive,
             search=search,
             categories=categories,
             statuses=statuses,
@@ -572,7 +570,7 @@
         return report(_MSG_NOT_IMPLEMENTED)
 
 
-def _api_get_files(name, kwargs):
+def _api_get_files(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts value(=nzo_id)"""
     value = kwargs.get("value")
     if value:
@@ -581,15 +579,14 @@
         return report(_MSG_NO_VALUE)
 
 
-def _api_move_nzf_bulk(name, kwargs):
+def _api_move_nzf_bulk(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts name(=top/up/down/bottom), value=(=nzo_id), nzf_ids, size (optional)"""
     nzo_id = kwargs.get("value")
-    nzf_ids = kwargs.get("nzf_ids")
+    nzf_ids = clean_comma_separated_list(kwargs.get("nzf_ids"))
     size = int_conv(kwargs.get("size"))
 
     if nzo_id and nzf_ids and name:
         name = name.lower()
-        nzf_ids = nzf_ids.split(",")
         nzf_moved = False
         if name == "up" and size:
             sabnzbd.NzbQueue.move_nzf_up_bulk(nzo_id, nzf_ids, size)
@@ -608,7 +605,7 @@
     return report(_MSG_NO_VALUE)
 
 
-def _api_addurl(name, kwargs):
+def _api_addurl(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts name, output, pp, script, cat, priority, nzbname"""
     pp = kwargs.get("pp")
     script = kwargs.get("script")
@@ -626,24 +623,24 @@
         return report(_MSG_NO_VALUE)
 
 
-def _api_pause(name, kwargs):
+def _api_pause(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     sabnzbd.Scheduler.plan_resume(0)
     sabnzbd.Downloader.pause()
     return report()
 
 
-def _api_resume(name, kwargs):
+def _api_resume(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     sabnzbd.Scheduler.plan_resume(0)
     sabnzbd.downloader.unpause_all()
     return report()
 
 
-def _api_shutdown(name, kwargs):
+def _api_shutdown(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     sabnzbd.shutdown_program()
     return report()
 
 
-def _api_warnings(name, kwargs):
+def _api_warnings(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts name, output"""
     if name == "clear":
         return report(keyword="warnings", data=sabnzbd.GUIHANDLER.clear())
@@ -657,13 +654,13 @@
 LOG_JSON_RE = re.compile(rb"'(apikey|api|username|password)': '(.*?)'", re.I)
 LOG_INI_HIDE_RE = re.compile(
     rb"(apikey|api|user|username|password|email_pwd|email_account|email_to|email_from|pushover_token|pushover_userkey"
-    rb"|pushbullet_apikey|prowl_apikey|growl_password|growl_server|IPv[4|6] address|Public address IPv[4|6]-only|Local IPv6 address)\s?=.*",
+    rb"|apprise_(target_[a-z_]+|urls)|pushbullet_apikey|prowl_apikey|growl_password|growl_server|IPv[4|6] address|Public address IPv[4|6]-only|Local IPv6 address)\s?=.*",
     re.I,
 )
 LOG_HASH_RE = re.compile(rb"([a-zA-Z\d]{25})", re.I)
 
 
-def _api_showlog(name, kwargs):
+def _api_showlog(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """Fetch the INI and the log-data and add a message at the top"""
     log_data = b"--------------------------------\n\n"
     log_data += b"The log includes a copy of your sabnzbd.ini with\nall usernames, passwords and API-keys removed."
@@ -693,19 +690,19 @@
     return log_data
 
 
-def _api_get_cats(name, kwargs):
+def _api_get_cats(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     return report(keyword="categories", data=list_cats(False))
 
 
-def _api_get_scripts(name, kwargs):
+def _api_get_scripts(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     return report(keyword="scripts", data=list_scripts())
 
 
-def _api_version(name, kwargs):
+def _api_version(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     return report(keyword="version", data=sabnzbd.__version__)
 
 
-def _api_auth(name, kwargs):
+def _api_auth(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     key = kwargs.get("key", "")
     if not key:
         auth = "apikey"
@@ -718,14 +715,14 @@
     return report(keyword="auth", data=auth)
 
 
-def _api_restart(name, kwargs):
+def _api_restart(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     logging.info("Restart requested by API")
     # Do the shutdown async to still send goodbye to browser
     Thread(target=sabnzbd.trigger_restart, kwargs={"timeout": 1}).start()
     return report()
 
 
-def _api_restart_repair(name, kwargs):
+def _api_restart_repair(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     logging.info("Queue repair requested by API")
     request_repair()
     # Do the shutdown async to still send goodbye to browser
@@ -733,12 +730,12 @@
     return report()
 
 
-def _api_disconnect(name, kwargs):
+def _api_disconnect(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     sabnzbd.Downloader.disconnect()
     return report()
 
 
-def _api_eval_sort(name, kwargs):
+def _api_eval_sort(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: evaluate sorting expression"""
     sort_string = kwargs.get("sort_string", "")
     job_name = kwargs.get("job_name", "")
@@ -750,28 +747,28 @@
         return report(keyword="result", data=path)
 
 
-def _api_watched_now(name, kwargs):
+def _api_watched_now(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     sabnzbd.DirScanner.scan()
     return report()
 
 
-def _api_resume_pp(name, kwargs):
+def _api_resume_pp(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     sabnzbd.PostProcessor.paused = False
     return report()
 
 
-def _api_pause_pp(name, kwargs):
+def _api_pause_pp(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     sabnzbd.PostProcessor.paused = True
     return report()
 
 
-def _api_rss_now(name, kwargs):
+def _api_rss_now(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     # Run RSS scan async, because it can take a long time
     sabnzbd.Scheduler.force_rss()
     return report()
 
 
-def _api_retry_all(name, kwargs):
+def _api_retry_all(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: Retry all failed items in History"""
     items = sabnzbd.api.build_history()[0]
     nzo_ids = []
@@ -781,13 +778,13 @@
     return report(keyword="status", data=nzo_ids)
 
 
-def _api_reset_quota(name, kwargs):
+def _api_reset_quota(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """Reset quota left"""
     sabnzbd.BPSMeter.reset_quota(force=True)
     return report()
 
 
-def _api_test_email(name, kwargs):
+def _api_test_email(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: send a test email, return result"""
     logging.info("Sending test email")
     pack = {"download": ["action 1", "action 2"], "unpack": ["action 1", "action 2"]}
@@ -809,81 +806,91 @@
     return report(error=res)
 
 
-def _api_test_windows(name, kwargs):
+def _api_test_windows(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: send a test to Windows, return result"""
     logging.info("Sending test notification")
     res = sabnzbd.notifier.send_windows("SABnzbd", T("Test Notification"), "other")
     return report(error=res)
 
 
-def _api_test_notif(name, kwargs):
+def _api_test_notif(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: send a test to Notification Center, return result"""
     logging.info("Sending test notification")
     res = sabnzbd.notifier.send_notification_center("SABnzbd", T("Test Notification"), "other")
     return report(error=res)
 
 
-def _api_test_osd(name, kwargs):
+def _api_test_osd(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: send a test OSD notification, return result"""
     logging.info("Sending OSD notification")
     res = sabnzbd.notifier.send_notify_osd("SABnzbd", T("Test Notification"))
     return report(error=res)
 
 
-def _api_test_prowl(name, kwargs):
+def _api_test_prowl(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: send a test Prowl notification, return result"""
     logging.info("Sending Prowl notification")
     res = sabnzbd.notifier.send_prowl("SABnzbd", T("Test Notification"), "other", force=True, test=kwargs)
     return report(error=res)
 
 
-def _api_test_pushover(name, kwargs):
+def _api_test_pushover(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: send a test Pushover notification, return result"""
     logging.info("Sending Pushover notification")
     res = sabnzbd.notifier.send_pushover("SABnzbd", T("Test Notification"), "other", force=True, test=kwargs)
     return report(error=res)
 
 
-def _api_test_pushbullet(name, kwargs):
+def _api_test_pushbullet(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: send a test Pushbullet notification, return result"""
     logging.info("Sending Pushbullet notification")
     res = sabnzbd.notifier.send_pushbullet("SABnzbd", T("Test Notification"), "other", force=True, test=kwargs)
     return report(error=res)
 
 
-def _api_test_nscript(name, kwargs):
+def _api_test_apprise(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
+    """API: send a test Apprise notification, return result"""
+    logging.info("Sending Apprise notification")
+    res = sabnzbd.notifier.send_apprise("SABnzbd", T("Test Notification"), "other", force=True, test=kwargs)
+    return report(error=res)
+
+
+def _api_test_nscript(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: execute a test notification script, return result"""
     logging.info("Executing notification script")
     res = sabnzbd.notifier.send_nscript("SABnzbd", T("Test Notification"), "other", force=True, test=kwargs)
     return report(error=res)
 
 
-def _api_undefined(name, kwargs):
+def _api_undefined(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     return report(_MSG_NOT_IMPLEMENTED)
 
 
-def _api_browse(name, kwargs):
+def _api_browse(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """Return tree of local path"""
-    compact = kwargs.get("compact")
-
-    if compact and compact == "1":
-        name = kwargs.get("term", "")
-        paths = [entry["path"] for entry in folders_at_path(os.path.dirname(name)) if "path" in entry]
-        return report(keyword="", data=paths)
+    compact = bool(int_conv(kwargs.get("compact")))
+    show_files = bool(int_conv(kwargs.get("show_files")))
+    show_hidden = bool(int_conv(kwargs.get("show_hidden_folders")))
+
+    if compact:
+        # Used for typeahead
+        paths = []
+        for entry in pathbrowser(os.path.dirname(name), show_hidden, show_files):
+            if "path" in entry:
+                paths.append(entry["path"])
     else:
-        show_hidden = kwargs.get("show_hidden_folders")
-        paths = folders_at_path(name, True, show_hidden)
-        return report(keyword="paths", data=paths)
+        paths = pathbrowser(name, show_hidden, show_files)
+    return report(keyword="paths", data=paths)
 
 
-def _api_config(name, kwargs):
+def _api_config(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: Dispatcher for "config" """
     if cfg.configlock():
         return report(_MSG_CONFIG_LOCKED)
     return _api_config_table.get(name, (_api_config_undefined, 2))[0](kwargs)
 
 
-def _api_config_speedlimit(kwargs):
+def _api_config_speedlimit(kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts value(=speed)"""
     value = kwargs.get("value")
     if not value:
@@ -892,26 +899,26 @@
     return report()
 
 
-def _api_config_set_pause(kwargs):
+def _api_config_set_pause(kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts value(=pause interval)"""
     value = kwargs.get("value")
     sabnzbd.Scheduler.plan_resume(int_conv(value))
     return report()
 
 
-def _api_config_set_apikey(kwargs):
+def _api_config_set_apikey(kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     cfg.api_key.set(config.create_api_key())
     config.save_config()
     return report(keyword="apikey", data=cfg.api_key())
 
 
-def _api_config_set_nzbkey(kwargs):
+def _api_config_set_nzbkey(kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     cfg.nzb_key.set(config.create_api_key())
     config.save_config()
     return report(keyword="nzbkey", data=cfg.nzb_key())
 
 
-def _api_config_regenerate_certs(kwargs):
+def _api_config_regenerate_certs(kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     # Make sure we only over-write default locations
     result = False
     if (
@@ -925,27 +932,27 @@
     return report(data=result)
 
 
-def _api_config_test_server(kwargs):
+def _api_config_test_server(kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """API: accepts server-params"""
     result, msg = test_nntp_server_dict(kwargs)
     return report(data={"result": result, "message": msg})
 
 
-def _api_config_create_backup(kwargs):
+def _api_config_create_backup(kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     backup_file = config.create_config_backup()
     return report(data={"result": bool(backup_file), "message": backup_file})
 
 
-def _api_config_purge_log_files(kwargs):
+def _api_config_purge_log_files(kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     purge_log_files()
     return report()
 
 
-def _api_config_undefined(kwargs):
+def _api_config_undefined(kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     return report(_MSG_NOT_IMPLEMENTED)
 
 
-def _api_server_stats(name, kwargs):
+def _api_server_stats(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     sum_t, sum_m, sum_w, sum_d = sabnzbd.BPSMeter.get_sums()
     stats = {"total": sum_t, "month": sum_m, "week": sum_w, "day": sum_d, "servers": {}}
 
@@ -964,7 +971,7 @@
     return report(keyword="", data=stats)
 
 
-def _api_gc_stats(name, kwargs):
+def _api_gc_stats(name: str, kwargs: Dict[str, Union[str, List[str]]]) -> bytes:
     """Function only intended for internal testing of the memory handling"""
     # Collect before we check
     gc.collect()
@@ -1023,6 +1030,7 @@
     "test_osd": (_api_test_osd, 3),
     "test_pushover": (_api_test_pushover, 3),
     "test_pushbullet": (_api_test_pushbullet, 3),
+    "test_apprise": (_api_test_apprise, 3),
     "test_prowl": (_api_test_prowl, 3),
     "test_nscript": (_api_test_nscript, 3),
 }
@@ -1073,28 +1081,13 @@
     return 4
 
 
-def report(error: Optional[str] = None, keyword: str = "value", data: Any = None) -> bytes:
+def report(error: Optional[str] = None, keyword: str = "value", data: Optional[Any] = None) -> bytes:
     """Report message in json, xml or plain text
-    If error is set, only an status/error report is made.
+    If error is set, only a status/error report is made.
     If no error and no data, only a status report is made.
     Else, a data report is made (optional 'keyword' for outer XML section).
     """
-    output = cherrypy.request.params.get("output")
-    if output == "json":
-        content = "application/json;charset=UTF-8"
-        if error:
-            info = {"status": False, "error": error}
-        elif data is None:
-            info = {"status": True}
-        else:
-            if hasattr(data, "__iter__") and not keyword:
-                info = data
-            else:
-                info = {keyword: data}
-
-        response = utob(json.dumps(info))
-
-    elif output == "xml":
+    if cherrypy.request.params.get("output") == "xml":
         if not keyword:
             # xml always needs an outer keyword, even when json doesn't
             keyword = "result"
@@ -1107,15 +1100,19 @@
         else:
             status_str = xmlmaker.run(keyword, data)
         response = '<?xml version="1.0" encoding="UTF-8" ?>\n%s\n' % status_str
-
     else:
-        content = "text/plain"
+        content = "application/json;charset=UTF-8"
         if error:
-            response = "error: %s\n" % error
-        elif not data:
-            response = "ok\n"
+            info = {"status": False, "error": error}
+        elif data is None:
+            info = {"status": True}
         else:
-            response = "%s\n" % str(data)
+            if hasattr(data, "__iter__") and not keyword:
+                info = data
+            else:
+                info = {keyword: data}
+
+        response = utob(json.dumps(info))
 
     cherrypy.response.headers["Content-Type"] = content
     cherrypy.response.headers["Pragma"] = "no-cache"
@@ -1177,7 +1174,7 @@
         return text
 
 
-def handle_server_api(kwargs):
+def handle_server_api(kwargs: Dict[str, Union[str, List[str]]]) -> str:
     """Special handler for API-call 'set_config' [servers]"""
     name = kwargs.get("keyword")
     if not name:
@@ -1195,7 +1192,7 @@
     return name
 
 
-def handle_sorter_api(kwargs):
+def handle_sorter_api(kwargs: Dict[str, Union[str, List[str]]]) -> Optional[str]:
     """Special handler for API-call 'set_config' [sorters]"""
     name = kwargs.get("keyword")
     if not name:
@@ -1211,7 +1208,7 @@
     return name
 
 
-def handle_rss_api(kwargs):
+def handle_rss_api(kwargs: Dict[str, Union[str, List[str]]]) -> Optional[str]:
     """Special handler for API-call 'set_config' [rss]"""
     name = kwargs.get("keyword")
     if not name:
@@ -1245,7 +1242,7 @@
     return name
 
 
-def handle_cat_api(kwargs):
+def handle_cat_api(kwargs: Dict[str, Union[str, List[str]]]) -> Optional[str]:
     """Special handler for API-call 'set_config' [categories]"""
     name = kwargs.get("keyword")
     if not name:
@@ -1262,7 +1259,132 @@
     return name
 
 
-def build_status(calculate_performance: bool = False, skip_dashboard: bool = False) -> Dict[str, Any]:
+def test_nntp_server_dict(kwargs: Dict[str, Union[str, List[str]]]) -> Tuple[bool, str]:
+    """Will connect (blocking) to the NNTP server and report back any errors"""
+    host = kwargs.get("host", "").strip()
+    port = int_conv(kwargs.get("port", 0))
+    username = kwargs.get("username", "").strip()
+    password = kwargs.get("password", "").strip()
+    server = kwargs.get("server", "").strip()
+    connections = int_conv(kwargs.get("connections", 0))
+    timeout = int_conv(kwargs.get("timeout", DEF_TEST_TIMEOUT))
+    ssl = int_conv(kwargs.get("ssl", 0))
+    ssl_verify = int_conv(kwargs.get("ssl_verify", 1))
+    ssl_ciphers = kwargs.get("ssl_ciphers", "").strip()
+
+    if not host:
+        return False, T("The hostname is not set.")
+
+    if not connections:
+        return False, T("There are no connections set. Please set at least one connection.")
+
+    if not port:
+        if ssl:
+            port = 563
+        else:
+            port = 119
+
+    if not timeout:
+        # Lower value during new server testing
+        timeout = DEF_TEST_TIMEOUT
+
+    if "*" in password and not password.strip("*"):
+        # If the password is masked, try retrieving it from the config
+        if srv := config.get_servers().get(server):
+            password = srv.password()
+        else:
+            return False, T("Password masked in ******, please re-enter")
+
+    try:
+        test_server = sabnzbd.downloader.Server(
+            server_id=-1,
+            displayname="",
+            host=host,
+            port=port,
+            timeout=timeout,
+            threads=0,
+            priority=0,
+            use_ssl=ssl,
+            ssl_verify=ssl_verify,
+            ssl_ciphers=ssl_ciphers,
+            username=username,
+            password=password,
+        )
+    except:
+        return False, T("Invalid server details")
+
+    # All exceptions are caught internally
+    test_server.request_addrinfo_blocking()
+    if not test_server.addrinfo:
+        # Try if we can connect on port 80 (so web server), forcing a short timeout
+        test_server.port = 80
+        test_server.timeout = DEF_TEST_TIMEOUT
+        test_server.request_addrinfo_blocking()
+        if test_server.addrinfo:
+            return False, T(
+                "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."
+            ) % (host, port, host)
+        return False, T('Server address "%s:%s" is not valid.') % (host, port)
+
+    try:
+        nw = NewsWrapper(server=test_server, thrdnum=-1, block=True)
+        nw.init_connect()
+        while not nw.connected:
+            nw.recv_chunk()
+            nw.finish_connect(nw.status_code)
+
+    except socket.timeout:
+        if port != 119 and not ssl:
+            return False, T("Timed out: Try enabling SSL or connecting on a different port.")
+        else:
+            return False, T("Timed out")
+
+    except socket.error as err:
+        # Trying SSL on non-SSL port?
+        if match_str(str(err), ("unknown protocol", "wrong version number")):
+            return False, T("Unknown SSL protocol: Try disabling SSL or connecting on a different port.")
+        return False, str(err)
+
+    except NNTPPermanentError:
+        # Handled by the code below
+        pass
+
+    except Exception as err:
+        return False, str(err)
+
+    if not username or not password:
+        nw.nntp.sock.sendall(b"ARTICLE <test@home>\r\n")
+        try:
+            nw.reset_data_buffer()
+            nw.recv_chunk()
+        except Exception as err:
+            # Some internal error, not always safe to close connection
+            return False, str(err)
+
+    # Parse result
+    return_status = ()
+    if nw.status_code:
+        if nw.status_code == 480:
+            return_status = (False, T("Server requires username and password."))
+        elif nw.status_code < 300 or nw.status_code in (411, 423, 430):
+            # If no username/password set and we requested fake-article, it will return 430 Not Found
+            return_status = (True, T("Connection Successful!"))
+        elif nw.status_code == 502 or sabnzbd.downloader.clues_login(nw.nntp_msg):
+            return_status = (False, T("Authentication failed, check username/password."))
+        elif sabnzbd.downloader.clues_too_many(nw.nntp_msg):
+            return_status = (False, T("Too many connections, please pause downloading or try again later"))
+
+    # Fallback in case no data was received or unknown status
+    if not return_status:
+        return_status = (False, T("Could not determine connection result (%s)") % nw.nntp_msg)
+
+    # Close the connection and return result
+    nw.hard_reset()
+    return return_status
+
+
+def build_status(calculate_performance: int = False, skip_dashboard: int = False) -> Dict[str, Any]:
     # build up header full of basic information
     info = build_header(trans_functions=False)
 
@@ -1275,16 +1397,16 @@
     info["warnings"] = sabnzbd.GUIHANDLER.content()
 
     # Calculate performance measures, if requested
-    if int_conv(calculate_performance):
+    if calculate_performance:
         # PyStone
         sabnzbd.PYSTONE_SCORE = getpystone()
 
-        # Diskspeed of download (aka incomplete) and complete directory:
-        sabnzbd.DOWNLOAD_DIR_SPEED = round(diskspeedmeasure(sabnzbd.cfg.download_dir.get_path()), 1)
-        sabnzbd.COMPLETE_DIR_SPEED = round(diskspeedmeasure(sabnzbd.cfg.complete_dir.get_path()), 1)
+        # Disk speed of download (aka incomplete) and complete directory:
+        sabnzbd.DOWNLOAD_DIR_SPEED = diskspeedmeasure(sabnzbd.cfg.download_dir.get_path())
+        sabnzbd.COMPLETE_DIR_SPEED = diskspeedmeasure(sabnzbd.cfg.complete_dir.get_path())
 
         # Internet bandwidth
-        sabnzbd.INTERNET_BANDWIDTH = round(internetspeed(), 1)
+        sabnzbd.INTERNET_BANDWIDTH = internetspeed()
 
     # How often did we delay?
     info["delayed_assembler"] = sabnzbd.BPSMeter.delayed_assembler
@@ -1305,7 +1427,7 @@
     info["internetbandwidth"] = sabnzbd.INTERNET_BANDWIDTH
 
     # Dashboard: Connection information
-    if not int_conv(skip_dashboard):
+    if not skip_dashboard:
         info["active_socks5_proxy"] = active_socks5_proxy()
         info["localipv4"] = local_ipv4()
         info["publicipv4"] = public_ipv4()
@@ -1368,7 +1490,7 @@
     priorities: Optional[List[str]] = None,
     statuses: Optional[List[str]] = None,
     nzo_ids: Optional[List[str]] = None,
-):
+) -> Dict[str, Any]:
     info = build_header(for_template=False)
     (
         queue_bytes_total,
@@ -1483,7 +1605,7 @@
     return paused, bytes_left, bpsnow, time_left
 
 
-def build_file_list(nzo_id: str):
+def build_file_list(nzo_id: str) -> List[Dict[str, Any]]:
     """Build file lists for specified job"""
     jobs = []
     nzo = sabnzbd.sabnzbd.NzbQueue.get_nzo(nzo_id)
@@ -1536,7 +1658,11 @@
     return jobs
 
 
-def retry_job(job, new_nzb=None, password=None):
+def retry_job(
+    job: str,
+    new_nzb: Optional[cherrypy._cpreqbody.Part] = None,
+    password: Optional[str] = None,
+) -> Optional[str]:
     """Re enter failed job in the download queue"""
     if job:
         history_db = sabnzbd.get_db_connection()
@@ -1548,19 +1674,19 @@
             nzo_id = sabnzbd.NzbQueue.repair_job(path, new_nzb, password)
         if nzo_id:
             # Only remove from history if we repaired something
-            history_db.remove_history(job)
+            history_db.remove(job)
             return nzo_id
     return None
 
 
-def del_job_files(job_paths):
+def del_job_files(job_paths: List[str]):
     """Remove files of each path in the list"""
     for path in job_paths:
         if path and clip_path(path).lower().startswith(cfg.download_dir.get_clipped_path().lower()):
             remove_all(path, recursive=True)
 
 
-def Tspec(txt):
+def Tspec(txt: str) -> str:
     """Translate special terms"""
     if is_none(txt):
         return T("None")
@@ -1573,7 +1699,7 @@
 _SKIN_CACHE = {}  # Stores pre-translated acronyms
 
 
-def Ttemplate(txt):
+def Ttemplate(txt: str) -> str:
     """Translation function for Skin texts
     This special is to be used in interface.py for template processing
     to be passed for the $T function: so { ..., 'T' : Ttemplate, ...}
@@ -1596,7 +1722,7 @@
     sabnzbd.WEBUI_READY = True
 
 
-def build_header(webdir: str = "", for_template: bool = True, trans_functions: bool = True) -> Dict:
+def build_header(webdir: str = "", for_template: bool = True, trans_functions: bool = True) -> Dict[str, Any]:
     """Build the basic header"""
     header = {}
 
@@ -1661,34 +1787,41 @@
 def build_history(
     start: int = 0,
     limit: int = 1000000,
+    archive: bool = False,
     search: Optional[str] = None,
     categories: Optional[List[str]] = None,
     statuses: Optional[List[str]] = None,
     nzo_ids: Optional[List[str]] = None,
 ) -> Tuple[List[Dict[str, Any]], int, int]:
     """Combine the jobs still in post-processing and the database history"""
-    # Grab any items that are active or queued in postproc
-    postproc_queue = sabnzbd.PostProcessor.get_queue(
-        search=search,
-        categories=categories,
-        statuses=statuses,
-        nzo_ids=nzo_ids,
-    )
+    if not archive:
+        # Grab any items that are active or queued in postproc
+        postproc_queue = sabnzbd.PostProcessor.get_queue(
+            search=search,
+            categories=categories,
+            statuses=statuses,
+            nzo_ids=nzo_ids,
+        )
 
-    # Multi-page support for postproc items
-    postproc_queue_size = len(postproc_queue)
-    if start > postproc_queue_size:
-        # On a page where we shouldn't show postproc items
-        postproc_queue = []
-        database_history_limit = limit
-    else:
-        if limit:
-            postproc_queue = postproc_queue[start : start + limit]
+        # Multi-page support for postproc items
+        postproc_queue_size = len(postproc_queue)
+        if start > postproc_queue_size:
+            # On a page where we shouldn't show postproc items
+            postproc_queue = []
+            database_history_limit = limit
         else:
-            postproc_queue = postproc_queue[start:]
-        # Remove the amount of postproc items from the db request for history items
-        database_history_limit = max(limit - len(postproc_queue), 0)
-    database_history_start = max(start - postproc_queue_size, 0)
+            if limit:
+                postproc_queue = postproc_queue[start : start + limit]
+            else:
+                postproc_queue = postproc_queue[start:]
+            # Remove the amount of postproc items from the db request for history items
+            database_history_limit = max(limit - len(postproc_queue), 0)
+        database_history_start = max(start - postproc_queue_size, 0)
+    else:
+        database_history_start = start
+        database_history_limit = limit
+        postproc_queue = []
+        postproc_queue_size = 0
 
     # Acquire the db instance
     try:
@@ -1704,6 +1837,7 @@
         items, total_items = history_db.fetch_history(
             start=database_history_start,
             limit=1,
+            archive=archive,
             search=search,
             categories=categories,
             statuses=statuses,
@@ -1714,6 +1848,7 @@
         items, total_items = history_db.fetch_history(
             start=database_history_start,
             limit=database_history_limit,
+            archive=archive,
             search=search,
             categories=categories,
             statuses=statuses,
@@ -1768,6 +1903,7 @@
             "action_line": nzo.action_line,
             "loaded": nzo.pp_active,
             "retry": False,
+            "archive": False,
         }
         # Add stage information, in the correct order
         for stage in STAGES:
@@ -1777,14 +1913,14 @@
         items.append(item)
 
 
-def calc_timeleft(bytesleft, bps):
+def calc_timeleft(bytesleft: float, bps: float) -> str:
     """Based on bytesleft and bps calculate the time left in the format HH:MM:SS"""
     if bytesleft <= 0 or bps <= 0:
         return "0:00:00"
     return format_time_left(int(bytesleft / bps))
 
 
-def list_cats(default=True):
+def list_cats(default: bool = True) -> List[str]:
     """Return list of (ordered) categories,
     when default==False use '*' for Default category
     """
@@ -1813,7 +1949,7 @@
         return def_kw
 
 
-def del_from_section(kwargs):
+def del_from_section(kwargs: Dict[str, Union[str, List[str]]]) -> bool:
     """Remove keyword in section"""
     section = kwargs.get("section", "")
     if section in ("sorters", "servers", "rss", "categories"):
@@ -1836,11 +1972,11 @@
     logging.info("Scheduled removal of all failed jobs")
     with HistoryDB() as history_db:
         del_job_files(history_db.get_failed_paths())
-        history_db.remove_failed()
+        history_db.remove_with_status(Status.FAILED)
 
 
 def history_remove_completed():
     """Remove all completed jobs from history"""
     logging.info("Scheduled removal of all completed jobs")
     with HistoryDB() as history_db:
-        history_db.remove_completed()
+        history_db.remove_with_status(Status.COMPLETED)
diff -Nru sabnzbdplus-4.2.3/sabnzbd/cfg.py sabnzbdplus-4.3.0~alpha1/sabnzbd/cfg.py
--- sabnzbdplus-4.2.3/sabnzbd/cfg.py	2024-03-11 07:44:42.590389300 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/cfg.py	2024-03-18 15:45:18.224047200 +0000
@@ -403,7 +403,9 @@
 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")
+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)
 
 quota_size = OptionStr("misc", "quota_size")
 quota_day = OptionStr("misc", "quota_day")
@@ -448,7 +450,7 @@
 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", True)
+backup_for_duplicates = OptionBool("misc", "backup_for_duplicates", False)
 empty_postproc = OptionBool("misc", "empty_postproc", False)
 wait_for_dfolder = OptionBool("misc", "wait_for_dfolder", False)
 rss_filenames = OptionBool("misc", "rss_filenames", False)
@@ -461,6 +463,7 @@
 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)
@@ -612,6 +615,35 @@
 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", ["*"])
diff -Nru sabnzbdplus-4.2.3/sabnzbd/constants.py sabnzbdplus-4.3.0~alpha1/sabnzbd/constants.py
--- sabnzbdplus-4.2.3/sabnzbd/constants.py	2024-03-11 07:44:42.594196600 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/constants.py	2024-03-18 15:45:18.227017000 +0000
@@ -75,7 +75,7 @@
 DEF_ARTICLE_CACHE_DEFAULT = "500M"
 DEF_ARTICLE_CACHE_MAX = "1G"
 DEF_TIMEOUT = 60
-DEF_TEST_TIMEOUT = 10
+DEF_TEST_TIMEOUT = 5
 DEF_SCANRATE = 5
 DEF_HTTPS_CERT_FILE = "server.cert"
 DEF_HTTPS_KEY_FILE = "server.key"
diff -Nru sabnzbdplus-4.2.3/sabnzbd/database.py sabnzbdplus-4.3.0~alpha1/sabnzbd/database.py
--- sabnzbdplus-4.2.3/sabnzbd/database.py	2024-03-11 07:44:42.593583300 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/database.py	2024-03-18 15:45:18.226661700 +0000
@@ -27,7 +27,7 @@
 import threading
 import sqlite3
 from sqlite3 import Connection, Cursor
-from typing import Optional, List, Sequence, Dict, Any, Tuple
+from typing import Optional, List, Sequence, Dict, Any, Tuple, Union
 
 import sabnzbd
 import sabnzbd.cfg
@@ -106,6 +106,11 @@
                     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;"
+                )
+
             HistoryDB.startup_done = True
 
     def execute(self, command: str, args: Sequence = ()) -> bool:
@@ -181,11 +186,12 @@
             "series" TEXT,
             "md5sum" TEXT,
             "password" TEXT,
-            "duplicate_key" TEXT
+            "duplicate_key" TEXT,
+            "archive" INTEGER
         )
         """
         )
-        self.execute("PRAGMA user_version = 3;")
+        self.execute("PRAGMA user_version = 4;")
 
     def close(self):
         """Close database connection"""
@@ -196,13 +202,32 @@
             logging.error(T("Failed to close database, see log"))
             logging.info("Traceback: ", exc_info=True)
 
-    def remove_completed(self, search=None):
-        """Remove all completed jobs from the database, optional with `search` pattern"""
+    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"""
+        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),
+        )
+
+    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 completed jobs from history")
-        return self.execute("""DELETE FROM history WHERE name LIKE ? AND status = ?""", (search, Status.COMPLETED))
+        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=None):
+    def get_failed_paths(self, search: Optional[str] = None) -> List[str]:
         """Return list of all storage paths of failed jobs (may contain non-existing or empty paths)"""
         search = convert_search(search)
         fetch_ok = self.execute(
@@ -213,53 +238,53 @@
         else:
             return []
 
-    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))
-
-    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,))
-                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
+        """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()
 
-        if sabnzbd.cfg.history_retention() == "-1":
+        if history_retention_option == "all":
+            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":
             # Delete all non-failed ones
-            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)
-                )
-        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),
-                )
+            self.remove_with_status(Status.COMPLETED)
 
     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"""
@@ -278,6 +303,7 @@
         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,
@@ -287,9 +313,13 @@
         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)
@@ -563,6 +593,7 @@
     # 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"]))
diff -Nru sabnzbdplus-4.2.3/sabnzbd/downloader.py sabnzbdplus-4.3.0~alpha1/sabnzbd/downloader.py
--- sabnzbdplus-4.2.3/sabnzbd/downloader.py	2024-03-11 07:44:42.591985000 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/downloader.py	2024-03-18 15:45:18.225427400 +0000
@@ -700,7 +700,7 @@
     def process_nw(self, nw: NewsWrapper):
         """Receive data from a NewsWrapper and handle the response"""
         try:
-            bytes_received, done = nw.recv_chunk()
+            bytes_received, end_of_line, article_done = nw.recv_chunk()
         except ssl.SSLWantReadError:
             return
         except (ConnectionError, ConnectionAbortedError):
@@ -717,7 +717,7 @@
                 self.last_max_chunk_size = bytes_received
             # Update statistics only when we fetched a whole article
             # The side effect is that we don't count things like article-not-available messages
-            if done:
+            if article_done:
                 article.nzf.nzo.update_download_stats(sabnzbd.BPSMeter.bps, server.id, nw.data_position)
             # Check speedlimit
             if (
@@ -729,9 +729,13 @@
                     time.sleep(0.01)
                     sabnzbd.BPSMeter.update()
 
+        # If we are not at the end of a line, more data will follow
+        if not end_of_line:
+            return
+
         # Response code depends on request command:
-        # # 220 = ARTICLE, 222 = BODY
-        if nw.status_code not in (220, 222) and not done:
+        # 220 = ARTICLE, 222 = BODY
+        if nw.status_code not in (220, 222) and not article_done:
             if not nw.connected or nw.status_code == 480:
                 if not self.__finish_connect_nw(nw):
                     return
@@ -740,11 +744,11 @@
                     self.__request_article(nw)
 
             elif nw.status_code == 223:
-                done = True
+                article_done = True
                 logging.debug("Article <%s> is present", article.article)
 
             elif nw.status_code in (411, 423, 430, 451):
-                done = True
+                article_done = True
                 logging.debug(
                     "Thread %s@%s: Article %s missing (error=%s)",
                     nw.thrdnum,
@@ -767,17 +771,21 @@
                 self.__request_article(nw)
 
             else:
-                logging.warning(
-                    T("%s@%s: Received unknown status code %s for article %s"),
-                    nw.thrdnum,
-                    nw.server.host,
-                    nw.status_code,
-                    article.article,
-                )
-                done = True
-                nw.reset_data_buffer()
+                # Don't warn for (internal) server errors during downloading
+                if nw.status_code not in (400, 502, 503):
+                    logging.warning(
+                        T("%s@%s: Received unknown status code %s for article %s"),
+                        nw.thrdnum,
+                        nw.server.host,
+                        nw.status_code,
+                        article.article,
+                    )
+
+                # Ditch this thread, we don't know what data we got now so the buffer can be bad
+                self.__reset_nw(nw, f"Server error or unknown status code: {nw.status_code}", wait=False)
+                return
 
-        if done:
+        if article_done:
             # Successful data, clear "bad" counter
             server.bad_cons = 0
             server.errormsg = server.warning = ""
diff -Nru sabnzbdplus-4.2.3/sabnzbd/filesystem.py sabnzbdplus-4.3.0~alpha1/sabnzbd/filesystem.py
--- sabnzbdplus-4.2.3/sabnzbd/filesystem.py	2024-03-11 07:44:42.593904300 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/filesystem.py	2024-03-18 15:45:18.226844800 +0000
@@ -39,6 +39,7 @@
 try:
     import win32api
     import win32file
+    import win32con
 except ImportError:
     pass
 
@@ -1317,3 +1318,119 @@
         allgood = False
 
     return allgood
+
+
+def get_win_drives() -> List[str]:
+    """Return list of detected drives, adapted from:
+    http://stackoverflow.com/questions/827371/is-there-a-way-to-list-all-the-available-drive-letters-in-python/827490
+    """
+    return filter(len, win32api.GetLogicalDriveStrings().split("\000"))
+
+
+PATHBROWSER_JUNKFOLDERS = (
+    "boot",
+    "bootmgr",
+    "cache",
+    "msocache",
+    "recovery",
+    "$recycle.bin",
+    "recycler",
+    "system volume information",
+    "temporary internet files",
+    "perflogs",  # windows specific
+    ".fseventd",
+    ".spotlight",
+    ".trashes",
+    ".vol",
+    "cachedmessages",
+    "caches",
+    "trash",  # osx specific
+)
+
+
+def pathbrowser(path: str, show_hidden: bool = False, show_files: bool = False) -> List[Dict[str, str]]:
+    """Returns a list of dictionaries with the folders and folders contained at the given path
+    Give the empty string as the path to list the contents of the root path
+    under Unix this means "/", on Windows this will be a list of drive letters
+    """
+    if path == "":
+        if sabnzbd.WIN32:
+            entries = [{"current_path": "Root"}]
+            for letter in get_win_drives():
+                entries.append(
+                    {
+                        "name": letter,
+                        "path": letter,
+                        "dir": True,
+                    }
+                )
+            return entries
+        else:
+            path = "/"
+
+    # Walk up the tree until we find a valid path
+    path = real_path(sabnzbd.DIR_HOME, path)
+    while path and not os.path.isdir(path):
+        if path == os.path.dirname(path):
+            return pathbrowser(path="")
+        else:
+            path = os.path.dirname(path)
+
+    # Fix up the path and find the parent
+    path = os.path.abspath(os.path.normpath(path))
+    parent_path = os.path.dirname(path)
+
+    # If we're at the root then the next step is the meta-node showing our drive letters
+    if path == parent_path and sabnzbd.WIN32:
+        parent_path = ""
+
+    # List all files and folders
+    file_list = []
+    for filename in os.listdir(path):
+        fpath = os.path.join(path, filename)
+        isdir = os.path.isdir(fpath)
+
+        # Skip unwanted folders
+        if isdir and filename.lower() in PATHBROWSER_JUNKFOLDERS:
+            continue
+
+        # Skip files
+        if not isdir and not show_files:
+            continue
+
+        # Skip hidden files
+        if not show_hidden:
+            if sabnzbd.WIN32:
+                try:
+                    if win32api.GetFileAttributes(fpath) & win32con.FILE_ATTRIBUTE_HIDDEN:
+                        continue
+                except win32api.error:
+                    # Can be thrown if file is in use
+                    continue
+            elif filename.startswith("."):
+                continue
+
+        file_list.append(
+            {
+                "name": clip_path(filename),
+                "path": clip_path(fpath),
+                "dir": isdir,
+            }
+        )
+
+    # Sort results, folders first (using string value of the bool)
+    file_list = sorted(file_list, key=lambda x: str(not x["dir"]) + os.path.basename(x["name"]).lower())
+
+    # Add current path
+    file_list.insert(0, {"current_path": clip_path(path)})
+    if parent_path != path:
+        file_list.insert(
+            1,
+            {
+                "name": "..",
+                "path": clip_path(parent_path),
+                "dir": True,
+            },
+        )
+
+    return file_list
diff -Nru sabnzbdplus-4.2.3/sabnzbd/getipaddress.py sabnzbdplus-4.3.0~alpha1/sabnzbd/getipaddress.py
--- sabnzbdplus-4.2.3/sabnzbd/getipaddress.py	2024-03-11 07:44:42.600092200 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/getipaddress.py	2024-03-18 15:45:18.231715200 +0000
@@ -132,7 +132,7 @@
         # Make sure it's a valid IPv4 or IPv6 address
         if not sabnzbd.misc.is_ipv4_addr(client_ip) and not sabnzbd.misc.is_ipv6_addr(client_ip):
             raise ValueError
-    except urllib.error.URLError:
+    except:
         logging.debug(
             "Failed to get public address from %s (%s)",
             sabnzbd.cfg.selftest_host(),
diff -Nru sabnzbdplus-4.2.3/sabnzbd/happyeyeballs.py sabnzbdplus-4.3.0~alpha1/sabnzbd/happyeyeballs.py
--- sabnzbdplus-4.2.3/sabnzbd/happyeyeballs.py	2024-03-11 07:44:42.598124700 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/happyeyeballs.py	2024-03-18 15:45:18.229848900 +0000
@@ -33,6 +33,7 @@
 from typing import Tuple, Union, Optional
 from more_itertools import roundrobin
 
+import sabnzbd.cfg as cfg
 from sabnzbd.constants import DEF_TIMEOUT
 from sabnzbd.decorators import cache_maintainer
 
@@ -41,6 +42,24 @@
 # The absolute minium specified in RFC 8305 is 10ms, so we use that.
 CONNECTION_ATTEMPT_DELAY = 0.01
 
+# While providers are afraid to add IPv6 to their standard hostnames
+# we map a number of well known hostnames to their IPv6 alternatives.
+# WARNING: Only add if the SSL-certificate allows both hostnames!
+IPV6_MAPPING = {
+    "news.eweka.nl": "news6.eweka.nl",
+    "news.xlned.com": "news6.xlned.com",
+    "news.easynews.com": "news6.easynews.com",
+    "news.tweaknews.nl": "news6.tweaknews.nl",
+    "news.tweaknews.eu": "news6.tweaknews.eu",
+    "news.astraweb.com": "news6.astraweb.com",
+    "news.pureusenet.nl": "news6.pureusenet.nl",
+    "news.sunnyusenet.com": "news6.sunnyusenet.com",
+    "news.newshosting.com": "news6.newshosting.com",
+    "news.usenetserver.com": "news6.usenetserver.com",
+    "news.frugalusenet.com": "news-v6.frugalusenet.com",
+    "eunews.frugalusenet.com": "eunews-v6.frugalusenet.com",
+}
+
 
 # For typing and convenience!
 @dataclass
@@ -65,7 +84,7 @@
         return "IPv4-only"
     elif family == socket.AF_INET6:
         return "IPv6-only"
-    return "IPv4 and IPv6"
+    return "IPv4 or IPv6"
 
 
 # Called by each thread
@@ -105,33 +124,41 @@
     by getaddrinfo or if no connection could be made to any of the addresses.
     If family is specified, only that family is tried"""
     try:
+        # See if we can add a IPv6 alternative
+        check_hosts = [host]
+        if cfg.ipv6_staging() and host in IPV6_MAPPING:
+            check_hosts.append(IPV6_MAPPING[host])
+            logging.info("Added alternative IPv6 address: %s", IPV6_MAPPING[host])
+
         ipv4_addrinfo = []
         ipv6_addrinfo = []
         last_canonname = ""
-
-        try:
-            for addrinfo in socket.getaddrinfo(host, port, family, socket.SOCK_STREAM, flags=socket.AI_CANONNAME):
-                # Convert to AddrInfo
-                addrinfo = AddrInfo(*addrinfo)
-
-                # The canonname is only reported once per alias
-                if addrinfo.canonname:
-                    last_canonname = addrinfo.canonname
-                elif last_canonname:
-                    addrinfo.canonname = last_canonname
-
-                # Put it in the right list for further processing
-                # But prevent adding duplicate items to the lists
-                if addrinfo not in ipv6_addrinfo and addrinfo not in ipv4_addrinfo:
-                    if addrinfo.family == socket.AddressFamily.AF_INET6:
-                        ipv6_addrinfo.append(addrinfo)
-                    else:
-                        ipv4_addrinfo.append(addrinfo)
-        except:
-            # Did we fail on the first getaddrinfo already?
-            # Otherwise, we failed on the IPv6 alternative address, and those failures can be ignored
-            if not ipv4_addrinfo and not ipv6_addrinfo:
-                raise
+        for check_host in check_hosts:
+            try:
+                for addrinfo in socket.getaddrinfo(
+                    check_host, port, family, socket.SOCK_STREAM, flags=socket.AI_CANONNAME
+                ):
+                    # Convert to AddrInfo
+                    addrinfo = AddrInfo(*addrinfo)
+
+                    # The canonname is only reported once per alias
+                    if addrinfo.canonname:
+                        last_canonname = addrinfo.canonname
+                    elif last_canonname:
+                        addrinfo.canonname = last_canonname
+
+                    # Put it in the right list for further processing
+                    # But prevent adding duplicate items to the lists
+                    if addrinfo not in ipv6_addrinfo and addrinfo not in ipv4_addrinfo:
+                        if addrinfo.family == socket.AddressFamily.AF_INET6:
+                            ipv6_addrinfo.append(addrinfo)
+                        else:
+                            ipv4_addrinfo.append(addrinfo)
+            except:
+                # Did we fail on the first getaddrinfo already?
+                # Otherwise, we failed on the IPv6 alternative address, and those failures can be ignored
+                if not ipv4_addrinfo and not ipv6_addrinfo:
+                    raise
 
         logging.debug(
             "Available addresses for %s (port=%d, %s): %d IPv4 and %d IPv6",
diff -Nru sabnzbdplus-4.2.3/sabnzbd/interface.py sabnzbdplus-4.3.0~alpha1/sabnzbd/interface.py
--- sabnzbdplus-4.2.3/sabnzbd/interface.py	2024-03-11 07:44:42.594528200 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/interface.py	2024-03-18 15:45:18.227224000 +0000
@@ -53,6 +53,7 @@
     recursive_html_escape,
     is_none,
     get_cpu_name,
+    clean_comma_separated_list,
 )
 from sabnzbd.happyeyeballs import happyeyeballs
 from sabnzbd.filesystem import (
@@ -68,7 +69,6 @@
 import sabnzbd.cfg as cfg
 import sabnzbd.notifier as notifier
 import sabnzbd.newsunpack
-from sabnzbd.utils.servertests import test_nntp_server_dict
 import sabnzbd.utils.ssdp
 from sabnzbd.constants import (
     DEF_STD_CONFIG,
@@ -210,11 +210,14 @@
     is_allowed = is_loopback_addr(remote_ip) or is_local_addr(remote_ip)
 
     # Never check the XFF header unless access would have been granted based on the remote IP alone!
-    if is_allowed and cfg.verify_xff_header() and (xff_header := cherrypy.request.headers.get("X-Forwarded-For")):
-        xff_ips = [ip.strip() for ip in xff_header.split(",")]
+    if (
+        is_allowed
+        and cfg.verify_xff_header()
+        and (xff_ips := clean_comma_separated_list(cherrypy.request.headers.get("X-Forwarded-For")))
+    ):
         is_allowed = all(is_local_addr(ip) or is_loopback_addr(ip) for ip in xff_ips)
         if not is_allowed:
-            logging.debug("Denying access based on X-Forwarded-For header '%s'", xff_header)
+            logging.debug("Denying access based on X-Forwarded-For IPs '%s'", xff_ips)
 
     if not is_allowed and warn_user:
         log_warning_and_ip(T("Refused connection from:"))
@@ -772,7 +775,8 @@
     "quota_day",
     "quota_resume",
     "quota_period",
-    "history_retention",
+    "history_retention_option",
+    "history_retention_number",
     "pre_check",
     "max_art_tries",
     "fail_hopeless_jobs",
@@ -830,6 +834,7 @@
     "preserve_paused_state",
     "no_penalties",
     "ipv6_servers",
+    "ipv6_staging",
     "fast_fail",
     "overwrite_files",
     "enable_par_cleanup",
@@ -1079,11 +1084,6 @@
         return handle_server(kwargs, self.__root)
 
     @secured_expose(check_api_key=True, check_configlock=True)
-    def testServer(self, **kwargs):
-        _, msg = test_nntp_server_dict(kwargs)
-        return msg
-
-    @secured_expose(check_api_key=True, check_configlock=True)
     def delServer(self, **kwargs):
         kwargs["section"] = "servers"
         kwargs["keyword"] = kwargs.get("server")
@@ -2090,6 +2090,35 @@
         "pushbullet_prio_other",
         "pushbullet_prio_new_login",
     ),
+    "apprise": (
+        "apprise_enable",
+        "apprise_cats",
+        "apprise_urls",
+        "apprise_target_startup",
+        "apprise_target_startup_enable",
+        "apprise_target_download",
+        "apprise_target_download_enable",
+        "apprise_target_pause_resume",
+        "apprise_target_pause_resume_enable",
+        "apprise_target_pp",
+        "apprise_target_pp_enable",
+        "apprise_target_complete",
+        "apprise_target_complete_enable",
+        "apprise_target_failed",
+        "apprise_target_failed_enable",
+        "apprise_target_disk_full",
+        "apprise_target_disk_full_enable",
+        "apprise_target_warning",
+        "apprise_target_warning_enable",
+        "apprise_target_error",
+        "apprise_target_error_enable",
+        "apprise_target_queue_done",
+        "apprise_target_queue_done_enable",
+        "apprise_target_other",
+        "apprise_target_other_enable",
+        "apprise_target_new_login",
+        "apprise_target_new_login_enable",
+    ),
     "nscript": (
         "nscript_enable",
         "nscript_cats",
diff -Nru sabnzbdplus-4.2.3/sabnzbd/internetspeed.py sabnzbdplus-4.3.0~alpha1/sabnzbd/internetspeed.py
--- sabnzbdplus-4.2.3/sabnzbd/internetspeed.py	2024-03-11 07:44:42.590744500 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/internetspeed.py	2024-03-18 15:45:18.224412000 +0000
@@ -30,7 +30,7 @@
 
 import sabctools
 import sabnzbd
-from sabnzbd.happyeyeballs import happyeyeballs
+from sabnzbd.happyeyeballs import happyeyeballs, family_type
 
 TEST_HOSTNAME = "sabnzbd.org"
 TEST_PORT = 443
@@ -75,14 +75,14 @@
         pass
 
 
-def internetspeed(test_time_limit: int = TIME_LIMIT) -> float:
+def internetspeed_interal(test_time_limit: int = TIME_LIMIT, family: int = socket.AF_UNSPEC) -> float:
     """Measure internet speed from a test-download using our optimized SSL-code"""
 
     context = ssl.create_default_context(ssl.Purpose.SERVER_AUTH)
     socket_speed = {}
 
     try:
-        addrinfo = happyeyeballs(TEST_HOSTNAME, TEST_PORT, SOCKET_TIMEOUT)
+        addrinfo = happyeyeballs(TEST_HOSTNAME, TEST_PORT, SOCKET_TIMEOUT, family)
         for _ in range(NR_CONNECTIONS):
             sock = socket.socket(addrinfo.family, addrinfo.type)
             sock.settimeout(SOCKET_TIMEOUT)
@@ -101,10 +101,32 @@
     time.sleep(test_time_limit + 0.5)
 
     speed = sum(socket_speed.values()) / 1024 / 1024
-    logging.debug("Internet Bandwidth = %.2f MB/s - %.2f Mbps", speed, speed * 8.05)
+    logging.debug("Internet Bandwidth (%s) = %.2f MB/s - %.2f Mbps", family_type(family), speed, speed * 8.05)
     return speed
 
 
+def internetspeed() -> float:
+    # Internet bandwidth
+    if not sabnzbd.cfg.ipv6_staging():
+        # no special IPv6 wishes, so straight Internet speed test (ipv4 / ipv6 agnostic)
+        return round(internetspeed_interal(), 2)
+    else:
+        internetspeed_ipv4 = round(internetspeed_interal(family=socket.AF_INET), 1)
+        internetspeed_ipv6 = round(internetspeed_interal(family=socket.AF_INET6), 1)
+        if internetspeed_ipv4 > 0 and internetspeed_ipv6 > 0:
+            # both working, so let's see if it's about the same speed (good), there is a big difference (bad)
+            if 0.5 > (internetspeed_ipv4 / internetspeed_ipv6) > 2:
+                sabnzbd.misc.helpful_warning(
+                    T(
+                        "Internet Bandwidth of IPv4 significantly different from IPv6: %f MB/s versus %f MB/s",
+                        internetspeed_ipv4,
+                        internetspeed_ipv6,
+                    )
+                )
+
+        return max(internetspeed_ipv4, internetspeed_ipv6)
+
+
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
     internetspeed()
diff -Nru sabnzbdplus-4.2.3/sabnzbd/misc.py sabnzbdplus-4.3.0~alpha1/sabnzbd/misc.py
--- sabnzbdplus-4.2.3/sabnzbd/misc.py	2024-03-11 07:44:42.589319700 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/misc.py	2024-03-18 15:45:18.223232500 +0000
@@ -39,6 +39,7 @@
 import ipaddress
 import socks
 from threading import Thread
+from collections.abc import Iterable
 from typing import Union, Tuple, Any, AnyStr, Optional, List, Dict, Collection
 
 import sabnzbd
@@ -177,6 +178,18 @@
     return not inp or (isinstance(inp, str) and inp.lower() == "none")
 
 
+def clean_comma_separated_list(inp: Any) -> List[str]:
+    """Return a list of stripped values from a string or list, empty ones removed"""
+    result_ids = []
+    if isinstance(inp, str):
+        inp = inp.split(",")
+    if isinstance(inp, Iterable):
+        for inp_id in inp:
+            if new_id := inp_id.strip():
+                result_ids.append(new_id)
+    return result_ids
+
+
 def cmp(x, y):
     """
     Replacement for built-in function cmp that was removed in Python 3
@@ -1476,3 +1489,18 @@
         # Configure the new sorter
         logging.debug("Converted old movie sorter config to '%s': %s", T("Movie Sorting"), movie_sorter)
         config.ConfigSorter(T("Movie Sorting"), movie_sorter)
+
+
+def convert_history_retention():
+    """Convert single-option to the split history retention setting"""
+    if "d" in cfg.history_retention():
+        days_to_keep = int_conv(cfg.history_retention().strip()[:-1])
+        cfg.history_retention_option.set("days-delete")
+        cfg.history_retention_number.set(days_to_keep)
+    else:
+        to_keep = int_conv(sabnzbd.cfg.history_retention())
+        if to_keep > 0:
+            cfg.history_retention_option.set("number-delete")
+            cfg.history_retention_number.set(to_keep)
+        elif to_keep < 0:
+            cfg.history_retention_option.set("all-delete")
diff -Nru sabnzbdplus-4.2.3/sabnzbd/newswrapper.py sabnzbdplus-4.3.0~alpha1/sabnzbd/newswrapper.py
--- sabnzbdplus-4.2.3/sabnzbd/newswrapper.py	2024-03-11 07:44:42.595496700 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/newswrapper.py	2024-03-18 15:45:18.228021000 +0000
@@ -34,6 +34,7 @@
 from sabnzbd.encoding import utob, ubtou
 from sabnzbd.happyeyeballs import AddrInfo
 from sabnzbd.decorators import synchronized, DOWNLOADER_LOCK
+from sabnzbd.misc import int_conv
 
 # Set pre-defined socket timeout
 socket.setdefaulttimeout(DEF_TIMEOUT)
@@ -95,7 +96,7 @@
     @property
     def status_code(self) -> Optional[int]:
         if self.data_position >= 3:
-            return int(self.data[:3])
+            return int_conv(self.data[:3])
 
     @property
     def nntp_msg(self) -> str:
@@ -177,8 +178,8 @@
         self.nntp.sock.sendall(command)
         self.reset_data_buffer()
 
-    def recv_chunk(self) -> Tuple[int, bool]:
-        """Receive data, return #bytes, done, skip"""
+    def recv_chunk(self) -> Tuple[int, bool, bool]:
+        """Receive data, return #bytes, end-of-line, end-of-article"""
         # Resize the buffer in the extremely unlikely case that it got full
         if self.data_position == len(self.data):
             self.nntp.nw.increase_data_buffer()
@@ -203,16 +204,19 @@
         # another recv_chunk so the buffer is increased and the data from the SSL-layer is read. See #2752.
         if self.nntp.nw.server.ssl and self.data_position == len(self.data) and self.nntp.sock.pending() > 0:
             # We do not perform error-handling, as we know there is data available to read
-            additional_bytes_recv, additional_result = self.recv_chunk()
-            return bytes_recv + additional_bytes_recv, additional_result
+            additional_bytes_recv, additional_end_of_line, additional_end_of_article = self.recv_chunk()
+            return bytes_recv + additional_bytes_recv, additional_end_of_line, additional_end_of_article
 
-        # Official end-of-article is "\r\n.\r\n"
+        # Check for end of line
         # Using the data directly seems faster than the memoryview
-        if self.data[self.data_position - 5 : self.data_position] == b"\r\n.\r\n":
-            return bytes_recv, True
+        if self.data[self.data_position - 2 : self.data_position] == b"\r\n":
+            # Official end-of-article is "\r\n.\r\n"
+            if self.data[self.data_position - 5 : self.data_position] == b"\r\n.\r\n":
+                return bytes_recv, True, True
+            return bytes_recv, True, False
 
         # Still in middle of data, so continue!
-        return bytes_recv, False
+        return bytes_recv, False, False
 
     def soft_reset(self):
         """Reset for the next article"""
diff -Nru sabnzbdplus-4.2.3/sabnzbd/notifier.py sabnzbdplus-4.3.0~alpha1/sabnzbd/notifier.py
--- sabnzbdplus-4.2.3/sabnzbd/notifier.py	2024-03-11 07:44:42.593252200 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/notifier.py	2024-03-18 15:45:18.226484000 +0000
@@ -29,7 +29,8 @@
 import http.client
 import json
 from threading import Thread
-from typing import Optional, Dict
+from typing import Optional, Dict, Union
+import apprise
 
 import sabnzbd
 import sabnzbd.cfg
@@ -115,6 +116,20 @@
         return -1000
 
 
+def get_target(notification_type: str, section: str) -> Union[str, bool, None]:
+    """Check target of `notification_type` in `section` if enabled is set"""
+    try:
+        if sabnzbd.config.get_config(section, "%s_target_%s_enable" % (section, notification_type))() > 0:
+            if result := sabnzbd.config.get_config(section, "%s_target_%s" % (section, notification_type))():
+                return result
+            # Use Default
+            return True
+    except TypeError:
+        logging.debug("Incorrect Notify option %s:%s_target_%s", section, section, notification_type)
+        return False
+    return False
+
+
 def check_cat(section: str, job_cat: str, keyword: Optional[str] = None) -> bool:
     """Check if `job_cat` is enabled in `section`.
     * = All, if no other categories selected.
@@ -165,6 +180,11 @@
         if sabnzbd.cfg.pushbullet_apikey() and check_classes(notification_type, "pushbullet"):
             Thread(target=send_pushbullet, args=(title, msg, notification_type)).start()
 
+    # Apprise
+    if sabnzbd.cfg.apprise_enable() and check_cat("apprise", job_cat):
+        if sabnzbd.cfg.apprise_urls() and check_classes(notification_type, "apprise"):
+            Thread(target=send_apprise, args=(title, msg, notification_type)).start()
+
     # Notification script.
     if sabnzbd.cfg.nscript_enable() and check_cat("nscript", job_cat):
         if sabnzbd.cfg.nscript_script():
@@ -265,6 +285,90 @@
     return ""
 
 
+def send_apprise(title, msg, notification_type, force=False, test=None):
+    """send apprise message"""
+    logging.debug("Sending Apprise notification")
+    if test:
+        urls = test.get("apprise_urls")
+    else:
+        urls = sabnzbd.cfg.apprise_urls()
+
+    # Notification mapper
+    n_map = {
+        # Startup/Shutdown
+        "startup": apprise.common.NotifyType.INFO,
+        # Pause/Resume
+        "pause_resume": apprise.common.NotifyType.INFO,
+        # Added NZB
+        "download": apprise.common.NotifyType.INFO,
+        # Post-processing started
+        "pp": apprise.common.NotifyType.INFO,
+        # Job finished
+        "complete": apprise.common.NotifyType.SUCCESS,
+        # Job failed
+        "failed": apprise.common.NotifyType.FAILURE,
+        # Warning
+        "warning": apprise.common.NotifyType.WARNING,
+        # Error
+        "error": apprise.common.NotifyType.FAILURE,
+        # Disk full
+        "disk_full": apprise.common.NotifyType.WARNING,
+        # Queue finished
+        "queue_done": apprise.common.NotifyType.INFO,
+        # User logged in
+        "new_login": apprise.common.NotifyType.INFO,
+        # Other Messages
+        "other": apprise.common.NotifyType.INFO,
+    }
+
+    # Prepare our Asset Object
+    asset = apprise.AppriseAsset(
+        app_id="SABnzbd",
+        app_desc="SABnzbd Notification",
+        app_url="https://sabnzbd.org/",
+        image_path_mask=os.path.join(sabnzbd.DIR_PROG, "icons", "apprise", "apprise-{TYPE}.png"),
+        image_url_mask="https://sabnzbd.org/images/icons/apprise/{TYPE}.png",
+        image_url_logo="https://sabnzbd.org/images/icons/apple-touch-icon-180x180-precomposed.png",
+    )
+
+    # Initialize our Apprise Instance
+    apobj = apprise.Apprise(asset=asset)
+
+    if not test:
+        # Get a list of tags that are set to use the common list
+        if target := get_target(notification_type, "apprise"):
+            if target is True:
+                # Use default list
+                apobj.add(urls)
+            elif not apobj.add(target):
+                # Target is string of URLs to over-ride with
+                # Store our URL and assign our key
+                logging.warning("%s - %s", notification_type, T("One or more Apprise URLs could not be loaded."))
+        else:
+            # Nothing to notify
+            return ""
+    else:
+        # Use default list
+        apobj.add(urls)
+
+    try:
+        # The below notifies anything added to our list
+        if not apobj.notify(
+            body=msg,
+            title=title,
+            notify_type=n_map[notification_type],
+            body_format=apprise.NotifyFormat.TEXT,
+        ):
+            return T("Failed to send one or more Apprise Notifications")
+
+    except:
+        logging.warning(T("Failed to send Apprise message"))
+        logging.info("Traceback: ", exc_info=True)
+        return T("Failed to send Apprise message")
+
+    return ""
+
+
 def send_pushover(title, msg, notification_type, force=False, test=None):
     """Send message to pushover"""
     logging.debug("Sending Pushover notification")
diff -Nru sabnzbdplus-4.2.3/sabnzbd/nzbqueue.py sabnzbdplus-4.3.0~alpha1/sabnzbd/nzbqueue.py
--- sabnzbdplus-4.2.3/sabnzbd/nzbqueue.py	2024-03-11 07:44:42.599475100 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/nzbqueue.py	2024-03-18 15:45:18.231138000 +0000
@@ -246,33 +246,33 @@
     def set_top_only(self, value):
         self.__top_only = value
 
-    def change_opts(self, nzo_ids: str, pp: int) -> int:
+    def change_opts(self, nzo_ids: List[str], pp: int) -> int:
         result = 0
-        for nzo_id in [item.strip() for item in nzo_ids.split(",")]:
+        for nzo_id in nzo_ids:
             if nzo_id in self.__nzo_table:
                 self.__nzo_table[nzo_id].set_pp(pp)
                 result += 1
         return result
 
-    def change_script(self, nzo_ids: str, script: str) -> int:
+    def change_script(self, nzo_ids: List[str], script: str) -> int:
         result = 0
         if (script is None) or is_valid_script(script):
-            for nzo_id in [item.strip() for item in nzo_ids.split(",")]:
+            for nzo_id in nzo_ids:
                 if nzo_id in self.__nzo_table:
                     self.__nzo_table[nzo_id].script = script
                     logging.info("Set script=%s for job %s", script, self.__nzo_table[nzo_id].final_name)
                     result += 1
         return result
 
-    def change_cat(self, nzo_ids: str, cat: str) -> int:
+    def change_cat(self, nzo_ids: List[str], cat: str) -> int:
         result = 0
-        for nzo_id in [item.strip() for item in nzo_ids.split(",")]:
+        for nzo_id in nzo_ids:
             if nzo_id in self.__nzo_table:
                 nzo = self.__nzo_table[nzo_id]
                 nzo.cat, pp, nzo.script, prio = cat_to_opts(cat)
                 logging.info("Set cat=%s for job %s", cat, nzo.final_name)
                 nzo.set_pp(pp)
-                self.set_priority(nzo_id, prio)
+                self.set_priority([nzo_id], prio)
                 # Abort any ongoing unpacking if the category changed
                 nzo.abort_direct_unpacker()
                 result += 1
@@ -660,10 +660,10 @@
             return -1
 
     @NzbQueueLocker
-    def set_priority(self, nzo_ids: str, priority: int) -> int:
+    def set_priority(self, nzo_ids: List[str], priority: int) -> int:
         try:
             n = -1
-            for nzo_id in [item.strip() for item in nzo_ids.split(",")]:
+            for nzo_id in nzo_ids:
                 n = self.__set_priority(nzo_id, priority)
             return n
         except:
diff -Nru sabnzbdplus-4.2.3/sabnzbd/osxmenu.py sabnzbdplus-4.3.0~alpha1/sabnzbd/osxmenu.py
--- sabnzbdplus-4.2.3/sabnzbd/osxmenu.py	2024-03-11 07:44:42.601044200 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/osxmenu.py	2024-03-18 15:45:18.232689400 +0000
@@ -488,7 +488,7 @@
         elif mode == "history":
             if not self.history_db:
                 self.history_db = sabnzbd.database.HistoryDB()
-            self.history_db.remove_history()
+            self.history_db.remove_with_status(Status.COMPLETED)
 
     def pauseAction_(self, sender):
         minutes = int(sender.representedObject())
diff -Nru sabnzbdplus-4.2.3/sabnzbd/postproc.py sabnzbdplus-4.3.0~alpha1/sabnzbd/postproc.py
--- sabnzbdplus-4.2.3/sabnzbd/postproc.py	2024-03-11 07:44:42.587489100 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/postproc.py	2024-03-18 15:45:18.221820800 +0000
@@ -197,10 +197,11 @@
         self.slow_queue.put(None)
         self.fast_queue.put(None)
 
-    def cancel_pp(self, nzo_id: str) -> Optional[bool]:
-        """Change the status, so that the PP is canceled"""
+    def cancel_pp(self, nzo_ids: List[str]) -> Optional[bool]:
+        """Abort Direct Unpack and change the status, so that the PP is canceled"""
+        result = None
         for nzo in self.history_queue:
-            if nzo.nzo_id == nzo_id:
+            if nzo.nzo_id in nzo_ids:
                 nzo.abort_direct_unpacker()
                 if nzo.pp_active:
                     nzo.pp_active = False
@@ -210,8 +211,9 @@
                         logging.info("Killed external process %s", self.external_process.args[0])
                     except:
                         pass
-                return True
-        return None
+                result = True
+            return result
+        return result
 
     def empty(self) -> bool:
         """Return True if pp queue is empty"""
@@ -279,6 +281,15 @@
         # aren't on 24/7 and typically don't benefit from the daily scheduled call at midnight
         database.scheduled_history_purge()
 
+        # Check for Apprise notification script
+        # We don't have a much better place to do this, since there's no notifier-thread
+        # TODO: Remove in 4.4
+        if sabnzbd.cfg.nscript_script() == "sabnzbd-notify.py":
+            helpful_warning(
+                "NZB-Notify has been integrated into SABnzbd. You can now use the "
+                "Apprise section to configure the same notifications."
+            )
+
         # Start looping
         check_eoq = False
         while not self.__stop:
@@ -337,7 +348,7 @@
 
             if nzo.to_be_removed:
                 with database.HistoryDB() as history_db:
-                    history_db.remove_history(nzo.nzo_id)
+                    history_db.remove(nzo.nzo_id)
                 nzo.purge_data()
 
             # Processing done
diff -Nru sabnzbdplus-4.2.3/sabnzbd/scheduler.py sabnzbdplus-4.3.0~alpha1/sabnzbd/scheduler.py
--- sabnzbdplus-4.2.3/sabnzbd/scheduler.py	2024-03-11 07:44:42.600397800 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/scheduler.py	2024-03-18 15:45:18.232040400 +0000
@@ -212,15 +212,14 @@
             logging.info("Setting schedule for quota check daily at %s:%s", hour, minute)
             self.scheduler.add_daytime_task(action, "quota_reset", DAILY_RANGE, None, (hour, minute))
 
-        if sabnzbd.misc.int_conv(cfg.history_retention()) > 0:
-            logging.info("Setting schedule for midnight auto history-purge")
-            self.scheduler.add_daytime_task(
-                sabnzbd.database.scheduled_history_purge,
-                "midnight_history_purge",
-                DAILY_RANGE,
-                None,
-                (0, 0),
-            )
+        logging.info("Setting schedule for midnight auto history-purge")
+        self.scheduler.add_daytime_task(
+            sabnzbd.database.scheduled_history_purge,
+            "midnight_history_purge",
+            DAILY_RANGE,
+            None,
+            (0, 0),
+        )
 
         logging.info("Setting schedule for midnight BPS reset")
         self.scheduler.add_daytime_task(
diff -Nru sabnzbdplus-4.2.3/sabnzbd/skintext.py sabnzbdplus-4.3.0~alpha1/sabnzbd/skintext.py
--- sabnzbdplus-4.2.3/sabnzbd/skintext.py	2024-03-11 07:44:42.588979000 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/skintext.py	2024-03-18 15:45:18.222837400 +0000
@@ -104,6 +104,7 @@
     "parameters": TT("Parameters"),  #: Config: startup parameters of SABnzbd
     "pythonVersion": TT("Python Version"),
     "notAvailable": TT("Not available"),
+    "empty": TT("Empty"),
     "homePage": TT("Home page"),  #: Home page of the SABnzbd project
     "source": TT("Source"),  #: Where to find the SABnzbd sourcecode
     "or": TT("or"),
@@ -173,20 +174,24 @@
     "eoq-scripts": TT("Scripts"),  #: Queue page table, script selection menu
     "purgeQueue": TT("Purge Queue"),  #: Queue page button
     "purgeQueueConf": TT("Delete all items from the queue?"),  #: Confirmation popup
+    "confirm-delete": TT("Are you sure you want to remove these jobs?"),  #: Delete confirmation popup
     "purgeNZBs": TT("Purge NZBs"),  #: Queue page button
     "purgeNZBs-Files": TT("Purge NZBs & Delete Files"),  #: Queue page button
     "removeNZB": TT("Remove NZB"),  #: Queue page button
     "removeNZB-Files": TT("Remove NZB & Delete Files"),  #: Queue page button
+    "permanently-delete": TT("Permanently delete (skip archive)"),  #: Checkbox if job should be added to Archive
     "missingArt": TT("Missing articles"),  #: Caption for missing articles in Queue
     "quota-left": TT("Quota left"),  #: Remaining quota (displayed in Queue)
     "manual": TT("manual"),  #: Manual reset of quota
     "link-resetQuota": TT("Reset Quota now"),
     # History page
+    "archive": TT("Archive"),
     "purgeHist": TT("Purge History"),  #: History page button
     "hideDetails": TT("Hide details"),  #: Button/link hiding History job details
     "showDetails": TT("Show details"),  #: Button/link showing History job details
     "showFailedHis": TT("Show Failed"),  #: Button or link showing only failed History jobs. DON'T MAKE THIS VERY LONG!
     "showAllHis": TT("Show All"),  #: Button or link showing all History jobs
+    "showArchive": TT("Show Archive"),  #: Button showing all archived jobs
     "size": TT("Size"),  #: History table header
     "status": TT("Status"),  #: History table header
     "purgeFailed": TT("Purge Failed NZBs"),  #: Button to delete all failed jobs in History
@@ -310,13 +315,13 @@
         "List of file extensions that should be deleted after download.<br />For example: <b>nfo</b> or <b>nfo, sfv</b>"
     ),
     "opt-history_retention": TT("History Retention"),
-    "explain-history_retention": TT(
-        "Automatically delete completed jobs from History. Beware that Duplicate Detection and some external tools rely on History information."
-    ),
     "history_retention-all": TT("Keep all jobs"),
-    "history_retention-number": TT("Keep maximum number of completed jobs"),
-    "history_retention-days": TT("Keep completed jobs maximum number of days"),
-    "history_retention-none": TT("Do not keep any completed jobs"),
+    "history_retention-number-archive": TT("Move jobs to the archive if the history exceeds specified number of jobs"),
+    "history_retention-number-delete": TT("Delete jobs if the history exceeds specified number of jobs"),
+    "history_retention-days-archive": TT("Move jobs to the archive after specified number of days"),
+    "history_retention-days-delete": TT("Delete jobs after specified number of days"),
+    "history_retention-archive": TT("Move all completed jobs to archive"),
+    "history_retention-none": TT("Delete all completed jobs"),
     "history_retention-limit": TT("Jobs"),
     "button-saveChanges": TT("Save Changes"),
     "button-restoreDefaults": TT("Restore Defaults"),
@@ -423,9 +428,9 @@
     "nodupes-off": TT("Off"),  #: Three way switch for duplicates
     "nodupes-ignore": TT("Discard"),  #: Four way switch for duplicates
     "nodupes-pause": TT("Pause"),  #: Four way switch for duplicates
-    "nodupes-fail": TT("Fail job (move to History)"),  #: Four way switch for duplicates
     "nodupes-tag": TT("Tag job"),  #: Four way switch for duplicates
-    "abort": TT("Abort"),  #: Three way switch for encrypted posts
+    "fail-to-history": TT("Fail job (move to History)"),  #: Four way switch for duplicates
+    "abort": TT("Abort post-processing"),
     "opt-action_on_unwanted_extensions": TT("Action when unwanted extension detected"),
     "explain-action_on_unwanted_extensions": TT("Action when an unwanted extension is detected"),
     "opt-unwanted_extensions": TT("Unwanted extensions"),
@@ -671,6 +676,15 @@
     "explain-pushbullet_apikey": TT("Your personal Pushbullet API key (required)"),  #: Pushbullet settings
     "opt-pushbullet_device": TT("Device"),  #: Pushbullet settings
     "explain-pushbullet_device": TT("Device to which message should be sent"),  #: Pushbullet settings
+    "opt-apprise_enable": TT("Enable Apprise notifications"),  #: Apprise settings
+    "explain-apprise_enable": TT(
+        "Send notifications using Apprise to almost any notification service"
+    ),  #: Apprise settings
+    "opt-apprise_urls": TT("Default Apprise URLs"),  #: Apprise settings
+    "explain-apprise_urls": TT("Use a comma and/or space to identify more than one URL."),  #: Apprise settings
+    "explain-apprise_extra_urls": TT(
+        "Override the default URLs for specific notification types below, if desired."
+    ),  #: Apprise settings
     "section-NScript": TT("Notification Script"),  #: Header for Notification Script notification section
     "opt-nscript_enable": TT("Enable notification script"),  #: Notification Script settings
     "opt-nscript_script": TT("Script"),  #: Notification Script settings
diff -Nru sabnzbdplus-4.2.3/sabnzbd/utils/certgen.py sabnzbdplus-4.3.0~alpha1/sabnzbd/utils/certgen.py
--- sabnzbdplus-4.2.3/sabnzbd/utils/certgen.py	2024-03-11 07:44:42.603918000 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/utils/certgen.py	2024-03-18 15:45:18.235715000 +0000
@@ -30,7 +30,6 @@
                 encoding=serialization.Encoding.PEM,
                 format=serialization.PrivateFormat.TraditionalOpenSSL,
                 encryption_algorithm=serialization.NoEncryption(),
-                # encryption_algorithm=serialization.BestAvailableEncryption(b"passphrase")
             )
         )
 
diff -Nru sabnzbdplus-4.2.3/sabnzbd/utils/diskspeed.py sabnzbdplus-4.3.0~alpha1/sabnzbd/utils/diskspeed.py
--- sabnzbdplus-4.2.3/sabnzbd/utils/diskspeed.py	2024-03-11 07:44:42.603577000 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/utils/diskspeed.py	2024-03-18 15:45:18.235422100 +0000
@@ -2,7 +2,6 @@
 
 """ Measure writing speed of disk specified (or working directory if not specified)"""
 
-import time
 import os
 import sys
 import logging
@@ -48,7 +47,7 @@
         logging.debug("Failed to measure disk speed on %s", dirname)
         return 0.0
 
-    megabyte_per_second = total_written / total_time / 1024 / 1024
+    megabyte_per_second = round(total_written / total_time / 1024 / 1024, 1)
     logging.debug("Disk speed of %s = %.2f MB/s (in %.2f seconds)", dirname, megabyte_per_second, time.time() - start)
     return megabyte_per_second
 
diff -Nru sabnzbdplus-4.2.3/sabnzbd/utils/pathbrowser.py sabnzbdplus-4.3.0~alpha1/sabnzbd/utils/pathbrowser.py
--- sabnzbdplus-4.2.3/sabnzbd/utils/pathbrowser.py	2024-03-11 07:44:42.604213500 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/utils/pathbrowser.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,130 +0,0 @@
-# ------------------------------------------------------------------------------------------------
-# This file is an excerpt from Sick Beard's browser.py
-# Modified and improved to fit SABnzbd.
-#
-# Author: Nic Wolfe <nic@wolfeden.ca>
-# URL: http://code.google.com/p/sickbeard/
-#
-# Sick Beard is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Sick Beard is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Sick Beard. If not, see <http://www.gnu.org/licenses/>.
-
-import os
-import sabnzbd
-
-if os.name == "nt":
-    import win32api
-    import win32con
-    import win32file
-    from ctypes import windll
-
-    MASK = win32con.FILE_ATTRIBUTE_DIRECTORY | win32con.FILE_ATTRIBUTE_HIDDEN
-    TMASK = win32con.FILE_ATTRIBUTE_DIRECTORY
-    DRIVES = (2, 3, 4)
-    NT = True
-else:
-    NT = False
-
-_JUNKFOLDERS = (
-    "boot",
-    "bootmgr",
-    "cache",
-    "msocache",
-    "recovery",
-    "$recycle.bin",
-    "recycler",
-    "system volume information",
-    "temporary internet files",
-    "perflogs",  # windows specific
-    ".fseventd",
-    ".spotlight",
-    ".trashes",
-    ".vol",
-    "cachedmessages",
-    "caches",
-    "trash",  # osx specific
-)
-
-
-def get_win_drives():
-    """Return list of detected drives, adapted from:
-    http://stackoverflow.com/questions/827371/is-there-a-way-to-list-all-the-available-drive-letters-in-python/827490
-    """
-    assert NT
-    drives = []
-    bitmask = windll.kernel32.GetLogicalDrives()
-    for letter in "ABCDEFGHIJKLMNOPQRSTUVWXYZ":
-        if (bitmask & 1) and win32file.GetDriveType("%s:\\" % letter) in DRIVES:
-            drives.append(letter)
-        bitmask >>= 1
-    return drives
-
-
-def folders_at_path(path, include_parent=False, show_hidden=False):
-    """Returns a list of dictionaries with the folders contained at the given path
-    Give the empty string as the path to list the contents of the root path
-    under Unix this means "/", on Windows this will be a list of drive letters)
-    """
-    if path == "":
-        if NT:
-            entries = [{"name": letter + ":\\", "path": letter + ":\\"} for letter in get_win_drives()]
-            entries.insert(0, {"current_path": "Root"})
-            return entries
-        else:
-            path = "/"
-
-    # Walk up the tree until we find a valid path
-    path = sabnzbd.filesystem.real_path(sabnzbd.DIR_HOME, path)
-    while path and not os.path.isdir(path):
-        if path == os.path.dirname(path):
-            return folders_at_path("", include_parent)
-        else:
-            path = os.path.dirname(path)
-
-    # Fix up the path and find the parent
-    path = os.path.abspath(os.path.normpath(path))
-    parent_path = os.path.dirname(path)
-
-    # If we're at the root then the next step is the meta-node showing our drive letters
-    if path == parent_path and NT:
-        parent_path = ""
-
-    # List all files and folders
-    file_list = []
-    for filename in os.listdir(path):
-        fpath = os.path.join(path, filename)
-        try:
-            if NT:
-                # Remove hidden folders
-                list_folder = (win32api.GetFileAttributes(fpath) & MASK) == TMASK
-            elif not show_hidden:
-                list_folder = not filename.startswith(".")
-            else:
-                list_folder = True
-        except:
-            list_folder = False
-
-        # Remove junk and sort results
-        if list_folder and os.path.isdir(fpath) and filename.lower() not in _JUNKFOLDERS:
-            file_list.append(
-                {"name": sabnzbd.filesystem.clip_path(filename), "path": sabnzbd.filesystem.clip_path(fpath)}
-            )
-
-    # Sort results
-    file_list = sorted(file_list, key=lambda x: os.path.basename(x["name"]).lower())
-
-    # Add current path
-    file_list.insert(0, {"current_path": sabnzbd.filesystem.clip_path(path)})
-    if include_parent and parent_path != path:
-        file_list.insert(1, {"name": "..", "path": sabnzbd.filesystem.clip_path(parent_path)})
-
-    return file_list
diff -Nru sabnzbdplus-4.2.3/sabnzbd/utils/servertests.py sabnzbdplus-4.3.0~alpha1/sabnzbd/utils/servertests.py
--- sabnzbdplus-4.2.3/sabnzbd/utils/servertests.py	2024-03-11 07:44:42.604844800 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/utils/servertests.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,141 +0,0 @@
-#!/usr/bin/python3 -OO
-# Copyright 2007-2024 by The SABnzbd-Team (sabnzbd.org)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-"""
-sabnzbd.utils.servertests - Debugging server connections. Currently only NNTP server tests are done.
-"""
-
-import socket
-
-from sabnzbd.constants import DEF_TEST_TIMEOUT
-from sabnzbd.newswrapper import NewsWrapper, NNTPPermanentError
-from sabnzbd.downloader import Server, clues_login, clues_too_many
-from sabnzbd.config import get_servers
-from sabnzbd.misc import int_conv, match_str
-
-
-def test_nntp_server_dict(kwargs):
-    """Will connect (blocking) to the NNTP server and report back any errors"""
-    host = kwargs.get("host", "").strip()
-    port = int_conv(kwargs.get("port", 0))
-    username = kwargs.get("username", "").strip()
-    password = kwargs.get("password", "").strip()
-    server = kwargs.get("server", "").strip()
-    connections = int_conv(kwargs.get("connections", 0))
-    timeout = int_conv(kwargs.get("timeout", DEF_TEST_TIMEOUT))
-    ssl = int_conv(kwargs.get("ssl", 0))
-    ssl_verify = int_conv(kwargs.get("ssl_verify", 1))
-    ssl_ciphers = kwargs.get("ssl_ciphers", "").strip()
-
-    if not host:
-        return False, T("The hostname is not set.")
-
-    if not connections:
-        return False, T("There are no connections set. Please set at least one connection.")
-
-    if not port:
-        if ssl:
-            port = 563
-        else:
-            port = 119
-
-    if not timeout:
-        # Lower value during new server testing
-        timeout = DEF_TEST_TIMEOUT
-
-    if "*" in password and not password.strip("*"):
-        # If the password is masked, try retrieving it from the config
-        srv = get_servers().get(server)
-        if srv:
-            password = srv.password()
-        else:
-            return False, T("Password masked in ******, please re-enter")
-
-    try:
-        s = Server(
-            server_id=-1,
-            displayname="",
-            host=host,
-            port=port,
-            timeout=timeout,
-            threads=0,
-            priority=0,
-            use_ssl=ssl,
-            ssl_verify=ssl_verify,
-            ssl_ciphers=ssl_ciphers,
-            username=username,
-            password=password,
-        )
-    except:
-        return False, T("Invalid server details")
-
-    try:
-        s.request_addrinfo_blocking()
-        nw = NewsWrapper(server=s, thrdnum=-1, block=True)
-        nw.init_connect()
-        while not nw.connected:
-            nw.recv_chunk()
-            nw.finish_connect(nw.status_code)
-
-    except socket.timeout:
-        if port != 119 and not ssl:
-            return False, T("Timed out: Try enabling SSL or connecting on a different port.")
-        else:
-            return False, T("Timed out")
-
-    except socket.error as err:
-        # Trying SSL on non-SSL port?
-        if match_str(str(err), ("unknown protocol", "wrong version number")):
-            return False, T("Unknown SSL protocol: Try disabling SSL or connecting on a different port.")
-        return False, str(err)
-
-    except NNTPPermanentError:
-        # Handled by the code below
-        pass
-
-    except Exception as err:
-        return False, str(err)
-
-    if not username or not password:
-        nw.nntp.sock.sendall(b"ARTICLE <test@home>\r\n")
-        try:
-            nw.reset_data_buffer()
-            nw.recv_chunk()
-        except Exception as err:
-            # Some internal error, not always safe to close connection
-            return False, str(err)
-
-    # Parse result
-    return_status = ()
-    if nw.status_code:
-        if nw.status_code == 480:
-            return_status = (False, T("Server requires username and password."))
-        elif nw.status_code < 300 or nw.status_code in (411, 423, 430):
-            # If no username/password set and we requested fake-article, it will return 430 Not Found
-            return_status = (True, T("Connection Successful!"))
-        elif nw.status_code == 502 or clues_login(nw.nntp_msg):
-            return_status = (False, T("Authentication failed, check username/password."))
-        elif clues_too_many(nw.nntp_msg):
-            return_status = (False, T("Too many connections, please pause downloading or try again later"))
-
-    # Fallback in case no data was received or unknown status
-    if not return_status:
-        return_status = (False, T("Could not determine connection result (%s)") % nw.nntp_msg)
-
-    # Close the connection and return result
-    nw.hard_reset()
-    return return_status
diff -Nru sabnzbdplus-4.2.3/sabnzbd/version.py sabnzbdplus-4.3.0~alpha1/sabnzbd/version.py
--- sabnzbdplus-4.2.3/sabnzbd/version.py	2024-03-11 07:44:42.591385600 +0000
+++ sabnzbdplus-4.3.0~alpha1/sabnzbd/version.py	2024-03-18 15:45:18.224918600 +0000
@@ -6,5 +6,5 @@
 # You MUST use double quotes (so " and not ')
 # Do not forget to update the appdata file for every major release!
 
-__version__ = "4.2.3"
-__baseline__ = "e7e06dea419a03bfe179af64b7a69398f652a7b9"
+__version__ = "4.3.0Alpha1"
+__baseline__ = "304cf5eda0dbd9864efdc31bd82041361e975b30"
diff -Nru sabnzbdplus-4.2.3/tests/data/tavern/api_get_files_format.yaml sabnzbdplus-4.3.0~alpha1/tests/data/tavern/api_get_files_format.yaml
--- sabnzbdplus-4.2.3/tests/data/tavern/api_get_files_format.yaml	2024-03-11 07:43:37.852097000 +0000
+++ sabnzbdplus-4.3.0~alpha1/tests/data/tavern/api_get_files_format.yaml	2024-03-18 15:44:21.964192400 +0000
@@ -12,7 +12,6 @@
       params:
         mode: get_files
         apikey: "{SAB_APIKEY}"
-        output: json
         value: "{nzo_id}"
     response:
       status_code: 200
@@ -31,39 +30,6 @@
           nzf_id: !re_match "SABnzbd_nzf_.*"
           status: !re_match "(finished|active|queued)"
 
-
----
-test_name: Check get_files format (text output)
-
-strict:
-  - json:on
-
-stages:
-  - name: get_files format (text)
-    request:
-      url: "http://{SAB_HOST}:{SAB_PORT}/sabnzbd/api"
-      method: GET
-      params:
-        mode: get_files
-        apikey: "{SAB_APIKEY}"
-        output: text
-        value: "{nzo_id}"
-    response:
-      status_code: 200
-      headers:
-        content-type: !re_match "text/plain"
-        content-type: !re_search "charset=(UTF|utf)-8"
-        pragma: "no-cache"
-        access-control-allow-origin: "*"
-      verify_response_with:
-        function: tavern.helpers:validate_regex
-        extra_kwargs:
-          # Verify response parameters with a regex using positive
-          # looksaheads, so parameters match regardless of their order
-          # of appearance in the text output.
-          expression: "^\\[{{(?=.*'filename': )(?=.*'mbleft': )(?=.*'mb': )(?=.*'bytes': )(?=.*'age': )(?=.*'nzf_id': 'SABnzbd_nzf_.*')(?=.*'status': '(finished|active|queued)').*}}.*\\]$"
-
-
 ---
 test_name: Check get_files format (xml output)
 
diff -Nru sabnzbdplus-4.2.3/tests/data/tavern/api_history_empty.yaml sabnzbdplus-4.3.0~alpha1/tests/data/tavern/api_history_empty.yaml
--- sabnzbdplus-4.2.3/tests/data/tavern/api_history_empty.yaml	2024-03-11 07:43:37.852342000 +0000
+++ sabnzbdplus-4.3.0~alpha1/tests/data/tavern/api_history_empty.yaml	2024-03-18 15:44:21.964408200 +0000
@@ -12,7 +12,6 @@
       params:
         mode: history
         apikey: "{SAB_APIKEY}"
-        output: json
     response:
       status_code: 200
       headers:
@@ -33,36 +32,6 @@
           last_history_update: !anyint
           version: "{SAB_VERSION}"
 
-
----
-test_name: Check empty history format (text output)
-
-stages:
-  - name: history format empty
-    request:
-      url: http://{SAB_HOST}:{SAB_PORT}/sabnzbd/api
-      method: GET
-      params:
-        mode: history
-        apikey: "{SAB_APIKEY}"
-        output: text
-    response:
-      status_code: 200
-      headers:
-        content-type: !re_match "text/plain"
-        content-type: !re_search "charset=(UTF|utf)-8"
-        pragma: "no-cache"
-        access-control-allow-origin: "*"
-        content-length: !re_match "[0-9]+"
-      verify_response_with:
-        function: tavern.helpers:validate_regex
-        extra_kwargs:
-          # Verify response with a regex using positive looksaheads so
-          # parameters match regardless of their order of appearance
-          expression: "^{{(?=.*'noofslots': 0)(?=.*'ppslots': 0)(?=.*'last_history_update': [0-9]+)(?=.*'total_size': '[0-9][0-9.]*.?(\ [A-Z])?')(?=.*'month_size': '[0-9][0-9.]*.?(\ [A-Z])?')(?=.*'week_size': '[0-9][0-9.]*.?(\ [A-Z])?')(?=.*'day_size': '[0-9][0-9.]*.?(\ [A-Z])?')(?=.*'slots': \\[\\])(?=.*'version': '{SAB_VERSION}').*}}$"
-          # minor api bug: text output appends a space to integer only values in *_size, e.g. 'day_size': '0 '
-
-
 ---
 test_name: Check empty history format (xml output)
 
diff -Nru sabnzbdplus-4.2.3/tests/data/tavern/api_history_format.yaml sabnzbdplus-4.3.0~alpha1/tests/data/tavern/api_history_format.yaml
--- sabnzbdplus-4.2.3/tests/data/tavern/api_history_format.yaml	2024-03-11 07:43:37.852538300 +0000
+++ sabnzbdplus-4.3.0~alpha1/tests/data/tavern/api_history_format.yaml	2024-03-18 15:44:21.964764800 +0000
@@ -12,7 +12,6 @@
       params:
         mode: history
         apikey: "{SAB_APIKEY}"
-        output: json
         limit: 1
     response:
       status_code: 200
@@ -59,43 +58,12 @@
               size: !re_match "[0-9][0-9.]*\ [A-Z]"
               loaded: !anybool
               retry: !anyint
+              archive: !anybool
           noofslots: !anyint
           ppslots: !anyint
           last_history_update: !anyint
           version: !anystr
 
-
----
-test_name: Check general history format (text output)
-
-stages:
-  - name: history format single entry
-    request:
-      url: "http://{SAB_HOST}:{SAB_PORT}/sabnzbd/api"
-      method: GET
-      params:
-        mode: history
-        apikey: "{SAB_APIKEY}"
-        output: text
-        limit: 1
-    response:
-      status_code: 200
-      headers:
-        content-type: !re_match "text/plain"
-        content-type: !re_search "charset=(UTF|utf)-8"
-        pragma: "no-cache"
-        access-control-allow-origin: "*"
-        content-length: !re_match "[0-9]+"
-      verify_response_with:
-        function: tavern.helpers:validate_regex
-        extra_kwargs:
-          # Verify response parameters with a regex using positive looksaheads,
-          # so parameters match regardless of their order of appearance. Note
-          # that the content of 'slots' is checked in a separate expression.
-          expression: "^{{(?=.*'version': '{SAB_VERSION}')(?=.*'noofslots': [0-9]+)(?=.*'ppslots': [0-9]+)(?=.*'last_history_update': '?[0-9]+'?)(?=.*'total_size': '[0-9][0-9.]*.?(\ [A-Z])?')(?=.*'month_size': '[0-9][0-9.]*.?(\ [A-Z])?')(?=.*'week_size': '[0-9][0-9.]*.?(\ [A-Z])?')(?=.*'day_size': '[0-9][0-9.]*.?(\ [A-Z])?')(?=.*'slots': .+).*}}$"
-          expression: ".*'slots': \\[{{(?=.*'completed': [0-9]+)(?=.*'name': '.+')(?=.*'nzb_name': '.+')(?=.*'category': '.+')(?=.*'pp': '.?')(?=.*'script': '.+')(?=.*'report': '.+')(?=.*'url': '.+')(?=.*'status': '.+')(?=.*'nzo_id': 'SAB.+')(?=.*'storage': '.+')(?=.*'path': '.+')(?=.*'script_line': '.*')(?=.*'download_time': [0-9]+)(?=.*'postproc_time': [0-9]*)(?=.*'stage_log': \\[.*\\])(?=.*'downloaded': [0-9]+)(?=.*'completeness': None)(?=.*'fail_message': '.*')(?=.*'url_info': '.*')(?=.*'bytes': [0-9]+)(?=.*'meta': None)(?=.*'series': '?.*'?)(?=.*'duplicate_key': '?.*'?)(?=.*'md5sum': '[0-9a-fA-F]+')(?=.*'password': '.*')(?=.*'action_line': '.*')(?=.*'size': '[0-9].*')(?=.*'loaded': (True|False))(?=.*'retry': [0-9]+).*}}\\].*"
-
-
 ---
 test_name: Check general history format (xml output)
 
@@ -158,6 +126,7 @@
             <size>!anystr</size>
             <loaded>!anybool</loaded>
             <retry>!anyint</retry>
+            <archive>!anybool</archive>
             </slot>
             </slots>
             <noofslots>!anyint</noofslots>
@@ -181,7 +150,6 @@
       params:
         mode: history
         apikey: "{SAB_APIKEY}"
-        output: json
     response:
       status_code: 200
       headers:
diff -Nru sabnzbdplus-4.2.3/tests/data/tavern/api_queue_empty.yaml sabnzbdplus-4.3.0~alpha1/tests/data/tavern/api_queue_empty.yaml
--- sabnzbdplus-4.2.3/tests/data/tavern/api_queue_empty.yaml	2024-03-11 07:43:37.852743400 +0000
+++ sabnzbdplus-4.3.0~alpha1/tests/data/tavern/api_queue_empty.yaml	2024-03-18 15:44:21.964940800 +0000
@@ -12,7 +12,6 @@
       params:
         mode: queue
         apikey: "{SAB_APIKEY}"
-        output: json
     response:
       status_code: 200
       headers:
@@ -56,36 +55,6 @@
           finish: 0
           slots: []
 
-
----
-test_name: Check empty queue format (text output)
-
-stages:
-  - name: queue format empty
-    request:
-      url: "http://{SAB_HOST}:{SAB_PORT}/sabnzbd/api"
-      method: GET
-      params:
-        mode: queue
-        apikey: "{SAB_APIKEY}"
-        output: text
-    response:
-      status_code: 200
-      headers:
-        content-type: !re_match "text/plain"
-        content-type: !re_search "charset=(UTF|utf)-8"
-        pragma: "no-cache"
-        access-control-allow-origin: "*"
-        content-length: !re_match "[0-9]+"
-      verify_response_with:
-        function: tavern.helpers:validate_regex
-        extra_kwargs:
-          # Verify only a bunch of key response parameters with a regex using
-          # positive looksaheads, so parameters match regardless of their order
-          # of appearance in the text output
-          expression: "^{{(?=.*'version': '{SAB_VERSION}')(?=.*'noofslots_total': 0)(?=.*'status': 'Idle')(?=.*'timeleft': '0:00:00')(?=.*'noofslots': 0)(?=.*'slots': \\[\\]).*}}$"
-
-
 ---
 test_name: Check empty queue format (xml output)
 
diff -Nru sabnzbdplus-4.2.3/tests/data/tavern/api_queue_format.yaml sabnzbdplus-4.3.0~alpha1/tests/data/tavern/api_queue_format.yaml
--- sabnzbdplus-4.2.3/tests/data/tavern/api_queue_format.yaml	2024-03-11 07:43:37.853000000 +0000
+++ sabnzbdplus-4.3.0~alpha1/tests/data/tavern/api_queue_format.yaml	2024-03-18 15:44:21.965271700 +0000
@@ -12,7 +12,6 @@
       params:
         mode: queue
         apikey: "{SAB_APIKEY}"
-        output: json
         limit: 1
     response:
       status_code: 200
@@ -77,36 +76,6 @@
             avg_age: "!anystr"
 
 ---
-test_name: Check general queue format (text output)
-
-stages:
-  - name: queue format single entry
-    request:
-      url: "http://{SAB_HOST}:{SAB_PORT}/sabnzbd/api"
-      method: GET
-      params:
-        mode: queue
-        apikey: "{SAB_APIKEY}"
-        output: text
-        limit: 1
-    response:
-      status_code: 200
-      headers:
-        content-type: !re_match "text/plain"
-        content-type: !re_search "charset=(UTF|utf)-8"
-        pragma: "no-cache"
-        access-control-allow-origin: "*"
-        content-length: !re_match "[0-9]+"
-      verify_response_with:
-        function: tavern.helpers:validate_regex
-        extra_kwargs:
-          # Verify only a bunch of key response parameters with a regex using
-          # positive looksaheads, so parameters match regardless of their order
-          # of appearance in the text output
-          expression: "^{{(?=.*'version': '{SAB_VERSION}')(?=.*'noofslots_total':)(?=.*'status':)(?=.*'timeleft': '0:00:00')(?=.*'noofslots':)(?=.*'slots': \\[.+\\]).*}}$"
-
-
----
 test_name: Check general queue format (xml output)
 
 stages:
diff -Nru sabnzbdplus-4.2.3/tests/data/tavern/api_server_stats.yaml sabnzbdplus-4.3.0~alpha1/tests/data/tavern/api_server_stats.yaml
--- sabnzbdplus-4.2.3/tests/data/tavern/api_server_stats.yaml	2024-03-11 07:43:37.853196100 +0000
+++ sabnzbdplus-4.3.0~alpha1/tests/data/tavern/api_server_stats.yaml	2024-03-18 15:44:21.965708300 +0000
@@ -12,7 +12,6 @@
       params:
         mode: server_stats
         apikey: "{SAB_APIKEY}"
-        output: json
     response:
       status_code: 200
       headers:
@@ -30,27 +29,6 @@
             day: !anyint
             daily: !anydict
 
-  - name: server_stats (text output)
-    request:
-      url: "http://{SAB_HOST}:{SAB_PORT}/sabnzbd/api"
-      method: GET
-      params:
-        mode: server_stats
-        apikey: "{SAB_APIKEY}"
-        output: text
-    response:
-      headers:
-        content-type: !re_match "text/plain"
-        content-type: !re_search "charset=(UTF|utf)-8"
-        pragma: "no-cache"
-        access-control-allow-origin: "*"
-        content-length: !re_match "[0-9]+"
-      status_code: 200
-      verify_response_with:
-        function: tavern.helpers:validate_regex
-        extra_kwargs:
-          expression: "{{(?=.*'total': [0-9]+)(?=.*'month': [0-9]+)(?=.*'week': [0-9]+)(?=.*'day': [0-9]+)(?=.*'servers': .*).*}}"
-
   - name: server_stats (xml output)
     request:
       url: "http://{SAB_HOST}:{SAB_PORT}/sabnzbd/api"
diff -Nru sabnzbdplus-4.2.3/tests/data/tavern/api_version.yaml sabnzbdplus-4.3.0~alpha1/tests/data/tavern/api_version.yaml
--- sabnzbdplus-4.2.3/tests/data/tavern/api_version.yaml	2024-03-11 07:43:37.853420300 +0000
+++ sabnzbdplus-4.3.0~alpha1/tests/data/tavern/api_version.yaml	2024-03-18 15:44:21.965903300 +0000
@@ -12,7 +12,6 @@
       params:
         mode: version
         apikey: "{SAB_APIKEY}"
-        output: json
     response:
       status_code: 200
       headers:
@@ -21,24 +20,6 @@
       json:
         version: "{SAB_VERSION}"
 
-  - name: version (text output)
-    request:
-      url: http://{SAB_HOST}:{SAB_PORT}/sabnzbd/api
-      method: GET
-      params:
-        mode: version
-        apikey: "{SAB_APIKEY}"
-        output: text
-    response:
-      status_code: 200
-      headers:
-        content-type: !re_match "text/plain"
-        content-type: !re_search "charset=(UTF|utf)-8"
-      verify_response_with:
-        function: tavern.helpers:validate_regex
-        extra_kwargs:
-          expression: "{SAB_VERSION}"
-
   - name: version (xml output)
     request:
       url: http://{SAB_HOST}:{SAB_PORT}/sabnzbd/api
diff -Nru sabnzbdplus-4.2.3/tests/requirements.txt sabnzbdplus-4.3.0~alpha1/tests/requirements.txt
--- sabnzbdplus-4.2.3/tests/requirements.txt	2024-03-11 07:44:42.574911400 +0000
+++ sabnzbdplus-4.3.0~alpha1/tests/requirements.txt	2024-03-18 15:45:18.212250700 +0000
@@ -1,5 +1,6 @@
 # Testing requirements
 pytest==7.4.4
+setuptools
 selenium
 requests
 pyfakefs
@@ -8,7 +9,8 @@
 pytest-httpserver
 flaky
 xmltodict
-tavern>=2.0.0
+tavern
+flask
 tavalidate
 importlib_metadata
 lxml
diff -Nru sabnzbdplus-4.2.3/tests/test_api_and_interface.py sabnzbdplus-4.3.0~alpha1/tests/test_api_and_interface.py
--- sabnzbdplus-4.2.3/tests/test_api_and_interface.py	2024-03-11 07:44:42.581802100 +0000
+++ sabnzbdplus-4.3.0~alpha1/tests/test_api_and_interface.py	2024-03-18 15:45:18.217139500 +0000
@@ -37,18 +37,13 @@
             api.api_handler("")
 
     def test_mode_invalid(self):
-        expected_error = "error: not implemented"
-        assert api.api_handler({"mode": "invalid"}).strip() == expected_error
-        with pytest.raises(IndexError):
-            assert api.api_handler({"mode": []}).strip() == expected_error
-            assert api.api_handler({"mode": ""}).strip() == expected_error
-            assert api.api_handler({"mode": None}).strip() == expected_error
+        assert "not implemented" in str(api.api_handler({"mode": "invalid"}))
 
     def test_version(self):
-        assert api.api_handler({"mode": "version"}).strip() == sabnzbd.__version__
+        assert sabnzbd.__version__ in str(api.api_handler({"mode": "version"}))
 
     def test_auth(self):
-        assert api.api_handler({"mode": "auth"}).strip() == "apikey"
+        assert "apikey" in str(api.api_handler({"mode": "auth"}))
 
 
 def set_remote_host_or_ip(hostname: str = "localhost", remote_ip: str = "127.0.0.1"):
@@ -62,11 +57,16 @@
 
     main_page = sabnzbd.interface.MainPage()
 
+    def api_wrapper(self, *args, **kwargs):
+        """Wrapper to convert bytes to str"""
+        if api_response := self.main_page.api(*args, **kwargs):
+            return str(api_response)
+
     def check_full_access(self, redirect_match: str = r".*wizard.*"):
         """Basic test if we have full access to API and interface"""
-        assert sabnzbd.__version__ in self.main_page.api(mode="version")
+        assert sabnzbd.__version__ in self.api_wrapper(mode="version")
         # Passed authentication
-        assert api._MSG_NOT_IMPLEMENTED in self.main_page.api(apikey=sabnzbd.cfg.api_key())
+        assert api._MSG_NOT_IMPLEMENTED in self.api_wrapper(apikey=sabnzbd.cfg.api_key())
         # Raises a redirect to the wizard
         with pytest.raises(cherrypy._cperror.HTTPRedirect, match=redirect_match):
             self.main_page.index()
@@ -78,29 +78,29 @@
     def test_api_no_or_wrong_api_key(self):
         set_remote_host_or_ip()
         # Get blocked
-        assert interface._MSG_APIKEY_REQUIRED in self.main_page.api()
-        assert interface._MSG_APIKEY_REQUIRED in self.main_page.api(mode="queue")
+        assert interface._MSG_APIKEY_REQUIRED in self.api_wrapper()
+        assert interface._MSG_APIKEY_REQUIRED in self.api_wrapper(mode="queue")
         # Allowed to access "auth" and "version" without key
-        assert "apikey" in self.main_page.api(mode="auth")
-        assert sabnzbd.__version__ in self.main_page.api(mode="version")
+        assert "apikey" in self.api_wrapper(mode="auth")
+        assert sabnzbd.__version__ in self.api_wrapper(mode="version")
         # Blocked when you do something wrong
-        assert interface._MSG_APIKEY_INCORRECT in self.main_page.api(mode="queue", apikey="wrong")
+        assert interface._MSG_APIKEY_INCORRECT in self.api_wrapper(mode="queue", apikey="wrong")
 
     def test_api_nzb_key(self):
         set_remote_host_or_ip()
         # It should only access the nzb-functions, nothing else
-        assert api._MSG_NO_VALUE in self.main_page.api(mode="addfile", apikey=sabnzbd.cfg.nzb_key())
-        assert interface._MSG_APIKEY_INCORRECT in self.main_page.api(mode="set_config", apikey=sabnzbd.cfg.nzb_key())
+        assert api._MSG_NO_VALUE in self.api_wrapper(mode="addfile", apikey=sabnzbd.cfg.nzb_key())
+        assert interface._MSG_APIKEY_INCORRECT in self.api_wrapper(mode="set_config", apikey=sabnzbd.cfg.nzb_key())
         assert interface._MSG_APIKEY_INCORRECT in self.main_page.shutdown(apikey=sabnzbd.cfg.nzb_key())
 
     def test_check_hostname_basic(self):
         # Block bad host
         set_remote_host_or_ip(hostname="not_me")
-        assert interface._MSG_ACCESS_DENIED_HOSTNAME in self.main_page.api()
+        assert interface._MSG_ACCESS_DENIED_HOSTNAME in self.api_wrapper()
         assert interface._MSG_ACCESS_DENIED_HOSTNAME in self.main_page.index()
         # Block empty value
         set_remote_host_or_ip(hostname="")
-        assert interface._MSG_ACCESS_DENIED_HOSTNAME in self.main_page.api()
+        assert interface._MSG_ACCESS_DENIED_HOSTNAME in self.api_wrapper()
         assert interface._MSG_ACCESS_DENIED_HOSTNAME in self.main_page.index()
 
         # Fine if ip-address
@@ -145,21 +145,21 @@
         """Each should allow all previous ones and the current one"""
         # Level 1: nzb
         if inet_exposure >= 1:
-            assert api._MSG_NO_VALUE in self.main_page.api(mode="addfile", apikey=sabnzbd.cfg.nzb_key())
-            assert api._MSG_NO_VALUE in self.main_page.api(mode="addfile", apikey=sabnzbd.cfg.api_key())
+            assert api._MSG_NO_VALUE in self.api_wrapper(mode="addfile", apikey=sabnzbd.cfg.nzb_key())
+            assert api._MSG_NO_VALUE in self.api_wrapper(mode="addfile", apikey=sabnzbd.cfg.api_key())
 
         # Level 2: basic API
         if inet_exposure >= 2:
-            assert api._MSG_NO_VALUE in self.main_page.api(mode="get_files", apikey=sabnzbd.cfg.api_key())
-            assert api._MSG_NO_VALUE in self.main_page.api(mode="change_script", apikey=sabnzbd.cfg.api_key())
+            assert api._MSG_NO_VALUE in self.api_wrapper(mode="get_files", apikey=sabnzbd.cfg.api_key())
+            assert api._MSG_NO_VALUE in self.api_wrapper(mode="change_script", apikey=sabnzbd.cfg.api_key())
             # Sub-function
-            assert "status" in self.main_page.api(mode="queue", name="resume", apikey=sabnzbd.cfg.api_key())
+            assert "status" in self.api_wrapper(mode="queue", name="resume", apikey=sabnzbd.cfg.api_key())
 
         # Level 3: full API
         if inet_exposure >= 3:
-            assert "misc" in self.main_page.api(mode="get_config", apikey=sabnzbd.cfg.api_key())
+            assert "misc" in self.api_wrapper(mode="get_config", apikey=sabnzbd.cfg.api_key())
             # Sub-function
-            assert "The hostname is not set" in self.main_page.api(
+            assert "The hostname is not set" in self.api_wrapper(
                 mode="config", name="test_server", apikey=sabnzbd.cfg.api_key()
             )
 
@@ -176,23 +176,23 @@
 
         # Level 2: basic API
         if inet_exposure <= 2:
-            assert interface._MSG_ACCESS_DENIED in self.main_page.api(mode="get_config", apikey=sabnzbd.cfg.api_key())
-            assert interface._MSG_ACCESS_DENIED in self.main_page.api(
+            assert interface._MSG_ACCESS_DENIED in self.api_wrapper(mode="get_config", apikey=sabnzbd.cfg.api_key())
+            assert interface._MSG_ACCESS_DENIED in self.api_wrapper(
                 mode="config", name="set_nzbkey", apikey=sabnzbd.cfg.api_key()
             )
         # Level 1: nzb
         if inet_exposure <= 1:
-            assert interface._MSG_ACCESS_DENIED in self.main_page.api(mode="get_scripts", apikey=sabnzbd.cfg.api_key())
-            assert interface._MSG_ACCESS_DENIED in self.main_page.api(
+            assert interface._MSG_ACCESS_DENIED in self.api_wrapper(mode="get_scripts", apikey=sabnzbd.cfg.api_key())
+            assert interface._MSG_ACCESS_DENIED in self.api_wrapper(
                 mode="queue", name="resume", apikey=sabnzbd.cfg.api_key()
             )
 
         # Level 0: nothing, already checked above, but just to be sure
         if inet_exposure <= 0:
-            assert interface._MSG_ACCESS_DENIED in self.main_page.api(mode="addfile", apikey=sabnzbd.cfg.api_key())
+            assert interface._MSG_ACCESS_DENIED in self.api_wrapper(mode="addfile", apikey=sabnzbd.cfg.api_key())
             # Check with or without API-key
-            assert interface._MSG_ACCESS_DENIED in self.main_page.api(mode="auth", apikey=sabnzbd.cfg.api_key())
-            assert interface._MSG_ACCESS_DENIED in self.main_page.api(mode="auth")
+            assert interface._MSG_ACCESS_DENIED in self.api_wrapper(mode="auth", apikey=sabnzbd.cfg.api_key())
+            assert interface._MSG_ACCESS_DENIED in self.api_wrapper(mode="auth")
 
     def test_inet_exposure(self):
         # Run all tests as external user
@@ -222,10 +222,10 @@
     def test_no_text_warnings(self):
         assert self.main_page.index() is None
         assert cherrypy.response.status == 403
-        assert self.main_page.api(mode="queue") is None
+        assert self.api_wrapper(mode="queue") is None
         assert cherrypy.response.status == 403
         set_remote_host_or_ip(hostname="not_me")
-        assert self.main_page.api() is None
+        assert self.api_wrapper() is None
         assert cherrypy.response.status == 403
 
 
diff -Nru sabnzbdplus-4.2.3/tests/test_functional_api.py sabnzbdplus-4.3.0~alpha1/tests/test_functional_api.py
--- sabnzbdplus-4.2.3/tests/test_functional_api.py	2024-03-11 07:44:42.580069300 +0000
+++ sabnzbdplus-4.3.0~alpha1/tests/test_functional_api.py	2024-03-18 15:45:18.215863700 +0000
@@ -46,12 +46,6 @@
         extra.update(extra_args)
         return get_api_result(mode=mode, host=SAB_HOST, port=SAB_PORT, extra_arguments=extra)
 
-    def _get_api_text(self, mode, extra_args={}):
-        """Wrapper for API calls with text output"""
-        extra = {"output": "text", "apikey": SAB_APIKEY}
-        extra.update(extra_args)
-        return get_api_result(mode=mode, host=SAB_HOST, port=SAB_PORT, extra_arguments=extra)
-
     def _get_api_xml(self, mode, extra_args={}):
         """Wrapper for API calls with xml output"""
         extra = {"output": "xml", "apikey": SAB_APIKEY}
@@ -199,9 +193,6 @@
     def test_api_version_json(self):
         assert self._get_api_json("version")["version"] == sabnzbd.__version__
 
-    def test_api_version_text(self):
-        assert self._get_api_text("version").rstrip() == sabnzbd.__version__
-
     def test_api_version_xml(self):
         assert self._get_api_xml("version")["version"] == sabnzbd.__version__
 
@@ -319,7 +310,7 @@
     def test_api_get_clear_warnings(self):
         # Trigger warnings by sending requests with a truncated apikey
         for _ in range(0, 2):
-            assert interface._MSG_APIKEY_INCORRECT in self._get_api_text(
+            assert interface._MSG_APIKEY_INCORRECT in self._get_api_json(
                 "shutdown", extra_args={"apikey": SAB_APIKEY[:-1]}
             )
 
@@ -345,7 +336,7 @@
     def test_api_pause_resume_pp(self):  # TODO include this in the queue output, like the other pause states?
         # Very basic test only, pp pause state cannot be verified for now
         assert self._get_api_json("pause_pp")["status"] is True
-        assert self._get_api_text("resume_pp").startswith("ok")
+        assert self._get_api_json("resume_pp")["status"] is True
 
     @pytest.mark.parametrize("set_watched_dir", [False, True])
     def test_api_watched_now(self, set_watched_dir):
@@ -376,10 +367,6 @@
             )
 
         # Reset the quota and verify the response for all output types
-        text = self._get_api_text("reset_quota")
-        assert len(text) > 0  # Test for issue #1161
-        assert text.strip() == "ok"
-
         xml = self._get_api_xml("reset_quota")
         assert len(xml) > 0  # Test for issue #1161
         assert xml["result"]["status"] == "True"
diff -Nru sabnzbdplus-4.2.3/tests/test_functional_misc.py sabnzbdplus-4.3.0~alpha1/tests/test_functional_misc.py
--- sabnzbdplus-4.2.3/tests/test_functional_misc.py	2024-03-11 07:44:42.580724000 +0000
+++ sabnzbdplus-4.3.0~alpha1/tests/test_functional_misc.py	2024-03-18 15:45:18.216246600 +0000
@@ -32,7 +32,7 @@
     def test_showlog(self):
         """Test the output of the filtered-log button"""
         # Basic URL-fetching, easier than Selenium file download
-        log_result = get_api_result("showlog", extra_arguments={"output": "text"})
+        log_result = get_api_result("showlog")
 
         # Make sure it has basic log stuff
         assert "The log" in log_result
diff -Nru sabnzbdplus-4.2.3/tests/test_getipaddress.py sabnzbdplus-4.3.0~alpha1/tests/test_getipaddress.py
--- sabnzbdplus-4.2.3/tests/test_getipaddress.py	2024-03-11 07:44:42.579741500 +0000
+++ sabnzbdplus-4.3.0~alpha1/tests/test_getipaddress.py	2024-03-18 15:45:18.215450500 +0000
@@ -32,15 +32,14 @@
             assert isinstance(item[0], type(socket.AF_INET))
 
     def test_public_ipv4(self):
-        publicipv4 = public_ipv4()
-        assert is_ipv4_addr(publicipv4)
+        if publicipv4 := public_ipv4():
+            assert is_ipv4_addr(publicipv4)
 
     def test_local_ipv4(self):
-        localipv4 = local_ipv4()
-        assert is_ipv4_addr(localipv4)
+        if localipv4 := local_ipv4():
+            assert is_ipv4_addr(localipv4)
 
     def test_public_ipv6(self):
-        test_ipv6 = public_ipv6()
-        # Not all systems have IPv6
-        if test_ipv6:
+        if test_ipv6 := public_ipv6():
+            # Not all systems have IPv6
             assert is_ipv6_addr(test_ipv6)
diff -Nru sabnzbdplus-4.2.3/tests/test_happyeyeballs.py sabnzbdplus-4.3.0~alpha1/tests/test_happyeyeballs.py
--- sabnzbdplus-4.2.3/tests/test_happyeyeballs.py	2024-03-11 07:44:42.581364000 +0000
+++ sabnzbdplus-4.3.0~alpha1/tests/test_happyeyeballs.py	2024-03-18 15:45:18.216891000 +0000
@@ -25,7 +25,8 @@
 import pytest
 from flaky import flaky
 
-from sabnzbd.happyeyeballs import happyeyeballs
+from sabnzbd.happyeyeballs import happyeyeballs, IPV6_MAPPING
+from sabnzbd.misc import is_ipv4_addr, is_ipv6_addr
 
 
 @flaky
@@ -37,24 +38,23 @@
 
     def test_google_http(self):
         addrinfo = happyeyeballs("www.google.com", port=80)
-        assert "." in addrinfo.ipaddress or ":" in addrinfo.ipaddress
+        assert is_ipv4_addr(addrinfo.ipaddress) or is_ipv6_addr(addrinfo.ipaddress)
         assert "google" in addrinfo.canonname
 
     def test_google_https(self):
         addrinfo = happyeyeballs("www.google.com", port=443)
-        assert "." in addrinfo.ipaddress or ":" in addrinfo.ipaddress
+        assert is_ipv4_addr(addrinfo.ipaddress) or is_ipv6_addr(addrinfo.ipaddress)
         assert "google" in addrinfo.canonname
 
     def test_google_http_want_ipv4(self):
         addrinfo = happyeyeballs("www.google.com", port=80, family=socket.AF_INET)
-        assert "." in addrinfo.ipaddress and not ":" in addrinfo.ipaddress
+        assert is_ipv4_addr(addrinfo.ipaddress) and not is_ipv6_addr(addrinfo.ipaddress)
         assert "google" in addrinfo.canonname
 
     def test_google_http_want_ipv6(self):
         # TODO: timeout needed for IPv4-only CI environment?
-        addrinfo = happyeyeballs("www.google.com", port=80, timeout=2, family=socket.AF_INET6)
-        if addrinfo:
-            assert not "." in addrinfo.ipaddress and ":" in addrinfo.ipaddress
+        if addrinfo := happyeyeballs("www.google.com", port=80, timeout=2, family=socket.AF_INET6):
+            assert not is_ipv4_addr(addrinfo.ipaddress) and is_ipv6_addr(addrinfo.ipaddress)
             assert "google" in addrinfo.canonname
 
     def test_not_resolvable(self):
@@ -62,7 +62,7 @@
 
     def test_ipv6_only(self):
         if addrinfo := happyeyeballs("ipv6.google.com", port=443, timeout=2):
-            assert ":" in addrinfo.ipaddress
+            assert is_ipv6_addr(addrinfo.ipaddress)
             assert "google" in addrinfo.canonname
 
     def test_google_unreachable_port(self):
@@ -70,5 +70,14 @@
 
     @pytest.mark.xfail(reason="CI sometimes blocks this")
     def test_nntp(self):
-        ip = happyeyeballs("news.newshosting.com", port=119).ipaddress
-        assert "." in ip or ":" in ip
+        if ip := happyeyeballs("news.newshosting.com", port=119).ipaddress:
+            assert is_ipv4_addr(ip) or is_ipv6_addr(ip)
+
+    @pytest.mark.skipif(sys.platform.startswith("darwin"), reason="Resolves strangely on macOS CI")
+    @pytest.mark.parametrize("hostname", IPV6_MAPPING.keys())
+    def test_ipv6_mapping(self, hostname):
+        # This test will let us remove hostnames from the mapping
+        # once the providers add IPv6 to their main hostname
+        with pytest.raises(socket.gaierror):
+            # Print results for us to see the new information
+            print(socket.getaddrinfo(hostname, 119, socket.AF_INET6, socket.SOCK_STREAM))
diff -Nru sabnzbdplus-4.2.3/tests/test_misc.py sabnzbdplus-4.3.0~alpha1/tests/test_misc.py
--- sabnzbdplus-4.2.3/tests/test_misc.py	2024-03-11 07:44:42.573943100 +0000
+++ sabnzbdplus-4.3.0~alpha1/tests/test_misc.py	2024-03-18 15:45:18.211510000 +0000
@@ -74,6 +74,15 @@
         assert misc.is_none(True) is False
         assert misc.is_none("Not None") is False
 
+    def test_clean_comma_separated_list(self):
+        assert misc.clean_comma_separated_list("") == []
+        assert misc.clean_comma_separated_list(None) == []
+        assert misc.clean_comma_separated_list(123) == []
+        assert misc.clean_comma_separated_list("a,b") == ["a", "b"]
+        assert misc.clean_comma_separated_list(",b") == ["b"]
+        assert misc.clean_comma_separated_list("   a  ,  b  ") == ["a", "b"]
+        assert misc.clean_comma_separated_list(["a  ", "  b", ""]) == ["a", "b"]
+
     def test_cmp(self):
         assert misc.cmp(1, 2) < 0
         assert misc.cmp(2, 1) > 0
diff -Nru sabnzbdplus-4.2.3/tests/testhelper.py sabnzbdplus-4.3.0~alpha1/tests/testhelper.py
--- sabnzbdplus-4.2.3/tests/testhelper.py	2024-03-11 07:44:42.577325800 +0000
+++ sabnzbdplus-4.3.0~alpha1/tests/testhelper.py	2024-03-18 15:45:18.213889800 +0000
@@ -135,15 +135,16 @@
 
 
 def get_api_result(mode, host=SAB_HOST, port=SAB_PORT, extra_arguments={}):
-    """Build JSON request to SABnzbd"""
-    arguments = {"apikey": SAB_APIKEY, "output": "json", "mode": mode}
+    """Build request to SABnzbd"""
+    arguments = {"apikey": SAB_APIKEY, "mode": mode}
     arguments.update(extra_arguments)
+
     r = requests.get("http://%s:%s/api" % (host, port), params=arguments)
-    if arguments["output"] == "text":
-        return r.text
-    elif arguments["output"] == "xml":
+    if "xml" in r.headers["Content-Type"]:
         return xmltodict.parse(r.text)
-    return r.json()
+    if "json" in r.headers["Content-Type"]:
+        return r.json()
+    return r.text
 
 
 def create_nzb(nzb_dir: str, metadata: Optional[Dict[str, str]] = None) -> str: