Fix spelling errors identified by Lintian

 * Processed output of lintian on repacked Kodi tarball
   with the following script:

   while read _1 _2 _3 _4 WORD REPL
   do
     FILENAMES=$(git grep -l "$WORD")
     sed -i "s/$WORD/$REPL/g" $FILENAMES
   done < /tmp/lint

Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>

50 files changed, 84 insertions, 84 deletions

diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index c654211c68..64432e7700 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -9825,7 +9825,7 @@ msgctxt "#19110"
 msgid "Could not delete the timer. Check the log for more information about this message."
 msgstr ""
 
-#. message box text stating that a PVR backend error occured
+#. message box text stating that a PVR backend error occurred
 #: xbmc/pvr/PVRGUIActions.cpp
 msgctxt "#19111"
 msgid "PVR backend error. Check the log for more information about this message."
diff --git a/docs/CODE_GUIDELINES.md b/docs/CODE_GUIDELINES.md
index 85e6495e2d..6ea0b0cb2a 100644
--- a/docs/CODE_GUIDELINES.md
+++ b/docs/CODE_GUIDELINES.md
@@ -244,7 +244,7 @@ void Test();
 void Test(void);
 ```
 
-### 3.7. Exceptions to the Formating Rules For Beter Readability
+### 3.7. Exceptions to the Formatting Rules For Better Readability
 There are some special situations where vertical alignment and longer lines does greatly aid readability, for example the initialization of some table-like multiple row structures. In these **rare** cases exceptions can be made to the formatting rules on vertical alignment, and the defined line length can be exceeded. 
 
 The layout can be protected from being reformatted when `clang-format` is applied by adding `// clang-format off` and `// clang-format on` statements either side of the lines of code.
diff --git a/tools/EventClients/Clients/PS3BDRemote/ps3_remote.py b/tools/EventClients/Clients/PS3BDRemote/ps3_remote.py
index e902bb8519..5b9d5b3a6b 100755
--- a/tools/EventClients/Clients/PS3BDRemote/ps3_remote.py
+++ b/tools/EventClients/Clients/PS3BDRemote/ps3_remote.py
@@ -155,7 +155,7 @@ def process_keys(remote, xbmc):
             return 2
         time.sleep(2)
 
-        # some other read exception occured, so raise it
+        # some other read exception occurred, so raise it
         raise e
 
     if datalen == 13:
diff --git a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/CHANGELOG b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/CHANGELOG
index 5e2d5a2b6e..8ca34392aa 100644
--- a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/CHANGELOG
+++ b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/CHANGELOG
@@ -70,7 +70,7 @@ v0.10 -- 11 Feb 2008
 		- Renamed INFO/WARNING/DEBUG macros to WIIUSE_* (by noisehole)
 		- Updated Makefiles (by noisehole)
 		- Fixed incorrect roll/pitch when smoothing was enabled
-		- Fixed nunchuk and classic controller flooding events when significant changes occured
+		- Fixed nunchuk and classic controller flooding events when significant changes occurred
 		- Fixed bug where IR was not correct on roll if IR was enabled before handshake
 
 	Removed:
@@ -115,7 +115,7 @@ v0.7 -- 19 Oct 2007
 
 	Fixed:
 		- [Windows] Problem where a connection is made to a wiimote that does not exist.
-		- [Windows] Issue that occured while using multiple wiimotes.
+		- [Windows] Issue that occurred while using multiple wiimotes.
 
 ---------------------------
 v0.6 -- 16 Oct 2007
diff --git a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/sdl.c b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/sdl.c
index 378611c7c8..c4699681c8 100644
--- a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/sdl.c
+++ b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/sdl.c
@@ -424,7 +424,7 @@ int WINAPI WinMain(HINSTANCE hInstance,	HINSTANCE hPrevInstance, LPSTR lpCmdLine
 			for (; i < MAX_WIIMOTES; ++i) {
 				switch (wiimotes[i]->event) {
 					case WIIUSE_EVENT:
-						/* a generic event occured */
+						/* a generic event occurred */
 						handle_event(wiimotes[i]);
 						break;
 
diff --git a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/example.c b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/example.c
index 8536cf683c..d401d80b7a 100644
--- a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/example.c
+++ b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/example.c
@@ -368,12 +368,12 @@ int main(int argc, char** argv) {
 			for (; i < MAX_WIIMOTES; ++i) {
 				switch (wiimotes[i]->event) {
 					case WIIUSE_EVENT:
-						/* a generic event occured */
+						/* a generic event occurred */
 						handle_event(wiimotes[i]);
 						break;
 
 					case WIIUSE_STATUS:
-						/* a status event occured */
+						/* a status event occurred */
 						handle_ctrl_status(wiimotes[i]);
 						break;
 
diff --git a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/events.c b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/events.c
index 578ee3f08b..04c2ea50bb 100644
--- a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/events.c
+++ b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/events.c
@@ -74,7 +74,7 @@ static int state_changed(struct wiimote_t* wm);
  *	@param wm		An array of pointers to wiimote_t structures.
  *	@param wiimotes	The number of wiimote_t structures in the \a wm array.
  *
- *	@return Returns number of wiimotes that an event has occured on.
+ *	@return Returns number of wiimotes that an event has occurred on.
  *
  *	It is necessary to poll the wiimote devices for events
  *	that occur.  If an event occurs on a particular wiimote,
@@ -241,10 +241,10 @@ static void clear_dirty_reads(struct wiimote_t* wm) {
 
 
 /**
- *	@brief Analyze the event that occured on a wiimote.
+ *	@brief Analyze the event that occurred on a wiimote.
  *
  *	@param wm		An array of pointers to wiimote_t structures.
- *	@param event	The event that occured.
+ *	@param event	The event that occurred.
  *	@param msg		The message specified in the event packet.
  *
  *	Pass the event to the registered event callback.
@@ -530,7 +530,7 @@ static void event_status(struct wiimote_t* wm, byte* msg) {
 	int exp_changed = 0;
 
 	/*
-	 *	An event occured.
+	 *	An event occurred.
 	 *	This event can be overwritten by a more specific
 	 *	event type during a handshake or expansion removal.
 	 */
@@ -780,7 +780,7 @@ static void save_state(struct wiimote_t* wm) {
 /**
  *	@brief Determine if the current state differs significantly from the previous.
  *	@param wm	A pointer to a wiimote_t structure.
- *	@return	1 if a significant change occured, 0 if not.
+ *	@return	1 if a significant change occurred, 0 if not.
  */
 static int state_changed(struct wiimote_t* wm) {
 	#define STATE_CHANGED(a, b)		if (a != b)				return 1
diff --git a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/io_win.c b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/io_win.c
index 85ddd109cd..6aeeb81dd2 100644
--- a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/io_win.c
+++ b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/io_win.c
@@ -195,7 +195,7 @@ int wiiuse_io_read(struct wiimote_t* wm) {
 			ResetEvent(wm->hid_overlap.hEvent);
 			return 0;
 		} else if (r == WAIT_FAILED) {
-			WIIUSE_WARNING("A wait error occured on reading from wiimote %i.", wm->unid);
+			WIIUSE_WARNING("A wait error occurred on reading from wiimote %i.", wm->unid);
 			return 0;
 		}
 
diff --git a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/wiiuse.c b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/wiiuse.c
index cdd31a68fb..1bb617d907 100644
--- a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/wiiuse.c
+++ b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/wiiuse.c
@@ -706,7 +706,7 @@ void wiiuse_set_bluetooth_stack(struct wiimote_t** wm, int wiimotes, enum win_bt
  *	@param threshold	The decimal place that should be considered a significant change.
  *
  *	If threshold is 0.01, and any angle changes by 0.01 then a significant change
- *	has occured and the event callback will be invoked.  If threshold is 1 then
+ *	has occurred and the event callback will be invoked.  If threshold is 1 then
  *	the angle has to change by a full degree to generate an event.
  */
 void wiiuse_set_orient_threshold(struct wiimote_t* wm, float threshold) {
diff --git a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/wiiuse.h b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/wiiuse.h
index dc886743e7..fce263c38f 100644
--- a/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/wiiuse.h
+++ b/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/wiiuse.h
@@ -572,7 +572,7 @@ typedef struct wiimote_t {
 
 	WCONST struct wiimote_state_t lstate;	/**< last saved state						*/
 
-	WCONST WIIUSE_EVENT_TYPE event;			/**< type of event that occured				*/
+	WCONST WIIUSE_EVENT_TYPE event;			/**< type of event that occurred				*/
 	WCONST byte event_buf[MAX_PAYLOAD];		/**< event buffer							*/
 } wiimote;
 
diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp
index 11d0e49754..5fde1eccf6 100644
--- a/xbmc/Util.cpp
+++ b/xbmc/Util.cpp
@@ -1219,7 +1219,7 @@ int CUtil::GetMatchingSource(const std::string& strPath1, VECSOURCES& VECSOURCES
         return i;
     }
 
-    // doesnt match a name, so try the source path
+    // doesn't match a name, so try the source path
     std::vector<std::string> vecPaths;
 
     // add any concatenated paths if they exist
diff --git a/xbmc/addons/addoninfo/AddonInfoBuilder.cpp b/xbmc/addons/addoninfo/AddonInfoBuilder.cpp
index 19388e2278..f62446521b 100644
--- a/xbmc/addons/addoninfo/AddonInfoBuilder.cpp
+++ b/xbmc/addons/addoninfo/AddonInfoBuilder.cpp
@@ -114,7 +114,7 @@ bool CAddonInfoBuilder::ParseXML(const AddonInfoPtr& addon, const TiXmlElement*
 
   if (!StringUtils::EqualsNoCase(element->Value(), "addon"))
   {
-    CLog::Log(LOGERROR, "CAddonInfoBuilder::{}: file from '{}' doesnt contain <addon>", __FUNCTION__, addonPath);
+    CLog::Log(LOGERROR, "CAddonInfoBuilder::{}: file from '{}' doesn't contain <addon>", __FUNCTION__, addonPath);
     return false;
   }
 
@@ -135,7 +135,7 @@ bool CAddonInfoBuilder::ParseXML(const AddonInfoPtr& addon, const TiXmlElement*
   addon->m_author = cstring ? cstring : "";
   if (addon->m_id.empty() || addon->m_version.empty())
   {
-    CLog::Log(LOGERROR, "CAddonInfoBuilder::{}: file '{}' doesnt contain required values on <addon ... > id='{}', version='{}'",
+    CLog::Log(LOGERROR, "CAddonInfoBuilder::{}: file '{}' doesn't contain required values on <addon ... > id='{}', version='{}'",
               __FUNCTION__,
               addonPath,
               addon->m_id.empty() ? "missing" : addon->m_id,
diff --git a/xbmc/addons/interfaces/AddonBase.cpp b/xbmc/addons/interfaces/AddonBase.cpp
index 7ceba7e279..930f435c8c 100644
--- a/xbmc/addons/interfaces/AddonBase.cpp
+++ b/xbmc/addons/interfaces/AddonBase.cpp
@@ -211,7 +211,7 @@ bool Interface_Base::get_setting_bool(void* kodiBase, const char* id, bool* valu
 
   if (!addon->ReloadSettings())
   {
-    CLog::Log(LOGERROR, "Interface_Base::{} - could't get settings for add-on '{}'", __func__,
+    CLog::Log(LOGERROR, "Interface_Base::{} - couldn't get settings for add-on '{}'", __func__,
               addon->Name());
     return false;
   }
@@ -248,7 +248,7 @@ bool Interface_Base::get_setting_int(void* kodiBase, const char* id, int* value)
 
   if (!addon->ReloadSettings())
   {
-    CLog::Log(LOGERROR, "Interface_Base::{} - could't get settings for add-on '{}'", __func__,
+    CLog::Log(LOGERROR, "Interface_Base::{} - couldn't get settings for add-on '{}'", __func__,
               addon->Name());
     return false;
   }
@@ -288,7 +288,7 @@ bool Interface_Base::get_setting_float(void* kodiBase, const char* id, float* va
 
   if (!addon->ReloadSettings())
   {
-    CLog::Log(LOGERROR, "Interface_Base::{} - could't get settings for add-on '{}'", __func__,
+    CLog::Log(LOGERROR, "Interface_Base::{} - couldn't get settings for add-on '{}'", __func__,
               addon->Name());
     return false;
   }
@@ -325,7 +325,7 @@ bool Interface_Base::get_setting_string(void* kodiBase, const char* id, char** v
 
   if (!addon->ReloadSettings())
   {
-    CLog::Log(LOGERROR, "Interface_Base::{} - could't get settings for add-on '{}'", __func__,
+    CLog::Log(LOGERROR, "Interface_Base::{} - couldn't get settings for add-on '{}'", __func__,
               addon->Name());
     return false;
   }
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h
index 0ffdcf9362..354806e501 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h
@@ -480,7 +480,7 @@ public:
      *         then, the add-on should call AllocateDemuxPacket(0) on the
      *         callback, and set the streamid to DMX_SPECIALID_STREAMCHANGE and
      *         return the value.
-     *         The add-on should return NULL if an error occured.
+     *         The add-on should return NULL if an error occurred.
      * @remarks Return NULL if this add-on won't provide this function.
      */
   virtual DemuxPacket* DemuxRead() { return nullptr; }
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PVR.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PVR.h
index 7bb972da43..0bca8e2d75 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PVR.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PVR.h
@@ -842,7 +842,7 @@ public:
   ///
   /// @param[in] radio True to get the radio channels, false to get the TV channels.
   /// @param[out] results The channels defined with @ref cpp_kodi_addon_pvr_Defs_Channel_PVRChannel
-  ///                     and available at the addon, them transfered with
+  ///                     and available at the addon, them transferred with
   ///                     @ref cpp_kodi_addon_pvr_Defs_Channel_PVRChannelsResultSet.
   /// @return @ref PVR_ERROR_NO_ERROR if the list has been fetched successfully.
   ///
@@ -1057,7 +1057,7 @@ public:
   ///                  TV channel groups.
   /// @param[out] results List of available groups on addon defined with
   ///                     @ref cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroup,
-  ///                     them transfered with
+  ///                     them transferred with
   ///                     @ref cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroupsResultSet.
   /// @return @ref PVR_ERROR_NO_ERROR if the list has been fetched successfully.
   ///
@@ -1107,7 +1107,7 @@ public:
   /// @param[in] group The group to get the members for.
   /// @param[out] results List of available group member channels defined with
   ///                     @ref cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroupMember,
-  ///                     them transfered with
+  ///                     them transferred with
   ///                     @ref PVRChannelGroupMembersResultSet.
   /// @return @ref PVR_ERROR_NO_ERROR if the list has been fetched successfully.
   ///
@@ -2319,7 +2319,7 @@ public:
   /// If the stream changed and Kodi's player needs to be reinitialised, then,
   /// the add-on should call @ref AllocateDemuxPacket(0) on the callback, and set
   /// the streamid to @ref DMX_SPECIALID_STREAMCHANGE and return the value.
-  /// The add-on should return `nullptr` if an error occured.
+  /// The add-on should return `nullptr` if an error occurred.
   ///
   /// @remarks Required, and only used if addon has its own demuxer.
   /// Return `nullptr` if this add-on won't provide this function.
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h
index 6151cf6854..54246f0c9c 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h
@@ -86,7 +86,7 @@ extern "C"
   enum VIDEOCODEC_RETVAL
   {
     VC_NONE = 0,        //< noop
-    VC_ERROR,           //< an error occured, no other messages will be returned
+    VC_ERROR,           //< an error occurred, no other messages will be returned
     VC_BUFFER,          //< the decoder needs more data
     VC_PICTURE,         //< the decoder got a picture
     VC_EOF,             //< the decoder signals EOF
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/ChannelGroups.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/ChannelGroups.h
index 3464909f69..84422fcc69 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/ChannelGroups.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/ChannelGroups.h
@@ -112,7 +112,7 @@ public:
 
   /// @brief To add and give content from addon to Kodi on related call.
   ///
-  /// @param[in] tag The to transfered data.
+  /// @param[in] tag The to transferred data.
   void Add(const kodi::addon::PVRChannelGroup& tag)
   {
     m_instance->toKodi->TransferChannelGroup(m_instance->toKodi->kodiInstance, m_handle, tag);
@@ -242,7 +242,7 @@ public:
 
   /// @brief To add and give content from addon to Kodi on related call.
   ///
-  /// @param[in] tag The to transfered data.
+  /// @param[in] tag The to transferred data.
   void Add(const kodi::addon::PVRChannelGroupMember& tag)
   {
     m_instance->toKodi->TransferChannelGroupMember(m_instance->toKodi->kodiInstance, m_handle, tag);
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Channels.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Channels.h
index 454cd28875..d89cb21f64 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Channels.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Channels.h
@@ -199,7 +199,7 @@ public:
 
   /// @brief To add and give content from addon to Kodi on related call.
   ///
-  /// @param[in] tag The to transfered data.
+  /// @param[in] tag The to transferred data.
   void Add(const kodi::addon::PVRChannel& tag)
   {
     m_instance->toKodi->TransferChannelEntry(m_instance->toKodi->kodiInstance, m_handle, tag);
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/EPG.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/EPG.h
index cdfb304a8e..00a515b147 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/EPG.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/EPG.h
@@ -477,7 +477,7 @@ public:
 
   /// @brief To add and give content from addon to Kodi on related call.
   ///
-  /// @param[in] tag The to transfered data.
+  /// @param[in] tag The to transferred data.
   void Add(const kodi::addon::PVREPGTag& tag)
   {
     m_instance->toKodi->TransferEpgEntry(m_instance->toKodi->kodiInstance, m_handle, tag.GetTag());
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Recordings.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Recordings.h
index 56feb899d7..b56ae4c85b 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Recordings.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Recordings.h
@@ -495,7 +495,7 @@ public:
 
   /// @brief To add and give content from addon to Kodi on related call.
   ///
-  /// @param[in] tag The to transfered data.
+  /// @param[in] tag The to transferred data.
   void Add(const kodi::addon::PVRRecording& tag)
   {
     m_instance->toKodi->TransferRecordingEntry(m_instance->toKodi->kodiInstance, m_handle, tag);
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Timers.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Timers.h
index b838f1c08d..7179eaa84a 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Timers.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Timers.h
@@ -495,7 +495,7 @@ public:
 
   /// @brief To add and give content from addon to Kodi on related call.
   ///
-  /// @param[in] tag The to transfered data.
+  /// @param[in] tag The to transferred data.
   void Add(const kodi::addon::PVRTimer& tag)
   {
     m_instance->toKodi->TransferTimerEntry(m_instance->toKodi->kodiInstance, m_handle, tag);
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
index 41befc8859..9bf0733cdf 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
@@ -942,7 +942,7 @@ void CAESinkALSA::HandleError(const char* name, int err)
       while((err = snd_pcm_resume(m_pcm)) == -EAGAIN)
         KODI::TIME::Sleep(1);
 
-      /* if the hardware doesnt support resume, prepare the stream */
+      /* if the hardware doesn't support resume, prepare the stream */
       if (err == -ENOSYS)
         if ((err = snd_pcm_prepare(m_pcm)) < 0)
           CLog::Log(LOGERROR, "CAESinkALSA::HandleError(%s) - snd_pcm_prepare returned %d (%s)", name, err, snd_strerror(err));
diff --git a/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.cpp b/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.cpp
index f6704ad139..8ef9a2aa48 100644
--- a/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.cpp
+++ b/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.cpp
@@ -140,7 +140,7 @@ void CAEBitstreamPacker::PackTrueHD(CAEStreamInfo &info, uint8_t* data, int size
   static const uint8_t mat_middle_code[12] = { 0xC3, 0xC1, 0x42, 0x49, 0x3B, 0xFA, 0x82, 0x83, 0x49, 0x80, 0x77, 0xE0 };
   static const uint8_t mat_end_code   [16] = { 0xC3, 0xC2, 0xC0, 0xC4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x97, 0x11 };
 
-  /* create the buffer if it doesnt already exist */
+  /* create the buffer if it doesn't already exist */
   if (!m_trueHD)
   {
     m_trueHD    = new uint8_t[MAT_FRAME_SIZE];
diff --git a/xbmc/cores/AudioEngine/Utils/AEChannelInfo.cpp b/xbmc/cores/AudioEngine/Utils/AEChannelInfo.cpp
index 6af528377d..60b1d6e40e 100644
--- a/xbmc/cores/AudioEngine/Utils/AEChannelInfo.cpp
+++ b/xbmc/cores/AudioEngine/Utils/AEChannelInfo.cpp
@@ -180,7 +180,7 @@ CAEChannelInfo& CAEChannelInfo::operator=(const enum AEStdChLayout rhs)
 
 bool CAEChannelInfo::operator==(const CAEChannelInfo& rhs) const
 {
-  /* if the channel count doesnt match, no need to check further */
+  /* if the channel count doesn't match, no need to check further */
   if (m_channelCount != rhs.m_channelCount)
     return false;
 
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.h
index 2d26b2adb8..e0b1d0955a 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.h
@@ -15,7 +15,7 @@
 #include "PlatformDefs.h"
 
 // VC_ messages, messages can be combined
-#define OC_ERROR    0x00000001  // an error occured, no other messages will be returned
+#define OC_ERROR    0x00000001  // an error occurred, no other messages will be returned
 #define OC_BUFFER   0x00000002  // the decoder needs more data
 #define OC_OVERLAY  0x00000004  // the decoder decoded an overlay, call Decode(NULL, 0) again to parse the rest of the data
 
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h
index 3b38482ff8..e1591c2234 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h
@@ -109,7 +109,7 @@ public:
   enum VCReturn
   {
     VC_NONE = 0,
-    VC_ERROR,           //< an error occured, no other messages will be returned
+    VC_ERROR,           //< an error occurred, no other messages will be returned
     VC_FATAL,           //< non recoverable error
     VC_BUFFER,          //< the decoder needs more data
     VC_PICTURE,         //< the decoder got a picture, call Decode(NULL, 0) again to parse the rest of the data
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_events.h b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_events.h
index 407e18cf6e..20c1942d4d 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_events.h
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/dvdnav_events.h
@@ -149,7 +149,7 @@ typedef struct {
  * they carry the start and end PTS values for the current VOBU.
  * (pci.vobu_s_ptm and pci.vobu_e_ptm) Whenever the start PTS of the
  * current NAV does not match the end PTS of the previous NAV, a PTS
- * discontinuity has occured.
+ * discontinuity has occurred.
  * NAV packets can also be used for time display, because they are
  * timestamped relatively to the current Cell.
  */
diff --git a/xbmc/cores/paplayer/PAPlayer.cpp b/xbmc/cores/paplayer/PAPlayer.cpp
index 881f8a606b..5aca5fb913 100644
--- a/xbmc/cores/paplayer/PAPlayer.cpp
+++ b/xbmc/cores/paplayer/PAPlayer.cpp
@@ -358,7 +358,7 @@ bool PAPlayer::QueueNextFileEx(const CFileItem &file, bool fadeIn)
       return false;
     }
 
-    /* yield our time so that the main PAP thread doesnt stall */
+    /* yield our time so that the main PAP thread doesn't stall */
     CThread::Sleep(1);
   }
 
@@ -503,7 +503,7 @@ inline bool PAPlayer::PrepareStream(StreamInfo *si)
     if (!QueueData(si))
       break;
 
-    /* yield our time so that the main PAP thread doesnt stall */
+    /* yield our time so that the main PAP thread doesn't stall */
     CThread::Sleep(1);
   }
 
diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp
index 3a02d7551f..b759bb9a5f 100644
--- a/xbmc/filesystem/CurlFile.cpp
+++ b/xbmc/filesystem/CurlFile.cpp
@@ -1585,7 +1585,7 @@ int8_t CCurlFile::CReadState::FillBuffer(unsigned int want)
   fd_set fdexcep;
 
   // only attempt to fill buffer if transactions still running and buffer
-  // doesnt exceed required size already
+  // doesn't exceed required size already
   while (m_buffer.getMaxReadSize() < want && m_buffer.getMaxWriteSize() > 0 )
   {
     if (m_cancelled)
diff --git a/xbmc/guilib/GUIColorManager.cpp b/xbmc/guilib/GUIColorManager.cpp
index 1ffcc547ee..823409e0b7 100644
--- a/xbmc/guilib/GUIColorManager.cpp
+++ b/xbmc/guilib/GUIColorManager.cpp
@@ -65,7 +65,7 @@ bool CGUIColorManager::LoadXML(CXBMCTinyXML &xmlDoc)
   std::string strValue = pRootElement->Value();
   if (strValue != std::string("colors"))
   {
-    CLog::Log(LOGERROR, "color file doesnt start with <colors>");
+    CLog::Log(LOGERROR, "color file doesn't start with <colors>");
     return false;
   }
 
diff --git a/xbmc/guilib/GUIFontManager.cpp b/xbmc/guilib/GUIFontManager.cpp
index 8bf25ab8e7..a7c49764c8 100644
--- a/xbmc/guilib/GUIFontManager.cpp
+++ b/xbmc/guilib/GUIFontManager.cpp
@@ -356,7 +356,7 @@ void GUIFontManager::LoadFonts(const std::string& fontSet)
   TiXmlElement* pRootElement = xmlDoc.RootElement();
   if (!pRootElement || pRootElement->ValueStr() != "fonts")
   {
-    CLog::Log(LOGERROR, "file %s doesnt start with <fonts>", strPath.c_str());
+    CLog::Log(LOGERROR, "file %s doesn't start with <fonts>", strPath.c_str());
     return;
   }
   // Resolve includes in Font.xml
@@ -385,11 +385,11 @@ void GUIFontManager::LoadFonts(const std::string& fontSet)
   // no fontset was loaded, try the first
   if (!firstFont.empty())
   {
-    CLog::Log(LOGWARNING, "file doesnt have <fontset> with name '%s', defaulting to first fontset", fontSet.c_str());
+    CLog::Log(LOGWARNING, "file doesn't have <fontset> with name '%s', defaulting to first fontset", fontSet.c_str());
     LoadFonts(firstFont);
   }
   else
-    CLog::Log(LOGERROR, "file '%s' doesnt have a valid <fontset>", strPath.c_str());
+    CLog::Log(LOGERROR, "file '%s' doesn't have a valid <fontset>", strPath.c_str());
 }
 
 void GUIFontManager::LoadFonts(const TiXmlNode* fontNode)
diff --git a/xbmc/guilib/VisibleEffect.cpp b/xbmc/guilib/VisibleEffect.cpp
index 0afbf68151..470cfd4539 100644
--- a/xbmc/guilib/VisibleEffect.cpp
+++ b/xbmc/guilib/VisibleEffect.cpp
@@ -427,7 +427,7 @@ void CAnimation::Animate(unsigned int time, bool startAnim)
       m_start = time;
     m_currentProcess = ANIM_PROCESS_REVERSE;
   }
-  // reset the queued state once we've rendered to ensure allocation has occured
+  // reset the queued state once we've rendered to ensure allocation has occurred
   m_queuedProcess = ANIM_PROCESS_NONE;
 
   // Update our animation process
diff --git a/xbmc/guilib/guiinfo/GUIInfoLabel.cpp b/xbmc/guilib/guiinfo/GUIInfoLabel.cpp
index fb0fc180b2..23201146b2 100644
--- a/xbmc/guilib/guiinfo/GUIInfoLabel.cpp
+++ b/xbmc/guilib/guiinfo/GUIInfoLabel.cpp
@@ -258,7 +258,7 @@ void CGUIInfoLabel::Parse(const std::string &label, int context)
             if (info == 0)
               info = infoMgr.RegisterSkinVariableString(g_SkinInfo->CreateSkinVariable(params[0], context));
             if (info == 0) // skinner didn't define this conditional label!
-              CLog::Log(LOGWARNING, "Label Formating: $VAR[%s] is not defined", params[0].c_str());
+              CLog::Log(LOGWARNING, "Label Formatting: $VAR[%s] is not defined", params[0].c_str());
           }
           else
             info = infoMgr.TranslateString(params[0]);
diff --git a/xbmc/input/joysticks/generic/FeatureHandling.h b/xbmc/input/joysticks/generic/FeatureHandling.h
index 4010781dab..096bcd1789 100644
--- a/xbmc/input/joysticks/generic/FeatureHandling.h
+++ b/xbmc/input/joysticks/generic/FeatureHandling.h
@@ -36,7 +36,7 @@ public:
   virtual ~CJoystickFeature() = default;
 
   /*!
-   * \brief A digital motion has occured
+   * \brief A digital motion has occurred
    *
    * \param source The source of the motion. Must be digital (button or hat)
    * \param bPressed True for press motion, false for release motion
@@ -46,7 +46,7 @@ public:
   virtual bool OnDigitalMotion(const CDriverPrimitive& source, bool bPressed) = 0;
 
   /*!
-   * \brief An analog motion has occured
+   * \brief An analog motion has occurred
    *
    * \param source The source of the motion. Must be a semiaxis
    * \param magnitude The magnitude of the press or motion in the interval [0.0, 1.0]
@@ -61,7 +61,7 @@ public:
   virtual bool OnAnalogMotion(const CDriverPrimitive& source, float magnitude) = 0;
 
   /*!
-   * \brief Process the motions that have occured since the last invocation
+   * \brief Process the motions that have occurred since the last invocation
    *
    * This allows features with motion on multiple driver primitives to call
    * their handler once all driver primitives are accounted for.
diff --git a/xbmc/input/touch/ITouchInputHandler.h b/xbmc/input/touch/ITouchInputHandler.h
index 15ca0f0e8f..12758395f2 100644
--- a/xbmc/input/touch/ITouchInputHandler.h
+++ b/xbmc/input/touch/ITouchInputHandler.h
@@ -52,7 +52,7 @@ public:
    * \param event    The actual touch event (abort, down, up, move)
    * \param x        The x coordinate (with sub-pixel) of the touch
    * \param y        The y coordinate (with sub-pixel) of the touch
-   * \param time     The time (in nanoseconds) when this touch occured
+   * \param time     The time (in nanoseconds) when this touch occurred
    * \param pointer  The number of the touch pointer which caused this event (default 0)
    * \param size     The size of the touch pointer (with sub-pixel) (default 0.0)
    *
@@ -76,7 +76,7 @@ public:
    * \param pointer  The number of the touch pointer which caused this event (default 0)
    * \param x        The x coordinate (with sub-pixel) of the touch
    * \param y        The y coordinate (with sub-pixel) of the touch
-   * \param time     The time (in nanoseconds) when this touch occured
+   * \param time     The time (in nanoseconds) when this touch occurred
    * \param size     The size of the touch pointer (with sub-pixel) (default 0.0)
    *
    * \return True if the pointer was updated otherwise false.
diff --git a/xbmc/input/touch/generic/IGenericTouchGestureDetector.h b/xbmc/input/touch/generic/IGenericTouchGestureDetector.h
index da9d86869e..7e2cb88365 100644
--- a/xbmc/input/touch/generic/IGenericTouchGestureDetector.h
+++ b/xbmc/input/touch/generic/IGenericTouchGestureDetector.h
@@ -66,7 +66,7 @@ public:
   virtual bool OnTouchMove(unsigned int index, const Pointer& pointer) { return false; }
   /*!
    * \brief An active touch pointer's values have been updated but no event has
-   *        occured.
+   *        occurred.
    *
    * \param index     Index of the given touch pointer
    * \param pointer   Touch pointer that has changed
diff --git a/xbmc/interfaces/json-rpc/schema/methods.json b/xbmc/interfaces/json-rpc/schema/methods.json
index 856dda7490..079eb7efea 100644
--- a/xbmc/interfaces/json-rpc/schema/methods.json
+++ b/xbmc/interfaces/json-rpc/schema/methods.json
@@ -694,7 +694,7 @@
   },
   "AudioLibrary.GetArtists": {
     "type": "method",
-    "description": "Retrieve all artists. For backward compatibility by default this implicity does not include those that only contribute other roles, however absolutely all artists can be returned using allroles=true",
+    "description": "Retrieve all artists. For backward compatibility by default this implicitly does not include those that only contribute other roles, however absolutely all artists can be returned using allroles=true",
     "transport": "Response",
     "permission": "ReadData",
     "params": [
@@ -837,9 +837,9 @@
           { "$ref": "List.Filter.Songs" }
         ]
       },
-      { "name": "includesingles", "type": "boolean", "default": true, "description": "Only songs from albums are returned when false, but overidden when singlesonly parameter is true" },
+      { "name": "includesingles", "type": "boolean", "default": true, "description": "Only songs from albums are returned when false, but overridden when singlesonly parameter is true" },
       { "name": "allroles", "type": "boolean", "default":false, "description": "Whether or not to include all roles when filtering by artist, rather than default of excluding other contributors. When true it overrides any role filter value." },
-      { "name": "singlesonly", "type": "boolean", "default": false, "description": "Only singles are returned when true, and overides includesingles parameter" }
+      { "name": "singlesonly", "type": "boolean", "default": false, "description": "Only singles are returned when true, and overrides includesingles parameter" }
     ],
     "returns": {
       "type": "object",
diff --git a/xbmc/interfaces/python/swig.cpp b/xbmc/interfaces/python/swig.cpp
index 2d70b6ec17..d0a0699d63 100644
--- a/xbmc/interfaces/python/swig.cpp
+++ b/xbmc/interfaces/python/swig.cpp
@@ -138,7 +138,7 @@ namespace PythonBindings
     std::string msg;
     std::string type, value, traceback;
     if (!ParsePythonException(type, value, traceback))
-      UncheckedException::SetMessage("Strange: No Python exception occured");
+      UncheckedException::SetMessage("Strange: No Python exception occurred");
     else
       SetMessage(type, value, traceback);
   }
diff --git a/xbmc/music/MusicDatabase.cpp b/xbmc/music/MusicDatabase.cpp
index ac8266c305..2611370746 100644
--- a/xbmc/music/MusicDatabase.cpp
+++ b/xbmc/music/MusicDatabase.cpp
@@ -1555,7 +1555,7 @@ int CMusicDatabase::AddGenre(std::string& strGenre)
     if (m_pDS->num_rows() == 0)
     {
       m_pDS->close();
-      // doesnt exists, add it
+      // doesn't exists, add it
       strSQL=PrepareSQL("INSERT INTO genre (idGenre, strGenre) values( NULL, '%s' )", strGenre.c_str());
       m_pDS->exec(strSQL);
 
@@ -2594,7 +2594,7 @@ int CMusicDatabase::AddPath(const std::string& strPath1)
     if (m_pDS->num_rows() == 0)
     {
       m_pDS->close();
-      // doesnt exists, add it
+      // doesn't exists, add it
       strSQL=PrepareSQL("insert into path (idPath, strPath) values( NULL, '%s' )", strPath.c_str());
       m_pDS->exec(strSQL);
 
@@ -4211,7 +4211,7 @@ bool CMusicDatabase::LookupCDDBInfo(bool bRequery/*=false*/)
       else
       {
         pCdInfo->SetNoCDDBInfo();
-        // ..no, an error occured, display it to the user
+        // ..no, an error occurred, display it to the user
         std::string strErrorText = StringUtils::Format("[%d] %s", cddb.getLastError(), cddb.getLastErrorText());
         HELPERS::ShowOKDialogLines(CVariant{255}, CVariant{257}, CVariant{std::move(strErrorText)}, CVariant{0});
       }
@@ -8208,7 +8208,7 @@ void CMusicDatabase::UpdateTables(int version)
     }
     catch (...)
     {
-      CLog::Log(LOGERROR, "Migrating specific artist scraper settings has failed, settings not transfered");
+      CLog::Log(LOGERROR, "Migrating specific artist scraper settings has failed, settings not transferred");
     }
     try
     {
@@ -8219,7 +8219,7 @@ void CMusicDatabase::UpdateTables(int version)
     }
     catch (...)
     {
-      CLog::Log(LOGERROR, "Migrating specific album scraper settings has failed, settings not transfered");
+      CLog::Log(LOGERROR, "Migrating specific album scraper settings has failed, settings not transferred");
     }
     try
     {
@@ -8234,7 +8234,7 @@ void CMusicDatabase::UpdateTables(int version)
     }
     catch (...)
     {
-      CLog::Log(LOGERROR, "Migrating album and artist scraper settings has failed, settings not transfered");
+      CLog::Log(LOGERROR, "Migrating album and artist scraper settings has failed, settings not transferred");
     }
     m_pDS->exec("DROP TABLE content_temp");
 
diff --git a/xbmc/music/MusicDatabase.h b/xbmc/music/MusicDatabase.h
index 8fada1a898..bfcacdef05 100644
--- a/xbmc/music/MusicDatabase.h
+++ b/xbmc/music/MusicDatabase.h
@@ -669,7 +669,7 @@ public:
   /*! \brief Check if music files need all tags rescanning regardless of file being unchanged
   because the tag processing has changed (which may happen without db version changes) since they
   where last scanned.
-  \return -1 if an error occured, 0 if no scan is needed, or the version number of tags if not the same as current.
+  \return -1 if an error occurred, 0 if no scan is needed, or the version number of tags if not the same as current.
   */
   virtual int GetMusicNeedsTagScan();
 
diff --git a/xbmc/network/WakeOnAccess.cpp b/xbmc/network/WakeOnAccess.cpp
index b4824be357..4e24fb06e9 100644
--- a/xbmc/network/WakeOnAccess.cpp
+++ b/xbmc/network/WakeOnAccess.cpp
@@ -811,7 +811,7 @@ void CWakeOnAccess::LoadFromXML()
   TiXmlElement* pRootElement = xmlDoc.RootElement();
   if (StringUtils::CompareNoCase(pRootElement->Value(), "onaccesswakeup"))
   {
-    CLog::Log(LOGERROR, "%s - XML file %s doesnt contain <onaccesswakeup>", __FUNCTION__, GetSettingFile().c_str());
+    CLog::Log(LOGERROR, "%s - XML file %s doesn't contain <onaccesswakeup>", __FUNCTION__, GetSettingFile().c_str());
     return;
   }
 
diff --git a/xbmc/network/cddb.cpp b/xbmc/network/cddb.cpp
index 4966567d78..5272369f4e 100644
--- a/xbmc/network/cddb.cpp
+++ b/xbmc/network/cddb.cpp
@@ -495,7 +495,7 @@ void Xcddb::parseData(const char *buffer)
 
         std::map<std::string, std::string>::const_iterator it = keywords.find(strKeyword);
         if (it != keywords.end())
-          strValue = it->second + strValue; // keyword occured before, concatenate
+          strValue = it->second + strValue; // keyword occurred before, concatenate
         else
           keywordsOrder.push_back(strKeyword);
 
diff --git a/xbmc/powermanagement/IPowerSyscall.h b/xbmc/powermanagement/IPowerSyscall.h
index f3bf1ae465..b3f215516c 100644
--- a/xbmc/powermanagement/IPowerSyscall.h
+++ b/xbmc/powermanagement/IPowerSyscall.h
@@ -55,7 +55,7 @@ public:
    PumpPowerEvents is called from Application Thread and the platform implementation may signal
    power related events back to xbmc through the callback.
 
-   return true if an event occured and false if not.
+   return true if an event occurred and false if not.
 
    \param callback the callback to signal to
    */
diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp
index f90292df14..b905fa7b25 100644
--- a/xbmc/pvr/PVRManager.cpp
+++ b/xbmc/pvr/PVRManager.cpp
@@ -542,7 +542,7 @@ void CPVRManager::Process()
     }
     catch (...)
     {
-      CLog::LogF(LOGERROR, "An error occured while trying to execute the last PVR update job, trying to recover");
+      CLog::LogF(LOGERROR, "An error occurred while trying to execute the last PVR update job, trying to recover");
       bRestart = true;
     }
 
diff --git a/xbmc/pvr/epg/Epg.h b/xbmc/pvr/epg/Epg.h
index 2e1293d296..2e6e1ac487 100644
--- a/xbmc/pvr/epg/Epg.h
+++ b/xbmc/pvr/epg/Epg.h
@@ -134,7 +134,7 @@ namespace PVR
     std::shared_ptr<CPVREpgInfoTag> GetTagNext() const;
 
     /*!
-     * @brief Get the event that occured previously
+     * @brief Get the event that occurred previously
      * @return The previous event or NULL if it wasn't found.
      */
     std::shared_ptr<CPVREpgInfoTag> GetTagPrevious() const;
diff --git a/xbmc/pvr/epg/EpgTagsContainer.h b/xbmc/pvr/epg/EpgTagsContainer.h
index f3ef0ad726..6a3ca24ce5 100644
--- a/xbmc/pvr/epg/EpgTagsContainer.h
+++ b/xbmc/pvr/epg/EpgTagsContainer.h
@@ -116,7 +116,7 @@ public:
   std::shared_ptr<CPVREpgInfoTag> GetNextStartingTag() const;
 
   /*!
-   * @brief Get the event that occured previously
+   * @brief Get the event that occurred previously
    * @return The tag or nullptr if no tag was found.
    */
   std::shared_ptr<CPVREpgInfoTag> GetLastEndedTag() const;
diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
index 7138b0a639..1b09d077f4 100644
--- a/xbmc/settings/AdvancedSettings.cpp
+++ b/xbmc/settings/AdvancedSettings.cpp
@@ -799,7 +799,7 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file)
   pElement = pRootElement->FirstChildElement("externalplayer");
   if (pElement)
   {
-    CLog::Log(LOGWARNING, "External player configuration has been removed from advancedsettings.xml.  It can now be configed in userdata/playercorefactory.xml");
+    CLog::Log(LOGWARNING, "External player configuration has been removed from advancedsettings.xml.  It can now be configured in userdata/playercorefactory.xml");
   }
   pElement = pRootElement->FirstChildElement("slideshow");
   if (pElement)
diff --git a/xbmc/utils/EGLUtils.cpp b/xbmc/utils/EGLUtils.cpp
index d5f2d4864e..01df4ba7e7 100644
--- a/xbmc/utils/EGLUtils.cpp
+++ b/xbmc/utils/EGLUtils.cpp
@@ -364,7 +364,7 @@ bool CEGLContextUtils::ChooseConfig(EGLint renderableType, EGLint visualId, bool
       break;
 
     if (eglGetConfigAttrib(m_eglDisplay, *currentConfig, EGL_NATIVE_VISUAL_ID, &id) != EGL_TRUE)
-      CEGLUtils::Log(LOGERROR, "failed to query EGL attibute EGL_NATIVE_VISUAL_ID");
+      CEGLUtils::Log(LOGERROR, "failed to query EGL attribute EGL_NATIVE_VISUAL_ID");
 
     if (visualId == id)
       break;
@@ -382,7 +382,7 @@ bool CEGLContextUtils::ChooseConfig(EGLint renderableType, EGLint visualId, bool
   {
     EGLint value{0};
     if (eglGetConfigAttrib(m_eglDisplay, *currentConfig, eglAttribute.first, &value) != EGL_TRUE)
-      CEGLUtils::Log(LOGERROR, StringUtils::Format("failed to query EGL attibute %s", eglAttribute.second));
+      CEGLUtils::Log(LOGERROR, StringUtils::Format("failed to query EGL attribute %s", eglAttribute.second));
 
     // we only need to print the hex value if it's an actual EGL define
     CLog::Log(LOGDEBUG, "  %s: %s", eglAttribute.second, (value >= 0x3000 && value <= 0x3200) ? StringUtils::Format("0x%04x", value) : StringUtils::Format("%d", value));
@@ -395,7 +395,7 @@ EGLint CEGLContextUtils::GetConfigAttrib(EGLint attribute) const
 {
   EGLint value{0};
   if (eglGetConfigAttrib(m_eglDisplay, m_eglConfig, attribute, &value) != EGL_TRUE)
-    CEGLUtils::Log(LOGERROR, "failed to query EGL attibute");
+    CEGLUtils::Log(LOGERROR, "failed to query EGL attribute");
   return value;
 }
 
diff --git a/xbmc/video/VideoDatabase.cpp b/xbmc/video/VideoDatabase.cpp
index bde44660d8..68c7241fc7 100644
--- a/xbmc/video/VideoDatabase.cpp
+++ b/xbmc/video/VideoDatabase.cpp
@@ -1483,7 +1483,7 @@ int CVideoDatabase::AddToTable(const std::string& table, const std::string& firs
     if (m_pDS->num_rows() == 0)
     {
       m_pDS->close();
-      // doesnt exists, add it
+      // doesn't exists, add it
       strSQL = PrepareSQL("insert into %s (%s, %s) values(NULL, '%s')", table.c_str(), firstField.c_str(), secondField.c_str(), value.substr(0, 255).c_str());
       m_pDS->exec(strSQL);
       int id = (int)m_pDS->lastinsertid();
@@ -1543,7 +1543,7 @@ int CVideoDatabase::AddRatings(int mediaId, const char *mediaType, const RatingM
       if (m_pDS->num_rows() == 0)
       {
         m_pDS->close();
-        // doesnt exists, add it
+        // doesn't exists, add it
         strSQL = PrepareSQL("INSERT INTO rating (media_id, media_type, rating_type, rating, votes) VALUES (%i, '%s', '%s', %f, %i)", mediaId, mediaType, i.first.c_str(), i.second.rating, i.second.votes);
         m_pDS->exec(strSQL);
         id = (int)m_pDS->lastinsertid();
@@ -1608,7 +1608,7 @@ int CVideoDatabase::AddUniqueIDs(int mediaId, const char *mediaType, const CVide
       if (m_pDS->num_rows() == 0)
       {
         m_pDS->close();
-        // doesnt exists, add it
+        // doesn't exists, add it
         strSQL = PrepareSQL("INSERT INTO uniqueid (media_id, media_type, value, type) VALUES (%i, '%s', '%s', '%s')", mediaId, mediaType, i.second.c_str(), i.first.c_str());
         m_pDS->exec(strSQL);
         id = (int)m_pDS->lastinsertid();
@@ -1696,7 +1696,7 @@ int CVideoDatabase::AddActor(const std::string& name, const std::string& thumbUR
     if (m_pDS->num_rows() == 0)
     {
       m_pDS->close();
-      // doesnt exists, add it
+      // doesn't exists, add it
       strSQL=PrepareSQL("insert into actor (actor_id, name, art_urls) values(NULL, '%s', '%s')", trimmedName.substr(0,255).c_str(), thumbURLs.c_str());
       m_pDS->exec(strSQL);
       idActor = (int)m_pDS->lastinsertid();
@@ -1733,7 +1733,7 @@ void CVideoDatabase::AddLinkToActor(int mediaId, const char *mediaType, int acto
                                actorId, mediaId, mediaType, role.c_str());
 
   if (GetSingleValue(sql).empty())
-  { // doesnt exists, add it
+  { // doesn't exists, add it
     sql = PrepareSQL("INSERT INTO actor_link (actor_id, media_id, media_type, role, cast_order) VALUES(%i,%i,'%s','%s',%i)", actorId, mediaId, mediaType, role.c_str(), order);
     ExecuteQuery(sql);
   }
@@ -1745,7 +1745,7 @@ void CVideoDatabase::AddToLinkTable(int mediaId, const std::string& mediaType, c
   std::string sql = PrepareSQL("SELECT 1 FROM %s_link WHERE %s_id=%i AND media_id=%i AND media_type='%s'", table.c_str(), key, valueId, mediaId, mediaType.c_str());
 
   if (GetSingleValue(sql).empty())
-  { // doesnt exists, add it
+  { // doesn't exists, add it
     sql = PrepareSQL("INSERT INTO %s_link (%s_id,media_id,media_type) VALUES(%i,%i,'%s')", table.c_str(), key, valueId, mediaId, mediaType.c_str());
     ExecuteQuery(sql);
   }
diff --git a/xbmc/windowing/wayland/SeatInputProcessing.h b/xbmc/windowing/wayland/SeatInputProcessing.h
index b40b00fec2..ce1f0ee759 100644
--- a/xbmc/windowing/wayland/SeatInputProcessing.h
+++ b/xbmc/windowing/wayland/SeatInputProcessing.h
@@ -64,7 +64,7 @@ public:
    *
    * This request is sent in addition to \ref OnEnter for \ref InputType::POINTER.
    *
-   * \param seatGlobalName numeric Wayland global name of the seat the event occured on
+   * \param seatGlobalName numeric Wayland global name of the seat the event occurred on
    * \param pointer pointer instance that needs its cursor set
    * \param serial Wayland protocol message serial that must be sent back in set_cursor
    */