Merge remote-tracking branch 'origin/Omega' into contentrating

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: xbmc/xbmc
-        ref: master
+        ref: Omega
         path: xbmc
     - name: Checkout add-on repo
       uses: actions/checkout@v4
@@ -41,7 +41,7 @@ jobs:
       run: |
         if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir -p build && cd build; fi
         if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=${{ github.workspace }} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/xbmc/addons -DPACKAGE_ZIP=1 ${{ github.workspace }}/xbmc/cmake/addons; fi
-        if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/master/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi
+        if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/Omega/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi
         if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep ${{ github.workspace }}/${app_id}; fi
     - name: Build
       env:

azure-pipelines.yml

@@ -57,7 +57,7 @@ jobs:
 
     - script: |
         cd ..
-        git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git kodi
+        git clone --branch Omega --depth=1 https://github.com/xbmc/xbmc.git kodi
         cd $(Build.SourcesDirectory)
         mkdir build
         cd build

pvr.nextpvr/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.nextpvr"
-  version="22.0.0"
+  version="21.2.0"
   name="NextPVR PVR Client"
   provider-name="Graeme Blackley">
   <requires>@ADDON_DEPENDS@

pvr.nextpvr/changelog.txt

@@ -1,3 +1,12 @@
+v21.2.0
+- Start timeshift in realtime for radio playback
+- Add support for episode and episode part parsing
+- Clean up duplicated S/E information sent from NextPVR in the subtitle when no subtitle is present.
+
+v21.1.1
+- Translations updates from Weblate
+	- af_za, am_et, ar_sa, ast_es, az_az, be_by, bg_bg, bs_ba, ca_es, cs_cz, cy_gb, da_dk, de_de, el_gr, en_au, en_nz, en_us, eo, es_ar, es_es, es_mx, et_ee, eu_es, fa_af, fa_ir, fi_fi, fo_fo, fr_ca, fr_fr, gl_es, he_il, hi_in, hr_hr, hu_hu, hy_am, id_id, is_is, it_it, ja_jp, ko_kr, lt_lt, lv_lv, mi, mk_mk, ml_in, mn_mn, ms_my, mt_mt, my_mm, nb_no, nl_nl, pl_pl, pt_br, pt_pt, ro_ro, ru_ru, si_lk, sk_sk, sl_si, sq_al, sr_rs, sr_rs@latin, sv_se, szl, ta_in, te_in, tg_tj, th_th, tr_tr, uk_ua, uz_uz, vi_vn, zh_cn, zh_tw
+
 v21.0.4
 - Allow control of recording and timers access
 - Support all episode single channel recordings

pvr.nextpvr/resources/language/resource.language.af_za/strings.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: KODI Main\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
+"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: 2022-03-06 18:03+0000\n"
 "Last-Translator: Christian Gade <[email protected]>\n"
@@ -54,7 +54,7 @@ msgid "Download TV guide artwork"
 msgstr ""
 
 msgctxt "#30504"
-msgid "Not enabled for Matrix when remote"
+msgid "Not enabled when remote"
 msgstr ""
 
 msgctxt "#30040"
@@ -182,14 +182,6 @@ msgctxt "#30168"
 msgid "Recording chunk size"
 msgstr ""
 
-msgctxt "#30169"
-msgid "Kodi skin styled recordings"
-msgstr ""
-
-msgctxt "#30569"
-msgid "Separate title, season and episode for skin - season and episode numbers will not be shown in lists"
-msgstr ""
-
 msgctxt "#30170"
 msgid "Refresh cache for channel icons"
 msgstr "Verfris kas vir kanaal ikone"
@@ -346,6 +338,102 @@ msgctxt "#30700"
 msgid "When disabled resume location and watched status will be managed only in Kodi"
 msgstr ""
 
+msgctxt "#30201"
+msgid "Show root directory"
+msgstr ""
+
+msgctxt "#30701"
+msgid "Seperate recordings by the NextPVR recording folder"
+msgstr ""
+
+msgctxt "#30202"
+msgid "Channel instance number"
+msgstr ""
+
+msgctxt "#30702"
+msgid "Add instance indicators (#) to channel names"
+msgstr ""
+
+msgctxt "#30203"
+msgid "All channels group"
+msgstr ""
+
+msgctxt "#30703"
+msgid "Create an All channels group for this instance"
+msgstr ""
+
+msgctxt "#30204"
+msgid "Instance number"
+msgstr ""
+
+msgctxt "#30205"
+msgid "Instance options"
+msgstr ""
+
+msgctxt "#30206"
+msgid "Load comskip"
+msgstr ""
+
+msgctxt "#30706"
+msgid "Read comskip EDL files from backend"
+msgstr ""
+
+msgctxt "#30207"
+msgid "Update check"
+msgstr ""
+
+msgctxt "#30707"
+msgid "Interval to check for backend changes made outside this Kodi client"
+msgstr ""
+
+msgctxt "#30208"
+msgid "Every 5 minutes"
+msgstr ""
+
+msgctxt "#30209"
+msgid "Recording and timer control"
+msgstr ""
+
+msgctxt "#30709"
+msgid "Manage user rights for recordings and timers"
+msgstr ""
+
+msgctxt "#30210"
+msgid "Real Time"
+msgstr ""
+
+msgctxt "#30211"
+msgid "Timeshift"
+msgstr ""
+
+msgctxt "#30212"
+msgid "Transcoded"
+msgstr ""
+
+msgctxt "#30213"
+msgid "Spann"
+msgstr ""
+
+msgctxt "#30214"
+msgid "Full access to recordings and timers"
+msgstr ""
+
+msgctxt "#30215"
+msgid "Play and delete recordings with no timers"
+msgstr ""
+
+msgctxt "#30216"
+msgid "Play recordings with no timers"
+msgstr ""
+
+msgctxt "#30217"
+msgid "Live TV only"
+msgstr ""
+
+msgctxt "#30218"
+msgid "Repeating (all episodes)"
+msgstr ""
+
 #~ msgctxt "#30000"
 #~ msgid "NextPVR Hostname"
 #~ msgstr "NextPVR Gasheernaam"

pvr.nextpvr/resources/language/resource.language.am_et/strings.po

@@ -54,7 +54,7 @@ msgid "Download TV guide artwork"
 msgstr ""
 
 msgctxt "#30504"
-msgid "Not enabled for Matrix when remote"
+msgid "Not enabled when remote"
 msgstr ""
 
 msgctxt "#30040"
@@ -183,14 +183,6 @@ msgctxt "#30168"
 msgid "Recording chunk size"
 msgstr ""
 
-msgctxt "#30169"
-msgid "Kodi skin styled recordings"
-msgstr ""
-
-msgctxt "#30569"
-msgid "Separate title, season and episode for skin - season and episode numbers will not be shown in lists"
-msgstr ""
-
 msgctxt "#30170"
 msgid "Refresh cache for channel icons"
 msgstr ""
@@ -346,3 +338,99 @@ msgstr ""
 msgctxt "#30700"
 msgid "When disabled resume location and watched status will be managed only in Kodi"
 msgstr ""
+
+msgctxt "#30201"
+msgid "Show root directory"
+msgstr ""
+
+msgctxt "#30701"
+msgid "Seperate recordings by the NextPVR recording folder"
+msgstr ""
+
+msgctxt "#30202"
+msgid "Channel instance number"
+msgstr ""
+
+msgctxt "#30702"
+msgid "Add instance indicators (#) to channel names"
+msgstr ""
+
+msgctxt "#30203"
+msgid "All channels group"
+msgstr ""
+
+msgctxt "#30703"
+msgid "Create an All channels group for this instance"
+msgstr ""
+
+msgctxt "#30204"
+msgid "Instance number"
+msgstr ""
+
+msgctxt "#30205"
+msgid "Instance options"
+msgstr ""
+
+msgctxt "#30206"
+msgid "Load comskip"
+msgstr ""
+
+msgctxt "#30706"
+msgid "Read comskip EDL files from backend"
+msgstr ""
+
+msgctxt "#30207"
+msgid "Update check"
+msgstr ""
+
+msgctxt "#30707"
+msgid "Interval to check for backend changes made outside this Kodi client"
+msgstr ""
+
+msgctxt "#30208"
+msgid "Every 5 minutes"
+msgstr ""
+
+msgctxt "#30209"
+msgid "Recording and timer control"
+msgstr ""
+
+msgctxt "#30709"
+msgid "Manage user rights for recordings and timers"
+msgstr ""
+
+msgctxt "#30210"
+msgid "Real Time"
+msgstr ""
+
+msgctxt "#30211"
+msgid "Timeshift"
+msgstr ""
+
+msgctxt "#30212"
+msgid "Transcoded"
+msgstr ""
+
+msgctxt "#30213"
+msgid "Spann"
+msgstr ""
+
+msgctxt "#30214"
+msgid "Full access to recordings and timers"
+msgstr ""
+
+msgctxt "#30215"
+msgid "Play and delete recordings with no timers"
+msgstr ""
+
+msgctxt "#30216"
+msgid "Play recordings with no timers"
+msgstr ""
+
+msgctxt "#30217"
+msgid "Live TV only"
+msgstr ""
+
+msgctxt "#30218"
+msgid "Repeating (all episodes)"
+msgstr ""