From 71ed24604d6abb467ec638aef0eea02698f2b9e7 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 26 Dec 2015 03:07:24 -0500
Subject: [PATCH] update subtitles

---
 dashboard-ui/mypreferenceslanguages.html | 1 +
 dashboard-ui/strings/html/server.json    | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dashboard-ui/mypreferenceslanguages.html b/dashboard-ui/mypreferenceslanguages.html
index 99160380b8..f2491977fa 100644
--- a/dashboard-ui/mypreferenceslanguages.html
+++ b/dashboard-ui/mypreferenceslanguages.html
@@ -34,6 +34,7 @@
                             <label for="selectSubtitlePlaybackMode">${LabelSubtitlePlaybackMode}</label>
                             <select id="selectSubtitlePlaybackMode" data-mini="true">
                                 <option value="Default">${OptionDefaultSubtitles}</option>
+                                <option value="Smart">${OptionSmartSubtitles}</option>
                                 <option value="OnlyForced">${OptionOnlyForcedSubtitles}</option>
                                 <option value="Always">${OptionAlwaysPlaySubtitles}</option>
                                 <option value="None">${OptionNoSubtitles}</option>
diff --git a/dashboard-ui/strings/html/server.json b/dashboard-ui/strings/html/server.json
index 426f042509..e6c1211400 100644
--- a/dashboard-ui/strings/html/server.json
+++ b/dashboard-ui/strings/html/server.json
@@ -136,10 +136,12 @@
     "LabelAudioLanguagePreference": "Audio language preference:",
     "LabelSubtitleLanguagePreference": "Subtitle language preference:",
     "OptionDefaultSubtitles": "Default",
+    "OptionSmartSubtitles": "Smart",
+    "OptionSmartSubtitlesHelp": "Subtitles matching the language preference will be loaded when the audio is in a foreign language.",
     "OptionOnlyForcedSubtitles": "Only forced subtitles",
     "OptionAlwaysPlaySubtitles": "Always play subtitles",
     "OptionNoSubtitles": "None",
-    "OptionDefaultSubtitlesHelp": "Subtitles matching the language preference will be loaded when the audio is in a foreign language.",
+    "OptionDefaultSubtitlesHelp": "Subtitles are loaded based on the default and forced flags in the embedded metadata. Language preferences are considered when multiple options are available.",
     "OptionOnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
     "OptionAlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.",
     "OptionNoSubtitlesHelp": "Subtitles will not be loaded by default.",
@@ -1541,5 +1543,5 @@
     "HeadersFolders": "Folders",
     "LabelDisplayName": "Display name:",
     "HeaderNewRecording": "New Recording",
-    "ButtonAdvanced":  "Advanced"
+    "ButtonAdvanced": "Advanced"
 }