From c30236453390c6d7df5aaca005daf62ef7cb3416 Mon Sep 17 00:00:00 2001
From: Rick Phillips <ruuk@kodi.tv>
Date: Sun, 6 May 2018 11:20:33 -0700
Subject: [PATCH 1/2] Fix for encoding errors with PlexStream - Issue #188

---
 addon.xml                                    | 2 +-
 changelog.txt                                | 4 ++++
 lib/_included_packages/plexnet/plexstream.py | 8 ++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/addon.xml b/addon.xml
index 237f899c7..344d26415 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.plex"
        name="Plex"
-       version="0.1.5"
+       version="0.1.6a1"
        provider-name="Plex">
     <requires>
         <import addon="xbmc.python" version="2.25.0"/>
diff --git a/changelog.txt b/changelog.txt
index 182f2c3fb..abe6a81ea 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+[- 0.1.6 -]
+
+Fix issues when selecting subtitles (Issue #188)
+
 [- 0.1.5 -]
 
 Allow direct playback of episodes and movies using the play button on hub screen (thanks to pannal)
diff --git a/lib/_included_packages/plexnet/plexstream.py b/lib/_included_packages/plexnet/plexstream.py
index 4b6ff2149..1e67add40 100644
--- a/lib/_included_packages/plexnet/plexstream.py
+++ b/lib/_included_packages/plexnet/plexstream.py
@@ -47,9 +47,9 @@ def getTitle(self, translate_func=util.dummyTranslate):
             channels = self.getChannels(translate_func)
 
             if codec != "" and channels != "":
-                title += " ({0} {1})".format(codec, channels)
+                title += u" ({0} {1})".format(codec, channels)
             elif codec != "" or channels != "":
-                title += " ({0}{1})".format(codec, channels)
+                title += u" ({0}{1})".format(codec, channels)
         elif streamType == self.TYPE_SUBTITLE:
             extras = []
 
@@ -64,11 +64,11 @@ def getTitle(self, translate_func=util.dummyTranslate):
                 extras.append(translate_func("Forced"))
 
             if len(extras) > 0:
-                title += " ({0})".format('/'.join(extras))
+                title += u" ({0})".format('/'.join(extras))
         elif streamType == self.TYPE_LYRICS:
             title = translate_func("Lyrics")
             if self.format:
-                title += " ({0})".format(self.format)
+                title += u" ({0})".format(self.format)
 
         return title
 

From 111375c5e763c87adba50b3b199a098f51024f0e Mon Sep 17 00:00:00 2001
From: Rick Phillips <ruuk@kodi.tv>
Date: Thu, 10 May 2018 21:41:50 -0700
Subject: [PATCH 2/2] Version bump 0.1.6

---
 addon.xml     | 2 +-
 changelog.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon.xml b/addon.xml
index 344d26415..26cbc1a8f 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.plex"
        name="Plex"
-       version="0.1.6a1"
+       version="0.1.6"
        provider-name="Plex">
     <requires>
         <import addon="xbmc.python" version="2.25.0"/>
diff --git a/changelog.txt b/changelog.txt
index abe6a81ea..441afb369 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,6 +1,6 @@
 [- 0.1.6 -]
 
-Fix issues when selecting subtitles (Issue #188)
+Fix issues when selecting subtitles for users of certain languages (Issue #188)
 
 [- 0.1.5 -]