Merge branch 'develop' - Update to 2.0.1

Otherwise people might not be aware of it

ABOUT.txt

@@ -1,5 +1,5 @@
 *******************************************
-*** This is SABnzbd 1.2.x               ***
+*** This is SABnzbd 2.0.1               ***
 *******************************************
 SABnzbd is an open-source cross-platform binary newsreader.
 It simplifies the process of downloading from Usenet dramatically,
@@ -12,9 +12,6 @@ and offers a complete API for third-party applications to hook into.
 There is an extensive Wiki on the use of SABnzbd.
 https://sabnzbd.org/wiki/
 
-IMPORTANT INFORMATION about release 1.x.x:
-https://sabnzbd.org/wiki/new-features-and-changes
-
 Please also read the file "ISSUES.txt"
 
 The organization of the download queue is different from 0.7.x (and older).

INSTALL.txt

@@ -1,4 +1,4 @@
-                                SABnzbd 1.2.0
+                                SABnzbd 2.0.1
 
 -------------------------------------------------------------------------------
 0) LICENSE
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 -------------------------------------------------------------------------------
-1) INSTALL with the Win32 installer
+1) INSTALL with the Windows installer
 -------------------------------------------------------------------------------
 Just run the downloaded EXE file and the installer will start.
 It's just a simple standard installer.
@@ -32,7 +32,7 @@ Use the "Help" button in the web-interface to be directed to the Help Wiki.
 
 
 -------------------------------------------------------------------------------
-2) INSTALL pre-built Win32 binaries
+2) INSTALL pre-built Windows binaries
 -------------------------------------------------------------------------------
 Unzip pre-built version to any folder of your liking.
 Start the SABnzbd.exe program.
@@ -41,11 +41,11 @@ Use the "Help" button in the web-interface to be directed to the Help Wiki.
 
 
 -------------------------------------------------------------------------------
-3) INSTALL pre-built OSX binaries
+3) INSTALL pre-built macOS binaries
 -------------------------------------------------------------------------------
 Download the DMG file, mount and drag the SABnzbd icon to Programs.
 Just like you do with so many apps.
-Make sure you pick the right folder, depending on your OSX version.
+Make sure you pick the right folder, depending on your macOS version.
 
 
 -------------------------------------------------------------------------------
@@ -55,12 +55,9 @@ Make sure you pick the right folder, depending on your OSX version.
 You need to have Python installed plus some non-standard Python modules
 and a few tools.
 
-Unix/Linux/OSX
+Unix/Linux/macOS
     Python-2.7.latest       http://www.python.org (2.7.9+ recommended)
 
-OSX Mavericks or newer
-    Apple Python 2.7        Included in OSX (default)
-
 Windows
     Python-2.7.latest       http://www.python.org (2.7.9+ recommended)
     PyWin32                 use "pip install pypiwin32"
@@ -68,20 +65,20 @@ Windows
 Essential modules
     cheetah-2.0.1+          use "pip install cheetah"
     par2cmdline >= 0.4      http://parchive.sourceforge.net/
-                            Note: https://sabnzbd.org/wiki/configuration/1.2/switches#par2cmdline
+                            Note: https://sabnzbd.org/wiki/configuration/2.0/switches#par2cmdline
+                            And: https://sabnzbd.org/wiki/installation/multicore-par2
     unrar >= 5.00+          http://www.rarlab.com/rar_add.htm
 
 Optional modules
     unzip >= 6.00           http://www.info-zip.org/
     7zip >= 9.20            http://www.7zip.org/
-    yenc module >= 0.4      use "pip install yenc"
-                            https://sabnzbd.org/wiki/installation/yenc-0.4_py2.7.rar (Win32-only)
-    openssl => 1.0.0        http://www.openssl.org/
+    sabyenc == 3.0.2        use "pip install sabyenc" - https://sabnzbd.org/sabyenc
+    openssl >= 1.0.0        http://www.openssl.org/
                             v0.9.8 will work, but limits certificate validation
-    cryptography >= 1.2     use "pip install cryptography"
+    cryptography >= 1.0     use "pip install cryptography"
                             Enables certificate generation and detection of encrypted RAR-files
 
-Optional modules Unix/Linux/OSX
+Optional modules Unix/Linux/macOS
     pynotify                Should be part of GTK for Python support on Debian/Ubuntu
                             If not, you cannot use the NotifyOSD feature.
     python-dbus             Enable option to Shutdown/Restart/Standby PC on queue finish.

ISSUES.txt

@@ -24,13 +24,13 @@
   For these the server blocking method is not very favourable.
   There is an INI-only option that will limit blocks to 1 minute.
       no_penalties = 1
-  See: https://sabnzbd.org/wiki/configuration/1.2/special
+  See: https://sabnzbd.org/wiki/configuration/2.0/special
 
 - Some third-party utilties try to probe SABnzbd API in such a way that you will
   often see warnings about unauthenticated access.
   If you are sure these probes are harmless, you can suppress the warnings by
   setting the option "api_warnings" to 0.
-  See: https://sabnzbd.org/wiki/configuration/1.2/special
+  See: https://sabnzbd.org/wiki/configuration/2.0/special
 
 - On OSX you may encounter downloaded files with foreign characters.
   The par2 repair may fail when the files were created on a Windows system.
@@ -41,7 +41,7 @@
   You will see this only when downloaded files contain accented characters.
   You need to fix it yourself by running the convmv utility (available for most Linux platforms).
   Possible the file system override setting 'fsys_type' might be solve things:
-  See: https://sabnzbd.org/wiki/configuration/1.2/special
+  See: https://sabnzbd.org/wiki/configuration/2.0/special
 
 - The "Watched Folder" sometimes fails to delete the NZB files it has
   processed. This happens when other software still accesses these files.
@@ -81,4 +81,4 @@
   - Squeeze Linux
   There is a "special" option that will allow you to select an alternative library.
       use_pickle = 1
-  See: https://sabnzbd.org/wiki/configuration/1.2/special
+  See: https://sabnzbd.org/wiki/configuration/2.0/special

PKG-INFO

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

README.md

@@ -1,37 +1,25 @@
 SABnzbd - The automated Usenet download tool
 ============================================
 
-This Unicode release is not compatible with 0.7.x queues!
-
-There is also an issue with upgrading of the "sabnzbd.ini" file.
-Make sure that you have a backup!
-
-Saved queues may not be compatible after updates.
-
-----
-
 SABnzbd is an Open Source Binary Newsreader written in Python.
 
 It's totally free, incredibly easy to use, and works practically everywhere.
-
-SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add an .nzb. SABnzbd takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction.
-
+SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add an `.nzb`. SABnzbd takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction.
 If you want to know more you can head over to our website: http://sabnzbd.org.
 
 ## Resolving Dependencies
 
-SABnzbd has a good deal of dependencies you'll need before you can get running. If you've previously run SABnzbd from one of the various Linux packages floating around (Ubuntu, Debian, Fedora, etc), then you likely already have all the needed dependencies. If not, here's what you're looking for:
+SABnzbd has a good deal of dependencies you'll need before you can get running. If you've previously run SABnzbd from one of the various Linux packages, then you likely already have all the needed dependencies. If not, here's what you're looking for:
 
 - `python` (only 2.7.x and higher, but not 3.x.x)
 - `python-cheetah`
 - `python-support`
-- `par2` (Multi-threaded par2 installation guide can be found [here](https://forums.sabnzbd.org/viewtopic.php?f=16&t=18793#p99702))
+- `par2` (Multi-threaded par2 installation guide can be found [here](https://sabnzbd.org/wiki/installation/multicore-par2))
 - `unrar` (Make sure you get the "official" non-free version of unrar)
+- `sabyenc` (installation guide can be found [here](https://sabnzbd.org/sabyenc))
 
 Optional:
-
 - `python-cryptography` (enables certificate generation and detection of encrypted RAR-files during download)
-- `python-yenc`
 - `python-dbus` (enable option to Shutdown/Restart/Standby PC on queue finish)
 - `7zip`
 - `unzip`
@@ -43,13 +31,13 @@ Your package manager should supply these. If not, we've got links in our more in
 Once you've sorted out all the dependencies, simply run:
 
 ```
-python SABnzbd.py
+python -OO SABnzbd.py
 ```
 
 Or, if you want to run in the background:
 
 ```
-python SABnzbd.py -d -f /path/to/sabnzbd.ini
+python -OO SABnzbd.py -d -f /path/to/sabnzbd.ini
 ```
 
 If you want multi-language support, run:
@@ -68,9 +56,9 @@ Basically:
 - `develop` is the target for integration and is **not** intended for end-users.
 - `1.1.x` is a release and maintenance branch for 1.1.x (1.1.0 -> 1.1.1 -> 1.1.2) and is **not** intended for end-users.
 - `feature/my_feature` is a temporary feature branch based on `develop`.
-- `hotfix/my_hotfix` is an optional temporary branch for bugfix(es) based on `develop`.
+- `bugfix/my_bugfix` is an optional temporary branch for bugfix(es) based on `develop`.
 
-Condtions:
+Conditions:
 - Merging of a stable release into `master` will be simple: the release branch is always right.
 - `master` is not merged back to `develop`.
 - `develop` is not re-based on `master`.

README.mkd

@@ -1,77 +1,56 @@
-Release Notes  -  SABnzbd 1.2.0
-====================================
+Release Notes  -  SABnzbd 2.0.1
+=========================================================
 
-## What's new in 1.2.0
-- New SSL engine:
-  * SSL connections will always negotiate strongest encryption available
-  * Strict verification of certificates (optional)
-  * Set custom SSL-Ciphers to increase performance (lowers encryption strength)
-  * Detail information in Status window on type of encryption used
-  * Webserver can use stronger encryption for HTTPS connections
-- New RAR-file processing with full support for RAR5:
-  * All passwords are now tried on the first complete RAR-file during download
-  * RAR-based verification when no par2-files or SFV-files are available
-- Improvements to Categories processing:
-  * Matching of start of category inside NZB with user-categories
-    For example 'Movies > HD' will match a 'movies' category
-  * Categories can now be ordered to customize matching to categories in NZB's
-- Improvements to RSS feed management:
-  * Multiple feeds can now share the same set of filters
-  * Added 'From Show SxxEyy' filter
-  * Feeds will only re-evaluate after clicking 'Apply Filters' or 'Read Feed'
-  * Information from newznab, nZEDb and nntmux tags used (age, size and show info)
-  * Feeds now show the category, age and when the NZB was added to the queue
-- Detection of par2-files in completely obfuscated NZB's
-- Verification (par2) and UnRAR can now be aborted from Glitter
-- Faster startup and restart of SABnzbd
-- Duplicates can now be marked as Failed (to notify external tools)
-- Config Search function
+## Changes since 2.0.0
+- No longer change ports if the configured port is not available during startup.
+- 'Proof' files also ignored when Ignore Samples is enabled.
+- Redundant SFV and RAR checks no longer performed if par2 verification failed.
+- More repair/unpack info is retained in the History information.
+- Windows: remove option to start SABnzbd from installer, it would start the
+  program as administrator.
 
-## Changes:
-- Python post/pre/notification-scripts now require execute (+x) permissions
-- Dropped dependency on PyOpenSSL, now only requires cryptography package
-- Update 7zip to 16.04 and UnRar to 5.40 for Windows/macOS
-- Update Python to 2.7.13 on Windows and macOS binaries
-- CherryPy logging only enabled when forced via command line
-- Not having C yEnc module will trigger warning on startup
+## Bugfixes since 2.0.0
+- Some users experienced slower download speeds.
+- Revert changes to handling of missing articles introduced in 2.0.0 that
+  turned out to be slow for some users.
+- Missing first par2-file would cause repair to be skipped.
+- Better handling of 7zip unpacking.
+- Log X-Forwarded-For of API calls and logins.
+- Handle more URLGrabber exceptions.
+- Command-line parameters were not listed correctly.
+- Queue-finish-action picker in Glitter more stable.
+- Custom Pause interpreter in Glitter more reliable.
+- Pre-check would fail if download was on SMBv3 share.
+- Windows: NZB-icon association lost sometimes.
+- Windows: Unrar could fail on some archives containing very long paths.
 
-## Bug fixes
-- Re-use IP-address for new connections when a server has open connections
-- Auto-disables CPU-usage optimizations if they result in slowdown
-- no_penalties now applies to all types of penalties
-- par2cmdline would fail jobs in folders ending on ".par2"
-- Fix problem where memory usage wasn't correctly limited, causing MemoryError's
-- Removing files from active download was not working correctly
-- Accept & fail for pre-queue script was not working correctly
-- Recursive unpack failed on Windows with very long paths
-- Problems loading Notifications page with Scripts Folder set
-
-## Translations
-- Many translations updated, thanks to our translators!
-
-## About
-  SABnzbd is an open-source cross-platform binary newsreader.
-  It simplifies the process of downloading from Usenet dramatically,
-  thanks to its web-based user interface and advanced
-  built-in post-processing options that automatically verify, repair,
-  extract and clean up posts downloaded from Usenet.
-
-  (c) Copyright 2007-2017 by "The SABnzbd-team" \<team@sabnzbd.org\>
-
-### IMPORTANT INFORMATION about release 1.x.x
-<https://sabnzbd.org/wiki/new-features-and-changes>
-
-### Known problems and solutions
-- Read the file "ISSUES.txt"
-
-### Upgrading from 0.7.x and older
+## Upgrading from 0.7.x and older
 - Finish queue
 - Stop SABnzbd
 - Install new version
 - Start SABnzbd
 
-The organization of the download queue is different from older versions.
-1.x.x will not see the existing queue, but you can go to
-Status->QueueRepair and "Repair" the old queue.
-Also, your sabnzbd.ini file will be upgraded, making it
-incompatible with releases older than 0.7.9
+## Upgrade notices
+- Windows: When starting the Post-Processing script, the path to the job folder
+  is no longer in short-path notation but includes the full path. To support
+  long paths (>255), you might need to alter them to long-path notation (\\?\).
+- Schedule items are converted when upgrading to 2.x.x and will break when
+  reverted back to pre-2.x.x releases.
+- The organization of the download queue is different from 0.7.x releases.
+  So 2.x.x will not see the existing queue, but you can go to Status->Queue Repair
+  and "Repair" the old queue.
+
+## Known problems and solutions
+- Read the file "ISSUES.txt"
+
+## Translations
+- Numerous translations updated, thanks to our translators!
+
+## About
+  SABnzbd is an open-source cross-platform binary newsreader.
+  It simplifies the process of downloading from Usenet dramatically, thanks
+  to its web-based user interface and advanced built-in post-processing options
+  that automatically verify, repair, extract and clean up posts downloaded
+  from Usenet.
+
+  (c) Copyright 2007-2017 by "The SABnzbd-team" \<team@sabnzbd.org\>

SABnzbd.py

@@ -91,7 +91,7 @@ from sabnzbd.misc import real_path, \
     split_host, get_ext, create_https_certificates, \
     windows_variant, ip_extract, set_serv_parms, get_serv_parms, globber_full
 from sabnzbd.panic import panic_tmpl, panic_port, panic_host, panic_fwall, \
-    panic_sqlite, panic, launch_a_browser, panic_xport
+    panic_sqlite, panic, launch_a_browser
 import sabnzbd.scheduler as scheduler
 import sabnzbd.config as config
 import sabnzbd.cfg
@@ -130,24 +130,6 @@ def guard_loglevel():
     LOG_FLAG = True
 
 
-class FilterCP3:
-    # Filter out all CherryPy3-Access logging that we receive,
-    # because we have the root logger
-
-    def __init__(self):
-        pass
-
-    def filter(self, record):
-        _cplogging = record.module == '_cplogging'
-        # Python2.4 fix
-        # record has no attribute called funcName under python 2.4
-        if hasattr(record, 'funcName'):
-            access = record.funcName == 'access'
-        else:
-            access = True
-        return not (_cplogging and access)
-
-
 class guiHandler(logging.Handler):
     """ Logging handler collects the last warnings/errors/exceptions
         to be displayed in the web-gui
@@ -202,10 +184,9 @@ def print_help():
     print "  -f  --config-file <ini>  Location of config file"
     print "  -s  --server <srv:port>  Listen on server:port [*]"
     print "  -t  --templates <templ>  Template directory [*]"
-    print "  -2  --template2 <templ>  Secondary template dir [*]"
     print
     print "  -l  --logging <0..2>     Set logging level (-1=off, 0= least, 2= most) [*]"
-    print "  -w  --weblogging <0..2>  Set cherrypy logging (0= off, 1= on, 2= file-only) [*]"
+    print "  -w  --weblogging         Enable cherrypy access logging"
     print
     print "  -b  --browser <0..1>     Auto browser launch (0= off, 1= on) [*]"
     if sabnzbd.WIN32:
@@ -215,7 +196,6 @@ def print_help():
         print "      --pid <path>         Create a PID file in the given folder (full path)"
         print "      --pidfile <path>     Create a PID file with the given name (full path)"
     print
-    print "      --force              Discard web-port timeout (see Wiki!)"
     print "  -h  --help               Print this message"
     print "  -v  --version            Print version information"
     print "  -c  --clean              Remove queue, cache and logs"
@@ -224,6 +204,7 @@ def print_help():
     print "      --repair-all         Try to reconstruct the queue from the incomplete folder"
     print "                           with full data reconstruction"
     print "      --https <port>       Port to use for HTTPS server"
+    print "      --no-login           Start with username and password reset"
     print "      --log-all            Log all article handling (for developers)"
     print "      --console            Force console logging for OSX app"
     print "      --new                Run a new instance of SABnzbd"
@@ -274,9 +255,7 @@ def Bail_Out(browserhost, cherryport, err=''):
     """ Abort program because of CherryPy troubles """
     logging.error(T('Failed to start web-interface') + ' : ' + str(err))
     if not sabnzbd.DAEMON:
-        if '13' in err:
-            panic_xport(browserhost, cherryport)
-        elif '49' in err:
+        if '49' in err:
             panic_host(browserhost, cherryport)
         else:
             panic_port(browserhost, cherryport)
@@ -304,9 +283,6 @@ def Web_Template(key, defweb, wdir):
     logging.info("Web dir is %s", full_dir)
 
     if not os.path.exists(full_main):
-        # Temporarily fix that allows missing Config
-        if defweb == DEF_STDCONFIG:
-            return ''
         # end temp fix
         logging.warning(T('Cannot find web template: %s, trying standard template'), full_main)
         full_dir = real_path(sabnzbd.DIR_INTERFACES, DEF_STDINTF)
@@ -316,8 +292,6 @@ def Web_Template(key, defweb, wdir):
             panic_tmpl(full_dir)
             exit_sab(1)
 
-    # sabnzbd.lang.install_language(real_path(full_dir, DEF_INT_LANGUAGE), sabnzbd.cfg.language(), wdir)
-
     return real_path(full_dir, "templates")
 
 
@@ -428,13 +402,26 @@ def GetProfileInfo(vista_plus):
 
 def print_modules():
     """ Log all detected optional or external modules """
-    if sabnzbd.decoder.HAVE_YENC:
-        logging.info("_yenc module... found!")
+    if sabnzbd.decoder.SABYENC_ENABLED:
+        # Yes, we have SABYenc, and it's the correct version, so it's enabled
+        logging.info("SABYenc module (v%s)... found!", sabnzbd.constants.SABYENC_VERSION_REQUIRED)
     else:
-        logging.warning(T('_yenc module... NOT found!'))
+        # Something wrong with SABYenc, so let's determine and print what:
+        if sabnzbd.decoder.SABYENC_VERSION:
+            # We have a VERSION, thus a SABYenc module, but it's not the correct version
+            logging.warning(T("SABYenc disabled: no correct version found! (Found v%s, expecting v%s)") % (sabnzbd.decoder.SABYENC_VERSION, sabnzbd.constants.SABYENC_VERSION_REQUIRED))
+        else:
+            # No SABYenc module at all
+            logging.warning(T("SABYenc module... NOT found! Expecting v%s - https://sabnzbd.org/sabyenc") % sabnzbd.constants.SABYENC_VERSION_REQUIRED)
+
+        # No correct SABYenc version or no SABYenc at all, so now we care about old-yEnc
+        if sabnzbd.decoder.HAVE_YENC:
+            logging.info("_yenc module... found!")
+        else:
+            logging.error(T('_yenc module... NOT found!'))
 
     if sabnzbd.HAVE_CRYPTOGRAPHY:
-        logging.info('Cryptography module... found!')
+        logging.info('Cryptography module (v%s)... found!', sabnzbd.HAVE_CRYPTOGRAPHY)
     else:
         logging.info('Cryptography module... NOT found!')
 
@@ -449,8 +436,15 @@ def print_modules():
     if sabnzbd.newsunpack.RAR_COMMAND:
         logging.info("UNRAR binary... found (%s)", sabnzbd.newsunpack.RAR_COMMAND)
 
+        # Report problematic unrar
+        if sabnzbd.newsunpack.RAR_PROBLEM and not sabnzbd.cfg.ignore_wrong_unrar():
+            have_str = '%.2f' % (float(sabnzbd.newsunpack.RAR_VERSION) / 100)
+            want_str = '%.2f' % (float(sabnzbd.constants.REC_RAR_VERSION) / 100)
+            logging.warning(T('Your UNRAR version is %s, we recommend version %s or higher.<br />') % (have_str, want_str))
+        elif not (sabnzbd.WIN32 or sabnzbd.DARWIN):
+            logging.debug('UNRAR binary version %.2f', (float(sabnzbd.newsunpack.RAR_VERSION) / 100))
     else:
-        logging.warning(T('unrar binary... NOT found'))
+        logging.error(T('unrar binary... NOT found'))
 
     if sabnzbd.newsunpack.ZIP_COMMAND:
         logging.info("unzip binary... found (%s)", sabnzbd.newsunpack.ZIP_COMMAND)
@@ -492,6 +486,9 @@ def all_localhosts():
     ips = []
     for item in info:
         item = item[4][0]
+        # Avoid problems on strange Linux settings
+        if not isinstance(item, basestring):
+            continue
         # Only return IPv6 when enabled
         if item not in ips and ('::1' not in item or sabnzbd.cfg.ipv6_hosting()):
             ips.append(item)
@@ -648,7 +645,7 @@ def attach_server(host, port, cert=None, key=None, chain=None):
         http_server = cherrypy._cpserver.Server()
         http_server.bind_addr = (host, port)
         if cert and key:
-            http_server.ssl_provider = 'builtin'
+            http_server.ssl_module = 'builtin'
             http_server.ssl_certificate = cert
             http_server.ssl_private_key = key
             http_server.ssl_certificate_chain = chain
@@ -673,7 +670,7 @@ def find_free_port(host, currentport):
     n = 0
     while n < 10 and currentport <= 49151:
         try:
-            cherrypy.process.servers.check_port(host, currentport, timeout=0.1)
+            cherrypy.process.servers.check_port(host, currentport, timeout=0.025)
             return currentport
         except:
             currentport += 5
@@ -775,9 +772,9 @@ def commandline_handler(frozen=True):
     info.extend(sys.argv[slice:])
 
     try:
-        opts, args = getopt.getopt(info, "phdvncw:l:s:f:t:b:2:",
+        opts, args = getopt.getopt(info, "phdvncwl:s:f:t:b:2:",
                                    ['pause', 'help', 'daemon', 'nobrowser', 'clean', 'logging=',
-                                    'weblogging=', 'server=', 'templates', 'ipv6_hosting=',
+                                    'weblogging', 'server=', 'templates', 'ipv6_hosting=',
                                     'template2', 'browser=', 'config-file=', 'force',
                                     'version', 'https=', 'autorestarted', 'repair', 'repair-all',
                                     'log-all', 'no-login', 'pid=', 'new', 'console', 'pidfile=',
@@ -842,10 +839,8 @@ def main():
     clean_up = False
     logging_level = None
     web_dir = None
-    web_dir2 = None
     vista_plus = False
     vista64 = False
-    force_web = False
     repair = 0
     api_url = None
     no_login = False
@@ -876,8 +871,6 @@ def main():
             exit_sab(0)
         elif opt in ('-t', '--templates'):
             web_dir = arg
-        elif opt in ('-2', '--template2'):
-            web_dir2 = arg
         elif opt in ('-s', '--server'):
             (cherryhost, cherryport) = split_host(arg)
         elif opt in ('-n', '--nobrowser'):
@@ -892,13 +885,7 @@ def main():
         elif opt in ('-c', '--clean'):
             clean_up = True
         elif opt in ('-w', '--weblogging'):
-            try:
-                cherrypylogging = int(arg)
-            except:
-                cherrypylogging = -1
-            if cherrypylogging < 0 or cherrypylogging > 2:
-                print_help()
-                exit_sab(1)
+            cherrypylogging = True
         elif opt in ('-l', '--logging'):
             try:
                 logging_level = int(arg)
@@ -912,9 +899,6 @@ def main():
             exit_sab(0)
         elif opt in ('-p', '--pause'):
             pause = True
-        elif opt in ('--force',):
-            force_web = True
-            sabnzbd.RESTART_ARGS.append(opt)
         elif opt in ('--https',):
             https_port = int(arg)
             sabnzbd.RESTART_ARGS.append(opt)
@@ -1032,13 +1016,13 @@ def main():
     if sabnzbd.DAEMON:
         if enable_https and https_port:
             try:
-                cherrypy.process.servers.check_port(cherryhost, https_port, timeout=0.1)
+                cherrypy.process.servers.check_port(cherryhost, https_port, timeout=0.05)
             except IOError, error:
                 Bail_Out(browserhost, cherryport)
             except:
                 Bail_Out(browserhost, cherryport, '49')
         try:
-            cherrypy.process.servers.check_port(cherryhost, cherryport, timeout=0.1)
+            cherrypy.process.servers.check_port(cherryhost, cherryport, timeout=0.05)
         except IOError, error:
             Bail_Out(browserhost, cherryport)
         except:
@@ -1051,55 +1035,62 @@ def main():
         if url and check_for_sabnzbd(url, upload_nzbs, autobrowser):
             exit_sab(0)
 
-    # If an instance of sabnzbd(same version) is already running on this port, launch the browser
-    # If another program or sabnzbd version is on this port, try 10 other ports going up in a step of 5
-    # If 'Port is not bound' (firewall) do not do anything (let the script further down deal with that).
-    notify_port_change = False
-
     # SSL
     if enable_https:
         port = https_port or cherryport
         try:
-            cherrypy.process.servers.check_port(browserhost, port, timeout=0.1)
+            cherrypy.process.servers.check_port(browserhost, port, timeout=0.05)
         except IOError, error:
             if str(error) == 'Port not bound.':
                 pass
             else:
                 if not url:
                     url = 'https://%s:%s/sabnzbd/api?' % (browserhost, port)
-                if not sabnzbd.cfg.fixed_ports():
-                    if new_instance or not check_for_sabnzbd(url, upload_nzbs, autobrowser):
-                        newport = find_free_port(browserhost, port)
-                        if newport > 0:
+                if new_instance or not check_for_sabnzbd(url, upload_nzbs, autobrowser):
+                    # Bail out if we have fixed our ports after first start-up
+                    if sabnzbd.cfg.fixed_ports():
+                        Bail_Out(browserhost, cherryport)
+                    # Find free port to bind
+                    newport = find_free_port(browserhost, port)
+                    if newport > 0:
+                        # Save the new port
+                        if https_port:
+                            https_port = newport
                             sabnzbd.cfg.https_port.set(newport)
-                            notify_port_change = True
-                            if https_port:
-                                https_port = newport
-                            else:
-                                http_port = newport
+                        else:
+                            # In case HTTPS == HTTP port
+                            http_port = newport
+                            sabnzbd.cfg.port.set(newport)
         except:
+            # Something else wrong, probably badly specified host
             Bail_Out(browserhost, cherryport, '49')
 
     # NonSSL check if there's no HTTPS or we only use 1 port
     if not (enable_https and not https_port):
         try:
-            cherrypy.process.servers.check_port(browserhost, cherryport, timeout=0.1)
+            cherrypy.process.servers.check_port(browserhost, cherryport, timeout=0.05)
         except IOError, error:
             if str(error) == 'Port not bound.':
                 pass
             else:
                 if not url:
                     url = 'http://%s:%s/sabnzbd/api?' % (browserhost, cherryport)
-                if not sabnzbd.cfg.fixed_ports():
-                    if new_instance or not check_for_sabnzbd(url, upload_nzbs, autobrowser):
-                        port = find_free_port(browserhost, cherryport)
-                        if port > 0:
-                            sabnzbd.cfg.cherryport.set(port)
-                            notify_port_change = True
-                            cherryport = port
+                if new_instance or not check_for_sabnzbd(url, upload_nzbs, autobrowser):
+                    # Bail out if we have fixed our ports after first start-up
+                    if sabnzbd.cfg.fixed_ports():
+                        Bail_Out(browserhost, cherryport)
+                    # Find free port to bind
+                    port = find_free_port(browserhost, cherryport)
+                    if port > 0:
+                        sabnzbd.cfg.cherryport.set(port)
+                        cherryport = port
         except:
+            # Something else wrong, probably badly specified host
             Bail_Out(browserhost, cherryport, '49')
 
+    # We found a port, now we never check again
+    sabnzbd.cfg.fixed_ports.set(True)
+
     if logging_level is None:
         logging_level = sabnzbd.cfg.log_level()
     else:
@@ -1133,7 +1124,6 @@ def main():
 
         logformat = '%(asctime)s::%(levelname)s::[%(module)s:%(lineno)d] %(message)s'
         rollover_log.setFormatter(logging.Formatter(logformat))
-        rollover_log.addFilter(FilterCP3())
         sabnzbd.LOGHANDLER = rollover_log
         logger.addHandler(rollover_log)
         logger.setLevel(LOGLEVELS[logging_level + 1])
@@ -1163,7 +1153,6 @@ def main():
 
             if consoleLogging:
                 console = logging.StreamHandler()
-                console.addFilter(FilterCP3())
                 console.setLevel(LOGLEVELS[logging_level + 1])
                 console.setFormatter(logging.Formatter(logformat))
                 logger.addHandler(console)
@@ -1192,11 +1181,18 @@ def main():
         logging.info('Platform = %s', os.name)
     logging.info('Python-version = %s', sys.version)
     logging.info('Arguments = %s', sabnzbd.CMDLINE)
+
+    # Find encoding; relevant for unrar activities
     try:
-        logging.info('Preferred encoding = %s', locale.getpreferredencoding())
+        preferredencoding = locale.getpreferredencoding()
+        logging.info('Preferred encoding = %s', preferredencoding)
     except:
         logging.info('Preferred encoding = ERROR')
+        preferredencoding = ''
 
+    # On Linux/FreeBSD/Unix "UTF-8" is strongly, strongly adviced:
+    if not sabnzbd.WIN32 and not sabnzbd.DARWIN and not ('utf' in preferredencoding.lower() and '8' in preferredencoding.lower()):
+        logging.warning(T("SABnzbd was started with encoding %s, this should be UTF-8. Expect problems with Unicoded file and directory names in downloads.") % preferredencoding)
 
     if sabnzbd.cfg.log_level() > 1:
         from sabnzbd.getipaddress import localipv4, publicipv4, ipv6
@@ -1230,17 +1226,6 @@ def main():
         if cpumodel:
             logging.debug('CPU model name is %s', cpumodel)
 
-    # OSX 10.5 I/O priority setting
-    if sabnzbd.DARWIN:
-        logging.info('[osx] IO priority setting')
-        try:
-            from ctypes import cdll
-            libc = cdll.LoadLibrary('/usr/lib/libc.dylib')
-            boolSetResult = libc.setiopolicy_np(0, 1, 3)  # @UnusedVariable
-            logging.info('[osx] IO priority set to throttle for process scope')
-        except:
-            logging.info('[osx] IO priority setting not supported')
-
     logging.info('Read INI file %s', inifile)
 
     if autobrowser is not None:
@@ -1256,22 +1241,12 @@ def main():
 
     os.chdir(sabnzbd.DIR_PROG)
 
-    web_dir = Web_Template(sabnzbd.cfg.web_dir, DEF_STDINTF, fix_webname(web_dir))
-    web_dir2 = Web_Template(sabnzbd.cfg.web_dir2, '', fix_webname(web_dir2))
-    web_dirc = Web_Template(None, DEF_STDCONFIG, '')
+    sabnzbd.WEB_DIR = Web_Template(sabnzbd.cfg.web_dir, DEF_STDINTF, fix_webname(web_dir))
+    sabnzbd.WEB_DIR_CONFIG = Web_Template(None, DEF_STDCONFIG, '')
+    sabnzbd.WIZARD_DIR = os.path.join(sabnzbd.DIR_INTERFACES, 'wizard')
 
-    wizard_dir = os.path.join(sabnzbd.DIR_INTERFACES, 'wizard')
-    # sabnzbd.lang.install_language(os.path.join(wizard_dir, DEF_INT_LANGUAGE), sabnzbd.cfg.language(), 'wizard')
-
-    sabnzbd.WEB_DIR = web_dir
-    sabnzbd.WEB_DIR2 = web_dir2
-    sabnzbd.WEB_DIRC = web_dirc
-    sabnzbd.WIZARD_DIR = wizard_dir
-
-    sabnzbd.WEB_COLOR = CheckColor(sabnzbd.cfg.web_color(), web_dir)
+    sabnzbd.WEB_COLOR = CheckColor(sabnzbd.cfg.web_color(), sabnzbd.WEB_DIR)
     sabnzbd.cfg.web_color.set(sabnzbd.WEB_COLOR)
-    sabnzbd.WEB_COLOR2 = CheckColor(sabnzbd.cfg.web_color2(), web_dir2)
-    sabnzbd.cfg.web_color2.set(sabnzbd.WEB_COLOR2)
 
     if fork and not sabnzbd.WIN32:
         daemonize()
@@ -1299,23 +1274,6 @@ def main():
     logging.info("SSL version %s", sabnzbd.utils.sslinfo.ssl_version())
     logging.info("SSL supported protocols %s", str(sabnzbd.utils.sslinfo.ssl_protocols_labels()))
 
-    cherrylogtoscreen = False
-    sabnzbd.WEBLOGFILE = None
-
-    if cherrypylogging:
-        if logdir:
-            sabnzbd.WEBLOGFILE = os.path.join(logdir, DEF_LOG_CHERRY)
-        # Define our custom logger for cherrypy errors
-        cherrypy_logging(sabnzbd.WEBLOGFILE, logging.handlers.RotatingFileHandler)
-        if not fork:
-            try:
-                x = sys.stderr.fileno
-                x = sys.stdout.fileno
-                if cherrypylogging == 1:
-                    cherrylogtoscreen = True
-            except:
-                pass
-
     https_cert = sabnzbd.cfg.https_cert.get_path()
     https_key = sabnzbd.cfg.https_key.get_path()
     https_chain = sabnzbd.cfg.https_chain.get_path()
@@ -1355,7 +1313,7 @@ def main():
             cherryport = https_port
         elif multilocal:
             # Extra HTTPS port for secondary localhost
-            attach_server(hosts[1], cherryport, https_cert, https_key)
+            attach_server(hosts[1], cherryport, https_cert, https_key, https_chain)
 
         cherrypy.config.update({'server.ssl_module': 'builtin',
                                 'server.ssl_certificate': https_cert,
@@ -1382,60 +1340,49 @@ def main():
                             'server.socket_host': cherryhost,
                             'server.socket_port': cherryport,
                             'server.shutdown_timeout': 0,
-                            'log.screen': cherrylogtoscreen,
+                            'log.screen': False,
                             'engine.autoreload.on': False,
                             'tools.encode.on': True,
                             'tools.gzip.on': True,
                             'tools.gzip.mime_types': mime_gzip,
                             'request.show_tracebacks': True,
-                            'checker.check_localhost': bool(consoleLogging),
                             'error_page.401': sabnzbd.panic.error_page_401,
                             'error_page.404': sabnzbd.panic.error_page_404
                             })
 
-    forced_mime_types = {'css': 'text/css', 'js': 'application/javascript'}
-    static = {'tools.staticdir.on': True, 'tools.staticdir.dir': os.path.join(web_dir, 'static'), 'tools.staticdir.content_types': forced_mime_types}
-    staticcfg = {'tools.staticdir.on': True, 'tools.staticdir.dir': os.path.join(web_dirc, 'staticcfg'), 'tools.staticdir.content_types': forced_mime_types}
-    wizard_static = {'tools.staticdir.on': True, 'tools.staticdir.dir': os.path.join(wizard_dir, 'static'), 'tools.staticdir.content_types': forced_mime_types}
 
-    appconfig = {'/sabnzbd/api': {'tools.basic_auth.on': False},
-                 '/api': {'tools.basic_auth.on': False},
-                 '/m/api': {'tools.basic_auth.on': False},
+    # Do we want CherryPy Logging? Cannot be done via the config
+    if cherrypylogging:
+        sabnzbd.WEBLOGFILE = os.path.join(logdir, DEF_LOG_CHERRY)
+        cherrypy.log.screen = True
+        cherrypy.log.access_log.propagate = True
+        cherrypy.log.access_file = str(sabnzbd.WEBLOGFILE)
+    else:
+        cherrypy.log.access_log.propagate = False
+
+    # Force mimetypes (OS might overwrite them)
+    forced_mime_types = {'css': 'text/css', 'js': 'application/javascript'}
+
+    static = {'tools.staticdir.on': True, 'tools.staticdir.dir': os.path.join(sabnzbd.WEB_DIR, 'static'), 'tools.staticdir.content_types': forced_mime_types}
+    staticcfg = {'tools.staticdir.on': True, 'tools.staticdir.dir': os.path.join(sabnzbd.WEB_DIR_CONFIG, 'staticcfg'), 'tools.staticdir.content_types': forced_mime_types}
+    wizard_static = {'tools.staticdir.on': True, 'tools.staticdir.dir': os.path.join(sabnzbd.WIZARD_DIR, 'static'), 'tools.staticdir.content_types': forced_mime_types}
+
+    appconfig = {'/api': {'tools.basic_auth.on': False},
                  '/rss': {'tools.basic_auth.on': False},
-                 '/sabnzbd/rss': {'tools.basic_auth.on': False},
-                 '/m/rss': {'tools.basic_auth.on': False},
-                 '/sabnzbd/shutdown': {'streamResponse': True},
-                 '/sabnzbd/static': static,
                  '/static': static,
-                 '/sabnzbd/wizard/static': wizard_static,
                  '/wizard/static': wizard_static,
-                 '/favicon.ico': {'tools.staticfile.on': True, 'tools.staticfile.filename': os.path.join(web_dirc, 'staticcfg', 'ico', 'favicon.ico')},
-                 '/sabnzbd/staticcfg': staticcfg,
+                 '/favicon.ico': {'tools.staticfile.on': True, 'tools.staticfile.filename': os.path.join(sabnzbd.WEB_DIR_CONFIG, 'staticcfg', 'ico', 'favicon.ico')},
                  '/staticcfg': staticcfg
                  }
 
-    if web_dir2:
-        static2 = {'tools.staticdir.on': True, 'tools.staticdir.dir': os.path.join(web_dir2, 'static'), 'tools.staticdir.content_types': forced_mime_types}
-        appconfig['/sabnzbd/m/api'] = {'tools.basic_auth.on': False}
-        appconfig['/sabnzbd/m/rss'] = {'tools.basic_auth.on': False}
-        appconfig['/sabnzbd/m/shutdown'] = {'streamResponse': True}
-        appconfig['/sabnzbd/m/static'] = static2
-        appconfig['/m/static'] = static2
-        appconfig['/sabnzbd/m/wizard/static'] = wizard_static
-        appconfig['/m/wizard/static'] = wizard_static
-        appconfig['/sabnzbd/m/staticcfg'] = staticcfg
-        appconfig['/m/staticcfg'] = staticcfg
-
-    login_page = sabnzbd.interface.MainPage(web_dir, '/', web_dir2, '/m/', web_dirc, first=2)
-    cherrypy.tree.mount(login_page, '/', config=appconfig)
+    # Make available from both URLs
+    main_page = sabnzbd.interface.MainPage()
+    cherrypy.tree.mount(main_page, '/', config=appconfig)
+    cherrypy.tree.mount(main_page, '/sabnzbd/', config=appconfig)
 
     # Set authentication for CherryPy
     sabnzbd.interface.set_auth(cherrypy.config)
 
-    # Notify if port was changed
-    if notify_port_change:
-        logging.warning(T('Could not bind to configured port. Port changed to %s') % cherryport)
-
     logging.info('Starting web-interface on %s:%s', cherryhost, cherryport)
 
     sabnzbd.cfg.log_level.callback(guard_loglevel)

cherrypy/_cperror.py

@@ -214,18 +214,7 @@ class HTTPRedirect(CherryPyException):
         if isinstance(urls, text_or_bytes):
             urls = [urls]
 
-        abs_urls = []
-        for url in urls:
-            url = tonative(url, encoding or self.encoding)
-
-            # Note that urljoin will "do the right thing" whether url is:
-            #  1. a complete URL with host (e.g. "http://www.example.com/test")
-            #  2. a URL relative to root (e.g. "/dummy")
-            #  3. a URL relative to the current path
-            # Note that any query string in cherrypy.request is discarded.
-            url = _urljoin(cherrypy.url(), url)
-            abs_urls.append(url)
-        self.urls = abs_urls
+        self.urls = [tonative(url, encoding or self.encoding) for url in urls]
 
         # RFC 2616 indicates a 301 response code fits our goal; however,
         # browser support for 301 is quite messy. Do 302/303 instead. See
@@ -241,7 +230,7 @@ class HTTPRedirect(CherryPyException):
                 raise ValueError('status must be between 300 and 399.')
 
         self.status = status
-        CherryPyException.__init__(self, abs_urls, status)
+        CherryPyException.__init__(self, self.urls, status)
 
     def set_response(self):
         """Modify cherrypy.response status, headers, and body to represent

cherrypy/wsgiserver/ssl_builtin.py

@@ -82,15 +82,16 @@ class BuiltinSSLAdapter(wsgiserver.SSLAdapter):
                 if 'http request' in e.args[1]:
                     # The client is speaking HTTP to an HTTPS server.
                     raise wsgiserver.NoSSLError
-                elif 'unknown protocol' in e.args[1]:
-                    # The client is speaking some non-HTTP protocol.
-                    # Drop the conn.
-                    return None, {}
-                elif 'unknown ca' in e.args[1]:
-                    # This error is thrown by builtin SSL if Safari connects
-                    # when self-signed certificates are used. The connection
-                    # can be dropped until the users adds the exception
-                    return None, {}
+
+                # Check if it's one of the known errors
+                # Errors that are caught by PyOpenSSL, but thrown by built-in ssl
+                _block_errors = ('unknown protocol', 'unknown ca', 'unknown_ca', 'unknown error',
+                                 'https proxy request', 'inappropriate fallback', 'wrong version number',
+                                 'no shared cipher', 'certificate unknown', 'ccs received early')
+                for error_text in _block_errors:
+                    if error_text in e.args[1].lower():
+                        # Accepted error, let's pass
+                        return None, {}
             elif 'handshake operation timed out' in e.args[0]:
                 # This error is thrown by builtin SSL after a timeout
                 # when client is speaking HTTP to an HTTPS server.

interfaces/Config/templates/_inc_header_uc.tmpl

@@ -31,9 +31,9 @@
     <link rel="apple-touch-icon" sizes="180x180" href="${root}staticcfg/ico/apple-touch-icon-180x180-precomposed.png" />
     <link rel="apple-touch-icon" sizes="192x192" href="${root}staticcfg/ico/android-192x192.png" />
 
-    <link rel="stylesheet" type="text/css" href="${root}staticcfg/bootstrap/css/bootstrap.min.css" />
+    <link rel="stylesheet" type="text/css" href="${root}staticcfg/bootstrap/css/bootstrap.min.css?v=$version" />
     <link rel="stylesheet" type="text/css" href="${root}staticcfg/css/style.css?p=$pid" />
-    <link rel="shortcut icon" href="${root}staticcfg/ico/favicon.ico?v=1.1.0" />
+    <link rel="shortcut icon" href="${root}staticcfg/ico/favicon.ico?v=$version" />
 
     <script type="text/javascript">
         // Keeping track of the form state
@@ -59,9 +59,9 @@
         configTranslate.confirmLeave = "$T('confirmWithoutSavingPrompt')";
         configTranslate.searchPages = ['$T('cmenu-general')', '$T('cmenu-folders')', '$T('cmenu-switches')', '$T('cmenu-sorting')', '$T('cmenu-notif')', '$T('cmenu-special')']
     </script>
-    <script type="text/javascript" src="${root}staticcfg/js/jquery-3.1.1.min.js"></script>
-    <script type="text/javascript" src="${root}staticcfg/bootstrap/js/bootstrap.min.js"></script>
-    <script type="text/javascript" src="${root}staticcfg/js/script.js?p=$pid"></script>
+    <script type="text/javascript" src="${root}staticcfg/js/jquery-3.1.1.min.js?v=$version"></script>
+    <script type="text/javascript" src="${root}staticcfg/bootstrap/js/bootstrap.min.js?v=$version"></script>
+    <script type="text/javascript" src="${root}staticcfg/js/script.js?v=$version"></script>
     <script type="text/javascript">
         // Set default functions for the autocomplete everywhere
         \$.extend(\$.fn.typeahead.defaults, {

interfaces/Config/templates/config.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Config"#-->
-<!--#set global $help_uri="configuration/1.2/configure"#-->
+<!--#set global $help_uri="configuration/2.0/configure"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#from locale import getpreferredencoding#-->
@@ -19,10 +19,6 @@
                     <th scope="row">$T('confgFile'): </th>
                     <td>$configfn</td>
                 </tr>
-                <tr>
-                    <th scope="row">$T('cache').capitalize(): </th>
-                    <td><!--#set $msg=$T('ft-buffer@2')%($cache_art, $cache_size)#-->$msg</td>
-                </tr>
                 <tr>
                     <th scope="row">$T('parameters'): </th>
                     <td>$cmdline</td>
@@ -34,12 +30,7 @@
                 <tr>
                     <th scope="row">OpenSSL:</th>
                     <td>
-                        <!--#if $have_ssl#-->
-                            $ssl_version &nbsp; [$ssl_protocols]
-                        <!--#else#-->
-                            <span class="label label-danger">$T('notAvailable')</span>
-                            <a href="$helpuri$help_uri#no_ssl" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
-                        <!--#end if#-->
+                        $ssl_version &nbsp; [$ssl_protocols]
                     </td>
                 </tr>
                 <!--#if not $have_ssl_context#-->
@@ -50,6 +41,15 @@
                     </td>
                 </tr>
                 <!--#end if#-->
+                <!--#if not $have_mt_par2#-->
+                <tr>
+                    <th scope="row">Multicore Par2</th>
+                    <td>
+                        <span class="label label-warning">$T('notAvailable')</span> $T('explain-getpar2mt')
+                        <a href="${helpuri}installation/multicore-par2" target="_blank">${helpuri}installation/multicore-par2</a>
+                    </td>
+                </tr>
+                <!--#end if#-->
                 <!--#if not $have_cryptography #-->
                 <tr>
                     <th scope="row">Python Cryptography:</th>
@@ -59,7 +59,7 @@
                     </td>
                 </tr>
                 <!--#end if#-->
-                <!--#if not $have_yenc#-->
+                <!--#if not $have_yenc and not $have_sabyenc#-->
                 <tr>
                     <th scope="row">yEnc:</th>
                     <td>
@@ -68,6 +68,15 @@
                     </td>
                 </tr>
                 <!--#end if#-->
+                <!--#if not $have_sabyenc#-->
+                <tr>
+                    <th scope="row">SABYenc:</th>
+                    <td>
+                        <span class="label label-danger">$T('notAvailable')</span>
+                        <a href="$helpuri$help_uri#no_sabyenc" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
+                    </td>
+                </tr>
+                <!--#end if#-->
                 <!--#if not $have_unzip #-->
                 <tr>
                     <th scope="row">$T('opt-enable_unzip'):</th>

interfaces/Config/templates/config_cat.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Categories"#-->
-<!--#set global $help_uri="configuration/1.2/categories"#-->
+<!--#set global $help_uri="configuration/2.0/categories"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <div class="colmask">
     <div class="section">
@@ -17,9 +17,7 @@
                             <th>$T('category')</th>
                             <th>$T('priority')</th>
                             <th>$T('mode')</th>
-                            <!--#if $script_list#-->
                             <th>$T('script')</th>
-                            <!--#end if#-->
                             <th>$T('catFolderPath')</th>
                             <th colspan="2">$T('catTags')</th>
                         </tr>
@@ -61,17 +59,21 @@
                                     <option value="3" <!--#if $slot.pp=="3" then 'selected="selected"' else ""#-->>$T('pp-delete')</option>
                                 </select>
                             </td>
-                            <!--#if $script_list#-->
                             <td>
+                                <!--#if $scripts#-->
                                 <select name="script">
-                                    <!--#for $sc in $script_list#-->
+                                    <!--#for $sc in $scripts#-->
                                         <!--#if not ($sc == 'Default' and $slot.name == '*')#-->
                                         <option value="$sc" <!--#if $slot.script.lower()==$sc.lower() then 'selected="selected"' else ""#-->>$Tspec($sc)</option>
                                         <!--#end if#-->
                                     <!--#end for#-->
                                 </select>
+                                <!--#else#-->
+                                <select name="script" disabled>
+
+                                </select>
+                                <!--#end if#-->
                             </td>
-                            <!--#end if#-->
                             <td class="nowrap">
                                 <input type="text" name="dir" class="fileBrowserSmall" value="$slot.dir" size="20" data-initialdir="$defdir" data-title="$T('catFolderPath')" title="$T('explain-catTags2')" />
                             </td>

interfaces/Config/templates/config_folders.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Folders"#-->
-<!--#set global $help_uri="configuration/1.2/folders"#-->
+<!--#set global $help_uri="configuration/2.0/folders"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">

interfaces/Config/templates/config_general.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="General"#-->
-<!--#set global $help_uri="configuration/1.2/general"#-->
+<!--#set global $help_uri="configuration/2.0/general"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -23,6 +23,11 @@
                     <input type="number" name="port" id="port" value="$port" size="8" data-original="$port" />
                     <span class="desc">$T('explain-port')</span>
                 </div>
+                <div class="field-pair">
+                    <label class="config" for="enable_https">$T('opt-enable_https')</label>
+                    <input type="checkbox" name="enable_https" id="enable_https" value="1" <!--#if int($enable_https) > 0 then 'checked="checked"' else ""#-->/>
+                    <span class="desc">$T('explain-enable_https')</span>
+                </div>
                 <div class="field-pair">
                     <label class="config" for="web_dir">$T('opt-web_dir')</label>
                     <select name="web_dir" id="web_dir">
@@ -34,21 +39,7 @@
                         <!--#end if#-->
                     <!--#end for#-->
                     </select>
-                    <span class="desc">$T('explain-web_dir')&nbsp;&nbsp;<a href="$caller_url1">$caller_url1</a></span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="web_dir2">$T('opt-web_dir2')</label>
-                    <select name="web_dir2" id="web_dir2">
-                        <option value="None" selected="selected">$T("None")</option>
-                        <!--#for $webline in $web_list#-->
-                            <!--#if $webline.lower() == $web_dir2.lower()#-->
-                                <option value="$webline" selected="selected">$webline</option>
-                            <!--#else#-->
-                                <option value="$webline">$webline</option>
-                            <!--#end if#-->
-                        <!--#end for#-->
-                    </select>
-                    <span class="desc">$T('explain-web_dir2')&nbsp;&nbsp;<a href="$caller_url2">$caller_url2</a></span>
+                    <span class="desc">$T('explain-web_dir')&nbsp;&nbsp;<a href="$caller_url">$caller_url</a></span>
                 </div>
                 <div class="field-pair">
                     <label class="config" for="language">$T('opt-language')</label>
@@ -66,46 +57,39 @@
                        $T('explain-ask-language') <a href="https://sabnzbd.org/wiki/translate" target="_blank" class="alert-link">https://sabnzbd.org/wiki/translate</a>
                     </div>
                 </div>
-                <div class="field-pair <!--#if int($have_ssl) == 0 then "disabled" else ""#-->">
-                    <label class="config" for="enable_https">$T('opt-enable_https')</label>
-                    <input type="checkbox" name="enable_https" id="enable_https" value="1" <!--#if int($enable_https) > 0 then 'checked="checked"' else ""#--> <!--#if int($have_ssl) == 0 then "disabled" else ""#--> />
-                    <span class="desc">$T('explain-enable_https')</span>
+                <div class="field-pair advanced-settings">
+                    <h5 class="darkred nomargin">$T('base-folder'): <span class="path">$my_lcldata</span></h5>
                 </div>
-                <div id="enable_https_options" <!--#if int($enable_https) < 1 then 'style="display:none"' else ""#-->>
-                    <div class="field-pair">
-                        <h5 class="darkred nomargin">$T('base-folder'): <span class="path">$my_lcldata</span></h5>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="https_port">$T('opt-https_port')</label>
-                        <input type="number" name="https_port" id="https_port" value="$https_port" size="8" data-original="$https_port" />
-                        <span class="desc">$T('explain-https_port')</span>
-                    </div>
-
-                    <div class="field-pair">
-                        <label class="config" for="https_cert">$T('opt-https_cert')</label>
-                        <input type="text" name="https_cert" id="https_cert" value="$https_cert" />
-                        <button class="btn btn-default generate_cert" title="$T('explain-new-cert')" <!--#if int($have_cryptography) == 0 then "disabled" else ""#-->>
-                            <span class="glyphicon glyphicon-repeat"></span>
-                        </button>
-                        <span class="desc">$T('explain-https_cert')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="https_key">$T('opt-https_key')</label>
-                        <input type="text" name="https_key" id="https_key" value="$https_key" />
-                        <button class="btn btn-default generate_cert" title="$T('explain-new-cert')" <!--#if int($have_cryptography) == 0 then "disabled" else ""#-->>
-                            <span class="glyphicon glyphicon-repeat"></span>
-                        </button>
-                        <span class="desc">$T('explain-https_key')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="https_chain">$T('opt-https_chain')</label>
-                        <input type="text" name="https_chain" id="https_chain" value="$https_chain" />
-                        <span class="desc">$T('explain-https_chain')</span>
-                    </div>
+                <div class="field-pair advanced-settings">
+                    <label class="config" for="https_port">$T('opt-https_port')</label>
+                    <input type="number" name="https_port" id="https_port" value="$https_port" size="8" data-original="$https_port" />
+                    <span class="desc">$T('explain-https_port')</span>
+                </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" />
+                    <button class="btn btn-default generate_cert" title="$T('explain-new-cert')" <!--#if int($have_cryptography) == 0 then "disabled" else ""#-->>
+                        <span class="glyphicon glyphicon-repeat"></span>
+                    </button>
+                    <span class="desc">$T('explain-https_cert')</span>
+                </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" />
+                    <button class="btn btn-default generate_cert" title="$T('explain-new-cert')" <!--#if int($have_cryptography) == 0 then "disabled" else ""#-->>
+                        <span class="glyphicon glyphicon-repeat"></span>
+                    </button>
+                    <span class="desc">$T('explain-https_key')</span>
+                </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" />
+                    <span class="desc">$T('explain-https_chain')</span>
                 </div>
                 <div class="field-pair">
                     <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
                     <button class="btn btn-default sabnzbd_restart"><span class="glyphicon glyphicon-refresh"></span> $T('button-restart') SABnzbd</button>
+                    <button class="btn btn-default advancedButton enable_https_options"><span class="glyphicon glyphicon-cog"></span> $T('button-advanced')</button>
                 </div>
             </fieldset>
         </div>
@@ -142,7 +126,7 @@
                                 <option value="5" <!--#if $inet_exposure == 5 then 'selected="selected"' else ""#-->>$T('inet-ui') - $T('inet-external_login')</option>
                             </optgroup>
                         </select>
-                    <span class="desc">$T('explain-inet_exposure').replace('.','.<br>')</span>
+                    <span class="desc">$T('explain-inet_exposure').replace('. ','.<br><span class="label label-warning">'+$T('warning').upper()+'</span> ')</span>
                 </div>
                 <div class="field-pair">
                     <label class="config" for="local_ranges">$T('opt-local_ranges')</label>

interfaces/Config/templates/config_notify.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Email"#-->
-<!--#set global $help_uri="configuration/1.2/notifications"#-->
+<!--#set global $help_uri="configuration/2.0/notifications"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#def show_notify_checkboxes($section_label)#-->
@@ -340,7 +340,7 @@
                 <div class="field-pair">
                     <label class="config" for="nscript_script">$T('opt-nscript_script')</label>
                     <select name="nscript_script">
-                        <!--#for $sc in $script_list#-->
+                        <!--#for $sc in $scripts#-->
                         <option value="$sc" <!--#if $nscript_script == $sc then 'selected="selected"' else ""#-->>$Tspec($sc)</option>
                         <!--#end for#-->
                     </select>

interfaces/Config/templates/config_rss.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="RSS"#-->
-<!--#set global $help_uri="configuration/1.2/rss"#-->
+<!--#set global $help_uri="configuration/2.0/rss"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <div class="colmask">
     <!--#if not $active_feed#-->
@@ -163,7 +163,7 @@
                             <!--#if $rss[$feed]['pick_cat']#-->
                             <td>
                                 <select name="cat">
-                                    <!--#for $ct in $cat_list#-->
+                                    <!--#for $ct in $categories#-->
                                         <option value="$ct" <!--#if $ct==$rss[$feed]['cat'] then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
                                     <!--#end for#-->
                                 </select>
@@ -191,7 +191,7 @@
                             <!--#if $rss[$feed]['pick_script']#-->
                             <td>
                                 <select name="script">
-                                    <!--#for $sc in $script_list#-->
+                                    <!--#for $sc in $scripts#-->
                                         <option value="$sc" <!--#if $sc==$rss[$feed]['script'] then 'selected="selected"' else ""#-->>$Tspec($sc)</option>
                                     <!--#end for#-->
                                 </select>
@@ -236,7 +236,7 @@
                             <!--#if $rss[$feed]['pick_cat']#-->
                             <td>
                                 <select name="cat">
-                                    <!--#for $ct in $cat_list#-->
+                                    <!--#for $ct in $categories#-->
                                         <option value="$ct" <!--#if $ct=='Default' then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
                                     <!--#end for#-->
                                 </select>
@@ -264,7 +264,7 @@
                             <!--#if $rss[$feed]['pick_script']#-->
                             <td>
                                 <select name="script">
-                                    <!--#for $sc in $script_list#-->
+                                    <!--#for $sc in $scripts#-->
                                         <option value="$sc" <!--#if $sc=='Default' then 'selected="selected"' else ""#-->>$Tspec($sc)</option>
                                     <!--#end for#-->
                                 </select>
@@ -312,7 +312,7 @@
                                 <!--#if $rss[$feed]['pick_cat']#-->
                                 <td>
                                     <select name="cat">
-                                        <!--#for $ct in $cat_list#-->
+                                        <!--#for $ct in $categories#-->
                                             <option value="$ct" <!--#if $ct==$filter[0] then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
                                         <!--#end for#-->
                                     </select>
@@ -340,7 +340,7 @@
                                 <!--#if $rss[$feed]['pick_script']#-->
                                 <td>
                                     <select name="script">
-                                        <!--#for $sc in $script_list#-->
+                                        <!--#for $sc in $scripts#-->
                                             <option value="$sc" <!--#if $sc==$filter[2] then 'selected="selected"' else ""#-->>$Tspec($sc)</option>
                                         <!--#end for#-->
                                     </select>
@@ -401,16 +401,16 @@
                             <form action="download" method="get">
                                 <input type="hidden" value="$feed" name="feed" />
                                 <input type="hidden" name="session" value="$session" />
-                                <input type="hidden" name="url" value="$job[0]" />
-                                <input type="hidden" name="nzbname" value="$job[4]" />
+                                <input type="hidden" name="url" value="$job['url']" />
+                                <input type="hidden" name="nzbname" value="$job['nzbname']" />
                                 <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-plus-sign"></span> $T('link-download')</button>
                             </form>
                         </td>
-                        <td>$job[3] $job[2]</td>
-                        <td data-sort-value="$job[6]">$job[5]</td>
-                        <td>$job[1]</td>
-                        <td>$job[11]</td>
-                        <td data-sort-value="$job[8]">$job[7]</td>
+                        <td>$job['rule'] $job['skip']</td>
+                        <td data-sort-value="$job['size']">$job['size_units']</td>
+                        <td>$job['title']</td>
+                        <td>$job['cat']</td>
+                        <td data-sort-value="$job['age_ms']">$job['age']</td>
                     </tr>
                 <!--#end for#-->
             </table>
@@ -437,16 +437,16 @@
                             <form action="download" method="get">
                                 <input type="hidden" value="$feed" name="feed" />
                                 <input type="hidden" name="session" value="$session" />
-                                <input type="hidden" name="url" value="$job[0]" />
-                                <input type="hidden" name="nzbname" value="$job[4]" />
+                                <input type="hidden" name="url" value="$job['url']" />
+                                <input type="hidden" name="nzbname" value="$job['nzbname']" />
                                 <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-plus-sign"></span> $T('link-download')</button>
                             </form>
                         </td>
-                        <td>$job[3] $job[2]</td>
-                        <td data-sort-value="$job[6]">$job[5]</td>
-                        <td>$job[1]</td>
-                        <td>$job[11]</td>
-                        <td data-sort-value="$job[8]">$job[7]</td>
+                        <td>$job['rule'] $job['skip']</td>
+                        <td data-sort-value="$job['size']">$job['size_units']</td>
+                        <td>$job['title']</td>
+                        <td>$job['cat']</td>
+                        <td data-sort-value="$job['age_ms']">$job['age']</td>
                     </tr>
                 <!--#end for#-->
             </table>
@@ -466,14 +466,20 @@
                             <th>$T('size')</th>
                             <th width="60%">$T('sort-title')</th>
                             <th>$T('category')</th>
+                            <th>$T('source')</th>
                         </tr>
                     </thead>
                     <!--#for $job in $downloaded#-->
                         <tr class="infoTableSeperator">
-                            <td data-sort-value="$job[10]">$job[9]</td>
-                            <td data-sort-value="$job[6]">$job[5]</td>
-                            <td>$job[1]</td>
-                            <td>$job[11]</td>
+                            <td data-sort-value="$job['time_downloaded_ms']">$job['time_downloaded']</td>
+                            <td data-sort-value="$job['size']">$job['size_units']</td>
+                            <td>$job['title']</td>
+                            <td>$job['cat']</td>
+                            <td data-sort-value="$job['baselink']" title="$job['baselink']">
+                                <!--#if $job['baselink']#-->
+                                <div class="favicon source-icon" style="background-image: url(//$job['baselink']/favicon.ico);" data-domain="$job['baselink']"></div>
+                                <!--#end if#-->
+                            </td>
                         </tr>
                     <!--#end for#-->
                 </table>

interfaces/Config/templates/config_scheduling.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Scheduling"#-->
-<!--#set global $help_uri="configuration/1.2/scheduling"#-->
+<!--#set global $help_uri="configuration/2.0/scheduling"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <%
@@ -80,21 +80,20 @@ else:
         <div class="col1">
             <fieldset>
                 <!--#if $schedlines#-->
-                        <!--#set $schednum = 0#-->
                         <!--#set $odd = True#-->
-                        <!--#for $line in $schedlines#-->
+                        <!--#for $schednum, $line in enumerate($schedlines)#-->
                             <!--#set $odd = not $odd#-->
                             <form action="delSchedule" method="post">
                                 <input type="hidden" name="session" value="$session"/>
                                 <input type="hidden" name="line" id="line" value="$line"/>
                                 <div class="field-pair infoTableSeperator <!--#if $odd then "" else " alt"#-->">
+                                    <input type="checkbox" name="schedenabled" value="$line" <!--#if int($taskinfo[$schednum][5]) > 0 then 'checked="checked"' else ""#-->>
                                     <button class="btn btn-default float-left"><span class="glyphicon glyphicon-trash"></span></button>
                                     <div class="scheduleEntry">
                                         <span class="time">$taskinfo[$schednum][1]:$taskinfo[$schednum][2]</span><span class="frequency">$taskinfo[$schednum][3]</span> <span class="darkred">$taskinfo[$schednum][4]</span>
                                     </div>
                                 </div>
                             </form>
-                            <!--#set $schednum = $schednum+1#-->
                         <!--#end for#-->
                 <!--#else#-->
                     <div class="field-pair">
@@ -126,5 +125,18 @@ else:
             \$('#hidden_arguments').show()
         }*/
     })
+
+    \$('[name="schedenabled"]').click(function() {
+        \$.ajax({
+            type: "POST",
+            url: "toggleSchedule",
+            data: {line: \$(this).val(), session: "$session" }
+        }).done(function() {
+            // Let us leave!
+            formWasSubmitted = true;
+            formHasChanged = false;
+            location.reload();
+        });
+    });
 </script>
 <!--#include $webdir + "/_inc_footer_uc.tmpl"#-->

interfaces/Config/templates/config_server.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Servers"#-->
-<!--#set global $help_uri="configuration/1.2/servers"#-->
+<!--#set global $help_uri="configuration/2.0/servers"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -29,9 +29,9 @@
                     <label class="config" for="port">$T('srv-port')</label>
                     <input type="number" name="port" id="port" size="8" value="119" />
                 </div>
-                <div class="field-pair <!--#if int($have_ssl) == 0 then "disabled" else ""#-->">
+                <div class="field-pair">
                     <label class="config" for="ssl">$T('srv-ssl')</label>
-                    <input type="checkbox" name="ssl" id="ssl" value="1" <!--#if int($have_ssl) == 0 then "disabled=\"disabled\"" else ""#--> />
+                    <input type="checkbox" name="ssl" id="ssl" value="1" />
                     <span class="desc">$T('explain-ssl')</span>
                 </div>
                 <!-- Tricks to avoid browser auto-fill, fixed on-submit with javascript -->
@@ -62,9 +62,9 @@
                 <div class="field-pair <!--#if int($have_ssl_context) == 0 then "disabled" else ""#--> advanced-settings">
                     <label class="config" for="ssl_verify">$T('opt-ssl_verify')</label>
                     <select name="ssl_verify" id="ssl_verify" <!--#if int($have_ssl_context) == 0 then "disabled=\"disabled\"" else ""#-->>
-                          <option value="0">$T('ssl_verify-disabled')</option>
-                          <option value="1" selected>$T('ssl_verify-normal')</option>
-                          <option value="2">$T('ssl_verify-strict')</option>
+                        <option value="2" selected>$T('ssl_verify-strict')</option>
+                        <option value="1">$T('ssl_verify-normal')</option>
+                        <option value="0">$T('ssl_verify-disabled')</option>
                     </select>
                     <span class="desc">$T('explain-ssl_verify').replace('. ', '.<br/>')</span>
                 </div>
@@ -149,9 +149,9 @@
                     <label class="config" for="port$cur">$T('srv-port')</label>
                     <input type="number" name="port" id="port$cur" value="$server['port']" size="8" />
                 </div>
-                <div class="field-pair <!--#if int($have_ssl) == 0 then "disabled" else ""#-->">
+                <div class="field-pair">
                     <label class="config" for="ssl$cur">$T('srv-ssl')</label>
-                    <input type="checkbox" name="ssl" id="ssl$cur" value="1" <!--#if int($server['ssl']) != 0 and int($have_ssl) == 1 then 'checked="checked"' else ""#--> <!--#if int($have_ssl) == 0 then "disabled=\"disabled\"" else ""#--> />
+                    <input type="checkbox" name="ssl" id="ssl$cur" value="1" <!--#if int($server['ssl']) != 0 then 'checked="checked"' else ""#--> />
                     <span class="desc">$T('explain-ssl')</span>
                 </div>
                 <!-- Tricks to avoid browser auto-fill, fixed on-submit with javascript -->
@@ -183,9 +183,9 @@
                 <div class="field-pair <!--#if int($have_ssl_context) == 0 then "disabled" else ""#--> advanced-settings">
                     <label class="config" for="ssl_verify$cur">$T('opt-ssl_verify')</label>
                     <select name="ssl_verify" id="ssl_verify$cur" <!--#if int($have_ssl_context) == 0 then "disabled=\"disabled\"" else ""#-->>
-                          <option value="0" <!--#if $server['ssl_verify'] == 0 then 'selected="selected"' else ""#--> >$T('ssl_verify-disabled')</option>
-                          <option value="1" <!--#if $server['ssl_verify'] == 1 then 'selected="selected"' else ""#--> >$T('ssl_verify-normal')</option>
-                          <option value="2" <!--#if $server['ssl_verify'] == 2 then 'selected="selected"' else ""#--> >$T('ssl_verify-strict')</option>
+                        <option value="2" <!--#if $server['ssl_verify'] == 2 then 'selected="selected"' else ""#--> >$T('ssl_verify-strict')</option>
+                        <option value="1" <!--#if $server['ssl_verify'] == 1 then 'selected="selected"' else ""#--> >$T('ssl_verify-normal')</option>
+                        <option value="0" <!--#if $server['ssl_verify'] == 0 then 'selected="selected"' else ""#--> >$T('ssl_verify-disabled')</option>
                     </select>
                     <span class="desc">$T('explain-ssl_verify').replace('. ', '.<br/>')</span>
                 </div>
@@ -325,11 +325,6 @@
         setTimeout(function() { portBox.removeClass('port-highlight') }, 2000)
     })
 
-    \$('.advancedButton').click(function(event){
-        \$('.advanced-settings').toggle()
-        return false;
-    })
-
     \$('.testServer').click(function(event){
         removeObfuscation()
         var theButton = \$(this)
@@ -341,9 +336,11 @@
             url: "../../tapi",
             data: "mode=config&output=json&name=test_server&" + \$(this).parents('form:first').serialize()
         }).then(function(data) {
+            // Let's replace the link
+            msg = data.value.message.replace('https://sabnzbd.org/certificate-errors', '<a href="https://sabnzbd.org/certificate-errors" class="alert-link" target="_blank">https://sabnzbd.org/certificate-errors</a>')
             // Fill the box and enable the button
             resultBox.removeClass('alert-success alert-danger').show()
-            resultBox.text(data.value.message)
+            resultBox.html(msg)
             theButton.removeAttr("disabled")
             theButton.find('span').toggleClass('glyphicon-sort glyphicon-refresh spin-glyphicon')
 

interfaces/Config/templates/config_sorting.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Sorting"#-->
-<!--#set global $help_uri="configuration/1.2/sorting"#-->
+<!--#set global $help_uri="configuration/2.0/sorting"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -12,7 +12,7 @@
                 <p>
                     <b>$T('affectedCat')</b><br/>
                     <select name="tv_cat" multiple="multiple" class="multiple_cats">
-                        <!--#for $ct in $cat_list#-->
+                        <!--#for $ct in $categories#-->
                         <option value="$ct" <!--#if $ct in $tv_categories then 'selected="selected"' else ""#--> >$Tspec($ct)</option>
                         <!--#end for#-->
                     </select>
@@ -165,7 +165,7 @@
                 <p>
                     <b>$T('affectedCat')</b><br/>
                     <select name="movie_cat" multiple="multiple" class="multiple_cats">
-                        <!--#for $ct in $cat_list#-->
+                        <!--#for $ct in $categories#-->
                         <option value="$ct" <!--#if $ct in $movie_categories then 'selected="selected"' else ""#--> >$Tspec($ct)</option>
                         <!--#end for#-->
                     </select>
@@ -303,7 +303,7 @@
                 <p>
                     <b>$T('affectedCat')</b><br/>
                     <select name="date_cat" multiple="multiple" class="multiple_cats">
-                        <!--#for $ct in $cat_list#-->
+                        <!--#for $ct in $categories#-->
                         <option value="$ct" <!--#if $ct in $date_categories then 'selected="selected"' else ""#--> >$Tspec($ct)</option>
                         <!--#end for#-->
                     </select>

interfaces/Config/templates/config_special.tmpl

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

interfaces/Config/templates/config_switches.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Switches"#-->
-<!--#set global $help_uri="configuration/1.2/switches"#-->
+<!--#set global $help_uri="configuration/2.0/switches"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -20,9 +20,9 @@
                         </select>
                         <span class="desc">$T('explain-load_balancing')</span>
                     </div>
-                    <div class="field-pair <!--#if int($have_ssl) == 0 then "disabled" else ""#-->">
+                    <div class="field-pair">
                         <label class="config" for="ssl_ciphers">$T('opt-ssl_ciphers')</label>
-                        <input type="text" name="ssl_ciphers" id="ssl_ciphers" value="$ssl_ciphers"<!--#if int($have_ssl) == 0 then "disabled=\"disabled\"" else ""#--> />
+                        <input type="text" name="ssl_ciphers" id="ssl_ciphers" value="$ssl_ciphers" />
                         <span class="desc">$T('explain-ssl_ciphers') <br>$T('readwiki')
                         <a href="${helpuri}advanced/ssl-ciphers" target="_blank">${helpuri}advanced/ssl-ciphers</a></span>
                     </div>
@@ -58,7 +58,7 @@
                     <div class="field-pair">
                         <label class="config" for="pre_script">$T('opt-pre_script')</label>
                         <select name="pre_script" id="pre_script">
-                        <!--#for $sc in $script_list#-->
+                        <!--#for $sc in $scripts#-->
                             <!--#if $sc.lower() == $pre_script.lower()#-->
                                 <option value="$sc" selected="selected">$Tspec($sc)</option>
                             <!--#else#-->
@@ -159,11 +159,6 @@
                         <input type="checkbox" name="enable_all_par" id="enable_all_par" value="1" <!--#if int($enable_all_par) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-enable_all_par').replace('. ', '.<br/>')</span>
                     </div>
-                    <div class="field-pair">
-                        <label class="config" for="quick_check">$T('opt-quick_check')</label>
-                        <input type="checkbox" name="quick_check" id="quick_check" value="1" <!--#if int($quick_check) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-quick_check')</span>
-                    </div>
                     <!--#if $have_multicore#-->
                     <div class="field-pair">
                         <label class="config" for="par2_multicore">$T('opt-par2_multicore')</label>
@@ -196,17 +191,6 @@
                         <input type="checkbox" name="flat_unpack" id="flat_unpack" value="1" <!--#if int($flat_unpack) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-flat_unpack')</span>
                     </div>
-                    <div class="field-pair">
-                        <label class="config" for="overwrite_files">$T('opt-overwrite_files')</label>
-                        <input type="checkbox" name="overwrite_files" id="overwrite_files" value="1" <!--#if int($overwrite_files) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-overwrite_files')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="unpack_check">$T('opt-unpack_check')</label>
-                        <input type="checkbox" name="unpack_check" id="unpack_check" value="1" <!--#if int($unpack_check) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-unpack_check')</span>
-                    </div>
-
                     <div class="field-pair">
                         <label class="config" for="script_can_fail">$T('opt-script_can_fail')</label>
                         <input type="checkbox" name="script_can_fail" id="script_can_fail" value="1" <!--#if int($script_can_fail) > 0 then 'checked="checked"' else ""#--> />
@@ -279,11 +263,6 @@
                         <span class="desc">$T('explain-sanitize_safe')</span>
                     </div>
                     <!--#end if#-->
-                    <div class="field-pair">
-                        <label class="config" for="enable_meta">$T('opt-enable_meta')</label>
-                        <input type="checkbox" name="enable_meta" id="enable_meta" value="1" <!--#if int($enable_meta) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-enable_meta')</span>
-                    </div>
                     <div class="field-pair">
                         <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
                         <button class="btn btn-default restoreDefaults"><span class="glyphicon glyphicon-asterisk"></span> $T('button-restoreDefaults')</button>
@@ -337,16 +316,7 @@
                     <div class="field-pair">
                         <label class="config" for="rating_enable">$T('opt-rating_enable')</label>
                         <input type="checkbox" name="rating_enable" id="rating_enable" value="1" <!--#if int($rating_enable) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-rating_enable')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="rating_feedback">$T('opt-rating_feedback')</label>
-                        <input type="checkbox" name="rating_feedback" id="rating_feedback" value="1" <!--#if int($rating_feedback) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-rating_feedback')</span>
-                    </div>
-                    <div class="field-pair">
-                        <label class="config" for="rating_host">$T('opt-rating_host')</label>
-                        <input type="text" name="rating_host" id="rating_host" value="$rating_host" />
+                        <span class="desc">$T('explain-rating_enable').replace('. ', '.<br/>')</span>
                     </div>
                     <div class="field-pair">
                         <label class="config" for="rating_api_key">$T('opt-rating_api_key')</label>

interfaces/Config/templates/login/main.tmpl

@@ -11,13 +11,13 @@
     <link rel="apple-touch-icon" sizes="152x152" href="../staticcfg/ico/apple-touch-icon-152x152-precomposed.png" />
     <link rel="apple-touch-icon" sizes="180x180" href="../staticcfg/ico/apple-touch-icon-180x180-precomposed.png" />
     <link rel="apple-touch-icon" sizes="192x192" href="../staticcfg/ico/android-192x192.png" />
-    <link rel="shortcut icon" href="../staticcfg/ico/favicon.ico?v=1.1.0" />
+    <link rel="shortcut icon" href="../staticcfg/ico/favicon.ico?v=$version" />
 
-    <link rel="stylesheet" type="text/css" href="../staticcfg/bootstrap/css/bootstrap.min.css" />
-    <link rel="stylesheet" type="text/css" href="../staticcfg/css/login.css?p=$pid" />
+    <link rel="stylesheet" type="text/css" href="../staticcfg/bootstrap/css/bootstrap.min.css?v=$version" />
+    <link rel="stylesheet" type="text/css" href="../staticcfg/css/login.css?v=$version" />
 
-    <script type="text/javascript" src="../staticcfg/js/jquery-3.1.1.min.js"></script>
-    <script type="text/javascript" src="../staticcfg/bootstrap/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="../staticcfg/js/jquery-3.1.1.min.js?v=$version"></script>
+    <script type="text/javascript" src="../staticcfg/bootstrap/js/bootstrap.min.js?v=$version"></script>
 </head>
 <html>
     <body>

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

@@ -272,6 +272,9 @@ textarea:hover, input[type="date"]:hover, input[type="datetime"]:hover, input[ty
     overflow: auto;
     clear: both;
 }
+.label {
+    font-style: normal;
+}
 .padTable h3 {
     margin-top: 0;
 }
@@ -557,6 +560,9 @@ h2.activeRSS {
     margin: 0 6px 0 2px;
     text-align: center;
 }
+.source-icon span {
+    top: -3px;
+}
 .feed {
     text-decoration: none;
 }
@@ -859,11 +865,17 @@ input[type="checkbox"] {
     max-width: 150px !important;
 }
 
-.Scheduling input[type="checkbox"] {
+.Scheduling form[action="addSchedule"] input[type="checkbox"] {
     margin-top: 0px;
     margin-left: -20px;
 }
 
+.Scheduling form[action="delSchedule"] input[type="checkbox"] {
+    position: initial;
+    float: left;
+    margin: 9px 10px 0px 5px;
+}
+
 .navbar .container {
     padding-right: 0;
 }
@@ -981,7 +993,7 @@ input[type="checkbox"] {
     opacity: 0.7;
 }
 
-.Servers .advanced-settings {
+.advanced-settings {
     display: none;
 }
 

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

@@ -265,6 +265,11 @@ function do_restart() {
 
             // Now we try untill we can connect
             var refreshInterval = setInterval(function() {
+                // We skip the first one
+                if(failureCounter == 0) {
+                    failureCounter = failureCounter+1;
+                    return
+                }
                 $.ajax({ url: urlTotal,
                     success: function() {
                         // Back to base
@@ -273,7 +278,7 @@ function do_restart() {
                     error: function(status, text) {
                         failureCounter = failureCounter+1;
                         // Too many failuers and we give up
-                        if(failureCounter >= 7) {
+                        if(failureCounter >= 6) {
                             // If the port has changed 'Access-Control-Allow-Origin' header will not allow
                             // us to check if the server is back up. So after 7 failures we redirect
                             // anyway in the hopes it works anyway..
@@ -281,7 +286,7 @@ function do_restart() {
                         }
                     }
                 })
-            }, 3000)
+            }, 4000)
 
             // Exception if we go from HTTPS to HTTP
             // (this is not allowed by browsers and all of the above will be ignored)
@@ -402,7 +407,12 @@ $(document).ready(function () {
 
     // Hide or show HTTPS
     $('#enable_https').on('change', function() {
-        $('#enable_https_options').toggle()
+        $('.enable_https_options').toggle()
+    })
+
+    $('.advancedButton').click(function(event){
+        $('.advanced-settings').toggle()
+        return false;
     })
 });
 

interfaces/Glitter/templates/include_menu.tmpl

@@ -101,7 +101,7 @@
                     <li class="divider"></li>
                     <li class="dropdown-header"><span class="glyphicon glyphicon-off"></span> $T('Glitter-onFinish'):</li>
                     <li>
-                        <select data-bind="value: onQueueFinish" class="form-control">
+                        <select data-bind="value: onQueueFinish, event: { change: setOnQueueFinish }" class="form-control">
                             <option value=""></option>
                             <optgroup label="$T('eoq-actions')">
                                 <option value="shutdown_program">$T('shutdownSab')</option>
@@ -111,9 +111,11 @@
                                 <option value="hibernate_pc">$T('hibernatePc')</option>
                                 <!--#end if#-->
                             </optgroup>
-                            <optgroup label="$T('eoq-scripts')">
+                            <optgroup label="$T('eoq-scripts')" data-bind="visible: queue.scriptsList().length > 1">
                                 <!-- ko foreach: queue.scriptsList -->
-                                    <option data-bind="text: \$data, attr: { value: 'script_'+\$data } " ></option>
+                                    <!-- ko if: \$data != glitterTranslate.noneText -->
+                                        <option data-bind="text: \$data, attr: { value: 'script_'+\$data } " ></option>
+                                    <!-- /ko -->
                                 <!-- /ko -->
                             </optgroup>
                         </select>

interfaces/Glitter/templates/include_overlays.tmpl

@@ -112,37 +112,36 @@
                         <hr/>
                         <div class="row">
                             <div class="col-sm-6">$T('cache')</div>
-                            <div class="col-sm-6" data-bind="visible: hasStatusInfo">
-                                <span data-bind="text: statusInfo.cache_size"></span> (<span data-bind="text: statusInfo.cache_art"></span> $T('Glitter-articles'))
+                            <div class="col-sm-6">
+                                <span data-bind="text: cacheSize"></span> (<span data-bind="text: cacheArticles"></span> $T('Glitter-articles'))
                             </div>
-                            <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
                             <div class="col-sm-6">$T('dashboard-systemPerformance')</div>
-                            <div class="col-sm-6" data-bind="visible: hasStatusInfo">
+                            <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.pystone"></span>
-                                <a href="#" data-bind="click: loadStatusInfo" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
-                                <small data-bind="truncatedText: statusInfo.cpumodel, length: 25"></small>
+                                <a href="#" data-bind="click: testDiskSpeed" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
+                                <small data-bind="truncatedText: statusInfo.cpumodel, length: 25, attr: { 'data-original-title': statusInfo.cpumodel }" data-tooltip="true"></small>
                             </div>
-                            <div class="col-sm-6 col-loading" data-bind="visible: !hasStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
+                            <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
                             <div class="col-sm-6">$T('dashboard-downloadDirSpeed')</div>
-                            <div class="col-sm-6" data-bind="visible: hasDiskStatusInfo">
+                            <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.downloaddirspeed()"></span> MB/s
                                 <a href="#" class="diskspeed-button" data-bind="click: testDiskSpeed" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
-                                <small>(<span data-bind="truncatedText: statusInfo.downloaddir, length: 24"></span>)</small>
+                                <small>(<span data-bind="truncatedText: statusInfo.downloaddir, length: 24, attr: { 'data-original-title': statusInfo.downloaddir }" data-tooltip="true"></span>)</small>
                             </div>
-                            <div class="col-sm-6 col-loading" data-bind="visible: !hasDiskStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
+                            <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <div class="row">
                             <div class="col-sm-6">$T('dashboard-completeDirSpeed')</div>
-                            <div class="col-sm-6" data-bind="visible: hasDiskStatusInfo">
+                            <div class="col-sm-6" data-bind="visible: hasPerformanceInfo">
                                 <span data-bind="text: statusInfo.completedirspeed()"></span> MB/s
                                 <a href="#" class="diskspeed-button" data-bind="click: testDiskSpeed" data-tooltip="true" data-placement="right" title="$T('dashboard-repeatTest')"><span class="glyphicon glyphicon-repeat"></span></a>
-                                <small>(<span data-bind="truncatedText: statusInfo.completedir, length: 24"></span>)</small>
+                                <small>(<span data-bind="truncatedText: statusInfo.completedir, length: 24, attr: { 'data-original-title': statusInfo.completedir }" data-tooltip="true"></span>)</small>
                             </div>
-                            <div class="col-sm-6 col-loading" data-bind="visible: !hasDiskStatusInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
+                            <div class="col-sm-6 col-loading" data-bind="visible: !hasPerformanceInfo()">$T('Glitter-loading')<span class="loader-dot-one">.</span><span class="loader-dot-two">.</span><span class="loader-dot-three">.</span></div>
                         </div>
                         <hr />
                         <div class="row options-function-box">
@@ -185,7 +184,7 @@
                                     <div class="col-sm-6">$T('swtag-server')</div>
                                     <div class="col-sm-6">
                                         <span data-bind="text: servername"></span>
-                                        <span class="label label-default" data-bind="visible: serveroptional">$T('optional').capitalize()</span>
+                                        <span class="label label-warning" data-bind="visible: serveroptional">$T('optional').capitalize()</span>
                                     </div>
                                 </div>
                                 <div class="row">
@@ -208,7 +207,7 @@
                                 <div class="row" data-bind="visible: servererror()">
                                     <div class="col-sm-12">
                                         <div class="alert alert-danger">
-                                            <a href="#" data-bind="visible: !serveractive(), click: function() { \$parent.unblockServer(servername()) }" class="btn btn-default"><span class="glyphicon glyphicon-share-alt"></span> $T('Glitter-unblockServer')</a>
+                                            <a href="#" data-bind="visible: !serveractive(), click: function() { \$parent.unblockServer(servername) }" class="btn btn-default"><span class="glyphicon glyphicon-share-alt"></span> $T('Glitter-unblockServer')</a>
                                             <span class="glyphicon glyphicon-exclamation-sign"></span>
                                             <span data-bind="text: servererror()"></span>
                                         </div>

interfaces/Glitter/templates/include_queue.tmpl

@@ -152,7 +152,7 @@
                             </li>
                             <li title="$T('eoq-scripts')" data-tooltip="true" data-placement="left">
                                 <span class="glyphicon glyphicon-flash"></span>
-                                <select name="Post-processing" class="form-control" data-bind="options: parent.scriptsList, value: script, event: { change: changeScript }, enable: (parent.scriptsList().length > 0)"></select>
+                                <select name="Post-processing" class="form-control" data-bind="options: parent.scriptsList, value: script, event: { change: changeScript }, enable: (parent.scriptsList().length > 1)"></select>
                             </li>
                         </ul>
                         <!-- /ko -->

interfaces/Glitter/templates/main.tmpl

@@ -59,7 +59,7 @@
             glitterTranslate.minutes = "$T('mins')"
             glitterTranslate.shutdown = "$T('shutdownOK?')";
             glitterTranslate.restart = "$T('explain-Restart')".replace(/<br \/>/g, "\n");
-            glitterTranslate.repair = "$T('explain-Repair')".replace(/<br \/>/g, "\n");
+            glitterTranslate.repair = "$T('explain-Repair')".replace(/<br \/>/g, "\n").replace(/&quot;/g,'"');
             glitterTranslate.removeDown = "$T('Glitter-confirmClearDownloads')";
             glitterTranslate.removeDow1 = "$T('Glitter-confirmClear1Download')";
             glitterTranslate.encrypted = "$T('Glitter-encrypted')";
@@ -125,7 +125,7 @@
             <!--#include raw $webdir + "/static/javascripts/jquery.min.js"#-->
             <!--#include raw $webdir + "/static/javascripts/jquery-ui.min.js"#-->
             <!--#include raw $webdir + "/static/javascripts/jquery.peity.min.js"#-->
-            <!--#include raw $webdir + "/static/javascripts/moment.js"#-->
+            <!--#include raw $webdir + "/static/javascripts/moment.min.js"#-->
             <!--#include raw $webdir + "/static/javascripts/knockout-latest.js"#-->
             <!--#include raw $webdir + "/static/javascripts/knockout-extensions.js"#-->
             <!--#include raw $webdir + "/static/bootstrap/js/bootstrap.min.js"#-->

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

@@ -55,15 +55,10 @@ function Fileslisting(parent) {
             $.each(response.files, function(index, slot) {
                 // Existing or updating?
                 var existingItem = ko.utils.arrayFirst(self.fileItems(), function(i) {
-                    return i.filename() == slot.filename;
+                    return i.nzf_id() == slot.nzf_id;
                 });
 
                 if(existingItem) {
-                    // We skip queued files!
-                    // They cause problems because they can have the same filename
-                    // as files that we do want to be updated.. The slot.id is not unique!
-                    if(slot.status == "queued") return false;
-
                     // Update the rest
                     existingItem.updateFromData(slot);
                 } else {
@@ -203,7 +198,7 @@ function FileslistingModel(parent, data) {
     self.file_age = ko.observable(data.age);
     self.mb = ko.observable(data.mb);
     self.percentage = ko.observable(fixPercentages((100 - (data.mbleft / data.mb * 100)).toFixed(0)));
-    self.canselect = ko.observable(data.nzf_id !== undefined);
+    self.canselect = ko.observable(data.status != "finished" && data.status != "queued");
     self.isdone =  ko.observable(data.status == "finished");
 
     // Update internally
@@ -213,7 +208,7 @@ function FileslistingModel(parent, data) {
         self.file_age(data.age)
         self.mb(data.mb)
         self.percentage(fixPercentages((100 - (data.mbleft / data.mb * 100)).toFixed(0)));
-        self.canselect(data.nzf_id !== undefined)
+        self.canselect(data.status != "finished" && data.status != "queued")
         self.isdone(data.status == "finished")
     }
 }

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

@@ -356,10 +356,17 @@ function HistoryModel(parent, data) {
         return displayDateTime(self.completed(), parent.parent.dateFormat(), 'X')
     });
 
+    // Subscribe to retryEvent so we can load the password
+    self.canRetry.subscribe(function() {
+        self.updateAllHistory = true;
+    })
+
     // Re-try button
     self.retry = function() {
         // Set JOB-id
         $('#modal-retry-job input[name="retry_job_id"]').val(self.nzo_id)
+        // Set password
+        $('#retry_job_password').val(self.historyStatus.password())
         // Open modal
         $('#modal-retry-job').modal("show")
     };

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

@@ -40,6 +40,8 @@ function ViewModel() {
     self.quotaLimit = ko.observable();
     self.quotaLimitLeft = ko.observable();
     self.systemLoad = ko.observable();
+    self.cacheSize = ko.observable();
+    self.cacheArticles = ko.observable();
     self.nrWarnings = ko.observable(0);
     self.allWarnings = ko.observableArray([]);
     self.allMessages = ko.observableArray([]);
@@ -48,7 +50,7 @@ function ViewModel() {
 
     // Statusinfo container
     self.hasStatusInfo = ko.observable(false);
-    self.hasDiskStatusInfo = ko.observable(false);
+    self.hasPerformanceInfo = ko.observable(false);
     self.statusInfo = {};
     self.statusInfo.folders = ko.observableArray([]);
     self.statusInfo.servers = ko.observableArray([]);
@@ -59,8 +61,6 @@ function ViewModel() {
     self.statusInfo.pystone = ko.observable();
     self.statusInfo.cpumodel = ko.observable();
     self.statusInfo.loglevel = ko.observable();
-    self.statusInfo.cache_size = ko.observable();
-    self.statusInfo.cache_art = ko.observable();
     self.statusInfo.downloaddir = ko.observable();
     self.statusInfo.downloaddirspeed = ko.observable();
     self.statusInfo.completedir = ko.observable();
@@ -183,6 +183,10 @@ function ViewModel() {
         // System load
         self.systemLoad(response.queue.loadavg)
 
+        // Cache
+        self.cacheSize(response.queue.cache_size)
+        self.cacheArticles(response.queue.cache_art)
+
         // Warnings (new warnings will trigger an update of allMessages)
         self.nrWarnings(response.queue.have_warnings)
 
@@ -467,6 +471,12 @@ function ViewModel() {
             return;
         }
 
+        // Fix DateJS bug it has some strange problem with the current day-of-month + 1
+        // Removing the space makes DateJS work properly
+        newValue = newValue.replace(/\s*h|\s*m|\s*d/g, function(match) {
+            return match.trim()
+        });
+
         // Parse
         var pauseParsed = Date.parse(newValue);
 
@@ -589,7 +599,7 @@ function ViewModel() {
     }
 
     // Shutdown options
-    self.onQueueFinish.subscribe(function(newValue) {
+    self.setOnQueueFinish = function(model, event) {
         // Ignore updates before the page is done
         if(!self.hasStatusInfo()) return;
 
@@ -597,9 +607,12 @@ function ViewModel() {
         callAPI({
             mode: 'queue',
             name: 'change_complete_action',
-            value: newValue
+            value: $(event.target).val()
         })
-    })
+
+        // Top stop blinking while the API is calling
+        self.onQueueFinish($(event.target).val())
+    }
 
     // Use global settings or device-specific?
     self.useGlobalOptions.subscribe(function(newValue) {
@@ -749,8 +762,6 @@ function ViewModel() {
         callAPI({ mode: 'fullstatus', skip_dashboard: (!statusFullRefresh)*1 }).then(function(data) {
             // Update basic
             self.statusInfo.loglevel(data.status.loglevel)
-            self.statusInfo.cache_art(data.status.cache_art)
-            self.statusInfo.cache_size(data.status.cache_size)
             self.statusInfo.folders(data.status.folders)
 
             // Update the full set
@@ -766,7 +777,7 @@ function ViewModel() {
                 self.statusInfo.publicipv4(data.status.publicipv4)
                 self.statusInfo.ipv6(data.status.ipv6 || glitterTranslate.noneText)
                 // Loaded disk info
-                self.hasDiskStatusInfo(true)
+                self.hasPerformanceInfo(true)
             }
 
             // Update the servers
@@ -816,7 +827,7 @@ function ViewModel() {
 
     // Do a disk-speedtest
     self.testDiskSpeed = function(item, event) {
-        self.hasDiskStatusInfo(false)
+        self.hasPerformanceInfo(false)
 
         // Run it and then display it
         callSpecialAPI('./status/dashrefresh/').then(function() {

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

@@ -171,7 +171,7 @@ function QueueListModel(parent) {
 
     // Do we show search box. So it doesn't dissapear when nothing is found
     self.hasQueueSearch = ko.pureComputed(function() {
-        return (self.pagination.hasPagination() || self.searchTerm())
+        return (self.pagination.hasPagination() || self.searchTerm() || (self.parent.hasQueue() && self.isMultiEditing()))
     })
 
     // Searching in queue (rate-limited in decleration)
@@ -652,7 +652,7 @@ function QueueModel(parent, data) {
     }
     self.changeScript = function(item) {
         // Not on empty handlers
-        if(!item.script()) return;
+        if(!item.script() || parent.scriptsList().length <= 1) return;
         callAPI({
             mode: 'change_script',
             value: item.id,

interfaces/Glitter/templates/static/javascripts/momentjs_locale/da.js

@@ -1,59 +1,60 @@
 //! moment.js locale configuration
-//! locale : danish (da)
+//! locale : Danish [da]
 //! author : Ulrik Nielsen : https://github.com/mrbase
 
-(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
    factory(global.moment)
-}(this, function (moment) { 'use strict';
+}(this, (function (moment) { 'use strict';
 
 
-    var da = moment.defineLocale('da', {
-        months : 'januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december'.split('_'),
-        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
-        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
-        weekdaysShort : 'søn_man_tir_ons_tor_fre_lør'.split('_'),
-        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D. MMMM YYYY',
-            LLL : 'D. MMMM YYYY HH:mm',
-            LLLL : 'dddd [d.] D. MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[I dag kl.] LT',
-            nextDay : '[I morgen kl.] LT',
-            nextWeek : 'dddd [kl.] LT',
-            lastDay : '[I går kl.] LT',
-            lastWeek : '[sidste] dddd [kl] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'om %s',
-            past : '%s siden',
-            s : 'få sekunder',
-            m : 'et minut',
-            mm : '%d minutter',
-            h : 'en time',
-            hh : '%d timer',
-            d : 'en dag',
-            dd : '%d dage',
-            M : 'en måned',
-            MM : '%d måneder',
-            y : 'et år',
-            yy : '%d år'
-        },
-        ordinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
+var da = moment.defineLocale('da', {
+    months : 'januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december'.split('_'),
+    monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
+    weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
+    weekdaysShort : 'søn_man_tir_ons_tor_fre_lør'.split('_'),
+    weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'HH:mm:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D. MMMM YYYY',
+        LLL : 'D. MMMM YYYY HH:mm',
+        LLLL : 'dddd [d.] D. MMMM YYYY [kl.] HH:mm'
+    },
+    calendar : {
+        sameDay : '[i dag kl.] LT',
+        nextDay : '[i morgen kl.] LT',
+        nextWeek : 'på dddd [kl.] LT',
+        lastDay : '[i går kl.] LT',
+        lastWeek : '[i] dddd[s kl.] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'om %s',
+        past : '%s siden',
+        s : 'få sekunder',
+        m : 'et minut',
+        mm : '%d minutter',
+        h : 'en time',
+        hh : '%d timer',
+        d : 'en dag',
+        dd : '%d dage',
+        M : 'en måned',
+        MM : '%d måneder',
+        y : 'et år',
+        yy : '%d år'
+    },
+    dayOfMonthOrdinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
 
-    return da;
+return da;
 
-}));
+})));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/de.js

@@ -1,74 +1,78 @@
 //! moment.js locale configuration
-//! locale : german (de)
+//! locale : German [de]
 //! author : lluchs : https://github.com/lluchs
 //! author: Menelion Elensúle: https://github.com/Oire
+//! author : Mikolaj Dadela : https://github.com/mik01aj
 
-(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
    factory(global.moment)
-}(this, function (moment) { 'use strict';
+}(this, (function (moment) { 'use strict';
 
 
-    function processRelativeTime(number, withoutSuffix, key, isFuture) {
-        var format = {
-            'm': ['eine Minute', 'einer Minute'],
-            'h': ['eine Stunde', 'einer Stunde'],
-            'd': ['ein Tag', 'einem Tag'],
-            'dd': [number + ' Tage', number + ' Tagen'],
-            'M': ['ein Monat', 'einem Monat'],
-            'MM': [number + ' Monate', number + ' Monaten'],
-            'y': ['ein Jahr', 'einem Jahr'],
-            'yy': [number + ' Jahre', number + ' Jahren']
-        };
-        return withoutSuffix ? format[key][0] : format[key][1];
+function processRelativeTime(number, withoutSuffix, key, isFuture) {
+    var format = {
+        'm': ['eine Minute', 'einer Minute'],
+        'h': ['eine Stunde', 'einer Stunde'],
+        'd': ['ein Tag', 'einem Tag'],
+        'dd': [number + ' Tage', number + ' Tagen'],
+        'M': ['ein Monat', 'einem Monat'],
+        'MM': [number + ' Monate', number + ' Monaten'],
+        'y': ['ein Jahr', 'einem Jahr'],
+        'yy': [number + ' Jahre', number + ' Jahren']
+    };
+    return withoutSuffix ? format[key][0] : format[key][1];
+}
+
+var de = moment.defineLocale('de', {
+    months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+    monthsShort : 'Jan._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
+    monthsParseExact : true,
+    weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+    weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
+    weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+    weekdaysParseExact : true,
+    longDateFormat : {
+        LT: 'HH:mm',
+        LTS: 'HH:mm:ss',
+        L : 'DD.MM.YYYY',
+        LL : 'D. MMMM YYYY',
+        LLL : 'D. MMMM YYYY HH:mm',
+        LLLL : 'dddd, D. MMMM YYYY HH:mm'
+    },
+    calendar : {
+        sameDay: '[heute um] LT [Uhr]',
+        sameElse: 'L',
+        nextDay: '[morgen um] LT [Uhr]',
+        nextWeek: 'dddd [um] LT [Uhr]',
+        lastDay: '[gestern um] LT [Uhr]',
+        lastWeek: '[letzten] dddd [um] LT [Uhr]'
+    },
+    relativeTime : {
+        future : 'in %s',
+        past : 'vor %s',
+        s : 'ein paar Sekunden',
+        m : processRelativeTime,
+        mm : '%d Minuten',
+        h : processRelativeTime,
+        hh : '%d Stunden',
+        d : processRelativeTime,
+        dd : processRelativeTime,
+        M : processRelativeTime,
+        MM : processRelativeTime,
+        y : processRelativeTime,
+        yy : processRelativeTime
+    },
+    dayOfMonthOrdinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
     }
+});
 
-    var de = moment.defineLocale('de', {
-        months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
-        monthsShort : 'Jan._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
-        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
-        weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
-        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
-        longDateFormat : {
-            LT: 'HH:mm',
-            LTS: 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D. MMMM YYYY',
-            LLL : 'D. MMMM YYYY HH:mm',
-            LLLL : 'dddd, D. MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[Heute um] LT [Uhr]',
-            sameElse: 'L',
-            nextDay: '[Morgen um] LT [Uhr]',
-            nextWeek: 'dddd [um] LT [Uhr]',
-            lastDay: '[Gestern um] LT [Uhr]',
-            lastWeek: '[letzten] dddd [um] LT [Uhr]'
-        },
-        relativeTime : {
-            future : 'in %s',
-            past : 'vor %s',
-            s : 'ein paar Sekunden',
-            m : processRelativeTime,
-            mm : '%d Minuten',
-            h : processRelativeTime,
-            hh : '%d Stunden',
-            d : processRelativeTime,
-            dd : processRelativeTime,
-            M : processRelativeTime,
-            MM : processRelativeTime,
-            y : processRelativeTime,
-            yy : processRelativeTime
-        },
-        ordinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
+return de;
 
-    return de;
-
-}));
+})));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/es.js

@@ -1,78 +1,83 @@
 //! moment.js locale configuration
-//! locale : spanish (es)
+//! locale : Spanish [es]
 //! author : Julio Napurí : https://github.com/julionc
 
-(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
    factory(global.moment)
-}(this, function (moment) { 'use strict';
+}(this, (function (moment) { 'use strict';
 
 
-    var monthsShortDot = 'Ene._Feb._Mar._Abr._May._Jun._Jul._Ago._Sep._Oct._Nov._Dic.'.split('_'),
-        monthsShort = 'Ene_Feb_Mar_Abr_May_Jun_Jul_Ago_Sep_Oct_Nov_Dic'.split('_');
+var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_');
+var monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');
 
-    var es = moment.defineLocale('es', {
-        months : 'Enero_Febrero_Marzo_Abril_Mayo_Junio_Julio_Agosto_Septiembre_Octubre_Noviembre_Diciembre'.split('_'),
-        monthsShort : function (m, format) {
-            if (/-MMM-/.test(format)) {
-                return monthsShort[m.month()];
-            } else {
-                return monthsShortDot[m.month()];
-            }
-        },
-        weekdays : 'Domingo_Lunes_Martes_Miércoles_Jueves_Viernes_Sábado'.split('_'),
-        weekdaysShort : 'Dom._Lun._Mar._Mié._Jue._Vie._Sáb.'.split('_'),
-        weekdaysMin : 'Do_Lu_Ma_Mi_Ju_Vi_Sá'.split('_'),
-        longDateFormat : {
-            LT : 'H:mm',
-            LTS : 'H:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D [de] MMMM [de] YYYY',
-            LLL : 'D [de] MMMM [de] YYYY H:mm',
-            LLLL : 'dddd, D [de] MMMM [de] YYYY H:mm'
-        },
-        calendar : {
-            sameDay : function () {
-                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            nextDay : function () {
-                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            nextWeek : function () {
-                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            lastDay : function () {
-                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            lastWeek : function () {
-                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'en %s',
-            past : 'hace %s',
-            s : 'unos segundos',
-            m : 'un minuto',
-            mm : '%d minutos',
-            h : 'una hora',
-            hh : '%d horas',
-            d : 'un día',
-            dd : '%d días',
-            M : 'un mes',
-            MM : '%d meses',
-            y : 'un año',
-            yy : '%d años'
-        },
-        ordinalParse : /\d{1,2}º/,
-        ordinal : '%dº',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
+var es = moment.defineLocale('es', {
+    months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
+    monthsShort : function (m, format) {
+        if (!m) {
+            return monthsShortDot;
+        } else if (/-MMM-/.test(format)) {
+            return monthsShort[m.month()];
+        } else {
+            return monthsShortDot[m.month()];
         }
-    });
+    },
+    monthsParseExact : true,
+    weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
+    weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
+    weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),
+    weekdaysParseExact : true,
+    longDateFormat : {
+        LT : 'H:mm',
+        LTS : 'H:mm:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D [de] MMMM [de] YYYY',
+        LLL : 'D [de] MMMM [de] YYYY H:mm',
+        LLLL : 'dddd, D [de] MMMM [de] YYYY H:mm'
+    },
+    calendar : {
+        sameDay : function () {
+            return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+        },
+        nextDay : function () {
+            return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+        },
+        nextWeek : function () {
+            return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+        },
+        lastDay : function () {
+            return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+        },
+        lastWeek : function () {
+            return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+        },
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'en %s',
+        past : 'hace %s',
+        s : 'unos segundos',
+        m : 'un minuto',
+        mm : '%d minutos',
+        h : 'una hora',
+        hh : '%d horas',
+        d : 'un día',
+        dd : '%d días',
+        M : 'un mes',
+        MM : '%d meses',
+        y : 'un año',
+        yy : '%d años'
+    },
+    dayOfMonthOrdinalParse : /\d{1,2}º/,
+    ordinal : '%dº',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
 
-    return es;
+return es;
 
-}));
+})));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/fi.js

@@ -1,22 +1,23 @@
 //! moment.js locale configuration
-//! locale : finnish (fi)
+//! locale : Finnish [fi]
 //! author : Tarmo Aidantausta : https://github.com/bleadof
 
-(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
    factory(global.moment)
-}(this, function (moment) { 'use strict';
+}(this, (function (moment) { 'use strict';
 
 
-    var numbersPast = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' '),
-        numbersFuture = [
-            'nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden',
-            numbersPast[7], numbersPast[8], numbersPast[9]
-        ];
-    function translate(number, withoutSuffix, key, isFuture) {
-        var result = '';
-        switch (key) {
+var numbersPast = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' ');
+var numbersFuture = [
+        'nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden',
+        numbersPast[7], numbersPast[8], numbersPast[9]
+    ];
+function translate(number, withoutSuffix, key, isFuture) {
+    var result = '';
+    switch (key) {
         case 's':
             return isFuture ? 'muutaman sekunnin' : 'muutama sekunti';
         case 'm':
@@ -44,63 +45,63 @@
         case 'yy':
             result = isFuture ? 'vuoden' : 'vuotta';
             break;
-        }
-        result = verbalNumber(number, isFuture) + ' ' + result;
-        return result;
     }
-    function verbalNumber(number, isFuture) {
-        return number < 10 ? (isFuture ? numbersFuture[number] : numbersPast[number]) : number;
+    result = verbalNumber(number, isFuture) + ' ' + result;
+    return result;
+}
+function verbalNumber(number, isFuture) {
+    return number < 10 ? (isFuture ? numbersFuture[number] : numbersPast[number]) : number;
+}
+
+var fi = moment.defineLocale('fi', {
+    months : 'tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu'.split('_'),
+    monthsShort : 'tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu'.split('_'),
+    weekdays : 'sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai'.split('_'),
+    weekdaysShort : 'su_ma_ti_ke_to_pe_la'.split('_'),
+    weekdaysMin : 'su_ma_ti_ke_to_pe_la'.split('_'),
+    longDateFormat : {
+        LT : 'HH.mm',
+        LTS : 'HH.mm.ss',
+        L : 'DD.MM.YYYY',
+        LL : 'Do MMMM[ta] YYYY',
+        LLL : 'Do MMMM[ta] YYYY, [klo] HH.mm',
+        LLLL : 'dddd, Do MMMM[ta] YYYY, [klo] HH.mm',
+        l : 'D.M.YYYY',
+        ll : 'Do MMM YYYY',
+        lll : 'Do MMM YYYY, [klo] HH.mm',
+        llll : 'ddd, Do MMM YYYY, [klo] HH.mm'
+    },
+    calendar : {
+        sameDay : '[tänään] [klo] LT',
+        nextDay : '[huomenna] [klo] LT',
+        nextWeek : 'dddd [klo] LT',
+        lastDay : '[eilen] [klo] LT',
+        lastWeek : '[viime] dddd[na] [klo] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : '%s päästä',
+        past : '%s sitten',
+        s : translate,
+        m : translate,
+        mm : translate,
+        h : translate,
+        hh : translate,
+        d : translate,
+        dd : translate,
+        M : translate,
+        MM : translate,
+        y : translate,
+        yy : translate
+    },
+    dayOfMonthOrdinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
     }
+});
 
-    var fi = moment.defineLocale('fi', {
-        months : 'tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu'.split('_'),
-        monthsShort : 'tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu'.split('_'),
-        weekdays : 'sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai'.split('_'),
-        weekdaysShort : 'su_ma_ti_ke_to_pe_la'.split('_'),
-        weekdaysMin : 'su_ma_ti_ke_to_pe_la'.split('_'),
-        longDateFormat : {
-            LT : 'HH.mm',
-            LTS : 'HH.mm.ss',
-            L : 'DD.MM.YYYY',
-            LL : 'Do MMMM[ta] YYYY',
-            LLL : 'Do MMMM[ta] YYYY, [klo] HH.mm',
-            LLLL : 'dddd, Do MMMM[ta] YYYY, [klo] HH.mm',
-            l : 'D.M.YYYY',
-            ll : 'Do MMM YYYY',
-            lll : 'Do MMM YYYY, [klo] HH.mm',
-            llll : 'ddd, Do MMM YYYY, [klo] HH.mm'
-        },
-        calendar : {
-            sameDay : '[tänään] [klo] LT',
-            nextDay : '[huomenna] [klo] LT',
-            nextWeek : 'dddd [klo] LT',
-            lastDay : '[eilen] [klo] LT',
-            lastWeek : '[viime] dddd[na] [klo] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s päästä',
-            past : '%s sitten',
-            s : translate,
-            m : translate,
-            mm : translate,
-            h : translate,
-            hh : translate,
-            d : translate,
-            dd : translate,
-            M : translate,
-            MM : translate,
-            y : translate,
-            yy : translate
-        },
-        ordinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
+return fi;
 
-    return fi;
-
-}));
+})));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/fr.js

@@ -1,61 +1,83 @@
 //! moment.js locale configuration
-//! locale : french (fr)
+//! locale : French [fr]
 //! author : John Fischer : https://github.com/jfroffice
 
-(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
    factory(global.moment)
-}(this, function (moment) { 'use strict';
+}(this, (function (moment) { 'use strict';
 
 
-    var fr = moment.defineLocale('fr', {
-        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
-        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
-        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
-        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
-        weekdaysMin : 'Di_Lu_Ma_Me_Je_Ve_Sa'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[Aujourd\'hui à] LT',
-            nextDay: '[Demain à] LT',
-            nextWeek: 'dddd [à] LT',
-            lastDay: '[Hier à] LT',
-            lastWeek: 'dddd [dernier à] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'dans %s',
-            past : 'il y a %s',
-            s : 'quelques secondes',
-            m : 'une minute',
-            mm : '%d minutes',
-            h : 'une heure',
-            hh : '%d heures',
-            d : 'un jour',
-            dd : '%d jours',
-            M : 'un mois',
-            MM : '%d mois',
-            y : 'un an',
-            yy : '%d ans'
-        },
-        ordinalParse: /\d{1,2}(er|)/,
-        ordinal : function (number) {
-            return number + (number === 1 ? 'er' : '');
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
+var fr = moment.defineLocale('fr', {
+    months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
+    monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+    monthsParseExact : true,
+    weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+    weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+    weekdaysMin : 'Di_Lu_Ma_Me_Je_Ve_Sa'.split('_'),
+    weekdaysParseExact : true,
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'HH:mm:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY HH:mm',
+        LLLL : 'dddd D MMMM YYYY HH:mm'
+    },
+    calendar : {
+        sameDay : '[Aujourd’hui à] LT',
+        nextDay : '[Demain à] LT',
+        nextWeek : 'dddd [à] LT',
+        lastDay : '[Hier à] LT',
+        lastWeek : 'dddd [dernier à] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'dans %s',
+        past : 'il y a %s',
+        s : 'quelques secondes',
+        m : 'une minute',
+        mm : '%d minutes',
+        h : 'une heure',
+        hh : '%d heures',
+        d : 'un jour',
+        dd : '%d jours',
+        M : 'un mois',
+        MM : '%d mois',
+        y : 'un an',
+        yy : '%d ans'
+    },
+    dayOfMonthOrdinalParse: /\d{1,2}(er|)/,
+    ordinal : function (number, period) {
+        switch (period) {
+            // TODO: Return 'e' when day of month > 1. Move this case inside
+            // block for masculine words below.
+            // See https://github.com/moment/moment/issues/3375
+            case 'D':
+                return number + (number === 1 ? 'er' : '');
+
+            // Words with masculine grammatical gender: mois, trimestre, jour
+            default:
+            case 'M':
+            case 'Q':
+            case 'DDD':
+            case 'd':
+                return number + (number === 1 ? 'er' : 'e');
+
+            // Words with feminine grammatical gender: semaine
+            case 'w':
+            case 'W':
+                return number + (number === 1 ? 're' : 'e');
         }
-    });
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
 
-    return fr;
+return fr;
 
-}));
+})));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/nb.js

@@ -1,60 +1,63 @@
 //! moment.js locale configuration
-//! locale : norwegian bokmål (nb)
+//! locale : Norwegian Bokmål [nb]
 //! authors : Espen Hovlandsdal : https://github.com/rexxars
 //!           Sigurd Gartmann : https://github.com/sigurdga
 
-(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
    factory(global.moment)
-}(this, function (moment) { 'use strict';
+}(this, (function (moment) { 'use strict';
 
 
-    var nb = moment.defineLocale('nb', {
-        months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
-        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
-        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
-        weekdaysShort : 'søn_man_tirs_ons_tors_fre_lør'.split('_'),
-        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
-        longDateFormat : {
-            LT : 'H.mm',
-            LTS : 'H.mm.ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D. MMMM YYYY',
-            LLL : 'D. MMMM YYYY [kl.] H.mm',
-            LLLL : 'dddd D. MMMM YYYY [kl.] H.mm'
-        },
-        calendar : {
-            sameDay: '[i dag kl.] LT',
-            nextDay: '[i morgen kl.] LT',
-            nextWeek: 'dddd [kl.] LT',
-            lastDay: '[i går kl.] LT',
-            lastWeek: '[forrige] dddd [kl.] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'om %s',
-            past : 'for %s siden',
-            s : 'noen sekunder',
-            m : 'ett minutt',
-            mm : '%d minutter',
-            h : 'en time',
-            hh : '%d timer',
-            d : 'en dag',
-            dd : '%d dager',
-            M : 'en måned',
-            MM : '%d måneder',
-            y : 'ett år',
-            yy : '%d år'
-        },
-        ordinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
+var nb = moment.defineLocale('nb', {
+    months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+    monthsShort : 'jan._feb._mars_april_mai_juni_juli_aug._sep._okt._nov._des.'.split('_'),
+    monthsParseExact : true,
+    weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
+    weekdaysShort : 'sø._ma._ti._on._to._fr._lø.'.split('_'),
+    weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
+    weekdaysParseExact : true,
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'HH:mm:ss',
+        L : 'DD.MM.YYYY',
+        LL : 'D. MMMM YYYY',
+        LLL : 'D. MMMM YYYY [kl.] HH:mm',
+        LLLL : 'dddd D. MMMM YYYY [kl.] HH:mm'
+    },
+    calendar : {
+        sameDay: '[i dag kl.] LT',
+        nextDay: '[i morgen kl.] LT',
+        nextWeek: 'dddd [kl.] LT',
+        lastDay: '[i går kl.] LT',
+        lastWeek: '[forrige] dddd [kl.] LT',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'om %s',
+        past : '%s siden',
+        s : 'noen sekunder',
+        m : 'ett minutt',
+        mm : '%d minutter',
+        h : 'en time',
+        hh : '%d timer',
+        d : 'en dag',
+        dd : '%d dager',
+        M : 'en måned',
+        MM : '%d måneder',
+        y : 'ett år',
+        yy : '%d år'
+    },
+    dayOfMonthOrdinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
 
-    return nb;
+return nb;
 
-}));
+})));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/nl.js

@@ -1,70 +1,88 @@
 //! moment.js locale configuration
-//! locale : dutch (nl)
-//! author : Joris Röling : https://github.com/jjupiter
+//! locale : Dutch [nl]
+//! author : Joris Röling : https://github.com/jorisroling
+//! author : Jacob Middag : https://github.com/middagj
 
-(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
    factory(global.moment)
-}(this, function (moment) { 'use strict';
+}(this, (function (moment) { 'use strict';
 
 
-    var monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_'),
-        monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');
+var monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_');
+var monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');
 
-    var nl = moment.defineLocale('nl', {
-        months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
-        monthsShort : function (m, format) {
-            if (/-MMM-/.test(format)) {
-                return monthsShortWithoutDots[m.month()];
-            } else {
-                return monthsShortWithDots[m.month()];
-            }
-        },
-        weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
-        weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),
-        weekdaysMin : 'Zo_Ma_Di_Wo_Do_Vr_Za'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD-MM-YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[vandaag om] LT',
-            nextDay: '[morgen om] LT',
-            nextWeek: 'dddd [om] LT',
-            lastDay: '[gisteren om] LT',
-            lastWeek: '[afgelopen] dddd [om] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'over %s',
-            past : '%s geleden',
-            s : 'een paar seconden',
-            m : 'één minuut',
-            mm : '%d minuten',
-            h : 'één uur',
-            hh : '%d uur',
-            d : 'één dag',
-            dd : '%d dagen',
-            M : 'één maand',
-            MM : '%d maanden',
-            y : 'één jaar',
-            yy : '%d jaar'
-        },
-        ordinalParse: /\d{1,2}(ste|de)/,
-        ordinal : function (number) {
-            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
+var monthsParse = [/^jan/i, /^feb/i, /^maart|mrt.?$/i, /^apr/i, /^mei$/i, /^jun[i.]?$/i, /^jul[i.]?$/i, /^aug/i, /^sep/i, /^okt/i, /^nov/i, /^dec/i];
+var monthsRegex = /^(januari|februari|maart|april|mei|april|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i;
+
+var nl = moment.defineLocale('nl', {
+    months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
+    monthsShort : function (m, format) {
+        if (!m) {
+            return monthsShortWithDots;
+        } else if (/-MMM-/.test(format)) {
+            return monthsShortWithoutDots[m.month()];
+        } else {
+            return monthsShortWithDots[m.month()];
         }
-    });
+    },
 
-    return nl;
+    monthsRegex: monthsRegex,
+    monthsShortRegex: monthsRegex,
+    monthsStrictRegex: /^(januari|februari|maart|mei|ju[nl]i|april|augustus|september|oktober|november|december)/i,
+    monthsShortStrictRegex: /^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,
 
-}));
+    monthsParse : monthsParse,
+    longMonthsParse : monthsParse,
+    shortMonthsParse : monthsParse,
+
+    weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
+    weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),
+    weekdaysMin : 'Zo_Ma_Di_Wo_Do_Vr_Za'.split('_'),
+    weekdaysParseExact : true,
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'HH:mm:ss',
+        L : 'DD-MM-YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY HH:mm',
+        LLLL : 'dddd D MMMM YYYY HH:mm'
+    },
+    calendar : {
+        sameDay: '[vandaag om] LT',
+        nextDay: '[morgen om] LT',
+        nextWeek: 'dddd [om] LT',
+        lastDay: '[gisteren om] LT',
+        lastWeek: '[afgelopen] dddd [om] LT',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'over %s',
+        past : '%s geleden',
+        s : 'een paar seconden',
+        m : 'één minuut',
+        mm : '%d minuten',
+        h : 'één uur',
+        hh : '%d uur',
+        d : 'één dag',
+        dd : '%d dagen',
+        M : 'één maand',
+        MM : '%d maanden',
+        y : 'één jaar',
+        yy : '%d jaar'
+    },
+    dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
+    ordinal : function (number) {
+        return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
+return nl;
+
+})));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/pl.js

@@ -1,22 +1,23 @@
 //! moment.js locale configuration
-//! locale : polish (pl)
+//! locale : Polish [pl]
 //! author : Rafal Hirsz : https://github.com/evoL
 
-(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
    factory(global.moment)
-}(this, function (moment) { 'use strict';
+}(this, (function (moment) { 'use strict';
 
 
-    var monthsNominative = 'styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień'.split('_'),
-        monthsSubjective = 'stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia'.split('_');
-    function plural(n) {
-        return (n % 10 < 5) && (n % 10 > 1) && ((~~(n / 10) % 10) !== 1);
-    }
-    function translate(number, withoutSuffix, key) {
-        var result = number + ' ';
-        switch (key) {
+var monthsNominative = 'styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień'.split('_');
+var monthsSubjective = 'stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia'.split('_');
+function plural(n) {
+    return (n % 10 < 5) && (n % 10 > 1) && ((~~(n / 10) % 10) !== 1);
+}
+function translate(number, withoutSuffix, key) {
+    var result = number + ' ';
+    switch (key) {
         case 'm':
             return withoutSuffix ? 'minuta' : 'minutę';
         case 'mm':
@@ -29,41 +30,43 @@
             return result + (plural(number) ? 'miesiące' : 'miesięcy');
         case 'yy':
             return result + (plural(number) ? 'lata' : 'lat');
-        }
     }
+}
 
-    var pl = moment.defineLocale('pl', {
-        months : function (momentToFormat, format) {
-            if (format === '') {
-                // Hack: if format empty we know this is used to generate
-                // RegExp by moment. Give then back both valid forms of months
-                // in RegExp ready format.
-                return '(' + monthsSubjective[momentToFormat.month()] + '|' + monthsNominative[momentToFormat.month()] + ')';
-            } else if (/D MMMM/.test(format)) {
-                return monthsSubjective[momentToFormat.month()];
-            } else {
-                return monthsNominative[momentToFormat.month()];
-            }
-        },
-        monthsShort : 'sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru'.split('_'),
-        weekdays : 'niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota'.split('_'),
-        weekdaysShort : 'nie_pon_wt_śr_czw_pt_sb'.split('_'),
-        weekdaysMin : 'N_Pn_Wt_Śr_Cz_Pt_So'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd, D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[Dziś o] LT',
-            nextDay: '[Jutro o] LT',
-            nextWeek: '[W] dddd [o] LT',
-            lastDay: '[Wczoraj o] LT',
-            lastWeek: function () {
-                switch (this.day()) {
+var pl = moment.defineLocale('pl', {
+    months : function (momentToFormat, format) {
+        if (!momentToFormat) {
+            return monthsNominative;
+        } else if (format === '') {
+            // Hack: if format empty we know this is used to generate
+            // RegExp by moment. Give then back both valid forms of months
+            // in RegExp ready format.
+            return '(' + monthsSubjective[momentToFormat.month()] + '|' + monthsNominative[momentToFormat.month()] + ')';
+        } else if (/D MMMM/.test(format)) {
+            return monthsSubjective[momentToFormat.month()];
+        } else {
+            return monthsNominative[momentToFormat.month()];
+        }
+    },
+    monthsShort : 'sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru'.split('_'),
+    weekdays : 'niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota'.split('_'),
+    weekdaysShort : 'ndz_pon_wt_śr_czw_pt_sob'.split('_'),
+    weekdaysMin : 'Nd_Pn_Wt_Śr_Cz_Pt_So'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'HH:mm:ss',
+        L : 'DD.MM.YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY HH:mm',
+        LLLL : 'dddd, D MMMM YYYY HH:mm'
+    },
+    calendar : {
+        sameDay: '[Dziś o] LT',
+        nextDay: '[Jutro o] LT',
+        nextWeek: '[W] dddd [o] LT',
+        lastDay: '[Wczoraj o] LT',
+        lastWeek: function () {
+            switch (this.day()) {
                 case 0:
                     return '[W zeszłą niedzielę o] LT';
                 case 3:
@@ -72,33 +75,33 @@
                     return '[W zeszłą sobotę o] LT';
                 default:
                     return '[W zeszły] dddd [o] LT';
-                }
-            },
-            sameElse: 'L'
+            }
         },
-        relativeTime : {
-            future : 'za %s',
-            past : '%s temu',
-            s : 'kilka sekund',
-            m : translate,
-            mm : translate,
-            h : translate,
-            hh : translate,
-            d : '1 dzień',
-            dd : '%d dni',
-            M : 'miesiąc',
-            MM : translate,
-            y : 'rok',
-            yy : translate
-        },
-        ordinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'za %s',
+        past : '%s temu',
+        s : 'kilka sekund',
+        m : translate,
+        mm : translate,
+        h : translate,
+        hh : translate,
+        d : '1 dzień',
+        dd : '%d dni',
+        M : 'miesiąc',
+        MM : translate,
+        y : 'rok',
+        yy : translate
+    },
+    dayOfMonthOrdinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
 
-    return pl;
+return pl;
 
-}));
+})));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/pt-br.js

@@ -1,59 +1,61 @@
 //! moment.js locale configuration
-//! locale : brazilian portuguese (pt-br)
+//! locale : Portuguese (Brazil) [pt-br]
 //! author : Caio Ribeiro Pereira : https://github.com/caio-ribeiro-pereira
 
-(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
    factory(global.moment)
-}(this, function (moment) { 'use strict';
+}(this, (function (moment) { 'use strict';
 
 
-    var pt_br = moment.defineLocale('pt-br', {
-        months : 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'),
-        monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
-        weekdays : 'Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado'.split('_'),
-        weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
-        weekdaysMin : 'Dom_2ª_3ª_4ª_5ª_6ª_Sáb'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D [de] MMMM [de] YYYY',
-            LLL : 'D [de] MMMM [de] YYYY [às] HH:mm',
-            LLLL : 'dddd, D [de] MMMM [de] YYYY [às] HH:mm'
+var ptBr = moment.defineLocale('pt-br', {
+    months : 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'),
+    monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
+    weekdays : 'Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado'.split('_'),
+    weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
+    weekdaysMin : 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'),
+    weekdaysParseExact : true,
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'HH:mm:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D [de] MMMM [de] YYYY',
+        LLL : 'D [de] MMMM [de] YYYY [às] HH:mm',
+        LLLL : 'dddd, D [de] MMMM [de] YYYY [às] HH:mm'
+    },
+    calendar : {
+        sameDay: '[Hoje às] LT',
+        nextDay: '[Amanhã às] LT',
+        nextWeek: 'dddd [às] LT',
+        lastDay: '[Ontem às] LT',
+        lastWeek: function () {
+            return (this.day() === 0 || this.day() === 6) ?
+                '[Último] dddd [às] LT' : // Saturday + Sunday
+                '[Última] dddd [às] LT'; // Monday - Friday
         },
-        calendar : {
-            sameDay: '[Hoje às] LT',
-            nextDay: '[Amanhã às] LT',
-            nextWeek: 'dddd [às] LT',
-            lastDay: '[Ontem às] LT',
-            lastWeek: function () {
-                return (this.day() === 0 || this.day() === 6) ?
-                    '[Último] dddd [às] LT' : // Saturday + Sunday
-                    '[Última] dddd [às] LT'; // Monday - Friday
-            },
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'em %s',
-            past : '%s atrás',
-            s : 'poucos segundos',
-            m : 'um minuto',
-            mm : '%d minutos',
-            h : 'uma hora',
-            hh : '%d horas',
-            d : 'um dia',
-            dd : '%d dias',
-            M : 'um mês',
-            MM : '%d meses',
-            y : 'um ano',
-            yy : '%d anos'
-        },
-        ordinalParse: /\d{1,2}º/,
-        ordinal : '%dº'
-    });
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'em %s',
+        past : '%s atrás',
+        s : 'poucos segundos',
+        m : 'um minuto',
+        mm : '%d minutos',
+        h : 'uma hora',
+        hh : '%d horas',
+        d : 'um dia',
+        dd : '%d dias',
+        M : 'um mês',
+        MM : '%d meses',
+        y : 'um ano',
+        yy : '%d anos'
+    },
+    dayOfMonthOrdinalParse: /\d{1,2}º/,
+    ordinal : '%dº'
+});
 
-    return pt_br;
+return ptBr;
 
-}));
+})));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/ro.js

@@ -1,73 +1,75 @@
 //! moment.js locale configuration
-//! locale : romanian (ro)
+//! locale : Romanian [ro]
 //! author : Vlad Gurdiga : https://github.com/gurdiga
 //! author : Valentin Agachi : https://github.com/avaly
 
-(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
    factory(global.moment)
-}(this, function (moment) { 'use strict';
+}(this, (function (moment) { 'use strict';
 
 
-    function relativeTimeWithPlural(number, withoutSuffix, key) {
-        var format = {
-                'mm': 'minute',
-                'hh': 'ore',
-                'dd': 'zile',
-                'MM': 'luni',
-                'yy': 'ani'
-            },
-            separator = ' ';
-        if (number % 100 >= 20 || (number >= 100 && number % 100 === 0)) {
-            separator = ' de ';
-        }
-        return number + separator + format[key];
+function relativeTimeWithPlural(number, withoutSuffix, key) {
+    var format = {
+            'mm': 'minute',
+            'hh': 'ore',
+            'dd': 'zile',
+            'MM': 'luni',
+            'yy': 'ani'
+        },
+        separator = ' ';
+    if (number % 100 >= 20 || (number >= 100 && number % 100 === 0)) {
+        separator = ' de ';
     }
+    return number + separator + format[key];
+}
 
-    var ro = moment.defineLocale('ro', {
-        months : 'ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie'.split('_'),
-        monthsShort : 'ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.'.split('_'),
-        weekdays : 'duminică_luni_marți_miercuri_joi_vineri_sâmbătă'.split('_'),
-        weekdaysShort : 'Dum_Lun_Mar_Mie_Joi_Vin_Sâm'.split('_'),
-        weekdaysMin : 'Du_Lu_Ma_Mi_Jo_Vi_Sâ'.split('_'),
-        longDateFormat : {
-            LT : 'H:mm',
-            LTS : 'H:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY H:mm',
-            LLLL : 'dddd, D MMMM YYYY H:mm'
-        },
-        calendar : {
-            sameDay: '[azi la] LT',
-            nextDay: '[mâine la] LT',
-            nextWeek: 'dddd [la] LT',
-            lastDay: '[ieri la] LT',
-            lastWeek: '[fosta] dddd [la] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'peste %s',
-            past : '%s în urmă',
-            s : 'câteva secunde',
-            m : 'un minut',
-            mm : relativeTimeWithPlural,
-            h : 'o oră',
-            hh : relativeTimeWithPlural,
-            d : 'o zi',
-            dd : relativeTimeWithPlural,
-            M : 'o lună',
-            MM : relativeTimeWithPlural,
-            y : 'un an',
-            yy : relativeTimeWithPlural
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 1st is the first week of the year.
-        }
-    });
+var ro = moment.defineLocale('ro', {
+    months : 'ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie'.split('_'),
+    monthsShort : 'ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.'.split('_'),
+    monthsParseExact: true,
+    weekdays : 'duminică_luni_marți_miercuri_joi_vineri_sâmbătă'.split('_'),
+    weekdaysShort : 'Dum_Lun_Mar_Mie_Joi_Vin_Sâm'.split('_'),
+    weekdaysMin : 'Du_Lu_Ma_Mi_Jo_Vi_Sâ'.split('_'),
+    longDateFormat : {
+        LT : 'H:mm',
+        LTS : 'H:mm:ss',
+        L : 'DD.MM.YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY H:mm',
+        LLLL : 'dddd, D MMMM YYYY H:mm'
+    },
+    calendar : {
+        sameDay: '[azi la] LT',
+        nextDay: '[mâine la] LT',
+        nextWeek: 'dddd [la] LT',
+        lastDay: '[ieri la] LT',
+        lastWeek: '[fosta] dddd [la] LT',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'peste %s',
+        past : '%s în urmă',
+        s : 'câteva secunde',
+        m : 'un minut',
+        mm : relativeTimeWithPlural,
+        h : 'o oră',
+        hh : relativeTimeWithPlural,
+        d : 'o zi',
+        dd : relativeTimeWithPlural,
+        M : 'o lună',
+        MM : relativeTimeWithPlural,
+        y : 'un an',
+        yy : relativeTimeWithPlural
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
 
-    return ro;
+return ro;
 
-}));
+})));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/ru.js

@@ -1,90 +1,110 @@
 //! moment.js locale configuration
-//! locale : russian (ru)
+//! locale : Russian [ru]
 //! author : Viktorminator : https://github.com/Viktorminator
 //! Author : Menelion Elensúle : https://github.com/Oire
+//! author : Коренберг Марк : https://github.com/socketpair
 
-(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
    factory(global.moment)
-}(this, function (moment) { 'use strict';
+}(this, (function (moment) { 'use strict';
 
 
-    function plural(word, num) {
-        var forms = word.split('_');
-        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
+function plural(word, num) {
+    var forms = word.split('_');
+    return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
+}
+function relativeTimeWithPlural(number, withoutSuffix, key) {
+    var format = {
+        'mm': withoutSuffix ? 'минута_минуты_минут' : 'минуту_минуты_минут',
+        'hh': 'час_часа_часов',
+        'dd': 'день_дня_дней',
+        'MM': 'месяц_месяца_месяцев',
+        'yy': 'год_года_лет'
+    };
+    if (key === 'm') {
+        return withoutSuffix ? 'минута' : 'минуту';
     }
-    function relativeTimeWithPlural(number, withoutSuffix, key) {
-        var format = {
-            'mm': withoutSuffix ? 'минута_минуты_минут' : 'минуту_минуты_минут',
-            'hh': 'час_часа_часов',
-            'dd': 'день_дня_дней',
-            'MM': 'месяц_месяца_месяцев',
-            'yy': 'год_года_лет'
-        };
-        if (key === 'm') {
-            return withoutSuffix ? 'минута' : 'минуту';
-        }
-        else {
-            return number + ' ' + plural(format[key], +number);
-        }
-    }
-    function monthsCaseReplace(m, format) {
-        var months = {
-            'nominative': 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),
-            'accusative': 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_')
-        },
-        nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
-            'accusative' :
-            'nominative';
-        return months[nounCase][m.month()];
-    }
-    function monthsShortCaseReplace(m, format) {
-        var monthsShort = {
-            'nominative': 'янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек'.split('_'),
-            'accusative': 'янв_фев_мар_апр_мая_июня_июля_авг_сен_окт_ноя_дек'.split('_')
-        },
-        nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
-            'accusative' :
-            'nominative';
-        return monthsShort[nounCase][m.month()];
-    }
-    function weekdaysCaseReplace(m, format) {
-        var weekdays = {
-            'nominative': 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'),
-            'accusative': 'воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу'.split('_')
-        },
-        nounCase = (/\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\] ?dddd/).test(format) ?
-            'accusative' :
-            'nominative';
-        return weekdays[nounCase][m.day()];
+    else {
+        return number + ' ' + plural(format[key], +number);
     }
+}
+var monthsParse = [/^янв/i, /^фев/i, /^мар/i, /^апр/i, /^ма[йя]/i, /^июн/i, /^июл/i, /^авг/i, /^сен/i, /^окт/i, /^ноя/i, /^дек/i];
 
-    var ru = moment.defineLocale('ru', {
-        months : monthsCaseReplace,
-        monthsShort : monthsShortCaseReplace,
-        weekdays : weekdaysCaseReplace,
-        weekdaysShort : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
-        weekdaysMin : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
-        monthsParse : [/^янв/i, /^фев/i, /^мар/i, /^апр/i, /^ма[й|я]/i, /^июн/i, /^июл/i, /^авг/i, /^сен/i, /^окт/i, /^ноя/i, /^дек/i],
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D MMMM YYYY г.',
-            LLL : 'D MMMM YYYY г., HH:mm',
-            LLLL : 'dddd, D MMMM YYYY г., HH:mm'
+// http://new.gramota.ru/spravka/rules/139-prop : § 103
+// Сокращения месяцев: http://new.gramota.ru/spravka/buro/search-answer?s=242637
+// CLDR data:          http://www.unicode.org/cldr/charts/28/summary/ru.html#1753
+var ru = moment.defineLocale('ru', {
+    months : {
+        format: 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_'),
+        standalone: 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_')
+    },
+    monthsShort : {
+        // по CLDR именно "июл." и "июн.", но какой смысл менять букву на точку ?
+        format: 'янв._февр._мар._апр._мая_июня_июля_авг._сент._окт._нояб._дек.'.split('_'),
+        standalone: 'янв._февр._март_апр._май_июнь_июль_авг._сент._окт._нояб._дек.'.split('_')
+    },
+    weekdays : {
+        standalone: 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'),
+        format: 'воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу'.split('_'),
+        isFormat: /\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\] ?dddd/
+    },
+    weekdaysShort : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
+    weekdaysMin : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
+    monthsParse : monthsParse,
+    longMonthsParse : monthsParse,
+    shortMonthsParse : monthsParse,
+
+    // полные названия с падежами, по три буквы, для некоторых, по 4 буквы, сокращения с точкой и без точки
+    monthsRegex: /^(январ[ья]|янв\.?|феврал[ья]|февр?\.?|марта?|мар\.?|апрел[ья]|апр\.?|ма[йя]|июн[ья]|июн\.?|июл[ья]|июл\.?|августа?|авг\.?|сентябр[ья]|сент?\.?|октябр[ья]|окт\.?|ноябр[ья]|нояб?\.?|декабр[ья]|дек\.?)/i,
+
+    // копия предыдущего
+    monthsShortRegex: /^(январ[ья]|янв\.?|феврал[ья]|февр?\.?|марта?|мар\.?|апрел[ья]|апр\.?|ма[йя]|июн[ья]|июн\.?|июл[ья]|июл\.?|августа?|авг\.?|сентябр[ья]|сент?\.?|октябр[ья]|окт\.?|ноябр[ья]|нояб?\.?|декабр[ья]|дек\.?)/i,
+
+    // полные названия с падежами
+    monthsStrictRegex: /^(январ[яь]|феврал[яь]|марта?|апрел[яь]|ма[яй]|июн[яь]|июл[яь]|августа?|сентябр[яь]|октябр[яь]|ноябр[яь]|декабр[яь])/i,
+
+    // Выражение, которое соотвествует только сокращённым формам
+    monthsShortStrictRegex: /^(янв\.|февр?\.|мар[т.]|апр\.|ма[яй]|июн[ья.]|июл[ья.]|авг\.|сент?\.|окт\.|нояб?\.|дек\.)/i,
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'HH:mm:ss',
+        L : 'DD.MM.YYYY',
+        LL : 'D MMMM YYYY г.',
+        LLL : 'D MMMM YYYY г., HH:mm',
+        LLLL : 'dddd, D MMMM YYYY г., HH:mm'
+    },
+    calendar : {
+        sameDay: '[Сегодня в] LT',
+        nextDay: '[Завтра в] LT',
+        lastDay: '[Вчера в] LT',
+        nextWeek: function (now) {
+            if (now.week() !== this.week()) {
+                switch (this.day()) {
+                    case 0:
+                        return '[В следующее] dddd [в] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                        return '[В следующий] dddd [в] LT';
+                    case 3:
+                    case 5:
+                    case 6:
+                        return '[В следующую] dddd [в] LT';
+                }
+            } else {
+                if (this.day() === 2) {
+                    return '[Во] dddd [в] LT';
+                } else {
+                    return '[В] dddd [в] LT';
+                }
+            }
         },
-        calendar : {
-            sameDay: '[Сегодня в] LT',
-            nextDay: '[Завтра в] LT',
-            lastDay: '[Вчера в] LT',
-            nextWeek: function () {
-                return this.day() === 2 ? '[Во] dddd [в] LT' : '[В] dddd [в] LT';
-            },
-            lastWeek: function (now) {
-                if (now.week() !== this.week()) {
-                    switch (this.day()) {
+        lastWeek: function (now) {
+            if (now.week() !== this.week()) {
+                switch (this.day()) {
                     case 0:
                         return '[В прошлое] dddd [в] LT';
                     case 1:
@@ -95,50 +115,50 @@
                     case 5:
                     case 6:
                         return '[В прошлую] dddd [в] LT';
-                    }
-                } else {
-                    if (this.day() === 2) {
-                        return '[Во] dddd [в] LT';
-                    } else {
-                        return '[В] dddd [в] LT';
-                    }
                 }
-            },
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'через %s',
-            past : '%s назад',
-            s : 'несколько секунд',
-            m : relativeTimeWithPlural,
-            mm : relativeTimeWithPlural,
-            h : 'час',
-            hh : relativeTimeWithPlural,
-            d : 'день',
-            dd : relativeTimeWithPlural,
-            M : 'месяц',
-            MM : relativeTimeWithPlural,
-            y : 'год',
-            yy : relativeTimeWithPlural
-        },
-        meridiemParse: /ночи|утра|дня|вечера/i,
-        isPM : function (input) {
-            return /^(дня|вечера)$/.test(input);
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 4) {
-                return 'ночи';
-            } else if (hour < 12) {
-                return 'утра';
-            } else if (hour < 17) {
-                return 'дня';
             } else {
-                return 'вечера';
+                if (this.day() === 2) {
+                    return '[Во] dddd [в] LT';
+                } else {
+                    return '[В] dddd [в] LT';
+                }
             }
         },
-        ordinalParse: /\d{1,2}-(й|го|я)/,
-        ordinal: function (number, period) {
-            switch (period) {
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'через %s',
+        past : '%s назад',
+        s : 'несколько секунд',
+        m : relativeTimeWithPlural,
+        mm : relativeTimeWithPlural,
+        h : 'час',
+        hh : relativeTimeWithPlural,
+        d : 'день',
+        dd : relativeTimeWithPlural,
+        M : 'месяц',
+        MM : relativeTimeWithPlural,
+        y : 'год',
+        yy : relativeTimeWithPlural
+    },
+    meridiemParse: /ночи|утра|дня|вечера/i,
+    isPM : function (input) {
+        return /^(дня|вечера)$/.test(input);
+    },
+    meridiem : function (hour, minute, isLower) {
+        if (hour < 4) {
+            return 'ночи';
+        } else if (hour < 12) {
+            return 'утра';
+        } else if (hour < 17) {
+            return 'дня';
+        } else {
+            return 'вечера';
+        }
+    },
+    dayOfMonthOrdinalParse: /\d{1,2}-(й|го|я)/,
+    ordinal: function (number, period) {
+        switch (period) {
             case 'M':
             case 'd':
             case 'DDD':
@@ -150,14 +170,14 @@
                 return number + '-я';
             default:
                 return number;
-            }
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 1st is the first week of the year.
         }
-    });
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
 
-    return ru;
+return ru;
 
-}));
+})));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/sr.js

@@ -1,107 +1,110 @@
 //! moment.js locale configuration
-//! locale : Serbian-cyrillic (sr-cyrl)
+//! locale : Serbian [sr]
 //! author : Milan Janačković<milanjanackovic@gmail.com> : https://github.com/milan-j
 
-(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
    factory(global.moment)
-}(this, function (moment) { 'use strict';
+}(this, (function (moment) { 'use strict';
 
 
-    var translator = {
-        words: { //Different grammatical cases
-            m: ['један минут', 'једне минуте'],
-            mm: ['минут', 'минуте', 'минута'],
-            h: ['један сат', 'једног сата'],
-            hh: ['сат', 'сата', 'сати'],
-            dd: ['дан', 'дана', 'дана'],
-            MM: ['месец', 'месеца', 'месеци'],
-            yy: ['година', 'године', 'година']
-        },
-        correctGrammaticalCase: function (number, wordKey) {
-            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
-        },
-        translate: function (number, withoutSuffix, key) {
-            var wordKey = translator.words[key];
-            if (key.length === 1) {
-                return withoutSuffix ? wordKey[0] : wordKey[1];
-            } else {
-                return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
-            }
+var translator = {
+    words: { //Different grammatical cases
+        m: ['jedan minut', 'jedne minute'],
+        mm: ['minut', 'minute', 'minuta'],
+        h: ['jedan sat', 'jednog sata'],
+        hh: ['sat', 'sata', 'sati'],
+        dd: ['dan', 'dana', 'dana'],
+        MM: ['mesec', 'meseca', 'meseci'],
+        yy: ['godina', 'godine', 'godina']
+    },
+    correctGrammaticalCase: function (number, wordKey) {
+        return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+    },
+    translate: function (number, withoutSuffix, key) {
+        var wordKey = translator.words[key];
+        if (key.length === 1) {
+            return withoutSuffix ? wordKey[0] : wordKey[1];
+        } else {
+            return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
         }
-    };
+    }
+};
 
-    var sr_cyrl = moment.defineLocale('sr-cyrl', {
-        months: ['јануар', 'фебруар', 'март', 'април', 'мај', 'јун', 'јул', 'август', 'септембар', 'октобар', 'новембар', 'децембар'],
-        monthsShort: ['јан.', 'феб.', 'мар.', 'апр.', 'мај', 'јун', 'јул', 'авг.', 'сеп.', 'окт.', 'нов.', 'дец.'],
-        weekdays: ['недеља', 'понедељак', 'уторак', 'среда', 'четвртак', 'петак', 'субота'],
-        weekdaysShort: ['нед.', 'пон.', 'уто.', 'сре.', 'чет.', 'пет.', 'суб.'],
-        weekdaysMin: ['не', 'по', 'ут', 'ср', 'че', 'пе', 'су'],
-        longDateFormat: {
-            LT: 'H:mm',
-            LTS : 'H:mm:ss',
-            L: 'DD. MM. YYYY',
-            LL: 'D. MMMM YYYY',
-            LLL: 'D. MMMM YYYY H:mm',
-            LLLL: 'dddd, D. MMMM YYYY H:mm'
-        },
-        calendar: {
-            sameDay: '[данас у] LT',
-            nextDay: '[сутра у] LT',
-            nextWeek: function () {
-                switch (this.day()) {
+var sr = moment.defineLocale('sr', {
+    months: 'januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar'.split('_'),
+    monthsShort: 'jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.'.split('_'),
+    monthsParseExact: true,
+    weekdays: 'nedelja_ponedeljak_utorak_sreda_četvrtak_petak_subota'.split('_'),
+    weekdaysShort: 'ned._pon._uto._sre._čet._pet._sub.'.split('_'),
+    weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'),
+    weekdaysParseExact : true,
+    longDateFormat: {
+        LT: 'H:mm',
+        LTS : 'H:mm:ss',
+        L: 'DD.MM.YYYY',
+        LL: 'D. MMMM YYYY',
+        LLL: 'D. MMMM YYYY H:mm',
+        LLLL: 'dddd, D. MMMM YYYY H:mm'
+    },
+    calendar: {
+        sameDay: '[danas u] LT',
+        nextDay: '[sutra u] LT',
+        nextWeek: function () {
+            switch (this.day()) {
                 case 0:
-                    return '[у] [недељу] [у] LT';
+                    return '[u] [nedelju] [u] LT';
                 case 3:
-                    return '[у] [среду] [у] LT';
+                    return '[u] [sredu] [u] LT';
                 case 6:
-                    return '[у] [суботу] [у] LT';
+                    return '[u] [subotu] [u] LT';
                 case 1:
                 case 2:
                 case 4:
                 case 5:
-                    return '[у] dddd [у] LT';
-                }
-            },
-            lastDay  : '[јуче у] LT',
-            lastWeek : function () {
-                var lastWeekDays = [
-                    '[прошле] [недеље] [у] LT',
-                    '[прошлог] [понедељка] [у] LT',
-                    '[прошлог] [уторка] [у] LT',
-                    '[прошле] [среде] [у] LT',
-                    '[прошлог] [четвртка] [у] LT',
-                    '[прошлог] [петка] [у] LT',
-                    '[прошле] [суботе] [у] LT'
-                ];
-                return lastWeekDays[this.day()];
-            },
-            sameElse : 'L'
+                    return '[u] dddd [u] LT';
+            }
         },
-        relativeTime : {
-            future : 'за %s',
-            past   : 'пре %s',
-            s      : 'неколико секунди',
-            m      : translator.translate,
-            mm     : translator.translate,
-            h      : translator.translate,
-            hh     : translator.translate,
-            d      : 'дан',
-            dd     : translator.translate,
-            M      : 'месец',
-            MM     : translator.translate,
-            y      : 'годину',
-            yy     : translator.translate
+        lastDay  : '[juče u] LT',
+        lastWeek : function () {
+            var lastWeekDays = [
+                '[prošle] [nedelje] [u] LT',
+                '[prošlog] [ponedeljka] [u] LT',
+                '[prošlog] [utorka] [u] LT',
+                '[prošle] [srede] [u] LT',
+                '[prošlog] [četvrtka] [u] LT',
+                '[prošlog] [petka] [u] LT',
+                '[prošle] [subote] [u] LT'
+            ];
+            return lastWeekDays[this.day()];
         },
-        ordinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 1st is the first week of the year.
-        }
-    });
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'za %s',
+        past   : 'pre %s',
+        s      : 'nekoliko sekundi',
+        m      : translator.translate,
+        mm     : translator.translate,
+        h      : translator.translate,
+        hh     : translator.translate,
+        d      : 'dan',
+        dd     : translator.translate,
+        M      : 'mesec',
+        MM     : translator.translate,
+        y      : 'godinu',
+        yy     : translator.translate
+    },
+    dayOfMonthOrdinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
 
-    return sr_cyrl;
+return sr;
 
-}));
+})));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/sv.js

@@ -1,66 +1,69 @@
 //! moment.js locale configuration
-//! locale : swedish (sv)
+//! locale : Swedish [sv]
 //! author : Jens Alm : https://github.com/ulmus
 
-(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
    factory(global.moment)
-}(this, function (moment) { 'use strict';
+}(this, (function (moment) { 'use strict';
 
 
-    var sv = moment.defineLocale('sv', {
-        months : 'januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december'.split('_'),
-        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
-        weekdays : 'söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag'.split('_'),
-        weekdaysShort : 'sön_mån_tis_ons_tor_fre_lör'.split('_'),
-        weekdaysMin : 'sö_må_ti_on_to_fr_lö'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'YYYY-MM-DD',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[Idag] LT',
-            nextDay: '[Imorgon] LT',
-            lastDay: '[Igår] LT',
-            nextWeek: '[På] dddd LT',
-            lastWeek: '[I] dddd[s] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'om %s',
-            past : 'för %s sedan',
-            s : 'några sekunder',
-            m : 'en minut',
-            mm : '%d minuter',
-            h : 'en timme',
-            hh : '%d timmar',
-            d : 'en dag',
-            dd : '%d dagar',
-            M : 'en månad',
-            MM : '%d månader',
-            y : 'ett år',
-            yy : '%d år'
-        },
-        ordinalParse: /\d{1,2}(e|a)/,
-        ordinal : function (number) {
-            var b = number % 10,
-                output = (~~(number % 100 / 10) === 1) ? 'e' :
-                (b === 1) ? 'a' :
-                (b === 2) ? 'a' :
-                (b === 3) ? 'e' : 'e';
-            return number + output;
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
+var sv = moment.defineLocale('sv', {
+    months : 'januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december'.split('_'),
+    monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
+    weekdays : 'söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag'.split('_'),
+    weekdaysShort : 'sön_mån_tis_ons_tor_fre_lör'.split('_'),
+    weekdaysMin : 'sö_må_ti_on_to_fr_lö'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'HH:mm:ss',
+        L : 'YYYY-MM-DD',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY [kl.] HH:mm',
+        LLLL : 'dddd D MMMM YYYY [kl.] HH:mm',
+        lll : 'D MMM YYYY HH:mm',
+        llll : 'ddd D MMM YYYY HH:mm'
+    },
+    calendar : {
+        sameDay: '[Idag] LT',
+        nextDay: '[Imorgon] LT',
+        lastDay: '[Igår] LT',
+        nextWeek: '[På] dddd LT',
+        lastWeek: '[I] dddd[s] LT',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'om %s',
+        past : 'för %s sedan',
+        s : 'några sekunder',
+        m : 'en minut',
+        mm : '%d minuter',
+        h : 'en timme',
+        hh : '%d timmar',
+        d : 'en dag',
+        dd : '%d dagar',
+        M : 'en månad',
+        MM : '%d månader',
+        y : 'ett år',
+        yy : '%d år'
+    },
+    dayOfMonthOrdinalParse: /\d{1,2}(e|a)/,
+    ordinal : function (number) {
+        var b = number % 10,
+            output = (~~(number % 100 / 10) === 1) ? 'e' :
+            (b === 1) ? 'a' :
+            (b === 2) ? 'a' :
+            (b === 3) ? 'e' : 'e';
+        return number + output;
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
 
-    return sv;
+return sv;
 
-}));
+})));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/zh-cn.js

@@ -1,91 +1,76 @@
 //! moment.js locale configuration
-//! locale : chinese (zh-cn)
+//! locale : Chinese (China) [zh-cn]
 //! author : suupic : https://github.com/suupic
 //! author : Zeno Zeng : https://github.com/zenozeng
 
-(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+;(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined'
+       && typeof require === 'function' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
    factory(global.moment)
-}(this, function (moment) { 'use strict';
+}(this, (function (moment) { 'use strict';
 
 
-    var zh_cn = moment.defineLocale('zh-cn', {
-        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
-        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
-        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
-        weekdaysShort : '周日_周一_周二_周三_周四_周五_周六'.split('_'),
-        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
-        longDateFormat : {
-            LT : 'Ah点mm分',
-            LTS : 'Ah点m分s秒',
-            L : 'YYYY-MM-DD',
-            LL : 'YYYY年MMMD日',
-            LLL : 'YYYY年MMMD日Ah点mm分',
-            LLLL : 'YYYY年MMMD日ddddAh点mm分',
-            l : 'YYYY-MM-DD',
-            ll : 'YYYY年MMMD日',
-            lll : 'YYYY年MMMD日Ah点mm分',
-            llll : 'YYYY年MMMD日ddddAh点mm分'
-        },
-        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
-        meridiemHour: function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (meridiem === '凌晨' || meridiem === '早上' ||
-                    meridiem === '上午') {
-                return hour;
-            } else if (meridiem === '下午' || meridiem === '晚上') {
-                return hour + 12;
-            } else {
-                // '中午'
-                return hour >= 11 ? hour : hour + 12;
-            }
-        },
-        meridiem : function (hour, minute, isLower) {
-            var hm = hour * 100 + minute;
-            if (hm < 600) {
-                return '凌晨';
-            } else if (hm < 900) {
-                return '早上';
-            } else if (hm < 1130) {
-                return '上午';
-            } else if (hm < 1230) {
-                return '中午';
-            } else if (hm < 1800) {
-                return '下午';
-            } else {
-                return '晚上';
-            }
-        },
-        calendar : {
-            sameDay : function () {
-                return this.minutes() === 0 ? '[今天]Ah[点整]' : '[今天]LT';
-            },
-            nextDay : function () {
-                return this.minutes() === 0 ? '[明天]Ah[点整]' : '[明天]LT';
-            },
-            lastDay : function () {
-                return this.minutes() === 0 ? '[昨天]Ah[点整]' : '[昨天]LT';
-            },
-            nextWeek : function () {
-                var startOfWeek, prefix;
-                startOfWeek = moment().startOf('week');
-                prefix = this.unix() - startOfWeek.unix() >= 7 * 24 * 3600 ? '[下]' : '[本]';
-                return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
-            },
-            lastWeek : function () {
-                var startOfWeek, prefix;
-                startOfWeek = moment().startOf('week');
-                prefix = this.unix() < startOfWeek.unix()  ? '[上]' : '[本]';
-                return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
-            },
-            sameElse : 'LL'
-        },
-        ordinalParse: /\d{1,2}(日|月|周)/,
-        ordinal : function (number, period) {
-            switch (period) {
+var zhCn = moment.defineLocale('zh-cn', {
+    months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+    monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+    weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+    weekdaysShort : '周日_周一_周二_周三_周四_周五_周六'.split('_'),
+    weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'HH:mm:ss',
+        L : 'YYYY年MMMD日',
+        LL : 'YYYY年MMMD日',
+        LLL : 'YYYY年MMMD日Ah点mm分',
+        LLLL : 'YYYY年MMMD日ddddAh点mm分',
+        l : 'YYYY年MMMD日',
+        ll : 'YYYY年MMMD日',
+        lll : 'YYYY年MMMD日 HH:mm',
+        llll : 'YYYY年MMMD日dddd HH:mm'
+    },
+    meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+    meridiemHour: function (hour, meridiem) {
+        if (hour === 12) {
+            hour = 0;
+        }
+        if (meridiem === '凌晨' || meridiem === '早上' ||
+                meridiem === '上午') {
+            return hour;
+        } else if (meridiem === '下午' || meridiem === '晚上') {
+            return hour + 12;
+        } else {
+            // '中午'
+            return hour >= 11 ? hour : hour + 12;
+        }
+    },
+    meridiem : function (hour, minute, isLower) {
+        var hm = hour * 100 + minute;
+        if (hm < 600) {
+            return '凌晨';
+        } else if (hm < 900) {
+            return '早上';
+        } else if (hm < 1130) {
+            return '上午';
+        } else if (hm < 1230) {
+            return '中午';
+        } else if (hm < 1800) {
+            return '下午';
+        } else {
+            return '晚上';
+        }
+    },
+    calendar : {
+        sameDay : '[今天]LT',
+        nextDay : '[明天]LT',
+        nextWeek : '[下]ddddLT',
+        lastDay : '[昨天]LT',
+        lastWeek : '[上]ddddLT',
+        sameElse : 'L'
+    },
+    dayOfMonthOrdinalParse: /\d{1,2}(日|月|周)/,
+    ordinal : function (number, period) {
+        switch (period) {
             case 'd':
             case 'D':
             case 'DDD':
@@ -97,30 +82,30 @@
                 return number + '周';
             default:
                 return number;
-            }
-        },
-        relativeTime : {
-            future : '%s内',
-            past : '%s前',
-            s : '几秒',
-            m : '1 分钟',
-            mm : '%d 分钟',
-            h : '1 小时',
-            hh : '%d 小时',
-            d : '1 天',
-            dd : '%d 天',
-            M : '1 个月',
-            MM : '%d 个月',
-            y : '1 年',
-            yy : '%d 年'
-        },
-        week : {
-            // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-    });
+    },
+    relativeTime : {
+        future : '%s内',
+        past : '%s前',
+        s : '几秒',
+        m : '1 分钟',
+        mm : '%d 分钟',
+        h : '1 小时',
+        hh : '%d 小时',
+        d : '1 天',
+        dd : '%d 天',
+        M : '1 个月',
+        MM : '%d 个月',
+        y : '1 年',
+        yy : '%d 年'
+    },
+    week : {
+        // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
 
-    return zh_cn;
+return zhCn;
 
-}));
+})));

interfaces/Plush/templates/_inc_header.tmpl

@@ -26,9 +26,9 @@
   <link rel="apple-touch-icon" sizes="76x76" href="${path}staticcfg/ico/apple-touch-icon-76x76-precomposed.png" />
   <link rel="apple-touch-icon" sizes="120x120" href="${path}staticcfg/ico/apple-touch-icon-120x120-precomposed.png" />
   <link rel="apple-touch-icon" sizes="152x152" href="${path}staticcfg/ico/apple-touch-icon-152x152-precomposed.png" />
-  <link rel="apple-touch-icon" sizes="180x180" href="${path}staticcfg/ico/apple-touch-icon-180x180-precomposed.png" /> 
+  <link rel="apple-touch-icon" sizes="180x180" href="${path}staticcfg/ico/apple-touch-icon-180x180-precomposed.png" />
   <link rel="apple-touch-icon" sizes="192x192" href="${path}staticcfg/ico/android-192x192.png" />
-  
+
   <script type="text/javascript" src="${path}static/javascripts/lib.js?$version"></script>
 
 #if $pane=="Main"#
@@ -102,7 +102,6 @@
         <span id="warning_box"><b><a href="${path}status/#tabs-warnings" id="last_warning" title="#echo $last_warning.replace("\n"," ").replace('"',"'") #"><span id="have_warnings">$have_warnings</span> $T('warnings')</a></b></span>
         #if $pane=="Main"#
           #if $new_release#&sdot; <a href="$new_rel_url" id="new_release" target="_blank">$T('Plush-updateAvailable').replace(' ','&nbsp;')</a>#end if#
-          #if $warning#&sdot; <a id="warning_message">$warning.replace(' ','&nbsp;')</a>#end if#
         #end if#
       </div>
     </div>

interfaces/Plush/templates/_inc_modals.tmpl

@@ -84,10 +84,10 @@ $T('Plush-containerWidth'):
     <div id="add_nzb_hr"><hr></div>
       <i>$T('pp'):</i>
       <table id="add_nzb_pp">
-        #if $cat_list#
+        #if $categories#
         <tr><td style="text-align:right">$T('category'):</td>
           <td><select id="addID_cat" name="cat">
-            #for $ct in $cat_list#
+            #for $ct in $categories#
             <option value="$ct">$Tspec($ct)</option>
             #end for#
             </select>
@@ -111,10 +111,10 @@ $T('Plush-containerWidth'):
             <option value="3">$T('pp-delete')</option>
             </select>
         </td></tr>
-        #if $script_list#
+        #if $scripts#
         <tr><td style="text-align:right">$T('script'):</td>
           <td><select id="addID_script" name="script">
-            #for $sc in $script_list#
+            #for $sc in $scripts#
             <option value="$sc">$Tspec($sc)</option>
             #end for#
             </select>
@@ -186,7 +186,7 @@ $T('Plush-containerWidth'):
         <option value='www.newshosting.com'>NewsHosting</option>
         <option value='www.readnews.com'>Readnews</option>
         <option value='www.supernews.com'>SuperNews</option>
-        <option value='www.thundernews.com'>ThunderNews</option>        
+        <option value='www.thundernews.com'>ThunderNews</option>
         <option value='www.tweaknews.eu'>Tweaknews</option>
         <option value='www.usenetserver.com'>UsenetServer</option>
         <option value='www.xentech.net'>XenTech</option>

interfaces/Plush/templates/main.tmpl

@@ -46,9 +46,9 @@
                       <option value="hibernate_pc" <!--#if $finishaction == 'hibernate_pc' then 'selected' else ''#-->>$T('hibernatePc')</option>
                       <!--#end if#-->
                     </optgroup>
-                    <!--#if $script_list#-->
+                    <!--#if $scripts#-->
                     <optgroup label="$T('eoq-scripts')">
-                      <!--#for $sc in $script_list#-->
+                      <!--#for $sc in $scripts#-->
                       <!--#if $sc != 'None'#-->
                       <option value="script_$sc" <!--#if $finishaction == 'script_'+$sc then 'selected' else ''#-->>$sc</option>
                       <!--#end if#-->
@@ -85,7 +85,7 @@
             <ul>
               <li>
                 $T('Plush-maxSpeed'):&nbsp;&nbsp;
-                <input type="text" id="maxSpeed-option" size="4" /> 
+                <input type="text" id="maxSpeed-option" size="4" />
                 <select id="maxSpeed-label">
                     <option value="%">%</option>
                     <option value="K">KB/s</option>
@@ -136,10 +136,10 @@
       <option value="pause">$T('sch-pause')</option>
       <option value="resume">$T('sch-resume')</option>
     </optgroup></select>
-<!--#if $cat_list#-->
+<!--#if $categories#-->
   <select id="multi_cat"><optgroup label="$T('category')">
     <option value="">$T('category')</option>
-  <!--#for $ct in $cat_list#-->
+  <!--#for $ct in $categories#-->
     <option value="$ct">$Tspec($ct)</option>
   <!--#end for#-->
   </optgroup></select>
@@ -158,10 +158,10 @@
     <option value="2">$T('pp-unpack')</option>
     <option value="3">$T('pp-delete')</option>
   </optgroup></select>
-<!--#if $script_list#-->
+<!--#if $scripts#-->
   <select id="multi_script"><optgroup label="$T('script')">
     <option value="">$T('script')</option>
-  <!--#for $sc in $script_list#-->
+  <!--#for $sc in $scripts#-->
     <!--#if $sc != "Default"#--><option value="$sc">$Tspec($sc)</option><!--#end if#-->
   <!--#end for#-->
   </optgroup></select>

interfaces/Plush/templates/nzo.tmpl

@@ -15,9 +15,9 @@
     <option value=$i <!--#if $i == $index then "selected" else ""#-->>$i</option>
   <!--#end for#-->
   </select>
-  <!--#if $cat_list#-->
+  <!--#if $categories#-->
   <select name="cat"><optgroup label="$T('category')">
-    <!--#for $ct in $cat_list#-->
+    <!--#for $ct in $categories#-->
     <option value="$ct" <!--#if $slot.cat.lower() == $ct.lower() then "selected" else ""#-->>$Tspec($ct)</option>
     <!--#end for#-->
   </optgroup></select>
@@ -35,9 +35,9 @@
     <option value="2" <!--#if $slot.unpackopts == "2" then "selected" else ""#-->>$T('pp-unpack')</option>
     <option value="3" <!--#if $slot.unpackopts == "3" then "selected" else ""#-->>$T('pp-delete')</option>
   </optgroup></select>
-  <!--#if $script_list#-->
+  <!--#if $scripts#-->
   <select name="script"><optgroup label="$T('script')">
-    <!--#for $sc in $script_list#-->
+    <!--#for $sc in $scripts#-->
     <option value="$sc" <!--#if $slot.script.lower() == $sc.lower() then "selected" else ""#-->>$Tspec($sc)</option>
     <!--#end for#-->
   </optgroup></select>

interfaces/Plush/templates/queue.tmpl

@@ -75,7 +75,7 @@
       <td></td>
     <!--#end if#-->
   <!--#end if#-->
-  
+
   <td>
     <div class="main_sprite_container sprite_progressbar_bg">
       <div class="main_sprite_container sprite_progress_done" style="background-position: -<!--#if $slot.mb == "0.00" then "120" else int(120 - 120.0 / 100.0 * int(100 - float($slot.mbleft) / float($slot.mb) * 100))#-->px -401px">
@@ -94,9 +94,9 @@
   </td>
 
   <td class="options nowrap">
-    <!--#if $cat_list#-->
+    <!--#if $categories#-->
     <select class="change_cat"><optgroup label="$T('category')">
-      <!--#for $ct in $cat_list#-->
+      <!--#for $ct in $categories#-->
       <option value="$ct" <!--#if $slot.cat.lower() == $ct.lower() then "selected" else ""#-->>$Tspec($ct)</option>
       <!--#end for#-->
     </optgroup></select>
@@ -114,9 +114,9 @@
       <option value="2" <!--#if $slot.unpackopts == "2" then "selected " else ""#-->>$T('pp-unpack')</option>
       <option value="3" <!--#if $slot.unpackopts == "3" then "selected " else ""#-->>$T('pp-delete')</option>
     </optgroup></select>
-    <!--#if $script_list#-->
+    <!--#if $scripts#-->
     <select class="change_script"><optgroup label="$T('script')">
-      <!--#for $sc in $script_list#-->
+      <!--#for $sc in $scripts#-->
       <option value="$sc"  <!--#if $slot.script == $sc then "selected" else ""#-->>$Tspec($sc)</option>
       <!--#end for#-->
     </optgroup></select>

interfaces/Plush/templates/status.tmpl

@@ -125,15 +125,15 @@
 
   <div id="tabs-dashboard">
     <table class="rssTable">
-        <tr> 
-            <th colspan="2">$T('dashboard-title')</th> 
+        <tr>
+            <th colspan="2">$T('dashboard-title')</th>
         </tr>
         <!--#set $odd = False#-->
 
-        <!--#set $odd = not $odd#-->    
+        <!--#set $odd = not $odd#-->
         <tr class="<!--#if $odd then "odd" else "even"#-->">
             <td>$T('dashboard-localIP4')</td>
-            <td>  
+            <td>
                 <!--#if $localipv4#-->
                     $localipv4
                 <!--#else#-->
@@ -141,10 +141,10 @@
                 <!--#end if#-->
             </td>
         </tr>
-        <!--#set $odd = not $odd#-->    
+        <!--#set $odd = not $odd#-->
         <tr class="<!--#if $odd then "odd" else "even"#-->">
             <td>$T('dashboard-publicIP4')</td>
-            <td>  
+            <td>
                 <!--#if $publicipv4#-->
                     $publicipv4
                 <!--#else#-->
@@ -152,10 +152,10 @@
                 <!--#end if#-->
             </td>
         </tr>
-        <!--#set $odd = not $odd#-->    
+        <!--#set $odd = not $odd#-->
         <tr class="<!--#if $odd then "odd" else "even"#-->">
             <td>$T('dashboard-IP6')</td>
-            <td>  
+            <td>
                 <!--#if $ipv6#-->
                     $ipv6
                 <!--#else#-->
@@ -163,10 +163,10 @@
                 <!--#end if#-->
             </td>
         </tr>
-        <!--#set $odd = not $odd#-->    
+        <!--#set $odd = not $odd#-->
         <tr class="<!--#if $odd then "odd" else "even"#-->">
             <td>$T('dashboard-NameserverDNS')</td>
-            <td>  
+            <td>
                 <!--#if $dnslookup#-->
                     $dnslookup
                 <!--#else#-->
@@ -178,27 +178,33 @@
                 <!--#end if#-->
              </td>
         </tr>
-        <!--#set $odd = not $odd#-->    
+        <!--#set $odd = not $odd#-->
         <tr class="<!--#if $odd then "odd" else "even"#-->">
            <td>$T('dashboard-systemPerformance')</td>
-           <td>$pystone</td>
+           <td>
+              <!--#if $pystone > 0 #-->
+                    $pystone
+                <!--#elif $pystone == 0 #-->
+                   $T('dashboard-clickToStart')
+                <!--#end if#-->
+           </td>
         </tr>
         <!--#if $cpumodel#-->
-        <!--#set $odd = not $odd#-->    
+        <!--#set $odd = not $odd#-->
         <tr class="<!--#if $odd then "odd" else "even"#-->">
             <td>$T('dashboard-cpuModel')</td>
             <td>$cpumodel</td>
         </tr>
         <!--#end if#-->
-        <!--#set $odd = not $odd#-->    
+        <!--#set $odd = not $odd#-->
         <tr class="<!--#if $odd then "odd" else "even"#-->">
             <td>$T('opt-download_dir')</td>
             <td>$downloaddir</td>
         </tr>
-        <!--#set $odd = not $odd#-->    
+        <!--#set $odd = not $odd#-->
         <tr class="<!--#if $odd then "odd" else "even"#-->">
             <td>$T('dashboard-writingSpeed')</td>
-            <td>  
+            <td>
                 <!--#if $downloaddirspeed > 0 #-->
                     $downloaddirspeed MB/s
                 <!--#elif $downloaddirspeed == 0 #-->
@@ -208,15 +214,15 @@
                 <!--#end if#-->
             </td>
         </tr>
-        <!--#set $odd = not $odd#-->    
+        <!--#set $odd = not $odd#-->
         <tr class="<!--#if $odd then "odd" else "even"#-->">
             <td>$T('opt-complete_dir')</td>
             <td>$completedir</td>
         </tr>
-        <!--#set $odd = not $odd#-->    
+        <!--#set $odd = not $odd#-->
         <tr class="<!--#if $odd then "odd" else "even"#-->">
             <td>$T('dashboard-writingSpeed')</td>
-            <td>  
+            <td>
                 <!--#if $completedirspeed > 0 #-->
                     $completedirspeed MB/s
                 <!--#elif $completedirspeed == 0 #-->

interfaces/smpl/templates/main.tmpl

@@ -13,7 +13,7 @@
   <!--#end if#-->
   <link href="rss?mode=history&apikey=$session" rel="alternate" type="application/rss+xml" title="SABnzbd History" />
   <link rel="shortcut icon" href="./staticcfg/ico/favicon.ico?v=1.1.0" />
-  
+
   <meta name="apple-mobile-web-app-title" content="SABnzbd" />
   <link rel="apple-touch-icon" sizes="76x76" href="./staticcfg/ico/apple-touch-icon-76x76-precomposed.png" />
   <link rel="apple-touch-icon" sizes="120x120" href="./staticcfg/ico/apple-touch-icon-120x120-precomposed.png" />
@@ -973,14 +973,14 @@ function loadingJSON(){
   clearTimeout ( jsontimeout );
   jsontimeout = setTimeout("loadingJSON();", RefreshTime*1000);
   }
-  var url = "tapi?mode=qstatus&output=json&_dc="+Math.random()+"&session="+session;
+  var url = "tapi?mode=queue&output=json&_dc="+Math.random()+"&session="+session;
   var d = loadJSONDoc(url);
   var gotMetadata = function (info)
   {
     //alert(info["kbpersec"]);
-
+  info = info["queue"]
   speed = info["speed"];
-  kbpersec = info["kbpersec"].toFixed(0);
+  kbpersec = info["kbpersec"];
   var paused = info["paused"];
   var pause_int = info["pause_int"];
   //if (paused==true) speed = '';
@@ -1017,10 +1017,10 @@ function loadingJSON(){
   }
 
   document.getElementById("speed").innerHTML = speed;
-  document.getElementById("mbleft").innerHTML = info["mbleft"].toFixed(2);
-  document.getElementById("mbtotal").innerHTML = info["mb"].toFixed(2);
-  document.getElementById("ds1").innerHTML = info["diskspace1"].toFixed(2);
-  document.getElementById("ds2").innerHTML = info["diskspace2"].toFixed(2);
+  document.getElementById("mbleft").innerHTML = info["mbleft"];
+  document.getElementById("mbtotal").innerHTML = info["mb"];
+  document.getElementById("ds1").innerHTML = info["diskspace1"];
+  document.getElementById("ds2").innerHTML = info["diskspace2"];
   document.getElementById("have_warnings").innerHTML = info["have_warnings"];
   load = document.getElementById("loadavg")
   if (load) load.innerHTML = info["loadavg"];
@@ -1155,10 +1155,10 @@ function loadingJSON(){
 <div id="addNew" class="centerLinks" style="overflow: hidden; display: none;">
   <form action="addID" method="get">
     <input type="text" style="width:218px;" name="id" value="$T('enterURL')" onfocus="clearForm(this, 'Enter URL')" onblur="setForm(this, 'Enter URL')">
-    <!--#if $cat_list#-->
+    <!--#if $categories#-->
       <select name="cat" >
         <optgroup label="$T('category')">
-          <!--#for $ct in $cat_list#-->
+          <!--#for $ct in $categories#-->
             <option value="$ct">$Tspec($ct)</option>
           <!--#end for#-->
         </optgroup>
@@ -1166,17 +1166,17 @@ function loadingJSON(){
     <!--#end if#-->
     <select name="pp">
       <optgroup label="$T('pp')">
-        <option value="-1" <!--#if $cat_list then "selected" else ""#-->>$T('default')</option>
+        <option value="-1" <!--#if $categories then "selected" else ""#-->>$T('default')</option>
         <option value="0">$T('none')</option>
         <option value="1">$T('pp-repair')</option>
         <option value="2">$T('pp-unpack')</option>
-        <option value="3" <!--#if $cat_list then "" else "selected"#-->>$T('pp-delete')</option>
+        <option value="3" <!--#if $categories then "" else "selected"#-->>$T('pp-delete')</option>
       </optgroup>
     </select>
-    <!--#if $script_list#-->
+    <!--#if $scripts#-->
       <select name="script">
         <optgroup label="$T('script')">
-          <!--#for $sc in $script_list#-->
+          <!--#for $sc in $scripts#-->
             <option value="$sc">$Tspec($sc)</option>
           <!--#end for#-->
         </optgroup>
@@ -1196,10 +1196,10 @@ function loadingJSON(){
   </form>
   <form action="addFile" method="post" enctype="multipart/form-data">
     <input type="file" style="width:221px" name="nzbfile">
-    <!--#if $cat_list#-->
+    <!--#if $categories#-->
       <select name="cat">
         <optgroup label="$T('category')">
-          <!--#for $ct in $cat_list#-->
+          <!--#for $ct in $categories#-->
             <option value="$ct">$Tspec($ct)</option>
           <!--#end for#-->
         </optgroup>
@@ -1207,17 +1207,17 @@ function loadingJSON(){
     <!--#end if#-->
     <select name="pp">
       <optgroup label="$T('pp')">
-        <option value="-1" <!--#if $cat_list then "selected" else ""#-->>$T('default')</option>
+        <option value="-1" <!--#if $categories then "selected" else ""#-->>$T('default')</option>
         <option value="0">$T('none')</option>
         <option value="1">$T('pp-repair')</option>
         <option value="2">$T('pp-unpack')</option>
-        <option value="3" <!--#if $cat_list then "" else "selected"#-->>$T('pp-delete')</option>
+        <option value="3" <!--#if $categories then "" else "selected"#-->>$T('pp-delete')</option>
       </optgroup>
     </select>
-    <!--#if $script_list#-->
+    <!--#if $scripts#-->
       <select name="script">
         <optgroup label="$T('script')">
-          <!--#for $sc in $script_list#-->
+          <!--#for $sc in $scripts#-->
             <option value="$sc">$Tspec($sc)</option>
           <!--#end for#-->
         </optgroup>
@@ -1255,10 +1255,6 @@ function loadingJSON(){
     <option value="0" >$T("none")</option>
   </select>
   <br />SABnzbd $T('version'): $version | smpl skin</a></p>
-    <!--#if $warning#-->
-    <h2>$T('ft-warning')</h2>
-    <b>$warning</b><br />
-    <!--#end if#-->
     <!--#if $new_release#-->
     <!--#set $msg=$T('ft-newRelease@1')%($new_release)#-->
     <b>$msg <a href="$new_rel_url" target="_blank">SF.net</a></b><br/>

interfaces/smpl/templates/nzo.tmpl

@@ -30,20 +30,20 @@
     </select>
   <!--#end if#-->
 
-  <!--#if $script_list#-->
+  <!--#if $scripts#-->
     <br class="clear" />
     <label class="label">$T('script'):</label>
     <select name="script">
-      <!--#for $sc in $script_list#-->
+      <!--#for $sc in $scripts#-->
       <option value="$sc" <!--#if $slot.script.lower() == $sc.lower() then "selected" else ""#-->>$Tspec($sc)</option>
       <!--#end for#-->
     </select>
   <!--#end if#-->
-  <!--#if $cat_list#-->
+  <!--#if $categories#-->
     <br class="clear" />
     <label class="label">$T('category'):</label>
     <select name="cat">
-      <!--#for $ct in $cat_list#-->
+      <!--#for $ct in $categories#-->
       <option value="$ct" <!--#if $slot.cat.lower() == $ct.lower() then "selected" else ""#-->>$Tspec($ct)</option>
       <!--#end for#-->
     </select>

interfaces/smpl/templates/queue.tmpl

@@ -14,9 +14,9 @@ $T('onQueueFinish'):
     <!--#end if#-->
     <option value="shutdown_program" <!--#if $finishaction == 'shutdown_program' then 'selected' else ''#-->>Shutdown SABnzbd</option>
   </optgroup>
-<!--#if $script_list#-->
+<!--#if $scripts#-->
   <optgroup label="$T('eoq-scripts')">
-  <!--#for $sc in $script_list#-->
+  <!--#for $sc in $scripts#-->
     <!--#if $sc != 'None'#-->
     <option value="script_$sc" <!--#if $finishaction == 'script_'+$sc then 'selected' else ''#-->>$sc</option>
     <!--#end if#-->
@@ -90,20 +90,20 @@ $T('smpl-timeleft'): <strong>$timeleft</strong> $T('eta'): <strong>$eta</strong>
     </optgroup>
   </select>
   <!--#end if#-->
-<!--#if $script_list#-->
+<!--#if $scripts#-->
   <select onfocus="pauseQueueDeferer(this.parentNode.parentNode.id)" onblur="javascript:lr('queue/','limit=$limit&start=$start', 1,-1, this.parentNode.parentNode.id);" onchange="javascript:changequeuedetails('queue/change_script?nzo_id=$slot.nzo_id&script='+this.options[this.selectedIndex].value, 'limit=$limit&start=$start');">
   <optgroup label="$T('script')">
-  <!--#for $sc in $script_list#-->
+  <!--#for $sc in $scripts#-->
     <option value="$sc" <!--#if $slot.script.lower() == $sc.lower() then "selected" else ""#-->>$Tspec($sc)</option>
   <!--#end for#-->
   </optgroup>
   </select>
 <!--#end if#-->
 
-  <!--#if $cat_list#-->
+  <!--#if $categories#-->
   <select onfocus="pauseQueueDeferer(this.parentNode.parentNode.id)" onblur="javascript:lr('queue/','limit=$limit&start=$start', 1,-1, this.parentNode.parentNode.id);" onchange="javascript:changequeuedetails('queue/change_cat?nzo_id=$slot.nzo_id&cat='+this.options[this.selectedIndex].value, 'limit=$limit&start=$start');">
     <optgroup label="$T('category')">
-    <!--#for $ct in $cat_list#-->
+    <!--#for $ct in $categories#-->
       <option value="$ct" <!--#if $slot.cat.lower() == $ct.lower() then "selected" else ""#-->>$Tspec($ct)</option>
     <!--#end for#-->
     </optgroup>

interfaces/wizard/inc_top.tmpl

@@ -3,11 +3,11 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <title>$T('wizard-quickstart')</title>
-        <link rel="stylesheet" type="text/css" href="../staticcfg/bootstrap/css/bootstrap.min.css?pid=$version"/>
-        <link rel="stylesheet" type="text/css" href="static/style.css?pid=$version"/>
-        <link rel="shortcut icon" href="../staticcfg/ico/favicon.ico?v=1.1.0" />
-        <script type="text/javascript" src="../staticcfg/js/jquery-3.1.1.min.js"></script>
-        <script type="text/javascript" src="../staticcfg/bootstrap/js/bootstrap.min.js"></script>
+        <link rel="stylesheet" type="text/css" href="../staticcfg/bootstrap/css/bootstrap.min.css?v=$version"/>
+        <link rel="stylesheet" type="text/css" href="static/style.css?v=$version"/>
+        <link rel="shortcut icon" href="../staticcfg/ico/favicon.ico?v=$version" />
+        <script type="text/javascript" src="../staticcfg/js/jquery-3.1.1.min.js?v=$version"></script>
+        <script type="text/javascript" src="../staticcfg/bootstrap/js/bootstrap.min.js?v=$version"></script>
     </head>
     <body>
         <div id="logo">

interfaces/wizard/one.html

@@ -40,9 +40,7 @@
                                  $T('srv-ssl')
                             </label>
                             <div class="col-sm-8 input-checkbox">
-                                <input type="checkbox" id="ssl" name="ssl" value="1" <!--#if $have_ssl then '' else 'disabled'#--><!--#if $ssl == 1 then 'checked' else ''#--> data-toggle="tooltip" data-placement="right" title="$T('wizard-server-ssl-explain')"/>
-                                <!--#if not $have_ssl then '<span class="label label-warning">OpenSSL  '+$T('opt-notInstalled')+'</span>' else ''#-->
-                                <small></small>
+                                <input type="checkbox" id="ssl" name="ssl" value="1" <!--#if $ssl == 1 then 'checked' else ''#--> data-toggle="tooltip" data-placement="right" title="$T('wizard-server-ssl-explain')"/>
                             </div>
                         </div>
                         <div class="form-group">
@@ -66,13 +64,23 @@
                                     <input type="number" class="form-control" name="connections" id="connections" value="<!--#if $connections then $connections else '8'#-->" data-toggle="tooltip" data-placement="right" title="$T('wizard-server-con-explain') $T('wizard-server-con-eg')" />
                                 </div>
                             </div>
+                            <div class="form-group">
+                                <label for="ssl_verify" class="col-sm-4 control-label">$T('opt-ssl_verify')</label>
+                                <div class="col-sm-8">
+                                    <select name="ssl_verify" id="ssl_verify" class="form-control" <!--#if int($have_ssl_context) == 0 then "disabled=\"disabled\"" else ""#-->>
+                                        <option value="2" <!--#if $ssl_verify == 2 then 'selected="selected"' else ""#--> >$T('ssl_verify-strict')</option>
+                                        <option value="1" <!--#if $ssl_verify == 1 then 'selected="selected"' else ""#--> >$T('ssl_verify-normal')</option>
+                                        <option value="0" <!--#if $ssl_verify == 0 then 'selected="selected"' else ""#--> >$T('ssl_verify-disabled')</option>
+                                    </select>
+                                </div>
+                            </div>
                         </div>
                         <div class="row">
                             <div class="col-sm-4">
                                 <button id="serverTest" class="btn btn-default"><span class="glyphicon glyphicon-sort"></span> $T('wizard-button-testServer')</button>
                             </div>
                             <div class="col-sm-8">
-                                <div id="serverQuote" class="btn btn-default disabled"><span id="serverResponse">$T('wizard-server-text')</span></div>
+                                <div id="serverResponse" class="well well-sm">$T('wizard-server-text')</div>
                             </div>
                         </div>
 

interfaces/wizard/static/javascript/checkserver.js

@@ -24,7 +24,7 @@ $(document).ready(function() {
                 } else {
                     r = '<span class="failed"><span class="glyphicon glyphicon-minus-sign"></span> ' + result.value.message + '</span>';
                 }
-
+                r = r.replace('https://sabnzbd.org/certificate-errors', '<a href="https://sabnzbd.org/certificate-errors" class="failed" target="_blank">https://sabnzbd.org/certificate-errors</a>')
                 $('#serverResponse').html(r);
             }
         );

interfaces/wizard/static/style.css

@@ -62,7 +62,7 @@ a[target="_blank"] {
     color: #00cc22;
 }
 .failed {
-    color: red;
+    color: red !important;
 }
 #rightGreyText {
     color: #ccc;
@@ -164,16 +164,12 @@ label {
     text-decoration: line-through;
     color: #ccc;
 }
-#serverQuote {
-    opacity: 0.8;
-    box-shadow: none !important;
-    white-space: normal;
-    width: 100%;
+#serverResponse {
+    padding: 6px 10px;
 }
 #host-tip {
     margin-bottom: 5px;
 }
-
 .error-text {
     display: inline;
     color: red;
@@ -192,7 +188,8 @@ label {
 #content a,
 #content a:hover,
 #content a:active,
-#content a:visited {
+#content a:visited,
+#serverResponse {
     color: #555;
 }
 .btn {

licenses/License-OrderedDict.txt

@@ -1,30 +0,0 @@
-The Backport of OrderedDict() is coming from ActiveState's Python recipe website.
-It has been written by Raymond Hettinger.
-
-
-Home of the module:
-http://code.activestate.com/recipes/576693-ordered-dictionary-for-py24/
-
-It is covered by the MIT License.
-===================
-(c) 2009 Raymond Hettinger
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

licenses/License-listquote.txt

@@ -1,41 +0,0 @@
-The module listquote.py is written by Michael Foord.
-
-Home of the module:
-http://www.voidspace.org.uk/python/configobj-api/pythonutils.listquote-pysrc.html
-
-It is covered by the following license.
-
--------------------------------------------------------------------------
-Copyright (c) 2003-2007, Michael Foord
-All rights reserved.
-E-mail : fuzzyman AT voidspace DOT org DOT uk
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the name of Michael Foord nor the name of Voidspace
-      may be used to endorse or promote products derived from this
-      software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------

po/main/en.po

@@ -60,10 +60,6 @@ msgstr "Disable server:"
 msgid "enable server"
 msgstr "Enable server:"
 
-#: sabnzbd/skintext.py:661
-msgid "Generic Sorting"
-msgstr "Movie Sorting"
-
 #: sabnzbd/emailer.py:117
 msgid "The server didn't reply properly to the helo greeting"
 msgstr "The server didn't reply properly to the hello greeting"
@@ -124,17 +120,8 @@ msgstr "Web interface"
 msgid "Script returned exit code %s and output \"%s\""
 msgstr "Notification script returned exit code %s and output \"%s\""
 
-#: sabnzbd/skintext.py:521
-msgid ""
-"Enhanced functionality including ratings and extra status information is "
-"available when connected to OZnzb indexer."
-msgstr ""
-"Indexers can supply information when a job is added <strong>or</strong> "
-"using the settings below to provide ratings and extra status information. "
-"<br>The Server address and API key settings can be left blank, depending on your indexer. "
-
 #: sabnzbd/skintext.py:333
 msgid "If empty, the standard port will only listen to HTTPS."
-msgstr "If empty, the SABnzbd Port set above will only listen to HTTPS."
+msgstr "If empty, the SABnzbd Port set above will listen to HTTPS."
 
 

po/nsis/SABnsis.pot

@@ -1,11 +1,11 @@
 #
 # SABnzbd Translation Template file NSIS
-# Copyright (C) 2011-2015 by the SABnzbd Team
+# Copyright 2011-2017 The SABnzbd-Team
 #   team@sabnzbd.org
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: SABnzbd-0.8.x\n"
+"Project-Id-Version: SABnzbd-develop\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: shypike@sabnzbd.org\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,67 +13,71 @@ msgstr ""
 "Content-Type: text/plain; charset=ASCII\n"
 "Content-Transfer-Encoding: 7bit\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr ""
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr ""
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr ""
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr ""
 
-#: NSIS_Installer.nsi:424
+#: NSIS_Installer.nsi:481
+msgid "The installation directory has changed (now in \"Program Files\"). \\nIf you run SABnzbd as a service, you need to update the service settings."
+msgstr ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr ""
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr ""
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr ""
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr ""
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr ""
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr ""
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid "This system requires the Microsoft runtime library VC90 to be installed first. Do you want to do that now?"
 msgstr ""
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr ""
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr ""
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr ""
 
-#: NSIS_Installer.nsi:444
+#: NSIS_Installer.nsi:503
 msgid "You cannot overwrite an existing installation. \\n\\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade."
 msgstr ""
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr ""
 

po/nsis/da.po

@@ -7,57 +7,65 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
-"PO-Revision-Date: 2013-05-05 14:50+0000\n"
-"Last-Translator: Steffen Thomsen <urskov@gmail.com>\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
+"PO-Revision-Date: 2017-04-10 11:28+0000\n"
+"Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Danish <da@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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-04-14 05:48+0000\n"
+"X-Generator: Launchpad (build 18352)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Gå til SABnzbd Wiki"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Vis udgivelsesbemærkninger"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Støt projektet, donér!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Luk venligst \"SABnzbd.exe\" først"
 
-#: NSIS_Installer.nsi:424
+#: NSIS_Installer.nsi:481
+msgid ""
+"The installation directory has changed (now in \"Program Files\"). \\nIf you "
+"run SABnzbd as a service, you need to update the service settings."
+msgstr ""
+"Installationsmappen er ændret (nu i  \"Program Files \"). \\nHvis du kører "
+"SABnzbd som en tjeneste, skal du opdatere tjenesteindstillingerne."
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Dette vil afinstallere SABnzbd fra dit system"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Kør ved opstart"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Skrivebordsikon"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "NZB filtilknytning"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Slet program"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Slet indstillinger"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,19 +73,19 @@ msgstr ""
 "Dette system kræver, at Microsoft runtime biblioteket VC90 skal installeres "
 "først. Ønsker du at gøre det nu?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Downloader Microsoft runtime installationsfil..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Download fejl, prøv igen?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "Kan ikke installere uden runtime bibliotek, prøv igen?"
 
-#: NSIS_Installer.nsi:444
+#: NSIS_Installer.nsi:503
 msgid ""
 "You cannot overwrite an existing installation. \\n\\nClick `OK` to remove "
 "the previous version or `Cancel` to cancel this upgrade."
@@ -86,10 +94,13 @@ msgstr ""
 "fjerne den tidligere version eller `Annuller` for at annullere denne "
 "opgradering."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Dine indstillinger og data vil blive bevaret."
 
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Gå til SABnzbd Wiki"
+
 #~ msgid ""
 #~ "                  >>>> WARNING <<<<\\r\\n\\r\\nPlease, first check the "
 #~ "release notes or go to http://wiki.sabnzbd.org/introducing-0-7-0 !"

po/nsis/de.po

@@ -7,57 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: shypike <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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Gehen Sie auf die SABnzbd Wiki-Seite"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Versionshinweise anzeigen"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Bitte unterstützen Sie das Projekt durch eine Spende!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Schliessen Sie bitte zuerst \"SABnzbd.exe\"."
 
-#: NSIS_Installer.nsi:424
+#: NSIS_Installer.nsi:481
+msgid ""
+"The installation directory has changed (now in \"Program Files\"). \\nIf you "
+"run SABnzbd as a service, you need to update the service settings."
+msgstr ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Dies entfernt SABnzbd von Ihrem System"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Beim Systemstart ausführen"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Desktop-Symbol"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "Mit NZB-Dateien verknüpfen"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Programm löschen"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Einstellungen löschen"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,22 +71,22 @@ msgstr ""
 "Dieses System erfordert die Installation der Laufzeitbibliothek VC90 von "
 "Microsoft. Möchten Sie die Installation jetzt durchführen?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr ""
 "Installationsprogramm für Microsoft-Laufzeitbibliothek wird "
 "heruntergeladen..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Download-Fehler. Erneut versuchen?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr ""
 "Installation ohne Laufzeitbibliothek nicht möglich. Erneut versuchen?"
 
-#: NSIS_Installer.nsi:444
+#: NSIS_Installer.nsi:503
 msgid ""
 "You cannot overwrite an existing installation. \\n\\nClick `OK` to remove "
 "the previous version or `Cancel` to cancel this upgrade."
@@ -89,7 +95,7 @@ msgstr ""
 "Sie 'OK', um die vorherige Version zu entfernen oder 'Abbrechen' um die "
 "Aktualisierung abzubrechen."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Ihre Einstellungen und Daten bleiben erhalten."
 
@@ -100,3 +106,6 @@ msgstr "Ihre Einstellungen und Daten bleiben erhalten."
 #~ "                  >>>> WARNING <<<<\\r\\n\\r\\nBitte lesen Sie zuerst die "
 #~ "Versionshinweise oder gehen Sie zu http://wiki.sabnzbd.org/introducing-0-7-0 "
 #~ "!"
+
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Gehen Sie auf die SABnzbd Wiki-Seite"

po/nsis/es.po

@@ -7,57 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: Victor Herrero <victorhera@gmail.com>\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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Ir al wiki de SABnzbd"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Mostrar notas de la versión"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "¡Apoye el proyecto, haga una  donación!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Por favor cierre primero \"SABnzbd.exe\""
 
-#: NSIS_Installer.nsi:424
+#: NSIS_Installer.nsi:481
+msgid ""
+"The installation directory has changed (now in \"Program Files\"). \\nIf you "
+"run SABnzbd as a service, you need to update the service settings."
+msgstr ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Esto desinstalará SABnzbd de su sistema"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Ejecutar al inicio"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Icono del escritorio"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "Asociación de archivos NZB"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Eliminar programa"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Eliminar Ajustes"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,20 +71,20 @@ msgstr ""
 "Este sistema requiere la ejecución de la biblioteca Microsoft runtime VC90 "
 "que debe ser instalada. ¿Quieres hacerlo ahora?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Descargando el instalador de Microsoft runtime..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Error en la descarga, ¿probamos de nuevo?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr ""
 "No se puede instalar sin la biblioteca runtime, ¿Lo volvemos a intentar?"
 
-#: NSIS_Installer.nsi:444
+#: NSIS_Installer.nsi:503
 msgid ""
 "You cannot overwrite an existing installation. \\n\\nClick `OK` to remove "
 "the previous version or `Cancel` to cancel this upgrade."
@@ -86,10 +92,13 @@ msgstr ""
 "No es posible sobrescribir una instalación existente. \\n\\nPresione `OK' "
 "para quitar la versión anterior o 'Cancelar' para cancelar la actualización."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Tus ajustes y datos se mantendrán intactos."
 
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Ir al wiki de SABnzbd"
+
 #~ msgid ""
 #~ "                  >>>> WARNING <<<<\\r\\n\\r\\nPlease, first check the "
 #~ "release notes or go to http://wiki.sabnzbd.org/introducing-0-7-0 !"

po/nsis/fi.po

@@ -7,57 +7,65 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
-"PO-Revision-Date: 2013-05-05 14:50+0000\n"
-"Last-Translator: Matti Ylönen <Unknown>\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
+"PO-Revision-Date: 2017-04-02 07:38+0000\n"
+"Last-Translator: Paavo Rissanen <paavo.rissanen@outlook.com>\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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-04-05 07:19+0000\n"
+"X-Generator: Launchpad (build 18335)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Siirry SABnzbd wikiin"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Näytä julkaisutiedot"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr "Käynnistä SABnzbd"
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Tue projektia, lahjoita!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Ole hyvä ja sulje \"SABnzbd.exe\" ensin"
 
-#: NSIS_Installer.nsi:424
+#: NSIS_Installer.nsi:481
+msgid ""
+"The installation directory has changed (now in \"Program Files\"). \\nIf you "
+"run SABnzbd as a service, you need to update the service settings."
+msgstr ""
+"Asennuskansio on muuttunut (nykyisin \"Program Files\"). \\nJos suoritat "
+"SABnzbd:ta palveluna, sinun täytyy päivittää palvelun asetukset."
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Tämä poistaa SABnzbd:n tietokoneestasi"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Suorita käynnistyksen yhteydessä"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Työpöydän kuvake"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "NZB tiedostosidos"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Poista sovellus"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Poista asetukset"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,19 +73,19 @@ msgstr ""
 "Tämä järjestelmä vaatii, että Microsoft runtime kirjasto VC90 täytyy asentaa "
 "ensin. Haluatko asentaa sen nyt?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Ladataan Microsoft runtime asennusta..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Latausvirhe, yritä uudelleen?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "Ei voida asentaa ilman runtime kirjastoa, yritä uudelleen?"
 
-#: NSIS_Installer.nsi:444
+#: NSIS_Installer.nsi:503
 msgid ""
 "You cannot overwrite an existing installation. \\n\\nClick `OK` to remove "
 "the previous version or `Cancel` to cancel this upgrade."
@@ -85,10 +93,13 @@ msgstr ""
 "Et voi asentaa tätä vanhan asennuksen päälle. \\n\\nPaina `OK` poistaaksesi "
 "edellisen version tai paina `Peruuta` peruuttaaksesi tämän päivityksen."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Asetuksiasi ja tietojasi ei poisteta."
 
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Siirry SABnzbd wikiin"
+
 #~ msgid ""
 #~ "                  >>>> WARNING <<<<\\r\\n\\r\\nPlease, first check the "
 #~ "release notes or go to http://wiki.sabnzbd.org/introducing-0-7-0 !"

po/nsis/fr.po

@@ -7,57 +7,66 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
-"PO-Revision-Date: 2015-12-07 07:47+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
+"PO-Revision-Date: 2017-03-21 08:58+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: 2015-12-08 05:47+0000\n"
-"X-Generator: Launchpad (build 17862)\n"
+"X-Launchpad-Export-Date: 2017-03-22 06:58+0000\n"
+"X-Generator: Launchpad (build 18334)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Aller sur le Wiki de SABnzbd"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Afficher les notes de version"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr "Démarrer SABnzbd"
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Soutenez le projet, faites un don !"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Merci de fermer \"SABnzbd.exe\" avant l'installation"
 
-#: NSIS_Installer.nsi:424
+#: NSIS_Installer.nsi:481
+msgid ""
+"The installation directory has changed (now in \"Program Files\"). \\nIf you "
+"run SABnzbd as a service, you need to update the service settings."
+msgstr ""
+"Le répertoire d'installation a changé (maintenant dans \"Program Files\"). \\"
+"nSi vous exécutez SABnzbd en tant que service, vous devez mettre à jour les "
+"paramètres du service."
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Ceci désinstallera SABnzbd de votre système"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Lancer au démarrage"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Icône sur le Bureau"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "Association des fichiers NZB"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Supprimer le programme"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Supprimer les paramètres"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,19 +74,19 @@ msgstr ""
 "Ce système nécessite que la bibliothèque d'exécution Microsoft vc90 soit "
 "installée en premier. Voulez-vous le faire maintenant?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Téléchargement de Microsoft runtime installer..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Erreur de téléchargement, réessayer ?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "Impossible d'installer sans moteur d'exécution, réessayer?"
 
-#: NSIS_Installer.nsi:444
+#: NSIS_Installer.nsi:503
 msgid ""
 "You cannot overwrite an existing installation. \\n\\nClick `OK` to remove "
 "the previous version or `Cancel` to cancel this upgrade."
@@ -86,7 +95,7 @@ msgstr ""
 "pour supprimer la version précédente ou `Annuler` pour annuler cette mise à "
 "niveau."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Vos paramètres et données seront conservés."
 
@@ -97,3 +106,6 @@ msgstr "Vos paramètres et données seront conservés."
 #~ "                  >>>> AVERTISSEMENT <<<<\\r\\n\\r\\nS'il vous plaît, "
 #~ "vérifiez d'abord les notes de version ou consultez "
 #~ "http://wiki.sabnzbd.org/introducing-0-7-0 !"
+
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Aller sur le Wiki de SABnzbd"

po/nsis/nb.po

@@ -7,57 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Gå til SABnzbd Wiki"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Vis versjonsmerknader"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Støtt prosjektet, donèr!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Vennligst lukk \"SABnzbd.exe\" først"
 
-#: NSIS_Installer.nsi:424
+#: NSIS_Installer.nsi:481
+msgid ""
+"The installation directory has changed (now in \"Program Files\"). \\nIf you "
+"run SABnzbd as a service, you need to update the service settings."
+msgstr ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Dette vil avinstallere SABnzbd fra ditt system"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Kjør ved oppstart"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Skrivebordsikon"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "NZB-filassosiering"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Fjern program"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Slett innstillinger"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,19 +71,19 @@ msgstr ""
 "Dette sytemet krever at Microsoft runtime library VC90 er installert først. "
 "Ønsker du å gjøre dette nå?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Laster ned Microsoft runtime installer..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Nedlasting feilet, prøve på nytt?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "Kan ikke installere uten runtime library, prøve på nytt?"
 
-#: NSIS_Installer.nsi:444
+#: NSIS_Installer.nsi:503
 msgid ""
 "You cannot overwrite an existing installation. \\n\\nClick `OK` to remove "
 "the previous version or `Cancel` to cancel this upgrade."
@@ -86,7 +92,7 @@ msgstr ""
 "fjerne tidligere installasjon, eller 'Avbryt' for å avbryte denne "
 "oppgraderingen."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Dine innstillinger og data vil bli tatt vare på."
 
@@ -97,3 +103,6 @@ msgstr "Dine innstillinger og data vil bli tatt vare på."
 #~ "                  >>>> ADVARSEL <<<<\\r\\n\\r\\nVennligst sjekk "
 #~ "versjonsmerknadene først, eller gå til http://wiki.sabnzbd.org/introducing-0-"
 #~ "7-0 !"
+
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Gå til SABnzbd Wiki"

po/nsis/nl.po

@@ -7,57 +7,66 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
-"PO-Revision-Date: 2015-09-10 07:52+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
+"PO-Revision-Date: 2017-03-19 09:47+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\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: 2015-09-11 06:02+0000\n"
-"X-Generator: Launchpad (build 17720)\n"
+"X-Launchpad-Export-Date: 2017-03-20 06:21+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Ga naar de SABnzbd-Wiki"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Toon opmerkingen bij deze uitgave"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr "Start SABnzbd"
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Steun het project, doneer!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Sluit \"SABnzbd.exe\" eerst af"
 
-#: NSIS_Installer.nsi:424
+#: NSIS_Installer.nsi:481
+msgid ""
+"The installation directory has changed (now in \"Program Files\"). \\nIf you "
+"run SABnzbd as a service, you need to update the service settings."
+msgstr ""
+"De installatie map is veranderd (nu in \"Program Files\").\\nIndien je "
+"SABnzbd als een service draait, zul je de service instellingen moeten "
+"aanpassen."
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Dit verwijdert SABnzbd van je systeem"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Starten met Windows"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Bureaubladpictogram"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "NZB-bestanden openen met SABnzbd"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Programma verwijderen"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Verwijder alle instellingen"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,19 +74,19 @@ msgstr ""
 "Op dit systeem moeten eerst de Microsoft runtime bibliotheek VC90 "
 "geïnstalleerd worden. Wilt u dat nu doen?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Downloaden van de Microsoft bibliotheek"
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Download mislukt, opnieuw proberen?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "Installeren heeft geen zin zonder de bibliotheek, opnieuw proberen?"
 
-#: NSIS_Installer.nsi:444
+#: NSIS_Installer.nsi:503
 msgid ""
 "You cannot overwrite an existing installation. \\n\\nClick `OK` to remove "
 "the previous version or `Cancel` to cancel this upgrade."
@@ -85,7 +94,7 @@ msgstr ""
 "U kunt geen bestaande installatie overschrijven.\\n\\nKlik op `OK` om de "
 "vorige versie te verwijderen of op `Annuleren` om te stoppen."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Je instellingen en bestanden blijven behouden."
 
@@ -95,3 +104,6 @@ msgstr "Je instellingen en bestanden blijven behouden."
 #~ msgstr ""
 #~ "                  >>>> WAARSCHUWING <<<<\\\\r\\\\n\\\\r\\\\nLees eerst het "
 #~ "vrijgave bericht of ga naar http://wiki.sabnzbd.org/introducing-0-7-0 !"
+
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Ga naar de SABnzbd-Wiki"

po/nsis/pl.po

@@ -7,57 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: Tomasz 'Zen' Napierala <tomasz@napierala.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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Idź do wiki SABnzbd"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Pokaż informacje o wydaniu"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Wspomóż projekt!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Najpierw zamknij SABnzbd.exe"
 
-#: NSIS_Installer.nsi:424
+#: NSIS_Installer.nsi:481
+msgid ""
+"The installation directory has changed (now in \"Program Files\"). \\nIf you "
+"run SABnzbd as a service, you need to update the service settings."
+msgstr ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "To odinstaluje SABnzbd z systemu"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Uruchom wraz z systemem"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Ikona pulpitu"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "powiązanie pliku NZB"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Usuń program"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Skasuj obecne ustawienia"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,19 +71,19 @@ msgstr ""
 "Ten system wymaga najpierw zainstalowania bibliotek Microsoft VC90. Czy "
 "chcesz wykonać teraz instalację?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Pobieranie instalatora bibliotek Microsoft..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Problem z pobieraniem, spróbować ponownie?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "Nie można wykonać instalacji bez bibliotek, spróbować ponownie?"
 
-#: NSIS_Installer.nsi:444
+#: NSIS_Installer.nsi:503
 msgid ""
 "You cannot overwrite an existing installation. \\n\\nClick `OK` to remove "
 "the previous version or `Cancel` to cancel this upgrade."
@@ -85,7 +91,7 @@ msgstr ""
 "Nie można nadpisać istniejącej instalacji. \\n\\n Naciśnij `OK`, aby usunąć "
 "poprzednia wersję lub `Anuluj` aby anulować aktualizację."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Twoje ustawienia i dane zostaną zachowane."
 
@@ -95,3 +101,6 @@ msgstr "Twoje ustawienia i dane zostaną zachowane."
 #~ msgstr ""
 #~ "                  >>>> UWAGA <<<<\\r\\n\\r\\nNajpierw przeczytaj informacje "
 #~ "o wydaniu lub odwiedź http://wiki.sabnzbd.org/introducing-0-7-0 !"
+
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Idź do wiki SABnzbd"

po/nsis/pt_BR.po

@@ -7,57 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: lrrosa <Unknown>\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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Vá para a Wiki do SABnzbd"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Mostrar Notas de Lançamento"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Apoie o projeto. Faça uma doação!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Por favor, feche \"SABnzbd.exe\" primeiro"
 
-#: NSIS_Installer.nsi:424
+#: NSIS_Installer.nsi:481
+msgid ""
+"The installation directory has changed (now in \"Program Files\"). \\nIf you "
+"run SABnzbd as a service, you need to update the service settings."
+msgstr ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Isso irá desinstalar SABnzbd de seu sistema"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Executar na inicialização"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Ícone na Área de Trabalho"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "Associação com Arquivos NZB"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Excluir o Programa"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Apagar Configurações"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,19 +71,19 @@ msgstr ""
 "Este sistema precisa que a biblioteca runtime Microsoft VC90 seja instalada "
 "antes. Você quer fazer isso agora?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Baixando o instalador runtime da Microsoft ..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Houve um erro de download. Quer tentar novamente?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "Não é possível instalar sem a biblioteca runtime. Quer repetir?"
 
-#: NSIS_Installer.nsi:444
+#: NSIS_Installer.nsi:503
 msgid ""
 "You cannot overwrite an existing installation. \\n\\nClick `OK` to remove "
 "the previous version or `Cancel` to cancel this upgrade."
@@ -85,7 +91,7 @@ msgstr ""
 "Você não pode substituir uma instalação existente. \\n\\nClique `OK` para "
 "remover a versão anterior ou `Cancelar` para cancelar esta atualização."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Suas configurações e os dados serão preservados."
 
@@ -95,3 +101,6 @@ msgstr "Suas configurações e os dados serão preservados."
 #~ msgstr ""
 #~ "                  >>>> ATENÇÃO <<<<\\r\\n\\r\\nPor favor, verifique primeiro "
 #~ "as notas de lançamento ou vá até http://wiki.sabnzbd.org/introducing-0-7-0 !"
+
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Vá para a Wiki do SABnzbd"

po/nsis/ro.po

@@ -7,57 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: nicusor <Unknown>\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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Dute la Wiki SABnzbd"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Arată Notele de Publicare"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Susţine proiectul, Donează!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Închideţi mai întâi \"SABnzbd.exe\""
 
-#: NSIS_Installer.nsi:424
+#: NSIS_Installer.nsi:481
+msgid ""
+"The installation directory has changed (now in \"Program Files\"). \\nIf you "
+"run SABnzbd as a service, you need to update the service settings."
+msgstr ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Acest lucru va dezinstala SABnzbd din sistem"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Executare la pornire"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Icoană Desktop"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "Asociere cu Fişierele NZB"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Şterge Program"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Ştergeţi Setări"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,19 +71,19 @@ msgstr ""
 "Acest sistem necesită librăria Microsoft VC90 instalată. Dortiți să faceți "
 "asta acum ?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Descărcare rutină instalare Microsoft..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Eroare descărcare, încerc din nou?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "Nu pot instala fără rutină librărie, încerc din nou?"
 
-#: NSIS_Installer.nsi:444
+#: NSIS_Installer.nsi:503
 msgid ""
 "You cannot overwrite an existing installation. \\n\\nClick `OK` to remove "
 "the previous version or `Cancel` to cancel this upgrade."
@@ -85,7 +91,7 @@ msgstr ""
 "Nu puteți suprascrie instalarea existentă. \\n\\nClick `OK` pentru a elimina "
 "versiunea anterioară sau `Anulare` pentru a anula actualizarea."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Setările şi informaţiile vor fi salvate."
 
@@ -96,3 +102,6 @@ msgstr "Setările şi informaţiile vor fi salvate."
 #~ "                  >>>> ATENŢIE <<<<\\r\\n\\r\\nVă rugăm, să verificaţi mai "
 #~ "întâi notele de publicare sau să vizitaţi "
 #~ "http://wiki.sabnzbd.org/introducing-0-7-0 !"
+
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Dute la Wiki SABnzbd"

po/nsis/ru.po

@@ -7,57 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: Pavel Maryanov <Unknown>\n"
 "Language-Team: Russian <gnu@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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr ""
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Показать заметки о выпуске"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Поддержите проект. Сделайте пожертвование!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Завершите сначала работу процесса SABnzbd.exe"
 
-#: NSIS_Installer.nsi:424
+#: NSIS_Installer.nsi:481
+msgid ""
+"The installation directory has changed (now in \"Program Files\"). \\nIf you "
+"run SABnzbd as a service, you need to update the service settings."
+msgstr ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Приложение SABnzbd будет удалено из вашей системы"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Запускать вместе с системой"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Значок на рабочем столе"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "Ассоциировать с файлами NZB"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Удалить программу"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Удалить параметры"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,21 +71,21 @@ msgstr ""
 "Для этой системы сначала необходимо установить библиотеку времени выполнения "
 "Microsoft VC90. Сделать это сейчас?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Загрузка программы установки Microsoft..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Ошибка загрузки. Повторить попытку?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr ""
 "Не удаётся выполнить установку без библиотеки времени выполнения. Повторить "
 "попытку?"
 
-#: NSIS_Installer.nsi:444
+#: NSIS_Installer.nsi:503
 msgid ""
 "You cannot overwrite an existing installation. \\n\\nClick `OK` to remove "
 "the previous version or `Cancel` to cancel this upgrade."
@@ -88,6 +94,6 @@ msgstr ""
 "удалить предыдущую версию, нажмите кнопку «ОК». Чтобы отменить обновление, "
 "нажмите кнопку «Отмена»."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Ваши параметры и данные будут сохранены."

po/nsis/sr.po

@@ -7,92 +7,101 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: Ozzii <Unknown>\n"
 "Language-Team: Launchpad Serbian Translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 "Language: sr\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Иди на SABnzbd Вики"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Прикажи белешке о издању"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Подржите пројекат, дајте добровољан прилог!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Прво затворите „SABnzbd.exe“"
 
-#: NSIS_Installer.nsi:424
+#: NSIS_Installer.nsi:481
+msgid ""
+"The installation directory has changed (now in \"Program Files\"). \\nIf you "
+"run SABnzbd as a service, you need to update the service settings."
+msgstr ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Ово ће уклонити САБнзбд са вашег система"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Покрени са системом"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Иконица радне површи"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "Придруживање НЗБ датотеке"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Обриши програм"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Обриши подешавања"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
 msgstr ""
-"Овај систем захтева да буде прво инсталирана Мајкрософтова извршивачка "
-"библиотека VC90. Да ли желите то да урадите?"
+"Овај систем захтева да буде прво инсталирана Мајкрософтова извршна "
+"библиотека „VC90“. Да ли желите то да урадите?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
-msgstr "Преузимам Мајкрософтов извршивачки програм за инсталацију..."
+msgstr "Преузимам Мајкрософтов извршни програм за инсталацију..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Грешка у преузимању, да поновим?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
-msgstr "Не могу да инсталирам без извршивачке библиотеке, да поновим?"
+msgstr "Не могу да инсталирам без извршне библиотеке, да поновим?"
 
-#: NSIS_Installer.nsi:444
+#: NSIS_Installer.nsi:503
 msgid ""
 "You cannot overwrite an existing installation. \\n\\nClick `OK` to remove "
 "the previous version or `Cancel` to cancel this upgrade."
 msgstr ""
-"Не можете да препишете постојећу инсталацију. \\n\\nКликните „У реду“ да "
+"Не можете да препишете постојећу инсталацију. \\n\\nПритисните „У реду“ да "
 "уклоните претходно издање или „Откажи“ да поништите ову надоградњу."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
-msgstr "Ваша подешавања и податка ће бити сачувана."
+msgstr "Ваша подешавања и подаци биће сачувани."
+
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Иди на вики САБнзбд-а"
 
 #~ msgid ""
 #~ "                  >>>> WARNING <<<<\\r\\n\\r\\nPlease, first check the "
 #~ "release notes or go to http://wiki.sabnzbd.org/introducing-0-7-0 !"
 #~ msgstr ""
-#~ "                  >>>> ПАЖЊА <<<<\\r\\n\\r\\nПрво проверите белешке о "
-#~ "верзији или идите на http://wiki.sabnzbd.org/introducing-0-7-0 !"
+#~ "                  >>>> ПАЖЊА <<<<\\r\\n\\r\\nПрво проверите белешке о издању "
+#~ "или идите на „http://wiki.sabnzbd.org/introducing-0-7-0“ !"

po/nsis/sv.po

@@ -7,57 +7,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: Andreas Lindberg <andypandyswe@gmail.com>\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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "Gå till SABnzbd Wiki"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "Visa releasenoteringar"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "Donera och stöd detta projekt!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "Var vänlig stäng \"SABnzbd.exe\" först"
 
-#: NSIS_Installer.nsi:424
+#: NSIS_Installer.nsi:481
+msgid ""
+"The installation directory has changed (now in \"Program Files\"). \\nIf you "
+"run SABnzbd as a service, you need to update the service settings."
+msgstr ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "Detta kommer att avinstallera SABnzbd från systemet"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "Kör vid uppstart"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "Skrivbordsikon"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "NZB Filassosication"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "Radera programmet"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "Radera inställningar"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
@@ -65,19 +71,19 @@ msgstr ""
 "Detta system kräver att Microsofts runtimebibliotek VC90 är installerat. "
 "Vill du göra detta nu?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "Laddar ned Microsofts runtimeinstaller..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "Misslyckat nedladdningsförsök, försök igen?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "Kan inte installera utan runtimebibliotek, försök igen?"
 
-#: NSIS_Installer.nsi:444
+#: NSIS_Installer.nsi:503
 msgid ""
 "You cannot overwrite an existing installation. \\n\\nClick `OK` to remove "
 "the previous version or `Cancel` to cancel this upgrade."
@@ -86,10 +92,13 @@ msgstr ""
 "avinstallera tidigare version eller 'Avbryt' för att avbryta denna "
 "uppgradering."
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "Dina inställningar och ditt data kommer att bevaras."
 
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "Gå till SABnzbd Wiki"
+
 #~ msgid ""
 #~ "                  >>>> WARNING <<<<\\r\\n\\r\\nPlease, first check the "
 #~ "release notes or go to http://wiki.sabnzbd.org/introducing-0-7-0 !"

po/nsis/zh_CN.po

@@ -7,81 +7,87 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-04-25 09:51+0000\n"
+"POT-Creation-Date: 2017-03-18 21:42+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: XsLiDian <xslidian@gmail.com>\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: 2015-04-26 05:46+0000\n"
-"X-Generator: Launchpad (build 17430)\n"
+"X-Launchpad-Export-Date: 2017-03-19 06:37+0000\n"
+"X-Generator: Launchpad (build 18332)\n"
 
-#: NSIS_Installer.nsi:416
-msgid "Go to the SABnzbd Wiki"
-msgstr "访问 SABnzbd Wiki"
-
-#: NSIS_Installer.nsi:418
+#: NSIS_Installer.nsi:473
 msgid "Show Release Notes"
 msgstr "显示版本说明"
 
-#: NSIS_Installer.nsi:420
+#: NSIS_Installer.nsi:475
+msgid "Start SABnzbd"
+msgstr ""
+
+#: NSIS_Installer.nsi:477
 msgid "Support the project, Donate!"
 msgstr "支持该项目，捐助!"
 
-#: NSIS_Installer.nsi:422
+#: NSIS_Installer.nsi:479
 msgid "Please close \"SABnzbd.exe\" first"
 msgstr "请先关闭 \"SABnzbd.exe\""
 
-#: NSIS_Installer.nsi:424
+#: NSIS_Installer.nsi:481
+msgid ""
+"The installation directory has changed (now in \"Program Files\"). \\nIf you "
+"run SABnzbd as a service, you need to update the service settings."
+msgstr ""
+
+#: NSIS_Installer.nsi:483
 msgid "This will uninstall SABnzbd from your system"
 msgstr "这将从您的系统中卸载 SABnzbd"
 
-#: NSIS_Installer.nsi:426
+#: NSIS_Installer.nsi:485
 msgid "Run at startup"
 msgstr "启动时运行"
 
-#: NSIS_Installer.nsi:428
+#: NSIS_Installer.nsi:487
 msgid "Desktop Icon"
 msgstr "桌面图标"
 
-#: NSIS_Installer.nsi:430
+#: NSIS_Installer.nsi:489
 msgid "NZB File association"
 msgstr "NZB 文件关联"
 
-#: NSIS_Installer.nsi:432
+#: NSIS_Installer.nsi:491
 msgid "Delete Program"
 msgstr "删除程序"
 
-#: NSIS_Installer.nsi:434
+#: NSIS_Installer.nsi:493
 msgid "Delete Settings"
 msgstr "删除设置"
 
-#: NSIS_Installer.nsi:436
+#: NSIS_Installer.nsi:495
 msgid ""
 "This system requires the Microsoft runtime library VC90 to be installed "
 "first. Do you want to do that now?"
 msgstr "该系统需要先安装 Microsoft 运行时库 VC90。是否希望立即安装?"
 
-#: NSIS_Installer.nsi:438
+#: NSIS_Installer.nsi:497
 msgid "Downloading Microsoft runtime installer..."
 msgstr "正在下载 Microsoft 运行时安装程序..."
 
-#: NSIS_Installer.nsi:440
+#: NSIS_Installer.nsi:499
 msgid "Download error, retry?"
 msgstr "下载出错，重试?"
 
-#: NSIS_Installer.nsi:442
+#: NSIS_Installer.nsi:501
 msgid "Cannot install without runtime library, retry?"
 msgstr "没有运行时库无法安装，重试?"
 
-#: NSIS_Installer.nsi:444
+#: NSIS_Installer.nsi:503
 msgid ""
 "You cannot overwrite an existing installation. \\n\\nClick `OK` to remove "
 "the previous version or `Cancel` to cancel this upgrade."
 msgstr "不可以覆盖安装。\\n\\n点击“确定”可移除旧版，或点击“取消”取消升级。"
 
-#: NSIS_Installer.nsi:446
+#: NSIS_Installer.nsi:505
 msgid "Your settings and data will be preserved."
 msgstr "您的设置及数据将会保留。"
 
@@ -91,3 +97,6 @@ msgstr "您的设置及数据将会保留。"
 #~ msgstr ""
 #~ "                  >>>> *警告* <<<<\\r\\n\\r\\n请首先查看版本说明或访问 "
 #~ "http://wiki.sabnzbd.org/introducing-0-7-0 !"
+
+#~ msgid "Go to the SABnzbd Wiki"
+#~ msgstr "访问 SABnzbd Wiki"

sabnzbd/__init__.py

@@ -79,24 +79,18 @@ else:
 ##############################################################################
 # SSL CHECKS
 ##############################################################################
+import ssl
 HAVE_SSL_CONTEXT = None
-HAVE_SSL = None
 try:
-    import ssl
-    HAVE_SSL = True
-    try:
-        # Test availability of SSLContext (python 2.7.9+)
-        ssl.SSLContext
-        HAVE_SSL_CONTEXT = True
-    except:
-        HAVE_SSL_CONTEXT = False
+    # Test availability of SSLContext (python 2.7.9+)
+    ssl.SSLContext
+    HAVE_SSL_CONTEXT = True
 except:
-    HAVE_SSL = False
     HAVE_SSL_CONTEXT = False
 
 try:
     import cryptography
-    HAVE_CRYPTOGRAPHY = True
+    HAVE_CRYPTOGRAPHY = cryptography.__version__
 except:
     HAVE_CRYPTOGRAPHY = False
 
@@ -134,7 +128,7 @@ START = datetime.datetime.now()
 MY_NAME = None
 MY_FULLNAME = None
 RESTART_ARGS = []
-NEW_VERSION = None
+NEW_VERSION = (None, None)
 DIR_HOME = None
 DIR_APPDATA = None
 DIR_LCLDATA = None
@@ -160,11 +154,9 @@ BROWSER_URL = None
 CMDLINE = ''  # Rendering of original command line arguments
 
 WEB_DIR = None
-WEB_DIR2 = None
-WEB_DIRC = None
+WEB_DIR_CONFIG = None
 WIZARD_DIR = None
 WEB_COLOR = None
-WEB_COLOR2 = None
 SABSTOP = False
 RESTART_REQ = False
 PAUSED_ALL = False
@@ -177,6 +169,11 @@ LAST_ERROR = None
 EXTERNAL_IPV6 = False
 LAST_HISTORY_UPDATE = time.time()
 
+# Performance measure for dashboard
+PYSTONE_SCORE = 0
+DOWNLOAD_DIR_SPEED = 0
+COMPLETE_DIR_SPEED = 0
+
 __INITIALIZED__ = False
 __SHUTTING_DOWN__ = False
 
@@ -220,7 +217,6 @@ def connect_db(thread_index=0):
     return cherrypy.thread_data.history_db
 
 
-
 @synchronized(INIT_LOCK)
 def initialize(pause_downloader=False, clean_up=False, evalSched=False, repair=0):
     global __INITIALIZED__, __SHUTTING_DOWN__,\
@@ -266,9 +262,7 @@ def initialize(pause_downloader=False, clean_up=False, evalSched=False, repair=0
     cfg.cherryhost.callback(guard_restart)
     cfg.cherryport.callback(guard_restart)
     cfg.web_dir.callback(guard_restart)
-    cfg.web_dir2.callback(guard_restart)
     cfg.web_color.callback(guard_restart)
-    cfg.web_color2.callback(guard_restart)
     cfg.username.callback(guard_restart)
     cfg.password.callback(guard_restart)
     cfg.log_dir.callback(guard_restart)
@@ -292,9 +286,8 @@ def initialize(pause_downloader=False, clean_up=False, evalSched=False, repair=0
     sabnzbd.encoding.change_fsys(cfg.fsys_type())
 
     # Set cache limit
-    if sabnzbd.WIN32 or sabnzbd.DARWIN:
-        if cfg.cache_limit() == '' or cfg.cache_limit() == '200M':
-            cfg.cache_limit.set('450M')
+    if not cfg.cache_limit() or (cfg.cache_limit() == '200M' and (sabnzbd.WIN32 or sabnzbd.DARWIN)):
+        cfg.cache_limit.set(misc.get_cache_limit())
     ArticleCache.do.new_limit(cfg.cache_limit.get_int())
 
     check_incomplete_vs_complete()
@@ -318,8 +311,12 @@ def initialize(pause_downloader=False, clean_up=False, evalSched=False, repair=0
             else:
                 newsched.append(sched)
         cfg.schedules.set(newsched)
-        cfg.sched_converted.set(True)
+        cfg.sched_converted.set(1)
 
+    # Second time schedule conversion
+    if cfg.sched_converted() != 2:
+        cfg.schedules.set(['%s %s' % (1, schedule) for schedule in cfg.schedules()])
+        cfg.sched_converted.set(2)
 
     if check_repair_request():
         repair = 2
@@ -443,7 +440,6 @@ def halt():
         except:
             logging.error(T('Fatal error at saving state'), exc_info=True)
 
-
         # The Scheduler cannot be stopped when the stop was scheduled.
         # Since all warm-restarts have been removed, it's not longer
         # needed to stop the scheduler.
@@ -455,8 +451,13 @@ def halt():
         __INITIALIZED__ = False
 
 
-def trigger_restart():
+def trigger_restart(timeout=None):
     """ Trigger a restart by setting a flag an shutting down CP """
+    # Sometimes we need to wait a bit to send good-bye to the browser
+    if timeout:
+        time.sleep(timeout)
+
+    # Add extra arguments
     if sabnzbd.downloader.Downloader.do.paused:
         sabnzbd.RESTART_ARGS.append('-p')
     sys.argv = sabnzbd.RESTART_ARGS
@@ -519,6 +520,7 @@ def guard_fsys_type():
     """ Callback for change of file system naming type """
     sabnzbd.encoding.change_fsys(cfg.fsys_type())
 
+
 def set_https_verification(value):
     prev = False
     try:
@@ -609,7 +611,7 @@ def save_compressed(folder, filename, data):
     # Need to go to the save folder to
     # prevent the pathname being embedded in the GZ file
     here = os.getcwd()
-    os.chdir(misc.short_path(folder))
+    os.chdir(folder)
 
     if filename.endswith('.nzb'):
         filename += '.gz'
@@ -858,7 +860,7 @@ def keep_awake():
 def CheckFreeSpace():
     """ Check if enough disk space is free, if not pause downloader and send email """
     if cfg.download_free() and not sabnzbd.downloader.Downloader.do.paused:
-        if misc.diskfree(cfg.download_dir.get_path()) < cfg.download_free.get_float() / GIGI:
+        if misc.diskspace(cfg.download_dir.get_path(), force=True)[1] < cfg.download_free.get_float() / GIGI:
             logging.warning(T('Too little diskspace forcing PAUSE'))
             # Pause downloader, but don't save, since the disk is almost full!
             Downloader.do.pause(save=False)
@@ -897,25 +899,25 @@ def save_data(data, _id, path, do_pickle=True, silent=False):
         logging.debug("Saving data for %s in %s", _id, path)
     path = os.path.join(path, _id)
 
-    try:
-        _f = open(path, 'wb')
-        if do_pickle:
-            if cfg.use_pickle():
-                pickler = pickle.Pickler(_f, 2)
+    # We try 3 times, to avoid any dict or access problems
+    for t in xrange(3):
+        try:
+            with open(path, 'wb') as data_file:
+                if do_pickle:
+                    if cfg.use_pickle():
+                        cPickle.dump(data, data_file)
+                    else:
+                        pickle.dump(data, data_file)
+                else:
+                    data_file.write(data)
+            break
+        except:
+            if t == 2:
+                logging.error(T('Saving %s failed'), path)
+                logging.info("Traceback: ", exc_info=True)
             else:
-                pickler = cPickle.Pickler(_f, 2)
-            pickler.dump(data)
-            _f.flush()
-            _f.close()
-            pickler.clear_memo()
-            del pickler
-        else:
-            _f.write(data)
-            _f.flush()
-            _f.close()
-    except:
-        logging.error(T('Saving %s failed'), path)
-        logging.info("Traceback: ", exc_info=True)
+                # Wait a tiny bit before trying again
+                time.sleep(0.1)
 
 
 @synchronized(IO_LOCK)
@@ -931,15 +933,14 @@ def load_data(_id, path, remove=True, do_pickle=True, silent=False):
         logging.debug("Loading data for %s from %s", _id, path)
 
     try:
-        _f = open(path, 'rb')
-        if do_pickle:
-            if cfg.use_pickle():
-                data = pickle.load(_f)
+        with open(path, 'rb') as data_file:
+            if do_pickle:
+                if cfg.use_pickle():
+                    data = pickle.load(data_file)
+                else:
+                    data = cPickle.load(data_file)
             else:
-                data = cPickle.load(_f)
-        else:
-            data = _f.read()
-        _f.close()
+                data = data_file.read()
 
         if remove:
             os.remove(path)
@@ -964,31 +965,31 @@ def remove_data(_id, path):
 
 
 @synchronized(IO_LOCK)
-def save_admin(data, _id, do_pickle=True):
+def save_admin(data, _id):
     """ Save data in admin folder in specified format """
     path = os.path.join(cfg.admin_dir.get_path(), _id)
     logging.info("Saving data for %s in %s", _id, path)
 
-    try:
-        _f = open(path, 'wb')
-        if do_pickle:
-            pickler = cPickle.Pickler(_f, 2)
-            pickler.dump(data)
-            _f.flush()
-            _f.close()
-            pickler.clear_memo()
-            del pickler
-        else:
-            _f.write(data)
-            _f.flush()
-            _f.close()
-    except:
-        logging.error(T('Saving %s failed'), path)
-        logging.info("Traceback: ", exc_info=True)
+    # We try 3 times, to avoid any dict or access problems
+    for t in xrange(3):
+        try:
+            with open(path, 'wb') as data_file:
+                if cfg.use_pickle():
+                    data = pickle.dump(data, data_file)
+                else:
+                    data = cPickle.dump(data, data_file)
+            break
+        except:
+            if t == 2:
+                logging.error(T('Saving %s failed'), path)
+                logging.info("Traceback: ", exc_info=True)
+            else:
+                # Wait a tiny bit before trying again
+                time.sleep(0.1)
 
 
 @synchronized(IO_LOCK)
-def load_admin(_id, remove=False, do_pickle=True, silent=False):
+def load_admin(_id, remove=False, silent=False):
     """ Read data in admin folder in specified format """
     path = os.path.join(cfg.admin_dir.get_path(), _id)
     logging.info("Loading data for %s from %s", _id, path)
@@ -998,13 +999,11 @@ def load_admin(_id, remove=False, do_pickle=True, silent=False):
         return None
 
     try:
-        f = open(path, 'rb')
-        if do_pickle:
-            data = cPickle.load(f)
-        else:
-            data = f.read()
-        f.close()
-
+        with open(path, 'rb') as data_file:
+            if cfg.use_pickle():
+                data = pickle.load(data_file)
+            else:
+                data = cPickle.load(data_file)
         if remove:
             os.remove(path)
     except:
@@ -1153,11 +1152,12 @@ def wait_for_download_folder():
         logging.debug('Waiting for "incomplete" folder')
         time.sleep(2.0)
 
+
 def check_old_queue():
     """ Check for old queue (when a new queue is not present) """
     old = False
     if not os.path.exists(os.path.join(cfg.admin_dir.get_path(), QUEUE_FILE_NAME)):
-        for ver in (QUEUE_VERSION -1 , QUEUE_VERSION - 2, QUEUE_VERSION - 3):
+        for ver in (QUEUE_VERSION - 1, QUEUE_VERSION - 2, QUEUE_VERSION - 3):
             data = load_admin(QUEUE_FILE_TMPL % str(ver))
             if data:
                 break
@@ -1165,8 +1165,7 @@ def check_old_queue():
             old = bool(data and isinstance(data, tuple) and len(data[1]))
         except (TypeError, IndexError):
             pass
-        if old and sabnzbd.WIN32 and ver < 10 and sabnzbd.DIR_LCLDATA != sabnzbd.DIR_HOME \
-            and misc.is_relative_path(cfg.download_dir()):
+        if old and sabnzbd.WIN32 and ver < 10 and sabnzbd.DIR_LCLDATA != sabnzbd.DIR_HOME and misc.is_relative_path(cfg.download_dir()):
             # For Windows and when version < 10: adjust old default location
             cfg.download_dir.set('Documents/' + cfg.download_dir())
     return old

sabnzbd/api.py

@@ -28,6 +28,7 @@ import json
 import cherrypy
 import locale
 import socket
+from threading import Thread
 try:
     locale.setlocale(locale.LC_ALL, "")
 except:
@@ -54,7 +55,8 @@ from sabnzbd.utils.json import JsonWriter
 
 from sabnzbd.utils.rsslib import RSS, Item
 from sabnzbd.utils.pathbrowser import folders_at_path
-from sabnzbd.misc import loadavg, to_units, diskfree, disktotal, get_ext, \
+from sabnzbd.utils.getperformance import getcpu
+from sabnzbd.misc import loadavg, to_units, diskspace, get_ext, \
     get_filename, int_conv, globber, globber_full, time_format, remove_all, \
     starts_with_path, cat_convert, clip_path, create_https_certificates, calc_age
 from sabnzbd.encoding import xml_name, unicoder, special_fixer, platform_encode, html_escape
@@ -64,6 +66,7 @@ from sabnzbd.utils.servertests import test_nntp_server_dict
 from sabnzbd.bpsmeter import BPSMeter
 from sabnzbd.rating import Rating
 from sabnzbd.getipaddress import localipv4, publicipv4, ipv6
+from sabnzbd.newsunpack import userxbit
 from sabnzbd.database import build_history_info, unpack_history_info, HistoryDB
 import sabnzbd.notifier
 import sabnzbd.rss
@@ -95,6 +98,7 @@ else:
 # Flag for using the fast json encoder, unless it fails
 FAST_JSON = True
 
+
 def api_handler(kwargs):
     """ API Dispatcher """
     mode = kwargs.get('mode', '')
@@ -103,7 +107,7 @@ def api_handler(kwargs):
     callback = kwargs.get('callback', '')
 
     # Extend the timeout of API calls to 10minutes
-    cherrypy.response.timeout = 60*10
+    cherrypy.response.timeout = 600
 
     if isinstance(mode, list):
         mode = mode[0]
@@ -137,6 +141,7 @@ def _api_set_config(name, output, kwargs):
     res, data = config.get_dconfig(kwargs.get('section'), kwargs.get('keyword'))
     return report(output, keyword='config', data=data)
 
+
 def _api_set_config_default(name, output, kwargs):
     """ API: Reset requested config variables back to defaults. Currently only for misc-section """
     keywords = kwargs.get('keyword', [])
@@ -166,7 +171,8 @@ def _api_qstatus(name, output, kwargs):
         keyword = ''
     else:
         keyword = 'queue'
-    return report(output, keyword=keyword, data=qstatus_data())
+    info, pnfo_list, bytespersec = build_queue()
+    return report(output, keyword='', data=remove_callable(info))
 
 
 def _api_queue(name, output, kwargs):
@@ -269,21 +275,12 @@ def _api_queue_sort(output, value, kwargs):
 
 def _api_queue_default(output, value, kwargs):
     """ API: accepts output, sort, dir, start, limit """
-    sort = kwargs.get('sort')
-    direction = kwargs.get('dir', '')
     start = int_conv(kwargs.get('start'))
     limit = int_conv(kwargs.get('limit'))
-    trans = kwargs.get('trans')
     search = kwargs.get('search')
 
     if output in ('xml', 'json'):
-        if sort and sort != 'index':
-            reverse = direction.lower() == 'desc'
-            sort_queue(sort, reverse)
-
-        info, pnfo_list, bytespersec = build_queue(start=start, limit=limit, output=output, trans=trans, search=search)
-        info['categories'] = info.pop('cat_list')
-        info['scripts'] = info.pop('script_list')
+        info, pnfo_list, bytespersec = build_queue(start=start, limit=limit, output=output, search=search)
         return report(output, keyword='queue', data=remove_callable(info))
     elif output == 'rss':
         return rss_qstatus()
@@ -383,6 +380,7 @@ def _api_retry(name, output, kwargs):
     else:
         return report(output, _MSG_NO_ITEM)
 
+
 def _api_cancel_pp(name, output, kwargs):
     """ API: accepts name, output, value(=nzo_id) """
     nzo_id = kwargs.get('value')
@@ -391,6 +389,7 @@ def _api_cancel_pp(name, output, kwargs):
     else:
         return report(output, _MSG_NO_ITEM)
 
+
 def _api_addlocalfile(name, output, kwargs):
     """ API: accepts name, output, pp, script, cat, priority, nzbname """
     if name and isinstance(name, list):
@@ -483,7 +482,7 @@ def _api_change_opts(name, output, kwargs):
 
 def _api_fullstatus(name, output, kwargs):
     """ API: full history status"""
-    status = build_status(skip_dashboard=kwargs.get('skip_dashboard'), output=output)
+    status = build_status(skip_dashboard=kwargs.get('skip_dashboard', 1), output=output)
     return report(output, keyword='status', data=remove_callable(status))
 
 
@@ -531,9 +530,7 @@ def _api_history(name, output, kwargs):
         else:
             return report(output, _MSG_NO_VALUE)
     elif not name:
-        history = build_header(prim=True)
-        if 'noofslots_total' in history:
-            del history['noofslots_total']
+        history = {}
         grand, month, week, day = BPSMeter.do.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)
@@ -543,6 +540,7 @@ def _api_history(name, output, kwargs):
                                                                               categories=categories,
                                                                               output=output)
         history['last_history_update'] = int(sabnzbd.LAST_HISTORY_UPDATE)
+        history['version'] = sabnzbd.__version__
         return report(output, keyword='history', data=remove_callable(history))
     else:
         return report(output, _MSG_NOT_IMPLEMENTED)
@@ -605,6 +603,7 @@ def _api_resume(name, output, kwargs):
 
 def _api_shutdown(name, output, kwargs):
     """ API: accepts output """
+    logging.info('Shutdown requested by API')
     sabnzbd.halt()
     cherrypy.engine.exit()
     sabnzbd.SABSTOP = True
@@ -658,12 +657,15 @@ def _api_auth(name, output, kwargs):
 
 def _api_restart(name, output, kwargs):
     """ API: accepts output """
-    sabnzbd.trigger_restart()
+    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(output)
 
 
 def _api_restart_repair(name, output, kwargs):
     """ API: accepts output """
+    logging.info('Queue repair requested by API')
     sabnzbd.request_repair()
     sabnzbd.trigger_restart()
     return report(output)
@@ -751,12 +753,14 @@ def _api_test_email(name, output, kwargs):
         res = None
     return report(output, error=res)
 
+
 def _api_test_windows(name, output, kwargs):
     """ 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(output, error=res)
 
+
 def _api_test_notif(name, output, kwargs):
     """ API: send a test to Notification Center, return result """
     logging.info("Sending test notification")
@@ -798,12 +802,14 @@ def _api_test_pushbullet(name, output, kwargs):
     res = sabnzbd.notifier.send_pushbullet('SABnzbd', T('Test Notification'), 'other', force=True, test=kwargs)
     return report(output, error=res)
 
+
 def _api_test_nscript(name, output, kwargs):
     """ 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(output, error=res)
 
+
 def _api_undefined(name, output, kwargs):
     """ API: accepts output """
     return report(output, _MSG_NOT_IMPLEMENTED)
@@ -845,14 +851,10 @@ def _api_config_get_speedlimit(output, kwargs):
 
 
 def _api_config_set_colorscheme(output, kwargs):
-    """ API: accepts output, value(=color for primary), value2(=color for secondary) """
+    """ API: accepts output"""
     value = kwargs.get('value')
-    value2 = kwargs.get('value2')
     if value:
         cfg.web_color.set(value)
-    if value2:
-        cfg.web_color2.set(value2)
-    if value or value2:
         return report(output)
     else:
         return report(output, _MSG_NO_VALUE)
@@ -1187,9 +1189,9 @@ def handle_cat_api(output, kwargs):
     return name
 
 
-def build_status(web_dir=None, root=None, prim=True, skip_dashboard=False, output=None):
+def build_status(skip_dashboard=False, output=None):
     # build up header full of basic information
-    info = build_header(prim, web_dir)
+    info = build_header()
 
     info['logfile'] = sabnzbd.LOGFILE
     info['weblogfile'] = sabnzbd.WEBLOGFILE
@@ -1197,7 +1199,19 @@ def build_status(web_dir=None, root=None, prim=True, skip_dashboard=False, outpu
     info['folders'] = [xml_name(item) for item in sabnzbd.nzbqueue.scan_jobs(all=False, action=False)]
     info['configfn'] = xml_name(config.get_filename())
 
-    # Dashboard: Begin
+    # Dashboard: Speed of System
+    info['cpumodel'] = getcpu()
+    info['pystone'] = sabnzbd.PYSTONE_SCORE
+
+    # Dashboard: Speed of Download directory:
+    info['downloaddir'] = sabnzbd.cfg.download_dir.get_path()
+    info['downloaddirspeed'] = sabnzbd.DOWNLOAD_DIR_SPEED
+
+    # Dashboard: Speed of Complete directory:
+    info['completedir'] = sabnzbd.cfg.complete_dir.get_path()
+    info['completedirspeed'] = sabnzbd.COMPLETE_DIR_SPEED
+
+    # Dashboard: Connection information
     if not int_conv(skip_dashboard):
         info['localipv4'] = localipv4()
         info['publicipv4'] = publicipv4()
@@ -1209,33 +1223,6 @@ def build_status(web_dir=None, root=None, prim=True, skip_dashboard=False, outpu
         except:
             info['dnslookup'] = None
 
-        # Dashboard: Speed of System
-        from sabnzbd.utils.getperformance import getpystone, getcpu
-        info['pystone'] = getpystone()
-        info['cpumodel'] = getcpu()
-        # Dashboard: Speed of Download directory:
-        info['downloaddir'] = sabnzbd.cfg.download_dir.get_path()
-        try:
-            sabnzbd.downloaddirspeed  # The persistent var
-        except:
-            # does not yet exist, so create it:
-            sabnzbd.downloaddirspeed = 0  # 0 means ... not yet determined
-        info['downloaddirspeed'] = sabnzbd.downloaddirspeed
-        # Dashboard: Speed of Complete directory:
-        info['completedir'] = sabnzbd.cfg.complete_dir.get_path()
-        try:
-            sabnzbd.completedirspeed  # The persistent var
-        except:
-            # does not yet exist, so create it:
-            sabnzbd.completedirspeed = 0  # 0 means ... not yet determined
-        info['completedirspeed'] = sabnzbd.completedirspeed
-
-        try:
-            sabnzbd.dashrefreshcounter  # The persistent var @UndefinedVariable
-        except:
-            sabnzbd.dashrefreshcounter = 0
-        info['dashrefreshcounter'] = sabnzbd.dashrefreshcounter
-
     info['servers'] = []
     servers = sorted(Downloader.do.servers[:], key=lambda svr: '%02d%s' % (svr.priority, svr.displayname.lower()))
     for server in servers:
@@ -1309,14 +1296,15 @@ def build_status(web_dir=None, root=None, prim=True, skip_dashboard=False, outpu
 
     return info
 
-def build_queue(web_dir=None, root=None, prim=True, webdir='', start=0, limit=0, trans=False, output=None, search=None):
+
+def build_queue(start=0, limit=0, trans=False, output=None, search=None):
     if output:
         converter = unicoder
     else:
         converter = xml_name
 
     # build up header full of basic information
-    info, pnfo_list, bytespersec, q_size, bytes_left_previous_page = build_queue_header(prim, webdir, search=search, start=start, limit=limit)
+    info, pnfo_list, bytespersec, q_size, bytes_left_previous_page = build_queue_header(search=search, start=start, limit=limit, output=output)
 
     datestart = datetime.datetime.now()
     priorities = {TOP_PRIORITY: 'Force', REPAIR_PRIORITY: 'Repair', HIGH_PRIORITY: 'High', NORMAL_PRIORITY: 'Normal', LOW_PRIORITY: 'Low'}
@@ -1324,8 +1312,8 @@ def build_queue(web_dir=None, root=None, prim=True, webdir='', start=0, limit=0,
     start = int_conv(start)
 
     info['refresh_rate'] = str(cfg.refresh_rate()) if cfg.refresh_rate() > 0 else ''
-    info['script_list'] = list_scripts()
-    info['cat_list'] = list_cats(output is None)
+    info['scripts'] = list_scripts()
+    info['categories'] = list_cats(output is None)
     info['rating_enable'] = bool(cfg.rating_enable())
     info['noofslots'] = q_size
     info['start'] = start
@@ -1380,7 +1368,8 @@ def build_queue(web_dir=None, root=None, prim=True, webdir='', start=0, limit=0,
                 slot['status'] = Status.DOWNLOADING
         else:
             # ensure compatibility of API status
-            if status in (Status.DELETED, ): status = Status.DOWNLOADING
+            if status in (Status.DELETED, ):
+                status = Status.DOWNLOADING
             slot['status'] = "%s" % (status)
 
         if (Downloader.do.paused or Downloader.do.postproc or is_propagating or  \
@@ -1429,60 +1418,6 @@ def fast_queue():
     return paused, bytes_left, bpsnow, time_left
 
 
-def qstatus_data():
-    """ Build up the queue status as a nested object and output as a JSON object """
-
-    qnfo = NzbQueue.do.queue_info()
-    pnfo_list = qnfo.list
-
-    jobs = []
-    bytesleftprogess = 0
-    bpsnow = BPSMeter.do.get_bps()
-    for pnfo in pnfo_list:
-        filename = pnfo.filename
-        bytesleft = pnfo.bytes_left / MEBI
-        bytesleftprogess += pnfo.bytes_left
-        bytes = pnfo.bytes / MEBI
-        nzo_id = pnfo.nzo_id
-        jobs.append({"id": nzo_id,
-                        "mb": bytes,
-                        "mbleft": bytesleft,
-                        "filename": unicoder(filename),
-                        "timeleft": calc_timeleft(bytesleftprogess, bpsnow)})
-
-    state = "IDLE"
-    if Downloader.do.paused:
-        state = Status.PAUSED
-    elif qnfo.bytes_left / MEBI > 0:
-        state = Status.DOWNLOADING
-
-    speed_limit = Downloader.do.get_limit()
-    if speed_limit <= 0:
-        speed_limit = 100
-
-    status = {
-        "state": state,
-        "pp_active": not PostProcessor.do.empty(),
-        "paused": Downloader.do.paused,
-        "pause_int": scheduler.pause_int(),
-        "kbpersec": bpsnow / KIBI,
-        "speed": to_units(bpsnow, dec_limit=1),
-        "mbleft": qnfo.bytes_left / MEBI,
-        "mb": qnfo.bytes / MEBI,
-        "noofslots": len(pnfo_list),
-        "noofslots_total": qnfo.q_fullsize,
-        "have_warnings": str(sabnzbd.GUIHANDLER.count()),
-        "diskspace1": diskfree(cfg.download_dir.get_path()),
-        "diskspace2": diskfree(cfg.complete_dir.get_path()),
-        "timeleft": calc_timeleft(qnfo.bytes_left, bpsnow),
-        "loadavg": loadavg(),
-        "speedlimit": "{1:0.{0}f}".format(int(speed_limit % 1 > 0), speed_limit),
-        "speedlimit_abs": str(Downloader.do.get_limit_abs() or ''),
-        "jobs": jobs
-    }
-    return status
-
-
 def build_file_list(nzo_id):
     """ Build file lists for specified job
     """
@@ -1495,27 +1430,23 @@ def build_file_list(nzo_id):
         active_files = pnfo.active_files
         queued_files = pnfo.queued_files
 
-        n = 0
         for nzf in finished_files:
             jobs.append({'filename': xml_name(nzf.filename if nzf.filename else nzf.subject),
                          'mbleft': "%.2f" % (nzf.bytes_left / MEBI),
                          'mb': "%.2f" % (nzf.bytes / MEBI),
                          'bytes': "%.2f" % nzf.bytes,
                          'age': calc_age(nzf.date),
-                         'id': str(n),
+                         'nzf_id': nzf.nzf_id,
                          'status': 'finished'})
-            n += 1
 
         for nzf in active_files:
             jobs.append({'filename': xml_name(nzf.filename if nzf.filename else nzf.subject),
                          'mbleft': "%.2f" % (nzf.bytes_left / MEBI),
                          'mb': "%.2f" % (nzf.bytes / MEBI),
                          'bytes': "%.2f" % nzf.bytes,
-                         'nzf_id': nzf.nzf_id,
                          'age': calc_age(nzf.date),
-                         'id': str(n),
+                         'nzf_id': nzf.nzf_id,
                          'status': 'active'})
-            n += 1
 
         for nzf in queued_files:
             jobs.append({'filename': xml_name(nzf.filename if nzf.filename else nzf.subject),
@@ -1524,12 +1455,12 @@ def build_file_list(nzo_id):
                          'mb': "%.2f" % (nzf.bytes / MEBI),
                          'bytes': "%.2f" % nzf.bytes,
                          'age': calc_age(nzf.date),
-                         'id': str(n),
+                         'nzf_id': nzf.nzf_id,
                          'status': 'queued'})
-            n += 1
 
     return jobs
 
+
 def rss_qstatus():
     """ Return a RSS feed with the queue status """
     qnfo = NzbQueue.do.queue_info()
@@ -1599,8 +1530,7 @@ def options_list(output):
         'zip': sabnzbd.newsunpack.ZIP_COMMAND,
         '7zip': sabnzbd.newsunpack.SEVEN_COMMAND,
         'nice': sabnzbd.newsunpack.NICE_COMMAND,
-        'ionice': sabnzbd.newsunpack.IONICE_COMMAND,
-        'ssl': sabnzbd.HAVE_SSL
+        'ionice': sabnzbd.newsunpack.IONICE_COMMAND
     })
 
 
@@ -1610,7 +1540,8 @@ def retry_job(job, new_nzb, password):
         history_db = sabnzbd.connect_db()
         futuretype, url, pp, script, cat = history_db.get_other(job)
         if futuretype:
-            if pp == 'X': pp = None
+            if pp == 'X':
+                pp = None
             sabnzbd.add_url(url, pp, script, cat)
             history_db.remove_history(job)
         else:
@@ -1683,24 +1614,13 @@ def clear_trans_cache():
     sabnzbd.WEBUI_READY = True
 
 
-def build_header(prim, webdir=''):
+def build_header(webdir='', output=None):
     """ Build the basic header """
     try:
         uptime = calc_age(sabnzbd.START)
     except:
         uptime = "-"
 
-    if prim:
-        color = sabnzbd.WEB_COLOR
-    else:
-        color = sabnzbd.WEB_COLOR2
-    if not color:
-        color = ''
-
-    header = {'T': Ttemplate, 'Tspec': Tspec, 'Tx': Ttemplate, 'version': sabnzbd.__version__,
-               'paused': Downloader.do.paused or Downloader.do.postproc,
-               'pause_int': scheduler.pause_int(), 'paused_all': sabnzbd.PAUSED_ALL,
-               'uptime': uptime, 'color_scheme': color}
     speed_limit = Downloader.do.get_limit()
     if speed_limit <= 0:
         speed_limit = 100
@@ -1708,36 +1628,57 @@ def build_header(prim, webdir=''):
     if speed_limit_abs <= 0:
         speed_limit_abs = ''
 
-    free1 = diskfree(cfg.download_dir.get_path())
-    free2 = diskfree(cfg.complete_dir.get_path())
+    disk_total1, disk_free1 = diskspace(cfg.download_dir.get_path())
+    disk_total2, disk_free2 = diskspace(cfg.complete_dir.get_path())
 
-    header['helpuri'] = 'https://sabnzbd.org/wiki/'
-    header['diskspace1'] = "%.2f" % free1
-    header['diskspace2'] = "%.2f" % free2
-    header['diskspace1_norm'] = to_units(free1 * GIGI)
-    header['diskspace2_norm'] = to_units(free2 * GIGI)
-    header['diskspacetotal1'] = "%.2f" % disktotal(cfg.download_dir.get_path())
-    header['diskspacetotal2'] = "%.2f" % disktotal(cfg.complete_dir.get_path())
+    header = {}
+
+    # We don't output everything for API
+    if not output:
+        header['T'] = Ttemplate
+        header['Tspec'] = Tspec
+        header['Tx'] = Ttemplate
+        header['uptime'] = uptime
+        header['color_scheme'] = sabnzbd.WEB_COLOR or ''
+        header['helpuri'] = 'https://sabnzbd.org/wiki/'
+
+        header['restart_req'] = sabnzbd.RESTART_REQ
+        header['pid'] = os.getpid()
+
+        header['last_warning'] = sabnzbd.GUIHANDLER.last().replace('WARNING', ('WARNING:')).replace('ERROR', T('ERROR:'))
+        header['active_lang'] = cfg.language()
+
+        header['my_lcldata'] = sabnzbd.DIR_LCLDATA
+        header['my_home'] = sabnzbd.DIR_HOME
+        header['webdir'] = webdir or sabnzbd.WEB_DIR
+
+        header['nt'] = sabnzbd.WIN32
+        header['darwin'] = sabnzbd.DARWIN
+
+        header['power_options'] = sabnzbd.WIN32 or sabnzbd.DARWIN or sabnzbd.LINUX_POWER
+        header['pp_pause_event'] = sabnzbd.scheduler.pp_pause_event()
+
+        header['session'] = cfg.api_key()
+        header['new_release'], header['new_rel_url'] = sabnzbd.NEW_VERSION
+
+
+    header['version'] = sabnzbd.__version__
+    header['paused'] = Downloader.do.paused or Downloader.do.postproc
+    header['pause_int'] = scheduler.pause_int()
+    header['paused_all'] = sabnzbd.PAUSED_ALL
+
+    header['diskspace1'] = "%.2f" % disk_free1
+    header['diskspace2'] = "%.2f" % disk_free2
+    header['diskspace1_norm'] = to_units(disk_free1 * GIGI)
+    header['diskspace2_norm'] = to_units(disk_free2 * GIGI)
+    header['diskspacetotal1'] = "%.2f" % disk_total1
+    header['diskspacetotal2'] = "%.2f" % disk_total2
     header['loadavg'] = loadavg()
-    # Special formatting so only decimal points when needed
     header['speedlimit'] = "{1:0.{0}f}".format(int(speed_limit % 1 > 0), speed_limit)
     header['speedlimit_abs'] = "%s" % speed_limit_abs
-    header['restart_req'] = sabnzbd.RESTART_REQ
+
     header['have_warnings'] = str(sabnzbd.GUIHANDLER.count())
-    header['last_warning'] = sabnzbd.GUIHANDLER.last().replace('WARNING', ('WARNING:')).replace('ERROR', T('ERROR:'))
-    header['active_lang'] = cfg.language()
-    header['my_lcldata'] = sabnzbd.DIR_LCLDATA
-    header['my_home'] = sabnzbd.DIR_HOME
-
-    header['webdir'] = webdir
-    header['pid'] = os.getpid()
-
     header['finishaction'] = sabnzbd.QUEUECOMPLETE
-    header['nt'] = sabnzbd.WIN32
-    header['darwin'] = sabnzbd.DARWIN
-    header['power_options'] = sabnzbd.WIN32 or sabnzbd.DARWIN or sabnzbd.LINUX_POWER
-
-    header['session'] = cfg.api_key()
 
     header['quota'] = to_units(BPSMeter.do.quota)
     header['have_quota'] = bool(BPSMeter.do.quota > 0.0)
@@ -1748,22 +1689,13 @@ def build_header(prim, webdir=''):
     header['cache_size'] = format_bytes(anfo.cache_size)
     header['cache_max'] = str(anfo.cache_limit)
 
-    header['pp_pause_event'] = sabnzbd.scheduler.pp_pause_event()
-
-    if sabnzbd.NEW_VERSION:
-        header['new_release'], header['new_rel_url'] = sabnzbd.NEW_VERSION
-    else:
-        header['new_release'] = ''
-        header['new_rel_url'] = ''
-
     return header
 
 
-
-def build_queue_header(prim, webdir='', search=None, start=0, limit=0):
+def build_queue_header(search=None, start=0, limit=0, output=None):
     """ Build full queue header """
 
-    header = build_header(prim, webdir)
+    header = build_header(output=output)
 
     bytespersec = BPSMeter.do.get_bps()
     qnfo = NzbQueue.do.queue_info(search=search, start=start, limit=limit)
@@ -1957,21 +1889,6 @@ def build_history(start=None, limit=None, verbose=False, verbose_list=None, sear
     return (items, fetched_items, total_items)
 
 
-def format_history_for_queue():
-    """ Retrieves the information on currently active history items, and formats them for displaying in the queue """
-    slotinfo = []
-    history_items = get_active_history()
-
-    for item in history_items:
-        slot = {'nzo_id': item['nzo_id'],
-                'bookmark': '', 'filename': xml_name(item['name']), 'loaded': False,
-                'stages': item['stage_log'], 'status': item['status'], 'bytes': item['bytes'],
-                'size': item['size']}
-        slotinfo.append(slot)
-
-    return slotinfo
-
-
 def get_active_history(queue=None, items=None):
     """ Get the currently in progress and active history queue. """
     if items is None:
@@ -1986,7 +1903,7 @@ def get_active_history(queue=None, items=None):
             item['url'], item['status'], item['nzo_id'], item['storage'], item['path'], item['script_log'], \
             item['script_line'], item['download_time'], item['postproc_time'], item['stage_log'], \
             item['downloaded'], item['completeness'], item['fail_message'], item['url_info'], item['bytes'], \
-            dummy, dummy = history
+            dummy, dummy, item['password'] = history
         item['action_line'] = nzo.action_line
         item = unpack_history_info(item)
 
@@ -2054,7 +1971,7 @@ def list_scripts(default=False, none=True):
                 if (sabnzbd.WIN32 and os.path.splitext(script)[1].lower() in PATHEXT and
                                       not win32api.GetFileAttributes(script) & win32file.FILE_ATTRIBUTE_HIDDEN) or \
                    script.endswith('.py') or \
-                   (not sabnzbd.WIN32 and os.access(script, os.X_OK) and not os.path.basename(script).startswith('.')):
+                   (not sabnzbd.WIN32 and userxbit(script) and not os.path.basename(script).startswith('.')):
                     lst.append(os.path.basename(script))
         if none:
             lst.insert(0, 'None')

sabnzbd/articlecache.py

@@ -25,7 +25,7 @@ import threading
 
 import sabnzbd
 from sabnzbd.decorators import synchronized
-from sabnzbd.constants import GIGI, ANFO, Status
+from sabnzbd.constants import GIGI, ANFO
 
 
 ARTICLE_LOCK = threading.Lock()
@@ -59,7 +59,7 @@ class ArticleCache(object):
     @synchronized(ARTICLE_LOCK)
     def reserve_space(self, data):
         """ Is there space left in the set limit? """
-        data_size = sys.getsizeof(data)*64
+        data_size = sys.getsizeof(data) * 64
         self.__cache_size += data_size
         if self.__cache_size + data_size > self.__cache_limit:
             return False
@@ -69,11 +69,10 @@ class ArticleCache(object):
     @synchronized(ARTICLE_LOCK)
     def free_reserve_space(self, data):
         """ Remove previously reserved space """
-        data_size = sys.getsizeof(data)*64
+        data_size = sys.getsizeof(data) * 64
         self.__cache_size -= data_size
         return self.__cache_size + data_size < self.__cache_limit
 
-
     @synchronized(ARTICLE_LOCK)
     def save_article(self, article, data):
         nzf = article.nzf
@@ -148,7 +147,7 @@ class ArticleCache(object):
     @synchronized(ARTICLE_LOCK)
     def purge_articles(self, articles):
         if sabnzbd.LOG_ALL:
-            logging.debug("Purgable articles -> %s", articles)
+            logging.debug("Purgeable articles -> %s", articles)
         for article in articles:
             if article in self.__article_list:
                 self.__article_list.remove(article)

sabnzbd/assembler.py

@@ -26,16 +26,11 @@ import struct
 import re
 from threading import Thread
 from time import sleep
-try:
-    import hashlib
-    new_md5 = hashlib.md5
-except:
-    import md5
-    new_md5 = md5.new
+import hashlib
 
 import sabnzbd
 from sabnzbd.misc import get_filepath, sanitize_filename, get_unique_filename, renamer, \
-    set_permissions, flag_file, long_path, clip_path, get_all_passwords, short_path
+    set_permissions, flag_file, long_path, clip_path, has_win_device, get_all_passwords
 from sabnzbd.constants import QCHECK_FILE, Status
 import sabnzbd.cfg as cfg
 from sabnzbd.articlecache import ArticleCache
@@ -65,7 +60,6 @@ class Assembler(Thread):
         self.queue.put(job)
 
     def run(self):
-        import sabnzbd.nzbqueue
         while 1:
             job = self.queue.get()
             if not job:
@@ -76,7 +70,8 @@ class Assembler(Thread):
 
             if nzf:
                 sabnzbd.CheckFreeSpace()
-                filename = sanitize_filename(nzf.filename)
+                # We allow win_devices because otherwise par2cmdline fails to repair
+                filename = sanitize_filename(nzf.filename, allow_win_devices=True)
                 nzf.filename = filename
 
                 dupe = nzo.check_for_dupe(nzf)
@@ -88,10 +83,8 @@ class Assembler(Thread):
                     try:
                         filepath = _assemble(nzf, filepath, dupe)
                     except IOError, (errno, strerror):
-                        if nzo.is_gone():
-                            # Job was deleted, ignore error
-                            pass
-                        else:
+                        # If job was deleted, ignore error
+                        if not nzo.is_gone():
                             # 28 == disk full => pause downloader
                             if errno == 28:
                                 logging.error(T('Disk full! Forcing Pause'))
@@ -99,6 +92,7 @@ class Assembler(Thread):
                                 logging.error(T('Disk error on creating file %s'), clip_path(filepath))
                             # Pause without saving
                             sabnzbd.downloader.Downloader.do.pause(save=False)
+                        continue
                     except:
                         logging.error(T('Fatal error in Assembler'), exc_info=True)
                         break
@@ -110,6 +104,11 @@ class Assembler(Thread):
                         if pack:
                             nzo.md5packs[setname] = pack
                             logging.debug('Got md5pack for set %s', setname)
+                            # Valid md5pack, so use this par2-file as main par2 file for the set
+                            if setname in nzo.partable:
+                                # First copy the set of extrapars, we need them later
+                                nzf.extrapars = nzo.partable[setname].extrapars
+                                nzo.partable[setname] = nzf
 
                     rar_encrypted, unwanted_file = check_encrypted_and_unwanted_files(nzo, filepath)
                     if rar_encrypted:
@@ -119,7 +118,6 @@ class Assembler(Thread):
                         else:
                             logging.warning(T('WARNING: Aborted job "%s" because of encrypted RAR file (if supplied, all passwords were tried)'), nzo.final_name)
                             nzo.fail_msg = T('Aborted, encryption detected')
-                            import sabnzbd.nzbqueue
                             sabnzbd.nzbqueue.NzbQueue.do.end_job(nzo)
 
                     if unwanted_file:
@@ -132,7 +130,6 @@ class Assembler(Thread):
                         if cfg.action_on_unwanted_extensions() == 2:
                             logging.debug('Unwanted extension ... aborting')
                             nzo.fail_msg = T('Aborted, unwanted extension detected')
-                            import sabnzbd.nzbqueue
                             sabnzbd.nzbqueue.NzbQueue.do.end_job(nzo)
 
                     filter, reason = nzo_filtered_by_rating(nzo)
@@ -142,7 +139,6 @@ class Assembler(Thread):
                     elif filter == 2:
                         logging.warning(Ta('WARNING: Aborted job "%s" because of rating (%s)'), nzo.final_name, reason)
                         nzo.fail_msg = T('Aborted, rating filter matched (%s)') % reason
-                        import sabnzbd.nzbqueue
                         sabnzbd.nzbqueue.NzbQueue.do.end_job(nzo)
 
                     nzf.completed = True
@@ -162,7 +158,7 @@ def _assemble(nzf, path, dupe):
     fout = open(path, 'ab')
 
     if cfg.quick_check():
-        md5 = new_md5()
+        md5 = hashlib.md5()
     else:
         md5 = None
 
@@ -174,7 +170,7 @@ def _assemble(nzf, path, dupe):
             break
 
         # Sleep to allow decoder/assembler switching
-        sleep(0.001)
+        sleep(0.0001)
         article = decodetable[articlenum]
 
         data = ArticleCache.do.load_article(article)
@@ -267,7 +263,7 @@ def ParseFilePacket(f, header):
 
     # Read and check the data
     data = f.read(len - 32)
-    md5 = new_md5()
+    md5 = hashlib.md5()
     md5.update(data)
     if md5sum != md5.digest():
         return nothing
@@ -291,7 +287,7 @@ def ParseFilePacket(f, header):
 
 
 RE_SUBS = re.compile(r'\W+sub|subs|subpack|subtitle|subtitles(?![a-z])', re.I)
-def is_cloaked(path, names):
+def is_cloaked(nzo, path, names):
     """ Return True if this is likely to be a cloaked encrypted post """
     fname = unicoder(os.path.split(path)[1]).lower()
     fname = os.path.splitext(fname)[0]
@@ -299,10 +295,16 @@ def is_cloaked(path, names):
         name = os.path.split(name.lower())[1]
         name, ext = os.path.splitext(unicoder(name))
         if ext == u'.rar' and fname.startswith(name) and (len(fname) - len(name)) < 8 and len(names) < 3 and not RE_SUBS.search(fname):
-            logging.debug('File %s is probably encrypted due to RAR with same name inside this RAR', fname)
+            # Only warn once
+            if nzo.encrypted == 0:
+                logging.warning(T('Job "%s" is probably encrypted due to RAR with same name inside this RAR'), nzo.final_name)
+                nzo.encrypted = 1
             return True
         elif 'password' in name:
-            logging.debug('RAR %s is probably encrypted: "password" in filename %s', fname, name)
+            # Only warn once
+            if nzo.encrypted == 0:
+                logging.warning(T('Job "%s" is probably encrypted: "password" in filename "%s"'), nzo.final_name, name)
+                nzo.encrypted = 1
             return True
     return False
 
@@ -312,24 +314,29 @@ def check_encrypted_and_unwanted_files(nzo, filepath):
     encrypted = False
     unwanted = None
 
-    if cfg.unwanted_extensions() or (nzo.encrypted == 0 and cfg.pause_on_pwrar()):
-        # Safe-format for Windows
-        # RarFile requires de-unicoded filenames for zf.testrar()
-        filepath_split = os.path.split(filepath)
-        workdir_short = short_path(filepath_split[0])
-        filepath = deunicode(os.path.join(workdir_short, filepath_split[1]))
+    if (cfg.unwanted_extensions() and cfg.action_on_unwanted_extensions()) or (nzo.encrypted == 0 and cfg.pause_on_pwrar()):
+        # These checks should not break the assembler
+        try:
+            # Rarfile freezes on Windows special names, so don't try those!
+            if sabnzbd.WIN32 and has_win_device(filepath):
+                return encrypted, unwanted
 
-        # Is it even a rarfile?
-        if rarfile.is_rarfile(filepath):
-            try:
+            # Is it even a rarfile?
+            if rarfile.is_rarfile(filepath):
+                # Open the rar
+                rarfile.UNRAR_TOOL = sabnzbd.newsunpack.RAR_COMMAND
                 zf = rarfile.RarFile(filepath, all_names=True)
+
                 # Check for encryption
-                if nzo.encrypted == 0 and cfg.pause_on_pwrar() and (zf.needs_password() or is_cloaked(filepath, zf.namelist())):
+                if nzo.encrypted == 0 and cfg.pause_on_pwrar() and (zf.needs_password() or is_cloaked(nzo, filepath, zf.namelist())):
                     # Load all passwords
                     passwords = get_all_passwords(nzo)
 
-                    # if no cryptography installed, only error when no password was set
-                    if not sabnzbd.HAVE_CRYPTOGRAPHY and not passwords:
+                    # Cloaked job?
+                    if is_cloaked(nzo, filepath, zf.namelist()):
+                        encrypted = True
+                    elif not sabnzbd.HAVE_CRYPTOGRAPHY and not passwords:
+                        # if no cryptography installed, only error when no password was set
                         logging.info(T('%s missing'), 'Python Cryptography')
                         nzo.encrypted = 1
                         encrypted = True
@@ -337,13 +344,17 @@ def check_encrypted_and_unwanted_files(nzo, filepath):
                     elif sabnzbd.HAVE_CRYPTOGRAPHY:
                         # Lets test if any of the password work
                         password_hit = False
-                        rarfile.UNRAR_TOOL = sabnzbd.newsunpack.RAR_COMMAND
 
                         for password in passwords:
                             if password:
                                 logging.info('Trying password "%s" on job "%s"', password, nzo.final_name)
                                 try:
                                     zf.setpassword(password)
+                                except:
+                                    # On weird passwords the setpassword() will fail
+                                    # but the actual rartest() will work
+                                    pass
+                                try:
                                     zf.testrar()
                                     password_hit = password
                                     break
@@ -351,7 +362,11 @@ def check_encrypted_and_unwanted_files(nzo, filepath):
                                     # On CRC error we can continue!
                                     password_hit = password
                                     break
-                                except:
+                                except Exception as e:
+                                    # Did we start from the right volume?
+                                    if 'need to start extraction from a previous volume' in e[0]:
+                                        return encrypted, unwanted
+                                    # This one failed
                                     pass
 
                         # Did any work?
@@ -370,17 +385,16 @@ def check_encrypted_and_unwanted_files(nzo, filepath):
                         encrypted = False
 
                 # Check for unwanted extensions
-                if cfg.unwanted_extensions():
+                if cfg.unwanted_extensions() and cfg.action_on_unwanted_extensions():
                     for somefile in zf.namelist():
                         logging.debug('File contains: %s', somefile)
                         if os.path.splitext(somefile)[1].replace('.', '').lower() in cfg.unwanted_extensions():
                             logging.debug('Unwanted file %s', somefile)
                             unwanted = somefile
-                            zf.close()
                 zf.close()
                 del zf
-            except:
-                logging.debug('RAR file %s cannot be inspected', filepath)
+        except:
+            logging.info('Error during inspection of RAR-file %s', filepath, exc_info=True)
 
     return encrypted, unwanted
 

sabnzbd/bpsmeter.py

@@ -22,7 +22,6 @@ sabnzbd.bpsmeter - bpsmeter
 import time
 import logging
 import re
-from math import floor
 
 import sabnzbd
 from sabnzbd.constants import BYTES_FILE_NAME, BYTES_FILE_NAME_OLD, KIBI
@@ -156,7 +155,6 @@ class BPSMeter(object):
     def defaults(self):
         """ Get the latest data from the database and assign to a fake server """
         logging.debug('Setting default BPS meter values')
-        import sabnzbd.database
         history_db = sabnzbd.database.HistoryDB()
         grand, month, week = history_db.get_history_size()
         history_db.close()
@@ -245,9 +243,8 @@ class BPSMeter(object):
             if self.have_quota and self.quota_enabled:
                 self.left -= amount
                 if self.left <= 0.0:
-                    from sabnzbd.downloader import Downloader
-                    if Downloader.do and not Downloader.do.paused:
-                        Downloader.do.pause()
+                    if sabnzbd.downloader.Downloader.do and not sabnzbd.downloader.Downloader.do.paused:
+                        sabnzbd.downloader.Downloader.do.pause()
                         logging.warning(T('Quota spent, pausing downloading'))
 
         # Speedometer
@@ -335,15 +332,15 @@ class BPSMeter(object):
             return None
 
         # Calculate the variance in the speed
-        avg = sum(self.bps_list[-timespan:])/timespan
+        avg = sum(self.bps_list[-timespan:]) / timespan
         vari = 0
         for bps in self.bps_list[-timespan:]:
             vari += abs(bps - avg)
-        vari = vari/timespan
+        vari = vari / timespan
 
         try:
             # See if the variance is less than 5%
-            if (vari / (self.bps/KIBI)) < 0.05:
+            if (vari / (self.bps / KIBI)) < 0.05:
                 return avg
             else:
                 return False
@@ -352,7 +349,6 @@ class BPSMeter(object):
             pass
         return None
 
-
     def reset_quota(self, force=False):
         """ Check if it's time to reset the quota, optionally resuming
             Return True, when still paused
@@ -465,9 +461,8 @@ class BPSMeter(object):
 
     def resume(self):
         """ Resume downloading """
-        from sabnzbd.downloader import Downloader
-        if cfg.quota_resume() and Downloader.do and Downloader.do.paused:
-            Downloader.do.resume()
+        if cfg.quota_resume() and sabnzbd.downloader.Downloader.do and sabnzbd.downloader.Downloader.do.paused:
+            sabnzbd.downloader.Downloader.do.resume()
 
     def midnight(self):
         """ Midnight action: dummy update for all servers """

sabnzbd/cfg.py

@@ -21,10 +21,9 @@ sabnzbd.cfg - Configuration Parameters
 import re
 
 import sabnzbd
-from sabnzbd.constants import DEF_HOST, DEF_PORT_WIN_SSL, DEF_PORT_WIN, DEF_STDINTF, \
-    DEF_DOWNLOAD_DIR, DEF_NZBBACK_DIR, DEF_PORT_UNIX_SSL, \
-    DEF_SCANRATE, DEF_PORT_UNIX, DEF_COMPLETE_DIR, \
-    DEF_ADMIN_DIR
+from sabnzbd.constants import DEF_HOST, DEF_PORT, DEF_STDINTF, DEF_ADMIN_DIR, \
+    DEF_DOWNLOAD_DIR, DEF_NZBBACK_DIR, DEF_SCANRATE, DEF_COMPLETE_DIR
+
 from sabnzbd.config import OptionBool, OptionNumber, OptionPassword, \
     OptionDir, OptionStr, OptionList, no_nonsense, \
     validate_octal, validate_safedir, \
@@ -65,6 +64,7 @@ else:
 ##############################################################################
 quick_check = OptionBool('misc', 'quick_check', True)
 sfv_check = OptionBool('misc', 'sfv_check', True)
+quick_check_ext_ignore = OptionList('misc', 'quick_check_ext_ignore', ['nfo', 'sfv', 'srr'])
 
 email_server = OptionStr('misc', 'email_server', validation=validate_server)
 email_to = OptionList('misc', 'email_to', validation=validate_email)
@@ -113,7 +113,6 @@ req_completion_rate = OptionNumber('misc', 'req_completion_rate', 100.2, 100, 20
 rating_enable = OptionBool('misc', 'rating_enable', False)
 rating_host = OptionStr('misc', 'rating_host', 'api.oznzb.com')
 rating_api_key = OptionStr('misc', 'rating_api_key')
-rating_feedback = OptionBool('misc', 'rating_feedback', True)
 rating_filter_enable = OptionBool('misc', 'rating_filter_enable', False)
 rating_filter_abort_audio = OptionNumber('misc', 'rating_filter_abort_audio', 0)
 rating_filter_abort_video = OptionNumber('misc', 'rating_filter_abort_video', 0)
@@ -189,7 +188,6 @@ complete_dir = OptionDir('misc', 'complete_dir', DEF_COMPLETE_DIR, create=False,
 script_dir = OptionDir('misc', 'script_dir', create=True, writable=False)
 nzb_backup_dir = OptionDir('misc', 'nzb_backup_dir', DEF_NZBBACK_DIR)
 admin_dir = OptionDir('misc', 'admin_dir', DEF_ADMIN_DIR, validation=validate_safedir)
-# log_dir = OptionDir('misc', 'log_dir', 'logs')
 dirscan_dir = OptionDir('misc', 'dirscan_dir', create=False)
 dirscan_speed = OptionNumber('misc', 'dirscan_speed', DEF_SCANRATE, 0, 3600)
 size_limit = OptionStr('misc', 'size_limit', '0')
@@ -201,14 +199,8 @@ sanitize_safe = OptionBool('misc', 'sanitize_safe', False)
 api_logging = OptionBool('misc', 'api_logging', True)
 
 cherryhost = OptionStr('misc', 'host', DEF_HOST)
-if sabnzbd.WIN32:
-    cherryport = OptionStr('misc', 'port', DEF_PORT_WIN)
-else:
-    cherryport = OptionStr('misc', 'port', DEF_PORT_UNIX)
-if sabnzbd.WIN32:
-    https_port = OptionStr('misc', 'https_port', DEF_PORT_WIN_SSL)
-else:
-    https_port = OptionStr('misc', 'https_port', DEF_PORT_UNIX_SSL)
+cherryport = OptionStr('misc', 'port', DEF_PORT)
+https_port = OptionStr('misc', 'https_port')
 
 username = OptionStr('misc', 'username')
 password = OptionPassword('misc', 'password')
@@ -220,9 +212,7 @@ refresh_rate = OptionNumber('misc', 'refresh_rate', 0)
 rss_rate = OptionNumber('misc', 'rss_rate', 60, 15, 24 * 60)
 cache_limit = OptionStr('misc', 'cache_limit')
 web_dir = OptionStr('misc', 'web_dir', DEF_STDINTF)
-web_dir2 = OptionStr('misc', 'web_dir2')
 web_color = OptionStr('misc', 'web_color', '')
-web_color2 = OptionStr('misc', 'web_color2')
 cleanup_list = OptionList('misc', 'cleanup_list')
 warned_old_queue = OptionBool('misc', 'warned_old_queue9', False)
 notified_new_skin = OptionNumber('misc', 'notified_new_skin', 0)
@@ -242,14 +232,10 @@ https_chain = OptionDir('misc', 'https_chain', create=False)
 enable_https = OptionBool('misc', 'enable_https', False)
 
 language = OptionStr('misc', 'language', 'en')
-unpack_check = OptionBool('misc', 'unpack_check', True)
 no_penalties = OptionBool('misc', 'no_penalties', False)
 load_balancing = OptionNumber('misc', 'load_balancing', 2)
 ipv6_servers = OptionNumber('misc', 'ipv6_servers', 1, 0, 2)
 
-# Internal options, not saved in INI file
-debug_delay = OptionNumber('misc', 'debug_delay', 0, add=False)
-
 api_key = OptionStr('misc', 'api_key', create_api_key())
 nzb_key = OptionStr('misc', 'nzb_key', create_api_key())
 disable_key = OptionBool('misc', 'disable_api_key', False, protect=True)
@@ -394,7 +380,6 @@ osx_speed = OptionBool('misc', 'osx_speed', True)
 keep_awake = OptionBool('misc', 'keep_awake', True)
 win_menu = OptionBool('misc', 'win_menu', True)
 allow_incomplete_nzb = OptionBool('misc', 'allow_incomplete_nzb', False)
-prospective_par_download = OptionBool('misc', 'prospective_par_download', True)
 marker_file = OptionStr('misc', 'nomedia_marker', '')
 wait_ext_drive = OptionNumber('misc', 'wait_ext_drive', 5, 1, 60)
 queue_limit = OptionNumber('misc', 'queue_limit', 20, 0)
@@ -405,6 +390,9 @@ allow_duplicate_files = OptionBool('misc', 'allow_duplicate_files', False)
 warn_dupl_jobs = OptionBool('misc', 'warn_dupl_jobs', True)
 new_nzb_on_failure = OptionBool('misc', 'new_nzb_on_failure', False)
 
+# TEMP
+nr_decoders = OptionNumber('misc', 'nr_decoders', 2)
+
 
 ##############################################################################
 # Set root folders for Folder config-items