Merge pull request #1260 from croneter/merge-from-leia

Merge from Kodi Leia
2021-01-02 13:48:09 +01:00 · 2021-01-02 13:48:09 +01:00 · 55de6a1572
commit 55de6a1572
parent 110bf3ff9a 189b3ce60c
23 changed files with 145 additions and 31 deletions
--- a/changelog.txt
+++ b/changelog.txt
@ -1,3 +1,12 @@
+version 3.0.0:
+- Major upgrade from Python 2 to Python 3, allowing use of Kodi 19 Matrix
+
+version 2.12.6:
+- Fix rare KeyError when using PKC widgets
+- Fix suspension of artwork caching and PKC becoming unresponsive
+- Update translations
+- Versions 2.12.4 and 2.12.5 for everyone
+
 version 2.12.5 (beta only):
 - Greatly improve matching logic for The Movie Database if Plex does not provide an appropriate id
 - Fix high transcoding resolutions not being available for Win10
--- a/resources/language/resource.language.cs_CZ/strings.po
+++ b/resources/language/resource.language.cs_CZ/strings.po
@ -950,6 +950,11 @@ msgctxt "#39036"
 msgid "Escape special characters in path (e.g. space to %20)"
 msgstr "Nahrazovat speciální znaky v cestě (např. z mezery na %20)"

+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr ""
+
 # PKC Settings - Customize Paths
 msgctxt "#39037"
 msgid "Original Plex MOVIE path to replace:"
--- a/resources/language/resource.language.da_DK/strings.po
+++ b/resources/language/resource.language.da_DK/strings.po
@ -954,6 +954,11 @@ msgctxt "#39036"
 msgid "Escape special characters in path (e.g. space to %20)"
 msgstr "Escape special characters in path (e.g. space to %20)"

+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr ""
+
 # PKC Settings - Customize Paths
 msgctxt "#39037"
 msgid "Original Plex MOVIE path to replace:"
--- a/resources/language/resource.language.de_DE/strings.po
+++ b/resources/language/resource.language.de_DE/strings.po
@ -966,6 +966,11 @@ msgctxt "#39036"
 msgid "Escape special characters in path (e.g. space to %20)"
 msgstr "Sonderzeichen im Pfad escapen (z.B. Leerzeichen zu %20)"

+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr "Sichere Zeichen für http(s), dav(s) und (s)ftp urls"
+
 # PKC Settings - Customize Paths
 msgctxt "#39037"
 msgid "Original Plex MOVIE path to replace:"
--- a/resources/language/resource.language.es_AR/strings.po
+++ b/resources/language/resource.language.es_AR/strings.po
@ -1,6 +1,6 @@
 #  XBMC Media Center language file
 # Translators:
-# Croneter None <croneter@gmail.com>, 2019
+# Croneter None <croneter@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@ -8,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: croneter@gmail.com\n"
 "POT-Creation-Date: 2017-04-15 13:13+0000\n"
 "PO-Revision-Date: 2017-04-30 08:30+0000\n"
-"Last-Translator: Croneter None <croneter@gmail.com>, 2019\n"
+"Last-Translator: Croneter None <croneter@gmail.com>, 2020\n"
 "Language-Team: Spanish (Argentina) (https://www.transifex.com/croneter/teams/73837/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -935,7 +935,7 @@ msgid ""
 "Kodi cannot locate the file %s. Please verify your PKC settings. Stop "
 "syncing?"
 msgstr ""
-"Kodi no puede localizer el archive %s. Por favoer verificar sus ajustes de "
+"Kodi no puede localizer el archivo %s. Por favor verificar sus ajustes de "
 "PKC. ¿Detener la sincronización?"

 # Pop-up on initial sync
@ -964,7 +964,12 @@ msgstr ""
 # PKC Settings - Customize Paths
 msgctxt "#39036"
 msgid "Escape special characters in path (e.g. space to %20)"
-msgstr "Escapar caracteres especiales en la ruta (i.e. espacio a %20)"
+msgstr "Escapar caracteres especiales en la ruta (p. ej. espacio a %20)"
+
+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr "Caracteres seguros para urls http(s), dav(s) y (s)ftp"

 # PKC Settings - Customize Paths
 msgctxt "#39037"
@ -1430,7 +1435,7 @@ msgid ""
 "The current Kodi version is not supported by PKC. Please consult the Plex "
 "forum."
 msgstr ""
-"La version actual de Kodi no está soportada por PKC.  Por favor consultar el"
+"La versión actual de Kodi no está soportada por PKC.  Por favor consultar el"
 " fórum de Plex."

 msgctxt "#39405"
@ -1474,7 +1479,7 @@ msgstr "Sagas"

 msgctxt "#39502"
 msgid "PKC On Deck (faster)"
-msgstr "Tablero de PKC (mas rapido)"
+msgstr "On Deck de PKC (más rápido)"

 msgctxt "#39600"
 msgid ""
@ -1616,8 +1621,8 @@ msgid ""
 "Do you want to replace your custom user ratings with an indicator of how "
 "many versions of a media item you posses?"
 msgstr ""
-"¿Quiere reemplazar su valoración personalizada con cuántas versione posee de"
-" un elemento de medios?"
+"¿Quiere reemplazar su valoración personalizada por cuántas versiones posee "
+"de un elemento de medios?"

 # In PKC Settings under Sync
 msgctxt "#39719"
--- a/resources/language/resource.language.es_ES/strings.po
+++ b/resources/language/resource.language.es_ES/strings.po
@ -2,6 +2,7 @@
 # Translators:
 # Dani <danichispa@gmail.com>, 2019
 # Bartolome Soriano <bsoriano@gmail.com>, 2019
+# Croneter None <croneter@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@ -9,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: croneter@gmail.com\n"
 "POT-Creation-Date: 2017-04-15 13:13+0000\n"
 "PO-Revision-Date: 2017-04-30 08:30+0000\n"
-"Last-Translator: Bartolome Soriano <bsoriano@gmail.com>, 2019\n"
+"Last-Translator: Croneter None <croneter@gmail.com>, 2020\n"
 "Language-Team: Spanish (Spain) (https://www.transifex.com/croneter/teams/73837/es_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/resources/language/resource.language.es_MX/strings.po
+++ b/resources/language/resource.language.es_MX/strings.po
@ -1,6 +1,6 @@
 #  XBMC Media Center language file
 # Translators:
-# Croneter None <croneter@gmail.com>, 2019
+# Croneter None <croneter@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@ -8,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: croneter@gmail.com\n"
 "POT-Creation-Date: 2017-04-15 13:13+0000\n"
 "PO-Revision-Date: 2017-04-30 08:30+0000\n"
-"Last-Translator: Croneter None <croneter@gmail.com>, 2019\n"
+"Last-Translator: Croneter None <croneter@gmail.com>, 2020\n"
 "Language-Team: Spanish (Mexico) (https://www.transifex.com/croneter/teams/73837/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -935,7 +935,7 @@ msgid ""
 "Kodi cannot locate the file %s. Please verify your PKC settings. Stop "
 "syncing?"
 msgstr ""
-"Kodi no puede localizer el archive %s. Por favoer verificar sus ajustes de "
+"Kodi no puede localizer el archivo %s. Por favor verificar sus ajustes de "
 "PKC. ¿Detener la sincronización?"

 # Pop-up on initial sync
@ -964,7 +964,12 @@ msgstr ""
 # PKC Settings - Customize Paths
 msgctxt "#39036"
 msgid "Escape special characters in path (e.g. space to %20)"
-msgstr "Escapar caracteres especiales en la ruta (i.e. espacio a %20)"
+msgstr "Escapar caracteres especiales en la ruta (p. ej. espacio a %20)"
+
+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr "Caracteres seguros para urls http(s), dav(s) y (s)ftp"

 # PKC Settings - Customize Paths
 msgctxt "#39037"
@ -1430,7 +1435,7 @@ msgid ""
 "The current Kodi version is not supported by PKC. Please consult the Plex "
 "forum."
 msgstr ""
-"La version actual de Kodi no está soportada por PKC.  Por favor consultar el"
+"La versión actual de Kodi no está soportada por PKC.  Por favor consultar el"
 " fórum de Plex."

 msgctxt "#39405"
@ -1474,7 +1479,7 @@ msgstr "Sagas"

 msgctxt "#39502"
 msgid "PKC On Deck (faster)"
-msgstr "Tablero de PKC (mas rapido)"
+msgstr "On Deck de PKC (más rápido)"

 msgctxt "#39600"
 msgid ""
@ -1616,8 +1621,8 @@ msgid ""
 "Do you want to replace your custom user ratings with an indicator of how "
 "many versions of a media item you posses?"
 msgstr ""
-"¿Quiere reemplazar su valoración personalizada con cuántas versione posee de"
-" un elemento de medios?"
+"¿Quiere reemplazar su valoración personalizada por cuántas versiones posee "
+"de un elemento de medios?"

 # In PKC Settings under Sync
 msgctxt "#39719"
--- a/resources/language/resource.language.fr_CA/strings.po
+++ b/resources/language/resource.language.fr_CA/strings.po
@ -975,6 +975,11 @@ msgstr ""
 "Echapper les caractères spéciaux dans le chemin (ex: %20 au lieu des "
 "espaces)"

+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr "Caractères sûrs pour les urls http(s), dav(s) et (s)ftp"
+
 # PKC Settings - Customize Paths
 msgctxt "#39037"
 msgid "Original Plex MOVIE path to replace:"
--- a/resources/language/resource.language.fr_FR/strings.po
+++ b/resources/language/resource.language.fr_FR/strings.po
@ -979,6 +979,11 @@ msgstr ""
 "Echapper les caractères spéciaux dans le chemin (ex: %20 au lieu des "
 "espaces)"

+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr "Caractères sûrs pour les urls http(s), dav(s) et (s)ftp"
+
 # PKC Settings - Customize Paths
 msgctxt "#39037"
 msgid "Original Plex MOVIE path to replace:"
--- a/resources/language/resource.language.hu_HU/strings.po
+++ b/resources/language/resource.language.hu_HU/strings.po
@ -968,6 +968,11 @@ msgid "Escape special characters in path (e.g. space to %20)"
 msgstr ""
 "A speciális karakterek feloldása az elérési útban (pl. szóköz helyett %20)"

+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr ""
+
 # PKC Settings - Customize Paths
 msgctxt "#39037"
 msgid "Original Plex MOVIE path to replace:"
--- a/resources/language/resource.language.it_IT/strings.po
+++ b/resources/language/resource.language.it_IT/strings.po
@ -967,6 +967,11 @@ msgstr ""
 "Esegui l'escape dei caratteri speciali nel percorso (es. \"spazio\" "
 "trasformato in \"%20\")"

+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr ""
+
 # PKC Settings - Customize Paths
 msgctxt "#39037"
 msgid "Original Plex MOVIE path to replace:"
--- a/resources/language/resource.language.lt_LT/strings.po
+++ b/resources/language/resource.language.lt_LT/strings.po
@ -963,6 +963,11 @@ msgctxt "#39036"
 msgid "Escape special characters in path (e.g. space to %20)"
 msgstr "Kaita specialių simbolių kelyje (pvz., tarpas %20)"

+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr ""
+
 # PKC Settings - Customize Paths
 msgctxt "#39037"
 msgid "Original Plex MOVIE path to replace:"
--- a/resources/language/resource.language.lv_LV/strings.po
+++ b/resources/language/resource.language.lv_LV/strings.po
@ -946,6 +946,11 @@ msgctxt "#39036"
 msgid "Escape special characters in path (e.g. space to %20)"
 msgstr ""

+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr ""
+
 # PKC Settings - Customize Paths
 msgctxt "#39037"
 msgid "Original Plex MOVIE path to replace:"
@ -1100,7 +1105,7 @@ msgstr "Uzspiest atjaunošanu Kodi ādiņai apturot atskaņošanu"
 # PKC Settings - Appearance Tweaks
 msgctxt "#39066"
 msgid "Recently Added: Also show already watched movies"
-msgstr ""
+msgstr "Nesen Pievienots: Rādīt arī jau skatītas filmas"

 # PKC Settings - Connection
 msgctxt "#39067"
@ -1110,7 +1115,7 @@ msgstr "Tavs pašreizējais Plex Media Serveris:"
 # PKC Settings - Connection
 msgctxt "#39068"
 msgid "Manually enter Plex Media Server address"
-msgstr ""
+msgstr "Pats ievadi Plex Media Server adresi"

 # PKC Settings - Connection
 msgctxt "#39069"
@ -1173,22 +1178,22 @@ msgstr ""
 # Button text for choosing PKC mode
 msgctxt "#39081"
 msgid "Add-on Paths"
-msgstr ""
+msgstr "Spraudņu Ceļš"

 # Button text for choosing PKC mode
 msgctxt "#39082"
 msgid "Direct Paths"
-msgstr ""
+msgstr "Tiešie Ceļi"

 # Dialog for manually entering PMS
 msgctxt "#39083"
 msgid "Enter PMS IP or URL"
-msgstr ""
+msgstr "Ievadi PMS IP vai URL"

 # Dialog for manually entering PMS
 msgctxt "#39084"
 msgid "Enter PMS port"
-msgstr ""
+msgstr "Ievadi PMS portu"

 # PKC settings - Appearance Tweaks
 msgctxt "#39085"
@ -1291,23 +1296,23 @@ msgstr "Tikai trūkstošo"
 # Message in the PKC settings if user has not logged in to plex.tv
 msgctxt "#39226"
 msgid "Not logged in to plex.tv"
-msgstr ""
+msgstr "Nav pieteicies plex.tv"

 # Message in the PKC settings if user is logged in to plex.tv
 msgctxt "#39227"
 msgid "Logged in to plex.tv"
-msgstr ""
+msgstr "Pieteicies plex.tv"

 # Message in the PKC settings to display the plex.tv username
 msgctxt "#39228"
 msgid "Plex admin user"
-msgstr ""
+msgstr "Plex admin user"

 # Error message if user could not log in; the actual user name will be
 # appended at the end of the string
 msgctxt "#39229"
 msgid "Login failed with plex.tv for user"
-msgstr ""
+msgstr "Lietotāja pieteikšanās plex.tv neizdevās"

 # Message in the PKC settings to display the plex.tv username
 msgctxt "#39230"
@ -1472,7 +1477,7 @@ msgstr ""
 # Addon Disclaimer
 msgctxt "#39705"
 msgid "Use at your own risk"
-msgstr ""
+msgstr "Lieto uz savu atbildību"

 # If user gets prompted to choose between several subtitles to burn in
 msgctxt "#39706"
@ -1530,7 +1535,7 @@ msgstr "Sinhronizēt"
 # Shown during sync process
 msgctxt "#39715"
 msgid "Synching playlists"
-msgstr ""
+msgstr "Sinhronizē spēļsarakstus"

 # Error message if an xml, e.g. advancedsettings.xml cannot be parsed (xml is
 # screwed up; formated the wrong way). Do NOT replace {0} and {1}!
--- a/resources/language/resource.language.nl_NL/strings.po
+++ b/resources/language/resource.language.nl_NL/strings.po
@ -957,6 +957,11 @@ msgctxt "#39036"
 msgid "Escape special characters in path (e.g. space to %20)"
 msgstr "Pas speciale tekens aan in pad (b.v. spatie naar %20)"

+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr ""
+
 # PKC Settings - Customize Paths
 msgctxt "#39037"
 msgid "Original Plex MOVIE path to replace:"
--- a/resources/language/resource.language.no_NO/strings.po
+++ b/resources/language/resource.language.no_NO/strings.po
@ -951,6 +951,11 @@ msgctxt "#39036"
 msgid "Escape special characters in path (e.g. space to %20)"
 msgstr "Unngå spesielle tegn i stier (eksempel mellomrom til %20)"

+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr ""
+
 # PKC Settings - Customize Paths
 msgctxt "#39037"
 msgid "Original Plex MOVIE path to replace:"
--- a/resources/language/resource.language.pt_BR/strings.po
+++ b/resources/language/resource.language.pt_BR/strings.po
@ -945,6 +945,11 @@ msgctxt "#39036"
 msgid "Escape special characters in path (e.g. space to %20)"
 msgstr ""

+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr ""
+
 # PKC Settings - Customize Paths
 msgctxt "#39037"
 msgid "Original Plex MOVIE path to replace:"
--- a/resources/language/resource.language.pt_PT/strings.po
+++ b/resources/language/resource.language.pt_PT/strings.po
@ -948,6 +948,11 @@ msgctxt "#39036"
 msgid "Escape special characters in path (e.g. space to %20)"
 msgstr ""

+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr ""
+
 # PKC Settings - Customize Paths
 msgctxt "#39037"
 msgid "Original Plex MOVIE path to replace:"
--- a/resources/language/resource.language.ru_RU/strings.po
+++ b/resources/language/resource.language.ru_RU/strings.po
@ -961,6 +961,11 @@ msgctxt "#39036"
 msgid "Escape special characters in path (e.g. space to %20)"
 msgstr "Преобразуйте специальные символы в пути. (например пробел в %20)"

+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr ""
+
 # PKC Settings - Customize Paths
 msgctxt "#39037"
 msgid "Original Plex MOVIE path to replace:"
--- a/resources/language/resource.language.sv_SE/strings.po
+++ b/resources/language/resource.language.sv_SE/strings.po
@ -951,6 +951,11 @@ msgctxt "#39036"
 msgid "Escape special characters in path (e.g. space to %20)"
 msgstr "Omkoda specialtecken i sökväg (exempelvis mellanslag som %20)"

+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr ""
+
 # PKC Settings - Customize Paths
 msgctxt "#39037"
 msgid "Original Plex MOVIE path to replace:"
--- a/resources/language/resource.language.uk_UA/strings.po
+++ b/resources/language/resource.language.uk_UA/strings.po
@ -957,6 +957,11 @@ msgctxt "#39036"
 msgid "Escape special characters in path (e.g. space to %20)"
 msgstr "Замінювати спеціальні символи у шляхах (наприклад, пробіл у %20)"

+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr "Безпечні символи для URL-адрес http(s), dav(s) та (s)ftp"
+
 # PKC Settings - Customize Paths
 msgctxt "#39037"
 msgid "Original Plex MOVIE path to replace:"
@ -1528,7 +1533,7 @@ msgstr "Використовуйте на свій ризик"
 # If user gets prompted to choose between several subtitles to burn in
 msgctxt "#39706"
 msgid "Don't burn-in any subtitle"
-msgstr ""
+msgstr "Не виводити жодних субтитрів"

 # If user gets prompted to choose between several audio/subtitle tracks and
 # language is unknown
--- a/resources/language/resource.language.zh_CN/strings.po
+++ b/resources/language/resource.language.zh_CN/strings.po
@ -918,6 +918,11 @@ msgctxt "#39036"
 msgid "Escape special characters in path (e.g. space to %20)"
 msgstr ""

+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr ""
+
 # PKC Settings - Customize Paths
 msgctxt "#39037"
 msgid "Original Plex MOVIE path to replace:"
--- a/resources/language/resource.language.zh_TW/strings.po
+++ b/resources/language/resource.language.zh_TW/strings.po
@ -916,6 +916,11 @@ msgctxt "#39036"
 msgid "Escape special characters in path (e.g. space to %20)"
 msgstr ""

+# PKC Settings - Customize Paths
+msgctxt "#39090"
+msgid "Safe characters for http(s), dav(s) and (s)ftp urls"
+msgstr ""
+
 # PKC Settings - Customize Paths
 msgctxt "#39037"
 msgid "Original Plex MOVIE path to replace:"
--- a/resources/lib/widgets.py
+++ b/resources/lib/widgets.py
@ -128,7 +128,11 @@ def _generate_content(api):
        # Item is synched to the Kodi db - let's use that info
        # (will thus e.g. include additional artwork or metadata)
        item = js.item_details(api.kodi_id, api.kodi_type)
-    else:
+
+    # In rare cases, Kodi's JSON reply does not provide 'title' plus potentially
+    # other fields - let's use the PMS answer to be safe
+    # See https://github.com/croneter/PlexKodiConnect/issues/1129
+    if not api.kodi_id or 'title' not in item:
        cast = [{
            'name': x[0],
            'thumbnail': x[1],