Merge pull request #1536 from croneter/beta-version

Bump master
2021-07-18 12:04:58 +02:00 · 2021-07-18 12:04:58 +02:00 · 3ff97d0669
commit 3ff97d0669
parent 0cf35b7b87 7553061945
32 changed files with 367 additions and 8 deletions
--- a/addon.xml
+++ b/addon.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.12.25" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.13.0" provider-name="croneter">
  <requires>
    <import addon="xbmc.python" version="2.1.0"/>
    <import addon="script.module.requests" version="2.9.1" />
@ -88,7 +88,17 @@
    <summary lang="ko_KR">Plex를 Kodi에 기본 통합</summary>
    <description lang="ko_KR">Kodi를 Plex Media Server에 연결합니다. 이 플러그인은 Plex로 모든 비디오를 관리하고 Kodi로는 관리하지 않는다고 가정합니다. Kodi 비디오 및 음악 데이터베이스에 이미 저장된 데이터가 손실 될 수 있습니다 (이 플러그인이 직접 변경하므로). 자신의 책임하에 사용하십시오!</description>
    <disclaimer lang="ko_KR">자신의 책임하에 사용</disclaimer>
-    <news>version 2.12.25:
+    <news>version 2.13.0:
+- Support for the Plex HAMA agent to let Kodi identify animes (using Kodi's uniqueID 'anidb')
+- Support forced HAMA IDs when using tvdb uniqueID
+- version 2.12.26 for everyone
+
+version 2.12.26 (beta only):
+- Add an additional Plex Hub "PKC Continue Watching" that merges the Plex Continue Watching with On Deck
+- Fix auto-picking of video stream if several video versions are available
+- Update translations
+
+version 2.12.25:
 - Update websocket client to 0.59.0. Fix threading issues and AttributeErrors

 version 2.12.24:
--- a/changelog.txt
+++ b/changelog.txt
@ -1,3 +1,13 @@
+version 2.13.0:
+- Support for the Plex HAMA agent to let Kodi identify animes (using Kodi's uniqueID 'anidb')
+- Support forced HAMA IDs when using tvdb uniqueID
+- version 2.12.26 for everyone
+
+version 2.12.26 (beta only):
+- Add an additional Plex Hub "PKC Continue Watching" that merges the Plex Continue Watching with On Deck
+- Fix auto-picking of video stream if several video versions are available
+- Update translations
+
 version 2.12.25:
 - Update websocket client to 0.59.0. Fix threading issues and AttributeErrors

--- a/resources/language/resource.language.cs_CZ/strings.po
+++ b/resources/language/resource.language.cs_CZ/strings.po
@ -168,6 +168,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr "Stahování obrázků PKC dokončeno"

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Číslo portu"
@ -1165,6 +1173,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "Seriály"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.da_DK/strings.po
+++ b/resources/language/resource.language.da_DK/strings.po
@ -168,6 +168,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr "PKC billede caching er færdiggjort"

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Portnummer"
@ -1168,6 +1176,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "TV-udsendelser"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.de_DE/strings.po
+++ b/resources/language/resource.language.de_DE/strings.po
@ -170,6 +170,17 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr "PKC Bilder-Caching beendet"

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+"Um ein reibungsloses PlexKodiConnect-Erlebnis zu gewährleisten, wird "
+"DRINGEND empfohlen, für die Ersteinrichtung und für mögliche Datenbank-"
+"Resets den Standard-Skin \"Estuary\" von Kodi zu verwenden. Weiterfahren?"
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Portnummer"
@ -1186,6 +1197,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "Serien"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr "Zugriff auf Mediendateien während der Synchronisierung überprüfen"
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.el_GR/strings.po
+++ b/resources/language/resource.language.el_GR/strings.po
@ -164,6 +164,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr ""

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Αριθμός θύρας"
@ -1128,6 +1136,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr ""

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.en_gb/strings.po
+++ b/resources/language/resource.language.en_gb/strings.po
@ -660,6 +660,11 @@ msgctxt "#30545"
 msgid "Force transcode pictures"
 msgstr ""

+# PKC Settings - Playback
+msgctxt "#30546"
+msgid "Pick the first video if several versions are present"
+msgstr ""
+
 # Welcome to Plex notification
 msgctxt "#33000"
 msgid "Welcome"
--- a/resources/language/resource.language.es_AR/strings.po
+++ b/resources/language/resource.language.es_AR/strings.po
@ -171,6 +171,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr "El caché de imágenes solo-PKC fue completado"

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Número de puerto"
@ -1181,6 +1189,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "Series"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.es_ES/strings.po
+++ b/resources/language/resource.language.es_ES/strings.po
@ -173,6 +173,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr "El caché de imágenes solo-PKC fue completado"

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Número de puerto"
@ -1183,6 +1191,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "Series"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.es_MX/strings.po
+++ b/resources/language/resource.language.es_MX/strings.po
@ -171,6 +171,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr "El caché de imágenes solo-PKC fue completado"

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Número de puerto"
@ -1181,6 +1189,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "Series"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.fr_CA/strings.po
+++ b/resources/language/resource.language.fr_CA/strings.po
@ -172,6 +172,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr "Mise en cache de images pour PKC-seulement terminée"

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Numéro de port"
@ -1195,6 +1203,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "Séries TV"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.fr_FR/strings.po
+++ b/resources/language/resource.language.fr_FR/strings.po
@ -176,6 +176,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr "Mise en cache de images pour PKC-seulement terminée"

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Numéro de port"
@ -1199,6 +1207,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "Séries TV"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.hu_HU/strings.po
+++ b/resources/language/resource.language.hu_HU/strings.po
@ -173,6 +173,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr "PKC képek gyorsítótárazása befejeződött"

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Portszám"
@ -1189,6 +1197,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "TV sorozatok"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.it_IT/strings.po
+++ b/resources/language/resource.language.it_IT/strings.po
@ -171,6 +171,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr "Cache delle immagini di PKC completato"

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Porta"
@ -1184,6 +1192,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "Serie TV"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.ko_KR/strings.po
+++ b/resources/language/resource.language.ko_KR/strings.po
@ -6,7 +6,7 @@
 # yun changwon <ycw98@hanmail.net>, 2020
 # k irbymaker <hun010811@naver.com>, 2020
 # Croneter None <croneter@gmail.com>, 2021
-# jaemin kwak <cjhamo@naver.com>, 2021
+# so.o.bima <cjhamo@naver.com>, 2021
 # 
 msgid ""
 msgstr ""
@ -14,7 +14,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: jaemin kwak <cjhamo@naver.com>, 2021\n"
+"Last-Translator: so.o.bima <cjhamo@naver.com>, 2021\n"
 "Language-Team: Korean (Korea) (https://www.transifex.com/croneter/teams/73837/ko_KR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -174,6 +174,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr "PKC 전용 이미지 캐싱 완료"

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "포트 번호"
@ -1148,6 +1156,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "TV 프로그램"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.lt_LT/strings.po
+++ b/resources/language/resource.language.lt_LT/strings.po
@ -171,6 +171,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr "„PKC“-baigtas tik  atvaizdžių podėliavimas"

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Prievado numeris"
@ -1177,6 +1185,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "TV Laidos"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.lv_LV/strings.po
+++ b/resources/language/resource.language.lv_LV/strings.po
@ -166,6 +166,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr "Tikai-PKC attēlu kešošana pabeigta"

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Porta Numurs"
@ -1159,6 +1167,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "Seriāli"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.nl_NL/strings.po
+++ b/resources/language/resource.language.nl_NL/strings.po
@ -170,6 +170,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr "PKC afbeelding caching voltooid"

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Poortnummer"
@ -1171,6 +1179,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "TV series"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.no_NO/strings.po
+++ b/resources/language/resource.language.no_NO/strings.po
@ -172,6 +172,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr "PKC mellomlagring av bilder gjennomført"

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Portnummer"
@ -1164,6 +1172,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "TV-show"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.pl_PL/strings.po
+++ b/resources/language/resource.language.pl_PL/strings.po
@ -170,6 +170,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr ""

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Numer portu"
@ -1133,6 +1141,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr ""

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.pt_BR/strings.po
+++ b/resources/language/resource.language.pt_BR/strings.po
@ -169,6 +169,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr "Armazenamento PKC somente imagens finalizado"

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Número da Porta"
@ -1160,6 +1168,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "Programas de TV"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.pt_PT/strings.po
+++ b/resources/language/resource.language.pt_PT/strings.po
@ -170,6 +170,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr ""

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Número da Porta"
@ -1163,6 +1171,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "Programas de TV"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.ru_RU/strings.po
+++ b/resources/language/resource.language.ru_RU/strings.po
@ -173,6 +173,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr "Кеширование изображений PKC завершено"

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Порт"
@ -1176,6 +1184,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "Сериалы"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.sv_SE/strings.po
+++ b/resources/language/resource.language.sv_SE/strings.po
@ -173,6 +173,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr "Cachelagring av PKC-bilder färdig"

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Portnummer"
@ -1171,6 +1179,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "TV-Serier"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.uk_UA/strings.po
+++ b/resources/language/resource.language.uk_UA/strings.po
@ -167,6 +167,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr "Кешування зображень PKC завершено"

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "Номер порту"
@ -1173,6 +1181,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "Серіали"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.zh_CN/strings.po
+++ b/resources/language/resource.language.zh_CN/strings.po
@ -166,6 +166,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr ""

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "端口号"
@ -1129,6 +1137,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "电视节目"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/language/resource.language.zh_TW/strings.po
+++ b/resources/language/resource.language.zh_TW/strings.po
@ -164,6 +164,14 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr ""

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid ""
+"To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to "
+"use Kodi's default skin \"Estuary\" for initial set-up and for possible "
+"database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr "埠號"
@ -1125,6 +1133,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr "電視節目"

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid ""
--- a/resources/lib/entrypoint.py
+++ b/resources/lib/entrypoint.py
@ -7,6 +7,7 @@ e.g. plugin://... calls. Hence be careful to only rely on window variables.
 from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 import sys
+import copy

 import xbmc
 import xbmcplugin
@ -423,6 +424,7 @@ def hub(content_type):
    # We need to make sure that only entries that WORK are displayed
    # WARNING: using xml.remove(child) in for-loop requires traversing from
    # the end!
+    pkc_cont_watching = None
    for entry in reversed(xml):
        api = API(entry)
        append = False
@ -439,6 +441,21 @@ def hub(content_type):
            append = True
        if not append:
            xml.remove(entry)
+
+        # HACK ##################
+        # Merge Plex's "Continue watching" with "On deck"
+        if entry.get('key') == '/hubs/home/continueWatching':
+            pkc_cont_watching = copy.deepcopy(entry)
+            pkc_cont_watching.set('key', '/hubs/continueWatching')
+            title = pkc_cont_watching.get('title') or 'Continue Watching'
+            pkc_cont_watching.set('title', 'PKC %s' % title)
+    if pkc_cont_watching:
+        for i, entry in enumerate(xml):
+            if entry.get('key') == '/hubs/home/continueWatching':
+                xml.insert(i + 1, pkc_cont_watching)
+                break
+    # END HACK ##################
+
    show_listing(xml)


--- a/resources/lib/plex_api/base.py
+++ b/resources/lib/plex_api/base.py
@ -15,8 +15,8 @@ LOG = getLogger('PLEX.api')

 METADATA_PROVIDERS = (('imdb', utils.REGEX_IMDB),
                      ('tvdb', utils.REGEX_TVDB),
-                      ('tmdb', utils.REGEX_TMDB))
-
+                      ('tmdb', utils.REGEX_TMDB),
+                      ('anidb', utils.REGEX_ANIDB))
 class Base(object):
    """
    Processes a Plex media server's XML response
--- a/resources/lib/plex_api/media.py
+++ b/resources/lib/plex_api/media.py
@ -178,7 +178,7 @@ class Media(object):
            count += 1
        if (count > 1 and (
                (self.plex_type != v.PLEX_TYPE_CLIP and
-                 utils.settings('bestQuality') == 'false')
+                 utils.settings('firstVideoStream') == 'false')
            or
                (self.plex_type == v.PLEX_TYPE_CLIP and
                 utils.settings('bestTrailer') == 'false'))):
--- a/resources/lib/utils.py
+++ b/resources/lib/utils.py
@ -48,8 +48,9 @@ REGEX_END_DIGITS = re.compile(r'''/(.+)/(\d+)$''')
 REGEX_PLEX_DIRECT = re.compile(r'''\.plex\.direct:\d+$''')
 # Plex API
 REGEX_IMDB = re.compile(r'''/(tt\d+)''')
-REGEX_TVDB = re.compile(r'''thetvdb:\/\/(.+?)\?''')
+REGEX_TVDB = re.compile(r'''(?:the)?tvdb(?::\/\/|[2-5]?-)(\d+?)\?''')
 REGEX_TMDB = re.compile(r'''themoviedb:\/\/(.+?)\?''')
+REGEX_ANIDB = re.compile(r'''anidb[2-4]?-(\d+?)\?''')
 # Plex music
 REGEX_MUSICPATH = re.compile(r'''^\^(.+)\$$''')
 # Grab Plex id from an URL-encoded string
--- a/resources/settings.xml
+++ b/resources/settings.xml
@ -113,6 +113,7 @@
 		<setting id="askCinema" type="bool" label="30519" default="false" visible="eq(-1,true)" subsetting="true" />
        <setting id="trailerNumber" type="slider" label="39000" default="3" visible="eq(-2,true)" range="1,1,15" option="int" />
        <setting id="enableSkipIntro" type="bool" label="30525" default="true" /><!-- Enable skipping of intros -->
+        <setting id="firstVideoStream" type="bool" label="30546" default="false" /><!-- Pick the first video if several versions are present -->
 	    <setting id="ignoreSpecialsNextEpisodes" type="bool" label="30527" default="false" />
        <setting id="resumeJumpBack" type="slider" label="30521" default="10" range="0,1,120" option="int" visible="false"/>
        <setting type="sep" />