Set version to 2.1.0 and make identical to develop

interfaces/smpl/templates/static/MochiKit/__package__.js

@@ -1,2 +1,2 @@
-dojo.hostenv.conditionalLoadModule({"common": ["MochiKit.MochiKit"]});
+dojo.hostenv.conditionalLoadModule({"common": ["MochiKit.MochiKit"]});
-dojo.hostenv.moduleLoaded("MochiKit.*");
+dojo.hostenv.moduleLoaded("MochiKit.*");

licenses/License-pynewsleecher.txt

@@ -1,11 +1,11 @@
-The original author of SABnzbd based his work on Pynewsleecher by Freddy@madcowdesease.org.
+The original author of SABnzbd based his work on Pynewsleecher by Freddy@madcowdesease.org.
-
+
-Few parts of Pynewsleecher have survived the generations of SABnzbd in a
+Few parts of Pynewsleecher have survived the generations of SABnzbd in a
-recognizable form.
+recognizable form.
-Still, we wish to thank Freddy for his inspiration.
+Still, we wish to thank Freddy for his inspiration.
-
+
-The home of the Pynewsleecher project:
+The home of the Pynewsleecher project:
-http://www.madcowdisease.org/mcd/pynewsleecher
+http://www.madcowdisease.org/mcd/pynewsleecher
-
+
-The software does not carry any license information.
+The software does not carry any license information.
-
+

licenses/License-systrayicon.txt

@@ -1,8 +1,8 @@
-On http://www.brunningonline.net/simon/blog/archives/001835.html,
+On http://www.brunningonline.net/simon/blog/archives/001835.html,
-the author licensed SysTrayIcon.py under a variant of the WTFPL:
+the author licensed SysTrayIcon.py under a variant of the WTFPL:
-
+
-> Any road up, help yourself. Consider SysTrayIcon.py to be under an
+> Any road up, help yourself. Consider SysTrayIcon.py to be under an
-> "Aleister Crowley" style license - "Do what thou wilt shall be the
+> "Aleister Crowley" style license - "Do what thou wilt shall be the
-> only law".
+> only law".
-> 
+> 
-> Err, but don't sue me if it doesn't work. ;-)
+> Err, but don't sue me if it doesn't work. ;-)

sabnzbd/misc.py

@@ -337,8 +337,7 @@ def sanitize_foldername(name, limit=True):
 
     maxlen = cfg.folder_max_length()
     if limit and len(name) > maxlen:
-        # Folders can't end on a dot in Windows
+        name = name[:maxlen]
-        name = name[:maxlen].strip('.')
 
     # And finally, make sure it doesn't end in a dot
     if name != '.' and name != '..':

sabnzbd/version.py

@@ -4,5 +4,5 @@
 
 # You MUST use double quotes (so " and not ')
 
-__version__ = "2.0.1"
+__version__ = "2.1.0"
-__baseline__ = "be5bebb5741eeaffed552807929248ee603e6bf1"
+__baseline__ = "443efb5eda00e165e7d0459824989a6300ec458c"

scripts/Sample-PostProc.cmd

@@ -1,15 +1,15 @@
-@echo off
+@echo off
-rem Example of a post processing script for SABnzbd
+rem Example of a post processing script for SABnzbd
-
+
-echo.
+echo.
-echo Running in directory "%~d0%~p0"
+echo Running in directory "%~d0%~p0"
-echo.
+echo.
-echo The first parameter (result-dir) = %1
+echo The first parameter (result-dir) = %1
-echo The second parameter (nzb-name)  = %2
+echo The second parameter (nzb-name)  = %2
-echo The third parameter (nice name)  = %3
+echo The third parameter (nice name)  = %3
-echo The fourth parameter (newzbin #) = %4
+echo The fourth parameter (newzbin #) = %4
-echo The fifth parameter (category)   = %5
+echo The fifth parameter (category)   = %5
-echo The sixth parameter (group)      = %6
+echo The sixth parameter (group)      = %6
-echo The seventh parameter (status)   = %7
+echo The seventh parameter (status)   = %7
-echo The eight parameter (failure_url)= %8
+echo The eight parameter (failure_url)= %8
-echo.
+echo.