Merge branch 'master' into remove_commented_code

This commit is contained in:
Abby 2019-12-09 20:33:40 +00:00 committed by GitHub
commit f7fdcd0cd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 904 additions and 739 deletions

View file

@ -15,7 +15,7 @@ import xbmcaddon
import database
from downloader import TheVoid
from obj import Objects
from helper import _, playutils, api, window, settings, dialog
from helper import translate, playutils, api, window, settings, dialog
from dialogs import resume
#################################################################################################
@ -122,7 +122,7 @@ class Actions(object):
if settings('askCinema') == "true":
resp = dialog("yesno", heading="{jellyfin}", line1=_(33016))
resp = dialog("yesno", heading="{jellyfin}", line1=translate(33016))
if not resp:
enabled = False

View file

@ -216,4 +216,4 @@ class GetArtworkWorker(threading.Thread):
self.queue.task_done()
if xbmc.Monitor().abortRequested():
break
break