Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'MediaBrowser/master'

Browse source
This commit is contained in:
tomkat83 2015-12-31 10:55:08 +01:00
commit 9ad059e31f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/language/English/strings.xml
View file

@ -143,7 +143,7 @@
<string id="30154"> - Show Unplayed Count Indicator</string> <string id="30154"> - Show Unplayed Count Indicator</string>
<string id="30155"> - Show Played Percentage Indicator</string> <string id="30155"> - Show Played Percentage Indicator</string>
<string id="30156">Sort NextUp by Show Title</string> <string id="30156">Sort NextUp by Show Title</string>
<string id="30157">Disable Enhanced Images (eg CoverArt)</string> <string id="30157">Enable Enhanced Images (eg CoverArt)</string>
<string id="30158">Metadata</string> <string id="30158">Metadata</string>
<string id="30159">Artwork</string> <string id="30159">Artwork</string>
<string id="30160">Video Quality</string> <string id="30160">Video Quality</string>

4
resources/lib/read_embyserver.py
View file

@ -233,8 +233,8 @@ class Read_EmbyServer():
if itemId == folder['Id']: if itemId == folder['Id']:
itemtype = folder.get('CollectionType', "mixed") itemtype = folder.get('CollectionType', "mixed")
if (itemtype == type or if (name not in ('Collections', 'Trailers') and (itemtype == type or
(itemtype == "mixed" and type in ("movies", "tvshows"))): (itemtype == "mixed" and type in ("movies", "tvshows")))):
views.append({ views.append({