diff --git a/interfaces/Config/templates/config_switches.tmpl b/interfaces/Config/templates/config_switches.tmpl index a1fc8cb..f9ed42d 100644 --- a/interfaces/Config/templates/config_switches.tmpl +++ b/interfaces/Config/templates/config_switches.tmpl @@ -153,13 +153,6 @@ 0 then 'checked="checked"' else ""#--> /> $T('explain-enable_all_par').replace('. ', '.
')
- -
- - 0 then 'checked="checked"' else ""#--> /> - $T('explain-par2_multipar') -
-
diff --git a/sabnzbd/interface.py b/sabnzbd/interface.py index a0a6ba2..f6949bd 100644 --- a/sabnzbd/interface.py +++ b/sabnzbd/interface.py @@ -1298,7 +1298,7 @@ class ConfigFolders(object): ############################################################################## SWITCH_LIST = \ - ('par2_multicore', 'multipar', 'par_option', 'top_only', 'ssl_ciphers', + ('par2_multicore', 'par_option', 'top_only', 'ssl_ciphers', 'auto_sort', 'propagation_delay', 'auto_disconnect', 'flat_unpack', 'safe_postproc', 'no_dupes', 'replace_spaces', 'replace_dots', 'ignore_samples', 'pause_on_post_processing', 'nice', 'ionice', @@ -1375,10 +1375,10 @@ SPECIAL_BOOL_LIST = \ ('start_paused', 'no_penalties', 'ignore_wrong_unrar', 'overwrite_files', 'enable_par_cleanup', 'queue_complete_pers', 'api_warnings', 'ampm', 'enable_unrar', 'enable_unzip', 'enable_7zip', 'enable_filejoin', 'enable_tsjoin', 'allow_streaming', 'ignore_unrar_dates', 'par2_multicore', - 'osx_menu', 'osx_speed', 'win_menu', 'use_pickle', 'allow_incomplete_nzb', 'rss_filenames', - 'ipv6_hosting', 'keep_awake', 'empty_postproc', 'html_login', 'wait_for_dfolder', 'max_art_opt', - 'warn_empty_nzb', 'enable_bonjour','allow_duplicate_files', 'warn_dupl_jobs', 'replace_illegal', - 'backup_for_duplicates', 'disable_api_key', 'api_logging', 'enable_meta', + 'multipar', 'osx_menu', 'osx_speed', 'win_menu', 'use_pickle', 'allow_incomplete_nzb', + 'rss_filenames', 'ipv6_hosting', 'keep_awake', 'empty_postproc', 'html_login', 'wait_for_dfolder', + 'max_art_opt', 'warn_empty_nzb', 'enable_bonjour','allow_duplicate_files', 'warn_dupl_jobs', + 'replace_illegal', 'backup_for_duplicates', 'disable_api_key', 'api_logging', 'enable_meta', ) SPECIAL_VALUE_LIST = \ ('size_limit', 'folder_max_length', 'fsys_type', 'movie_rename_limit', 'nomedia_marker', diff --git a/sabnzbd/skintext.py b/sabnzbd/skintext.py index f6b26f1..8f3ecae 100644 --- a/sabnzbd/skintext.py +++ b/sabnzbd/skintext.py @@ -452,8 +452,6 @@ SKIN_TEXT = { 'explain-pre_script' : TT('Used before an NZB enters the queue.'), 'opt-par2_multicore' : TT('Enable MultiCore Par2'), 'explain-par2_multicore' : TT('Read the Wiki Help on this!'), - 'opt-par2_multipar' : TT('Enable MultiPar'), - 'explain-par2_multipar' : TT('MultiPar is the fastest par2 verification and repair implementation, using multiple cores and the GPU (if available).'), 'opt-par_option' : TT('Extra PAR2 Parameters'), 'explain-par_option' : TT('Read the Wiki Help on this!'), 'opt-nice' : TT('Nice Parameters'),