diff --git a/pvr.njoy/addon.xml.in b/pvr.njoy/addon.xml.in
index 7e831a6..ea2e17a 100644
--- a/pvr.njoy/addon.xml.in
+++ b/pvr.njoy/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.njoy"
-  version="20.0.0"
+  version="20.2.0"
   name="Njoy N7 PVR Client"
   provider-name="Team Kodi">
   <requires>@ADDON_DEPENDS@</requires>
@@ -23,7 +23,7 @@
     <summary lang="ca_ES">Client PVR Njoy N7</summary>
     <summary lang="cs_CZ">Klient nahrávače Njoy N7</summary>
     <summary lang="cy_GB">Rhaglen Rhaglenni Njoy N7</summary>
-    <summary lang="da_DK">Njoy N7 PVR Klient</summary>
+    <summary lang="da_DK">Njoy N7 PVR-klient</summary>
     <summary lang="de_DE">Njoy N7 PVR Client</summary>
     <summary lang="el_GR">Πελάτης PVR του Njoy N7</summary>
     <summary lang="en_AU">Njoy N7 PVR Client</summary>
@@ -48,7 +48,7 @@
     <summary lang="ko_KR">Njoy N7 PVR 클라이언트</summary>
     <summary lang="lt_LT">Njoy N7 PVR klientas</summary>
     <summary lang="lv_LV">Njoy N7 PVR klients</summary>
-    <summary lang="mk_MK"> Njoy N7 PVR клиент</summary>
+    <summary lang="mk_MK">Njoy N7 PVR клиент</summary>
     <summary lang="ms_MY">Klien PVR Njoy N7</summary>
     <summary lang="mt_MT">Njoy N7 PVR Client</summary>
     <summary lang="my_MM">Njoy N7 PVR Client</summary>
@@ -59,7 +59,7 @@
     <summary lang="pt_PT">Cliente PVR Njoy N7</summary>
     <summary lang="ro_RO">Client PVR Njoy N7</summary>
     <summary lang="ru_RU">Njoy N7 PVR Клиент</summary>
-    <summary lang="si_LK">Njoy N7 PVR සේවාග්‍රාහකයා </summary>
+    <summary lang="si_LK">Njoy N7 PVR සේවාග්‍රාහකයා</summary>
     <summary lang="sk_SK">Njoy N7 PVR Klient</summary>
     <summary lang="sl_SI">Odjemalec PVR Njoy N7</summary>
     <summary lang="sr_RS">Njoy N7 PVR Клијент</summary>
diff --git a/pvr.njoy/changelog.txt b/pvr.njoy/changelog.txt
index 5336068..54bfeb5 100644
--- a/pvr.njoy/changelog.txt
+++ b/pvr.njoy/changelog.txt
@@ -1,3 +1,7 @@
+v20.2.0
+- Translation updates by Weblate
+- Kodi main API update to version 2.0.0
+
 v20.1.0
 - Kodi API to 8.0.0
 
diff --git a/pvr.njoy/resources/language/resource.language.ar_sa/strings.po b/pvr.njoy/resources/language/resource.language.ar_sa/strings.po
index 087bbab..95f43c7 100644
--- a/pvr.njoy/resources/language/resource.language.ar_sa/strings.po
+++ b/pvr.njoy/resources/language/resource.language.ar_sa/strings.po
@@ -14,14 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 
 msgctxt "Addon Summary"
 msgid "Njoy N7 PVR Client"
 msgstr ""
 
-#settings labels
+# settings labels
 msgctxt "#30000"
 msgid "N7 IP"
 msgstr ""
diff --git a/pvr.njoy/resources/language/resource.language.az_az/strings.po b/pvr.njoy/resources/language/resource.language.az_az/strings.po
index b4627ec..f5648ae 100644
--- a/pvr.njoy/resources/language/resource.language.az_az/strings.po
+++ b/pvr.njoy/resources/language/resource.language.az_az/strings.po
@@ -20,7 +20,7 @@ msgctxt "Addon Summary"
 msgid "Njoy N7 PVR Client"
 msgstr ""
 
-#settings labels
+# settings labels
 msgctxt "#30000"
 msgid "N7 IP"
 msgstr ""
diff --git a/pvr.njoy/resources/language/resource.language.bs_ba/strings.po b/pvr.njoy/resources/language/resource.language.bs_ba/strings.po
index 1215ff3..b77d8c4 100644
--- a/pvr.njoy/resources/language/resource.language.bs_ba/strings.po
+++ b/pvr.njoy/resources/language/resource.language.bs_ba/strings.po
@@ -14,14 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 msgctxt "Addon Summary"
 msgid "Njoy N7 PVR Client"
 msgstr ""
 
-#settings labels
+# settings labels
 msgctxt "#30000"
 msgid "N7 IP"
 msgstr ""
diff --git a/pvr.njoy/resources/language/resource.language.da_dk/strings.po b/pvr.njoy/resources/language/resource.language.da_dk/strings.po
index faf54a7..81d6cbd 100644
--- a/pvr.njoy/resources/language/resource.language.da_dk/strings.po
+++ b/pvr.njoy/resources/language/resource.language.da_dk/strings.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: KODI Main\n"
 "Report-Msgid-Bugs-To: translations@kodi.tv\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2021-07-28 22:29+0000\n"
+"PO-Revision-Date: 2021-11-14 13:07+0000\n"
 "Last-Translator: Christian Gade <gade@kodi.tv>\n"
 "Language-Team: Danish <https://kodi.weblate.cloud/projects/kodi-add-ons-pvr-clients/pvr-njoy/da_dk/>\n"
 "Language: da_dk\n"
@@ -15,11 +15,11 @@ msgstr ""
 "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.7.2\n"
+"X-Generator: Weblate 4.8.1\n"
 
 msgctxt "Addon Summary"
 msgid "Njoy N7 PVR Client"
-msgstr "Njoy N7 PVR Klient"
+msgstr "Njoy N7 PVR-klient"
 
 msgctxt "#30000"
 msgid "N7 IP"
diff --git a/pvr.njoy/resources/language/resource.language.eo/strings.po b/pvr.njoy/resources/language/resource.language.eo/strings.po
index 74077cf..ab1986a 100644
--- a/pvr.njoy/resources/language/resource.language.eo/strings.po
+++ b/pvr.njoy/resources/language/resource.language.eo/strings.po
@@ -20,7 +20,7 @@ msgctxt "Addon Summary"
 msgid "Njoy N7 PVR Client"
 msgstr ""
 
-#settings labels
+# settings labels
 msgctxt "#30000"
 msgid "N7 IP"
 msgstr ""
diff --git a/pvr.njoy/resources/language/resource.language.eu_es/strings.po b/pvr.njoy/resources/language/resource.language.eu_es/strings.po
index b9bd0ee..b581197 100644
--- a/pvr.njoy/resources/language/resource.language.eu_es/strings.po
+++ b/pvr.njoy/resources/language/resource.language.eu_es/strings.po
@@ -20,7 +20,7 @@ msgctxt "Addon Summary"
 msgid "Njoy N7 PVR Client"
 msgstr ""
 
-#settings labels
+# settings labels
 msgctxt "#30000"
 msgid "N7 IP"
 msgstr ""
diff --git a/pvr.njoy/resources/language/resource.language.fa_af/strings.po b/pvr.njoy/resources/language/resource.language.fa_af/strings.po
index 03744c8..7ed1b00 100644
--- a/pvr.njoy/resources/language/resource.language.fa_af/strings.po
+++ b/pvr.njoy/resources/language/resource.language.fa_af/strings.po
@@ -20,7 +20,7 @@ msgctxt "Addon Summary"
 msgid "Njoy N7 PVR Client"
 msgstr ""
 
-#settings labels
+# settings labels
 msgctxt "#30000"
 msgid "N7 IP"
 msgstr ""
diff --git a/pvr.njoy/resources/language/resource.language.fa_ir/strings.po b/pvr.njoy/resources/language/resource.language.fa_ir/strings.po
index 8dafec1..035d54c 100644
--- a/pvr.njoy/resources/language/resource.language.fa_ir/strings.po
+++ b/pvr.njoy/resources/language/resource.language.fa_ir/strings.po
@@ -20,7 +20,7 @@ msgctxt "Addon Summary"
 msgid "Njoy N7 PVR Client"
 msgstr ""
 
-#settings labels
+# settings labels
 msgctxt "#30000"
 msgid "N7 IP"
 msgstr ""
diff --git a/pvr.njoy/resources/language/resource.language.fo_fo/strings.po b/pvr.njoy/resources/language/resource.language.fo_fo/strings.po
index e4ccb42..792ce8e 100644
--- a/pvr.njoy/resources/language/resource.language.fo_fo/strings.po
+++ b/pvr.njoy/resources/language/resource.language.fo_fo/strings.po
@@ -20,7 +20,7 @@ msgctxt "Addon Summary"
 msgid "Njoy N7 PVR Client"
 msgstr ""
 
-#settings labels
+# settings labels
 msgctxt "#30000"
 msgid "N7 IP"
 msgstr ""
diff --git a/pvr.njoy/resources/language/resource.language.hi_in/strings.po b/pvr.njoy/resources/language/resource.language.hi_in/strings.po
index 396a84f..9bdd640 100644
--- a/pvr.njoy/resources/language/resource.language.hi_in/strings.po
+++ b/pvr.njoy/resources/language/resource.language.hi_in/strings.po
@@ -20,7 +20,7 @@ msgctxt "Addon Summary"
 msgid "Njoy N7 PVR Client"
 msgstr ""
 
-#settings labels
+# settings labels
 msgctxt "#30000"
 msgid "N7 IP"
 msgstr ""
diff --git a/pvr.njoy/resources/language/resource.language.hy_am/strings.po b/pvr.njoy/resources/language/resource.language.hy_am/strings.po
index e82e0f2..4a47656 100644
--- a/pvr.njoy/resources/language/resource.language.hy_am/strings.po
+++ b/pvr.njoy/resources/language/resource.language.hy_am/strings.po
@@ -20,7 +20,7 @@ msgctxt "Addon Summary"
 msgid "Njoy N7 PVR Client"
 msgstr ""
 
-#settings labels
+# settings labels
 msgctxt "#30000"
 msgid "N7 IP"
 msgstr ""
diff --git a/pvr.njoy/resources/language/resource.language.mi/strings.po b/pvr.njoy/resources/language/resource.language.mi/strings.po
index 9d071a1..326da4d 100644
--- a/pvr.njoy/resources/language/resource.language.mi/strings.po
+++ b/pvr.njoy/resources/language/resource.language.mi/strings.po
@@ -20,7 +20,7 @@ msgctxt "Addon Summary"
 msgid "Njoy N7 PVR Client"
 msgstr ""
 
-#settings labels
+# settings labels
 msgctxt "#30000"
 msgid "N7 IP"
 msgstr ""
diff --git a/pvr.njoy/resources/language/resource.language.mk_mk/strings.po b/pvr.njoy/resources/language/resource.language.mk_mk/strings.po
index b07be89..0c9fba9 100644
--- a/pvr.njoy/resources/language/resource.language.mk_mk/strings.po
+++ b/pvr.njoy/resources/language/resource.language.mk_mk/strings.po
@@ -5,20 +5,21 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: KODI Main\n"
-"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\n"
+"Report-Msgid-Bugs-To: translations@kodi.tv\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Kodi Translation Team\n"
-"Language-Team: Macedonian (Macedonia) (http://www.transifex.com/projects/p/kodi-main/language/mk_MK/)\n"
-"Language: mk_MK\n"
+"PO-Revision-Date: 2021-11-05 03:16+0000\n"
+"Last-Translator: Christian Gade <gade@kodi.tv>\n"
+"Language-Team: Macedonian <https://kodi.weblate.cloud/projects/kodi-add-ons-pvr-clients/pvr-njoy/mk_mk/>\n"
+"Language: mk_mk\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 % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
+"X-Generator: Weblate 4.8.1\n"
 
 msgctxt "Addon Summary"
 msgid "Njoy N7 PVR Client"
-msgstr " Njoy N7 PVR клиент"
+msgstr "Njoy N7 PVR клиент"
 
 msgctxt "#30000"
 msgid "N7 IP"
diff --git a/pvr.njoy/resources/language/resource.language.ml_in/strings.po b/pvr.njoy/resources/language/resource.language.ml_in/strings.po
index 8830d51..3d89417 100644
--- a/pvr.njoy/resources/language/resource.language.ml_in/strings.po
+++ b/pvr.njoy/resources/language/resource.language.ml_in/strings.po
@@ -20,7 +20,7 @@ msgctxt "Addon Summary"
 msgid "Njoy N7 PVR Client"
 msgstr ""
 
-#settings labels
+# settings labels
 msgctxt "#30000"
 msgid "N7 IP"
 msgstr ""
diff --git a/pvr.njoy/resources/language/resource.language.mn_mn/strings.po b/pvr.njoy/resources/language/resource.language.mn_mn/strings.po
index 3d3d40c..4767be5 100644
--- a/pvr.njoy/resources/language/resource.language.mn_mn/strings.po
+++ b/pvr.njoy/resources/language/resource.language.mn_mn/strings.po
@@ -20,7 +20,7 @@ msgctxt "Addon Summary"
 msgid "Njoy N7 PVR Client"
 msgstr ""
 
-#settings labels
+# settings labels
 msgctxt "#30000"
 msgid "N7 IP"
 msgstr ""
diff --git a/pvr.njoy/resources/language/resource.language.si_lk/strings.po b/pvr.njoy/resources/language/resource.language.si_lk/strings.po
index fcf8b22..10aa6c8 100644
--- a/pvr.njoy/resources/language/resource.language.si_lk/strings.po
+++ b/pvr.njoy/resources/language/resource.language.si_lk/strings.po
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: KODI Main\n"
-"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\n"
+"Report-Msgid-Bugs-To: translations@kodi.tv\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2021-06-27 10:29+0000\n"
+"PO-Revision-Date: 2021-09-25 08:30+0000\n"
 "Last-Translator: Christian Gade <gade@kodi.tv>\n"
 "Language-Team: Sinhala (Sri Lanka) <https://kodi.weblate.cloud/projects/kodi-add-ons-pvr-clients/pvr-njoy/si_lk/>\n"
 "Language: si_lk\n"
@@ -15,11 +15,11 @@ msgstr ""
 "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.7\n"
+"X-Generator: Weblate 4.8\n"
 
 msgctxt "Addon Summary"
 msgid "Njoy N7 PVR Client"
-msgstr "Njoy N7 PVR සේවාග්‍රාහකයා "
+msgstr "Njoy N7 PVR සේවාග්‍රාහකයා"
 
 msgctxt "#30000"
 msgid "N7 IP"
diff --git a/pvr.njoy/resources/language/resource.language.sq_al/strings.po b/pvr.njoy/resources/language/resource.language.sq_al/strings.po
index 8c67c1f..a3063f5 100644
--- a/pvr.njoy/resources/language/resource.language.sq_al/strings.po
+++ b/pvr.njoy/resources/language/resource.language.sq_al/strings.po
@@ -20,7 +20,7 @@ msgctxt "Addon Summary"
 msgid "Njoy N7 PVR Client"
 msgstr ""
 
-#settings labels
+# settings labels
 msgctxt "#30000"
 msgid "N7 IP"
 msgstr ""
diff --git a/pvr.njoy/resources/language/resource.language.te_in/strings.po b/pvr.njoy/resources/language/resource.language.te_in/strings.po
index 496e0ae..c3ed0b7 100644
--- a/pvr.njoy/resources/language/resource.language.te_in/strings.po
+++ b/pvr.njoy/resources/language/resource.language.te_in/strings.po
@@ -20,7 +20,7 @@ msgctxt "Addon Summary"
 msgid "Njoy N7 PVR Client"
 msgstr ""
 
-#settings labels
+# settings labels
 msgctxt "#30000"
 msgid "N7 IP"
 msgstr ""
diff --git a/pvr.njoy/resources/language/resource.language.uz_uz/strings.po b/pvr.njoy/resources/language/resource.language.uz_uz/strings.po
index d39d961..ec6a197 100644
--- a/pvr.njoy/resources/language/resource.language.uz_uz/strings.po
+++ b/pvr.njoy/resources/language/resource.language.uz_uz/strings.po
@@ -20,7 +20,7 @@ msgctxt "Addon Summary"
 msgid "Njoy N7 PVR Client"
 msgstr ""
 
-#settings labels
+# settings labels
 msgctxt "#30000"
 msgid "N7 IP"
 msgstr ""
diff --git a/src/N7Xml.cpp b/src/N7Xml.cpp
index 38ecd3d..32e6843 100644
--- a/src/N7Xml.cpp
+++ b/src/N7Xml.cpp
@@ -27,14 +27,14 @@ N7Xml::N7Xml()
 {
   kodi::Log(ADDON_LOG_DEBUG, "Creating N7 PVR-Client");
 
-  m_strHostname = kodi::GetSettingString("n7host", DEFAULT_HOST);
-  m_iPort = kodi::GetSettingInt("n7port", DEFAULT_PORT);
+  m_strHostname = kodi::addon::GetSettingString("n7host", DEFAULT_HOST);
+  m_iPort = kodi::addon::GetSettingInt("n7port", DEFAULT_PORT);
 
   list_channels();
 }
 
 ADDON_STATUS N7Xml::SetSetting(const std::string& settingName,
-                               const kodi::CSettingValue& settingValue)
+                               const kodi::addon::CSettingValue& settingValue)
 {
   if (settingName == "n7host")
   {
diff --git a/src/N7Xml.h b/src/N7Xml.h
index 3739d96..f191c00 100644
--- a/src/N7Xml.h
+++ b/src/N7Xml.h
@@ -22,8 +22,8 @@ class CCurlFile
   bool Get(const std::string& strURL, std::string& strResult);
 };
 
-class ATTRIBUTE_HIDDEN N7Xml : public kodi::addon::CAddonBase,
-                               public kodi::addon::CInstancePVRClient
+class ATTR_DLL_LOCAL N7Xml : public kodi::addon::CAddonBase,
+                             public kodi::addon::CInstancePVRClient
 
 {
 public:
@@ -31,7 +31,7 @@ class ATTRIBUTE_HIDDEN N7Xml : public kodi::addon::CAddonBase,
   ~N7Xml() override = default;
 
   ADDON_STATUS SetSetting(const std::string& settingName,
-                          const kodi::CSettingValue& settingValue) override;
+                          const kodi::addon::CSettingValue& settingValue) override;
 
   PVR_ERROR GetCapabilities(kodi::addon::PVRCapabilities& capabilities) override;
   PVR_ERROR GetBackendName(std::string& name) override;