Merge branch 'master' into NetworkPR2

2 files changed, 2 insertions, 2 deletions

diff --git a/Emby.Naming/Subtitles/SubtitleParser.cs b/Emby.Naming/Subtitles/SubtitleParser.cs
index e872452519..a19340ef69 100644
--- a/Emby.Naming/Subtitles/SubtitleParser.cs
+++ b/Emby.Naming/Subtitles/SubtitleParser.cs
@@ -60,7 +60,7 @@ namespace Emby.Naming.Subtitles
 
         private string[] GetFlags(string path)
         {
-            // Note: the tags need be be surrounded be either a space ( ), hyphen -, dot . or underscore _.
+            // Note: the tags need be surrounded be either a space ( ), hyphen -, dot . or underscore _.
 
             var file = Path.GetFileName(path);
 
diff --git a/Emby.Naming/Video/VideoListResolver.cs b/Emby.Naming/Video/VideoListResolver.cs
index 19cc491cfb..5f83355c8f 100644
--- a/Emby.Naming/Video/VideoListResolver.cs
+++ b/Emby.Naming/Video/VideoListResolver.cs
@@ -30,7 +30,7 @@ namespace Emby.Naming.Video
         /// </summary>
         /// <param name="files">List of related video files.</param>
         /// <param name="supportMultiVersion">Indication we should consider multi-versions of content.</param>
-        /// <returns>Returns enumerable of <see cref="VideoInfo"/> which groups files togeather when related.</returns>
+        /// <returns>Returns enumerable of <see cref="VideoInfo"/> which groups files together when related.</returns>
         public IEnumerable<VideoInfo> Resolve(List<FileSystemMetadata> files, bool supportMultiVersion = true)
         {
             var videoResolver = new VideoResolver(_options);