Translation corrections

Added missing an_za and es_es translations that got removed by Weblate.  Correct some en_gb strings

azure-pipelines.yml

@@ -39,11 +39,11 @@ jobs:
           ARCHITECTURE: x64
           CONFIGURATION: Release
           WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
-        ARM32-UWP:
-          GENERATOR: "Visual Studio 17 2022"
-          ARCHITECTURE: ARM
-          CONFIGURATION: Release
-          WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
+        #ARM32-UWP:
+        #  GENERATOR: "Visual Studio 17 2022"
+        #  ARCHITECTURE: ARM
+        #  CONFIGURATION: Release
+        #  WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
         #ARM64-UWP:
         #  GENERATOR: "Visual Studio 17 2022"
         #  ARCHITECTURE: ARM64

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

@@ -54,16 +54,16 @@ msgid "Download TV guide artwork"
 msgstr ""
 
 msgctxt "#30504"
-msgid "Not enabled for Matrix when remote"
+msgid "Not enabled when remote"
 msgstr ""
 
 msgctxt "#30040"
 msgid "Connection"
-msgstr "Konneksie"
+msgstr "Verbinding"
 
 msgctxt "#30041"
 msgid "Advanced"
-msgstr "Gevorderde"
+msgstr "Gevorderd"
 
 # empty strings from id 30042 to 30049
 msgctxt "#30050"
@@ -346,6 +346,10 @@ msgctxt "#30700"
 msgid "When disabled resume location and watched status will be managed only in Kodi"
 msgstr ""
 
+msgctxt "#30211"
+msgid "Timeshift"
+msgstr "Tydskuif"
+
 #~ msgctxt "#30000"
 #~ msgid "NextPVR Hostname"
 #~ msgstr "NextPVR Gasheernaam"

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

@@ -223,7 +223,7 @@ msgid "Use legacy (V4) setting"
 msgstr ""
 
 msgctxt "#30178"
-msgid "Include filesize with recordings"
+msgid "Include file size with recordings"
 msgstr ""
 
 msgctxt "#30678"
@@ -351,7 +351,7 @@ msgid "Show root directory"
 msgstr ""
 
 msgctxt "#30701"
-msgid "Seperate recordings by the NextPVR recording folder"
+msgid "Separate recordings by the NextPVR recording folder"
 msgstr ""
 
 msgctxt "#30202"
@@ -419,7 +419,7 @@ msgid "Transcoded"
 msgstr ""
 
 msgctxt "#30213"
-msgid "Spann"
+msgid "Span"
 msgstr ""
 
 msgctxt "#30214"

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

@@ -344,7 +344,115 @@ msgstr "Guardar ubicación de la reanudación de la grabación en NextPVR"
 
 msgctxt "#30700"
 msgid "When disabled resume location and watched status will be managed only in Kodi"
-msgstr "Cuando se desactiva, la ubicación de reanudación y el estado de visto se gestionarán solo en Kodi"
+msgstr "Cuando se desactiva, la ubicación de reanudación y el estado de visto se gestionarán sólo en Kodi"
+
+msgctxt "#30201"
+msgid "Show root directory"
+msgstr "Mostrar directorio raíz"
+
+msgctxt "#30701"
+msgid "Seperate recordings by the NextPVR recording folder"
+msgstr "Separar grabaciones en la carpeta de NextPVR"
+
+msgctxt "#30202"
+msgid "Channel instance number"
+msgstr "Numero de la instancia de canal"
+
+msgctxt "#30702"
+msgid "Add instance indicators (#) to channel names"
+msgstr "Añadir el indicador de instancia (#) al nombre de canal"
+
+msgctxt "#30203"
+msgid "All channels group"
+msgstr "Todo el grupo de canales"
+
+msgctxt "#30703"
+msgid "Create an All channels group for this instance"
+msgstr "Crea un grupo con todos los canales para esta instancia"
+
+msgctxt "#30204"
+msgid "Instance number"
+msgstr "Número de instancia"
+
+msgctxt "#30205"
+msgid "Instance options"
+msgstr "Opciones de la instancia"
+
+msgctxt "#30206"
+msgid "Load comskip"
+msgstr "Cargar comskip"
+
+msgctxt "#30706"
+msgid "Read comskip EDL files from backend"
+msgstr "Leer ficheros EDL comskip del servidor"
+
+msgctxt "#30207"
+msgid "Update check"
+msgstr "Comprobar actualizaciones"
+
+msgctxt "#30707"
+msgid "Interval to check for backend changes made outside this Kodi client"
+msgstr "Intervalo para comprobar cambios del servidor hechos fuera del cliente Kodi"
+
+msgctxt "#30208"
+msgid "Every 5 minutes"
+msgstr "Cada 5 minutos"
+
+msgctxt "#30209"
+msgid "Recording and timer control"
+msgstr "Control del grabaciones y programaciones"
+
+msgctxt "#30709"
+msgid "Manage user rights for recordings and timers"
+msgstr "Gestionar permisos de usuario para grabaciones y programaciones"
+
+msgctxt "#30210"
+msgid "Real Time"
+msgstr "Tiempo Real"
+
+msgctxt "#30211"
+msgid "Timeshift"
+msgstr "Timeshift"
+
+msgctxt "#30212"
+msgid "Transcoded"
+msgstr "Transcodificado"
+
+msgctxt "#30213"
+msgid "Spann"
+msgstr "Extender"
+
+msgctxt "#30214"
+msgid "Full access to recordings and timers"
+msgstr "Acceso completo a grabaciones y programaciones"
+
+msgctxt "#30215"
+msgid "Play and delete recordings with no timers"
+msgstr "Reproducir y borrar grabaciones pero no programaciones"
+
+msgctxt "#30216"
+msgid "Play recordings with no timers"
+msgstr "Reproducir grabaciones pero no programaciones"
+
+msgctxt "#30217"
+msgid "Live TV only"
+msgstr "Sólo TV en directo"
+
+msgctxt "#30218"
+msgid "Repeating (all episodes)"
+msgstr "Repetir (todos los episodios)"
+
+#~ msgctxt "#30504"
+#~ msgid "Not enabled for Matrix when remote"
+#~ msgstr "Desactivado para Matrix en remoto"
+
+#~ msgctxt "#30169"
+#~ msgid "Kodi skin styled recordings"
+#~ msgstr "Grabaciones al estilo skin de Kodi"
+
+#~ msgctxt "#30569"
+#~ msgid "Separate title, season and episode for skin - season and episode numbers will not be shown in lists"
+#~ msgstr "Separar título, temporada y episodio para la skin - Los números de episodio y temporada no se mostrarán en las listas"
 
 #~ msgctxt "#30000"
 #~ msgid "NextPVR Hostname"

src/EPG.cpp

@@ -121,7 +121,6 @@ PVR_ERROR EPG::GetEPGForChannel(int channelUid, time_t start, time_t end, kodi::
         // genre type
         broadcast.SetGenreType(XMLUtils::GetIntValue(pListingNode, "genre_type"));
         broadcast.SetGenreSubType(XMLUtils::GetIntValue(pListingNode, "genre_subtype"));
-
       }
 
       NextPVR::GenreBlock genreBlock = { sGenre, broadcast.GetGenreType(), EPG_EVENT_CONTENTMASK_UNDEFINED };

src/utilities/GenreMapper.cpp

@@ -24,7 +24,7 @@ GenreMapper::GenreMapper(const std::shared_ptr<InstanceSettings>& settings) : m_
 GenreMapper::~GenreMapper() {}
 
 
-bool GenreMapper::IsEnabled()
+bool GenreMapper::UseDvbGenre()
 {
   return !m_settings->m_genreString;
 }
@@ -66,7 +66,7 @@ bool GenreMapper::ParseAllGenres(const tinyxml2::XMLNode* node, GenreBlock& genr
   {
     if (allGenres.find(EPG_STRING_TOKEN_SEPARATOR) != std::string::npos)
     {
-      if (IsEnabled())
+      if (UseDvbGenre())
       {
         std::vector<std::string> genreCodes = kodi::tools::StringUtils::Split(allGenres, EPG_STRING_TOKEN_SEPARATOR);
         if (genreCodes.size() == 2)
@@ -86,17 +86,14 @@ bool GenreMapper::ParseAllGenres(const tinyxml2::XMLNode* node, GenreBlock& genr
       }
       if (genreBlock.genreSubType == EPG_EVENT_CONTENTMASK_UNDEFINED)
       {
-        if (genreBlock.genreType != EPG_GENRE_USE_STRING)
-        {
-          genreBlock.genreType = EPG_GENRE_USE_STRING;
-        }
+        genreBlock.genreSubType = EPG_GENRE_USE_STRING;
         genreBlock.description = allGenres;
       }
     }
-    else if (!IsEnabled() && genreBlock.genreSubType != EPG_GENRE_USE_STRING)
+    else if (!UseDvbGenre() && genreBlock.genreSubType != EPG_EVENT_CONTENTMASK_UNDEFINED)
     {
       genreBlock.description = allGenres;
-      genreBlock.genreType = EPG_GENRE_USE_STRING;
+      genreBlock.genreSubType = EPG_GENRE_USE_STRING;
     }
 
     return true;

src/utilities/GenreMapper.h

@@ -28,7 +28,7 @@ namespace NextPVR
     int GetGenreType(std::string code);
     int GetGenreSubType(std::string code);
     bool ParseAllGenres(const tinyxml2::XMLNode* node, GenreBlock& genreBlock);
-    bool IsEnabled();
+    bool UseDvbGenre();
 
   private:
     GenreMapper() = default;