xbmc · enen92 · Oct 12, 2023 · Oct 12, 2023
diff --git a/plugin.video.composite_for_plex/addon.xml b/plugin.video.composite_for_plex/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.composite_for_plex" name="Composite" version="2.0.1" provider-name="anxdpanic">
+<addon id="plugin.video.composite_for_plex" name="Composite" version="2.0.2" provider-name="anxdpanic">
     <requires>
         <import addon="xbmc.python" version="3.0.1"/>
         <import addon="script.module.requests" version="2.12.4"/>
@@ -41,8 +41,7 @@
             <fanart>resources/media/fanart.png</fanart>
         </assets>
         <news>
-[fix] encoding error in logging
-[upd] linting
+[fix] leftover kodi-six imports
 [lang] update translations from Weblate
         </news>
         <platform>all</platform>
@@ -55,15 +54,15 @@
         <description lang="es_ES">Explorar y reproducir archivos multimedia de vídeo, música y fotos gestionados por Plex Media Server.[CR][CR]Bifurcación de PleXBMC por Hippojay</description>
         <description lang="es_MX">Explora y reproduce multimedia tal como video, música y e imágenes administrados por Plex Media Server.[CR][CR]Fork de PleXBMC por Hippojay</description>
         <description lang="fi_FI">Selaa ja toista video-, musiikki- ja kuvamediatiedostoja, joita Plex Media Server hallinnoi.[CR][CR]kehittäjän Hippojay PleXBMC-kehityshaara</description>
-        <description lang="it_IT">Sfoglia e riproduci file multimediali di video, musica e foto gestiti da Plex Media Server.[CR][CR]Fork di PleXBMC di Hippojay</description>
+        <description lang="it_IT">Sfoglia e riproduci video, musica e foto gestiti da Plex Media Server.[CR][CR]Fork di PleXBMC di Hippojay</description>
         <description lang="pl_PL">Przeglądaj i odtwarzaj pliki multimedialne zarządzane przez Plex Media Server.[CR] [CR] Jest to fork PleXBMC stworzonego przez Hippojay&apos;a</description>
         <description lang="vi_VN">Duyệt và phát các tập tin đa phương tiện video, nhạc và ảnh do Plex Media Server quản lý.[CR][CR]Fork of PleXBMC by Hippojay</description>
         <disclaimer lang="de_DE">Composite ist KEIN offizielles Plex-Addon und wird von Plex weder unterstützt noch gebilligt.</disclaimer>
         <disclaimer lang="en_GB">Composite is NOT an official Plex add-on and is not supported or endorsed by Plex.</disclaimer>
         <disclaimer lang="es_ES">Composite NO es un add-on oficial de Plex y no está apoyado ni respaldado por Plex.</disclaimer>
         <disclaimer lang="es_MX">Composite NO es un complemento oficial de Plex y no tiene soporte o respaldo por parte de Plex.</disclaimer>
         <disclaimer lang="fi_FI">Composite ei ole virallinen Plex-lisäosa, eikä Plex tue tai suosittele sen käyttöä.</disclaimer>
-        <disclaimer lang="it_IT">Composite NON è un componente aggiuntivo Plex ufficiale e non è supportato o approvato da Plex.</disclaimer>
+        <disclaimer lang="it_IT">Composite NON è un add-on ufficiale di Plex e non è supportato o approvato da Plex.</disclaimer>
         <disclaimer lang="pl_PL">Composite NIE jest oficjalnym dodatkiem do programu Plex, nie jest wspierany ani zatwierdzany przez firmę Plex.</disclaimer>
         <disclaimer lang="vi_VN">Composite KHÔNG phải là một tiện ích chính thức của Plex và không được Plex hỗ trợ hoặc xác nhận.</disclaimer>
     </extension>

diff --git a/plugin.video.composite_for_plex/resources/language/resource.language.ca_es/strings.po b/plugin.video.composite_for_plex/resources/language/resource.language.ca_es/strings.po
@@ -5,17 +5,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Composite\n"
-"Report-Msgid-Bugs-To: https://github.com/anxdpanic/plugin.video.composite_for_plex/issues\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2014-10-26 17:05+0000\n"
-"PO-Revision-Date: 2022-08-27 12:14+0000\n"
-"Last-Translator: Xean <[email protected]>\n"
+"PO-Revision-Date: 2023-06-21 11:42+0000\n"
+"Last-Translator: Christian Gade <[email protected]>\n"
 "Language-Team: Catalan (Spain) <https://kodi.weblate.cloud/projects/kodi-add-ons-video/plugin-video-composite_for_plex/ca_es/>\n"
 "Language: ca_es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.14\n"
+"X-Generator: Weblate 4.18\n"
 
 msgctxt "Addon Description"
 msgid "Browse and play video, music and photo media files managed by Plex Media Server.[CR][CR]Fork of PleXBMC by Hippojay"
@@ -360,7 +360,7 @@ msgstr ""
 
 msgctxt "#30084"
 msgid "Channels"
-msgstr ""
+msgstr "Canals"
 
 msgctxt "#30085"
 msgid "Playlists"

diff --git a/plugin.video.composite_for_plex/resources/language/resource.language.de_de/strings.po b/plugin.video.composite_for_plex/resources/language/resource.language.de_de/strings.po
@@ -5,10 +5,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Composite\n"
-"Report-Msgid-Bugs-To: https://github.com/anxdpanic/plugin.video.composite_for_plex/issues\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2014-10-26 17:05+0000\n"
-"PO-Revision-Date: 2023-02-02 18:45+0000\n"
-"Last-Translator: Kai Sommerfeld <[email protected]>\n"
+"PO-Revision-Date: 2023-04-21 18:16+0000\n"
+"Last-Translator: Kai Sommerfeld <[email protected]>\n"
 "Language-Team: German <https://kodi.weblate.cloud/projects/kodi-add-ons-video/plugin-video-composite_for_plex/de_de/>\n"
 "Language: de_de\n"
 "MIME-Version: 1.0\n"
@@ -1461,7 +1461,7 @@ msgstr "Quelle"
 
 msgctxt "#30773"
 msgid "None"
-msgstr ""
+msgstr "Keine"
 
 msgctxt "#30774"
 msgid "Generating Playlist"

diff --git a/plugin.video.composite_for_plex/resources/language/resource.language.es_es/strings.po b/plugin.video.composite_for_plex/resources/language/resource.language.es_es/strings.po
@@ -5,10 +5,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Composite\n"
-"Report-Msgid-Bugs-To: https://github.com/anxdpanic/plugin.video.composite_for_plex/issues\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2014-10-26 17:05+0000\n"
-"PO-Revision-Date: 2023-02-17 18:08+0000\n"
-"Last-Translator: José Antonio Alvarado <jalvarado0.eses@gmail.com>\n"
+"PO-Revision-Date: 2023-03-04 08:15+0000\n"
+"Last-Translator: Alfonso Cachero <alfonso.cachero@gmail.com>\n"
 "Language-Team: Spanish (Spain) <https://kodi.weblate.cloud/projects/kodi-add-ons-video/plugin-video-composite_for_plex/es_es/>\n"
 "Language: es_es\n"
 "MIME-Version: 1.0\n"
@@ -1577,51 +1577,51 @@ msgstr "Detectar servidores"
 
 msgctxt "#30802"
 msgid "420x420, 320Kbps"
-msgstr ""
+msgstr "420x420, 320Kbps"
 
 msgctxt "#30803"
 msgid "576x320, 720Kbps"
-msgstr ""
+msgstr "576x320, 720Kbps"
 
 msgctxt "#30804"
 msgid "720x480, 1.5Mbps"
-msgstr ""
+msgstr "720x480, 1.5Mbps"
 
 msgctxt "#30805"
 msgid "1024x768, 2Mbps"
-msgstr ""
+msgstr "1024x768, 2Mbps"
 
 msgctxt "#30806"
 msgid "1280x720, 3Mbps"
-msgstr ""
+msgstr "1280x720, 3Mbps"
 
 msgctxt "#30807"
 msgid "1280x720, 4Mbps"
-msgstr ""
+msgstr "1280x720, 4Mbps"
 
 msgctxt "#30808"
 msgid "1920x1080, 8Mbps"
-msgstr ""
+msgstr "1920x1080, 8Mbps"
 
 msgctxt "#30809"
 msgid "1920x1080, 10Mbps"
-msgstr ""
+msgstr "1920x1080, 10Mbps"
 
 msgctxt "#30810"
 msgid "1920x1080, 12Mbps"
-msgstr ""
+msgstr "1920x1080, 12Mbps"
 
 msgctxt "#30811"
 msgid "1920x1080, 20Mbps"
-msgstr ""
+msgstr "1920x1080, 20Mbps"
 
 msgctxt "#30812"
 msgid "1920x1080, 40Mbps"
-msgstr ""
+msgstr "1920x1080, 40Mbps"
 
 msgctxt "#30813"
 msgid "1920x1080, unlimited"
-msgstr ""
+msgstr "1920x1080, ilimitado"
 
 #~ msgctxt "#30689"
 #~ msgid "Up Next requires Kodi 18 or higher"

diff --git a/plugin.video.composite_for_plex/resources/language/resource.language.fi_fi/strings.po b/plugin.video.composite_for_plex/resources/language/resource.language.fi_fi/strings.po
@@ -5,17 +5,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Composite\n"
-"Report-Msgid-Bugs-To: https://github.com/anxdpanic/plugin.video.composite_for_plex/issues\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2014-10-26 17:05+0000\n"
-"PO-Revision-Date: 2022-08-03 14:14+0000\n"
+"PO-Revision-Date: 2023-10-05 00:11+0000\n"
 "Last-Translator: Oskari Lavinto <[email protected]>\n"
 "Language-Team: Finnish <https://kodi.weblate.cloud/projects/kodi-add-ons-video/plugin-video-composite_for_plex/fi_fi/>\n"
 "Language: fi_fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.13\n"
+"X-Generator: Weblate 5.0.2\n"
 
 msgctxt "Addon Description"
 msgid "Browse and play video, music and photo media files managed by Plex Media Server.[CR][CR]Fork of PleXBMC by Hippojay"
@@ -1089,7 +1089,7 @@ msgstr "\"%s\" lisättiin toistolistalle \"%s\""
 
 msgctxt "#30679"
 msgid "Failed to add %s to the %s playlist"
-msgstr "\"%s\" lisäys toistolistalle \"%s\" epäonnistui"
+msgstr "\"%s\" lisääminen toistolistalle \"%s\" ei onnistunut"
 
 msgctxt "#30680"
 msgid "%s is already in the %s playlist"
@@ -1101,7 +1101,7 @@ msgstr "\"%s\" poistettiin toistolistalta \"%s\""
 
 msgctxt "#30682"
 msgid "Unable to remove %s from the %s playlist"
-msgstr "\"%s\" poisto toistolistalta \"%s\" ei onnistu"
+msgstr "\"%s\" poistaminen toistolistalta \"%s\" ei onnistunut"
 
 msgctxt "#30683"
 msgid "Show the 'Delete' context menu"

diff --git a/plugin.video.composite_for_plex/resources/language/resource.language.it_it/strings.po b/plugin.video.composite_for_plex/resources/language/resource.language.it_it/strings.po
@@ -5,33 +5,33 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Composite\n"
-"Report-Msgid-Bugs-To: https://github.com/anxdpanic/plugin.video.composite_for_plex/issues\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2014-10-26 17:05+0000\n"
-"PO-Revision-Date: 2023-01-22 10:15+0000\n"
+"PO-Revision-Date: 2023-05-09 06:27+0000\n"
 "Last-Translator: Massimo Pissarello <[email protected]>\n"
 "Language-Team: Italian <https://kodi.weblate.cloud/projects/kodi-add-ons-video/plugin-video-composite_for_plex/it_it/>\n"
 "Language: it_it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.15.1\n"
+"X-Generator: Weblate 4.15.2\n"
 
 msgctxt "Addon Description"
 msgid "Browse and play video, music and photo media files managed by Plex Media Server.[CR][CR]Fork of PleXBMC by Hippojay"
-msgstr "Sfoglia e riproduci file multimediali di video, musica e foto gestiti da Plex Media Server.[CR][CR]Fork di PleXBMC di Hippojay"
+msgstr "Sfoglia e riproduci video, musica e foto gestiti da Plex Media Server.[CR][CR]Fork di PleXBMC di Hippojay"
 
 msgctxt "Addon Disclaimer"
 msgid "Composite is NOT an official Plex add-on and is not supported or endorsed by Plex."
-msgstr "Composite NON è un componente aggiuntivo Plex ufficiale e non è supportato o approvato da Plex."
+msgstr "Composite NON è un add-on ufficiale di Plex e non è supportato o approvato da Plex."
 
 msgctxt "#30000"
 msgid "Confirm file delete?"
 msgstr "Confermare l'eliminazione del file?"
 
 msgctxt "#30001"
 msgid "Delete this item? This action will delete media and associated data files."
-msgstr "Eliminare questo elemento? Questa azione eliminerà i file multimediali e di dati associati."
+msgstr "Eliminare questo elemento? Questa azione eliminerà i file multimediali e i file di dati associati."
 
 msgctxt "#30002"
 msgid "Plex Online"
@@ -401,7 +401,7 @@ msgstr "Ottieni metadata estesi da PMS"
 
 msgctxt "#30503"
 msgid "Enable extra filter menus"
-msgstr "Abilita i filtri aggiuntivi nei menu"
+msgstr "Abilita filtri aggiuntivi nei menu"
 
 msgctxt "#30504"
 msgid "Server Discovery"
@@ -925,7 +925,7 @@ msgstr ""
 
 msgctxt "#30638"
 msgid "Enter search term"
-msgstr ""
+msgstr "Inserisci il termine di ricerca"
 
 msgctxt "#30639"
 msgid "Enter value"
@@ -1081,7 +1081,7 @@ msgstr "Seleziona playlist"
 
 msgctxt "#30677"
 msgid "Add to playlist"
-msgstr "Aggiungi a playlist"
+msgstr "Aggiungi alla playlist"
 
 msgctxt "#30678"
 msgid "Added %s to the %s playlist"

diff --git a/plugin.video.composite_for_plex/resources/language/resource.language.nl_nl/strings.po b/plugin.video.composite_for_plex/resources/language/resource.language.nl_nl/strings.po
@@ -5,17 +5,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Composite\n"
-"Report-Msgid-Bugs-To: https://github.com/anxdpanic/plugin.video.composite_for_plex/issues\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2014-10-26 17:05+0000\n"
-"PO-Revision-Date: 2022-03-11 09:05+0000\n"
+"PO-Revision-Date: 2023-06-21 11:42+0000\n"
 "Last-Translator: Christian Gade <[email protected]>\n"
 "Language-Team: Dutch <https://kodi.weblate.cloud/projects/kodi-add-ons-video/plugin-video-composite_for_plex/nl_nl/>\n"
 "Language: nl_nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.11.2\n"
+"X-Generator: Weblate 4.18\n"
 
 msgctxt "Addon Description"
 msgid "Browse and play video, music and photo media files managed by Plex Media Server.[CR][CR]Fork of PleXBMC by Hippojay"
@@ -372,7 +372,7 @@ msgstr ""
 
 msgctxt "#30087"
 msgid "All episodes"
-msgstr ""
+msgstr "Alle afleveringen"
 
 msgctxt "#30088"
 msgid "Season"

diff --git a/plugin.video.composite_for_plex/resources/language/resource.language.sk_sk/strings.po b/plugin.video.composite_for_plex/resources/language/resource.language.sk_sk/strings.po
@@ -5,17 +5,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Composite\n"
-"Report-Msgid-Bugs-To: https://github.com/anxdpanic/plugin.video.composite_for_plex/issues\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2014-10-26 17:05+0000\n"
-"PO-Revision-Date: 2022-04-07 23:13+0000\n"
+"PO-Revision-Date: 2023-06-21 11:42+0000\n"
 "Last-Translator: Christian Gade <[email protected]>\n"
 "Language-Team: Slovak <https://kodi.weblate.cloud/projects/kodi-add-ons-video/plugin-video-composite_for_plex/sk_sk/>\n"
 "Language: sk_sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.11.2\n"
+"X-Generator: Weblate 4.18\n"
 
 msgctxt "Addon Description"
 msgid "Browse and play video, music and photo media files managed by Plex Media Server.[CR][CR]Fork of PleXBMC by Hippojay"
@@ -372,7 +372,7 @@ msgstr ""
 
 msgctxt "#30087"
 msgid "All episodes"
-msgstr ""
+msgstr "Všetky epizódy"
 
 msgctxt "#30088"
 msgid "Season"

diff --git a/plugin.video.composite_for_plex/resources/lib/composite_addon/addon/dialogs/skip_intro.py b/plugin.video.composite_for_plex/resources/lib/composite_addon/addon/dialogs/skip_intro.py
@@ -9,8 +9,8 @@
     See LICENSES/GPL-2.0-or-later.txt for more information.
 """
 
-from kodi_six.xbmc import Player  # pylint: disable=import-error
-from kodi_six.xbmcgui import WindowXMLDialog  # pylint: disable=import-error
+from xbmc import Player  # pylint: disable=import-error
+from xbmcgui import WindowXMLDialog  # pylint: disable=import-error
 
 from ..logger import Logger