From 432c8c49ceddbd67788d6e737997cac88de03e19 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 31 Mar 2014 17:04:22 -0400
Subject: [PATCH] added more remote control commands

---
 dashboard-ui/dashboardgeneral.html        |  2 +-
 dashboard-ui/dashboardinfopage.html       |  1 +
 dashboard-ui/library.html                 |  2 +-
 dashboard-ui/scripts/dashboardinfo.js     |  1 +
 dashboard-ui/scripts/mediacontroller.js   | 26 ++++++++++++++++--
 dashboard-ui/scripts/medialibrarypage.js  |  3 +--
 dashboard-ui/scripts/pluginspage.js       | 30 ++++++++++++---------
 dashboard-ui/scripts/pluginupdatespage.js | 13 +++++++--
 dashboard-ui/scripts/site.js              | 23 ++++------------
 dashboard-ui/scripts/tvrecommended.js     | 26 +++++++-----------
 dashboard-ui/scripts/tvupcoming.js        |  7 ++---
 dashboard-ui/tvrecommended.html           |  1 +
 dashboard-ui/tvupcoming.html              |  1 +
 dashboard-ui/wizardfinish.html            |  4 +--
 dashboard-ui/wizardimagesettings.html     | 20 +++++++-------
 dashboard-ui/wizardlibrary.html           | 32 +++++++++--------------
 dashboard-ui/wizardservice.html           | 12 ++++-----
 dashboard-ui/wizardsettings.html          | 22 ++++++++--------
 dashboard-ui/wizardstart.html             |  8 +++---
 dashboard-ui/wizarduser.html              | 12 ++++-----
 20 files changed, 129 insertions(+), 117 deletions(-)

diff --git a/dashboard-ui/dashboardgeneral.html b/dashboard-ui/dashboardgeneral.html
index 2038311ef3..000a7b7572 100644
--- a/dashboard-ui/dashboardgeneral.html
+++ b/dashboard-ui/dashboardgeneral.html
@@ -27,7 +27,7 @@
                             <label for="selectLocalizationLanguage">Preferred display language</label>
                             <select id="selectLocalizationLanguage" data-mini="true">
                             </select>
-                            <div class="fieldDescription">Translating Media Browser is an ongoing project. Read about how <a href="http://mediabrowser3.com/community/index.php?/topic/5727-join-our-translation-team/" target="_blank">you can contribute</a>.</div>
+                            <div class="fieldDescription">Translating Media Browser is an ongoing project. <a href="http://mediabrowser3.com/community/index.php?/topic/5727-join-our-translation-team/" target="_blank">Read about how you can contribute</a>.</div>
                         </li>
                     </ul>
                     <ul data-role="listview" class="ulForm">
diff --git a/dashboard-ui/dashboardinfopage.html b/dashboard-ui/dashboardinfopage.html
index 71e3f1e2f7..a255eb8987 100644
--- a/dashboard-ui/dashboardinfopage.html
+++ b/dashboard-ui/dashboardinfopage.html
@@ -31,6 +31,7 @@
                             <p><b>Cache:</b> <span id="cachePath"></span></p>
                             <p><b>Images by name:</b> <span id="imagesByNamePath"></span></p>
                             <p><b>Logs:</b> <span id="logPath"></span></p>
+                            <p><b>Metadata:</b> <span id="metadataPath"></span></p>
                             <p><b>Transcoding temporary files:</b> <span id="transcodingTemporaryPath"></span></p>
                         </div>
                     </div>
diff --git a/dashboard-ui/library.html b/dashboard-ui/library.html
index c79186293d..387789a53c 100644
--- a/dashboard-ui/library.html
+++ b/dashboard-ui/library.html
@@ -35,7 +35,7 @@
         <div data-role="popup" data-transition="slidefade" id="popupEnterText" class="popup">
 
             <div class="ui-bar-a" style="text-align: center; padding: 0 20px;">
-                <h3>Rename</h3>
+                <h3>Rename Media Folder</h3>
             </div>
 
             <div data-role="content">
diff --git a/dashboard-ui/scripts/dashboardinfo.js b/dashboard-ui/scripts/dashboardinfo.js
index 5044e8d598..622b83b66e 100644
--- a/dashboard-ui/scripts/dashboardinfo.js
+++ b/dashboard-ui/scripts/dashboardinfo.js
@@ -6,6 +6,7 @@
         $('#logPath', page).html(systemInfo.LogPath);
         $('#imagesByNamePath', page).html(systemInfo.ItemsByNamePath);
         $('#transcodingTemporaryPath', page).html(systemInfo.TranscodingTempPath);
+        $('#metadataPath', page).html(systemInfo.InternalMetadataPath);
 
         if (systemInfo.WanAddress) {
 
diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index 893bbe5b3e..9f53094057 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -150,7 +150,9 @@
 
     function onWebSocketMessageReceived(e, msg) {
 
-        var localPlayer = msg.MessageType === "Play" || msg.MessageType === "Playstate" ?
+        var localPlayer = msg.MessageType === "Play" ||
+            msg.MessageType === "Playstate" ||
+            msg.MessageType === "GeneralCommand" ?
             MediaController.getLocalPlayer() :
             null;
 
@@ -191,6 +193,26 @@
                 localPlayer.remoteFullscreen();
             }
         }
+        else if (msg.MessageType === "GeneralCommand") {
+
+            var cmd = msg.Data;
+
+            if (cmd.Name === 'Mute') {
+                localPlayer.mute();
+            }
+            else if (cmd.Name === 'Unmute') {
+                localPlayer.unmute();
+            }
+            else if (cmd.Name === 'VolumeUp') {
+                localPlayer.volumeUp();
+            }
+            else if (cmd.Name === 'VolumeDown') {
+                localPlayer.volumeDown();
+            }
+            else if (cmd.Name === 'ToggleMute') {
+                localPlayer.toggleMute();
+            }
+        }
     }
 
     $(ApiClient).on("websocketmessage", onWebSocketMessageReceived);
@@ -232,7 +254,7 @@
     function showPlayerSelection(page) {
 
         var promise = MediaController.getTargets();
-        
+
         var html = '<div data-role="panel" data-position="right" data-display="overlay" data-position-fixed="true" id="playerSelectionPanel" class="playerSelectionPanel" data-theme="b">';
 
         html += '<div class="players"></div>';
diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js
index ba1b9b15e1..63426906e2 100644
--- a/dashboard-ui/scripts/medialibrarypage.js
+++ b/dashboard-ui/scripts/medialibrarypage.js
@@ -16,7 +16,6 @@
             MediaLibraryPage.reloadVirtualFolders(page, result);
         });
 
-        $('#fldUseDefaultLibrary', page).hide();
         $('#divMediaLibrary', page).show();
         Dashboard.setPageTitle("Media Library");
     },
@@ -245,7 +244,7 @@
 
         $('.collectionTypeFieldDescription').hide();
 
-        MediaLibraryPage.getTextValue(virtualFolder.Name, "Rename " + virtualFolder.Name, virtualFolder.Name, false, function (newName) {
+        MediaLibraryPage.getTextValue("Rename Media Folder", "New name:", virtualFolder.Name, false, function (newName) {
 
             if (virtualFolder.Name != newName) {
 
diff --git a/dashboard-ui/scripts/pluginspage.js b/dashboard-ui/scripts/pluginspage.js
index 7e1bb41e61..fe65cc6c65 100644
--- a/dashboard-ui/scripts/pluginspage.js
+++ b/dashboard-ui/scripts/pluginspage.js
@@ -12,7 +12,7 @@
 
         var promise2 = $.getJSON("configurationpages?pageType=PluginConfiguration");
 
-        $.when(promise1, promise2).done(function(response1, response2) {
+        $.when(promise1, promise2).done(function (response1, response2) {
 
             PluginsPage.populateList(page, response1[0], response2[0]);
 
@@ -32,7 +32,7 @@
         for (var i = 0, length = plugins.length; i < length; i++) {
 
             var plugin = plugins[i];
-            
+
             var configPage = $.grep(pluginConfigurationPages, function (pluginConfigurationPage) {
                 return pluginConfigurationPage.PluginId == plugin.Id;
             })[0];
@@ -42,7 +42,7 @@
             if (configPage) {
                 html += "<a href='" + Dashboard.getConfigurationPageUrl(configPage.Name) + "'>";
             } else {
-                html += "<a onclick='Dashboard.alert(\"Nothing to configure.\");' href='#'>";
+                html += "<a onclick='Dashboard.alert(\"" + Globalize.translate("NoPluginConfigurationMessage") + "\");' href='#'>";
             }
 
             html += "<h3>" + plugin.Name + "</h3>";
@@ -51,18 +51,24 @@
 
             html += "</a>";
 
-            html += "<a data-id='" + plugin.Id + "' data-pluginname='" + plugin.Name + "' onclick='PluginsPage.deletePlugin(this);' href='#'>Delete</a>";
+            html += "<a data-id='" + plugin.Id + "' data-pluginname='" + plugin.Name + "' onclick='PluginsPage.deletePlugin(this);' href='#'>" + Globalize.translate("Delete") + "</a>";
 
             html += "</li>";
         }
 
-	    if (plugins.length == 0 || !plugins.length) {
-		    html += '<li style="padding:5px;">You have no plugins installed. Browse our <a href="plugincatalog.html">plugin catalog</a> to view available plugins.</li>';
-	        $('#ulInstalledPlugins', page).html(html);
-	    }else {
-	        $('#ulInstalledPlugins', page).html(html).listview('refresh');
-        }
+        if (!plugins.length) {
 
+            html += '<li style="padding:5px;">';
+            html += '<p>You have no plugins installed.</p>';
+            html += '<p><a href="plugincatalog.html">';
+            html += Globalize.translate("BrowsePluginCatalogMessage");
+            html += '</a></p>';
+            html += '</li>';
+
+            $('#ulInstalledPlugins', page).html(html);
+        } else {
+            $('#ulInstalledPlugins', page).html(html).listview('refresh');
+        }
 
         Dashboard.hideLoadingMsg();
     },
@@ -73,9 +79,9 @@
         var name = link.getAttribute('data-pluginname');
         var uniqueid = link.getAttribute('data-id');
 
-        var msg = "Are you sure you wish to uninstall " + name + "?";
+        var msg = Globalize.translate("UninstallPluginConfirmation").replace("{0}", name);
 
-        Dashboard.confirm(msg, "Uninstall Plugin", function (result) {
+        Dashboard.confirm(msg, Globalize.translate("UninstallPluginHeader"), function (result) {
 
             if (result) {
                 Dashboard.showLoadingMsg();
diff --git a/dashboard-ui/scripts/pluginupdatespage.js b/dashboard-ui/scripts/pluginupdatespage.js
index 7841738826..5fc630c26b 100644
--- a/dashboard-ui/scripts/pluginupdatespage.js
+++ b/dashboard-ui/scripts/pluginupdatespage.js
@@ -33,7 +33,11 @@
 
         var fieldId = "liPluginUpdateFielda" + fieldIndex;
 
-        var options = PluginUpdatesPage.getHtmlOptions(["Off", "On"], (plugin.EnableAutoUpdate ? "On" : "Off"));
+        var enabledOptions = [
+            Globalize.translate('OptionOff'),
+            Globalize.translate('OptionOn')
+        ];
+        var options = PluginUpdatesPage.getHtmlOptions(enabledOptions, (plugin.EnableAutoUpdate ? "On" : "Off"));
 
         html += "<td style='vertical-align:middle;text-align:left;'>";
         html += "<select data-mini='true' data-id='" + plugin.Id + "' onchange='PluginUpdatesPage.setAutoUpdate(this);' data-role='slider' id='" + fieldId + "' name='" + fieldId + "'>" + options + "</select>";
@@ -41,7 +45,12 @@
 
         fieldId = "liPluginUpdateFieldb" + fieldIndex;
 
-        options = PluginUpdatesPage.getHtmlOptions(["Release", "Beta", "Dev"], plugin.UpdateClass);
+        var updateOptions = [
+            Globalize.translate('OptionRelease'),
+            Globalize.translate('OptionBeta'),
+            Globalize.translate('OptionDev')
+        ];
+        options = PluginUpdatesPage.getHtmlOptions(updateOptions, plugin.UpdateClass);
 
         html += "<td style='vertical-align:middle;text-align:left;'>";
         html += "<select data-mini='true' data-id='" + plugin.Id + "' onchange='PluginUpdatesPage.setUpdateClass(this);' data-inline='true' id='" + fieldId + "' name='" + fieldId + "'>" + options + "</select>";
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 8642adb936..e342ee878e 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -882,29 +882,16 @@ var Dashboard = {
 
             Dashboard.onBrowseCommand(msg.Data);
         }
-        else if (msg.MessageType === "SystemCommand") {
+        else if (msg.MessageType === "GeneralCommand") {
 
-            if (msg.Data === 'GoHome') {
+            var cmd = msg.Data;
+
+            if (cmd.Name === 'GoHome') {
                 Dashboard.navigate('index.html');
             }
-            else if (msg.Data === 'GoToSettings') {
+            else if (cmd.Name === 'GoToSettings') {
                 Dashboard.navigate('dashboard.html');
             }
-            else if (msg.Data === 'Mute') {
-                MediaPlayer.mute();
-            }
-            else if (msg.Data === 'Unmute') {
-                MediaPlayer.unmute();
-            }
-            else if (msg.Data === 'VolumeUp') {
-                MediaPlayer.volumeUp();
-            }
-            else if (msg.Data === 'VolumeDown') {
-                MediaPlayer.volumeDown();
-            }
-            else if (msg.Data === 'ToggleMute') {
-                MediaPlayer.toggleMute();
-            }
         }
         else if (msg.MessageType === "MessageCommand") {
 
diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js
index 68e9a02eb1..5927a44de2 100644
--- a/dashboard-ui/scripts/tvrecommended.js
+++ b/dashboard-ui/scripts/tvrecommended.js
@@ -51,27 +51,21 @@
 
             if (result.Items.length) {
                 $('#resumableSection', page).show();
+                $('.noNextUpItems', page).hide();
             } else {
                 $('#resumableSection', page).hide();
+                $('.noNextUpItems', page).show();
             }
 
-            if (result.Items.length) {
+            $('#nextUpItems', page).html(LibraryBrowser.getPosterViewHtml({
+                items: result.Items,
+                useAverageAspectRatio: true,
+                shape: "backdrop",
+                showTitle: true,
+                showParentTitle: true,
+                overlayText: true
 
-                $('#nextUpItems', page).html(LibraryBrowser.getPosterViewHtml({
-                    items: result.Items,
-                    useAverageAspectRatio: true,
-                    shape: "backdrop",
-                    showTitle: true,
-                    showParentTitle: true,
-                    overlayText: true
-
-                })).createPosterItemMenus();
-
-            } else {
-
-                $('#nextUpItems', page).html('<br/><p>None found. Start watching your shows!</p>');
-
-            }
+            })).createPosterItemMenus();
 
         });
     }
diff --git a/dashboard-ui/scripts/tvupcoming.js b/dashboard-ui/scripts/tvupcoming.js
index 60e3abffa3..c49b3d3e0d 100644
--- a/dashboard-ui/scripts/tvupcoming.js
+++ b/dashboard-ui/scripts/tvupcoming.js
@@ -15,9 +15,10 @@
 
             var items = result.Items;
 
-            if (!items.length) {
-                $('#upcomingItems', page).html("<p>Nothing here. Please ensure <a href='metadata.html'>downloading of internet metadata</a> is enabled.</p>").trigger('create');
-                return;
+            if (items.length) {
+                $('.noItemsMessage', page).hide();
+            } else {
+                $('.noItemsMessage', page).show();
             }
 
             $('#upcomingItems', page).html(LibraryBrowser.getPosterViewHtml({
diff --git a/dashboard-ui/tvrecommended.html b/dashboard-ui/tvrecommended.html
index bd73e29aa4..8d23aa3a79 100644
--- a/dashboard-ui/tvrecommended.html
+++ b/dashboard-ui/tvrecommended.html
@@ -31,6 +31,7 @@
 
                         <div id="nextUpItems">
                         </div>
+                        <p class="noNextUpItems" style="display: none;">None found. Start watching your shows!</p>
                     </td>
                 </tr>
             </table>
diff --git a/dashboard-ui/tvupcoming.html b/dashboard-ui/tvupcoming.html
index 394c5e0c9a..de0fb31f09 100644
--- a/dashboard-ui/tvupcoming.html
+++ b/dashboard-ui/tvupcoming.html
@@ -21,6 +21,7 @@
                     <td>
                         <div id="upcomingItems">
                         </div>
+                        <p class="noItemsMessage" style="display: none;">Nothing here. Please ensure <a href="metadata.html">downloading of internet metadata</a> is enabled.</p>
                     </td>
                 </tr>
             </table>
diff --git a/dashboard-ui/wizardfinish.html b/dashboard-ui/wizardfinish.html
index dee75dee5c..7f151e0faa 100644
--- a/dashboard-ui/wizardfinish.html
+++ b/dashboard-ui/wizardfinish.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Media Browser</title>
+    <title>${LabelMediaBrowser}</title>
 </head>
 <body>
     <div id="wizardFinishPage" data-role="page" class="page standalonePage wizardPage">
@@ -12,7 +12,7 @@
                 <h2>
                     <img src="css/images/checkmarkblack.png" />${LabelYoureDone}</h2>
 
-                <p>That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish</b> to view the <b>Dashboard</b>.</p>
+                <p>${WizardCompleted}</p>
 
                 <p class="appLinks">
                     <a href="http://www.amazon.com/Mark-Linton-Mediabrowser-Android-Client/dp/B00GVH9O0I" target="_blank">
diff --git a/dashboard-ui/wizardimagesettings.html b/dashboard-ui/wizardimagesettings.html
index bb7f84647b..41a11b8726 100644
--- a/dashboard-ui/wizardimagesettings.html
+++ b/dashboard-ui/wizardimagesettings.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Media Browser</title>
+    <title>${LabelMediaBrowser}</title>
 </head>
 <body>
     <div id="wizardImageSettingsPage" data-role="page" class="page standalonePage wizardPage mediaLibraryPage">
@@ -10,30 +10,30 @@
 
             <div class="ui-corner-all ui-shadow wizardContent">
                 <h2>
-                    <img src="css/images/mblogoicon.png" />Configure settings</h2>
+                    <img src="css/images/mblogoicon.png" />${LabelConfigureSettings}</h2>
 
                 <br />
                 <div style="margin: 1em 0 2em;">
-                    <label for="chkVideoImages">Enable video image extraction</label>
+                    <label for="chkVideoImages">${LabelEnableVideoImageExtraction}</label>
                     <input id="chkVideoImages" name="chkVideoImages" type="checkbox" checked="checked" />
-                    <div class="fieldDescription">For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.</div>
+                    <div class="fieldDescription">${VideoImageExtractionHelp}</div>
                 </div>
 
                 <div style="margin: 2em 0;">
-                    <label for="chkMovies">Extract chapter image extraction for Movies</label>
+                    <label for="chkMovies">${LabelEnableChapterImageExtractionForMovies}</label>
                     <input id="chkMovies" name="chkMovies" type="checkbox" checked="checked" />
-                    <div class="fieldDescription">Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.</div>
+                    <div class="fieldDescription">${LabelChapterImageExtractionForMoviesHelp}</div>
                 </div>
 
                 <div style="margin: 2em 0;">
-                    <label for="chkEnableUpnp">Enable automatic port mapping</label>
+                    <label for="chkEnableUpnp">${LabelEnableAutomaticPortMapping}</label>
                     <input type="checkbox" id="chkEnableUpnp" checked="checked" />
-                    <div class="fieldDescription">UPnP allows automated router configuration for easy remote access. This may not work with some router models.</div>
+                    <div class="fieldDescription">${LabelEnableAutomaticPortMappingHelp}</div>
                 </div>
 
                 <div class="wizardNavigation">
-                    <button type="button" data-iconpos="left" data-icon="arrow-l" data-inline="true" onclick="history.back();">Previous</button>
-                    <button id="btnNextPage" type="button" data-iconpos="right" data-icon="arrow-r" data-inline="true">Next</button>
+                    <button type="button" data-iconpos="left" data-icon="arrow-l" data-inline="true" onclick="history.back();">${LabelPrevious}</button>
+                    <button id="btnNextPage" type="button" data-iconpos="right" data-icon="arrow-r" data-inline="true">${LabelNext}</button>
                 </div>
             </div>
 
diff --git a/dashboard-ui/wizardlibrary.html b/dashboard-ui/wizardlibrary.html
index d4fb5de029..17098d2ba3 100644
--- a/dashboard-ui/wizardlibrary.html
+++ b/dashboard-ui/wizardlibrary.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Media Browser</title>
+    <title>${LabelMediaBrowser}</title>
 </head>
 <body>
     <div id="wizardLibraryPage" data-role="page" class="page standalonePage wizardPage mediaLibraryPage">
@@ -10,48 +10,40 @@
 
             <div class="ui-corner-all ui-shadow wizardContent">
                 <h2>
-                    <img src="css/images/mblogoicon.png" />Setup your media library</h2>
+                    <img src="css/images/mblogoicon.png" />${HeaderSetupLibrary}</h2>
 
-                <p id="fldUseDefaultLibrary" style="display: none;">
-                    <input type="checkbox" id="chkUseDefaultLibrary" name="chkUseDefaultLibrary" onchange="MediaLibraryPage.setUseDefaultMediaLibrary(this.checked);" />
-                    <label for="chkUseDefaultLibrary">Use default media library</label>
-                </p>
                 <div id="divMediaLibrary">
                     <p>
-                        <button type="button" data-mini="true" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">Add media folder</button>
+                        <button type="button" data-mini="true" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">${ButtonAddMediaFolder}</button>
                     </p>
                     <div id="divVirtualFolders"></div>
                 </div>
-                <p>Refer to <a href="https://github.com/MediaBrowser/MediaBrowser/wiki/Library-Structure" target="_blank">media library wiki.</a></p>
+                <p><a href="https://github.com/MediaBrowser/MediaBrowser/wiki/Library-Structure" target="_blank">${ReferToMediaLibraryWiki}</a></p>
 
                 <div data-role="popup" data-transition="slidefade" id="popupEnterText" class="popup">
 
                     <div class="ui-corner-top ui-bar-a" style="text-align: center; padding: 0 20px;">
-                        <h3>Rename</h3>
+                        <h3></h3>
                     </div>
 
                     <div data-role="content">
                         <form id="textEntryForm">
                             <p>
-                                <label id="lblValue" for="txtValue">New name:</label>
+                                <label id="lblValue" for="txtValue"></label>
                                 <input type="text" name="txtValue" id="txtValue" required="required" />
                             </p>
 
                             <p id="fldCollectionType">
-                                <label for="selectCollectionType">Folder type:</label>
+                                <label for="selectCollectionType">${LabelFolderType}</label>
                                 <select id="selectCollectionType" name="selectCollectionType"></select>
                             </p>
 
-                            <p class="collectionTypeFieldDescription">
-                                * Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.
-                            </p>
+                            <p class="collectionTypeFieldDescription">${MediaFolderHelpPluginRequired}</p>
 
                             <p>
-                                <button type="submit" data-theme="b" data-icon="check">
-                                    Ok
-                                </button>
+                                <button type="submit" data-theme="b" data-icon="check">${ButtonOk}</button>
                                 <button type="button" data-icon="delete" onclick="$(this).parents('.popup').popup('close');">
-                                    Cancel
+                                    ${ButtonCancel}
                                 </button>
                             </p>
                         </form>
@@ -60,8 +52,8 @@
                 </div>
 
                 <div class="wizardNavigation">
-                    <button type="button" data-iconpos="left" data-icon="arrow-l" data-inline="true" onclick="history.back();">Previous</button>
-                    <button type="button" data-iconpos="right" data-icon="arrow-r" data-inline="true" onclick="Dashboard.navigate('wizardsettings.html');">Next</button>
+                    <button type="button" data-iconpos="left" data-icon="arrow-l" data-inline="true" onclick="history.back();">${LabelPrevious}</button>
+                    <button type="button" data-iconpos="right" data-icon="arrow-r" data-inline="true" onclick="Dashboard.navigate('wizardsettings.html');">${LabelNext}</button>
                 </div>
             </div>
 
diff --git a/dashboard-ui/wizardservice.html b/dashboard-ui/wizardservice.html
index 412c93d82f..1547b6517f 100644
--- a/dashboard-ui/wizardservice.html
+++ b/dashboard-ui/wizardservice.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Media Browser</title>
+    <title>${LabelMediaBrowser}</title>
 </head>
 <body>
     <div id="wizardServicePage" data-role="page" class="page standalonePage wizardPage mediaLibraryPage">
@@ -10,17 +10,17 @@
 
             <div class="ui-corner-all ui-shadow wizardContent">
                 <h2>
-                    <img src="css/images/mblogoicon.png" />Windows Service</h2>
+                    <img src="css/images/mblogoicon.png" />${LabelWindowsService}</h2>
 
                 <p>A Windows Service has been installed.</p>
 
-                <p>Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.</p>
+                <p>${WindowsServiceIntro1}</p>
 
-                <p>If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.</p>
+                <p>${WindowsServiceIntro2}</p>
 
                 <div class="wizardNavigation">
-                    <button type="button" data-iconpos="left" data-icon="arrow-l" data-inline="true" onclick="history.back();">Previous</button>
-                    <button id="btnNextPage" type="button" data-iconpos="right" data-icon="arrow-r" data-inline="true">Next</button>
+                    <button type="button" data-iconpos="left" data-icon="arrow-l" data-inline="true" onclick="history.back();">${LabelPrevious}</button>
+                    <button id="btnNextPage" type="button" data-iconpos="right" data-icon="arrow-r" data-inline="true">${LabelNext}</button>
                 </div>
             </div>
 
diff --git a/dashboard-ui/wizardsettings.html b/dashboard-ui/wizardsettings.html
index 649357567e..760080dea5 100644
--- a/dashboard-ui/wizardsettings.html
+++ b/dashboard-ui/wizardsettings.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Media Browser</title>
+    <title>${LabelMediaBrowser}</title>
 </head>
 <body>
     <div id="wizardSettingsPage" data-role="page" class="page standalonePage wizardPage mediaLibraryPage">
@@ -11,35 +11,35 @@
             <div class="ui-corner-all ui-shadow wizardContent">
                 <form class="wizardSettingsForm">
                     <h2>
-                        <img src="css/images/mblogoicon.png" />Configure settings</h2>
+                        <img src="css/images/mblogoicon.png" />${LabelConfigureSettings}</h2>
 
                     <br />
                     <div style="margin: 1em 0;">
                         <input type="checkbox" id="chkEnableInternetProviders" name="chkEnableInternetProviders" checked="checked" />
-                        <label for="chkEnableInternetProviders">Download artwork and metadata from the internet </label>
-                        <div class="fieldDescription">Media Browser can download information about your media to enable rich presentations.</div>
+                        <label for="chkEnableInternetProviders">${LabelDownloadInternetMetadata}</label>
+                        <div class="fieldDescription">${LabelDownloadInternetMetadataHelp}</div>
                     </div>
                     <div style="margin: 2em 0;">
-                        <label for="chkSaveLocalMetadata">Save artwork and metadata into media folders</label>
+                        <label for="chkSaveLocalMetadata">${LabelSaveLocalMetadata}</label>
                         <input id="chkSaveLocalMetadata" name="chkSaveLocalMetadata" type="checkbox" />
-                        <div class="fieldDescription">Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.</div>
+                        <div class="fieldDescription">${LabelSaveLocalMetadataHelp}</div>
                     </div>
 
-                    <h2 style="margin-top: 1.5em;">Preferred metadata language</h2>
+                    <h2 style="margin-top: 1.5em;">${HeaderPreferredMetadataLanguage}</h2>
 
                     <div style="margin: 2em 0;">
-                        <label for="selectLanguage">Language: </label>
+                        <label for="selectLanguage">${LabelLanguage}</label>
                         <select name="selectLanguage" id="selectLanguage" data-mini="true" required="required"></select>
                     </div>
 
                     <div style="margin: 2em 0;">
-                        <label for="selectCountry">Country: </label>
+                        <label for="selectCountry">${LabelCountry}</label>
                         <select name="selectCountry" id="selectCountry" data-mini="true" required="required"></select>
                     </div>
 
                     <div class="wizardNavigation">
-                        <button type="button" data-iconpos="left" data-icon="arrow-l" data-inline="true" onclick="history.back();">Previous</button>
-                        <button id="btnNextPage" type="submit" data-iconpos="right" data-icon="arrow-r" data-inline="true">Next</button>
+                        <button type="button" data-iconpos="left" data-icon="arrow-l" data-inline="true" onclick="history.back();">${LabelPrevious}</button>
+                        <button id="btnNextPage" type="submit" data-iconpos="right" data-icon="arrow-r" data-inline="true">${LabelNext}</button>
                     </div>
                 </form>
             </div>
diff --git a/dashboard-ui/wizardstart.html b/dashboard-ui/wizardstart.html
index ef7f8e67b4..f72aedbccb 100644
--- a/dashboard-ui/wizardstart.html
+++ b/dashboard-ui/wizardstart.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Media Browser</title>
+    <title>${LabelMediaBrowser}</title>
 </head>
 <body>
     <div id="wizardStartPage" data-role="page" class="page standalonePage wizardPage">
@@ -10,11 +10,11 @@
 
             <div class="ui-corner-all ui-shadow wizardContent">
                 <h2>
-                    <img src="css/images/mblogoicon.png" />Welcome to Media Browser!</h2>
+                    <img src="css/images/mblogoicon.png" />${WelcomeToMediaBrowser}</h2>
 
-                <p>This wizard will help guide you through the setup process.</p>
+                <p>${ThisWizardWillGuideYou}</p>
                 <div class="wizardNavigation">
-                    <button type="button" data-iconpos="right" data-icon="arrow-r" data-inline="true" onclick="WizardStartPage.gotoNextPage();">Next</button>
+                    <button type="button" data-iconpos="right" data-icon="arrow-r" data-inline="true" onclick="WizardStartPage.gotoNextPage();">${LabelNext}</button>
                 </div>
             </div>
 
diff --git a/dashboard-ui/wizarduser.html b/dashboard-ui/wizarduser.html
index 7fd2c27005..13663153a9 100644
--- a/dashboard-ui/wizarduser.html
+++ b/dashboard-ui/wizarduser.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Media Browser</title>
+    <title>${LabelMediaBrowser}</title>
 </head>
 <body>
     <div id="wizardUserPage" data-role="page" class="page standalonePage wizardPage">
@@ -11,17 +11,15 @@
             <div class="ui-corner-all ui-shadow wizardContent">
                 <form id="wizardUserForm">
                     <h2>
-                        <img src="css/images/mblogoicon.png" style="height: 30px;" />Tell us about yourself</h2>
+                        <img src="css/images/mblogoicon.png" style="height: 30px;" />${TellUsAboutYourself}</h2>
 
-                    <p>Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.</p>
+                    <p>${UserProfilesIntro}</p>
 
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <label for="txtUsername">Your first name: </label>
+                            <label for="txtUsername">${LabelYourFirstName}</label>
                             <input type="text" id="txtUsername" name="txtUsername" required="required" />
-                            <div class="fieldDescription">
-                                More users can be added later within the Dashboard.
-                            </div>
+                            <div class="fieldDescription">${MoreUsersCanBeAddedLater}</div>
                         </li>
                     </ul>