Merge branch 'develop' into py3

6 years ago · 563173a325
38 changed files with 267 additions and 385 deletions
--- a/ABOUT.txt
+++ b/ABOUT.txt
@ -1,5 +1,5 @@
 *******************************************
-*** This is SABnzbd 2.3.7               ***
+*** This is SABnzbd 2.3.8               ***
 *******************************************
 SABnzbd is an open-source cross-platform binary newsreader.
 It simplifies the process of downloading from Usenet dramatically,
--- a/INSTALL.txt
+++ b/INSTALL.txt
@ -1,4 +1,4 @@
-                            SABnzbd 2.3.7
+                            SABnzbd 2.3.8

 -------------------------------------------------------------------------------
 0) LICENSE
--- a/README.mkd
+++ b/README.mkd
@ -1,18 +1,16 @@
-Release Notes - SABnzbd 2.3.7
+Release Notes - SABnzbd 2.3.8
 =========================================================

-## Improvements and bug fixes since 2.3.6
- Hopeless jobs will be failed faster, based on the first article of
-  each file. If 80% of these first articles is missing, the job is aborted.
- Option "fast_fail" added to disable the new behavior.
- Added option to quickly add a verified test download
- Readout of some RSS feeds could result in a crash
- Direct Unpack could get stuck processing
- Show Details on Servers page could break graph display
- Windows: Update MultiPar to 1.3.0.3
-
-Still looking for help with SABnzbd (Python 3) development!
-https://www.reddit.com/r/usenet/comments/918nxv/
+## Improvements and bug fixes since 2.3.7
+- Changes to newsserver configuration could be delayed
+- Filenames would not be sanitized when using "Make Windows compatible"
+- Sorting could fail on root-folders
+- 7z-files were not listed as supported NZB archives
+- SSL cipher settings were ignored during server test
+- Windows: update 7zip to 19.00
+- Windows: update MultiPar to v1.3.0.4
+- Windows and macOS: update Python to 2.7.16
+- Windows and macOS: update UnRar to 5.70

 ## Upgrading from 2.2.x and older
 - Finish queue
--- a/interfaces/Glitter/templates/static/javascripts/glitter.main.js
+++ b/interfaces/Glitter/templates/static/javascripts/glitter.main.js
@ -841,6 +841,12 @@ function ViewModel() {
    // Download a test-NZB
    self.testDownload = function(data, event) {
        var nzbSize = $(event.target).data('size')
+
+        // Maybe it was a click on the icon?
+        if(nzbSize == undefined) {
+            nzbSize = $(event.target.parentElement).data('size')
+        }
+
        // Build request
        var theCall = {
            mode: "addurl",
--- a/licenses/License-pynewsleecher.txt
+++ b/licenses/License-pynewsleecher.txt
@ -1,11 +1,11 @@
-The original author of SABnzbd based his work on Pynewsleecher by Freddy@madcowdesease.org.
-
-Few parts of Pynewsleecher have survived the generations of SABnzbd in a
-recognizable form.
-Still, we wish to thank Freddy for his inspiration.
-
-The home of the Pynewsleecher project:
-http://www.madcowdisease.org/mcd/pynewsleecher
-
-The software does not carry any license information.
-
+The original author of SABnzbd based his work on Pynewsleecher by Freddy@madcowdesease.org.
+
+Few parts of Pynewsleecher have survived the generations of SABnzbd in a
+recognizable form.
+Still, we wish to thank Freddy for his inspiration.
+
+The home of the Pynewsleecher project:
+http://www.madcowdisease.org/mcd/pynewsleecher
+
+The software does not carry any license information.
+
--- a/licenses/License-systrayicon.txt
+++ b/licenses/License-systrayicon.txt
@ -1,8 +1,8 @@
-On http://www.brunningonline.net/simon/blog/archives/001835.html,
-the author licensed SysTrayIcon.py under a variant of the WTFPL:
-
-> Any road up, help yourself. Consider SysTrayIcon.py to be under an
-> "Aleister Crowley" style license - "Do what thou wilt shall be the
-> only law".
-> 
-> Err, but don't sue me if it doesn't work. ;-)
+On http://www.brunningonline.net/simon/blog/archives/001835.html,
+the author licensed SysTrayIcon.py under a variant of the WTFPL:
+
+> Any road up, help yourself. Consider SysTrayIcon.py to be under an
+> "Aleister Crowley" style license - "Do what thou wilt shall be the
+> only law".
+> 
+> Err, but don't sue me if it doesn't work. ;-)
--- a/osx/unrar/unrar
+++ b/osx/unrar/unrar
--- a/po/main/SABnzbd.pot
+++ b/po/main/SABnzbd.pot
@ -5,14 +5,14 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-2.4.0-develop\n"
+"Project-Id-Version: SABnzbd-2.3.8\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: shypike@sabnzbd.org\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ASCII\n"
 "Content-Transfer-Encoding: 7bit\n"
-"POT-Creation-Date: 2019-01-04 12:49+W. Europe Standard Time\n"
+"POT-Creation-Date: 2019-05-07 09:00+W. Europe Daylight Time\n"
 "Generated-By: pygettext.py 1.5\n"


@ -413,10 +413,6 @@ msgid "Unpacked %s files/folders in %s"
 msgstr ""

 #: sabnzbd/directunpacker.py [Warning message]
-msgid "Unable to stop the unrar process."
-msgstr ""
-
-#: sabnzbd/directunpacker.py [Warning message]
 msgid "Direct Unpack was automatically enabled."
 msgstr ""

@ -3275,19 +3271,19 @@ msgid "Comma separated list"
 msgstr ""

 #: sabnzbd/skintext.py
-msgid "Server load-balancing"
+msgid "Server IP address selection"
 msgstr ""

 #: sabnzbd/skintext.py
-msgid "Prevent load-balancing"
+msgid "First IP address"
 msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing"
+msgid "Randomly selected IP address"
 msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing with optimization for IPv6"
+msgid "Quickest IP address, preferring IPv6"
 msgstr ""

 #: sabnzbd/skintext.py
@ -4155,10 +4151,6 @@ msgid "Optionally specify a filename"
 msgstr ""

 #: sabnzbd/skintext.py
-msgid "Formats: .nzb, .rar, .zip, .gz, .bz2"
-msgstr ""
-
-#: sabnzbd/skintext.py
 msgid "Submit"
 msgstr ""

--- a/po/main/da.po
+++ b/po/main/da.po
@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2019-01-04 12:42+0000\n"
+"POT-Creation-Date: 2019-05-07 12:00+0000\n"
 "PO-Revision-Date: 2019-01-26 09:26+0000\n"
 "Last-Translator: B.E. <Unknown>\n"
 "Language-Team: Danish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2019-01-27 05:44+0000\n"
-"X-Generator: Launchpad (build 18857)\n"
+"X-Launchpad-Export-Date: 2019-05-08 05:48+0000\n"
+"X-Generator: Launchpad (build 18958)\n"
 "Language: da\n"

 #: SABnzbd.py [Error message]
@ -442,10 +442,6 @@ msgid "Unpacked %s files/folders in %s"
 msgstr "Udpakket %s filer/mapper i %s"

 #: sabnzbd/directunpacker.py [Warning message]
-msgid "Unable to stop the unrar process."
-msgstr ""
-
-#: sabnzbd/directunpacker.py [Warning message]
 msgid "Direct Unpack was automatically enabled."
 msgstr ""

@ -3541,20 +3537,20 @@ msgid "Comma separated list"
 msgstr "Kommasepareret liste"

 #: sabnzbd/skintext.py
-msgid "Server load-balancing"
-msgstr "Server belastningsjustering"
+msgid "Server IP address selection"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Prevent load-balancing"
-msgstr "Forhindre belastningsjustering"
+msgid "First IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing"
-msgstr "Tillad belastningsjustering"
+msgid "Randomly selected IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing with optimization for IPv6"
-msgstr "Giver mulighed for belastningsjustering med optimering for IPv6"
+msgid "Quickest IP address, preferring IPv6"
+msgstr ""

 #: sabnzbd/skintext.py
 msgid "Useful if a newsserver has more than one IPv4/IPv6 address"
@ -4452,10 +4448,6 @@ msgid "Optionally specify a filename"
 msgstr "Angiv et valgfrit filnavn"

 #: sabnzbd/skintext.py
-msgid "Formats: .nzb, .rar, .zip, .gz, .bz2"
-msgstr "Formater: .nzb, .rar, .zip, .gz, .bz2"
-
-#: sabnzbd/skintext.py
 msgid "Submit"
 msgstr "Tilføj"

--- a/po/main/de.po
+++ b/po/main/de.po
@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2019-01-04 12:42+0000\n"
+"POT-Creation-Date: 2019-05-07 12:00+0000\n"
 "PO-Revision-Date: 2018-05-31 06:22+0000\n"
 "Last-Translator: scope <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2019-01-05 05:41+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2019-05-08 05:49+0000\n"
+"X-Generator: Launchpad (build 18958)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@ -458,10 +458,6 @@ msgid "Unpacked %s files/folders in %s"
 msgstr "%s Datei(en)/Ordner entpackt in %s"

 #: sabnzbd/directunpacker.py [Warning message]
-msgid "Unable to stop the unrar process."
-msgstr ""
-
-#: sabnzbd/directunpacker.py [Warning message]
 msgid "Direct Unpack was automatically enabled."
 msgstr "Direkt entpacken wurde automatisch aktiviert"

@ -3646,20 +3642,20 @@ msgid "Comma separated list"
 msgstr "Durch Komma getrennte Liste"

 #: sabnzbd/skintext.py
-msgid "Server load-balancing"
-msgstr "Server Lastverteilung"
+msgid "Server IP address selection"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Prevent load-balancing"
-msgstr "Lastverteilung verhindern"
+msgid "First IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing"
-msgstr "Lastverteilung zulassen"
+msgid "Randomly selected IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing with optimization for IPv6"
-msgstr "Lastverteilung mit IPv6-Optimierung zulassen"
+msgid "Quickest IP address, preferring IPv6"
+msgstr ""

 #: sabnzbd/skintext.py
 msgid "Useful if a newsserver has more than one IPv4/IPv6 address"
@ -4563,10 +4559,6 @@ msgid "Optionally specify a filename"
 msgstr "Wahlweise einen Dateinamen angeben:"

 #: sabnzbd/skintext.py
-msgid "Formats: .nzb, .rar, .zip, .gz, .bz2"
-msgstr "Formate: .nzb, .rar, .zip, .gz, .bz2"
-
-#: sabnzbd/skintext.py
 msgid "Submit"
 msgstr "Senden"

--- a/po/main/es.po
+++ b/po/main/es.po
@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2019-01-04 12:42+0000\n"
+"POT-Creation-Date: 2019-05-07 12:00+0000\n"
 "PO-Revision-Date: 2018-02-14 14:18+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2019-01-05 05:42+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2019-05-08 05:49+0000\n"
+"X-Generator: Launchpad (build 18958)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@ -440,10 +440,6 @@ msgid "Unpacked %s files/folders in %s"
 msgstr "Descompresos %s archivos/directorios en %s"

 #: sabnzbd/directunpacker.py [Warning message]
-msgid "Unable to stop the unrar process."
-msgstr ""
-
-#: sabnzbd/directunpacker.py [Warning message]
 msgid "Direct Unpack was automatically enabled."
 msgstr ""

@ -3558,20 +3554,20 @@ msgid "Comma separated list"
 msgstr "Lista separada por comas"

 #: sabnzbd/skintext.py
-msgid "Server load-balancing"
-msgstr "Balanceo de carga del servidor"
+msgid "Server IP address selection"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Prevent load-balancing"
-msgstr "Evitar el balanceo de carga"
+msgid "First IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing"
-msgstr "Permitir balanceo de carga"
+msgid "Randomly selected IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing with optimization for IPv6"
-msgstr "Permitir balanceo de carga con optimización para IPv6"
+msgid "Quickest IP address, preferring IPv6"
+msgstr ""

 #: sabnzbd/skintext.py
 msgid "Useful if a newsserver has more than one IPv4/IPv6 address"
@ -4468,10 +4464,6 @@ msgid "Optionally specify a filename"
 msgstr "Opcionalmente especificar un nombre de fichero"

 #: sabnzbd/skintext.py
-msgid "Formats: .nzb, .rar, .zip, .gz, .bz2"
-msgstr "Formatos: .nzb, .rar, .zip, .gz, .bz2"
-
-#: sabnzbd/skintext.py
 msgid "Submit"
 msgstr "Enviar"

--- a/po/main/fi.po
+++ b/po/main/fi.po
@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2019-01-04 12:42+0000\n"
+"POT-Creation-Date: 2019-05-07 12:00+0000\n"
 "PO-Revision-Date: 2018-02-14 14:19+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2019-01-05 05:41+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2019-05-08 05:49+0000\n"
+"X-Generator: Launchpad (build 18958)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@ -439,10 +439,6 @@ msgid "Unpacked %s files/folders in %s"
 msgstr "Purettiin %s tiedostoa/kansiota kohteeseen %s"

 #: sabnzbd/directunpacker.py [Warning message]
-msgid "Unable to stop the unrar process."
-msgstr ""
-
-#: sabnzbd/directunpacker.py [Warning message]
 msgid "Direct Unpack was automatically enabled."
 msgstr ""

@ -3547,20 +3543,20 @@ msgid "Comma separated list"
 msgstr "Pilkulla erotettu lista"

 #: sabnzbd/skintext.py
-msgid "Server load-balancing"
-msgstr "Palvelimen kuormantasaus"
+msgid "Server IP address selection"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Prevent load-balancing"
-msgstr "Estä kuormantasaus"
+msgid "First IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing"
-msgstr "Salli kuormantasaus"
+msgid "Randomly selected IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing with optimization for IPv6"
-msgstr "Salli kuormantasaus IPv6 optimoinnille"
+msgid "Quickest IP address, preferring IPv6"
+msgstr ""

 #: sabnzbd/skintext.py
 msgid "Useful if a newsserver has more than one IPv4/IPv6 address"
@ -4460,10 +4456,6 @@ msgid "Optionally specify a filename"
 msgstr "Vaihtoehtoisesti anna tiedostonimi"

 #: sabnzbd/skintext.py
-msgid "Formats: .nzb, .rar, .zip, .gz, .bz2"
-msgstr "Tiedostomuodot: .nzb, .rar, .zip, .gz, .bz2"
-
-#: sabnzbd/skintext.py
 msgid "Submit"
 msgstr "Lähetä"

--- a/po/main/fr.po
+++ b/po/main/fr.po
@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2019-01-04 12:42+0000\n"
-"PO-Revision-Date: 2019-01-05 12:50+0000\n"
+"POT-Creation-Date: 2019-05-07 12:00+0000\n"
+"PO-Revision-Date: 2019-05-14 00:00+0000\n"
 "Last-Translator: Fred <88com88@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2019-01-06 04:48+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2019-05-15 04:49+0000\n"
+"X-Generator: Launchpad (build 18962)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@ -460,10 +460,6 @@ msgid "Unpacked %s files/folders in %s"
 msgstr "%s fichier(s)/dossier(s) extrait(s) en %s"

 #: sabnzbd/directunpacker.py [Warning message]
-msgid "Unable to stop the unrar process."
-msgstr "Impossible d'arrêter le processus unrar."
-
-#: sabnzbd/directunpacker.py [Warning message]
 msgid "Direct Unpack was automatically enabled."
 msgstr "La Décompression Directe a été activée automatiquement."

@ -3654,20 +3650,20 @@ msgid "Comma separated list"
 msgstr "Liste séparée par des virgules"

 #: sabnzbd/skintext.py
-msgid "Server load-balancing"
-msgstr "Equilibrage de charge du serveur"
+msgid "Server IP address selection"
+msgstr "Sélection de l'adresse IP du serveur"

 #: sabnzbd/skintext.py
-msgid "Prevent load-balancing"
-msgstr "Empêcher l'équilibrage de charge"
+msgid "First IP address"
+msgstr "Première adresse IP"

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing"
-msgstr "Autoriser l'équilibrage de charge"
+msgid "Randomly selected IP address"
+msgstr "Adresse IP sélectionnée au hasard"

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing with optimization for IPv6"
-msgstr "Autoriser l'équilibrage de charge avec l'optimisation pour IPv6"
+msgid "Quickest IP address, preferring IPv6"
+msgstr "Adresse IP la plus rapide, IPv6 de préférence"

 #: sabnzbd/skintext.py
 msgid "Useful if a newsserver has more than one IPv4/IPv6 address"
@ -4577,10 +4573,6 @@ msgid "Optionally specify a filename"
 msgstr "Vous pouvez également indiquer un nom de fichier"

 #: sabnzbd/skintext.py
-msgid "Formats: .nzb, .rar, .zip, .gz, .bz2"
-msgstr "Formats : .nzb, .rar, .zip, .gz, .bz2"
-
-#: sabnzbd/skintext.py
 msgid "Submit"
 msgstr "Soumettre"

--- a/po/main/he.po
+++ b/po/main/he.po
@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2019-01-04 12:42+0000\n"
-"PO-Revision-Date: 2019-01-14 07:17+0000\n"
+"POT-Creation-Date: 2019-05-07 12:00+0000\n"
+"PO-Revision-Date: 2019-05-07 23:12+0000\n"
 "Last-Translator: ION IL <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2019-01-15 04:50+0000\n"
-"X-Generator: Launchpad (build 18855)\n"
+"X-Launchpad-Export-Date: 2019-05-08 05:49+0000\n"
+"X-Generator: Launchpad (build 18958)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@ -433,10 +433,6 @@ msgid "Unpacked %s files/folders in %s"
 msgstr "פורקו %s קבצים/תיקיות תוך %s"

 #: sabnzbd/directunpacker.py [Warning message]
-msgid "Unable to stop the unrar process."
-msgstr "לא היה ניתן לעצור את תהליך החילוץ"
-
-#: sabnzbd/directunpacker.py [Warning message]
 msgid "Direct Unpack was automatically enabled."
 msgstr ".פריקה ישירה אופשרה באופן אוטומטי"

@ -3518,20 +3514,20 @@ msgid "Comma separated list"
 msgstr "רשימה מופרדת בפסיקים"

 #: sabnzbd/skintext.py
-msgid "Server load-balancing"
-msgstr "איזון-עומס של שרת"
+msgid "Server IP address selection"
+msgstr "של שרת IP בחירת כתובת"

 #: sabnzbd/skintext.py
-msgid "Prevent load-balancing"
-msgstr "מנע איזון-עומס"
+msgid "First IP address"
+msgstr "ראשונה IP כתובת"

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing"
-msgstr "התר איזון-עומס"
+msgid "Randomly selected IP address"
+msgstr "נבחרת באופן אקראי IP כתובת"

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing with optimization for IPv6"
-msgstr "IPv6 התר איזון-עומס עם ייעול עבור"
+msgid "Quickest IP address, preferring IPv6"
+msgstr "IPv6 הזריזה ביותר, העדפה אל IP כתובת"

 #: sabnzbd/skintext.py
 msgid "Useful if a newsserver has more than one IPv4/IPv6 address"
@ -4426,10 +4422,6 @@ msgid "Optionally specify a filename"
 msgstr "ציין באופן רשותי שם קובץ"

 #: sabnzbd/skintext.py
-msgid "Formats: .nzb, .rar, .zip, .gz, .bz2"
-msgstr ".nzb, .rar, .zip, .gz, .bz2 :תסדירים"
-
-#: sabnzbd/skintext.py
 msgid "Submit"
 msgstr "הגש"

--- a/po/main/nb.po
+++ b/po/main/nb.po
@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2019-01-04 12:42+0000\n"
+"POT-Creation-Date: 2019-05-07 12:00+0000\n"
 "PO-Revision-Date: 2018-02-14 14:18+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2019-01-05 05:41+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2019-05-08 05:49+0000\n"
+"X-Generator: Launchpad (build 18958)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@ -435,10 +435,6 @@ msgid "Unpacked %s files/folders in %s"
 msgstr "Utpakket %s filer/mapper på %s"

 #: sabnzbd/directunpacker.py [Warning message]
-msgid "Unable to stop the unrar process."
-msgstr ""
-
-#: sabnzbd/directunpacker.py [Warning message]
 msgid "Direct Unpack was automatically enabled."
 msgstr ""

@ -3512,20 +3508,20 @@ msgid "Comma separated list"
 msgstr "Kommaseparert liste"

 #: sabnzbd/skintext.py
-msgid "Server load-balancing"
-msgstr "Serverlastbalansering"
+msgid "Server IP address selection"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Prevent load-balancing"
-msgstr "Forhindre lastbalansering"
+msgid "First IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing"
-msgstr "Tillat lastbalansering"
+msgid "Randomly selected IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing with optimization for IPv6"
-msgstr "Tillat lastbalansering med optimalisering for IPv6"
+msgid "Quickest IP address, preferring IPv6"
+msgstr ""

 #: sabnzbd/skintext.py
 msgid "Useful if a newsserver has more than one IPv4/IPv6 address"
@ -4419,10 +4415,6 @@ msgid "Optionally specify a filename"
 msgstr "Valgfritt spesifiser filnavn"

 #: sabnzbd/skintext.py
-msgid "Formats: .nzb, .rar, .zip, .gz, .bz2"
-msgstr "Formater: .nzb, .rar, .zip, .gz, .bz2"
-
-#: sabnzbd/skintext.py
 msgid "Submit"
 msgstr "Send"

--- a/po/main/nl.po
+++ b/po/main/nl.po
@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2019-01-04 12:42+0000\n"
-"PO-Revision-Date: 2019-01-10 08:23+0000\n"
-"Last-Translator: Safihre <safihre@sabnzbd.org>\n"
+"POT-Creation-Date: 2019-05-07 12:00+0000\n"
+"PO-Revision-Date: 2019-05-15 19:07+0000\n"
+"Last-Translator: Dennis Versteegen <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2019-01-11 05:42+0000\n"
-"X-Generator: Launchpad (build 18855)\n"
+"X-Launchpad-Export-Date: 2019-05-16 05:47+0000\n"
+"X-Generator: Launchpad (build 18962)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@ -453,10 +453,6 @@ msgid "Unpacked %s files/folders in %s"
 msgstr "%s bestanden/mappen uitgepakt in %s"

 #: sabnzbd/directunpacker.py [Warning message]
-msgid "Unable to stop the unrar process."
-msgstr "Het was niet mogelijk het unrar process te stoppen."
-
-#: sabnzbd/directunpacker.py [Warning message]
 msgid "Direct Unpack was automatically enabled."
 msgstr "Direct Uitpakken is automatisch ingeschakeld."

@ -3601,20 +3597,20 @@ msgid "Comma separated list"
 msgstr "Door komma's gescheiden lijst"

 #: sabnzbd/skintext.py
-msgid "Server load-balancing"
-msgstr "Balanceren van server belasting"
+msgid "Server IP address selection"
+msgstr "Server IP adres selectie"

 #: sabnzbd/skintext.py
-msgid "Prevent load-balancing"
-msgstr "Schakel balancering uit"
+msgid "First IP address"
+msgstr "Eerste IP adres"

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing"
-msgstr "Schakel balancering in"
+msgid "Randomly selected IP address"
+msgstr "willekeurig geselecteerd IP adres"

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing with optimization for IPv6"
-msgstr "Schakel balancering met optimalisatie voor IPv6 in"
+msgid "Quickest IP address, preferring IPv6"
+msgstr "Snelste IP adres, voorkeur voor IPv6"

 #: sabnzbd/skintext.py
 msgid "Useful if a newsserver has more than one IPv4/IPv6 address"
@ -4521,10 +4517,6 @@ msgid "Optionally specify a filename"
 msgstr "Geef eventueel een andere naam"

 #: sabnzbd/skintext.py
-msgid "Formats: .nzb, .rar, .zip, .gz, .bz2"
-msgstr "Formaten: .nzb, .rar, .zip, .gz, .bz2"
-
-#: sabnzbd/skintext.py
 msgid "Submit"
 msgstr "Verstuur"

--- a/po/main/pl.po
+++ b/po/main/pl.po
@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2019-01-04 12:42+0000\n"
+"POT-Creation-Date: 2019-05-07 12:00+0000\n"
 "PO-Revision-Date: 2018-02-14 14:18+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2019-01-05 05:42+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2019-05-08 05:49+0000\n"
+"X-Generator: Launchpad (build 18958)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@ -435,10 +435,6 @@ msgid "Unpacked %s files/folders in %s"
 msgstr "Rozpakowano %s plików/katalogów w %s"

 #: sabnzbd/directunpacker.py [Warning message]
-msgid "Unable to stop the unrar process."
-msgstr ""
-
-#: sabnzbd/directunpacker.py [Warning message]
 msgid "Direct Unpack was automatically enabled."
 msgstr ""

@ -3529,20 +3525,20 @@ msgid "Comma separated list"
 msgstr "Lista wartości oddzielonych przecinkami"

 #: sabnzbd/skintext.py
-msgid "Server load-balancing"
-msgstr "Równoważenie obciążenia serwerów"
+msgid "Server IP address selection"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Prevent load-balancing"
-msgstr "Zapobiegaj równoważeniu obciążenia"
+msgid "First IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing"
-msgstr "Zezwól na równoważenie obciążenia"
+msgid "Randomly selected IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing with optimization for IPv6"
-msgstr "Zezwól na równoważenie obciążenia, preferując IPv6"
+msgid "Quickest IP address, preferring IPv6"
+msgstr ""

 #: sabnzbd/skintext.py
 msgid "Useful if a newsserver has more than one IPv4/IPv6 address"
@ -4436,10 +4432,6 @@ msgid "Optionally specify a filename"
 msgstr "Opcjonalnie podaj nazwę pliku"

 #: sabnzbd/skintext.py
-msgid "Formats: .nzb, .rar, .zip, .gz, .bz2"
-msgstr "Formaty: .nzb, .rar, .zip, .gz, .bz2"
-
-#: sabnzbd/skintext.py
 msgid "Submit"
 msgstr "Wyślij"

--- a/po/main/pt_BR.po
+++ b/po/main/pt_BR.po
@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2019-01-04 12:42+0000\n"
+"POT-Creation-Date: 2019-05-07 12:00+0000\n"
 "PO-Revision-Date: 2018-02-14 14:16+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2019-01-05 05:42+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2019-05-08 05:50+0000\n"
+"X-Generator: Launchpad (build 18958)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@ -437,10 +437,6 @@ msgid "Unpacked %s files/folders in %s"
 msgstr "Descompactados %s arquivos/pastas em %s"

 #: sabnzbd/directunpacker.py [Warning message]
-msgid "Unable to stop the unrar process."
-msgstr ""
-
-#: sabnzbd/directunpacker.py [Warning message]
 msgid "Direct Unpack was automatically enabled."
 msgstr ""

@ -3527,20 +3523,20 @@ msgid "Comma separated list"
 msgstr "Lista separada por vírgulas"

 #: sabnzbd/skintext.py
-msgid "Server load-balancing"
-msgstr "Balanceamento de carga do servidor"
+msgid "Server IP address selection"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Prevent load-balancing"
-msgstr "Prevenir balanceamento de carga"
+msgid "First IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing"
-msgstr "Permitir balanceamento de carga"
+msgid "Randomly selected IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing with optimization for IPv6"
-msgstr "Permitir balanceamento de carga com optimização para IPv6"
+msgid "Quickest IP address, preferring IPv6"
+msgstr ""

 #: sabnzbd/skintext.py
 msgid "Useful if a newsserver has more than one IPv4/IPv6 address"
@ -4435,10 +4431,6 @@ msgid "Optionally specify a filename"
 msgstr "Opcionalmente, especifique um nome de arquivo"

 #: sabnzbd/skintext.py
-msgid "Formats: .nzb, .rar, .zip, .gz, .bz2"
-msgstr "Formatos: .nzb, .rar, .zip, .gz, .bz2"
-
-#: sabnzbd/skintext.py
 msgid "Submit"
 msgstr "Enviar"

--- a/po/main/ro.po
+++ b/po/main/ro.po
@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2019-01-04 12:42+0000\n"
+"POT-Creation-Date: 2019-05-07 12:00+0000\n"
 "PO-Revision-Date: 2018-02-14 14:18+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2019-01-05 05:42+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2019-05-08 05:49+0000\n"
+"X-Generator: Launchpad (build 18958)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@ -439,10 +439,6 @@ msgid "Unpacked %s files/folders in %s"
 msgstr "Dezarhivat %s fişierele/dosarele în %s"

 #: sabnzbd/directunpacker.py [Warning message]
-msgid "Unable to stop the unrar process."
-msgstr ""
-
-#: sabnzbd/directunpacker.py [Warning message]
 msgid "Direct Unpack was automatically enabled."
 msgstr ""

@ -3529,20 +3525,20 @@ msgid "Comma separated list"
 msgstr "Listă separată prin virgulă"

 #: sabnzbd/skintext.py
-msgid "Server load-balancing"
-msgstr "Server de load-balancing"
+msgid "Server IP address selection"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Prevent load-balancing"
-msgstr "Previne load-balancing"
+msgid "First IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing"
-msgstr "Permite load-balancing"
+msgid "Randomly selected IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing with optimization for IPv6"
-msgstr "Permite load-balancing cu o optimizare pentru IPv6"
+msgid "Quickest IP address, preferring IPv6"
+msgstr ""

 #: sabnzbd/skintext.py
 msgid "Useful if a newsserver has more than one IPv4/IPv6 address"
@ -4435,10 +4431,6 @@ msgid "Optionally specify a filename"
 msgstr "Opţional specifică un nume de fişier"

 #: sabnzbd/skintext.py
-msgid "Formats: .nzb, .rar, .zip, .gz, .bz2"
-msgstr "Formate: .nzb, .rar, .zip, .gz, .bz2"
-
-#: sabnzbd/skintext.py
 msgid "Submit"
 msgstr "Trimite"

--- a/po/main/ru.po
+++ b/po/main/ru.po
@ -2,15 +2,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SABnzbd-0.7.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-04 12:42+0000\n"
+"POT-Creation-Date: 2019-05-07 12:00+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: Pavel Maryanov <Unknown>\n"
 "Language-Team: Russian <gmu@mx.ru>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2019-01-05 05:42+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2019-05-08 05:49+0000\n"
+"X-Generator: Launchpad (build 18958)\n"
 "Generated-By: pygettext.py 1.5\n"

 #: SABnzbd.py [Error message]
@ -428,10 +428,6 @@ msgid "Unpacked %s files/folders in %s"
 msgstr "Распаковка %s файлов или папок в %s"

 #: sabnzbd/directunpacker.py [Warning message]
-msgid "Unable to stop the unrar process."
-msgstr ""
-
-#: sabnzbd/directunpacker.py [Warning message]
 msgid "Direct Unpack was automatically enabled."
 msgstr ""

@ -3504,19 +3500,19 @@ msgid "Comma separated list"
 msgstr ""

 #: sabnzbd/skintext.py
-msgid "Server load-balancing"
+msgid "Server IP address selection"
 msgstr ""

 #: sabnzbd/skintext.py
-msgid "Prevent load-balancing"
+msgid "First IP address"
 msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing"
+msgid "Randomly selected IP address"
 msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing with optimization for IPv6"
+msgid "Quickest IP address, preferring IPv6"
 msgstr ""

 #: sabnzbd/skintext.py
@ -4416,10 +4412,6 @@ msgid "Optionally specify a filename"
 msgstr "Имя файла (необязательно)"

 #: sabnzbd/skintext.py
-msgid "Formats: .nzb, .rar, .zip, .gz, .bz2"
-msgstr ""
-
-#: sabnzbd/skintext.py
 msgid "Submit"
 msgstr ""

--- a/po/main/sr.po
+++ b/po/main/sr.po
@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: ОZZII <ozzii.translate@gmail.com>\n"
-"POT-Creation-Date: 2019-01-04 12:42+0000\n"
+"POT-Creation-Date: 2019-05-07 12:00+0000\n"
 "PO-Revision-Date: 2018-02-14 14:18+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2019-01-05 05:42+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2019-05-08 05:49+0000\n"
+"X-Generator: Launchpad (build 18958)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@ -432,10 +432,6 @@ msgid "Unpacked %s files/folders in %s"
 msgstr "Издвојено %s датотека/фасцикла у %s"

 #: sabnzbd/directunpacker.py [Warning message]
-msgid "Unable to stop the unrar process."
-msgstr ""
-
-#: sabnzbd/directunpacker.py [Warning message]
 msgid "Direct Unpack was automatically enabled."
 msgstr ""

@ -3498,20 +3494,20 @@ msgid "Comma separated list"
 msgstr "Lista razdvojena zarezom"

 #: sabnzbd/skintext.py
-msgid "Server load-balancing"
-msgstr "Balansiranje opterećenja servera"
+msgid "Server IP address selection"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Prevent load-balancing"
-msgstr "Onemogući balansiranje opterećenja"
+msgid "First IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing"
-msgstr "Omogući balansiranje opterećenja"
+msgid "Randomly selected IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing with optimization for IPv6"
-msgstr "Omogući balansiranje opterećenja sa optimizacijom za IPv6"
+msgid "Quickest IP address, preferring IPv6"
+msgstr ""

 #: sabnzbd/skintext.py
 msgid "Useful if a newsserver has more than one IPv4/IPv6 address"
@ -4403,10 +4399,6 @@ msgid "Optionally specify a filename"
 msgstr "Опционо специфирати име"

 #: sabnzbd/skintext.py
-msgid "Formats: .nzb, .rar, .zip, .gz, .bz2"
-msgstr "Formati: .nzb, .rar, .zip, .gz, .bz2"
-
-#: sabnzbd/skintext.py
 msgid "Submit"
 msgstr "Пошаљи"

--- a/po/main/sv.po
+++ b/po/main/sv.po
@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2019-01-04 12:42+0000\n"
+"POT-Creation-Date: 2019-05-07 12:00+0000\n"
 "PO-Revision-Date: 2018-02-14 14:19+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2019-01-05 05:42+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2019-05-08 05:49+0000\n"
+"X-Generator: Launchpad (build 18958)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@ -433,10 +433,6 @@ msgid "Unpacked %s files/folders in %s"
 msgstr "Uppackad %s filer/mappar i %s"

 #: sabnzbd/directunpacker.py [Warning message]
-msgid "Unable to stop the unrar process."
-msgstr ""
-
-#: sabnzbd/directunpacker.py [Warning message]
 msgid "Direct Unpack was automatically enabled."
 msgstr ""

@ -3512,20 +3508,20 @@ msgid "Comma separated list"
 msgstr "Kommaseparerad lista"

 #: sabnzbd/skintext.py
-msgid "Server load-balancing"
-msgstr "Serverbelastad-balansering"
+msgid "Server IP address selection"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Prevent load-balancing"
-msgstr "Undvik belastningsbalansering"
+msgid "First IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing"
-msgstr "Tillåt belastningsbalansering"
+msgid "Randomly selected IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing with optimization for IPv6"
-msgstr "Tillåt bellastningsbalansering med optimering för IPv6"
+msgid "Quickest IP address, preferring IPv6"
+msgstr ""

 #: sabnzbd/skintext.py
 msgid "Useful if a newsserver has more than one IPv4/IPv6 address"
@ -4417,10 +4413,6 @@ msgid "Optionally specify a filename"
 msgstr "Alternativt ange ett filnamn"

 #: sabnzbd/skintext.py
-msgid "Formats: .nzb, .rar, .zip, .gz, .bz2"
-msgstr "Format: .nzb, .rar, .zip, .gz, .bz2"
-
-#: sabnzbd/skintext.py
 msgid "Submit"
 msgstr "Skicka"

--- a/po/main/zh_CN.po
+++ b/po/main/zh_CN.po
@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2019-01-04 12:42+0000\n"
+"POT-Creation-Date: 2019-05-07 12:00+0000\n"
 "PO-Revision-Date: 2017-06-22 07:06+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2019-01-05 05:42+0000\n"
-"X-Generator: Launchpad (build 18847)\n"
+"X-Launchpad-Export-Date: 2019-05-08 05:50+0000\n"
+"X-Generator: Launchpad (build 18958)\n"

 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@ -427,10 +427,6 @@ msgid "Unpacked %s files/folders in %s"
 msgstr "已解压 %s 个文件/文件夹，耗时 %s"

 #: sabnzbd/directunpacker.py [Warning message]
-msgid "Unable to stop the unrar process."
-msgstr ""
-
-#: sabnzbd/directunpacker.py [Warning message]
 msgid "Direct Unpack was automatically enabled."
 msgstr ""

@ -3441,20 +3437,20 @@ msgid "Comma separated list"
 msgstr "逗号分隔的列表"

 #: sabnzbd/skintext.py
-msgid "Server load-balancing"
-msgstr "服务器负载均衡"
+msgid "Server IP address selection"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Prevent load-balancing"
-msgstr "避免负载均衡"
+msgid "First IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing"
-msgstr "允许负载均衡"
+msgid "Randomly selected IP address"
+msgstr ""

 #: sabnzbd/skintext.py
-msgid "Allow load-balancing with optimization for IPv6"
-msgstr "允许负载均衡，并对 IPv6 优化"
+msgid "Quickest IP address, preferring IPv6"
+msgstr ""

 #: sabnzbd/skintext.py
 msgid "Useful if a newsserver has more than one IPv4/IPv6 address"
@ -4343,10 +4339,6 @@ msgid "Optionally specify a filename"
 msgstr "可以选择指定文件名"

 #: sabnzbd/skintext.py
-msgid "Formats: .nzb, .rar, .zip, .gz, .bz2"
-msgstr "格式: .nzb, .rar, .zip, .gz, .bz2"
-
-#: sabnzbd/skintext.py
 msgid "Submit"
 msgstr "提交"

--- a/sabnzbd/api.py
+++ b/sabnzbd/api.py
@ -1353,7 +1353,7 @@ def fast_queue():
    """ Return paused, bytes_left, bpsnow, time_left """
    bytes_left = NzbQueue.do.remaining()
    paused = Downloader.do.paused
-    bpsnow = BPSMeter.do.get_bps()
+    bpsnow = BPSMeter.do.bps
    time_left = calc_timeleft(bytes_left, bpsnow)
    return paused, bytes_left, bpsnow, time_left

@ -1576,7 +1576,7 @@ def build_queue_header(search=None, start=0, limit=0, output=None):

    header = build_header(output=output)

-    bytespersec = BPSMeter.do.get_bps()
+    bytespersec = BPSMeter.do.bps
    qnfo = NzbQueue.do.queue_info(search=search, start=start, limit=limit)

    bytesleft = qnfo.bytes_left
--- a/sabnzbd/bpsmeter.py
+++ b/sabnzbd/bpsmeter.py
@ -292,9 +292,6 @@ class BPSMeter:
            del self.timeline_total[server]
        self.save()

-    def get_bps(self):
-        return self.bps
-
    def get_bps_list(self):
        refresh_rate = int(cfg.refresh_rate()) if cfg.refresh_rate() else 1
        self.add_empty_time()
--- a/sabnzbd/database.py
+++ b/sabnzbd/database.py
@ -277,7 +277,7 @@ class HistoryDB:

    def add_history_db(self, nzo, storage="", path="", postproc_time=0, script_output="", script_line=""):
        """ Add a new job entry to the database """
-        t = build_history_info(nzo, storage, path, postproc_time, script_output, script_line)
+        t = build_history_info(nzo, storage, path, postproc_time, script_output, script_line, series_info=True)

        self.execute(
            """INSERT INTO history (completed, name, nzb_name, category, pp, script, report,
@ -351,8 +351,8 @@ class HistoryDB:
                    pass
        return total > 0

-    def have_md5sum(self, md5sum):
-        """ Check whether this md5sum already in History """
+    def have_name_or_md5sum(self, name, md5sum):
+        """ Check whether this name or md5sum is already in History """
        total = 0
        res = self.execute("select count(*) from History WHERE md5sum = ? AND STATUS != ?", (md5sum, Status.FAILED))
        if res:
@ -461,7 +461,7 @@ def dict_factory(cursor, row):
 _PP_LOOKUP = {0: "", 1: "R", 2: "U", 3: "D"}


-def build_history_info(nzo, storage="", downpath="", postproc_time=0, script_output="", script_line=""):
+def build_history_info(nzo, storage="", downpath="", postproc_time=0, script_output="", script_line="", series_info=False):
    """ Collects all the information needed for the database """
    completed = int(time.time())
    if not downpath:
@ -489,7 +489,7 @@ def build_history_info(nzo, storage="", downpath="", postproc_time=0, script_out

    # Analyze series info only when job is finished
    series = ""
-    if postproc_time:
+    if series_info:
        seriesname, season, episode, _ = sabnzbd.newsunpack.analyse_show(nzo.final_name)
        if seriesname and season and episode:
            series = "%s/%s/%s" % (seriesname.lower(), season, episode)
--- a/sabnzbd/directunpacker.py
+++ b/sabnzbd/directunpacker.py
@ -167,10 +167,10 @@ class DirectUnpacker(threading.Thread):
                break

            # Error? Let PP-handle it
-            if linebuf.endswith(('ERROR: ', 'Cannot create', 'in the encrypted file', 'CRC failed',
-                                 'checksum failed', 'You need to start extraction from a previous volume',
-                                 'password is incorrect', 'Write error', 'checksum error',
-                                 'start extraction from a previous volume')):
+            if linebuf.endswith(('ERROR: ', 'Cannot create', 'in the encrypted file', 'CRC failed', 'checksum failed',
+                                 'You need to start extraction from a previous volume', 'password is incorrect',
+                                 'Write error', 'checksum error', 'start extraction from a previous volume'
+                                 'Unexpected end of archive')):
                logging.info('Error in DirectUnpack of %s: %s', self.cur_setname, linebuf.strip())
                self.abort()

--- a/sabnzbd/downloader.py
+++ b/sabnzbd/downloader.py
@ -600,15 +600,13 @@ class Downloader(Thread):

                else:
                    if self.bandwidth_limit:
-                        bps = BPSMeter.do.get_bps()
-                        bps += bytes_received
                        limit = self.bandwidth_limit
-                        if bps > limit:
-                            while BPSMeter.do.get_bps() > limit:
+                        if bytes_received + BPSMeter.do.bps > limit:
+                            while BPSMeter.do.bps > limit:
                                time.sleep(0.05)
                                BPSMeter.do.update()
                    BPSMeter.do.update(server.id, bytes_received)
-                    nzo.update_download_stats(BPSMeter.do.get_bps(), server.id, bytes_received)
+                    nzo.update_download_stats(BPSMeter.do.bps, server.id, bytes_received)

                if not done and nw.status_code != 222:
                    if not nw.connected or nw.status_code == 480:
--- a/sabnzbd/newsunpack.py
+++ b/sabnzbd/newsunpack.py
@ -761,7 +761,7 @@ def rar_extract_core(rarfile_path, numrars, one_folder, nzo, setname, extraction
            # unrar 3.x: "Encrypted file: CRC failed in oLKQfrcNVivzdzSG22a2xo7t001.part1.rar (password incorrect ?)"
            # unrar 4.x: "CRC failed in the encrypted file oLKQfrcNVivzdzSG22a2xo7t001.part1.rar. Corrupt file or wrong password."
            # unrar 5.x: "Checksum error in the encrypted file oLKQfrcNVivzdzSG22a2xo7t001.part1.rar. Corrupt file or wrong password."
-            # unrar 5.01 : "The specified password is incorrect."
+            # unrar 5.01: "The specified password is incorrect."
            m = re.search(r'encrypted file (.+)\. Corrupt file', line)
            if not m:
                # unrar 3.x syntax
@ -787,8 +787,8 @@ def rar_extract_core(rarfile_path, numrars, one_folder, nzo, setname, extraction
            nzo.set_unpack_info('Unpack', msg, setname)
            fail = 3

-        elif 'checksum error' in line:
-            # Corrupt archive
+        elif 'checksum error' in line or 'Unexpected end of archive' in line:
+            # Corrupt archive or passworded, we can't know
            # packed data checksum error in volume FILE
            m = re.search(r'error in volume (.+)', line)
            if m:
--- a/sabnzbd/nzbqueue.py
+++ b/sabnzbd/nzbqueue.py
@ -662,11 +662,13 @@ class NzbQueue:
        """ Get next article for jobs in the queue
            Not locked for performance, since it only reads the queue
        """
+        # Pre-calculate propagation delay
+        propagtion_delay = float(cfg.propagation_delay() * 60)
        for nzo in self.__nzo_list:
            # Not when queue paused and not a forced item
            if nzo.status not in (Status.PAUSED, Status.GRABBING) or nzo.priority == TOP_PRIORITY:
                # Check if past propagation delay, or forced
-                if not cfg.propagation_delay() or nzo.priority == TOP_PRIORITY or (nzo.avg_stamp + float(cfg.propagation_delay() * 60)) < time.time():
+                if not propagtion_delay or nzo.priority == TOP_PRIORITY or (nzo.avg_stamp + propagtion_delay) < time.time():
                    if not nzo.server_in_try_list(server):
                        article = nzo.get_article(server, servers)
                        if article:
--- a/sabnzbd/nzbstuff.py
+++ b/sabnzbd/nzbstuff.py
@ -708,7 +708,6 @@ class NzbObject(TryList):
            # Raise error, so it's not added
            raise TypeError

-    @synchronized(NZO_LOCK)
    def update_download_stats(self, bps, serverid, bytes):
        if bps:
            self.avg_bps_total += bps / 1024
@ -1649,7 +1648,7 @@ class NzbObject(TryList):

        # dupe check off nzb contents
        if no_dupes:
-            res = history_db.have_md5sum(self.md5sum)
+            res = history_db.have_name_or_md5sum(self.final_name, self.md5sum)
            logging.debug('Dupe checking NZB in history: filename=%s, md5sum=%s, result=%s', self.filename, self.md5sum, res)
            if not res and cfg.backup_for_duplicates():
                res = sabnzbd.backup_exists(self.filename)
--- a/sabnzbd/osxmenu.py
+++ b/sabnzbd/osxmenu.py
@ -345,7 +345,6 @@ class SABnzbdDelegate(NSObject):
            pnfo_list = qnfo.list

            bytesleftprogess = 0
-            bpsnow = BPSMeter.do.get_bps()
            self.info = ""

            self.menu_queue = NSMenu.alloc().init()
@ -361,7 +360,7 @@ class SABnzbdDelegate(NSObject):
                    bytesleftprogess += pnfo.bytes_left
                    bytes = pnfo.bytes / MEBI
                    nzo_id = pnfo.nzo_id
-                    timeleft = self.calc_timeleft_(bytesleftprogess, bpsnow)
+                    timeleft = self.calc_timeleft_(bytesleftprogess, BPSMeter.do.bps)

                    job = "%s\t(%d/%d MB) %s" % (pnfo.filename, bytesleft, bytes, timeleft)
                    menu_queue_item = NSMenuItem.alloc().initWithTitle_action_keyEquivalent_(job, '', '')
--- a/sabnzbd/postproc.py
+++ b/sabnzbd/postproc.py
@ -883,17 +883,28 @@ def get_last_line(txt):


 def remove_samples(path):
-    """ Remove all files that match the sample pattern """
+    """ Remove all files that match the sample pattern
+        Skip deleting if it matches all files or there is only 1 file
+    """
+    files_to_delete = []
+    nr_files = 0
    for root, _dirs, files in os.walk(path):
-        for file_ in files:
-            if RE_SAMPLE.search(file_):
-                path = os.path.join(root, file_)
-                try:
-                    logging.info("Removing unwanted sample file %s", path)
-                    remove_file(path)
-                except:
-                    logging.error(T('Removing %s failed'), clip_path(path))
-                    logging.info("Traceback: ", exc_info=True)
+        for file_to_match in files:
+            nr_files += 1
+            if RE_SAMPLE.search(file_to_match):
+                files_to_delete.append(os.path.join(root, file_to_match))
+
+    # Make sure we skip false-positives
+    if 1 < len(files_to_delete) < nr_files:
+        for path in files_to_delete:
+            try:
+                logging.info("Removing unwanted sample file %s", path)
+                remove_file(path)
+            except:
+                logging.error(T('Removing %s failed'), clip_path(path))
+                logging.info("Traceback: ", exc_info=True)
+    else:
+        logging.info("Skipping sample-removal, false-positive")


 def rename_and_collapse_folder(oldpath, newpath, files):
--- a/scripts/Sample-PostProc.cmd
+++ b/scripts/Sample-PostProc.cmd
@ -1,15 +1,15 @@
-@echo off
-rem Example of a post processing script for SABnzbd
-
-echo.
-echo Running in directory "%~d0%~p0"
-echo.
-echo The first parameter (result-dir) = %1
-echo The second parameter (nzb-name)  = %2
-echo The third parameter (nice name)  = %3
-echo The fourth parameter (newzbin #) = %4
-echo The fifth parameter (category)   = %5
-echo The sixth parameter (group)      = %6
-echo The seventh parameter (status)   = %7
-echo The eight parameter (failure_url)= %8
-echo.
+@echo off
+rem Example of a post processing script for SABnzbd
+
+echo.
+echo Running in directory "%~d0%~p0"
+echo.
+echo The first parameter (result-dir) = %1
+echo The second parameter (nzb-name)  = %2
+echo The third parameter (nice name)  = %3
+echo The fourth parameter (newzbin #) = %4
+echo The fifth parameter (category)   = %5
+echo The sixth parameter (group)      = %6
+echo The seventh parameter (status)   = %7
+echo The eight parameter (failure_url)= %8
+echo.
--- a/win/par2/multipar/par2j.exe
+++ b/win/par2/multipar/par2j.exe
--- a/win/par2/multipar/par2j64.exe
+++ b/win/par2/multipar/par2j64.exe
--- a/win/unrar/UnRAR.exe
+++ b/win/unrar/UnRAR.exe
--- a/win/unrar/x64/UnRAR.exe
+++ b/win/unrar/x64/UnRAR.exe