diff --git a/mythplugins/mythgame/i18n/themestrings.h b/mythplugins/mythgame/i18n/themestrings.h
index e6663dd0960..970b95a4b98 100644
--- a/mythplugins/mythgame/i18n/themestrings.h
+++ b/mythplugins/mythgame/i18n/themestrings.h
@@ -2,7 +2,6 @@
 // Do not edit
 
 void strings_null() {
-    ThemeUI::tr("Games");
     ThemeUI::tr("Play Games");
     ThemeUI::tr("System:");
     ThemeUI::tr("Year:");
@@ -43,6 +42,7 @@ void strings_null() {
     ThemeUI::tr("Game Name:");
     ThemeUI::tr("Description:");
     ThemeUI::tr("Boxart:");
+    ThemeUI::tr("Games");
     ThemeUI::tr("Favorite");
     ThemeUI::tr("No Plot.");
     ThemeUI::tr("General Settings");
diff --git a/mythplugins/mythmusic/i18n/themestrings.h b/mythplugins/mythmusic/i18n/themestrings.h
index 789877a6e8f..39dd03bf3c2 100644
--- a/mythplugins/mythmusic/i18n/themestrings.h
+++ b/mythplugins/mythmusic/i18n/themestrings.h
@@ -144,18 +144,6 @@ void strings_null() {
     ThemeUI::tr("Playing:");
     ThemeUI::tr("None");
     ThemeUI::tr("%TITLE%  by  %ARTIST%");
-    ThemeUI::tr("Convert stereo to 5.1 sound");
-    ThemeUI::tr("Ignore ID3 Tags");
-    ThemeUI::tr("Allow metadata to be written to tags");
-    ThemeUI::tr("Automatically lookup CDs");
-    ThemeUI::tr("Automatically Play CDs");
-    ThemeUI::tr("Replace space with underscore");
-    ThemeUI::tr("Use variable bitrates");
-    ThemeUI::tr("Automatically eject CDs after ripping");
-    ThemeUI::tr("Enable CD Writing");
-    ThemeUI::tr("Enable directories on MP3 Creation");
-    ThemeUI::tr("Change Visualizer on each song");
-    ThemeUI::tr("Randomize Visualizer order");
     ThemeUI::tr("Please Wait...");
     ThemeUI::tr("Track Information");
     ThemeUI::tr("Play Count:");
@@ -177,11 +165,33 @@ void strings_null() {
     ThemeUI::tr("Click here to search existing artists...");
     ThemeUI::tr("Click here to search existing albums...");
     ThemeUI::tr("Click here to search existing genres...");
+    ThemeUI::tr("Track Title:");
+    ThemeUI::tr("Track Artist:");
+    ThemeUI::tr("Track:");
+    ThemeUI::tr("Click Here to Select Artist");
+    ThemeUI::tr("Click Here to Select Compilation");
+    ThemeUI::tr("Click Here to Select Album");
+    ThemeUI::tr("Click Here to Select Genre");
+    ThemeUI::tr("-");
+    ThemeUI::tr("+");
+    ThemeUI::tr("Convert stereo to 5.1 sound");
+    ThemeUI::tr("Ignore ID3 Tags");
+    ThemeUI::tr("Allow metadata to be written to tags");
+    ThemeUI::tr("Automatically lookup CDs");
+    ThemeUI::tr("Automatically Play CDs");
+    ThemeUI::tr("Replace space with underscore");
+    ThemeUI::tr("Use variable bitrates");
+    ThemeUI::tr("Automatically eject CDs after ripping");
+    ThemeUI::tr("Enable CD Writing");
+    ThemeUI::tr("Enable directories on MP3 Creation");
+    ThemeUI::tr("Change Visualizer on each song");
+    ThemeUI::tr("Randomize Visualizer order");
     ThemeUI::tr("Import Files");
     ThemeUI::tr("Scan");
     ThemeUI::tr("Import CD");
     ThemeUI::tr("Album");
     ThemeUI::tr("Genre");
+    ThemeUI::tr("Listen to Music");
     ThemeUI::tr("Play List");
     ThemeUI::tr("Play List Editor (tree)");
     ThemeUI::tr("Play List Editor (gallery)");
@@ -198,6 +208,18 @@ void strings_null() {
     ThemeUI::tr("Importing CD:");
     ThemeUI::tr("Encoding Track:");
     ThemeUI::tr("Matches");
+    ThemeUI::tr("Press MENU to add some radio streams to play.");
+    ThemeUI::tr("%STATION% - %CHANNEL%");
+    ThemeUI::tr("Add/Edit Music Stream");
+    ThemeUI::tr("Station:");
+    ThemeUI::tr("Search for Stream");
+    ThemeUI::tr("Channel:");
+    ThemeUI::tr("URL:");
+    ThemeUI::tr("Logo URL:");
+    ThemeUI::tr("Genres:");
+    ThemeUI::tr("Metadata Format:");
+    ThemeUI::tr("Search for Music Stream");
+    ThemeUI::tr("%STATION% - %Channel%");
     ThemeUI::tr("Music folders and general options");
     ThemeUI::tr("Music playback options");
     ThemeUI::tr("CD copying options");
@@ -205,6 +227,7 @@ void strings_null() {
     ThemeUI::tr("Visualization Settings");
     ThemeUI::tr("Music visualization options");
     ThemeUI::tr("Play Music");
+    ThemeUI::tr("Play Radio Streams");
     ThemeUI::tr("Select Music");
     ThemeUI::tr("Scan for New Music");
     ThemeUI::tr("Eject media");
diff --git a/mythtv/html/htmlstrings.h b/mythtv/html/htmlstrings.h
index 6bbcda87dea..8cb10992136 100644
--- a/mythtv/html/htmlstrings.h
+++ b/mythtv/html/htmlstrings.h
@@ -9,8 +9,11 @@
 
 void html_strings_null() {
     /* ./js/util.qjs */
+    HtmlUI::tr("Installing"),
     HtmlUI::tr("Loading"),
     HtmlUI::tr("No"),
+    HtmlUI::tr("Package installed"),
+    HtmlUI::tr("Unable to install package."),
     HtmlUI::tr("Unable to retrieve setting."),
     HtmlUI::tr("Unable to save setting."),
     HtmlUI::tr("Unable to send message."),
@@ -44,6 +47,7 @@ void html_strings_null() {
     HtmlUI::tr("Tuesday"),
     HtmlUI::tr("Wednesday"),
     /* ./menu.qsp */
+    HtmlUI::tr("3rd Party Software"),
     HtmlUI::tr("API"),
     HtmlUI::tr("Advanced Setup"),
     HtmlUI::tr("Backend Status"),
@@ -55,6 +59,7 @@ void html_strings_null() {
     HtmlUI::tr("DVR Service"),
     HtmlUI::tr("Database"),
     HtmlUI::tr("Database Tools"),
+    HtmlUI::tr("Examples"),
     HtmlUI::tr("Expert/Dev Setup"),
     HtmlUI::tr("General"),
     HtmlUI::tr("GetRecorded() Example"),
@@ -62,8 +67,10 @@ void html_strings_null() {
     HtmlUI::tr("Guide Data"),
     HtmlUI::tr("Guide Data Sources"),
     HtmlUI::tr("Guide Service"),
+    HtmlUI::tr("HTTP Live Streaming"),
     HtmlUI::tr("Hardware Profile"),
     HtmlUI::tr("Information"),
+    HtmlUI::tr("JW Player™"),
     HtmlUI::tr("Job Queue"),
     HtmlUI::tr("Myth Service"),
     HtmlUI::tr("Overview"),
@@ -76,6 +83,7 @@ void html_strings_null() {
     HtmlUI::tr("System Events"),
     HtmlUI::tr("Utilities"),
     HtmlUI::tr("Video Library Service"),
+    HtmlUI::tr("View Logs"),
     HtmlUI::tr("WSDL Links"),
     /* ./setup/jobqueue-jobs.qsp */
     HtmlUI::tr("Actions"),
@@ -88,14 +96,54 @@ void html_strings_null() {
     HtmlUI::tr("User Job #%1"),
     /* ./setup/wizard-network.qsp */
     HtmlUI::tr("Local Backend"),
+    HtmlUI::tr("Local Backend (IPv6)"),
     HtmlUI::tr("Make this server the master backend"),
     HtmlUI::tr("Master Backend"),
     HtmlUI::tr("Security PIN"),
+    HtmlUI::tr("Use Link-Local"),
     /* ./samples/storagegroups.qsp */
     HtmlUI::tr("Filter"),
     HtmlUI::tr("List Files"),
     HtmlUI::tr("Loading"),
     HtmlUI::tr("Sample Storage Group browser"),
     HtmlUI::tr("Storage Group"),
+    /* ./samples/hlstest.qsp */
+    HtmlUI::tr("Add Stream"),
+    HtmlUI::tr("Audio"),
+    HtmlUI::tr("Bitrate"),
+    HtmlUI::tr("Delete"),
+    HtmlUI::tr("Filename"),
+    HtmlUI::tr("Filter"),
+    HtmlUI::tr("Group"),
+    HtmlUI::tr("HTTP Live Stream Demo"),
+    HtmlUI::tr("Height"),
+    HtmlUI::tr("List Files"),
+    HtmlUI::tr("List Recordings"),
+    HtmlUI::tr("Loading"),
+    HtmlUI::tr("Play"),
+    HtmlUI::tr("Recordings:"),
+    HtmlUI::tr("Refresh"),
+    HtmlUI::tr("Size"),
+    HtmlUI::tr("Status"),
+    HtmlUI::tr("Stop"),
+    HtmlUI::tr("Storage Groups"),
+    HtmlUI::tr("Waiting"),
+    HtmlUI::tr("Width"),
+    HtmlUI::tr("install JW Player™"),
+    /* ./samples/livestream_rec.qsp */
+    HtmlUI::tr("Filter"),
+    HtmlUI::tr("HTTP Live Stream Demo2"),
+    HtmlUI::tr("HTTP Live Streams Demo2"),
+    HtmlUI::tr("List Files"),
+    HtmlUI::tr("Loading"),
+    HtmlUI::tr("Recording Group"),
+    /* ./samples/livestream_sg.qsp */
+    HtmlUI::tr("Filter"),
+    HtmlUI::tr("HTTP Live Stream Demo"),
+    HtmlUI::tr("HTTP Live Streams Demo"),
+    HtmlUI::tr("List Files"),
+    HtmlUI::tr("Loading"),
+    HtmlUI::tr("Storage Group"),
+    HtmlUI::tr("Waiting"),
     QString()
 }
diff --git a/mythtv/themes/themestrings.h b/mythtv/themes/themestrings.h
index 8e9a891da20..eb524e8fff1 100644
--- a/mythtv/themes/themestrings.h
+++ b/mythtv/themes/themestrings.h
@@ -11,6 +11,8 @@ void strings_null() {
     ThemeUI::tr("6. Channel Editor");
     ThemeUI::tr("7. Storage Directories");
     ThemeUI::tr("8. System Events");
+    ThemeUI::tr("Setup Wizard");
+    ThemeUI::tr("Perform basic configuration tasks");
     ThemeUI::tr("General");
     ThemeUI::tr("Core MythTV behavior and system settings");
     ThemeUI::tr("Appearance");
@@ -21,8 +23,6 @@ void strings_null() {
     ThemeUI::tr("Configure local audio output");
     ThemeUI::tr("Screen Setup Wizards");
     ThemeUI::tr("Compensate for TVs with overscan");
-    ThemeUI::tr("Setup Wizard");
-    ThemeUI::tr("Perform basic configuration tasks");
     ThemeUI::tr("System Event Handlers");
     ThemeUI::tr("Configure System Event handler commands");
     ThemeUI::tr("Artwork and Data Sources");
@@ -341,6 +341,7 @@ void strings_null() {
     ThemeUI::tr("Save as default");
     ThemeUI::tr("Appearance Wizard");
     ThemeUI::tr("Move the selected arrow to the corner of the TV screen.  Press SELECT to edit the other arrow.  Press MENU for options and ESC to quit.");
+    ThemeUI::tr("%Using |TEMPLATE| Template%");
     ThemeUI::tr("Select Time & Date");
     ThemeUI::tr("Search terms:");
     ThemeUI::tr("Search");
@@ -358,6 +359,7 @@ void strings_null() {
     ThemeUI::tr("%STARTTIME%-%ENDTIME%");
     ThemeUI::tr("%CHANNUM%");
     ThemeUI::tr("Channel Number");
+    ThemeUI::tr("%DATE% %TIME%");
     ThemeUI::tr("(1) Time (2) Title");
     ThemeUI::tr("Sample Clauses:");
     ThemeUI::tr("Automatically Look Up Metadata");
@@ -406,12 +408,12 @@ void strings_null() {
     ThemeUI::tr("Delete your hardware profile");
     ThemeUI::tr("Audio Configuration");
     ThemeUI::tr("Audio Device:");
-    ThemeUI::tr("Number of Speakers:");
     ThemeUI::tr("My audio subsystem supports Dolby Digital");
     ThemeUI::tr("My audio subsystem supports DTS");
     ThemeUI::tr("My audio subsystem supports E-AC-3");
     ThemeUI::tr("My audio subsystem supports TrueHD");
     ThemeUI::tr("My audio subsystem supports DTS-HD");
+    ThemeUI::tr("Number of Speakers:");
     ThemeUI::tr("Previous");
     ThemeUI::tr("Video Configuration");
     ThemeUI::tr("Video Playback Profile:");
@@ -550,6 +552,8 @@ void strings_null() {
     ThemeUI::tr("Browse your video library");
     ThemeUI::tr("Listen to Music");
     ThemeUI::tr("Browse your music library");
+    ThemeUI::tr("Listen to Radio Stream");
+    ThemeUI::tr("Play radio streams");
     ThemeUI::tr("Search Internet Video");
     ThemeUI::tr("Search popular video sites");
     ThemeUI::tr("Browse Internet Video");
@@ -613,7 +617,7 @@ void strings_null() {
     ThemeUI::tr("Twitter Timeline");
     ThemeUI::tr("Edit Channels");
     ThemeUI::tr("Modify, Add, and Delete television channels.");
-    ThemeUI::tr("Delete Source");
+    ThemeUI::tr("Delete Channels");
     ThemeUI::tr("Import Icons");
     ThemeUI::tr("Edit On Screen Display");
     ThemeUI::tr("Select the menu items you want to see by playback mode.");
@@ -669,6 +673,7 @@ void strings_null() {
     ThemeUI::tr("Using the text areas below, you can change the recording title, subtitle, and description.\n\nOnce you have completed your modifications, click the \"OK\" button.");
     ThemeUI::tr("Description:");
     ThemeUI::tr("(%STARTTIME% - %ENDTIME%) %LONGREPEAT% %YEARSTARS%%DESCRIPTION%");
+    ThemeUI::tr("%CHANNELNUMBER%\n%CALLSIGN%");
     ThemeUI::tr("Manually Schedule A Recording");
     ThemeUI::tr("To manually schedule a recording, enter a title (optional).  Then set the channel, date, start time, and duration of your recording.  Note that this recording will not have any listings data or other information provided by an EPG.");
     ThemeUI::tr("Date:");
@@ -893,6 +898,9 @@ void strings_null() {
     ThemeUI::tr("name");
     ThemeUI::tr("Select a clause from the list:");
     ThemeUI::tr("Press Up/Down from letter list, to navigate to another list.  Press Left/Right from Show or Episode list to navigate to another list.");
+    ThemeUI::tr("%Using the '|TEMPLATE|' template%");
+    ThemeUI::tr("Schedule Type:");
+    ThemeUI::tr("Repeats:");
     ThemeUI::tr("Filter Options");
     ThemeUI::tr("Select the filters that should be applied for this recording.");
     ThemeUI::tr("->");
@@ -922,12 +930,12 @@ void strings_null() {
     ThemeUI::tr("Browsable");
     ThemeUI::tr("Filter video list");
     ThemeUI::tr("Designed to show off some different element arrangements available in Myth 0.25.  Reminder: On Watch Recordings screen [Rew] and [FF] can be used to change the Rec. Group.");
-    ThemeUI::tr("Another Theme build on the new UI library Any suggestions or bugs to https://code.google.com/p/a-forest/ A special thank to Steve Adeff for his help on this project.");
+    ThemeUI::tr("Animation, transparency and fanart for mythtv 0.25");
     ThemeUI::tr("LCARS");
     ThemeUI::tr(" Retro Originally by Gerhard Aldorf MythUI version based on MythCenter by Jeroen Brosens Conversion of Retro to MythUI by Chris Candreva A generally blue theme. Icon style is realistic based on clasic, 'Retro' styles. ");
     ThemeUI::tr("TintedGlass is a transparent theme that is a little old school MythTV yet takes advantage of new MythUI features.");
     ThemeUI::tr("a nice transparent theme to use your own background if you want. just copy your favorite picture (be sure that its resolution is 1920x1200) to /usr/share/mythtv/themes/TransBlue/background.jpg");
-    ThemeUI::tr("A UI and OSD theme with focus for fanart, banners and cover display.");
+    ThemeUI::tr("A UI and OSD theme with focus on fanart, banners and cover display.");
     ThemeUI::tr("blootube-ng is a theme based on the original blootube-wide by Justin Hornsby (justin.hornsby@gmail.com) which uses very large graphics associated with every menu entry. All changes where made to bring this theme forward to MythTV 0.24.");
     ThemeUI::tr("Blue-abstract is a modern looking theme meant for widescreen HD displays. The blue background and the consistent layout makes it an attractive and elegant looking theme.");
 }