Merge branch 'master' into development

README.md

@@ -67,7 +67,6 @@ If you need something that is not already part of Bazarr, feel free to create a
 * SubZ
 * Supersubtitles
 * Titlovi
-* Titrari.ro
 * TVSubtitles
 * XSubs
 * Zimuku

bazarr/get_providers.py

@@ -39,7 +39,7 @@ PROVIDER_THROTTLE_MAP = {
 }
 
 PROVIDERS_FORCED_OFF = ["addic7ed", "tvsubtitles", "legendasdivx", "legendastv", "napiprojekt", "shooter", "hosszupuska",
-                        "supersubtitles", "titlovi", "titrari", "argenteam", "assrt", "subscene"]
+                        "supersubtitles", "titlovi", "argenteam", "assrt", "subscene"]
 
 throttle_count = {}
 

libs/subzero/language.py

@@ -30,7 +30,6 @@ repl_map = {
     "rum": "ro",
     "slo": "sk",
     "tib": "bo",
-    "ron": "ro",
 }
 
 ALPHA2_LIST = list(set(filter(lambda x: x, map(lambda x: x.alpha2, LANGUAGE_MATRIX)))) + list(repl_map.values())

views/providers.tpl

@@ -756,28 +756,6 @@
                             </div>
                         </div>
 
-                        <div class="middle aligned row">
-                            <div class="right aligned four wide column">
-                                <label>Titrari.ro</label>
-                            </div>
-                            <div class="one wide column">
-                                <div id="titrari" class="ui toggle checkbox provider">
-                                    <input type="checkbox">
-                                    <label></label>
-                                </div>
-                            </div>
-                            <div class="collapsed column">
-                                <div class="collapsed center aligned column">
-                                    <div class="ui basic icon" data-tooltip="Romanian Subtitles Provider." data-inverted="">
-                                        <i class="help circle large icon"></i>
-                                     </div>
-                                 </div>
-                             </div>
-                        </div>
-                        <div id="titrari_option" class="ui grid container">
-
-                        </div>
-
                         <div class="middle aligned row">
                             <div class="right aligned four wide column">
                                 <label>TVSubtitles</label>