Automatic translation update

Typo!

PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 1.0
 Name: SABnzbd
-Version: 2.3.2RC1
-Summary: SABnzbd-2.3.2RC1
+Version: 2.3.2RC2
+Summary: SABnzbd-2.3.2RC2
 Home-page: https://sabnzbd.org
 Author: The SABnzbd Team
 Author-email: team@sabnzbd.org

README.mkd

@@ -1,6 +1,16 @@
-Release Notes - SABnzbd 2.3.2 RC 1
+Release Notes - SABnzbd 2.3.2 RC 2
 =========================================================
 
+## Changes since 2.3.2 RC 1
+- Simplify Config pages by hiding Advanced Settings
+- Automatically set Article Cache to 25% of system memory (max. 2GB)
+- Added Hebrew date-time texts
+- Added option '%dn' to Date Sorting to rename files as job name
+- Added 'Job Name as Folder Name' as Sorting Preset for de-obfuscation
+- Add per-day download-statistics to 'server_stats' API-call
+- Having 'Download all par2' enabled would result in disappearing jobs
+- Pre-queue scripts would fail to run
+
 ## Changes since 2.3.1
 - SABYenc updated to 3.3.2 to fix rare crash during downloading
 - Minor updates of SABYenc (such as 3.3.2) are no longer mandatory

interfaces/Config/templates/config_folders.tmpl

@@ -3,6 +3,11 @@
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
+    <div class="padding alt section">
+        <label for="advanced-settings-button" class="form-control advanced-button ">
+            <input type="checkbox" id="advanced-settings-button" name="advanced-settings-button"> $T('button-advanced')
+        </label>
+    </div>
     <form action="saveDirectories" method="post" name="fullform" class="fullform" autocomplete="off">
     <input type="hidden" id="session" name="session" value="$session" />
     <input type="hidden" id="ajax" name="ajax" value="1" />
@@ -21,7 +26,7 @@
                     <input type="text" name="download_dir" id="download_dir" value="$download_dir" data-initialdir="$my_home" />
                     <span class="desc">$T('explain-download_dir')</span>
                 </div>
-                <div class="field-pair">
+                <div class="field-pair advanced-settings">
                     <label class="config" for="download_free">$T('opt-download_free')</label>
                     <input type="text" name="download_free" id="download_free" value="$download_free" class="smaller_input"  />
                     <span class="desc">$T('explain-download_free')</span>
@@ -32,7 +37,7 @@
                     <span class="desc">$T('explain-complete_dir')</span>
                 </div>
                 <!--#if not $nt#-->
-                <div class="field-pair">
+                <div class="field-pair advanced-settings">
                     <label class="config" for="permissions">$T('opt-permissions')</label>
                     <input type="text" name="permissions" id="permissions" value="$permissions" class="smaller_input" />
                     <span class="desc">$T('explain-permissions')</span>
@@ -43,7 +48,7 @@
                     <input type="text" name="dirscan_dir" id="dirscan_dir" value="$dirscan_dir" data-initialdir="$my_home" />
                     <span class="desc">$T('explain-dirscan_dir')</span>
                 </div>
-                <div class="field-pair">
+                <div class="field-pair advanced-settings">
                     <label class="config" for="dirscan_speed">$T('opt-dirscan_speed')</label>
                     <input type="number" name="dirscan_speed" id="dirscan_speed" value="$dirscan_speed"  min="0" max="3600" />
                     <span class="desc">$T('explain-dirscan_speed')</span>
@@ -53,12 +58,12 @@
                     <input type="text" name="script_dir" id="script_dir" value="$script_dir" data-initialdir="$my_home" />
                     <span class="desc">$T('explain-script_dir')</span>
                 </div>
-                <div class="field-pair">
+                <div class="field-pair advanced-settings">
                     <label class="config" for="email_dir">$T('opt-email_dir')</label>
                     <input type="text" name="email_dir" id="email_dir" value="$email_dir" data-initialdir="$my_home" />
                     <span class="desc">$T('explain-email_dir')</span>
                 </div>
-                <div class="field-pair">
+                <div class="field-pair advanced-settings">
                     <label class="config" for="password_file">$T('opt-password_file')</label>
                     <input type="text" name="password_file" id="password_file" value="$password_file" />
                     <span class="desc">$T('explain-password_file')</span>
@@ -72,7 +77,7 @@
             </fieldset>
         </div><!-- /col1 -->
     </div><!-- /section -->
-    <div class="section">
+    <div class="section advanced-settings">
         <div class="col2">
             <h3>$T('systemFolders') <a href="$helpuri$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             <p>$T('explain-folderConfig')</p>

interfaces/Config/templates/config_general.tmpl

@@ -3,6 +3,11 @@
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
+    <div class="padding alt section">
+        <label for="advanced-settings-button" class="form-control advanced-button ">
+            <input type="checkbox" id="advanced-settings-button" name="advanced-settings-button"> $T('button-advanced')
+        </label>
+    </div>
     <form action="saveGeneral" method="post" name="fullform" class="fullform" autocomplete="off">
     <input type="hidden" id="session" name="session" value="$session" />
     <input type="hidden" id="ajax" name="ajax" value=1 />
@@ -28,7 +33,7 @@
                     <input type="checkbox" name="enable_https" id="enable_https" value="1" <!--#if int($enable_https) > 0 then 'checked="checked" data-original="1"' else ""#-->/>
                     <span class="desc">$T('explain-enable_https')</span>
                 </div>
-                <div class="field-pair">
+                <div class="field-pair advanced-settings">
                     <label class="config" for="web_dir">$T('opt-web_dir')</label>
                     <select name="web_dir" id="web_dir">
                     <!--#for $webline in $web_list#-->
@@ -89,7 +94,6 @@
                 <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>
@@ -173,7 +177,7 @@
                     </select>
                     <span class="desc">$T('explain-check_new_rel')</span>
                 </div>
-                <div class="field-pair <!--#if int($have_ssl_context) == 0 then "disabled" else ""#-->">
+                <div class="field-pair advanced-settings <!--#if int($have_ssl_context) == 0 then "disabled" else ""#-->">
                     <label class="config" for="enable_https_verification">$T('opt-enable_https_verification')</label>
                     <input type="checkbox" name="enable_https_verification" id="enable_https_verification" value="1" <!--#if int($enable_https_verification) > 0 then 'checked="checked"' else ""#--> <!--#if int($have_ssl_context) == 0 then "disabled=\"disabled\"" else ""#--> />
                     <span class="desc">$T('explain-enable_https_verification')</span>
@@ -200,12 +204,12 @@
                     </select>
                     <input type="hidden" name="bandwidth_max" id="bandwidth_max" value="$bandwidth_max" />
                 </div>
-                <div class="field-pair">
+                <div class="field-pair advanced-settings">
                     <label class="config" for="bandwidth_perc">$T('opt-bandwidth_perc')</label>
                     <input type="number" name="bandwidth_perc" id="bandwidth_perc" value="$bandwidth_perc" step="10" min="0" max="100"/>
                     <span class="desc">$T('explain-bandwidth_perc')</span>
                 </div>
-                <div class="field-pair">
+                <div class="field-pair advanced-settings">
                     <label class="config" for="cache_limit">$T('opt-cache_limitstr')</label>
                     <input type="text" name="cache_limit" id="cache_limit" value="$cache_limit" class="smaller_input" />
                     <span class="desc">$T('explain-cache_limitstr').replace("64M", "256M").replace("128M", "512M")</span>

interfaces/Config/templates/config_notify.tmpl

@@ -91,7 +91,7 @@
                     <input type="text" name="email_pwd" id="email_pwd" value="$email_pwd" />
                     <span class="desc">$T('explain-email_pwd')</span>
                 </div>
-                <div class="field-pair">
+                <div class="field-pair no-field-pair-bg">
                     <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
                     <button class="btn btn-default" type="button" id="test_email" rel="$T('askTestEmail')"><span class="glyphicon glyphicon-envelope"></span> $T('link-testEmail')</button>
                 </div>
@@ -115,7 +115,7 @@
         <div class="col1" <!--#if int($ncenter_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 $show_notify_checkboxes('ncenter')
-                <div class="field-pair">
+                <div class="field-pair no-field-pair-bg">
                     <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
                     <button class="btn btn-default" type="button" id="test_notif"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
                </div>
@@ -141,7 +141,7 @@
         <div class="col1" <!--#if int($acenter_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 $show_notify_checkboxes('acenter')
-                <div class="field-pair">
+                <div class="field-pair no-field-pair-bg">
                     <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
                     <button class="btn btn-default" type="button" id="test_windows"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
                </div>
@@ -167,7 +167,7 @@
         <div class="col1" <!--#if int($ntfosd_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 $show_notify_checkboxes('ntfosd')
-                <div class="field-pair">
+                <div class="field-pair no-field-pair-bg">
                     <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
                     <button class="btn btn-default" type="button" id="test_osd"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
                </div>
@@ -207,7 +207,7 @@
                     <span class="desc">$T('Optional') - $T('explain-nscript_parameters')</span>
                 </div>
                 $show_notify_checkboxes('nscript')
-                <div class="field-pair">
+                <div class="field-pair no-field-pair-bg">
                     <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
                     <button class="btn btn-default" type="button" id="test_nscript"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
                 </div>
@@ -241,7 +241,7 @@
                     <span class="desc">$T('explain-growl_password')</span>
                 </div>
                 $show_notify_checkboxes('growl')
-                <div class="field-pair">
+                <div class="field-pair no-field-pair-bg">
                     <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
                     <button class="btn btn-default" type="button" id="test_growl"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
                 </div>
@@ -286,7 +286,7 @@
                         </select>
                     </div>
                 <!--#end for#-->
-                <div class="field-pair">
+                <div class="field-pair no-field-pair-bg">
                     <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
                     <button class="btn btn-default" type="button" id="test_prowl"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
                 </div>
@@ -352,7 +352,7 @@
                         </select>
                     </div>
                 <!--#end for#-->
-                <div class="field-pair">
+                <div class="field-pair no-field-pair-bg">
                     <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
                     <button class="btn btn-default" type="button" id="test_pushover"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
                 </div>
@@ -389,7 +389,7 @@
                 </div>
                 <!--#end if#-->
                 $show_notify_checkboxes('pushbullet')
-                <div class="field-pair">
+                <div class="field-pair no-field-pair-bg">
                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
                    <button class="btn btn-default" type="button" id="test_pushbullet"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
                 </div>
@@ -417,6 +417,7 @@
             \$(this).parents('.col2').find('.col2-cats').hide()
         }
         \$('form').submit()
+        addRowColor()
     })
     \$('#email_endjob').change(function() {
         if(\$(this).val() > 0) {

interfaces/Config/templates/config_server.tmpl

@@ -47,33 +47,35 @@
 </script>
 
 <div class="colmask">
-    <form action="addServer" method="post" autocomplete="off" onsubmit="removeObfuscation();">
-        <input type="hidden" name="session" value="$session" />
-        <div id="addServer">
-            <div class="padding alt">
-                <button type="button" class="btn btn-default" id="addServerButton"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
+    <div class="padding alt section">
+        <button type="button" class="btn btn-default" id="addServerButton"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
+        <label for="advanced-settings-button" class="form-control advanced-button ">
+            <input type="checkbox" id="advanced-settings-button" name="advanced-settings-button"> $T('button-advanced')
+        </label>
 
-                <!--#if $months_recorded#-->
-                <div class="chart-selector-container" title="$T('srv-bandwidth')">
-                    <span class="glyphicon glyphicon-signal"></span>
-                    <select name="chart-selector" id="chart-selector">
-                        <!--#for $cur_date in months_recorded#-->
-                            <!--#set month_date = '%d-%02d' % ($cur_date.year, $cur_date.month)#-->
-                            <!--#if $month_date not in $max_data_all#-->
-                                <!--#set max_data_all[$month_date] = 0#-->
-                             <!--#end if#-->
-                            <option value="$month_date" data-max="$max_data_all[$month_date]">$month_names[$cur_date.month-1] $cur_date.year</option>
-                        <!--#end for#-->
-                    </select>
-                </div>
-                <!--#end if#-->
-            </div>
+        <!--#if $months_recorded#-->
+        <div class="advanced-buttonSeperator"></div>
+        <div class="chart-selector-container" title="$T('srv-bandwidth')">
+            <span class="glyphicon glyphicon-signal"></span>
+            <select name="chart-selector" id="chart-selector">
+                <!--#for $cur_date in months_recorded#-->
+                    <!--#set month_date = '%d-%02d' % ($cur_date.year, $cur_date.month)#-->
+                    <!--#if $month_date not in $max_data_all#-->
+                        <!--#set max_data_all[$month_date] = 0#-->
+                     <!--#end if#-->
+                    <option value="$month_date" data-max="$max_data_all[$month_date]">$month_names[$cur_date.month-1] $cur_date.year</option>
+                <!--#end for#-->
+            </select>
         </div>
-        <div class="section" id="addServerContent" style="display: none;">
-            <div class="col2">
-                <h3>$T('addServer') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-            </div>
-            <div class="col1">
+        <!--#end if#-->
+    </div>
+    <div class="section" id="addServerContent" style="display: none;">
+        <div class="col2">
+            <h3>$T('addServer') <a href="$helpuri$help_uri" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
+        </div>
+        <div class="col1">
+            <form action="addServer" method="post" autocomplete="off" onsubmit="removeObfuscation();">
+                <input type="hidden" name="session" value="$session" />
                 <fieldset>
                     <div class="field-pair">
                         <label class="config" for="enable">$T('srv-enable')</label>
@@ -145,18 +147,17 @@
                         <label class="config" for="notes">$T('srv-notes')</label>
                         <textarea name="notes" id="notes" rows="3" cols="50"></textarea>
                     </div>
-                    <div class="field-pair">
+                    <div class="field-pair no-field-pair-bg">
                         <button class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> $T('button-addServer')</button>
-                        <button class="btn btn-default advancedButton"><span class="glyphicon glyphicon-cog"></span> $T('button-advanced')</button>
                         <button class="btn btn-default testServer" type="button"><span class="glyphicon glyphicon-sort"></span> $T('button-testServer')</button>
                     </div>
                     <div class="field-pair result-box">
                         <div class="alert"></div>
                     </div>
                 </fieldset>
-            </div>
+            </form>
         </div>
-    </form>
+    </div>
 
     <!--#set $prio_colors = ["#59cc33", "#3366cc","#7f33cc", "#cc33a6", "#cc3333"] #-->
     <!--#set $cur_prio_color = -1 #-->
@@ -186,7 +187,7 @@
                     <button type="button" class="btn btn-default showserver"><span class="glyphicon glyphicon-pencil"></span> $T('showDetails')</button>
                     <button type="button" class="btn btn-default clrServer"><span class="glyphicon glyphicon-remove"></span> $T('button-clrServer')</button>
                 </div>
-                <div class="col1"  style="display:none;">
+                <div class="col1" style="display:none;">
                     <input type="hidden" name="enable" id="enable$cur" value="$int($server['enable'])" />
                     <fieldset>
                         <div class="field-pair">
@@ -257,7 +258,6 @@
                         </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 advancedButton"><span class="glyphicon glyphicon-cog"></span> $T('button-advanced')</button>
                             <button class="btn btn-default testServer" type="button"><span class="glyphicon glyphicon-sort"></span> $T('button-testServer')</button>
                             <button class="btn btn-default delServer"><span class="glyphicon glyphicon-trash"></span> $T('button-delServer')</button>
                         </div>
@@ -436,11 +436,14 @@
             } else {
                 \$(this).html(\$(this).html().replace("$T('hideDetails')", "$T('showDetails')"));
             }
+            // Add coloring
+            addRowColor()
         });
 
         \$('#addServerButton').click(function(){
-            \$('#addServer').hide();
             \$('#addServerContent').show();
+            // Add coloring
+            addRowColor()
         });
 
         \$('[name="ssl"]').click(function() {

interfaces/Config/templates/config_sorting.tmpl

@@ -40,6 +40,8 @@
                             <br/>
                             <input type="button" class="btn btn-default" onclick="tvSet('%sn/%sx%0e - %en/%sn - %sx%0e - %en.%ext')" value="$T('button-Ep1x05')" />
                             <input type="button" class="btn btn-default" onclick="tvSet('%sn/S%0sE%0e - %en/%sn - S%0sE%0e - %en.%ext')" value="$T('button-EpS01E05')" />
+                            <br>
+                            <input type="button" class="btn btn-default" onclick="tvSet('%dn.%ext')" value="$T('button-FileLikeFolder')" />
                         </div>
                     </div>
                     <div id="previewtv" class="example">
@@ -51,7 +53,7 @@
                             <label class="config">$T('sortResult')</label> <span class="desc path" id="previewtv-result">&nbsp;</span>
                         </div>
                     </div>
-                    <div class="field-pair">
+                    <div class="field-pair no-field-pair-bg">
                         <label class="config">$T('sort-legenda')</label>
                         <button type="button" class="btn btn-default patternKey" onclick="jQuery(this).hide(); jQuery('#Key1').show();"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span> $T('sort-legenda')</button>
                         <table id="Key1" class="Key">
@@ -139,9 +141,9 @@
                                     <td>$T("sort-File")</td>
                                 </tr>
                                 <tr>
-                                    <td class="align-right"><b>$T('orgDirname'):</b></td>
+                                    <td class="align-right"><b>$T('orgJobname'):</b></td>
                                     <td>%dn</td>
-                                    <td>$T("sort-Folder")</td>
+                                    <td></td>
                                 </tr>
                                 <tr>
                                     <td class="align-right"><b>$T('lowercase'):</b></td>
@@ -199,6 +201,7 @@
                             <input type="button" class="btn btn-default" onclick="movieSet('%title (%y)/%title (%y).%ext',' CD%1');movieExtraFolder(false)" value="$T('button-inFolders')" />
                             <input type="button" class="btn btn-default" onclick="movieSet('%title (%y).%ext',' CD%1');movieExtraFolder(true)" value="$T('button-noFolders')" />
                             <input type="button" class="btn btn-default" onclick="movieSet('%0decade/%title (%y).%ext',' CD%1');movieExtraFolder(true)" value="$T('decade')" />
+                            <input type="button" class="btn btn-default" onclick="movieSet('%dn.%ext')" value="$T('button-FileLikeFolder')" />
                         </div>
                     </div>
                     <div id="previewmovie" class="example">
@@ -210,7 +213,7 @@
                             <label class="config">$T('sortResult')</label> <span class="desc path" id="previewmovie-result">&nbsp;</span>
                         </div>
                     </div>
-                    <div class="field-pair">
+                    <div class="field-pair no-field-pair-bg">
                         <label class="config">$T('sort-legenda')</label>
                         <button type="button" class="btn btn-default patternKey" onclick="jQuery(this).hide(); jQuery('#Key2').show();"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span> $T('sort-legenda')</button>
                         <table id="Key2" class="Key">
@@ -263,9 +266,9 @@
                                     <td>$T('sort-File')</td>
                                 </tr>
                                 <tr>
-                                    <td class="align-right"><b>$T('orgDirname'):</b></td>
+                                    <td class="align-right"><b>$T('orgJobname'):</b></td>
                                     <td>%dn</td>
-                                    <td>$T("sort-Folder")</td>
+                                    <td></td>
                                 </tr>
                                 <tr>
                                     <td class="align-right"><b>$T('lowercase'):</b></td>
@@ -328,7 +331,9 @@
                         <div class="presets float-left">
                             <input type="button" class="btn btn-default" onclick="dateSet('%t/%t - %y-%0m-%0d - %desc.%ext')" value="$T('button-ShowNameF')" />
                             <input type="button" class="btn btn-default" onclick="dateSet('%y-%0m/%t - %y-%0m-%0d - %desc.%ext')" value="$T('button-YMF')" />
+                            <br>
                             <input type="button" class="btn btn-default" onclick="dateSet('%y-%0m-%0d/%t - %y-%0m-%0d - %desc.%ext')" value="$T('button-DailyF')" />
+                            <input type="button" class="btn btn-default" onclick="dateSet('%dn.%ext')" value="$T('button-FileLikeFolder')" />
                         </div>
                     </div>
                     <div id="previewdate" class="example">
@@ -340,7 +345,7 @@
                             <label class="config">$T('sortResult')</label> <span class="desc path" id="previewdate-result">&nbsp;</span>
                         </div>
                     </div>
-                    <div class="field-pair">
+                    <div class="field-pair no-field-pair-bg">
                         <label class="config">$T('sort-legenda')</label>
                         <button type="button" class="btn btn-default patternKey" onclick="jQuery(this).hide(); jQuery('#Key3').show();"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span> $T('sort-legenda')</button>
                         <table id="Key3" class="Key">
@@ -407,6 +412,11 @@
                                     <td>%fn</td>
                                     <td>$T('sort-File')</td>
                                 </tr>
+                                <tr>
+                                    <td class="align-right"><b>$T('orgJobname'):</b></td>
+                                    <td>%dn</td>
+                                    <td></td>
+                                </tr>
                                 <tr>
                                     <td class="align-right"><b>$T('lowercase'):</b></td>
                                     <td>{$T('TEXT')}</td>
@@ -487,7 +497,7 @@
                 \$.ajax({
                   type: "GET",
                   url: "../../tapi",
-                  data: {mode:'eval_sort', value: 'generic', name: \$('#moviesamplename').val(), title: \$moviesortstring, movieextra:  \$('#movieextra').val(), apikey: '$session', output: 'json' },
+                  data: {mode:'eval_sort', value: 'movie', name: \$('#moviesamplename').val(), title: \$moviesortstring, movieextra:  \$('#movieextra').val(), apikey: '$session', output: 'json' },
                   success: function(data){
                     \$('#previewmovie-result').removeClass("loading failure").html(data.result);
                   },

interfaces/Config/templates/config_switches.tmpl

@@ -3,9 +3,14 @@
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
+    <div class="padding alt section">
+        <label for="advanced-settings-button" class="form-control advanced-button ">
+            <input type="checkbox" id="advanced-settings-button" name="advanced-settings-button"> $T('button-advanced')
+        </label>
+    </div>
     <form action="saveSwitches" method="post" name="fullform" class="fullform" autocomplete="off">
         <input type="hidden" id="session" name="session" value="$session" />
-        <div class="section">
+        <div class="section advanced-settings">
             <div class="col2">
                 <h3>$T('swtag-server') <a href="$helpuri$help_uri#toc1" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->
@@ -67,12 +72,12 @@
                         <input type="number" name="propagation_delay" id="propagation_delay" value="$propagation_delay" /> <i>$T('minutes')</i>
                         <span class="desc">$T('explain-propagation_delay')</span>
                     </div>
-                    <div class="field-pair">
+                    <div class="field-pair advanced-settings">
                         <label class="config" for="top_only">$T('opt-top_only')</label>
                         <input type="checkbox" name="top_only" id="top_only" value="1" <!--#if int($top_only) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-top_only')</span>
                     </div>
-                    <div class="field-pair">
+                    <div class="field-pair advanced-settings">
                         <label class="config" for="pre_check">$T('opt-pre_check')</label>
                         <input type="checkbox" name="pre_check" id="pre_check" value="1" <!--#if int($pre_check) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-pre_check')</span>
@@ -104,7 +109,7 @@
                         </select>
                         <span class="desc">$T('explain-no_series_dupes')</span>
                     </div>
-                    <div class="field-pair">
+                    <div class="field-pair advanced-settings">
                         <label class="config" for="series_propercheck">$T('opt-series_propercheck')</label>
                         <input type="checkbox" name="series_propercheck" id="series_propercheck" value="1" <!--#if int($series_propercheck) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-series_propercheck')</span>
@@ -118,6 +123,11 @@
                         </select>
                         <span class="desc">$T('explain-pause_on_pwrar')</span>
                     </div>
+                    <div class="field-pair">
+                        <label class="config" for="unwanted_extensions">$T('opt-unwanted_extensions')</label>
+                        <input type="text" name="unwanted_extensions" id="unwanted_extensions" value="$unwanted_extensions"/>
+                        <span class="desc">$T('explain-unwanted_extensions')</span>
+                    </div>
                     <div class="field-pair">
                         <label class="config" for="action_on_unwanted_extensions">$T('opt-action_on_unwanted_extensions')</label>
                         <select name="action_on_unwanted_extensions" id="action_on_unwanted_extensions">
@@ -127,12 +137,7 @@
                         </select>
                         <span class="desc">$T('explain-action_on_unwanted_extensions')</span>
                     </div>
-                    <div class="field-pair">
-                        <label class="config" for="unwanted_extensions">$T('opt-unwanted_extensions')</label>
-                        <input type="text" name="unwanted_extensions" id="unwanted_extensions" value="$unwanted_extensions"/>
-                        <span class="desc">$T('explain-unwanted_extensions')</span>
-                    </div>
-                    <div class="field-pair">
+                    <div class="field-pair advanced-settings">
                         <label class="config" for="auto_sort">$T('opt-auto_sort')</label>
                         <input type="checkbox" name="auto_sort" id="auto_sort" value="1" <!--#if int($auto_sort) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-auto_sort')</span>
@@ -160,53 +165,53 @@
                         <input type="checkbox" name="pause_on_post_processing" id="pause_on_post_processing" value="1" <!--#if int($pause_on_post_processing) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-pause_on_post_processing')</span>
                     </div>
-                    <div class="field-pair">
+                    <div class="field-pair advanced-settings">
                         <label class="config" for="enable_all_par">$T('opt-enable_all_par')</label>
                         <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">
+                    <div class="field-pair advanced-settings">
                         <label class="config" for="par_option">$T('opt-par_option')</label>
                         <input type="text" name="par_option" id="par_option" value="$par_option" />
                         <span class="desc">$T('explain-par_option')</span>
                     </div>
-                    <div class="field-pair">
+                    <div class="field-pair advanced-settings">
                         <label class="config" for="sfv_check">$T('opt-sfv_check')</label>
                         <input type="checkbox" name="sfv_check" id="sfv_check" value="1" <!--#if int($sfv_check) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-sfv_check')</span>
                     </div>
-                    <div class="field-pair">
+                    <div class="field-pair advanced-settings">
                         <label class="config" for="safe_postproc">$T('opt-safe_postproc')</label>
                         <input type="checkbox" name="safe_postproc" id="safe_postproc" value="1" <!--#if int($safe_postproc) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-safe_postproc')</span>
                     </div>
-                    <div class="field-pair">
+                    <div class="field-pair advanced-settings">
                         <label class="config" for="enable_recursive">$T('opt-enable_recursive')</label>
                         <input type="checkbox" name="enable_recursive" id="enable_recursive" value="1" <!--#if int($enable_recursive) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-enable_recursive')</span>
                     </div>
-                    <div class="field-pair">
+                    <div class="field-pair advanced-settings">
                         <label class="config" for="flat_unpack">$T('opt-flat_unpack')</label>
                         <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">
+                    <div class="field-pair advanced-settings">
                         <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 ""#--> />
                         <span class="desc">$T('explain-script_can_fail')</span>
                     </div>
-                    <div class="field-pair">
+                    <div class="field-pair advanced-settings">
                         <label class="config" for="new_nzb_on_failure">$T('opt-new_nzb_on_failure')</label>
                         <input type="checkbox" name="new_nzb_on_failure" id="new_nzb_on_failure" value="1" <!--#if int($new_nzb_on_failure) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-new_nzb_on_failure')</span>
                     </div>
                     <!--#if not $nt#-->
-                    <div class="field-pair <!--#if not $have_nice then "disabled" else "" #-->">
+                    <div class="field-pair advanced-settings <!--#if not $have_nice then "disabled" else "" #-->">
                         <label class="config" for="nice">$T('opt-nice')</label>
                         <input type="text" name="nice" id="nice" value="$nice" <!--#if not $have_nice then 'readonly="readonly" disabled="disabled"' else "" #--> />
                         <span class="desc">$T('explain-nice')</span>
                     </div>
-                    <div class="field-pair <!--#if not $have_ionice then "disabled" else "" #-->">
+                    <div class="field-pair advanced-settings <!--#if not $have_ionice then "disabled" else "" #-->">
                         <label class="config" for="ionice">$T('opt-ionice')</label>
                         <input type="text" name="ionice" id="ionice" value="$ionice" <!--#if not $have_ionice then 'readonly="readonly" disabled="disabled"' else "" #--> />
                         <span class="desc">$T('explain-ionice')</span>
@@ -217,7 +222,7 @@
                         <input type="checkbox" name="ignore_samples" id="ignore_samples" value="1" <!--#if int($ignore_samples) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-ignore_samples') $T('igsam-del').</span>
                     </div>
-                    <div class="field-pair">
+                    <div class="field-pair advanced-settings">
                         <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').replace('. ', '.<br/>')</span>
@@ -246,7 +251,7 @@
                 </fieldset>
             </div><!-- /col1 -->
         </div><!-- /section -->
-        <div class="section">
+        <div class="section advanced-settings">
             <div class="col2">
                 <h3>$T('swtag-naming') <a href="$helpuri$help_uri#toc4" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
             </div><!-- /col2 -->

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

@@ -23,16 +23,32 @@ body {
     overflow: visible;
     border: 1px solid #dfdede;
     background-color: #FFF;
-    border: 1px solid rgba(0, 0, 0, 0.2);
     width: 100%
 }
-.section, .Servers form, #addFeed, #addFeedContent {
+.advanced-button {
+    float: right;
+    width: auto;
+    margin: 0 4px 0px 0px;
+    font-size: 13px;
+    color: inherit;
+    height: auto;
+    padding-bottom: 5px;
+}
+#advanced-settings-button {
+    float: left;
+    margin: 2px 7px 0px 0px;
+}
+.advanced-buttonSeperator {
+    width: 1px;
+    height: 34px;
+    background-color: #dfdede;
+    float: right;
+    margin: 0px 10px;
+}
+.section, #addFeed, #addFeedContent {
     border-bottom: 1px solid #dfdede;
     overflow: auto;
 }
-.section:last-child, .Servers form:last-child {
-    border: 0;
-}
 .col2 {
     z-index: 10;
     float: left;
@@ -150,13 +166,13 @@ input[type="checkbox"]+.desc {
     overflow: hidden;
     min-width: 555px;
 }
-.field-pair:nth-child(odd),
 .Key tr:nth-child(odd),
 .tab-pane tr:nth-child(odd),
 .even {
     background-color: #F8F8F8;
 }
-.field-pair:last-child {
+.field-pair:last-child,
+.no-field-pair-bg {
     background-color: transparent;
 }
 .alt,
@@ -1078,9 +1094,10 @@ input[type="checkbox"] {
 }
 
 .host-warning {
-    color: #404040;
-    margin-left: 7px;
-    top: 3px;
+    color: #F0AD4E;
+    margin-left: 13px;
+    top: 5px;
+    font-size: 1.2em;
 }
 
 .fileBrowser .glyphicon {
@@ -1221,7 +1238,8 @@ input[type="checkbox"] {
     }
 
     .Servers .server-chart,
-    .Servers .chart-selector-container {
+    .Servers .chart-selector-container,
+    .Servers .advanced-buttonSeperator {
         display: none;
     }
 

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

@@ -19,7 +19,7 @@ var da = moment.defineLocale('da', {
     longDateFormat : {
         LT : 'HH:mm',
         LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
+        L : 'DD.MM.YYYY',
         LL : 'D. MMMM YYYY',
         LLL : 'D. MMMM YYYY HH:mm',
         LLLL : 'dddd [d.] D. MMMM YYYY [kl.] HH:mm'

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

@@ -28,7 +28,7 @@ function processRelativeTime(number, withoutSuffix, key, isFuture) {
 
 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('_'),
+    monthsShort : 'Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'),
     monthsParseExact : true,
     weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
     weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),

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

@@ -13,6 +13,9 @@
 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 monthsParse = [/^ene/i, /^feb/i, /^mar/i, /^abr/i, /^may/i, /^jun/i, /^jul/i, /^ago/i, /^sep/i, /^oct/i, /^nov/i, /^dic/i];
+var monthsRegex = /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i;
+
 var es = moment.defineLocale('es', {
     months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
     monthsShort : function (m, format) {
@@ -24,7 +27,13 @@ var es = moment.defineLocale('es', {
             return monthsShortDot[m.month()];
         }
     },
-    monthsParseExact : true,
+    monthsRegex : monthsRegex,
+    monthsShortRegex : monthsRegex,
+    monthsStrictRegex : /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,
+    monthsShortStrictRegex : /^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,
+    monthsParse : monthsParse,
+    longMonthsParse : monthsParse,
+    shortMonthsParse : monthsParse,
     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('_'),

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

@@ -0,0 +1,99 @@
+//! moment.js locale configuration
+//! locale : Hebrew [he]
+//! author : Tomer Cohen : https://github.com/tomer
+//! author : Moshe Simantov : https://github.com/DevelopmentIL
+//! author : Tal Ater : https://github.com/TalAter
+
+;(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';
+
+
+var he = moment.defineLocale('he', {
+    months : 'ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר'.split('_'),
+    monthsShort : 'ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳'.split('_'),
+    weekdays : 'ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת'.split('_'),
+    weekdaysShort : 'א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳'.split('_'),
+    weekdaysMin : 'א_ב_ג_ד_ה_ו_ש'.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',
+        l : 'D/M/YYYY',
+        ll : 'D MMM YYYY',
+        lll : 'D MMM YYYY HH:mm',
+        llll : 'ddd, D MMM YYYY HH:mm'
+    },
+    calendar : {
+        sameDay : '[היום ב־]LT',
+        nextDay : '[מחר ב־]LT',
+        nextWeek : 'dddd [בשעה] LT',
+        lastDay : '[אתמול ב־]LT',
+        lastWeek : '[ביום] dddd [האחרון בשעה] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'בעוד %s',
+        past : 'לפני %s',
+        s : 'מספר שניות',
+        m : 'דקה',
+        mm : '%d דקות',
+        h : 'שעה',
+        hh : function (number) {
+            if (number === 2) {
+                return 'שעתיים';
+            }
+            return number + ' שעות';
+        },
+        d : 'יום',
+        dd : function (number) {
+            if (number === 2) {
+                return 'יומיים';
+            }
+            return number + ' ימים';
+        },
+        M : 'חודש',
+        MM : function (number) {
+            if (number === 2) {
+                return 'חודשיים';
+            }
+            return number + ' חודשים';
+        },
+        y : 'שנה',
+        yy : function (number) {
+            if (number === 2) {
+                return 'שנתיים';
+            } else if (number % 10 === 0 && number !== 10) {
+                return number + ' שנה';
+            }
+            return number + ' שנים';
+        }
+    },
+    meridiemParse: /אחה"צ|לפנה"צ|אחרי הצהריים|לפני הצהריים|לפנות בוקר|בבוקר|בערב/i,
+    isPM : function (input) {
+        return /^(אחה"צ|אחרי הצהריים|בערב)$/.test(input);
+    },
+    meridiem : function (hour, minute, isLower) {
+        if (hour < 5) {
+            return 'לפנות בוקר';
+        } else if (hour < 10) {
+            return 'בבוקר';
+        } else if (hour < 12) {
+            return isLower ? 'לפנה"צ' : 'לפני הצהריים';
+        } else if (hour < 18) {
+            return isLower ? 'אחה"צ' : 'אחרי הצהריים';
+        } else {
+            return 'בערב';
+        }
+    }
+});
+
+return he;
+
+})));

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

@@ -40,7 +40,7 @@ var nl = moment.defineLocale('nl', {
 
     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('_'),
+    weekdaysMin : 'zo_ma_di_wo_do_vr_za'.split('_'),
     weekdaysParseExact : true,
     longDateFormat : {
         LT : 'HH:mm',

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

@@ -63,7 +63,24 @@ var pl = moment.defineLocale('pl', {
     calendar : {
         sameDay: '[Dziś o] LT',
         nextDay: '[Jutro o] LT',
-        nextWeek: '[W] dddd [o] LT',
+        nextWeek: function () {
+            switch (this.day()) {
+                case 0:
+                    return '[W niedzielę o] LT';
+
+                case 2:
+                    return '[We wtorek o] LT';
+
+                case 3:
+                    return '[W środę o] LT';
+
+                case 6:
+                    return '[W sobotę o] LT';
+
+                default:
+                    return '[W] dddd [o] LT';
+            }
+        },
         lastDay: '[Wczoraj o] LT',
         lastWeek: function () {
             switch (this.day()) {

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

@@ -11,8 +11,8 @@
 
 
 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('_'),
+    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('_'),
@@ -41,6 +41,7 @@ var ptBr = moment.defineLocale('pt-br', {
         future : 'em %s',
         past : '%s atrás',
         s : 'poucos segundos',
+        ss : '%d segundos',
         m : 'um minuto',
         mm : '%d minutos',
         h : 'uma hora',

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

@@ -174,7 +174,7 @@ var ru = moment.defineLocale('ru', {
     },
     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.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
     }
 });
 

interfaces/smpl/templates/main.tmpl

@@ -79,7 +79,6 @@
     input = input.replace(/%0e/g,'05');
     input = input.replace(/%e/g,'5');
     input = input.replace(/%fn/g,'$T("sort-File")');
-    input = input.replace(/%dn/g,'$T("sort-Folder")');
 
   document.getElementById('previewtv').innerHTML = getOutput(input);
 }

po/main/SABnzbd.pot

@@ -12,7 +12,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ASCII\n"
 "Content-Transfer-Encoding: 7bit\n"
-"POT-Creation-Date: 2017-11-17 22:23+W. Europe Standard Time\n"
+"POT-Creation-Date: 2017-12-06 10:56+W. Europe Standard Time\n"
 "Generated-By: pygettext.py 1.5\n"
 
 
@@ -706,7 +706,7 @@ msgstr ""
 msgid "m"
 msgstr ""
 
-#: sabnzbd/misc.py [Error message] # sabnzbd/tvsort.py [Error message]
+#: sabnzbd/misc.py [Error message] # sabnzbd/sorting.py [Error message]
 msgid "Cannot create directory %s"
 msgstr ""
 
@@ -3858,6 +3858,10 @@ msgstr ""
 msgid "S01E05 Episode Folder"
 msgstr ""
 
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr ""
@@ -3927,7 +3931,7 @@ msgid "Original Filename"
 msgstr ""
 
 #: sabnzbd/skintext.py
-msgid "Original Foldername"
+msgid "Original Job Name"
 msgstr ""
 
 #: sabnzbd/skintext.py
@@ -3946,10 +3950,6 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: sabnzbd/skintext.py
-msgid "folder"
-msgstr ""
-
 #: sabnzbd/skintext.py
 msgid "Sort String"
 msgstr ""
@@ -4638,16 +4638,16 @@ msgstr ""
 msgid "Don't have a usenet provider? We recommend trying %s."
 msgstr ""
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Error getting TV info (%s)"
 msgstr ""
 
-#: sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message]
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename: %s to %s"
 msgstr ""
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename similar file: %s to %s"
 msgstr ""
 

po/main/da.po

@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-11-20 21:21+0000\n"
+"POT-Creation-Date: 2017-12-06 10:30+0000\n"
 "PO-Revision-Date: 2017-10-27 21:53+0000\n"
 "Last-Translator: Søren <Unknown>\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: 2017-11-21 05:47+0000\n"
-"X-Generator: Launchpad (build 18505)\n"
+"X-Launchpad-Export-Date: 2017-12-07 05:30+0000\n"
+"X-Generator: Launchpad (build 18511)\n"
 
 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -773,7 +773,7 @@ msgstr "h"
 msgid "m"
 msgstr "m"
 
-#: sabnzbd/misc.py [Error message] # sabnzbd/tvsort.py [Error message]
+#: sabnzbd/misc.py [Error message] # sabnzbd/sorting.py [Error message]
 msgid "Cannot create directory %s"
 msgstr "Kan ikke oprette mappe %s"
 
@@ -4146,6 +4146,10 @@ msgstr "1x05 Episodemappe"
 msgid "S01E05 Episode Folder"
 msgstr "S01E05 Episodemappe"
 
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr "Titel"
@@ -4215,8 +4219,8 @@ msgid "Original Filename"
 msgstr "Originalfilnavn"
 
 #: sabnzbd/skintext.py
-msgid "Original Foldername"
-msgstr "Orginal Mappenavn"
+msgid "Original Job Name"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Lower Case"
@@ -4234,10 +4238,6 @@ msgstr "tekst"
 msgid "file"
 msgstr "fil"
 
-#: sabnzbd/skintext.py
-msgid "folder"
-msgstr "mappe"
-
 #: sabnzbd/skintext.py
 msgid "Sort String"
 msgstr "Sorteringsstreng"
@@ -4960,16 +4960,16 @@ msgstr ""
 msgid "Don't have a usenet provider? We recommend trying %s."
 msgstr "Har du ingen usenet leverandør? Vi anbefaler at prøve %s."
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Error getting TV info (%s)"
 msgstr "Det lykkedes ikke at hente TV info (%s)"
 
-#: sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message]
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename: %s to %s"
 msgstr "Det lykkedes ikke at omdøbe: %s til %s"
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename similar file: %s to %s"
 msgstr "Kunne ikke omdøbe lignende fil: %s til %s"
 
@@ -5414,6 +5414,12 @@ msgstr "URL hentning mislykkedes; %s"
 #~ msgid "Show times in AM/PM notation (does not affect scheduler)."
 #~ msgstr "Vis tider i AM / PM notation (påvirker ikke skemalægger)."
 
+#~ msgid "folder"
+#~ msgstr "mappe"
+
+#~ msgid "Original Foldername"
+#~ msgstr "Orginal Mappenavn"
+
 #~ msgid "Groups / Indexer tags"
 #~ msgstr "Gruppe / Index tags"
 

po/main/de.po

@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-11-20 21:21+0000\n"
+"POT-Creation-Date: 2017-12-06 10:30+0000\n"
 "PO-Revision-Date: 2017-10-10 19:03+0000\n"
 "Last-Translator: Robin Munkittrick <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: 2017-11-21 05:48+0000\n"
-"X-Generator: Launchpad (build 18505)\n"
+"X-Launchpad-Export-Date: 2017-12-07 05:30+0000\n"
+"X-Generator: Launchpad (build 18511)\n"
 
 #: SABnzbd.py [Error message]
 msgid "MultiPar binary... NOT found!"
@@ -794,7 +794,7 @@ msgstr "h"
 msgid "m"
 msgstr "m"
 
-#: sabnzbd/misc.py [Error message] # sabnzbd/tvsort.py [Error message]
+#: sabnzbd/misc.py [Error message] # sabnzbd/sorting.py [Error message]
 msgid "Cannot create directory %s"
 msgstr "Verzeichnis %s konnte nicht angelegt werden"
 
@@ -4254,6 +4254,10 @@ msgstr "1x05 Episoden-Ordner"
 msgid "S01E05 Episode Folder"
 msgstr "S01E05 Episoden-Ordner"
 
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr "Titel"
@@ -4323,8 +4327,8 @@ msgid "Original Filename"
 msgstr "Ursprünglicher Dateiname"
 
 #: sabnzbd/skintext.py
-msgid "Original Foldername"
-msgstr "Ursprünglicher Ordnername"
+msgid "Original Job Name"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Lower Case"
@@ -4342,10 +4346,6 @@ msgstr "text"
 msgid "file"
 msgstr "Datei"
 
-#: sabnzbd/skintext.py
-msgid "folder"
-msgstr "Ordner"
-
 #: sabnzbd/skintext.py
 msgid "Sort String"
 msgstr "Sortieranweisung"
@@ -5072,16 +5072,16 @@ msgstr ""
 msgid "Don't have a usenet provider? We recommend trying %s."
 msgstr "Wenn Sie noch keinen Usenet-Provider haben, empfehlen wir Ihnen %s."
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Error getting TV info (%s)"
 msgstr "Fehler beim Abrufen der TV-Informationen: %s"
 
-#: sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message]
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename: %s to %s"
 msgstr "Umbenennen von %s nach %s fehlgeschlagen."
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename similar file: %s to %s"
 msgstr "Umbenennen der gleichen Datei von %s nach %s fehlgeschlagen."
 
@@ -5565,6 +5565,12 @@ msgstr "Abrufen der URL fehlgeschlagen; %s"
 #~ msgid "Show times in AM/PM notation (does not affect scheduler)."
 #~ msgstr "Zeiten in der AM/PM-Notation anzeigen (betrifft die Regeln nicht)."
 
+#~ msgid "folder"
+#~ msgstr "Ordner"
+
+#~ msgid "Original Foldername"
+#~ msgstr "Ursprünglicher Ordnername"
+
 #~ msgid "Groups / Indexer tags"
 #~ msgstr "Gruppen/Indexer-Tags"
 

po/main/en.po

@@ -69,9 +69,6 @@ msgstr "Replace spaces in folder name"
 msgid "Replace dots in Foldername"
 msgstr "Replace dots in folder name"
 
-msgid "Original Foldername"
-msgstr "Original folder name"
-
 msgid "How long or untill when do you want to pause? (in English!)"
 msgstr "How long or until when do you want to pause? (in English!)"
 
@@ -119,3 +116,7 @@ msgstr "Downloads will not be unpacked."
 
 msgid "Seperate multiple URLs by a comma"
 msgstr "Separate multiple URLs with a comma"
+
+msgid "Advanced"
+msgstr "Advanced Settings"
+

po/main/es.po

@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-11-20 21:21+0000\n"
+"POT-Creation-Date: 2017-12-06 10:30+0000\n"
 "PO-Revision-Date: 2017-06-22 07:07+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-11-21 05:48+0000\n"
-"X-Generator: Launchpad (build 18505)\n"
+"X-Launchpad-Export-Date: 2017-12-07 05:31+0000\n"
+"X-Generator: Launchpad (build 18511)\n"
 
 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -772,7 +772,7 @@ msgstr "h"
 msgid "m"
 msgstr "m"
 
-#: sabnzbd/misc.py [Error message] # sabnzbd/tvsort.py [Error message]
+#: sabnzbd/misc.py [Error message] # sabnzbd/sorting.py [Error message]
 msgid "Cannot create directory %s"
 msgstr "No se pudo crear el directorio %s"
 
@@ -4166,6 +4166,10 @@ msgstr "1x05 Episodio Directorio"
 msgid "S01E05 Episode Folder"
 msgstr "S01E05 Episodio Directorio"
 
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr "Título"
@@ -4235,8 +4239,8 @@ msgid "Original Filename"
 msgstr "Nombre fichero original"
 
 #: sabnzbd/skintext.py
-msgid "Original Foldername"
-msgstr "Nombre directorio original"
+msgid "Original Job Name"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Lower Case"
@@ -4254,10 +4258,6 @@ msgstr "texto"
 msgid "file"
 msgstr "archivo"
 
-#: sabnzbd/skintext.py
-msgid "folder"
-msgstr "carpeta"
-
 #: sabnzbd/skintext.py
 msgid "Sort String"
 msgstr "Ordenar cadena"
@@ -4983,16 +4983,16 @@ msgstr ""
 msgid "Don't have a usenet provider? We recommend trying %s."
 msgstr "¿No tienes proveedor de Usenet? Nosotros recomendamos probar %s."
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Error getting TV info (%s)"
 msgstr "Error al recuperar info de la serie (%s)"
 
-#: sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message]
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename: %s to %s"
 msgstr "Error al renombrar: %s a %s"
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename similar file: %s to %s"
 msgstr "Error al renombrar ficheros similares: %s a %s"
 
@@ -5291,6 +5291,9 @@ msgstr "Error al recuperar la URL; %s"
 #~ msgid "Email Options"
 #~ msgstr "Opciones de e-mail"
 
+#~ msgid "folder"
+#~ msgstr "carpeta"
+
 #~ msgid "Are you sure you want to delete"
 #~ msgstr "¿Está seguro de querer borrar?"
 
@@ -5466,6 +5469,9 @@ msgstr "Error al recuperar la URL; %s"
 #~ msgid "Enable if downloads are not put in their own folders."
 #~ msgstr "Habilitar si las descargas no quedan en sus propios directorios."
 
+#~ msgid "Original Foldername"
+#~ msgstr "Nombre directorio original"
+
 #~ msgid "Enable sorting and renaming of date named files."
 #~ msgstr "Habilitar ordenación y renombrado de nombres de ficheros con fechas."
 

po/main/fi.po

@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-11-20 21:21+0000\n"
+"POT-Creation-Date: 2017-12-06 10:30+0000\n"
 "PO-Revision-Date: 2017-06-22 07:07+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-11-21 05:48+0000\n"
-"X-Generator: Launchpad (build 18505)\n"
+"X-Launchpad-Export-Date: 2017-12-07 05:30+0000\n"
+"X-Generator: Launchpad (build 18511)\n"
 
 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -768,7 +768,7 @@ msgstr "t"
 msgid "m"
 msgstr "m"
 
-#: sabnzbd/misc.py [Error message] # sabnzbd/tvsort.py [Error message]
+#: sabnzbd/misc.py [Error message] # sabnzbd/sorting.py [Error message]
 msgid "Cannot create directory %s"
 msgstr "Ei voi luoda kansiota %s"
 
@@ -4156,6 +4156,10 @@ msgstr "1x05 Jakso kansio"
 msgid "S01E05 Episode Folder"
 msgstr "S01E05 Jakso kansio"
 
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr "Nimi"
@@ -4225,8 +4229,8 @@ msgid "Original Filename"
 msgstr "Alkuperäinen tiedostonimi"
 
 #: sabnzbd/skintext.py
-msgid "Original Foldername"
-msgstr "Alkuperäinen kansionimi"
+msgid "Original Job Name"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Lower Case"
@@ -4244,10 +4248,6 @@ msgstr "teksti"
 msgid "file"
 msgstr "tiedosto"
 
-#: sabnzbd/skintext.py
-msgid "folder"
-msgstr "kansio"
-
 #: sabnzbd/skintext.py
 msgid "Sort String"
 msgstr "Lajittelumerkkijono"
@@ -4973,16 +4973,16 @@ msgstr ""
 msgid "Don't have a usenet provider? We recommend trying %s."
 msgstr "Eikö sinulla ole usenet tarjoajaa? Suosittelemme kokeilemaan %s."
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Error getting TV info (%s)"
 msgstr "Virhe noudettaessa TV tietoja (%s)"
 
-#: sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message]
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename: %s to %s"
 msgstr "Virhe uudelleennimettäessä: %s %s"
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename similar file: %s to %s"
 msgstr "Samankaltaisen tiedoston uudelleennimeäminen epäonnistui: %s %s"
 
@@ -5401,6 +5401,12 @@ msgstr "Osoitteen nouto epäonnistui; %s"
 #~ msgstr ""
 #~ "Kansio jossa ovat käyttäjän skriptit joita käytetään jälkikäsittelyssä."
 
+#~ msgid "Original Foldername"
+#~ msgstr "Alkuperäinen kansionimi"
+
+#~ msgid "folder"
+#~ msgstr "kansio"
+
 #~ msgid "Hour:Min"
 #~ msgstr "Tunti:Min"
 

po/main/fr.po

@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-11-20 21:21+0000\n"
-"PO-Revision-Date: 2017-11-15 19:29+0000\n"
+"POT-Creation-Date: 2017-12-06 10:30+0000\n"
+"PO-Revision-Date: 2017-12-06 19:46+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: 2017-11-21 05:48+0000\n"
-"X-Generator: Launchpad (build 18505)\n"
+"X-Launchpad-Export-Date: 2017-12-07 05:30+0000\n"
+"X-Generator: Launchpad (build 18511)\n"
 
 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -800,7 +800,7 @@ msgstr "h"
 msgid "m"
 msgstr "m"
 
-#: sabnzbd/misc.py [Error message] # sabnzbd/tvsort.py [Error message]
+#: sabnzbd/misc.py [Error message] # sabnzbd/sorting.py [Error message]
 msgid "Cannot create directory %s"
 msgstr "Impossible de créer le dossier %s"
 
@@ -4270,6 +4270,10 @@ msgstr "1x05 Dossier Épisode"
 msgid "S01E05 Episode Folder"
 msgstr "S01E05 Dossier Épisode"
 
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
+msgstr "Nom de la tâche en tant que nom de fichier"
+
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr "Titre"
@@ -4339,8 +4343,8 @@ msgid "Original Filename"
 msgstr "Nom de fichier originel"
 
 #: sabnzbd/skintext.py
-msgid "Original Foldername"
-msgstr "Nom du dossier originel"
+msgid "Original Job Name"
+msgstr "Nom d'origine de la tâche"
 
 #: sabnzbd/skintext.py
 msgid "Lower Case"
@@ -4358,10 +4362,6 @@ msgstr "texte"
 msgid "file"
 msgstr "fichier"
 
-#: sabnzbd/skintext.py
-msgid "folder"
-msgstr "dossier"
-
 #: sabnzbd/skintext.py
 msgid "Sort String"
 msgstr "Chaîne de caractères de tri"
@@ -5093,16 +5093,16 @@ msgid "Don't have a usenet provider? We recommend trying %s."
 msgstr ""
 "Vous n'avez pas de fournisseur usenet? Nous vous recommendons d'essayer %s."
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Error getting TV info (%s)"
 msgstr "Erreur lors de l'obtention des information TV (%s)"
 
-#: sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message]
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename: %s to %s"
 msgstr "Échec du renommage : %s en %s"
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename similar file: %s to %s"
 msgstr "Impossible de renommer le fichier similaire : %s en %s"
 
@@ -5437,6 +5437,9 @@ msgstr "Échec de récupération de l'URL ; %s"
 #~ msgid "Enable sorting and renaming of date named files."
 #~ msgstr "Active le tri et le renommage des fichiers par date."
 
+#~ msgid "folder"
+#~ msgstr "dossier"
+
 #~ msgid "Set Pause Interval"
 #~ msgstr "Intervalle de pause"
 
@@ -5702,6 +5705,9 @@ msgstr "Échec de récupération de l'URL ; %s"
 #~ msgid "Groups / Indexer tags"
 #~ msgstr "balises Groupes / Indexeur"
 
+#~ msgid "Original Foldername"
+#~ msgstr "Nom du dossier originel"
+
 #~ msgid ""
 #~ "After SABnzbd has finished restarting you will be able to access it at the "
 #~ "following location: %s"

po/main/he.po

@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-11-20 21:21+0000\n"
-"PO-Revision-Date: 2017-11-15 20:06+0000\n"
+"POT-Creation-Date: 2017-12-06 10:30+0000\n"
+"PO-Revision-Date: 2017-12-06 19:50+0000\n"
 "Last-Translator: ION IL <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-11-21 05:48+0000\n"
-"X-Generator: Launchpad (build 18505)\n"
+"X-Launchpad-Export-Date: 2017-12-07 05:30+0000\n"
+"X-Generator: Launchpad (build 18511)\n"
 
 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -760,7 +760,7 @@ msgstr "ש"
 msgid "m"
 msgstr "ד"
 
-#: sabnzbd/misc.py [Error message] # sabnzbd/tvsort.py [Error message]
+#: sabnzbd/misc.py [Error message] # sabnzbd/sorting.py [Error message]
 msgid "Cannot create directory %s"
 msgstr "%s לא יכול ליצור את הספרייה"
 
@@ -4119,6 +4119,10 @@ msgstr "1x05 תיקיית פרק"
 msgid "S01E05 Episode Folder"
 msgstr "S01E05 תיקיית פרק"
 
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
+msgstr "שם עבודה בתור שם קובץ"
+
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr "כותר"
@@ -4188,8 +4192,8 @@ msgid "Original Filename"
 msgstr "שם מקורי של קובץ"
 
 #: sabnzbd/skintext.py
-msgid "Original Foldername"
-msgstr "שם קובץ מקורי"
+msgid "Original Job Name"
+msgstr "שם עבודה מקורי"
 
 #: sabnzbd/skintext.py
 msgid "Lower Case"
@@ -4207,10 +4211,6 @@ msgstr "text"
 msgid "file"
 msgstr "קובץ"
 
-#: sabnzbd/skintext.py
-msgid "folder"
-msgstr "תיקייה"
-
 #: sabnzbd/skintext.py
 msgid "Sort String"
 msgstr "מיין מחרוזת"
@@ -4930,16 +4930,16 @@ msgstr ""
 msgid "Don't have a usenet provider? We recommend trying %s."
 msgstr ".%s אנו ממליצים לנסות את ?usenet אין לך ספק"
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Error getting TV info (%s)"
 msgstr "(%s) שגיאה בהשגת מידע טלוויזיה"
 
-#: sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message]
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename: %s to %s"
 msgstr "%s אל %s:נכשל בשינוי שם"
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename similar file: %s to %s"
 msgstr "%s אל %s :נכשל בשינוי שם של קובץ דומה"
 
@@ -4983,6 +4983,9 @@ msgstr "%s ;משיכת כתובת נכשלה"
 #~ msgid "Skip"
 #~ msgstr "דלג"
 
+#~ msgid "folder"
+#~ msgstr "תיקייה"
+
 #~ msgid "OK"
 #~ msgstr "אישור"
 
@@ -5011,6 +5014,9 @@ msgstr "%s ;משיכת כתובת נכשלה"
 #~ "Replace illegal characters in folder names by equivalents (otherwise remove)."
 #~ msgstr ".(החלף תווים בלתי חוקיים בשמות תיקיות בשווי ערך (אחרת יימחקו"
 
+#~ msgid "Original Foldername"
+#~ msgstr "שם קובץ מקורי"
+
 #~ msgid "Folder \"%s\" does not exist"
 #~ msgstr "אינה קיימת \"%s\" התיקייה"
 

po/main/nb.po

@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-11-20 21:21+0000\n"
+"POT-Creation-Date: 2017-12-06 10:30+0000\n"
 "PO-Revision-Date: 2017-09-03 14:07+0000\n"
 "Last-Translator: Steffen Bærø <steffen.baro@gmail.com>\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: 2017-11-21 05:48+0000\n"
-"X-Generator: Launchpad (build 18505)\n"
+"X-Launchpad-Export-Date: 2017-12-07 05:31+0000\n"
+"X-Generator: Launchpad (build 18511)\n"
 
 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -764,7 +764,7 @@ msgstr "h"
 msgid "m"
 msgstr "m"
 
-#: sabnzbd/misc.py [Error message] # sabnzbd/tvsort.py [Error message]
+#: sabnzbd/misc.py [Error message] # sabnzbd/sorting.py [Error message]
 msgid "Cannot create directory %s"
 msgstr "Kan ikke opprette mappe %s"
 
@@ -4112,6 +4112,10 @@ msgstr "1x05 Episodemappe"
 msgid "S01E05 Episode Folder"
 msgstr "S01E05 Episodemappe"
 
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr "Tittel"
@@ -4181,8 +4185,8 @@ msgid "Original Filename"
 msgstr "Originalfilnavn"
 
 #: sabnzbd/skintext.py
-msgid "Original Foldername"
-msgstr "Originalt mappenavn"
+msgid "Original Job Name"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Lower Case"
@@ -4200,10 +4204,6 @@ msgstr "tekst"
 msgid "file"
 msgstr "fil"
 
-#: sabnzbd/skintext.py
-msgid "folder"
-msgstr "mappe"
-
 #: sabnzbd/skintext.py
 msgid "Sort String"
 msgstr "Sorteringsstreng"
@@ -4925,16 +4925,16 @@ msgstr ""
 msgid "Don't have a usenet provider? We recommend trying %s."
 msgstr "Har du ikke noen usenet leverandør? Vi anbefaler å prøve %s."
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Error getting TV info (%s)"
 msgstr "Kunne ikke hente TV info (%s)"
 
-#: sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message]
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename: %s to %s"
 msgstr "Kunne ikke endre navn fra: %s til %s"
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename similar file: %s to %s"
 msgstr "Kunne ikke endre navn på lik fil: %s til %s"
 
@@ -5449,6 +5449,9 @@ msgstr "URL henting mislyktes; %s"
 #~ msgid "Open Source URL"
 #~ msgstr "Åpen kildekode URL"
 
+#~ msgid "Original Foldername"
+#~ msgstr "Originalt mappenavn"
+
 #~ msgid "Groups / Indexer tags"
 #~ msgstr "Grupper / Indeks etiketter"
 
@@ -5514,3 +5517,6 @@ msgstr "URL henting mislyktes; %s"
 #~ msgstr ""
 #~ "Send automatisk beregnet valideringsresultater for nedlastinger til "
 #~ "indekserer."
+
+#~ msgid "folder"
+#~ msgstr "mappe"

po/main/nl.po

@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-11-20 21:21+0000\n"
-"PO-Revision-Date: 2017-11-01 09:08+0000\n"
+"POT-Creation-Date: 2017-12-06 10:30+0000\n"
+"PO-Revision-Date: 2017-12-08 10: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: 2017-11-21 05:48+0000\n"
-"X-Generator: Launchpad (build 18505)\n"
+"X-Launchpad-Export-Date: 2017-12-09 05:32+0000\n"
+"X-Generator: Launchpad (build 18511)\n"
 
 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -789,7 +789,7 @@ msgstr "h"
 msgid "m"
 msgstr "m"
 
-#: sabnzbd/misc.py [Error message] # sabnzbd/tvsort.py [Error message]
+#: sabnzbd/misc.py [Error message] # sabnzbd/sorting.py [Error message]
 msgid "Cannot create directory %s"
 msgstr "Niet mogelijk directory %s aan te maken"
 
@@ -4214,6 +4214,10 @@ msgstr "1x05 Aflevering-map"
 msgid "S01E05 Episode Folder"
 msgstr "S01E05 Aflevering-map"
 
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
+msgstr "Downloadnaam als Bestandsnaam"
+
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr "Titel"
@@ -4283,8 +4287,8 @@ msgid "Original Filename"
 msgstr "Originele bestandsnaam"
 
 #: sabnzbd/skintext.py
-msgid "Original Foldername"
-msgstr "Oorspronkelijke mapnaam"
+msgid "Original Job Name"
+msgstr "Originele Downloadnaam"
 
 #: sabnzbd/skintext.py
 msgid "Lower Case"
@@ -4302,10 +4306,6 @@ msgstr "tekst"
 msgid "file"
 msgstr "bestand"
 
-#: sabnzbd/skintext.py
-msgid "folder"
-msgstr "map"
-
 #: sabnzbd/skintext.py
 msgid "Sort String"
 msgstr "Sorteertekst"
@@ -4659,6 +4659,8 @@ msgid ""
 "All usernames, passwords and API-keys are automatically removed from the log "
 "and the included copy of your settings."
 msgstr ""
+"Alle gebruikersnamen, wachtwoorden en API-sleutels worden automatisch "
+"verwijderd uit het logbestand en de bijgevoegde kopie van je instellingen."
 
 #: sabnzbd/skintext.py
 msgid "Sort by Age <small>Oldest&rarr;Newest</small>"
@@ -5027,16 +5029,16 @@ msgstr ""
 msgid "Don't have a usenet provider? We recommend trying %s."
 msgstr "Heb je nog geen Usenet provider? Wij bevelen %s aan."
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Error getting TV info (%s)"
 msgstr "Fout bij ophalen TV info (%s)"
 
-#: sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message]
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename: %s to %s"
 msgstr "Hernoemen van %s tot %s mislukt"
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename similar file: %s to %s"
 msgstr "Hernoemen van gelijkaardig bestand %s naar %s mislukt"
 
@@ -5439,6 +5441,12 @@ msgstr "URL ophalen mislukt; %s"
 #~ msgid "OK"
 #~ msgstr "OK"
 
+#~ msgid "folder"
+#~ msgstr "map"
+
+#~ msgid "Original Foldername"
+#~ msgstr "Oorspronkelijke mapnaam"
+
 #~ msgid "Groups / Indexer tags"
 #~ msgstr "Groepen / Indexer markeringen"
 

po/main/pl.po

@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-11-20 21:21+0000\n"
+"POT-Creation-Date: 2017-12-06 10:30+0000\n"
 "PO-Revision-Date: 2015-12-28 10:22+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-11-21 05:48+0000\n"
-"X-Generator: Launchpad (build 18505)\n"
+"X-Launchpad-Export-Date: 2017-12-07 05:31+0000\n"
+"X-Generator: Launchpad (build 18511)\n"
 
 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -767,7 +767,7 @@ msgstr "g"
 msgid "m"
 msgstr "m"
 
-#: sabnzbd/misc.py [Error message] # sabnzbd/tvsort.py [Error message]
+#: sabnzbd/misc.py [Error message] # sabnzbd/sorting.py [Error message]
 msgid "Cannot create directory %s"
 msgstr "Nie można utworzyć katalogu %s"
 
@@ -4130,6 +4130,10 @@ msgstr "Katalog odcinka 1x05"
 msgid "S01E05 Episode Folder"
 msgstr "Katalog odcinka S01E05"
 
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr "Tytuł"
@@ -4199,8 +4203,8 @@ msgid "Original Filename"
 msgstr "Oryginalna nazwa pliku"
 
 #: sabnzbd/skintext.py
-msgid "Original Foldername"
-msgstr "Oryginalna nazwa katalogu"
+msgid "Original Job Name"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Lower Case"
@@ -4218,10 +4222,6 @@ msgstr "tekst"
 msgid "file"
 msgstr "plik"
 
-#: sabnzbd/skintext.py
-msgid "folder"
-msgstr "katalog"
-
 #: sabnzbd/skintext.py
 msgid "Sort String"
 msgstr "Wzorzec sortowania"
@@ -4941,16 +4941,16 @@ msgstr ""
 msgid "Don't have a usenet provider? We recommend trying %s."
 msgstr "Nie masz dostawcy Usenet? Polecamy spróbować %s."
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Error getting TV info (%s)"
 msgstr "Błąd pobierania informacji TV (%s)"
 
-#: sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message]
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename: %s to %s"
 msgstr "Nie udało się zmienić nazwy %s na %s"
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename similar file: %s to %s"
 msgstr "Nie udało się zmienić nazwy podobnego pliku %s na %s"
 
@@ -5203,6 +5203,12 @@ msgstr "Pobieranie URL nie powiodło się; %s"
 #~ msgid "Generic Sorting"
 #~ msgstr "Sortowanie standardowe"
 
+#~ msgid "folder"
+#~ msgstr "katalog"
+
+#~ msgid "Original Foldername"
+#~ msgstr "Oryginalna nazwa katalogu"
+
 #~ msgid "Are you sure you want to delete"
 #~ msgstr "Czy na pewno usunąć?"
 

po/main/pt_BR.po

@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-11-20 21:21+0000\n"
+"POT-Creation-Date: 2017-12-06 10:30+0000\n"
 "PO-Revision-Date: 2016-01-01 22:58+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: 2017-11-21 05:49+0000\n"
-"X-Generator: Launchpad (build 18505)\n"
+"X-Launchpad-Export-Date: 2017-12-07 05:31+0000\n"
+"X-Generator: Launchpad (build 18511)\n"
 
 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -767,7 +767,7 @@ msgstr "h"
 msgid "m"
 msgstr "m"
 
-#: sabnzbd/misc.py [Error message] # sabnzbd/tvsort.py [Error message]
+#: sabnzbd/misc.py [Error message] # sabnzbd/sorting.py [Error message]
 msgid "Cannot create directory %s"
 msgstr "Não é possível criar a pasta %s"
 
@@ -4128,6 +4128,10 @@ msgstr "1x05 Pasta Do Episódio"
 msgid "S01E05 Episode Folder"
 msgstr "S01E05 Pasta Do Episódio"
 
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr "Tí­tulo"
@@ -4197,8 +4201,8 @@ msgid "Original Filename"
 msgstr "Nome do arquivo original"
 
 #: sabnzbd/skintext.py
-msgid "Original Foldername"
-msgstr "Nome da pasta original"
+msgid "Original Job Name"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Lower Case"
@@ -4216,10 +4220,6 @@ msgstr "texto"
 msgid "file"
 msgstr "arquivo"
 
-#: sabnzbd/skintext.py
-msgid "folder"
-msgstr "pasta"
-
 #: sabnzbd/skintext.py
 msgid "Sort String"
 msgstr "String de ordenação"
@@ -4942,16 +4942,16 @@ msgstr ""
 msgid "Don't have a usenet provider? We recommend trying %s."
 msgstr "Não tem um provedor usenet? Recomendamos testar %s."
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Error getting TV info (%s)"
 msgstr "Erro ao obter informações de TV (%s)"
 
-#: sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message]
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename: %s to %s"
 msgstr "Falha ao renomear: %s para %s"
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename similar file: %s to %s"
 msgstr "Falha ao renomear arquivo similar: %s para %s"
 
@@ -5374,6 +5374,12 @@ msgstr "A busca da URL falhou; %s"
 #~ msgid "Generic Sorting"
 #~ msgstr "Ordenação genérica"
 
+#~ msgid "Original Foldername"
+#~ msgstr "Nome da pasta original"
+
+#~ msgid "folder"
+#~ msgstr "pasta"
+
 #~ msgid "Enable sorting and renaming of episodes."
 #~ msgstr "Ativa a ordenação e renomeação de episódios."
 

po/main/ro.po

@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-11-20 21:21+0000\n"
+"POT-Creation-Date: 2017-12-06 10:30+0000\n"
 "PO-Revision-Date: 2016-07-29 16:20+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: 2017-11-21 05:48+0000\n"
-"X-Generator: Launchpad (build 18505)\n"
+"X-Launchpad-Export-Date: 2017-12-07 05:31+0000\n"
+"X-Generator: Launchpad (build 18511)\n"
 
 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -770,7 +770,7 @@ msgstr "h"
 msgid "m"
 msgstr "m"
 
-#: sabnzbd/misc.py [Error message] # sabnzbd/tvsort.py [Error message]
+#: sabnzbd/misc.py [Error message] # sabnzbd/sorting.py [Error message]
 msgid "Cannot create directory %s"
 msgstr "Nu pot crea dosarul %s"
 
@@ -4132,6 +4132,10 @@ msgstr "1x05 Dosar Episod"
 msgid "S01E05 Episode Folder"
 msgstr "S01E05 Dosar Episod"
 
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr "Titlu"
@@ -4201,8 +4205,8 @@ msgid "Original Filename"
 msgstr "Nume de Fişier Original"
 
 #: sabnzbd/skintext.py
-msgid "Original Foldername"
-msgstr "Nume de Dosar Original"
+msgid "Original Job Name"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Lower Case"
@@ -4220,10 +4224,6 @@ msgstr "text"
 msgid "file"
 msgstr "fișier"
 
-#: sabnzbd/skintext.py
-msgid "folder"
-msgstr "dosar"
-
 #: sabnzbd/skintext.py
 msgid "Sort String"
 msgstr "Şir Caractere Sortare"
@@ -4947,16 +4947,16 @@ msgstr ""
 msgid "Don't have a usenet provider? We recommend trying %s."
 msgstr "Nu aveţi un furnizor usenet? Vă recomandăm să încercaţi %s."
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Error getting TV info (%s)"
 msgstr "Eroare obţinere info TV (%s)"
 
-#: sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message]
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename: %s to %s"
 msgstr "Redenumire:%s în %s nereuşită"
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename similar file: %s to %s"
 msgstr "Redenumire fişiere similare : %s în %s nereuşită"
 
@@ -5351,6 +5351,12 @@ msgstr "Descărcare URL nereuşită; %s"
 #~ msgid "Enable if downloads are not put in their own folders."
 #~ msgstr "Activează dacă descărcările nu sunt puse în dosarele lor."
 
+#~ msgid "Original Foldername"
+#~ msgstr "Nume de Dosar Original"
+
+#~ msgid "folder"
+#~ msgstr "dosar"
+
 #~ msgid "Enable sorting and renaming of date named files."
 #~ msgstr "Activează sortarea şi redenumirea fişierelor denumite după dată."
 

po/main/ru.po

@@ -2,15 +2,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SABnzbd-0.7.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-20 21:21+0000\n"
+"POT-Creation-Date: 2017-12-06 10:30+0000\n"
 "PO-Revision-Date: 2013-05-05 14:50+0000\n"
 "Last-Translator: Pavel Maryanov <Unknown>\n"
 "Language-Team: Russian <gmu@mx.ru>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-11-21 05:48+0000\n"
-"X-Generator: Launchpad (build 18505)\n"
+"X-Launchpad-Export-Date: 2017-12-07 05:31+0000\n"
+"X-Generator: Launchpad (build 18511)\n"
 "Generated-By: pygettext.py 1.5\n"
 
 #: SABnzbd.py [Error message]
@@ -757,7 +757,7 @@ msgstr "ч"
 msgid "m"
 msgstr "м"
 
-#: sabnzbd/misc.py [Error message] # sabnzbd/tvsort.py [Error message]
+#: sabnzbd/misc.py [Error message] # sabnzbd/sorting.py [Error message]
 msgid "Cannot create directory %s"
 msgstr "Не удаётся создать каталог %s"
 
@@ -4110,6 +4110,10 @@ msgstr "1x05 Эпизод Папка"
 msgid "S01E05 Episode Folder"
 msgstr "S01E05 Эпизод Папка"
 
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr "Название"
@@ -4179,8 +4183,8 @@ msgid "Original Filename"
 msgstr "Исходное название файла"
 
 #: sabnzbd/skintext.py
-msgid "Original Foldername"
-msgstr "Исходное название папки"
+msgid "Original Job Name"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Lower Case"
@@ -4198,10 +4202,6 @@ msgstr "текст"
 msgid "file"
 msgstr "файл"
 
-#: sabnzbd/skintext.py
-msgid "folder"
-msgstr "папка"
-
 #: sabnzbd/skintext.py
 msgid "Sort String"
 msgstr "Строка сортировки"
@@ -4926,16 +4926,16 @@ msgstr ""
 msgid "Don't have a usenet provider? We recommend trying %s."
 msgstr "У вас ещё нет поставщика услуг Usenet? Рекомендуем попробовать %s."
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Error getting TV info (%s)"
 msgstr "Не удалось получить сведения о ТВ (%s)"
 
-#: sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message]
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename: %s to %s"
 msgstr "Не удалось переименовать: %s в %s"
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename similar file: %s to %s"
 msgstr "Не удалось переименовать похожий файл: %s в %s"
 
@@ -5384,6 +5384,12 @@ msgstr "Не удалось загрузить URL: %s"
 #~ msgid "Enable if downloads are not put in their own folders."
 #~ msgstr "Включите, если загрузки не размещаются в собственных папках."
 
+#~ msgid "Original Foldername"
+#~ msgstr "Исходное название папки"
+
+#~ msgid "folder"
+#~ msgstr "папка"
+
 #~ msgid "Enable sorting and renaming of date named files."
 #~ msgstr "Позволяет сортировать и переименовывать файлы с датой в названии."
 

po/main/sr.po

@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: ОZZII <ozzii.translate@gmail.com>\n"
-"POT-Creation-Date: 2017-11-20 21:21+0000\n"
+"POT-Creation-Date: 2017-12-06 10:30+0000\n"
 "PO-Revision-Date: 2015-12-28 10:25+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-11-21 05:48+0000\n"
-"X-Generator: Launchpad (build 18505)\n"
+"X-Launchpad-Export-Date: 2017-12-07 05:31+0000\n"
+"X-Generator: Launchpad (build 18511)\n"
 
 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -759,7 +759,7 @@ msgstr "с"
 msgid "m"
 msgstr "м"
 
-#: sabnzbd/misc.py [Error message] # sabnzbd/tvsort.py [Error message]
+#: sabnzbd/misc.py [Error message] # sabnzbd/sorting.py [Error message]
 msgid "Cannot create directory %s"
 msgstr "Немогуће креирати фасциклу %s"
 
@@ -4096,6 +4096,10 @@ msgstr "1x05 Фасцикла епизоде"
 msgid "S01E05 Episode Folder"
 msgstr "S01E05 Фасцикла епизоде"
 
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr "Наслов"
@@ -4165,8 +4169,8 @@ msgid "Original Filename"
 msgstr "Оригинално име датотеке"
 
 #: sabnzbd/skintext.py
-msgid "Original Foldername"
-msgstr "Оригинално име фасцикле"
+msgid "Original Job Name"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Lower Case"
@@ -4184,10 +4188,6 @@ msgstr "текст"
 msgid "file"
 msgstr "датотека"
 
-#: sabnzbd/skintext.py
-msgid "folder"
-msgstr "фасцикла"
-
 #: sabnzbd/skintext.py
 msgid "Sort String"
 msgstr "Уреди низ"
@@ -4907,16 +4907,16 @@ msgstr ""
 msgid "Don't have a usenet provider? We recommend trying %s."
 msgstr "Немате 'usenet' провајдер? Препоручујемо Вам %s."
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Error getting TV info (%s)"
 msgstr "Грешка преузимању ТВ инфо (%s)"
 
-#: sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message]
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename: %s to %s"
 msgstr "Неуспешно преименовање : %s у %s"
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename similar file: %s to %s"
 msgstr "Неуспешно преименовање сличне датотеке: %s у %s"
 
@@ -5020,6 +5020,12 @@ msgstr "Погрешно учитавање УРЛ-а; %s"
 #~ msgid "Enable sorting and renaming of date named files."
 #~ msgstr "Упали сређивање и преименовање датотеке са датумом"
 
+#~ msgid "folder"
+#~ msgstr "фасцикла"
+
+#~ msgid "Original Foldername"
+#~ msgstr "Оригинално име фасцикле"
+
 #~ msgid "Enable generic sorting and renaming of files."
 #~ msgstr "Упали генерално сортирање/преименовање датотеке."
 

po/main/sv.po

@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-11-20 21:21+0000\n"
+"POT-Creation-Date: 2017-12-06 10:30+0000\n"
 "PO-Revision-Date: 2016-02-20 20:34+0000\n"
 "Last-Translator: shypike <Unknown>\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: 2017-11-21 05:48+0000\n"
-"X-Generator: Launchpad (build 18505)\n"
+"X-Launchpad-Export-Date: 2017-12-07 05:31+0000\n"
+"X-Generator: Launchpad (build 18511)\n"
 
 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -763,7 +763,7 @@ msgstr "h"
 msgid "m"
 msgstr "m"
 
-#: sabnzbd/misc.py [Error message] # sabnzbd/tvsort.py [Error message]
+#: sabnzbd/misc.py [Error message] # sabnzbd/sorting.py [Error message]
 msgid "Cannot create directory %s"
 msgstr "Kan ej skapa mapp %s"
 
@@ -4111,6 +4111,10 @@ msgstr "1x05 Episodmapp"
 msgid "S01E05 Episode Folder"
 msgstr "S01E05 Episodmapp"
 
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr "Titel"
@@ -4180,8 +4184,8 @@ msgid "Original Filename"
 msgstr "Originalfilnamn"
 
 #: sabnzbd/skintext.py
-msgid "Original Foldername"
-msgstr "Ursprungliga mappnamnet"
+msgid "Original Job Name"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Lower Case"
@@ -4199,10 +4203,6 @@ msgstr "text"
 msgid "file"
 msgstr "fil"
 
-#: sabnzbd/skintext.py
-msgid "folder"
-msgstr "mapp"
-
 #: sabnzbd/skintext.py
 msgid "Sort String"
 msgstr "Sorteringssträng"
@@ -4926,16 +4926,16 @@ msgstr ""
 msgid "Don't have a usenet provider? We recommend trying %s."
 msgstr "Har du inte någon usenet leverantör? Vi rekommenderar att prova %s."
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Error getting TV info (%s)"
 msgstr "Det gick inte att hämta TV info (%s)"
 
-#: sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message]
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename: %s to %s"
 msgstr "Det gick inte att döpa om: %s till %s"
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename similar file: %s to %s"
 msgstr "Det gick inte att döpa om liknande fil: %s till %s"
 
@@ -5468,6 +5468,12 @@ msgstr "URL hämtning misslyckades; %s"
 #~ msgid "Groups / Indexer tags"
 #~ msgstr "Grupper/Indexering-tagg"
 
+#~ msgid "folder"
+#~ msgstr "mapp"
+
+#~ msgid "Original Foldername"
+#~ msgstr "Ursprungliga mappnamnet"
+
 #~ msgid "E.g. 119 or 563 for SSL"
 #~ msgstr "T.ex. 119 eller 563 för SSL"
 

po/main/zh_CN.po

@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sabnzbd\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2017-11-20 21:21+0000\n"
+"POT-Creation-Date: 2017-12-06 10:30+0000\n"
 "PO-Revision-Date: 2017-06-22 07:06+0000\n"
 "Last-Translator: Safihre <safihre@sabnzbd.org>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-11-21 05:49+0000\n"
-"X-Generator: Launchpad (build 18505)\n"
+"X-Launchpad-Export-Date: 2017-12-07 05:31+0000\n"
+"X-Generator: Launchpad (build 18511)\n"
 
 #: SABnzbd.py [Error message]
 msgid "Failed to start web-interface"
@@ -746,7 +746,7 @@ msgstr "小时"
 msgid "m"
 msgstr "分钟"
 
-#: sabnzbd/misc.py [Error message] # sabnzbd/tvsort.py [Error message]
+#: sabnzbd/misc.py [Error message] # sabnzbd/sorting.py [Error message]
 msgid "Cannot create directory %s"
 msgstr "无法创建目录 %s"
 
@@ -4039,6 +4039,10 @@ msgstr "1x05 剧集文件夹"
 msgid "S01E05 Episode Folder"
 msgstr "S01E05 剧集文件夹"
 
+#: sabnzbd/skintext.py
+msgid "Job Name as Filename"
+msgstr ""
+
 #: sabnzbd/skintext.py
 msgid "Title"
 msgstr "标题"
@@ -4108,8 +4112,8 @@ msgid "Original Filename"
 msgstr "原始文件名"
 
 #: sabnzbd/skintext.py
-msgid "Original Foldername"
-msgstr "原始文件夹名"
+msgid "Original Job Name"
+msgstr ""
 
 #: sabnzbd/skintext.py
 msgid "Lower Case"
@@ -4127,10 +4131,6 @@ msgstr "text"
 msgid "file"
 msgstr "文件"
 
-#: sabnzbd/skintext.py
-msgid "folder"
-msgstr "文件夹"
-
 #: sabnzbd/skintext.py
 msgid "Sort String"
 msgstr "排序字串"
@@ -4841,16 +4841,16 @@ msgstr "要从 usenet 下载您需要有一家提供商的访问权限。您的
 msgid "Don't have a usenet provider? We recommend trying %s."
 msgstr "还没有 usenet 提供商r? 我们推荐试试 %s。"
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Error getting TV info (%s)"
 msgstr "获取 TV 信息出错 (%s)"
 
-#: sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message] # sabnzbd/tvsort.py [Error message]
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message] # sabnzbd/sorting.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename: %s to %s"
 msgstr "重命名失败: %s 为 %s"
 
-#: sabnzbd/tvsort.py [Error message]
+#: sabnzbd/sorting.py [Error message]
 msgid "Failed to rename similar file: %s to %s"
 msgstr "重命名相似文件失败: %s 为 %s"
 
@@ -5279,6 +5279,12 @@ msgstr "URL 装取失败; %s"
 #~ msgid "Enable if downloads are not put in their own folders."
 #~ msgstr "启用可将下载内容存放在各自的文件夹。"
 
+#~ msgid "Original Foldername"
+#~ msgstr "原始文件夹名"
+
+#~ msgid "folder"
+#~ msgstr "文件夹"
+
 #~ msgid "Enable sorting and renaming of date named files."
 #~ msgstr "启用按日期命名的文件的排序与重命名。"
 

sabnzbd/__init__.py

@@ -278,7 +278,7 @@ def initialize(pause_downloader=False, clean_up=False, evalSched=False, repair=0
     sabnzbd.encoding.change_fsys(cfg.fsys_type())
 
     # Set cache limit
-    if not cfg.cache_limit() or (cfg.cache_limit() == '200M' and (sabnzbd.WIN32 or sabnzbd.DARWIN)):
+    if not cfg.cache_limit() or (cfg.cache_limit() in ('200M', '450M') and (sabnzbd.WIN32 or sabnzbd.DARWIN)):
         cfg.cache_limit.set(misc.get_cache_limit())
     ArticleCache.do.new_limit(cfg.cache_limit.get_int())
 

sabnzbd/api.py

@@ -681,12 +681,11 @@ def _api_rescan(name, output, kwargs):
 
 def _api_eval_sort(name, output, kwargs):
     """ API: evaluate sorting expression """
-    import sabnzbd.tvsort
     name = kwargs.get('name', '')
     value = kwargs.get('value', '')
     title = kwargs.get('title')
     multipart = kwargs.get('movieextra', '')
-    path = sabnzbd.tvsort.eval_sort(value, title, name, multipart)
+    path = sabnzbd.sorting.eval_sort(value, title, name, multipart)
     if path is None:
         return report(output, _MSG_NOT_IMPLEMENTED)
     else:
@@ -903,8 +902,8 @@ def _api_server_stats(name, output, kwargs):
 
     stats['servers'] = {}
     for svr in config.get_servers():
-        t, m, w, d, _ = BPSMeter.do.amounts(svr)
-        stats['servers'][svr] = {'total': t or 0, 'month': m or 0, 'week': w or 0, 'day': d or 0}
+        t, m, w, d, daily = BPSMeter.do.amounts(svr)
+        stats['servers'][svr] = {'total': t or 0, 'month': m or 0, 'week': w or 0, 'day': d or 0, 'daily': daily or {} }
 
     return report(output, keyword='', data=stats)
 

sabnzbd/assembler.py

@@ -371,5 +371,5 @@ def remove_warning_label(msg):
     """ Standardize errors by removing obsolete
         "WARNING:" part in all languages """
     if ':' in msg:
-        return msg.split(':')[1]
+        return msg.split(':')[1].strip()
     return msg

sabnzbd/constants.py

@@ -74,7 +74,8 @@ DEF_WORKDIR = 'sabnzbd'
 DEF_LOG_FILE = 'sabnzbd.log'
 DEF_LOG_ERRFILE = 'sabnzbd.error.log'
 DEF_LOG_CHERRY = 'cherrypy.log'
-DEF_CACHE_LIMIT = '450M'
+DEF_ARTICLE_CACHE_DEFAULT = '500M'
+DEF_ARTICLE_CACHE_MAX = '1G'
 DEF_TIMEOUT = 60
 DEF_SCANRATE = 5
 MAX_URL_RETRIES = 10

sabnzbd/misc.py

@@ -24,6 +24,7 @@ import sys
 import logging
 import urllib
 import re
+import ctypes
 import shutil
 import threading
 import subprocess
@@ -39,7 +40,7 @@ from urlparse import urlparse
 import sabnzbd
 from sabnzbd.decorators import synchronized
 from sabnzbd.constants import DEFAULT_PRIORITY, FUTURE_Q_FOLDER, JOB_ADMIN, \
-     GIGI, MEBI, DEF_CACHE_LIMIT
+     GIGI, MEBI, DEF_ARTICLE_CACHE_DEFAULT, DEF_ARTICLE_CACHE_MAX
 import sabnzbd.config as config
 import sabnzbd.cfg as cfg
 from sabnzbd.encoding import unicoder, special_fixer, gUTF
@@ -875,27 +876,74 @@ def check_mount(path):
 
 
 def get_cache_limit():
-    """ Depending on OS, calculate cache limit """
-    # OSX/Windows use Default value
-    if sabnzbd.WIN32 or sabnzbd.DARWIN:
-        return DEF_CACHE_LIMIT
-
+    """ Depending on OS, calculate cache limits.
+        In ArticleCache it will make sure we stay
+        within system limits for 32/64 bit
+    """
     # Calculate, if possible
     try:
+        if sabnzbd.WIN32:
+            # Windows
+            mem_bytes = get_windows_memory()
+        elif sabnzbd.DARWIN:
+            # macOS
+            mem_bytes = get_darwin_memory()
+        else:
+            # Linux
+            mem_bytes = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES'))
+
         # Use 1/4th of available memory
-        mem_bytes = (os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES'))/4
-        # Not more than the maximum we think is reasonable
-        if mem_bytes > from_units(DEF_CACHE_LIMIT):
-            return DEF_CACHE_LIMIT
-        elif mem_bytes > from_units('32M'):
-            # We make sure it's at least a valid value
+        mem_bytes = mem_bytes/4
+
+        # We don't want to set a value that's too high
+        if mem_bytes > from_units(DEF_ARTICLE_CACHE_MAX):
+            return DEF_ARTICLE_CACHE_MAX
+
+        # We make sure it's at least a valid value
+        if mem_bytes > from_units('32M'):
             return to_units(mem_bytes)
     except:
         pass
-    # If failed, leave empty so user needs to decide
+
+    # Always at least minimum on Windows/macOS
+    if sabnzbd.WIN32 and sabnzbd.DARWIN:
+        return DEF_ARTICLE_CACHE_DEFAULT
+
+    # If failed, leave empty for Linux so user needs to decide
     return ''
 
 
+def get_windows_memory():
+    """ Use ctypes to extract available memory """
+    class MEMORYSTATUSEX(ctypes.Structure):
+        _fields_ = [
+            ("dwLength", ctypes.c_ulong),
+            ("dwMemoryLoad", ctypes.c_ulong),
+            ("ullTotalPhys", ctypes.c_ulonglong),
+            ("ullAvailPhys", ctypes.c_ulonglong),
+            ("ullTotalPageFile", ctypes.c_ulonglong),
+            ("ullAvailPageFile", ctypes.c_ulonglong),
+            ("ullTotalVirtual", ctypes.c_ulonglong),
+            ("ullAvailVirtual", ctypes.c_ulonglong),
+            ("sullAvailExtendedVirtual", ctypes.c_ulonglong),
+        ]
+
+        def __init__(self):
+            # have to initialize this to the size of MEMORYSTATUSEX
+            self.dwLength = ctypes.sizeof(self)
+            super(MEMORYSTATUSEX, self).__init__()
+
+    stat = MEMORYSTATUSEX()
+    ctypes.windll.kernel32.GlobalMemoryStatusEx(ctypes.byref(stat))
+    return stat.ullTotalPhys
+
+
+def get_darwin_memory():
+    """ Use system-call to extract total memory on macOS """
+    system_output = sabnzbd.newsunpack.run_simple(['sysctl', 'hw.memsize'])
+    return float(system_output.split()[1])
+
+
 ##############################################################################
 # Locked directory operations to avoid problems with simultaneous add/remove
 ##############################################################################

sabnzbd/newsunpack.py

@@ -34,7 +34,7 @@ import sabnzbd.utils.rarfile as rarfile
 from sabnzbd.misc import format_time_string, find_on_path, make_script_path, int_conv, \
     real_path, globber, globber_full, get_all_passwords, renamer, clip_path, \
     has_win_device, calc_age, long_path, remove_file
-from sabnzbd.tvsort import SeriesSorter
+from sabnzbd.sorting import SeriesSorter
 import sabnzbd.cfg as cfg
 from sabnzbd.constants import Status
 
@@ -1093,8 +1093,10 @@ def par2_repair(parfile_nzf, nzo, workdir, setname, single):
         # Download all par2 files that haven't been downloaded yet
         readd = False
         for extrapar in nzo.extrapars[setname][:]:
-            nzo.add_parfile(extrapar)
-            readd = True
+            # Make sure we only get new par2 files
+            if extrapar not in nzo.finished_files and extrapar not in nzo.files:
+                nzo.add_parfile(extrapar)
+                readd = True
         if readd:
             return readd, result
 
@@ -2292,8 +2294,9 @@ def pre_queue(name, pp, cat, script, priority, size, groups):
     values = [1, name, pp, cat, script, priority, None]
     script_path = make_script_path(cfg.pre_script())
     if script_path:
-        command = [script_path, name, pp, fix(cat), fix(script), priority, str(size), ' '.join(groups)]
+        command = [script_path, name, pp, cat, script, priority, str(size), ' '.join(groups)]
         command.extend(analyse_show(name))
+        command = [fix(arg) for arg in command]
 
         try:
             stup, need_shell, command, creationflags = build_command(command)

sabnzbd/nzbstuff.py

@@ -1747,6 +1747,7 @@ class NzbObject(TryList):
                 try:
                     remove_dir(self.downpath)
                 except:
+                    logging.debug('Folder not removed: %s', self.downpath)
                     pass
 
     def gather_info(self, full=False):

sabnzbd/postproc.py

@@ -35,7 +35,7 @@ from sabnzbd.misc import real_path, get_unique_path, create_dirs, move_to_path,
     on_cleanup_list, renamer, remove_dir, remove_all, globber, globber_full, \
     set_permissions, cleanup_empty_directories, fix_unix_encoding, \
     sanitize_and_trim_path, sanitize_files_in_folder, remove_file
-from sabnzbd.tvsort import Sorter
+from sabnzbd.sorting import Sorter
 from sabnzbd.constants import REPAIR_PRIORITY, TOP_PRIORITY, POSTPROC_QUEUE_FILE_NAME, \
     POSTPROC_QUEUE_VERSION, sample_match, JOB_ADMIN, Status, VERIFIED_FILE
 from sabnzbd.encoding import TRANS, unicoder

sabnzbd/skintext.py

@@ -712,6 +712,7 @@ SKIN_TEXT = {
     'button-SeasonS01E05' : TT('S01E05 Season Folder'),
     'button-Ep1x05' : TT('1x05 Episode Folder'),
     'button-EpS01E05' : TT('S01E05 Episode Folder'),
+    'button-FileLikeFolder' : TT('Job Name as Filename'),
     'sort-title' : TT('Title'),
     'movie-sp-name' : TT('Movie Name'),
     'movie-dot-name' : TT('Movie.Name'),
@@ -731,12 +732,11 @@ SKIN_TEXT = {
     'partNumber' : TT('Part Number'),
     'decade' : TT('Decade'),
     'orgFilename' : TT('Original Filename'),
-    'orgDirname' : TT('Original Foldername'),
+    'orgJobname' : TT('Original Job Name'),
     'lowercase' : TT('Lower Case'),
     'TEXT' : TT('TEXT'),
     'text' : TT('text'),
     'sort-File' : TT('file'),
-    'sort-Folder' : TT('folder'),
     'sortString' : TT('Sort String'),
     'multiPartLabel' : TT('Multi-part label'),
     'button-inFolders' : TT('In folders'),

sabnzbd/sorting.py

@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 """
-sabnzbd.tvsort - Sorting Functions
+sabnzbd.sorting - Sorting Functions
 Series Sorting - Sorting downloads into seasons & episodes
 Date Sorting - Sorting downloads by a custom date matching
 Generic Sorting - Sorting large files by a custom matching
@@ -101,23 +101,23 @@ class Sorter(object):
         self.cat = cat
         self.ext = ''
 
-    def detect(self, dirname, complete_dir):
+    def detect(self, job_name, complete_dir):
         """ Detect which kind of sort applies """
-        self.sorter = SeriesSorter(self.nzo, dirname, complete_dir, self.cat)
+        self.sorter = SeriesSorter(self.nzo, job_name, complete_dir, self.cat)
         if self.sorter.matched:
             complete_dir = self.sorter.get_final_path()
             self.type = 'tv'
             self.sort_file = True
             return complete_dir
 
-        self.sorter = DateSorter(self.nzo, dirname, complete_dir, self.cat)
+        self.sorter = DateSorter(self.nzo, job_name, complete_dir, self.cat)
         if self.sorter.matched:
             complete_dir = self.sorter.get_final_path()
             self.type = 'date'
             self.sort_file = True
             return complete_dir
 
-        self.sorter = GenericSorter(self.nzo, dirname, complete_dir, self.cat)
+        self.sorter = MovieSorter(self.nzo, job_name, complete_dir, self.cat)
         if self.sorter.matched:
             complete_dir = self.sorter.get_final_path()
             self.type = 'movie'
@@ -177,10 +177,10 @@ class Sorter(object):
 class SeriesSorter(object):
     """ Methods for Series Sorting """
 
-    def __init__(self, nzo, dirname, path, cat):
+    def __init__(self, nzo, job_name, path, cat):
         self.matched = False
 
-        self.original_dirname = dirname
+        self.original_job_name = job_name
         self.original_path = path
         self.nzo = nzo
         self.cat = cat
@@ -205,9 +205,9 @@ class SeriesSorter(object):
         if force or (cfg.enable_tv_sorting() and cfg.tv_sort_string()):
             if force or (not self.cats) or (self.cat and self.cat.lower() in self.cats) or (not self.cat and 'None' in self.cats):
                 # First check if the show matches TV episode regular expressions. Returns regex match object
-                self.match_obj, self.extras = check_regexs(self.original_dirname, series_match)
+                self.match_obj, self.extras = check_regexs(self.original_job_name, series_match)
                 if self.match_obj:
-                    logging.debug("Found TV Show (%s)", self.original_dirname)
+                    logging.debug("Found TV Show (%s)", self.original_job_name)
                     self.matched = True
 
     def is_match(self):
@@ -223,7 +223,7 @@ class SeriesSorter(object):
             return self.final_path
         else:
             # Error Sorting
-            return os.path.join(self.original_path, self.original_dirname)
+            return os.path.join(self.original_path, self.original_job_name)
 
     def get_multi_ep_naming(self, one, two, extras):
         """ Returns a list of unique values joined into a string and separated by - (ex:01-02-03-04) """
@@ -242,8 +242,8 @@ class SeriesSorter(object):
     def get_shownames(self):
         """ Get the show name from the match object and format it """
         # Get the formatted title and alternate title formats
-        self.show_info['show_tname'], self.show_info['show_tname_two'], self.show_info['show_tname_three'] = get_titles(self.nzo, self.match_obj, self.original_dirname, True)
-        self.show_info['show_name'], self.show_info['show_name_two'], self.show_info['show_name_three'] = get_titles(self.nzo, self.match_obj, self.original_dirname)
+        self.show_info['show_tname'], self.show_info['show_tname_two'], self.show_info['show_tname_three'] = get_titles(self.nzo, self.match_obj, self.original_job_name, True)
+        self.show_info['show_name'], self.show_info['show_name_two'], self.show_info['show_name_three'] = get_titles(self.nzo, self.match_obj, self.original_job_name)
 
     def get_seasons(self):
         """ Get the season number from the match object and format it """
@@ -289,7 +289,7 @@ class SeriesSorter(object):
 
     def get_showdescriptions(self):
         """ Get the show descriptions from the match object and format them """
-        self.show_info['ep_name'], self.show_info['ep_name_two'], self.show_info['ep_name_three'] = get_descriptions(self.nzo, self.match_obj, self.original_dirname)
+        self.show_info['ep_name'], self.show_info['ep_name_two'], self.show_info['ep_name_three'] = get_descriptions(self.nzo, self.match_obj, self.original_job_name)
 
     def get_values(self):
         """ Collect and construct all the values needed for path replacement """
@@ -309,7 +309,7 @@ class SeriesSorter(object):
             return True
 
         except:
-            logging.error(T('Error getting TV info (%s)'), clip_path(self.original_dirname))
+            logging.error(T('Error getting TV info (%s)'), clip_path(self.original_job_name))
             logging.info("Traceback: ", exc_info=True)
             return False
 
@@ -338,7 +338,7 @@ class SeriesSorter(object):
         mapping.append(('%0s', self.show_info['season_num_alt']))
 
         # Original dir name
-        mapping.append(('%dn', self.original_dirname))
+        mapping.append(('%dn', self.original_job_name))
 
         # Replace episode names
         if self.show_info['ep_name']:
@@ -428,9 +428,9 @@ class SeriesSorter(object):
 
 
 _RE_MULTIPLE = (
-    re.compile(r'cd\W?(\d+)\W?', re.I),        # .cd1.avi
-    re.compile(r'\w\W?([\w\d])[{}]*$', re.I),  # blah1.avi blaha.avi
-    re.compile(r'\w\W([\w\d])\W', re.I)        # blah-1-ok.avi blah-a-ok.avi
+    re.compile(r'cd\W?(\d+)\W?', re.I),        # .cd1.mkv
+    re.compile(r'\w\W?([\w\d])[{}]*$', re.I),  # blah1.mkv blaha.mkv
+    re.compile(r'\w\W([\w\d])\W', re.I)        # blah-1-ok.mkv blah-a-ok.mkv
 )
 
 
@@ -448,7 +448,7 @@ def check_for_sequence(regex, files):
     matches = {}
     prefix = None
     # Build up a dictionary of matches
-    # The key is based off the match, ie {1:'blah-part1.avi'}
+    # The key is based off the match, ie {1:'blah-part1.mkv'}
     for _file in files:
         name, ext = os.path.splitext(_file)
         match1 = regex.search(name)
@@ -483,7 +483,7 @@ def check_for_sequence(regex, files):
                 else:
                     passed = False
         if passed:
-            # convert {'b':'filename-b.avi'} to {'2', 'filename-b.avi'}
+            # convert {'b':'filename-b.mkv'} to {'2', 'filename-b.mkv'}
             item = matches.pop(akey)
             matches[str(key)] = item
 
@@ -493,13 +493,13 @@ def check_for_sequence(regex, files):
         return {}
 
 
-class GenericSorter(object):
+class MovieSorter(object):
     """ Methods for Generic Sorting """
 
-    def __init__(self, nzo, dirname, path, cat):
+    def __init__(self, nzo, job_name, path, cat):
         self.matched = False
 
-        self.original_dirname = dirname
+        self.original_job_name = job_name
         self.original_path = path
         self.sort_string = cfg.movie_sort_string()
         self.extra = cfg.movie_sort_extra()
@@ -524,7 +524,7 @@ class GenericSorter(object):
         if force or (cfg.enable_movie_sorting() and self.sort_string):
             # First check if the show matches TV episode regular expressions. Returns regex match object
             if force or (self.cat and self.cat.lower() in self.cats) or (not self.cat and 'None' in self.cats):
-                logging.debug("Found Movie (%s)", self.original_dirname)
+                logging.debug("Found Movie (%s)", self.original_job_name)
                 self.matched = True
 
     def get_final_path(self):
@@ -536,7 +536,7 @@ class GenericSorter(object):
             return self.final_path
         else:
             # Error Sorting
-            return os.path.join(self.original_path, self.original_dirname)
+            return os.path.join(self.original_path, self.original_job_name)
 
     def get_values(self):
         """ Collect and construct all the values needed for path replacement """
@@ -548,13 +548,13 @@ class GenericSorter(object):
         if year:
             year_m = None
         else:
-            dirname = self.original_dirname.replace('_', ' ')
+            job_name = self.original_job_name.replace('_', ' ')
             RE_YEAR = re.compile(year_match, re.I)
-            year_m = RE_YEAR.search(dirname)
+            year_m = RE_YEAR.search(job_name)
             if year_m:
                 # Find the last matched date
                 # Keep year_m to use in get_titles
-                year = RE_YEAR.findall(dirname)[-1][0]
+                year = RE_YEAR.findall(job_name)[-1][0]
             else:
                 year = ''
         self.movie_info['year'] = year
@@ -563,8 +563,8 @@ class GenericSorter(object):
         self.movie_info['decade'], self.movie_info['decade_two'] = get_decades(year)
 
         # - Get Title
-        self.movie_info['ttitle'], self.movie_info['ttitle_two'], self.movie_info['ttitle_three'] = get_titles(self.nzo, year_m, self.original_dirname, True)
-        self.movie_info['title'], self.movie_info['title_two'], self.movie_info['title_three'] = get_titles(self.nzo, year_m, self.original_dirname)
+        self.movie_info['ttitle'], self.movie_info['ttitle_two'], self.movie_info['ttitle_three'] = get_titles(self.nzo, year_m, self.original_job_name, True)
+        self.movie_info['title'], self.movie_info['title_two'], self.movie_info['title_three'] = get_titles(self.nzo, year_m, self.original_job_name)
 
         return True
 
@@ -605,7 +605,7 @@ class GenericSorter(object):
         mapping.append(('%0decade', self.movie_info['decade_two']))
 
         # Original dir name
-        mapping.append(('%dn', self.original_dirname))
+        mapping.append(('%dn', self.original_job_name))
 
         path = path_subst(sorter, mapping)
 
@@ -698,10 +698,10 @@ class GenericSorter(object):
 class DateSorter(object):
     """ Methods for Date Sorting """
 
-    def __init__(self, nzo, dirname, path, cat):
+    def __init__(self, nzo, job_name, path, cat):
         self.matched = False
 
-        self.original_dirname = dirname
+        self.original_job_name = job_name
         self.original_path = path
         self.sort_string = cfg.date_sort_string()
         self.cats = cfg.date_categories()
@@ -726,9 +726,9 @@ class DateSorter(object):
         if force or (cfg.enable_date_sorting() and self.sort_string):
             # First check if the show matches TV episode regular expressions. Returns regex match object
             if force or (self.cat and self.cat.lower() in self.cats) or (not self.cat and 'None' in self.cats):
-                self.match_obj, self.date_type = check_for_date(self.original_dirname, date_match)
+                self.match_obj, self.date_type = check_for_date(self.original_job_name, date_match)
                 if self.match_obj:
-                    logging.debug("Found date for sorting (%s)", self.original_dirname)
+                    logging.debug("Found date for sorting (%s)", self.original_job_name)
                     self.matched = True
 
     def is_match(self):
@@ -744,7 +744,7 @@ class DateSorter(object):
             return self.final_path
         else:
             # Error Sorting
-            return os.path.join(self.original_path, self.original_dirname)
+            return os.path.join(self.original_path, self.original_job_name)
 
     def get_values(self):
         """ Collect and construct all the values needed for path replacement """
@@ -767,10 +767,10 @@ class DateSorter(object):
         self.date_info['decade'], self.date_info['decade_two'] = get_decades(self.date_info['year'])
 
         # - Get Title
-        self.date_info['ttitle'], self.date_info['ttitle_two'], self.date_info['ttitle_three'] = get_titles(self.nzo, self.match_obj, self.original_dirname, True)
-        self.date_info['title'], self.date_info['title_two'], self.date_info['title_three'] = get_titles(self.nzo, self.match_obj, self.original_dirname)
+        self.date_info['ttitle'], self.date_info['ttitle_two'], self.date_info['ttitle_three'] = get_titles(self.nzo, self.match_obj, self.original_job_name, True)
+        self.date_info['title'], self.date_info['title_two'], self.date_info['title_three'] = get_titles(self.nzo, self.match_obj, self.original_job_name)
 
-        self.date_info['ep_name'], self.date_info['ep_name_two'], self.date_info['ep_name_three'] = get_descriptions(self.nzo, self.match_obj, self.original_dirname)
+        self.date_info['ep_name'], self.date_info['ep_name_two'], self.date_info['ep_name_three'] = get_descriptions(self.nzo, self.match_obj, self.original_job_name)
 
         return True
 
@@ -814,6 +814,9 @@ class DateSorter(object):
             mapping.append(('%.desc', ''))
             mapping.append(('%_desc', ''))
 
+        # Replace dir-name before replacing %d for month
+        mapping.append(('%dn', self.original_job_name))
+
         # Replace decades
         mapping.append(('%decade', self.date_info['decade']))
         mapping.append(('%0decade', self.date_info['decade_two']))
@@ -1168,13 +1171,13 @@ def eval_sort(sorttype, expression, name=None, multipart=''):
     name = sanitize_foldername(name)
     if sorttype == 'series':
         name = name or ('%s S01E05 - %s [DTS]' % (Ttemplate('show-name'), Ttemplate('ep-name')))
-        sorter = sabnzbd.tvsort.SeriesSorter(None, name, path, 'tv')
-    elif sorttype == 'generic':
+        sorter = SeriesSorter(None, name, path, 'tv')
+    elif sorttype == 'movie':
         name = name or (Ttemplate('movie-sp-name') + ' (2009)')
-        sorter = sabnzbd.tvsort.GenericSorter(None, name, path, 'tv')
+        sorter = MovieSorter(None, name, path, 'tv')
     elif sorttype == 'date':
         name = name or (Ttemplate('show-name') + ' 2009-01-02')
-        sorter = sabnzbd.tvsort.DateSorter(None, name, path, 'tv')
+        sorter = DateSorter(None, name, path, 'tv')
     else:
         return None
     sorter.sort_string = expression
@@ -1183,14 +1186,14 @@ def eval_sort(sorttype, expression, name=None, multipart=''):
     path = os.path.normpath(os.path.join(path, sorter.filename_set))
     fname = Ttemplate('orgFilename')
     fpath = path
-    if sorttype == 'generic' and '%1' in multipart:
+    if sorttype == 'movie' and '%1' in multipart:
         fname = fname + multipart.replace('%1', '1')
         fpath = fpath + multipart.replace('%1', '1')
     if '%fn' in path:
-        path = path.replace('%fn', fname + '.avi')
+        path = path.replace('%fn', fname + '.mkv')
     else:
         if sorter.rename_or_not:
-            path = fpath + '.avi'
+            path = fpath + '.mkv'
         else:
             if sabnzbd.WIN32:
                 path += '\\'

sabnzbd/utils/servertests.py

@@ -62,7 +62,7 @@ def test_nntp_server(host, port, server=None, username=None, password=None, ssl=
             servers = get_servers()
             got_pass = False
             for server in servers:
-                if host in server:
+                if host in servers[server].host():
                     srv = servers[server]
                     password = srv.password()
                     got_pass = True

sabnzbd/wizard.py

@@ -121,7 +121,9 @@ class Wizard(object):
             info['ssl'] = 0
             info['ssl_verify'] = 2
         else:
-            for server in servers:
+            # Sort servers to get the first enabled one
+            server_names = sorted(servers.keys(), key=lambda svr: '%d%02d%s' % (int(not servers[svr].enable()), servers[svr].priority(), servers[svr].displayname().lower()))
+            for server in server_names:
                 # If there are multiple servers, just use the first enabled one
                 s = servers[server]
                 info['host'] = s.host()

six/__init__.py

@@ -1,6 +1,4 @@
-"""Utilities for writing code that runs on Python 2 and 3"""
-
-# Copyright (c) 2010-2015 Benjamin Peterson
+# Copyright (c) 2010-2017 Benjamin Peterson
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+"""Utilities for writing code that runs on Python 2 and 3"""
+
 from __future__ import absolute_import
 
 import functools
@@ -29,7 +29,7 @@ import sys
 import types
 
 __author__ = "Benjamin Peterson <benjamin@python.org>"
-__version__ = "1.10.0"
+__version__ = "1.11.0"
 
 
 # Useful for very coarse version differentiation.
@@ -241,6 +241,7 @@ _moved_attributes = [
     MovedAttribute("map", "itertools", "builtins", "imap", "map"),
     MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"),
     MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"),
+    MovedAttribute("getoutput", "commands", "subprocess"),
     MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
     MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"),
     MovedAttribute("reduce", "__builtin__", "functools"),
@@ -262,10 +263,11 @@ _moved_attributes = [
     MovedModule("html_entities", "htmlentitydefs", "html.entities"),
     MovedModule("html_parser", "HTMLParser", "html.parser"),
     MovedModule("http_client", "httplib", "http.client"),
+    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
+    MovedModule("email_mime_image", "email.MIMEImage", "email.mime.image"),
     MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
     MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"),
     MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
-    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
     MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
     MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
     MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
@@ -337,10 +339,12 @@ _urllib_parse_moved_attributes = [
     MovedAttribute("quote_plus", "urllib", "urllib.parse"),
     MovedAttribute("unquote", "urllib", "urllib.parse"),
     MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
+    MovedAttribute("unquote_to_bytes", "urllib", "urllib.parse", "unquote", "unquote_to_bytes"),
     MovedAttribute("urlencode", "urllib", "urllib.parse"),
     MovedAttribute("splitquery", "urllib", "urllib.parse"),
     MovedAttribute("splittag", "urllib", "urllib.parse"),
     MovedAttribute("splituser", "urllib", "urllib.parse"),
+    MovedAttribute("splitvalue", "urllib", "urllib.parse"),
     MovedAttribute("uses_fragment", "urlparse", "urllib.parse"),
     MovedAttribute("uses_netloc", "urlparse", "urllib.parse"),
     MovedAttribute("uses_params", "urlparse", "urllib.parse"),
@@ -416,6 +420,8 @@ _urllib_request_moved_attributes = [
     MovedAttribute("URLopener", "urllib", "urllib.request"),
     MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
     MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
+    MovedAttribute("parse_http_list", "urllib2", "urllib.request"),
+    MovedAttribute("parse_keqv_list", "urllib2", "urllib.request"),
 ]
 for attr in _urllib_request_moved_attributes:
     setattr(Module_six_moves_urllib_request, attr.name, attr)
@@ -679,11 +685,15 @@ if PY3:
     exec_ = getattr(moves.builtins, "exec")
 
     def reraise(tp, value, tb=None):
-        if value is None:
-            value = tp()
-        if value.__traceback__ is not tb:
-            raise value.with_traceback(tb)
-        raise value
+        try:
+            if value is None:
+                value = tp()
+            if value.__traceback__ is not tb:
+                raise value.with_traceback(tb)
+            raise value
+        finally:
+            value = None
+            tb = None
 
 else:
     def exec_(_code_, _globs_=None, _locs_=None):
@@ -699,19 +709,28 @@ else:
         exec("""exec _code_ in _globs_, _locs_""")
 
     exec_("""def reraise(tp, value, tb=None):
-    raise tp, value, tb
+    try:
+        raise tp, value, tb
+    finally:
+        tb = None
 """)
 
 
 if sys.version_info[:2] == (3, 2):
     exec_("""def raise_from(value, from_value):
-    if from_value is None:
-        raise value
-    raise value from from_value
+    try:
+        if from_value is None:
+            raise value
+        raise value from from_value
+    finally:
+        value = None
 """)
 elif sys.version_info[:2] > (3, 2):
     exec_("""def raise_from(value, from_value):
-    raise value from from_value
+    try:
+        raise value from from_value
+    finally:
+        value = None
 """)
 else:
     def raise_from(value, from_value):
@@ -802,10 +821,14 @@ def with_metaclass(meta, *bases):
     # This requires a bit of explanation: the basic idea is to make a dummy
     # metaclass for one level of class instantiation that replaces itself with
     # the actual metaclass.
-    class metaclass(meta):
+    class metaclass(type):
 
         def __new__(cls, name, this_bases, d):
             return meta(name, bases, d)
+
+        @classmethod
+        def __prepare__(cls, name, this_bases):
+            return meta.__prepare__(name, bases)
     return type.__new__(metaclass, 'temporary_class', (), {})