From 56fcdaf90373a5fd4534e44773557b8b22ffa282 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 27 Feb 2019 21:48:56 +0000
Subject: mythtv & mythplugins: update to latest fixes

update en translation
---
 abs/core/mythtv/stable-30/git_src/git_hash         |     2 +-
 abs/core/mythtv/stable-30/mythplugins/PKGBUILD     |    10 +-
 .../mythmusic_en_us.ts_Title_Case.patch            |  2895 ++++
 abs/core/mythtv/stable-30/mythtv/PKGBUILD          |     9 +-
 .../mythtv/stable-30/mythtv/fixTranslations.patch  |    39 +
 .../mythtv/mythfrontend_en_us.ts_Title_Case.patch  | 16094 ++++++++++++-------
 6 files changed, 13527 insertions(+), 5522 deletions(-)
 create mode 100644 abs/core/mythtv/stable-30/mythplugins/mythmusic_en_us.ts_Title_Case.patch

diff --git a/abs/core/mythtv/stable-30/git_src/git_hash b/abs/core/mythtv/stable-30/git_src/git_hash
index 8d2d223..c2e883a 100644
--- a/abs/core/mythtv/stable-30/git_src/git_hash
+++ b/abs/core/mythtv/stable-30/git_src/git_hash
@@ -1 +1 @@
-26034244e8b664f2ae0e74027653293625615a86
+e3474f8afb7191d5593d5fa5baac24611842bbec
diff --git a/abs/core/mythtv/stable-30/mythplugins/PKGBUILD b/abs/core/mythtv/stable-30/mythplugins/PKGBUILD
index a224fdb..b9ed6d5 100644
--- a/abs/core/mythtv/stable-30/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-30/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
          'mythweather'
          'mythzoneminder')
 pkgver=30.0
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url="http://www.mythtv.org"
 license=('GPL')
@@ -22,6 +22,7 @@ makedepends=('cdrkit' 'dcraw' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexi
 source=('mythburn.py-aspectratio.patch'
         'mythburn.cpp-python2.patch'
         '0317-0336-MythMusic-Fix-Playlist-copyTracks-and-removeAllTrack.patch'
+        'mythmusic_en_us.ts_Title_Case.patch'
         )
 
 prepare() {
@@ -43,6 +44,10 @@ prepare() {
     find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
     patch -Np1 -i "$srcdir/mythburn.cpp-python2.patch"
 
+    msg "Patch and update MythMusic translations"
+    patch -Np1 -i "$srcdir/mythmusic_en_us.ts_Title_Case.patch"
+    cd ${srcdir}/$pkgbase/mythmusic/i18n
+    lrelease -removeidentical mythmusic_en_us.ts
 }
 
 build() {
@@ -130,4 +135,5 @@ package_mythzoneminder() {
 
 md5sums=('e98c2a09bcb051fdde959fb4bb2e5ab2'
          'b9edd8f7da64ffa74baa91092bd48cc9'
-         '0299d0214c0d3a452c0284352435d698')
+         '0299d0214c0d3a452c0284352435d698'
+         'df4b92d6886db1fdd59fc02dbe33df60')
diff --git a/abs/core/mythtv/stable-30/mythplugins/mythmusic_en_us.ts_Title_Case.patch b/abs/core/mythtv/stable-30/mythplugins/mythmusic_en_us.ts_Title_Case.patch
new file mode 100644
index 0000000..e97cbdf
--- /dev/null
+++ b/abs/core/mythtv/stable-30/mythplugins/mythmusic_en_us.ts_Title_Case.patch
@@ -0,0 +1,2895 @@
+--- src/mythplugins/mythmusic/i18n/mythmusic_en_us.ts.orig	2019-02-27 18:13:10.875044646 +0000
++++ src/mythplugins/mythmusic/i18n/mythmusic_en_us.ts	2019-02-27 18:11:15.120068810 +0000
+@@ -6,7 +6,7 @@
+     <message>
+         <location filename="../mythmusic/musicdata.cpp" line="114"/>
+         <source>Loading Music. Please wait ...</source>
+-        <translation>Loading Music. Please wait ...</translation>
++        <translation>Loading Music...</translation>
+     </message>
+     <message>
+         <location filename="../mythmusic/main.cpp" line="92"/>
+@@ -28,20 +28,20 @@
+     <message>
+         <location filename="../mythmusic/main.cpp" line="221"/>
+         <source>MythMusic hasn&apos;t been built with libcdio support so ripping CDs is not possible</source>
+-        <translation>MythMusic hasn&apos;t been built with libcdio support so ripping CDs is not possible</translation>
++        <translation>MythMusic hasn&apos;t been built with libcdio support so ripping CDs is not possible.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="549"/>
++        <location filename="../mythmusic/main.cpp" line="546"/>
+         <source>Searching for music files...</source>
+-        <translation>Searching for music files...</translation>
++        <translation>Searching for Music Files...</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="572"/>
++        <location filename="../mythmusic/main.cpp" line="569"/>
+         <source>Loading music tracks</source>
+-        <translation>Loading music tracks</translation>
++        <translation>Loading Music Tracks...</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="731"/>
++        <location filename="../mythmusic/main.cpp" line="728"/>
+         <source>Unknown</source>
+         <translation>Unknown</translation>
+     </message>
+@@ -49,7 +49,7 @@
+ <context>
+     <name>AlbumArt</name>
+     <message>
+-        <location filename="../mythmusic/visualize.cpp" line="1549"/>
++        <location filename="../mythmusic/visualize.cpp" line="1512"/>
+         <source>?</source>
+         <translation>?</translation>
+     </message>
+@@ -57,7 +57,7 @@
+ <context>
+     <name>CDRipperThread</name>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="272"/>
++        <location filename="../mythmusic/cdrip.cpp" line="268"/>
+         <source>Importing %1</source>
+         <translation>Importing %1</translation>
+     </message>
+@@ -86,27 +86,27 @@
+ <context>
+     <name>CriteriaRowEditor</name>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="1590"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="1580"/>
+         <source>Select an Artist</source>
+         <translation>Select an Artist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="1595"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="1585"/>
+         <source>Select a Compilation Artist</source>
+         <translation>Select a Compilation Artist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="1600"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="1590"/>
+         <source>Select an Album</source>
+         <translation>Select an Album</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="1605"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="1595"/>
+         <source>Select a Genre</source>
+         <translation>Select a Genre</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="1610"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="1600"/>
+         <source>Select a Title</source>
+         <translation>Select a Title</translation>
+     </message>
+@@ -116,224 +116,224 @@
+     <message>
+         <location filename="../mythmusic/decoderhandler.cpp" line="314"/>
+         <source>Retrieving playlist</source>
+-        <translation>Retrieving playlist</translation>
++        <translation>Retrieving Playlist...</translation>
+     </message>
+ </context>
+ <context>
+     <name>EditAlbumartDialog</name>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="1036"/>
+-        <location filename="../mythmusic/editmetadata.cpp" line="1097"/>
+-        <location filename="../mythmusic/editmetadata.cpp" line="1192"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="1029"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="1090"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="1185"/>
+         <source>Change Image Type</source>
+         <translation>Change Image Type</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="1038"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="1031"/>
+         <source>What image type do you want to use for this image?</source>
+         <translation>What image type do you want to use for this image?</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="1073"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="1066"/>
+         <source>Options</source>
+         <translation>Options</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="1087"/>
+-        <location filename="../mythmusic/editmetadata.cpp" line="1186"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="1080"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="1179"/>
+         <source>Edit Metadata</source>
+         <translation>Edit Metadata</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="1088"/>
+-        <location filename="../mythmusic/editmetadata.cpp" line="1188"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="1081"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="1181"/>
+         <source>Rescan For Images</source>
+-        <translation>Rescan For Images</translation>
++        <translation>Rescan for Images</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="1091"/>
+-        <location filename="../mythmusic/editmetadata.cpp" line="1190"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="1084"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="1183"/>
+         <source>Search Internet For Images</source>
+-        <translation>Search Internet For Images</translation>
++        <translation>Search Internet for Images</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="1110"/>
+-        <location filename="../mythmusic/editmetadata.cpp" line="1194"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="1103"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="1187"/>
+         <source>Copy Selected Image To Tag</source>
+-        <translation>Copy Selected Image To Tag</translation>
++        <translation>Copy Selected Image to Tag</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="1115"/>
+-        <location filename="../mythmusic/editmetadata.cpp" line="1196"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="1108"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="1189"/>
+         <source>Remove Selected Image From Tag</source>
+-        <translation>Remove Selected Image From Tag</translation>
++        <translation>Remove Selected Image from Tag</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="1125"/>
+-        <location filename="../mythmusic/editmetadata.cpp" line="1198"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="1118"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="1191"/>
+         <source>Copy Image To Tag</source>
+-        <translation>Copy Image To Tag</translation>
++        <translation>Copy Image to Tag</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="1304"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="1297"/>
+         <source>Are you sure you want to permanently remove this image from the tag?</source>
+         <translation>Are you sure you want to permanently remove this image from the tag?</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="1357"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="1350"/>
+         <source>Copying image to tag...</source>
+-        <translation>Copying image to tag...</translation>
++        <translation>Copying Image to Tag...</translation>
+     </message>
+ </context>
+ <context>
+     <name>EditLyricsDialog</name>
+     <message>
+-        <location filename="../mythmusic/lyricsview.cpp" line="688"/>
++        <location filename="../mythmusic/lyricsview.cpp" line="681"/>
+         <source>Save changes?</source>
+-        <translation>Save changes?</translation>
++        <translation>Save Changes?</translation>
+     </message>
+ </context>
+ <context>
+     <name>EditMetadataCommon</name>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="171"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="168"/>
+         <source>Save Changes?</source>
+         <translation>Save Changes?</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="186"/>
+-        <location filename="../mythmusic/editmetadata.cpp" line="188"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="183"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="185"/>
+         <source>Save Changes</source>
+         <translation>Save Changes</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="190"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="187"/>
+         <source>Exit/Do Not Save</source>
+-        <translation>Exit/Do Not Save</translation>
++        <translation>Do Not Save</translation>
+     </message>
+ </context>
+ <context>
+     <name>EditMetadataDialog</name>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="505"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="501"/>
+         <source>Options</source>
+         <translation>Options</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="519"/>
+-        <location filename="../mythmusic/editmetadata.cpp" line="783"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="515"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="779"/>
+         <source>Edit Albumart Images</source>
+-        <translation>Edit Albumart Images</translation>
++        <translation>Edit Album Art Images</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="520"/>
+-        <location filename="../mythmusic/editmetadata.cpp" line="790"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="516"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="786"/>
+         <source>Search Internet For Artist Image</source>
+-        <translation>Search Internet For Artist Image</translation>
++        <translation>Search Internet for Artist Image</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="521"/>
+-        <location filename="../mythmusic/editmetadata.cpp" line="795"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="517"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="791"/>
+         <source>Search Internet For Album Image</source>
+-        <translation>Search Internet For Album Image</translation>
++        <translation>Search Internet for Album Image</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="522"/>
+-        <location filename="../mythmusic/editmetadata.cpp" line="785"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="518"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="781"/>
+         <source>Search Internet For Genre Image</source>
+-        <translation>Search Internet For Genre Image</translation>
++        <translation>Search Internet for Genre Image</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="523"/>
+-        <location filename="../mythmusic/editmetadata.cpp" line="800"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="519"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="796"/>
+         <source>Check Track Length</source>
+         <translation>Check Track Length</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="558"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="554"/>
+         <source>Various Artists</source>
+         <translation>Various Artists</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="565"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="561"/>
+         <source>Select an Artist</source>
+         <translation>Select an Artist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="610"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="606"/>
+         <source>Select a Compilation Artist</source>
+         <translation>Select a Compilation Artist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="635"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="631"/>
+         <source>Select an Album</source>
+         <translation>Select an Album</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="678"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="674"/>
+         <source>Select a Genre</source>
+         <translation>Select a Genre</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/editmetadata.cpp" line="810"/>
++        <location filename="../mythmusic/editmetadata.cpp" line="806"/>
+         <source>Asked the backend to check the tracks length</source>
+-        <translation>Asked the backend to check the tracks length</translation>
++        <translation>Asked the backend to check the length of the track.</translation>
+     </message>
+ </context>
+ <context>
+     <name>GeneralSettings</name>
+     <message>
+-        <location filename="../mythmusic/generalsettings.cpp" line="77"/>
++        <location filename="../mythmusic/generalsettings.cpp" line="72"/>
+         <source>Audio Device used for playback. &apos;default&apos; will use the device specified in MythTV</source>
+-        <translation>Audio Device used for playback. &apos;default&apos; will use the device specified in MythTV</translation>
++        <translation>Audio Device used for playback. &apos;default&apos; will use the device specified in MythTV.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/generalsettings.cpp" line="79"/>
++        <location filename="../mythmusic/generalsettings.cpp" line="74"/>
+         <source>MythTV can upconvert stereo tracks to 5.1 audio. Set this option to enable it by default. You can enable or disable the upconversion during playback at anytime.</source>
+-        <translation>MythTV can upconvert stereo tracks to 5.1 audio. Set this option to enable it by default. You can enable or disable the upconversion during playback at anytime.</translation>
++        <translation>MythTV can upconvert stereo tracks to 5.1 audio. Set this option to enable it by default. You can enable or disable the upconversion during playback.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/generalsettings.cpp" line="83"/>
++        <location filename="../mythmusic/generalsettings.cpp" line="78"/>
+         <source>CD-ROM device used for ripping/playback.</source>
+         <translation>CD-ROM device used for ripping/playback.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/generalsettings.cpp" line="84"/>
++        <location filename="../mythmusic/generalsettings.cpp" line="79"/>
+         <source>Directory and filename format used to grab information if no ID3 information is found. Accepts GENRE, ARTIST, ALBUM, TITLE, ARTIST_TITLE and TRACK_TITLE.</source>
+         <translation>Directory and filename format used to grab information if no ID3 information is found. Accepts GENRE, ARTIST, ALBUM, TITLE, ARTIST_TITLE and TRACK_TITLE.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/generalsettings.cpp" line="88"/>
++        <location filename="../mythmusic/generalsettings.cpp" line="83"/>
+         <source>If set, MythMusic will skip checking ID3 tags in files and just try to determine Genre, Artist, Album, and Track number and title from the filename.</source>
+         <translation>If set, MythMusic will skip checking ID3 tags in files and just try to determine Genre, Artist, Album, and Track number and title from the filename.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/generalsettings.cpp" line="92"/>
++        <location filename="../mythmusic/generalsettings.cpp" line="87"/>
+         <source>If set, MythMusic will be allowed to update the metadata in the file (e.g. ID3) to match the database. This means allowing MythTV to write to the file and permissions must be set accordingly. Features such as ID3 playcounts and ratings depend on this being enabled.</source>
+         <translation>If set, MythMusic will be allowed to update the metadata in the file (e.g. ID3) to match the database. This means allowing MythTV to write to the file and permissions must be set accordingly. Features such as ID3 playcounts and ratings depend on this being enabled.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/generalsettings.cpp" line="99"/>
++        <location filename="../mythmusic/generalsettings.cpp" line="94"/>
+         <source>This will clear all the MythMusic database tables allowing for a fresh start. NOTE: You may lose any manual or automatic changes made to a tracks metadata like rating or playcount unless you told MythMusic to write those to the tag.</source>
+         <translation>This will clear all the MythMusic database tables allowing for a fresh start. NOTE: You may lose any manual or automatic changes made to a tracks metadata like rating or playcount unless you told MythMusic to write those to the tag.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/generalsettings.cpp" line="103"/>
++        <location filename="../mythmusic/generalsettings.cpp" line="98"/>
+         <source>Exit without saving settings</source>
+-        <translation>Exit without saving settings</translation>
++        <translation>Exit Without Saving</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/generalsettings.cpp" line="104"/>
++        <location filename="../mythmusic/generalsettings.cpp" line="99"/>
+         <source>Save settings and Exit</source>
+-        <translation>Save settings and Exit</translation>
++        <translation>Save and Exit</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/generalsettings.cpp" line="115"/>
++        <location filename="../mythmusic/generalsettings.cpp" line="110"/>
+         <source>Are you sure you want to reset the music database?</source>
+         <translation>Are you sure you want to reset the music database?</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/generalsettings.cpp" line="161"/>
++        <location filename="../mythmusic/generalsettings.cpp" line="156"/>
+         <source>Music database has been cleared.
+ You must now scan, rip or import some tracks.</source>
+         <translation>Music database has been cleared.
+@@ -343,56 +343,56 @@
+ <context>
+     <name>ImportCoverArtDialog</name>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="1035"/>
+-        <location filename="../mythmusic/importmusic.cpp" line="1230"/>
++        <location filename="../mythmusic/importmusic.cpp" line="1028"/>
++        <location filename="../mythmusic/importmusic.cpp" line="1223"/>
+         <source>Front Cover</source>
+         <translation>Front Cover</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="1037"/>
+-        <location filename="../mythmusic/importmusic.cpp" line="1232"/>
++        <location filename="../mythmusic/importmusic.cpp" line="1030"/>
++        <location filename="../mythmusic/importmusic.cpp" line="1225"/>
+         <source>Back Cover</source>
+         <translation>Back Cover</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="1039"/>
+-        <location filename="../mythmusic/importmusic.cpp" line="1236"/>
++        <location filename="../mythmusic/importmusic.cpp" line="1032"/>
++        <location filename="../mythmusic/importmusic.cpp" line="1229"/>
+         <source>CD</source>
+         <translation>CD</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="1041"/>
+-        <location filename="../mythmusic/importmusic.cpp" line="1234"/>
++        <location filename="../mythmusic/importmusic.cpp" line="1034"/>
++        <location filename="../mythmusic/importmusic.cpp" line="1227"/>
+         <source>Inlay</source>
+         <translation>Inlay</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="1043"/>
+-        <location filename="../mythmusic/importmusic.cpp" line="1238"/>
++        <location filename="../mythmusic/importmusic.cpp" line="1036"/>
++        <location filename="../mythmusic/importmusic.cpp" line="1231"/>
+         <source>&lt;Unknown&gt;</source>
+         <translation>&lt;Unknown&gt;</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="1081"/>
++        <location filename="../mythmusic/importmusic.cpp" line="1074"/>
+         <source>Copy CoverArt Failed.
+ Copying to %1</source>
+         <extracomment>%1 is the filename</extracomment>
+-        <translation>Copy CoverArt Failed.
++        <translation>Copying Cover Art Failed
+ Copying to %1</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="1163"/>
++        <location filename="../mythmusic/importmusic.cpp" line="1156"/>
+         <source>%1 of %2</source>
+         <comment>Current file copied</comment>
+         <translation>%1 of %2</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="1205"/>
++        <location filename="../mythmusic/importmusic.cpp" line="1198"/>
+         <source>File Already Exists</source>
+         <translation>File Already Exists</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="1207"/>
++        <location filename="../mythmusic/importmusic.cpp" line="1200"/>
+         <source>New File</source>
+         <translation>New File</translation>
+     </message>
+@@ -419,89 +419,89 @@
+     <message>
+         <location filename="../mythmusic/importmusic.cpp" line="156"/>
+         <source>Not found</source>
+-        <translation>Not found</translation>
++        <translation>Not Found</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="219"/>
++        <location filename="../mythmusic/importmusic.cpp" line="218"/>
+         <source>You might have unsaved changes.
+ Are you sure you want to exit this screen?</source>
+         <translation>You might have unsaved changes.
+ Are you sure you want to exit this screen?</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="424"/>
++        <location filename="../mythmusic/importmusic.cpp" line="423"/>
+         <source>Copy Failed
+ Could not copy file to: %1</source>
+         <translation>Copy Failed
+ Could not copy file to: %1</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="448"/>
++        <location filename="../mythmusic/importmusic.cpp" line="447"/>
+         <source>This track is already in the database</source>
+-        <translation>This track is already in the database</translation>
++        <translation>This track is already in the database.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="477"/>
++        <location filename="../mythmusic/importmusic.cpp" line="476"/>
+         <source>%1 new tracks were added to the database</source>
+-        <translation>%1 new tracks were added to the database</translation>
++        <translation>%1 new tracks were added to the database.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="505"/>
++        <location filename="../mythmusic/importmusic.cpp" line="504"/>
+         <source>Copying music file to the &apos;Music&apos; storage group on %1</source>
+-        <translation>Copying music file to the &apos;Music&apos; storage group on %1</translation>
++        <translation>Copying Music File to the &apos;Music&apos; Storage Group on %1...</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="547"/>
++        <location filename="../mythmusic/importmusic.cpp" line="546"/>
+         <source>Searching for music files</source>
+-        <translation>Searching for music files</translation>
++        <translation>Searching for Music Files...</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="682"/>
++        <location filename="../mythmusic/importmusic.cpp" line="681"/>
+         <source>Select Where To Save Tracks</source>
+-        <translation>Select Where To Save Tracks</translation>
++        <translation>Select Where to Save Tracks</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="683"/>
++        <location filename="../mythmusic/importmusic.cpp" line="682"/>
+         <source>Save Defaults</source>
+         <translation>Save Defaults</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="687"/>
++        <location filename="../mythmusic/importmusic.cpp" line="686"/>
+         <source>Change Compilation Flag</source>
+         <translation>Change Compilation Flag</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="688"/>
++        <location filename="../mythmusic/importmusic.cpp" line="687"/>
+         <source>Change Compilation Artist</source>
+         <translation>Change Compilation Artist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="690"/>
++        <location filename="../mythmusic/importmusic.cpp" line="689"/>
+         <source>Change Artist</source>
+         <translation>Change Artist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="691"/>
++        <location filename="../mythmusic/importmusic.cpp" line="690"/>
+         <source>Change Album</source>
+         <translation>Change Album</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="692"/>
++        <location filename="../mythmusic/importmusic.cpp" line="691"/>
+         <source>Change Genre</source>
+         <translation>Change Genre</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="693"/>
++        <location filename="../mythmusic/importmusic.cpp" line="692"/>
+         <source>Change Year</source>
+         <translation>Change Year</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="694"/>
++        <location filename="../mythmusic/importmusic.cpp" line="693"/>
+         <source>Change Rating</source>
+         <translation>Change Rating</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importmusic.cpp" line="723"/>
++        <location filename="../mythmusic/importmusic.cpp" line="722"/>
+         <source>Select where to save tracks</source>
+         <translation>Select where to save tracks</translation>
+     </message>
+@@ -509,162 +509,162 @@
+ <context>
+     <name>ImportSettings</name>
+     <message>
+-        <location filename="../mythmusic/importsettings.cpp" line="54"/>
++        <location filename="../mythmusic/importsettings.cpp" line="49"/>
+         <source>Full</source>
+         <translation>Full</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importsettings.cpp" line="55"/>
++        <location filename="../mythmusic/importsettings.cpp" line="50"/>
+         <source>Faster</source>
+         <translation>Faster</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importsettings.cpp" line="70"/>
++        <location filename="../mythmusic/importsettings.cpp" line="65"/>
+         <source>Ogg Vorbis</source>
+         <translation>Ogg Vorbis</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importsettings.cpp" line="71"/>
++        <location filename="../mythmusic/importsettings.cpp" line="66"/>
+         <source>Lame (MP3)</source>
+         <translation>Lame (MP3)</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importsettings.cpp" line="74"/>
++        <location filename="../mythmusic/importsettings.cpp" line="69"/>
+         <source>Low</source>
+         <translation>Low</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importsettings.cpp" line="75"/>
++        <location filename="../mythmusic/importsettings.cpp" line="70"/>
+         <source>Medium</source>
+         <translation>Medium</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importsettings.cpp" line="76"/>
++        <location filename="../mythmusic/importsettings.cpp" line="71"/>
+         <source>High</source>
+         <translation>High</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importsettings.cpp" line="77"/>
++        <location filename="../mythmusic/importsettings.cpp" line="72"/>
+         <source>Perfect</source>
+         <translation>Perfect</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importsettings.cpp" line="87"/>
++        <location filename="../mythmusic/importsettings.cpp" line="82"/>
+         <source>Paranoia level of the CD ripper. Set to faster if you&apos;re not concerned about possible errors in the audio.</source>
+         <translation>Paranoia level of the CD ripper. Set to faster if you&apos;re not concerned about possible errors in the audio.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importsettings.cpp" line="90"/>
++        <location filename="../mythmusic/importsettings.cpp" line="85"/>
+         <source>Defines the location/name for new songs. Valid tokens are:
+ GENRE, ARTIST, ALBUM, TRACK, TITLE, YEAR</source>
+         <translation>Defines the location/name for new songs. Valid tokens are:
+ GENRE, ARTIST, ALBUM, TRACK, TITLE, YEAR</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importsettings.cpp" line="93"/>
++        <location filename="../mythmusic/importsettings.cpp" line="88"/>
+         <source>If set, whitespace characters in filenames will be replaced with underscore characters.</source>
+         <translation>If set, whitespace characters in filenames will be replaced with underscore characters.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importsettings.cpp" line="95"/>
++        <location filename="../mythmusic/importsettings.cpp" line="90"/>
+         <source>If present this script will be executed after a CD Rip is completed.</source>
+         <translation>If present this script will be executed after a CD Rip is completed.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importsettings.cpp" line="97"/>
++        <location filename="../mythmusic/importsettings.cpp" line="92"/>
+         <source>If set, the CD tray will automatically open after the CD has been ripped.</source>
+         <translation>If set, the CD tray will automatically open after the CD has been ripped.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importsettings.cpp" line="99"/>
++        <location filename="../mythmusic/importsettings.cpp" line="94"/>
+         <source>Audio encoder to use for CD ripping. Note that the quality level &apos;Perfect&apos; will use the FLAC encoder.</source>
+         <translation>Audio encoder to use for CD ripping. Note that the quality level &apos;Perfect&apos; will use the FLAC encoder.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importsettings.cpp" line="102"/>
++        <location filename="../mythmusic/importsettings.cpp" line="97"/>
+         <source>Default quality for new CD rips.</source>
+         <translation>Default quality for new CD rips.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importsettings.cpp" line="103"/>
++        <location filename="../mythmusic/importsettings.cpp" line="98"/>
+         <source>If set, the MP3 encoder will use variable bitrates (VBR) except for the low quality setting. The Ogg encoder will always use variable bitrates.</source>
+         <translation>If set, the MP3 encoder will use variable bitrates (VBR) except for the low quality setting. The Ogg encoder will always use variable bitrates.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importsettings.cpp" line="106"/>
++        <location filename="../mythmusic/importsettings.cpp" line="101"/>
+         <source>Exit without saving settings</source>
+-        <translation>Exit without saving settings</translation>
++        <translation>Exit Without Saving</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/importsettings.cpp" line="107"/>
++        <location filename="../mythmusic/importsettings.cpp" line="102"/>
+         <source>Save settings and Exit</source>
+-        <translation>Save settings and Exit</translation>
++        <translation>Save and Exit</translation>
+     </message>
+ </context>
+ <context>
+     <name>LyricsView</name>
+     <message>
+-        <location filename="../mythmusic/lyricsview.cpp" line="156"/>
+-        <location filename="../mythmusic/lyricsview.cpp" line="246"/>
++        <location filename="../mythmusic/lyricsview.cpp" line="155"/>
++        <location filename="../mythmusic/lyricsview.cpp" line="245"/>
+         <source>Save Lyrics</source>
+         <translation>Save Lyrics</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/lyricsview.cpp" line="160"/>
+-        <location filename="../mythmusic/lyricsview.cpp" line="241"/>
++        <location filename="../mythmusic/lyricsview.cpp" line="159"/>
++        <location filename="../mythmusic/lyricsview.cpp" line="240"/>
+         <source>Edit Lyrics</source>
+         <translation>Edit Lyrics</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/lyricsview.cpp" line="164"/>
+-        <location filename="../mythmusic/lyricsview.cpp" line="243"/>
++        <location filename="../mythmusic/lyricsview.cpp" line="163"/>
++        <location filename="../mythmusic/lyricsview.cpp" line="242"/>
+         <source>Add Lyrics</source>
+         <translation>Add Lyrics</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/lyricsview.cpp" line="168"/>
+-        <location filename="../mythmusic/lyricsview.cpp" line="250"/>
++        <location filename="../mythmusic/lyricsview.cpp" line="167"/>
++        <location filename="../mythmusic/lyricsview.cpp" line="249"/>
+         <source>Auto Scroll Lyrics</source>
+         <translation>Auto Scroll Lyrics</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/lyricsview.cpp" line="230"/>
++        <location filename="../mythmusic/lyricsview.cpp" line="229"/>
+         <source>Actions</source>
+         <translation>Actions</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/lyricsview.cpp" line="236"/>
+-        <location filename="../mythmusic/lyricsview.cpp" line="267"/>
++        <location filename="../mythmusic/lyricsview.cpp" line="235"/>
++        <location filename="../mythmusic/lyricsview.cpp" line="266"/>
+         <source>Find Lyrics</source>
+         <translation>Find Lyrics</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/lyricsview.cpp" line="253"/>
++        <location filename="../mythmusic/lyricsview.cpp" line="252"/>
+         <source>Other Options</source>
+         <translation>Other Options</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/lyricsview.cpp" line="270"/>
++        <location filename="../mythmusic/lyricsview.cpp" line="269"/>
+         <source>Search All Grabbers</source>
+         <translation>Search All Grabbers</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/lyricsview.cpp" line="276"/>
++        <location filename="../mythmusic/lyricsview.cpp" line="275"/>
+         <source>Search %1</source>
+         <translation>Search %1</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/lyricsview.cpp" line="459"/>
++        <location filename="../mythmusic/lyricsview.cpp" line="455"/>
+         <source>Syncronized</source>
+         <translation>Syncronized</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/lyricsview.cpp" line="459"/>
++        <location filename="../mythmusic/lyricsview.cpp" line="455"/>
+         <source>Unsyncronized</source>
+         <translation>Unsyncronized</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/lyricsview.cpp" line="460"/>
++        <location filename="../mythmusic/lyricsview.cpp" line="456"/>
+         <source>** Lyrics from %1 (%2) **</source>
+         <translation>** Lyrics from %1 (%2) **</translation>
+     </message>
+@@ -672,225 +672,231 @@
+ <context>
+     <name>MusicCommon</name>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1215"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1217"/>
+         <source>Playing stream.</source>
+-        <translation>Playing stream.</translation>
++        <translation>Playing Stream.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1244"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1246"/>
+         <source>Buffering stream.</source>
+-        <translation>Buffering stream.</translation>
++        <translation>Buffering Stream.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1248"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1250"/>
+         <source>Stream paused.</source>
+-        <translation>Stream paused.</translation>
++        <translation>Stream Paused.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1316"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1319"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1323"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1331"/>
+         <source>kbps</source>
+         <translation>kbps</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1316"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1322"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1319"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1323"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1331"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1335"/>
+         <source>kHz</source>
+         <translation>kHz</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1316"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1322"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1319"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1323"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1331"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1335"/>
+         <source>ch</source>
+         <translation>ch</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1340"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1354"/>
+         <source>Stream stopped.</source>
+-        <translation>Stream stopped.</translation>
++        <translation>Stream Stopped.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1377"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2229"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1391"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2243"/>
+         <source>Playlist Editor</source>
+         <translation>Playlist Editor</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1386"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2225"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1400"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2239"/>
+         <source>Switch To Gallery View</source>
+-        <translation>Switch To Gallery View</translation>
++        <translation>Switch to Gallery View</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1388"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2227"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1402"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2241"/>
+         <source>Switch To Tree View</source>
+-        <translation>Switch To Tree View</translation>
++        <translation>Switch to Tree View</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1390"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2246"/>
+-        <location filename="../mythmusic/streamview.cpp" line="101"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1404"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2260"/>
++        <location filename="../mythmusic/streamview.cpp" line="93"/>
+         <source>Lyrics</source>
+         <translation>Lyrics</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1422"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2297"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1436"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2311"/>
+         <source>Save To New Playlist</source>
+-        <translation>Save To New Playlist</translation>
++        <translation>Save to New Playlist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1424"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1438"/>
+         <source>Enter new playlist name</source>
+-        <translation>Enter new playlist name</translation>
++        <translation>Enter new playlist name:</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1438"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2298"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1452"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2312"/>
+         <source>Save To Existing Playlist</source>
+-        <translation>Save To Existing Playlist</translation>
++        <translation>Save to Existing Playlist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1440"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1454"/>
+         <source>Select the playlist to save to</source>
+         <translation>Select the playlist to save to</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1505"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2339"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1519"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2353"/>
+         <source>Change Volume</source>
+         <translation>Change Volume</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1507"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2340"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1521"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2354"/>
+         <source>Mute</source>
+         <translation>Mute</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1509"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2341"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1523"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2355"/>
+         <source>Previous Track</source>
+         <translation>Previous Track</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1511"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2342"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1525"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2356"/>
+         <source>Next Track</source>
+         <translation>Next Track</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1513"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2346"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1527"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2360"/>
+         <source>Jump Back</source>
+         <translation>Jump Back</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1515"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2347"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1529"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2361"/>
+         <source>Jump Forward</source>
+         <translation>Jump Forward</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1517"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2350"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1531"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2364"/>
+         <source>Play</source>
+         <translation>Play</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1519"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2351"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1533"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2365"/>
+         <source>Stop</source>
+         <translation>Stop</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1521"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2354"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1535"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2368"/>
+         <source>Pause</source>
+         <translation>Pause</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1526"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2397"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1540"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2411"/>
+         <source>All Tracks</source>
+         <translation>All Tracks</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1528"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2400"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1542"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2414"/>
+         <source>From CD</source>
+         <translation>From CD</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2248"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2547"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2262"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2561"/>
+         <source>More Options</source>
+         <translation>More Options</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2255"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2269"/>
+         <source>Actions</source>
+         <translation>Actions</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2139"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2153"/>
+         <source>Default Playlist</source>
+         <translation>Default Playlist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2141"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2155"/>
+         <source>Stream Playlist</source>
+         <translation>Stream Playlist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2265"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2283"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2279"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2297"/>
+         <source>Playlist Options</source>
+         <translation>Playlist Options</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2266"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2376"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2280"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2390"/>
+         <source>Set Shuffle Mode</source>
+         <translation>Set Shuffle Mode</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2267"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2361"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2281"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2375"/>
+         <source>Set Repeat Mode</source>
+         <translation>Set Repeat Mode</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2270"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2284"/>
+         <source>Player Options</source>
+         <translation>Player Options</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2273"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2393"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2287"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2407"/>
+         <source>Quick Playlists</source>
+         <translation>Quick Playlists</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2276"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2290"/>
+         <source>Change Visualizer</source>
+         <translation>Change Visualizer</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1384"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2240"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1398"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2254"/>
+         <source>Search for Music</source>
+         <translation>Search for Music</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1375"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2243"/>
+-        <location filename="../mythmusic/streamview.cpp" line="100"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1389"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2257"/>
++        <location filename="../mythmusic/streamview.cpp" line="92"/>
+         <source>Fullscreen Visualizer</source>
+         <translation>Fullscreen Visualizer</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2311"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2325"/>
+         <source>Exiting Music Player.
+ 
+ Do you want to continue playing in the background?</source>
+@@ -899,160 +905,160 @@
+ Do you want to continue playing in the background?</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2335"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2349"/>
+         <source>Player Actions</source>
+         <translation>Player Actions</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2365"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2380"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2379"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2394"/>
+         <source>None</source>
+         <translation>None</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2366"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2380"/>
+         <source>Track</source>
+         <translation>Track</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2367"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2381"/>
+         <source>All</source>
+         <translation>All</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2381"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2395"/>
+         <source>Random</source>
+         <translation>Random</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2382"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2396"/>
+         <source>Smart</source>
+         <translation>Smart</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2383"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2397"/>
+         <source>Album</source>
+         <translation>Album</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2384"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2398"/>
+         <source>Artist</source>
+         <translation>Artist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2416"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2430"/>
+         <source>Choose Visualizer</source>
+         <translation>Choose Visualizer</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2430"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2444"/>
+         <source>Add to Playlist Options</source>
+         <translation>Add to Playlist Options</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1395"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2261"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1409"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2275"/>
+         <source>Search List...</source>
+         <translation>Search List...</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1400"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2289"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1414"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2303"/>
+         <source>Sync List With Current Track</source>
+         <translation>Sync List With Current Track</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1404"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2290"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1418"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2304"/>
+         <source>Remove Selected Track</source>
+         <translation>Remove Selected Track</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1414"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2293"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1428"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2307"/>
+         <source>Remove All Tracks</source>
+         <translation>Remove All Tracks</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1453"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2303"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1467"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2317"/>
+         <source>Switch To Move Mode</source>
+-        <translation>Switch To Move Mode</translation>
++        <translation>Switch to Move Mode</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1461"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2301"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1475"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2315"/>
+         <source>Switch To Select Mode</source>
+-        <translation>Switch To Select Mode</translation>
++        <translation>Switch to Select Mode</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1530"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2404"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1544"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2418"/>
+         <source>Tracks By Current Artist</source>
+-        <translation>Tracks By Current Artist</translation>
++        <translation>Tracks by Current Artist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1532"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2406"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1546"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2420"/>
+         <source>Tracks From Current Genre</source>
+-        <translation>Tracks From Current Genre</translation>
++        <translation>Tracks from Current Genre</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1534"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2405"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1548"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2419"/>
+         <source>Tracks From Current Album</source>
+-        <translation>Tracks From Current Album</translation>
++        <translation>Tracks from Current Album</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1536"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2407"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1550"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2421"/>
+         <source>Tracks From Current Year</source>
+-        <translation>Tracks From Current Year</translation>
++        <translation>Tracks from Current Year</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1538"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2408"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1552"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2422"/>
+         <source>Tracks With Same Title</source>
+         <translation>Tracks With Same Title</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1543"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2434"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1557"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2448"/>
+         <source>Replace Tracks</source>
+         <translation>Replace Tracks</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1548"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2435"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1562"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2449"/>
+         <source>Add Tracks</source>
+         <translation>Add Tracks</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2130"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2144"/>
+         <source>%1 of %2</source>
+         <translation>%1 of %2</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2220"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2234"/>
+         <source>View Actions</source>
+         <translation>View Actions</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2328"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2342"/>
+         <source>Cancel</source>
+         <translation>Cancel</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1492"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2326"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1506"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2340"/>
+         <source>No - Exit, Stop Playing</source>
+-        <translation>No - Exit, Stop Playing</translation>
++        <translation>Stop Playing and Exit</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/musiccommon.cpp" line="1498"/>
+-        <location filename="../mythmusic/musiccommon.cpp" line="2327"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="1512"/>
++        <location filename="../mythmusic/musiccommon.cpp" line="2341"/>
+         <source>Yes - Exit, Continue Playing</source>
+-        <translation>Yes - Exit, Continue Playing</translation>
++        <translation>Continue Playing and Exit</translation>
+     </message>
+ </context>
+ <context>
+@@ -1060,7 +1066,7 @@
+     <message>
+         <location filename="../mythmusic/musicdata.cpp" line="71"/>
+         <source>Rebuilding music tree</source>
+-        <translation>Rebuilding music tree</translation>
++        <translation>Rebuilding Music Tree...</translation>
+     </message>
+ </context>
+ <context>
+@@ -1081,7 +1087,7 @@
+     <message>
+         <location filename="../mythmusic/musicplayer.cpp" line="349"/>
+         <source>Got too many track unavailable errors. Maybe the host with the music on is off-line?</source>
+-        <translation>Got too many track unavailable errors. Maybe the host with the music on is off-line?</translation>
++        <translation>Too many track unavailable errors. Maybe the host with the music on is off-line?</translation>
+     </message>
+     <message>
+         <location filename="../mythmusic/musicplayer.cpp" line="357"/>
+@@ -1091,7 +1097,7 @@
+     <message>
+         <location filename="../mythmusic/musicplayer.cpp" line="778"/>
+         <source>A music file scan has started on %1</source>
+-        <translation>A music file scan has started on %1</translation>
++        <translation>A music file scan has started on %1.</translation>
+     </message>
+     <message>
+         <location filename="../mythmusic/musicplayer.cpp" line="779"/>
+@@ -1104,24 +1110,24 @@
+     <message>
+         <location filename="../mythmusic/musicplayer.cpp" line="780"/>
+         <source>This may take a while I&apos;ll give a shout when finished</source>
+-        <translation>This may take a while I&apos;ll give a shout when finished</translation>
++        <translation>This may take a while I&apos;ll give a shout when finished.</translation>
+     </message>
+     <message>
+         <location filename="../mythmusic/musicplayer.cpp" line="798"/>
+         <source>A music file scan has finished on %1</source>
+-        <translation>A music file scan has finished on %1</translation>
++        <translation>A music file scan has finished on %1.</translation>
+     </message>
+     <message>
+         <location filename="../mythmusic/musicplayer.cpp" line="816"/>
+         <source>Can&apos;t run the music file scanner because it is already running on %1</source>
+-        <translation>Can&apos;t run the music file scanner because it is already running on %1</translation>
++        <translation>Can&apos;t run the music file scanner because it is already running on %1.</translation>
+     </message>
+     <message>
+         <location filename="../mythmusic/musicplayer.cpp" line="820"/>
+         <source>The music file scanner has been running for more than 60 minutes on %1.
+ Resetting and trying again</source>
+         <translation>The music file scanner has been running for more than 60 minutes on %1.
+-Resetting and trying again</translation>
++Resetting and trying again.</translation>
+     </message>
+     <message>
+         <location filename="../mythmusic/musicplayer.cpp" line="857"/>
+@@ -1148,310 +1154,300 @@
+ <context>
+     <name>MythControls</name>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="799"/>
++        <location filename="../mythmusic/main.cpp" line="796"/>
+         <source>Play music</source>
+-        <translation>Play music</translation>
++        <translation>Play Music</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="801"/>
++        <location filename="../mythmusic/main.cpp" line="798"/>
+         <source>Select music playlists</source>
+-        <translation>Select music playlists</translation>
++        <translation>Select Music Playlists</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="803"/>
++        <location filename="../mythmusic/main.cpp" line="800"/>
+         <source>Play radio stream</source>
+-        <translation>Play radio stream</translation>
++        <translation>Play Radio Stream</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="805"/>
++        <location filename="../mythmusic/main.cpp" line="802"/>
+         <source>Rip CD</source>
+         <translation>Rip CD</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="807"/>
++        <location filename="../mythmusic/main.cpp" line="804"/>
+         <source>Scan music</source>
+-        <translation>Scan music</translation>
++        <translation>Scan Music</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="809"/>
++        <location filename="../mythmusic/main.cpp" line="806"/>
+         <source>Show Music Miniplayer</source>
+         <translation>Show Music Miniplayer</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="812"/>
++        <location filename="../mythmusic/main.cpp" line="809"/>
+         <source>Move to the next track</source>
+-        <translation>Move to the next track</translation>
++        <translation>Move to the Next Track</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="814"/>
++        <location filename="../mythmusic/main.cpp" line="811"/>
+         <source>Move to the previous track</source>
+-        <translation>Move to the previous track</translation>
++        <translation>Move to the Previous Track</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="816"/>
++        <location filename="../mythmusic/main.cpp" line="813"/>
+         <source>Fast forward</source>
+-        <translation>Fast forward</translation>
++        <translation>Fast Forward</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="818"/>
++        <location filename="../mythmusic/main.cpp" line="815"/>
+         <source>Rewind</source>
+         <translation>Rewind</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="820"/>
++        <location filename="../mythmusic/main.cpp" line="817"/>
+         <source>Pause/Start playback</source>
+-        <translation>Pause/Start playback</translation>
++        <translation>Pause/Start Playback</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="822"/>
++        <location filename="../mythmusic/main.cpp" line="819"/>
+         <source>Start playback</source>
+-        <translation>Start playback</translation>
++        <translation>Start Playback</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="824"/>
++        <location filename="../mythmusic/main.cpp" line="821"/>
+         <source>Stop playback</source>
+-        <translation>Stop playback</translation>
++        <translation>Stop Playback</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="826"/>
++        <location filename="../mythmusic/main.cpp" line="823"/>
+         <source>Volume down</source>
+-        <translation>Volume down</translation>
++        <translation>Volume Down</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="828"/>
++        <location filename="../mythmusic/main.cpp" line="825"/>
+         <source>Volume up</source>
+-        <translation>Volume up</translation>
++        <translation>Volume Up</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="830"/>
++        <location filename="../mythmusic/main.cpp" line="827"/>
+         <source>Mute</source>
+         <translation>Mute</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="832"/>
++        <location filename="../mythmusic/main.cpp" line="829"/>
+         <source>Toggle audio upmixer</source>
+-        <translation>Toggle audio upmixer</translation>
++        <translation>Toggle Audio Upmixer</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="834"/>
++        <location filename="../mythmusic/main.cpp" line="831"/>
+         <source>Cycle visualizer mode</source>
+-        <translation>Cycle visualizer mode</translation>
++        <translation>Cycle Visualizer Mode</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="836"/>
++        <location filename="../mythmusic/main.cpp" line="833"/>
+         <source>Blank screen</source>
+-        <translation>Blank screen</translation>
++        <translation>Blank Screen</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="838"/>
++        <location filename="../mythmusic/main.cpp" line="835"/>
+         <source>Increase rating</source>
+-        <translation>Increase rating</translation>
++        <translation>Increase Rating</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="840"/>
++        <location filename="../mythmusic/main.cpp" line="837"/>
+         <source>Decrease rating</source>
+-        <translation>Decrease rating</translation>
++        <translation>Decrease Rating</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="842"/>
++        <location filename="../mythmusic/main.cpp" line="839"/>
+         <source>Refresh music tree</source>
+-        <translation>Refresh music tree</translation>
++        <translation>Refresh Music Tree</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="844"/>
++        <location filename="../mythmusic/main.cpp" line="841"/>
+         <source>Increase Play Speed</source>
+         <translation>Increase Play Speed</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="846"/>
++        <location filename="../mythmusic/main.cpp" line="843"/>
+         <source>Decrease Play Speed</source>
+         <translation>Decrease Play Speed</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="848"/>
++        <location filename="../mythmusic/main.cpp" line="845"/>
+         <source>Toggle track selection</source>
+-        <translation>Toggle track selection</translation>
++        <translation>Toggle Track Selection</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="850"/>
++        <location filename="../mythmusic/main.cpp" line="847"/>
+         <source>Toggle shuffle mode</source>
+-        <translation>Toggle shuffle mode</translation>
++        <translation>Toggle Shuffle Mode</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="852"/>
++        <location filename="../mythmusic/main.cpp" line="849"/>
+         <source>Toggle repeat mode</source>
+-        <translation>Toggle repeat mode</translation>
++        <translation>Toggle Repeat Mode</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="854"/>
++        <location filename="../mythmusic/main.cpp" line="851"/>
+         <source>Switch to previous radio stream</source>
+-        <translation>Switch to previous radio stream</translation>
++        <translation>Switch to Previous Radio Stream</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="858"/>
++        <location filename="../mythmusic/main.cpp" line="855"/>
+         <source>Switch to the current playlist view</source>
+-        <translation>Switch to the current playlist view</translation>
++        <translation>Switch to the Current Playlist View</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="860"/>
++        <location filename="../mythmusic/main.cpp" line="857"/>
+         <source>Switch to the playlist editor tree view</source>
+-        <translation>Switch to the playlist editor tree view</translation>
++        <translation>Switch to the Playlist Editor Tree View</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="862"/>
++        <location filename="../mythmusic/main.cpp" line="859"/>
+         <source>Switch to the playlist editor gallery view</source>
+-        <translation>Switch to the playlist editor gallery view</translation>
++        <translation>Switch to the Playlist Editor Gallery View</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="864"/>
++        <location filename="../mythmusic/main.cpp" line="861"/>
+         <source>Switch to the search view</source>
+-        <translation>Switch to the search view</translation>
++        <translation>Switch to the Search View</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="866"/>
++        <location filename="../mythmusic/main.cpp" line="863"/>
+         <source>Switch to the fullscreen visualiser view</source>
+-        <translation>Switch to the fullscreen visualiser view</translation>
++        <translation>Switch to the Fullscreen Visualizer View</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="868"/>
++        <location filename="../mythmusic/main.cpp" line="865"/>
+         <source>Switch to the radio stream view</source>
+-        <translation>Switch to the radio stream view</translation>
++        <translation>Switch to the Radio Stream View</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="872"/>
++        <location filename="../mythmusic/main.cpp" line="868"/>
+         <source>MythMusic Media Handler 1/2</source>
+         <translation>MythMusic Media Handler 1/2</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/main.cpp" line="873"/>
+-        <source>MythMusic audio CD</source>
+-        <translation>MythMusic audio CD</translation>
+-    </message>
+-    <message>
+-        <location filename="../mythmusic/main.cpp" line="879"/>
++        <location filename="../mythmusic/main.cpp" line="874"/>
+         <source>MythMusic Media Handler 2/2</source>
+         <translation>MythMusic Media Handler 2/2</translation>
+     </message>
+-    <message>
+-        <location filename="../mythmusic/main.cpp" line="880"/>
+-        <source>MythMusic audio files</source>
+-        <translation>MythMusic audio files</translation>
+-    </message>
+ </context>
+ <context>
+     <name>PlayerSettings</name>
+     <message>
+-        <location filename="../mythmusic/playersettings.cpp" line="53"/>
+-        <location filename="../mythmusic/playersettings.cpp" line="59"/>
+-        <location filename="../mythmusic/playersettings.cpp" line="65"/>
++        <location filename="../mythmusic/playersettings.cpp" line="48"/>
++        <location filename="../mythmusic/playersettings.cpp" line="54"/>
++        <location filename="../mythmusic/playersettings.cpp" line="60"/>
+         <source>Off</source>
+         <translation>Off</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playersettings.cpp" line="54"/>
+-        <location filename="../mythmusic/playersettings.cpp" line="60"/>
++        <location filename="../mythmusic/playersettings.cpp" line="49"/>
++        <location filename="../mythmusic/playersettings.cpp" line="55"/>
+         <source>First</source>
+         <translation>First</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playersettings.cpp" line="55"/>
+-        <location filename="../mythmusic/playersettings.cpp" line="61"/>
++        <location filename="../mythmusic/playersettings.cpp" line="50"/>
++        <location filename="../mythmusic/playersettings.cpp" line="56"/>
+         <source>Track</source>
+         <translation>Track</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playersettings.cpp" line="56"/>
+-        <location filename="../mythmusic/playersettings.cpp" line="62"/>
++        <location filename="../mythmusic/playersettings.cpp" line="51"/>
++        <location filename="../mythmusic/playersettings.cpp" line="57"/>
+         <source>Exact</source>
+         <translation>Exact</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playersettings.cpp" line="66"/>
++        <location filename="../mythmusic/playersettings.cpp" line="61"/>
+         <source>On</source>
+         <translation>On</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playersettings.cpp" line="69"/>
++        <location filename="../mythmusic/playersettings.cpp" line="64"/>
+         <source>Prompt</source>
+         <translation>Prompt</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playersettings.cpp" line="70"/>
+-        <location filename="../mythmusic/playersettings.cpp" line="74"/>
++        <location filename="../mythmusic/playersettings.cpp" line="65"/>
++        <location filename="../mythmusic/playersettings.cpp" line="69"/>
+         <source>Stop playing</source>
+-        <translation>Stop playing</translation>
++        <translation>Stop Playing</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playersettings.cpp" line="71"/>
+-        <location filename="../mythmusic/playersettings.cpp" line="75"/>
++        <location filename="../mythmusic/playersettings.cpp" line="66"/>
++        <location filename="../mythmusic/playersettings.cpp" line="70"/>
+         <source>Continue Playing</source>
+         <translation>Continue Playing</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playersettings.cpp" line="85"/>
++        <location filename="../mythmusic/playersettings.cpp" line="80"/>
+         <source>Playback screen - Resume playback at either the beginning of the active play queue, the beginning of the last track played, or an exact point within the last track played or not at all.</source>
+         <translation>Playback screen - Resume playback at either the beginning of the active play queue, the beginning of the last track played, or an exact point within the last track played or not at all.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playersettings.cpp" line="88"/>
++        <location filename="../mythmusic/playersettings.cpp" line="83"/>
+         <source>Playlist Editor screen - Resume playback at either the beginning of the active play queue, the beginning of the last track played, or an exact point within the last track played or not at all.</source>
+         <translation>Playlist Editor screen - Resume playback at either the beginning of the active play queue, the beginning of the last track played, or an exact point within the last track played or not at all.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playersettings.cpp" line="91"/>
++        <location filename="../mythmusic/playersettings.cpp" line="86"/>
+         <source>Radio screen - Resume playback at the previous station or not at all</source>
+-        <translation>Radio screen - Resume playback at the previous station or not at all</translation>
++        <translation>Radio screen - Resume playback at the previous station or not at all.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playersettings.cpp" line="92"/>
++        <location filename="../mythmusic/playersettings.cpp" line="87"/>
+         <source>Specify what action to take when exiting MythMusic plugin.</source>
+-        <translation>Specify what action to take when exiting MythMusic plugin.</translation>
++        <translation>Specify what action to take when exiting MythMusic.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playersettings.cpp" line="93"/>
++        <location filename="../mythmusic/playersettings.cpp" line="88"/>
+         <source>Specify what action to take when exiting MythMusic plugin due to a jumppoint being executed.</source>
+-        <translation>Specify what action to take when exiting MythMusic plugin due to a jumppoint being executed.</translation>
++        <translation>Specify what action to take when exiting MythMusic due to a jumppoint being executed.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playersettings.cpp" line="94"/>
++        <location filename="../mythmusic/playersettings.cpp" line="89"/>
+         <source>Automatically lookup an audio CD if it is present and show its information in the Music Selection Tree.</source>
+         <translation>Automatically lookup an audio CD if it is present and show its information in the Music Selection Tree.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playersettings.cpp" line="97"/>
++        <location filename="../mythmusic/playersettings.cpp" line="92"/>
+         <source>Automatically put a new CD on the playlist and start playing the CD.</source>
+         <translation>Automatically put a new CD on the playlist and start playing the CD.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playersettings.cpp" line="99"/>
++        <location filename="../mythmusic/playersettings.cpp" line="94"/>
+         <source>Exit without saving settings</source>
+-        <translation>Exit without saving settings</translation>
++        <translation>Exit Without Saving</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playersettings.cpp" line="100"/>
++        <location filename="../mythmusic/playersettings.cpp" line="95"/>
+         <source>Save settings and Exit</source>
+-        <translation>Save settings and Exit</translation>
++        <translation>Save and Exit</translation>
+     </message>
+ </context>
+ <context>
+     <name>Playlist</name>
+     <message>
+-        <location filename="../mythmusic/playlist.cpp" line="150"/>
++        <location filename="../mythmusic/playlist.cpp" line="149"/>
+         <source>oops</source>
+         <translation>oops</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlist.cpp" line="606"/>
++        <location filename="../mythmusic/playlist.cpp" line="623"/>
+         <source>Default Playlist</source>
+         <translation>Default Playlist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlist.cpp" line="1336"/>
++        <location filename="../mythmusic/playlist.cpp" line="1353"/>
+         <source>Creating CD File System</source>
+         <translation>Creating CD File System</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlist.cpp" line="1385"/>
++        <location filename="../mythmusic/playlist.cpp" line="1402"/>
+         <source>Burning CD</source>
+         <translation>Burning CD</translation>
+     </message>
+@@ -1467,154 +1463,154 @@
+ <context>
+     <name>PlaylistEditorView</name>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="266"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="745"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="755"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="260"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="732"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="742"/>
+         <source>New Smart Playlist</source>
+         <translation>New Smart Playlist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="288"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="756"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="282"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="743"/>
+         <source>Remove Smart Playlist</source>
+         <translation>Remove Smart Playlist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="293"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="478"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="287"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="468"/>
+         <source>Are you sure you want to delete this Smart Playlist?
+ Category: %1 - Name: %2</source>
+         <translation>Are you sure you want to delete this Smart Playlist?
+ Category: %1 - Name: %2</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="297"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="754"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="291"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="741"/>
+         <source>Edit Smart Playlist</source>
+         <translation>Edit Smart Playlist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="318"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="352"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="719"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="751"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="312"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="346"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="706"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="738"/>
+         <source>Replace Tracks</source>
+         <translation>Replace Tracks</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="324"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="358"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="720"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="752"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="318"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="352"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="707"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="739"/>
+         <source>Add Tracks</source>
+         <translation>Add Tracks</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="344"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="721"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="338"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="708"/>
+         <source>Remove Playlist</source>
+         <translation>Remove Playlist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="348"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="487"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="342"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="477"/>
+         <source>Are you sure you want to delete this Playlist?
+ Name: %1</source>
+         <translation>Are you sure you want to delete this Playlist?
+ Name: %1</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="687"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="674"/>
+         <source>More Options</source>
+         <translation>More Options</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="718"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="705"/>
+         <source>Playlist Actions</source>
+         <translation>Playlist Actions</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="741"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="749"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="728"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="736"/>
+         <source>Smart Playlist Actions</source>
+         <translation>Smart Playlist Actions</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="768"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="1347"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="755"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="1335"/>
+         <source>All Tracks</source>
+         <translation>All Tracks</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="772"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="1353"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="759"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="1341"/>
+         <source>Albums</source>
+         <translation>Albums</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="776"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="1360"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="763"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="1348"/>
+         <source>Artists</source>
+         <translation>Artists</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="780"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="1408"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="767"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="1396"/>
+         <source>Genres</source>
+         <translation>Genres</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="784"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="1415"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="771"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="1403"/>
+         <source>Tags</source>
+         <translation>Tags</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="788"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="1422"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="775"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="1410"/>
+         <source>Ratings</source>
+         <translation>Ratings</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="792"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="1429"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="779"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="1417"/>
+         <source>Years</source>
+         <translation>Years</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="796"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="783"/>
+         <source>Compilations</source>
+         <translation>Compilations</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="816"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="803"/>
+         <source>CD - %1</source>
+         <translation>CD - %1</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="821"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="1274"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="808"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="1262"/>
+         <source>Directory</source>
+         <translation>Directory</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="825"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="812"/>
+         <source>Playlists</source>
+         <translation>Playlists</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="828"/>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="1732"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="815"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="1720"/>
+         <source>Smart Playlists</source>
+         <translation>Smart Playlists</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="964"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="951"/>
+         <source>%1 of %2</source>
+         <translation>%1 of %2</translation>
+     </message>
+     <message numerus="yes">
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="1203"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="1191"/>
+         <source>%n Star(s)</source>
+         <translatorcomment>I&apos;m not sure this about that uppercase S should really be there...</translatorcomment>
+         <translation>
+@@ -1623,17 +1619,17 @@
+         </translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="1400"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="1388"/>
+         <source>Compilation Artists</source>
+         <translation>Compilation Artists</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="1591"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="1579"/>
+         <source>** No matching tracks **</source>
+-        <translation>** No matching tracks **</translation>
++        <translation>** No Matching Tracks **</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/playlisteditorview.cpp" line="1649"/>
++        <location filename="../mythmusic/playlisteditorview.cpp" line="1637"/>
+         <source>** Empty Playlist!! **</source>
+         <translation>** Empty Playlist!! **</translation>
+     </message>
+@@ -1641,50 +1637,50 @@
+ <context>
+     <name>RatingSettings</name>
+     <message>
+-        <location filename="../mythmusic/ratingsettings.cpp" line="52"/>
++        <location filename="../mythmusic/ratingsettings.cpp" line="47"/>
+         <source>Used in &quot;Smart&quot; Shuffle mode. This weighting affects how much strength is given to your rating of a given track when ordering a group of songs.</source>
+         <translation>Used in &quot;Smart&quot; Shuffle mode. This weighting affects how much strength is given to your rating of a given track when ordering a group of songs.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/ratingsettings.cpp" line="56"/>
++        <location filename="../mythmusic/ratingsettings.cpp" line="51"/>
+         <source>Used in &quot;Smart&quot; Shuffle mode. This weighting affects how much strength is given to how many times a given track has been played when ordering a group of songs.</source>
+         <translation>Used in &quot;Smart&quot; Shuffle mode. This weighting affects how much strength is given to how many times a given track has been played when ordering a group of songs.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/ratingsettings.cpp" line="60"/>
++        <location filename="../mythmusic/ratingsettings.cpp" line="55"/>
+         <source>Used in &quot;Smart&quot; Shuffle mode. This weighting affects how much strength is given to how long it has been since a given track was played when ordering a group of songs.</source>
+         <translation>Used in &quot;Smart&quot; Shuffle mode. This weighting affects how much strength is given to how long it has been since a given track was played when ordering a group of songs.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/ratingsettings.cpp" line="64"/>
++        <location filename="../mythmusic/ratingsettings.cpp" line="59"/>
+         <source>Used in &quot;Smart&quot; Shuffle mode. This weighting affects how much strength is given to good old (pseudo-)randomness when ordering a group of songs.</source>
+         <translation>Used in &quot;Smart&quot; Shuffle mode. This weighting affects how much strength is given to good old (pseudo-)randomness when ordering a group of songs.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/ratingsettings.cpp" line="68"/>
++        <location filename="../mythmusic/ratingsettings.cpp" line="63"/>
+         <source>Exit without saving settings</source>
+-        <translation>Exit without saving settings</translation>
++        <translation>Exit Without Saving</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/ratingsettings.cpp" line="69"/>
++        <location filename="../mythmusic/ratingsettings.cpp" line="64"/>
+         <source>Save settings and Exit</source>
+-        <translation>Save settings and Exit</translation>
++        <translation>Save and Exit</translation>
+     </message>
+ </context>
+ <context>
+     <name>RipStatus</name>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="1603"/>
++        <location filename="../mythmusic/cdrip.cpp" line="1583"/>
+         <source>Cancel ripping the CD?</source>
+         <translation>Cancel ripping the CD?</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="1671"/>
++        <location filename="../mythmusic/cdrip.cpp" line="1652"/>
+         <source>Copying Track ...</source>
+-        <translation>Copying Track ...</translation>
++        <translation>Copying Track...</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="1700"/>
++        <location filename="../mythmusic/cdrip.cpp" line="1681"/>
+         <source>The encoder failed to create the file.
+ Do you have write permissions for the music directory?</source>
+         <translation>The encoder failed to create the file.
+@@ -1694,194 +1690,194 @@
+ <context>
+     <name>Ripper</name>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="668"/>
++        <location filename="../mythmusic/cdrip.cpp" line="662"/>
+         <source>Low</source>
+         <translation>Low</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="669"/>
++        <location filename="../mythmusic/cdrip.cpp" line="663"/>
+         <source>Medium</source>
+         <translation>Medium</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="670"/>
++        <location filename="../mythmusic/cdrip.cpp" line="664"/>
+         <source>High</source>
+         <translation>High</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="671"/>
++        <location filename="../mythmusic/cdrip.cpp" line="665"/>
+         <source>Perfect</source>
+         <translation>Perfect</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="726"/>
++        <location filename="../mythmusic/cdrip.cpp" line="719"/>
+         <source>Select Where To Save Tracks</source>
+         <translation>Select Where To Save Tracks</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="727"/>
++        <location filename="../mythmusic/cdrip.cpp" line="720"/>
+         <source>Edit Track Metadata</source>
+         <translation>Edit Track Metadata</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="760"/>
++        <location filename="../mythmusic/cdrip.cpp" line="753"/>
+         <source>Select where to save tracks</source>
+-        <translation>Select where to save tracks</translation>
++        <translation>Select Where To Save Tracks</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="790"/>
++        <location filename="../mythmusic/cdrip.cpp" line="783"/>
+         <source>Scanning CD. Please Wait ...</source>
+-        <translation>Scanning CD. Please Wait ...</translation>
++        <translation>Scanning CD...</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="1162"/>
++        <location filename="../mythmusic/cdrip.cpp" line="1144"/>
+         <source>There are no tracks to rip?</source>
+         <translation>There are no tracks to rip?</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="1190"/>
++        <location filename="../mythmusic/cdrip.cpp" line="1172"/>
+         <source>Rip completed successfully.</source>
+         <translation>Rip completed successfully.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="1205"/>
++        <location filename="../mythmusic/cdrip.cpp" line="1187"/>
+         <source>Ejecting CD. Please Wait ...</source>
+-        <translation>Ejecting CD. Please Wait ...</translation>
++        <translation>Ejecting CD...</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="1308"/>
++        <location filename="../mythmusic/cdrip.cpp" line="1290"/>
+         <source>Select an Artist</source>
+         <translation>Select an Artist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="1332"/>
++        <location filename="../mythmusic/cdrip.cpp" line="1314"/>
+         <source>Select an Album</source>
+         <translation>Select an Album</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="1356"/>
++        <location filename="../mythmusic/cdrip.cpp" line="1338"/>
+         <source>Select a Genre</source>
+         <translation>Select a Genre</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="1459"/>
++        <location filename="../mythmusic/cdrip.cpp" line="1441"/>
+         <source>This track has been disabled because it is already present in the database.
+ Do you want to permanently delete the existing file(s)?</source>
+         <translation>This track has been disabled because it is already present in the database.
+ Do you want to permanently delete the existing file(s)?</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="1475"/>
++        <location filename="../mythmusic/cdrip.cpp" line="1457"/>
+         <source>No, Cancel</source>
+-        <translation>No, Cancel</translation>
++        <translation>Do Not Delete</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="1476"/>
++        <location filename="../mythmusic/cdrip.cpp" line="1458"/>
+         <source>Yes, Delete</source>
+-        <translation>Yes, Delete</translation>
++        <translation>Delete</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/cdrip.cpp" line="1477"/>
++        <location filename="../mythmusic/cdrip.cpp" line="1459"/>
+         <source>Yes, Delete All</source>
+-        <translation>Yes, Delete All</translation>
++        <translation>Delete All</translation>
+     </message>
+ </context>
+ <context>
+     <name>SearchStream</name>
+     <message>
+-        <location filename="../mythmusic/streamview.cpp" line="915"/>
+-        <location filename="../mythmusic/streamview.cpp" line="932"/>
+-        <location filename="../mythmusic/streamview.cpp" line="1043"/>
++        <location filename="../mythmusic/streamview.cpp" line="903"/>
++        <location filename="../mythmusic/streamview.cpp" line="920"/>
++        <location filename="../mythmusic/streamview.cpp" line="1031"/>
+         <source>&lt;All Broadcasters&gt;</source>
+         <translation>&lt;All Broadcasters&gt;</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/streamview.cpp" line="939"/>
+-        <location filename="../mythmusic/streamview.cpp" line="956"/>
+-        <location filename="../mythmusic/streamview.cpp" line="1044"/>
++        <location filename="../mythmusic/streamview.cpp" line="927"/>
++        <location filename="../mythmusic/streamview.cpp" line="944"/>
++        <location filename="../mythmusic/streamview.cpp" line="1032"/>
+         <source>&lt;All Genres&gt;</source>
+         <translation>&lt;All Genres&gt;</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/streamview.cpp" line="965"/>
+-        <location filename="../mythmusic/streamview.cpp" line="982"/>
+-        <location filename="../mythmusic/streamview.cpp" line="1029"/>
+-        <location filename="../mythmusic/streamview.cpp" line="1046"/>
++        <location filename="../mythmusic/streamview.cpp" line="953"/>
++        <location filename="../mythmusic/streamview.cpp" line="970"/>
++        <location filename="../mythmusic/streamview.cpp" line="1017"/>
++        <location filename="../mythmusic/streamview.cpp" line="1034"/>
+         <source>&lt;All Countries&gt;</source>
+         <translation>&lt;All Countries&gt;</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/streamview.cpp" line="992"/>
+-        <location filename="../mythmusic/streamview.cpp" line="1009"/>
+-        <location filename="../mythmusic/streamview.cpp" line="1028"/>
+-        <location filename="../mythmusic/streamview.cpp" line="1045"/>
++        <location filename="../mythmusic/streamview.cpp" line="980"/>
++        <location filename="../mythmusic/streamview.cpp" line="997"/>
++        <location filename="../mythmusic/streamview.cpp" line="1016"/>
++        <location filename="../mythmusic/streamview.cpp" line="1033"/>
+         <source>&lt;All Languages&gt;</source>
+         <translation>&lt;All Languages&gt;</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/streamview.cpp" line="1133"/>
++        <location filename="../mythmusic/streamview.cpp" line="1121"/>
+         <source>Updating stream list. Please Wait ...</source>
+-        <translation>Updating stream list. Please Wait ...</translation>
++        <translation>Updating Stream List...</translation>
+     </message>
+ </context>
+ <context>
+     <name>SearchView</name>
+     <message>
+-        <location filename="../mythmusic/searchview.cpp" line="60"/>
++        <location filename="../mythmusic/searchview.cpp" line="54"/>
+         <source>All Fields</source>
+         <translation>All Fields</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/searchview.cpp" line="62"/>
++        <location filename="../mythmusic/searchview.cpp" line="56"/>
+         <source>Artist</source>
+         <translation>Artist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/searchview.cpp" line="64"/>
++        <location filename="../mythmusic/searchview.cpp" line="58"/>
+         <source>Album</source>
+         <translation>Album</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/searchview.cpp" line="66"/>
++        <location filename="../mythmusic/searchview.cpp" line="60"/>
+         <source>Title</source>
+         <translation>Title</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/searchview.cpp" line="68"/>
++        <location filename="../mythmusic/searchview.cpp" line="62"/>
+         <source>Genre</source>
+         <translation>Genre</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/searchview.cpp" line="177"/>
+-        <location filename="../mythmusic/searchview.cpp" line="288"/>
++        <location filename="../mythmusic/searchview.cpp" line="171"/>
++        <location filename="../mythmusic/searchview.cpp" line="278"/>
+         <source>Add To Playlist</source>
+-        <translation>Add To Playlist</translation>
++        <translation>Add to Playlist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/searchview.cpp" line="177"/>
+-        <location filename="../mythmusic/searchview.cpp" line="285"/>
++        <location filename="../mythmusic/searchview.cpp" line="171"/>
++        <location filename="../mythmusic/searchview.cpp" line="275"/>
+         <source>Remove From Playlist</source>
+-        <translation>Remove From Playlist</translation>
++        <translation>Remove from Playlist</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/searchview.cpp" line="189"/>
+-        <location filename="../mythmusic/searchview.cpp" line="289"/>
++        <location filename="../mythmusic/searchview.cpp" line="183"/>
++        <location filename="../mythmusic/searchview.cpp" line="279"/>
+         <source>Add To Playlist And Play</source>
+-        <translation>Add To Playlist And Play</translation>
++        <translation>Add to Playlist and Play</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/searchview.cpp" line="201"/>
+-        <location filename="../mythmusic/searchview.cpp" line="295"/>
++        <location filename="../mythmusic/searchview.cpp" line="195"/>
++        <location filename="../mythmusic/searchview.cpp" line="285"/>
+         <source>Search List...</source>
+         <translation>Search List...</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/searchview.cpp" line="274"/>
++        <location filename="../mythmusic/searchview.cpp" line="264"/>
+         <source>Search Actions</source>
+         <translation>Search Actions</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/searchview.cpp" line="297"/>
++        <location filename="../mythmusic/searchview.cpp" line="287"/>
+         <source>More Options</source>
+         <translation>More Options</translation>
+     </message>
+@@ -1889,7 +1885,7 @@
+ <context>
+     <name>SmartPLCriteriaRow</name>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="361"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="357"/>
+         <source>and</source>
+         <translation>and</translation>
+     </message>
+@@ -1897,7 +1893,7 @@
+ <context>
+     <name>SmartPLDateDialog</name>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="2256"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="2233"/>
+         <source>Invalid Date</source>
+         <translation>Invalid Date</translation>
+     </message>
+@@ -1905,7 +1901,7 @@
+ <context>
+     <name>SmartPLResultViewer</name>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="1780"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="1765"/>
+         <source>%1 of %2</source>
+         <translation>%1 of %2</translation>
+     </message>
+@@ -1913,84 +1909,84 @@
+ <context>
+     <name>SmartPlaylistEditor</name>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="429"/>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="764"/>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="870"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="425"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="759"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="865"/>
+         <source>All</source>
+         <translation>All</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="430"/>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="872"/>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="1037"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="426"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="867"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="1031"/>
+         <source>Any</source>
+         <translation>Any</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="505"/>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="688"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="500"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="683"/>
+         <source>New Category</source>
+         <translation>New Category</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="508"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="503"/>
+         <source>Enter Name Of New Category</source>
+-        <translation>Enter Name Of New Category</translation>
++        <translation>Enter Name of New Category</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="520"/>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="689"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="515"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="684"/>
+         <source>Delete Category</source>
+         <translation>Delete Category</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="522"/>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="690"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="517"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="685"/>
+         <source>Rename Category</source>
+         <translation>Rename Category</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="525"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="520"/>
+         <source>Enter New Name For Category: %1</source>
+-        <translation>Enter New Name For Category: %1</translation>
++        <translation>Enter New Name for Category: %1</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="582"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="577"/>
+         <source>Delete Criteria?</source>
+         <translation>Delete Criteria?</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="674"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="669"/>
+         <source>Category Actions</source>
+         <translation>Category Actions</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="697"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="692"/>
+         <source>Criteria Actions</source>
+         <translation>Criteria Actions</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="714"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="709"/>
+         <source>Edit Criteria</source>
+         <translation>Edit Criteria</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="716"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="711"/>
+         <source>Add Criteria</source>
+         <translation>Add Criteria</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="719"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="714"/>
+         <source>Delete Criteria</source>
+         <translation>Delete Criteria</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="958"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="952"/>
+         <source>Are you sure you want to delete this Category?</source>
+         <translation>Are you sure you want to delete this Category?</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/smartplaylist.cpp" line="960"/>
++        <location filename="../mythmusic/smartplaylist.cpp" line="954"/>
+         <source>It will also delete any Smart Playlists belonging to this category.</source>
+         <translation>It will also delete any Smart Playlists belonging to this category.</translation>
+     </message>
+@@ -1998,35 +1994,35 @@
+ <context>
+     <name>StreamView</name>
+     <message>
+-        <location filename="../mythmusic/streamview.cpp" line="91"/>
++        <location filename="../mythmusic/streamview.cpp" line="83"/>
+         <source>Stream Actions</source>
+         <translation>Stream Actions</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/streamview.cpp" line="92"/>
+-        <location filename="../mythmusic/streamview.cpp" line="309"/>
++        <location filename="../mythmusic/streamview.cpp" line="84"/>
++        <location filename="../mythmusic/streamview.cpp" line="301"/>
+         <source>Add Stream</source>
+         <translation>Add Stream</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/streamview.cpp" line="96"/>
+-        <location filename="../mythmusic/streamview.cpp" line="323"/>
++        <location filename="../mythmusic/streamview.cpp" line="88"/>
++        <location filename="../mythmusic/streamview.cpp" line="315"/>
+         <source>Edit Stream</source>
+         <translation>Edit Stream</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/streamview.cpp" line="97"/>
+-        <location filename="../mythmusic/streamview.cpp" line="319"/>
++        <location filename="../mythmusic/streamview.cpp" line="89"/>
++        <location filename="../mythmusic/streamview.cpp" line="311"/>
+         <source>Remove Stream</source>
+         <translation>Remove Stream</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/streamview.cpp" line="103"/>
++        <location filename="../mythmusic/streamview.cpp" line="95"/>
+         <source>More Options</source>
+         <translation>More Options</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/streamview.cpp" line="411"/>
++        <location filename="../mythmusic/streamview.cpp" line="399"/>
+         <source>Are you sure you want to delete this Stream?
+ Broadcaster: %1 - Channel: %2</source>
+         <translation>Are you sure you want to delete this Stream?
+@@ -2154,7 +2150,7 @@
+     <message>
+         <location filename="themestrings.h" line="52"/>
+         <source>Already in database</source>
+-        <translation>Already in database</translation>
++        <translation>Already in Database</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="46"/>
+@@ -2369,17 +2365,17 @@
+     <message>
+         <location filename="themestrings.h" line="178"/>
+         <source>Directory to hold music:</source>
+-        <translation>Directory to hold music:</translation>
++        <translation>Directory to Hold Music:</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="101"/>
+         <source>CD device:</source>
+-        <translation>CD device:</translation>
++        <translation>CD Device:</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="102"/>
+         <source>Audio device:</source>
+-        <translation>Audio device:</translation>
++        <translation>Audio Device:</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="104"/>
+@@ -2394,7 +2390,7 @@
+     <message>
+         <location filename="themestrings.h" line="240"/>
+         <source>Convert stereo to 5.1 sound</source>
+-        <translation>Convert stereo to 5.1 sound</translation>
++        <translation>Convert Stereo to 5.1 Sound</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="241"/>
+@@ -2404,7 +2400,7 @@
+     <message>
+         <location filename="themestrings.h" line="242"/>
+         <source>Allow metadata to be written to tags</source>
+-        <translation>Allow metadata to be written to tags</translation>
++        <translation>Allow Metadata to be Written to Tags</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="77"/>
+@@ -2419,17 +2415,17 @@
+     <message>
+         <location filename="themestrings.h" line="108"/>
+         <source>Resume mode:</source>
+-        <translation>Resume mode:</translation>
++        <translation>Resume Mode:</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="109"/>
+         <source>Action on exit:</source>
+-        <translation>Action on exit:</translation>
++        <translation>Action on Exit:</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="244"/>
+         <source>Automatically lookup CDs</source>
+-        <translation>Automatically lookup CDs</translation>
++        <translation>Automatically Lookup CDs</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="245"/>
+@@ -2479,22 +2475,22 @@
+     <message>
+         <location filename="themestrings.h" line="119"/>
+         <source>File storage location:</source>
+-        <translation>File storage location:</translation>
++        <translation>File Storage Location:</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="246"/>
+         <source>Replace space with underscore</source>
+-        <translation>Replace space with underscore</translation>
++        <translation>Replace Space with Underscore</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="247"/>
+         <source>Use variable bitrates</source>
+-        <translation>Use variable bitrates</translation>
++        <translation>Use Variable Bitrates</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="248"/>
+         <source>Automatically eject CDs after ripping</source>
+-        <translation>Automatically eject CDs after ripping</translation>
++        <translation>Automatically Eject CDs After Ripping</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="125"/>
+@@ -2534,7 +2530,7 @@
+     <message>
+         <location filename="themestrings.h" line="250"/>
+         <source>Enable directories on MP3 Creation</source>
+-        <translation>Enable directories on MP3 Creation</translation>
++        <translation>Enable Directories on MP3 Creation</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="133"/>
+@@ -2555,12 +2551,12 @@
+     <message>
+         <location filename="themestrings.h" line="251"/>
+         <source>Change Visualizer on each song</source>
+-        <translation>Change Visualizer on each song</translation>
++        <translation>Change Visualizer on Each Song</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="252"/>
+         <source>Randomize Visualizer order</source>
+-        <translation>Randomize Visualizer order</translation>
++        <translation>Randomize Visualizer Order</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="138"/>
+@@ -2610,7 +2606,7 @@
+     <message>
+         <location filename="themestrings.h" line="22"/>
+         <source>You haven&apos;t selected any tracks to play</source>
+-        <translation>You haven&apos;t selected any tracks to play</translation>
++        <translation>You haven&apos;t selected any tracks to play.</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="10"/>
+@@ -2630,17 +2626,17 @@
+     <message>
+         <location filename="themestrings.h" line="190"/>
+         <source>Play List Editor (tree)</source>
+-        <translation>Play List Editor (tree)</translation>
++        <translation>Play List Editor (Tree)</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="191"/>
+         <source>Play List Editor (gallery)</source>
+-        <translation>Play List Editor (gallery)</translation>
++        <translation>Play List Editor (Gallery)</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="192"/>
+         <source>Play List Editor (search)</source>
+-        <translation>Play List Editor (search)</translation>
++        <translation>Play List Editor (Search)</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="23"/>
+@@ -2985,17 +2981,17 @@
+     <message>
+         <location filename="themestrings.h" line="179"/>
+         <source>Resume mode (Playlist Editor):</source>
+-        <translation>Resume mode (Playlist Editor):</translation>
++        <translation>Resume Mode (Playlist Editor):</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="180"/>
+         <source>Resume mode (Radio):</source>
+-        <translation>Resume mode (Radio):</translation>
++        <translation>Resume Mode (Radio):</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="181"/>
+         <source>Action on jumppoint:</source>
+-        <translation>Action on jumppoint:</translation>
++        <translation>Action on Jumppoint:</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="182"/>
+@@ -3015,7 +3011,7 @@
+     <message>
+         <location filename="themestrings.h" line="209"/>
+         <source>Clears the entire database:</source>
+-        <translation>Clears the entire database:</translation>
++        <translation>Clears the Entire Database:</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="210"/>
+@@ -3090,7 +3086,7 @@
+     <message>
+         <location filename="themestrings.h" line="221"/>
+         <source>Date added:</source>
+-        <translation>Date added:</translation>
++        <translation>Date Added:</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="223"/>
+@@ -3155,7 +3151,7 @@
+     <message>
+         <location filename="themestrings.h" line="103"/>
+         <source>Convert stereo to 5.1 sound:</source>
+-        <translation>Convert stereo to 5.1 sound:</translation>
++        <translation>Convert Stereo to 5.1 Sound:</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="105"/>
+@@ -3165,12 +3161,12 @@
+     <message>
+         <location filename="themestrings.h" line="106"/>
+         <source>Allow metadata to be written to tags:</source>
+-        <translation>Allow metadata to be written to tags:</translation>
++        <translation>Allow Metadata to be Written to Tags:</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="110"/>
+         <source>Automatically lookup CDs:</source>
+-        <translation>Automatically lookup CDs:</translation>
++        <translation>Automatically Lookup CDs:</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="111"/>
+@@ -3180,27 +3176,27 @@
+     <message>
+         <location filename="themestrings.h" line="120"/>
+         <source>Replace space with underscore:</source>
+-        <translation>Replace space with underscore:</translation>
++        <translation>Replace Space with Underscore:</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="123"/>
+         <source>Use variable bitrates:</source>
+-        <translation>Use variable bitrates:</translation>
++        <translation>Use Variable Bitrates:</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="124"/>
+         <source>Automatically eject CDs after ripping:</source>
+-        <translation>Automatically eject CDs after ripping:</translation>
++        <translation>Automatically Eject CDs After Ripping:</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="134"/>
+         <source>Change Visualizer on each song:</source>
+-        <translation>Change Visualizer on each song:</translation>
++        <translation>Change Visualizer on Each Song:</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="135"/>
+         <source>Randomize Visualizer order:</source>
+-        <translation>Randomize Visualizer order:</translation>
++        <translation>Randomize Visualizer Order:</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="127"/>
+@@ -3210,7 +3206,7 @@
+     <message>
+         <location filename="themestrings.h" line="132"/>
+         <source>Enable directories on MP3 Creation:</source>
+-        <translation>Enable directories on MP3 Creation:</translation>
++        <translation>Enable Directories on MP3 Creation:</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="147"/>
+@@ -3320,7 +3316,7 @@
+     <message>
+         <location filename="themestrings.h" line="243"/>
+         <source>Resume mode (Playlist):</source>
+-        <translation>Resume mode (Playlist):</translation>
++        <translation>Resume Mode (Playlist):</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="253"/>
+@@ -3390,7 +3386,7 @@
+     <message>
+         <location filename="themestrings.h" line="268"/>
+         <source>Allow writing metadata to tags:</source>
+-        <translation>Allow writing metadata to tags:</translation>
++        <translation>Allow Writing Metadata to Tags:</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="269"/>
+@@ -3445,7 +3441,7 @@
+     <message>
+         <location filename="themestrings.h" line="280"/>
+         <source>Reset music database</source>
+-        <translation>Reset music database</translation>
++        <translation>Reset Music Database</translation>
+     </message>
+     <message>
+         <location filename="themestrings.h" line="285"/>
+@@ -3511,51 +3507,51 @@
+ <context>
+     <name>VisualizationSettings</name>
+     <message>
+-        <location filename="../mythmusic/visualizationsettings.cpp" line="58"/>
++        <location filename="../mythmusic/visualizationsettings.cpp" line="53"/>
+         <source>Change the visualizer when the song changes.</source>
+         <translation>Change the visualizer when the song changes.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/visualizationsettings.cpp" line="59"/>
++        <location filename="../mythmusic/visualizationsettings.cpp" line="54"/>
+         <source>On changing the visualizer pick a new one at random.</source>
+         <translation>On changing the visualizer pick a new one at random.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/visualizationsettings.cpp" line="60"/>
+-        <location filename="../mythmusic/visualizationsettings.cpp" line="64"/>
++        <location filename="../mythmusic/visualizationsettings.cpp" line="55"/>
++        <location filename="../mythmusic/visualizationsettings.cpp" line="59"/>
+         <source>If set to &quot;2&quot;, visualizations will be scaled in half. Currently only used by the goom visualization. Reduces CPU load on slower machines.</source>
+         <translation>If set to &quot;2&quot;, visualizations will be scaled in half. Currently only used by the goom visualization. Reduces CPU load on slower machines.</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/visualizationsettings.cpp" line="68"/>
++        <location filename="../mythmusic/visualizationsettings.cpp" line="63"/>
+         <source>Exit without saving settings</source>
+-        <translation>Exit without saving settings</translation>
++        <translation>Exit Without Saving</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/visualizationsettings.cpp" line="69"/>
++        <location filename="../mythmusic/visualizationsettings.cpp" line="64"/>
+         <source>Save settings and Exit</source>
+-        <translation>Save settings and Exit</translation>
++        <translation>Save and Exit</translation>
+     </message>
+ </context>
+ <context>
+     <name>VisualizerView</name>
+     <message>
+-        <location filename="../mythmusic/visualizerview.cpp" line="102"/>
++        <location filename="../mythmusic/visualizerview.cpp" line="92"/>
+         <source>Actions</source>
+         <translation>Actions</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/visualizerview.cpp" line="106"/>
++        <location filename="../mythmusic/visualizerview.cpp" line="96"/>
+         <source>Change Visualizer</source>
+         <translation>Change Visualizer</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/visualizerview.cpp" line="107"/>
++        <location filename="../mythmusic/visualizerview.cpp" line="97"/>
+         <source>Show Track Info</source>
+         <translation>Show Track Info</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/visualizerview.cpp" line="108"/>
++        <location filename="../mythmusic/visualizerview.cpp" line="98"/>
+         <source>Other Options</source>
+         <translation>Other Options</translation>
+     </message>
+@@ -3563,52 +3559,52 @@
+ <context>
+     <name>Visualizers</name>
+     <message>
+-        <location filename="../mythmusic/bumpscope.cpp" line="566"/>
++        <location filename="../mythmusic/bumpscope.cpp" line="557"/>
+         <source>BumpScope</source>
+         <translation>BumpScope</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/goom/mythgoom.cpp" line="126"/>
++        <location filename="../mythmusic/mythgoom.cpp" line="126"/>
+         <source>Goom</source>
+         <translation>Goom</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/synaesthesia.cpp" line="652"/>
++        <location filename="../mythmusic/synaesthesia.cpp" line="650"/>
+         <source>Synaesthesia</source>
+         <translation>Synaesthesia</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/visualize.cpp" line="536"/>
++        <location filename="../mythmusic/visualize.cpp" line="520"/>
+         <source>StereoScope</source>
+         <translation>StereoScope</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/visualize.cpp" line="562"/>
++        <location filename="../mythmusic/visualize.cpp" line="546"/>
+         <source>MonoScope</source>
+         <translation>MonoScope</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/visualize.cpp" line="811"/>
++        <location filename="../mythmusic/visualize.cpp" line="789"/>
+         <source>Spectrum</source>
+         <translation>Spectrum</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/visualize.cpp" line="903"/>
++        <location filename="../mythmusic/visualize.cpp" line="877"/>
+         <source>Squares</source>
+         <translation>Squares</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/visualize.cpp" line="1372"/>
++        <location filename="../mythmusic/visualize.cpp" line="1339"/>
+         <source>Piano</source>
+         <translation>Piano</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/visualize.cpp" line="1570"/>
++        <location filename="../mythmusic/visualize.cpp" line="1533"/>
+         <source>AlbumArt</source>
+-        <translation>AlbumArt</translation>
++        <translation>Album Art</translation>
+     </message>
+     <message>
+-        <location filename="../mythmusic/visualize.cpp" line="1620"/>
++        <location filename="../mythmusic/visualize.cpp" line="1579"/>
+         <source>Blank</source>
+         <translation>Blank</translation>
+     </message>
+@@ -3616,7 +3612,7 @@
+ <context>
+     <name>avfDecoderFactory</name>
+     <message>
+-        <location filename="../mythmusic/avfdecoder.cpp" line="628"/>
++        <location filename="../mythmusic/avfdecoder.cpp" line="624"/>
+         <source>Internal Decoder</source>
+         <translation>Internal Decoder</translation>
+     </message>
diff --git a/abs/core/mythtv/stable-30/mythtv/PKGBUILD b/abs/core/mythtv/stable-30/mythtv/PKGBUILD
index 8b20750..806fdc3 100644
--- a/abs/core/mythtv/stable-30/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-30/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv
 pkgver=30.0
-pkgrel=2
+pkgrel=3
 commit_hash=`cat ../git_src/git_hash`
 pkgdesc="A Homebrew PVR project $commit_hash"
 arch=('x86_64')
@@ -28,7 +28,7 @@ patches=(
          'videoAlwaysUseBookmark.patch'
          'autoskip_reduce_commskip_jumpback.patch'
          'change_msg_types.patch'
-         'disable_mythnotification_tuner_failure.patch'
+#         'disable_mythnotification_tuner_failure.patch'
          'searchMetatdataSelectedGrabber.patch'
          'defaultThemeLinHES.patch'
          'addEnableDisableAutoShutdownToSystemMenu.patch'
@@ -129,12 +129,11 @@ md5sums=('fb5a87c52a31168a0c8fdde72f27cc45'
          '41098e898361a5a3cde3eaae358482a8'
          '2f983590a8a3cf81f386cc65b9628e13'
          'f764758832f8e9068ffda1ac0c8aacba'
-         'ab2a31dc29ff325162a4b71b49f0adca'
          '0f674b9cad031ba1e03aaf6b5ee1499f'
          'b0b238320fa78a4928dce2cea7c85071'
          '8e4492d1777234a021f368bd6ee964ee'
-         'e6f5c4f7ed0410fa07da6057d2631520'
-         'a1c7fb6a3bd11b7b21f2ea8327a843e1'
+         'cb34243fafbcfefc3818626126684f6a'
+         '72404ebfec2f18536ccc10d8e2bc8757'
          'd05eaf66c434a131c8efb4d87e99b402'
          'abaef221b00690b329f4dca18676bcd6'
          '73ad2f3bec8745f7a3bbf2169ee34db3'
diff --git a/abs/core/mythtv/stable-30/mythtv/fixTranslations.patch b/abs/core/mythtv/stable-30/mythtv/fixTranslations.patch
index b013470..ba2c4fe 100644
--- a/abs/core/mythtv/stable-30/mythtv/fixTranslations.patch
+++ b/abs/core/mythtv/stable-30/mythtv/fixTranslations.patch
@@ -89,3 +89,42 @@ index 210d9907f1..d51ec37ee5 100644
  SOURCES += ../libs/libmythtv/*.cpp
  SOURCES += ../libs/libmythtv/*.h
  SOURCES += ../libs/libmythtv/AirPlay/*.cpp
+diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
+index ea0aa806d5..710650dc95 100644
+--- a/mythtv/libs/libmythtv/tv_play.cpp
++++ b/mythtv/libs/libmythtv/tv_play.cpp
+@@ -12018,7 +12018,7 @@ bool TV::MenuItemDisplayPlayback(const MenuItemContext &c)
+             if (m_tvm_canupmix)
+             {
+                 active = m_tvm_upmixing;
+-                BUTTON(actionName, tr("Auto Detect"));
++                BUTTON(actionName, tr("Enable Audio Upmixer"));
+             }
+         }
+         else if (actionName == "AUTODETECT_FILL")
+@@ -12035,6 +12035,14 @@ bool TV::MenuItemDisplayPlayback(const MenuItemContext &c)
+         {
+             BUTTON(actionName, tr("Manual Zoom Mode"));
+         }
++        else if (actionName == "BOTTOMLINEMOVE")
++        {
++            BUTTON(actionName, tr("Move BottomLine off screen"));
++        }
++        else if (actionName == "BOTTOMLINESAVE")
++        {
++            BUTTON(actionName, tr("Save manual zoom for BottomLine"));
++        }
+         else if (actionName == "TOGGLENIGHTMODE")
+         {
+             if (m_tvm_sup != kPictureAttributeSupported_None)
+@@ -12222,6 +12230,10 @@ bool TV::MenuItemDisplayPlayback(const MenuItemContext &c)
+                 BUTTON2(actionName, tr("DVD Root Menu"), tr("Top menu"));
+             }
+         }
++        else if (actionName == "JUMPBKMRK")
++        {
++            BUTTON(actionName, tr("Jump to bookmark"));
++        }
+         else if (actionName == "JUMPTOPOPUPMENU")
+         {
+             if (m_tvm_isbd)
diff --git a/abs/core/mythtv/stable-30/mythtv/mythfrontend_en_us.ts_Title_Case.patch b/abs/core/mythtv/stable-30/mythtv/mythfrontend_en_us.ts_Title_Case.patch
index 2b57dc1..09088ec 100644
--- a/abs/core/mythtv/stable-30/mythtv/mythfrontend_en_us.ts_Title_Case.patch
+++ b/abs/core/mythtv/stable-30/mythtv/mythfrontend_en_us.ts_Title_Case.patch
@@ -1,574 +1,1665 @@
---- src/mythtv/i18n/mythfrontend_en_us.ts.orig	2018-10-12 15:14:32.718932846 +0000
-+++ src/mythtv/i18n/mythfrontend_en_us.ts	2018-10-12 15:15:18.343034045 +0000
-@@ -573,7 +573,7 @@
+--- src/mythtv/i18n/mythfrontend_en_us.ts.orig	2019-02-25 01:33:22.413248950 +0000
++++ src/mythtv/i18n/mythfrontend_en_us.ts	2019-02-27 01:32:37.679194737 +0000
+@@ -4,21 +4,21 @@
+ <context>
+     <name>(Categories)</name>
+     <message>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1522"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="388"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1506"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="389"/>
+         <source>Education</source>
+         <translation>Education</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1524"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="640"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1508"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="641"/>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="350"/>
+         <source>Entertainment</source>
+         <translation>Entertainment</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1526"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="380"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1510"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="381"/>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="309"/>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="311"/>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="314"/>
+@@ -32,1090 +32,1090 @@
+         <translation>Movie</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1528"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="536"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1512"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="537"/>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="340"/>
+         <source>News</source>
+         <translation>News</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1530"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="394"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="546"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1514"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="395"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="547"/>
+         <source>Religious</source>
+         <translation>Religious</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1532"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="382"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1516"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="383"/>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="359"/>
+         <source>Sports</source>
+         <translation>Sports</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="400"/>
-         <source>Adults only</source>
--        <translation>Adults only</translation>
-+        <translation>Adults Only</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1534"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1518"/>
+         <source>Other</source>
+         <translation>Other</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="402"/>
-@@ -624,7 +624,7 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1536"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="398"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1520"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="399"/>
+         <source>Action</source>
+         <translation>Action</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="430"/>
-         <source>Bus./financial</source>
--        <translation>Bus./financial</translation>
-+        <translation>Business/Financial</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1538"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1522"/>
+         <source>Advertisement</source>
+         <translation>Advertisement</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="432"/>
-@@ -634,17 +634,17 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1540"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="406"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1524"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="407"/>
+         <source>Animated</source>
+         <translation>Animated</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="434"/>
-         <source>Children-special</source>
--        <translation>Children-special</translation>
-+        <translation>Children-Special</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1542"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="408"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1526"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="409"/>
+         <source>Anthology</source>
+         <translation>Anthology</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="436"/>
-         <source>Children-news</source>
--        <translation>Children-news</translation>
-+        <translation>Children-News</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1544"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1528"/>
+         <source>Automobile</source>
+         <translation>Automobile</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="438"/>
-         <source>Children-music</source>
--        <translation>Children-music</translation>
-+        <translation>Children-Music</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1546"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="414"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1530"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="415"/>
+         <source>Awards</source>
+         <translation>Awards</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="440"/>
-@@ -654,7 +654,7 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1548"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="418"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1532"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="419"/>
+         <source>Baseball</source>
+         <translation>Baseball</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="444"/>
-         <source>Comedy-drama</source>
--        <translation>Comedy-drama</translation>
-+        <translation>Comedy-Drama</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1550"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="420"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1534"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="421"/>
+         <source>Basketball</source>
+         <translation>Basketball</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="446"/>
-@@ -670,7 +670,7 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1552"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1536"/>
+         <source>Bulletin</source>
+         <translation>Bulletin</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="452"/>
-         <source>Crime drama</source>
--        <translation>Crime drama</translation>
-+        <translation>Crime Drama</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1554"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1538"/>
+         <source>Business</source>
+         <translation>Business</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="456"/>
-@@ -695,7 +695,7 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1556"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1540"/>
+         <source>Classical</source>
+         <translation>Classical</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="478"/>
-         <source>Game show</source>
--        <translation>Game show</translation>
-+        <translation>Game Show</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1558"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1542"/>
+         <source>College</source>
+         <translation>College</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="482"/>
-@@ -705,7 +705,7 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1560"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1544"/>
+         <source>Combat</source>
+         <translation>Combat</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="488"/>
-         <source>Historical drama</source>
--        <translation>Historical drama</translation>
-+        <translation>Historical Drama</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1562"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="442"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1546"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="443"/>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="323"/>
+         <source>Comedy</source>
+         <translation>Comedy</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="492"/>
-@@ -715,32 +715,32 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1564"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1548"/>
+         <source>Commentary</source>
+         <translation>Commentary</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="494"/>
-         <source>Holiday-children</source>
--        <translation>Holiday-children</translation>
-+        <translation>Holiday-Children</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1566"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1550"/>
+         <source>Concert</source>
+         <translation>Concert</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="496"/>
-         <source>Holiday-children special</source>
--        <translation>Holiday-children special</translation>
-+        <translation>Holiday-Children Special</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1568"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="632"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1552"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="633"/>
+         <source>Consumer</source>
+         <translation>Consumer</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="498"/>
-         <source>Holiday special</source>
--        <translation>Holiday special</translation>
-+        <translation>Holiday Special</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1570"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1554"/>
+         <source>Contemporary</source>
+         <translation>Contemporary</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="502"/>
-         <source>Horse racing</source>
--        <translation>Horse racing</translation>
-+        <translation>Horse Racing</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1572"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="450"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1556"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="451"/>
+         <source>Crime</source>
+         <translation>Crime</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="504"/>
-         <source>House/garden</source>
--        <translation>House/garden</translation>
-+        <translation>House/Garden</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1574"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="454"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1558"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="455"/>
+         <source>Dance</source>
+         <translation>Dance</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="506"/>
-         <source>How-to</source>
--        <translation>How-to</translation>
-+        <translation>How-To</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1576"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="458"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1560"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="459"/>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="345"/>
+         <source>Documentary</source>
+         <translation>Documentary</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="510"/>
-@@ -765,12 +765,12 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1578"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="460"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1562"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="461"/>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="487"/>
+         <source>Drama</source>
+         <translation>Drama</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="524"/>
-         <source>Music special</source>
--        <translation>Music special</translation>
-+        <translation>Music Special</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1580"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1564"/>
+         <source>Elementary</source>
+         <translation>Elementary</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="526"/>
-         <source>Music talk</source>
--        <translation>Music talk</translation>
-+        <translation>Music Talk</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1582"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1566"/>
+         <source>Erotica</source>
+         <translation>Erotica</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="528"/>
-@@ -780,7 +780,7 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1584"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="464"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1568"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="465"/>
+         <source>Exercise</source>
+         <translation>Exercise</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="530"/>
-         <source>Musical comedy</source>
--        <translation>Musical comedy</translation>
-+        <translation>Musical Comedy</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1586"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="466"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1570"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="467"/>
+         <source>Fantasy</source>
+         <translation>Fantasy</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="538"/>
-@@ -795,7 +795,7 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1588"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1572"/>
+         <source>Farm</source>
+         <translation>Farm</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="542"/>
-         <source>Public affairs</source>
--        <translation>Public affairs</translation>
-+        <translation>Public Affairs</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1590"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="468"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1574"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="469"/>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="434"/>
+         <source>Fashion</source>
+         <translation>Fashion</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="544"/>
-@@ -810,7 +810,7 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1592"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1576"/>
+         <source>Fiction</source>
+         <translation>Fiction</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="552"/>
-         <source>Romance-comedy</source>
--        <translation>Romance-comedy</translation>
-+        <translation>Romance-Comedy</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1594"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1578"/>
+         <source>Food</source>
+         <translation>Food</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="554"/>
-@@ -825,12 +825,12 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1596"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="472"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="648"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1580"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="473"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="649"/>
+         <source>Football</source>
+         <translation>Football</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="560"/>
-         <source>Science fiction</source>
--        <translation>Science fiction</translation>
-+        <translation>Science Fiction</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1598"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1582"/>
+         <source>Foreign</source>
+         <translation>Foreign</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="562"/>
-         <source>Self improvement</source>
--        <translation>Self improvement</translation>
-+        <translation>Self Improvement</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1600"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="476"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1584"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="477"/>
+         <source>Fundraiser</source>
+         <translation>Fundraiser</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="566"/>
-@@ -860,12 +860,12 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1602"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1586"/>
+         <source>Game/Quiz</source>
+         <translation>Game/Quiz</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="578"/>
-         <source>Sports non-event</source>
--        <translation>Sports non-event</translation>
-+        <translation>Sports Non-Event</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1604"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1588"/>
+         <source>Garden</source>
+         <translation>Garden</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="580"/>
-         <source>Sports talk</source>
--        <translation>Sports talk</translation>
-+        <translation>Sports Talk</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1606"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="480"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1590"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="481"/>
+         <source>Golf</source>
+         <translation>Golf</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="584"/>
-@@ -875,7 +875,7 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1608"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1592"/>
+         <source>Government</source>
+         <translation>Government</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="590"/>
-         <source>Track/field</source>
--        <translation>Track/field</translation>
-+        <translation>Track/Field</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1610"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="484"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1594"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="485"/>
+         <source>Health</source>
+         <translation>Health</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="596"/>
-@@ -920,7 +920,7 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1612"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1596"/>
+         <source>High School</source>
+         <translation>High School</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="616"/>
-         <source>Arts/crafts</source>
--        <translation>Arts/crafts</translation>
-+        <translation>Arts/Crafts</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1614"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="486"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1598"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="487"/>
+         <source>History</source>
+         <translation>History</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="618"/>
-@@ -930,12 +930,12 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1616"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1600"/>
+         <source>Hobby</source>
+         <translation>Hobby</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="620"/>
-         <source>Auto racing</source>
--        <translation>Auto racing</translation>
-+        <translation>Auto Racing</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1618"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="490"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1602"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="491"/>
+         <source>Hockey</source>
+         <translation>Hockey</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="622"/>
-         <source>Air racing</source>
--        <translation>Air racing</translation>
-+        <translation>Air Racing</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1620"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1604"/>
+         <source>Home</source>
+         <translation>Home</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="624"/>
-@@ -945,7 +945,7 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1622"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="500"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1606"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="501"/>
+         <source>Horror</source>
+         <translation>Horror</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="626"/>
-         <source>Bicycle racing</source>
--        <translation>Bicycle racing</translation>
-+        <translation>Bicycle Racing</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1624"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1608"/>
+         <source>Information</source>
+         <translation>Information</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="628"/>
-@@ -965,12 +965,12 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1626"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1610"/>
+         <source>Instruction</source>
+         <translation>Instruction</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="636"/>
-         <source>Dog show</source>
--        <translation>Dog show</translation>
-+        <translation>Dog Show</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1628"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1612"/>
+         <source>International</source>
+         <translation>International</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="638"/>
-         <source>Drag racing</source>
--        <translation>Drag racing</translation>
-+        <translation>Drag Racing</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1630"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="508"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1614"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="509"/>
+         <source>Interview</source>
+         <translation>Interview</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="642"/>
-@@ -986,12 +986,12 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1632"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1616"/>
+         <source>Language</source>
+         <translation>Language</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="646"/>
-         <source>Field hockey</source>
--        <translation>Field hockey</translation>
-+        <translation>Field Hockey</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1634"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1618"/>
+         <source>Legal</source>
+         <translation>Legal</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="650"/>
-         <source>Gay/lesbian</source>
--        <translation>Gay/lesbian</translation>
-+        <translation>Gay/Lesbian</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1636"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1620"/>
+         <source>Live</source>
+         <translation>Live</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="652"/>
-@@ -1001,7 +1001,7 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1638"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1622"/>
+         <source>Local</source>
+         <translation>Local</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="654"/>
-         <source>Home improvement</source>
--        <translation>Home improvement</translation>
-+        <translation>Home Improvement</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1640"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1624"/>
+         <source>Math</source>
+         <translation>Math</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="656"/>
-@@ -1011,7 +1011,7 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1642"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="514"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1626"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="515"/>
+         <source>Medical</source>
+         <translation>Medical</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="658"/>
-         <source>Hydroplane racing</source>
--        <translation>Hydroplane racing</translation>
-+        <translation>Hydroplane Racing</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1644"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1628"/>
+         <source>Meeting</source>
+         <translation>Meeting</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="660"/>
-@@ -1021,7 +1021,7 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1646"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="698"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1630"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="699"/>
+         <source>Military</source>
+         <translation>Military</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="662"/>
-         <source>Motorcycle racing</source>
--        <translation>Motorcycle racing</translation>
-+        <translation>Motorcycle Racing</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1648"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="516"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1632"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="517"/>
+         <source>Miniseries</source>
+         <translation>Miniseries</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="664"/>
-@@ -1047,7 +1047,7 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1650"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="522"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1634"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="523"/>
+         <source>Music</source>
+         <translation>Music</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="674"/>
-         <source>Pro wrestling</source>
--        <translation>Pro wrestling</translation>
-+        <translation>Pro Wrestling</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1652"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="532"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1636"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="533"/>
+         <source>Mystery</source>
+         <translation>Mystery</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="676"/>
-@@ -1092,7 +1092,7 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1654"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1638"/>
+         <source>National</source>
+         <translation>National</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="694"/>
-         <source>Card games</source>
--        <translation>Card games</translation>
-+        <translation>Card Games</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1656"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="534"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1640"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="535"/>
+         <source>Nature</source>
+         <translation>Nature</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="696"/>
-@@ -1107,12 +1107,12 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1658"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1642"/>
+         <source>Police</source>
+         <translation>Police</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="702"/>
-         <source>Mixed martial arts</source>
--        <translation>Mixed martial arts</translation>
-+        <translation>Mixed Martial Arts</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1660"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="672"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1644"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="673"/>
+         <source>Politics</source>
+         <translation>Politics</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="704"/>
-         <source>Action sports</source>
--        <translation>Action sports</translation>
-+        <translation>Action Sports</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1662"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1646"/>
+         <source>Premiere</source>
+         <translation>Premiere</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="706"/>
-@@ -1144,7 +1144,7 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1664"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1648"/>
+         <source>Prerecorded</source>
+         <translation>Prerecorded</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="326"/>
-         <source>Soap/melodrama/folkloric</source>
--        <translation>Soap/melodrama/folkloric</translation>
-+        <translation>Soap/Melodrama/Folkloric</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1666"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1650"/>
+         <source>Product</source>
+         <translation>Product</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="333"/>
-@@ -1160,12 +1160,12 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1668"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1652"/>
+         <source>Professional</source>
+         <translation>Professional</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="341"/>
-         <source>News/weather report</source>
--        <translation>News/weather report</translation>
-+        <translation>News/Weather Report</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1670"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1654"/>
+         <source>Public</source>
+         <translation>Public</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="343"/>
-         <source>News magazine</source>
--        <translation>News magazine</translation>
-+        <translation>News Magazine</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1672"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1656"/>
+         <source>Racing</source>
+         <translation>Racing</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="347"/>
-@@ -1380,7 +1380,7 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1674"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1658"/>
+         <source>Reading</source>
+         <translation>Reading</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="447"/>
-         <source>Nature/animals/Environment</source>
--        <translation>Nature/animals/Environment</translation>
-+        <translation>Nature/Animals/Environment</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1676"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1660"/>
+         <source>Repair</source>
+         <translation>Repair</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="449"/>
-@@ -1440,7 +1440,7 @@
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1678"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1662"/>
+         <source>Repeat</source>
+         <translation>Repeat</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="473"/>
-         <source>Advertizement/Shopping</source>
--        <translation>Advertizement/Shopping</translation>
-+        <translation>Advertisement/Shopping</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1680"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1664"/>
+         <source>Review</source>
+         <translation>Review</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="475"/>
-@@ -1471,124 +1471,132 @@
- <context>
-     <name>(ChannelSettings)</name>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1682"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="550"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1666"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="551"/>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="330"/>
+         <source>Romance</source>
+         <translation>Romance</translation>
+     </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="89"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="91"/>
-         <source>[Not Selected]</source>
-         <translation>[Not Selected]</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1684"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="558"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1668"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="559"/>
+         <source>Science</source>
+         <translation>Science</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="132"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="134"/>
-         <source>TV Format</source>
-         <translation>TV Format</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1686"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1670"/>
+         <source>Series</source>
+         <translation>Series</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="133"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="135"/>
-         <source>If this channel uses a format other than TV Format in the General Backend Setup screen, set it here.</source>
-         <translation>If this channel uses a format other than TV Format in the General Backend Setup screen, set it here.</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1688"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1672"/>
+         <source>Service</source>
+         <translation>Service</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="173"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="175"/>
-         <source>DataDirect Time Offset</source>
-         <translation>DataDirect Time Offset</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1690"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="564"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1674"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="565"/>
+         <source>Shopping</source>
+         <translation>Shopping</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="176"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="178"/>
-         <source>Offset (in minutes) to apply to the program guide data during import.  This can be used when the listings for a particular channel are in a different time zone. (Works for DataDirect listings only.)</source>
--        <translation>Offset (in minutes) to apply to the program guide data during import.  This can be used when the listings for a particular channel are in a different time zone. (Works for DataDirect listings only.)</translation>
-+        <translation>Offset (in minutes) to apply to the program guide data during import. This can be used when the listings for a particular channel are in a different time zone. (Works for DataDirect listings only.)</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1692"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1676"/>
+         <source>Soap Opera</source>
+         <translation>Soap Opera</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="191"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="193"/>
-         <source>Priority</source>
-         <translation>Priority</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1694"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="576"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1678"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="577"/>
+         <source>Special</source>
+         <translation>Special</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="193"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="195"/>
-         <source>Number of priority points to be added to any recording on this channel during scheduling. Use a positive number as the priority if you want this to be a preferred channel, a negative one to depreciate this channel.</source>
-         <translation>Number of priority points to be added to any recording on this channel during scheduling. Use a positive number as the priority if you want this to be a preferred channel, a negative one to depreciate this channel.</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1696"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="582"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1680"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="583"/>
+         <source>Suspense</source>
+         <translation>Suspense</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="207"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="209"/>
-         <source>Icon</source>
-         <translation>Icon</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1698"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="586"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1682"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="587"/>
+         <source>Talk</source>
+         <translation>Talk</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="209"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="211"/>
-         <source>Image file to use as the icon for this channel on various MythTV displays.</source>
-         <translation>Image file to use as the icon for this channel on various MythTV displays.</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1700"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1684"/>
+         <source>Technical</source>
+         <translation>Technical</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="221"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="223"/>
-         <source>Video filters</source>
--        <translation>Video filters</translation>
-+        <translation>Video Filters</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1702"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="588"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="690"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1686"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="589"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="691"/>
+         <source>Tennis</source>
+         <translation>Tennis</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="224"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="226"/>
-         <source>Filters to be used when recording from this channel.  Not used with hardware encoding cards.</source>
--        <translation>Filters to be used when recording from this channel.  Not used with hardware encoding cards.</translation>
-+        <translation>Filters to be used when recording from this channel. Not used with hardware encoding cards.</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1704"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="592"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1688"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="593"/>
+         <source>Travel</source>
+         <translation>Travel</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="238"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="240"/>
-         <source>Playback filters</source>
--        <translation>Playback filters</translation>
-+        <translation>Playback Filters</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1706"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="594"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1690"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="595"/>
+         <source>Variety</source>
+         <translation>Variety</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="241"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="243"/>
-         <source>Filters to be used when recordings from this channel are viewed. Start with a plus to append to the global playback filters.</source>
-         <translation>Filters to be used when recordings from this channel are viewed. Start with a plus to append to the global playback filters.</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1708"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1692"/>
+         <source>Video</source>
+         <translation>Video</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="256"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="258"/>
-         <source>ID used by listing services to get an exact correspondence between a channel in your line-up and a channel in their database. Normally this is set automatically when &apos;mythfilldatabase&apos; is run.</source>
-         <translation>ID used by listing services to get an exact correspondence between a channel in your line-up and a channel in their database. Normally this is set automatically when &apos;mythfilldatabase&apos; is run.</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1710"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="602"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1694"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="603"/>
+         <source>Weather</source>
+         <translation>Weather</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="312"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="314"/>
-         <source>ServiceID</source>
--        <translation>ServiceID</translation>
-+        <translation>Service ID</translation>
+-        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1712"/>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="604"/>
++        <location filename="../libs/libmythtv/cc608decoder.cpp" line="1696"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="605"/>
+         <source>Western</source>
+         <translation>Western</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="314"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="316"/>
-         <source>Service ID (Program Number) of desired channel within the transport stream. If there is only one channel, then setting this to anything will still find it.</source>
-         <translation>Service ID (Program Number) of desired channel within the transport stream. If there is only one channel, then setting this to anything will still find it.</translation>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="384"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="385"/>
+         <source>News/Business</source>
+         <translation>News/Business</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="345"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="344"/>
-         <source>Commercial Detection Method</source>
-         <translation>Commercial Detection Method</translation>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="386"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="387"/>
+         <source>Family/Children</source>
+         <translation>Family/Children</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="348"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="347"/>
-         <source>Changes the method of commercial detection used for recordings on this channel or skips detection by marking the channel as Commercial Free.</source>
-         <translation>Changes the method of commercial detection used for recordings on this channel or skips detection by marking the channel as Commercial Free.</translation>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="390"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="391"/>
+         <source>Series/Special</source>
+         <translation>Series/Special</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="370"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="369"/>
-         <source>Visible</source>
-         <translation>Visible</translation>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="392"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="393"/>
+         <source>Music/Art</source>
+         <translation>Music/Art</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelsettings.cpp" line="372"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="371"/>
-         <source>If enabled, the channel will be visible in the EPG.</source>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="400"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="401"/>
+         <source>Adults only</source>
+-        <translation>Adults only</translation>
++        <translation>Adults Only</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="402"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="403"/>
+         <source>Adventure</source>
+         <translation>Adventure</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="404"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="405"/>
+         <source>Animals</source>
+         <translation>Animals</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="410"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="411"/>
+         <source>Art</source>
+         <translation>Art</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="412"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="413"/>
+         <source>Auto</source>
+         <translation>Auto</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="416"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="417"/>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="409"/>
+         <source>Ballet</source>
+         <translation>Ballet</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="422"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="423"/>
+         <source>Biography</source>
+         <translation>Biography</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="424"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="425"/>
+         <source>Boat</source>
+         <translation>Boat</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="426"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="427"/>
+         <source>Bowling</source>
+         <translation>Bowling</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="428"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="429"/>
+         <source>Boxing</source>
+         <translation>Boxing</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="430"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="431"/>
+         <source>Bus./financial</source>
+-        <translation>Bus./financial</translation>
++        <translation>Business/Financial</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="432"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="433"/>
+         <source>Children</source>
+         <translation>Children</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="434"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="435"/>
+         <source>Children-special</source>
+-        <translation>Children-special</translation>
++        <translation>Children-Special</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="436"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="437"/>
+         <source>Children-news</source>
+-        <translation>Children-news</translation>
++        <translation>Children-News</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="438"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="439"/>
+         <source>Children-music</source>
+-        <translation>Children-music</translation>
++        <translation>Children-Music</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="440"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="441"/>
+         <source>Collectibles</source>
+         <translation>Collectibles</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="444"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="445"/>
+         <source>Comedy-drama</source>
+-        <translation>Comedy-drama</translation>
++        <translation>Comedy-Drama</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="446"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="447"/>
+         <source>Computers</source>
+         <translation>Computers</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="448"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="449"/>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="472"/>
+         <source>Cooking</source>
+         <translation>Cooking</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="452"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="453"/>
+         <source>Crime drama</source>
+-        <translation>Crime drama</translation>
++        <translation>Crime Drama</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="456"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="457"/>
+         <source>Docudrama</source>
+         <translation>Docudrama</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="462"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="463"/>
+         <source>Educational</source>
+         <translation>Educational</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="470"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="471"/>
+         <source>Fishing</source>
+         <translation>Fishing</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="474"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="475"/>
+         <source>French</source>
+         <translation>French</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="478"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="479"/>
+         <source>Game show</source>
+-        <translation>Game show</translation>
++        <translation>Game Show</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="482"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="483"/>
+         <source>Gymnastics</source>
+         <translation>Gymnastics</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="488"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="489"/>
+         <source>Historical drama</source>
+-        <translation>Historical drama</translation>
++        <translation>Historical Drama</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="492"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="493"/>
+         <source>Holiday</source>
+         <translation>Holiday</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="494"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="495"/>
+         <source>Holiday-children</source>
+-        <translation>Holiday-children</translation>
++        <translation>Holiday-Children</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="496"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="497"/>
+         <source>Holiday-children special</source>
+-        <translation>Holiday-children special</translation>
++        <translation>Holiday-Children Special</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="498"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="499"/>
+         <source>Holiday special</source>
+-        <translation>Holiday special</translation>
++        <translation>Holiday Special</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="502"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="503"/>
+         <source>Horse racing</source>
+-        <translation>Horse racing</translation>
++        <translation>Horse Racing</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="504"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="505"/>
+         <source>House/garden</source>
+-        <translation>House/garden</translation>
++        <translation>House/Garden</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="506"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="507"/>
+         <source>How-to</source>
+-        <translation>How-to</translation>
++        <translation>How-To</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="510"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="511"/>
+         <source>Lacrosse</source>
+         <translation>Lacrosse</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="512"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="513"/>
+         <source>Martial Arts</source>
+         <translation>Martial Arts</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="518"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="519"/>
+         <source>Motorsports</source>
+         <translation>Motorsports</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="520"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="521"/>
+         <source>Motorcycle</source>
+         <translation>Motorcycle</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="524"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="525"/>
+         <source>Music special</source>
+-        <translation>Music special</translation>
++        <translation>Music Special</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="526"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="527"/>
+         <source>Music talk</source>
+-        <translation>Music talk</translation>
++        <translation>Music Talk</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="528"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="529"/>
+         <source>Musical</source>
+         <translation>Musical</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="530"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="531"/>
+         <source>Musical comedy</source>
+-        <translation>Musical comedy</translation>
++        <translation>Musical Comedy</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="538"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="539"/>
+         <source>Opera</source>
+         <translation>Opera</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="540"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="541"/>
+         <source>Outdoors</source>
+         <translation>Outdoors</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="542"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="543"/>
+         <source>Public affairs</source>
+-        <translation>Public affairs</translation>
++        <translation>Public Affairs</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="544"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="545"/>
+         <source>Reality</source>
+         <translation>Reality</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="548"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="549"/>
+         <source>Rodeo</source>
+         <translation>Rodeo</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="552"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="553"/>
+         <source>Romance-comedy</source>
+-        <translation>Romance-comedy</translation>
++        <translation>Romance-Comedy</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="554"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="555"/>
+         <source>Rugby</source>
+         <translation>Rugby</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="556"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="557"/>
+         <source>Running</source>
+         <translation>Running</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="560"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="561"/>
+         <source>Science fiction</source>
+-        <translation>Science fiction</translation>
++        <translation>Science Fiction</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="562"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="563"/>
+         <source>Self improvement</source>
+-        <translation>Self improvement</translation>
++        <translation>Self Improvement</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="566"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="567"/>
+         <source>Skiing</source>
+         <translation>Skiing</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="568"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="569"/>
+         <source>Soap</source>
+         <translation>Soap</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="570"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="571"/>
+         <source>Soccer</source>
+         <translation>Soccer</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="572"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="573"/>
+         <source>Softball</source>
+         <translation>Softball</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="574"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="575"/>
+         <source>Spanish</source>
+         <translation>Spanish</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="578"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="579"/>
+         <source>Sports non-event</source>
+-        <translation>Sports non-event</translation>
++        <translation>Sports Non-Event</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="580"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="581"/>
+         <source>Sports talk</source>
+-        <translation>Sports talk</translation>
++        <translation>Sports Talk</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="584"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="585"/>
+         <source>Swimming</source>
+         <translation>Swimming</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="590"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="591"/>
+         <source>Track/field</source>
+-        <translation>Track/field</translation>
++        <translation>Track/Field</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="596"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="597"/>
+         <source>Volleyball</source>
+         <translation>Volleyball</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="598"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="599"/>
+         <source>War</source>
+         <translation>War</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="600"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="601"/>
+         <source>Watersports</source>
+         <translation>Watersports</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="606"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="607"/>
+         <source>Wrestling</source>
+         <translation>Wrestling</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="608"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="609"/>
+         <source>Yoga</source>
+         <translation>Yoga</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="610"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="611"/>
+         <source>Agriculture</source>
+         <translation>Agriculture</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="612"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="613"/>
+         <source>Anime</source>
+         <translation>Anime</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="614"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="615"/>
+         <source>Arm Wrestling</source>
+         <translation>Arm Wrestling</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="616"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="617"/>
+         <source>Arts/crafts</source>
+-        <translation>Arts/crafts</translation>
++        <translation>Arts/Crafts</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="618"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="619"/>
+         <source>Auction</source>
+         <translation>Auction</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="620"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="621"/>
+         <source>Auto racing</source>
+-        <translation>Auto racing</translation>
++        <translation>Auto Racing</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="622"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="623"/>
+         <source>Air racing</source>
+-        <translation>Air racing</translation>
++        <translation>Air Racing</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="624"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="625"/>
+         <source>Badminton</source>
+         <translation>Badminton</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="626"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="627"/>
+         <source>Bicycle racing</source>
+-        <translation>Bicycle racing</translation>
++        <translation>Bicycle Racing</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="628"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="629"/>
+         <source>Boat Racing</source>
+         <translation>Boat Racing</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="630"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="631"/>
+         <source>Community</source>
+         <translation>Community</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="634"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="635"/>
+         <source>Debate</source>
+         <translation>Debate</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="636"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="637"/>
+         <source>Dog show</source>
+-        <translation>Dog show</translation>
++        <translation>Dog Show</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="638"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="639"/>
+         <source>Drag racing</source>
+-        <translation>Drag racing</translation>
++        <translation>Drag Racing</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="642"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="643"/>
+         <source>Environment</source>
+         <translation>Environment</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="644"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="645"/>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="380"/>
+         <source>Equestrian</source>
+         <translation>Equestrian</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="646"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="647"/>
+         <source>Field hockey</source>
+-        <translation>Field hockey</translation>
++        <translation>Field Hockey</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="650"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="651"/>
+         <source>Gay/lesbian</source>
+-        <translation>Gay/lesbian</translation>
++        <translation>Gay/Lesbian</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="652"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="653"/>
+         <source>Handball</source>
+         <translation>Handball</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="654"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="655"/>
+         <source>Home improvement</source>
+-        <translation>Home improvement</translation>
++        <translation>Home Improvement</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="656"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="657"/>
+         <source>Hunting</source>
+         <translation>Hunting</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="658"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="659"/>
+         <source>Hydroplane racing</source>
+-        <translation>Hydroplane racing</translation>
++        <translation>Hydroplane Racing</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="660"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="661"/>
+         <source>Law</source>
+         <translation>Law</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="662"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="663"/>
+         <source>Motorcycle racing</source>
+-        <translation>Motorcycle racing</translation>
++        <translation>Motorcycle Racing</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="664"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="665"/>
+         <source>Newsmagazine</source>
+         <translation>Newsmagazine</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="666"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="667"/>
+         <source>Paranormal</source>
+         <translation>Paranormal</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="668"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="669"/>
+         <source>Parenting</source>
+         <translation>Parenting</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="670"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="671"/>
+         <source>Performing arts</source>
+         <translatorcomment>Will have to be modified for &quot;Performing Arts&quot;...</translatorcomment>
+         <translation>Performing Arts</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="674"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="675"/>
+         <source>Pro wrestling</source>
+-        <translation>Pro wrestling</translation>
++        <translation>Pro Wrestling</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="676"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="677"/>
+         <source>Sailing</source>
+         <translation>Sailing</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="678"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="679"/>
+         <source>Shooting</source>
+         <translation>Shooting</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="680"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="681"/>
+         <source>Sitcom</source>
+         <translation>Sitcom</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="682"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="683"/>
+         <source>Skateboarding</source>
+         <translation>Skateboarding</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="684"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="685"/>
+         <source>Snowboarding</source>
+         <translation>Snowboarding</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="686"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="687"/>
+         <source>Standup</source>
+         <translation>Standup</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="688"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="689"/>
+         <source>Surfing</source>
+         <translation>Surfing</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="692"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="693"/>
+         <source>Triathlon</source>
+         <translation>Triathlon</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="694"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="695"/>
+         <source>Card games</source>
+-        <translation>Card games</translation>
++        <translation>Card Games</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="696"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="697"/>
+         <source>Poker</source>
+         <translation>Poker</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="700"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="701"/>
+         <source>Technology</source>
+         <translation>Technology</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="702"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="703"/>
+         <source>Mixed martial arts</source>
+-        <translation>Mixed martial arts</translation>
++        <translation>Mixed Martial Arts</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="704"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="705"/>
+         <source>Action sports</source>
+-        <translation>Action sports</translation>
++        <translation>Action Sports</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="706"/>
++        <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="707"/>
+         <source>Dish Network</source>
+         <translation>Dish Network</translation>
+     </message>
+@@ -1144,7 +1144,7 @@
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="326"/>
+         <source>Soap/melodrama/folkloric</source>
+-        <translation>Soap/melodrama/folkloric</translation>
++        <translation>Soap/Melodrama/Folkloric</translation>
+     </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="333"/>
+@@ -1160,12 +1160,12 @@
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="341"/>
+         <source>News/weather report</source>
+-        <translation>News/weather report</translation>
++        <translation>News/Weather Report</translation>
+     </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="343"/>
+         <source>News magazine</source>
+-        <translation>News magazine</translation>
++        <translation>News Magazine</translation>
+     </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="347"/>
+@@ -1380,7 +1380,7 @@
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="447"/>
+         <source>Nature/animals/Environment</source>
+-        <translation>Nature/animals/Environment</translation>
++        <translation>Nature/Animals/Environment</translation>
+     </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="449"/>
+@@ -1440,7 +1440,7 @@
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="473"/>
+         <source>Advertizement/Shopping</source>
+-        <translation>Advertizement/Shopping</translation>
++        <translation>Advertisement/Shopping</translation>
+     </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="475"/>
+@@ -1471,152 +1471,152 @@
+ <context>
+     <name>(ChannelSettings)</name>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="89"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="90"/>
+         <source>[Not Selected]</source>
+         <translation>[Not Selected]</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="132"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="133"/>
+         <source>TV Format</source>
+         <translation>TV Format</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="133"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="134"/>
+         <source>If this channel uses a format other than TV Format in the General Backend Setup screen, set it here.</source>
+         <translation>If this channel uses a format other than TV Format in the General Backend Setup screen, set it here.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="173"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="174"/>
+         <source>DataDirect Time Offset</source>
+         <translation>DataDirect Time Offset</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="176"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="177"/>
+         <source>Offset (in minutes) to apply to the program guide data during import.  This can be used when the listings for a particular channel are in a different time zone. (Works for DataDirect listings only.)</source>
+-        <translation>Offset (in minutes) to apply to the program guide data during import.  This can be used when the listings for a particular channel are in a different time zone. (Works for DataDirect listings only.)</translation>
++        <translation>Offset (in minutes) to apply to the program guide data during import. This can be used when the listings for a particular channel are in a different time zone. (Works for DataDirect listings only.)</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="191"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="192"/>
+         <source>Priority</source>
+         <translation>Priority</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="193"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="194"/>
+         <source>Number of priority points to be added to any recording on this channel during scheduling. Use a positive number as the priority if you want this to be a preferred channel, a negative one to depreciate this channel.</source>
+         <translation>Number of priority points to be added to any recording on this channel during scheduling. Use a positive number as the priority if you want this to be a preferred channel, a negative one to depreciate this channel.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="207"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="208"/>
+         <source>Icon</source>
+         <translation>Icon</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="209"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="210"/>
+         <source>Image file to use as the icon for this channel on various MythTV displays.</source>
+         <translation>Image file to use as the icon for this channel on various MythTV displays.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="221"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="222"/>
+         <source>Video filters</source>
+-        <translation>Video filters</translation>
++        <translation>Video Filters</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="224"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="225"/>
+         <source>Filters to be used when recording from this channel.  Not used with hardware encoding cards.</source>
+-        <translation>Filters to be used when recording from this channel.  Not used with hardware encoding cards.</translation>
++        <translation>Filters to be used when recording from this channel. Not used with hardware encoding cards.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="238"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="239"/>
+         <source>Playback filters</source>
+-        <translation>Playback filters</translation>
++        <translation>Playback Filters</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="241"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="242"/>
+         <source>Filters to be used when recordings from this channel are viewed. Start with a plus to append to the global playback filters.</source>
+         <translation>Filters to be used when recordings from this channel are viewed. Start with a plus to append to the global playback filters.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="256"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="257"/>
+         <source>ID used by listing services to get an exact correspondence between a channel in your line-up and a channel in their database. Normally this is set automatically when &apos;mythfilldatabase&apos; is run.</source>
+         <translation>ID used by listing services to get an exact correspondence between a channel in your line-up and a channel in their database. Normally this is set automatically when &apos;mythfilldatabase&apos; is run.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="312"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="313"/>
+         <source>ServiceID</source>
+-        <translation>ServiceID</translation>
++        <translation>Service ID</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="314"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="315"/>
+         <source>Service ID (Program Number) of desired channel within the transport stream. If there is only one channel, then setting this to anything will still find it.</source>
+         <translation>Service ID (Program Number) of desired channel within the transport stream. If there is only one channel, then setting this to anything will still find it.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="345"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="343"/>
+         <source>Commercial Detection Method</source>
+         <translation>Commercial Detection Method</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="348"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="346"/>
+         <source>Changes the method of commercial detection used for recordings on this channel or skips detection by marking the channel as Commercial Free.</source>
+         <translation>Changes the method of commercial detection used for recordings on this channel or skips detection by marking the channel as Commercial Free.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="370"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="368"/>
+         <source>Visible</source>
+         <translation>Visible</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="372"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="370"/>
+         <source>If enabled, the channel will be visible in the EPG.</source>
          <translation>If enabled, the channel will be visible in the EPG.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelsettings.cpp" line="383"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="382"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="381"/>
          <source>Use on air guide</source>
 -        <translation>Use on air guide</translation>
 +        <translation>Use On Air Guide</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelsettings.cpp" line="386"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="385"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="384"/>
          <source>If enabled, guide information for this channel will be updated using &apos;Over-the-Air&apos; program listings.</source>
          <translation>If enabled, guide information for this channel will be updated using &apos;Over-the-Air&apos; program listings.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelsettings.cpp" line="402"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="401"/>
+-        <source>Frequency or Channel</source>
+-        <translation>Frequency or Channel</translation>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="400"/>
 +        <source>Freq/Channel</source>
 +        <translation>Frequency/Channel</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="403"/>
-+        <source>Depending on the tuner type, specify either the exact frequency (in kHz) or a valid channel number that will be understood by your tuners.</source>
-+        <translation>Depending on the tuner type, specify either the exact frequency (in kHz) or a valid channel number that will be understood by your tuners.</translation>
-+    </message>
-+    <message>
-         <source>Frequency or Channel</source>
--        <translation>Frequency or Channel</translation>
-+        <translation type="vanished">Frequency or Channel</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelsettings.cpp" line="404"/>
-         <source>Specify either the exact frequency (in kHz) or a valid channel for your &apos;TV Format&apos;.</source>
+-        <source>Specify either the exact frequency (in kHz) or a valid channel for your &apos;TV Format&apos;.</source>
 -        <translation>Specify either the exact frequency (in kHz) or a valid channel for your &apos;TV Format&apos;.</translation>
-+        <translation type="vanished">Specify either the exact frequency (in kHz) or a valid channel for your &apos;TV Format&apos;.</translation>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="402"/>
++        <source>Depending on the tuner type, specify either the exact frequency (in kHz) or a valid channel number that will be understood by your tuners.</source>
++        <translation>Depending on the tuner type, specify either the exact frequency (in kHz) or a valid channel number that will be understood by your tuners.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="417"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="416"/>
+         <source>Finetune (kHz)</source>
+         <translation>Finetune (kHz)</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/channelsettings.cpp" line="417"/>
-@@ -1601,22 +1609,22 @@
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="420"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="419"/>
+         <source>Value to be added to your desired frequency (in kHz) for &apos;fine tuning&apos;.</source>
          <translation>Value to be added to your desired frequency (in kHz) for &apos;fine tuning&apos;.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelsettings.cpp" line="473"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="475"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="474"/>
          <source>Channel Options - Common</source>
          <translation>Channel Options - Common</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelsettings.cpp" line="580"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="567"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="566"/>
          <source>Channel Options - Filters</source>
          <translation>Channel Options - Filters</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelsettings.cpp" line="591"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="576"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="575"/>
          <source>Channel Options - Video4Linux</source>
          <translation>Channel Options - Video4Linux</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelsettings.cpp" line="610"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="594"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="593"/>
          <source>Channel Options - Raw Transport Stream</source>
          <translation>Channel Options - Raw Transport Stream</translation>
      </message>
-@@ -1624,39 +1632,37 @@
+@@ -1624,72 +1624,53 @@
  <context>
      <name>(Common)</name>
      <message>
 -        <location filename="../libs/libmyth/dbsettings.cpp" line="65"/>
-         <source>Hostname</source>
+-        <source>Hostname</source>
 -        <translation>Hostname</translation>
-+        <translation type="vanished">Hostname</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmyth/dbsettings.cpp" line="94"/>
-         <source>Port</source>
-         <comment>TCP/IP port</comment>
+-        <source>Port</source>
+-        <comment>TCP/IP port</comment>
 -        <translation>Port</translation>
-+        <translation type="vanished">Port</translation>
-+    </message>
-+    <message>
 +        <location filename="../libs/libmyth/dbsettings.cpp" line="56"/>
 +        <source>Database name</source>
 +        <translation>Database Name</translation>
@@ -581,15 +1672,14 @@
      </message>
      <message>
 -        <location filename="../libs/libmyth/dbsettings.cpp" line="121"/>
-         <source>Password</source>
+-        <source>Password</source>
 -        <translation>Password</translation>
-+        <translation type="vanished">Password</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="41"/>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1483"/>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1507"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1534"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1558"/>
          <source>OK</source>
          <translation>OK</translation>
      </message>
@@ -598,33 +1688,100 @@
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1486"/>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1509"/>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1567"/>
--        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1652"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1536"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1628"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1715"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1560"/>
+         <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1652"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1739"/>
          <source>Cancel</source>
          <translation>Cancel</translation>
      </message>
-@@ -1699,7 +1705,7 @@
+     <message>
+-        <location filename="../libs/libmythbase/mythdate.cpp" line="156"/>
++        <location filename="../libs/libmythbase/mythdate.cpp" line="185"/>
+         <source>Today</source>
+         <translation>Today</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythbase/mythdate.cpp" line="158"/>
++        <location filename="../libs/libmythbase/mythdate.cpp" line="187"/>
+         <source>Yesterday</source>
+         <translation>Yesterday</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythbase/mythdate.cpp" line="160"/>
++        <location filename="../libs/libmythbase/mythdate.cpp" line="189"/>
+         <source>Tomorrow</source>
+         <translation>Tomorrow</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythmetadata/bluraymetadata.cpp" line="108"/>
++        <location filename="../libs/libmythmetadata/bluraymetadata.cpp" line="114"/>
+         <source>%1 of %2</source>
+         <extracomment>%1 and %2 are both numbers, %1 is the current position, %2 the maximum</extracomment>
+         <translation>%1 of %2</translation>
+     </message>
      <message numerus="yes">
-         <location filename="../libs/libmythmetadata/metadatacommon.cpp" line="481"/>
-         <location filename="../libs/libmythmetadata/metadatacommon.cpp" line="493"/>
+-        <location filename="../libs/libmythmetadata/metadatacommon.cpp" line="474"/>
+-        <location filename="../libs/libmythmetadata/metadatacommon.cpp" line="487"/>
+-        <location filename="../libs/libmythmetadata/videoutils.cpp" line="161"/>
+-        <location filename="../libs/libmythmetadata/videoutils.cpp" line="164"/>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="586"/>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="589"/>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="595"/>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="598"/>
++        <location filename="../libs/libmythmetadata/metadatacommon.cpp" line="478"/>
++        <location filename="../libs/libmythmetadata/videoutils.cpp" line="160"/>
++        <location filename="../libs/libmythtv/recordingrule.cpp" line="637"/>
++        <location filename="../libs/libmythtv/recordingrule.cpp" line="640"/>
+         <source>%n minute(s)</source>
+         <translation>
+             <numerusform>%n minute</numerusform>
+@@ -1697,9 +1678,8 @@
+         </translation>
+     </message>
+     <message numerus="yes">
+-        <location filename="../libs/libmythmetadata/metadatacommon.cpp" line="481"/>
+-        <location filename="../libs/libmythmetadata/metadatacommon.cpp" line="493"/>
 -        <location filename="../libs/libmythtv/osd.cpp" line="948"/>
-+        <location filename="../libs/libmythtv/osd.cpp" line="958"/>
++        <location filename="../libs/libmythmetadata/metadatacommon.cpp" line="484"/>
++        <location filename="../libs/libmythtv/osd.cpp" line="987"/>
          <source>%n second(s)</source>
          <translation>
              <numerusform>%n second</numerusform>
-@@ -1724,31 +1730,29 @@
+@@ -1707,122 +1687,124 @@
+         </translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythmetadata/videoutils.cpp" line="174"/>
+-        <location filename="../libs/libmythmetadata/videoutils.cpp" line="188"/>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="784"/>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="793"/>
++        <location filename="../libs/libmythmetadata/videoutils.cpp" line="169"/>
++        <location filename="../libs/libmythmetadata/videoutils.cpp" line="183"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="753"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="762"/>
+         <source>Yes</source>
+         <translation>Yes</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythmetadata/videoutils.cpp" line="177"/>
+-        <location filename="../libs/libmythmetadata/videoutils.cpp" line="191"/>
++        <location filename="../libs/libmythmetadata/videoutils.cpp" line="172"/>
++        <location filename="../libs/libmythmetadata/videoutils.cpp" line="186"/>
+         <location filename="../programs/mythfrontend/exitprompt.cpp" line="225"/>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="786"/>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="795"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="755"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="764"/>
+         <source>No</source>
          <translation>No</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1488"/>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1511"/>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1569"/>
--        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1654"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1537"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1630"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1717"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1561"/>
+         <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1654"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1741"/>
          <source>Cancel All</source>
          <translation>Cancel All</translation>
      </message>
@@ -640,36 +1797,40 @@
          <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="71"/>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2609"/>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2627"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2634"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2652"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2687"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2706"/>
          <source>Auto</source>
          <comment>Automatic</comment>
          <translation>Auto</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/channelsettings.cpp" line="50"/>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="50"/>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="64"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="49"/>
 +        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="66"/>
          <source>Channel Name</source>
          <translation>Channel Name</translation>
      </message>
-@@ -1758,65 +1762,70 @@
+     <message>
+-        <location filename="../libs/libmythtv/channelsettings.cpp" line="60"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="59"/>
+         <source>Channel Number</source>
          <translation>Channel Number</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelsettings.cpp" line="71"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="61"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="60"/>
 +        <source>This is the number by which the channel is known to MythTV.</source>
 +        <translation>This is the number by which the channel is known to MythTV.</translation>
 +    </message>
 +    <message>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="73"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="72"/>
          <source>Video Source</source>
          <translation>Video Source</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelsettings.cpp" line="125"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="127"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="126"/>
          <source>Callsign</source>
          <translation>Callsign</translation>
      </message>
@@ -677,39 +1838,39 @@
 -        <location filename="../libs/libmythtv/channelsettings.cpp" line="137"/>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1236"/>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="106"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="139"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1217"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="110"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="138"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1229"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="172"/>
          <source>Default</source>
          <translation>Default</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelsettings.cpp" line="254"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="256"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="255"/>
          <source>XMLTV ID</source>
          <translation>XMLTV ID</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelsettings.cpp" line="433"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="435"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="434"/>
          <source>Contrast</source>
          <translation>Contrast</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelsettings.cpp" line="444"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="446"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="445"/>
          <source>Brightness</source>
          <translation>Brightness</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelsettings.cpp" line="455"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="457"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="456"/>
          <source>Color</source>
          <translation>Color</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelsettings.cpp" line="465"/>
-+        <location filename="../libs/libmythtv/channelsettings.cpp" line="468"/>
++        <location filename="../libs/libmythtv/channelsettings.cpp" line="467"/>
          <source>Hue</source>
          <translation>Hue</translation>
      </message>
@@ -722,122 +1883,215 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recorders/signalmonitor.cpp" line="222"/>
-+        <location filename="../libs/libmythtv/recorders/signalmonitor.cpp" line="235"/>
++        <location filename="../libs/libmythtv/recorders/signalmonitor.cpp" line="227"/>
          <location filename="../libs/libmythtv/signalmonitorvalue.cpp" line="28"/>
          <source>Signal Lock</source>
          <translation>Signal Lock</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recorders/signalmonitor.cpp" line="224"/>
-+        <location filename="../libs/libmythtv/recorders/signalmonitor.cpp" line="237"/>
++        <location filename="../libs/libmythtv/recorders/signalmonitor.cpp" line="229"/>
          <source>Signal Power</source>
          <translation>Signal Power</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recorders/signalmonitor.cpp" line="226"/>
-+        <location filename="../libs/libmythtv/recorders/signalmonitor.cpp" line="239"/>
++        <location filename="../libs/libmythtv/recorders/signalmonitor.cpp" line="231"/>
          <source>Script Status</source>
          <translation>Script Status</translation>
      </message>
-@@ -1842,81 +1851,75 @@
+     <message numerus="yes">
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="592"/>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="601"/>
++        <location filename="../libs/libmythtv/recordingrule.cpp" line="643"/>
+         <source>%n hour(s)</source>
+         <translation>
+             <numerusform>%n hour</numerusform>
+@@ -1830,123 +1812,105 @@
+         </translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="609"/>
++        <location filename="../libs/libmythtv/recordingrule.cpp" line="649"/>
+         <source>%1 %2</source>
+         <comment>Hours and minutes</comment>
+         <extracomment>Time duration, %1 is replaced by the hours, %2 by the minutes</extracomment>
+         <translation>%1 %2</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythui/mythnotificationcenter.cpp" line="1540"/>
++        <location filename="../libs/libmythui/mythnotificationcenter.cpp" line="1542"/>
+         <source>MythTV</source>
          <translation>MythTV</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="226"/>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="245"/>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="941"/>
-         <source>Warning</source>
+-        <source>Warning</source>
 -        <translation>Warning</translation>
-+        <translation type="vanished">Warning</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="377"/>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="449"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="380"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="423"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="389"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="433"/>
          <source>Stereo</source>
          <translation>Stereo</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="380"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="383"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="392"/>
          <source>5.1</source>
          <translation>5.1</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="383"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="386"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="395"/>
          <source>7.1</source>
          <translation>7.1</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="909"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="877"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="889"/>
          <source>Stop</source>
          <translation>Stop</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="239"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="243"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="323"/>
          <source>Off</source>
          <translation>Off</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1009"/>
-         <source>Edit</source>
+-        <source>Edit</source>
 -        <translation>Edit</translation>
-+        <translation type="vanished">Edit</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1010"/>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1279"/>
-         <source>Delete</source>
+-        <source>Delete</source>
 -        <translation>Delete</translation>
-+        <translation type="vanished">Delete</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2608"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2633"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2699"/>
          <source>Qt</source>
          <translation>Qt</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2612"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2637"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2694"/>
          <source>OpenGL 2</source>
          <translation>OpenGL 2</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2614"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2639"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2696"/>
          <source>OpenGL 1</source>
          <translation>OpenGL 1</translation>
      </message>
      <message>
--        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2618"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2643"/>
-         <source>Direct3D</source>
-         <translation>Direct3D</translation>
+-        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2618"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2690"/>
+         <source>Direct3D</source>
+         <translation>Direct3D</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/main.cpp" line="132"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="142"/>
+         <source>MythFrontend</source>
+         <translation>MythFrontend</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/main.cpp" line="576"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="605"/>
+         <source>All tuners are currently busy.</source>
+         <translation>All tuners are currently busy.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/main.cpp" line="579"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="608"/>
+         <source>There are no configured tuners.</source>
+         <translation>There are no configured tuners.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="814"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="783"/>
+         <source>Title</source>
+         <translation>Title</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="817"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="786"/>
+         <source>Season/Episode</source>
+         <translation>Season/Episode</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="820"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="789"/>
+         <source>Year</source>
+         <translation>Year</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="823"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="792"/>
+         <source>User Rating</source>
+         <translation>User Rating</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="826"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="795"/>
+         <source>Runtime</source>
+         <translation>Runtime</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="829"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="798"/>
+         <source>Filename</source>
+         <translation>Filename</translation>
+     </message>
+@@ -1954,32 +1918,32 @@
+ <context>
+     <name>(DVD menu)</name>
+     <message>
+-        <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="38"/>
++        <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="40"/>
+         <source>Title Menu</source>
+         <translation>Title Menu</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="39"/>
++        <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="41"/>
+         <source>Root Menu</source>
+         <translation>Root Menu</translation>
      </message>
      <message>
--        <location filename="../programs/mythfrontend/main.cpp" line="132"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="131"/>
-         <source>MythFrontend</source>
-         <translation>MythFrontend</translation>
+-        <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="40"/>
++        <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="42"/>
+         <source>Subpicture Menu</source>
+         <translation>Subpicture Menu</translation>
      </message>
      <message>
--        <location filename="../programs/mythfrontend/main.cpp" line="576"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="584"/>
-         <source>All tuners are currently busy.</source>
-         <translation>All tuners are currently busy.</translation>
+-        <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="41"/>
++        <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="43"/>
+         <source>Audio Menu</source>
+         <translation>Audio Menu</translation>
      </message>
      <message>
--        <location filename="../programs/mythfrontend/main.cpp" line="579"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="587"/>
-         <source>There are no configured tuners.</source>
-         <translation>There are no configured tuners.</translation>
+-        <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="42"/>
++        <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="44"/>
+         <source>Angle Menu</source>
+         <translation>Angle Menu</translation>
      </message>
-@@ -2061,7 +2064,7 @@
+     <message>
+-        <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="44"/>
++        <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="46"/>
+         <source>Part Menu</source>
+         <extracomment>DVD part/chapter menu</extracomment>
+         <translation>Part Menu</translation>
+@@ -2061,7 +2025,7 @@
      <message>
          <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="56"/>
          <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="89"/>
@@ -846,7 +2100,7 @@
          <source>Modulation</source>
          <translation>Modulation</translation>
      </message>
-@@ -2076,17 +2079,17 @@
+@@ -2076,50 +2040,50 @@
          <translation>Modulation (Default: Auto)</translation>
      </message>
      <message>
@@ -863,29 +2117,31 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="124"/>
+-        <source>Modulation, QPSK, 8PSK, QAM-16. Most DVB-S transponders use QPSK, while DVB-S2 use 8PSK. QAM-16 is not available for DVB-S2 transports.</source>
+-        <translation>Modulation, QPSK, 8PSK, QAM-16. Most DVB-S transponders use QPSK, while DVB-S2 use 8PSK. QAM-16 is not available for DVB-S2 transports.</translation>
 +        <location filename="../libs/libmythtv/channelscan/modulationsetting.h" line="125"/>
-         <source>Modulation, QPSK, 8PSK, QAM-16. Most DVB-S transponders use QPSK, while DVB-S2 use 8PSK. QAM-16 is not available for DVB-S2 transports.</source>
-         <translation>Modulation, QPSK, 8PSK, QAM-16. Most DVB-S transponders use QPSK, while DVB-S2 use 8PSK. QAM-16 is not available for DVB-S2 transports.</translation>
++        <source>Modulation, QPSK, 8PSK, QAM-16, 16APSK, 32APSK. Most DVB-S transponders use QPSK, while DVB-S2 use 8PSK, 16APSK, or 32APSK. QAM-16 is not available for DVB-S2 transports.</source>
++        <translation>Modulation, QPSK, 8PSK, QAM-16, 16APSK, 32APSK. Most DVB-S transponders use QPSK, while DVB-S2 use 8PSK, 16APSK, or 32APSK. QAM-16 is not available for DVB-S2 transports.</translation>
      </message>
-@@ -2094,32 +2097,32 @@
+ </context>
  <context>
      <name>(MythFrontendMain)</name>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="307"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="315"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="326"/>
          <source>The ScreenSetupWizard cannot be used while mythfrontend is operating in windowed mode.</source>
          <translation>The ScreenSetupWizard cannot be used while mythfrontend is operating in windowed mode.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="618"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="626"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="669"/>
          <source>Loading videos ...</source>
 -        <translation>Loading videos ...</translation>
 +        <translation>Loading Videos...</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1159"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1251"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1296"/>
          <source>Failed to open 
   &apos;%1&apos; in %2 
  Check if the video exists</source>
@@ -897,18 +2153,18 @@
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1193"/>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1219"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1285"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1311"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1330"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1356"/>
          <source>DVD Failure</source>
          <translation>DVD Failure</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1888"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1986"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="2074"/>
          <source>MythTV Frontend</source>
          <comment>Main window title</comment>
          <translation>MythTV Frontend</translation>
-@@ -2180,7 +2183,7 @@
+@@ -2180,7 +2144,7 @@
      <message>
          <location filename="../libs/libmythbase/storagegroup.cpp" line="35"/>
          <source>MusicArt</source>
@@ -917,7 +2173,28 @@
      </message>
  </context>
  <context>
-@@ -2215,48 +2218,48 @@
+@@ -2197,17 +2161,17 @@
+         <translation>No Cover</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythmetadata/videoutils.cpp" line="202"/>
++        <location filename="../libs/libmythmetadata/videoutils.cpp" line="197"/>
+         <source>Details Downloaded</source>
+         <translation>Details Downloaded</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythmetadata/videoutils.cpp" line="205"/>
++        <location filename="../libs/libmythmetadata/videoutils.cpp" line="200"/>
+         <source>Waiting for Detail Download</source>
+         <translation>Waiting for Detail Download</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythmetadata/videoutils.cpp" line="219"/>
++        <location filename="../libs/libmythmetadata/videoutils.cpp" line="214"/>
+         <source>No rating available.</source>
+         <translation>No rating available.</translation>
+     </message>
+@@ -2215,48 +2179,48 @@
  <context>
      <name>(mythcommflag)</name>
      <message>
@@ -943,8 +2220,8 @@
 -        <location filename="../programs/mythcommflag/CommDetector2.cpp" line="459"/>
 -        <location filename="../programs/mythcommflag/PrePostRollFlagger.cpp" line="333"/>
 +        <location filename="../programs/mythcommflag/ClassicCommDetector.cpp" line="558"/>
-+        <location filename="../programs/mythcommflag/CommDetector2.cpp" line="458"/>
-+        <location filename="../programs/mythcommflag/PrePostRollFlagger.cpp" line="334"/>
++        <location filename="../programs/mythcommflag/CommDetector2.cpp" line="455"/>
++        <location filename="../programs/mythcommflag/PrePostRollFlagger.cpp" line="335"/>
          <source>%1% Completed @ %2 fps.</source>
 -        <translation>%1% Completed @ %2 fps.</translation>
 +        <translation>%1% Completed @ %2 fps</translation>
@@ -954,15 +2231,15 @@
 -        <location filename="../programs/mythcommflag/CommDetector2.cpp" line="464"/>
 -        <location filename="../programs/mythcommflag/PrePostRollFlagger.cpp" line="337"/>
 +        <location filename="../programs/mythcommflag/ClassicCommDetector.cpp" line="562"/>
-+        <location filename="../programs/mythcommflag/CommDetector2.cpp" line="463"/>
-+        <location filename="../programs/mythcommflag/PrePostRollFlagger.cpp" line="338"/>
++        <location filename="../programs/mythcommflag/CommDetector2.cpp" line="460"/>
++        <location filename="../programs/mythcommflag/PrePostRollFlagger.cpp" line="339"/>
          <source>%1 Frames Completed @ %2 fps.</source>
 -        <translation>%1 Frames Completed @ %2 fps.</translation>
 +        <translation>%1 Frames Completed @ %2 fps</translation>
      </message>
      <message>
 -        <location filename="../programs/mythcommflag/CommDetector2.cpp" line="590"/>
-+        <location filename="../programs/mythcommflag/CommDetector2.cpp" line="589"/>
++        <location filename="../programs/mythcommflag/CommDetector2.cpp" line="586"/>
          <source>Performing Logo Identification</source>
          <translation>Performing Logo Identification</translation>
      </message>
@@ -982,16 +2259,21 @@
      </message>
      <message>
          <location filename="../programs/mythcommflag/main.cpp" line="420"/>
-@@ -2274,7 +2277,7 @@
-         <location filename="../programs/mythcommflag/main.cpp" line="1211"/>
+@@ -2271,709 +2235,730 @@
+         <translation>Running</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythcommflag/main.cpp" line="1211"/>
++        <location filename="../programs/mythcommflag/main.cpp" line="1215"/>
          <source>Failed with exit status %1</source>
          <comment>Job status</comment>
 -        <translation>Failed with exit status %1</translation>
 +        <translation>Failed with Exit Status %1</translation>
      </message>
      <message numerus="yes">
-         <location filename="../programs/mythcommflag/main.cpp" line="1217"/>
-@@ -2282,347 +2285,357 @@
+-        <location filename="../programs/mythcommflag/main.cpp" line="1217"/>
+-        <location filename="../programs/mythcommflag/main.cpp" line="1223"/>
++        <location filename="../programs/mythcommflag/main.cpp" line="1220"/>
          <source>%n commercial break(s)</source>
          <comment>Job status</comment>
          <translation>
@@ -1006,13 +2288,18 @@
      <name>ASIConfigurationGroup</name>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1963"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1981"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1873"/>
++        <source>Status</source>
++        <translation>Status</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1906"/>
          <source>Not a valid DVEO ASI card</source>
          <translation>Not a valid DVEO ASI card</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1968"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1986"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1911"/>
          <source>Valid DVEO ASI card</source>
 -        <translation>Valid DVEO ASI card</translation>
 +        <translation>Valid DVEO ASI Card</translation>
@@ -1022,50 +2309,50 @@
      <name>AlbumArtImages</name>
      <message>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2019"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2024"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2059"/>
          <source>Scanning for music album art...</source>
 -        <translation>Scanning for music album art...</translation>
 +        <translation>Scanning for Music Album Art...</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2146"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2151"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2186"/>
          <source>Unknown</source>
          <translation>Unknown</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2147"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2152"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2187"/>
          <source>Front Cover</source>
          <translation>Front Cover</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2148"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2153"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2188"/>
          <source>Back Cover</source>
          <translation>Back Cover</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2149"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2154"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2189"/>
          <source>CD</source>
          <translation>CD</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2150"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2155"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2190"/>
          <source>Inlay</source>
          <translation>Inlay</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2151"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2156"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2191"/>
          <source>Artist</source>
          <translation>Artist</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2163"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2168"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2203"/>
          <source>unknown</source>
 -        <translation>unknown</translation>
 +        <translation>Unknown</translation>
@@ -1073,8 +2360,8 @@
      <message>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2164"/>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2181"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2169"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2186"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2204"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2221"/>
          <source>front</source>
 -        <translation>front</translation>
 +        <translation>Front</translation>
@@ -1082,8 +2369,8 @@
      <message>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2165"/>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2184"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2170"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2189"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2205"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2224"/>
          <source>back</source>
 -        <translation>back</translation>
 +        <translation>Back</translation>
@@ -1091,8 +2378,8 @@
      <message>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2166"/>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2190"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2171"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2195"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2206"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2230"/>
          <source>cd</source>
 -        <translation>cd</translation>
 +        <translation>CD</translation>
@@ -1100,22 +2387,22 @@
      <message>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2167"/>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2187"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2172"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2192"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2207"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2227"/>
          <source>inlay</source>
 -        <translation>inlay</translation>
 +        <translation>Inlay</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2168"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2173"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2208"/>
          <source>artist</source>
 -        <translation>artist</translation>
 +        <translation>Artist</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2193"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2198"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="2233"/>
          <source>cover</source>
 -        <translation>cover</translation>
 +        <translation>Cover</translation>
@@ -1125,7 +2412,7 @@
      <name>AllMusic</name>
      <message>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="1678"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="1683"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="1718"/>
          <source>CD -- none</source>
 -        <translation>CD -- none</translation>
 +        <translation>CD - None</translation>
@@ -1135,207 +2422,227 @@
      <name>AppearanceSettings</name>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1462"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1438"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1459"/>
          <source>Menu theme</source>
 -        <translation>Menu theme</translation>
 +        <translation>Menu Theme</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1992"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1985"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2008"/>
          <source>All</source>
          <translation>All</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1994"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1987"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2010"/>
          <source>Display on screen</source>
 -        <translation>Display on screen</translation>
 +        <translation>Display On Screen</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1998"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1991"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2014"/>
          <source>Run on the specified screen or spanning all screens.</source>
          <translation>Run on the specified screen or spanning all screens.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2008"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2001"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2024"/>
          <source>Monitor aspect ratio</source>
 -        <translation>Monitor aspect ratio</translation>
 +        <translation>Monitor Aspect Ratio</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2010"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2003"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2026"/>
          <source>16:9</source>
          <translation>16:9</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2011"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2004"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2027"/>
          <source>16:10</source>
          <translation>16:10</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2012"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2005"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2028"/>
          <source>4:3</source>
          <translation>4:3</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2014"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2007"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2030"/>
          <source>The aspect ratio of a Xinerama display cannot be queried from the display, so it must be specified.</source>
          <translation>The aspect ratio of a Xinerama display cannot be queried from the display, so it must be specified.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2079"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2072"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2095"/>
          <source>GUI width (pixels)</source>
 -        <translation>GUI width (pixels)</translation>
 +        <translation>GUI Width (pixels)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2083"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2076"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2099"/>
          <source>The width of the GUI. Do not make the GUI wider than your actual screen resolution. Set to 0 to automatically scale to fullscreen.</source>
          <translation>The width of the GUI. Do not make the GUI wider than your actual screen resolution. Set to 0 to automatically scale to fullscreen.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2095"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2088"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2111"/>
          <source>GUI height (pixels)</source>
 -        <translation>GUI height (pixels)</translation>
 +        <translation>GUI Height (pixels)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2099"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2092"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2115"/>
          <source>The height of the GUI. Do not make the GUI taller than your actual screen resolution. Set to 0 to automatically scale to fullscreen.</source>
          <translation>The height of the GUI. Do not make the GUI taller than your actual screen resolution. Set to 0 to automatically scale to fullscreen.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2111"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2104"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2127"/>
          <source>GUI X offset</source>
 -        <translation>GUI X offset</translation>
 +        <translation>GUI X Offset</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2115"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2108"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2131"/>
          <source>The horizontal offset where the GUI will be displayed. May only work if run in a window.</source>
          <translation>The horizontal offset where the GUI will be displayed. May only work if run in a window.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2125"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2118"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2141"/>
          <source>GUI Y offset</source>
 -        <translation>GUI Y offset</translation>
 +        <translation>GUI Y Offset</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2129"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2122"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2145"/>
          <source>The vertical offset where the GUI will be displayed.</source>
          <translation>The vertical offset where the GUI will be displayed.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2139"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2132"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2155"/>
          <source>Display size - width</source>
 -        <translation>Display size - width</translation>
 +        <translation>Display Size - Width</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2143"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2136"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2159"/>
          <source>Horizontal size of the monitor or TV. Used to calculate the actual aspect ratio of the display. This will override the DisplaySize from the system.</source>
          <translation>Horizontal size of the monitor or TV. Used to calculate the actual aspect ratio of the display. This will override the DisplaySize from the system.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2154"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2147"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2170"/>
          <source>Display size - height</source>
 -        <translation>Display size - height</translation>
 +        <translation>Display Size - Height</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2158"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2151"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2174"/>
          <source>Vertical size of the monitor or TV. Used to calculate the actual aspect ratio of the display. This will override the DisplaySize from the system.</source>
          <translation>Vertical size of the monitor or TV. Used to calculate the actual aspect ratio of the display. This will override the DisplaySize from the system.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2170"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2163"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2186"/>
          <source>Use GUI size for TV playback</source>
 -        <translation>Use GUI size for TV playback</translation>
 +        <translation>Use GUI Size for TV Playback</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2174"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2167"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2190"/>
          <source>If enabled, use the above size for TV, otherwise use full screen.</source>
          <translation>If enabled, use the above size for TV, otherwise use full screen.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2414"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2439"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2462"/>
          <source>Hide mouse cursor in MythTV</source>
 -        <translation>Hide mouse cursor in MythTV</translation>
 +        <translation>Hide Mouse Cursor in MythTV</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2418"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2443"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2466"/>
          <source>Toggles mouse cursor visibility for touchscreens. By default MythTV will auto-hide the cursor if the mouse doesn&apos;t move for a period, this setting disables the cursor entirely.</source>
          <translation>Toggles mouse cursor visibility for touchscreens. By default MythTV will auto-hide the cursor if the mouse doesn&apos;t move for a period, this setting disables the cursor entirely.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2432"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2457"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2480"/>
          <source>Use window border</source>
 -        <translation>Use window border</translation>
 +        <translation>Use Window Border</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2436"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2461"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2484"/>
          <source>Toggles between windowed and borderless operation.</source>
          <translation>Toggles between windowed and borderless operation.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2445"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2470"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2493"/>
          <source>Use fixed window size</source>
 -        <translation>Use fixed window size</translation>
 +        <translation>Use Fixed Window Size</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2449"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2474"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2497"/>
          <source>If disabled, the video playback window can be resized</source>
 -        <translation>If disabled, the video playback window can be resized</translation>
 +        <translation>If disabled, the video playback window can be resized.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2458"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2483"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2506"/>
          <source>Always On Top</source>
          <translation>Always On Top</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2462"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2487"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2510"/>
          <source>If enabled, MythTV will always be on top</source>
          <translation>If enabled, MythTV will always be on top</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2470"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2495"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2519"/>
++        <source>Startup Screen Delay</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2523"/>
++        <source>The Startup Screen will show the progress of starting the frontend if frontend startup takes longer than this number of seconds.</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2535"/>
++        <source>GUI text zoom percentage</source>
++        <translation>GUI Text Zoom Percentage</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2540"/>
++        <source>Adjust the themed defined font size by this percentage. mythfrontend needs restart for this to take effect.</source>
++        <translation>Adjust the themed defined font size by this percentage. Restart mythfrontend for this to take effect.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2549"/>
          <source>Date format</source>
 -        <translation>Date format</translation>
 +        <translation>Date Format</translation>
@@ -1343,22 +2650,22 @@
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2473"/>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2528"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2498"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2553"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2552"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2607"/>
          <source>Samples are shown using today&apos;s date.</source>
          <translation>Samples are shown using today&apos;s date.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2479"/>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2534"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2504"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2559"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2558"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2613"/>
          <source>Samples are shown using tomorrow&apos;s date.</source>
          <translation>Samples are shown using tomorrow&apos;s date.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2515"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2540"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2594"/>
          <source>Your preferred date format. %1</source>
          <extracomment>%1 gives additional information regarding the date format</extracomment>
 -        <translation>Your preferred date format. %1</translation>
@@ -1366,14 +2673,14 @@
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2524"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2549"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2603"/>
          <source>Short date format</source>
 -        <translation>Short date format</translation>
 +        <translation>Short Date Format</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2569"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2594"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2648"/>
          <source>Your preferred short date format. %1</source>
          <extracomment>%1 gives additional information regarding the date format</extracomment>
 -        <translation>Your preferred short date format. %1</translation>
@@ -1381,210 +2688,186 @@
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2578"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2603"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2657"/>
          <source>Time format</source>
 -        <translation>Time format</translation>
 +        <translation>Time Format</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2593"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2618"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2672"/>
          <source>Your preferred time format. You must choose a format with &quot;AM&quot; or &quot;PM&quot; in it, otherwise your time display will be 24-hour or &quot;military&quot; time.</source>
          <translation>Your preferred time format. You must choose a format with &quot;AM&quot; or &quot;PM&quot; in it, otherwise your time display will be 24-hour or &quot;military&quot; time.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2606"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2631"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2685"/>
          <source>Paint engine</source>
 -        <translation>Paint engine</translation>
 +        <translation>Paint Engine</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2622"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2647"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2701"/>
          <source>This selects what MythTV uses to draw. Choosing &apos;%1&apos; is recommended, unless running on systems with broken OpenGL implementations (broken hardware or drivers or windowing systems) where only Qt works.</source>
          <translation>This selects what MythTV uses to draw. Choosing &apos;%1&apos; is recommended, unless running on systems with broken OpenGL implementations (broken hardware or drivers or windowing systems) where only Qt works.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2951"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2957"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3056"/>
          <source>Language</source>
          <translation>Language</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2970"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2976"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3075"/>
          <source>Your preferred language for the user interface.</source>
          <translation>Your preferred language for the user interface.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3006"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3012"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3111"/>
          <source>Guide language #%1</source>
 -        <translation>Guide language #%1</translation>
 +        <translation>Guide Language #%1</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3012"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3018"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3117"/>
          <source>Your #%1 preferred language for Program Guide data and captions.</source>
          <translation>Your #%1 preferred language for Program Guide data and captions.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4200"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4252"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4476"/>
 +        <source>GUI dimension</source>
 +        <translation>GUI Dimension</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4274"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4498"/>
 +        <source>Fullscreen</source>
 +        <translation>Fullscreen</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4297"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4521"/>
          <source>Theme / Screen Settings</source>
          <translation>Theme / Screen Settings</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4253"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4332"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4558"/>
          <source>Localization</source>
          <translation>Localization</translation>
      </message>
-@@ -2630,350 +2643,491 @@
+ </context>
  <context>
-     <name>AudioAdvancedSettings</name>
-     <message>
+-    <name>AudioAdvancedSettings</name>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1159"/>
-         <source>Stereo PCM Only</source>
+-        <source>Stereo PCM Only</source>
 -        <translation>Stereo PCM Only</translation>
-+        <translation type="vanished">Stereo PCM Only</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1163"/>
-         <source>Enable if your amplifier or sound decoder only supports 2 channel PCM (typically an old HDMI 1.0 device). Multichannel audio will be re-encoded to AC-3 when required</source>
+-        <source>Enable if your amplifier or sound decoder only supports 2 channel PCM (typically an old HDMI 1.0 device). Multichannel audio will be re-encoded to AC-3 when required</source>
 -        <translation>Enable if your amplifier or sound decoder only supports 2 channel PCM (typically an old HDMI 1.0 device). Multichannel audio will be re-encoded to AC-3 when required</translation>
-+        <translation type="vanished">Enable if your amplifier or sound decoder only supports 2 channel PCM (typically an old HDMI 1.0 device). Multichannel audio will be re-encoded to AC-3 when required</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1174"/>
-         <source>Override SRC quality</source>
+-        <source>Override SRC quality</source>
 -        <translation>Override SRC quality</translation>
-+        <translation type="vanished">Override SRC quality</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1178"/>
-         <source>Enable to override audio sample rate conversion quality.</source>
+-        <source>Enable to override audio sample rate conversion quality.</source>
 -        <translation>Enable to override audio sample rate conversion quality.</translation>
-+        <translation type="vanished">Enable to override audio sample rate conversion quality.</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1187"/>
-         <source>Sample rate conversion</source>
+-        <source>Sample rate conversion</source>
 -        <translation>Sample rate conversion</translation>
-+        <translation type="vanished">Sample rate conversion</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1189"/>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1199"/>
-         <source>Disabled</source>
-         <comment>Sample rate conversion</comment>
+-        <source>Disabled</source>
+-        <comment>Sample rate conversion</comment>
 -        <translation>Disabled</translation>
-+        <translation type="vanished">Disabled</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1190"/>
-         <source>Fastest</source>
-         <comment>Sample rate conversion</comment>
+-        <source>Fastest</source>
+-        <comment>Sample rate conversion</comment>
 -        <translation>Fastest</translation>
-+        <translation type="vanished">Fastest</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1191"/>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1198"/>
-         <source>Good</source>
-         <comment>Sample rate conversion</comment>
+-        <source>Good</source>
+-        <comment>Sample rate conversion</comment>
 -        <translation>Good</translation>
-+        <translation type="vanished">Good</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1192"/>
-         <source>Best</source>
-         <comment>Sample rate conversion</comment>
+-        <source>Best</source>
+-        <comment>Sample rate conversion</comment>
 -        <translation>Best</translation>
-+        <translation type="vanished">Best</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1194"/>
-         <source>Set the quality of audio sample-rate conversion. &quot;%1&quot; (default) provides the best compromise between CPU usage and quality. &quot;%2&quot; lets the audio device handle sample-rate conversion.</source>
+-        <source>Set the quality of audio sample-rate conversion. &quot;%1&quot; (default) provides the best compromise between CPU usage and quality. &quot;%2&quot; lets the audio device handle sample-rate conversion.</source>
 -        <translation>Set the quality of audio sample-rate conversion. &quot;%1&quot; (default) provides the best compromise between CPU usage and quality. &quot;%2&quot; lets the audio device handle sample-rate conversion.</translation>
-+        <translation type="vanished">Set the quality of audio sample-rate conversion. &quot;%1&quot; (default) provides the best compromise between CPU usage and quality. &quot;%2&quot; lets the audio device handle sample-rate conversion.</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1208"/>
-         <source>Force audio device output to 48kHz</source>
+-        <source>Force audio device output to 48kHz</source>
 -        <translation>Force audio device output to 48kHz</translation>
-+        <translation type="vanished">Force audio device output to 48kHz</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1211"/>
-         <source>Force audio sample rate to 48kHz. Some audio devices will report various rates, but they ultimately crash.</source>
+-        <source>Force audio sample rate to 48kHz. Some audio devices will report various rates, but they ultimately crash.</source>
 -        <translation>Force audio sample rate to 48kHz. Some audio devices will report various rates, but they ultimately crash.</translation>
-+        <translation type="vanished">Force audio sample rate to 48kHz. Some audio devices will report various rates, but they ultimately crash.</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1221"/>
-         <source>Separate digital output device</source>
+-        <source>Separate digital output device</source>
 -        <translation>Separate digital output device</translation>
-+        <translation type="vanished">Separate digital output device</translation>
-     </message>
+-    </message>
++    <name>AudioConfigScreen</name>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1225"/>
-         <source>Use a distinct digital output device from default. (default is not checked)</source>
+-        <source>Use a distinct digital output device from default. (default is not checked)</source>
 -        <translation>Use a distinct digital output device from default. (default is not checked)</translation>
-+        <translation type="vanished">Use a distinct digital output device from default. (default is not checked)</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1234"/>
-         <source>Digital output device</source>
+-        <source>Digital output device</source>
 -        <translation>Digital output device</translation>
-+        <translation type="vanished">Digital output device</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1247"/>
-         <source>Audio output device to use for digital audio. This value is currently only used with ALSA and DirectX sound output.</source>
+-        <source>Audio output device to use for digital audio. This value is currently only used with ALSA and DirectX sound output.</source>
 -        <translation>Audio output device to use for digital audio. This value is currently only used with ALSA and DirectX sound output.</translation>
-+        <translation type="vanished">Audio output device to use for digital audio. This value is currently only used with ALSA and DirectX sound output.</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1257"/>
-         <source>SPDIF 48kHz rate override</source>
+-        <source>SPDIF 48kHz rate override</source>
 -        <translation>SPDIF 48kHz rate override</translation>
-+        <translation type="vanished">SPDIF 48kHz rate override</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1261"/>
-         <source>ALSA only. By default, let ALSA determine the passthrough sampling rate. If checked set the sampling rate to 48kHz for passthrough. (default is not checked)</source>
+-        <source>ALSA only. By default, let ALSA determine the passthrough sampling rate. If checked set the sampling rate to 48kHz for passthrough. (default is not checked)</source>
 -        <translation>ALSA only. By default, let ALSA determine the passthrough sampling rate. If checked set the sampling rate to 48kHz for passthrough. (default is not checked)</translation>
-+        <translation type="vanished">ALSA only. By default, let ALSA determine the passthrough sampling rate. If checked set the sampling rate to 48kHz for passthrough. (default is not checked)</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1272"/>
-         <source>HBR passthrough support</source>
+-        <source>HBR passthrough support</source>
 -        <translation>HBR passthrough support</translation>
-+        <translation type="vanished">HBR passthrough support</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1276"/>
-         <source>HBR support is required for TrueHD and DTS-HD passthrough. If unchecked, Myth will limit the passthrough bitrate to 6.144Mbit/s. This will disable True-HD passthrough, however will allow DTS-HD content to be sent as DTS-HD Hi-Res. (default is checked)</source>
+-        <source>HBR support is required for TrueHD and DTS-HD passthrough. If unchecked, Myth will limit the passthrough bitrate to 6.144Mbit/s. This will disable True-HD passthrough, however will allow DTS-HD content to be sent as DTS-HD Hi-Res. (default is checked)</source>
 -        <translation>HBR support is required for TrueHD and DTS-HD passthrough. If unchecked, Myth will limit the passthrough bitrate to 6.144Mbit/s. This will disable True-HD passthrough, however will allow DTS-HD content to be sent as DTS-HD Hi-Res. (default is checked)</translation>
-+        <translation type="vanished">HBR support is required for TrueHD and DTS-HD passthrough. If unchecked, Myth will limit the passthrough bitrate to 6.144Mbit/s. This will disable True-HD passthrough, however will allow DTS-HD content to be sent as DTS-HD Hi-Res. (default is checked)</translation>
-+    </message>
-+</context>
-+<context>
-+    <name>AudioConfigScreen</name>
-+    <message>
 +        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="95"/>
 +        <source>Scanning for available audio devices</source>
 +        <translation>Scanning for Available Audio Devices...</translation>
@@ -1594,56 +2877,54 @@
      <name>AudioConfigSettings</name>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="114"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="111"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="112"/>
          <source>Audio System</source>
          <translation>Audio System</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="122"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="117"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="118"/>
          <source>Rescan</source>
          <translation>Rescan</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="123"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="118"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="119"/>
          <source>Rescan for available audio devices. Current entry will be checked and capability entries populated.</source>
          <translation>Rescan for available audio devices. Current entry will be checked and capability entries populated.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="158"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="126"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="127"/>
          <source>Digital Audio Capabilities</source>
          <translation>Digital Audio Capabilities</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="174"/>
-         <source>Test</source>
+-        <source>Test</source>
 -        <translation>Test</translation>
-+        <translation type="vanished">Test</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="175"/>
-         <source>Will play a test pattern on all configured speakers</source>
+-        <source>Will play a test pattern on all configured speakers</source>
 -        <translation>Will play a test pattern on all configured speakers</translation>
-+        <translation type="vanished">Will play a test pattern on all configured speakers</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="181"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="141"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="142"/>
          <source>Advanced Audio Settings</source>
          <translation>Advanced Audio Settings</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="182"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="142"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="143"/>
          <source>Enable extra audio settings. Under most usage all options should be left alone</source>
 -        <translation>Enable extra audio settings. Under most usage all options should be left alone</translation>
 +        <translation>Enable extra audio settings. Under most usage all options should be left alone.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="222"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="200"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="201"/>
          <source>%1 is invalid or not useable.</source>
          <translatorcomment>Temporary fix</translatorcomment>
 -        <translation>%1 is invalid and can not be used.</translation>
@@ -1651,7 +2932,7 @@
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="239"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="213"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="214"/>
          <source>Passthrough device is invalid or not useable. Check configuration in Advanced Settings:</source>
          <translatorcomment>Temporary fix</translatorcomment>
 -        <translation>Passthrough device is invalid or can not be used. Check configuration in Advanced Settings:</translation>
@@ -1659,403 +2940,348 @@
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="447"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="421"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="431"/>
          <source>Speaker configuration</source>
 -        <translation>Speaker configuration</translation>
 +        <translation>Speaker Configuration</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="452"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="426"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="436"/>
          <source>Select the maximum number of audio channels supported by your receiver and speakers.</source>
          <translation>Select the maximum number of audio channels supported by your receiver and speakers.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="462"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="436"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="446"/>
          <source>Upconvert stereo to 5.1 surround</source>
 -        <translation>Upconvert stereo to 5.1 surround</translation>
 +        <translation>Upconvert Stereo to 5.1 Surround</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="466"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="440"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="450"/>
          <source>If enabled, MythTV will upconvert stereo to 5.1 audio. You can enable or disable the upconversion during playback at any time.</source>
          <translation>If enabled, MythTV will upconvert stereo to 5.1 audio. You can enable or disable the upconversion during playback at any time.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="476"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="450"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="460"/>
          <source>Upmix Quality</source>
          <translation>Upmix Quality</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="478"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="452"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="462"/>
          <source>Passive</source>
          <translation>Passive</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="479"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="453"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="463"/>
          <source>Hall</source>
          <comment>Upmix Quality</comment>
          <translation>Hall</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="480"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="454"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="464"/>
          <source>Good</source>
          <comment>Upmix Quality</comment>
          <translation>Good</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="481"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="455"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="465"/>
          <source>Best</source>
          <comment>Upmix Quality</comment>
          <translation>Best</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="483"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="457"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="467"/>
          <source>Set the audio surround-upconversion quality.</source>
          <translation>Set the audio surround-upconversion quality.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="492"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="466"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="476"/>
          <source>Dolby Digital</source>
          <translation>Dolby Digital</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="496"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="470"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="480"/>
          <source>Enable if your amplifier or sound decoder supports AC-3/Dolby Digital. You must use a digital connection. Uncheck if using an analog connection.</source>
          <translation>Enable if your amplifier or sound decoder supports AC-3/Dolby Digital. You must use a digital connection. Uncheck if using an analog connection.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="506"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="480"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="490"/>
          <source>DTS</source>
          <translation>DTS</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="510"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="484"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="494"/>
          <source>Enable if your amplifier or sound decoder supports DTS. You must use a digital connection. Uncheck if using an analog connection</source>
 -        <translation>Enable if your amplifier or sound decoder supports DTS. You must use a digital connection. Uncheck if using an analog connection</translation>
 +        <translation>Enable if your amplifier or sound decoder supports DTS. You must use a digital connection. Uncheck if using an analog connection.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="520"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="494"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="504"/>
          <source>E-AC-3</source>
          <translation>E-AC-3</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="524"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="498"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="508"/>
          <source>Enable if your amplifier or sound decoder supports E-AC-3 (DD+). You must use a HDMI connection.</source>
          <translation>Enable if your amplifier or sound decoder supports E-AC-3 (DD+). You must use a HDMI connection.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="533"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="507"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="517"/>
          <source>TrueHD</source>
          <translation>TrueHD</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="537"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="511"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="521"/>
          <source>Enable if your amplifier or sound decoder supports Dolby TrueHD. You must use a HDMI connection.</source>
          <translation>Enable if your amplifier or sound decoder supports Dolby TrueHD. You must use a HDMI connection.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="546"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="520"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="530"/>
          <source>DTS-HD</source>
          <translation>DTS-HD</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="550"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="524"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="534"/>
          <source>Enable if your amplifier or sound decoder supports DTS-HD. You must use a HDMI connection.</source>
          <translation>Enable if your amplifier or sound decoder supports DTS-HD. You must use a HDMI connection.</translation>
      </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1026"/>
-+        <source>Use internal volume controls</source>
+-</context>
+-<context>
+-    <name>AudioDeviceComboBox</name>
+     <message>
+-        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="53"/>
+-        <source>Audio output device</source>
+-        <translation>Audio output device</translation>
+-    </message>
+-</context>
+-<context>
+-    <name>AudioMixerSettings</name>
+-    <message>
+-        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1022"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1038"/>
+         <source>Use internal volume controls</source>
+-        <translation>Use internal volume controls</translation>
 +        <translation>Use Internal Volume Controls</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1030"/>
-+        <source>If enabled, MythTV will control the PCM and master mixer volume. Disable this option if you prefer to control the volume externally (for example, using your amplifier) or if you use an external mixer program.</source>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1026"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1042"/>
+         <source>If enabled, MythTV will control the PCM and master mixer volume. Disable this option if you prefer to control the volume externally (for example, using your amplifier) or if you use an external mixer program.</source>
+-        <translation>If enabled, MythTV will control the PCM and master mixer volume. Disable this option if you prefer to control the volume externally (for example, using your amplifier) or if you use an external mixer program.</translation>
 +        <translation>If enabled, MythTV will control the PCM and master mixer volume. Disable if you prefer to control the volume externally (for example, using your amplifier) or if you use an external mixer program.</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1046"/>
-+        <source>Mixer device</source>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1037"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1058"/>
+         <source>Mixer device</source>
+-        <translation>Mixer device</translation>
 +        <translation>Mixer Device</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1072"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1078"/>
-+        <source>software</source>
-+        <translation>Software</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1075"/>
-+        <source>Setting the mixer device to &quot;%1&quot; lets MythTV control the volume of all audio at the expense of a slight quality loss.</source>
-+        <translation>Setting the mixer device to &quot;%1&quot; lets MythTV control the volume of all audio at the expense of a slight quality loss.</translation>
-+    </message>
-+    <message>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1063"/>
+-        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1069"/>
 +        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1084"/>
-+        <source>PCM</source>
-+        <translation>PCM</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1085"/>
-+        <source>Master</source>
-+        <translation>Master</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1091"/>
-+        <source>Mixer controls</source>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1090"/>
+         <source>software</source>
+-        <translation>software</translation>
++        <translation>Software</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1066"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1087"/>
+         <source>Setting the mixer device to &quot;%1&quot; lets MythTV control the volume of all audio at the expense of a slight quality loss.</source>
+         <translation>Setting the mixer device to &quot;%1&quot; lets MythTV control the volume of all audio at the expense of a slight quality loss.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1074"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1096"/>
+         <source>PCM</source>
+         <translation>PCM</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1075"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1097"/>
+         <source>Master</source>
+         <translation>Master</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1081"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1103"/>
+         <source>Mixer controls</source>
+-        <translation>Mixer controls</translation>
 +        <translation>Mixer Controls</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1100"/>
-+        <source>Changing the volume adjusts the selected mixer.</source>
-+        <translation>Changing the volume adjusts the selected mixer.</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1110"/>
-+        <source>Master mixer volume</source>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1090"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1112"/>
+         <source>Changing the volume adjusts the selected mixer.</source>
+         <translation>Changing the volume adjusts the selected mixer.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1099"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1122"/>
+         <source>Master mixer volume</source>
+-        <translation>Master mixer volume</translation>
 +        <translation>Master Mixer Volume</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1114"/>
-+        <source>Initial volume for the Master mixer. This affects all sound created by the audio device. Note: Do not set this too low.</source>
-+        <translation>Initial volume for the Master mixer. This affects all sound created by the audio device. Note: Do not set this too low.</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1125"/>
-+        <source>PCM mixer volume</source>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1103"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1126"/>
+         <source>Initial volume for the Master mixer. This affects all sound created by the audio device. Note: Do not set this too low.</source>
+         <translation>Initial volume for the Master mixer. This affects all sound created by the audio device. Note: Do not set this too low.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1113"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1137"/>
+         <source>PCM mixer volume</source>
+-        <translation>PCM mixer volume</translation>
 +        <translation>PCM Mixer Volume</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1129"/>
-+        <source>Initial volume for PCM output. Using the volume keys in MythTV will adjust this parameter.</source>
-+        <translation>Initial volume for PCM output. Using the volume keys in MythTV will adjust this parameter.</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1138"/>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1117"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1141"/>
+         <source>Initial volume for PCM output. Using the volume keys in MythTV will adjust this parameter.</source>
+         <translation>Initial volume for PCM output. Using the volume keys in MythTV will adjust this parameter.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1125"/>
+-        <source>Audio Mixer</source>
+-        <translation>Audio Mixer</translation>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1150"/>
 +        <source>Stereo PCM Only</source>
 +        <translation>Stereo PCM Only</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1142"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1154"/>
 +        <source>Enable if your amplifier or sound decoder only supports 2 channel PCM (typically an old HDMI 1.0 device). Multichannel audio will be re-encoded to AC-3 when required</source>
 +        <translation>Enable if your amplifier or sound decoder only supports 2 channel PCM (typically an old HDMI 1.0 device). Multichannel audio will be re-encoded to AC-3 when required.</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1153"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1165"/>
 +        <source>Override SRC quality</source>
 +        <translation>Override Sample Rate Conversion Quality</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1157"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1169"/>
 +        <source>Enable to override audio sample rate conversion quality.</source>
 +        <translation>Enable to override audio sample rate conversion quality.</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1166"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1178"/>
 +        <source>Sample rate conversion</source>
 +        <translation>Sample Rate Conversion</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1168"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1178"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1180"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1190"/>
 +        <source>Disabled</source>
 +        <comment>Sample rate conversion</comment>
 +        <translation>Disabled</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1169"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1181"/>
 +        <source>Fastest</source>
 +        <comment>Sample rate conversion</comment>
 +        <translation>Fastest</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1170"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1177"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1182"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1189"/>
 +        <source>Good</source>
 +        <comment>Sample rate conversion</comment>
 +        <translation>Good</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1171"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1183"/>
 +        <source>Best</source>
 +        <comment>Sample rate conversion</comment>
 +        <translation>Best</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1173"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1185"/>
 +        <source>Set the quality of audio sample-rate conversion. &quot;%1&quot; (default) provides the best compromise between CPU usage and quality. &quot;%2&quot; lets the audio device handle sample-rate conversion.</source>
 +        <translation>Set the quality of audio sample-rate conversion. &quot;%1&quot; (default) provides the best compromise between CPU usage and quality. &quot;%2&quot; lets the audio device handle sample-rate conversion.</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1187"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1199"/>
 +        <source>Force audio device output to 48kHz</source>
 +        <translation>Force Audio Device Output to 48kHz</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1190"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1202"/>
 +        <source>Force audio sample rate to 48kHz. Some audio devices will report various rates, but they ultimately crash.</source>
 +        <translation>Force audio sample rate to 48kHz. Some audio devices will report various rates, but they ultimately crash.</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1200"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1212"/>
 +        <source>Separate digital output device</source>
 +        <translation>Separate Digital Output Device</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1204"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1216"/>
 +        <source>Use a distinct digital output device from default. (default is not checked)</source>
 +        <translation>Use a distinct digital output device from default. (default is not enabled)</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1214"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1226"/>
 +        <source>Digital output device</source>
 +        <translation>Digital Output Device</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1228"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1240"/>
 +        <source>Audio output device to use for digital audio. This value is currently only used with ALSA and DirectX sound output.</source>
 +        <translation>Audio output device to use for digital audio. This value is currently only used with ALSA and DirectX sound output.</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1238"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1250"/>
 +        <source>SPDIF 48kHz rate override</source>
 +        <translation>SPDIF 48kHz Rate Override</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1242"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1254"/>
 +        <source>ALSA only. By default, let ALSA determine the passthrough sampling rate. If checked set the sampling rate to 48kHz for passthrough. (default is not checked)</source>
 +        <translation>ALSA only. If disabled, ALSA determines the passthrough sampling rate. If enabled, set the sampling rate to 48kHz for passthrough. (default is disabled)</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1253"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1265"/>
 +        <source>HBR passthrough support</source>
 +        <translation>HBR Passthrough Support</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1257"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1269"/>
 +        <source>HBR support is required for TrueHD and DTS-HD passthrough. If unchecked, Myth will limit the passthrough bitrate to 6.144Mbit/s. This will disable True-HD passthrough, however will allow DTS-HD content to be sent as DTS-HD Hi-Res. (default is checked)</source>
 +        <translation>HBR support is required for TrueHD and DTS-HD passthrough. If disabled, Myth will limit the passthrough bitrate to 6.144Mbit/s. This will disable True-HD passthrough, however will allow DTS-HD content to be sent as DTS-HD Hi-Res. (default is disabled)</translation>
 +    </message>
- </context>
- <context>
-     <name>AudioDeviceComboBox</name>
-     <message>
--        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="53"/>
++</context>
++<context>
++    <name>AudioDeviceComboBox</name>
++    <message>
 +        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="33"/>
-         <source>Audio output device</source>
--        <translation>Audio output device</translation>
++        <source>Audio output device</source>
 +        <translation>Audio Output Device</translation>
      </message>
  </context>
  <context>
-     <name>AudioMixerSettings</name>
-     <message>
--        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1022"/>
-         <source>Use internal volume controls</source>
--        <translation>Use internal volume controls</translation>
-+        <translation type="vanished">Use internal volume controls</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1026"/>
-         <source>If enabled, MythTV will control the PCM and master mixer volume. Disable this option if you prefer to control the volume externally (for example, using your amplifier) or if you use an external mixer program.</source>
--        <translation>If enabled, MythTV will control the PCM and master mixer volume. Disable this option if you prefer to control the volume externally (for example, using your amplifier) or if you use an external mixer program.</translation>
-+        <translation type="vanished">If enabled, MythTV will control the PCM and master mixer volume. Disable this option if you prefer to control the volume externally (for example, using your amplifier) or if you use an external mixer program.</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1037"/>
-         <source>Mixer device</source>
--        <translation>Mixer device</translation>
-+        <translation type="vanished">Mixer device</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1063"/>
--        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1069"/>
-         <source>software</source>
--        <translation>software</translation>
-+        <translation type="vanished">software</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1066"/>
-         <source>Setting the mixer device to &quot;%1&quot; lets MythTV control the volume of all audio at the expense of a slight quality loss.</source>
--        <translation>Setting the mixer device to &quot;%1&quot; lets MythTV control the volume of all audio at the expense of a slight quality loss.</translation>
-+        <translation type="vanished">Setting the mixer device to &quot;%1&quot; lets MythTV control the volume of all audio at the expense of a slight quality loss.</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1074"/>
-         <source>PCM</source>
--        <translation>PCM</translation>
-+        <translation type="vanished">PCM</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1075"/>
-         <source>Master</source>
--        <translation>Master</translation>
-+        <translation type="vanished">Master</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1081"/>
-         <source>Mixer controls</source>
--        <translation>Mixer controls</translation>
-+        <translation type="vanished">Mixer controls</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1090"/>
-         <source>Changing the volume adjusts the selected mixer.</source>
--        <translation>Changing the volume adjusts the selected mixer.</translation>
-+        <translation type="vanished">Changing the volume adjusts the selected mixer.</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1099"/>
-         <source>Master mixer volume</source>
--        <translation>Master mixer volume</translation>
-+        <translation type="vanished">Master mixer volume</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1103"/>
-         <source>Initial volume for the Master mixer. This affects all sound created by the audio device. Note: Do not set this too low.</source>
--        <translation>Initial volume for the Master mixer. This affects all sound created by the audio device. Note: Do not set this too low.</translation>
-+        <translation type="vanished">Initial volume for the Master mixer. This affects all sound created by the audio device. Note: Do not set this too low.</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1113"/>
-         <source>PCM mixer volume</source>
--        <translation>PCM mixer volume</translation>
-+        <translation type="vanished">PCM mixer volume</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1117"/>
-         <source>Initial volume for PCM output. Using the volume keys in MythTV will adjust this parameter.</source>
--        <translation>Initial volume for PCM output. Using the volume keys in MythTV will adjust this parameter.</translation>
-+        <translation type="vanished">Initial volume for PCM output. Using the volume keys in MythTV will adjust this parameter.</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="1125"/>
-         <source>Audio Mixer</source>
--        <translation>Audio Mixer</translation>
-+        <translation type="vanished">Audio Mixer</translation>
-     </message>
- </context>
- <context>
-@@ -2981,29 +3135,29 @@
+@@ -2981,57 +2966,57 @@
      <message>
          <location filename="../libs/libmyth/audio/audiooutput.cpp" line="325"/>
          <source>Invalid or unuseable audio device</source>
@@ -2083,23 +3309,50 @@
 +Device Supports Up to %1</translation>
      </message>
      <message>
-         <location filename="../libs/libmyth/audio/audiooutput.cpp" line="415"/>
+-        <location filename="../libs/libmyth/audio/audiooutput.cpp" line="415"/>
++        <location filename="../libs/libmyth/audio/audiooutput.cpp" line="416"/>
          <source>OSS device</source>
 -        <translation>OSS device</translation>
 +        <translation>OSS Device</translation>
      </message>
      <message>
-         <location filename="../libs/libmyth/audio/audiooutput.cpp" line="476"/>
-@@ -3013,7 +3167,7 @@
+-        <location filename="../libs/libmyth/audio/audiooutput.cpp" line="476"/>
++        <location filename="../libs/libmyth/audio/audiooutput.cpp" line="477"/>
+         <source>Use JACK default sound server.</source>
+         <translation>Use JACK default sound server.</translation>
+     </message>
      <message>
-         <location filename="../libs/libmyth/audio/audiooutput.cpp" line="507"/>
+-        <location filename="../libs/libmyth/audio/audiooutput.cpp" line="507"/>
++        <location filename="../libs/libmyth/audio/audiooutput.cpp" line="508"/>
          <source>CoreAudio default output</source>
 -        <translation>CoreAudio default output</translation>
 +        <translation>CoreAudio Default Output</translation>
      </message>
      <message>
-         <location filename="../libs/libmyth/audio/audiooutput.cpp" line="556"/>
-@@ -3072,22 +3226,22 @@
+-        <location filename="../libs/libmyth/audio/audiooutput.cpp" line="556"/>
++        <location filename="../libs/libmyth/audio/audiooutput.cpp" line="557"/>
+         <source>PulseAudio default sound server.</source>
+         <translation>PulseAudio default sound server.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/audio/audiooutput.cpp" line="569"/>
++        <location filename="../libs/libmyth/audio/audiooutput.cpp" line="570"/>
+         <source>OpenSLES default output.</source>
+         <translation>OpenSLES default output.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/audio/audiooutput.cpp" line="583"/>
++        <location filename="../libs/libmyth/audio/audiooutput.cpp" line="584"/>
+         <source>OpenMAX analog output.</source>
+         <translation>OpenMAX analog output.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/audio/audiooutput.cpp" line="592"/>
++        <location filename="../libs/libmyth/audio/audiooutput.cpp" line="593"/>
+         <source>OpenMAX HDMI output.</source>
+         <translation>OpenMAX HDMI output.</translation>
+     </message>
+@@ -3072,22 +3057,22 @@
      <message>
          <location filename="../libs/libmyth/audio/audiooutputjack.cpp" line="181"/>
          <source>Error while registering new jack port: %1</source>
@@ -2126,282 +3379,335 @@
      </message>
      <message>
          <location filename="../libs/libmyth/audio/audiooutputjack.cpp" line="211"/>
-@@ -3103,7 +3257,7 @@
+@@ -3095,31 +3080,31 @@
+         <translation>Calling jack_activate failed</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/audio/audiooutputjack.cpp" line="620"/>
++        <location filename="../libs/libmyth/audio/audiooutputjack.cpp" line="619"/>
+         <source>Calling jack_connect failed on port: %1
+ </source>
+         <translation>Calling jack_connect failed on port: %1</translation>
+     </message>
      <message>
-         <location filename="../libs/libmyth/audio/audiooutputjack.cpp" line="634"/>
+-        <location filename="../libs/libmyth/audio/audiooutputjack.cpp" line="634"/>
++        <location filename="../libs/libmyth/audio/audiooutputjack.cpp" line="633"/>
          <source>Error closing Jack output device. Error: %1</source>
 -        <translation>Error closing Jack output device. Error: %1</translation>
 +        <translation>ERROR: Closing Jack output device. Error: %1</translation>
      </message>
  </context>
  <context>
-@@ -3129,7 +3283,7 @@
+     <name>AudioPlayer</name>
+     <message>
+-        <location filename="../libs/libmythtv/audioplayer.cpp" line="162"/>
++        <location filename="../libs/libmythtv/audioplayer.cpp" line="161"/>
+         <source>Audio Player</source>
+         <translation>Audio Player</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/audioplayer.cpp" line="139"/>
++        <location filename="../libs/libmythtv/audioplayer.cpp" line="138"/>
+         <source>Unable to create AudioOutput.</source>
+         <translation>Unable to create AudioOutput.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/audioplayer.cpp" line="161"/>
++        <location filename="../libs/libmythtv/audioplayer.cpp" line="160"/>
+         <source>Disabling Audio</source>
+         <translation>Disabling Audio</translation>
+     </message>
+@@ -3127,68 +3112,68 @@
+ <context>
+     <name>AudioSetupWizard</name>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="94"/>
+-        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="94"/>
++        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="91"/>
          <source>Select from one of the audio devices detected on your system.  When satisfied, you can test audio before moving on.  If you fail to configure audio, video playback may fail as well.</source>
 -        <translation>Select from one of the audio devices detected on your system.  When satisfied, you can test audio before moving on.  If you fail to configure audio, video playback may fail as well.</translation>
 +        <translation>Select from one of the audio devices detected on your system. When satisfied, you can test audio before moving on. If you fail to configure audio, video playback may fail as well.</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="99"/>
-@@ -3139,27 +3293,27 @@
+-        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="99"/>
++        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="96"/>
+         <source>Select the number of speakers you have.</source>
+         <translation>Select the number of speakers you have.</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="103"/>
+-        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="103"/>
++        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="100"/>
          <source>Select this checkbox if your receiver is capable of playing DTS.</source>
 -        <translation>Select this checkbox if your receiver is capable of playing DTS.</translation>
 +        <translation>Enable if your receiver is capable of playing DTS.</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="105"/>
+-        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="105"/>
++        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="102"/>
          <source>Select this checkbox if your receiver is capable of playing AC-3 (Dolby Digital).</source>
 -        <translation>Select this checkbox if your receiver is capable of playing AC-3 (Dolby Digital).</translation>
 +        <translation>Enable if your receiver is capable of playing AC-3 (Dolby Digital).</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="107"/>
+-        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="107"/>
++        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="104"/>
          <source>Select this checkbox if your receiver is capable of playing E-AC-3 (Dolby Digital Plus).</source>
 -        <translation>Select this checkbox if your receiver is capable of playing E-AC-3 (Dolby Digital Plus).</translation>
 +        <translation>Enable if your receiver is capable of playing E-AC-3 (Dolby Digital Plus).</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="109"/>
+-        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="109"/>
++        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="106"/>
          <source>Select this checkbox if your receiver is capable of playing TrueHD.</source>
 -        <translation>Select this checkbox if your receiver is capable of playing TrueHD.</translation>
 +        <translation>Enable if your receiver is capable of playing TrueHD.</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="111"/>
+-        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="111"/>
++        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="108"/>
          <source>Select this checkbox if your receiver is capable of playing DTS-HD.</source>
 -        <translation>Select this checkbox if your receiver is capable of playing DTS-HD.</translation>
 +        <translation>Enable if your receiver is capable of playing DTS-HD.</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="115"/>
-@@ -3185,10 +3339,10 @@
+-        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="115"/>
++        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="112"/>
+         <source>Test your audio settings by playing noise through each speaker.</source>
+         <translation>Test your audio settings by playing noise through each speaker.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="117"/>
++        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="114"/>
+         <source>Save these changes and move on to the next configuration step.</source>
+         <translation>Save these changes and move on to the next configuration step.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="119"/>
++        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="116"/>
+         <source>Return to the previous configuration step.</source>
+         <translation>Return to the previous configuration step.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="122"/>
+-        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="430"/>
++        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="119"/>
++        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="427"/>
+         <source>Test Speakers</source>
+         <translation>Test Speakers</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="128"/>
+-        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="128"/>
++        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="125"/>
          <source>Discovering audio devices...</source>
 -        <translation>Discovering audio devices...</translation>
 +        <translation>Discovering Audio Devices...</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="452"/>
-+        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="451"/>
++        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="448"/>
          <source>Stop Speaker Test</source>
          <translation>Stop Speaker Test</translation>
      </message>
-@@ -3196,88 +3350,130 @@
- <context>
-     <name>AudioTest</name>
-     <message>
--        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="772"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="760"/>
-         <source>Audio Configuration Testing</source>
+@@ -3201,83 +3186,113 @@
          <translation>Audio Configuration Testing</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="778"/>
-         <source>%1 is invalid or not useable.</source>
+-        <source>%1 is invalid or not useable.</source>
 -        <translation>%1 is invalid and can not be used.</translation>
-+        <translation type="vanished">%1 is invalid and can not be used.</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="781"/>
-         <source>Warning</source>
+-        <source>Warning</source>
 -        <translation>Warning</translation>
-+        <translation type="vanished">Warning</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="786"/>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="887"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="823"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="925"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="835"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="937"/>
          <source>Test All</source>
          <translation>Test All</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="787"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="824"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="836"/>
          <source>Start all channels test</source>
 -        <translation>Start all channels test</translation>
 +        <translation>Start All Channels Test</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="800"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="765"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="777"/>
          <source>Front Left</source>
          <translation>Front Left</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="804"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="761"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="773"/>
 +        <source>Will play a test pattern on all configured speakers</source>
 +        <translation>Will play a test pattern on all configured speakers.</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="766"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="778"/>
 +        <source>Start front left channel test</source>
 +        <translation>Start Front Left Channel Test</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="772"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="784"/>
          <source>Front Right</source>
          <translation>Front Right</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="813"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="773"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="785"/>
 +        <source>Start front right channel test</source>
 +        <translation>Start Front Right Channel Test</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="779"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="791"/>
          <source>Rear Left</source>
          <translation>Rear Left</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="821"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="780"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="792"/>
 +        <source>Start rear left channel test</source>
 +        <translation>Start Rear Left Channel Test</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="786"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="798"/>
          <source>Rear Right</source>
          <translation>Rear Right</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="821"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="787"/>
+-        <source>Rear Center</source>
+-        <translation>Rear Center</translation>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="799"/>
 +        <source>Start rear right channel test</source>
 +        <translation>Start Rear Right Channel Test</translation>
-+    </message>
-+    <message>
-         <source>Rear Center</source>
--        <translation>Rear Center</translation>
-+        <translation type="vanished">Rear Center</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="830"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="794"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="806"/>
          <source>LFE</source>
          <translation>LFE</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="837"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="795"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="807"/>
 +        <source>Start LFE channel test</source>
 +        <translation>Start LFE Channel Test</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="802"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="814"/>
          <source>Surround Left</source>
          <translation>Surround Left</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="841"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="803"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="815"/>
 +        <source>Start surround left channel test</source>
 +        <translation>Start Surround Left Channel Test</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="809"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="821"/>
          <source>Surround Right</source>
          <translation>Surround Right</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="845"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="810"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="822"/>
 +        <source>Start surround right channel test</source>
 +        <translation>Start Surround Right Channel Test</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="816"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="828"/>
          <source>Center</source>
          <translation>Center</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="864"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="817"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="829"/>
 +        <source>Start center channel test</source>
 +        <translation>Start Center Channel Test</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="829"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="841"/>
          <source>Use Highest Quality Mode</source>
          <translation>Use Highest Quality Mode</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="865"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="830"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="842"/>
          <source>Use the highest audio quality settings supported by your audio card. This will be a good place to start troubleshooting potential errors</source>
 -        <translation>Use the highest audio quality settings supported by your audio card. This will be a good place to start troubleshooting potential errors</translation>
 +        <translation>Use the highest audio quality settings supported by your audio card. This will be a good place to start troubleshooting potential errors.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="938"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="943"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="955"/>
          <source>Audio device is invalid or not useable.</source>
          <translation>Audio device is invalid or not useable.</translation>
      </message>
-@@ -3285,7 +3481,7 @@
+@@ -3285,7 +3300,7 @@
  <context>
      <name>AudioTestThread</name>
      <message>
 -        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="637"/>
-+        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="627"/>
++        <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="639"/>
          <source>Unable to create AudioOutput.</source>
          <translation>Unable to create AudioOutput.</translation>
      </message>
-@@ -3293,7 +3489,7 @@
+@@ -3293,7 +3308,7 @@
  <context>
      <name>BDInfo</name>
      <message>
 -        <location filename="../libs/libmythtv/Bluray/bdringbuffer.cpp" line="121"/>
-+        <location filename="../libs/libmythtv/Bluray/bdringbuffer.cpp" line="207"/>
++        <location filename="../libs/libmythtv/Bluray/bdringbuffer.cpp" line="212"/>
          <source>Could not open Blu-ray device: %1</source>
          <translation>Could not open Blu-ray device: %1</translation>
      </message>
-@@ -3301,29 +3497,29 @@
+@@ -3301,29 +3316,29 @@
  <context>
      <name>BDRingBuffer</name>
      <message>
 -        <location filename="../libs/libmythtv/Bluray/bdringbuffer.cpp" line="336"/>
-+        <location filename="../libs/libmythtv/Bluray/bdringbuffer.cpp" line="426"/>
++        <location filename="../libs/libmythtv/Bluray/bdringbuffer.cpp" line="431"/>
          <source>Title %1 chapter %2</source>
 -        <translation>Title %1 chapter %2</translation>
 +        <translation>Title %1 Chapter %2</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/Bluray/bdringbuffer.cpp" line="505"/>
-+        <location filename="../libs/libmythtv/Bluray/bdringbuffer.cpp" line="595"/>
++        <location filename="../libs/libmythtv/Bluray/bdringbuffer.cpp" line="608"/>
          <source>Could not open Blu-ray device: %1</source>
          <translation>Could not open Blu-ray device: %1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/Bluray/bdringbuffer.cpp" line="537"/>
-+        <location filename="../libs/libmythtv/Bluray/bdringbuffer.cpp" line="627"/>
++        <location filename="../libs/libmythtv/Bluray/bdringbuffer.cpp" line="640"/>
          <source>Could not open Blu-ray device %1, failed to decrypt</source>
 -        <translation>Could not open Blu-ray device %1, failed to decrypt</translation>
 +        <translation>Failed to decrypt, could not open Blu-ray device: %1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/Bluray/bdringbuffer.cpp" line="588"/>
-+        <location filename="../libs/libmythtv/Bluray/bdringbuffer.cpp" line="678"/>
++        <location filename="../libs/libmythtv/Bluray/bdringbuffer.cpp" line="691"/>
          <source>Unable to find any Blu-ray compatible titles</source>
 -        <translation>Unable to find any Blu-ray compatible titles</translation>
 +        <translation>Unable to find any Blu-ray compatible titles.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/Bluray/bdringbuffer.cpp" line="688"/>
-+        <location filename="../libs/libmythtv/Bluray/bdringbuffer.cpp" line="784"/>
++        <location filename="../libs/libmythtv/Bluray/bdringbuffer.cpp" line="797"/>
          <source>Unable to find any usable Blu-ray titles</source>
 -        <translation>Unable to find any usable Blu-ray titles</translation>
 +        <translation>Unable to find any usable Blu-ray titles.</translation>
      </message>
  </context>
  <context>
-@@ -3336,159 +3532,172 @@
+@@ -3336,159 +3351,128 @@
      <message>
          <location filename="../libs/libmyth/backendselect.cpp" line="358"/>
          <source>Please enter the backend access PIN</source>
@@ -2422,7 +3728,7 @@
 +        <translation>Allow this backend to receive connections on any IP Address assigned to it. Recommended for most users for ease and reliability.</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="884"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="894"/>
 +        <source>Host Address Backend Setup</source>
 +        <translation>Host Address Backend Setup</translation>
      </message>
@@ -2431,21 +3737,21 @@
      <name>BookmarkDialog</name>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="205"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="213"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="224"/>
          <source>DVD/Video contains a bookmark</source>
 -        <translation>DVD/Video contains a bookmark</translation>
 +        <translation>DVD/Video Contains a Bookmark</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="206"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="214"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="225"/>
          <source>Play from bookmark</source>
 -        <translation>Play from bookmark</translation>
 +        <translation>Play from Bookmark</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="207"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="215"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="226"/>
          <source>Play from beginning</source>
 -        <translation>Play from beginning</translation>
 +        <translation>Play from Beginning</translation>
@@ -2457,154 +3763,139 @@
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3752"/>
 -        <source>Capture cards</source>
 -        <translation>Capture cards</translation>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3751"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3508"/>
 +        <source>New capture card</source>
 +        <translation>New Capture Card</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3783"/>
-+        <source>Error getting list of cards for this host. Unable to delete capturecards for %1</source>
-+        <translation>Error getting list of cards for this host. Unable to delete capture cards for %1.</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3800"/>
-+        <source>Capture cards</source>
-+        <translation>Capture Cards</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3796"/>
-         <source>Capture Card Menu</source>
+-        <source>Capture Card Menu</source>
 -        <translation>Capture Card Menu</translation>
-+        <translation type="vanished">Capture Card Menu</translation>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3540"/>
++        <source>Error getting list of cards for this host. Unable to delete capturecards for %1</source>
++        <translation>Error getting list of cards for this host. Unable to delete capture cards for %1.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3797"/>
-         <source>Edit...</source>
+-        <source>Edit...</source>
 -        <translation>Edit...</translation>
-+        <translation type="vanished">Edit...</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3798"/>
-         <source>Delete...</source>
+-        <source>Delete...</source>
 -        <translation>Delete...</translation>
-+        <translation type="vanished">Delete...</translation>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3557"/>
++        <source>Capture cards</source>
++        <translation>Capture Cards</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3815"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3731"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3488"/>
          <source>Are you sure you want to delete ALL capture cards on %1?</source>
          <translation>Are you sure you want to delete ALL capture cards on %1?</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3817"/>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3852"/>
-         <source>Yes, delete capture cards</source>
+-        <source>Yes, delete capture cards</source>
 -        <translation>Yes, delete capture cards</translation>
-+        <translation type="vanished">Yes, Delete Capture Cards</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3818"/>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3853"/>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3876"/>
-         <source>No, don&apos;t</source>
+-        <source>No, don&apos;t</source>
 -        <translation>No, don&apos;t</translation>
-+        <translation type="vanished">No, Keep</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3834"/>
-         <source>Error getting list of cards for this host</source>
+-        <source>Error getting list of cards for this host</source>
 -        <translation>Error getting list of cards for this host</translation>
-+        <translation type="vanished">Error getting list of cards for this host</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3835"/>
-         <source>Unable to delete capturecards for %1</source>
+-        <source>Unable to delete capturecards for %1</source>
 -        <translation>Unable to delete capture cards for %1</translation>
-+        <translation type="vanished">Unable to delete capture cards for %1</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3850"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3741"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3498"/>
          <source>Are you sure you want to delete ALL capture cards?</source>
          <translation>Are you sure you want to delete ALL capture cards?</translation>
      </message>
-     <message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3874"/>
-         <source>Are you sure you want to delete this capture card?</source>
+-        <source>Are you sure you want to delete this capture card?</source>
 -        <translation>Are you sure you want to delete this capture card?</translation>
-+        <translation type="vanished">Are you sure you want to delete this capture card?</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3875"/>
-         <source>Yes, delete capture card</source>
+-        <source>Yes, delete capture card</source>
 -        <translation>Yes, delete capture card</translation>
-+        <translation type="vanished">Yes, Delete Capture Card</translation>
-     </message>
+-    </message>
  </context>
  <context>
      <name>CardInput</name>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3456"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3356"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3112"/>
          <source>Scan for channels</source>
 -        <translation>Scan for channels</translation>
 +        <translation>Scan for Channels</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3458"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3390"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3146"/>
          <source>Use channel scanner to find channels for this input.</source>
          <translation>Use channel scanner to find channels for this input.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3460"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3357"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3113"/>
          <source>Fetch channels from listings source</source>
 -        <translation>Fetch channels from listings source</translation>
 +        <translation>Fetch Channels from Listings Source</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3462"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3393"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3149"/>
          <source>This uses the listings data source to provide the channels for this input.</source>
          <translation>This uses the listings data source to provide the channels for this input.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3464"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3395"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3151"/>
          <source>This can take a long time to run.</source>
          <translation>This can take a long time to run.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3545"/>
-         <source>Create Input Group</source>
+-        <source>Create Input Group</source>
 -        <translation>Create Input Group</translation>
-+        <translation type="vanished">Create Input Group</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3546"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3483"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3239"/>
          <source>Enter new group name</source>
 -        <translation>Enter new group name</translation>
-+        <translation>Enter group name:</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3554"/>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3577"/>
-         <source>Error</source>
+-        <source>Error</source>
 -        <translation>Error</translation>
-+        <translation type="vanished">Error</translation>
++        <translation>Enter group name:</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3555"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3499"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3255"/>
          <source>Sorry, this Input Group name cannot be blank.</source>
 -        <translation>Sorry, this Input Group name cannot be blank.</translation>
 +        <translation>Sorry, the name cannot be blank.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3578"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3519"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3275"/>
          <source>Sorry, this Input Group name is already in use.</source>
 -        <translation>Sorry, this Input Group name is already in use.</translation>
 +        <translation>Sorry, this name is already in use.</translation>
@@ -2614,7 +3905,7 @@
      <name>CardInputEditor</name>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3987"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3868"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3625"/>
          <source>Input connections</source>
 -        <translation>Input connections</translation>
 +        <translation>Input Connections</translation>
@@ -2624,49 +3915,40 @@
      <name>CetonConfigurationGroup</name>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2426"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2384"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2135"/>
          <source>Description</source>
          <translation>Description</translation>
      </message>
-@@ -3496,141 +3705,146 @@
+@@ -3496,253 +3480,223 @@
  <context>
      <name>CetonDeviceID</name>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2377"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2341"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2091"/>
          <source>Device ID</source>
          <translation>Device ID</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2378"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2342"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2092"/>
          <source>Device ID of Ceton device</source>
 -        <translation>Device ID of Ceton device</translation>
-+        <translation>Device ID of Ceton Tuner</translation>
-     </message>
- </context>
- <context>
-     <name>ChannelCheckBox</name>
-     <message>
+-    </message>
+-</context>
+-<context>
+-    <name>ChannelCheckBox</name>
+-    <message>
 -        <location filename="../libs/libmythtv/channelgroupsettings.cpp" line="90"/>
-         <source>%1 %2</source>
-         <comment>Channel number with channel name</comment>
-         <extracomment>%1 is the channel number, %2 is the channel name</extracomment>
+-        <source>%1 %2</source>
+-        <comment>Channel number with channel name</comment>
+-        <extracomment>%1 is the channel number, %2 is the channel name</extracomment>
 -        <translation>%1 %2</translation>
-+        <translation type="vanished">%1 %2</translation>
-+    </message>
-+    <message>
-+        <source>Select/Unselect channels for this channel group</source>
-+        <translation type="vanished">Select/Unselect channels for this channel group</translation>
-     </message>
-+</context>
-+<context>
-+    <name>ChannelCheckBoxSetting</name>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/channelgroupsettings.cpp" line="92"/>
-         <source>Select/Unselect channels for this channel group</source>
+-        <source>Select/Unselect channels for this channel group</source>
 -        <translation>Select/Unselect channels for this channel group</translation>
-+        <translation type="vanished">Select channels for this channel group.</translation>
++        <translation>Device ID of Ceton Tuner</translation>
      </message>
  </context>
  <context>
@@ -2675,15 +3957,15 @@
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="112"/>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="270"/>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="317"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="114"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="272"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="319"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="111"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="268"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="315"/>
          <source>Channel Name</source>
          <translation>Channel Name</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="109"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="111"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="108"/>
          <source>Delete all channels on currently selected source(s).</source>
 -        <translation>Delete all channels on currently selected source(s).</translation>
 +        <translation>Delete All Channels on Currently Selected Source(s).</translation>
@@ -2692,254 +3974,245 @@
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="113"/>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="274"/>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="322"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="115"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="276"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="324"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="112"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="272"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="320"/>
          <source>Channel Number</source>
          <translation>Channel Number</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="120"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="122"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="119"/>
          <source>All</source>
          <translation>All</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="132"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="134"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="131"/>
          <source>(Unassigned)</source>
          <translation>(Unassigned)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="143"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="145"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="142"/>
          <source>Starts the channel scanner.</source>
          <translation>Starts the channel scanner.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="147"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="149"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="146"/>
          <source>Starts the icon downloader</source>
 -        <translation>Starts the icon downloader</translation>
 +        <translation>Starts the icon downloader.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="153"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="155"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="152"/>
          <source>Allows you to edit the transports directly. This is rarely required unless you are using a satellite dish and must enter an initial frequency to for the channel scanner to try.</source>
          <translation>Allows you to edit the transports directly. This is rarely required unless you are using a satellite dish and must enter an initial frequency to for the channel scanner to try.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="247"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="249"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="245"/>
          <source>(Add New Channel)</source>
          <translation>(Add New Channel)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="405"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="407"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="403"/>
          <source>Delete channel &apos;%1&apos;?</source>
 -        <translation>Delete channel &apos;%1&apos;?</translation>
 +        <translation>Delete Channel &apos;%1&apos;?</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="429"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="431"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="427"/>
          <source>Delete ALL channels?</source>
 -        <translation>Delete ALL channels?</translation>
 +        <translation>Delete All Channels?</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="430"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="432"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="428"/>
          <source>Delete all unassigned channels?</source>
 -        <translation>Delete all unassigned channels?</translation>
 +        <translation>Delete All Unassigned Channels?</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="431"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="433"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="429"/>
          <source>Delete all channels on %1?</source>
 -        <translation>Delete all channels on %1?</translation>
 +        <translation>Delete All Channels on %1?</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="472"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="482"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="478"/>
          <source>Channel Options</source>
          <translation>Channel Options</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="482"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="492"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="488"/>
          <source>Edit</source>
          <translation>Edit</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="487"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="497"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="493"/>
          <source>Delete</source>
          <translation>Delete</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="526"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="549"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="545"/>
          <source>Add some channels first!</source>
          <translation>Add some channels first!</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="547"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="570"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="566"/>
          <source>Icon Import Options</source>
          <translation>Icon Import Options</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="557"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="580"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="576"/>
          <source>Download all icons...</source>
 -        <translation>Download all icons...</translation>
 +        <translation>Download All Icons...</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="558"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="581"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="577"/>
          <source>Rescan for missing icons...</source>
 -        <translation>Rescan for missing icons...</translation>
 +        <translation>Rescan for Missing Icons...</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="560"/>
-+        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="583"/>
++        <location filename="../programs/mythtv-setup/channeleditor.cpp" line="579"/>
          <source>Download icon for %1</source>
 -        <translation>Download icon for %1</translation>
 +        <translation>Download Icon for %1</translation>
      </message>
  </context>
  <context>
-@@ -3644,87 +3858,110 @@
+     <name>ChannelGroup</name>
+     <message>
+-        <location filename="../libs/libmythtv/channelgroup.cpp" line="201"/>
++        <location filename="../libs/libmythtv/channelgroup.cpp" line="243"/>
+         <source>All Channels</source>
+         <translation>All Channels</translation>
+     </message>
+ </context>
  <context>
-     <name>ChannelGroupConfig</name>
+-    <name>ChannelGroupConfig</name>
++    <name>ChannelGroupSetting</name>
      <message>
 -        <location filename="../libs/libmythtv/channelgroupsettings.cpp" line="113"/>
-         <source>%1 Channel Group - Page %2 of %3</source>
+-        <source>%1 Channel Group - Page %2 of %3</source>
 -        <translation>%1 Channel Group - Page %2 of %3</translation>
-+        <translation type="vanished">%1 Channel Group - Page %2 of %3</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4696"/>
++        <source>Group name</source>
++        <translation>Group Name</translation>
      </message>
  </context>
  <context>
-     <name>ChannelGroupEditor</name>
-     <message>
+-    <name>ChannelGroupEditor</name>
+-    <message>
 -        <location filename="../libs/libmythtv/channelgroupsettings.cpp" line="139"/>
-         <source>Channel Groups</source>
+-        <source>Channel Groups</source>
 -        <translation>Channel Groups</translation>
-+        <translation type="vanished">Channel Groups</translation>
-     </message>
+-    </message>
++    <name>ChannelGroupSettings</name>
      <message>
 -        <location filename="../libs/libmythtv/channelgroupsettings.cpp" line="153"/>
-         <source>Create New Channel Group</source>
+-        <source>Create New Channel Group</source>
 -        <translation>Create New Channel Group</translation>
-+        <translation type="vanished">Create New Channel Group</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2754"/>
++        <source>Remember last channel group</source>
++        <translation>Remember Last Channel Group</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelgroupsettings.cpp" line="154"/>
-         <source>Enter group name or press SELECT to enter text via the On Screen Keyboard</source>
+-        <source>Enter group name or press SELECT to enter text via the On Screen Keyboard</source>
 -        <translation>Enter group name or press SELECT to enter text via the On Screen Keyboard</translation>
-+        <translation type="vanished">Enter group name or press SELECT to enter text via the On Screen Keyboard</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2756"/>
++        <source>If enabled, the EPG will initially display only the channels from the last channel group selected. Pressing &quot;4&quot; will toggle channel group.</source>
++        <translation>If enabled, the EPG will initially display only the channels from the last channel group selected. Pressing &quot;4&quot; will toggle channel group.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelgroupsettings.cpp" line="181"/>
-         <source>Delete &apos;%1&apos; Channel group?</source>
+-        <source>Delete &apos;%1&apos; Channel group?</source>
 -        <translation>Delete &apos;%1&apos; Channel group?</translation>
-+        <translation type="vanished">Delete &apos;%1&apos; Channel group?</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2771"/>
++        <source>Default channel group</source>
++        <translation>Default Channel Group</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelgroupsettings.cpp" line="186"/>
-         <source>Yes, delete group</source>
+-        <source>Yes, delete group</source>
 -        <translation>Yes, delete group</translation>
-+        <translation type="vanished">Yes, Delete Group</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2777"/>
++        <source>All Channels</source>
++        <translation>All Channels</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelgroupsettings.cpp" line="187"/>
-         <source>No, Don&apos;t delete group</source>
+-        <source>No, Don&apos;t delete group</source>
 -        <translation>No, Don&apos;t delete group</translation>
-+        <translation type="vanished">No, Keep Group</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2784"/>
++        <source>Default channel group to be shown in the EPG.  Pressing GUIDE key will toggle channel group.</source>
++        <translation>Default channel group to be shown in the EPG. Pressing GUIDE key will toggle channel group.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelgroupsettings.cpp" line="239"/>
-         <source>(Create new group)</source>
+-        <source>(Create new group)</source>
 -        <translation>(Create new group)</translation>
-+        <translation type="vanished">(Create new group)</translation>
-+    </message>
-+</context>
-+<context>
-+    <name>ChannelGroupSetting</name>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4471"/>
-+        <source>Group name</source>
-+        <translation>Group Name</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4593"/>
++        <source>Select/Unselect channels for this channel group</source>
++        <translation>Select channels for this channel group.</translation>
      </message>
  </context>
  <context>
-     <name>ChannelGroupSettings</name>
-     <message>
+-    <name>ChannelGroupSettings</name>
+-    <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2675"/>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2735"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2700"/>
-         <source>Remember last channel group</source>
+-        <source>Remember last channel group</source>
 -        <translation>Remember last channel group</translation>
-+        <translation>Remember Last Channel Group</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2677"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2702"/>
-         <source>If enabled, the EPG will initially display only the channels from the last channel group selected. Pressing &quot;4&quot; will toggle channel group.</source>
-         <translation>If enabled, the EPG will initially display only the channels from the last channel group selected. Pressing &quot;4&quot; will toggle channel group.</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2692"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2717"/>
-         <source>Default channel group</source>
--        <translation>Default channel group</translation>
-+        <translation>Default Channel Group</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2698"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2723"/>
-         <source>All Channels</source>
-         <translation>All Channels</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2705"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2730"/>
-         <source>Default channel group to be shown in the EPG.  Pressing GUIDE key will toggle channel group.</source>
--        <translation>Default channel group to be shown in the EPG.  Pressing GUIDE key will toggle channel group.</translation>
-+        <translation>Default channel group to be shown in the EPG. Pressing GUIDE key will toggle channel group.</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4367"/>
-+        <source>Select/Unselect channels for this channel group</source>
-+        <translation>Select channels for this channel group.</translation>
-+    </message>
-+</context>
-+<context>
+-    </message>
 +    <name>ChannelGroupsSetting</name>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4535"/>
+     <message>
+-        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2677"/>
+-        <source>If enabled, the EPG will initially display only the channels from the last channel group selected. Pressing &quot;4&quot; will toggle channel group.</source>
+-        <translation>If enabled, the EPG will initially display only the channels from the last channel group selected. Pressing &quot;4&quot; will toggle channel group.</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4760"/>
 +        <source>Channel Groups</source>
 +        <translation>Channel Groups</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4542"/>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2692"/>
+-        <source>Default channel group</source>
+-        <translation>Default channel group</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4767"/>
 +        <source>(Create New Channel Group)</source>
 +        <translation>(Create New Channel Group)</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4546"/>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2698"/>
+-        <source>All Channels</source>
+-        <translation>All Channels</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4771"/>
 +        <source>Favorites</source>
 +        <translation>Favorites</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4579"/>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2705"/>
+-        <source>Default channel group to be shown in the EPG.  Pressing GUIDE key will toggle channel group.</source>
+-        <translation>Default channel group to be shown in the EPG.  Pressing GUIDE key will toggle channel group.</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4804"/>
 +        <source>Enter the name of the new channel group</source>
 +        <translation>Enter group name:</translation>
      </message>
@@ -2953,13 +4226,14 @@
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1421"/>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1547"/>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1629"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1608"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1692"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1632"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1716"/>
          <source>Channel Importer</source>
          <translation>Channel Importer</translation>
      </message>
-@@ -3732,8 +3969,8 @@
-         <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="49"/>
+     <message numerus="yes">
+-        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="49"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="50"/>
          <source>Found %n channel(s)</source>
          <translation>
 -            <numerusform>Found %n channel</numerusform>
@@ -2969,21 +4243,32 @@
          </translation>
      </message>
      <message>
-@@ -3800,7 +4037,7 @@
+-        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="50"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="51"/>
+         <source>Failed to find any new channels!</source>
+         <translation>Failed to find any new channels!</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="51"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="52"/>
+         <source>Failed to find any channels.</source>
+         <translation>Failed to find any channels.</translation>
+     </message>
+@@ -3800,7 +3754,7 @@
          </translation>
      </message>
      <message numerus="yes">
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1132"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1152"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1163"/>
          <source>Found %n transport(s):
  </source>
          <extracomment>%n is the number of transports</extracomment>
-@@ -3812,148 +4049,159 @@
+@@ -3812,148 +3766,155 @@
          </translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1133"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1153"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1164"/>
          <source>Channels: FTA Enc Dec
  </source>
          <translation>Channels: FTA Enc Dec
@@ -2991,7 +4276,7 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1147"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1167"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1178"/>
          <source>Unique: prog %1 atsc %2 atsc minor %3 channum %4
  </source>
          <translation>Unique: prog %1 atsc %2 atsc minor %3 channum %4
@@ -2999,20 +4284,20 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1150"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1170"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1181"/>
          <source>Max atsc major count: %1</source>
          <translation>Max atsc major count: %1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1282"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1319"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1343"/>
          <source>Delete all</source>
 -        <translation>Delete all</translation>
 +        <translation>Delete All</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1283"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1320"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1344"/>
          <source>Set all invisible</source>
 -        <translation>Set all invisible</translation>
 +        <translation>Set All Invisible</translation>
@@ -3021,9 +4306,9 @@
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1285"/>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1352"/>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1415"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1322"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1398"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1470"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1346"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1422"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1494"/>
          <source>Ignore all</source>
 -        <translation>Ignore all</translation>
 +        <translation>Ignore All</translation>
@@ -3032,64 +4317,64 @@
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1308"/>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1373"/>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1436"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1345"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1419"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1491"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1369"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1443"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1515"/>
          <source>Do you want to:</source>
          <translation>Do you want to:</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1310"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1347"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1371"/>
          <source>1. Delete all</source>
 -        <translation>1. Delete all</translation>
 +        <translation>1. Delete All</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1312"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1349"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1373"/>
          <source>2. Set all invisible</source>
 -        <translation>2. Set all invisible</translation>
 +        <translation>2. Set All Invisible</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1315"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1352"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1376"/>
          <source>4. Ignore all</source>
 -        <translation>4. Ignore all</translation>
 +        <translation>4. Ignore All</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1334"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1371"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1395"/>
          <source>Please enter either 1, 2 or 4:</source>
 -        <translation>Please enter either 1, 2 or 4:</translation>
 +        <translation>Please enter 1, 2 or 4:</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1350"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1396"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1420"/>
          <source>Insert all</source>
 -        <translation>Insert all</translation>
 +        <translation>Insert All</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1351"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1397"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1421"/>
          <source>Insert manually</source>
 -        <translation>Insert manually</translation>
 +        <translation>Insert Manually</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1375"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1421"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1445"/>
          <source>1. Insert all</source>
 -        <translation>1. Insert all</translation>
 +        <translation>1. Insert All</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1377"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1423"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1447"/>
          <source>2. Insert manually</source>
 -        <translation>2. Insert manually</translation>
 +        <translation>2. Insert Manually</translation>
@@ -3097,8 +4382,8 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1379"/>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1442"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1425"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1497"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1449"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1521"/>
          <source>3. Ignore all</source>
 -        <translation>3. Ignore all</translation>
 +        <translation>3. Ignore All</translation>
@@ -3106,154 +4391,182 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1396"/>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1459"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1442"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1514"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1466"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1538"/>
          <source>Please enter either 1, 2, or 3:</source>
 -        <translation>Please enter either 1, 2, or 3:</translation>
 +        <translation>Please enter 1, 2, or 3:</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1413"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1468"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1492"/>
          <source>Update all</source>
 -        <translation>Update all</translation>
 +        <translation>Update All</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1414"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1469"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1493"/>
          <source>Update manually</source>
 -        <translation>Update manually</translation>
 +        <translation>Update Manually</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1438"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1493"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1517"/>
          <source>1. Update all</source>
 -        <translation>1. Update all</translation>
 +        <translation>1. Update All</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1440"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1495"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1519"/>
          <source>2. Update manually</source>
 -        <translation>2. Update manually</translation>
-+        <translation>2. Update Manually</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1485"/>
-         <source>Suggest</source>
+-        <source>Suggest</source>
 -        <translation>Suggest</translation>
-+        <translation type="vanished">Suggest</translation>
++        <translation>2. Update Manually</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1532"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1591"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1615"/>
          <source>Channel %1 was found to be in conflict with other channels.</source>
          <translation>Channel %1 was found to be in conflict with other channels.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1543"/>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1625"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1557"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1602"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1686"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1581"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1626"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1710"/>
          <source>Please enter a unique channel number.</source>
          <translation>Please enter a unique channel number.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1571"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1535"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1559"/>
 +        <source>Edit</source>
 +        <translation>Edit</translation>
 +    </message>
 +    <message>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1606"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1690"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1630"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1714"/>
 +        <source>Default value is %1</source>
 +        <translation>Default value is %1</translation>
 +    </message>
 +    <message>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1632"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1656"/>
          <source>Please enter a non-conflicting channel number (or type &apos;%1&apos; to skip, &apos;%2&apos; to skip all):</source>
          <translation>Please enter a non-conflicting channel number (or type &apos;%1&apos; to skip, &apos;%2&apos; to skip all):</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1614"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1675"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1699"/>
          <source>You chose to manually insert channel %1.</source>
          <translation>You chose to manually insert channel %1.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1658"/>
-+        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1721"/>
++        <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1745"/>
          <source>Please enter a non-conflicting channel number (or type &apos;%1&apos; to skip, &apos;%2&apos; to skip all): </source>
          <extracomment>%1 is the translation of &quot;cancel&quot;, %2 of &quot;cancel all&quot;</extracomment>
          <translation>Please enter a non-conflicting channel number (or type &apos;%1&apos; to skip, &apos;%2&apos; to skip all): </translation>
-@@ -3978,32 +4226,32 @@
-         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="192"/>
-         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="225"/>
+@@ -3962,12 +3923,12 @@
+ <context>
+     <name>ChannelRecPriority</name>
+     <message>
+-        <location filename="../programs/mythfrontend/channelrecpriority.cpp" line="165"/>
++        <location filename="../programs/mythfrontend/channelrecpriority.cpp" line="164"/>
+         <source>Channel Options</source>
+         <translation>Channel Options</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/channelrecpriority.cpp" line="181"/>
++        <location filename="../programs/mythfrontend/channelrecpriority.cpp" line="180"/>
+         <source>Program List</source>
+         <translation>Program List</translation>
+     </message>
+@@ -3975,48 +3936,48 @@
+ <context>
+     <name>ChannelScanner</name>
+     <message>
+-        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="192"/>
+-        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="225"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="213"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="246"/>
          <source>Error tuning to transport</source>
 -        <translation>Error tuning to transport</translation>
 +        <translation>Error Tuning to Transport</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="244"/>
+-        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="244"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="265"/>
          <source>Error scanning MPTS in IPTV</source>
 -        <translation>Error scanning MPTS in IPTV</translation>
 +        <translation>Error Scanning MPTS in IPTV</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="267"/>
+-        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="267"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="294"/>
          <source>Programmer Error: Failed to handle tune complete.</source>
 -        <translation>Programmer Error: Failed to handle tune complete.</translation>
 +        <translation>Programmer Error: Failed to Handle Tune Complete.</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="301"/>
+-        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="301"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="329"/>
          <source>Failed to parse &apos;%1&apos;</source>
 -        <translation>Failed to parse &apos;%1&apos;</translation>
 +        <translation>Failed to Parse &apos;%1&apos;</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="303"/>
+-        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="303"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="331"/>
          <source>Programmer Error : incorrect card type</source>
 -        <translation>Programmer Error : incorrect card type</translation>
 +        <translation>Programmer Error : Incorrect Card Type</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="304"/>
+-        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="304"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="332"/>
          <source>Failed to open &apos;%1&apos;</source>
 -        <translation>Failed to open &apos;%1&apos;</translation>
 +        <translation>Failed to Open &apos;%1&apos;</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="375"/>
-@@ -4013,7 +4261,7 @@
+-        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="375"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="430"/>
+         <source>Programmer Error: No Device</source>
+         <translation>Programmer Error: No Device</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="454"/>
+-        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="454"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="511"/>
          <source>Programmer Error: Channel not created</source>
 -        <translation>Programmer Error: Channel not created</translation>
 +        <translation>Programmer Error: Channel Not Created</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="465"/>
-@@ -4024,72 +4272,80 @@
+-        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="465"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanner.cpp" line="522"/>
+         <source>Channel could not be opened.</source>
+         <translation>Channel could not be opened.</translation>
+     </message>
+@@ -4024,78 +3985,46 @@
  <context>
      <name>ChannelScannerGUI</name>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanner_gui.cpp" line="62"/>
-         <source>Scanning</source>
+-        <source>Scanning</source>
 -        <translation>Scanning</translation>
-+        <translation type="vanished">Scanning</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanner_gui.cpp" line="171"/>
-         <source>ScanWizard</source>
+-        <source>ScanWizard</source>
 -        <translation>ScanWizard</translation>
-+        <translation type="vanished">ScanWizard</translation>
-+    </message>
-+    <message>
 +        <location filename="../libs/libmythtv/channelscan/channelscanner_gui.cpp" line="74"/>
 +        <source>Scan complete</source>
 +        <translation>Scan Complete</translation>
@@ -3263,17 +4576,15 @@
      <name>ChannelScannerGUIScanPane</name>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="41"/>
-         <source>Scan Progress</source>
+-        <source>Scan Progress</source>
 -        <translation>Scan Progress</translation>
-+        <translation type="vanished">Scan Progress</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="46"/>
-         <source>Status</source>
+-        <source>Status</source>
 -        <translation>Status</translation>
-+        <translation type="vanished">Status</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="47"/>
 +        <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="112"/>
          <source>Tuning</source>
@@ -3281,35 +4592,28 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="61"/>
-         <source>Rotor Movement</source>
+-        <source>Rotor Movement</source>
 -        <translation>Rotor Movement</translation>
-+        <translation type="vanished">Rotor Movement</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="71"/>
-         <source>Signal Strength</source>
+-        <source>Signal Strength</source>
 -        <translation>Signal Strength</translation>
-+        <translation type="vanished">Signal Strength</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="77"/>
-         <source>Signal/Noise</source>
+-        <source>Signal/Noise</source>
 -        <translation>Signal/Noise</translation>
-+        <translation type="vanished">Signal/Noise</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="85"/>
-         <source>Scan</source>
+-        <source>Scan</source>
 -        <translation>Scan</translation>
-+        <translation type="vanished">Scan</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="90"/>
-         <source>Stop Scan</source>
+-        <source>Stop Scan</source>
 -        <translation>Stop Scan</translation>
-+        <translation type="vanished">Stop Scan</translation>
-+    </message>
-+    <message>
 +        <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="128"/>
 +        <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="137"/>
 +        <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="146"/>
@@ -3331,18 +4635,22 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="132"/>
+-        <source>Scan Progress %1</source>
+-        <translation>Scan Progress %1</translation>
 +        <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="167"/>
 +        <source>%1</source>
 +        <translation>%1</translation>
-+    </message>
-+    <message>
-         <source>Scan Progress %1</source>
--        <translation>Scan Progress %1</translation>
-+        <translation type="vanished">Scan Progress %1</translation>
      </message>
  </context>
  <context>
-@@ -4104,7 +4360,7 @@
+     <name>ChannelUtil</name>
+     <message>
+-        <location filename="../libs/libmythtv/channelutil.cpp" line="1301"/>
++        <location filename="../libs/libmythtv/channelutil.cpp" line="1297"/>
+         <source>UNKNOWN</source>
+         <comment>Synthesized callsign</comment>
+         <translation>UNKNOWN</translation>
+@@ -4104,7 +4033,7 @@
  <context>
      <name>ChannelWizard</name>
      <message>
@@ -3351,39 +4659,58 @@
          <source>Channel Options</source>
          <translation>Channel Options</translation>
      </message>
-@@ -4116,7 +4372,7 @@
-         <location filename="../libs/libmythtv/commbreakmap.cpp" line="368"/>
+@@ -4112,37 +4041,37 @@
+ <context>
+     <name>CommBreakMap</name>
+     <message>
+-        <location filename="../libs/libmythtv/commbreakmap.cpp" line="236"/>
+-        <location filename="../libs/libmythtv/commbreakmap.cpp" line="368"/>
++        <location filename="../libs/libmythtv/commbreakmap.cpp" line="232"/>
++        <location filename="../libs/libmythtv/commbreakmap.cpp" line="364"/>
          <source>Skip %1</source>
          <extracomment>%1 is the skip time</extracomment>
 -        <translation>Skip %1</translation>
 +        <translation>Skip Commercial %1</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/commbreakmap.cpp" line="241"/>
-@@ -4127,19 +4383,19 @@
+-        <location filename="../libs/libmythtv/commbreakmap.cpp" line="241"/>
++        <location filename="../libs/libmythtv/commbreakmap.cpp" line="237"/>
+         <source>Commercial: %1</source>
+         <extracomment>%1 is the skip time</extracomment>
+         <translation>Commercial: %1</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/commbreakmap.cpp" line="272"/>
+-        <location filename="../libs/libmythtv/commbreakmap.cpp" line="272"/>
++        <location filename="../libs/libmythtv/commbreakmap.cpp" line="268"/>
          <source>Skipping Back.</source>
 -        <translation>Skipping Back.</translation>
 +        <translation>Skipping Back</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/commbreakmap.cpp" line="290"/>
-         <location filename="../libs/libmythtv/commbreakmap.cpp" line="316"/>
+-        <location filename="../libs/libmythtv/commbreakmap.cpp" line="290"/>
+-        <location filename="../libs/libmythtv/commbreakmap.cpp" line="316"/>
++        <location filename="../libs/libmythtv/commbreakmap.cpp" line="286"/>
++        <location filename="../libs/libmythtv/commbreakmap.cpp" line="312"/>
          <source>Start of program.</source>
 -        <translation>Start of program.</translation>
 +        <translation>Start of Program</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/commbreakmap.cpp" line="300"/>
-         <location filename="../libs/libmythtv/commbreakmap.cpp" line="344"/>
+-        <location filename="../libs/libmythtv/commbreakmap.cpp" line="300"/>
+-        <location filename="../libs/libmythtv/commbreakmap.cpp" line="344"/>
++        <location filename="../libs/libmythtv/commbreakmap.cpp" line="296"/>
++        <location filename="../libs/libmythtv/commbreakmap.cpp" line="340"/>
          <source>At End, cannot Skip.</source>
 -        <translation>At End, cannot Skip.</translation>
 +        <translation>At End, Cannot Skip</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/commbreakmap.cpp" line="362"/>
-@@ -4163,124 +4419,124 @@
+-        <location filename="../libs/libmythtv/commbreakmap.cpp" line="362"/>
++        <location filename="../libs/libmythtv/commbreakmap.cpp" line="358"/>
+         <source>Too Far %1</source>
+         <extracomment>%1 is the skip time</extracomment>
+         <translation>Too Far %1</translation>
+@@ -4163,273 +4092,273 @@
      <message>
          <location filename="../programs/mythfrontend/customedit.cpp" line="129"/>
          <source>&lt;New rule&gt;</source>
@@ -3391,290 +4718,402 @@
 +        <translation>&lt;New Rule&gt;</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="238"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="238"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="236"/>
          <source>Match an exact title</source>
 -        <translation>Match an exact title</translation>
 +        <translation>Match an Exact Title</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="248"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="248"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="246"/>
          <source>Match this series</source>
 -        <translation>Match this series</translation>
 +        <translation>Match This Series</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="255"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="255"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="253"/>
          <source>Match words in the title</source>
 -        <translation>Match words in the title</translation>
 +        <translation>Match Words in the Title</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="264"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="264"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="262"/>
          <source>Match words in the subtitle</source>
 -        <translation>Match words in the subtitle</translation>
 +        <translation>Match Words in the Subtitle</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="275"/>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="281"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="275"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="281"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="273"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="279"/>
          <source>Match this episode</source>
 -        <translation>Match this episode</translation>
 +        <translation>Match This Episode</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="288"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="288"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="286"/>
          <source>Match an exact episode</source>
 -        <translation>Match an exact episode</translation>
 +        <translation>Match an Exact Episode</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="296"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="296"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="294"/>
          <source>Match in any descriptive field</source>
 -        <translation>Match in any descriptive field</translation>
 +        <translation>Match in Any Descriptive Field</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="304"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="304"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="302"/>
          <source>New episodes only</source>
 -        <translation>New episodes only</translation>
 +        <translation>New Episodes Only</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="310"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="310"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="308"/>
          <source>Exclude unidentified episodes</source>
 -        <translation>Exclude unidentified episodes</translation>
 +        <translation>Exclude Unidentified Episodes</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="316"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="316"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="314"/>
          <source>First showing of each episode</source>
 -        <translation>First showing of each episode</translation>
 +        <translation>First Showing of Each Episode</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="322"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="322"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="320"/>
          <source>Last showing of each episode</source>
 -        <translation>Last showing of each episode</translation>
 +        <translation>Last Showing of Each Episode</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="328"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="328"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="326"/>
          <source>Anytime on a specific day of the week</source>
 -        <translation>Anytime on a specific day of the week</translation>
 +        <translation>Anytime on a Specific Day of the Week</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="335"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="335"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="333"/>
          <source>Only on weekdays (Monday through Friday)</source>
 -        <translation>Only on weekdays (Monday through Friday)</translation>
 +        <translation>Only on Weekdays (Monday Through Friday)</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="342"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="342"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="340"/>
          <source>Only on weekends</source>
 -        <translation>Only on weekends</translation>
 +        <translation>Only on Weekends</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="365"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="365"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="363"/>
          <source>Only on a specific station</source>
 -        <translation>Only on a specific station</translation>
 +        <translation>Only on a Specific Station</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="374"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="374"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="372"/>
          <source>Exclude one station</source>
 -        <translation>Exclude one station</translation>
 +        <translation>Exclude One Station</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="380"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="380"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="378"/>
          <source>Match related callsigns</source>
 -        <translation>Match related callsigns</translation>
 +        <translation>Match Related Callsigns</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="386"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="386"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="384"/>
          <source>Only channels from the Favorites group</source>
 -        <translation>Only channels from the Favorites group</translation>
 +        <translation>Only Channels from the Favorites Group</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="466"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="466"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="464"/>
          <source>Category type (%1)</source>
          <comment>List of hardcoded category types</comment>
 -        <translation>Category type (%1)</translation>
 +        <translation>Category Type (%1)</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="748"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="748"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="759"/>
          <source>Replace as a search</source>
 -        <translation>Replace as a search</translation>
 +        <translation>Replace as a Search</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="750"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="750"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="761"/>
          <source>Store as a search</source>
 -        <translation>Store as a search</translation>
 +        <translation>Store as a Search</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="754"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="754"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="765"/>
          <source>Replace as an example</source>
 -        <translation>Replace as an example</translation>
 +        <translation>Replace as an Example</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="756"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="756"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="767"/>
          <source>Store as an example</source>
 -        <translation>Store as an example</translation>
 +        <translation>Store as an Example</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="783"/>
-@@ -4290,82 +4546,82 @@
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="783"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="794"/>
+         <source>Power Search rules no longer require a leading &quot;AND&quot;.</source>
+         <translation>Power Search rules no longer require a leading &quot;AND&quot;.</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="787"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="787"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="798"/>
          <source>Power Search rules cannot include semicolon ( ; ) </source>
 -        <translation>Power Search rules cannot include semicolon ( ; ) </translation>
 +        <translation>Power Search rules cannot include semicolon ( ; ).</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="394"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="394"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="392"/>
          <source>Only channels from a specific video source</source>
 -        <translation>Only channels from a specific video source</translation>
 +        <translation>Only Channels from a Specific Video Source</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="349"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="349"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="347"/>
          <source>Only in prime time</source>
 -        <translation>Only in prime time</translation>
 +        <translation>Only in Prime Time</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="357"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="357"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="355"/>
          <source>Not in prime time</source>
 -        <translation>Not in prime time</translation>
 +        <translation>Not in Prime Time</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="400"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="400"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="398"/>
          <source>Only channels marked as commercial free</source>
 -        <translation>Only channels marked as commercial free</translation>
 +        <translation>Only Channels Marked as Commercial Free</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="407"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="407"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="405"/>
          <source>Only shows marked as HDTV</source>
 -        <translation>Only shows marked as HDTV</translation>
 +        <translation>Only Shows Marked as HDTV</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="413"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="413"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="411"/>
          <source>Only shows marked as widescreen</source>
 -        <translation>Only shows marked as widescreen</translation>
 +        <translation>Only Shows Marked as Widescreen</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="419"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="419"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="417"/>
          <source>Exclude H.264 encoded streams (EIT only)</source>
 -        <translation>Exclude H.264 encoded streams (EIT only)</translation>
 +        <translation>Exclude H.264 Encoded Streams (EIT Only)</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="425"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="425"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="423"/>
          <source>Only shows with in-vision signing</source>
 -        <translation>Only shows with in-vision signing</translation>
 +        <translation>Only Shows with In-vision Signing</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="431"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="431"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="429"/>
          <source>Only shows with in-vision subtitles</source>
 -        <translation>Only shows with in-vision subtitles</translation>
 +        <translation>Only Shows with In-vision Subtitles</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="437"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="437"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="435"/>
          <source>Limit by category</source>
 -        <translation>Limit by category</translation>
 +        <translation>Limit by Category</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="446"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="446"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="444"/>
          <source>All matches for a genre (Data Direct)</source>
 -        <translation>All matches for a genre (Data Direct)</translation>
 +        <translation>All Matches for a Genre (Data Direct)</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="457"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="457"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="455"/>
          <source>Limit by MPAA or VCHIP rating (Data Direct)</source>
 -        <translation>Limit by MPAA or VCHIP rating (Data Direct)</translation>
 +        <translation>Limit by MPAA or VCHIP Rating (Data Direct)</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="473"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="473"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="471"/>
          <source>Limit movies by the year of release</source>
 -        <translation>Limit movies by the year of release</translation>
 +        <translation>Limit Movies by the Year of Release</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="480"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="480"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="478"/>
          <source>Minimum star rating (0.0 to 1.0 for movies only)</source>
 -        <translation>Minimum star rating (0.0 to 1.0 for movies only)</translation>
 +        <translation>Minimum Star Rating (0.0 to 1.0 for Movies Only)</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="486"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="486"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="484"/>
          <source>Person named in the credits (Data Direct)</source>
 -        <translation>Person named in the credits (Data Direct)</translation>
 +        <translation>Person Named in the Credits (Data Direct)</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="507"/>
-@@ -4375,7 +4631,7 @@
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="507"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="505"/>
+         <source>Re-record SDTV in HDTV (disable duplicate matching)</source>
+         <translation>Re-record SDTV in HDTV (disable duplicate matching)</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="517"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="517"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="515"/>
          <source>Multiple sports teams (complete example)</source>
 -        <translation>Multiple sports teams (complete example)</translation>
 +        <translation>Multiple Sports Teams (complete example)</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/customedit.cpp" line="525"/>
-@@ -4590,52 +4846,51 @@
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="525"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="523"/>
+         <source>Sci-fi B-movies (complete example)</source>
+         <translation>Sci-fi B-movies (complete example)</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="534"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="532"/>
+         <source>SportsCenter Overnight (complete example - use FindDaily)</source>
+         <translation>SportsCenter Overnight (complete example - use FindDaily)</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="543"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="541"/>
+         <source>Movie of the Week (complete example - use FindWeekly)</source>
+         <translation>Movie of the Week (complete example - use FindWeekly)</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="553"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="551"/>
+         <source>First Episodes (complete example for Data Direct)</source>
+         <translation>First Episodes (complete example for Data Direct)</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="728"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="739"/>
+         <source>Current Example</source>
+         <translation>Current Example</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="919"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="930"/>
+         <source>Replace</source>
+         <translation>Replace</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="918"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="929"/>
+         <source>as a search</source>
+         <translation>as a search</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="763"/>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="912"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="774"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="923"/>
+         <source>Delete</source>
+         <translation>Delete</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="788"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="799"/>
+         <source>statement terminators.</source>
+         <translation>statement terminators.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="802"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="813"/>
+         <source>An error was found when checking</source>
+         <translation>An error was found when checking</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/customedit.cpp" line="804"/>
++        <location filename="../programs/mythfrontend/customedit.cpp" line="815"/>
+         <source>The database error was</source>
+         <translation>The database error was</translation>
+     </message>
+@@ -4590,301 +4519,239 @@
  <context>
      <name>DVBConfigurationGroup</name>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="4124"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3986"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3743"/>
          <source>Could not open card %1</source>
 -        <translation>Could not open card %1</translation>
 +        <translation>Could Not Open Card %1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="4125"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3987"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3744"/>
          <source>Could not get card info for card %1</source>
 -        <translation>Could not get card info for card %1</translation>
 +        <translation>Could Not Get Card Info for %1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="4330"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="4159"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3916"/>
          <source>DiSEqC (Switch, LNB, and Rotor Configuration)</source>
          <translation>DiSEqC (Switch, LNB, and Rotor Configuration)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="4331"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="4160"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3917"/>
          <source>Input and satellite settings.</source>
          <translation>Input and satellite settings.</translation>
      </message>
-     <message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="4322"/>
-         <source>Recording Options</source>
+-        <source>Recording Options</source>
 -        <translation>Recording Options</translation>
-+        <translation type="vanished">Recording Options</translation>
-     </message>
+-    </message>
  </context>
  <context>
      <name>DVBSignalMonitor</name>
@@ -3705,24 +5144,27 @@
      </message>
  </context>
  <context>
-@@ -4643,7 +4898,7 @@
+     <name>DVDInfo</name>
      <message>
-         <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="63"/>
+-        <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="63"/>
++        <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="65"/>
          <source>Failed to open device at %1</source>
 -        <translation>Failed to open device at %1</translation>
 +        <translation>Failed to Open Device %1</translation>
      </message>
  </context>
  <context>
-@@ -4651,227 +4906,238 @@
+     <name>DVDRingBuffer</name>
      <message>
-         <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="474"/>
+-        <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="474"/>
++        <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="476"/>
          <source>Title %1 chapter %2</source>
 -        <translation>Title %1 chapter %2</translation>
 +        <translation>Title %1 Chapter %2</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="497"/>
+-        <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="497"/>
++        <location filename="../libs/libmythtv/DVD/dvdringbuffer.cpp" line="507"/>
          <source>Failed to open DVD device at %1</source>
 -        <translation>Failed to open DVD device at %1</translation>
 +        <translation>Failed to Open DVD Device at %1</translation>
@@ -3732,51 +5174,49 @@
      <name>DataDirectLineupSelector</name>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="366"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="521"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="522"/>
          <source>Fetching lineups from %1...</source>
 -        <translation>Fetching lineups from %1...</translation>
 +        <translation>Fetching Lineups from %1...</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="527"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="533"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="547"/>
-+        <source>DataDirect</source>
-+        <translation>DataDirect</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="532"/>
-+        <source>Fetching of lineups failed</source>
-+        <translation>Fetching Lineups Failed</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="546"/>
-+        <source>Fetching of lineups complete</source>
-+        <translation>Fetching Lineups Complete</translation>
      </message>
- </context>
- <context>
-     <name>DatabaseSettings</name>
+-</context>
+-<context>
+-    <name>DatabaseSettings</name>
      <message>
 -        <location filename="../libs/libmyth/dbsettings.cpp" line="17"/>
 -        <location filename="../libs/libmyth/dbsettings.cpp" line="150"/>
-+        <location filename="../libs/libmyth/dbsettings.cpp" line="81"/>
-         <source>Use custom identifier for frontend preferences</source>
+-        <source>Use custom identifier for frontend preferences</source>
 -        <translation>Use custom identifier for frontend preferences</translation>
-+        <translation>Use Custom Identifier for Frontend Preferences</translation>
++        <location filename="../libs/libmythtv/videosource.cpp" line="528"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="534"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="548"/>
++        <source>DataDirect</source>
++        <translation>DataDirect</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/dbsettings.cpp" line="29"/>
-         <source>Backend Server Wakeup settings</source>
+-        <source>Backend Server Wakeup settings</source>
 -        <translation>Backend Server Wakeup settings</translation>
-+        <translation type="vanished">Backend Server Wakeup settings</translation>
++        <location filename="../libs/libmythtv/videosource.cpp" line="533"/>
++        <source>Fetching of lineups failed</source>
++        <translation>Fetching Lineups Failed</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/dbsettings.cpp" line="44"/>
 -        <location filename="../libs/libmyth/dbsettings.cpp" line="145"/>
-         <source>Database Configuration %1/%2</source>
+-        <source>Database Configuration %1/%2</source>
 -        <translation>Database Configuration %1/%2</translation>
-+        <translation type="vanished">Database Configuration %1/%2</translation>
++        <location filename="../libs/libmythtv/videosource.cpp" line="547"/>
++        <source>Fetching of lineups complete</source>
++        <translation>Fetching Lineups Complete</translation>
++    </message>
++</context>
++<context>
++    <name>DatabaseSettings</name>
++    <message>
++        <location filename="../libs/libmyth/dbsettings.cpp" line="81"/>
++        <source>Use custom identifier for frontend preferences</source>
++        <translation>Use Custom Identifier for Frontend Preferences</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/dbsettings.cpp" line="51"/>
@@ -3792,11 +5232,10 @@
      </message>
      <message>
 -        <location filename="../libs/libmyth/dbsettings.cpp" line="61"/>
-         <source>Database Server Settings</source>
+-        <source>Database Server Settings</source>
 -        <translation>Database Server Settings</translation>
-+        <translation type="vanished">Database Server Settings</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmyth/dbsettings.cpp" line="67"/>
 +        <location filename="../libs/libmyth/dbsettings.cpp" line="33"/>
          <source>The host name or IP address of the machine hosting the database. This information is required.</source>
@@ -3825,11 +5264,8 @@
      </message>
      <message>
 -        <location filename="../libs/libmyth/dbsettings.cpp" line="103"/>
-         <source>Database name</source>
+-        <source>Database name</source>
 -        <translation>Database name</translation>
-+        <translation type="vanished">Database name</translation>
-+    </message>
-+    <message>
 +        <location filename="../libs/libmyth/dbsettings.cpp" line="17"/>
 +        <source>Database Configuration</source>
 +        <translation>Database Configuration</translation>
@@ -3922,16 +5358,19 @@
      </message>
      <message>
 -        <location filename="../libs/libmyth/dbsettings.cpp" line="206"/>
-+        <location filename="../libs/libmyth/dbsettings.cpp" line="127"/>
-         <source>Wake command</source>
+-        <source>Wake command</source>
 -        <translation>Wake command</translation>
-+        <translation>Wake Command</translation>
++        <location filename="../libs/libmyth/dbsettings.cpp" line="127"/>
++        <source>Wake command or MAC</source>
++        <translation>Wake Command or MAC</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/dbsettings.cpp" line="208"/>
+-        <source>The command executed on this frontend to wake up the database server (eg. sudo /etc/init.d/mysql restart).</source>
+-        <translation>The command executed on this frontend to wake up the database server (eg. sudo /etc/init.d/mysql restart).</translation>
 +        <location filename="../libs/libmyth/dbsettings.cpp" line="129"/>
-         <source>The command executed on this frontend to wake up the database server (eg. sudo /etc/init.d/mysql restart).</source>
-         <translation>The command executed on this frontend to wake up the database server (eg. sudo /etc/init.d/mysql restart).</translation>
++        <source>The command executed on this frontend or server MAC to wake up the database server (eg. sudo /etc/init.d/mysql restart or 32:D2:86:00:17:A8).</source>
++        <translation></translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/dbsettings.cpp" line="238"/>
@@ -3944,89 +5383,77 @@
 -        <location filename="../libs/libmyth/dbsettings.cpp" line="258"/>
 -        <location filename="../libs/libmyth/dbsettings.cpp" line="262"/>
 -        <location filename="../libs/libmyth/dbsettings.cpp" line="266"/>
-         <source>* %1</source>
-         <comment>Required field</comment>
-         <extracomment>%1 is the required field name</extracomment>
+-        <source>* %1</source>
+-        <comment>Required field</comment>
+-        <extracomment>%1 is the required field name</extracomment>
 -        <translation>* %1</translation>
-+        <translation type="vanished">* %1</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="144"/>
-         <source>Database Settings</source>
+-        <source>Database Settings</source>
 -        <translation>Database Settings</translation>
-+        <translation type="vanished">Database Settings</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="144"/>
-         <source> (Requires edit privileges)</source>
+-        <source> (Requires edit privileges)</source>
 -        <translation> (Requires edit privileges)</translation>
-+        <translation type="vanished"> (Requires edit privileges)</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="153"/>
-         <source>Scanner Exclusions</source>
+-        <source>Scanner Exclusions</source>
 -        <translation>Scanner Exclusions</translation>
-+        <translation type="vanished">Scanner Exclusions</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="154"/>
-         <source>Comma-separated list of filenames/directory names to be ignored when scanning. Glob wildcards * and ? are valid.</source>
+-        <source>Comma-separated list of filenames/directory names to be ignored when scanning. Glob wildcards * and ? are valid.</source>
 -        <translation>Comma-separated list of filenames/directory names to be ignored when scanning. Glob wildcards * and ? are valid.</translation>
-+        <translation type="vanished">Comma-separated list of filenames/directory names to be ignored when scanning. Glob wildcards * and ? are valid.</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="165"/>
-         <source>Start Gallery when media inserted</source>
+-        <source>Start Gallery when media inserted</source>
 -        <translation>Start Gallery when media inserted</translation>
-+        <translation type="vanished">Start Gallery when media inserted</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="166"/>
-         <source>Set to automatically start Gallery when media (USB/CD&apos;s containing images) are inserted.</source>
+-        <source>Set to automatically start Gallery when media (USB/CD&apos;s containing images) are inserted.</source>
 -        <translation>Set to automatically start Gallery when media (USB/CD&apos;s containing images) are inserted.</translation>
-+        <translation type="vanished">Set to automatically start Gallery when media (USB/CD&apos;s containing images) are inserted.</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="176"/>
 +        <location filename="../libs/libmyth/dbsettings.cpp" line="72"/>
          <source>Password</source>
          <translation>Password</translation>
      </message>
-     <message>
+-    <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="178"/>
-         <source>When set all actions that modify the filesystem or database are protected (copy, move, transform, hiding, covers). Hidden items cannot be viewed. Applies to all frontends. 
- Disabled by an empty password. Privileges persist until Gallery exits to main menu.</source>
+-        <source>When set all actions that modify the filesystem or database are protected (copy, move, transform, hiding, covers). Hidden items cannot be viewed. Applies to all frontends. 
+-Disabled by an empty password. Privileges persist until Gallery exits to main menu.</source>
 -        <translation>When set all actions that modify the filesystem or database are protected (copy, move, transform, hiding, covers). Hidden items cannot be viewed. Applies to all frontends. 
-+        <translation type="vanished">When set all actions that modify the filesystem or database are protected (copy, move, transform, hiding, covers). Hidden items cannot be viewed. Applies to all frontends. 
- Disabled by an empty password. Privileges persist until Gallery exits to main menu.</translation>
-     </message>
-     <message>
+-Disabled by an empty password. Privileges persist until Gallery exits to main menu.</translation>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="193"/>
-         <source>Reset Image Database</source>
+-        <source>Reset Image Database</source>
 -        <translation>Reset Image Database</translation>
-+        <translation type="vanished">Reset Image Database</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="194"/>
-         <source>Clears the database and thumbnails for the Image Storage Group. A rescan will be required. Images for local media will persist.</source>
+-        <source>Clears the database and thumbnails for the Image Storage Group. A rescan will be required. Images for local media will persist.</source>
 -        <translation>Clears the database and thumbnails for the Image Storage Group. A rescan will be required. Images for local media will persist.</translation>
-+        <translation type="vanished">Clears the database and thumbnails for the Image Storage Group. A rescan will be required. Images for local media will persist.</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="202"/>
-         <source>Clear Now!</source>
+-        <source>Clear Now!</source>
 -        <translation>Clear Now!</translation>
-+        <translation type="vanished">Clear Now!</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="203"/>
-         <source>Warning! This will erase settings for: hidden images, directory covers and re-orientations. You will have to set them again after re-scanning.</source>
+-        <source>Warning! This will erase settings for: hidden images, directory covers and re-orientations. You will have to set them again after re-scanning.</source>
 -        <translation>Warning! This will erase settings for: hidden images, directory covers and re-orientations. You will have to set them again after re-scanning.</translation>
-+        <translation type="vanished">Warning! This will erase settings for: hidden images, directory covers and re-orientations. You will have to set them again after re-scanning.</translation>
-     </message>
+-    </message>
  </context>
  <context>
-@@ -4879,12 +5145,12 @@
+     <name>DeleteMap</name>
      <message>
          <location filename="../libs/libmythtv/deletemap.cpp" line="82"/>
          <source>(Nothing to undo)</source>
@@ -4041,39 +5468,64 @@
      </message>
      <message>
          <location filename="../libs/libmythtv/deletemap.cpp" line="99"/>
-@@ -4903,7 +5169,7 @@
+@@ -4903,7 +4770,7 @@
      </message>
      <message>
          <location filename="../libs/libmythtv/deletemap.cpp" line="124"/>
 -        <location filename="../libs/libmythtv/deletemap.cpp" line="524"/>
-+        <location filename="../libs/libmythtv/deletemap.cpp" line="525"/>
++        <location filename="../libs/libmythtv/deletemap.cpp" line="523"/>
          <source>Delete</source>
          <extracomment>Delete the current cut or preserved region</extracomment>
          <translation>Delete</translation>
-@@ -4975,35 +5241,35 @@
+@@ -4954,56 +4821,56 @@
+         <translation>error</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/deletemap.cpp" line="197"/>
++        <location filename="../libs/libmythtv/deletemap.cpp" line="196"/>
+         <source>cut</source>
+         <translation>cut</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/deletemap.cpp" line="208"/>
++        <location filename="../libs/libmythtv/deletemap.cpp" line="207"/>
+         <source>Edit</source>
+         <translation>Edit</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/deletemap.cpp" line="213"/>
++        <location filename="../libs/libmythtv/deletemap.cpp" line="212"/>
+         <source>%3 (%1 of %2)</source>
+         <extracomment>example: &quot;13:24 (10:23 of 24:37)&quot;</extracomment>
+         <translation>%3 (%1 of %2)</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/deletemap.cpp" line="283"/>
++        <location filename="../libs/libmythtv/deletemap.cpp" line="282"/>
+         <source>Reverse Cuts</source>
          <translation>Reverse Cuts</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/deletemap.cpp" line="501"/>
-+        <location filename="../libs/libmythtv/deletemap.cpp" line="502"/>
++        <location filename="../libs/libmythtv/deletemap.cpp" line="500"/>
          <source>New Cut</source>
          <translation>New Cut</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/deletemap.cpp" line="543"/>
-+        <location filename="../libs/libmythtv/deletemap.cpp" line="544"/>
++        <location filename="../libs/libmythtv/deletemap.cpp" line="542"/>
          <source>Move Mark</source>
          <translation>Move Mark</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/deletemap.cpp" line="741"/>
-+        <location filename="../libs/libmythtv/deletemap.cpp" line="742"/>
++        <location filename="../libs/libmythtv/deletemap.cpp" line="739"/>
          <source>Load Detected Commercials</source>
          <translation>Load Detected Commercials</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/deletemap.cpp" line="779"/>
-+        <location filename="../libs/libmythtv/deletemap.cpp" line="780"/>
++        <location filename="../libs/libmythtv/deletemap.cpp" line="777"/>
          <source>Load Auto-saved Cuts</source>
 -        <translation>Load Auto-saved Cuts</translation>
 +        <translation>Load Auto-Saved Cuts</translation>
@@ -4083,61 +5535,58 @@
      <name>DeletedExpireOptions</name>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="374"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="378"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="458"/>
          <source>Auto-Expire instead of delete recording</source>
 -        <translation>Auto-Expire instead of delete recording</translation>
 +        <translation>Auto-Expire Instead of Delete Recording</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="378"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="382"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="462"/>
          <source>If enabled, move deleted recordings to the &apos;Deleted&apos; recgroup and turn on autoexpire instead of deleting immediately.</source>
          <translation>If enabled, move deleted recordings to the &apos;Deleted&apos; recgroup and turn on autoexpire instead of deleting immediately.</translation>
      </message>
-@@ -5011,256 +5277,258 @@
+@@ -5011,256 +4878,238 @@
  <context>
      <name>DemoConfigurationGroup</name>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2552"/>
-         <source>A local MPEG file used to simulate a recording. Must be entered as file:/path/movie.mpg</source>
+-        <source>A local MPEG file used to simulate a recording. Must be entered as file:/path/movie.mpg</source>
 -        <translation>A local MPEG file used to simulate a recording. Must be entered as file:/path/movie.mpg</translation>
-+        <translation type="vanished">A local MPEG file used to simulate a recording. Must be entered as file:/path/movie.mpg</translation>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2260"/>
++        <source>A local MPEG file used to simulate a recording.</source>
++        <translation>A local MPEG file used to simulate a recording.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2560"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2508"/>
-+        <source>A local MPEG file used to simulate a recording.</source>
-+        <translation>A local MPEG file used to simulate a recording.</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2515"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2267"/>
          <source>File info</source>
 -        <translation>File info</translation>
 +        <translation>File Info</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2563"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2519"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2271"/>
          <source>File size</source>
 -        <translation>File size</translation>
 +        <translation>File Size</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2589"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2538"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2290"/>
          <source>%1 MB</source>
          <translation>%1 MB</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2592"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2541"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2293"/>
          <source>File not readable</source>
 -        <translation>File not readable</translation>
 +        <translation>File Not Readable</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2596"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2545"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2297"/>
          <source>File does not exist</source>
 -        <translation>File does not exist</translation>
 +        <translation>File Does Not Exist</translation>
@@ -4359,17 +5808,15 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/diseqcsettings.cpp" line="463"/>
-         <source>Position Index %1</source>
+-        <source>Position Index %1</source>
 -        <translation>Position Index %1</translation>
-+        <translation type="vanished">Position Index %1</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/diseqcsettings.cpp" line="464"/>
-         <source>Orbital Position</source>
+-        <source>Orbital Position</source>
 -        <translation>Orbital Position</translation>
-+        <translation type="vanished">Orbital Position</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/diseqcsettings.cpp" line="486"/>
 +        <location filename="../libs/libmythtv/diseqcsettings.cpp" line="501"/>
          <source>None</source>
@@ -4377,17 +5824,15 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/diseqcsettings.cpp" line="490"/>
-         <source>Position #%1 (%2)</source>
+-        <source>Position #%1 (%2)</source>
 -        <translation>Position #%1 (%2)</translation>
-+        <translation type="vanished">Position #%1 (%2)</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/diseqcsettings.cpp" line="503"/>
-         <source>Rotor Position Map</source>
+-        <source>Rotor Position Map</source>
 -        <translation>Rotor Position Map</translation>
-+        <translation type="vanished">Rotor Position Map</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/diseqcsettings.cpp" line="522"/>
 +        <location filename="../libs/libmythtv/diseqcsettings.cpp" line="542"/>
          <source>Rotor Configuration</source>
@@ -4417,7 +5862,7 @@
          <source>Universal (Europe)</source>
          <translation>Universal (Europe)</translation>
      </message>
-@@ -5275,128 +5543,132 @@
+@@ -5275,128 +5124,132 @@
          <translation>The Cartesian longitude for your location. Use negative numbers for western coordinates.</translation>
      </message>
      <message>
@@ -4577,7 +6022,7 @@
          <source>This defines the offset the frequency coming from the LNB will be in low setting. For bandstacked LNBs this is the vertical/right polarization band.</source>
          <translation>This defines the offset the frequency coming from the LNB will be in low setting. For bandstacked LNBs this is the vertical/right polarization band.</translation>
      </message>
-@@ -5411,77 +5683,75 @@
+@@ -5411,77 +5264,67 @@
          <translation>This defines the offset the frequency coming from the LNB will be in high setting. For bandstacked LNBs this is the horizontal/left polarization band.</translation>
      </message>
      <message>
@@ -4600,17 +6045,15 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/diseqcsettings.cpp" line="1091"/>
-         <source>Select Type of Device</source>
+-        <source>Select Type of Device</source>
 -        <translation>Select Type of Device</translation>
-+        <translation type="vanished">Select Type of Device</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/diseqcsettings.cpp" line="1238"/>
-         <source>DiSEqC Device Tree</source>
--        <translation>DiSEqC Device Tree</translation>
-+        <translation type="vanished">DiSEqC Device Tree</translation>
-     </message>
-     <message>
+-        <source>DiSEqC Device Tree</source>
+-        <translation>DiSEqC Device Tree</translation>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/diseqcsettings.cpp" line="1257"/>
 +        <location filename="../libs/libmythtv/diseqcsettings.cpp" line="1203"/>
          <source>Choose a port to use for this switch.</source>
@@ -4670,49 +6113,46 @@
          <source>DTV Device Configuration</source>
          <translation>DTV Device Configuration</translation>
      </message>
-@@ -5489,29 +5759,33 @@
+@@ -5489,29 +5332,29 @@
  <context>
      <name>EPGSettings</name>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2921"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2927"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3026"/>
          <source>Guide starts at channel</source>
 -        <translation>Guide starts at channel</translation>
 +        <translation>Guide Starts at Channel</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2925"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2931"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3030"/>
          <source>The program guide starts on this channel if it is run from outside of Live TV mode. Leave blank to enable Live TV automatic start channel.</source>
          <translation>The program guide starts on this channel if it is run from outside of Live TV mode. Leave blank to enable Live TV automatic start channel.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2937"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2943"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3042"/>
          <source>Record threshold</source>
 -        <translation>Record threshold</translation>
 +        <translation>Record Threshold</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2941"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2947"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3046"/>
          <source>Pressing SELECT on a show that is at least this many minutes into the future will schedule a recording.</source>
          <translation>Pressing SELECT on a show that is at least this many minutes into the future will schedule a recording.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4163"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4201"/>
+-        <source>Program Guide %1/%2</source>
+-        <translation>Program Guide %1/%2</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4425"/>
 +        <source>Program Guide</source>
 +        <translation>Program Guide</translation>
-+    </message>
-+    <message>
-         <source>Program Guide %1/%2</source>
--        <translation>Program Guide %1/%2</translation>
-+        <translation type="vanished">Program Guide %1/%2</translation>
      </message>
  </context>
  <context>
-@@ -5529,12 +5803,12 @@
+@@ -5529,12 +5372,12 @@
      <message>
          <location filename="../programs/mythfrontend/editvideometadata.cpp" line="500"/>
          <source>Enter new category</source>
@@ -4727,7 +6167,7 @@
      </message>
      <message>
          <location filename="../programs/mythfrontend/editvideometadata.cpp" line="663"/>
-@@ -5545,22 +5819,22 @@
+@@ -5545,58 +5388,58 @@
      <message>
          <location filename="../programs/mythfrontend/editvideometadata.cpp" line="682"/>
          <source>Downloading selected artwork...</source>
@@ -4754,130 +6194,252 @@
      </message>
  </context>
  <context>
-@@ -5611,7 +5885,7 @@
+     <name>EditPowerSearchPopup</name>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="525"/>
++        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="509"/>
+         <source>(Any Program Type)</source>
+         <translation>(Any Program Type)</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="527"/>
++        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="511"/>
+         <source>Movies</source>
+         <translation>Movies</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="529"/>
++        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="513"/>
+         <source>Series</source>
+         <translation>Series</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="531"/>
++        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="515"/>
+         <source>Show</source>
+         <translation>Show</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="533"/>
++        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="517"/>
+         <source>Sports</source>
+         <translation>Sports</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="539"/>
++        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="523"/>
+         <source>(Any Genre)</source>
+         <translation>(Any Genre)</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="566"/>
++        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="550"/>
+         <source>(Any Channel)</source>
+         <translation>(Any Channel)</translation>
+     </message>
+@@ -5611,22 +5454,22 @@
      <message>
          <location filename="../programs/mythfrontend/exitprompt.cpp" line="227"/>
          <source>Yes, Exit now</source>
 -        <translation>Yes, Exit now</translation>
-+        <translation>Yes, Exit</translation>
++        <translation>Exit</translation>
      </message>
      <message>
          <location filename="../programs/mythfrontend/exitprompt.cpp" line="229"/>
-@@ -5644,12 +5918,12 @@
+         <source>Yes, Exit and Reboot</source>
+-        <translation>Yes, Exit and Reboot</translation>
++        <translation>Exit and Reboot</translation>
+     </message>
+     <message>
+         <location filename="../programs/mythfrontend/exitprompt.cpp" line="231"/>
+         <source>Yes, Exit and Shutdown</source>
+-        <translation>Yes, Exit and Shutdown</translation>
++        <translation>Exit and Shutdown</translation>
+     </message>
+     <message>
+         <location filename="../programs/mythfrontend/exitprompt.cpp" line="233"/>
+         <source>Yes, Enter Standby Mode</source>
+-        <translation>Yes, Enter Standby Mode</translation>
++        <translation>Enter Standby Mode</translation>
+     </message>
+     <message>
+         <location filename="../programs/mythtv-setup/exitprompt.cpp" line="39"/>
+@@ -5644,12 +5487,12 @@
      <message>
          <location filename="../programs/mythtv-setup/exitprompt.cpp" line="85"/>
          <source>Yes please</source>
 -        <translation>Yes please</translation>
-+        <translation>Yes, Fix</translation>
++        <translation>Fix</translation>
      </message>
      <message>
          <location filename="../programs/mythtv-setup/exitprompt.cpp" line="86"/>
          <source>No, I know what I am doing</source>
 -        <translation>No, I know what I am doing</translation>
-+        <translation>No, Do Not Fix</translation>
++        <translation>Do Not Fix</translation>
      </message>
  </context>
  <context>
-@@ -5668,34 +5942,51 @@
+@@ -5666,79 +5509,132 @@
+     </message>
+ </context>
  <context>
++    <name>ExternRecChannelScanner</name>
++    <message>
++        <location filename="../libs/libmythtv/channelscan/externrecscanner.cpp" line="101"/>
++        <source>Creating channel list</source>
++        <translation>Creating Channel List</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/channelscan/externrecscanner.cpp" line="120"/>
++        <source>Processing channels</source>
++        <translation>Processing Channels</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/channelscan/externrecscanner.cpp" line="138"/>
++        <source>Adding Channels</source>
++        <translation>Adding Channels</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/channelscan/externrecscanner.cpp" line="143"/>
++        <source>Channel #%1 : %2</source>
++        <translation>Channel #%1 : %2</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/channelscan/externrecscanner.cpp" line="156"/>
++        <source>Adding %1</source>
++        <translation>Adding %1</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/channelscan/externrecscanner.cpp" line="167"/>
++        <source>Updating %1</source>
++        <translation>Updating %1</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/channelscan/externrecscanner.cpp" line="196"/>
++        <source>Removing unused Channel #%1</source>
++        <translation>Removing Unused Channel #%1</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/channelscan/externrecscanner.cpp" line="205"/>
++        <source>Found %1 channels.</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/channelscan/externrecscanner.cpp" line="209"/>
++        <source>Done</source>
++        <translation>Done</translation>
++    </message>
++</context>
++<context>
      <name>ExternalConfigurationGroup</name>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2611"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2560"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2312"/>
 +        <source>Command path</source>
 +        <translation>Command Path</translation>
 +    </message>
 +    <message>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2561"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2313"/>
          <source>A &apos;black box&apos; application controlled via stdin, status on stderr and TransportStream read from stdout</source>
 -        <translation>A &apos;black box&apos; application controlled via stdin, status on stderr and TransportStream read from stdout</translation>
 +        <translation>A &apos;black box&apos; application controlled via stdin, status on stderr and TransportStream read from stdout.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2616"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2566"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2318"/>
          <source>File info</source>
 -        <translation>File info</translation>
 +        <translation>File Info</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2638"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2589"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2341"/>
          <source>&apos;%1&apos; is valid.</source>
          <translation>&apos;%1&apos; is valid.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2640"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2591"/>
+-        <source>&apos;%1&apos; is not readable.</source>
+-        <translation>&apos;%1&apos; is not readable.</translation>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2343"/>
 +        <source>WARNING: &apos;%1&apos; is not readable.</source>
 +        <translation>WARNING: &apos;%1&apos; is not readable.</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2594"/>
-+        <source>WARNING: &apos;%1&apos; is not executable.</source>
-+        <translation>WARNING: &apos;%1&apos; is not executable.</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2599"/>
-+        <source>WARNING: &apos;%1&apos; does not exist.</source>
-+        <translation>WARNING: &apos;%1&apos; does not exist.</translation>
-+    </message>
-+    <message>
-         <source>&apos;%1&apos; is not readable.</source>
--        <translation>&apos;%1&apos; is not readable.</translation>
-+        <translation type="vanished">&apos;%1&apos; is not readable.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2642"/>
-         <source>&apos;%1&apos; is not executable.</source>
+-        <source>&apos;%1&apos; is not executable.</source>
 -        <translation>&apos;%1&apos; is not executable.</translation>
-+        <translation type="vanished">&apos;%1&apos; is not executable.</translation>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2346"/>
++        <source>WARNING: &apos;%1&apos; is not executable.</source>
++        <translation>WARNING: &apos;%1&apos; is not executable.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2646"/>
-         <source>&apos;%1&apos; does not exist.</source>
+-        <source>&apos;%1&apos; does not exist.</source>
 -        <translation>&apos;%1&apos; does not exist.</translation>
-+        <translation type="vanished">&apos;%1&apos; does not exist.</translation>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2351"/>
++        <source>WARNING: &apos;%1&apos; does not exist.</source>
++        <translation>WARNING: &apos;%1&apos; does not exist.</translation>
      </message>
  </context>
  <context>
-@@ -5708,22 +5999,22 @@
+     <name>FileAssocDialog</name>
+     <message>
+-        <location filename="../programs/mythfrontend/videofileassoc.cpp" line="373"/>
++        <location filename="../programs/mythfrontend/videofileassoc.cpp" line="375"/>
+         <source>Select a file extension from this list to modify or delete its settings.</source>
+         <translation>Select a file extension from this list to modify or delete its settings.</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/videofileassoc.cpp" line="375"/>
+-        <location filename="../programs/mythfrontend/videofileassoc.cpp" line="375"/>
++        <location filename="../programs/mythfrontend/videofileassoc.cpp" line="377"/>
          <source>The command to use when playing this kind of file.  To use MythTV&apos;s Internal player, use &quot;Internal&quot; as the player.  For all other players, you can use %s to substitute the filename.</source>
 -        <translation>The command to use when playing this kind of file.  To use MythTV&apos;s Internal player, use &quot;Internal&quot; as the player.  For all other players, you can use %s to substitute the filename.</translation>
 +        <translation>The command to use when playing this kind of file. To use MythTV&apos;s Internal player, use &quot;Internal&quot; as the player. For all other players, you can use %s to substitute the filename.</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/videofileassoc.cpp" line="379"/>
+-        <location filename="../programs/mythfrontend/videofileassoc.cpp" line="379"/>
++        <location filename="../programs/mythfrontend/videofileassoc.cpp" line="381"/>
          <source>When checked, this will cause the file extension to be ignored in scans of your library.</source>
 -        <translation>When checked, this will cause the file extension to be ignored in scans of your library.</translation>
 +        <translation>When enabled, this will cause the file extension to be ignored in scans of your library.</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/videofileassoc.cpp" line="381"/>
+-        <location filename="../programs/mythfrontend/videofileassoc.cpp" line="381"/>
++        <location filename="../programs/mythfrontend/videofileassoc.cpp" line="383"/>
          <source>When checked, this will cause the global player settings to override this one.</source>
 -        <translation>When checked, this will cause the global player settings to override this one.</translation>
 +        <translation>When enabled, this will cause the global player settings to override this one.</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/videofileassoc.cpp" line="383"/>
+-        <location filename="../programs/mythfrontend/videofileassoc.cpp" line="383"/>
++        <location filename="../programs/mythfrontend/videofileassoc.cpp" line="385"/>
          <source>Save and exit this screen.</source>
 -        <translation>Save and exit this screen.</translation>
 +        <translation>Save and Exit</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/videofileassoc.cpp" line="384"/>
-@@ -5738,7 +6029,7 @@
+-        <location filename="../programs/mythfrontend/videofileassoc.cpp" line="384"/>
++        <location filename="../programs/mythfrontend/videofileassoc.cpp" line="386"/>
+         <source>Create a new file extension.</source>
+         <translation>Create a new file extension.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofileassoc.cpp" line="385"/>
++        <location filename="../programs/mythfrontend/videofileassoc.cpp" line="387"/>
+         <source>Delete this file extension.</source>
+         <translation>Delete this file extension.</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/videofileassoc.cpp" line="444"/>
+-        <location filename="../programs/mythfrontend/videofileassoc.cpp" line="444"/>
++        <location filename="../programs/mythfrontend/videofileassoc.cpp" line="446"/>
          <source>Enter the new extension:</source>
 -        <translation>Enter the new extension:</translation>
 +        <translation>Enter new extension:</translation>
      </message>
  </context>
  <context>
-@@ -5747,45 +6038,45 @@
+@@ -5747,45 +5643,45 @@
          <location filename="../libs/libmythtv/fileringbuffer.cpp" line="304"/>
          <source>Could not open %1</source>
          <extracomment>%1 is the filename</extracomment>
@@ -4932,271 +6494,208 @@
          <source>Complete</source>
          <translation>Complete</translation>
      </message>
-@@ -5793,15 +6084,88 @@
+@@ -5793,164 +5689,164 @@
  <context>
      <name>FirewireDesc</name>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1255"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1297"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1312"/>
          <source>Description</source>
          <translation>Description</translation>
      </message>
  </context>
  <context>
+-    <name>GallerySettings</name>
 +    <name>GUIStartup</name>
-+    <message>
-+        <location filename="../libs/libmyth/guistartup.cpp" line="192"/>
-+        <source>Do you really want to exit MythTV?</source>
-+        <translation>Do you really want to exit MythTV?</translation>
-+    </message>
-+</context>
-+<context>
-+    <name>GalleryDbSettings</name>
-+    <message>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="155"/>
-+        <source>Database Settings</source>
-+        <translation>Database Settings</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="155"/>
-+        <source> (Requires edit privileges)</source>
-+        <translation>(Requires Edit Privileges)</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="164"/>
-+        <source>Scanner Exclusions</source>
-+        <translation>Scanner Exclusions</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="165"/>
-+        <source>Comma-separated list of filenames/directory names to be ignored when scanning. Glob wildcards * and ? are valid.</source>
-+        <translation>Comma-separated list of file/directory names to be ignored when scanning. Glob wildcards * and ? are valid.</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="176"/>
-+        <source>Start Gallery when media inserted</source>
-+        <translation>Start Gallery when Media Inserted</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="177"/>
-+        <source>Set to automatically start Gallery when media (USB/CD&apos;s containing images) are inserted.</source>
-+        <translation>Set to automatically start Gallery when media (USB/CD&apos;s containing images) are inserted.</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="187"/>
-+        <source>Password</source>
-+        <translation>Password</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="189"/>
-+        <source>When set all actions that modify the filesystem or database are protected (copy, move, transform, hiding, covers). Hidden items cannot be viewed. Applies to all frontends. 
-+Disabled by an empty password. Privileges persist until Gallery exits to main menu.</source>
-+        <translation>When set all actions that modify the filesystem or database are protected (copy, move, transform, hiding, covers). Hidden items cannot be viewed. Applies to all frontends. 
-+Disabled by an empty password. Privileges persist until Gallery exits to main menu.</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="204"/>
-+        <source>Reset Image Database</source>
-+        <translation>Reset Image Database</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="205"/>
-+        <source>Clears the database and thumbnails for the Image Storage Group. A rescan will be required. Images for local media will persist.</source>
-+        <translation>Clears the database and thumbnails for the Image Storage Group. A rescan will be required. Images for local media will persist.</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="213"/>
-+        <source>Clear Now!</source>
-+        <translation>Clear Now!</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="214"/>
-+        <source>Warning! This will erase settings for: hidden images, directory covers and re-orientations. You will have to set them again after re-scanning.</source>
-+        <translation>Warning! This will erase settings for hidden images, directory covers, and re-orientations. You will have to set them again after re-scanning.</translation>
-+    </message>
-+</context>
-+<context>
-     <name>GallerySettings</name>
      <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="109"/>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="120"/>
-         <source>Gallery Settings</source>
-         <translation>Gallery Settings</translation>
+-        <source>Gallery Settings</source>
+-        <translation>Gallery Settings</translation>
++        <location filename="../libs/libmyth/guistartup.cpp" line="193"/>
++        <source>Do you really want to exit MythTV?</source>
++        <translation>Do you really want to exit MythTV?</translation>
      </message>
-@@ -5809,135 +6173,135 @@
+ </context>
  <context>
      <name>GallerySlideView</name>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="100"/>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="524"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="106"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="533"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="108"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="538"/>
          <source>Hide</source>
          <translation>Hide</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="258"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="268"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="270"/>
          <source>Slideshow Options</source>
          <translation>Slideshow Options</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="262"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="272"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="274"/>
          <source>Play Video</source>
          <translation>Play Video</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="265"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="275"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="277"/>
          <source>Stop</source>
          <translation>Stop</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="267"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="277"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="279"/>
          <source>Start SlideShow</source>
          <translation>Start SlideShow</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="270"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="280"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="282"/>
          <source>Turn Repeat Off</source>
          <translation>Turn Repeat Off</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="272"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="282"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="284"/>
          <source>Turn Repeat On</source>
          <translation>Turn Repeat On</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="279"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="289"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="291"/>
          <source>Hide Captions</source>
          <translation>Hide Captions</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="281"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="291"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="293"/>
          <source>Show Captions</source>
          <translation>Show Captions</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="287"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="297"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="299"/>
          <source>More Details</source>
          <translation>More Details</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="288"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="298"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="300"/>
          <source>Less Details</source>
          <translation>Less Details</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="290"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="300"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="302"/>
          <source>Show Details</source>
          <translation>Show Details</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="295"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="305"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="307"/>
          <source>Hide Details</source>
          <translation>Hide Details</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="315"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="325"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="327"/>
          <source>Transform Options</source>
          <translation>Transform Options</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="319"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="329"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="331"/>
          <source>Rotate CW</source>
          <translation>Rotate CW</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="320"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="330"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="332"/>
          <source>Rotate CCW</source>
          <translation>Rotate CCW</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="321"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="331"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="333"/>
          <source>Flip Horizontal</source>
          <translation>Flip Horizontal</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="322"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="332"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="334"/>
          <source>Flip Vertical</source>
          <translation>Flip Vertical</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="323"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="333"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="335"/>
          <source>Reset to Exif</source>
          <translation>Reset to Exif</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="327"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="337"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="339"/>
          <source>Zoom In</source>
          <translation>Zoom In</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="330"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="340"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="342"/>
          <source>Zoom Out</source>
          <translation>Zoom Out</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="332"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="342"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="344"/>
          <source>Transforms</source>
          <translation>Transforms</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="409"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="419"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="423"/>
          <source>Stopped</source>
          <translation>Stopped</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="425"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="434"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="439"/>
          <source>Playing</source>
          <translation>Playing</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="547"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="556"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="561"/>
          <source>Loading</source>
          <translation>Loading</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="585"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="759"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="766"/>
          <source>Failed to load %1</source>
 -        <translation>Failed to load %1</translation>
 +        <translation>Failed to Load %1</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/galleryslideview.cpp" line="654"/>
-@@ -5950,7 +6314,7 @@
+-        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="654"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="659"/>
+         <source>Video</source>
+         <translation>Video</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="670"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="675"/>
+         <source>Start</source>
          <translation>Start</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="689"/>
-+        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="692"/>
++        <location filename="../programs/mythfrontend/galleryslideview.cpp" line="698"/>
          <source>End</source>
          <extracomment>Slideshow has reached last slide</extracomment>
          <translation>End</translation>
-@@ -5959,12 +6323,12 @@
+@@ -5959,12 +5855,12 @@
  <context>
      <name>GalleryThumbView</name>
      <message>
@@ -5207,64 +6706,64 @@
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="617"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="636"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="637"/>
          <source>No images found.
  Scan storage group using menu,
  or insert/mount local media.
-@@ -5975,477 +6339,477 @@
+@@ -5975,477 +5871,477 @@
  </translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="896"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="921"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="922"/>
          <source>%L1 of %L3</source>
          <translation>%L1 of %L3</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="953"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="980"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="981"/>
          <source>Hidden</source>
          <translation>Hidden</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="962"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="989"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="990"/>
          <source>Pictures</source>
          <translation>Pictures</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="963"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="990"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="991"/>
          <source>Videos</source>
          <translation>Videos</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="984"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1011"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1012"/>
          <source>Gallery Options</source>
          <translation>Gallery Options</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1001"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1028"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1029"/>
          <source>Enable Edits</source>
          <translation>Enable Edits</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1006"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1033"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1034"/>
          <source>Stop Scan</source>
          <translation>Stop Scan</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1008"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1035"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1036"/>
          <source>Scan Storage Group</source>
          <translation>Scan Storage Group</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1010"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1037"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1038"/>
          <source>Settings</source>
          <translation>Settings</translation>
      </message>
@@ -5273,430 +6772,430 @@
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1090"/>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1111"/>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1150"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1058"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1117"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1138"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1177"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1059"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1118"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1139"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1178"/>
          <source>%L1 marked</source>
 -        <translation>%L1 marked</translation>
 +        <translation>%L1 Marked</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1038"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1065"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1066"/>
          <source>Unmark File</source>
          <translation>Unmark File</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1040"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1067"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1068"/>
          <source>Mark File</source>
          <translation>Mark File</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1047"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1074"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1075"/>
          <source>Unmark Directory</source>
          <translation>Unmark Directory</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1049"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1076"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1077"/>
          <source>Mark Directory</source>
          <translation>Mark Directory</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1056"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1083"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1084"/>
          <source>Mark All</source>
          <translation>Mark All</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1061"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1088"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1089"/>
          <source>Unmark All</source>
          <translation>Unmark All</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1062"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1089"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1090"/>
          <source>Invert Marked</source>
          <translation>Invert Marked</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1069"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1096"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1097"/>
          <source>Mark</source>
          <translation>Mark</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1094"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1121"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1122"/>
          <source>Move Marked Into</source>
          <translation>Move Marked Into</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1095"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1122"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1123"/>
          <source>Copy Marked Into</source>
          <translation>Copy Marked Into</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1097"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1124"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1125"/>
          <source>Paste</source>
          <translation>Paste</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1115"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1142"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1143"/>
          <source>Rotate Marked CW</source>
          <translation>Rotate Marked CW</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1116"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1143"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1144"/>
          <source>Rotate Marked CCW</source>
          <translation>Rotate Marked CCW</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1117"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1144"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1145"/>
          <source>Flip Marked Horizontal</source>
          <translation>Flip Marked Horizontal</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1118"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1145"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1146"/>
          <source>Flip Marked Vertical</source>
          <translation>Flip Marked Vertical</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1119"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1146"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1147"/>
          <source>Reset Marked to Exif</source>
          <translation>Reset Marked to Exif</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1121"/>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1133"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1148"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1160"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1149"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1161"/>
          <source>Transforms</source>
          <translation>Transforms</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1127"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1154"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1155"/>
          <source>Rotate CW</source>
          <translation>Rotate CW</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1128"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1155"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1156"/>
          <source>Rotate CCW</source>
          <translation>Rotate CCW</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1129"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1156"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1157"/>
          <source>Flip Horizontal</source>
          <translation>Flip Horizontal</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1130"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1157"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1158"/>
          <source>Flip Vertical</source>
          <translation>Flip Vertical</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1131"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1158"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1159"/>
          <source>Reset to Exif</source>
          <translation>Reset to Exif</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1156"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1183"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1184"/>
          <source>Hide Marked</source>
          <translation>Hide Marked</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1158"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1185"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1186"/>
          <source>Unhide Marked</source>
          <translation>Unhide Marked</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1160"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1187"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1188"/>
          <source>Delete Marked</source>
          <translation>Delete Marked</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1171"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1198"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1199"/>
          <source>Unhide</source>
          <translation>Unhide</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1173"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1200"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1201"/>
          <source>Hide</source>
          <translation>Hide</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1175"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1202"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1203"/>
          <source>Use as Cover</source>
          <translation>Use as Cover</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1176"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1203"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1204"/>
          <source>Delete</source>
          <translation>Delete</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1177"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1204"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1205"/>
          <source>Rename</source>
          <translation>Rename</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1180"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1207"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1208"/>
          <source>Reset Cover</source>
          <translation>Reset Cover</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1186"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1213"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1214"/>
          <source>Create Directory</source>
          <translation>Create Directory</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1191"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1218"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1219"/>
          <source>Import</source>
          <translation>Import</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1195"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1222"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1223"/>
          <source>Eject media</source>
 -        <translation>Eject media</translation>
 +        <translation>Eject Media</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1200"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1227"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1228"/>
          <source>Actions</source>
          <translation>Actions</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1215"/>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1241"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1242"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1268"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1243"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1269"/>
          <source>Shuffled</source>
          <translation>Shuffled</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1216"/>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1242"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1243"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1269"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1244"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1270"/>
          <source>Random</source>
          <translation>Random</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1217"/>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1243"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1244"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1270"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1245"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1271"/>
          <source>Seasonal</source>
          <translation>Seasonal</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1219"/>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1240"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1246"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1267"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1247"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1268"/>
          <source>Ordered</source>
          <translation>Ordered</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1222"/>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1252"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1249"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1279"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1250"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1280"/>
          <source>Slideshow</source>
          <translation>Slideshow</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1229"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1256"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1257"/>
          <source>Directory</source>
          <translation>Directory</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1232"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1259"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1260"/>
          <source>Recursive</source>
          <translation>Recursive</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1235"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1262"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1263"/>
          <source>Current Directory</source>
          <translation>Current Directory</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1237"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1264"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1265"/>
          <source>Slideshow Order</source>
          <translation>Slideshow Order</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1245"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1272"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1273"/>
          <source>Change Order</source>
          <translation>Change Order</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1248"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1275"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1276"/>
          <source>Turn Repeat Off</source>
          <translation>Turn Repeat Off</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1250"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1277"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1278"/>
          <source>Turn Repeat On</source>
          <translation>Turn Repeat On</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1262"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1289"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1290"/>
          <source>Show Options</source>
          <translation>Show Options</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1267"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1294"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1295"/>
          <source>Hide Pictures</source>
          <translation>Hide Pictures</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1268"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1295"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1296"/>
          <source>Hide Videos</source>
          <translation>Hide Videos</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1271"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1298"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1299"/>
          <source>Show Videos</source>
          <translation>Show Videos</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1271"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1298"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1299"/>
          <source>Show Pictures</source>
          <translation>Show Pictures</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1275"/>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1283"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1302"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1310"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1303"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1311"/>
          <source>Image Captions</source>
          <translation>Image Captions</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1278"/>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1288"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1305"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1315"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1306"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1316"/>
          <source>Name</source>
          <translation>Name</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1279"/>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1289"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1306"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1316"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1307"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1317"/>
          <source>Date</source>
          <translation>Date</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1280"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1307"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1308"/>
          <source>Comment</source>
          <translation>Comment</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1281"/>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1290"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1308"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1317"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1309"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1318"/>
          <source>None</source>
          <translation>None</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1286"/>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1292"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1313"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1319"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1314"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1320"/>
          <source>Directory Captions</source>
          <translation>Directory Captions</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1297"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1324"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1325"/>
          <source>Hide Hidden Items</source>
          <translation>Hide Hidden Items</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1299"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1326"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1327"/>
          <source>Show Hidden Items</source>
          <translation>Show Hidden Items</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1303"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1330"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1331"/>
          <source>Zoom Out</source>
          <translation>Zoom Out</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1305"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1332"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1333"/>
          <source>Zoom In</source>
          <translation>Zoom In</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1308"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1335"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1336"/>
          <source>Show Details</source>
          <translation>Show Details</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1308"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1335"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1336"/>
          <source>Hide Details</source>
          <translation>Hide Details</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1312"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1339"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1340"/>
          <source>Show</source>
          <translation>Show</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1567"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1594"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1595"/>
          <source>Do you want to delete
  %1 ?</source>
          <translation>Do you want to delete
@@ -5704,26 +7203,26 @@
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1577"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1604"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1605"/>
          <source>Do you want to delete all marked files ?</source>
          <translation>Do you want to delete all marked files ?</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1675"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1702"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1710"/>
          <source>Enter a new name:</source>
 -        <translation>Enter a new name:</translation>
 +        <translation>Enter name:</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1703"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1730"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1738"/>
          <source>Enter password:</source>
          <translation>Enter password:</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1817"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1844"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1852"/>
          <source>Enter name of new directory</source>
 -        <translation>Enter name of new directory</translation>
 +        <translation>Enter directory name:</translation>
@@ -5731,29 +7230,29 @@
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1863"/>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1990"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1890"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2017"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1898"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2025"/>
          <source>No files specified</source>
 -        <translation>No files specified</translation>
 +        <translation>No Files Specified</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1874"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1901"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1909"/>
          <source>No images</source>
 -        <translation>No images</translation>
 +        <translation>No Images</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1901"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1928"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1936"/>
          <source>Copying files</source>
 -        <translation>Copying files</translation>
 +        <translation>Copying Files</translation>
      </message>
      <message numerus="yes">
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1919"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1946"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="1954"/>
          <source>Failed to copy %L1/%Ln file(s)</source>
          <translation>
 -            <numerusform>Failed to copy %L1/%Ln file</numerusform>
@@ -5764,21 +7263,21 @@
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2007"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2034"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2042"/>
          <source>No images specified</source>
 -        <translation>No images specified</translation>
 +        <translation>No Images Specified</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2035"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2062"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2070"/>
          <source>Moving files</source>
 -        <translation>Moving files</translation>
 +        <translation>Moving Files</translation>
      </message>
      <message numerus="yes">
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2054"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2081"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2089"/>
          <source>Failed to move %L1/%Ln file(s)</source>
          <translation>
 -            <numerusform>Failed to move %L1/%Ln file</numerusform>
@@ -5789,13 +7288,13 @@
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2083"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2110"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2118"/>
          <source>Failed to create temporary directory.</source>
          <translation>Failed to create temporary directory.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2093"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2120"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2128"/>
          <source>Running Import command.
  Please wait...</source>
          <translation>Running Import command.
@@ -5803,399 +7302,399 @@
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2103"/>
-+        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2130"/>
++        <location filename="../programs/mythfrontend/gallerythumbview.cpp" line="2138"/>
          <source>Import command failed.
  Error: %1</source>
          <translation>Import command failed.
-@@ -6455,117 +6819,117 @@
+@@ -6455,117 +6351,117 @@
  <context>
      <name>GeneralRecPrioritiesSettings</name>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2756"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2762"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2861"/>
          <source>Avoid back to back recordings</source>
 -        <translation>Avoid back to back recordings</translation>
 +        <translation>Avoid Back to Back Recordings</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2760"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2766"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2865"/>
          <source>Selects the situations where the scheduler will avoid assigning shows to the same card if their end time and start time match. This will be allowed when necessary in order to resolve conflicts.</source>
          <translation>Selects the situations where the scheduler will avoid assigning shows to the same card if their end time and start time match. This will be allowed when necessary in order to resolve conflicts.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2767"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2773"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2872"/>
          <source>Never</source>
          <translation>Never</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2768"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2774"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2873"/>
          <source>Different Channels</source>
          <translation>Different Channels</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2770"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2776"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2875"/>
          <source>Always</source>
          <translation>Always</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2781"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2787"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2886"/>
          <source>Preferred input priority</source>
 -        <translation>Preferred input priority</translation>
 +        <translation>Preferred Input Priority</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2783"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2789"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2888"/>
          <source>Additional priority when a showing matches the preferred input selected in the &apos;Scheduling Options&apos; section of the recording rule.</source>
          <translation>Additional priority when a showing matches the preferred input selected in the &apos;Scheduling Options&apos; section of the recording rule.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2798"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2804"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2903"/>
          <source>HDTV recording priority</source>
 -        <translation>HDTV recording priority</translation>
 +        <translation>HDTV Recording Priority</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2800"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2806"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2905"/>
          <source>Additional priority when a showing is marked as an HDTV broadcast in the TV listings.</source>
          <translation>Additional priority when a showing is marked as an HDTV broadcast in the TV listings.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2814"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2820"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2919"/>
          <source>Widescreen recording priority</source>
 -        <translation>Widescreen recording priority</translation>
 +        <translation>Widescreen Recording Priority</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2817"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2823"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2922"/>
          <source>Additional priority when a showing is marked as widescreen in the TV listings.</source>
          <translation>Additional priority when a showing is marked as widescreen in the TV listings.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2832"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2838"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2937"/>
          <source>Sign language recording priority</source>
 -        <translation>Sign language recording priority</translation>
 +        <translation>Sign Language Recording Priority</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2835"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2841"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2940"/>
          <source>Additional priority when a showing is marked as having in-vision sign language.</source>
          <translation>Additional priority when a showing is marked as having in-vision sign language.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2851"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2857"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2956"/>
          <source>In-vision Subtitles Recording Priority</source>
          <translation>In-vision Subtitles Recording Priority</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2854"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2860"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2959"/>
          <source>Additional priority when a showing is marked as having in-vision subtitles.</source>
          <translation>Additional priority when a showing is marked as having in-vision subtitles.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2869"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2875"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2974"/>
          <source>Subtitles/CC recording priority</source>
 -        <translation>Subtitles/CC recording priority</translation>
 +        <translation>Subtitles/CC Recording Priority</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2872"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2878"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2977"/>
          <source>Additional priority when a showing is marked as having subtitles or closed captioning (CC) available.</source>
          <translation>Additional priority when a showing is marked as having subtitles or closed captioning (CC) available.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2888"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2894"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2993"/>
          <source>Hard of hearing priority</source>
 -        <translation>Hard of hearing priority</translation>
 +        <translation>Hard of Hearing Priority</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2890"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2896"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2995"/>
          <source>Additional priority when a showing is marked as having support for viewers with impaired hearing.</source>
          <translation>Additional priority when a showing is marked as having support for viewers with impaired hearing.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2906"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2912"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3011"/>
          <source>Audio described priority</source>
 -        <translation>Audio described priority</translation>
 +        <translation>Audio Described Priority</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2908"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2914"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3013"/>
          <source>Additional priority when a showing is marked as being Audio Described.</source>
          <translation>Additional priority when a showing is marked as being Audio Described.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4175"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4211"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4435"/>
          <source>Scheduler Options</source>
          <translation>Scheduler Options</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4186"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4222"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4446"/>
          <source>Accessibility Options</source>
          <translation>Accessibility Options</translation>
      </message>
-@@ -6573,270 +6937,271 @@
+@@ -6573,270 +6469,291 @@
  <context>
      <name>GeneralSettings</name>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="205"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="209"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="289"/>
          <source>Commercial detection method</source>
 -        <translation>Commercial detection method</translation>
 +        <translation>Commercial Detection Method</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="207"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="211"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="291"/>
          <source>This determines the method used by MythTV to detect when commercials start and end.</source>
          <translation>This determines the method used by MythTV to detect when commercials start and end.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="223"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="227"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="307"/>
          <source>Enable experimental speedup of commercial detection</source>
 -        <translation>Enable experimental speedup of commercial detection</translation>
 +        <translation>Experimental Speedup of Commercial Detection</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="228"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="232"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="312"/>
          <source>If enabled, experimental commercial detection speedups will be enabled.</source>
          <translation>If enabled, experimental commercial detection speedups will be enabled.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="258"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="262"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="342"/>
          <source>Deferral days for auto transcode jobs</source>
 -        <translation>Deferral days for auto transcode jobs</translation>
 +        <translation>Deferral Days for Auto Transcode Jobs</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="260"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="264"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="344"/>
          <source>If non-zero, automatic transcode jobs will be scheduled to run this many days after a recording completes instead of immediately afterwards.</source>
          <translation>If non-zero, automatic transcode jobs will be scheduled to run this many days after a recording completes instead of immediately afterwards.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="274"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="278"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="358"/>
          <source>Strict commercial detection</source>
 -        <translation>Strict commercial detection</translation>
 +        <translation>Strict Commercial Detection</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="278"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="282"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="362"/>
          <source>Enable stricter commercial detection code. Disable if some commercials are not being detected.</source>
          <translation>Enable stricter commercial detection code. Disable if some commercials are not being detected.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="357"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="361"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="441"/>
          <source>Extra disk space (GB)</source>
 -        <translation>Extra disk space (GB)</translation>
 +        <translation>Extra Disk Space (GB)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="359"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="363"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="443"/>
          <source>Extra disk space (in gigabytes) beyond what MythTV requires that you want to keep free on the recording file systems.</source>
          <translation>Extra disk space (in gigabytes) beyond what MythTV requires that you want to keep free on the recording file systems.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="389"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="393"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="473"/>
          <source>Time to retain deleted recordings (days)</source>
 -        <translation>Time to retain deleted recordings (days)</translation>
 +        <translation>Time to Retain Deleted Recordings (days)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="392"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="396"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="476"/>
          <source>Determines the maximum number of days before undeleting a recording will become impossible. A value of zero means the recording will be permanently deleted between 5 and 20 minutes later. A value of minus one means recordings will be retained until space is required. A recording will always be removed before this time if the space is needed for a new recording.</source>
          <translation>Determines the maximum number of days before undeleting a recording will become impossible. A value of zero means the recording will be permanently deleted between 5 and 20 minutes later. A value of minus one means recordings will be retained until space is required. A recording will always be removed before this time if the space is needed for a new recording.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="435"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="439"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="519"/>
          <source>Auto-Expire method</source>
 -        <translation>Auto-Expire method</translation>
 +        <translation>Auto-Expire Method</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="437"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="441"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="521"/>
          <source>Oldest show first</source>
 -        <translation>Oldest show first</translation>
 +        <translation>Oldest Show First</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="438"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="442"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="522"/>
          <source>Lowest priority first</source>
 -        <translation>Lowest priority first</translation>
 +        <translation>Lowest Priority First</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="439"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="443"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="523"/>
          <source>Weighted time/priority combination</source>
 -        <translation>Weighted time/priority combination</translation>
 +        <translation>Weighted Time/Priority Combination</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="442"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="446"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="526"/>
          <source>Method used to determine which recorded shows to delete first. Live TV recordings will always expire before normal recordings.</source>
          <translation>Method used to determine which recorded shows to delete first. Live TV recordings will always expire before normal recordings.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="455"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="459"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="539"/>
          <source>Watched before unwatched</source>
 -        <translation>Watched before unwatched</translation>
 +        <translation>Watched Before Unwatched</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="459"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="463"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="543"/>
          <source>If enabled, programs that have been marked as watched will be expired before programs that have not been watched.</source>
          <translation>If enabled, programs that have been marked as watched will be expired before programs that have not been watched.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="470"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="474"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="554"/>
          <source>Priority weight</source>
 -        <translation>Priority weight</translation>
 +        <translation>Priority Weight</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="472"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="476"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="556"/>
          <source>The number of days bonus a program gets for each priority point. This is only used when the Weighted time/priority Auto-Expire method is selected.</source>
 -        <translation>The number of days bonus a program gets for each priority point. This is only used when the Weighted time/priority Auto-Expire method is selected.</translation>
 +        <translation>The number of days bonus a program gets for each priority point. This is only used when the Weighted time/priority Auto-expire method is selected.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="486"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="490"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="570"/>
          <source>Live TV max age (days)</source>
 -        <translation>Live TV max age (days)</translation>
 +        <translation>Live TV Max Age (days)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="488"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="492"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="572"/>
          <source>Auto-Expire will force expiration of Live TV recordings when they are this many days old. Live TV recordings may also be expired early if necessary to free up disk space.</source>
          <translation>Auto-Expire will force expiration of Live TV recordings when they are this many days old. Live TV recordings may also be expired early if necessary to free up disk space.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="518"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="522"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="602"/>
          <source>Re-record watched</source>
 -        <translation>Re-record watched</translation>
 +        <translation>Re-record Watched</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="522"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="526"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="606"/>
          <source>If enabled, programs that have been marked as watched and are Auto-Expired will be re-recorded if they are shown again.</source>
          <translation>If enabled, programs that have been marked as watched and are Auto-Expired will be re-recorded if they are shown again.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="533"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="537"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="617"/>
          <source>Time to record before start of show (secs)</source>
 -        <translation>Time to record before start of show (secs)</translation>
 +        <translation>Time to Record Before Start of Show (secs)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="536"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="540"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="620"/>
          <source>This global setting allows the recorder to start before the scheduled start time. It does not affect the scheduler. It is ignored when two shows have been scheduled without enough time in between.</source>
          <translatorcomment>Temporary fix</translatorcomment>
          <translation>This global setting allows the recorder to start before the scheduled start time. It does not affect the scheduler. It is ignored when two shows have been scheduled without enough time in-between.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="551"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="555"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="635"/>
          <source>Time to record past end of show (secs)</source>
 -        <translation>Time to record past end of show (secs)</translation>
 +        <translation>Time to Record Past End of Show (secs)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="555"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="559"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="639"/>
          <source>This global setting allows the recorder to record beyond the scheduled end time. It does not affect the scheduler. It is ignored when two shows have been scheduled without enough time in between.</source>
          <translatorcomment>Temporary fix</translatorcomment>
          <translation>This global setting allows the recorder to record beyond the scheduled end time. It does not affect the scheduler. It is ignored when two shows have been scheduled without enough time in-between.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="568"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="572"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="652"/>
          <source>Category of shows to be extended</source>
 -        <translation>Category of shows to be extended</translation>
 +        <translation>Category of Shows to be Extended</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="570"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="574"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="654"/>
          <source>For a special category (e.g. &quot;Sports event&quot;), request that shows be autoextended. Only works if a show&apos;s category can be determined.</source>
 -        <translation>For a special category (e.g. &quot;Sports event&quot;), request that shows be autoextended. Only works if a show&apos;s category can be determined.</translation>
 +        <translation>For a special category (e.g. &quot;Sports Event&quot;), request that shows be autoextended. Only works if a show&apos;s category can be determined.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="599"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="603"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="683"/>
          <source>Record past end of show (mins)</source>
 -        <translation>Record past end of show (mins)</translation>
 +        <translation>Record Past End of Show (mins)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="603"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="607"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="687"/>
          <source>For the specified category, an attempt will be made to extend the recording by the specified number of minutes. It is ignored when two shows have been scheduled without enough time in-between.</source>
          <translation>For the specified category, an attempt will be made to extend the recording by the specified number of minutes. It is ignored when two shows have been scheduled without enough time in-between.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="617"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="620"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="700"/>
          <source>Category record over-time</source>
 -        <translation>Category record over-time</translation>
 +        <translation>Category Record Over Time</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1521"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1497"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1520"/>
          <source>Channel ordering</source>
 -        <translation>Channel ordering</translation>
 +        <translation>Channel Ordering</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1523"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1499"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1522"/>
          <source>channel number</source>
          <translation>channel number</translation>
      </message>
@@ -6203,15 +7702,15 @@
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1524"/>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2642"/>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2661"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1500"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2667"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2686"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1523"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2721"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2740"/>
          <source>callsign</source>
          <translation>callsign</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2637"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2662"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2716"/>
          <source>Channel format</source>
 -        <translation>Channel format</translation>
 +        <translation>Channel Format</translation>
@@ -6219,143 +7718,264 @@
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2639"/>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2658"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2664"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2683"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2718"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2737"/>
          <source>number</source>
          <translation>number</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2640"/>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2659"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2665"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2684"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2719"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2738"/>
          <source>number callsign</source>
          <translation>number callsign</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2641"/>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2660"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2666"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2685"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2720"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2739"/>
          <source>number name</source>
          <translation>number name</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2643"/>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2662"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2668"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2687"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2722"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2741"/>
          <source>name</source>
          <translation>name</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2645"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2670"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2724"/>
          <source>Your preferred channel format.</source>
          <translation>Your preferred channel format.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2656"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2681"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2735"/>
          <source>Long channel format</source>
 -        <translation>Long channel format</translation>
 +        <translation>Long Channel Format</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2664"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2689"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2743"/>
          <source>Your preferred long channel format.</source>
          <translation>Your preferred long channel format.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2718"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2743"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2797"/>
          <source>Browse/change channels from Channel Group</source>
 -        <translation>Browse/change channels from Channel Group</translation>
 +        <translation>Browse/Change Channels from Channel Group</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2721"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2746"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2800"/>
          <source>If enabled, Live TV will browse or change channels from the selected channel group. The &quot;All Channels&quot; channel group may be selected to browse all channels.</source>
          <translation>If enabled, Live TV will browse or change channels from the selected channel group. The &quot;All Channels&quot; channel group may be selected to browse all channels.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4090"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4141"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4143"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2814"/>
++        <source>Case-sensitive sorting</source>
++        <translation>Case-sensitive Sorting</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2816"/>
++        <source>If enabled, all sorting will be case-sensitive.  This would mean that &quot;bee movie&quot; would sort after &quot;Sea World&quot; as lower case letters sort after uppercase letters.</source>
++        <translation>If enabled, all sorting will be case-sensitive. For example, &quot;bee movie&quot; would sort after &quot;Sea World&quot; as lower case letters sort after uppercase letters.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2829"/>
++        <source>Remove prefixes when sorting</source>
++        <translation>Remove Prefixes when Sorting</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2831"/>
++        <source>If enabled, all sorting will remove the common prefixes (The, A, An) from a string prior to sorting.  For example, this would sort the titles &quot;Earth 2&quot;, &quot;The Flash&quot;, and &quot;Kings&quot; in that order.  If disabled, they would sort as &quot;Earth 2&quot;, &quot;Kings&quot;, &quot;The Flash&quot;.</source>
++        <translation>If enabled, all sorting will remove the common prefixes (The, A, An) from a string prior to sorting. For example, this would sort the titles &quot;Earth 2&quot;, &quot;The Flash&quot;, and &quot;Kings&quot; in that order. If disabled, they would sort as &quot;Earth 2&quot;, &quot;Kings&quot;, &quot;The Flash&quot;.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4365"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4367"/>
          <source>General (Basic)</source>
          <translation>General (Basic)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4099"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4152"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4376"/>
          <source>General (Auto-Expire)</source>
          <translation>General (Auto-Expire)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4130"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4170"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4394"/>
          <source>General (Jobs)</source>
          <translation>General (Jobs)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4141"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4181"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4405"/>
          <source>General (Advanced)</source>
          <translation>General (Advanced)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4150"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4190"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4414"/>
          <source>General (Channel Groups)</source>
          <translation>General (Channel Groups)</translation>
      </message>
-@@ -6866,7 +7231,7 @@
+@@ -6844,82 +6761,82 @@
+ <context>
+     <name>GeneralSetupWizard</name>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="57"/>
++        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="54"/>
+         <source>Anonymously submit a profile of your hardware. This helps the developers to determine where to focus their efforts.</source>
+         <translation>Anonymously submit a profile of your hardware. This helps the developers to determine where to focus their efforts.</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="66"/>
+-        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="60"/>
++        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="57"/>
+         <source>Visit your online hardware profile. (This requires that you have the MythBrowser plugin installed)</source>
+         <translation>Visit your online hardware profile. (This requires that you have the MythBrowser plugin installed)</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="62"/>
++        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="59"/>
+         <source>Delete your online hardware profile.</source>
+         <translation>Delete your online hardware profile.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="64"/>
++        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="61"/>
+         <source>Save these changes and move on to the next configuration step.</source>
+         <translation>Save these changes and move on to the next configuration step.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="66"/>
++        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="63"/>
          <source>Exit this wizard, save no changes.</source>
 -        <translation>Exit this wizard, save no changes.</translation>
 +        <translation>Exit Without Saving</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="133"/>
-@@ -6876,7 +7241,7 @@
+-        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="133"/>
++        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="126"/>
+         <source>Would you like to share your hardware profile with the MythTV developers? Profiles are anonymous and are a great way to help with future development.</source>
+         <translation>Would you like to share your hardware profile with the MythTV developers? Profiles are anonymous and are a great way to help with future development.</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="151"/>
+-        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="151"/>
++        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="144"/>
          <source>Submitting your hardware profile...</source>
 -        <translation>Submitting your hardware profile...</translation>
 +        <translation>Submitting Your Hardware Profile...</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="159"/>
-@@ -6911,7 +7276,7 @@
+-        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="159"/>
++        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="152"/>
+         <source>Hardware profile submitted. Thank you for supporting MythTV!</source>
+         <translation>Hardware profile submitted. Thank you for supporting MythTV!</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="173"/>
++        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="166"/>
+         <source>Encountered a problem while submitting your profile.</source>
+         <translation>Encountered a problem while submitting your profile.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="182"/>
++        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="175"/>
+         <source>You haven&apos;t submitted your hardware profile yet! Please submit your profile to visit it online.</source>
+         <translation>You haven&apos;t submitted your hardware profile yet! Please submit your profile to visit it online.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="199"/>
++        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="192"/>
+         <source>No browser command set! MythTV needs a browser installed and configure to display your hardware profile.</source>
+         <translation>No browser command set! MythTV needs a browser installed and configure to display your hardware profile.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="230"/>
++        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="223"/>
+         <source>You haven&apos;t submitted your hardware profile yet!</source>
+         <translation>You haven&apos;t submitted your hardware profile yet!</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="234"/>
++        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="227"/>
+         <source>Are you sure you want to delete your online profile?  Your information is anonymous and helps the developers to know what hardware the majority of users prefer.</source>
+         <translation>Are you sure you want to delete your online profile?  Your information is anonymous and helps the developers to know what hardware the majority of users prefer.</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="253"/>
+-        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="253"/>
++        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="246"/>
          <source>Deleting your hardware profile...</source>
 -        <translation>Deleting your hardware profile...</translation>
 +        <translation>Deleting Your Hardware Profile...</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="261"/>
-@@ -6944,12 +7309,12 @@
+-        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="261"/>
++        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="254"/>
+         <source>Hardware profile deleted.</source>
+         <translation>Hardware profile deleted.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="274"/>
++        <location filename="../programs/mythfrontend/setupwizard_general.cpp" line="267"/>
+         <source>Encountered a problem while deleting your profile.</source>
+         <translation>Encountered a problem while deleting your profile.</translation>
+     </message>
+@@ -6927,191 +6844,191 @@
+ <context>
+     <name>GrabberSettings</name>
+     <message>
+-        <location filename="../programs/mythfrontend/grabbersettings.cpp" line="56"/>
++        <location filename="../programs/mythfrontend/grabbersettings.cpp" line="53"/>
+         <source>Select a source to use when searching for information and artwork about movies.</source>
+         <translation>Select a source to use when searching for information and artwork about movies.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/grabbersettings.cpp" line="58"/>
++        <location filename="../programs/mythfrontend/grabbersettings.cpp" line="55"/>
+         <source>Select a source to use when searching for information and artwork about television.</source>
+         <translation>Select a source to use when searching for information and artwork about television.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/grabbersettings.cpp" line="60"/>
++        <location filename="../programs/mythfrontend/grabbersettings.cpp" line="57"/>
+         <source>Select a source to use when searching for information and artwork about video games.</source>
+         <translation>Select a source to use when searching for information and artwork about video games.</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/grabbersettings.cpp" line="62"/>
+-        <location filename="../programs/mythfrontend/grabbersettings.cpp" line="62"/>
++        <location filename="../programs/mythfrontend/grabbersettings.cpp" line="59"/>
          <source>Save your changes and close this window.</source>
 -        <translation>Save your changes and close this window.</translation>
 +        <translation>Save and Exit</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/grabbersettings.cpp" line="63"/>
+-        <location filename="../programs/mythfrontend/grabbersettings.cpp" line="63"/>
++        <location filename="../programs/mythfrontend/grabbersettings.cpp" line="60"/>
          <source>Discard your changes and close this window.</source>
 -        <translation>Discard your changes and close this window.</translation>
 +        <translation>Exit Without Saving</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/grabbersettings.cpp" line="65"/>
-@@ -6959,159 +7324,159 @@
+-        <location filename="../programs/mythfrontend/grabbersettings.cpp" line="65"/>
++        <location filename="../programs/mythfrontend/grabbersettings.cpp" line="62"/>
+         <source>If set, the backend will attempt to perform artwork updates for recordings daily. When new seasons begin to record, this will attempt to provide you with fresh, relevant artwork while preserving the artwork assigned to old recordings.</source>
+         <translation>If set, the backend will attempt to perform artwork updates for recordings daily. When new seasons begin to record, this will attempt to provide you with fresh, relevant artwork while preserving the artwork assigned to old recordings.</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/grabbersettings.cpp" line="76"/>
+-        <location filename="../programs/mythfrontend/grabbersettings.cpp" line="76"/>
++        <location filename="../programs/mythfrontend/grabbersettings.cpp" line="73"/>
          <source>Searching for data sources...</source>
 -        <translation>Searching for data sources...</translation>
 +        <translation>Searching for Data Sources...</translation>
@@ -6365,7 +7985,7 @@
      <name>GuideGrid</name>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="441"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="442"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="437"/>
          <source>You don&apos;t have any channels defined in the database.
  			The program guide will have nothing to show you.</source>
          <translation>You don&apos;t have any channels defined in the database.
@@ -6373,7 +7993,7 @@
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="446"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="447"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="442"/>
          <source>Channel group &apos;%1&apos; doesn&apos;t have any channels defined.
  			The program guide will have nothing to show you.</source>
          <translation>Channel group &apos;%1&apos; doesn&apos;t have any channels defined.
@@ -6381,81 +8001,81 @@
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1091"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1096"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1090"/>
          <source>Guide Options</source>
          <translation>Guide Options</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1102"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1924"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1107"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1942"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1101"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1938"/>
          <source>Change to Channel</source>
          <translation>Change to Channel</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1104"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1928"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1109"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1930"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1103"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1926"/>
          <source>Watch This Channel</source>
          <translation>Watch This Channel</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1106"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1920"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1111"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1938"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1105"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1934"/>
          <source>Record This</source>
          <translation>Record This</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1108"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1138"/>
--        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1961"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1113"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1143"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1973"/>
+-        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1961"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1107"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1137"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1969"/>
          <source>Recording Options</source>
          <translation>Recording Options</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1112"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1965"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1117"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1977"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1111"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1973"/>
          <source>Jump to Time</source>
          <translation>Jump to Time</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1116"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1944"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1121"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1956"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1115"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1952"/>
          <source>Channel Search</source>
          <translation>Channel Search</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1151"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1972"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1156"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1984"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1150"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1980"/>
          <source>Edit Recording Status</source>
          <translation>Edit Recording Status</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1152"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1976"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1157"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1988"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1151"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1984"/>
          <source>Edit Schedule</source>
          <translation>Edit Schedule</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1154"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1984"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1159"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1996"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1153"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1992"/>
          <source>Previously Recorded</source>
          <translation>Previously Recorded</translation>
      </message>
@@ -6464,17 +8084,17 @@
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1863"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2235"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2236"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1706"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1873"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2244"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2245"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1702"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1869"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2240"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2241"/>
          <source>Unknown</source>
          <comment>Unknown program title</comment>
          <translation>Unknown</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2730"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2739"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2735"/>
          <source>Jump to a specific date and time in the guide</source>
 -        <translation>Jump to a specific date and time in the guide</translation>
 +        <translation>Jump to a Specific Date and Time in the Guide</translation>
@@ -6482,48 +8102,48 @@
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1110"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1934"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1115"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1946"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1109"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1942"/>
          <source>Program Details</source>
          <translation>Program Details</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1153"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1980"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1158"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1992"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1152"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1988"/>
          <source>Show Upcoming</source>
          <translation>Show Upcoming</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1155"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1988"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1160"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2000"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1154"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1996"/>
          <source>Custom Edit</source>
          <translation>Custom Edit</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1158"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1992"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1163"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2004"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1157"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2000"/>
          <source>Delete Rule</source>
          <translation>Delete Rule</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1114"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1938"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1119"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1950"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1113"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1946"/>
          <source>Reverse Channel Order</source>
          <translation>Reverse Channel Order</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1123"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1948"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1128"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1960"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1122"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1956"/>
          <source>Add To Channel Group</source>
 -        <translation>Add To Channel Group</translation>
 +        <translation>Add to Channel Group</translation>
@@ -6531,101 +8151,94 @@
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1125"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1953"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1130"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1965"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1124"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1961"/>
          <source>Remove from Channel Group</source>
          <translation>Remove from Channel Group</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1120"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1957"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1125"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1969"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1119"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="1965"/>
          <source>Choose Channel Group</source>
          <translation>Choose Channel Group</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2289"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2298"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2294"/>
          <source>You don&apos;t have any channel groups defined</source>
          <translation>You don&apos;t have any channel groups defined</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2303"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2312"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2308"/>
          <source>Select Channel Group</source>
          <translation>Select Channel Group</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2588"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2597"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2593"/>
          <source>Delete &apos;%1&apos; %2 rule?</source>
          <translation>Delete &apos;%1&apos; %2 rule?</translation>
      </message>
-@@ -7119,12 +7484,12 @@
+@@ -7119,158 +7036,130 @@
  <context>
      <name>HDHomeRunConfigurationGroup</name>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2067"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2077"/>
-         <source>Description</source>
-         <translation>Description</translation>
-     </message>
-     <message>
+-        <source>Description</source>
+-        <translation>Description</translation>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2082"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2092"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1465"/>
          <source>Recording Options</source>
          <translation>Recording Options</translation>
      </message>
-@@ -7132,22 +7497,22 @@
+ </context>
  <context>
-     <name>HDHomeRunDeviceID</name>
-     <message>
+-    <name>HDHomeRunDeviceID</name>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1415"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1444"/>
-         <source>Device ID</source>
-         <translation>Device ID</translation>
-     </message>
-     <message>
+-        <source>Device ID</source>
+-        <translation>Device ID</translation>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1416"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1445"/>
-         <source>Device ID of HDHomeRun device</source>
+-        <source>Device ID of HDHomeRun device</source>
 -        <translation>Device ID of HDHomeRun device</translation>
-+        <translation>Device ID of HDHomeRun Device</translation>
-     </message>
- </context>
- <context>
-     <name>HDHomeRunDeviceIDList</name>
-     <message>
+-    </message>
+-</context>
+-<context>
+-    <name>HDHomeRunDeviceIDList</name>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1509"/>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1565"/>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1575"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1541"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1599"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1609"/>
-         <source>Manually Enter IP Address</source>
-         <translation>Manually Enter IP Address</translation>
-     </message>
-@@ -7155,122 +7520,122 @@
- <context>
+-        <source>Manually Enter IP Address</source>
+-        <translation>Manually Enter IP Address</translation>
+-    </message>
+-</context>
+-<context>
      <name>HDPVRConfigurationGroup</name>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2662"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2618"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2370"/>
          <source>Probed info</source>
 -        <translation>Probed info</translation>
 +        <translation>Probed Info</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2679"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2636"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2388"/>
          <source>Failed to open</source>
 -        <translation>Failed to open</translation>
 +        <translation>Failed to Open</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2685"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2642"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2394"/>
          <source>Failed to probe</source>
 -        <translation>Failed to probe</translation>
 +        <translation>Failed to Probe</translation>
@@ -6635,136 +8248,136 @@
      <name>HelpPopup</name>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5516"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5547"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5560"/>
          <source>Commercials are flagged</source>
 -        <translation>Commercials are flagged</translation>
 +        <translation>Commercials are Flagged</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5517"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5548"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5561"/>
          <source>An editing cutlist is present</source>
 -        <translation>An editing cutlist is present</translation>
 +        <translation>Editing Cutlist is Present</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5518"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5549"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5562"/>
          <source>The program is able to auto-expire</source>
 -        <translation>The program is able to auto-expire</translation>
 +        <translation>Program is Set to Auto-expire</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5519"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5550"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5563"/>
          <source>Commercials are being flagged</source>
 -        <translation>Commercials are being flagged</translation>
 +        <translation>Commercials are Being Flagged</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5520"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5551"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5564"/>
          <source>A bookmark is set</source>
 -        <translation>A bookmark is set</translation>
 +        <translation>Bookmark is Set</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5522"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5553"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5566"/>
          <source>Recording is in use</source>
 -        <translation>Recording is in use</translation>
 +        <translation>Recording is In Use</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5523"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5554"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5567"/>
          <source>Recording has been transcoded</source>
 -        <translation>Recording has been transcoded</translation>
 +        <translation>Recording has been Transcoded</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5526"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5557"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5570"/>
          <source>Recording is in Mono</source>
          <translation>Recording is in Mono</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5527"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5558"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5571"/>
          <source>Recording is in Stereo</source>
          <translation>Recording is in Stereo</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5528"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5559"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5572"/>
          <source>Recording is in Surround Sound</source>
          <translation>Recording is in Surround Sound</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5529"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5560"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5573"/>
          <source>Recording is in Dolby Surround Sound</source>
          <translation>Recording is in Dolby Surround Sound</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5531"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5562"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5575"/>
          <source>Recording is Closed Captioned</source>
          <translation>Recording is Closed Captioned</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5532"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5563"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5576"/>
          <source>Recording has Subtitles Available</source>
          <translation>Recording has Subtitles Available</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5533"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5564"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5577"/>
          <source>Recording is Subtitled</source>
          <translation>Recording is Subtitled</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5535"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5566"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5579"/>
          <source>Recording is in 1080i/p High Definition</source>
          <translation>Recording is in 1080i/p High Definition</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5536"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5567"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5580"/>
          <source>Recording is in 720p High Definition</source>
          <translation>Recording is in 720p High Definition</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5537"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5568"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5581"/>
          <source>Recording is in High Definition</source>
          <translation>Recording is in High Definition</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5538"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5569"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5582"/>
          <source>Recording is Widescreen</source>
          <translation>Recording is Widescreen</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5539"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5570"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5583"/>
          <source>Recording is in HD using H.264 codec</source>
 -        <translation>Recording is in HD using H.264 codec</translation>
 +        <translation>Recording is in HD Using H.264 Codec</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5541"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5572"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5585"/>
          <source>Recording has been watched</source>
 -        <translation>Recording has been watched</translation>
 +        <translation>Recording has been Watched</translation>
      </message>
  </context>
  <context>
-@@ -7296,7 +7661,7 @@
+@@ -7296,7 +7185,7 @@
      <message>
          <location filename="../html/htmlstrings.h" line="24"/>
          <source>Package installed</source>
@@ -6773,7 +8386,7 @@
      </message>
      <message>
          <location filename="../html/htmlstrings.h" line="25"/>
-@@ -7747,7 +8112,7 @@
+@@ -7747,7 +7636,7 @@
      <message>
          <location filename="../html/htmlstrings.h" line="163"/>
          <source>Use Link-Local</source>
@@ -6782,7 +8395,7 @@
      </message>
      <message>
          <location filename="../html/htmlstrings.h" line="165"/>
-@@ -8060,7 +8425,7 @@
+@@ -8060,7 +7949,7 @@
      <message>
          <location filename="../html/htmlstrings.h" line="240"/>
          <source>Auto-Expire</source>
@@ -6791,7 +8404,7 @@
      </message>
      <message>
          <location filename="../html/htmlstrings.h" line="241"/>
-@@ -8080,7 +8445,7 @@
+@@ -8080,7 +7969,7 @@
      <message>
          <location filename="../html/htmlstrings.h" line="245"/>
          <source>Delete and Re-Record</source>
@@ -6800,7 +8413,7 @@
      </message>
      <message>
          <location filename="../html/htmlstrings.h" line="246"/>
-@@ -8165,7 +8530,7 @@
+@@ -8165,7 +8054,7 @@
      <message>
          <location filename="../html/htmlstrings.h" line="272"/>
          <source>Allow Auto-Expire</source>
@@ -6809,7 +8422,7 @@
      </message>
      <message>
          <location filename="../html/htmlstrings.h" line="275"/>
-@@ -8449,7 +8814,7 @@
+@@ -8449,7 +8338,7 @@
      <message>
          <location filename="../html/htmlstrings.h" line="12"/>
          <source>Loading ...</source>
@@ -6818,7 +8431,7 @@
      </message>
      <message>
          <location filename="../html/htmlstrings.h" line="14"/>
-@@ -8661,7 +9026,7 @@
+@@ -8661,13 +8550,13 @@
      <message>
          <location filename="../libs/libmythtv/channelscan/iptvchannelfetcher.cpp" line="335"/>
          <source>Encountered malformed channel</source>
@@ -6827,164 +8440,228 @@
      </message>
  </context>
  <context>
-@@ -8691,34 +9056,34 @@
+     <name>IdleScreen</name>
+     <message numerus="yes">
+-        <location filename="../programs/mythfrontend/idlescreen.cpp" line="138"/>
++        <location filename="../programs/mythfrontend/idlescreen.cpp" line="135"/>
+         <source>Backend will shutdown in %n second(s).</source>
+         <translation>
+             <numerusform>Backend will shutdown in %n second.</numerusform>
+@@ -8678,12 +8567,12 @@
+ <context>
+     <name>ImageManagerFe</name>
+     <message>
+-        <location filename="../libs/libmythmetadata/imagemanager.cpp" line="2362"/>
++        <location filename="../libs/libmythmetadata/imagemanager.cpp" line="2370"/>
+         <source>Gallery</source>
+         <translation>Gallery</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythmetadata/imagemanager.cpp" line="2364"/>
++        <location filename="../libs/libmythmetadata/imagemanager.cpp" line="2372"/>
+         <source>Photographs</source>
+         <translation>Photographs</translation>
+     </message>
+@@ -8691,111 +8580,111 @@
  <context>
      <name>ImportConfigurationGroup</name>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1980"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1999"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1925"/>
          <source>A local file used to simulate a recording. Leave empty to use MythEvents to trigger an external program to import recording files.</source>
          <translation>A local file used to simulate a recording. Leave empty to use MythEvents to trigger an external program to import recording files.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1988"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2007"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1933"/>
          <source>File info</source>
 -        <translation>File info</translation>
 +        <translation>File Info</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1991"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2011"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1937"/>
          <source>File size</source>
 -        <translation>File size</translation>
 +        <translation>File Size</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2014"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2035"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1961"/>
          <source>%1 MB</source>
          <translation>%1 MB</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2017"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2038"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1964"/>
          <source>File not readable</source>
 -        <translation>File not readable</translation>
 +        <translation>File Not Readable</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2021"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2042"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1968"/>
          <source>File %1 does not exist</source>
 -        <translation>File %1 does not exist</translation>
 +        <translation>File %1 Does Not Exist</translation>
      </message>
  </context>
  <context>
-@@ -8726,27 +9091,27 @@
+     <name>ImportIconsWizard</name>
      <message>
-         <location filename="../programs/mythtv-setup/importicons.cpp" line="94"/>
+-        <location filename="../programs/mythtv-setup/importicons.cpp" line="94"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="90"/>
          <source>Name of the icon file</source>
 -        <translation>Name of the icon file</translation>
 +        <translation>Name of the Icon File</translation>
      </message>
      <message>
-         <location filename="../programs/mythtv-setup/importicons.cpp" line="95"/>
+-        <location filename="../programs/mythtv-setup/importicons.cpp" line="95"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="91"/>
          <source>List of possible icon files</source>
 -        <translation>List of possible icon files</translation>
 +        <translation>List of Possible Icon Files</translation>
      </message>
      <message>
-         <location filename="../programs/mythtv-setup/importicons.cpp" line="96"/>
+-        <location filename="../programs/mythtv-setup/importicons.cpp" line="96"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="92"/>
          <source>Enter text here for the manual search</source>
 -        <translation>Enter text here for the manual search</translation>
 +        <translation>Enter search text:</translation>
      </message>
      <message>
-         <location filename="../programs/mythtv-setup/importicons.cpp" line="97"/>
+-        <location filename="../programs/mythtv-setup/importicons.cpp" line="97"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="93"/>
          <source>Manually search for the text</source>
 -        <translation>Manually search for the text</translation>
 +        <translation>Manually Search for the Text</translation>
      </message>
      <message>
-         <location filename="../programs/mythtv-setup/importicons.cpp" line="98"/>
+-        <location filename="../programs/mythtv-setup/importicons.cpp" line="98"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="94"/>
          <source>Skip this icon</source>
 -        <translation>Skip this icon</translation>
 +        <translation>Skip This Icon</translation>
      </message>
      <message>
-         <location filename="../programs/mythtv-setup/importicons.cpp" line="139"/>
-@@ -8761,7 +9126,7 @@
+-        <location filename="../programs/mythtv-setup/importicons.cpp" line="139"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="135"/>
+         <source>Finish</source>
+         <translation>Finish</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythtv-setup/importicons.cpp" line="141"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="137"/>
+         <source>Skip</source>
+         <translation>Skip</translation>
+     </message>
      <message>
-         <location filename="../programs/mythtv-setup/importicons.cpp" line="173"/>
+-        <location filename="../programs/mythtv-setup/importicons.cpp" line="173"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="169"/>
          <source>No matches found for &quot;%1&quot;</source>
 -        <translation>No matches found for &quot;%1&quot;</translation>
 +        <translation>No Matches Found for &quot;%1&quot;</translation>
      </message>
      <message>
-         <location filename="../programs/mythtv-setup/importicons.cpp" line="411"/>
-@@ -8772,7 +9137,7 @@
+-        <location filename="../programs/mythtv-setup/importicons.cpp" line="411"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="407"/>
+         <source>Downloading %1 of %2</source>
+         <extracomment>%1 is the current channel position, * %2 is the total number of channels,</extracomment>
+         <translation>Downloading %1 of %2</translation>
+     </message>
      <message>
-         <location filename="../programs/mythtv-setup/importicons.cpp" line="483"/>
+-        <location filename="../programs/mythtv-setup/importicons.cpp" line="483"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="479"/>
          <source>No matches found for %1</source>
 -        <translation>No matches found for %1</translation>
 +        <translation>No Matches Found for %1</translation>
      </message>
      <message>
-         <location filename="../programs/mythtv-setup/importicons.cpp" line="218"/>
-@@ -8787,12 +9152,12 @@
+-        <location filename="../programs/mythtv-setup/importicons.cpp" line="218"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="214"/>
+         <source>Icon for %1 was downloaded successfully.</source>
+         <translation>Icon for %1 was downloaded successfully.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythtv-setup/importicons.cpp" line="223"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="219"/>
+         <source>Failed to download the icon for %1.</source>
+         <translation>Failed to download the icon for %1.</translation>
+     </message>
      <message>
-         <location filename="../programs/mythtv-setup/importicons.cpp" line="319"/>
+-        <location filename="../programs/mythtv-setup/importicons.cpp" line="319"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="315"/>
          <source>Initializing, please wait...</source>
 -        <translation>Initializing, please wait...</translation>
 +        <translation>Initializing, Please Wait...</translation>
      </message>
      <message>
-         <location filename="../programs/mythtv-setup/importicons.cpp" line="393"/>
+-        <location filename="../programs/mythtv-setup/importicons.cpp" line="393"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="389"/>
          <source>Downloading, please wait...</source>
 -        <translation>Downloading, please wait...</translation>
 +        <translation>Downloading, Please Wait...</translation>
      </message>
      <message numerus="yes">
-         <location filename="../programs/mythtv-setup/importicons.cpp" line="423"/>
-@@ -8805,20 +9170,20 @@
+-        <location filename="../programs/mythtv-setup/importicons.cpp" line="423"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="419"/>
+         <source>Could not find %n icon(s).</source>
+         <translation>
+             <numerusform>Could not find %n icon.</numerusform>
+@@ -8803,47 +8692,27 @@
+         </translation>
+     </message>
      <message>
-         <location filename="../programs/mythtv-setup/importicons.cpp" line="479"/>
+-        <location filename="../programs/mythtv-setup/importicons.cpp" line="479"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="475"/>
          <source>Choose icon for channel %1</source>
 -        <translation>Choose icon for channel %1</translation>
 +        <translation>Choose Icon for Channel %1</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/importicons.cpp" line="762"/>
-+        <location filename="../programs/mythtv-setup/importicons.cpp" line="790"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="786"/>
          <source>You now have the opportunity to transmit your choices back to mythtv.org so that others can benefit from your selections.</source>
          <translation>You now have the opportunity to transmit your choices back to mythtv.org so that others can benefit from your selections.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/importicons.cpp" line="785"/>
-+        <location filename="../programs/mythtv-setup/importicons.cpp" line="813"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="809"/>
          <source>Failed to submit icon choices.</source>
          <translation>Failed to submit icon choices.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/importicons.cpp" line="820"/>
-+        <location filename="../programs/mythtv-setup/importicons.cpp" line="848"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="844"/>
          <source>Icon choices submitted successfully.</source>
          <translation>Icon choices submitted successfully.</translation>
      </message>
-@@ -8826,17 +9191,17 @@
+ </context>
  <context>
-     <name>ImportSettings</name>
-     <message>
+-    <name>ImportSettings</name>
+-    <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="122"/>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="133"/>
-         <source>Import</source>
-         <translation>Import</translation>
-     </message>
-     <message>
+-        <source>Import</source>
+-        <translation>Import</translation>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="126"/>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="137"/>
-         <source>Import Command</source>
-         <translation>Import Command</translation>
-     </message>
-     <message>
+-        <source>Import Command</source>
+-        <translation>Import Command</translation>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="127"/>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="138"/>
-         <source>Command/script that can be run from the menu. 
- %TMPDIR% will be replaced by a new temporary directory, which the import dialog will show automatically. The directory will be removed when Gallery exits.</source>
-         <translation>Command/script that can be run from the menu. 
-@@ -8877,7 +9242,7 @@
+-        <source>Command/script that can be run from the menu. 
+-%TMPDIR% will be replaced by a new temporary directory, which the import dialog will show automatically. The directory will be removed when Gallery exits.</source>
+-        <translation>Command/script that can be run from the menu. 
+-%TMPDIR% will be replaced by a new temporary directory, which the import dialog will show automatically. The directory will be removed when Gallery exits.</translation>
+-    </message>
+-</context>
+-<context>
+     <name>InfoList</name>
+     <message numerus="yes">
+         <location filename="../programs/mythfrontend/galleryinfo.cpp" line="161"/>
+@@ -8877,7 +8746,7 @@
      <message>
          <location filename="../programs/mythfrontend/galleryinfo.cpp" line="168"/>
          <source>Dir size</source>
@@ -6993,7 +8670,7 @@
      </message>
      <message>
          <location filename="../programs/mythfrontend/galleryinfo.cpp" line="176"/>
-@@ -8913,7 +9278,7 @@
+@@ -8913,20 +8782,20 @@
      <message>
          <location filename="../programs/mythfrontend/galleryinfo.cpp" line="243"/>
          <source>Last scan</source>
@@ -7001,141 +8678,223 @@
 +        <translation>Last Scan</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/galleryinfo.cpp" line="251"/>
-@@ -8923,7 +9288,7 @@
+-        <location filename="../programs/mythfrontend/galleryinfo.cpp" line="251"/>
++        <location filename="../programs/mythfrontend/galleryinfo.cpp" line="255"/>
+         <source>Modified</source>
+         <translation>Modified</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/galleryinfo.cpp" line="257"/>
+-        <location filename="../programs/mythfrontend/galleryinfo.cpp" line="257"/>
++        <location filename="../programs/mythfrontend/galleryinfo.cpp" line="265"/>
          <source>File size</source>
 -        <translation>File size</translation>
 +        <translation>File Size</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/galleryinfo.cpp" line="258"/>
-@@ -8940,6 +9305,13 @@
+-        <location filename="../programs/mythfrontend/galleryinfo.cpp" line="258"/>
++        <location filename="../programs/mythfrontend/galleryinfo.cpp" line="266"/>
+         <source>Orientation</source>
+         <translation>Orientation</translation>
      </message>
- </context>
+@@ -8934,7 +8803,7 @@
+ <context>
+     <name>InputSelector</name>
+     <message>
+-        <location filename="../libs/libmythtv/channelscan/inputselectorsetting.cpp" line="41"/>
++        <location filename="../libs/libmythtv/channelscan/inputselectorsetting.cpp" line="40"/>
+         <source>Input</source>
+         <translation>Input</translation>
+     </message>
+@@ -8942,155 +8811,155 @@
  <context>
-+    <name>IpAddressSettings</name>
-+    <message>
-+        <source>Allow this backend to receive connections on any IP Address assigned to it. Recommended for most users for ease and reliability.</source>
-+        <translation type="vanished">Allow this backend to receive connections on any IP Address assigned to it. Recommended for most users for ease and reliability.</translation>
-+    </message>
-+</context>
-+<context>
      <name>JobQueue</name>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="1109"/>
-@@ -8954,7 +9326,7 @@
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="1109"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="1145"/>
+         <source>Transcode</source>
+         <translation>Transcode</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="1110"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="1146"/>
+         <source>Flag Commercials</source>
+         <translation>Flag Commercials</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="1111"/>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="1111"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="1147"/>
          <source>Look up Metadata</source>
 -        <translation>Look up Metadata</translation>
 +        <translation>Look Up Metadata</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="1121"/>
-@@ -8969,12 +9341,12 @@
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="1121"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="1157"/>
+         <source>Unknown Job</source>
+         <translation>Unknown Job</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="1132"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="1168"/>
+         <source>Undefined</source>
+         <translation>Undefined</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="1678"/>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="1678"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="1740"/>
          <source>Unable to retrieve program info from database</source>
 -        <translation>Unable to retrieve program info from database</translation>
 +        <translation>Unable to Retrieve Program Info from Database</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="1708"/>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="1708"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="1770"/>
          <source>Program has been deleted</source>
 -        <translation>Program has been deleted</translation>
 +        <translation>Program has been Deleted</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="1733"/>
-@@ -8989,7 +9361,7 @@
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="1733"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="1795"/>
+         <source>UNKNOWN JobType, unable to process!</source>
+         <translation>UNKNOWN JobType, unable to process!</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2004"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2065"/>
+         <source>ERROR: Unable to find mythtranscode, check backend logs.</source>
+         <translation>ERROR: Unable to find mythtranscode, check backend logs.</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2028"/>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2028"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2089"/>
          <source>Finished.</source>
 -        <translation>Finished.</translation>
 +        <translation>Finished</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2040"/>
-@@ -9005,12 +9377,12 @@
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2040"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2101"/>
+         <source>%1: %2 =&gt; %3</source>
+         <extracomment>%1 is transcoder name, %2 is the original file size and %3 is the current file size</extracomment>
+         <translation>%1: %2 =&gt; %3</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2074"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2135"/>
+         <source>exit status %1, job status was &quot;%2&quot;</source>
+         <translation>exit status %1, job status was &quot;%2&quot;</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2096"/>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2096"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2157"/>
          <source>Retry limit exceeded</source>
 -        <translation>Retry limit exceeded</translation>
 +        <translation>Retry Limit Exceeded</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2148"/>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2148"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2209"/>
          <source>Could not open new database connection for metadata lookup.</source>
 -        <translation>Could not open new database connection for metadata lookup.</translation>
 +        <translation>Could Not Open New Database Connection for Metadata Lookup</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2155"/>
-@@ -9020,12 +9392,12 @@
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2155"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2216"/>
+         <source>Metadata Lookup Starting</source>
+         <translation>Metadata Lookup Starting</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2181"/>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2181"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2242"/>
          <source>Unable to find mythmetadatalookup</source>
 -        <translation>Unable to find mythmetadatalookup</translation>
 +        <translation>Unable to Find mythmetadatalookup</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2205"/>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2205"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2266"/>
          <source>Metadata Lookup Complete.</source>
 -        <translation>Metadata Lookup Complete.</translation>
 +        <translation>Metadata Lookup Complete</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2211"/>
-@@ -9036,7 +9408,7 @@
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2211"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2272"/>
+         <source>Metadata Lookup %1</source>
+         <comment>Job ID</comment>
+         <translation>Metadata Lookup %1</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2273"/>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2273"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2334"/>
          <source>Could not open new database connection for commercial detector.</source>
 -        <translation>Could not open new database connection for commercial detector.</translation>
 +        <translation>Could Not Open New Database Connection for Commercial Detector</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2280"/>
-@@ -9046,7 +9418,7 @@
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2280"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2341"/>
+         <source>Commercial Detection Starting</source>
+         <translation>Commercial Detection Starting</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2318"/>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2318"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2379"/>
          <source>Unable to find mythcommflag</source>
 -        <translation>Unable to find mythcommflag</translation>
 +        <translation>Unable to Find mythcommflag</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2440"/>
-@@ -9061,32 +9433,32 @@
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2440"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2501"/>
+         <source>ERROR: Unable to find executable, check backend logs.</source>
+         <translation>ERROR: Unable to find executable, check backend logs.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2448"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2509"/>
+         <source>ERROR: User Job returned non-zero, check logs.</source>
+         <translation>ERROR: User Job returned non-zero, check logs.</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2464"/>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2464"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2525"/>
          <source>Successfully Completed.</source>
 -        <translation>Successfully Completed.</translation>
 +        <translation>Successfully Completed</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2187"/>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2324"/>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2187"/>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2324"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2248"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2385"/>
          <source>Aborted by user</source>
 -        <translation>Aborted by user</translation>
 +        <translation>Aborted by User</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2193"/>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2330"/>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2193"/>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2330"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2254"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2391"/>
          <source>Unable to open file or init decoder</source>
 -        <translation>Unable to open file or init decoder</translation>
 +        <translation>Unable to Open File or Initialize Decoder</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2199"/>
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2336"/>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2199"/>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2336"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2260"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2397"/>
          <source>Failed with exit status %1</source>
 -        <translation>Failed with exit status %1</translation>
 +        <translation>Failed with Exit Status %1</translation>
      </message>
      <message numerus="yes">
-         <location filename="../libs/libmythtv/jobqueue.cpp" line="2342"/>
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2342"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2403"/>
          <source>%n commercial break(s)</source>
          <translation>
 -            <numerusform>%n commercial break</numerusform>
@@ -7145,21 +8904,37 @@
          </translation>
      </message>
      <message>
-@@ -9181,43 +9553,43 @@
+-        <location filename="../libs/libmythtv/jobqueue.cpp" line="2358"/>
++        <location filename="../libs/libmythtv/jobqueue.cpp" line="2419"/>
+         <source>Commercial Detection %1</source>
+         <comment>Job ID</comment>
+         <translation>Commercial Detection %1</translation>
+@@ -9174,50 +9043,50 @@
+ <context>
+     <name>KeyGrabPopupBox</name>
+     <message>
+-        <location filename="../programs/mythfrontend/keygrabber.cpp" line="48"/>
++        <location filename="../programs/mythfrontend/keygrabber.cpp" line="41"/>
+         <source>Press A Key</source>
+         <translation>Press A Key</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/keygrabber.cpp" line="49"/>
+-        <location filename="../programs/mythfrontend/keygrabber.cpp" line="49"/>
++        <location filename="../programs/mythfrontend/keygrabber.cpp" line="42"/>
          <source>Waiting for key press</source>
 -        <translation>Waiting for key press</translation>
 +        <translation>Waiting for Key Press</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/keygrabber.cpp" line="113"/>
+-        <location filename="../programs/mythfrontend/keygrabber.cpp" line="113"/>
++        <location filename="../programs/mythfrontend/keygrabber.cpp" line="108"/>
          <source>Pressed key not recognized</source>
 -        <translation>Pressed key not recognized</translation>
 +        <translation>Pressed Key Not Recognized</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/keygrabber.cpp" line="119"/>
+-        <location filename="../programs/mythfrontend/keygrabber.cpp" line="119"/>
++        <location filename="../programs/mythfrontend/keygrabber.cpp" line="114"/>
          <source>Add key &apos;%1&apos;?</source>
 -        <translation>Add key &apos;%1&apos;?</translation>
 +        <translation>Add Key &apos;%1&apos;?</translation>
@@ -7169,35 +8944,35 @@
      <name>LCDProcClient</name>
      <message>
 -        <location filename="../programs/mythlcdserver/lcdprocclient.cpp" line="1933"/>
-+        <location filename="../programs/mythlcdserver/lcdprocclient.cpp" line="1934"/>
++        <location filename="../programs/mythlcdserver/lcdprocclient.cpp" line="1929"/>
          <source>RECORDING</source>
          <translation>RECORDING</translation>
      </message>
      <message>
 -        <location filename="../programs/mythlcdserver/lcdprocclient.cpp" line="2026"/>
-+        <location filename="../programs/mythlcdserver/lcdprocclient.cpp" line="2027"/>
++        <location filename="../programs/mythlcdserver/lcdprocclient.cpp" line="2022"/>
          <source>R </source>
          <translation>R </translation>
      </message>
      <message>
 -        <location filename="../programs/mythlcdserver/lcdprocclient.cpp" line="2031"/>
-+        <location filename="../programs/mythlcdserver/lcdprocclient.cpp" line="2032"/>
++        <location filename="../programs/mythlcdserver/lcdprocclient.cpp" line="2027"/>
          <source>E </source>
          <translation>E </translation>
      </message>
      <message>
 -        <location filename="../programs/mythlcdserver/lcdprocclient.cpp" line="2038"/>
-+        <location filename="../programs/mythlcdserver/lcdprocclient.cpp" line="2039"/>
++        <location filename="../programs/mythlcdserver/lcdprocclient.cpp" line="2034"/>
          <source>C </source>
          <translation>C </translation>
      </message>
      <message>
 -        <location filename="../programs/mythlcdserver/lcdprocclient.cpp" line="2064"/>
-+        <location filename="../programs/mythlcdserver/lcdprocclient.cpp" line="2065"/>
++        <location filename="../programs/mythlcdserver/lcdprocclient.cpp" line="2060"/>
          <source>RECORDING|</source>
          <translation>RECORDING|</translation>
      </message>
-@@ -9227,170 +9599,169 @@
+@@ -9227,171 +9096,166 @@
      <message>
          <location filename="../libs/libmyth/langsettings.cpp" line="76"/>
          <source>Preferred language</source>
@@ -7215,205 +8990,205 @@
      <name>LcdSettings</name>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3335"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3342"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3502"/>
          <source>Display time</source>
 -        <translation>Display time</translation>
 +        <translation>Display Time</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3337"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3344"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3504"/>
          <source>Display current time on idle LCD display.</source>
          <translation>Display current time on idle LCD display.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3349"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3356"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3516"/>
          <source>Display recording status</source>
 -        <translation>Display recording status</translation>
 +        <translation>Display Recording Status</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3351"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3358"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3518"/>
          <source>Display current recordings information on LCD display.</source>
          <translation>Display current recordings information on LCD display.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3363"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3370"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3530"/>
          <source>Display menus</source>
 -        <translation>Display menus</translation>
 +        <translation>Display Menus</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3365"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3372"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3532"/>
          <source>Display selected menu on LCD display. </source>
          <translation>Display selected menu on LCD display. </translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3376"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3383"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3543"/>
          <source>Menu pop-up time</source>
 -        <translation>Menu pop-up time</translation>
 +        <translation>Menu Pop-up Time</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3378"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3385"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3545"/>
          <source>How many seconds the menu will remain visible after navigation.</source>
          <translation>How many seconds the menu will remain visible after navigation.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3390"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3397"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3557"/>
          <source>Display music artist and title</source>
          <translation>Display music artist and title</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3392"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3399"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3559"/>
          <source>Display playing artist and song title in MythMusic on LCD display.</source>
          <translation>Display playing artist and song title in MythMusic on LCD display.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3404"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3411"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3571"/>
          <source>Items</source>
          <translation>Items</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3406"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3413"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3573"/>
          <source>Artist - Title</source>
          <translation>Artist - Title</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3407"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3414"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3574"/>
          <source>Artist [Album] Title</source>
          <translation>Artist [Album] Title</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3410"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3417"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3577"/>
          <source>Which items to show when playing music.</source>
          <translation>Which items to show when playing music.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3419"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3426"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3586"/>
          <source>Display channel information</source>
 -        <translation>Display channel information</translation>
 +        <translation>Display Channel Information</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3421"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3428"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3588"/>
          <source>Display tuned channel information on LCD display.</source>
          <translation>Display tuned channel information on LCD display.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3433"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3440"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3600"/>
          <source>Display volume information</source>
 -        <translation>Display volume information</translation>
 +        <translation>Display Volume Information</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3435"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3442"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3602"/>
          <source>Display volume level information on LCD display.</source>
          <translation>Display volume level information on LCD display.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3447"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3454"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3614"/>
          <source>Display generic information</source>
 -        <translation>Display generic information</translation>
 +        <translation>Display Generic Information</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3449"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3456"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3616"/>
          <source>Display generic information on LCD display.</source>
          <translation>Display generic information on LCD display.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3460"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3467"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3627"/>
          <source>Backlight always on</source>
 -        <translation>Backlight always on</translation>
 +        <translation>Backlight Always On</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3462"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3469"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3629"/>
          <source>Turn on the backlight permanently on the LCD display.</source>
          <translation>Turn on the backlight permanently on the LCD display.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3473"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3480"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3640"/>
          <source>Heartbeat always on</source>
 -        <translation>Heartbeat always on</translation>
 +        <translation>Heartbeat Always On</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3475"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3482"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3642"/>
          <source>Turn on the LCD heartbeat.</source>
          <translation>Turn on the LCD heartbeat.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3486"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3493"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3653"/>
          <source>Display large clock</source>
 -        <translation>Display large clock</translation>
 +        <translation>Display Large Clock</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3488"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3495"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3655"/>
          <source>On multiline displays try and display the time as large as possible.</source>
          <translation>On multiline displays try and display the time as large as possible.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3500"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3507"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3667"/>
          <source>LCD key order</source>
 -        <translation>LCD key order</translation>
 +        <translation>LCD Key Order</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3505"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3512"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3672"/>
          <source>Enter the 6 Keypad Return Codes for your LCD keypad in the order in which you want the functions up/down/left/right/yes/no to operate. (See lcdproc/server/drivers/hd44780.c/keyMapMatrix[] or the matrix for your display)</source>
          <translation>Enter the 6 Keypad Return Codes for your LCD keypad in the order in which you want the functions up/down/left/right/yes/no to operate. (See lcdproc/server/drivers/hd44780.c/keyMapMatrix[] or the matrix for your display)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3517"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3524"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3684"/>
          <source>Enable LCD device</source>
 -        <translation>Enable LCD device</translation>
 +        <translation>Enable LCD Device</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3519"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3526"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3686"/>
          <source>Use an LCD display to view MythTV status information.</source>
          <translation>Use an LCD display to view MythTV status information.</translation>
      </message>
-     <message>
+-    <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3532"/>
-         <source>LCD device display</source>
+-        <source>LCD device display</source>
 -        <translation>LCD device display</translation>
-+        <translation type="vanished">LCD device display</translation>
-     </message>
+-    </message>
  </context>
  <context>
-@@ -9405,47 +9776,46 @@
+     <name>LyricsData</name>
+@@ -9405,47 +9269,46 @@
          <location filename="../libs/libmythmetadata/lyricsdata.cpp" line="95"/>
          <location filename="../libs/libmythmetadata/lyricsdata.cpp" line="230"/>
          <source>No lyrics found for this track</source>
@@ -7425,21 +9200,21 @@
      <name>MPEGConfigurationGroup</name>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2513"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2467"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2219"/>
          <source>Probed info</source>
 -        <translation>Probed info</translation>
 +        <translation>Probed Info</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2528"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2483"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2235"/>
          <source>Failed to open</source>
 -        <translation>Failed to open</translation>
 +        <translation>Failed to Open</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2535"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2490"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2242"/>
          <source>Failed to probe</source>
 -        <translation>Failed to probe</translation>
 +        <translation>Failed to Probe</translation>
@@ -7450,493 +9225,559 @@
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3799"/>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3830"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3723"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3883"/>
          <source>Video on the desktop</source>
 -        <translation>Video on the desktop</translation>
 +        <translation>Video on the Desktop</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3803"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3727"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3887"/>
          <source>If enabled, video will be displayed on the desktop, behind the Finder icons. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</source>
          <translation>If enabled, video will be displayed on the desktop, behind the Finder icons. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3817"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3741"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3901"/>
          <source>Frames to skip</source>
 -        <translation>Frames to skip</translation>
 +        <translation>Frames to Skip</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3821"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3745"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3905"/>
          <source>Video on the desktop will skip this many frames for each frame drawn. Set to 0 to show every frame.</source>
          <translation>Video on the desktop will skip this many frames for each frame drawn. Set to 0 to show every frame.</translation>
      </message>
-@@ -9453,23 +9823,22 @@
+@@ -9453,23 +9316,22 @@
  <context>
      <name>MacDockSettings</name>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3755"/>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3783"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3693"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3853"/>
          <source>Video in the dock</source>
 -        <translation>Video in the dock</translation>
 +        <translation>Video in the Dock</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3759"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3697"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3857"/>
          <source>If enabled, video will be displayed in the application&apos;s dock icon. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</source>
          <translation>If enabled, video will be displayed in the application&apos;s dock icon. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3771"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3709"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3869"/>
          <source>Frames to skip</source>
 -        <translation>Frames to skip</translation>
 +        <translation>Frames to Skip</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3775"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3713"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3873"/>
          <source>Video in the dock icon will skip this many frames for each frame drawn. Set to 0 to show every frame.</source>
          <translation>Video in the dock icon will skip this many frames for each frame drawn. Set to 0 to show every frame.</translation>
      </message>
-@@ -9477,33 +9846,32 @@
+@@ -9477,33 +9339,32 @@
  <context>
      <name>MacFloatSettings</name>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3690"/>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3734"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3647"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3807"/>
          <source>Video in floating window</source>
 -        <translation>Video in floating window</translation>
 +        <translation>Video in Floating Window</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3694"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3651"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3811"/>
          <source>If enabled, video will be displayed in a floating window. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</source>
          <translation>If enabled, video will be displayed in a floating window. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3706"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3663"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3823"/>
          <source>Frames to skip</source>
 -        <translation>Frames to skip</translation>
 +        <translation>Frames to Skip</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3710"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3667"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3827"/>
          <source>Video in the floating window will skip this many frames for each frame drawn. Set to 0 to show every frame.</source>
          <translation>Video in the floating window will skip this many frames for each frame drawn. Set to 0 to show every frame.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3721"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3678"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3838"/>
          <source>Opacity</source>
          <translation>Opacity</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3725"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3682"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3842"/>
          <source>The opacity of the floating window. Set to 100 for completely opaque, set to 0 for completely transparent.</source>
          <translation>The opacity of the floating window. Set to 100 for completely opaque, set to 0 for completely transparent.</translation>
      </message>
-@@ -9511,33 +9879,32 @@
+@@ -9511,33 +9372,32 @@
  <context>
      <name>MacMainSettings</name>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3625"/>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3670"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3600"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3760"/>
          <source>Video in main window</source>
 -        <translation>Video in main window</translation>
 +        <translation>Video in Main Window</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3629"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3604"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3764"/>
          <source>If enabled, video will be displayed in the main GUI window. Disable this when you only want video on the desktop or in a floating window. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</source>
          <translation>If enabled, video will be displayed in the main GUI window. Disable this when you only want video on the desktop or in a floating window. Only valid when &quot;Use GUI size for TV playback&quot; and &quot;Run the frontend in a window&quot; are checked.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3643"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3618"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3778"/>
          <source>Frames to skip</source>
 -        <translation>Frames to skip</translation>
 +        <translation>Frames to Skip</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3647"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3622"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3782"/>
          <source>Video in the main window will skip this many frames for each frame drawn. Set to 0 to show every frame.</source>
          <translation>Video in the main window will skip this many frames for each frame drawn. Set to 0 to show every frame.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3658"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3633"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3793"/>
          <source>Opacity</source>
          <translation>Opacity</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3662"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3637"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3797"/>
          <source>The opacity of the main window. Set to 100 for completely opaque, set to 0 for completely transparent.</source>
          <translation>The opacity of the main window. Set to 100 for completely opaque, set to 0 for completely transparent.</translation>
      </message>
-@@ -9545,252 +9912,269 @@
+@@ -9545,252 +9405,327 @@
  <context>
      <name>MainGeneralSettings</name>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1834"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1827"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1850"/>
          <source>Use line edit virtual keyboards</source>
 -        <translation>Use line edit virtual keyboards</translation>
 +        <translation>Use Line Edit Virtual Keyboards</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1838"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1831"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1854"/>
          <source>If enabled, you can use a virtual keyboard in MythTV&apos;s line edit boxes. To use, hit SELECT (Enter or Space) while a line edit is in focus.</source>
          <translation>If enabled, you can use a virtual keyboard in MythTV&apos;s line edit boxes. To use, hit SELECT (Enter or Space) while a line edit is in focus.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1850"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1843"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1866"/>
          <source>Idle time before entering standby mode (minutes)</source>
 -        <translation>Idle time before entering standby mode (minutes)</translation>
 +        <translation>Idle Time Before Entering Standby Mode (minutes)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1855"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1848"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1871"/>
          <source>Number of minutes to wait when the frontend is idle before entering standby mode. Standby mode allows the backend to power down if configured to do so. Any remote or mouse input will cause the countdown to start again and/or exit idle mode. Video playback suspends the countdown. A value of zero prevents the frontend automatically entering standby.</source>
          <translation>Number of minutes to wait when the frontend is idle before entering standby mode. Standby mode allows the backend to power down if configured to do so. Any remote or mouse input will cause the countdown to start again and/or exit idle mode. Video playback suspends the countdown. A value of zero prevents the frontend automatically entering standby.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1874"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1867"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1890"/>
          <source>Customize exit menu options</source>
 -        <translation>Customize exit menu options</translation>
 +        <translation>Customize Exit Menu Options</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1876"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1869"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1892"/>
          <source>Default</source>
          <translation>Default</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1877"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1870"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1893"/>
          <source>Show quit</source>
 -        <translation>Show quit</translation>
 +        <translation>Show Quit</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1878"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1871"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1894"/>
          <source>Show quit and shutdown</source>
 -        <translation>Show quit and shutdown</translation>
 +        <translation>Show Quit and Shutdown</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1879"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1872"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1895"/>
          <source>Show quit, reboot and shutdown</source>
 -        <translation>Show quit, reboot and shutdown</translation>
 +        <translation>Show Quit, Reboot and Shutdown</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1881"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1874"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1897"/>
          <source>Show shutdown</source>
 -        <translation>Show shutdown</translation>
 +        <translation>Show Shutdown</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1882"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1875"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1898"/>
          <source>Show reboot</source>
 -        <translation>Show reboot</translation>
 +        <translation>Show Reboot</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1883"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1876"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1899"/>
          <source>Show reboot and shutdown</source>
 -        <translation>Show reboot and shutdown</translation>
 +        <translation>Show Reboot and Shutdown</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1884"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1877"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1900"/>
          <source>Show standby</source>
 -        <translation>Show standby</translation>
 +        <translation>Show Standby</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1887"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1880"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1903"/>
          <source>By default, only remote frontends are shown the shutdown option on the exit menu. Here you can force specific shutdown and reboot options to be displayed.</source>
          <translation>By default, only remote frontends are shown the shutdown option on the exit menu. Here you can force specific shutdown and reboot options to be displayed.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1898"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1891"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1914"/>
          <source>Reboot command</source>
 -        <translation>Reboot command</translation>
 +        <translation>Reboot Command</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1902"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1895"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1918"/>
          <source>Optional. Script to run if you select the reboot option from the exit menu, if the option is displayed. You must configure an exit key to display the exit menu.</source>
          <translation>Optional. Script to run if you select the reboot option from the exit menu, if the option is displayed. You must configure an exit key to display the exit menu.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1915"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1908"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1931"/>
          <source>Halt command</source>
 -        <translation>Halt command</translation>
 +        <translation>Halt Command</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1919"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1912"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1935"/>
          <source>Optional. Script to run if you select the shutdown option from the exit menu, if the option is displayed. You must configure an exit key to display the exit menu.</source>
          <translation>Optional. Script to run if you select the shutdown option from the exit menu, if the option is displayed. You must configure an exit key to display the exit menu.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1932"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1925"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1948"/>
          <source>LIRC daemon socket</source>
 -        <translation>LIRC daemon socket</translation>
 +        <translation>LIRC Daemon Socket</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1942"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1935"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1958"/>
          <source>UNIX socket or IP address[:port] to connect in order to communicate with the LIRC Daemon.</source>
          <translation>UNIX socket or IP address[:port] to connect in order to communicate with the LIRC Daemon.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1954"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1947"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1970"/>
          <source>Screen shot path</source>
 -        <translation>Screen shot path</translation>
 +        <translation>Screenshot Path</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1958"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1951"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1974"/>
          <source>Path to screenshot storage location. Should be writable by the frontend</source>
-         <translation>Path to screenshot storage location. Should be writable by the frontend</translation>
+-        <translation>Path to screenshot storage location. Should be writable by the frontend</translation>
++        <translation>Path to screenshot storage location. Path must be writable by MythFrontend.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1969"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1962"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1985"/>
          <source>Setup PIN code</source>
 -        <translation>Setup PIN code</translation>
 +        <translation>Setup PIN Code</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1971"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1964"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1987"/>
          <source>This PIN is used to control access to the setup menus. If you want to use this feature, then setting the value to all numbers will make your life much easier. Set it to blank to disable. If enabled, you will not be able to return to this screen and reset the Setup PIN without first entering the current PIN.</source>
          <translation>This PIN is used to control access to the setup menus. If you want to use this feature, then setting the value to all numbers will make your life much easier. Set it to blank to disable. If enabled, you will not be able to return to this screen and reset the Setup PIN without first entering the current PIN.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3022"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3028"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2845"/>
++        <source>Names exempt from prefix removal</source>
++        <translation>Names Exempt from Prefix Removal</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2847"/>
++        <source>This list of names will be exempt from removing the common prefixes (The, A, An) from a title or filename.   Enter multiple names separated by semicolons.</source>
++        <translation>This list of names will be exempt from removing the common prefixes (The, A, An) from a title or filename. Enter multiple names separated by semicolons.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3127"/>
          <source>Enable Network Remote Control interface</source>
 -        <translation>Enable Network Remote Control interface</translation>
 +        <translation>Enable Network Remote Control Interface</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3025"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3031"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3130"/>
          <source>This enables support for controlling MythFrontend over the network.</source>
          <translation>This enables support for controlling MythFrontend over the network.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3038"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3044"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3143"/>
          <source>Network Remote Control port</source>
 -        <translation>Network Remote Control port</translation>
 +        <translation>Network Remote Control Port</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3042"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3048"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3147"/>
          <source>This specifies what port the Network Remote Control interface will listen on for new connections.</source>
          <translation>This specifies what port the Network Remote Control interface will listen on for new connections.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3053"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3059"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3158"/>
          <source>UDP notify port</source>
 -        <translation>UDP notify port</translation>
 +        <translation>UDP Notify Port</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3057"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3063"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3162"/>
          <source>MythTV will listen for connections from the &quot;mythutil&quot; program on this port.</source>
          <translation>MythTV will listen for connections from the &quot;mythutil&quot; program on this port.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3070"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3076"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3173"/>
++        <source>Enable CEC Control interface</source>
++        <translation>Enable CEC Control Interface</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3175"/>
++        <source>This enables controlling MythFrontend from a TV remote or powering the TV on and off from a MythTV remote if you have compatible hardware. These settings only take effect after a restart.</source>
++        <translation>This enables controlling MythFrontend from a TV remote or powering the TV on and off from a MythTV remote if you have compatible hardware. These settings only take effect after a restart.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3187"/>
++        <source>Allow Power On TV</source>
++        <translation>Allow Power On TV</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3188"/>
++        <source>Enables your TV to be powered on from MythTV remote or when MythTV starts if you have compatible hardware.</source>
++        <translation>Enables your TV to be powered on from MythTV remote or when MythFrontend starts if you have compatible hardware.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3198"/>
++        <source>Allow Power Off TV</source>
++        <translation>Allow Power Off TV</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3199"/>
++        <source>Enables your TV to be powered off from MythTV remote or when MythTV starts if you have compatible hardware.</source>
++        <translation>Enables your TV to be powered off from MythTV remote or when MythFrontend starts if you have compatible hardware.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3209"/>
++        <source>Power on TV At Start</source>
++        <translation>Power On TV at Start</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3210"/>
++        <source>Powers on your TV when you start MythTV if you have compatible hardware.</source>
++        <translation>Powers on your TV when you start MythFrontend if you have compatible hardware.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3220"/>
++        <source>Power off TV At Exit</source>
++        <translation>Power Off TV at Exit</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3221"/>
++        <source>Powers off your TV when you exit MythTV if you have compatible hardware.</source>
++        <translation>Powers off your TV when you exit MythFrontend if you have compatible hardware.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3236"/>
          <source>Enable AirPlay</source>
          <translation>Enable AirPlay</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3072"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3078"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3238"/>
          <source>AirPlay lets you wirelessly view content on your TV from your iPhone, iPad, iPod Touch, or iTunes on your computer.</source>
          <translation>AirPlay lets you wirelessly view content on your TV from your iPhone, iPad, iPod Touch, or iTunes on your computer.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3086"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3092"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3252"/>
          <source>Only support AirTunes (no video)</source>
 -        <translation>Only support AirTunes (no video)</translation>
 +        <translation>Only Support AirTunes (no video)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3088"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3094"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3254"/>
          <source>Only stream audio from your iPhone, iPad, iPod Touch, or iTunes on your computer</source>
 -        <translation>Only stream audio from your iPhone, iPad, iPod Touch, or iTunes on your computer</translation>
 +        <translation>Only stream audio from your iPhone, iPad, iPod Touch, or iTunes on your computer.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3101"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3107"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3267"/>
          <source>Require password</source>
 -        <translation>Require password</translation>
 +        <translation>Require Password</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3105"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3111"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3271"/>
          <source>Require a password to use AirPlay. Your iPhone, iPad, iPod Touch, or iTunes on your computer will prompt you when required</source>
          <translation>Require a password to use AirPlay. Your iPhone, iPad, iPod Touch, or iTunes on your computer will prompt you when required</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3118"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3122"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3282"/>
 +        <source>Password</source>
 +        <translation>Password</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3126"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3286"/>
          <source>Your iPhone, iPad, iPod Touch, or iTunes on your computer will prompt you for this password when required</source>
 -        <translation>Your iPhone, iPad, iPod Touch, or iTunes on your computer will prompt you for this password when required</translation>
 +        <translation>Your iPhone, iPad, iPod Touch, or iTunes on your computer will prompt you for this password when required.</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3137"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3297"/>
 +        <source>AirPlay - Password</source>
 +        <translation>AirPlay - Password</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3140"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3148"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3308"/>
          <source>AirPlay full screen playback</source>
 -        <translation>AirPlay full screen playback</translation>
 +        <translation>AirPlay Fullscreen Playback</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3144"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3152"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3312"/>
          <source>During music playback, displays album cover and various media information in full screen mode</source>
          <translation>During music playback, displays album cover and various media information in full screen mode</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3154"/>
-         <source>All AirPlay settings take effect when you restart MythFrontend.</source>
+-        <source>All AirPlay settings take effect when you restart MythFrontend.</source>
 -        <translation>All AirPlay settings take effect when you restart MythFrontend.</translation>
-+        <translation type="vanished">All AirPlay settings take effect when you restart MythFrontend.</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3165"/>
-         <source>AirTunes RSA key couldn&apos;t be loaded. Check http://www.mythtv.org/wiki/AirTunes/AirPlay. Last Error: %1</source>
+-        <source>AirTunes RSA key couldn&apos;t be loaded. Check http://www.mythtv.org/wiki/AirTunes/AirPlay. Last Error: %1</source>
 -        <translation>AirTunes RSA key couldn&apos;t be loaded. Check http://www.mythtv.org/wiki/AirTunes/AirPlay. Last Error: %1</translation>
-+        <translation type="vanished">AirTunes RSA key couldn&apos;t be loaded. Check http://www.mythtv.org/wiki/AirTunes/AirPlay. Last Error: %1</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3368"/>
++        <source>Ignore devices</source>
++        <translation>Ignore Devices</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3172"/>
-         <source>AirTunes RSA key successfully loaded.</source>
+-        <source>AirTunes RSA key successfully loaded.</source>
 -        <translation>AirTunes RSA key successfully loaded.</translation>
-+        <translation type="vanished">AirTunes RSA key successfully loaded.</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3372"/>
++        <source>If there are any devices that you do not want to be monitored, list them here with commas in-between. The plugins will ignore them. Requires restart.</source>
++        <translation>If there are any devices that you do not want to be monitored, list them here with commas in between. The plugins will ignore them. Requires restart.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3200"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3208"/>
-         <source>Ignore devices</source>
+-        <source>Ignore devices</source>
 -        <translation>Ignore devices</translation>
-+        <translation>Ignore Devices</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3485"/>
++        <source>This enables support for monitoring your CD/DVD drives for new disks and launching the proper plugin to handle them. Requires restart.</source>
++        <translation>This enables support for monitoring your CD/DVD drives for new disks and launching the proper plugin to handle them. Requires restart.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3204"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3212"/>
-         <source>If there are any devices that you do not want to be monitored, list them here with commas in-between. The plugins will ignore them. Requires restart.</source>
+-        <source>If there are any devices that you do not want to be monitored, list them here with commas in-between. The plugins will ignore them. Requires restart.</source>
 -        <translation>If there are any devices that you do not want to be monitored, list them here with commas in-between. The plugins will ignore them. Requires restart.</translation>
-+        <translation>If there are any devices that you do not want to be monitored, list them here with commas in between. The plugins will ignore them. Requires restart.</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3325"/>
-+        <source>This enables support for monitoring your CD/DVD drives for new disks and launching the proper plugin to handle them. Requires restart.</source>
-+        <translation>This enables support for monitoring your CD/DVD drives for new disks and launching the proper plugin to handle them. Requires restart.</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3808"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3968"/>
 +        <source>Main Settings</source>
 +        <translation>Main Settings</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3848"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3813"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3973"/>
          <source>Settings Access</source>
          <translation>Settings Access</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3854"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3818"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3978"/>
          <source>General</source>
          <translation>General</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3861"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3323"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3483"/>
          <source>Media Monitor</source>
          <translation>Media Monitor</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3867"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3828"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="76"/>
++        <source>Decoder Device for VAAPI2 hardware decoding</source>
++        <translation>Decoder Device for VAAPI2 Hardware Decoding</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="80"/>
++        <source>Use this if your system does not detect the VAAPI device. Example: &apos;/dev/dri/renderD128&apos;.</source>
++        <translation>Use this if your system does not detect the VAAPI device. Example: &apos;/dev/dri/renderD128&apos;.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4001"/>
          <source>Remote Control</source>
          <translation>Remote Control</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3877"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3837"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4026"/>
          <source>AirPlay Settings</source>
          <translation>AirPlay Settings</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3889"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3769"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3929"/>
          <source>Shutdown/Reboot Settings</source>
          <translation>Shutdown/Reboot Settings</translation>
      </message>
-@@ -9800,135 +10184,132 @@
+@@ -9800,173 +9735,162 @@
      <message>
          <location filename="../programs/mythfrontend/manualschedule.cpp" line="93"/>
          <source>5 weekdays if daily</source>
@@ -7992,51 +9833,49 @@
 +        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="320"/>
          <source>Failed to eject %1</source>
 -        <translation>Failed to eject %1</translation>
-+        <translation>Failed to Eject %1</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="679"/>
-         <source>Media Handler Selection</source>
+-        <source>Media Handler Selection</source>
 -        <translation>Media Handler Selection</translation>
-+        <translation type="vanished">Media Handler Selection</translation>
++        <translation>Failed to Eject %1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="680"/>
-         <source>The new media contains mixed content that can be rendered in different ways. Select your preferred method.</source>
+-        <source>The new media contains mixed content that can be rendered in different ways. Select your preferred method.</source>
 -        <translation>The new media contains mixed content that can be rendered in different ways. Select your preferred method.</translation>
-+        <translation type="vanished">The new media contains mixed content that can be rendered in different ways. Select your preferred method.</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="872"/>
-+        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="868"/>
++        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="886"/>
          <source>Select a CD drive</source>
 -        <translation>Select a CD drive</translation>
 +        <translation>Select a CD Drive</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="881"/>
-+        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="877"/>
++        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="895"/>
          <source>Select a VCD drive</source>
 -        <translation>Select a VCD drive</translation>
 +        <translation>Select a VCD Drive</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="890"/>
-+        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="886"/>
++        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="904"/>
          <source>Select a DVD drive</source>
 -        <translation>Select a DVD drive</translation>
 +        <translation>Select a DVD Drive</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="899"/>
-+        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="895"/>
++        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="913"/>
          <source>Select a CD writer</source>
 -        <translation>Select a CD writer</translation>
 +        <translation>Select a CD Writer</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="911"/>
-+        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="907"/>
++        <location filename="../libs/libmyth/mythmediamonitor.cpp" line="925"/>
          <source>Select a DVD writer</source>
 -        <translation>Select a DVD writer</translation>
 +        <translation>Select a DVD Writer</translation>
@@ -8046,35 +9885,35 @@
      <name>MetadataOptions</name>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1420"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1421"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1399"/>
          <source>Trying to manually find this recording online...</source>
 -        <translation>Trying to manually find this recording online...</translation>
 +        <translation>Trying to Manually Find This Recording Online...</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1437"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1438"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1416"/>
          <source>Downloading selected artwork...</source>
 -        <translation>Downloading selected artwork...</translation>
 +        <translation>Downloading Selected Artwork...</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1585"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1586"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1564"/>
          <source>You must set a reference number on this rule to set artwork.  For items without a metadata source, you can set any unique value.</source>
 -        <translation>You must set a reference number on this rule to set artwork.  For items without a metadata source, you can set any unique value.</translation>
 +        <translation>You must set a reference number on this rule to set artwork. For items without a metadata source, you can set any unique value.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1638"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1639"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1617"/>
          <source>Searching for available artwork...</source>
 -        <translation>Searching for available artwork...</translation>
 +        <translation>Searching for Available Artwork...</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1664"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1665"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1643"/>
          <source>No image found</source>
 -        <translation>No image found</translation>
 +        <translation>No Image Found</translation>
@@ -8082,132 +9921,208 @@
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1664"/>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1914"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1665"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1915"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1643"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1893"/>
          <source>Schedule Editor</source>
          <translation>Schedule Editor</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1833"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1834"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1812"/>
          <source>No match found for this recording. You can try entering a TVDB/TMDB number, season, and episode manually.</source>
          <translation>No match found for this recording. You can try entering a TVDB/TMDB number, season, and episode manually.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1877"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1878"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1856"/>
          <source>This number, season, and episode combination does not appear to be valid (or the site may be down). Check your information and try again.</source>
          <translation>This number, season, and episode combination does not appear to be valid (or the site may be down). Check your information and try again.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1913"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1914"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1892"/>
          <source>Failed to retrieve image(s)</source>
 -        <translation>Failed to retrieve image(s)</translation>
 +        <translation>Failed to Retrieve Image(s)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1915"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1916"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="1894"/>
          <source>Check logs</source>
 -        <translation>Check logs</translation>
 +        <translation>Check Logs</translation>
      </message>
  </context>
  <context>
-@@ -9961,12 +10342,12 @@
+     <name>MetadataSettings</name>
+     <message>
+-        <location filename="../programs/mythfrontend/videometadatasettings.cpp" line="96"/>
++        <location filename="../programs/mythfrontend/videometadatasettings.cpp" line="93"/>
+         <source>If set, this will enable a button called &quot;Watch With Trailers&quot; which will play a user-specified number of trailers before the movie.</source>
+         <translation>If set, this will enable a button called &quot;Watch With Trailers&quot; which will play a user-specified number of trailers before the movie.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videometadatasettings.cpp" line="100"/>
++        <location filename="../programs/mythfrontend/videometadatasettings.cpp" line="97"/>
+         <source>Number of trailers to play before a film.</source>
+         <translation>Number of trailers to play before a film.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videometadatasettings.cpp" line="102"/>
++        <location filename="../programs/mythfrontend/videometadatasettings.cpp" line="99"/>
+         <source>If set, all files below the MythVideo directory will be displayed unless their extension is explicitly set to be ignored.</source>
+         <translation>If set, all files below the MythVideo directory will be displayed unless their extension is explicitly set to be ignored.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videometadatasettings.cpp" line="106"/>
++        <location filename="../programs/mythfrontend/videometadatasettings.cpp" line="103"/>
+         <source>If set, every time a scan for new videos is performed, a mass metadata update of the collection will also occur.</source>
+         <translation>If set, every time a scan for new videos is performed, a mass metadata update of the collection will also occur.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videometadatasettings.cpp" line="110"/>
++        <location filename="../programs/mythfrontend/videometadatasettings.cpp" line="107"/>
+         <source>If set along with Browse Files, this will cause the Video List to load any known video metadata from the database. Turning this off can greatly speed up how long it takes to load the Video List tree.</source>
+         <translation>If set along with Browse Files, this will cause the Video List to load any known video metadata from the database. Turning this off can greatly speed up how long it takes to load the Video List tree.</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/videometadatasettings.cpp" line="114"/>
+-        <location filename="../programs/mythfrontend/videometadatasettings.cpp" line="114"/>
++        <location filename="../programs/mythfrontend/videometadatasettings.cpp" line="111"/>
          <source>Exit without saving settings</source>
 -        <translation>Exit without saving settings</translation>
 +        <translation>Exit Without Saving</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/videometadatasettings.cpp" line="115"/>
+-        <location filename="../programs/mythfrontend/videometadatasettings.cpp" line="115"/>
++        <location filename="../programs/mythfrontend/videometadatasettings.cpp" line="112"/>
          <source>Save settings and Exit</source>
 -        <translation>Save settings and Exit</translation>
 +        <translation>Save and Exit</translation>
      </message>
  </context>
  <context>
-@@ -10004,7 +10385,7 @@
+@@ -9986,25 +9910,25 @@
+ <context>
+     <name>MusicMetadata</name>
+     <message>
+-        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="872"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="881"/>
+         <source>Unknown Artist</source>
+         <comment>Default artist if no artist</comment>
+         <translation>Unknown Artist</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="877"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="886"/>
+         <source>Unknown Album</source>
+         <comment>Default album if no album</comment>
+         <translation>Unknown Album</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="881"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="890"/>
+         <source>Unknown Genre</source>
+         <comment>Default genre if no genre</comment>
          <translation>Unknown Genre</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="1108"/>
-+        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="1113"/>
++        <location filename="../libs/libmythmetadata/musicmetadata.cpp" line="1136"/>
          <source>Never Played</source>
          <translation>Never Played</translation>
      </message>
-@@ -10014,7 +10395,7 @@
+@@ -10012,24 +9936,24 @@
+ <context>
+     <name>MythAirplayServer</name>
      <message>
-         <location filename="../libs/libmythtv/AirPlay/mythairplayserver.cpp" line="593"/>
+-        <location filename="../libs/libmythtv/AirPlay/mythairplayserver.cpp" line="593"/>
++        <location filename="../libs/libmythtv/AirPlay/mythairplayserver.cpp" line="586"/>
          <source>Client disconnected</source>
 -        <translation>Client disconnected</translation>
 +        <translation>Client Disconnected</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/AirPlay/mythairplayserver.cpp" line="593"/>
-@@ -10050,1505 +10431,1509 @@
+-        <location filename="../libs/libmythtv/AirPlay/mythairplayserver.cpp" line="593"/>
+-        <location filename="../libs/libmythtv/AirPlay/mythairplayserver.cpp" line="736"/>
++        <location filename="../libs/libmythtv/AirPlay/mythairplayserver.cpp" line="586"/>
++        <location filename="../libs/libmythtv/AirPlay/mythairplayserver.cpp" line="729"/>
+         <source>AirPlay</source>
+         <translation>AirPlay</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/AirPlay/mythairplayserver.cpp" line="594"/>
+-        <location filename="../libs/libmythtv/AirPlay/mythairplayserver.cpp" line="737"/>
++        <location filename="../libs/libmythtv/AirPlay/mythairplayserver.cpp" line="587"/>
++        <location filename="../libs/libmythtv/AirPlay/mythairplayserver.cpp" line="730"/>
+         <source>from %1</source>
+         <translation>from %1</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/AirPlay/mythairplayserver.cpp" line="736"/>
++        <location filename="../libs/libmythtv/AirPlay/mythairplayserver.cpp" line="729"/>
+         <source>New Connection</source>
+         <translation>New Connection</translation>
+     </message>
+@@ -10050,1649 +9974,1682 @@
  <context>
      <name>MythControls</name>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1269"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1274"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1207"/>
          <source>Page Up</source>
          <translation>Page Up</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1271"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1276"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1209"/>
          <source>Page Down</source>
          <translation>Page Down</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="541"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="543"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="549"/>
          <source>Play Program</source>
          <translation>Play Program</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="543"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="545"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="551"/>
          <source>Stop Program</source>
          <translation>Stop Program</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="545"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="653"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="547"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="655"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="553"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="664"/>
          <source>Toggle recording status of current program</source>
 -        <translation>Toggle recording status of current program</translation>
 +        <translation>Toggle Recording Status of Current Program</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="547"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="549"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="555"/>
          <source>Page the program guide back one day</source>
 -        <translation>Page the program guide back one day</translation>
 +        <translation>Page the Program Guide Back One Day</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="549"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="551"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="557"/>
          <source>Page the program guide forward one day</source>
 -        <translation>Page the program guide forward one day</translation>
 +        <translation>Page the Program Guide Forward One Day</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="551"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="553"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="559"/>
          <source>Page the program guide left</source>
 -        <translation>Page the program guide left</translation>
 +        <translation>Page the Program Guide Left</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="553"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="555"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="561"/>
          <source>Page the program guide right</source>
 -        <translation>Page the program guide right</translation>
 +        <translation>Page the Program Guide Right</translation>
@@ -8215,15 +10130,15 @@
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="555"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="655"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="557"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="657"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="563"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="666"/>
          <source>Toggle the current channel as a favorite</source>
 -        <translation>Toggle the current channel as a favorite</translation>
 +        <translation>Toggle the Current Channel as a Favorite</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="557"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="559"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="565"/>
          <source>Reverse the channel order in the program guide</source>
 -        <translation>Reverse the channel order in the program guide</translation>
 +        <translation>Reverse the Channel Order in the Program Guide</translation>
@@ -8231,685 +10146,705 @@
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="559"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="813"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="561"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="815"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="567"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="830"/>
          <source>Show the Program Guide</source>
          <translation>Show the Program Guide</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="561"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="815"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="563"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="817"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="569"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="832"/>
          <source>Show the Program Finder</source>
          <translation>Show the Program Finder</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="563"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="565"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="571"/>
          <source>Show the Channel Search</source>
          <translation>Show the Channel Search</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="565"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="567"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="573"/>
          <source>Cycle through channel groups and all channels in the program guide.</source>
 -        <translation>Cycle through channel groups and all channels in the program guide.</translation>
--    </message>
--    <message>
++        <translation>Cycle Through Channel Groups and All Channels in the Program Guide</translation>
+     </message>
+     <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="568"/>
--        <source>Switch channels without exiting guide in Live TV mode.</source>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="576"/>
+         <source>Switch channels without exiting guide in Live TV mode.</source>
 -        <translation>Switch channels without exiting guide in Live TV mode.</translation>
-+        <translation>Cycle Through Channel Groups and All Channels in the Program Guide</translation>
++        <translation>Switch Channels Without Exiting Guide in Live TV Mode</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/tv_play.cpp" line="570"/>
+-        <location filename="../libs/libmythtv/tv_play.cpp" line="570"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="657"/>
--        <source>Volume down</source>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="578"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="668"/>
+         <source>Volume down</source>
 -        <translation>Volume down</translation>
-+        <source>Switch channels without exiting guide in Live TV mode.</source>
-+        <translation>Switch Channels Without Exiting Guide in Live TV Mode</translation>
++        <translation>Volume Down</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/tv_play.cpp" line="572"/>
-         <location filename="../libs/libmythtv/tv_play.cpp" line="659"/>
--        <source>Volume up</source>
+-        <location filename="../libs/libmythtv/tv_play.cpp" line="572"/>
+-        <location filename="../libs/libmythtv/tv_play.cpp" line="659"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="580"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="670"/>
+         <source>Volume up</source>
 -        <translation>Volume up</translation>
-+        <source>Volume down</source>
-+        <translation>Volume Down</translation>
++        <translation>Volume Up</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/tv_play.cpp" line="574"/>
-         <location filename="../libs/libmythtv/tv_play.cpp" line="661"/>
-+        <source>Volume up</source>
-+        <translation>Volume Up</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="576"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="663"/>
+-        <location filename="../libs/libmythtv/tv_play.cpp" line="574"/>
+-        <location filename="../libs/libmythtv/tv_play.cpp" line="661"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="582"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="672"/>
          <source>Mute</source>
          <translation>Mute</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="576"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="665"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="578"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="667"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="584"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="676"/>
          <source>Cycle audio channels</source>
 -        <translation>Cycle audio channels</translation>
 +        <translation>Cycle Audio Channels</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="578"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="580"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="586"/>
          <source>Increase program or channel rank</source>
 -        <translation>Increase program or channel rank</translation>
 +        <translation>Increase Program or Channel Rank</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="580"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="582"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="588"/>
          <source>Decrease program or channel rank</source>
 -        <translation>Decrease program or channel rank</translation>
 +        <translation>Decrease Program or Channel Rank</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="582"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="584"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="590"/>
          <source>List upcoming episodes</source>
 -        <translation>List upcoming episodes</translation>
 +        <translation>List Upcoming Episodes</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="584"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="586"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="592"/>
          <source>List scheduled upcoming episodes</source>
 -        <translation>List scheduled upcoming episodes</translation>
 +        <translation>List Scheduled Upcoming Episodes</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="586"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="588"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="594"/>
          <source>List previously recorded episodes</source>
 -        <translation>List previously recorded episodes</translation>
 +        <translation>List Previously Recorded Episodes</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="588"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="590"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="596"/>
          <source>Show details</source>
 -        <translation>Show details</translation>
 +        <translation>Show Details</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="592"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="594"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="600"/>
          <source>Edit Custom Record Rule</source>
          <translation>Edit Custom Record Rule</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="594"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="596"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="602"/>
          <source>Change Recording Group</source>
          <translation>Change Recording Group</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="596"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="598"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="604"/>
          <source>Change Group View</source>
          <translation>Change Group View</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="598"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="600"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="606"/>
          <source>List recorded episodes</source>
 -        <translation>List recorded episodes</translation>
 +        <translation>List Recorded Episodes</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="608"/>
++        <source>Add Bookmark</source>
++        <translation>Add Bookmark</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="610"/>
++        <source>Toggle Bookmark</source>
++        <translation>Toggle Bookmark</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="601"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="603"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="612"/>
          <source>Exit or return to DVD menu</source>
 -        <translation>Exit or return to DVD menu</translation>
 +        <translation>Exit or Return to DVD Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="603"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="605"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="614"/>
          <source>Playback Compact Menu</source>
          <translation>Playback Compact Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="605"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="607"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="616"/>
          <source>Clear OSD</source>
          <translation>Clear OSD</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="607"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="609"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="618"/>
          <source>Pause</source>
          <translation>Pause</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="609"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="611"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="620"/>
          <source>Fast Forward</source>
          <translation>Fast Forward</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="611"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="613"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="622"/>
          <source>Rewind</source>
          <translation>Rewind</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="613"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="615"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="624"/>
          <source>Arbitrary Seek</source>
          <translation>Arbitrary Seek</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="615"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="617"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="626"/>
          <source>Seek to a position in seconds</source>
 -        <translation>Seek to a position in seconds</translation>
 +        <translation>Seek to a Position in Seconds</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="617"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="619"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="628"/>
          <source>Channel up</source>
 -        <translation>Channel up</translation>
 +        <translation>Channel Up</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="619"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="621"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="630"/>
          <source>Channel down</source>
 -        <translation>Channel down</translation>
 +        <translation>Channel Down</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="621"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="623"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="632"/>
          <source>Switch to the next favorite channel</source>
 -        <translation>Switch to the next favorite channel</translation>
 +        <translation>Switch to the Next Favorite Channel</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="623"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="625"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="634"/>
          <source>Switch to the previous channel</source>
 -        <translation>Switch to the previous channel</translation>
 +        <translation>Switch to the Previous Channel</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="625"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="627"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="636"/>
          <source>Jump ahead</source>
 -        <translation>Jump ahead</translation>
 +        <translation>Jump Ahead</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="627"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="629"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="638"/>
          <source>Jump back</source>
 -        <translation>Jump back</translation>
 +        <translation>Jump Back</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="629"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="631"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="640"/>
          <source>Info utilizing cutlist</source>
 -        <translation>Info utilizing cutlist</translation>
 +        <translation>Info Utilizing Cutlist</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="631"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="633"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="642"/>
          <source>Jump to bookmark</source>
 -        <translation>Jump to bookmark</translation>
 +        <translation>Jump to Bookmark</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="637"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="639"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="648"/>
          <source>Next Video Source</source>
          <translation>Next Video Source</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="639"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="641"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="650"/>
          <source>Previous Video Source</source>
          <translation>Previous Video Source</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="641"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="643"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="652"/>
          <source>Next Input</source>
          <translation>Next Input</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="643"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="645"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="654"/>
          <source>Next Card</source>
          <translation>Next Card</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="645"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="647"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="656"/>
          <source>Skip Commercial</source>
          <translation>Skip Commercial</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="647"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="649"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="658"/>
          <source>Skip Commercial (Reverse)</source>
          <translation>Skip Commercial (Reverse)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="649"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="651"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="660"/>
          <source>Jump to the start of the recording.</source>
 -        <translation>Jump to the start of the recording.</translation>
 +        <translation>Jump to the Start of the Recording</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="651"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="653"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="662"/>
          <source>Toggle channel browse mode</source>
 -        <translation>Toggle channel browse mode</translation>
 +        <translation>Toggle Channel Browse Mode</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="663"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="665"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="674"/>
          <source>Set the volume</source>
 -        <translation>Set the volume</translation>
 +        <translation>Set the Volume</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="667"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="669"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="678"/>
          <source>Toggle audio upmixer</source>
 -        <translation>Toggle audio upmixer</translation>
 +        <translation>Toggle Audio Upmixer</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="669"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="671"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="680"/>
          <source>Toggle Picture-in-Picture view</source>
 -        <translation>Toggle Picture-in-Picture view</translation>
 +        <translation>Toggle Picture-in-Picture View</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="671"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="673"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="682"/>
          <source>Toggle Picture-by-Picture view</source>
 -        <translation>Toggle Picture-by-Picture view</translation>
 +        <translation>Toggle Picture-by-Picture View</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="673"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="675"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="684"/>
          <source>Create Picture-in-Picture view</source>
 -        <translation>Create Picture-in-Picture view</translation>
 +        <translation>Create Picture-in-Picture View</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="675"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="677"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="686"/>
          <source>Create Picture-by-Picture view</source>
 -        <translation>Create Picture-by-Picture view</translation>
 +        <translation>Create Picture-by-Picture View</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="677"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="679"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="688"/>
          <source>Toggle active PIP/PBP window</source>
 -        <translation>Toggle active PIP/PBP window</translation>
 +        <translation>Toggle Active PIP/PBP Window</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="679"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="681"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="690"/>
          <source>Swap PBP/PIP Windows</source>
          <translation>Swap PBP/PIP Windows</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="681"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="683"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="692"/>
          <source>Change PxP view</source>
 -        <translation>Change PxP view</translation>
 +        <translation>Change PxP View</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="695"/>
++        <source>Move BottomLine off screen</source>
++        <translation>Move Bottom Line Off Screen</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="698"/>
++        <source>Save manual zoom for BottomLine</source>
++        <translation>Save Manual Zoom for Bottom Line</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="683"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="685"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="700"/>
          <source>Toggle the video aspect ratio</source>
 -        <translation>Toggle the video aspect ratio</translation>
 +        <translation>Toggle the Video Aspect Ratio</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="685"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="687"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="702"/>
          <source>Next Preconfigured Zoom mode</source>
 -        <translation>Next Preconfigured Zoom mode</translation>
 +        <translation>Next Preconfigured Zoom Mode</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="687"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="689"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="704"/>
          <source>Toggle any captions</source>
 -        <translation>Toggle any captions</translation>
 +        <translation>Toggle any Captions</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="689"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="691"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="706"/>
          <source>Enable any captions</source>
 -        <translation>Enable any captions</translation>
 +        <translation>Enable any Captions</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="691"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="693"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="708"/>
          <source>Disable any captions</source>
 -        <translation>Disable any captions</translation>
 +        <translation>Disable any Captions</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="693"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="695"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="710"/>
          <source>Toggle Teletext Captions</source>
          <translation>Toggle Teletext Captions</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="695"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="697"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="712"/>
          <source>Toggle Subtitles</source>
          <translation>Toggle Subtitles</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="697"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="699"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="714"/>
          <source>Toggle VBI CC</source>
          <translation>Toggle VBI CC</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="699"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="701"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="716"/>
          <source>Toggle ATSC CC</source>
          <translation>Toggle ATSC CC</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="701"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="703"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="718"/>
          <source>Toggle Teletext Menu</source>
          <translation>Toggle Teletext Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="703"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="705"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="720"/>
          <source>Toggle External Subtitles</source>
          <translation>Toggle External Subtitles</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="705"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="707"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="722"/>
          <source>Enable External Subtitles</source>
          <translation>Enable External Subtitles</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="707"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="709"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="724"/>
          <source>Disable External Subtitles</source>
          <translation>Disable External Subtitles</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="709"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="711"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="726"/>
          <source>Toggle Text Subtitles</source>
          <translation>Toggle Text Subtitles</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="712"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="714"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="729"/>
          <source>Play audio track 1</source>
 -        <translation>Play audio track 1</translation>
 +        <translation>Play Audio Track 1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="714"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="716"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="731"/>
          <source>Play audio track 2</source>
 -        <translation>Play audio track 2</translation>
 +        <translation>Play Audio Track 2</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="716"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="718"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="733"/>
          <source>Display subtitle 1</source>
 -        <translation>Display subtitle 1</translation>
 +        <translation>Display Subtitle 1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="718"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="720"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="735"/>
          <source>Display subtitle 2</source>
 -        <translation>Display subtitle 2</translation>
 +        <translation>Display Subtitle 2</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="720"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="722"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="737"/>
          <source>Display Text Subtitle 1</source>
          <translation>Display Text Subtitle 1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="722"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="724"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="739"/>
          <source>Display VBI CC1</source>
          <translation>Display VBI CC1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="724"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="726"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="741"/>
          <source>Display VBI CC2</source>
          <translation>Display VBI CC2</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="726"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="728"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="743"/>
          <source>Display VBI CC3</source>
          <translation>Display VBI CC3</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="728"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="730"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="745"/>
          <source>Display VBI CC4</source>
          <translation>Display VBI CC4</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="730"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="732"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="747"/>
          <source>Display ATSC CC1</source>
          <translation>Display ATSC CC1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="732"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="734"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="749"/>
          <source>Display ATSC CC2</source>
          <translation>Display ATSC CC2</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="734"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="736"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="751"/>
          <source>Display ATSC CC3</source>
          <translation>Display ATSC CC3</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="736"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="738"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="753"/>
          <source>Display ATSC CC4</source>
          <translation>Display ATSC CC4</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="738"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="740"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="755"/>
          <source>Enable Forced Subtitles</source>
          <translation>Enable Forced Subtitles</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="740"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="742"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="757"/>
          <source>Disable Forced Subtitles</source>
          <translation>Disable Forced Subtitles</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="743"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="745"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="760"/>
          <source>Next audio track</source>
 -        <translation>Next audio track</translation>
 +        <translation>Next Audio Track</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="745"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="747"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="762"/>
          <source>Previous audio track</source>
 -        <translation>Previous audio track</translation>
 +        <translation>Previous Audio Track</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="747"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="749"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="764"/>
          <source>Next subtitle track</source>
 -        <translation>Next subtitle track</translation>
 +        <translation>Next Subtitle Track</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="749"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="751"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="766"/>
          <source>Previous subtitle track</source>
 -        <translation>Previous subtitle track</translation>
 +        <translation>Previous Subtitle Track</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="751"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="753"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="768"/>
          <source>Next Text track</source>
 -        <translation>Next Text track</translation>
 +        <translation>Next Text Track</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="753"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="755"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="770"/>
          <source>Previous Text track</source>
 -        <translation>Previous Text track</translation>
 +        <translation>Previous Text Track</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="755"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="757"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="772"/>
          <source>Next VBI CC track</source>
 -        <translation>Next VBI CC track</translation>
 +        <translation>Next VBI CC Track</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="757"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="759"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="774"/>
          <source>Previous VBI CC track</source>
 -        <translation>Previous VBI CC track</translation>
 +        <translation>Previous VBI CC Track</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="759"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="761"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="776"/>
          <source>Next ATSC CC track</source>
 -        <translation>Next ATSC CC track</translation>
 +        <translation>Next ATSC CC Track</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="761"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="763"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="778"/>
          <source>Previous ATSC CC track</source>
 -        <translation>Previous ATSC CC track</translation>
 +        <translation>Previous ATSC CC Track</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="763"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="765"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="780"/>
          <source>Next of any captions</source>
 -        <translation>Next of any captions</translation>
 +        <translation>Next of any Captions</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="766"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="768"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="783"/>
          <source>Next video scan overidemode</source>
 -        <translation>Next video scan overidemode</translation>
 +        <translation>Next Video Scan Overide Mode</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="768"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="770"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="785"/>
          <source>Queue the current recording for transcoding</source>
 -        <translation>Queue the current recording for transcoding</translation>
 +        <translation>Queue the Current Recording for Transcoding</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="770"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="772"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="787"/>
          <source>Increase the playback speed</source>
 -        <translation>Increase the playback speed</translation>
 +        <translation>Increase the Playback Speed</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="772"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="774"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="789"/>
          <source>Decrease the playback speed</source>
 -        <translation>Decrease the playback speed</translation>
 +        <translation>Decrease the Playback Speed</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="774"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="776"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="791"/>
          <source>Turn on time stretch control</source>
 -        <translation>Turn on time stretch control</translation>
 +        <translation>Turn on Time Stretch Control</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="776"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="778"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="793"/>
          <source>Increase time stretch speed</source>
 -        <translation>Increase time stretch speed</translation>
 +        <translation>Increase Time Stretch Speed</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="778"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="780"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="795"/>
          <source>Decrease time stretch speed</source>
 -        <translation>Decrease time stretch speed</translation>
 +        <translation>Decrease Time Stretch Speed</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="780"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="782"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="797"/>
          <source>Toggle time stretch speed</source>
 -        <translation>Toggle time stretch speed</translation>
 +        <translation>Toggle Time Stretch Speed</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="783"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="785"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="800"/>
          <source>Turn on audio sync adjustment controls</source>
 -        <translation>Turn on audio sync adjustment controls</translation>
 +        <translation>Turn on Audio Sync Adjustment Controls</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="786"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="788"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="803"/>
          <source>Set the audio sync adjustment</source>
 -        <translation>Set the audio sync adjustment</translation>
 +        <translation>Set the Audio Sync Adjustment</translation>
@@ -8917,354 +10852,359 @@
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="789"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="802"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="791"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="804"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="806"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="819"/>
          <source>Playback picture adjustments</source>
 -        <translation>Playback picture adjustments</translation>
 +        <translation>Playback Picture Adjustments</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="792"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="794"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="809"/>
          <source>Toggle night mode</source>
 -        <translation>Toggle night mode</translation>
 +        <translation>Toggle Night Mode</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="794"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="796"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="811"/>
          <source>Set the picture brightness</source>
 -        <translation>Set the picture brightness</translation>
 +        <translation>Set the Picture Brightness</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="796"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="798"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="813"/>
          <source>Set the picture contrast</source>
 -        <translation>Set the picture contrast</translation>
 +        <translation>Set the Picture Contrast</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="798"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="800"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="815"/>
          <source>Set the picture color</source>
 -        <translation>Set the picture color</translation>
 +        <translation>Set the Picture Color</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="800"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="802"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="817"/>
          <source>Set the picture hue</source>
 -        <translation>Set the picture hue</translation>
 +        <translation>Set the Picture Hue</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="805"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="807"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="822"/>
          <source>Recording picture adjustments for this channel</source>
 -        <translation>Recording picture adjustments for this channel</translation>
 +        <translation>Recording Picture Adjustments for This Channel</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="808"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="810"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="825"/>
          <source>Recording picture adjustments for this recorder</source>
 -        <translation>Recording picture adjustments for this recorder</translation>
 +        <translation>Recording Picture Adjustments for This Recorder</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="811"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="813"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="828"/>
          <source>Cycle Commercial Skip mode</source>
 -        <translation>Cycle Commercial Skip mode</translation>
 +        <translation>Cycle Commercial Skip Mode</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="817"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="819"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="834"/>
          <source>Toggle the Sleep Timer</source>
          <translation>Toggle the Sleep Timer</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="819"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="821"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="836"/>
          <source>Play</source>
          <translation>Play</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="821"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="823"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="838"/>
          <source>Jump to previously played recording</source>
 -        <translation>Jump to previously played recording</translation>
 +        <translation>Jump to Previously Played Recording</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="823"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="825"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="840"/>
          <source>Display menu of recorded programs to jump to</source>
 -        <translation>Display menu of recorded programs to jump to</translation>
 +        <translation>Display Menu of Recorded Programs to Jump to</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="825"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="827"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="842"/>
          <source>Display scheduled recording list</source>
 -        <translation>Display scheduled recording list</translation>
 +        <translation>Display Scheduled Recording List</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="827"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="829"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="844"/>
          <source>Display previously recorded episodes</source>
 -        <translation>Display previously recorded episodes</translation>
 +        <translation>Display Previously Recorded Episodes</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="829"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="831"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="846"/>
          <source>Monitor Signal Quality</source>
          <translation>Monitor Signal Quality</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="832"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="834"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="849"/>
          <source>Jump to the DVD Root Menu</source>
          <translation>Jump to the DVD Root Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="834"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="836"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="851"/>
          <source>Jump to the Popup Menu</source>
          <translation>Jump to the Popup Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="836"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="838"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="853"/>
          <source>Jump to the DVD Chapter Menu</source>
          <translation>Jump to the DVD Chapter Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="838"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="840"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="855"/>
          <source>Jump to the DVD Title Menu</source>
          <translation>Jump to the DVD Title Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="840"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="842"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="857"/>
          <source>Exit Show without any prompts</source>
 -        <translation>Exit Show without any prompts</translation>
 +        <translation>Exit Show Without any Prompts</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="842"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="844"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="859"/>
          <source>Jump to a chapter</source>
 -        <translation>Jump to a chapter</translation>
 +        <translation>Jump to a Chapter</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="844"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="846"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="861"/>
          <source>Switch title</source>
 -        <translation>Switch title</translation>
 +        <translation>Switch Title</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="846"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="848"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="863"/>
          <source>Switch angle</source>
 -        <translation>Switch angle</translation>
 +        <translation>Switch Angle</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="848"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="850"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="865"/>
++        <source>OSD Navigation</source>
++        <translation>OSD Navigation</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="867"/>
          <source>Zoom mode - shift up</source>
 -        <translation>Zoom mode - shift up</translation>
 +        <translation>Zoom Mode - Shift Up</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="850"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="852"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="869"/>
          <source>Zoom mode - shift down</source>
 -        <translation>Zoom mode - shift down</translation>
 +        <translation>Zoom Mode - Shift Down</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="852"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="854"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="871"/>
          <source>Zoom mode - shift left</source>
 -        <translation>Zoom mode - shift left</translation>
 +        <translation>Zoom Mode - Shift Left</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="854"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="856"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="873"/>
          <source>Zoom mode - shift right</source>
 -        <translation>Zoom mode - shift right</translation>
 +        <translation>Zoom Mode - Shift Right</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="857"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="859"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="876"/>
          <source>Zoom mode - increase aspect ratio</source>
 -        <translation>Zoom mode - increase aspect ratio</translation>
 +        <translation>Zoom Mode - Increase Aspect Ratio</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="860"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="862"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="879"/>
          <source>Zoom mode - decrease aspect ratio</source>
 -        <translation>Zoom mode - decrease aspect ratio</translation>
 +        <translation>Zoom Mode - Decrease Aspect Ratio</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="862"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="864"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="881"/>
          <source>Zoom mode - zoom in</source>
 -        <translation>Zoom mode - zoom in</translation>
 +        <translation>Zoom Mode - Zoom In</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="864"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="866"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="883"/>
          <source>Zoom mode - zoom out</source>
 -        <translation>Zoom mode - zoom out</translation>
 +        <translation>Zoom Mode - Zoom Out</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="867"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="869"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="886"/>
          <source>Zoom mode - vertical zoom in</source>
 -        <translation>Zoom mode - vertical zoom in</translation>
 +        <translation>Zoom Mode - Vertical Zoom in</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="870"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="872"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="889"/>
          <source>Zoom mode - vertical zoom out</source>
 -        <translation>Zoom mode - vertical zoom out</translation>
 +        <translation>Zoom Mode - Vertical Zoom Out</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="873"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="875"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="892"/>
          <source>Zoom mode - horizontal zoom in</source>
 -        <translation>Zoom mode - horizontal zoom in</translation>
 +        <translation>Zoom Mode - Horizontal Zoom in</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="876"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="878"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="895"/>
          <source>Zoom mode - horizontal zoom out</source>
 -        <translation>Zoom mode - horizontal zoom out</translation>
 +        <translation>Zoom Mode - Horizontal Zoom Out</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="878"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="880"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="897"/>
          <source>Zoom mode - quit and abandon changes</source>
 -        <translation>Zoom mode - quit and abandon changes</translation>
 +        <translation>Zoom Mode - Quit and Abandon Changes</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="880"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="882"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="899"/>
          <source>Zoom mode - commit changes</source>
 -        <translation>Zoom mode - commit changes</translation>
 +        <translation>Zoom Mode - Commit Changes</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="904"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="906"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="923"/>
          <source>Save cuts</source>
 -        <translation>Save cuts</translation>
 +        <translation>Save Cuts</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="906"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="908"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="925"/>
          <source>Load cuts from detected commercials</source>
 -        <translation>Load cuts from detected commercials</translation>
 +        <translation>Load Cuts From Detected Commercials</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="916"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="918"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="935"/>
          <source>Cut point editor compact menu</source>
 -        <translation>Cut point editor compact menu</translation>
 +        <translation>Cut Point Editor Compact Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="947"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="949"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="966"/>
          <source>Toggle audio visualisation</source>
 -        <translation>Toggle audio visualisation</translation>
-+        <translation>Toggle Audio Visualisation</translation>
++        <translation>Toggle Audio Visualization</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="951"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="953"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="970"/>
          <source>Toggle OSD playback information</source>
 -        <translation>Toggle OSD playback information</translation>
 +        <translation>Toggle OSD Playback Information</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="955"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="957"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="974"/>
          <source>No 3D</source>
          <translation>No 3D</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="957"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="959"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="976"/>
          <source>3D Side by Side</source>
          <translation>3D Side by Side</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="959"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="961"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="978"/>
          <source>Discard 3D Side by Side</source>
          <translation>Discard 3D Side by Side</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="961"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="963"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="980"/>
          <source>3D Top and Bottom</source>
          <translation>3D Top and Bottom</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="963"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="965"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="982"/>
          <source>Discard 3D Top and Bottom</source>
          <translation>Discard 3D Top and Bottom</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="884"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="930"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="886"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="932"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="903"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="949"/>
          <source>Menu Red</source>
          <translation>Menu Red</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="590"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="592"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="598"/>
          <source>Switch Recording Input view</source>
 -        <translation>Switch Recording Input view</translation>
 +        <translation>Switch Recording Input View</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="633"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="635"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="644"/>
          <source>Fast Forward (Sticky) or Forward one second while paused</source>
 -        <translation>Fast Forward (Sticky) or Forward one second while paused</translation>
 +        <translation>Fast Forward (Sticky) or Forward One Second While Paused</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="635"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="637"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="646"/>
          <source>Rewind (Sticky) or Rewind one second while paused</source>
 -        <translation>Rewind (Sticky) or Rewind one second while paused</translation>
 +        <translation>Rewind (Sticky) or Rewind One Second While Paused</translation>
@@ -9272,1056 +11212,1165 @@
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="886"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="932"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="888"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="934"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="905"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="951"/>
          <source>Menu Green</source>
          <translation>Menu Green</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="888"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="934"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="890"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="936"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="907"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="953"/>
          <source>Menu Yellow</source>
          <translation>Menu Yellow</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="890"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="936"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="892"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="938"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="909"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="955"/>
          <source>Menu Blue</source>
          <translation>Menu Blue</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="892"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="894"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="911"/>
          <source>Menu Exit</source>
          <translation>Menu Exit</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="894"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="896"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="913"/>
          <source>Menu Text</source>
          <translation>Menu Text</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="896"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="898"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="915"/>
          <source>Menu EPG</source>
          <translation>Menu EPG</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="900"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="902"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="919"/>
          <source>Clear editing cut points</source>
 -        <translation>Clear editing cut points</translation>
 +        <translation>Clear Editing Cut Points</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="902"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="904"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="921"/>
          <source>Invert Begin/End cut points</source>
 -        <translation>Invert Begin/End cut points</translation>
 +        <translation>Invert Begin/End Cut Points</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="908"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="910"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="927"/>
          <source>Jump to the next cut point</source>
 -        <translation>Jump to the next cut point</translation>
 +        <translation>Jump to the Next Cut Point</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="910"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="912"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="929"/>
          <source>Jump to the previous cut point</source>
 -        <translation>Jump to the previous cut point</translation>
 +        <translation>Jump to the Previous Cut Point</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="912"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="914"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="931"/>
          <source>Jump back 10x the normal amount</source>
 -        <translation>Jump back 10x the normal amount</translation>
 +        <translation>Jump Back 10x Normal</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="914"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="916"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="933"/>
          <source>Jump forward 10x the normal amount</source>
 -        <translation>Jump forward 10x the normal amount</translation>
 +        <translation>Jump Forward 10x Normal</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="920"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="922"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="939"/>
          <source>Next Page</source>
          <translation>Next Page</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="922"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="924"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="941"/>
          <source>Previous Page</source>
          <translation>Previous Page</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="924"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="926"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="943"/>
          <source>Next Subpage</source>
          <translation>Next Subpage</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="926"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="928"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="945"/>
          <source>Previous Subpage</source>
          <translation>Previous Subpage</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="928"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="930"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="947"/>
          <source>Toggle Teletext</source>
          <translation>Toggle Teletext</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="938"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="940"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="957"/>
          <source>Menu White</source>
          <translation>Menu White</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="941"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="943"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="960"/>
          <source>Toggle Background</source>
          <translation>Toggle Background</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="942"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="944"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="961"/>
          <source>Reveal hidden Text</source>
 -        <translation>Reveal hidden Text</translation>
 +        <translation>Reveal Hidden Text</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1238"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1243"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1176"/>
          <source>Up Arrow</source>
          <translation>Up Arrow</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1240"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1245"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1178"/>
          <source>Down Arrow</source>
          <translation>Down Arrow</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1242"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1247"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1180"/>
          <source>Left Arrow</source>
          <translation>Left Arrow</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1244"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1249"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1182"/>
          <source>Right Arrow</source>
          <translation>Right Arrow</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1246"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1251"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1184"/>
          <source>Move to next widget</source>
 -        <translation>Move to next widget</translation>
 +        <translation>Move to Next Widget</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1248"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1253"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1186"/>
          <source>Move to preview widget</source>
 -        <translation>Move to preview widget</translation>
 +        <translation>Move to Preview Widget</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1250"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1255"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1188"/>
          <source>Select</source>
          <translation>Select</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1252"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1257"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1190"/>
          <source>Backspace</source>
          <translation>Backspace</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1254"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1259"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1192"/>
          <source>Escape</source>
          <translation>Escape</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1256"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1261"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1194"/>
          <source>Pop-up menu</source>
 -        <translation>Pop-up menu</translation>
 +        <translation>Pop-up Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1258"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1263"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1196"/>
          <source>More information</source>
 -        <translation>More information</translation>
 +        <translation>More Information</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1260"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1265"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1198"/>
          <source>Delete</source>
          <translation>Delete</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1262"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1267"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1200"/>
          <source>Edit</source>
          <translation>Edit</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1264"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1269"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1202"/>
          <source>Save screenshot</source>
 -        <translation>Save screenshot</translation>
 +        <translation>Save Screenshot</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1266"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1271"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1204"/>
          <source>Play a media resource</source>
 -        <translation>Play a media resource</translation>
 +        <translation>Play a Media Resource</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1273"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1278"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1211"/>
          <source>Page to top of list</source>
 -        <translation>Page to top of list</translation>
 +        <translation>Page to Top of List</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1275"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1280"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1213"/>
          <source>Page to middle of list</source>
 -        <translation>Page to middle of list</translation>
 +        <translation>Page to Middle of List</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1277"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1282"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1215"/>
          <source>Page to bottom of list</source>
 -        <translation>Page to bottom of list</translation>
 +        <translation>Page to Bottom of List</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1280"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1285"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1218"/>
          <source>Previous View</source>
          <translation>Previous View</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1282"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1287"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1220"/>
          <source>Next View</source>
          <translation>Next View</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1285"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1290"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1223"/>
          <source>Help</source>
          <translation>Help</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1287"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1292"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1225"/>
          <source>Eject Removable Media</source>
          <translation>Eject Removable Media</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1290"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1295"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1228"/>
          <source>Cut text from textedit</source>
 -        <translation>Cut text from textedit</translation>
 +        <translation>Cut Text from Textedit</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1292"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1297"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1230"/>
          <source>Copy text from textedit</source>
 -        <translation>Copy text from textedit</translation>
 +        <translation>Copy Text from Textedit</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1294"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1299"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1232"/>
          <source>Paste text into textedit</source>
 -        <translation>Paste text into textedit</translation>
 +        <translation>Paste Text Into Textedit</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1296"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1301"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1234"/>
          <source>Insert newline into textedit</source>
 -        <translation>Insert newline into textedit</translation>
 +        <translation>Insert Newline Into Textedit</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1298"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1303"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1236"/>
          <source>Undo</source>
          <translation>Undo</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1300"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1305"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1238"/>
          <source>Redo</source>
          <translation>Redo</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1302"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1307"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1240"/>
          <source>Show incremental search dialog</source>
 -        <translation>Show incremental search dialog</translation>
 +        <translation>Show Incremental Search Dialog</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1305"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1310"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1243"/>
          <source>0</source>
          <translation>0</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1306"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1311"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1244"/>
          <source>1</source>
          <translation>1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1307"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1312"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1245"/>
          <source>2</source>
          <translation>2</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1308"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1313"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1246"/>
          <source>3</source>
          <translation>3</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1309"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1314"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1247"/>
          <source>4</source>
          <translation>4</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1310"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1315"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1248"/>
          <source>5</source>
          <translation>5</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1311"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1316"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1249"/>
          <source>6</source>
          <translation>6</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1312"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1317"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1250"/>
          <source>7</source>
          <translation>7</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1313"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1318"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1251"/>
          <source>8</source>
          <translation>8</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1314"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1319"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1252"/>
          <source>9</source>
          <translation>9</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1316"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1321"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1254"/>
          <source>Turn the display on</source>
 -        <translation>Turn the display on</translation>
 +        <translation>Turn the Display On</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1318"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1323"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1256"/>
          <source>Turn the display off</source>
 -        <translation>Turn the display off</translation>
 +        <translation>Turn the Display Off</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1321"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1326"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1259"/>
          <source>Trigger System Key Event #1</source>
          <translation>Trigger System Key Event #1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1323"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1328"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1261"/>
          <source>Trigger System Key Event #2</source>
          <translation>Trigger System Key Event #2</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1325"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1330"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1263"/>
          <source>Trigger System Key Event #3</source>
          <translation>Trigger System Key Event #3</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1327"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1332"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1265"/>
          <source>Trigger System Key Event #4</source>
          <translation>Trigger System Key Event #4</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1329"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1334"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1267"/>
          <source>Trigger System Key Event #5</source>
          <translation>Trigger System Key Event #5</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1331"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1336"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1269"/>
          <source>Trigger System Key Event #6</source>
          <translation>Trigger System Key Event #6</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1333"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1338"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1271"/>
          <source>Trigger System Key Event #7</source>
          <translation>Trigger System Key Event #7</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1335"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1340"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1273"/>
          <source>Trigger System Key Event #8</source>
          <translation>Trigger System Key Event #8</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1337"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1342"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1275"/>
          <source>Trigger System Key Event #9</source>
          <translation>Trigger System Key Event #9</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1339"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1344"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1277"/>
          <source>Trigger System Key Event #10</source>
          <translation>Trigger System Key Event #10</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1343"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1348"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1281"/>
          <source>Zoom in on browser window</source>
 -        <translation>Zoom in on browser window</translation>
 +        <translation>Zoom In on Browser Window</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1345"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1350"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1283"/>
          <source>Zoom out on browser window</source>
 -        <translation>Zoom out on browser window</translation>
 +        <translation>Zoom Out on Browser Window</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1347"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1352"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1285"/>
          <source>Toggle where keyboard input goes to</source>
 -        <translation>Toggle where keyboard input goes to</translation>
 +        <translation>Toggle Where Keyboard Input Goes To</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1350"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1355"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1288"/>
          <source>Move mouse pointer up</source>
 -        <translation>Move mouse pointer up</translation>
 +        <translation>Move Mouse Pointer Up</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1352"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1357"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1290"/>
          <source>Move mouse pointer down</source>
 -        <translation>Move mouse pointer down</translation>
 +        <translation>Move Mouse Pointer Down</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1354"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1359"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1292"/>
          <source>Move mouse pointer left</source>
 -        <translation>Move mouse pointer left</translation>
 +        <translation>Move Mouse Pointer Left</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1356"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1361"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1294"/>
          <source>Move mouse pointer right</source>
 -        <translation>Move mouse pointer right</translation>
 +        <translation>Move Mouse Pointer Right</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1358"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1363"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1296"/>
          <source>Mouse Left button click</source>
 -        <translation>Mouse Left button click</translation>
 +        <translation>Mouse Left Button Click</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1361"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1366"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1299"/>
          <source>Scroll down half a page</source>
 -        <translation>Scroll down half a page</translation>
 +        <translation>Scroll Down Half Page</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1363"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1368"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1301"/>
          <source>Scroll up half a page</source>
 -        <translation>Scroll up half a page</translation>
 +        <translation>Scroll Up Half Page</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1365"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1370"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1303"/>
          <source>Scroll left half a page</source>
 -        <translation>Scroll left half a page</translation>
 +        <translation>Scroll Left Half Page</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1367"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1372"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1305"/>
          <source>Scroll right half a page</source>
 -        <translation>Scroll right half a page</translation>
 +        <translation>Scroll Right Half Page</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1370"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1375"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1308"/>
          <source>Move selection to next link</source>
 -        <translation>Move selection to next link</translation>
 +        <translation>Move Selection to Next Link</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1372"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1377"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1310"/>
          <source>Move selection to previous link</source>
 -        <translation>Move selection to previous link</translation>
 +        <translation>Move Selection to Previous Link</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1374"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1379"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1312"/>
          <source>Follow selected link</source>
 -        <translation>Follow selected link</translation>
 +        <translation>Follow Selected Link</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1376"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1381"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1314"/>
          <source>Go back to previous page</source>
 -        <translation>Go back to previous page</translation>
 +        <translation>Go Back to Previous Page</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1378"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1383"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1316"/>
          <source>Go forward to previous page</source>
 -        <translation>Go forward to previous page</translation>
 +        <translation>Go Forward to Previous Page</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1383"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1388"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1321"/>
          <source>System Exit</source>
          <translation>System Exit</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1385"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1390"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1323"/>
          <source>Enter Standby Mode</source>
          <translation>Enter Standby Mode</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1381"/>
-+        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1386"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1325"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1327"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1329"/>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1331"/>
++        <source>Up to 16 Keys that allow Long Press</source>
++        <translation>Up to 16 Keys that allow Long Press</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythui/mythmainwindow.cpp" line="1319"/>
          <source>Display System Exit Prompt</source>
          <translation>Display System Exit Prompt</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1364"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1456"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1554"/>
          <source>Reload Theme</source>
          <translation>Reload Theme</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1366"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1458"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1556"/>
          <source>Main Menu</source>
          <translation>Main Menu</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1368"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1460"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1558"/>
          <source>Program Guide</source>
          <translation>Program Guide</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1370"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1462"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1560"/>
          <source>Program Finder</source>
          <translation>Program Finder</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1374"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1466"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1564"/>
          <source>Manage Recordings / Fix Conflicts</source>
          <translation>Manage Recordings / Fix Conflicts</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1376"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1468"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1566"/>
          <source>Manage Recording Rules</source>
          <translation>Manage Recording Rules</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1378"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1470"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1568"/>
          <source>Channel Recording Priorities</source>
          <translation>Channel Recording Priorities</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1380"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1472"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1570"/>
          <source>TV Recording Playback</source>
          <translation>TV Recording Playback</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1382"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1474"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1572"/>
          <source>Live TV</source>
          <translation>Live TV</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1384"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1476"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1574"/>
          <source>Status Screen</source>
          <translation>Status Screen</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1386"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1478"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1576"/>
          <source>Previously Recorded</source>
          <translation>Previously Recorded</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1389"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1481"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1579"/>
          <source>Standby Mode</source>
          <translation>Standby Mode</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1394"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1486"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1584"/>
          <source>The Video Default View</source>
          <translation>The Video Default View</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1396"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1488"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1586"/>
          <source>The Video Manager</source>
          <translation>The Video Manager</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1398"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1490"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1588"/>
          <source>The Video Browser</source>
          <translation>The Video Browser</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1400"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1492"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1590"/>
          <source>The Video Listings</source>
          <translation>The Video Listings</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1402"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1494"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1592"/>
          <source>The Video Gallery</source>
          <translation>The Video Gallery</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1404"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1496"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1594"/>
          <source>Play an Optical Disc</source>
          <translation>Play an Optical Disc</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1409"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1501"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1599"/>
          <source>Image Gallery</source>
          <translation>Image Gallery</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1412"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1504"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1602"/>
          <source>Toggle Show Widget Borders</source>
          <translation>Toggle Show Widget Borders</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1414"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1506"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1604"/>
          <source>Toggle Show Widget Names</source>
          <translation>Toggle Show Widget Names</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1416"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1508"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1606"/>
          <source>Reset All Keys</source>
          <translation>Reset All Keys</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1417"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1509"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1607"/>
          <source>Reset all keys to defaults</source>
 -        <translation>Reset all keys to defaults</translation>
 +        <translation>Reset All Keys to Defaults</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1446"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1538"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1636"/>
          <source>Start/Stop Slideshow</source>
          <translation>Start/Stop Slideshow</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1448"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1540"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1638"/>
          <source>Start Recursive Slideshow</source>
          <translation>Start Recursive Slideshow</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1450"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1542"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1640"/>
          <source>Rotate image right 90 degrees</source>
 -        <translation>Rotate image right 90 degrees</translation>
 +        <translation>Rotate Image Right 90 Degrees</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1452"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1544"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1642"/>
          <source>Rotate image left 90 degrees</source>
 -        <translation>Rotate image left 90 degrees</translation>
 +        <translation>Rotate Image Left 90 Degrees</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1454"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1546"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1644"/>
          <source>Flip image horizontally</source>
 -        <translation>Flip image horizontally</translation>
 +        <translation>Flip Image Horizontally</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1456"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1548"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1646"/>
          <source>Flip image vertically</source>
 -        <translation>Flip image vertically</translation>
 +        <translation>Flip Image Vertically</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1458"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1550"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1648"/>
          <source>Zoom image out</source>
 -        <translation>Zoom image out</translation>
 +        <translation>Zoom Image Out</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1460"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1552"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1650"/>
          <source>Zoom image in</source>
 -        <translation>Zoom image in</translation>
 +        <translation>Zoom Image In</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1462"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1554"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1652"/>
          <source>Full-size (un-zoom) image</source>
 -        <translation>Full-size (un-zoom) image</translation>
 +        <translation>Fullsize (Un-zoom) Image</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1464"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1556"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1654"/>
          <source>Mark image</source>
 -        <translation>Mark image</translation>
 +        <translation>Mark Image</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1466"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1558"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1656"/>
          <source>Scroll image up</source>
 -        <translation>Scroll image up</translation>
 +        <translation>Scroll Image Up</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1468"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1560"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1658"/>
          <source>Scroll image left</source>
 -        <translation>Scroll image left</translation>
 +        <translation>Scroll Image Left</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1470"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1562"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1660"/>
          <source>Scroll image right</source>
 -        <translation>Scroll image right</translation>
 +        <translation>Scroll Image Right</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1472"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1564"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1662"/>
          <source>Scroll image down</source>
 -        <translation>Scroll image down</translation>
 +        <translation>Scroll Image Down</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1474"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1566"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1664"/>
          <source>Recenter image</source>
 -        <translation>Recenter image</translation>
 +        <translation>Recenter Image</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1530"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1568"/>
+-        <source>MythTV&apos;s native media player.</source>
+-        <translation>MythTV&apos;s native media player.</translation>
++        <location filename="../programs/mythfrontend/main.cpp" line="1666"/>
 +        <source>Set or clear cover image</source>
 +        <translation>Set or Clear Cover Image</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1624"/>
-         <source>MythTV&apos;s native media player.</source>
--        <translation>MythTV&apos;s native media player.</translation>
-+        <translation>MythTV&apos;s Native Media Player</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1535"/>
-         <source>MythDVD media</source>
+-        <source>MythDVD media</source>
 -        <translation>MythDVD media</translation>
-+        <translation type="vanished">MythDVD media</translation>
++        <location filename="../programs/mythfrontend/main.cpp" line="1722"/>
++        <source>MythTV&apos;s native media player.</source>
++        <translation>MythTV&apos;s Native Media Player</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1538"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1629"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1727"/>
          <source>MythImage Media Handler 1/2</source>
          <translation>MythImage Media Handler 1/2</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1545"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1636"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1734"/>
          <source>MythImage Media Handler 2/2</source>
          <translation>MythImage Media Handler 2/2</translation>
      </message>
-@@ -11576,12 +11961,12 @@
      <message>
-         <location filename="../programs/mythfrontend/mythcontrols.cpp" line="234"/>
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="196"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="193"/>
+         <source>Modify Action</source>
+         <translation>Modify Action</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="209"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="206"/>
+         <source>Set Binding</source>
+         <translation>Set Binding</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="210"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="207"/>
+         <source>Remove Binding</source>
+         <translation>Remove Binding</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="221"/>
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="256"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="218"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="253"/>
+         <source>Change View</source>
+         <translation>Change View</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="234"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="231"/>
          <source>Actions By Context</source>
 -        <translation>Actions By Context</translation>
 +        <translation>Actions by Context</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/mythcontrols.cpp" line="235"/>
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="235"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="232"/>
          <source>Contexts By Key</source>
 -        <translation>Contexts By Key</translation>
 +        <translation>Contexts by Key</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/mythcontrols.cpp" line="236"/>
-@@ -11642,57 +12027,57 @@
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="236"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="233"/>
+         <source>Keys By Context</source>
+         <translation>Keys By Context</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="242"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="239"/>
+         <source>Options</source>
+         <translation>Options</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="255"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="252"/>
+         <source>Save</source>
+         <translation>Save</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="257"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="254"/>
+         <source>Reset All Keys to Defaults</source>
+         <translation>Reset All Keys to Defaults</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="607"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="599"/>
+         <source>This key binding conflicts with %1 in the %2 context. Unable to bind key.</source>
+         <translation>This key binding conflicts with %1 in the %2 context. Unable to bind key.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="611"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="603"/>
+         <source>This key binding conflicts with %1 in the %2 context. Do you want to bind it anyway?</source>
+         <translation>This key binding conflicts with %1 in the %2 context. Do you want to bind it anyway?</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="574"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="566"/>
+         <source>This action is mandatory and needs at least one key bound to it. Instead, try rebinding with another key.</source>
+         <translation>This action is mandatory and needs at least one key bound to it. Instead, try rebinding with another key.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="265"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="262"/>
+         <source>Save changes?</source>
+         <translation>Save changes?</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="733"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="725"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="732"/>
+         <location filename="../programs/mythfrontend/mythcontrols.cpp" line="740"/>
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="748"/>
+         <source>Contexts</source>
+         <translation>Contexts</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="734"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="726"/>
+         <source>Actions</source>
+         <translation>Actions</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="741"/>
+-        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="747"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="733"/>
++        <location filename="../programs/mythfrontend/mythcontrols.cpp" line="739"/>
+         <source>Keys</source>
          <translation>Keys</translation>
      </message>
      <message>
 -        <location filename="../programs/mythwelcome/main.cpp" line="37"/>
-+        <location filename="../programs/mythwelcome/main.cpp" line="38"/>
++        <location filename="../programs/mythwelcome/main.cpp" line="34"/>
          <source>Open an Xterm window</source>
 -        <translation>Open an Xterm window</translation>
 +        <translation>Open Xterm Window</translation>
      </message>
      <message>
 -        <location filename="../programs/mythwelcome/main.cpp" line="39"/>
-+        <location filename="../programs/mythwelcome/main.cpp" line="40"/>
++        <location filename="../programs/mythwelcome/main.cpp" line="36"/>
          <source>Show Mythshutdown settings</source>
 -        <translation>Show Mythshutdown settings</translation>
 +        <translation>Show mythshutdown Settings</translation>
      </message>
      <message>
 -        <location filename="../programs/mythwelcome/main.cpp" line="41"/>
-+        <location filename="../programs/mythwelcome/main.cpp" line="42"/>
++        <location filename="../programs/mythwelcome/main.cpp" line="38"/>
          <source>Start Mythtv-Setup</source>
 -        <translation>Start Mythtv-Setup</translation>
 +        <translation>Start mythtv-setup</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1430"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1522"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1620"/>
          <source>Play selected item in alternate player</source>
 -        <translation>Play selected item in alternate player</translation>
 +        <translation>Play Selected Item in Alternate Player</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1432"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1524"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1622"/>
          <source>Open video filter dialog</source>
 -        <translation>Open video filter dialog</translation>
 +        <translation>Open Video Filter Dialog</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1434"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1526"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1624"/>
          <source>Increase Parental Level</source>
          <translation>Increase Parental Level</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1436"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1528"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1626"/>
          <source>Decrease Parental Level</source>
          <translation>Decrease Parental Level</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1438"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1530"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1628"/>
          <source>Show Incremental Search Dialog</source>
          <translation>Show Incremental Search Dialog</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1440"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1532"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1630"/>
          <source>Download metadata for current item</source>
 -        <translation>Download metadata for current item</translation>
 +        <translation>Download Metadata for Current Item</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1442"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1534"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1632"/>
          <source>Display Item Detail Popup</source>
          <translation>Display Item Detail Popup</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/main.cpp" line="1534"/>
-+        <location filename="../programs/mythfrontend/main.cpp" line="1626"/>
++        <location filename="../programs/mythfrontend/main.cpp" line="1724"/>
          <source>MythDVD DVD Media Handler</source>
          <translation>MythDVD DVD Media Handler</translation>
      </message>
-@@ -11700,9 +12085,9 @@
+@@ -11700,20 +11657,20 @@
  <context>
      <name>MythCoreContext</name>
      <message>
 -        <location filename="../libs/libmythbase/mythcorecontext.cpp" line="237"/>
-+        <location filename="../libs/libmythbase/mythcorecontext.cpp" line="242"/>
++        <location filename="../libs/libmythbase/mythcorecontext.cpp" line="243"/>
          <source>This application is not compatible with the installed MythTV libraries. Please recompile after a make distclean</source>
 -        <translation>This application is not compatible with the installed MythTV libraries. Please recompile after a make distclean</translation>
 +        <translation>This application is not compatible with the installed MythTV libraries. Please recompile after a make distclean.</translation>
      </message>
  </context>
  <context>
-@@ -11721,184 +12106,183 @@
+     <name>MythDVDPlayer</name>
+     <message>
+-        <location filename="../libs/libmythtv/DVD/mythdvdplayer.cpp" line="668"/>
++        <location filename="../libs/libmythtv/DVD/mythdvdplayer.cpp" line="675"/>
+         <source>DVD Menu Not Available</source>
+         <translation>DVD Menu Not Available</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/DVD/mythdvdplayer.cpp" line="709"/>
++        <location filename="../libs/libmythtv/DVD/mythdvdplayer.cpp" line="716"/>
+         <source>Angle %1</source>
+         <translation>Angle %1</translation>
+     </message>
+@@ -11721,184 +11678,187 @@
  <context>
      <name>MythPlayer</name>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="494"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="506"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="520"/>
          <source>Failed to initialize video output</source>
 -        <translation>Failed to initialize video output</translation>
-+        <translation>Failed to Initialize Video Output</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="582"/>
-         <source>Need to switch video renderer</source>
+-        <source>Need to switch video renderer</source>
 -        <translation>Need to switch video renderer</translation>
-+        <translation type="vanished">Need to switch video renderer</translation>
++        <translation>Failed to Initialize Video Output</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/mythplayer.cpp" line="603"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="608"/>
+         <location filename="../libs/libmythtv/mythplayer.cpp" line="603"/>
          <source>Failed to reinitialize video output</source>
 -        <translation>Failed to reinitialize video output</translation>
 +        <translation>Failed to Reinitialize Video Output</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="948"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="960"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="979"/>
          <source>Could not read first %1 bytes</source>
 -        <translation>Could not read first %1 bytes</translation>
 +        <translation>Could Not Read First %1 Bytes</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="968"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="980"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="999"/>
          <source>Could not find an A/V decoder</source>
 -        <translation>Could not find an A/V decoder</translation>
 +        <translation>Could Not Find a Decoder</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="977"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="989"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="1008"/>
          <source>Could not initialize A/V decoder</source>
 -        <translation>Could not initialize A/V decoder</translation>
 +        <translation>Could Not Initialize Decoder</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="1002"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1014"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="1032"/>
          <source>Could not open decoder</source>
 -        <translation>Could not open decoder</translation>
 +        <translation>Could Not Open Decoder</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="1391"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1406"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="1419"/>
          <source>TXT CAP</source>
          <translation>TXT CAP</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="1411"/>
--        <location filename="../libs/libmythtv/mythplayer.cpp" line="1439"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1426"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1457"/>
+         <location filename="../libs/libmythtv/mythplayer.cpp" line="1439"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="1470"/>
          <source>Text subtitles</source>
 -        <translation>Text subtitles</translation>
 +        <translation>Text Subtitles</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="1417"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1432"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="1445"/>
          <source>Off</source>
          <translation>Off</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="1442"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1460"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="1473"/>
          <source>TXT %1</source>
          <translation>TXT %1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="1456"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1474"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="1487"/>
          <source>On</source>
          <translation>On</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="1512"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1532"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="1545"/>
          <source>No captions</source>
          <comment>CC/Teletext/Subtitle text not available</comment>
 -        <translation>No captions</translation>
@@ -10329,19 +12378,21 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="1621"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1641"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="1654"/>
          <source>Forced Subtitles On</source>
          <translation>Forced Subtitles On</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="1622"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1642"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="1655"/>
          <source>Forced Subtitles Off</source>
          <translation>Forced Subtitles Off</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="1839"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1876"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="1905"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="2188"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="2291"/>
          <source>Failed to initialize A/V Sync</source>
 -        <translation>Failed to initialize A/V Sync</translation>
 +        <translation>Failed to Initialize A/V Sync</translation>
@@ -10349,525 +12400,596 @@
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="1942"/>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="2122"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="1986"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2168"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="2015"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="2356"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="2432"/>
          <source>Serious error detected in Video Output</source>
 -        <translation>Serious error detected in Video Output</translation>
 +        <translation>Serious Error Detected in Video Output</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="2200"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2263"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="2570"/>
          <source>Video frame buffering failed too many times.</source>
 -        <translation>Video frame buffering failed too many times.</translation>
 +        <translation>Video Frame Buffering Failed Too Many Times</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="2639"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2692"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="3019"/>
          <source>Error opening switch program buffer</source>
 -        <translation>Error opening switch program buffer</translation>
 +        <translation>Error Opening Switch Program Buffer</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="2664"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2717"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="3044"/>
          <source>Error opening switch program file</source>
 -        <translation>Error opening switch program file</translation>
 +        <translation>Error Opening Switch Program File</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="2791"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2842"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="3182"/>
          <source>Error opening jump program file buffer</source>
 -        <translation>Error opening jump program file buffer</translation>
 +        <translation>Error Opening Jump Program File Buffer</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="2801"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2852"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="3192"/>
          <source>Error opening jump program file</source>
 -        <translation>Error opening jump program file</translation>
 +        <translation>Error Opening Jump Program File</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="2810"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="2861"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="3201"/>
          <source>Error reopening video decoder</source>
 -        <translation>Error reopening video decoder</translation>
 +        <translation>Error Reopening Video Decoder</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="3044"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3097"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="3441"/>
          <source>Irrecoverable recorder error</source>
 -        <translation>Irrecoverable recorder error</translation>
 +        <translation>Irrecoverable Recorder Error</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="3134"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="3187"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="3531"/>
          <source>Not Flagged</source>
          <extracomment>The commercials/adverts have not been flagged</extracomment>
          <translation>Not Flagged</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="4035"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4079"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="4444"/>
          <source>Searching</source>
 -        <translation>Searching</translation>
 +        <translation>Searching...</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="4106"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4150"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="4524"/>
          <source>No Seektable</source>
          <translation>No Seektable</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="4136"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4180"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="4554"/>
          <source>Using previously auto-saved cuts</source>
 -        <translation>Using previously auto-saved cuts</translation>
 +        <translation>Using Previously Auto-saved Cuts</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="4185"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4229"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="4603"/>
          <source>Paused</source>
          <translation>Paused</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="4270"/>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="4306"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4314"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4350"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="4688"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="4724"/>
          <source>New cut added.</source>
 -        <translation>New cut added.</translation>
 +        <translation>New Cut Added</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="4275"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4319"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="4693"/>
          <source>Delete</source>
          <translation>Delete</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="4280"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4324"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="4698"/>
          <source>Undo Changes</source>
          <translation>Undo Changes</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="4311"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4355"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="4729"/>
          <source>Undo - %1</source>
          <extracomment>%1 is the undo message</extracomment>
          <translation>Undo - %1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="4317"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="4361"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="4735"/>
          <source>Redo - %1</source>
          <extracomment>%1 is the redo message</extracomment>
          <translation>Redo - %1</translation>
      </message>
++    <message>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="5310"/>
++        <source>%1 ms</source>
++        <translation>%1 ms</translation>
++    </message>
      <message numerus="yes">
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="5122"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="5166"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="5560"/>
          <source>%n second(s)</source>
          <translation>
              <numerusform>%n second</numerusform>
-@@ -11906,42 +12290,42 @@
+@@ -11906,42 +11866,42 @@
          </translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="5126"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="5170"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="5564"/>
          <source>Still Frame</source>
          <translation>Still Frame</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="5127"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="5171"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="5565"/>
          <source>%1 of %2</source>
          <translation>%1 of %2</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="5353"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="5397"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="5796"/>
          <source>Error opening remote stream buffer</source>
 -        <translation>Error opening remote stream buffer</translation>
 +        <translation>Error Opening Remote Stream Buffer</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="5366"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="5410"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="5809"/>
          <source>Error opening remote stream</source>
 -        <translation>Error opening remote stream</translation>
 +        <translation>Error Opening Remote Stream</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="5532"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="5576"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="5978"/>
          <source>Enabled Studio Levels</source>
          <translation>Enabled Studio Levels</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="5533"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="5577"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="5979"/>
          <source>Disabled Studio Levels</source>
          <translation>Disabled Studio Levels</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="5557"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="5601"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="6003"/>
          <source>Enabled Night Mode</source>
          <translation>Enabled Night Mode</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythplayer.cpp" line="5563"/>
-+        <location filename="../libs/libmythtv/mythplayer.cpp" line="5607"/>
++        <location filename="../libs/libmythtv/mythplayer.cpp" line="6009"/>
          <source>Disabled Night Mode</source>
          <translation>Disabled Night Mode</translation>
      </message>
-@@ -11964,7 +12348,7 @@
+@@ -11949,12 +11909,12 @@
+ <context>
+     <name>MythPopupBox</name>
+     <message>
+-        <location filename="../libs/libmyth/mythdialogs.cpp" line="744"/>
++        <location filename="../libs/libmyth/mythdialogs.cpp" line="737"/>
+         <source>OK</source>
+         <translation>OK</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/mythdialogs.cpp" line="745"/>
++        <location filename="../libs/libmyth/mythdialogs.cpp" line="738"/>
+         <source>Cancel</source>
+         <translation>Cancel</translation>
+     </message>
+@@ -11962,12 +11922,12 @@
+ <context>
+     <name>MythRAOPConnection</name>
      <message>
-         <location filename="../libs/libmythtv/AirPlay/mythraopconnection.cpp" line="1500"/>
+-        <location filename="../libs/libmythtv/AirPlay/mythraopconnection.cpp" line="1500"/>
++        <location filename="../libs/libmythtv/AirPlay/mythraopconnection.cpp" line="1503"/>
          <source>Failed to read key from: %1</source>
 -        <translation>Failed to read key from: %1</translation>
 +        <translation>Failed to Read Key From: %1</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/AirPlay/mythraopconnection.cpp" line="1517"/>
-@@ -12019,7 +12403,7 @@
-     <message>
-         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="136"/>
-         <source>Wakeup time format</source>
--        <translation>Wakeup time format</translation>
-+        <translation>Wakeup Time Format</translation>
+-        <location filename="../libs/libmythtv/AirPlay/mythraopconnection.cpp" line="1517"/>
++        <location filename="../libs/libmythtv/AirPlay/mythraopconnection.cpp" line="1520"/>
+         <source>Failed to load RSA private key.</source>
+         <translation>Failed to load RSA private key.</translation>
      </message>
+@@ -12007,328 +11967,277 @@
+ <context>
+     <name>MythShutdownSettings</name>
      <message>
-         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="139"/>
-@@ -12039,7 +12423,7 @@
-     <message>
-         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="163"/>
-         <source>Command to reboot</source>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="126"/>
+-        <source>Command to Set Wakeup Time</source>
+-        <translation>Command to Set Wakeup Time</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="128"/>
+-        <source>Command to set the wakeup time in the BIOS. See the README file for more examples.</source>
+-        <translation>Command to set the wakeup time in the BIOS. See the README file for more examples.</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="136"/>
+-        <source>Wakeup time format</source>
+-        <translation>Wakeup time format</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="139"/>
+-        <source>The format of the time string passed to the &apos;Set Wakeup Time Command&apos; as $time. See QT::QDateTime.toString() for details. Set to &apos;time_t&apos; for seconds since epoch (use time_t for nvram_wakeup).</source>
+-        <translation>The format of the time string passed to the &apos;Set Wakeup Time Command&apos; as $time. See QT::QDateTime.toString() for details. Set to &apos;time_t&apos; for seconds since epoch (use time_t for nvram_wakeup).</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="150"/>
+-        <source>nvram-wakeup Restart Command</source>
+-        <translation>nvram-wakeup Restart Command</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="152"/>
+-        <source>Command to run if your bios requires you to reboot to allow nvram-wakeup settings to take effect. Leave blank if your bios does not require a reboot. See the README file for more examples.</source>
+-        <translation>Command to run if your bios requires you to reboot to allow nvram-wakeup settings to take effect. Leave blank if your bios does not require a reboot. See the README file for more examples.</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="163"/>
+-        <source>Command to reboot</source>
 -        <translation>Command to reboot</translation>
-+        <translation>Command to Reboot</translation>
-     </message>
-     <message>
-         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="165"/>
-@@ -12049,7 +12433,7 @@
-     <message>
-         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="172"/>
-         <source>Command to shutdown</source>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="165"/>
+-        <source>Command to reboot computer.</source>
+-        <translation>Command to reboot computer.</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="172"/>
+-        <source>Command to shutdown</source>
 -        <translation>Command to shutdown</translation>
-+        <translation>Command to Shutdown</translation>
-     </message>
-     <message>
-         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="174"/>
-@@ -12059,7 +12443,7 @@
-     <message>
-         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="181"/>
-         <source>Command to run to start the Frontend</source>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="174"/>
+-        <source>Command to shutdown computer.</source>
+-        <translation>Command to shutdown computer.</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="181"/>
+-        <source>Command to run to start the Frontend</source>
 -        <translation>Command to run to start the Frontend</translation>
-+        <translation>Command to Start the Frontend</translation>
-     </message>
-     <message>
-         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="184"/>
-@@ -12069,7 +12453,7 @@
-     <message>
-         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="191"/>
-         <source>Command to run Xterm</source>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="184"/>
+-        <source>Command to start mythfrontend.</source>
+-        <translation>Command to start mythfrontend.</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="191"/>
+-        <source>Command to run Xterm</source>
 -        <translation>Command to run Xterm</translation>
-+        <translation>Command to Start Xterm</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="193"/>
+-        <source>Command to start an Xterm. Can be disabled by leaving this setting blank.</source>
+-        <translation>Command to start an Xterm. Can be disabled by leaving this setting blank.</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="205"/>
++        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="161"/>
+         <source>MythShutdown/MythWelcome Settings</source>
+         <translation>MythShutdown/MythWelcome Settings</translation>
      </message>
-     <message>
-         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="193"/>
-@@ -12085,212 +12469,217 @@
+ </context>
  <context>
++    <name>MythSortHelper</name>
++    <message>
++        <location filename="../libs/libmythbase/mythsorthelper.cpp" line="15"/>
++        <source>^(The |A |An )</source>
++        <comment>Regular Expression for what to ignore when sorting</comment>
++        <translation>^(The |A |An)</translation>
++    </message>
++</context>
++<context>
      <name>MythSystemEventEditor</name>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="377"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="380"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="385"/>
          <source>System Event Command Editor</source>
          <translation>System Event Command Editor</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="383"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="386"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="391"/>
          <source>Recording pending</source>
 -        <translation>Recording pending</translation>
 +        <translation>Recording Pending</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="388"/>
-+        <source>Recording about to fail</source>
-+        <translation>Recording About to Fail</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="385"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="390"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="393"/>
++        <source>Recording about to fail</source>
++        <translation>Recording About to Fail</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="395"/>
          <source>Recording failing</source>
 -        <translation>Recording failing</translation>
 +        <translation>Recording Failing</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="387"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="392"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="397"/>
          <source>Recording started</source>
 -        <translation>Recording started</translation>
 +        <translation>Recording Started</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="389"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="394"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="399"/>
          <source>Recording started writing</source>
 -        <translation>Recording started writing</translation>
 +        <translation>Recording Started Writing</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="391"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="396"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="401"/>
          <source>Recording finished</source>
 -        <translation>Recording finished</translation>
 +        <translation>Recording Finished</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="393"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="398"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="403"/>
          <source>Recording deleted</source>
 -        <translation>Recording deleted</translation>
 +        <translation>Recording Deleted</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="395"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="400"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="405"/>
          <source>Recording expired</source>
 -        <translation>Recording expired</translation>
 +        <translation>Recording Expired</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="397"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="402"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="407"/>
          <source>LiveTV started</source>
 -        <translation>LiveTV started</translation>
 +        <translation>LiveTV Started</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="399"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="404"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="409"/>
          <source>LiveTV ended</source>
 -        <translation>LiveTV ended</translation>
 +        <translation>LiveTV Ended</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="401"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="406"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="411"/>
          <source>Playback started</source>
 -        <translation>Playback started</translation>
 +        <translation>Playback Started</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="403"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="408"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="413"/>
          <source>Playback stopped</source>
 -        <translation>Playback stopped</translation>
 +        <translation>Playback Stopped</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="405"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="410"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="415"/>
          <source>Playback paused</source>
 -        <translation>Playback paused</translation>
 +        <translation>Playback Paused</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="407"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="412"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="417"/>
          <source>Playback unpaused</source>
 -        <translation>Playback unpaused</translation>
 +        <translation>Playback Unpaused</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="409"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="414"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="419"/>
          <source>Playback program changed</source>
 -        <translation>Playback program changed</translation>
 +        <translation>Playback Program Changed</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="411"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="416"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="421"/>
          <source>Tuning signal waiting</source>
 -        <translation>Tuning signal waiting</translation>
 +        <translation>Tuning Signal Waiting</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="413"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="418"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="423"/>
          <source>Master backend started</source>
 -        <translation>Master backend started</translation>
 +        <translation>Master Backend Started</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="415"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="420"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="425"/>
          <source>Master backend shutdown</source>
 -        <translation>Master backend shutdown</translation>
 +        <translation>Master Backend Shutdown</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="417"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="422"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="427"/>
          <source>Client connected to master backend</source>
 -        <translation>Client connected to master backend</translation>
 +        <translation>Client Connected to Master Backend</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="419"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="424"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="429"/>
          <source>Client disconnected from master backend</source>
 -        <translation>Client disconnected from master backend</translation>
 +        <translation>Client Disconnected from Master Backend</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="421"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="426"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="431"/>
          <source>Slave backend connected to master</source>
 -        <translation>Slave backend connected to master</translation>
 +        <translation>Slave Backend Connected to Master</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="423"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="428"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="433"/>
          <source>Slave backend disconnected from master</source>
 -        <translation>Slave backend disconnected from master</translation>
 +        <translation>Slave Backend Disconnected from Master</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="425"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="430"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="435"/>
          <source>Network Control client connected</source>
 -        <translation>Network Control client connected</translation>
 +        <translation>Network Control Client Connected</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="427"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="432"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="437"/>
          <source>Network Control client disconnected</source>
 -        <translation>Network Control client disconnected</translation>
 +        <translation>Network Control Client Disconnected</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="429"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="434"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="439"/>
          <source>mythfilldatabase ran</source>
 -        <translation>mythfilldatabase ran</translation>
 +        <translation>mythfilldatabase Ran</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="431"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="436"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="441"/>
          <source>Scheduler ran</source>
 -        <translation>Scheduler ran</translation>
 +        <translation>Scheduler Ran</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="433"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="438"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="443"/>
          <source>Settings cache cleared</source>
 -        <translation>Settings cache cleared</translation>
 +        <translation>Settings Cache Cleared</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="435"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="440"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="445"/>
          <source>Screen created or destroyed</source>
 -        <translation>Screen created or destroyed</translation>
 +        <translation>Screen Created or Destroyed</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="437"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="442"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="447"/>
          <source>Keystroke event #1</source>
 -        <translation>Keystroke event #1</translation>
 +        <translation>Keystroke Event #1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="439"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="444"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="449"/>
          <source>Keystroke event #2</source>
 -        <translation>Keystroke event #2</translation>
 +        <translation>Keystroke Event #2</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="441"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="446"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="451"/>
          <source>Keystroke event #3</source>
 -        <translation>Keystroke event #3</translation>
 +        <translation>Keystroke Event #3</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="443"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="448"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="453"/>
          <source>Keystroke event #4</source>
 -        <translation>Keystroke event #4</translation>
 +        <translation>Keystroke Event #4</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="445"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="450"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="455"/>
          <source>Keystroke event #5</source>
 -        <translation>Keystroke event #5</translation>
 +        <translation>Keystroke Event #5</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="447"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="452"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="457"/>
          <source>Keystroke event #6</source>
 -        <translation>Keystroke event #6</translation>
 +        <translation>Keystroke Event #6</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="449"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="454"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="459"/>
          <source>Keystroke event #7</source>
 -        <translation>Keystroke event #7</translation>
 +        <translation>Keystroke Event #7</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="451"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="456"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="461"/>
          <source>Keystroke event #8</source>
 -        <translation>Keystroke event #8</translation>
 +        <translation>Keystroke Event #8</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="453"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="458"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="463"/>
          <source>Keystroke event #9</source>
 -        <translation>Keystroke event #9</translation>
 +        <translation>Keystroke Event #9</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="455"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="460"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="465"/>
          <source>Keystroke event #10</source>
 -        <translation>Keystroke event #10</translation>
 +        <translation>Keystroke Event #10</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="457"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="462"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="467"/>
          <source>CEC command received</source>
 -        <translation>CEC command received</translation>
 +        <translation>CEC Command Received</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="459"/>
-+        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="464"/>
++        <location filename="../libs/libmythtv/mythsystemevent.cpp" line="469"/>
          <source>Any event</source>
 -        <translation>Any event</translation>
 +        <translation>Any Event</translation>
@@ -10877,73 +12999,143 @@
      <name>MythTerminal</name>
      <message>
 -        <location filename="../libs/libmyth/mythterminal.cpp" line="158"/>
-+        <location filename="../libs/libmyth/mythterminal.cpp" line="134"/>
++        <location filename="../libs/libmyth/mythterminal.cpp" line="135"/>
++        <source>*** Crashed with status: %1 ***</source>
++        <translation>*** Crashed with Status: %1 ***</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmyth/mythterminal.cpp" line="137"/>
          <source>*** Exited with status: %1 ***</source>
 -        <translation>*** Exited with status: %1 ***</translation>
 +        <translation>*** Exited with Status: %1 ***</translation>
      </message>
  </context>
  <context>
-@@ -12303,12 +12692,12 @@
+     <name>MythThemedMenu</name>
+     <message>
+-        <location filename="../libs/libmythui/myththemedmenu.cpp" line="311"/>
++        <location filename="../libs/libmythui/myththemedmenu.cpp" line="313"/>
+         <source>System Menu</source>
+         <translation>System Menu</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythui/myththemedmenu.cpp" line="322"/>
+-        <location filename="../libs/libmythui/myththemedmenu.cpp" line="322"/>
++        <location filename="../libs/libmythui/myththemedmenu.cpp" line="324"/>
          <source>Enter standby mode</source>
 -        <translation>Enter standby mode</translation>
 +        <translation>Standby</translation>
      </message>
      <message>
-         <location filename="../libs/libmythui/myththemedmenu.cpp" line="326"/>
+-        <location filename="../libs/libmythui/myththemedmenu.cpp" line="326"/>
++        <location filename="../libs/libmythui/myththemedmenu.cpp" line="328"/>
          <source>Exit application</source>
 -        <translation>Exit application</translation>
 +        <translation>Exit</translation>
      </message>
      <message>
-         <location filename="../libs/libmythui/myththemedmenu.cpp" line="333"/>
-@@ -12339,12 +12728,12 @@
+-        <location filename="../libs/libmythui/myththemedmenu.cpp" line="333"/>
+-        <location filename="../libs/libmythui/myththemedmenu.cpp" line="342"/>
++        <location filename="../libs/libmythui/myththemedmenu.cpp" line="335"/>
++        <location filename="../libs/libmythui/myththemedmenu.cpp" line="344"/>
+         <source>Shutdown</source>
+         <translation>Shutdown</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythui/myththemedmenu.cpp" line="337"/>
+-        <location filename="../libs/libmythui/myththemedmenu.cpp" line="343"/>
++        <location filename="../libs/libmythui/myththemedmenu.cpp" line="339"/>
++        <location filename="../libs/libmythui/myththemedmenu.cpp" line="345"/>
+         <source>Reboot</source>
+         <translation>Reboot</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythui/myththemedmenu.cpp" line="351"/>
++        <location filename="../libs/libmythui/myththemedmenu.cpp" line="353"/>
+         <source>About</source>
+         <translation>About</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythui/myththemedmenu.cpp" line="366"/>
++        <location filename="../libs/libmythui/myththemedmenu.cpp" line="368"/>
+         <source>Revision: %1
+  Branch: %2
+  %3</source>
+@@ -12337,22 +12246,22 @@
+  %3</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythui/myththemedmenu.cpp" line="377"/>
+-        <location filename="../libs/libmythui/myththemedmenu.cpp" line="377"/>
++        <location filename="../libs/libmythui/myththemedmenu.cpp" line="379"/>
          <source>Ok</source>
 -        <translation>Ok</translation>
 +        <translation>OK</translation>
      </message>
      <message>
-         <location filename="../libs/libmythui/myththemedmenu.cpp" line="609"/>
+-        <location filename="../libs/libmythui/myththemedmenu.cpp" line="609"/>
++        <location filename="../libs/libmythui/myththemedmenu.cpp" line="611"/>
          <source>MythTV could not locate the menu file %1</source>
 -        <translation>MythTV could not locate the menu file %1</translation>
 +        <translation>MythTV Could Not Locate the Menu File %1</translation>
      </message>
      <message>
-         <location filename="../libs/libmythui/myththemedmenu.cpp" line="626"/>
-@@ -12390,8 +12779,8 @@
+-        <location filename="../libs/libmythui/myththemedmenu.cpp" line="626"/>
++        <location filename="../libs/libmythui/myththemedmenu.cpp" line="628"/>
+         <source>The menu file %1 is incomplete.</source>
+         <translation>The menu file %1 is incomplete.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythui/myththemedmenu.cpp" line="943"/>
++        <location filename="../libs/libmythui/myththemedmenu.cpp" line="951"/>
+         <source>Enter password:</source>
+         <translation>Enter password:</translation>
+     </message>
+@@ -12376,13 +12285,13 @@
+ <context>
+     <name>MythUIFileBrowser</name>
+     <message>
+-        <location filename="../libs/libmythui/mythuifilebrowser.cpp" line="498"/>
+-        <location filename="../libs/libmythui/mythuifilebrowser.cpp" line="671"/>
++        <location filename="../libs/libmythui/mythuifilebrowser.cpp" line="490"/>
++        <location filename="../libs/libmythui/mythuifilebrowser.cpp" line="663"/>
+         <source>Parent</source>
+         <translation>Parent</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythui/mythuifilebrowser.cpp" line="641"/>
++        <location filename="../libs/libmythui/mythuifilebrowser.cpp" line="633"/>
+         <source>Parent Directory</source>
+         <translation>Parent Directory</translation>
+     </message>
+@@ -12390,8 +12299,8 @@
  <context>
      <name>MythUISearchDialog</name>
      <message numerus="yes">
 -        <location filename="../libs/libmythui/mythdialogbox.cpp" line="798"/>
 -        <location filename="../libs/libmythui/mythdialogbox.cpp" line="859"/>
-+        <location filename="../libs/libmythui/mythdialogbox.cpp" line="932"/>
-+        <location filename="../libs/libmythui/mythdialogbox.cpp" line="993"/>
++        <location filename="../libs/libmythui/mythdialogbox.cpp" line="925"/>
++        <location filename="../libs/libmythui/mythdialogbox.cpp" line="986"/>
          <source>%n match(es)</source>
          <translation>
              <numerusform>%n match</numerusform>
-@@ -12402,76 +12791,76 @@
+@@ -12402,76 +12311,76 @@
  <context>
      <name>MythUIWebBrowser</name>
      <message>
 -        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="1193"/>
-+        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="1199"/>
++        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="1186"/>
          <source>Zoom: %1%</source>
          <translation>Zoom: %1%</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="1537"/>
-+        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="1543"/>
++        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="1531"/>
          <source>Sending key presses to web page</source>
 -        <translation>Sending key presses to web page</translation>
 +        <translation>Sending Key Presses to Web Page</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="1539"/>
-+        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="1545"/>
++        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="1533"/>
          <source>Sending key presses to MythTV</source>
 -        <translation>Sending key presses to MythTV</translation>
 +        <translation>Sending Key Presses to MythTV</translation>
@@ -10953,7 +13145,7 @@
      <name>MythWebPage</name>
      <message>
 -        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="314"/>
-+        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="320"/>
++        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="313"/>
          <source>Error loading page: %1</source>
 -        <translation>Error loading page: %1</translation>
 +        <translation>Error Loading Page: %1</translation>
@@ -10963,28 +13155,28 @@
      <name>MythWebView</name>
      <message>
 -        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="546"/>
-+        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="552"/>
++        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="545"/>
          <source>Enter filename to save file</source>
 -        <translation>Enter filename to save file</translation>
 +        <translation>Enter filename:</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="566"/>
-+        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="572"/>
++        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="565"/>
          <source>Downloading file. Please wait...</source>
          <translation>Downloading file. Please wait...</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="579"/>
-+        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="585"/>
++        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="578"/>
          <source>Downloading...</source>
          <translation>Downloading...</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="616"/>
 -        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="708"/>
-+        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="622"/>
-+        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="714"/>
++        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="615"/>
++        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="707"/>
          <source>Play the file</source>
 -        <translation>Play the file</translation>
 +        <translation>Play the File</translation>
@@ -10992,8 +13184,8 @@
      <message>
 -        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="639"/>
 -        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="713"/>
-+        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="645"/>
-+        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="719"/>
++        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="638"/>
++        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="712"/>
          <source>Download the file</source>
 -        <translation>Download the file</translation>
 +        <translation>Download the File</translation>
@@ -11001,181 +13193,288 @@
      <message>
 -        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="643"/>
 -        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="711"/>
-+        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="649"/>
-+        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="717"/>
++        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="642"/>
++        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="710"/>
          <source>Download and play the file</source>
 -        <translation>Download and play the file</translation>
 +        <translation>Download and Play the File</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="675"/>
-+        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="681"/>
++        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="674"/>
          <source>ERROR downloading file.</source>
 -        <translation>ERROR downloading file.</translation>
 +        <translation>Error Downloading File</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="693"/>
-+        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="699"/>
++        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="692"/>
          <source>What do you want to do with this file?</source>
          <translation>What do you want to do with this file?</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="714"/>
-+        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="720"/>
++        <location filename="../libs/libmythui/mythuiwebbrowser.cpp" line="713"/>
          <source>Cancel</source>
          <translation>Cancel</translation>
      </message>
-@@ -12482,7 +12871,7 @@
-         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="14"/>
-         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="34"/>
-         <source>Period %1 start time</source>
--        <translation>Period %1 start time</translation>
-+        <translation>Period %1 Start Time</translation>
-     </message>
+@@ -12479,70 +12388,10 @@
+ <context>
+     <name>MythWelcomeSettings</name>
      <message>
-         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="15"/>
-@@ -12494,7 +12883,7 @@
-         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="24"/>
-         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="44"/>
-         <source>Period %1 end time</source>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="14"/>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="34"/>
+-        <source>Period %1 start time</source>
+-        <translation>Period %1 start time</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="15"/>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="35"/>
+-        <source>Period %1 start time. Defines a period the master backend should be awake. Set both Start &amp; End times to 00:00 to disable.</source>
+-        <translation>Period %1 start time. Defines a period the master backend should be awake. Set both Start &amp; End times to 00:00 to disable.</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="24"/>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="44"/>
+-        <source>Period %1 end time</source>
 -        <translation>Period %1 end time</translation>
-+        <translation>Period %1 End Time</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="25"/>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="45"/>
+-        <source>Period %1 end time. Defines a period the master backend should be awake. Set both Start &amp; End times to 00:00 to disable.</source>
+-        <translation>Period %1 end time. Defines a period the master backend should be awake. Set both Start &amp; End times to 00:00 to disable.</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="54"/>
+-        <source>Automatically Start mythfrontend</source>
+-        <translation>Automatically Start mythfrontend</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="56"/>
+-        <source>Mythwelcome will automatically start mythfrontend if it is determined that it was not started to record a program.</source>
+-        <translation>Mythwelcome will automatically start mythfrontend if it is determined that it was not started to record a program.</translation>
+-    </message>
+-    <message>
+         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="65"/>
+-        <source>Shutdown with Master Backend</source>
+-        <translation>Shutdown with Master Backend</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="67"/>
+-        <source>Mythwelcome will automatically shutdown this computer when the master backend shuts down. Should only be set on frontend only machines</source>
+-        <translation>Mythwelcome will automatically shutdown this computer when the master backend shuts down. Should only be set on frontend only machines</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="76"/>
+-        <source>Date Format</source>
+-        <translation>Date Format</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="78"/>
+-        <source>This is the format to use to display the date. See http://doc.trolltech.com/3.3/qdate.html#toString for a list of valid format specifiers.</source>
+-        <translation>This is the format to use to display the date. See http://doc.trolltech.com/3.3/qdate.html#toString for a list of valid format specifiers.</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="94"/>
+         <source>MythWelcome Settings</source>
+         <translation>MythWelcome Settings</translation>
      </message>
-     <message>
-         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="25"/>
-@@ -12541,7 +12930,7 @@
-         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="96"/>
-         <location filename="../programs/mythwelcome/welcomesettings.cpp" line="101"/>
-         <source>Daily Wakeup/ShutDown Period %1</source>
+-    <message>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="96"/>
+-        <location filename="../programs/mythwelcome/welcomesettings.cpp" line="101"/>
+-        <source>Daily Wakeup/ShutDown Period %1</source>
 -        <translation>Daily Wakeup/ShutDown Period %1</translation>
-+        <translation>Daily Wakeup/Shutdown Period %1</translation>
-     </message>
+-    </message>
  </context>
  <context>
-@@ -12570,7 +12959,7 @@
+     <name>MythWizard</name>
+@@ -12570,7 +12419,7 @@
  <context>
      <name>NetworkControl</name>
      <message>
 -        <location filename="../programs/mythfrontend/networkcontrol.cpp" line="1505"/>
-+        <location filename="../programs/mythfrontend/networkcontrol.cpp" line="1512"/>
++        <location filename="../programs/mythfrontend/networkcontrol.cpp" line="1511"/>
          <source>Network Control</source>
          <translation>Network Control</translation>
      </message>
-@@ -12578,87 +12967,87 @@
+@@ -12578,87 +12427,87 @@
  <context>
      <name>OSDSettings</name>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1484"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1460"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1482"/>
          <source>Decode VBI format</source>
 -        <translation>Decode VBI format</translation>
 +        <translation>Decode VBI Format</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1486"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1462"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1484"/>
          <source>None</source>
          <translation>None</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1488"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1464"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1486"/>
          <source>PAL teletext</source>
 -        <translation>PAL teletext</translation>
 +        <translation>PAL Teletext</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1490"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1466"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1488"/>
          <source>NTSC closed caption</source>
 -        <translation>NTSC closed caption</translation>
 +        <translation>NTSC Closed Caption</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1494"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1470"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1492"/>
          <source>If enabled, this overrides the mythtv-setup setting used during recording when decoding captions.</source>
          <translation>If enabled, this overrides the mythtv-setup setting used during recording when decoding captions.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1504"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1480"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1503"/>
          <source>Subtitle Codec</source>
          <translation>Subtitle Codec</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1589"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1565"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1588"/>
          <source>Always display closed captioning or subtitles</source>
 -        <translation>Always display closed captioning or subtitles</translation>
 +        <translation>Always Display Closed Captioning or Subtitles</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1594"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1570"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1593"/>
          <source>If enabled, captions will be displayed when playing back recordings or watching Live TV. Closed Captioning can be turned on or off by pressing &quot;T&quot; duringplayback.</source>
          <translation>If enabled, captions will be displayed when playing back recordings or watching Live TV. Closed Captioning can be turned on or off by pressing &quot;T&quot; duringplayback.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1606"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1582"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1605"/>
          <source>Enable interactive TV</source>
 -        <translation>Enable interactive TV</translation>
 +        <translation>Enable Interactive TV</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1610"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1586"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1609"/>
          <source>If enabled, interactive TV applications (MHEG) will be activated. This is used for teletext and logos for radio and channels that are currently off-air.</source>
          <translation>If enabled, interactive TV applications (MHEG) will be activated. This is used for teletext and logos for radio and channels that are currently off-air.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1620"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1596"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1619"/>
          <source>Enable network access for interactive TV</source>
 -        <translation>Enable network access for interactive TV</translation>
 +        <translation>Enable Network Access for Interactive TV</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1622"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1598"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1621"/>
          <source>If enabled, interactive TV applications (MHEG) will be able to access interactive content over the Internet. This is used for BBC iPlayer.</source>
          <translation>If enabled, interactive TV applications (MHEG) will be able to access interactive content over the Internet. This is used, amongst others, for BBC iPlayer.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1633"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1609"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1632"/>
          <source>Always use browse mode in Live TV</source>
 -        <translation>Always use browse mode in Live TV</translation>
 +        <translation>Always Use Browse Mode in Live TV</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1637"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1613"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1636"/>
          <source>If enabled, browse mode will automatically be activated whenever you use channel up/down while watching Live TV.</source>
          <translation>If enabled, browse mode will automatically be activated whenever you use channel up/down while watching Live TV.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1648"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1624"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1647"/>
          <source>Browse all channels</source>
 -        <translation>Browse all channels</translation>
 +        <translation>Browse All Channels</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1652"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1628"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1651"/>
          <source>If enabled, browse mode will show channels on all available recording devices, instead of showing channels on just the current recorder.</source>
          <translation>If enabled, browse mode will show channels on all available recording devices, instead of showing channels on just the current recorder.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4065"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4120"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4344"/>
          <source>On-screen Display</source>
          <translation>On-screen Display</translation>
      </message>
-@@ -12719,7 +13108,7 @@
+@@ -12666,52 +12515,52 @@
+ <context>
+     <name>Orientation</name>
+     <message>
+-        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="231"/>
++        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="239"/>
+         <source>File: %1, Db: %2</source>
+         <translation>File: %1, Db: %2</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="245"/>
++        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="253"/>
+         <source>1 (Normal)</source>
+         <translation>1 (Normal)</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="246"/>
++        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="254"/>
+         <source>2 (H Mirror)</source>
+         <translation>2 (H Mirror)</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="247"/>
++        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="255"/>
+         <source>3 (Rotate 180°)</source>
+         <translation>3 (Rotate 180°)</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="248"/>
++        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="256"/>
+         <source>4 (V Mirror)</source>
+         <translation>4 (V Mirror)</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="249"/>
++        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="257"/>
+         <source>5 (H Mirror, Rot 270°)</source>
+         <translation>5 (H Mirror, Rot 270°)</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="250"/>
++        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="258"/>
+         <source>6 (Rotate 90°)</source>
+         <translation>6 (Rotate 90°)</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="251"/>
++        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="259"/>
+         <source>7 (H Mirror, Rot 90°)</source>
+         <translation>7 (H Mirror, Rot 90°)</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="252"/>
++        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="260"/>
+         <source>8 (Rotate 270°)</source>
+         <translation>8 (Rotate 270°)</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="253"/>
++        <location filename="../libs/libmythmetadata/imagemetadata.cpp" line="261"/>
+         <source>%1 (Undefined)</source>
+         <translation>%1 (Undefined)</translation>
+     </message>
+@@ -12719,7 +12568,7 @@
  <context>
      <name>PaneATSC</name>
      <message>
@@ -11184,7 +13483,7 @@
          <source>Scanning Range</source>
          <translation>Scanning Range</translation>
      </message>
-@@ -12727,12 +13116,12 @@
+@@ -12727,12 +12576,12 @@
  <context>
      <name>PaneDVBUtilsImport</name>
      <message>
@@ -11200,21 +13499,8 @@
          <source>Location of the channels.conf file.</source>
          <translation>Location of the channels.conf file.</translation>
      </message>
-@@ -12802,67 +13191,78 @@
-     </message>
- </context>
+@@ -12804,65 +12653,65 @@
  <context>
-+    <name>PlayBackScaling</name>
-+    <message>
-+        <source>Scaling</source>
-+        <translation type="vanished">Scaling</translation>
-+    </message>
-+    <message>
-+        <source>No scaling</source>
-+        <translation type="vanished">No Scaling</translation>
-+    </message>
-+</context>
-+<context>
      <name>PlayGroupConfig</name>
      <message>
 -        <location filename="../libs/libmythtv/playgroup.cpp" line="55"/>
@@ -11299,7 +13585,7 @@
          <source>%1 Group</source>
          <comment>Play Group</comment>
          <extracomment>%1 is the name of the playgroup</extracomment>
-@@ -12872,631 +13272,651 @@
+@@ -12872,631 +12721,617 @@
  <context>
      <name>PlayGroupEditor</name>
      <message>
@@ -11316,44 +13602,34 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/playgroup.cpp" line="250"/>
-+        <location filename="../libs/libmythtv/playgroup.cpp" line="281"/>
-+        <source>Enter new group name</source>
-+        <translation>Enter group name:</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/playgroup.cpp" line="297"/>
-+        <source>Sorry, this Playback Group name cannot be blank.</source>
-+        <translation>Sorry, the name cannot be blank.</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/playgroup.cpp" line="315"/>
-+        <source>Sorry, this Playback Group name is already in use.</source>
-+        <translation>Sorry, this name is already in use.</translation>
-+    </message>
-+    <message>
-         <source>Enter group name or press SELECT to enter text via the On Screen Keyboard</source>
+-        <source>Enter group name or press SELECT to enter text via the On Screen Keyboard</source>
 -        <translation>Enter group name or press SELECT to enter text via the On Screen Keyboard</translation>
-+        <translation type="vanished">Enter group name or press SELECT to enter text via the On Screen Keyboard</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/playgroup.cpp" line="283"/>
-         <source>Delete playback group:
- &apos;%1&apos;?</source>
+-        <source>Delete playback group:
+-&apos;%1&apos;?</source>
 -        <translation>Delete playback group:
-+        <translation type="vanished">Delete playback group:
- &apos;%1&apos;?</translation>
+-&apos;%1&apos;?</translation>
++        <location filename="../libs/libmythtv/playgroup.cpp" line="281"/>
++        <source>Enter new group name</source>
++        <translation>Enter group name:</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/playgroup.cpp" line="288"/>
-         <source>Yes, delete group</source>
+-        <source>Yes, delete group</source>
 -        <translation>Yes, delete group</translation>
-+        <translation type="vanished">Yes, Delete Group</translation>
++        <location filename="../libs/libmythtv/playgroup.cpp" line="297"/>
++        <source>Sorry, this Playback Group name cannot be blank.</source>
++        <translation>Sorry, the name cannot be blank.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/playgroup.cpp" line="289"/>
-         <source>No, Don&apos;t delete group</source>
+-        <source>No, Don&apos;t delete group</source>
 -        <translation>No, Don&apos;t delete group</translation>
-+        <translation type="vanished">No, Keep Group</translation>
++        <location filename="../libs/libmythtv/playgroup.cpp" line="315"/>
++        <source>Sorry, this Playback Group name is already in use.</source>
++        <translation>Sorry, this name is already in use.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/playgroup.cpp" line="312"/>
@@ -11361,71 +13637,68 @@
          <source>Default</source>
          <translation>Default</translation>
      </message>
-     <message>
+-    <message>
 -        <location filename="../libs/libmythtv/playgroup.cpp" line="321"/>
-         <source>(Create new group)</source>
+-        <source>(Create new group)</source>
 -        <translation>(Create new group)</translation>
-+        <translation type="vanished">(Create new group)</translation>
-     </message>
+-    </message>
  </context>
  <context>
      <name>PlaybackBox</name>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="413"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="416"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="411"/>
          <source>Watch List</source>
          <translation>Watch List</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="590"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4485"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="594"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4515"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="595"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4528"/>
          <source>Groups</source>
          <translation>Groups</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="591"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="595"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="596"/>
          <source>Recordings</source>
          <translation>Recordings</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="635"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="639"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="640"/>
          <source>Password for group &apos;%1&apos;:</source>
          <translation>Password for group &apos;%1&apos;:</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="734"/>
-         <source>, which consume %1</source>
+-        <source>, which consume %1</source>
 -        <translation>, which consume %1</translation>
-+        <translation type="vanished">, which consume %1</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="735"/>
-         <source>GB</source>
-         <comment>GigaBytes</comment>
+-        <source>GB</source>
+-        <comment>GigaBytes</comment>
 -        <translation>GB</translation>
-+        <translation type="vanished">GB</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1453"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1460"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1469"/>
          <source>There are no recordings in your current view</source>
 -        <translation>There are no recordings in your current view</translation>
 +        <translation>There are No Recordings in the Current View</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1452"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1459"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1468"/>
          <source>There are no recordings available</source>
 -        <translation>There are no recordings available</translation>
 +        <translation>There are No Recordings Available</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1680"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1734"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1739"/>
          <source>_NO_TITLE_</source>
          <translation>_NO_TITLE_</translation>
      </message>
@@ -11435,61 +13708,61 @@
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4539"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4543"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4554"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1675"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4567"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4569"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4573"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4584"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1684"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4580"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4582"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4586"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4597"/>
          <source>Unknown</source>
          <translation>Unknown</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2438"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2466"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2478"/>
          <source>Change Group Filter</source>
          <translation>Change Group Filter</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2441"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2469"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2481"/>
          <source>Change Group View</source>
          <translation>Change Group View</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2445"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2473"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2485"/>
          <source>Change Group Password</source>
          <translation>Change Group Password</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2456"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2484"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2496"/>
          <source>Add this Group to Playlist</source>
 -        <translation>Add this Group to Playlist</translation>
 +        <translation>Add This Group to Playlist</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2461"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2489"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2501"/>
          <source>Add this recording to Playlist</source>
 -        <translation>Add this recording to Playlist</translation>
 +        <translation>Add This Recording to Playlist</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2466"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2494"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2506"/>
          <source>Help (Status Icons)</source>
          <translation>Help (Status Icons)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2588"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2619"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2631"/>
          <source>Are you sure you want to delete:</source>
          <translation>Are you sure you want to delete:</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2590"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2621"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2633"/>
          <source>Recording file does not exist.
  Are you sure you want to delete:</source>
          <translation>Recording file does not exist.
@@ -11497,66 +13770,66 @@
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2594"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2625"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2637"/>
          <source>Are you sure you want to stop:</source>
          <translation>Are you sure you want to stop:</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2623"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2654"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2666"/>
          <source>Yes, and allow re-record</source>
 -        <translation>Yes, and allow re-record</translation>
-+        <translation>Yes, Delete and Allow Re-record</translation>
++        <translation>Delete and Allow Re-record</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2631"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2635"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2662"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2666"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2674"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2678"/>
          <source>Yes, delete it</source>
 -        <translation>Yes, delete it</translation>
-+        <translation>Yes, Delete</translation>
++        <translation>Delete</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2639"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2670"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2682"/>
          <source>Yes, stop recording</source>
 -        <translation>Yes, stop recording</translation>
-+        <translation>Yes, Stop Recording</translation>
++        <translation>Stop Recording</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2653"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2684"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2696"/>
          <source>Yes, delete it and the remaining %1 list items</source>
 -        <translation>Yes, delete it and the remaining %1 list items</translation>
-+        <translation>Yes, Delete Recording and the Remaining %1 List Items</translation>
++        <translation>Delete Recording and the Remaining %1 List Items</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2663"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2694"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2706"/>
          <source>No, keep it</source>
 -        <translation>No, keep it</translation>
-+        <translation>No, Keep</translation>
++        <translation>Keep</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2667"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2698"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2710"/>
          <source>No, continue recording</source>
 -        <translation>No, continue recording</translation>
-+        <translation>No, Continue Recording</translation>
++        <translation>Continue Recording</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2675"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2706"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2718"/>
          <source>No, and keep the remaining %1 list items</source>
 -        <translation>No, and keep the remaining %1 list items</translation>
-+        <translation>No, Keep the Remaining %1 List Items</translation>
++        <translation>Keep the Remaining %1 List Items</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2695"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2702"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2726"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2733"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2738"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2745"/>
          <source>Recording Available
  </source>
          <translation>Recording Available
@@ -11565,24 +13838,23 @@
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2352"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2697"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2380"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2728"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2392"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2740"/>
          <source>This recording is currently in use by:</source>
          <translation>This recording is currently in use by:</translation>
      </message>
-     <message numerus="yes">
+-    <message numerus="yes">
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="710"/>
-         <source>There is/are %n recording(s) in this display group</source>
-         <translatorcomment>Used to have singular/plural problem.</translatorcomment>
+-        <source>There is/are %n recording(s) in this display group</source>
+-        <translatorcomment>Used to have singular/plural problem.</translatorcomment>
 -        <translation>
-+        <translation type="vanished">
-             <numerusform>There is %n recording in this display group</numerusform>
-             <numerusform>There are %n recordings in this display group</numerusform>
-         </translation>
-     </message>
+-            <numerusform>There is %n recording in this display group</numerusform>
+-            <numerusform>There are %n recordings in this display group</numerusform>
+-        </translation>
+-    </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1308"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1315"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1316"/>
          <source>%1% used, %2 GB free</source>
          <comment>Diskspace</comment>
          <translation>%1% used, %2 GB free</translation>
@@ -11595,21 +13867,21 @@
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3588"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4508"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4717"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1749"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2151"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2152"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3616"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3618"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4538"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4745"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="1754"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2156"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2157"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3630"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3632"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4551"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4758"/>
          <source>Live TV</source>
          <translation>Live TV</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2332"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2347"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2360"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2375"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2372"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2387"/>
          <source>This recording is already being deleted</source>
 -        <translation>This recording is already being deleted</translation>
 +        <translation>This Recording is Already Being Deleted</translation>
@@ -11618,15 +13890,15 @@
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2450"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3190"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3234"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2478"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3221"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3265"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2490"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3236"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3280"/>
          <source>Playlist Options</source>
          <translation>Playlist Options</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2704"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2735"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2747"/>
          <source>This recording is currently Available</source>
 -        <translation>This recording is currently Available</translation>
 +        <translation>This Recording is Currently Available</translation>
@@ -11637,11 +13909,11 @@
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2721"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2727"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2733"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2740"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2746"/>
 +        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2752"/>
 +        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2758"/>
 +        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2764"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2770"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2776"/>
          <source>Recording Unavailable
  </source>
          <translation>Recording Unavailable
@@ -11649,35 +13921,35 @@
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2711"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2742"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2754"/>
          <source>This recording is currently being deleted and is unavailable</source>
 -        <translation>This recording is currently being deleted and is unavailable</translation>
 +        <translation>This Recording is Currently Being Deleted and is Unavailable</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2717"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2748"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2760"/>
          <source>This recording has been deleted and is unavailable</source>
 -        <translation>This recording has been deleted and is unavailable</translation>
 +        <translation>This Recording Has Been Deleted and is Unavailable</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2723"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2754"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2766"/>
          <source>The file for this recording can not be found</source>
 -        <translation>The file for this recording can not be found</translation>
 +        <translation>The File for This Recording Can Not Be Found</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2729"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2760"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2772"/>
          <source>The file for this recording is empty.</source>
 -        <translation>The file for this recording is empty.</translation>
 +        <translation>The File for This Recording is Empty</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2735"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2766"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2778"/>
          <source>This recording is not yet available.</source>
 -        <translation>This recording is not yet available.</translation>
 +        <translation>This Recording is Not Yet Available</translation>
@@ -11685,40 +13957,40 @@
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2747"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3220"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2778"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3251"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2790"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3266"/>
          <source>Play</source>
          <translation>Play</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2748"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2779"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2791"/>
          <source>Shuffle Play</source>
          <translation>Shuffle Play</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2749"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2780"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2792"/>
          <source>Clear Playlist</source>
          <translation>Clear Playlist</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2754"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2785"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2797"/>
          <source>Toggle playlist for this Category/Title</source>
 -        <translation>Toggle playlist for this Category/Title</translation>
 +        <translation>Toggle Playlist for This Category/Title</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2757"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2788"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2800"/>
          <source>Toggle playlist for this Group</source>
 -        <translation>Toggle playlist for this Group</translation>
 +        <translation>Toggle Playlist for This Group</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2761"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2792"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2804"/>
          <source>Toggle playlist for this recording</source>
 -        <translation>Toggle playlist for this recording</translation>
 +        <translation>Toggle Playlist for This Recording</translation>
@@ -11727,9 +13999,9 @@
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2764"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2992"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3251"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2795"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3023"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3284"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2807"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3039"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3299"/>
          <source>Storage Options</source>
          <translation>Storage Options</translation>
      </message>
@@ -11737,9 +14009,9 @@
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2765"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3036"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3253"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2796"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3067"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3286"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2808"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3083"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3301"/>
          <source>Job Options</source>
          <translation>Job Options</translation>
      </message>
@@ -11747,15 +14019,15 @@
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2766"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3201"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3272"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2797"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3232"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3305"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2809"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3247"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3320"/>
          <source>Delete</source>
          <translation>Delete</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2767"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2798"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2810"/>
          <source>Delete, and allow re-record</source>
 -        <translation>Delete, and allow re-record</translation>
 +        <translation>Delete, and Allow Re-record</translation>
@@ -11763,64 +14035,64 @@
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2780"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2999"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2811"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3030"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2823"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3046"/>
          <source>Change Recording Group</source>
          <translation>Change Recording Group</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2781"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3000"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2812"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3031"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2824"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3047"/>
          <source>Change Playback Group</source>
          <translation>Change Playback Group</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2782"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2994"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2813"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3025"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2825"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3041"/>
          <source>Disable Auto Expire</source>
          <translation>Disable Auto Expire</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2783"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2994"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2814"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3025"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2826"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3041"/>
          <source>Enable Auto Expire</source>
          <translation>Enable Auto Expire</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2850"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3066"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2881"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3097"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2892"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3112"/>
          <source>Begin Transcoding</source>
          <translation>Begin Transcoding</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2852"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3066"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2883"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3097"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2894"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3112"/>
          <source>Stop Transcoding</source>
          <translation>Stop Transcoding</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2860"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3068"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2891"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3099"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2902"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3114"/>
          <source>Begin Metadata Lookup</source>
          <translation>Begin Metadata Lookup</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2862"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3068"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2893"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3099"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2904"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3114"/>
          <source>Stop Metadata Lookup</source>
          <translation>Stop Metadata Lookup</translation>
      </message>
@@ -11830,11 +14102,11 @@
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2896"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2909"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3098"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2901"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2914"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2927"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2940"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3129"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2912"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2925"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2938"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2951"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3144"/>
          <source>Begin</source>
          <translation>Begin</translation>
      </message>
@@ -11844,11 +14116,11 @@
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2899"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2912"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3097"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2904"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2917"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2930"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2943"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3128"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2915"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2928"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2941"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2954"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3143"/>
          <source>Stop</source>
          <translation>Stop</translation>
      </message>
@@ -11856,9 +14128,9 @@
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2742"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2775"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2793"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2773"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2806"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2824"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2785"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2818"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2836"/>
          <source>There is %n item(s) in the playlist. Actions affect all items in the playlist</source>
          <translation>
 -            <numerusform>There is %n item in the playlist. Actions affect all items in the playlist</numerusform>
@@ -11869,39 +14141,39 @@
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2786"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2817"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2829"/>
          <source>Allow Re-record</source>
          <translation>Allow Re-record</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2972"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3003"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3014"/>
          <source>Play Options</source>
          <translation>Play Options</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2977"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3008"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3019"/>
          <source>Play from bookmark</source>
 -        <translation>Play from bookmark</translation>
 +        <translation>Play from Bookmark</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2978"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3012"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3025"/>
          <source>Play from beginning</source>
 -        <translation>Play from beginning</translation>
 +        <translation>Play from Beginning</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2980"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3010"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3022"/>
          <source>Play from last played position</source>
 -        <translation>Play from last played position</translation>
 +        <translation>Play from Last Played Position</translation>
 +    </message>
 +    <message numerus="yes">
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="738"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="739"/>
 +        <source>There is/are %n recording(s) in this display group, which consume(s) %1 GiB.</source>
 +        <translation>
 +            <numerusform>There is %n recording in this display group, which consumes %1 GiB.</numerusform>
@@ -11909,51 +14181,56 @@
 +        </translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="744"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="745"/>
 +        <source>There is no recording in this display group.</source>
 +        <translation>There Are No Recordings in This Display Group</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2996"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3027"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3028"/>
++        <source>Clear bookmark</source>
++        <translation>Clear Bookmark</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3043"/>
          <source>Do not preserve this episode</source>
 -        <translation>Do not preserve this episode</translation>
 +        <translation>Do Not Preserve This Episode</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2996"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3027"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3043"/>
          <source>Preserve this episode</source>
 -        <translation>Preserve this episode</translation>
 +        <translation>Preserve This Episode</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3013"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3044"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3060"/>
          <source>Scheduling Options</source>
          <translation>Scheduling Options</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3017"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3048"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3064"/>
          <source>Edit Recording Schedule</source>
          <translation>Edit Recording Schedule</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3025"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3056"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3072"/>
          <source>Custom Edit</source>
          <translation>Custom Edit</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3096"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3127"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3142"/>
          <source>User Job</source>
          <translation>User Job</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3115"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3146"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3161"/>
          <source>Transcoding profiles</source>
 -        <translation>Transcoding profiles</translation>
 +        <translation>Transcoding Profiles</translation>
@@ -11964,48 +14241,48 @@
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4715"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4758"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4987"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3150"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4536"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4743"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4786"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5015"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3165"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4549"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4756"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4799"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5028"/>
          <source>Default</source>
          <translation>Default</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3120"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3151"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3166"/>
          <source>Autodetect</source>
          <translation>Autodetect</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3143"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3174"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3189"/>
          <source>High Quality</source>
          <translation>High Quality</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3145"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3176"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3191"/>
          <source>Medium Quality</source>
          <translation>Medium Quality</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3147"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3178"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3193"/>
          <source>Low Quality</source>
          <translation>Low Quality</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3174"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3205"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3220"/>
          <source>Recording file cannot be found</source>
 -        <translation>Recording file cannot be found</translation>
 +        <translation>Recording File Cannot Be Found</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3176"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3207"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3222"/>
          <source>Recording file contains no data</source>
 -        <translation>Recording file contains no data</translation>
 +        <translation>Recording File Contains No Data</translation>
@@ -12014,31 +14291,31 @@
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3177"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3192"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3252"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3208"/>
 +        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3223"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3285"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3238"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3300"/>
          <source>Recording Options</source>
          <translation>Recording Options</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3195"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3256"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3226"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3289"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3241"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3304"/>
          <source>List Recorded Episodes</source>
          <translation>List Recorded Episodes</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3198"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3259"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3229"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3292"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3244"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3307"/>
          <source>List All Recordings</source>
          <translation>List All Recordings</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3218"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3249"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3264"/>
          <source>Play from...</source>
 -        <translation>Play from...</translation>
 +        <translation>Play From...</translation>
@@ -12046,8 +14323,8 @@
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3185"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3227"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3216"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3258"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3231"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3273"/>
          <source>Remove from Playlist</source>
          <translation>Remove from Playlist</translation>
      </message>
@@ -12055,9 +14332,9 @@
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2331"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2346"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2351"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2359"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2374"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2379"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2371"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2386"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2391"/>
          <source>Cannot delete
  </source>
 -        <translation>Cannot delete
@@ -12066,92 +14343,92 @@
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2432"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2460"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2472"/>
          <source>Group List Menu</source>
          <translation>Group List Menu</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2855"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3067"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2886"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3098"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2897"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3113"/>
          <source>Begin Commercial Detection</source>
          <translation>Begin Commercial Detection</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2857"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3067"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2888"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3098"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2899"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3113"/>
          <source>Stop Commercial Detection</source>
          <translation>Stop Commercial Detection</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3019"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3050"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3066"/>
          <source>Allow this episode to re-record</source>
 -        <translation>Allow this episode to re-record</translation>
 +        <translation>Allow This Episode to Re-record</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3021"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3052"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3068"/>
          <source>Show Recording Details</source>
          <translation>Show Recording Details</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3023"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3054"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3070"/>
          <source>Change Recording Metadata</source>
          <translation>Change Recording Metadata</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3187"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3230"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3218"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3261"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3233"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3276"/>
          <source>Add to Playlist</source>
          <translation>Add to Playlist</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3243"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3276"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3291"/>
          <source>Stop Recording</source>
          <translation>Stop Recording</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2785"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3247"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2816"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3280"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2828"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3295"/>
          <source>Mark as Unwatched</source>
          <translation>Mark as Unwatched</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2784"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3249"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2815"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3282"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="2827"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3297"/>
          <source>Mark as Watched</source>
          <translation>Mark as Watched</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3267"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3300"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3315"/>
          <source>Undelete</source>
          <translation>Undelete</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3268"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3301"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="3316"/>
          <source>Delete Forever</source>
          <translation>Delete Forever</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4507"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4719"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4537"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4747"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4550"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4760"/>
          <source>Deleted</source>
          <translation>Deleted</translation>
      </message>
@@ -12161,332 +14438,350 @@
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4545"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4556"/>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4721"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4540"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4547"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4575"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4586"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4749"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4553"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4560"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4588"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4599"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4762"/>
          <source>%1 [%n item(s)]</source>
          <translation>
              <numerusform>%1 [%n item]</numerusform>
-@@ -13504,32 +13924,32 @@
+@@ -13504,32 +13339,32 @@
          </translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4564"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4594"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4607"/>
          <source>Categories</source>
          <translation>Categories</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4574"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4604"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4617"/>
          <source>Change Filter</source>
          <translation>Change Filter</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4703"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4731"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4744"/>
          <source>Add New</source>
          <translation>Add New</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4725"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4753"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4766"/>
          <source>Select Recording Group</source>
          <translation>Select Recording Group</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4769"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4797"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4810"/>
          <source>Select Playback Group</source>
          <translation>Select Playback Group</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4920"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4948"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="4961"/>
          <source>New Recording Group</source>
          <translation>New Recording Group</translation>
      </message>
-@@ -13537,18 +13957,22 @@
+@@ -13537,18 +13372,12 @@
  <context>
      <name>PlaybackProfileConfig</name>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="953"/>
-         <source>&amp;</source>
-         <comment>and</comment>
+-        <source>&amp;</source>
+-        <comment>and</comment>
 -        <translation>&amp;</translation>
-+        <translation type="vanished">&amp;</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="956"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1046"/>
-         <source>if rez</source>
-         <translation>if rez</translation>
+-        <source>if rez</source>
+-        <translation>if rez</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1167"/>
++        <source>Mark for deletion</source>
++        <translation>Mark for Deletion</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1032"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1074"/>
-+        <source>Mark for deletion</source>
-+        <translation>Mark for Deletion</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1075"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1168"/>
          <source>Add New Entry</source>
          <translation>Add New Entry</translation>
      </message>
-@@ -13556,662 +13980,808 @@
+@@ -13556,723 +13385,873 @@
  <context>
      <name>PlaybackProfileConfigs</name>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1188"/>
-         <source>Playback Profiles %1</source>
+-        <source>Playback Profiles %1</source>
 -        <translation>Playback Profiles %1</translation>
-+        <translation type="vanished">Playback Profiles %1</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1267"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1206"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1299"/>
          <source>Current Video Playback Profile</source>
          <translation>Current Video Playback Profile</translation>
      </message>
-     <message>
+-    <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1278"/>
-         <source>Add New</source>
+-        <source>Add New</source>
 -        <translation>Add New</translation>
-+        <translation type="vanished">Add New</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1317"/>
-         <source>Enter Playback Group Name</source>
+-        <source>Enter Playback Group Name</source>
 -        <translation>Enter Playback Group Name</translation>
-+        <translation type="vanished">Enter Playback Group Name</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1328"/>
-         <source>Sorry, playback group
- name cannot be blank.</source>
+-        <source>Sorry, playback group
+-name cannot be blank.</source>
 -        <translation>Sorry, playback group
-+        <translation type="vanished">Sorry, playback group
- name cannot be blank.</translation>
-     </message>
-     <message>
+-name cannot be blank.</translation>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1329"/>
-         <source>Sorry, playback group name
- &apos;%1&apos; is already being used.</source>
+-        <source>Sorry, playback group name
+-&apos;%1&apos; is already being used.</source>
 -        <translation>Sorry, playback group name
-+        <translation type="vanished">Sorry, playback group name
- &apos;%1&apos; is already being used.</translation>
-     </message>
+-&apos;%1&apos; is already being used.</translation>
+-    </message>
  </context>
  <context>
      <name>PlaybackProfileItemConfig</name>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="680"/>
-         <source>W</source>
-         <comment>Width</comment>
+-        <source>W</source>
+-        <comment>Width</comment>
 -        <translation>W</translation>
-+        <translation type="vanished">W</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="682"/>
-         <source>H</source>
-         <comment>Height</comment>
+-        <source>H</source>
+-        <comment>Height</comment>
 -        <translation>H</translation>
-+        <translation type="vanished">H</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="694"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="692"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="752"/>
          <source>Decoder</source>
          <translation>Decoder</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="695"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="693"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="753"/>
          <source>Max CPUs</source>
          <translation>Max CPUs</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="705"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="703"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="763"/>
          <source>Maximum number of CPU cores used for video decoding and filtering.</source>
          <translation>Maximum number of CPU cores used for video decoding and filtering.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="707"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="705"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="765"/>
          <source> Multithreaded decoding disabled-only one CPU will be used, please recompile with --enable-ffmpeg-pthreads to enable.</source>
          <translation> Multithreaded decoding disabled-only one CPU will be used, please recompile with --enable-ffmpeg-pthreads to enable.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="716"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="714"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="774"/>
          <source>Disabling will significantly reduce the load on the CPU when watching HD H.264 but may significantly reduce video quality.</source>
          <translation>Disabling will significantly reduce the load on the CPU when watching HD H.264 but may significantly reduce video quality.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="720"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="718"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="778"/>
          <source>When unchecked the OSD will not fade away but instead will disappear abruptly.</source>
          <translation>When unchecked the OSD will not fade away but instead will disappear abruptly.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="722"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="720"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="780"/>
          <source>Uncheck this if the video studders while the OSD is fading away.</source>
          <translation>Uncheck this if the video studders while the OSD is fading away.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="696"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="694"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="754"/>
          <source>Deblocking filter</source>
 -        <translation>Deblocking filter</translation>
 +        <translation>Deblocking Filter</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/globalsettings.cpp" line="650"/>
-         <source>Profile Item</source>
--        <translation>Profile Item</translation>
-+        <translation type="vanished">Profile Item</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/globalsettings.cpp" line="678"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="663"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="667"/>
-         <source>Match criteria</source>
--        <translation>Match criteria</translation>
-+        <translation>Match Criteria</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/globalsettings.cpp" line="697"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="664"/>
-+        <source>Width</source>
-+        <translation>Width</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="665"/>
-+        <source>Height</source>
-+        <translation>Height</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="668"/>
-+        <source>Optional setting to restrict this profile to a selected picture size range. If both match criteria are used then both must be satisfied for the entry to be selected.</source>
-+        <translation>Optional setting to restrict this profile to a selected picture size range. If both match criteria are used then both must be satisfied for the entry to be selected.</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="675"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="737"/>
 +        <source>Video Formats</source>
 +        <translation>Video Formats</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="681"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="743"/>
 +        <source>Optional setting to restrict this profile to a video format or formats. You can also type in a format or several formats separated by space. To find the format for a video use ffprobe and look at the word after &quot;Video:&quot;. Also you can get a complete list of available formats with ffmpeg -codecs.</source>
 +        <translation>Optional setting to restrict this profile to a video format or formats. You can also type in a format or several formats separated by space. To find the format for a video use ffprobe and look at the word after &quot;Video:&quot;. Also you can get a complete list of available formats with ffmpeg -codecs.</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="687"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="749"/>
 +        <source>Frame Rate Range</source>
 +        <translation>Frame Rate Range</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="688"/>
-+        <source>Optional setting to restrict this profile to a range of frame rates. Valid formats for the setting are [nn.nnn - nn.nnn], [&gt; nn.nnn], [&gt;= nn.nnn], [&lt; nn.nnn], [&lt;= nn.nnn]. Also [nn.nnn] for an exact match.</source>
-+        <translation>Optional setting to restrict this profile to a range of frame rates. Valid formats for the setting are [nn.nnn - nn.nnn], [&gt; nn.nnn], [&gt;= nn.nnn], [&lt; nn.nnn], [&lt;= nn.nnn]. Also [nn.nnn] for an exact match.</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="726"/>
++        <source> Valid formats for the setting are [nnnn - nnnn], [&gt; nnnn], [&gt;= nnnn], [&lt; nnnn], [&lt;= nnnn]. Also [nnnn] for an exact match. You can also use more than 1 expression with &amp; between.</source>
++        <translation>Valid formats are [nnnn - nnnn], [&gt; nnnn], [&gt;= nnnn], [&lt; nnnn], [&lt;= nnnn]. Also [nnnn] for an exact match. You can also use more than 1 expression with &amp; between.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="730"/>
++        <source>Numbers can have up to 3 decimal places.</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="731"/>
++        <source>Width Range</source>
++        <translation>Width Range</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="732"/>
++        <source>Optional setting to restrict this profile to videos with a selected width range. </source>
++        <translation>Optional setting to restrict this profile to videos with a selected width range.</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="695"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="734"/>
++        <source>Height Range</source>
++        <translation></translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/globalsettings.cpp" line="650"/>
+-        <source>Profile Item</source>
+-        <translation>Profile Item</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="735"/>
++        <source>Optional setting to restrict this profile to videos with a selected height range. </source>
++        <translation>Optional setting to restrict this profile to videos with a selected height range.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/globalsettings.cpp" line="678"/>
+-        <source>Match criteria</source>
+-        <translation>Match criteria</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="750"/>
++        <source>Optional setting to restrict this profile to a range of frame rates. </source>
++        <translation>Optional setting to restrict this profile to a range of frame rates.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/globalsettings.cpp" line="697"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="755"/>
          <source>Video renderer</source>
 -        <translation>Video renderer</translation>
 +        <translation>Video Renderer</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="698"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="696"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="756"/>
          <source>OSD renderer</source>
 -        <translation>OSD renderer</translation>
 +        <translation>OSD Renderer</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="699"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="697"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="757"/>
          <source>OSD fade</source>
 -        <translation>OSD fade</translation>
 +        <translation>OSD Fade</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="700"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="698"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="758"/>
          <source>Primary deinterlacer</source>
 -        <translation>Primary deinterlacer</translation>
 +        <translation>Primary Deinterlacer</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="701"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="699"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="759"/>
          <source>Fallback deinterlacer</source>
 -        <translation>Fallback deinterlacer</translation>
 +        <translation>Fallback Deinterlacer</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="702"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="700"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="760"/>
          <source>Custom filters</source>
 -        <translation>Custom filters</translation>
 +        <translation>Custom Filters</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="712"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="710"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="770"/>
          <source>Example custom filter list: &apos;ivtc,denoise3d&apos;</source>
 -        <translation>Example custom filter list: &apos;ivtc,denoise3d&apos;</translation>
 +        <translation>Example Custom Filter List: &apos;ivtc,denoise3d&apos;</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="715"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="713"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="773"/>
          <source>When unchecked the deblocking loopfilter will be disabled </source>
 -        <translation>When unchecked the deblocking loopfilter will be disabled </translation>
 +        <translation>When unchecked the deblocking loopfilter will be disabled.</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="881"/>
-+        <source>Invalid frame rate specification(%1), discarded</source>
-+        <translation>Invalid Frame Rate Specification(%1), Discarded</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="950"/>
++        <source>Invalid width specification(%1), discarded</source>
++        <translation>Invalid Width (%1), Discarded</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="964"/>
++        <source>Invalid height specification(%1), discarded</source>
++        <translation>Invalid Height (%1), Discarded</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="920"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="953"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="978"/>
++        <source>Invalid frame rate specification(%1), discarded</source>
++        <translation>Invalid Frame Rate Specification(%1), Discarded</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1057"/>
          <source>Main deinterlacing method. %1</source>
 -        <translation>Main deinterlacing method. %1</translation>
 +        <translation>Main Deinterlacing Method. %1</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="927"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="960"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1064"/>
          <source>Fallback deinterlacing method. %1</source>
 -        <translation>Fallback deinterlacing method. %1</translation>
 +        <translation>Fallback Deinterlacing Method. %1</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="985"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1089"/>
 +        <source>Remove this profile item?</source>
 +        <translation>Remove this profile item?</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1034"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1134"/>
 +        <source>&amp;</source>
 +        <comment>and</comment>
 +        <translation>&amp;</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1053"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1139"/>
++        <source>width</source>
++        <comment>video formats</comment>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1142"/>
++        <source>height</source>
++        <comment>video formats</comment>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1146"/>
 +        <source>formats</source>
 +        <comment>video formats</comment>
 +        <translation>formats</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1056"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1149"/>
 +        <source>framerate</source>
 +        <translation>framerate</translation>
      </message>
@@ -12495,124 +14790,168 @@
      <name>PlaybackSettings</name>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="52"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="56"/>
-         <source>Extra audio buffering</source>
+-        <source>Extra audio buffering</source>
 -        <translation>Extra audio buffering</translation>
-+        <translation>Extra Audio Buffering</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="59"/>
++        <source>Audio read ahead (ms)</source>
++        <translation>Audio Read Ahead (ms)</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="63"/>
++        <source>Increase this value if audio cuts out frequently. This is more likely to occur when adjusting audio sync to a negative value. If using high negative audio sync values you may need to set a large value here. Default is 100.</source>
++        <translation>Increase this value if audio cuts out frequently. This is more likely to occur when adjusting audio sync to a negative value. If using high negative audio sync values you may need to set a large value here. Default is 100.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="94"/>
++        <source>Enable new timestamp based playback speed (AVSync2)</source>
++        <translation>Enable New Timestamp Based Playback Speed (AVSync2)</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="96"/>
++        <source>Simplified timing and synchronization method. This may offer smoother video playback. Note there is a setting that can be used for fine tuning playback (press right arrow).</source>
++        <translation>Simplified timing and synchronization method. This may offer smoother video playback. Note there is a setting that can be used for fine tuning playback (press right arrow).</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="109"/>
++        <source>AVSync2 audio correction (ms)</source>
++        <translation>AVSync2 Audio Correction (ms)</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="113"/>
++        <source>When using AVSync2, if video playback is speeding up and slowing down every few seconds, reduce this value. For quicker recovery of audio sync after jumps, increase this value. Values can be from 1 to 40. Default is 10.</source>
++        <translation>When using AVSync2, if video playback is speeding up and slowing down every few seconds, reduce this value. For quicker recovery of audio sync after jumps, increase this value. Values can be from 1 to 40. Default is 10.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="124"/>
++        <source>Extra stage of OpenGL Shading</source>
++        <translation>Extra Stage of OpenGL Shading</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="56"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="60"/>
-         <source>Enable this setting if MythTV is playing &quot;crackly&quot; audio. This setting affects digital tuners (QAM/DVB/ATSC) and hardware encoders. It will have no effect on framegrabbers (MPEG-4/RTJPEG). MythTV will keep extra audio data in its internal buffers to workaround this bug.</source>
-         <translation>Enable this setting if MythTV is playing &quot;crackly&quot; audio. This setting affects digital tuners (QAM/DVB/ATSC) and hardware encoders. It will have no effect on framegrabbers (MPEG-4/RTJPEG). MythTV will keep extra audio data in its internal buffers to workaround this bug.</translation>
+-        <source>Enable this setting if MythTV is playing &quot;crackly&quot; audio. This setting affects digital tuners (QAM/DVB/ATSC) and hardware encoders. It will have no effect on framegrabbers (MPEG-4/RTJPEG). MythTV will keep extra audio data in its internal buffers to workaround this bug.</source>
+-        <translation>Enable this setting if MythTV is playing &quot;crackly&quot; audio. This setting affects digital tuners (QAM/DVB/ATSC) and hardware encoders. It will have no effect on framegrabbers (MPEG-4/RTJPEG). MythTV will keep extra audio data in its internal buffers to workaround this bug.</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="126"/>
++        <source>This may be needed if video is blank or distorted. In particular, it may be needed on Fire TV 4K. This may cause slowdown or dropped frames. By default this is disabled. </source>
++        <translatorcomment>This may be needed if video is blank or distorted. In particular, it may be needed on Fire TV 4K. This may cause slowdown or dropped frames. By default this is disabled.</translatorcomment>
++        <translation></translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="73"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="77"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="139"/>
          <source>Use FFmpeg&apos;s original MPEG-TS demuxer</source>
 -        <translation>Use FFmpeg&apos;s original MPEG-TS demuxer</translation>
 +        <translation>Use FFmpeg&apos;s Original MPEG-TS Demuxer</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="77"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="81"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="143"/>
          <source>Experimental: Enable this setting to use FFmpeg&apos;s native demuxer. Things will be broken.</source>
          <translation>Experimental: Enable this setting to use FFmpeg&apos;s native demuxer. Things will be broken.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="88"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="92"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="154"/>
          <source>PIP video location</source>
 -        <translation>PIP video location</translation>
 +        <translation>PIP Video Location</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="93"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="97"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="159"/>
          <source>Location of PIP Video window.</source>
          <translation>Location of PIP Video window.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="102"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="106"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="168"/>
          <source>Default group filter to apply</source>
 -        <translation>Default group filter to apply</translation>
 +        <translation>Default Group Filter to Apply</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="105"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="109"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="171"/>
          <source>All Programs</source>
          <translation>All Programs</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="135"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="139"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="201"/>
          <source>Default group filter to apply on the View Recordings screen.</source>
          <translation>Default group filter to apply on the View Recordings screen.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="144"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="148"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="210"/>
          <source>Always prompt for initial group filter</source>
 -        <translation>Always prompt for initial group filter</translation>
 +        <translation>Always Prompt for Initial Group Filter</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="149"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="153"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="215"/>
          <source>If enabled, always prompt the user for the initial filter to apply when entering the Watch Recordings screen.</source>
          <translation>If enabled, always prompt the user for the initial filter to apply when entering the Watch Recordings screen.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="160"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="164"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="226"/>
          <source>Save current group filter when changed</source>
 -        <translation>Save current group filter when changed</translation>
 +        <translation>Save Current Group Filter When Changed</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="165"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="169"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="231"/>
          <source>If enabled, remember the last selected filter instead of displaying the default filter whenever you enter the playback screen.</source>
          <translation>If enabled, remember the last selected filter instead of displaying the default filter whenever you enter the playback screen.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="177"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="181"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="243"/>
++        <source>Change Recording Group using the arrow keys</source>
++        <translation>Change Recording Group Using the Arrow Keys</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="248"/>
++        <source>If enabled, change recording group directly using the arrow keys instead of having to use &lt; and &gt;. Requires theme support for this feature.</source>
++        <translation>If enabled, change recording group directly using the arrow keys instead of having to use &lt; and &gt;. Requires theme support.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="261"/>
          <source>Start in group list</source>
 -        <translation>Start in group list</translation>
 +        <translation>Start in Group List</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="181"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="185"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="265"/>
          <source>If enabled, the focus will start on the group list, otherwise the focus will default to the recordings.</source>
          <translation>If enabled, the focus will start on the group list, otherwise the focus will default to the recordings.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="191"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="195"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="275"/>
          <source>Smart fast forwarding</source>
 -        <translation>Smart fast forwarding</translation>
 +        <translation>Smart Fast Forwarding</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="195"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="199"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="279"/>
          <source>If enabled, then immediately after rewinding, only skip forward the same amount as skipping backwards.</source>
          <translation>If enabled, then immediately after rewinding, only skip forward the same amount as skipping backwards.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="237"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="241"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="321"/>
          <source>Automatically skip commercials</source>
 -        <translation>Automatically skip commercials</translation>
 +        <translation>Automatically Skip Commercials</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="240"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="244"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="324"/>
          <source>Notify, but do not skip</source>
          <comment>Skip commercials</comment>
 -        <translation>Notify, but do not skip</translation>
@@ -12620,728 +14959,952 @@
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="242"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="246"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="326"/>
          <source>Automatically Skip</source>
          <comment>Skip commercials</comment>
          <translation>Automatically Skip</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="245"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="249"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="329"/>
          <source>Automatically skip commercial breaks that have been flagged during automatic commercial detection or by the mythcommflag program, or just notify that a commercial has been detected.</source>
          <translation>Automatically skip commercial breaks that have been flagged during automatic commercial detection or by the mythcommflag program, or just notify that a commercial has been detected.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="288"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="292"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="372"/>
          <source>Commercial skip automatic rewind amount (secs)</source>
 -        <translation>Commercial skip automatic rewind amount (secs)</translation>
 +        <translation>Commercial Skip Automatic Rewind Amount (seconds)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="291"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="295"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="375"/>
          <source>MythTV will automatically rewind this many seconds after performing a commercial skip.</source>
          <translation>MythTV will automatically rewind this many seconds after performing a commercial skip.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="304"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="308"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="388"/>
          <source>Commercial skip notify amount (secs)</source>
 -        <translation>Commercial skip notify amount (secs)</translation>
 +        <translation>Commercial Skip Notify Amount (secs)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="306"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="310"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="390"/>
          <source>MythTV will act like a commercial begins this many seconds early. This can be useful when commercial notification is used in place of automatic skipping.</source>
          <translation>MythTV will act like a commercial begins this many seconds early. This can be useful when commercial notification is used in place of automatic skipping.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="321"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="325"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="405"/>
          <source>Maximum commercial skip (secs)</source>
 -        <translation>Maximum commercial skip (secs)</translation>
 +        <translation>Maximum Commercial Skip (secs)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="323"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="327"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="407"/>
          <source>MythTV will discourage long manual commercial skips. Skips which are longer than this will require the user to hit the SKIP key twice. Automatic commercial skipping is not affected by this limit.</source>
          <translation>MythTV will discourage long manual commercial skips. Skips which are longer than this will require the user to hit the SKIP key twice. Automatic commercial skipping is not affected by this limit.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="339"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="343"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="423"/>
          <source>Merge short commercial breaks (secs)</source>
 -        <translation>Merge short commercial breaks (secs)</translation>
 +        <translation>Merge Short Commercial Breaks (secs)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="341"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="345"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="425"/>
          <source>Treat consecutive commercial breaks shorter than this as one break when skipping forward. Useful if you have to skip a few times during breaks. Applies to automatic skipping as well. Set to 0 to disable.</source>
          <translation>Treat consecutive commercial breaks shorter than this as one break when skipping forward. Useful if you have to skip a few times during breaks. Applies to automatic skipping as well. Set to 0 to disable.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1375"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1305"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1326"/>
 +        <source>Enter Playback Profile Name</source>
 +        <translation>Enter Playback Profile name:</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1331"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1352"/>
 +        <source>Sorry, playback group
 +name cannot be blank.</source>
 +        <translation>Sorry, group name cannot be blank.</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1332"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1353"/>
 +        <source>Sorry, playback group name
 +&apos;%1&apos; is already being used.</source>
 +        <translation>Sorry, group name &apos;%1&apos; is already used.</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1351"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1372"/>
          <source>Sort all sub-titles/multi-titles Ascending</source>
 -        <translation>Sort all sub-titles/multi-titles Ascending</translation>
 +        <translation>Sort All Sub-titles/Multi-titles Ascending</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1376"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1352"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1373"/>
          <source>Sort all sub-titles/multi-titles Descending</source>
 -        <translation>Sort all sub-titles/multi-titles Descending</translation>
 +        <translation>Sort All Sub-titles/Multi-titles Descending</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1377"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1353"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1374"/>
          <source>Sort sub-titles Descending, multi-titles Ascending</source>
 -        <translation>Sort sub-titles Descending, multi-titles Ascending</translation>
 +        <translation>Sort Sub-titles Descending, Multi-titles Ascending</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1379"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1355"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1376"/>
          <source>Sort sub-titles Ascending, multi-titles Descending</source>
 -        <translation>Sort sub-titles Ascending, multi-titles Descending</translation>
 +        <translation>Sort Sub-titles Ascending, Multi-titles Descending</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1382"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1358"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1379"/>
          <source>Selects how to sort show episodes. Sub-titles refers to the episodes listed under a specific show title. Multi-title refers to sections (e.g. &quot;All Programs&quot;) which list multiple titles. Sections in parentheses are not affected.</source>
          <translation>Selects how to sort show episodes. Sub-titles refers to the episodes listed under a specific show title. Multi-title refers to sections (e.g. &quot;All Programs&quot;) which list multiple titles. Sections in parentheses are not affected.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1392"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1368"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1389"/>
          <source>Episode sort orderings</source>
 -        <translation>Episode sort orderings</translation>
 +        <translation>Episode Sort Orderings</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1407"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1383"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1404"/>
          <source>Sort episodes</source>
 -        <translation>Sort episodes</translation>
 +        <translation>Sort Episodes</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1409"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1385"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1406"/>
          <source>Record date</source>
 -        <translation>Record date</translation>
 +        <translation>Record Date</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1410"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1386"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1407"/>
          <source>Season/Episode</source>
          <translation>Season/Episode</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1411"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1387"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1408"/>
          <source>Original air date</source>
 -        <translation>Original air date</translation>
 +        <translation>Original Air Date</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1412"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1388"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1409"/>
          <source>Program ID</source>
          <translation>Program ID</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1414"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1390"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1411"/>
          <source>Selects how to sort a show&apos;s episodes</source>
 -        <translation>Selects how to sort a show&apos;s episodes</translation>
 +        <translation>Selects How to Sort a Show&apos;s Episodes</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1424"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1400"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1421"/>
          <source>Fast forward/rewind reposition amount</source>
 -        <translation>Fast forward/rewind reposition amount</translation>
 +        <translation>Fast Forward/Rewind Reposition Amount</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1428"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1404"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1425"/>
          <source>When exiting sticky keys fast forward/rewind mode, reposition this many 1/100th seconds before resuming normal playback. This compensates for the reaction time between seeing where to resume playback and actually exiting seeking.</source>
          <translation>When exiting sticky keys fast forward/rewind mode, reposition this many 1/100th seconds before resuming normal playback. This compensates for the reaction time between seeing where to resume playback and actually exiting seeking.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1443"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1419"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1440"/>
          <source>Reverse direction in fast forward/rewind</source>
 -        <translation>Reverse direction in fast forward/rewind</translation>
 +        <translation>Reverse Direction in Fast Forward/Rewind</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1448"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1424"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1445"/>
          <source>If enabled, pressing the sticky rewind key in fast forward mode switches to rewind mode, and vice versa. If disabled, it will decrease the current speed or switch to play mode if the speed can&apos;t be decreased further.</source>
          <translation>If enabled, pressing the sticky rewind key in fast forward mode switches to rewind mode, and vice versa. If disabled, it will decrease the current speed or switch to play mode if the speed can&apos;t be decreased further.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1533"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1509"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1532"/>
          <source>Vertical scaling</source>
 -        <translation>Vertical scaling</translation>
 +        <translation>Vertical Scaling</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1537"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1513"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1536"/>
          <source>Adjust this if the image does not fill your screen vertically. Range -100% to 100%</source>
          <translation>Adjust this if the image does not fill your screen vertically. Range -100% to 100%</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1547"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1523"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1546"/>
          <source>Horizontal scaling</source>
 -        <translation>Horizontal scaling</translation>
 +        <translation>Horizontal Scaling</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1551"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1527"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1550"/>
          <source>Adjust this if the image does not fill your screen horizontally. Range -100% to 100%</source>
          <translation>Adjust this if the image does not fill your screen horizontally. Range -100% to 100%</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1561"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1537"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1560"/>
          <source>Scan displacement (X)</source>
 -        <translation>Scan displacement (X)</translation>
 +        <translation>Scan Displacement (X)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1565"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1541"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1564"/>
          <source>Adjust this to move the image horizontally.</source>
          <translation>Adjust this to move the image horizontally.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1575"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1551"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1574"/>
          <source>Scan displacement (Y)</source>
 -        <translation>Scan displacement (Y)</translation>
 +        <translation>Scan Displacement (Y)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1579"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1555"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1578"/>
          <source>Adjust this to move the image vertically.</source>
          <translation>Adjust this to move the image vertically.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1663"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1639"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1662"/>
          <source>Clear bookmark on playback</source>
 -        <translation>Clear bookmark on playback</translation>
 +        <translation>Clear Bookmark on Playback</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1667"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1643"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1666"/>
          <source>If enabled, automatically clear the bookmark on a recording when the recording is played back. If disabled, you can mark the beginning with rewind then save position.</source>
          <translation>If enabled, automatically clear the bookmark on a recording when the recording is played back. If disabled, you can mark the beginning with rewind then save position.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1680"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1656"/>
-         <source>Alternate clear and save bookmark</source>
+-        <source>Alternate clear and save bookmark</source>
 -        <translation>Alternate clear and save bookmark</translation>
-+        <translation>Alternate Clear and Save Bookmark</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1679"/>
++        <source>Playback from start of program</source>
++        <translation>Playback from Start of Program</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1684"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1660"/>
-         <source>During playback the SELECT key (Enter or Space) will alternate between &quot;Bookmark Saved&quot; and &quot;Bookmark Cleared&quot;. If disabled, the SELECT key will save the current position for each keypress.</source>
-         <translation>During playback the SELECT key (Enter or Space) will alternate between &quot;Bookmark Saved&quot; and &quot;Bookmark Cleared&quot;. If disabled, the SELECT key will save the current position for each keypress.</translation>
+-        <source>During playback the SELECT key (Enter or Space) will alternate between &quot;Bookmark Saved&quot; and &quot;Bookmark Cleared&quot;. If disabled, the SELECT key will save the current position for each keypress.</source>
+-        <translation>During playback the SELECT key (Enter or Space) will alternate between &quot;Bookmark Saved&quot; and &quot;Bookmark Cleared&quot;. If disabled, the SELECT key will save the current position for each keypress.</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1683"/>
++        <source>If enabled and no bookmark is set, playback starts at the program scheduled start time rather than the beginning of the recording. Useful for automatically skipping &apos;start early&apos; parts of a recording.</source>
++        <translation>If enabled and no bookmark is set, playback starts at the program scheduled start time rather than the beginning of the recording. Useful for automatically skipping &apos;start early&apos; parts of a recording.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1697"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1673"/>
-+        <source>Playback from start of program</source>
-+        <translation>Playback from Start of Program</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1677"/>
-+        <source>If enabled and no bookmark is set, playback starts at the program scheduled start time rather than the beginning of the recording. Useful for automatically skipping &apos;start early&apos; parts of a recording.</source>
-+        <translation>If enabled and no bookmark is set, playback starts at the program scheduled start time rather than the beginning of the recording. Useful for automatically skipping &apos;start early&apos; parts of a recording.</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1690"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1696"/>
          <source>Action on playback exit</source>
 -        <translation>Action on playback exit</translation>
 +        <translation>Action on Playback Exit</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1699"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1692"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1698"/>
          <source>Just exit</source>
 -        <translation>Just exit</translation>
 +        <translation>Exit Without Saving</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1700"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1693"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1699"/>
          <source>Save position and exit</source>
 -        <translation>Save position and exit</translation>
 +        <translation>Save and Exit</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1701"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1694"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1700"/>
          <source>Always prompt (excluding Live TV)</source>
 -        <translation>Always prompt (excluding Live TV)</translation>
 +        <translation>Always Prompt (excluding Live TV)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1703"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1696"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1702"/>
          <source>Always prompt (including Live TV)</source>
 -        <translation>Always prompt (including Live TV)</translation>
 +        <translation>Always Prompt (including Live TV)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1705"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1698"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1704"/>
          <source>Prompt for Live TV only</source>
 -        <translation>Prompt for Live TV only</translation>
 +        <translation>Prompt for Live TV Only</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1707"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1700"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1706"/>
          <source>If set to prompt, a menu will be displayed when you exit playback mode. The options available will allow you to save your position, delete the recording, or continue watching.</source>
          <translation>If set to prompt, a menu will be displayed when you exit playback mode. The options available will allow you to save your position, delete the recording, or continue watching.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1720"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1713"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1719"/>
          <source>Prompt at end of recording</source>
 -        <translation>Prompt at end of recording</translation>
 +        <translation>Prompt At End of Recording</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1724"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1717"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1723"/>
          <source>If enabled, a menu will be displayed allowing you to delete the recording when it has finished playing.</source>
          <translation>If enabled, a menu will be displayed allowing you to delete the recording when it has finished playing.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1734"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1727"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1733"/>
++        <source>Enable Music Choice</source>
++        <translation>Enable Music Choice</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1737"/>
++        <source>Enable this to improve playing of Music Choice channels or recordings from those channels. These are audio channels with slide show from some cable providers. In unusual situations this could cause lip sync problems watching normal videos or TV shows.</source>
++        <translation>Enable this to improve playing of Music Choice channels or recordings from those channels. These are audio channels with slide show from some cable providers. In unusual situations this could cause lip sync problems watching normal videos or TV shows.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1750"/>
          <source>Jump to program OSD</source>
 -        <translation>Jump to program OSD</translation>
 +        <translation>Jump to Program OSD</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1738"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1731"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1754"/>
          <source>Set the choice between viewing the current recording group in the OSD, or showing the &apos;Watch Recording&apos; screen when &apos;Jump to Program&apos; is activated. If enabled, the recordings are shown in the OSD</source>
          <translation>Set the choice between viewing the current recording group in the OSD, or showing the &apos;Watch Recording&apos; screen when &apos;Jump to Program&apos; is activated. If enabled, the recordings are shown in the OSD</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1751"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1744"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1767"/>
          <source>Continue playback when embedded</source>
 -        <translation>Continue playback when embedded</translation>
 +        <translation>Continue Playback When Embedded</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1755"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1748"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1771"/>
          <source>If enabled, TV playback continues when the TV window is embedded in the upcoming program list or recorded list. The default is to pause the recorded show when embedded.</source>
          <translation>If enabled, TV playback continues when the TV window is embedded in the upcoming program list or recorded list. The default is to pause the recorded show when embedded.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1768"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1761"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1784"/>
          <source>Automatically mark a recording as watched</source>
 -        <translation>Automatically mark a recording as watched</translation>
 +        <translation>Automatically Mark a Recording as Watched</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1773"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1766"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1789"/>
          <source>If enabled, when you exit near the end of a recording it will be marked as watched. The automatic detection is not foolproof, so do not enable this setting if you don&apos;t want an unwatched recording marked as watched.</source>
          <translation>If enabled, when you exit near the end of a recording it will be marked as watched. The automatic detection is not foolproof, so do not enable this setting if you don&apos;t want an unwatched recording marked as watched.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1787"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1780"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1803"/>
          <source>Live TV idle timeout (mins)</source>
 -        <translation>Live TV idle timeout (mins)</translation>
 +        <translation>Live TV Idle Timeout (mins)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1791"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1784"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1807"/>
          <source>Exit Live TV automatically if left idle for the specified number of minutes. 0 disables the timeout.</source>
          <translation>Exit Live TV automatically if left idle for the specified number of minutes. 0 disables the timeout.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2025"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2018"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2041"/>
          <source>Letterboxing color</source>
 -        <translation>Letterboxing color</translation>
 +        <translation>Letterboxing Color</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2030"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2023"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2046"/>
          <source>By default MythTV uses black letterboxing to match broadcaster letterboxing, but those with plasma screens may prefer gray to minimize burn-in. Currently only works with XVideo video renderer.</source>
          <translation>By default MythTV uses black letterboxing to match broadcaster letterboxing, but those with plasma screens may prefer gray to minimize burn-in. Currently only works with XVideo video renderer.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2043"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2036"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2059"/>
          <source>Video aspect override</source>
 -        <translation>Video aspect override</translation>
 +        <translation>Video Aspect Override</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2048"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2041"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2064"/>
          <source>When enabled, these will override the aspect ratio specified by any broadcaster for all video streams.</source>
          <translation>When enabled, these will override the aspect ratio specified by any broadcaster for all video streams.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2058"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2051"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2074"/>
          <source>Zoom</source>
          <translation>Zoom</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2067"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2060"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2083"/>
          <source>When enabled, these will apply a predefined zoom to all video playback in MythTV.</source>
          <translation>When enabled, these will apply a predefined zoom to all video playback in MythTV.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3184"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3192"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3352"/>
          <source>Enable realtime priority threads</source>
 -        <translation>Enable realtime priority threads</translation>
 +        <translation>Enable Realtime Priority Threads</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3186"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3194"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3354"/>
          <source>When running mythfrontend with root privileges, some threads can be given enhanced priority. Disable this if MythFrontend freezes during video playback.</source>
-         <translation>When running mythfrontend with root privileges, some threads can be given enhanced priority. Disable this if MythFrontend freezes during video playback.</translation>
+-        <translation>When running mythfrontend with root privileges, some threads can be given enhanced priority. Disable this if MythFrontend freezes during video playback.</translation>
++        <translation>When running MythFrontend with root privileges, some threads can be given enhanced priority. Disable this if MythFrontend freezes during video playback.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3216"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3224"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3384"/>
          <source>Sort titles</source>
 -        <translation>Sort titles</translation>
 +        <translation>Sort Titles</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3218"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3226"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3386"/>
          <source>Alphabetically</source>
          <translation>Alphabetically</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3220"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3228"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3388"/>
          <source>By recording priority</source>
 -        <translation>By recording priority</translation>
 +        <translation>by Recording Priority</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3223"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3231"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3391"/>
          <source>Sets the title sorting order when the view is set to Titles only.</source>
          <translation>Sets the title sorting order when the view is set to Titles only.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3577"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3552"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3712"/>
          <source>Enable gamma correction for video</source>
 -        <translation>Enable gamma correction for video</translation>
 +        <translation>Enable Gamma Correction for Video</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3581"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3556"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3716"/>
          <source>If enabled, QuickTime will correct the gamma of the video to match your monitor. Turning this off can save some CPU cycles.</source>
          <translation>If enabled, QuickTime will correct the gamma of the video to match your monitor. Turning this off can save some CPU cycles.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3592"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3567"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3727"/>
          <source>Scale video as necessary</source>
 -        <translation>Scale video as necessary</translation>
 +        <translation>Scale Video as Necessary</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3596"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3571"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3731"/>
          <source>If enabled, video will be scaled to fit your window or screen. If unchecked, video will never be made larger than its actual pixel size.</source>
          <translation>If enabled, video will be scaled to fit your window or screen. If unchecked, video will never be made larger than its actual pixel size.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3607"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3582"/>
-         <source>Frames to skip in fullscreen mode</source>
+-        <source>Frames to skip in fullscreen mode</source>
 -        <translation>Frames to skip in fullscreen mode</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3742"/>
++        <source>Frames to skip in fullscreen mode</source>
 +        <translation>Frames to Skip in Fullscreen Mode</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3611"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3586"/>
-         <source>Video displayed in fullscreen or non-windowed mode will skip this many frames for each frame drawn. Set to 0 to show every frame. Only valid when either &quot;Use GUI size for TV playback&quot; or &quot;Run the frontend in a window&quot; is not checked.</source>
-         <translation>Video displayed in fullscreen or non-windowed mode will skip this many frames for each frame drawn. Set to 0 to show every frame. Only valid when either &quot;Use GUI size for TV playback&quot; or &quot;Run the frontend in a window&quot; is not checked.</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3909"/>
--        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3941"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3874"/>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3746"/>
++        <source>Video displayed in fullscreen or non-windowed mode will skip this many frames for each frame drawn. Set to 0 to show every frame. Only valid when either &quot;Use GUI size for TV playback&quot; or &quot;Run the frontend in a window&quot; is not checked.</source>
++        <translation>Video displayed in fullscreen or non-windowed mode will skip this many frames for each frame drawn. Set to 0 to show every frame. Only valid when either &quot;Use GUI size for TV playback&quot; or &quot;Run the frontend in a window&quot; is not checked.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4086"/>
 +        <source>Scaling</source>
 +        <translation>Scaling</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3897"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4109"/>
 +        <source>No scaling</source>
 +        <translation>No Scaling</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4001"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4213"/>
 +        <source>Playback settings</source>
 +        <translation>Playback Settings</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4007"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4219"/>
 +        <source>General Playback</source>
 +        <translation>General Playback</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4037"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4244"/>
++        <source>Advanced Playback Settings</source>
++        <translation>Advanced Playback Settings</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4260"/>
 +        <source>Add a new playback profile</source>
 +        <translation>Add a New Playback Profile</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4043"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4266"/>
 +        <source>View Recordings</source>
 +        <translation>View Recordings</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4052"/>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3611"/>
+-        <source>Video displayed in fullscreen or non-windowed mode will skip this many frames for each frame drawn. Set to 0 to show every frame. Only valid when either &quot;Use GUI size for TV playback&quot; or &quot;Run the frontend in a window&quot; is not checked.</source>
+-        <translation>Video displayed in fullscreen or non-windowed mode will skip this many frames for each frame drawn. Set to 0 to show every frame. Only valid when either &quot;Use GUI size for TV playback&quot; or &quot;Run the frontend in a window&quot; is not checked.</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4275"/>
 +        <source>Recording Groups</source>
 +        <translation>Recording Groups</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4070"/>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3909"/>
+-        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3941"/>
+-        <source>General Playback (%1/%2)</source>
+-        <extracomment>%2 is the position, %2 is the total</extracomment>
+-        <translation>General Playback (%1/%2)</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4294"/>
 +        <source>Seeking</source>
 +        <translation>Seeking</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4078"/>
-+        <source>Commercial Skip</source>
-+        <translation>Commercial Skip</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4089"/>
-+        <source>Mac OS X Video Settings</source>
-+        <translation>Mac OS X Video Settings</translation>
-+    </message>
-+    <message>
-         <source>General Playback (%1/%2)</source>
-         <extracomment>%2 is the position, %2 is the total</extracomment>
--        <translation>General Playback (%1/%2)</translation>
-+        <translation type="vanished">General Playback (%1/%2)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3976"/>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4000"/>
-         <source>View Recordings (%1/%2)</source>
-         <extracomment>%1 is the position, %2 is the total</extracomment>
+-        <source>View Recordings (%1/%2)</source>
+-        <extracomment>%1 is the position, %2 is the total</extracomment>
 -        <translation>View Recordings (%1/%2)</translation>
-+        <translation type="vanished">View Recordings (%1/%2)</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4302"/>
++        <source>Commercial Skip</source>
++        <translation>Commercial Skip</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3989"/>
-         <source>Recording Groups (%1/%2)</source>
-         <extracomment>%1 is the position, %2 is the total</extracomment>
+-        <source>Recording Groups (%1/%2)</source>
+-        <extracomment>%1 is the position, %2 is the total</extracomment>
 -        <translation>Recording Groups (%1/%2)</translation>
-+        <translation type="vanished">Recording Groups (%1/%2)</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4313"/>
++        <source>Mac OS X Video Settings</source>
++        <translation>Mac OS X Video Settings</translation>
      </message>
++</context>
++<context>
++    <name>PlaybackSettingsDialog</name>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4010"/>
-         <source>Seeking (%1/%2)</source>
-         <extracomment>%1 is the position, %2 is the total</extracomment>
+-        <source>Seeking (%1/%2)</source>
+-        <extracomment>%1 is the position, %2 is the total</extracomment>
 -        <translation>Seeking (%1/%2)</translation>
-+        <translation type="vanished">Seeking (%1/%2)</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4143"/>
++        <source>Playback Profile Menu</source>
++        <translation>Playback Profile Menu</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4021"/>
-         <source>Commercial Skip (%1/%2)</source>
-         <extracomment>%1 is the position, %2 is the total</extracomment>
+-        <source>Commercial Skip (%1/%2)</source>
+-        <extracomment>%1 is the position, %2 is the total</extracomment>
 -        <translation>Commercial Skip (%1/%2)</translation>
-+        <translation type="vanished">Commercial Skip (%1/%2)</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4147"/>
++        <source>Move Up</source>
++        <translation>Move Up</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4035"/>
-         <source>Mac OS X Video Setting (%1/%2)</source>
-         <extracomment>%1 is the position, %2 is the total</extracomment>
+-        <source>Mac OS X Video Setting (%1/%2)</source>
+-        <extracomment>%1 is the position, %2 is the total</extracomment>
 -        <translation>Mac OS X Video Setting (%1/%2)</translation>
-+        <translation type="vanished">Mac OS X Video Setting (%1/%2)</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4149"/>
++        <source>Move Down</source>
++        <translation>Move Down</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4046"/>
-         <source>Mac OS X Video Settings (%1/%2)</source>
-         <extracomment>%1 is the position, %2 is the total</extracomment>
+-        <source>Mac OS X Video Settings (%1/%2)</source>
+-        <extracomment>%1 is the position, %2 is the total</extracomment>
 -        <translation>Mac OS X Video Settings (%1/%2)</translation>
-+        <translation type="vanished">Mac OS X Video Settings (%1/%2)</translation>
-+    </message>
-+</context>
-+<context>
-+    <name>PlaybackSettingsDialog</name>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3931"/>
-+        <source>Playback Profile Menu</source>
-+        <translation>Playback Profile Menu</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3935"/>
-+        <source>Move Up</source>
-+        <translation>Move Up</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3937"/>
-+        <source>Move Down</source>
-+        <translation>Move Down</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3939"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="4151"/>
 +        <source>Delete</source>
 +        <translation>Delete</translation>
      </message>
- </context>
+ </context>
+ <context>
+     <name>PlayerSettings</name>
+     <message>
+-        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="87"/>
++        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="84"/>
+         <source>This is the command used for any file whose extension is not specifically defined. You may also enter the name of one of the playback plugins such as &apos;Internal&apos;.</source>
+         <translation>This is the command used for any file whose extension is not specifically defined. You may also enter the name of one of the playback plugins such as &apos;Internal&apos;.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="92"/>
++        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="89"/>
+         <source>This can be any command to launch a DVD  player. Internal is the default.  For other players, %d will be substituted for the DVD device (e.g. /dev/dvd).</source>
+-        <translation>This can be any command to launch a DVD  player. Internal is the default.  For other players, %d will be substituted for the DVD device (e.g. /dev/dvd).</translation>
++        <translation>This can be any command to launch a DVD  player. Internal is the default. For other players, %d will be substituted for the DVD device (e.g. /dev/dvd).</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="96"/>
++        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="93"/>
+         <source>This device must exist, and the user playing the DVD needs to have read permission on the device.  &apos;default&apos; will let the MediaMonitor choose a device.</source>
+-        <translation>This device must exist, and the user playing the DVD needs to have read permission on the device.  &apos;default&apos; will let the MediaMonitor choose a device.</translation>
++        <translation>This device must exist, and the user playing the DVD needs to have read permission on the device. &apos;default&apos; will let the MediaMonitor choose a device.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="101"/>
++        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="98"/>
+         <source>This path is the location your operating system mounts Blu-ray discs.</source>
+         <translation>This path is the location your operating system mounts Blu-ray discs.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="104"/>
++        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="101"/>
+         <source>If for some reason the default player doesn&apos;t play a video, you can play it in an alternate player by selecting &apos;Play in Alternate Player.&apos;</source>
+         <translation>If for some reason the default player doesn&apos;t play a video, you can play it in an alternate player by selecting &apos;Play in Alternate Player.&apos;</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="108"/>
++        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="105"/>
+         <source>Some Blu-ray discs require that a player region be explicitly set. Only change the value from &apos;No Region&apos; if you encounter a disc which fails to play citing a region mismatch.</source>
+         <translation>Some Blu-ray discs require that a player region be explicitly set. Only change the value from &apos;No Region&apos; if you encounter a disc which fails to play citing a region mismatch.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="112"/>
++        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="109"/>
+         <source>Exit without saving settings</source>
+-        <translation>Exit without saving settings</translation>
++        <translation>Exit Without Saving</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="113"/>
++        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="110"/>
+         <source>Save settings and Exit</source>
+-        <translation>Save settings and Exit</translation>
++        <translation>Save and Exit</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="170"/>
++        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="158"/>
+         <source>No Region</source>
+         <translation>No Region</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="174"/>
++        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="162"/>
+         <source>Region A: The Americas, Southeast Asia, Japan</source>
+         <translation>Region A: The Americas, Southeast Asia, Japan</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="179"/>
++        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="167"/>
+         <source>Region B: Europe, Middle East, Africa, Oceania</source>
+         <translation>Region B: Europe, Middle East, Africa, Oceania</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="184"/>
++        <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="172"/>
+         <source>Region C: Eastern Europe, Central and South Asia</source>
+         <translation>Region C: Eastern Europe, Central and South Asia</translation>
+     </message>
+@@ -14280,93 +14259,241 @@
  <context>
-@@ -14224,12 +14794,12 @@
+     <name>PowerSearchPopup</name>
      <message>
-         <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="92"/>
-         <source>This can be any command to launch a DVD  player. Internal is the default.  For other players, %d will be substituted for the DVD device (e.g. /dev/dvd).</source>
--        <translation>This can be any command to launch a DVD  player. Internal is the default.  For other players, %d will be substituted for the DVD device (e.g. /dev/dvd).</translation>
-+        <translation>This can be any command to launch a DVD  player. Internal is the default. For other players, %d will be substituted for the DVD device (e.g. /dev/dvd).</translation>
+-        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="261"/>
++        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="253"/>
+         <source>Select Search</source>
+         <translation>Select Search</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="96"/>
-         <source>This device must exist, and the user playing the DVD needs to have read permission on the device.  &apos;default&apos; will let the MediaMonitor choose a device.</source>
--        <translation>This device must exist, and the user playing the DVD needs to have read permission on the device.  &apos;default&apos; will let the MediaMonitor choose a device.</translation>
-+        <translation>This device must exist, and the user playing the DVD needs to have read permission on the device. &apos;default&apos; will let the MediaMonitor choose a device.</translation>
+-        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="262"/>
++        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="254"/>
+         <source>&lt;New Search&gt;</source>
+         <translation>&lt;New Search&gt;</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="101"/>
-@@ -14249,12 +14819,12 @@
-     <message>
-         <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="112"/>
-         <source>Exit without saving settings</source>
--        <translation>Exit without saving settings</translation>
-+        <translation>Exit Without Saving</translation>
+-        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="277"/>
++        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="269"/>
+         <source>Edit</source>
+         <translation>Edit</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="113"/>
-         <source>Save settings and Exit</source>
--        <translation>Save settings and Exit</translation>
-+        <translation>Save and Exit</translation>
+-        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="278"/>
++        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="270"/>
+         <source>Delete</source>
+         <translation>Delete</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/videoplayersettings.cpp" line="170"/>
-@@ -14308,12 +14878,21 @@
+-        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="279"/>
++        <location filename="../programs/mythfrontend/proglist_helpers.cpp" line="271"/>
+         <source>Record</source>
+         <translation>Record</translation>
+     </message>
+ </context>
  <context>
-     <name>ProfileGroup</name>
+-    <name>ProfileGroup</name>
++    <name>PrevRecordedList</name>
      <message>
 -        <location filename="../libs/libmythtv/profilegroup.cpp" line="48"/>
-         <source>ProfileGroup</source>
+-        <source>ProfileGroup</source>
 -        <translation>ProfileGroup</translation>
-+        <translation type="vanished">ProfileGroup</translation>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="131"/>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="359"/>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="379"/>
++        <source>Programs</source>
++        <translation>Programs</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/profilegroup.cpp" line="168"/>
+-        <source>Transcoders</source>
+-        <translation>Transcoders</translation>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="132"/>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="360"/>
++        <source>Episodes</source>
++        <translation>Episodes</translation>
 +    </message>
 +    <message>
-+        <location filename="../libs/libmythtv/profilegroup.cpp" line="47"/>
-+        <source>Profile Group</source>
-+        <translation>Profile Group</translation>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="271"/>
++        <source>Last two weeks</source>
++        <translation>Last Two Weeks</translation>
 +    </message>
 +    <message>
-+        <location filename="../libs/libmythtv/profilegroup.cpp" line="171"/>
-+        <source>Profiles</source>
-+        <translation>Profiles</translation>
-     </message>
-     <message>
--        <location filename="../libs/libmythtv/profilegroup.cpp" line="168"/>
-+        <location filename="../libs/libmythtv/profilegroup.cpp" line="180"/>
-         <source>Transcoders</source>
-         <translation>Transcoders</translation>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="362"/>
++        <source>Select a program...</source>
++        <translation>Select a Program...</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="364"/>
++        <source>Select the title of the program you wish to find. When finished return with the left arrow key. To search by date press 1.</source>
++        <translation>Select the title of the program you wish to find. When finished return with the left arrow key. To search by date press 1.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="371"/>
++        <source>Reverse Title</source>
++        <comment>Sort sequence</comment>
++        <translation>Reverse Title</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="373"/>
++        <source>Title</source>
++        <comment>Sort sequence</comment>
++        <translation>Title</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="378"/>
++        <source>Dates</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="381"/>
++        <source>Select a month ...</source>
++        <translation>Select a Month...</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="383"/>
++        <source>Select a month to search. When finished return with the left arrow key. To search by title press 2.</source>
++        <translation>Select a month to search. When finished return with the left arrow key. To search by title press 2.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="390"/>
++        <source>Reverse Time</source>
++        <comment>Sort sequence</comment>
++        <translation>Reverse Time</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="392"/>
++        <source>Time</source>
++        <comment>Sort sequence</comment>
++        <translation>Time</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="539"/>
++        <source>Sort Options</source>
++        <translation>Sort Options</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="540"/>
++        <source>Reverse Sort Order</source>
++        <translation>Reverse Sort Order</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="541"/>
++        <source>Sort By Title</source>
++        <translation>Sort by Title</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="542"/>
++        <source>Sort By Time</source>
++        <translation>Sort by Time</translation>
      </message>
-@@ -14321,52 +14900,52 @@
- <context>
-     <name>ProfileGroupEditor</name>
+-</context>
+-<context>
+-    <name>ProfileGroupEditor</name>
      <message>
 -        <location filename="../libs/libmythtv/profilegroup.cpp" line="231"/>
-         <source>New Profile Group Name</source>
+-        <source>New Profile Group Name</source>
 -        <translation>New Profile Group Name</translation>
-+        <translation type="vanished">New Profile Group Name</translation>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="544"/>
++        <source>List Options</source>
++        <translation>List Options</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="546"/>
++        <source>Sort</source>
++        <translation>Sort</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="551"/>
++        <source>Edit Schedule</source>
++        <translation>Edit Schedule</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="552"/>
++        <source>Custom Edit</source>
++        <translation>Custom Edit</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="553"/>
++        <source>Program Details</source>
++        <translation>Program Details</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="554"/>
++        <source>Upcoming</source>
++        <translation>Upcoming</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="555"/>
++        <source>Channel Search</source>
++        <translation>Channel Search</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="557"/>
++        <source>Program Guide</source>
++        <translation>Program Guide</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="572"/>
++        <source>Recording Options</source>
++        <translation>Recording Options</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="578"/>
++        <source>Allow this episode to re-record</source>
++        <translation>Allow This Episode to Re-record</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="580"/>
++        <source>Never record this episode</source>
++        <translation>Never Record This Episode</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="581"/>
++        <source>Remove this episode from the list</source>
++        <translation>Remove This Episode from the List</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="583"/>
++        <source>Remove all episodes for this title</source>
++        <translation>Remove All Episodes for This Title</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="723"/>
++        <source>Delete this episode of &apos;%1&apos; from the previously recorded history?</source>
++        <translation>Delete this episode of &apos;%1&apos; from the previously recorded history?</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/profilegroup.cpp" line="301"/>
-         <source>(Create new profile group)</source>
+-        <source>(Create new profile group)</source>
 -        <translation>(Create new profile group)</translation>
-+        <translation type="vanished">(Create new profile group)</translation>
++        <location filename="../programs/mythfrontend/prevreclist.cpp" line="762"/>
++        <source>Delete all episodes of &apos;%1&apos; from the previously recorded history?</source>
++        <translation>Delete all episodes of &apos;%1&apos; from the previously recorded history?</translation>
++    </message>
++</context>
++<context>
++    <name>ProfileGroup</name>
++    <message>
++        <location filename="../libs/libmythtv/profilegroup.cpp" line="47"/>
++        <source>Profile Group</source>
++        <translation>Profile Group</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/profilegroup.cpp" line="354"/>
-         <source>Delete profile group:
- &apos;%1&apos;?</source>
+-        <source>Delete profile group:
+-&apos;%1&apos;?</source>
 -        <translation>Delete profile group:
-+        <translation type="vanished">Delete profile group:
- &apos;%1&apos;?</translation>
+-&apos;%1&apos;?</translation>
++        <location filename="../libs/libmythtv/profilegroup.cpp" line="171"/>
++        <source>Profiles</source>
++        <translation>Profiles</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/profilegroup.cpp" line="360"/>
-         <source>Yes, delete group</source>
+-        <source>Yes, delete group</source>
 -        <translation>Yes, delete group</translation>
-+        <translation type="vanished">Yes, Delete Group</translation>
++        <location filename="../libs/libmythtv/profilegroup.cpp" line="180"/>
++        <source>Transcoders</source>
++        <translation>Transcoders</translation>
      </message>
++</context>
++<context>
++    <name>ProfileGroupEditor</name>
      <message>
 -        <location filename="../libs/libmythtv/profilegroup.cpp" line="361"/>
-         <source>No, Don&apos;t delete group</source>
+-        <source>No, Don&apos;t delete group</source>
 -        <translation>No, Don&apos;t delete group</translation>
-+        <translation type="vanished">No, Keep Group</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/profilegroup.h" line="126"/>
++        <location filename="../libs/libmythtv/profilegroup.h" line="127"/>
 +        <source>Profile Group</source>
 +        <translation>Profile Group</translation>
      </message>
@@ -13350,620 +15913,1194 @@
      <name>ProgDetails</name>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="278"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="237"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="400"/>
          <source>Title</source>
          <translation>Title</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="281"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="241"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="404"/>
          <source>Title Pronounce</source>
          <translation>Title Pronounce</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="288"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="248"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="411"/>
          <source>Part %1 of %2, </source>
          <translation>Part %1 of %2, </translation>
      </message>
      <message numerus="yes">
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="298"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="261"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="424"/>
          <source>%n star(s)</source>
          <translation>
              <numerusform>%n star</numerusform>
-@@ -14374,199 +14953,204 @@
+@@ -14374,199 +14501,234 @@
          </translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="304"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="267"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="430"/>
          <source>Mono</source>
          <translation>Mono</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="306"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="269"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="432"/>
          <source>Stereo</source>
          <translation>Stereo</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="308"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="271"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="434"/>
          <source>Surround Sound</source>
          <translation>Surround Sound</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="310"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="273"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="436"/>
          <source>Dolby Sound</source>
          <translation>Dolby Sound</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="312"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="275"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="438"/>
          <source>Audio for Hearing Impaired</source>
          <translation>Audio for Hearing Impaired</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="314"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="277"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="440"/>
          <source>Audio for Visually Impaired</source>
          <translation>Audio for Visually Impaired</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="317"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="280"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="443"/>
          <source>HDTV</source>
          <translation>HDTV</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="319"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="282"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="445"/>
          <source>Widescreen</source>
          <translation>Widescreen</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="321"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="284"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="447"/>
          <source>AVC/H.264</source>
          <translation>AVC/H.264</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="323"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="286"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="449"/>
          <source>720p Resolution</source>
          <translation>720p Resolution</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="325"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="288"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="451"/>
          <source>1080i/p Resolution</source>
          <translation>1080i/p Resolution</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="328"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="291"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="453"/>
++        <source>Damaged</source>
++        <translation>Damaged</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="456"/>
          <source>CC</source>
          <comment>Closed Captioned</comment>
          <translation>CC</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="330"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="293"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="458"/>
          <source>Subtitles Available</source>
          <translation>Subtitles Available</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="332"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="295"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="460"/>
          <source>Subtitled</source>
          <translation>Subtitled</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="334"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="297"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="462"/>
          <source>Deaf Signing</source>
          <translation>Deaf Signing</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="337"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="300"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="465"/>
          <source>Unidentified Episode</source>
          <translation>Unidentified Episode</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="339"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="302"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="467"/>
          <source>Repeat</source>
          <translation>Repeat</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="347"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="310"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="475"/>
          <source>Description</source>
          <translation>Description</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="367"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="427"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="592"/>
          <source>Category</source>
          <translation>Category</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="378"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="444"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="609"/>
 +        <source>Genre</source>
 +        <translation>Genre</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="456"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="621"/>
          <source>Type</source>
          <comment>category_type</comment>
          <translation>Type</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="384"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="467"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="632"/>
          <source>%1 of %2</source>
          <translation>%1 of %2</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="389"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="473"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="638"/>
          <source>Episode</source>
          <translation>Episode</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="394"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="461"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="626"/>
          <source>Season</source>
          <translation>Season</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="396"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="475"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="640"/>
          <source>Syndicated Episode Number</source>
          <translation>Syndicated Episode Number</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="405"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="485"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="650"/>
          <source>Original Airdate</source>
          <translation>Original Airdate</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="407"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="487"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="652"/>
          <source>Program ID</source>
          <translation>Program ID</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="512"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="415"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="580"/>
          <source>Actors</source>
          <translation>Actors</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="513"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="421"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="586"/>
          <source>Director</source>
          <translation>Director</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="514"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="422"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="587"/>
          <source>Producer</source>
          <translation>Producer</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="515"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="423"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="588"/>
          <source>Executive Producer</source>
          <translation>Executive Producer</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="516"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="424"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="589"/>
          <source>Writer</source>
          <translation>Writer</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="517"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="416"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="581"/>
          <source>Guest Star</source>
          <translation>Guest Star</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="518"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="418"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="583"/>
          <source>Host</source>
          <translation>Host</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="519"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="425"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="590"/>
          <source>Adapter</source>
          <translation>Adapter</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="520"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="419"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="584"/>
          <source>Presenter</source>
          <translation>Presenter</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="521"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="420"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="585"/>
          <source>Commentator</source>
          <translation>Commentator</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="522"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="417"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="582"/>
          <source>Guest</source>
          <translation>Guest</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="586"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="553"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="310"/>
++        <source> MATCHED, adding %1</source>
++        <translation> MATCHED, adding %1</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="314"/>
++        <source> not matched</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="317"/>
++        <source> Query FAILED</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="319"/>
++        <source>Recording Priority Adjustment</source>
++        <translation>Recording Priority Adjustment</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="324"/>
++        <source>Priority Adjustment Total</source>
++        <translation>Priority Adjustment Total</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="718"/>
          <source>MythTV Status</source>
          <translation>MythTV Status</translation>
      </message>
      <message numerus="yes">
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="619"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="586"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="751"/>
          <source>%n hour(s)</source>
          <translation>
              <numerusform>%n hour</numerusform>
-@@ -14574,133 +15158,126 @@
+@@ -14574,134 +14736,111 @@
          </translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="633"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="600"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="765"/>
          <source>Auto-expire off</source>
 -        <translation>Auto-expire off</translation>
 +        <translation>Auto-expire Off</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="636"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="603"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="768"/>
          <source>Marked as &apos;watched&apos;</source>
          <translation>Marked as &apos;watched&apos;</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="639"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="606"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="771"/>
          <source>Not the earliest episode</source>
          <translation>Not the earliest episode</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="642"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="609"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="774"/>
          <source>Recently deleted episode</source>
          <translation>Recently deleted episode</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="654"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="618"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="783"/>
          <source>Recording Rule</source>
          <translation>Recording Rule</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="655"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="632"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="797"/>
          <source>Last Recorded</source>
          <translation>Last Recorded</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="656"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="633"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="798"/>
          <source>Next Recording</source>
          <translation>Next Recording</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="657"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="634"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="799"/>
          <source>Average Time Shift</source>
          <translation>Average Time Shift</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="658"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="635"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="800"/>
          <source>Watch List Score</source>
          <translation>Watch List Score</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="659"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="636"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="801"/>
          <source>Watch List Status</source>
          <translation>Watch List Status</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="660"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="619"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="784"/>
          <source>Search Phrase</source>
          <translation>Search Phrase</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="671"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="630"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="795"/>
          <source>Find ID</source>
          <translation>Find ID</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="690"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="655"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="820"/>
          <source>GB</source>
          <comment>GigaBytes</comment>
          <translation>GB</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="710"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="675"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="840"/>
          <source>Recording Host</source>
          <translation>Recording Host</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="711"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="676"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="841"/>
          <source>Recording Input</source>
          <translation>Recording Input</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="712"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="677"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="842"/>
          <source>Recorded File Name</source>
          <translation>Recorded File Name</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="713"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="678"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="843"/>
          <source>Recorded File Size</source>
          <translation>Recorded File Size</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="714"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="679"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="844"/>
          <source>Recording Profile</source>
          <translation>Recording Profile</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="715"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="680"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="845"/>
          <source>Recording Group</source>
          <translation>Recording Group</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/progdetails.cpp" line="716"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="681"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="846"/>
          <source>Storage Group</source>
          <translation>Storage Group</translation>
      </message>
      <message>
--        <location filename="../programs/mythfrontend/progdetails.cpp" line="717"/>
-+        <location filename="../programs/mythfrontend/progdetails.cpp" line="682"/>
-         <source>Playback Group</source>
-         <translation>Playback Group</translation>
+-        <location filename="../programs/mythfrontend/progdetails.cpp" line="717"/>
++        <location filename="../programs/mythfrontend/progdetails.cpp" line="847"/>
+         <source>Playback Group</source>
+         <translation>Playback Group</translation>
+     </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/progdetails.cpp" line="755"/>
+-        <source>Options</source>
+-        <translation>Options</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/progdetails.cpp" line="764"/>
+-        <location filename="../programs/mythfrontend/progdetails.cpp" line="789"/>
+-        <source>Zoom In</source>
+-        <translation>Zoom In</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/progdetails.cpp" line="765"/>
+-        <location filename="../programs/mythfrontend/progdetails.cpp" line="787"/>
+-        <source>Zoom Out</source>
+-        <translation>Zoom Out</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/progdetails.cpp" line="766"/>
+-        <location filename="../programs/mythfrontend/progdetails.cpp" line="791"/>
+-        <source>Switch Page</source>
+-        <translation>Switch Page</translation>
+-    </message>
+ </context>
+ <context>
+     <name>ProgFinder</name>
+@@ -14721,93 +14860,93 @@
+         <translation>Times</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="228"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="226"/>
+         <source>Options</source>
+         <translation>Options</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="238"/>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="286"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="236"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="284"/>
+         <source>Clear Search</source>
+         <translation>Clear Search</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="239"/>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="294"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="237"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="292"/>
+         <source>Edit Search</source>
+         <translation>Edit Search</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="242"/>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="306"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="240"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="304"/>
+         <source>Toggle Record</source>
+         <translation>Toggle Record</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="243"/>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="310"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="241"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="308"/>
+         <source>Program Details</source>
+         <translation>Program Details</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="244"/>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="314"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="242"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="312"/>
+         <source>Upcoming</source>
+         <translation>Upcoming</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="245"/>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="318"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="243"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="316"/>
+         <source>Previously Recorded</source>
+         <translation>Previously Recorded</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="246"/>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="322"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="244"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="320"/>
+         <source>Custom Edit</source>
+         <translation>Custom Edit</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="247"/>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="326"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="245"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="324"/>
+         <source>Program Guide</source>
+         <translation>Program Guide</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="248"/>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="330"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="246"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="328"/>
+         <source>Channel Search</source>
+         <translation>Channel Search</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="363"/>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="396"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="361"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="394"/>
+         <source>No Programs</source>
+         <translation>No Programs</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="365"/>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="398"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="363"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="396"/>
+         <source>There are no available programs under this search. Please select another search.</source>
+         <translation>There are no available programs under this search. Please select another search.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="371"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="369"/>
+         <source>Select a letter...</source>
+-        <translation>Select a letter...</translation>
++        <translation>Select a Letter...</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="373"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="371"/>
+         <source>Pick the first letter of the program name, then press SELECT or the right arrow.</source>
+         <translation>Pick the first letter of the program name, then press SELECT or the right arrow.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="382"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="380"/>
+         <source>Select a program...</source>
+-        <translation>Select a program...</translation>
++        <translation>Select a Program...</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/progfind.cpp" line="384"/>
++        <location filename="../programs/mythfrontend/progfind.cpp" line="382"/>
+         <source>Select the title of the program you wish to find. When finished return with the left arrow key. Press SELECT to schedule a recording.</source>
+         <translation>Select the title of the program you wish to find. When finished return with the left arrow key. Press SELECT to schedule a recording.</translation>
+     </message>
+@@ -14815,201 +14954,201 @@
+ <context>
+     <name>ProgLister</name>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="187"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="188"/>
+         <source>Program List</source>
+         <translation>Program List</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="195"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="196"/>
+         <source>Program Listings</source>
+         <translation>Program Listings</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="196"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="197"/>
+         <source>New Title Search</source>
+         <translation>New Title Search</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="197"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="198"/>
+         <source>Title Search</source>
+         <translation>Title Search</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="198"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="199"/>
+         <source>Keyword Search</source>
+         <translation>Keyword Search</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="199"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="200"/>
+         <source>People Search</source>
+         <translation>People Search</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="200"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="201"/>
+         <source>Stored Search</source>
+         <translation>Stored Search</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="201"/>
+         <location filename="../programs/mythfrontend/proglist.cpp" line="202"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="203"/>
+         <source>Power Search</source>
+         <translation>Power Search</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="203"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="204"/>
+         <source>Rule Search</source>
+         <translation>Rule Search</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="204"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="205"/>
+         <source>Category Search</source>
+         <translation>Category Search</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="205"/>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="345"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="206"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="346"/>
+         <source>Channel Search</source>
+         <translation>Channel Search</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="206"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="207"/>
+         <source>Movie Search</source>
+         <translation>Movie Search</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="207"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="208"/>
+         <source>Time Search</source>
+         <translation>Time Search</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="208"/>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="349"/>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="757"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="209"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="350"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="758"/>
+         <source>Previously Recorded</source>
+         <translation>Previously Recorded</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="209"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="210"/>
+         <source>Unknown Search</source>
+         <translation>Unknown Search</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="329"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="330"/>
+         <source>Options</source>
+         <translation>Options</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="333"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="334"/>
+         <source>Choose Search Phrase...</source>
+         <translation>Choose Search Phrase...</translation>
      </message>
      <message>
--        <location filename="../programs/mythfrontend/progdetails.cpp" line="755"/>
-         <source>Options</source>
--        <translation>Options</translation>
-+        <translation type="vanished">Options</translation>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="336"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="337"/>
+         <source>Sort</source>
+         <translation>Sort</translation>
      </message>
      <message>
--        <location filename="../programs/mythfrontend/progdetails.cpp" line="764"/>
--        <location filename="../programs/mythfrontend/progdetails.cpp" line="789"/>
-         <source>Zoom In</source>
--        <translation>Zoom In</translation>
-+        <translation type="vanished">Zoom In</translation>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="339"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="340"/>
+         <source>Record</source>
+         <translation>Record</translation>
      </message>
      <message>
--        <location filename="../programs/mythfrontend/progdetails.cpp" line="765"/>
--        <location filename="../programs/mythfrontend/progdetails.cpp" line="787"/>
-         <source>Zoom Out</source>
--        <translation>Zoom Out</translation>
-+        <translation type="vanished">Zoom Out</translation>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="341"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="342"/>
+         <source>Edit Schedule</source>
+         <translation>Edit Schedule</translation>
      </message>
      <message>
--        <location filename="../programs/mythfrontend/progdetails.cpp" line="766"/>
--        <location filename="../programs/mythfrontend/progdetails.cpp" line="791"/>
-         <source>Switch Page</source>
--        <translation>Switch Page</translation>
-+        <translation type="vanished">Switch Page</translation>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="342"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="343"/>
+         <source>Program Details</source>
+         <translation>Program Details</translation>
      </message>
- </context>
- <context>
-@@ -14794,7 +15371,7 @@
      <message>
-         <location filename="../programs/mythfrontend/progfind.cpp" line="371"/>
-         <source>Select a letter...</source>
--        <translation>Select a letter...</translation>
-+        <translation>Select a Letter...</translation>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="343"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="344"/>
+         <source>Program Guide</source>
+         <translation>Program Guide</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/progfind.cpp" line="373"/>
-@@ -14804,7 +15381,7 @@
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="347"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="348"/>
+         <source>Upcoming</source>
+         <translation>Upcoming</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/progfind.cpp" line="382"/>
-         <source>Select a program...</source>
--        <translation>Select a program...</translation>
-+        <translation>Select a Program...</translation>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="350"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="351"/>
+         <source>Custom Edit</source>
+         <translation>Custom Edit</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="356"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="357"/>
+         <source>Delete Rule</source>
+         <translation>Delete Rule</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/progfind.cpp" line="384"/>
-@@ -14951,7 +15528,7 @@
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="361"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="362"/>
+         <source>Delete Episode</source>
+         <translation>Delete Episode</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/proglist.cpp" line="519"/>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="519"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="520"/>
          <source>Start search from date and time</source>
 -        <translation>Start search from date and time</translation>
 +        <translation>Start Search from Date and Time</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/proglist.cpp" line="766"/>
-@@ -14971,12 +15548,12 @@
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="766"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="767"/>
+         <source>Cancel</source>
+         <translation>Cancel</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="324"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="325"/>
+         <source>Sort Options</source>
+         <translation>Sort Options</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="325"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="326"/>
+         <source>Reverse Sort Order</source>
+         <translation>Reverse Sort Order</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/proglist.cpp" line="326"/>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="326"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="327"/>
          <source>Sort By Title</source>
 -        <translation>Sort By Title</translation>
 +        <translation>Sort by Title</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/proglist.cpp" line="327"/>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="327"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="328"/>
          <source>Sort By Time</source>
 -        <translation>Sort By Time</translation>
 +        <translation>Sort by Time</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/proglist.cpp" line="489"/>
-@@ -15001,7 +15578,7 @@
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="489"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="490"/>
+         <source>Select Rating</source>
+         <translation>Select Rating</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="490"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="491"/>
+         <source>Select Channel</source>
+         <translation>Select Channel</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="491"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="492"/>
+         <source>Select Category</source>
+         <translation>Select Category</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="492"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="493"/>
+         <source>Select List</source>
+         <translation>Select List</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/proglist.cpp" line="494"/>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="494"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="495"/>
          <source>Select a search stored from</source>
 -        <translation>Select a search stored from</translation>
 +        <translation>Select a Search Stored from</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/proglist.cpp" line="495"/>
-@@ -15027,14 +15604,14 @@
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="495"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="496"/>
+         <source>Custom Record</source>
+         <translation>Custom Record</translation>
+     </message>
+     <message numerus="yes">
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="964"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="965"/>
+         <source>%n star(s)</source>
+         <translatorcomment>Used to have singular/plural problem</translatorcomment>
+         <translation>
+@@ -15018,7 +15157,7 @@
          </translation>
      </message>
-     <message>
--        <location filename="../programs/mythfrontend/proglist.cpp" line="1388"/>
-+        <location filename="../programs/mythfrontend/proglist.cpp" line="1394"/>
-         <source>^(The |A |An )</source>
-         <comment>Regular Expression for what to ignore when sorting</comment>
-         <translation>^(The |A |An )</translation>
+     <message numerus="yes">
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="969"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="970"/>
+         <source>%n star(s) and above</source>
+         <translatorcomment>Used to have singular/plural problem</translatorcomment>
+         <translation>
+@@ -15027,91 +15166,85 @@
+         </translation>
      </message>
      <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="1388"/>
+-        <source>^(The |A |An )</source>
+-        <comment>Regular Expression for what to ignore when sorting</comment>
+-        <translation>^(The |A |An )</translation>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/proglist.cpp" line="1579"/>
 -        <location filename="../programs/mythfrontend/proglist.cpp" line="1608"/>
-+        <location filename="../programs/mythfrontend/proglist.cpp" line="1585"/>
-+        <location filename="../programs/mythfrontend/proglist.cpp" line="1614"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="1576"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="1605"/>
          <source>%1 of %2</source>
          <comment>Current position in list where %1 is the position, %2 is the total count</comment>
          <translation>%1 of %2</translation>
-@@ -15062,22 +15639,22 @@
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="659"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="660"/>
+         <source>Delete &apos;%1&apos; %2 rule?</source>
+         <translation>Delete &apos;%1&apos; %2 rule?</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/proglist.cpp" line="761"/>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="683"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="684"/>
+         <source>Delete this episode of &apos;%1&apos;?</source>
+         <translation>Delete this episode of &apos;%1&apos;?</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="716"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="717"/>
+         <source>Delete all episodes of &apos;%1&apos;?</source>
+         <translation>Delete all episodes of &apos;%1&apos;?</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="754"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="755"/>
+         <source>NOTE: removing items from this list will not delete any recordings.</source>
+         <translation>NOTE: removing items from this list will not delete any recordings.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="761"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="762"/>
          <source>Allow this episode to re-record</source>
 -        <translation>Allow this episode to re-record</translation>
 +        <translation>Allow This Episode to Re-record</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/proglist.cpp" line="763"/>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="763"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="764"/>
          <source>Never record this episode</source>
 -        <translation>Never record this episode</translation>
 +        <translation>Never Record This Episode</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/proglist.cpp" line="764"/>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="764"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="765"/>
          <source>Remove this episode from the list</source>
 -        <translation>Remove this episode from the list</translation>
 +        <translation>Remove This Episode from the List</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/proglist.cpp" line="765"/>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="765"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="766"/>
          <source>Remove all episodes for this title</source>
 -        <translation>Remove all episodes for this title</translation>
 +        <translation>Remove All Episodes for This Title</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/proglist.cpp" line="940"/>
-@@ -15211,43 +15788,43 @@
-         <location filename="../programs/mythfrontend/programrecpriority.cpp" line="663"/>
-         <location filename="../programs/mythfrontend/programrecpriority.cpp" line="743"/>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="940"/>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="960"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="941"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="961"/>
+         <source>All</source>
+         <translation>All</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="943"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="944"/>
+         <source>Premieres</source>
+         <translation>Premieres</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="946"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="947"/>
+         <source>Movies</source>
+         <translation>Movies</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="949"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="950"/>
+         <source>Series</source>
+         <translation>Series</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="952"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="953"/>
+         <source>Specials</source>
+         <translation>Specials</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="962"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="963"/>
+         <source>Unrated</source>
+         <translation>Unrated</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/proglist.cpp" line="986"/>
++        <location filename="../programs/mythfrontend/proglist.cpp" line="987"/>
+         <source>Power Recording Rule</source>
+         <translation>Power Recording Rule</translation>
+     </message>
+@@ -15139,158 +15272,148 @@
+ <context>
+     <name>ProgramRecPriority</name>
+     <message>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="450"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="475"/>
+         <source>Schedule Priorities</source>
+         <translation>Schedule Priorities</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="625"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="649"/>
+         <source>Options</source>
+         <translation>Options</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="634"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="691"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="658"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="715"/>
+         <source>Increase Priority</source>
+         <translation>Increase Priority</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="635"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="695"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="659"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="719"/>
+         <source>Decrease Priority</source>
+         <translation>Decrease Priority</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="636"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="699"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="660"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="723"/>
+         <source>Sort</source>
+         <translation>Sort</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="637"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="703"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="661"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="727"/>
+         <source>Program Details</source>
+         <translation>Program Details</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="638"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="707"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="662"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="731"/>
+         <source>Upcoming</source>
+         <translation>Upcoming</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="639"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="712"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="663"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="736"/>
+         <source>Custom Edit</source>
+         <translation>Custom Edit</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="640"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="717"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="664"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="741"/>
+         <source>Delete Rule</source>
+         <translation>Delete Rule</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="641"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="722"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="665"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="746"/>
+         <source>New Template</source>
+         <translation>New Template</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="653"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="677"/>
+         <source>Sort Options</source>
+         <translation>Sort Options</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="662"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="738"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="686"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="762"/>
+         <source>Reverse Sort Order</source>
+         <translation>Reverse Sort Order</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="663"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="743"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="687"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="767"/>
          <source>Sort By Title</source>
 -        <translation>Sort By Title</translation>
 +        <translation>Sort by Title</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/programrecpriority.cpp" line="664"/>
-         <location filename="../programs/mythfrontend/programrecpriority.cpp" line="754"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="664"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="754"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="688"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="778"/>
          <source>Sort By Priority</source>
 -        <translation>Sort By Priority</translation>
 +        <translation>Sort by Priority</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/programrecpriority.cpp" line="665"/>
-         <location filename="../programs/mythfrontend/programrecpriority.cpp" line="765"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="665"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="765"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="689"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="789"/>
          <source>Sort By Type</source>
 -        <translation>Sort By Type</translation>
 +        <translation>Sort by Type</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/programrecpriority.cpp" line="666"/>
-         <location filename="../programs/mythfrontend/programrecpriority.cpp" line="776"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="666"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="776"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="690"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="800"/>
          <source>Sort By Count</source>
 -        <translation>Sort By Count</translation>
 +        <translation>Sort by Count</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/programrecpriority.cpp" line="667"/>
-         <location filename="../programs/mythfrontend/programrecpriority.cpp" line="789"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="667"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="789"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="691"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="813"/>
          <source>Sort By Record Count</source>
 -        <translation>Sort By Record Count</translation>
 +        <translation>Sort by Record Count</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/programrecpriority.cpp" line="668"/>
-         <location filename="../programs/mythfrontend/programrecpriority.cpp" line="800"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="668"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="800"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="692"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="824"/>
          <source>Sort By Last Recorded</source>
 -        <translation>Sort By Last Recorded</translation>
 +        <translation>Sort by Last Recorded</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/programrecpriority.cpp" line="669"/>
-         <location filename="../programs/mythfrontend/programrecpriority.cpp" line="811"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="669"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="811"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="693"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="835"/>
          <source>Sort By Average Delay</source>
 -        <translation>Sort By Average Delay</translation>
 +        <translation>Sort by Average Delay</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/programrecpriority.cpp" line="728"/>
-@@ -15284,13 +15861,13 @@
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="728"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="752"/>
+         <source>Template Name</source>
+         <translation>Template Name</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1019"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1043"/>
+         <source>Delete &apos;%1&apos; %2 rule?</source>
+-        <translation>Delete &apos;%1&apos; %2 rule?</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1212"/>
+-        <source>^(The |A |An )</source>
+-        <translation>^(The |A |An )</translation>
++        <translation>Delete &apos;%1&apos; %2 rule?</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1429"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1430"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1431"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1544"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1545"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1546"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1450"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1451"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1452"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1565"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1566"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1567"/>
+         <source>Any</source>
+         <translation>Any</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1395"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1488"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1416"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="1509"/>
+         <source>Recording %1 of %2</source>
+         <translation>Recording %1 of %2</translation>
+     </message>
+ </context>
  <context>
      <name>QObject</name>
-     <message>
+-    <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="393"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="396"/>
-         <source>^(The |A |An )</source>
-         <translation>^(The |A |An )</translation>
-     </message>
+-        <source>^(The |A |An )</source>
+-        <translation>^(The |A |An )</translation>
+-    </message>
      <message numerus="yes">
 -        <location filename="../libs/libmyth/programinfo.cpp" line="1697"/>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="1702"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="1711"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="1716"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="1888"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="1893"/>
          <source>%n hour(s)</source>
          <translation>
              <numerusform>%n hour</numerusform>
-@@ -15298,8 +15875,8 @@
+@@ -15298,8 +15421,8 @@
          </translation>
      </message>
      <message numerus="yes">
 -        <location filename="../libs/libmyth/programinfo.cpp" line="1686"/>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="1695"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="1700"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="1709"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="1877"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="1886"/>
          <source>%n minute(s)</source>
          <translation>
              <numerusform>%n minute</numerusform>
-@@ -15307,24 +15884,25 @@
+@@ -15307,24 +15430,28 @@
          </translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="1035"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="1027"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="1055"/>
++        <location filename="../libs/libmythmetadata/metadatacommon.cpp" line="222"/>
++        <location filename="../libs/libmythmetadata/metadatacommon.cpp" line="318"/>
++        <location filename="../libs/libmythmetadata/metadatacommon.cpp" line="397"/>
 +        <location filename="../libs/libmythmetadata/metadatacommon.h" line="255"/>
          <source>Manual Record</source>
          <translation>Manual Record</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="1725"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="1739"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="1916"/>
          <source>Re-Record</source>
 -        <translation>Re-Record</translation>
 +        <translation>Re-record</translation>
@@ -13972,31 +17109,31 @@
 -        <location filename="../libs/libmyth/programinfo.cpp" line="1767"/>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="1772"/>
 -        <location filename="../libs/libmyth/programtypes.cpp" line="212"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="1781"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="1786"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="1958"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="1963"/>
 +        <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="172"/>
          <source>Repeat</source>
          <translation>Repeat</translation>
      </message>
      <message numerus="yes">
 -        <location filename="../libs/libmyth/programinfo.cpp" line="1795"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="1809"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="1986"/>
          <source>%n star(s)</source>
          <translation>
              <numerusform>%n star</numerusform>
-@@ -15333,60 +15911,60 @@
+@@ -15333,60 +15460,60 @@
      </message>
      <message>
          <location filename="../libs/libmythtv/channelinfo.cpp" line="280"/>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1288"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1242"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1261"/>
          <source>Yes</source>
          <translation>Yes</translation>
      </message>
      <message>
          <location filename="../libs/libmythtv/channelinfo.cpp" line="280"/>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1289"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1243"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1262"/>
          <source>No</source>
          <translation>No</translation>
      </message>
@@ -14005,62 +17142,62 @@
 -        <location filename="../libs/libmyth/programinfo.cpp" line="4980"/>
 -        <location filename="../libs/libmyth/programtypes.cpp" line="228"/>
 -        <location filename="../libs/libmyth/programtypes.cpp" line="231"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="3125"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="4994"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="3298"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5167"/>
 +        <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="188"/>
 +        <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="191"/>
          <location filename="../libs/libmythtv/videoouttypes.h" line="137"/>
          <location filename="../libs/libmythtv/videoouttypes.h" line="160"/>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1053"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1060"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1123"/>
          <source>Unknown</source>
          <translation>Unknown</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="3115"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="3129"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="3302"/>
          <source>Playing</source>
          <translation>Playing</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="3122"/>
 -        <location filename="../libs/libmyth/programtypes.cpp" line="185"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="3136"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="3309"/>
 +        <location filename="../libs/libmythservicecontracts/enums/recStatus.cpp" line="143"/>
          <source>Recording</source>
          <translation>Recording</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="3130"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="3144"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="3317"/>
          <source>Transcoding</source>
          <translation>Transcoding</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="3117"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="3131"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="3304"/>
          <source>PIP</source>
          <translation>PIP</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="1847"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="1861"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="2038"/>
          <source>Blu-ray Disc</source>
          <translation>Blu-ray Disc</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="3119"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="3133"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="3306"/>
          <source>PBP</source>
          <translation>PBP</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="3124"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="3138"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="3311"/>
          <source>File transfer</source>
          <translation>File transfer</translation>
      </message>
-@@ -15436,47 +16014,47 @@
+@@ -15436,47 +15563,47 @@
      <message>
          <location filename="../libs/libmyth/recordingtypes.cpp" line="55"/>
          <source>Record only this showing</source>
@@ -14117,7 +17254,7 @@
      </message>
      <message>
          <location filename="../libs/libmyth/recordingtypes.cpp" line="137"/>
-@@ -15513,655 +16091,665 @@
+@@ -15513,665 +15640,675 @@
          <translation>Override Recording</translation>
      </message>
      <message>
@@ -14573,267 +17710,267 @@
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5223"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5190"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5363"/>
          <source>Default</source>
          <comment>Recording Profile Default</comment>
          <translation>Default</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5224"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5191"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5364"/>
          <source>High Quality</source>
          <comment>Recording Profile High Quality</comment>
          <translation>High Quality</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5225"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5192"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5365"/>
          <source>Live TV</source>
          <comment>Recording Profile Live TV</comment>
          <translation>Live TV</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5226"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5193"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5366"/>
          <source>Low Quality</source>
          <comment>Recording Profile Low Quality</comment>
          <translation>Low Quality</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5227"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5194"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5367"/>
          <source>Medium Quality</source>
          <comment>Recording Profile Medium Quality</comment>
          <translation>Medium Quality</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5233"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5200"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5373"/>
          <source>CRC IP Recorders</source>
          <comment>Recording Profile Group Name</comment>
          <translation>CRC IP Recorders</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5235"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5202"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5375"/>
          <source>FireWire Input</source>
          <comment>Recording Profile Group Name</comment>
          <translation>FireWire Input</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5237"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5204"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5377"/>
          <source>Freebox Input</source>
          <comment>Recording Profile Group Name</comment>
          <translation>Freebox Input</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5239"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5206"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5379"/>
          <source>Hardware DVB Encoders</source>
          <comment>Recording Profile Group Name</comment>
          <translation>Hardware DVB Encoders</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5241"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5208"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5381"/>
          <source>Hardware HDTV</source>
          <comment>Recording Profile Group Name</comment>
          <translation>Hardware HDTV</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5243"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5210"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5383"/>
          <source>Hardware MJPEG Encoders (Matrox G200-TV, Miro DC10, etc)</source>
          <comment>Recording Profile Group Name</comment>
          <translation>Hardware MJPEG Encoders (Matrox G200-TV, Miro DC10, etc)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5245"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5212"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5385"/>
          <source>HD-PVR Recorders</source>
          <comment>Recording Profile Group Name</comment>
          <translation>HD-PVR Recorders</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5247"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5214"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5387"/>
          <source>HDHomeRun Recorders</source>
          <comment>Recording Profile Group Name</comment>
          <translation>HDHomeRun Recorders</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5249"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5216"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5389"/>
          <source>MPEG-2 Encoders (PVR-x50, PVR-500)</source>
          <comment>Recording Profile Group Name</comment>
          <translation>MPEG-2 Encoders (PVR-x50, PVR-500)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5253"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5220"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5393"/>
          <source>Transcoders</source>
          <comment>Recording Profile Group Name</comment>
          <translation>Transcoders</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5257"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5224"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5397"/>
          <source>V4L2 Encoders</source>
          <comment>Recording Profile Group Name</comment>
          <translation>V4L2 Encoders</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5261"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5228"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5401"/>
          <source>All Programs</source>
          <comment>Recording Group All Programs</comment>
          <translation>All Programs</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5262"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5229"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5402"/>
          <source>All</source>
          <comment>Recording Group All Programs -- short form</comment>
          <translation>All</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5264"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5231"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5404"/>
          <source>Default</source>
          <comment>Recording Group Default</comment>
          <translation>Default</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5265"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5232"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5405"/>
          <source>Deleted</source>
          <comment>Recording Group Deleted</comment>
          <translation>Deleted</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5272"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5239"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5412"/>
          <source>Default</source>
          <comment>Storage Group Name</comment>
          <translation>Default</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="3128"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="3142"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="3315"/>
          <source>Commercial Detection</source>
          <translation>Commercial Detection</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="1679"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="1693"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="1870"/>
          <source>%1 GB</source>
          <comment>GigaBytes</comment>
          <translation>%1 GB</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="1835"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="1849"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="2026"/>
          <source>DVD</source>
          <translation>DVD</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="1839"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="1853"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="2030"/>
          <source>HTTP Streaming</source>
          <translation>HTTP Streaming</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="1843"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="1857"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="2034"/>
          <source>RTSP Streaming</source>
          <translation>RTSP Streaming</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="1852"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="1866"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="2043"/>
          <source>Recording</source>
          <comment>Recorded file, object not action</comment>
          <translation>Recording</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="3132"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="3146"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="3319"/>
          <source>Preview Generation</source>
          <translation>Preview Generation</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="3134"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="3148"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="3321"/>
          <source>User Job</source>
          <translation>User Job</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5228"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5195"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5368"/>
          <source>MPEG-2</source>
          <comment>Recording Profile MPEG-2</comment>
          <translation>MPEG-2</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5229"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5196"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5369"/>
          <source>RTjpeg/MPEG-4</source>
          <comment>Recording Profile RTjpeg/MPEG-4</comment>
          <translation>RTjpeg/MPEG-4</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5251"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5218"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5391"/>
          <source>Software Encoders (V4L based)</source>
          <comment>Recording Profile Group Name</comment>
          <translation>Software Encoders (V4L based)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5255"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5222"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5395"/>
          <source>USB MPEG-4 Encoder (Plextor ConvertX, etc)</source>
          <comment>Recording Profile Group Name</comment>
          <translation>USB MPEG-4 Encoder (Plextor ConvertX, etc)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5263"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5230"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5403"/>
          <source>Live TV</source>
          <comment>Recording Group Live TV</comment>
          <translation>Live TV</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5268"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5235"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5408"/>
          <source>All Programs - %1</source>
          <comment>Show all programs from a specific recording group</comment>
          <translation>All Programs - %1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5273"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5240"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5413"/>
          <source>Live TV</source>
          <comment>Storage Group Name</comment>
          <translation>Live TV</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5274"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5241"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5414"/>
          <source>Thumbnails</source>
          <comment>Storage Group Name</comment>
          <translation>Thumbnails</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5275"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5242"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5415"/>
          <source>DB Backups</source>
          <comment>Storage Group Name</comment>
          <translation>DB Backups</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="5278"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="5245"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="5418"/>
          <source>Default</source>
          <comment>Playback Group Name</comment>
          <translation>Default</translation>
@@ -14904,44 +18041,189 @@
          <source>Pre &amp; Post Roll</source>
          <translation>Pre &amp; Post Roll</translation>
      </message>
-@@ -16222,17 +16810,17 @@
      <message>
-         <location filename="../libs/libmythtv/decoderbase.cpp" line="1130"/>
+-        <location filename="../programs/mythbackend/httpstatus.cpp" line="414"/>
++        <location filename="../programs/mythbackend/httpstatus.cpp" line="409"/>
+         <source>master</source>
+         <translation>master</translation>
+     </message>
+     <message numerus="yes">
+-        <location filename="../programs/mythbackend/httpstatus.cpp" line="935"/>
++        <location filename="../programs/mythbackend/httpstatus.cpp" line="928"/>
+         <source> %n day(s),</source>
+         <translation>
+             <numerusform> %n day,</numerusform>
+@@ -16179,7 +16316,7 @@
+         </translation>
+     </message>
+     <message numerus="yes">
+-        <location filename="../programs/mythbackend/httpstatus.cpp" line="936"/>
++        <location filename="../programs/mythbackend/httpstatus.cpp" line="929"/>
+         <source> %n hour(s) and</source>
+         <translation>
+             <numerusform> %n hour and</numerusform>
+@@ -16187,7 +16324,7 @@
+         </translation>
+     </message>
+     <message numerus="yes">
+-        <location filename="../programs/mythbackend/httpstatus.cpp" line="937"/>
++        <location filename="../programs/mythbackend/httpstatus.cpp" line="930"/>
+         <source> %n minute(s)</source>
+         <translation>
+             <numerusform> %n minute</numerusform>
+@@ -16195,19 +16332,19 @@
+         </translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythbackend/httpstatus.cpp" line="940"/>
++        <location filename="../programs/mythbackend/httpstatus.cpp" line="933"/>
+         <source>within one minute</source>
+         <comment>Recording starting</comment>
+         <translation>within one minute</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythbackend/httpstatus.cpp" line="943"/>
++        <location filename="../programs/mythbackend/httpstatus.cpp" line="936"/>
+         <source>soon</source>
+         <comment>Recording starting</comment>
+         <translation>soon</translation>
+     </message>
+     <message numerus="yes">
+-        <location filename="../programs/mythbackend/httpstatus.cpp" line="1437"/>
++        <location filename="../programs/mythbackend/httpstatus.cpp" line="1430"/>
+         <source>(%n day(s))</source>
+         <translation>
+             <numerusform>(%n day)</numerusform>
+@@ -16215,300 +16352,309 @@
+         </translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/decoderbase.cpp" line="1127"/>
++        <location filename="../libs/libmythtv/decoderbase.cpp" line="1136"/>
+         <source>Track</source>
+         <translation>Track</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/decoderbase.cpp" line="1130"/>
++        <location filename="../libs/libmythtv/decoderbase.cpp" line="1139"/>
          <source>Audio track</source>
 -        <translation>Audio track</translation>
 +        <translation>Audio Track</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/decoderbase.cpp" line="1132"/>
+-        <location filename="../libs/libmythtv/decoderbase.cpp" line="1132"/>
++        <location filename="../libs/libmythtv/decoderbase.cpp" line="1141"/>
          <source>Video track</source>
 -        <translation>Video track</translation>
 +        <translation>Video Track</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/decoderbase.cpp" line="1134"/>
+-        <location filename="../libs/libmythtv/decoderbase.cpp" line="1134"/>
++        <location filename="../libs/libmythtv/decoderbase.cpp" line="1143"/>
          <source>Subtitle track</source>
 -        <translation>Subtitle track</translation>
 +        <translation>Subtitle Track</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/decoderbase.cpp" line="1136"/>
-@@ -16307,208 +16895,212 @@
+-        <location filename="../libs/libmythtv/decoderbase.cpp" line="1136"/>
++        <location filename="../libs/libmythtv/decoderbase.cpp" line="1145"/>
+         <source>CC</source>
+         <comment>EIA-608 closed captions</comment>
+         <translation>CC</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/decoderbase.cpp" line="1138"/>
++        <location filename="../libs/libmythtv/decoderbase.cpp" line="1147"/>
+         <source>ATSC CC</source>
+         <comment>EIA-708 closed captions</comment>
+         <translation>ATSC CC</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/decoderbase.cpp" line="1140"/>
++        <location filename="../libs/libmythtv/decoderbase.cpp" line="1149"/>
+         <source>TT CC</source>
+         <comment>Teletext closed captions</comment>
+         <translation>TT CC</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/decoderbase.cpp" line="1142"/>
++        <location filename="../libs/libmythtv/decoderbase.cpp" line="1151"/>
+         <source>TT Menu</source>
+         <comment>Teletext Menu</comment>
+         <translation>TT Menu</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/decoderbase.cpp" line="1144"/>
++        <location filename="../libs/libmythtv/decoderbase.cpp" line="1153"/>
+         <source>Text</source>
+         <comment>Text stream</comment>
+         <translation>Text</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/decoderbase.cpp" line="1146"/>
++        <location filename="../libs/libmythtv/decoderbase.cpp" line="1155"/>
+         <source>TXT File</source>
+         <comment>Text File</comment>
+         <translation>TXT File</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/decoderbase.cpp" line="1182"/>
++        <location filename="../libs/libmythtv/decoderbase.cpp" line="1191"/>
+         <source>Audio Description</source>
+         <comment>On-screen events described for the visually impaired</comment>
+         <translation>Audio Description</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/decoderbase.cpp" line="1186"/>
++        <location filename="../libs/libmythtv/decoderbase.cpp" line="1195"/>
+         <source>Clean Effects</source>
+         <comment>No dialog, background audio only</comment>
+         <translation>Clean Effects</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/decoderbase.cpp" line="1190"/>
++        <location filename="../libs/libmythtv/decoderbase.cpp" line="1199"/>
+         <source>Hearing Impaired</source>
+         <comment>Clear dialog for the hearing impaired</comment>
+         <translation>Hearing Impaired</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/decoderbase.cpp" line="1194"/>
++        <location filename="../libs/libmythtv/decoderbase.cpp" line="1203"/>
+         <source>Spoken Subtitles</source>
+         <comment>Subtitles are read out for the visually impaired</comment>
+         <translation>Spoken Subtitles</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/decoderbase.cpp" line="1198"/>
++        <location filename="../libs/libmythtv/decoderbase.cpp" line="1207"/>
+         <source>Commentary</source>
+         <comment>Director/Cast commentary track</comment>
+         <translation>Commentary</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/decoderbase.cpp" line="1202"/>
++        <location filename="../libs/libmythtv/decoderbase.cpp" line="1211"/>
+         <source>Normal</source>
+         <comment>Ordinary audio track</comment>
          <translation>Normal</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="228"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="561"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="230"/>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="207"/>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="271"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="243"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="558"/>
-         <location filename="../libs/libmythtv/videoouttypes.h" line="207"/>
-         <location filename="../libs/libmythtv/videoouttypes.h" line="271"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="205"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="266"/>
          <source>Off</source>
          <translation>Off</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="227"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="560"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="229"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="242"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="557"/>
          <source>On</source>
          <translation>On</translation>
@@ -14962,7 +18244,7 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="349"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="504"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="505"/>
          <source>Password</source>
          <translation>Password</translation>
      </message>
@@ -14977,175 +18259,183 @@
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythcontext.cpp" line="163"/>
-+        <location filename="../libs/libmyth/mythcontext.cpp" line="185"/>
++        <location filename="../libs/libmyth/mythcontext.cpp" line="189"/>
          <source>Could not find specified tuner (%1).</source>
          <translation>Could not find specified tuner (%1).</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythcontext.cpp" line="166"/>
-+        <location filename="../libs/libmyth/mythcontext.cpp" line="188"/>
++        <location filename="../libs/libmyth/mythcontext.cpp" line="192"/>
          <source>Specified tuner (%1) is already in use.</source>
          <translation>Specified tuner (%1) is already in use.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythcontext.cpp" line="171"/>
-+        <location filename="../libs/libmyth/mythcontext.cpp" line="193"/>
++        <location filename="../libs/libmyth/mythcontext.cpp" line="197"/>
          <source>All tuners are currently in use. If you want to watch TV, you can cancel one of the in-progress recordings from the delete menu</source>
 -        <translation>All tuners are currently in use. If you want to watch TV, you can cancel one of the in-progress recordings from the delete menu</translation>
 +        <translation>All tuners are currently in use. If you want to watch TV, you can cancel one of the in-progress recordings from the delete menu.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythcontext.cpp" line="191"/>
-+        <location filename="../libs/libmyth/mythcontext.cpp" line="213"/>
++        <location filename="../libs/libmyth/mythcontext.cpp" line="217"/>
          <source>Failed to configure plugin</source>
 -        <translation>Failed to configure plugin</translation>
 +        <translation>Failed to Configure Plugin</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythcontext.cpp" line="203"/>
-+        <location filename="../libs/libmyth/mythcontext.cpp" line="225"/>
++        <location filename="../libs/libmyth/mythcontext.cpp" line="229"/>
          <source>Plugin failure</source>
 -        <translation>Plugin failure</translation>
 +        <translation>Plugin Failure</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythcontext.cpp" line="205"/>
-+        <location filename="../libs/libmyth/mythcontext.cpp" line="227"/>
++        <location filename="../libs/libmyth/mythcontext.cpp" line="231"/>
          <source>%1 failed to run for some reason</source>
          <translation>%1 failed to run for some reason</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythcontext.cpp" line="385"/>
-+        <location filename="../libs/libmyth/mythcontext.cpp" line="462"/>
++        <location filename="../libs/libmyth/mythcontext.cpp" line="467"/>
          <source>No UPnP backends found</source>
          <comment>Backend Setup</comment>
          <translation>No UPnP backends found</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythcontext.cpp" line="700"/>
-+        <location filename="../libs/libmyth/mythcontext.cpp" line="991"/>
++        <location filename="../libs/libmyth/mythcontext.cpp" line="1050"/>
          <source>Cannot find (ping) database host %1 on the network</source>
          <comment>Backend Setup</comment>
          <translation>Cannot find (ping) database host %1 on the network</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythcontext.cpp" line="715"/>
-+        <location filename="../libs/libmyth/mythcontext.cpp" line="1000"/>
++        <location filename="../libs/libmyth/mythcontext.cpp" line="1059"/>
          <source>Cannot login to database</source>
          <comment>Backend Setup</comment>
          <translation>Cannot login to database</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythcontext.cpp" line="1038"/>
-+        <location filename="../libs/libmyth/mythcontext.cpp" line="1005"/>
++        <location filename="../libs/libmyth/mythcontext.cpp" line="1064"/>
 +        <source>Cannot connect to backend</source>
 +        <comment>Backend Setup</comment>
 +        <translation>Cannot connect to backend</translation>
 +    </message>
 +    <message>
-+        <location filename="../libs/libmyth/mythcontext.cpp" line="1361"/>
++        <location filename="../libs/libmyth/mythcontext.cpp" line="1420"/>
          <source>Could not connect to master backend</source>
 -        <translation>Could not connect to master backend</translation>
 +        <translation>Could Not Connect to Master Backend</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythcontext.cpp" line="1053"/>
-+        <location filename="../libs/libmyth/mythcontext.cpp" line="1376"/>
++        <location filename="../libs/libmyth/mythcontext.cpp" line="1435"/>
          <source>Backend is online</source>
 -        <translation>Backend is online</translation>
 +        <translation>Backend is Online</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythcontext.cpp" line="1134"/>
-+        <location filename="../libs/libmyth/mythcontext.cpp" line="1542"/>
++        <location filename="../libs/libmyth/mythcontext.cpp" line="1602"/>
          <source>This application is not compatible with the installed MythTV libraries.</source>
          <translation>This application is not compatible with the installed MythTV libraries.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythcontext.cpp" line="1029"/>
-+        <location filename="../libs/libmyth/mythcontext.cpp" line="1352"/>
++        <location filename="../libs/libmyth/mythcontext.cpp" line="1411"/>
          <source>The connection to the master backend server has gone away for some reason. Is it running?</source>
          <translation>The connection to the master backend server has gone away for some reason. Is it running?</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythcontext.cpp" line="1033"/>
-+        <location filename="../libs/libmyth/mythcontext.cpp" line="1356"/>
++        <location filename="../libs/libmyth/mythcontext.cpp" line="1415"/>
          <source>Could not connect to the master backend server. Is it running?  Is the IP address set for it in mythtv-setup correct?</source>
          <translation>Could not connect to the master backend server. Is it running?  Is the IP address set for it in mythtv-setup correct?</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/mythcontext.cpp" line="1067"/>
-+        <location filename="../libs/libmyth/mythcontext.cpp" line="1390"/>
++        <location filename="../libs/libmyth/mythcontext.cpp" line="1449"/>
          <source>The server uses network protocol version %1, but this client only understands version %2.  Make sure you are running compatible versions of the backend and frontend.</source>
 -        <translation>The server uses network protocol version %1, but this client only understands version %2.  Make sure you are running compatible versions of the backend and frontend.</translation>
 +        <translation>The server uses network protocol version %1, but this client only understands version %2. Make sure you are running compatible versions of the backend and frontend.</translation>
      </message>
      <message>
-         <location filename="../libs/libmyth/mythdialogs.cpp" line="716"/>
+-        <location filename="../libs/libmyth/mythdialogs.cpp" line="716"/>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1436"/>
 -        <location filename="../programs/mythfrontend/viewschedulediff.cpp" line="144"/>
-+        <location filename="../programs/mythfrontend/viewschedulediff.cpp" line="147"/>
++        <location filename="../libs/libmyth/mythdialogs.cpp" line="709"/>
++        <location filename="../programs/mythfrontend/viewschedulediff.cpp" line="142"/>
          <source>OK</source>
          <translation>OK</translation>
      </message>
      <message>
-         <location filename="../libs/libmyth/mythdialogs.cpp" line="837"/>
+-        <location filename="../libs/libmyth/mythdialogs.cpp" line="837"/>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1437"/>
++        <location filename="../libs/libmyth/mythdialogs.cpp" line="828"/>
          <source>Cancel</source>
          <translation>Cancel</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="1743"/>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="1747"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="1757"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="1761"/>
-         <location filename="../programs/mythfrontend/programrecpriority.cpp" line="125"/>
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="125"/>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2421"/>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2459"/>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2476"/>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2497"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2422"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2460"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2477"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2498"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="1934"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="1938"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="114"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2399"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2437"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2454"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2475"/>
          <source>Default</source>
          <translation>Default</translation>
      </message>
      <message>
          <location filename="../libs/libmyth/recordingtypes.cpp" line="228"/>
 -        <location filename="../libs/libmythtv/avformatdecoder.cpp" line="4127"/>
-+        <location filename="../libs/libmythtv/avformatdecoder.cpp" line="4139"/>
++        <location filename="../libs/libmythtv/avformatdecoder.cpp" line="4500"/>
          <source>Subtitle</source>
          <translation>Subtitle</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/avformatdecoder.cpp" line="4079"/>
-+        <location filename="../libs/libmythtv/avformatdecoder.cpp" line="4091"/>
++        <location filename="../libs/libmythtv/avformatdecoder.cpp" line="3791"/>
++        <source>Video Decode Error</source>
++        <translation>Video Decode Error</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/avformatdecoder.cpp" line="4450"/>
          <source> (forced)</source>
          <translation> (forced)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/cardutil.cpp" line="986"/>
-+        <location filename="../libs/libmythtv/cardutil.cpp" line="1035"/>
++        <location filename="../libs/libmythtv/cardutil.cpp" line="1185"/>
          <source>Input %1:%2</source>
          <translation>Input %1:%2</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/cardutil.cpp" line="1563"/>
-+        <location filename="../libs/libmythtv/cardutil.cpp" line="1623"/>
++        <location filename="../libs/libmythtv/cardutil.cpp" line="1737"/>
          <source>Could not query inputs.</source>
          <translation>Could not query inputs.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/cardutil.cpp" line="1594"/>
-+        <location filename="../libs/libmythtv/cardutil.cpp" line="1654"/>
++        <location filename="../libs/libmythtv/cardutil.cpp" line="1768"/>
          <source>ERROR, Compile with V4L support to query inputs</source>
 -        <translation>ERROR, Compile with V4L support to query inputs</translation>
 +        <translation>ERROR, Compile with V4L support to query inputs.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/cardutil.cpp" line="1626"/>
-+        <location filename="../libs/libmythtv/cardutil.cpp" line="1686"/>
++        <location filename="../libs/libmythtv/cardutil.cpp" line="1800"/>
          <source>ERROR, Compile with V4L support to query audio inputs</source>
 -        <translation>ERROR, Compile with V4L support to query audio inputs</translation>
 +        <translation>ERROR, Compile with V4L support to query audio inputs.</translation>
@@ -15153,166 +18443,198 @@
      <message>
 -        <location filename="../libs/libmythtv/cardutil.cpp" line="1691"/>
 -        <location filename="../libs/libmythtv/cardutil.cpp" line="1724"/>
-+        <location filename="../libs/libmythtv/cardutil.cpp" line="1751"/>
-+        <location filename="../libs/libmythtv/cardutil.cpp" line="1784"/>
++        <location filename="../libs/libmythtv/cardutil.cpp" line="1865"/>
++        <location filename="../libs/libmythtv/cardutil.cpp" line="1898"/>
          <source>Could not open &apos;%1&apos; to probe its inputs.</source>
          <translation>Could not open &apos;%1&apos; to probe its inputs.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/cardutil.cpp" line="1761"/>
-+        <location filename="../libs/libmythtv/cardutil.cpp" line="1821"/>
++        <location filename="../libs/libmythtv/cardutil.cpp" line="1935"/>
          <source>ERROR, Compile with DVB support to query inputs</source>
 -        <translation>ERROR, Compile with DVB support to query inputs</translation>
 +        <translation>ERROR, Compile with DVB support to query inputs.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/cardutil.cpp" line="2160"/>
-+        <location filename="../libs/libmythtv/cardutil.cpp" line="2242"/>
++        <location filename="../libs/libmythtv/cardutil.cpp" line="2348"/>
          <source>The VBox software version is too old (%1), we require %2</source>
          <translation>The VBox software version is too old (%1), we require %2</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/cardutil.cpp" line="2087"/>
 -        <location filename="../libs/libmythtv/cardutil.cpp" line="2145"/>
-+        <location filename="../libs/libmythtv/cardutil.cpp" line="2169"/>
-+        <location filename="../libs/libmythtv/cardutil.cpp" line="2227"/>
++        <location filename="../libs/libmythtv/cardutil.cpp" line="2276"/>
++        <location filename="../libs/libmythtv/cardutil.cpp" line="2333"/>
          <source>Unable to connect to device.</source>
          <translation>Unable to connect to device.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/cardutil.cpp" line="2101"/>
-+        <location filename="../libs/libmythtv/cardutil.cpp" line="2183"/>
++        <location filename="../libs/libmythtv/cardutil.cpp" line="2289"/>
          <source>Invalid Device ID</source>
          <translation>Invalid Device ID</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/cardutil.cpp" line="2111"/>
-+        <location filename="../libs/libmythtv/cardutil.cpp" line="2193"/>
++        <location filename="../libs/libmythtv/cardutil.cpp" line="2299"/>
          <source>Invalid Device ID or address.</source>
 -        <translation>Invalid Device ID or address.</translation>
 +        <translation>Invalid Device ID or Address</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/cardutil.cpp" line="2126"/>
-+        <location filename="../libs/libmythtv/cardutil.cpp" line="2208"/>
++        <location filename="../libs/libmythtv/cardutil.cpp" line="2314"/>
          <source>, firmware: %2</source>
          <translation>, firmware: %2</translation>
      </message>
-@@ -16518,13 +17110,13 @@
+@@ -16518,94 +16664,94 @@
          <translation>Sports</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="1831"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="1845"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="2022"/>
          <source>Video</source>
          <translation>Video</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2012"/>
 -        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2319"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2024"/>
-+        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2328"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2020"/>
++        <location filename="../programs/mythfrontend/guidegrid.cpp" line="2324"/>
          <source>All Channels</source>
          <translation>All Channels</translation>
      </message>
-@@ -16541,12 +17133,12 @@
      <message>
-         <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="293"/>
+-        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="267"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="264"/>
+         <source>Updated Channel %1</source>
+         <translation>Updated Channel %1</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="292"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="289"/>
+         <source>Added Channel %1</source>
+         <translation>Added Channel %1</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="293"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="290"/>
          <source>Failed to add channel %1</source>
 -        <translation>Failed to add channel %1</translation>
 +        <translation>Failed to Add Channel %1</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="619"/>
+-        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="619"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="638"/>
          <source>%1 -- Testing decryption of program %2</source>
 -        <translation>%1 -- Testing decryption of program %2</translation>
 +        <translation>%1 -- Testing Decryption of Program %2</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="895"/>
-@@ -16556,7 +17148,7 @@
+-        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="895"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="915"/>
+         <source>Program %1</source>
+         <translation>Program %1</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="896"/>
+-        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="896"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="916"/>
          <source>Unknown decryption status</source>
 -        <translation>Unknown decryption status</translation>
 +        <translation>Unknown Decryption Status</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="898"/>
-@@ -16571,41 +17163,41 @@
+-        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="898"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="918"/>
+         <source>Encrypted</source>
+         <translation>Encrypted</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="900"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="920"/>
+         <source>Decrypted</source>
+         <translation>Decrypted</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="935"/>
+-        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="935"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="955"/>
          <source>%1 -- Timed out</source>
 -        <translation>%1 -- Timed out</translation>
 +        <translation>%1 -- Timed Out</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="970"/>
+-        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="970"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="990"/>
          <source>%1 possible channels</source>
 -        <translation>%1 possible channels</translation>
 +        <translation>%1 Possible Channels</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="971"/>
+-        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="971"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="991"/>
          <source>no channels</source>
 -        <translation>no channels</translation>
 +        <translation>No Channels</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="982"/>
+-        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="982"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="1002"/>
          <source>%1, no signal</source>
 -        <translation>%1, no signal</translation>
 +        <translation>%1, No Signal</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="987"/>
+-        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="987"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="1007"/>
          <source>%1 -- Found %2 probable channels</source>
 -        <translation>%1 -- Found %2 probable channels</translation>
 +        <translation>%1 -- Found %2 Probable Channels</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="1170"/>
+-        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="1170"/>
 -        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="1736"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="1743"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="1190"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="1798"/>
          <source> offset %2</source>
          <translation> offset %2</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="1740"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="1747"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="1802"/>
          <source>ScanTransport Tuning to %1 mplexid(%2)</source>
          <translation>ScanTransport Tuning to %1 mplexid(%2)</translation>
      </message>
      <message numerus="yes">
 -        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="1754"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="1761"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="1816"/>
          <source>: Found %n</source>
          <translation>
              <numerusform>: Found %n</numerusform>
-@@ -16613,28 +17205,28 @@
+@@ -16613,28 +16759,28 @@
          </translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="2016"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="2023"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="2076"/>
          <source>Frequency %1</source>
          <translation>Frequency %1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="2079"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="2086"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="2139"/>
          <source>ATSC Channel %1</source>
          <translation>ATSC Channel %1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="2174"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="2181"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="2234"/>
          <source>as</source>
          <translation>as</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="2179"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="2186"/>
++        <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="2239"/>
          <source>Skipping %1, not in imported channel map</source>
 -        <translation>Skipping %1, not in imported channel map</translation>
 +        <translation>Skipping %1, Not in Imported Channel Map</translation>
@@ -15320,11 +18642,11 @@
      <message>
          <location filename="../libs/libmythtv/channelscan/frequencytablesetting.cpp" line="38"/>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1276"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1318"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1333"/>
          <source>Broadcast</source>
          <translation>Broadcast</translation>
      </message>
-@@ -16648,7 +17240,7 @@
+@@ -16648,7 +16794,7 @@
          <location filename="../libs/libmythtv/channelscan/frequencytablesetting.cpp" line="40"/>
          <location filename="../libs/libmythtv/channelscan/frequencytablesetting.cpp" line="42"/>
          <location filename="../libs/libmythtv/channelscan/frequencytablesetting.cpp" line="44"/>
@@ -15333,20 +18655,41 @@
          <source>High</source>
          <translation>High</translation>
      </message>
-@@ -16758,9 +17350,9 @@
+@@ -16758,775 +16904,741 @@
          <translation>France</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="143"/>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="154"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="455"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="144"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="155"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="157"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="168"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="445"/>
          <source>Frequency</source>
          <translation>Frequency</translation>
      </message>
-@@ -16785,30 +17377,30 @@
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="308"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="302"/>
+         <source>Contrast</source>
+         <translation>Contrast</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="306"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="300"/>
+         <source>Brightness</source>
+         <translation>Brightness</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="310"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="304"/>
+         <source>Color</source>
+         <translation>Color</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="312"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="306"/>
+         <source>Hue</source>
          <translation>Hue</translation>
      </message>
      <message>
@@ -15381,7 +18724,17 @@
          <source>Analog</source>
          <translation>Analog</translation>
      </message>
-@@ -16824,532 +17416,523 @@
+     <message>
+-        <location filename="../libs/libmythtv/teletextscreen.cpp" line="652"/>
++        <location filename="../libs/libmythtv/teletextscreen.cpp" line="654"/>
+         <source>Page Not Available</source>
+         <comment>Requested Teletext page not available</comment>
+         <translation>Page Not Available</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/playercontext.cpp" line="783"/>
++        <location filename="../libs/libmythtv/playercontext.cpp" line="788"/>
+         <source>Play</source>
          <translation>Play</translation>
      </message>
      <message>
@@ -15400,7 +18753,7 @@
      <message>
          <location filename="../libs/libmythtv/recordingprofile.cpp" line="76"/>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="569"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="551"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="566"/>
          <source>Codec</source>
          <translation>Codec</translation>
      </message>
@@ -15447,7 +18800,7 @@
 +        <location filename="../libs/libmythtv/recordingprofile.cpp" line="243"/>
 +        <location filename="../libs/libmythtv/recordingprofile.cpp" line="271"/>
 +        <location filename="../libs/libmythtv/recordingprofile.cpp" line="299"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1057"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1077"/>
          <source>Bitrate</source>
          <translation>Bitrate</translation>
      </message>
@@ -15514,19 +18867,19 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="580"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="563"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="578"/>
          <source>RTjpeg Quality</source>
          <translation>RTjpeg Quality</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="582"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="565"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="580"/>
          <source>Higher is better quality.</source>
          <translation>Higher is better quality.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="593"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="576"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="591"/>
          <source>Luma filter</source>
 -        <translation>Luma filter</translation>
 +        <translation>Luma Filter</translation>
@@ -15534,28 +18887,28 @@
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="595"/>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="608"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="578"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="591"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="593"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="606"/>
          <source>Lower is better.</source>
          <translation>Lower is better.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="606"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="589"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="604"/>
          <source>Chroma filter</source>
 -        <translation>Chroma filter</translation>
 +        <translation>Chroma Filter</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="633"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="616"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="631"/>
          <source>Scale bitrate for frame size</source>
 -        <translation>Scale bitrate for frame size</translation>
 +        <translation>Scale Bitrate for Frame Size</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="648"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="631"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="646"/>
          <source>Minimum quality</source>
 -        <translation>Minimum quality</translation>
 +        <translation>Minimum Quality</translation>
@@ -15564,77 +18917,77 @@
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="650"/>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="664"/>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="679"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="633"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="647"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="648"/>
 +        <location filename="../libs/libmythtv/recordingprofile.cpp" line="662"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="677"/>
          <source>Modifying the default may have severe consequences.</source>
          <translation>Modifying the default may have severe consequences.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="662"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="645"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="660"/>
          <source>Maximum quality</source>
 -        <translation>Maximum quality</translation>
 +        <translation>Maximum Quality</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="677"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="660"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="675"/>
          <source>Max quality difference between frames</source>
 -        <translation>Max quality difference between frames</translation>
 +        <translation>Max Quality Difference Between Frames</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="691"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="674"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="689"/>
          <source>Enable interlaced DCT encoding</source>
 -        <translation>Enable interlaced DCT encoding</translation>
 +        <translation>Enable Interlaced DCT Encoding</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="707"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="690"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="705"/>
          <source>Enable interlaced motion estimation</source>
 -        <translation>Enable interlaced motion estimation</translation>
 +        <translation>Enable Interlaced Motion Estimation</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="723"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="706"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="721"/>
          <source>Enable high-quality encoding</source>
 -        <translation>Enable high-quality encoding</translation>
 +        <translation>Enable High-quality Encoding</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="738"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="721"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="736"/>
          <source>Enable 4MV encoding</source>
 -        <translation>Enable 4MV encoding</translation>
 +        <translation>Enable 4MV Encoding</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="740"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="723"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="738"/>
          <source>If set, the MPEG4 encoder will use &apos;4MV&apos; motion-vector encoding.  This requires much more processing, but can result in better video. It is highly recommended that the HQ option is enabled if 4MV is enabled.</source>
 -        <translation>If set, the MPEG4 encoder will use &apos;4MV&apos; motion-vector encoding.  This requires much more processing, but can result in better video. It is highly recommended that the HQ option is enabled if 4MV is enabled.</translation>
 +        <translation>If set, the MPEG4 encoder will use &apos;4MV&apos; motion-vector encoding. This requires much more processing, but can result in better video. It is highly recommended that the HQ option is enabled if 4MV is enabled.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="756"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="739"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="754"/>
          <source>Number of threads</source>
 -        <translation>Number of threads</translation>
 +        <translation>Number of Threads</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="759"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="742"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="757"/>
          <source>Threads to use for software encoding.</source>
          <translation>Threads to use for software encoding.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="760"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="743"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="758"/>
          <source>Set to a value less than or equal to the number of processors on the backend that will be doing the encoding.</source>
          <translation>Set to a value less than or equal to the number of processors on the backend that will be doing the encoding.</translation>
      </message>
@@ -15672,285 +19025,286 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="619"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="602"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="617"/>
          <source>Bitrate (kb/s)</source>
          <translation>Bitrate (kb/s)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="621"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="604"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="619"/>
          <source>Bitrate in kilobits/second. As a guide, 2200 kb/s is approximately 1 GB/hr.</source>
          <translation>Bitrate in kilobits/second. As a guide, 2200 kb/s is approximately 1 GB/hr.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="635"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="618"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="633"/>
          <source>If set, the bitrate specified will be used for 640x480. If other resolutions are used, the bitrate will be scaled appropriately.</source>
          <translation>If set, the bitrate specified will be used for 640x480. If other resolutions are used, the bitrate will be scaled appropriately.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="693"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="676"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="691"/>
          <source>If set, the MPEG4 encoder will use interlaced DCT encoding. You may want this when encoding interlaced video; however, this is experimental and may cause damaged video.</source>
          <translation>If set, the MPEG4 encoder will use interlaced DCT encoding. You may want this when encoding interlaced video; however, this is experimental and may cause damaged video.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="709"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="692"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="707"/>
          <source>If set, the MPEG4 encoder will use interlaced motion estimation. You may want this when encoding interlaced video; however, this is experimental and may cause damaged video.</source>
          <translation>If set, the MPEG4 encoder will use interlaced motion estimation. You may want this when encoding interlaced video; however, this is experimental and may cause damaged video.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="725"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="708"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="723"/>
          <source>If set, the MPEG4 encoder will use &apos;high-quality&apos; encoding options. This requires much more processing, but can result in better video.</source>
          <translation>If set, the MPEG4 encoder will use &apos;high-quality&apos; encoding options. This requires much more processing, but can result in better video.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="778"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="761"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="776"/>
          <source>Avg. Bitrate (kb/s)</source>
          <translation>Avg. Bitrate (kb/s)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="781"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="764"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="779"/>
          <source>Average bitrate in kilobits/second. As a guide, 2200 kb/s is approximately 1 GB/hour.</source>
          <translation>Average bitrate in kilobits/second. As a guide, 2200 kb/s is approximately 1 GB/hour.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="799"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="782"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="797"/>
          <source>Max. Bitrate (kb/s)</source>
          <translation>Max. Bitrate (kb/s)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="802"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="785"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="800"/>
          <source>Maximum bitrate in kilobits/second. As a guide, 2200 kb/s is approximately 1 GB/hour.</source>
          <translation>Maximum bitrate in kilobits/second. As a guide, 2200 kb/s is approximately 1 GB/hour.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="817"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="800"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="815"/>
          <source>Stream Type</source>
          <translation>Stream Type</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="828"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="811"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="826"/>
          <source>Sets the type of stream generated by your PVR.</source>
          <translation>Sets the type of stream generated by your PVR.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="843"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="826"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="841"/>
          <source>Aspect Ratio</source>
          <translation>Aspect Ratio</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="845"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="828"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="843"/>
          <source>Square</source>
          <translation>Square</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="852"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="835"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="850"/>
          <source>Sets the aspect ratio of stream generated by your PVR.</source>
          <translation>Sets the aspect ratio of stream generated by your PVR.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="864"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="847"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="862"/>
          <source>Quality</source>
          <translation>Quality</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="877"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="860"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="875"/>
          <source>Horizontal Decimation</source>
          <translation>Horizontal Decimation</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="892"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="875"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="890"/>
          <source>Vertical Decimation</source>
          <translation>Vertical Decimation</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="910"/>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="912"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="890"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="905"/>
          <source>Video Compression</source>
          <translation>Video Compression</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="920"/>
-         <source>RTjpeg Parameters</source>
+-        <source>RTjpeg Parameters</source>
 -        <translation>RTjpeg Parameters</translation>
-+        <translation type="vanished">RTjpeg Parameters</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="928"/>
-         <source>MPEG-4 Parameters</source>
+-        <source>MPEG-4 Parameters</source>
 -        <translation>MPEG-4 Parameters</translation>
-+        <translation type="vanished">MPEG-4 Parameters</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="952"/>
-         <source>MPEG-2 Parameters</source>
+-        <source>MPEG-2 Parameters</source>
 -        <translation>MPEG-2 Parameters</translation>
-+        <translation type="vanished">MPEG-2 Parameters</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="966"/>
-         <source>Hardware MJPEG Parameters</source>
+-        <source>Hardware MJPEG Parameters</source>
 -        <translation>Hardware MJPEG Parameters</translation>
-+        <translation type="vanished">Hardware MJPEG Parameters</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="974"/>
-         <source>MPEG-2 Hardware Encoder</source>
+-        <source>MPEG-2 Hardware Encoder</source>
 -        <translation>MPEG-2 Hardware Encoder</translation>
-+        <translation type="vanished">MPEG-2 Hardware Encoder</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="983"/>
-         <source>MPEG-4 AVC Hardware Encoder</source>
+-        <source>MPEG-4 AVC Hardware Encoder</source>
 -        <translation>MPEG-4 AVC Hardware Encoder</translation>
-+        <translation type="vanished">MPEG-4 AVC Hardware Encoder</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="986"/>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1077"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="941"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1031"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="956"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1049"/>
          <source>Low Resolution</source>
          <translation>Low Resolution</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="994"/>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1085"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="949"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1039"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="964"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1058"/>
          <source>Medium Resolution</source>
          <translation>Medium Resolution</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1002"/>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1093"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="957"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1047"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="972"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1067"/>
          <source>High Resolution</source>
          <translation>High Resolution</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1211"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1165"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1184"/>
          <source>Enable auto-transcode after recording</source>
 -        <translation>Enable auto-transcode after recording</translation>
 +        <translation>Enable Auto-transcode After Recording</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1213"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1167"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1186"/>
          <source>Automatically transcode when a recording is made using this profile and the recording&apos;s schedule is configured to allow transcoding.</source>
          <translation>Automatically transcode when a recording is made using this profile and the recording&apos;s schedule is configured to allow transcoding.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1226"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1180"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1199"/>
          <source>Resize video while transcoding</source>
 -        <translation>Resize video while transcoding</translation>
 +        <translation>Resize Video While Transcoding</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1281"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1235"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1254"/>
          <source>If set, extra files will be created for each recording with the name of the recording followed by &apos;.ts.raw&apos;. These extra files represent the full contents of the transport stream used to generate the recording. (For debugging purposes)</source>
          <translation>If set, extra files will be created for each recording with the name of the recording followed by &apos;.ts.raw&apos;. These extra files represent the full contents of the transport stream used to generate the recording. (For debugging purposes)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1301"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1255"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1274"/>
          <source>Custom filters</source>
 -        <translation>Custom filters</translation>
 +        <translation>Custom Filters</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1228"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1182"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1201"/>
          <source>Allows the transcoder to resize the video during transcoding.</source>
          <translation>Allows the transcoder to resize the video during transcoding.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1240"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1194"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1213"/>
          <source>Lossless transcoding</source>
 -        <translation>Lossless transcoding</translation>
 +        <translation>Lossless Transcoding</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1242"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1196"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1215"/>
          <source>Only reencode where absolutely needed (normally only around cutpoints).  Otherwise keep audio and video formats identical to the source.  This should result in the highest quality, but won&apos;t save as much space.</source>
 -        <translation>Only reencode where absolutely needed (normally only around cutpoints).  Otherwise keep audio and video formats identical to the source.  This should result in the highest quality, but won&apos;t save as much space.</translation>
 +        <translation>Only re-encode where absolutely needed (normally only around cutpoints). Otherwise keep audio and video formats identical to the source. This should result in the highest quality, but won&apos;t save as much space.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1257"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1211"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1230"/>
          <source>Recording Type</source>
          <translation>Recording Type</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1259"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1213"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1232"/>
          <source>This option allows you to filter out unwanted streams. &apos;Normal&apos; will record all relevant streams including interactive television data. &apos;TV Only&apos; will record only audio, video and subtitle streams. </source>
          <translation>This option allows you to filter out unwanted streams. &apos;Normal&apos; will record all relevant streams including interactive television data. &apos;TV Only&apos; will record only audio, video and subtitle streams. </translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1266"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1220"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1239"/>
          <source>Normal</source>
          <translation>Normal</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1267"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1221"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1240"/>
          <source>TV Only</source>
          <translation>TV Only</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1268"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1222"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1241"/>
          <source>Audio Only</source>
          <translation>Audio Only</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1279"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1233"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1252"/>
          <source>Record Full TS?</source>
          <translation>Record Full TS?</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1302"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1256"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1275"/>
          <source>Filters used when transcoding with this profile. This value must be blank to perform lossless transcoding.  Format: [[&lt;filter&gt;=&lt;options&gt;,]...]</source>
 -        <translation>Filters used when transcoding with this profile. This value must be blank to perform lossless transcoding.  Format: [[&lt;filter&gt;=&lt;options&gt;,]...]</translation>
 +        <translation>Filters used when transcoding with this profile. This value must be blank to perform lossless transcoding. Format: [[&lt;filter&gt;=&lt;options&gt;,]...]</translation>
      </message>
      <message>
-         <location filename="../libs/libmyth/settings.cpp" line="805"/>
+-        <location filename="../libs/libmyth/settings.cpp" line="805"/>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="226"/>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="239"/>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="251"/>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="304"/>
--        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="319"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="241"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="254"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="266"/>
+         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="319"/>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="332"/>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="374"/>
--        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1321"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="334"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="347"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="389"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1294"/>
+         <location filename="../libs/libmythtv/recordingprofile.cpp" line="1321"/>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1348"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="559"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="573"/>
@@ -15958,15 +19312,6 @@
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="646"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="662"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="676"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="228"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="241"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="253"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="306"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="321"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="334"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="376"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1275"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1302"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="556"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="570"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="583"/>
@@ -15974,89 +19319,88 @@
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="659"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="673"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="718"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2291"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2314"/>
          <source>Auto</source>
          <translation>Auto</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1324"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1278"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1297"/>
          <source>Width</source>
          <translation>Width</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1328"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1282"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1301"/>
          <source>If the width is set to &apos;Auto&apos;, the width will be calculated based on the height and the recording&apos;s physical aspect ratio.</source>
          <translation>If the width is set to &apos;Auto&apos;, the width will be calculated based on the height and the recording&apos;s physical aspect ratio.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1331"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1285"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1304"/>
          <source>Width to use for encoding. Note: PVR-x50 cards may produce ghosting if this is not set to 720 or 768 for NTSC and PAL, respectively.</source>
          <translation>Width to use for encoding. Note: PVR-x50 cards may produce ghosting if this is not set to 720 or 768 for NTSC and PAL, respectively.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1351"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1305"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1324"/>
          <source>Height</source>
          <translation>Height</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1355"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1309"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1328"/>
          <source>If the height is set to &apos;Auto&apos;, the height will be calculated based on the width and the recording&apos;s physical aspect ratio.</source>
          <translation>If the height is set to &apos;Auto&apos;, the height will be calculated based on the width and the recording&apos;s physical aspect ratio.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1358"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1312"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1331"/>
          <source>Height to use for encoding. Note: PVR-x50 cards may produce ghosting if this is not set to 480 or 576 for NTSC and PAL, respectively.</source>
          <translation>Height to use for encoding. Note: PVR-x50 cards may produce ghosting if this is not set to 480 or 576 for NTSC and PAL, respectively.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1374"/>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1376"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1324"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1343"/>
          <source>Image size</source>
          <translation>Image size</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1465"/>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1467"/>
-         <source>Profile</source>
+-        <source>Profile</source>
 -        <translation>Profile</translation>
-+        <translation type="vanished">Profile</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1887"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1753"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1774"/>
          <source>Autodetect</source>
          <translation>Autodetect</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1902"/>
 -        <location filename="../programs/mythtranscode/transcode.cpp" line="104"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1769"/>
-+        <location filename="../programs/mythtranscode/transcode.cpp" line="109"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1790"/>
++        <location filename="../programs/mythtranscode/transcode.cpp" line="111"/>
          <source>Autodetect from %1</source>
          <translation>Autodetect from %1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1952"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1829"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1850"/>
          <source>Transcode using Autodetect</source>
          <translation>Transcode using Autodetect</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1965"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1842"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1863"/>
          <source>Transcode using &quot;%1&quot;</source>
          <translation>Transcode using &quot;%1&quot;</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1971"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1848"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1869"/>
          <source>Record using the &quot;%1&quot; profile</source>
          <translation>Record using the &quot;%1&quot; profile</translation>
      </message>
@@ -16068,25 +19412,24 @@
 +        <translation>Profile Name</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/programrecpriority.cpp" line="123"/>
-@@ -17357,410 +17940,418 @@
+-        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="123"/>
++        <location filename="../programs/mythfrontend/programrecpriority.cpp" line="112"/>
+         <source>Default (Template)</source>
          <translation>Default (Template)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="91"/>
-         <source>This section lists each transport that MythTV currently knows about. The display fields are video source, modulation, frequency, and when relevant symbol rate, network id, and transport id.</source>
+-        <source>This section lists each transport that MythTV currently knows about. The display fields are video source, modulation, frequency, and when relevant symbol rate, network id, and transport id.</source>
 -        <translation>This section lists each transport that MythTV currently knows about. The display fields are video source, modulation, frequency, and when relevant symbol rate, network id, and transport id.</translation>
-+        <translation type="vanished">This section lists each transport that MythTV currently knows about. The display fields are video source, modulation, frequency, and when relevant symbol rate, network id, and transport id.</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="185"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="210"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="241"/>
-         <source>Transport Editor</source>
+-        <source>Transport Editor</source>
 -        <translation>Transport Editor</translation>
-+        <translation type="vanished">Transport Editor</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="186"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="98"/>
          <source>Sorry, the Transport Editor can only be used to edit transports which are connected to a card input.</source>
@@ -16185,6 +19528,11 @@
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="165"/>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="187"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="468"/>
++        <location filename="../libs/libmythtv/transporteditor.cpp" line="701"/>
++        <source>Modulation System (Default: DVB-S)</source>
++        <translation>Modulation System (Default: DVB-S)</translation>
++    </message>
++    <message>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="702"/>
 +        <source>DVB-S</source>
 +        <translation>DVB-S</translation>
@@ -16195,8 +19543,8 @@
 +        <translation>DVB-S2</translation>
 +    </message>
 +    <message>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="166"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="189"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="179"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="202"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="458"/>
          <source>Symbol Rate</source>
          <translation>Symbol Rate</translation>
@@ -16204,7 +19552,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="207"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="491"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="209"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="222"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="481"/>
          <source>Polarity</source>
          <translation>Polarity</translation>
@@ -16212,7 +19560,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="208"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="492"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="210"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="223"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="482"/>
          <source>Polarity (Option has no default)</source>
          <translation>Polarity (Option has no default)</translation>
@@ -16220,7 +19568,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="209"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="493"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="211"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="224"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="483"/>
          <source>Horizontal</source>
          <translation>Horizontal</translation>
@@ -16228,7 +19576,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="210"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="494"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="212"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="225"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="484"/>
          <source>Vertical</source>
          <translation>Vertical</translation>
@@ -16236,7 +19584,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="211"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="495"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="213"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="226"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="485"/>
          <source>Right Circular</source>
          <translation>Right Circular</translation>
@@ -16244,7 +19592,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="212"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="496"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="214"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="227"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="486"/>
          <source>Left Circular</source>
          <translation>Left Circular</translation>
@@ -16270,7 +19618,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="221"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="555"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="223"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="236"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="552"/>
          <source>Inversion</source>
          <translation>Inversion</translation>
@@ -16278,7 +19626,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="222"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="556"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="224"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="237"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="553"/>
          <source>Inversion (Default: Auto):
  Most cards can autodetect this now, so leave it at Auto unless it won&apos;t work.</source>
@@ -16288,7 +19636,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="237"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="571"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="239"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="252"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="568"/>
          <source>Bandwidth</source>
          <translation>Bandwidth</translation>
@@ -16299,82 +19647,43 @@
          <source>Bandwidth (Default: Auto)</source>
          <translation>Bandwidth (Default: Auto)</translation>
      </message>
+@@ -17543,7 +17655,7 @@
      <message>
--        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="57"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="58"/>
-         <source>Ignore Signal Timeout</source>
-         <translation>Ignore Signal Timeout</translation>
-     </message>
-     <message>
--        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="59"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="60"/>
-         <source>This option allows you to slow down the scan for broken drivers, such as the DVB drivers for the Leadtek LR6650 DVB card.</source>
-         <translation>This option allows you to slow down the scan for broken drivers, such as the DVB drivers for the Leadtek LR6650 DVB card.</translation>
-     </message>
-     <message>
--        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="70"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="71"/>
+         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="70"/>
          <source>Search new Transports</source>
 -        <translation>Search new Transports</translation>
 +        <translation>Search New Transports</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="72"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="73"/>
-         <source>Digital transmissions may signal other available Transports. If this option is enabled the scanner scans all signaled transports for new/updated channels.</source>
-         <translation>Digital transmissions may signal other available Transports. If this option is enabled the scanner scans all signaled transports for new/updated channels.</translation>
-     </message>
-     <message>
--        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="84"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="85"/>
-         <source>Desired Services</source>
-         <translation>Desired Services</translation>
-     </message>
-     <message>
--        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="90"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="91"/>
-         <source>TV</source>
-         <translation>TV</translation>
-     </message>
-     <message>
--        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="91"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="92"/>
-         <source>TV+Radio</source>
-         <translation>TV+Radio</translation>
-     </message>
-     <message>
--        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="85"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="86"/>
-         <source>TV - Adds A/V services only, TV+Radio - Adds all services with audio, All - Adds all services (including data only services).</source>
-         <translation>TV - Adds A/V services only, TV+Radio - Adds all services with audio, All - Adds all services (including data only services).</translation>
-     </message>
-     <message>
--        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="115"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="116"/>
-         <source>Unencrypted Only</source>
-         <translation>Unencrypted Only</translation>
-     </message>
-     <message>
--        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="117"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="118"/>
-         <source>If set, only non-encrypted channels will be added during the scan.</source>
+         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="72"/>
+@@ -17581,653 +17693,802 @@
          <translation>If set, only non-encrypted channels will be added during the scan.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="128"/>
 +        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="129"/>
++        <source>Add full Transport Stream channels</source>
++        <translation>Add Full Transport Stream Channels</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="131"/>
++        <source>If set, Create MPTS channels, which allow recording of the full, unaltered, transport stream.</source>
++        <translation>If set, Create MPTS channels, which allow recording of the full, unaltered, transport stream.</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="142"/>
          <source>Test Decryptability</source>
          <translation>Test Decryptability</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="130"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="131"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="144"/>
          <source>Test all channels to see if they can be decrypted with installed CAM/smartcard. Sometimes the encrypted flag is set spuriously. Attention: Enabling this option increases the scan time for each encrypted channel by a couple of seconds.</source>
          <translation>Test all channels to see if they can be decrypted with installed CAM/smartcard. Sometimes the encrypted flag is set spuriously. Attention: Enabling this option increases the scan time for each encrypted channel by a couple of seconds.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="144"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="145"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="158"/>
          <source>Frequency (Option has no default)
  The frequency for this channel in kHz.</source>
          <translation>Frequency (Option has no default)
@@ -16382,7 +19691,7 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="155"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="156"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="169"/>
          <source>Frequency (Option has no default)
  The frequency for this channel in Hz.</source>
          <translation>Frequency (Option has no default)
@@ -16390,7 +19699,7 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="167"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="168"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="181"/>
          <source>Symbol Rate (symbols/second).
  Most DVB-S transponders transmit at 27.5 million symbols per second.</source>
          <translation>Symbol Rate (symbols/second).
@@ -16398,7 +19707,7 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="189"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="191"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="204"/>
          <source>Symbol Rate (symbols/second).
  Most DVB-C transports transmit at 6.9 or 6.875 million symbols per second.</source>
          <translation>Symbol Rate (symbols/second).
@@ -16406,7 +19715,7 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="238"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="240"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="253"/>
          <source>Bandwidth (Default: Auto)
  </source>
          <translation>Bandwidth (Default: Auto)</translation>
@@ -16414,7 +19723,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="240"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="574"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="242"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="255"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="571"/>
          <source>6 MHz</source>
          <translation>6 MHz</translation>
@@ -16422,7 +19731,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="241"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="575"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="243"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="256"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="572"/>
          <source>7 MHz</source>
          <translation>7 MHz</translation>
@@ -16430,7 +19739,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="242"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="576"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="244"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="257"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="573"/>
          <source>8 MHz</source>
          <translation>8 MHz</translation>
@@ -16442,21 +19751,22 @@
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="587"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="677"/>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="704"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="254"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="335"/>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="301"/>
+-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2298"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="267"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="348"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="584"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="674"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="895"/>
-         <location filename="../libs/libmythtv/videoouttypes.h" line="301"/>
--        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2298"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2299"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="918"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="295"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2276"/>
          <source>None</source>
          <translation>None</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="271"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="607"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="273"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="286"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="604"/>
          <source>FEC</source>
          <translation>FEC</translation>
@@ -16464,7 +19774,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="272"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="608"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="274"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="287"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="605"/>
          <source>Forward Error Correction (Default: Auto)</source>
          <translation>Forward Error Correction (Default: Auto)</translation>
@@ -16472,7 +19782,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="282"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="620"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="284"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="297"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="617"/>
          <source>LP Coderate</source>
          <translation>LP Coderate</translation>
@@ -16480,7 +19790,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="283"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="621"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="285"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="298"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="618"/>
          <source>Low Priority Code Rate (Default: Auto)</source>
          <translation>Low Priority Code Rate (Default: Auto)</translation>
@@ -16488,7 +19798,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="292"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="633"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="294"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="307"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="630"/>
          <source>HP Coderate</source>
          <translation>HP Coderate</translation>
@@ -16496,7 +19806,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="293"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="634"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="295"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="308"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="631"/>
          <source>High Priority Code Rate (Default: Auto)</source>
          <translation>High Priority Code Rate (Default: Auto)</translation>
@@ -16504,7 +19814,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="302"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="644"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="304"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="317"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="641"/>
          <source>Guard Interval</source>
          <translation>Guard Interval</translation>
@@ -16512,7 +19822,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="303"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="645"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="305"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="318"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="642"/>
          <source>Guard Interval (Default: Auto)</source>
          <translation>Guard Interval (Default: Auto)</translation>
@@ -16520,7 +19830,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="317"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="660"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="319"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="332"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="657"/>
          <source>Trans. Mode</source>
          <translation>Trans. Mode</translation>
@@ -16528,7 +19838,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="318"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="661"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="320"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="333"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="658"/>
          <source>Transmission Mode (Default: Auto)</source>
          <translation>Transmission Mode (Default: Auto)</translation>
@@ -16536,7 +19846,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="330"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="674"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="332"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="345"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="671"/>
          <source>Hierarchy</source>
          <translation>Hierarchy</translation>
@@ -16544,7 +19854,7 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="331"/>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="675"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="333"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="346"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="672"/>
          <source>Hierarchy (Default: Auto)</source>
          <translation>Hierarchy (Default: Auto)</translation>
@@ -16552,644 +19862,945 @@
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="345"/>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="357"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="347"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="359"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="360"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="372"/>
          <source>Mod Sys</source>
          <translation>Mod Sys</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="346"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="348"/>
-+        <location filename="../libs/libmythtv/transporteditor.cpp" line="701"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="361"/>
          <source>Modulation system (Default: DVB-S)</source>
 -        <translation>Modulation system (Default: DVB-S)</translation>
 +        <translation>Modulation System (Default: DVB-S)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="358"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="360"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="373"/>
          <source>Modulation system (Default: DVB-T)</source>
 -        <translation>Modulation system (Default: DVB-T)</translation>
 +        <translation>Modulation System (Default: DVB-T)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="369"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="371"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="384"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="713"/>
          <source>Roll-off</source>
          <translation>Roll-off</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="370"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="372"/>
++        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="385"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="714"/>
          <source>Roll-off factor (Default: 0.35)</source>
          <translation>Roll-off factor (Default: 0.35)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="710"/>
-         <source>Transport Options</source>
+-        <source>Transport Options</source>
 -        <translation>Transport Options</translation>
-+        <translation type="vanished">Transport Options</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="799"/>
-         <source>DVB Transport</source>
+-        <source>DVB Transport</source>
 -        <translation>DVB Transport</translation>
-+        <translation type="vanished">DVB Transport</translation>
+-    </message>
+-    <message>
+-        <location filename="../libs/libmythtv/tv.cpp" line="55"/>
++        <location filename="../libs/libmythtv/tv.cpp" line="54"/>
+         <source>(CH)</source>
+         <translation>(CH)</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/tv.cpp" line="56"/>
++        <location filename="../libs/libmythtv/tv.cpp" line="55"/>
+         <source>(REC)</source>
+         <translation>(REC)</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/tv.cpp" line="70"/>
++        <location filename="../libs/libmythtv/tv.cpp" line="66"/>
+         <source>Adjust Playback</source>
+         <translation>Adjust Playback</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/tv.cpp" line="55"/>
-@@ -17786,448 +18377,464 @@
+-        <location filename="../libs/libmythtv/tv.cpp" line="71"/>
+-        <location filename="../libs/libmythtv/tv.cpp" line="72"/>
++        <location filename="../libs/libmythtv/tv.cpp" line="67"/>
++        <location filename="../libs/libmythtv/tv.cpp" line="68"/>
+         <source>Adjust Recorder</source>
+         <translation>Adjust Recorder</translation>
+     </message>
      <message>
-         <location filename="../libs/libmythtv/tv.cpp" line="85"/>
+-        <location filename="../libs/libmythtv/tv.cpp" line="85"/>
++        <location filename="../libs/libmythtv/tv.cpp" line="78"/>
          <source>Auto-Skip OFF</source>
 -        <translation>Auto-Skip OFF</translation>
 +        <translation>Auto-skip Off</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/tv.cpp" line="86"/>
+-        <location filename="../libs/libmythtv/tv.cpp" line="86"/>
++        <location filename="../libs/libmythtv/tv.cpp" line="79"/>
          <source>Auto-Skip ON</source>
 -        <translation>Auto-Skip ON</translation>
 +        <translation>Auto-skip On</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/tv.cpp" line="87"/>
+-        <location filename="../libs/libmythtv/tv.cpp" line="87"/>
++        <location filename="../libs/libmythtv/tv.cpp" line="80"/>
          <source>Auto-Skip Notify</source>
 -        <translation>Auto-Skip Notify</translation>
 +        <translation>Auto-skip Notify</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_rec.cpp" line="3731"/>
-+        <location filename="../libs/libmythtv/tv_rec.cpp" line="3703"/>
++        <location filename="../libs/libmythtv/tv_rec.cpp" line="3728"/>
          <source>On known multiplex...</source>
 -        <translation>On known multiplex...</translation>
 +        <translation>On Known Multiplex...</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tvremoteutil.cpp" line="467"/>
-+        <location filename="../libs/libmythtv/tvremoteutil.cpp" line="456"/>
++        <location filename="../libs/libmythtv/tvremoteutil.cpp" line="476"/>
          <source>Error querying recorder state</source>
 -        <translation>Error querying recorder state</translation>
 +        <translation>Error Querying Recorder State</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="641"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="827"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="840"/>
          <source>Standard</source>
          <translation>Standard</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="642"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="828"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="841"/>
          <source>Mac hardware acceleration</source>
 -        <translation>Mac hardware acceleration</translation>
 +        <translation>Mac Hardware Acceleration</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="643"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="829"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="842"/>
          <source>NVidia VDPAU acceleration</source>
 -        <translation>NVidia VDPAU acceleration</translation>
 +        <translation>NVidia VDPAU Acceleration</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="669"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="855"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="868"/>
          <source>Standard will use ffmpeg library.</source>
          <translation>Standard will use ffmpeg library.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="672"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="858"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="871"/>
          <source>Mac hardware will try to use the graphics processor - this may hang or crash your Mac!</source>
          <translation>Mac hardware will try to use the graphics processor - this may hang or crash your Mac!</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="677"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="863"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="876"/>
          <source>VDPAU will attempt to use the graphics hardware to accelerate video decoding and playback.</source>
          <translation>VDPAU will attempt to use the graphics hardware to accelerate video decoding and playback.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="688"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="874"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="887"/>
          <source>VAAPI will attempt to use the graphics hardware to accelerate video decoding. REQUIRES OPENGL PAINTER.</source>
          <translation>VAAPI will attempt to use the graphics hardware to accelerate video decoding. REQUIRES OPENGL PAINTER.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="706"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="897"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="920"/>
          <source>Linear blend</source>
 -        <translation>Linear blend</translation>
 +        <translation>Linear Blend</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="708"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="899"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="922"/>
          <source>Kernel</source>
          <translation>Kernel</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="710"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="901"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="924"/>
          <source>Kernel (2x)</source>
          <translation>Kernel (2x)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="712"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="903"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="926"/>
          <source>Greedy HighMotion</source>
          <translation>Greedy HighMotion</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="714"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="905"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="928"/>
          <source>Greedy HighMotion (2x)</source>
          <translation>Greedy HighMotion (2x)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="716"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="907"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="930"/>
          <source>Yadif</source>
          <translation>Yadif</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="718"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="909"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="932"/>
          <source>Yadif (2x)</source>
          <translation>Yadif (2x)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="720"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="911"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="934"/>
          <source>Bob (2x)</source>
          <translation>Bob (2x)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="722"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="913"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="936"/>
          <source>One field</source>
 -        <translation>One field</translation>
 +        <translation>One Field</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="724"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="915"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="938"/>
          <source>Interlaced (2x)</source>
          <translation>Interlaced (2x)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="726"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="917"/>
-         <source>Linear blend (HW)</source>
+-        <source>Linear blend (HW)</source>
 -        <translation>Linear blend (HW)</translation>
-+        <translation>Linear Blend (HW)</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="728"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="919"/>
-         <source>Kernel (HW)</source>
-         <translation>Kernel (HW)</translation>
-     </message>
-     <message>
+-        <source>Kernel (HW)</source>
+-        <translation>Kernel (HW)</translation>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="730"/>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="742"/>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="754"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="921"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="933"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="945"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="956"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="968"/>
          <source>Bob (2x, HW)</source>
          <translation>Bob (2x, HW)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="732"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="923"/>
-         <source>One field (HW)</source>
+-        <source>One field (HW)</source>
 -        <translation>One field (HW)</translation>
-+        <translation>One Field (HW)</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="734"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="925"/>
-         <source>Kernel (2x, HW)</source>
-         <translation>Kernel (2x, HW)</translation>
-     </message>
-     <message>
+-        <source>Kernel (2x, HW)</source>
+-        <translation>Kernel (2x, HW)</translation>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="736"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="927"/>
-         <source>Linear blend (2x, HW)</source>
+-        <source>Linear blend (2x, HW)</source>
 -        <translation>Linear blend (2x, HW)</translation>
-+        <translation>Linear Blend (2x, HW)</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1253"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1456"/>
-         <source>This video renderer uses OpenGL for scaling and color conversion. It uses faster OpenGL functionality when available but at the expense of picture controls and GPU based deinterlacing.</source>
-         <translation>This video renderer uses OpenGL for scaling and color conversion. It uses faster OpenGL functionality when available but at the expense of picture controls and GPU based deinterlacing.</translation>
-     </message>
-     <message>
+-        <source>This video renderer uses OpenGL for scaling and color conversion. It uses faster OpenGL functionality when available but at the expense of picture controls and GPU based deinterlacing.</source>
+-        <translation>This video renderer uses OpenGL for scaling and color conversion. It uses faster OpenGL functionality when available but at the expense of picture controls and GPU based deinterlacing.</translation>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1340"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1543"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1683"/>
          <source>This deinterlacer attempts to synchronize with interlaced displays whose size and refresh rate exactly match the video source. It has low CPU requirements.</source>
          <translation>This deinterlacer attempts to synchronize with interlaced displays whose size and refresh rate exactly match the video source. It has low CPU requirements.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1033"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1224"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1306"/>
          <source>High Quality</source>
          <comment>Sample: high quality</comment>
          <translation>High Quality</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1043"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1234"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1317"/>
          <source>Normal</source>
          <comment>Sample: average quality</comment>
          <translation>Normal</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1053"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1244"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1328"/>
          <source>Slim</source>
          <comment>Sample: low CPU usage</comment>
          <translation>Slim</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1066"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1257"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1341"/>
          <source>VDPAU High Quality</source>
          <comment>Sample: VDPAU high quality</comment>
          <translation>VDPAU High Quality</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1074"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1265"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1350"/>
          <source>VDPAU Normal</source>
          <comment>Sample: VDPAU average quality</comment>
          <translation>VDPAU Normal</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1086"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1277"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1363"/>
          <source>VDPAU Slim</source>
          <comment>Sample: VDPAU low power GPU</comment>
          <translation>VDPAU Slim</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1208"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1411"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1483"/>
++        <source>MediaCodec Normal</source>
++        <comment>Sample: MediaCodec Normal</comment>
++        <translation>MediaCodec Normal</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1496"/>
++        <source>VAAPI2 Normal</source>
++        <comment>Sample: VAAPI2 Normal</comment>
++        <translation>VAAPI2 Normal</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1523"/>
          <source>Video rendering method</source>
 -        <translation>Video rendering method</translation>
 +        <translation>Video Rendering Method</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1215"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1418"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1530"/>
          <source>Render video offscreen. Used internally.</source>
          <translation>Render video offscreen. Used internally.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1219"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1422"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1534"/>
          <source>Use X11 pixel copy to render video. This is not recommended if any other option is available. The video will not be scaled to fit the screen. This will work with all X11 servers, local and remote.</source>
          <translation>Use X11 pixel copy to render video. This is not recommended if any other option is available. The video will not be scaled to fit the screen. This will work with all X11 servers, local and remote.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1226"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1429"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1541"/>
          <source>Use X11 shared memory pixel transfer to render video. This is only recommended over the X11 pixel copy renderer. The video will not be scaled to fit the screen. This works with most local X11 servers.</source>
          <translation>Use X11 shared memory pixel transfer to render video. This is only recommended over the X11 pixel copy renderer. The video will not be scaled to fit the screen. This works with most local X11 servers.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1233"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1436"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1548"/>
          <source>This is the standard video renderer for X11 systems. It uses XVideo hardware assist for scaling, color conversion. If the hardware offers picture controls the renderer supports them.</source>
          <translation>This is the standard video renderer for X11 systems. It uses XVideo hardware assist for scaling, color conversion. If the hardware offers picture controls the renderer supports them.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1239"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1442"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1554"/>
          <source>Windows video renderer based on Direct3D. Requires video card compatible with Direct3D 9. This is the preferred renderer for current Windows systems.</source>
          <translation>Windows video renderer based on Direct3D. Requires video card compatible with Direct3D 9. This is the preferred renderer for current Windows systems.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="738"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="929"/>
-         <source>Interlaced (2x, HW)</source>
-         <translation>Interlaced (2x, HW)</translation>
-     </message>
-     <message>
+-        <source>Interlaced (2x, HW)</source>
+-        <translation>Interlaced (2x, HW)</translation>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="644"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="830"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="843"/>
          <source>VAAPI acceleration</source>
 -        <translation>VAAPI acceleration</translation>
 +        <translation>VAAPI Acceleration</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="645"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="831"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="844"/>
          <source>Windows hardware acceleration</source>
 -        <translation>Windows hardware acceleration</translation>
 +        <translation>Windows Hardware Acceleration</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="646"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="832"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="845"/>
          <source>Mac VDA hardware acceleration</source>
 -        <translation>Mac VDA hardware acceleration</translation>
 +        <translation>Mac VDA Hardware Acceleration</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="846"/>
++        <source>Android MediaCodec decoder</source>
++        <translation>Android MediaCodec Decoder</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="847"/>
++        <source>VAAPI2 acceleration</source>
++        <translation>VAAPI2 Acceleration</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="661"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="847"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="860"/>
          <source>Processing method used to decode video.</source>
          <translation>Processing method used to decode video.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="682"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="868"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="881"/>
          <source>DXVA2 will use the graphics hardware to accelerate video decoding and playback (requires Windows Vista or later).</source>
          <translation>DXVA2 will use the graphics hardware to accelerate video decoding and playback (requires Windows Vista or later).</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="693"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="879"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="892"/>
          <source>VDA will attempt to use the graphics hardware to accelerate video decoding. (H264 only, requires Mac OS 10.6.3)</source>
          <translation>VDA will attempt to use the graphics hardware to accelerate video decoding. (H264 only, requires Mac OS 10.6.3)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="740"/>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="752"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="885"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="898"/>
 +        <source>Openmax will use the graphics hardware to accelerate video decoding on Raspberry Pi. </source>
 +        <translation>Openmax will use the graphics hardware to accelerate video decoding on Raspberry Pi. </translation>
 +    </message>
 +    <message>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="931"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="943"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="903"/>
++        <source>Mediacodec will use the graphics hardware to accelerate video decoding on Android. </source>
++        <translation>Mediacodec will use the graphics hardware to accelerate video decoding on Android.</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="908"/>
++        <source>VAAPI2 is a new implementation of VAAPI to will use the graphics hardware to accelerate video decoding on Intel CPUs. </source>
++        <translation>VAAPI2 is a new implementation of VAAPI to will use the graphics hardware to accelerate video decoding on Intel CPUs.</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="940"/>
++        <source>Linear blend (HW-GL)</source>
++        <translation>Linear Blend (HW-GL)</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="942"/>
++        <source>Kernel (HW-GL)</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="944"/>
++        <source>Bob (2x, HW-GL)</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="946"/>
++        <source>One field (HW-GL)</source>
++        <translation>One Field (HW-GL)</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="948"/>
++        <source>Kernel (2x, HW-GL)</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="950"/>
++        <source>Linear blend (2x, HW-GL)</source>
++        <translation>Linear Blend (2x, HW-GL)</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="952"/>
++        <source>Interlaced (2x, HW-GL)</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="954"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="966"/>
          <source>One Field (1x, HW)</source>
          <translation>One Field (1x, HW)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="744"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="935"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="958"/>
          <source>Temporal (1x, HW)</source>
          <translation>Temporal (1x, HW)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="746"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="937"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="960"/>
          <source>Temporal (2x, HW)</source>
          <translation>Temporal (2x, HW)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="748"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="939"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="962"/>
          <source>Advanced (1x, HW)</source>
          <translation>Advanced (1x, HW)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="750"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="941"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="964"/>
          <source>Advanced (2x, HW)</source>
          <translation>Advanced (2x, HW)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="757"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="948"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="971"/>
          <source>Advanced (HW)</source>
          <translation>Advanced (HW)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="759"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="950"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="973"/>
          <source>Fast (HW)</source>
          <translation>Fast (HW)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="761"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="952"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="975"/>
          <source>Line double (HW)</source>
 -        <translation>Line double (HW)</translation>
 +        <translation>Line Double (HW)</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="979"/>
++        <source>Advanced (HW-VA)</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="981"/>
++        <source>Bob (HW-VA)</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="983"/>
++        <source>Weave (HW-VA)</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="985"/>
++        <source>Motion Adaptive (HW-VA)</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="987"/>
++        <source>Motion Compensated (HW-VA)</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="989"/>
++        <source>Advanced (2x, HW-VA)</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="991"/>
++        <source>Bob (2x, HW-VA)</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="993"/>
++        <source>Weave (2x, HW-VA)</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="995"/>
++        <source>Motion Adaptive (2x, HW-VA)</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="997"/>
++        <source>Motion Compensated (2x, HW-VA)</source>
++        <translation></translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1097"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1288"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1374"/>
          <source>VDA High Quality</source>
          <comment>Sample: VDA high quality</comment>
          <translation>VDA High Quality</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1109"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1300"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1387"/>
          <source>VDA Normal</source>
          <comment>Sample: VDA average quality</comment>
          <translation>VDA Normal</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1121"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1312"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1400"/>
          <source>VDA Slim</source>
          <comment>Sample: VDA low power GPU</comment>
          <translation>VDA Slim</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1136"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1327"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1415"/>
          <source>OpenGL High Quality</source>
          <comment>Sample: OpenGL high quality</comment>
          <translation>OpenGL High Quality</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1144"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1335"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1425"/>
          <source>OpenGL Normal</source>
          <comment>Sample: OpenGL average quality</comment>
          <translation>OpenGL Normal</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1152"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1343"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1434"/>
          <source>OpenGL Slim</source>
          <comment>Sample: OpenGL low power GPU</comment>
          <translation>OpenGL Slim</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1163"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1354"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1445"/>
          <source>VAAPI Normal</source>
          <comment>Sample: VAAPI average quality</comment>
          <translation>VAAPI Normal</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1178"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1371"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1461"/>
 +        <source>OpenMAX High Quality</source>
 +        <comment>Sample: OpenMAX High Quality</comment>
 +        <translation>OpenMAX High Quality</translation>
 +    </message>
 +    <message>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1380"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1472"/>
          <source>OpenMAX Normal</source>
          <comment>Sample: OpenMAX Normal</comment>
          <translation>OpenMAX Normal</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1246"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1449"/>
-         <source>This video renderer uses OpenGL for scaling and color conversion with full picture controls. The GPU can be used for deinterlacing. This requires a faster GPU than XVideo.</source>
-         <translation>This video renderer uses OpenGL for scaling and color conversion with full picture controls. The GPU can be used for deinterlacing. This requires a faster GPU than XVideo.</translation>
+-        <source>This video renderer uses OpenGL for scaling and color conversion with full picture controls. The GPU can be used for deinterlacing. This requires a faster GPU than XVideo.</source>
+-        <translation>This video renderer uses OpenGL for scaling and color conversion with full picture controls. The GPU can be used for deinterlacing. This requires a faster GPU than XVideo.</translation>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1561"/>
++        <source>Video is converted to an intermediate format by the CPU (UYVY) before OpenGL is used for color conversion, scaling, picture controls and optionally deinterlacing. Processing is balanced between the CPUand GPU.</source>
++        <translation>Video is converted to an intermediate format by the CPU (UYVY) before OpenGL is used for color conversion, scaling, picture controls and optionally deinterlacing. Processing is balanced between the CPU and GPU.</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1569"/>
++        <source>OpenGL is used for scaling and color conversion. It uses faster OpenGL functionality when available but at the expense of picture controls and GPU based deinterlacing.</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1576"/>
++        <source>OpenGL is used for all color conversion, scaling, picture controls and optionally deinterlacing. CPU load is low but a more powerful GPU is needed for deinterlacing.</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1584"/>
++        <source>This renderer uses a higher quality CPU conversion for interlaced content before using OpenGL for color conversion, scaling, picture controls and optionally deinterlacing. CPU load is higher particularly on embedded systems.</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1593"/>
++        <source>All video processing is performed by the CPU. OpenGL is used for display only. Does not support picture controls or GPU deinterlacing. Requires a significantly faster CPU.</source>
++        <translation></translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1260"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1463"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1601"/>
          <source>This is the only video renderer for NVidia VDPAU decoding.</source>
          <translation>This is the only video renderer for NVidia VDPAU decoding.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1266"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1469"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1607"/>
          <source>This video renderer uses VAAPI for video decoding and OpenGL for scaling and color conversion.</source>
          <translation>This video renderer uses VAAPI for video decoding and OpenGL for scaling and color conversion.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1302"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1505"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1641"/>
          <source>This deinterlacer requires the display to be capable of twice the frame rate as the source video.</source>
          <translation>This deinterlacer requires the display to be capable of twice the frame rate as the source video.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1307"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1510"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1646"/>
          <source>Perform no deinterlacing.</source>
          <translation>Perform no deinterlacing.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1308"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1511"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1647"/>
          <source>Use this with an interlaced display whose resolution exactly matches the video size. This is incompatible with MythTV zoom modes.</source>
          <translation>Use this with an interlaced display whose resolution exactly matches the video size. This is incompatible with MythTV zoom modes.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1313"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1516"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1652"/>
          <source>Shows only one of the two fields in the frame. This looks good when displaying a high motion 1080i video on a 720p display.</source>
          <translation>Shows only one of the two fields in the frame. This looks good when displaying a high motion 1080i video on a 720p display.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1318"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1521"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1657"/>
          <source>Shows one field of the frame followed by the other field displaced vertically.</source>
          <translation>Shows one field of the frame followed by the other field displaced vertically.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1323"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1526"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1662"/>
          <source>Blends the odd and even fields linearly into one frame.</source>
          <translation>Blends the odd and even fields linearly into one frame.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1326"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1529"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1665"/>
          <source>This filter disables deinterlacing when the two fields are similar, and performs linear deinterlacing otherwise.</source>
          <translation>This filter disables deinterlacing when the two fields are similar, and performs linear deinterlacing otherwise.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1330"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1533"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1669"/>
          <source>(Hardware Accelerated)</source>
          <translation>(Hardware Accelerated)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1332"/>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1336"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1535"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1539"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1671"/>
++        <source>(VAAPI Hardware Accelerated)</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1673"/>
++        <source>(OpenGL Hardware Accelerated)</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1675"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1679"/>
          <source>This deinterlacer uses several fields to reduce motion blur. It has increased CPU requirements.</source>
          <translation>This deinterlacer uses several fields to reduce motion blur. It has increased CPU requirements.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1345"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1548"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1688"/>
          <source>This deinterlacer uses several fields to reduce motion blur. </source>
          <translation>This deinterlacer uses several fields to reduce motion blur. </translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1348"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1551"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1691"/>
          <source>This deinterlacer uses multiple fields to reduce motion blur and smooth edges. </source>
          <translation>This deinterlacer uses multiple fields to reduce motion blur and smooth edges. </translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1405"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1608"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1695"/>
++        <source>Use the most advanced hardware deinterlacing algorithm available. </source>
++        <translation>Use the most advanced hardware deinterlacing algorithm available.</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1698"/>
++        <source>Use the weave deinterlacing algorithm. </source>
++        <translation>Use the weave deinterlacing algorithm.</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1701"/>
++        <source>Use the motion adaptive deinterlacing algorithm. </source>
++        <translation>Use the motion adaptive deinterlacing algorithm.</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1704"/>
++        <source>Use the motion compensated deinterlacing algorithm. </source>
++        <translation>Use the motion compensated deinterlacing algorithm.</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1781"/>
          <source>&apos;%1&apos; has not been documented yet.</source>
          <translation>&apos;%1&apos; has not been documented yet.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1427"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1630"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1801"/>
          <source>OSD rendering method</source>
 -        <translation>OSD rendering method</translation>
 +        <translation>OSD Rendering Method</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1433"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1636"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1807"/>
          <source>Render the OSD using the XVideo chromakey feature.This renderer does not alpha blend but is the fastest OSD renderer for XVideo.</source>
          <translation>Render the OSD using the XVideo chromakey feature.This renderer does not alpha blend but is the fastest OSD renderer for XVideo.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1437"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1640"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1811"/>
          <source>Note: nVidia hardware after the 5xxx series does not have XVideo chromakey support.</source>
          <translation>Note: nVidia hardware after the 5xxx series does not have XVideo chromakey support.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1444"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1647"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1818"/>
          <source>Software OSD rendering uses your CPU to alpha blend the OSD.</source>
          <translation>Software OSD rendering uses your CPU to alpha blend the OSD.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1450"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1653"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1824"/>
          <source>Uses OpenGL to alpha blend the OSD onto the video.</source>
          <translation>Uses OpenGL to alpha blend the OSD onto the video.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1457"/>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1659"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1830"/>
 +        <source>Uses OpenGL in a separate thread to overlay the OSD onto the video.</source>
 +        <translation>Use OpenGL in a separate thread to overlay the OSD onto the video.</translation>
 +    </message>
 +    <message>
-+        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1666"/>
++        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1837"/>
          <source>Uses OpenMAX to alpha blend the OSD onto the video.</source>
          <translation>Uses OpenMAX to alpha blend the OSD onto the video.</translation>
      </message>
-@@ -18388,217 +18995,240 @@
+@@ -18288,317 +18549,336 @@
+         <translation>Progressive</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="194"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="193"/>
+         <source>Top Left</source>
+         <translation>Top Left</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="195"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="194"/>
+         <source>Bottom Left</source>
+         <translation>Bottom Left</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="196"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="195"/>
+         <source>Top Right</source>
+         <translation>Top Right</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="197"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="196"/>
+         <source>Bottom Right</source>
+         <translation>Bottom Right</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="210"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="208"/>
+         <source>4:3</source>
+         <translation>4:3</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="211"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="209"/>
+         <source>14:9</source>
+         <translation>14:9</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="212"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="210"/>
+         <source>16:9</source>
+         <translation>16:9</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="213"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="211"/>
+         <source>2.35:1</source>
+         <translation>2.35:1</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="225"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="222"/>
+         <source>Black</source>
+         <translation>Black</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="228"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="225"/>
+         <source>Gray</source>
+         <translation>Gray</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="274"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="269"/>
+         <source>Half</source>
+         <translation>Half</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="275"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="270"/>
+         <source>Full</source>
+         <translation>Full</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="277"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="272"/>
+         <source>H.Stretch</source>
+         <translation>H.Stretch</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="279"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="274"/>
+         <source>V.Stretch</source>
+         <translation>V.Stretch</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="281"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="276"/>
+         <source>V.Fill</source>
+         <translation>V.Fill</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="283"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="278"/>
+         <source>H.Fill</source>
+         <translation>H.Fill</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="288"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="283"/>
+         <source>Auto Detect (Default Off)</source>
+         <translation>Auto Detect (Default Off)</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="291"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="286"/>
+         <source>Auto Detect (Default Half)</source>
+         <translation>Auto Detect (Default Half)</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="314"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="308"/>
+         <source>Studio Levels</source>
+         <translation>Studio Levels</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videoouttypes.h" line="316"/>
++        <location filename="../libs/libmythtv/videoouttypes.h" line="310"/>
+         <source>Volume</source>
          <translation>Volume</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="130"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="139"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="142"/>
          <source>Max recordings</source>
 -        <translation>Max recordings</translation>
 +        <translation>Max Recordings</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="202"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="230"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="232"/>
          <source>Listings grabber</source>
 -        <translation>Listings grabber</translation>
 +        <translation>Listings Grabber</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="213"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="369"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="371"/>
          <source>Network ID</source>
          <translation>Network ID</translation>
      </message>
@@ -17197,8 +20808,8 @@
 -        <location filename="../libs/libmythtv/videosource.cpp" line="226"/>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="241"/>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="170"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="382"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="397"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="384"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="398"/>
 +        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="243"/>
          <source>Channel frequency table</source>
 -        <translation>Channel frequency table</translation>
@@ -17206,137 +20817,129 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="232"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="388"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="390"/>
          <source>Use default unless this source uses a different frequency table than the system wide table defined in the General settings.</source>
          <translation>Use default unless this source uses a different frequency table than the system wide table defined in the General settings.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="337"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="493"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="494"/>
          <source>User ID</source>
          <translation>User ID</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="505"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="661"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="662"/>
          <source>Use only the transmitted guide data.</source>
          <translation>Use only the transmitted guide data.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="509"/>
-         <source>This will usually only work with ATSC or DVB channels,</source>
+-        <source>This will usually only work with ATSC or DVB channels,</source>
 -        <translation>This will usually only work with ATSC or DVB channels,</translation>
-+        <translation type="vanished">This will usually only work with ATSC or DVB channels,</translation>
++        <location filename="../libs/libmythtv/videosource.cpp" line="684"/>
++        <source>Do not configure a grabber</source>
++        <translation>Do Not Configure a Grabber</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="513"/>
-         <source>and generally provides data only for the next few days.</source>
+-        <source>and generally provides data only for the next few days.</source>
 -        <translation>and generally provides data only for the next few days.</translation>
-+        <translation type="vanished">and generally provides data only for the next few days.</translation>
++        <location filename="../libs/libmythtv/videosource.cpp" line="244"/>
++        <source>North America (SchedulesDirect.org) (Internal)</source>
++        <translation>North America (SchedulesDirect.org) (Internal)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="533"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="683"/>
-         <source>Do not configure a grabber</source>
+-        <source>Do not configure a grabber</source>
 -        <translation>Do not configure a grabber</translation>
-+        <translation>Do Not Configure a Grabber</translation>
++        <location filename="../libs/libmythtv/videosource.cpp" line="145"/>
++        <source>Maximum number of simultaneous recordings MythTV will attempt using this device.  If set to a value other than 1, MythTV can sometimes record multiple programs on the same multiplex or overlapping copies of the same program on a single channel.</source>
++        <translation>Maximum number of simultaneous recordings MythTV will attempt using this device. If set to a value other than 1, MythTV can sometimes record multiple programs on the same multiplex or overlapping copies of the same program on a single channel.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="564"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="242"/>
-         <source>North America (SchedulesDirect.org) (Internal)</source>
-         <translation>North America (SchedulesDirect.org) (Internal)</translation>
+-        <source>North America (SchedulesDirect.org) (Internal)</source>
+-        <translation>North America (SchedulesDirect.org) (Internal)</translation>
++        <location filename="../libs/libmythtv/videosource.cpp" line="161"/>
++        <source>Schedule as group</source>
++        <translation>Schedule as Group</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="568"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="142"/>
-+        <source>Maximum number of simultaneous recordings MythTV will attempt using this device.  If set to a value other than 1, MythTV can sometimes record multiple programs on the same multiplex or overlapping copies of the same program on a single channel.</source>
-+        <translation>Maximum number of simultaneous recordings MythTV will attempt using this device. If set to a value other than 1, MythTV can sometimes record multiple programs on the same multiplex or overlapping copies of the same program on a single channel.</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="158"/>
-+        <source>Schedule as group</source>
-+        <translation>Schedule as Group</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="161"/>
-+        <source>Schedule all virtual inputs on this device as a group.  This is more efficient than scheduling each input individually, but can result in scheduling more simultaneous recordings than is allowed.  Be sure to set the maximum number of simultaneous recordings above high enough to handle all expected cases.</source>
-+        <translation>Schedule all virtual inputs on this device as a group. This is more efficient than scheduling each input individually, but can result in scheduling more simultaneous recordings than is allowed. Be sure to set the maximum number of simultaneous recordings above high enough to handle all expected cases.</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="246"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="248"/>
          <source>Transmitted guide only (EIT)</source>
 -        <translation>Transmitted guide only (EIT)</translation>
 +        <translation>Transmitted Guide Only (EIT)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="570"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="248"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="250"/>
          <source>No grabber</source>
 -        <translation>No grabber</translation>
 +        <translation>No Grabber</translation>
 +    </message>
 +    <message>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="663"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="664"/>
 +        <source>This will usually only work with ATSC or DVB channels, and generally provides data only for the next few days.</source>
 +        <translation>This will usually only work with ATSC or DVB channels, and generally provides data only for the next few days.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="747"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="785"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="786"/>
          <source>Video device</source>
 -        <translation>Video device</translation>
 +        <translation>Video Device</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="858"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="896"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="904"/>
          <source>VBI device</source>
 -        <translation>VBI device</translation>
 +        <translation>VBI Device</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="969"/>
-+        <source>Specify the command to run, with any needed arguments.</source>
-+        <translation>Specify the command to run, with any needed arguments.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="948"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="993"/>
-         <source>Audio device</source>
+-        <source>Audio device</source>
 -        <translation>Audio device</translation>
-+        <translation>Audio Device</translation>
++        <location filename="../libs/libmythtv/videosource.cpp" line="984"/>
++        <source>Specify the command to run, with any needed arguments.</source>
++        <translation>Specify the command to run, with any needed arguments.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="958"/>
--        <location filename="../libs/libmythtv/videosource.cpp" line="1008"/>
+         <location filename="../libs/libmythtv/videosource.cpp" line="1008"/>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3073"/>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3110"/>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3121"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1003"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1051"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3004"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3049"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3060"/>
++        <source>Audio device</source>
++        <translation>Audio Device</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1018"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1066"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2760"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2805"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2816"/>
          <source>(None)</source>
          <translation>(None)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1022"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1065"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1080"/>
          <source>Do not adjust volume</source>
 -        <translation>Do not adjust volume</translation>
 +        <translation>Do Not Adjust Volume</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1024"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1067"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1082"/>
          <source>Enable this option for budget BT878 based DVB-T cards such as the AverTV DVB-T which require the audio volume to be left alone.</source>
          <translation>Enable this option for budget BT878 based DVB-T cards such as the AverTV DVB-T which require the audio volume to be left alone.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1039"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1081"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1096"/>
          <source>When you change this setting, the text below should change to the name and type of your card. If the card cannot be opened, an error message will be displayed.</source>
          <translation>When you change this setting, the text below should change to the name and type of your card. If the card cannot be opened, an error message will be displayed.</translation>
      </message>
@@ -17345,731 +20948,736 @@
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1526"/>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1744"/>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1892"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1121"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1558"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1780"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1912"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1136"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1703"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1835"/>
          <source>Warning: already in use</source>
 -        <translation>Warning: already in use</translation>
 +        <translation>Warning: Already in Use</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1107"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1149"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1164"/>
          <source>Subtype</source>
          <translation>Subtype</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1116"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1159"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1174"/>
          <source>Frontend ID</source>
          <translation>Frontend ID</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1127"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1171"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1186"/>
          <source>Wait for SEQ start header.</source>
 -        <translation>Wait for SEQ start header.</translation>
 +        <translation>Wait for SEQ Start Header</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1142"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1186"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1201"/>
          <source>Open DVB card on demand</source>
 -        <translation>Open DVB card on demand</translation>
 +        <translation>Open DVB Card on Demand</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1190"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1233"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1248"/>
          <source>GUID</source>
          <translation>GUID</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1215"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1257"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1272"/>
          <source>Cable box model</source>
 -        <translation>Cable box model</translation>
 +        <translation>Cable Box Model</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1815"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1852"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1432"/>
++        <source>Use HDHomeRun %1 (%2 %3)</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1436"/>
++        <source>If enabled, use tuners from this HDHomeRun device.</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1775"/>
          <source>URL of M3U containing RTSP/RTP/UDP channel URLs.</source>
          <translation>URL of M3U containing RTSP/RTP/UDP channel URLs.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2994"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2925"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2681"/>
          <source>DVB-T/S/C, ATSC or ISDB-T tuner card</source>
 -        <translation>DVB-T/S/C, ATSC or ISDB-T tuner card</translation>
 +        <translation>DVB-T/S/C, ATSC or ISDB-T Tuner Card</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3002"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2933"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2689"/>
          <source>HD-PVR H.264 encoder</source>
 -        <translation>HD-PVR H.264 encoder</translation>
 +        <translation>HD-PVR H.264 Encoder</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3008"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2939"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2695"/>
          <source>HDHomeRun networked tuner</source>
 -        <translation>HDHomeRun networked tuner</translation>
 +        <translation>HDHomeRun Networked Tuner</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3023"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2954"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2710"/>
          <source>Ceton Cablecard tuner</source>
 -        <translation>Ceton Cablecard tuner</translation>
 +        <translation>Ceton Cablecard Tuner</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3027"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2958"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2714"/>
          <source>IPTV recorder</source>
 -        <translation>IPTV recorder</translation>
 +        <translation>IPTV Recorder</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3033"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2964"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2720"/>
          <source>Analog to MPEG-2 encoder card (PVR-150/250/350, etc)</source>
 -        <translation>Analog to MPEG-2 encoder card (PVR-150/250/350, etc)</translation>
 +        <translation>Analog to MPEG-2 Encoder Card (PVR-150/250/350, etc)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3036"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2967"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2723"/>
          <source>Analog to MJPEG encoder card (Matrox G200, DC10, etc)</source>
 -        <translation>Analog to MJPEG encoder card (Matrox G200, DC10, etc)</translation>
 +        <translation>Analog to MJPEG Encoder Card (Matrox G200, DC10, etc)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3038"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2969"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2725"/>
          <source>Analog to MPEG-4 encoder (Plextor ConvertX USB, etc)</source>
 -        <translation>Analog to MPEG-4 encoder (Plextor ConvertX USB, etc)</translation>
 +        <translation>Analog to MPEG-4 Encoder (Plextor ConvertX USB, etc)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3041"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2972"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2728"/>
          <source>Analog capture card</source>
 -        <translation>Analog capture card</translation>
 +        <translation>Analog Capture Card</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3179"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3118"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2874"/>
          <source>Generic</source>
          <translation>Generic</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1233"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1275"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1290"/>
          <source>Choose the model that most closely resembles your set top box. Depending on firmware revision SA4200HD may work better for a SA3250HD box.</source>
          <translation>Choose the model that most closely resembles your set top box. Depending on firmware revision SA4200HD may work better for a SA3250HD box.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="216"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="372"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="374"/>
          <source>If your provider has asked you to configure a specific network identifier (Network_ID), enter it here. Leave it at -1 otherwise.</source>
          <extracomment>Network_ID is the name of an identifier in the DVB&apos;s Service Information standard specification.</extracomment>
          <translation>If your provider has asked you to configure a specific network identifier (Network_ID), enter it here. Leave it at -1 otherwise.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="474"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="625"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="626"/>
          <source>You MUST run &apos;mythfilldatabase --manual&apos; the first time,
  instead of just &apos;mythfilldatabase&apos;.
  Your grabber does not provide channel numbers, so you have to set them manually.</source>
-@@ -18607,472 +19237,475 @@
+@@ -18607,536 +18887,516 @@
  Your grabber does not provide channel numbers, so you have to set them manually.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="483"/>
-         <source>Warning.</source>
+-        <source>Warning.</source>
 -        <translation>Warning.</translation>
-+        <translation type="vanished">Warning.</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1037"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1079"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1094"/>
          <source>DVB device</source>
 -        <translation>DVB device</translation>
 +        <translation>DVB Device</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1216"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1258"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1273"/>
          <source>Motorola Generic</source>
          <translation>Motorola Generic</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1217"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1259"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1274"/>
          <source>SA/Cisco Generic</source>
          <translation>SA/Cisco Generic</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1274"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1316"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1331"/>
          <source>Connection Type</source>
          <translation>Connection Type</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1275"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1317"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1332"/>
          <source>Point to Point</source>
          <translation>Point to Point</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1287"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1329"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1344"/>
          <source>Speed</source>
          <translation>Speed</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1288"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1330"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1345"/>
          <source>100Mbps</source>
          <translation>100Mbps</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1289"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1331"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1346"/>
          <source>200Mbps</source>
          <translation>200Mbps</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1290"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1332"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1347"/>
          <source>400Mbps</source>
          <translation>400Mbps</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1291"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1333"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1348"/>
          <source>800Mbps</source>
          <translation>800Mbps</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1340"/>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1596"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1370"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1630"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1557"/>
          <source>IP Address</source>
          <translation>IP Address</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1376"/>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1628"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1406"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1662"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1588"/>
          <source>Tuner</source>
          <translation>Tuner</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1813"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1850"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1773"/>
          <source>M3U URL</source>
          <translation>M3U URL</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1850"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1870"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1793"/>
          <source>ASI device</source>
 -        <translation>ASI device</translation>
 +        <translation>ASI Device</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1909"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1929"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1852"/>
          <source>Warning: unable to open</source>
 -        <translation>Warning: unable to open</translation>
-+        <translation>Warning: Unable to Open</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2045"/>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2245"/>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="4283"/>
-         <source>Recorder Options</source>
+-        <source>Recorder Options</source>
 -        <translation>Recorder Options</translation>
-+        <translation type="vanished">Recorder Options</translation>
++        <translation>Warning: Unable to Open</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2787"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2724"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2478"/>
          <source>Capture Card Setup</source>
          <translation>Capture Card Setup</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2984"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2915"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2671"/>
          <source>Card type</source>
 -        <translation>Card type</translation>
 +        <translation>Card Type</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2985"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2916"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2672"/>
          <source>Change the cardtype to the appropriate type for the capture card you are configuring.</source>
 -        <translation>Change the cardtype to the appropriate type for the capture card you are configuring.</translation>
 +        <translation>Change the card type to the appropriate type for the capture card you are configuring.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3018"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2949"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2705"/>
          <source>FireWire cable box</source>
 -        <translation>FireWire cable box</translation>
 +        <translation>FireWire Cable Box</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3045"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2976"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2732"/>
          <source>DVEO ASI recorder</source>
 -        <translation>DVEO ASI recorder</translation>
 +        <translation>DVEO ASI Recorder</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3109"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3048"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2804"/>
          <source>Video source</source>
 -        <translation>Video source</translation>
 +        <translation>Video Source</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3135"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3074"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2830"/>
          <source>Leave as &apos;Generic&apos; unless this input is shared with another device. Only one of the inputs in an input group will be allowed to record at any given time.</source>
          <translation>Leave as &apos;Generic&apos; unless this input is shared with another device. Only one of the inputs in an input group will be allowed to record at any given time.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3258"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3199"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2955"/>
          <source>Use quick tuning</source>
 -        <translation>Use quick tuning</translation>
 +        <translation>Use Quick Tuning</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3259"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3200"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2956"/>
          <source>Never</source>
          <translation>Never</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3260"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3201"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2957"/>
          <source>Live TV only</source>
 -        <translation>Live TV only</translation>
 +        <translation>Live TV Only</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3261"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3202"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2958"/>
          <source>Always</source>
          <translation>Always</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3280"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3219"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2975"/>
          <source>External channel change command</source>
 -        <translation>External channel change command</translation>
 +        <translation>External Channel Change Command</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3282"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3221"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2977"/>
          <source>If specified, this command will be run to change the channel for inputs which have an external tuner device such as a cable box. The first argument will be the channel number.</source>
          <translation>If specified, this command will be run to change the channel for inputs which have an external tuner device such as a cable box. The first argument will be the channel number.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3296"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3234"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2990"/>
          <source>Preset tuner to channel</source>
 -        <translation>Preset tuner to channel</translation>
 +        <translation>Preset Tuner to Channel</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3298"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3236"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2992"/>
          <source>Leave this blank unless you have an external tuner that is connected to the tuner input of your card. If so, you will need to specify the preset channel for the signal (normally 3 or 4).</source>
          <translation>Leave this blank unless you have an external tuner that is connected to the tuner input of your card. If so, you will need to specify the preset channel for the signal (normally 3 or 4).</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3349"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3288"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3044"/>
          <source>Input priority</source>
 -        <translation>Input priority</translation>
 +        <translation>Input Priority</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3351"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3290"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3046"/>
          <source>If the input priority is not equal for all inputs, the scheduler may choose to record a show at a later time so that it can record on an input with a higher value.</source>
          <translation>If the input priority is not equal for all inputs, the scheduler may choose to record a show at a later time so that it can record on an input with a higher value.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3365"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3304"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3060"/>
          <source>Schedule order</source>
 -        <translation>Schedule order</translation>
 +        <translation>Schedule Order</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3367"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3306"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3062"/>
          <source>If priorities and other factors are equal the scheduler will choose the available input with the lowest, non-zero value.  Setting this value to zero will make the input unavailable to the scheduler.</source>
 -        <translation>If priorities and other factors are equal the scheduler will choose the available input with the lowest, non-zero value.  Setting this value to zero will make the input unavailable to the scheduler.</translation>
 +        <translation>If priorities and other factors are equal the scheduler will choose the available input with the lowest, non-zero value. Setting this value to zero will make the input unavailable to the scheduler.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3382"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3321"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3077"/>
          <source>Live TV order</source>
 -        <translation>Live TV order</translation>
 +        <translation>Live TV Order</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3384"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3323"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3079"/>
          <source>When entering Live TV, the available, local input with the lowest, non-zero value will be used.  If no local inputs are available, the available, remote input with the lowest, non-zero value will be used.  Setting this value to zero will make the input unavailable to live TV.</source>
 -        <translation>When entering Live TV, the available, local input with the lowest, non-zero value will be used.  If no local inputs are available, the available, remote input with the lowest, non-zero value will be used.  Setting this value to zero will make the input unavailable to live TV.</translation>
 +        <translation>When entering Live TV, the available, local input with the lowest, non-zero value will be used. If no local inputs are available, the available, remote input with the lowest, non-zero value will be used. Setting this value to zero will make the input unavailable to live TV.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3404"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3343"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3099"/>
          <source>If you point your satellite dish toward DishNet&apos;s birds, you may wish to enable this feature. For best results, enable general EIT collection as well.</source>
          <translation>If you point your satellite dish toward DishNet&apos;s birds, you may wish to enable this feature. For best results, enable general EIT collection as well.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3434"/>
-         <source>Connect source to input</source>
+-        <source>Connect source to input</source>
 -        <translation>Connect source to input</translation>
-+        <translation type="vanished">Connect source to input</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3479"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3404"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3160"/>
          <source>Interactions between inputs</source>
 -        <translation>Interactions between inputs</translation>
 +        <translation>Interactions Between Inputs</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3485"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3417"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3173"/>
          <source>Create a New Input Group</source>
          <translation>Create a New Input Group</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3767"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3806"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3563"/>
          <source>(New capture card)</source>
 -        <translation>(New capture card)</translation>
 +        <translation>(New Capture Card)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3768"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3807"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3564"/>
          <source>(Delete all capture cards on %1)</source>
 -        <translation>(Delete all capture cards on %1)</translation>
 +        <translation>(Delete All Capture Cards on %1)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3770"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3810"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3567"/>
          <source>(Delete all capture cards)</source>
 -        <translation>(Delete all capture cards)</translation>
 +        <translation>(Delete All Capture Cards)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3912"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3823"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3580"/>
          <source>(New video source)</source>
 -        <translation>(New video source)</translation>
 +        <translation>(New Video Source)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3913"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3824"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3581"/>
          <source>(Delete all video sources)</source>
 -        <translation>(Delete all video sources)</translation>
 +        <translation>(Delete All Video Sources)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="323"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="479"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="480"/>
          <source>Perform EIT scan</source>
 -        <translation>Perform EIT scan</translation>
-+        <translation>Perform EIT Scan</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="132"/>
-         <source>Maximum number of simultaneous recordings this device should make. Some digital transmitters transmit multiple programs on a multiplex, if this is set to a value greater than one MythTV can sometimes take advantage of this. If only a single program is available, setting this to 2 allows overlapping schedules to record.</source>
+-        <source>Maximum number of simultaneous recordings this device should make. Some digital transmitters transmit multiple programs on a multiplex, if this is set to a value greater than one MythTV can sometimes take advantage of this. If only a single program is available, setting this to 2 allows overlapping schedules to record.</source>
 -        <translation>Maximum number of simultaneous recordings this device should make. Some digital transmitters transmit multiple programs on a multiplex, if this is set to a value greater than one MythTV can sometimes take advantage of this. If only a single program is available, setting this to 2 allows overlapping schedules to record.</translation>
-+        <translation type="vanished">Maximum number of simultaneous recordings this device should make. Some digital transmitters transmit multiple programs on a multiplex, if this is set to a value greater than one MythTV can sometimes take advantage of this. If only a single program is available, setting this to 2 allows overlapping schedules to record.</translation>
++        <translation>Perform EIT Scan</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="324"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="480"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="481"/>
          <source>If enabled, program guide data for channels on this source will be updated with data provided by the channels themselves &apos;Over-the-Air&apos;.</source>
          <translation>If enabled, program guide data for channels on this source will be updated with data provided by the channels themselves &apos;Over-the-Air&apos;.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="686"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="699"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="700"/>
          <source>Video Source Setup</source>
          <translation>Video Source Setup</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="860"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="898"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="906"/>
          <source>Device to read VBI (captions) from.</source>
          <translation>Device to read VBI (captions) from.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="926"/>
-         <source>Arguments</source>
+-        <source>Arguments</source>
 -        <translation>Arguments</translation>
-+        <translation type="vanished">Arguments</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="937"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="982"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="997"/>
          <source>File path</source>
 -        <translation>File path</translation>
 +        <translation>File Path</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="959"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1004"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1019"/>
          <source>Device to read audio from, if audio is separate from the video.</source>
          <translation>Device to read audio from, if audio is separate from the video.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="971"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1015"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1030"/>
          <source>Signal timeout (ms)</source>
 -        <translation>Signal timeout (ms)</translation>
 +        <translation>Signal Timeout (ms)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="973"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1017"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1032"/>
          <source>Maximum time (in milliseconds) MythTV waits for a signal when scanning for channels.</source>
          <translation>Maximum time (in milliseconds) MythTV waits for a signal when scanning for channels.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="986"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1030"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1045"/>
          <source>Tuning timeout (ms)</source>
 -        <translation>Tuning timeout (ms)</translation>
 +        <translation>Tuning Timeout (ms)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="988"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1032"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1047"/>
          <source>Maximum time (in milliseconds) MythTV waits for a channel lock.  For recordings, if this time is exceeded, the recording will be marked as failed.</source>
 -        <translation>Maximum time (in milliseconds) MythTV waits for a channel lock.  For recordings, if this time is exceeded, the recording will be marked as failed.</translation>
 +        <translation>Maximum time (in milliseconds) MythTV waits for a channel lock. For recordings, if this time is exceeded, the recording will be marked as failed.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1002"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1045"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1060"/>
          <source>Force audio sampling rate</source>
 -        <translation>Force audio sampling rate</translation>
 +        <translation>Force Audio Sampling Rate</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1004"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1047"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1062"/>
          <source>If non-zero, override the audio sampling rate in the recording profile when this card is used.  Use this if your capture card does not support all of the standard rates.</source>
 -        <translation>If non-zero, override the audio sampling rate in the recording profile when this card is used.  Use this if your capture card does not support all of the standard rates.</translation>
 +        <translation>If non-zero, override the audio sampling rate in the recording profile when this card is used. Use this if your capture card does not support all of the standard rates.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1130"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1174"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1189"/>
          <source>If enabled, drop packets from the start of a DVB recording until a sequence start header is seen.</source>
          <translation>If enabled, drop packets from the start of a DVB recording until a sequence start header is seen.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1145"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1189"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1204"/>
          <source>If enabled, only open the DVB card when required, leaving it free for other programs at other times.</source>
          <translation>If enabled, only open the DVB card when required, leaving it free for other programs at other times.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1157"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1201"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1216"/>
          <source>Use DVB card for active EIT scan</source>
 -        <translation>Use DVB card for active EIT scan</translation>
 +        <translation>Use DVB Card for Active EIT Scan</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1160"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1204"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1219"/>
          <source>If enabled, activate active scanning for program data (EIT). When this option is enabled the DVB card is constantly in-use.</source>
          <translation>If enabled, activate active scanning for program data (EIT). When this option is enabled the DVB card is constantly in-use.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1173"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1217"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1232"/>
          <source>DVB tuning delay (ms)</source>
 -        <translation>DVB tuning delay (ms)</translation>
 +        <translation>DVB Tuning Delay (ms)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1176"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1220"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1235"/>
          <source>Some Linux DVB drivers, in particular for the Hauppauge Nova-T, require that we slow down the tuning process by specifying a delay (in milliseconds).</source>
          <translation>Some Linux DVB drivers, in particular for the Hauppauge Nova-T, require that we slow down the tuning process by specifying a delay (in milliseconds).</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1471"/>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1707"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1503"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1743"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1666"/>
          <source>Available devices</source>
 -        <translation>Available devices</translation>
-+        <translation>Available Devices</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1473"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1505"/>
-         <source>Device ID and Tuner Number of available HDHomeRun devices.</source>
-         <translation>Device ID and Tuner Number of available HDHomeRun devices.</translation>
+-        <source>Device ID and Tuner Number of available HDHomeRun devices.</source>
+-        <translation>Device ID and Tuner Number of available HDHomeRun devices.</translation>
++        <translation>Available Devices</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1597"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1631"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1558"/>
          <source>Device IP or ID of a VBox device. eg. &apos;192.168.1.100&apos; or &apos;vbox_3718&apos;</source>
          <translation>Device IP or ID of a VBox device. eg. &apos;192.168.1.100&apos; or &apos;vbox_3718&apos;</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1629"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1663"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1589"/>
          <source>Number and type of the tuner to use. eg &apos;1-DVBT/T2&apos;.</source>
          <translation>Number and type of the tuner to use. eg &apos;1-DVBT/T2&apos;.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="1709"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1745"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1668"/>
          <source>Device IP or ID, tuner number and tuner type of available VBox devices.</source>
          <translation>Device IP or ID, tuner number and tuner type of available VBox devices.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2701"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2056"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1415"/>
 +        <source>Use HD HomeRun for active EIT scan</source>
 +        <translation>Use HD HomeRun for Active EIT Scan</translation>
 +    </message>
 +    <message>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2059"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="164"/>
++        <source>Schedule all virtual inputs on this device as a group.  This is more efficient than scheduling each input individually.  Additional, virtual inputs will be automatically added as needed to fulfill the recording load.</source>
++        <translation>Schedule all virtual inputs on this device as a group. This is more efficient than scheduling each input individually. Additional, virtual inputs will be automatically added as needed to fulfill the recording load.</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1418"/>
 +        <source>If enabled, activate active scanning for program data (EIT). When this option is enabled the HD HomeRun is constantly in-use.</source>
 +        <translation>If enabled, activate active scanning for program data (EIT). When this option is enabled the HD HomeRun is constantly in-use.</translation>
 +    </message>
 +    <message>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2656"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2408"/>
          <source>V4L2 encoder devices (multirec capable)</source>
 -        <translation>V4L2 encoder devices (multirec capable)</translation>
 +        <translation>V4L2 Encoder Devices (multirec capable)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2999"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2930"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2686"/>
          <source>V4L2 encoder</source>
 -        <translation>V4L2 encoder</translation>
 +        <translation>V4L2 Encoder</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3013"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2944"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2700"/>
          <source>V@Box TV Gateway networked tuner</source>
 -        <translation>V@Box TV Gateway networked tuner</translation>
 +        <translation>V@Box TV Gateway Networked Tuner</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3048"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2979"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2735"/>
          <source>Import test recorder</source>
 -        <translation>Import test recorder</translation>
 +        <translation>Import Test Recorder</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3049"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2980"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2736"/>
          <source>Demo test recorder</source>
 -        <translation>Demo test recorder</translation>
 +        <translation>Demo Test Recorder</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3051"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2982"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2738"/>
          <source>External (black box) recorder</source>
 -        <translation>External (black box) recorder</translation>
 +        <translation>External (black box) Recorder</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3062"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2993"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2749"/>
          <source>Input name</source>
 -        <translation>Input name</translation>
 +        <translation>Input Name</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3094"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3024"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2780"/>
          <source>Display name (optional)</source>
 -        <translation>Display name (optional)</translation>
 +        <translation>Display Name (optional)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3095"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3025"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2781"/>
          <source>This name is displayed on screen when Live TV begins and when changing the selected input or card. If you use this, make sure the information is unique for each input.</source>
          <translation>This name is displayed on screen when Live TV begins and when changing the selected input or card. If you use this, make sure the information is unique for each input.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3133"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3072"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2828"/>
          <source>Input group</source>
 -        <translation>Input group</translation>
 +        <translation>Input Group</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3262"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3203"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2959"/>
          <source>If enabled, MythTV will tune using only the MPEG program number. The program numbers change more often than DVB or ATSC tuning parameters, so this is slightly less reliable. This will also inhibit EIT gathering during Live TV and recording.</source>
          <translation>If enabled, MythTV will tune using only the MPEG program number. The program numbers change more often than DVB or ATSC tuning parameters, so this is slightly less reliable. This will also inhibit EIT gathering during Live TV and recording.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3401"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3340"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3096"/>
          <source>Use DishNet long-term EIT data</source>
 -        <translation>Use DishNet long-term EIT data</translation>
 +        <translation>Use DishNet Long-Term EIT Data</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3487"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3419"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3175"/>
          <source>Input groups are only needed when two or more cards share the same resource such as a FireWire card and an analog card input controlling the same set top box.</source>
          <translation>Input groups are only needed when two or more cards share the same resource such as a FireWire card and an analog card input controlling the same set top box.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="4237"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="4099"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3856"/>
          <source>Audio input</source>
 -        <translation>Audio input</translation>
 +        <translation>Audio Input</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="4238"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="4100"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3857"/>
          <source>If there is more than one audio input, select which one to use.</source>
          <translation>If there is more than one audio input, select which one to use.</translation>
      </message>
@@ -18088,43 +21696,46 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.h" line="268"/>
-+        <location filename="../libs/libmythtv/videosource.h" line="269"/>
++        <location filename="../libs/libmythtv/videosource.h" line="270"/>
          <source>Video source name</source>
 -        <translation>Video source name</translation>
 +        <translation>Video Source Name</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.h" line="859"/>
-+        <location filename="../libs/libmythtv/videosource.h" line="824"/>
++        <location filename="../libs/libmythtv/videosource.h" line="835"/>
          <source>Starting channel</source>
 -        <translation>Starting channel</translation>
 +        <translation>Starting Channel</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.h" line="860"/>
-+        <location filename="../libs/libmythtv/videosource.h" line="825"/>
++        <location filename="../libs/libmythtv/videosource.h" line="836"/>
          <source>Starting Live TV channel.</source>
 -        <translation>Starting Live TV channel.</translation>
 +        <translation>Starting Live TV Channel</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.h" line="861"/>
-+        <location filename="../libs/libmythtv/videosource.h" line="826"/>
++        <location filename="../libs/libmythtv/videosource.h" line="837"/>
          <source>This is updated on every successful channel change.</source>
          <translation>This is updated on every successful channel change.</translation>
      </message>
-@@ -19082,48 +19715,48 @@
+     <message>
+-        <location filename="../programs/mythfrontend/viewschedulediff.cpp" line="114"/>
++        <location filename="../programs/mythfrontend/viewschedulediff.cpp" line="109"/>
+         <source>The following programs will be recorded instead:</source>
          <translation>The following programs will be recorded instead:</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/viewschedulediff.cpp" line="137"/>
-+        <location filename="../programs/mythfrontend/viewschedulediff.cpp" line="140"/>
++        <location filename="../programs/mythfrontend/viewschedulediff.cpp" line="135"/>
          <source>Program Status</source>
          <translation>Program Status</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtranscode/transcode.cpp" line="1552"/>
-+        <location filename="../programs/mythtranscode/transcode.cpp" line="1598"/>
++        <location filename="../programs/mythtranscode/transcode.cpp" line="1603"/>
          <source>%1% Completed @ %2 fps.</source>
          <translation>%1% Completed @ %2 fps.</translation>
      </message>
@@ -18173,37 +21784,40 @@
 +        <translation>mythfilldatabase ran, but did not insert any new data into the Guide. This can indicate a potential problem with the XML file used for the update.</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="295"/>
-@@ -19136,24 +19769,23 @@
+-        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="295"/>
++        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="292"/>
+         <source>Stereo</source>
+         <translation>Stereo</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="443"/>
++        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="440"/>
+         <source>Audio device is invalid or not useable.</source>
          <translation>Audio device is invalid or not useable.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/programinfo.cpp" line="3126"/>
-+        <location filename="../libs/libmyth/programinfo.cpp" line="3140"/>
++        <location filename="../libs/libmyth/programinfo.cpp" line="3313"/>
          <source>Delete</source>
          <translation>Delete</translation>
      </message>
-     <message>
--        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="92"/>
-+        <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="93"/>
-         <source>All</source>
+@@ -19146,50 +19406,45 @@
          <translation>All</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="759"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="832"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="842"/>
          <source>Use &apos;mythfilldatabase&apos; or the name of a custom script that will populate the program guide info for all your video sources.</source>
          <translation>Use &apos;mythfilldatabase&apos; or the name of a custom script that will populate the program guide info for all your video sources.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="445"/>
-         <source>Warning</source>
+-        <source>Warning</source>
 -        <translation>Warning</translation>
-+        <translation type="vanished">Warning</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
          <location filename="../libs/libmyth/mythmediamonitor.cpp" line="37"/>
-@@ -19161,12 +19793,12 @@
+         <source>Media Monitor</source>
          <translation>Media Monitor</translation>
      </message>
      <message>
@@ -18218,31 +21832,37 @@
          <source>You may have to use the eject button under its tray</source>
          <translation>You may have to use the eject button under its tray</translation>
      </message>
-@@ -19182,722 +19814,769 @@
+     <message>
+-        <location filename="../programs/mythtranscode/main.cpp" line="83"/>
++        <location filename="../programs/mythtranscode/main.cpp" line="81"/>
+         <source>Generating Keyframe Index</source>
+         <translation>Generating Keyframe Index</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythtranscode/main.cpp" line="89"/>
++        <location filename="../programs/mythtranscode/main.cpp" line="87"/>
+         <source>Transcode Completed</source>
+         <translation>Transcode Completed</translation>
      </message>
      <message>
-         <location filename="../programs/mythtranscode/main.cpp" line="97"/>
+-        <location filename="../programs/mythtranscode/main.cpp" line="97"/>
 -        <location filename="../programs/mythtranscode/transcode.cpp" line="225"/>
-+        <location filename="../programs/mythtranscode/transcode.cpp" line="232"/>
++        <location filename="../programs/mythtranscode/main.cpp" line="96"/>
++        <location filename="../programs/mythtranscode/transcode.cpp" line="238"/>
          <source>Completed</source>
          <translation>Completed</translation>
      </message>
      <message>
--        <location filename="../programs/mythtranscode/main.cpp" line="871"/>
-+        <location filename="../programs/mythtranscode/main.cpp" line="873"/>
+         <location filename="../programs/mythtranscode/main.cpp" line="871"/>
          <source>Job errored, unable to find Program Info for job</source>
 -        <translation>Job errored, unable to find Program Info for job</translation>
 +        <translation>Job Errored, Unable to Find Program Info for Job</translation>
      </message>
      <message>
--        <location filename="../programs/mythtranscode/main.cpp" line="1115"/>
-+        <location filename="../programs/mythtranscode/main.cpp" line="1117"/>
-         <source>Job Aborted</source>
-         <translation>Job Aborted</translation>
-     </message>
+         <location filename="../programs/mythtranscode/main.cpp" line="1115"/>
+@@ -19199,705 +19454,734 @@
      <message>
--        <location filename="../programs/mythtranscode/main.cpp" line="1120"/>
-+        <location filename="../programs/mythtranscode/main.cpp" line="1122"/>
+         <location filename="../programs/mythtranscode/main.cpp" line="1120"/>
          <source>Unrecoverable error</source>
 -        <translation>Unrecoverable error</translation>
 +        <translation>Unrecoverable Error</translation>
@@ -18262,11 +21882,10 @@
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="38"/>
-         <source>IPv6 address</source>
+-        <source>IPv6 address</source>
 -        <translation>IPv6 address</translation>
-+        <translation type="vanished">IPv6 address</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="65"/>
 +        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="101"/>
          <source>Enter the IPv6 address of this machine. Use an externally accessible address (ie, not ::1) if you are going to be running a frontend on a different machine than this one.</source>
@@ -18274,10 +21893,6 @@
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="144"/>
-+        <source>Listen on All IP Addresses</source>
-+        <translation type="vanished">Listen on All IP Addresses</translation>
-+    </message>
-+    <message>
 +        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="171"/>
 +        <source>Primary IP address / DNS name</source>
 +        <translation>Primary IP Address/DNS Name</translation>
@@ -18474,38 +22089,43 @@
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="640"/>
 +        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="713"/>
++        <source>Allow preview jobs</source>
++        <translation>Allow Preview Jobs</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="723"/>
          <source>Transcoder command</source>
 -        <translation>Transcoder command</translation>
 +        <translation>Transcoder Command</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="642"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="715"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="725"/>
          <source>The program used to transcode recordings. The default is &apos;mythtranscode&apos; if this setting is empty.</source>
          <translation>The program used to transcode recordings. The default is &apos;mythtranscode&apos; if this setting is empty.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="662"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="735"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="745"/>
          <source>Allow %1 jobs</source>
          <translation>Allow %1 jobs</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="685"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="758"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="768"/>
          <source>If enabled, the master backend will include the list of recorded shows in the list of videos.  This is mainly to accommodate UPnP players which do not allow more than 1 video section.</source>
 -        <translation>If enabled, the master backend will include the list of recorded shows in the list of videos.  This is mainly to accommodate UPnP players which do not allow more than 1 video section.</translation>
 +        <translation>If enabled, the master backend will include the list of recorded shows in the list of videos. This is mainly to accommodate UPnP players which do not allow more than 1 video section.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="697"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="770"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="780"/>
          <source>Recordings</source>
          <translation>Recordings</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="698"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="771"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="781"/>
          <source>Videos</source>
          <translation>Videos</translation>
      </message>
@@ -18538,11 +22158,10 @@
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="111"/>
-         <source>The IP address of the master backend server. All frontend and non-master backend machines will connect to this server. If you only have one backend, this should be the same IP address as above.</source>
+-        <source>The IP address of the master backend server. All frontend and non-master backend machines will connect to this server. If you only have one backend, this should be the same IP address as above.</source>
 -        <translation>The IP address of the master backend server. All frontend and non-master backend machines will connect to this server. If you only have one backend, this should be the same IP address as above.</translation>
-+        <translation type="vanished">The IP address of the master backend server. All frontend and non-master backend machines will connect to this server. If you only have one backend, this should be the same IP address as above.</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="132"/>
 +        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="205"/>
          <source>Security PIN (required)</source>
@@ -18666,84 +22285,84 @@
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="700"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="773"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="783"/>
          <source>Which tree to show a Windows Media Player client when it requests a list of videos.</source>
          <translation>Which tree to show a Windows Media Player client when it requests a list of videos.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="708"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="781"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="791"/>
          <source>Automatically update program listings</source>
 -        <translation>Automatically update program listings</translation>
 +        <translation>Automatically Update Program Listings</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="710"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="783"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="793"/>
          <source>If enabled, the guide data program will be run automatically.</source>
          <translation>If enabled, the guide data program will be run automatically.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="718"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="791"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="801"/>
          <source>Guide data program execution start</source>
 -        <translation>Guide data program execution start</translation>
 +        <translation>Guide Data Program Execution Start</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="720"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="793"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="803"/>
          <source>This setting and the following one define a time period when the guide data program is allowed to run. For example, setting start to 11 and end to 13 would mean that the program would only run between 11:00 AM and 1:59 PM.</source>
          <translation>This setting and the following one define a time period when the guide data program is allowed to run. For example, setting start to 11 and end to 13 would mean that the program would only run between 11:00 AM and 1:59 PM.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="731"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="804"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="814"/>
          <source>Guide data program execution end</source>
 -        <translation>Guide data program execution end</translation>
 +        <translation>Guide Data Program Execution End</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="733"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="806"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="816"/>
          <source>This setting and the preceding one define a time period when the guide data program is allowed to run. For example, setting start to 11 and end to 13 would mean that the program would only run between 11:00 AM and 1:59 PM.</source>
          <translation>This setting and the preceding one define a time period when the guide data program is allowed to run. For example, setting start to 11 and end to 13 would mean that the program would only run between 11:00 AM and 1:59 PM.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="744"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="817"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="827"/>
          <source>Run guide data program at time suggested by the grabber.</source>
          <translation>Run guide data program at time suggested by the grabber.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="747"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="820"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="830"/>
          <source>If enabled, allow a DataDirect guide data provider to specify the next download time in order to distribute load on their servers. Guide data program execution start/end times are also ignored.</source>
          <translation>If enabled, allow a DataDirect guide data provider to specify the next download time in order to distribute load on their servers. Guide data program execution start/end times are also ignored.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="757"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="830"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="840"/>
          <source>Guide data program</source>
 -        <translation>Guide data program</translation>
 +        <translation>Guide Data Program</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="769"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="842"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="852"/>
          <source>Guide data arguments</source>
 -        <translation>Guide data arguments</translation>
 +        <translation>Guide Data Arguments</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="771"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="844"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="854"/>
          <source>Any arguments you want passed to the guide data program.</source>
          <translation>Any arguments you want passed to the guide data program.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="782"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="854"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="864"/>
          <source>Program Schedule Downloading Options</source>
          <translation>Program Schedule Downloading Options</translation>
      </message>
@@ -18804,13 +22423,12 @@
 +        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="409"/>
          <source>Wake attempts</source>
 -        <translation>Wake attempts</translation>
-+        <translation>Wake Attempts</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="348"/>
-         <source>The command used to wake up your master backend server (e.g. sudo /etc/init.d/mythtv-backend restart).</source>
+-        <source>The command used to wake up your master backend server (e.g. sudo /etc/init.d/mythtv-backend restart).</source>
 -        <translation>The command used to wake up your master backend server (e.g. sudo /etc/init.d/mythtv-backend restart).</translation>
-+        <translation type="vanished">The command used to wake up your master backend server (e.g. sudo /etc/init.d/mythtv-backend restart).</translation>
++        <translation>Wake Attempts</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="356"/>
@@ -19036,7 +22654,8 @@
 +        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="685"/>
 +        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="695"/>
 +        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="705"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="747"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="715"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="757"/>
          <source>If enabled, allow jobs of this type to run on this backend.</source>
          <translation>If enabled, allow jobs of this type to run on this backend.</translation>
      </message>
@@ -19049,53 +22668,51 @@
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="650"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="723"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="733"/>
          <source>Commercial-detection command</source>
 -        <translation>Commercial-detection command</translation>
 +        <translation>Commercial Detection Command</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="652"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="725"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="735"/>
          <source>The program used to detect commercials in a recording. The default is &apos;mythcommflag&apos; if this setting is empty.</source>
          <translation>The program used to detect commercials in a recording. The default is &apos;mythcommflag&apos; if this setting is empty.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="683"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="756"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="766"/>
          <source>Include recordings in video list</source>
 -        <translation>Include recordings in video list</translation>
 +        <translation>Include Recordings in Video List</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="696"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="769"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="779"/>
          <source>Video content to show a WMP client</source>
 -        <translation>Video content to show a WMP client</translation>
-+        <translation>Video Content to Show a WMP Client</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="804"/>
-         <source>Host Address Backend Setup</source>
+-        <source>Host Address Backend Setup</source>
 -        <translation>Host Address Backend Setup</translation>
-+        <translation type="vanished">Host Address Backend Setup</translation>
++        <translation>Video Content to Show a WMP Client</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="806"/>
-         <source>Local Backend</source>
+-        <source>Local Backend</source>
 -        <translation>Local Backend</translation>
-+        <translation type="vanished">Local Backend</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="830"/>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="894"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="964"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="974"/>
          <source>Master Backend</source>
          <translation>Master Backend</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="841"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="914"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="924"/>
          <source>Locale Settings</source>
          <translation>Locale Settings</translation>
      </message>
@@ -19136,72 +22753,72 @@
 +        <translation>Listen on IPv6 Address</translation>
 +    </message>
 +    <message>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="921"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="931"/>
          <source>Miscellaneous Settings</source>
          <translation>Miscellaneous Settings</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="851"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="924"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="934"/>
          <source>File Management Settings</source>
          <translation>File Management Settings</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="872"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="942"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="952"/>
          <source>EIT Scanner Options</source>
          <translation>EIT Scanner Options</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="878"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="948"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="958"/>
          <source>Shutdown/Wakeup Options</source>
          <translation>Shutdown/Wakeup Options</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="891"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="961"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="971"/>
          <source>Backend Wakeup settings</source>
 -        <translation>Backend Wakeup settings</translation>
 +        <translation>Backend Wakeup Settings</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="901"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="971"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="981"/>
          <source>Slave Backends</source>
          <translation>Slave Backends</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="908"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="978"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="988"/>
          <source>Backend Control</source>
          <translation>Backend Control</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="914"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="984"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="994"/>
          <source>Job Queue (Backend-Specific)</source>
          <translation>Job Queue (Backend-Specific)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="941"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="1000"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="1011"/>
          <source>Job Queue (Global)</source>
          <translation>Job Queue (Global)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="951"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="1010"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="1021"/>
          <source>Job Queue (Job Commands)</source>
          <translation>Job Queue (Job Commands)</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="862"/>
-+        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="932"/>
++        <location filename="../programs/mythtv-setup/backendsettings.cpp" line="942"/>
          <source>UPnP Server Settings</source>
          <translation>UPnP Server Settings</translation>
      </message>
-@@ -19915,12 +20594,12 @@
+@@ -19915,12 +20199,12 @@
          <location filename="../programs/mythtv-setup/checksetup.cpp" line="62"/>
          <location filename="../programs/mythtv-setup/checksetup.cpp" line="86"/>
          <source>No Storage Group directories are defined.  You must add at least one directory to the Default Storage Group where new recordings will be stored.</source>
@@ -19216,28 +22833,66 @@
      </message>
      <message>
          <location filename="../programs/mythtv-setup/checksetup.cpp" line="217"/>
-@@ -19928,12 +20607,12 @@
+@@ -19928,83 +20212,83 @@
          <translation>Card %1 (type %2) is set to start on channel %3, which does not exist.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/importicons.cpp" line="633"/>
-+        <location filename="../programs/mythtv-setup/importicons.cpp" line="661"/>
++        <location filename="../programs/mythtv-setup/importicons.cpp" line="657"/>
          <source>Searching for icons for channel %1</source>
 -        <translation>Searching for icons for channel %1</translation>
 +        <translation>Searching for Icons for Channel %1</translation>
      </message>
      <message>
 -        <location filename="../programs/mythtv-setup/main.cpp" line="517"/>
-+        <location filename="../programs/mythtv-setup/main.cpp" line="563"/>
++        <location filename="../programs/mythtv-setup/main.cpp" line="579"/>
          <source>MythTV Setup</source>
          <translation>MythTV Setup</translation>
      </message>
-@@ -19971,19 +20650,19 @@
+     <message>
+-        <location filename="../libs/libmyth/rssparse.cpp" line="112"/>
+-        <location filename="../libs/libmyth/rssparse.cpp" line="124"/>
++        <location filename="../libs/libmyth/rssparse.cpp" line="126"/>
++        <location filename="../libs/libmyth/rssparse.cpp" line="138"/>
+         <source>Web Only</source>
+         <translation>Web Only</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/rssparse.cpp" line="114"/>
+-        <location filename="../libs/libmyth/rssparse.cpp" line="126"/>
++        <location filename="../libs/libmyth/rssparse.cpp" line="128"/>
++        <location filename="../libs/libmyth/rssparse.cpp" line="140"/>
+         <source>Downloadable</source>
+         <translation>Downloadable</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/rssparse.cpp" line="120"/>
++        <location filename="../libs/libmyth/rssparse.cpp" line="134"/>
+         <source>MB</source>
+         <comment>Megabytes</comment>
+         <translation>MB</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/rssparse.cpp" line="491"/>
++        <location filename="../libs/libmyth/rssparse.cpp" line="504"/>
+         <source>Comments</source>
+         <translation>Comments</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/rssparse.cpp" line="510"/>
++        <location filename="../libs/libmyth/rssparse.cpp" line="523"/>
+         <source>Responses</source>
+         <translation>Responses</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/rssparse.cpp" line="529"/>
++        <location filename="../libs/libmyth/rssparse.cpp" line="542"/>
+         <source>Backlinks</source>
          <translation>Backlinks</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.h" line="100"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.h" line="101"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.h" line="103"/>
          <source>Scan Type</source>
          <translation>Scan Type</translation>
      </message>
@@ -19254,86 +22909,136 @@
 +        <translation>Error: Failed to Hash File &apos;%1&apos;</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/videolist.cpp" line="646"/>
-@@ -19994,7 +20673,7 @@
+-        <location filename="../programs/mythfrontend/videolist.cpp" line="646"/>
+-        <location filename="../programs/mythfrontend/videolist.cpp" line="654"/>
++        <location filename="../programs/mythfrontend/videolist.cpp" line="633"/>
++        <location filename="../programs/mythfrontend/videolist.cpp" line="641"/>
+         <source>Video Home</source>
+         <translation>Video Home</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/videolist.cpp" line="656"/>
+-        <location filename="../programs/mythfrontend/videolist.cpp" line="656"/>
++        <location filename="../programs/mythfrontend/videolist.cpp" line="643"/>
          <source>No files found</source>
 -        <translation>No files found</translation>
 +        <translation>No Files Found</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/videolist.cpp" line="952"/>
-@@ -20075,57 +20754,57 @@
+-        <location filename="../programs/mythfrontend/videolist.cpp" line="952"/>
++        <location filename="../programs/mythfrontend/videolist.cpp" line="938"/>
+         <source>Television</source>
+         <translation>Television</translation>
+     </message>
+     <message>
+         <location filename="../programs/mythbackend/upnpcdstv.cpp" line="186"/>
+         <location filename="../programs/mythbackend/upnpcdsvideo.cpp" line="82"/>
+-        <location filename="../programs/mythfrontend/videolist.cpp" line="955"/>
++        <location filename="../programs/mythfrontend/videolist.cpp" line="941"/>
+         <source>Movies</source>
+         <translation>Movies</translation>
+     </message>
+@@ -20065,84 +20349,84 @@
+     </message>
+     <message>
+         <location filename="../programs/mythbackend/upnpcdsvideo.cpp" line="490"/>
+-        <location filename="../programs/mythfrontend/videolist.cpp" line="968"/>
++        <location filename="../programs/mythfrontend/videolist.cpp" line="954"/>
+         <source>Season %1</source>
+         <translation>Season %1</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videolist.cpp" line="1048"/>
++        <location filename="../programs/mythfrontend/videolist.cpp" line="1034"/>
+         <source>videos</source>
          <translation>videos</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1641"/>
-+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1643"/>
++        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1645"/>
          <source>&gt;1Gbps</source>
          <translation>&gt;1Gbps</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1645"/>
-+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1647"/>
++        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1649"/>
          <source>%1Mbps</source>
          <translation>%1Mbps</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1645"/>
-+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1647"/>
++        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1649"/>
          <source>%1MHz</source>
          <translation>%1MHz</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1651"/>
-+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1653"/>
++        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1655"/>
          <source>%1kHz</source>
          <translation>%1kHz</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1651"/>
-+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1653"/>
++        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1655"/>
          <source>%1kbps</source>
          <translation>%1kbps</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1657"/>
-+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1659"/>
++        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1661"/>
          <source>%1bps</source>
          <translation>%1bps</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1657"/>
-+        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1659"/>
++        <location filename="../libs/libmythtv/ringbuffer.cpp" line="1661"/>
          <source>%1Hz</source>
          <translation>%1Hz</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1033"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1040"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1103"/>
          <source>%1 TB</source>
          <translation>%1 TB</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1038"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1045"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1108"/>
          <source>%1 GB</source>
          <translation>%1 GB</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1043"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1050"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1113"/>
          <source>%1 MB</source>
          <translation>%1 MB</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1046"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1053"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1116"/>
          <source>%1 KB</source>
          <translation>%1 KB</translation>
      </message>
-@@ -20150,17 +20829,17 @@
+     <message>
+-        <location filename="../libs/libmythupnp/mythxmlclient.cpp" line="101"/>
++        <location filename="../libs/libmythupnp/mythxmlclient.cpp" line="93"/>
+         <source>Version Mismatch</source>
+         <comment>UPNP Errors</comment>
+         <translation>Version Mismatch</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythupnp/mythxmlclient.cpp" line="122"/>
++        <location filename="../libs/libmythupnp/mythxmlclient.cpp" line="115"/>
+         <source>Not Authorized</source>
+         <comment>UPNP Errors</comment>
+         <translation>Not Authorized</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythupnp/mythxmlclient.cpp" line="126"/>
++        <location filename="../libs/libmythupnp/mythxmlclient.cpp" line="119"/>
+         <source>Unknown Error</source>
+         <comment>UPNP Errors</comment>
+         <translation>Unknown Error</translation>
+@@ -20150,17 +20434,17 @@
      <message>
          <location filename="../libs/libmyth/recordingtypes.cpp" line="251"/>
          <source>Match duplicates using subtitle &amp; description</source>
@@ -19354,7 +23059,7 @@
      </message>
      <message>
          <location filename="../libs/libmyth/recordingtypes.cpp" line="230"/>
-@@ -20180,22 +20859,22 @@
+@@ -20180,22 +20464,22 @@
      <message>
          <location filename="../libs/libmyth/recordingtypes.cpp" line="249"/>
          <source>Match duplicates using description</source>
@@ -19381,7 +23086,7 @@
      </message>
      <message>
          <location filename="../libs/libmyth/recordingtypes.cpp" line="160"/>
-@@ -20221,90 +20900,90 @@
+@@ -20221,211 +20505,211 @@
      <message>
          <location filename="../libs/libmyth/recordingtypes.cpp" line="179"/>
          <source>Look for duplicates in previous recordings only</source>
@@ -19391,103 +23096,103 @@
      <message>
          <location filename="../libs/libmyth/recordingtypes.cpp" line="184"/>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2124"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2125"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2103"/>
          <source>Record new episodes only</source>
 -        <translation>Record new episodes only</translation>
 +        <translation>Record New Episodes Only</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2095"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2096"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2074"/>
          <source>Use any available input</source>
 -        <translation>Use any available input</translation>
 +        <translation>Use Any Available Input</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2102"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2103"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2081"/>
          <source>Prefer input %1</source>
 -        <translation>Prefer input %1</translation>
 +        <translation>Prefer Input %1</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2121"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2122"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2100"/>
          <source>Record new and repeat episodes</source>
 -        <translation>Record new and repeat episodes</translation>
 +        <translation>Record New and Repeat Episodes</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2418"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2419"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2396"/>
          <source>Record using the %1 profile</source>
 -        <translation>Record using the %1 profile</translation>
 +        <translation>Record Using the %1 Profile</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2425"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2426"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2403"/>
          <source>LiveTV</source>
          <translation>LiveTV</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2428"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2429"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2406"/>
          <source>High Quality</source>
          <translation>High Quality</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2431"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2432"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2409"/>
          <source>Low Quality</source>
          <translation>Low Quality</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2442"/>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2653"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2443"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2654"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2420"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2631"/>
          <source>Include in the &quot;%1&quot; recording group</source>
          <translation>Include in the &quot;%1&quot; recording group</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2444"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2445"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2422"/>
          <source>Create a new recording group</source>
 -        <translation>Create a new recording group</translation>
 +        <translation>Create a New Recording Group</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2474"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2475"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2452"/>
          <source>Store in the &quot;%1&quot; storage group</source>
 -        <translation>Store in the &quot;%1&quot; storage group</translation>
 +        <translation>Store in the &quot;%1&quot; Storage Group</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2495"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2496"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2473"/>
          <source>Use &quot;%1&quot; playback group settings</source>
 -        <translation>Use &quot;%1&quot; playback group settings</translation>
 +        <translation>Use &quot;%1&quot; Playback Group Settings</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2528"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2529"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2506"/>
          <source>Don&apos;t record if this would exceed the max episodes</source>
 -        <translation>Don&apos;t record if this would exceed the max episodes</translation>
 +        <translation>Don&apos;t Record If This Would Exceed the Max Episodes</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2531"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2532"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2509"/>
          <source>Delete oldest if this would exceed the max episodes</source>
 -        <translation>Delete oldest if this would exceed the max episodes</translation>
 +        <translation>Delete Oldest If This Would Exceed the Max Episodes</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2630"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2631"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2608"/>
          <source>New Recording group name: </source>
 -        <translation>New Recording group name: </translation>
 +        <translation>New Recording Group name: </translation>
@@ -19497,39 +23202,69 @@
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2803"/>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2817"/>
 -        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2831"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2790"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2804"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2818"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2832"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2767"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2781"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2795"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="2809"/>
          <source>Run &apos;%1&apos;</source>
          <translation>Run &apos;%1&apos;</translation>
      </message>
-@@ -20335,97 +21014,97 @@
-         <translation>SetParameters() called with handle == NULL!</translation>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="303"/>
++        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="300"/>
+         <source>5.1 Channel Audio</source>
+         <translation>5.1 Channel Audio</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="311"/>
++        <location filename="../programs/mythfrontend/setupwizard_audio.cpp" line="308"/>
+         <source>7.1 Channel Audio</source>
+         <translation>7.1 Channel Audio</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/audio/audiooutput.cpp" line="382"/>
++        <location filename="../libs/libmyth/audio/audiooutput.cpp" line="383"/>
+         <source> (guessing: </source>
+         <translation> (guessing: </translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/audio/audiooutputalsa.cpp" line="479"/>
++        <location filename="../libs/libmyth/audio/audiooutputalsa.cpp" line="478"/>
+         <location filename="../libs/libmyth/audio/audiooutputopensles.cpp" line="176"/>
+         <source>Unknown sample format: %1</source>
+         <translation>Unknown sample format: %1</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/audio/audiooutputalsa.cpp" line="674"/>
+-        <source>SetParameters() called with handle == NULL!</source>
+-        <translation>SetParameters() called with handle == NULL!</translation>
++        <location filename="../libs/libmyth/audio/audiooutputalsa.cpp" line="675"/>
++        <source>SetParameters() called with handle == nullptr!</source>
++        <translation></translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/audio/audiooutputbase.cpp" line="670"/>
-+        <location filename="../libs/libmyth/audio/audiooutputbase.cpp" line="684"/>
++        <location filename="../libs/libmyth/audio/audiooutputbase.cpp" line="689"/>
          <source>Aborting Audio Reconfigure. Can&apos;t handle audio with more than 8 channels.</source>
          <translation>Aborting Audio Reconfigure. Can&apos;t handle audio with more than 8 channels.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/audio/audiooutputbase.cpp" line="722"/>
-+        <location filename="../libs/libmyth/audio/audiooutputbase.cpp" line="736"/>
++        <location filename="../libs/libmyth/audio/audiooutputbase.cpp" line="741"/>
          <source>Error creating resampler: %1</source>
 -        <translation>Error creating resampler: %1</translation>
 +        <translation>Error Creating Resampler: %1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/audio/audiooutputbase.cpp" line="758"/>
-+        <location filename="../libs/libmyth/audio/audiooutputbase.cpp" line="772"/>
++        <location filename="../libs/libmyth/audio/audiooutputbase.cpp" line="777"/>
          <source>AC-3 encoder initialization failed</source>
 -        <translation>AC-3 encoder initialization failed</translation>
 +        <translation>Ac-3 Encoder Initialization Failed</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/audio/audiooutputbase.cpp" line="819"/>
-+        <location filename="../libs/libmyth/audio/audiooutputbase.cpp" line="833"/>
++        <location filename="../libs/libmyth/audio/audiooutputbase.cpp" line="838"/>
          <source>Aborting reconfigure</source>
 -        <translation>Aborting reconfigure</translation>
 +        <translation>Aborting Reconfigure</translation>
@@ -19553,13 +23288,15 @@
 +        <translation>Failed to Create DS Buffer 0x%1</translation>
      </message>
      <message>
-         <location filename="../libs/libmyth/audio/audiooutputoss.cpp" line="143"/>
+-        <location filename="../libs/libmyth/audio/audiooutputoss.cpp" line="143"/>
++        <location filename="../libs/libmyth/audio/audiooutputoss.cpp" line="141"/>
          <source>Error opening audio device (%1)</source>
 -        <translation>Error opening audio device (%1)</translation>
 +        <translation>Error Opening Audio Device (%1)</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/streamingringbuffer.cpp" line="77"/>
+-        <location filename="../libs/libmythtv/streamingringbuffer.cpp" line="77"/>
++        <location filename="../libs/libmythtv/streamingringbuffer.cpp" line="82"/>
          <source>Failed to open stream (%1)</source>
 -        <translation>Failed to open stream (%1)</translation>
 +        <translation>Failed to Open Stream (%1)</translation>
@@ -19614,17 +23351,17 @@
      </message>
      <message>
 -        <location filename="../programs/mythfilldatabase/xmltvparser.cpp" line="349"/>
-+        <location filename="../programs/mythfilldatabase/xmltvparser.cpp" line="383"/>
++        <location filename="../programs/mythfilldatabase/xmltvparser.cpp" line="386"/>
          <source>movie</source>
          <translation>movie</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfilldatabase/xmltvparser.cpp" line="350"/>
-+        <location filename="../programs/mythfilldatabase/xmltvparser.cpp" line="384"/>
++        <location filename="../programs/mythfilldatabase/xmltvparser.cpp" line="387"/>
          <source>film</source>
          <translation>film</translation>
      </message>
-@@ -20433,56 +21112,56 @@
+@@ -20433,56 +20717,56 @@
          <location filename="../programs/mythshutdown/main.cpp" line="72"/>
          <source>Error: Database not open while trying to load setting: %1</source>
          <comment>mythshutdown</comment>
@@ -19690,7 +23427,7 @@
      </message>
      <message>
          <location filename="../programs/mythshutdown/main.cpp" line="317"/>
-@@ -20500,176 +21179,176 @@
+@@ -20500,185 +20784,185 @@
          <location filename="../programs/mythshutdown/main.cpp" line="342"/>
          <source>About to start daily wakeup period (1)</source>
          <comment>mythshutdown</comment>
@@ -19832,89 +23569,110 @@
 +        <translation>Daily Wakeup is Set but Will Wake Up At Next Scheduled Program</translation>
      </message>
      <message>
-         <location filename="../programs/mythshutdown/main.cpp" line="682"/>
+-        <location filename="../programs/mythshutdown/main.cpp" line="682"/>
++        <location filename="../programs/mythshutdown/main.cpp" line="687"/>
          <source>Sending command to set time in BIOS %1</source>
          <comment>mythshutdown</comment>
 -        <translation>Sending command to set time in BIOS %1</translation>
 +        <translation>Sending Command to Set Time in BIOS %1</translation>
      </message>
      <message>
-         <location filename="../programs/mythshutdown/main.cpp" line="689"/>
+-        <location filename="../programs/mythshutdown/main.cpp" line="689"/>
++        <location filename="../programs/mythshutdown/main.cpp" line="694"/>
          <source>Program %1 exited with code %2</source>
          <comment>mythshutdown</comment>
 -        <translation>Program %1 exited with code %2</translation>
 +        <translation>Program %1 Exited with Code %2</translation>
      </message>
      <message>
-         <location filename="../programs/mythshutdown/main.cpp" line="695"/>
+-        <location filename="../programs/mythshutdown/main.cpp" line="695"/>
++        <location filename="../programs/mythshutdown/main.cpp" line="700"/>
          <source>Error: nvram-wakeup failed to set time in BIOS</source>
          <comment>mythshutdown</comment>
 -        <translation>Error: nvram-wakeup failed to set time in BIOS</translation>
 +        <translation>Error: nvram-wakeup Failed to Set Time in BIOS</translation>
      </message>
      <message>
-         <location filename="../programs/mythshutdown/main.cpp" line="710"/>
+-        <location filename="../programs/mythshutdown/main.cpp" line="710"/>
++        <location filename="../programs/mythshutdown/main.cpp" line="715"/>
          <source>The next wakeup time is less than 15 mins away, not shutting down.</source>
          <comment>mythshutdown</comment>
 -        <translation>The next wakeup time is less than 15 mins away, not shutting down.</translation>
 +        <translation>The Next Wakeup Time is Less Than 15 Mins Away, Not Shutting Down.</translation>
      </message>
      <message>
-         <location filename="../programs/mythshutdown/main.cpp" line="724"/>
+-        <location filename="../programs/mythshutdown/main.cpp" line="724"/>
++        <location filename="../programs/mythshutdown/main.cpp" line="729"/>
          <source>everything looks fine, shutting down ...</source>
          <comment>mythshutdown</comment>
 -        <translation>everything looks fine, shutting down ...</translation>
 +        <translation>Everything Looks Fine, Shutting Down...</translation>
      </message>
      <message>
-         <location filename="../programs/mythshutdown/main.cpp" line="729"/>
+-        <location filename="../programs/mythshutdown/main.cpp" line="729"/>
++        <location filename="../programs/mythshutdown/main.cpp" line="734"/>
          <source>shutting down</source>
          <comment>mythshutdown</comment>
 -        <translation>shutting down</translation>
 +        <translation>Shutting Down</translation>
      </message>
      <message>
-         <location filename="../programs/mythshutdown/main.cpp" line="739"/>
+-        <location filename="../programs/mythshutdown/main.cpp" line="739"/>
++        <location filename="../programs/mythshutdown/main.cpp" line="744"/>
          <source>Everything looks fine, but reboot is needed</source>
          <comment>mythshutdown</comment>
 -        <translation>Everything looks fine, but reboot is needed</translation>
 +        <translation>Everything Looks Fine, but Reboot is Needed</translation>
      </message>
      <message>
-         <location filename="../programs/mythshutdown/main.cpp" line="742"/>
+-        <location filename="../programs/mythshutdown/main.cpp" line="742"/>
++        <location filename="../programs/mythshutdown/main.cpp" line="747"/>
          <source>Sending command to bootloader</source>
          <comment>mythshutdown</comment>
 -        <translation>Sending command to bootloader</translation>
 +        <translation>Sending Command to Bootloader</translation>
      </message>
      <message>
-         <location filename="../programs/mythshutdown/main.cpp" line="749"/>
+-        <location filename="../programs/mythshutdown/main.cpp" line="749"/>
++        <location filename="../programs/mythshutdown/main.cpp" line="754"/>
          <source>rebooting</source>
          <comment>mythshutdown</comment>
 -        <translation>rebooting</translation>
 +        <translation>Rebooting</translation>
      </message>
      <message>
-         <location filename="../programs/mythshutdown/main.cpp" line="760"/>
-@@ -20686,14 +21365,14 @@
+-        <location filename="../programs/mythshutdown/main.cpp" line="760"/>
++        <location filename="../programs/mythshutdown/main.cpp" line="765"/>
+         <source>Error: Invalid shutdown mode, doing nothing.</source>
+         <comment>mythshutdown</comment>
+         <translation>Error: Invalid shutdown mode, doing nothing.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythshutdown/main.cpp" line="893"/>
++        <location filename="../programs/mythshutdown/main.cpp" line="898"/>
+         <source>Error: --setwakeup invalid date format (%1)
+ 			must be yyyy-MM-ddThh:mm:ss</source>
+         <comment>mythshutdown</comment>
+@@ -20686,14 +20970,14 @@
  			must be yyyy-MM-ddThh:mm:ss</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recorders/ExternalSignalMonitor.cpp" line="97"/>
-+        <location filename="../libs/libmythtv/recorders/ExternalSignalMonitor.cpp" line="110"/>
++        <location filename="../libs/libmythtv/recorders/ExternalSignalMonitor.cpp" line="115"/>
          <source>Error: stream handler died</source>
 -        <translation>Error: stream handler died</translation>
 +        <translation>Error: Stream Handler Died</translation>
      </message>
      <message>
-         <location filename="../libs/libmythtv/tvbrowsehelper.cpp" line="583"/>
+-        <location filename="../libs/libmythtv/tvbrowsehelper.cpp" line="583"/>
++        <location filename="../libs/libmythtv/tvbrowsehelper.cpp" line="573"/>
          <source>All channels</source>
 -        <translation>All channels</translation>
 +        <translation>All Channels</translation>
      </message>
      <message>
          <location filename="../programs/mythbackend/upnpcdsmusic.cpp" line="105"/>
-@@ -20717,6 +21396,11 @@
+@@ -20717,6 +21001,11 @@
          <source>Genre</source>
          <translation>Genre</translation>
      </message>
@@ -19926,48 +23684,126 @@
  </context>
  <context>
      <name>RawSettingsEditor</name>
-@@ -20729,12 +21413,12 @@
+@@ -20729,12 +21018,12 @@
  <context>
      <name>RecMetadataEdit</name>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5356"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5387"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5400"/>
          <source>Trying to manually find this recording online...</source>
 -        <translation>Trying to manually find this recording online...</translation>
 +        <translation>Trying to Manually Find This Recording Online...</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5479"/>
-+        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5510"/>
++        <location filename="../programs/mythfrontend/playbackbox.cpp" line="5523"/>
          <source>No match found for this recording. You can try entering a TVDB/TMDB number, season, and episode manually.</source>
          <translation>No match found for this recording. You can try entering a TVDB/TMDB number, season, and episode manually.</translation>
      </message>
-@@ -20742,14 +21426,18 @@
+@@ -20742,77 +21031,78 @@
  <context>
      <name>RecordingProfileEditor</name>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1793"/>
-         <source>Add Recording Profile</source>
+-        <source>Add Recording Profile</source>
 -        <translation>Add Recording Profile</translation>
-+        <translation type="vanished">Add Recording Profile</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1648"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1669"/>
 +        <source>(Create new profile)</source>
 +        <translation>Create New Profile</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1794"/>
-+        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1660"/>
++        <location filename="../libs/libmythtv/recordingprofile.cpp" line="1681"/>
          <source>Enter the name of the new profile</source>
 -        <translation>Enter the name of the new profile</translation>
 +        <translation>Enter profile name:</translation>
      </message>
- </context>
+ </context>
+ <context>
+     <name>RecordingRule</name>
+     <message>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="50"/>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="321"/>
++        <location filename="../libs/libmythtv/recordingrule.cpp" line="51"/>
++        <location filename="../libs/libmythtv/recordingrule.cpp" line="363"/>
+         <source>Default</source>
+         <translation>Default</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="324"/>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="545"/>
++        <location filename="../libs/libmythtv/recordingrule.cpp" line="366"/>
++        <location filename="../libs/libmythtv/recordingrule.cpp" line="592"/>
++        <location filename="../libs/libmythtv/recordingrule.cpp" line="593"/>
+         <source>Default (Template)</source>
+         <translation>Default (Template)</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="329"/>
++        <location filename="../libs/libmythtv/recordingrule.cpp" line="372"/>
+         <source>%1 (Template)</source>
+         <extracomment>%1 is the category</extracomment>
+         <translation>%1 (Template)</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="353"/>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="809"/>
++        <location filename="../libs/libmythtv/recordingrule.cpp" line="397"/>
++        <location filename="../libs/libmythtv/recordingrule.cpp" line="853"/>
+         <source>Power Search</source>
+         <translation>Power Search</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="554"/>
++        <location filename="../libs/libmythtv/recordingrule.cpp" line="607"/>
+         <source>Default</source>
+         <comment>category</comment>
+         <translation>Default</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="637"/>
++        <location filename="../libs/libmythtv/recordingrule.cpp" line="678"/>
+         <source>(%1 or later) %3</source>
+         <comment>e.g. (Sunday or later) program subtitle</comment>
+         <translation>(%1 or later) %3</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="668"/>
++        <location filename="../libs/libmythtv/recordingrule.cpp" line="709"/>
+         <source>Default</source>
+         <comment>Default template</comment>
+         <translation>Default</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="812"/>
++        <location filename="../libs/libmythtv/recordingrule.cpp" line="856"/>
+         <source>Title Search</source>
+         <translation>Title Search</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="815"/>
++        <location filename="../libs/libmythtv/recordingrule.cpp" line="859"/>
+         <source>Keyword Search</source>
+         <translation>Keyword Search</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="818"/>
++        <location filename="../libs/libmythtv/recordingrule.cpp" line="862"/>
+         <source>People Search</source>
+         <translation>People Search</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/recordingrule.cpp" line="821"/>
++        <location filename="../libs/libmythtv/recordingrule.cpp" line="865"/>
+         <source>Unknown Search</source>
+         <translation>Unknown Search</translation>
+     </message>
+@@ -20820,130 +21110,126 @@
  <context>
-@@ -20822,128 +21510,130 @@
+     <name>ScanMonitor</name>
      <message>
-         <location filename="../libs/libmythtv/channelscan/scanmonitor.cpp" line="117"/>
+-        <location filename="../libs/libmythtv/channelscan/scanmonitor.cpp" line="117"/>
++        <location filename="../libs/libmythtv/channelscan/scanmonitor.cpp" line="116"/>
          <source>Scanning</source>
 -        <translation>Scanning</translation>
 +        <translation>Scanning...</translation>
@@ -19977,14 +23813,14 @@
      <name>ScanOptionalConfig</name>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="242"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="236"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="245"/>
          <source>Failed to open the card</source>
 -        <translation>Failed to open the card</translation>
 +        <translation>Failed to Open the Card</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="244"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="238"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="247"/>
          <source>Failed to probe the card</source>
 -        <translation>Failed to probe the card</translation>
 +        <translation>Failed to Probe the Card</translation>
@@ -19993,18 +23829,20 @@
  <context>
      <name>ScanTypeSetting</name>
      <message>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="103"/>
-         <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="109"/>
+-        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="109"/>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="115"/>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="125"/>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="153"/>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="161"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="119"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="147"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="155"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="165"/>
-         <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="171"/>
+-        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="171"/>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="177"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="110"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="116"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="126"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="154"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="162"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="172"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="178"/>
          <source>Full Scan</source>
          <translation>Full Scan</translation>
      </message>
@@ -20017,14 +23855,14 @@
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="157"/>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="165"/>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="181"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="105"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="115"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="125"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="133"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="141"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="151"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="159"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="175"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="112"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="122"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="132"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="140"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="148"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="158"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="166"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="182"/>
          <source>Import existing scan</source>
 -        <translation>Import existing scan</translation>
 +        <translation>Import Existing Scan</translation>
@@ -20036,69 +23874,74 @@
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="143"/>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="151"/>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="173"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="111"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="121"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="129"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="137"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="145"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="167"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="118"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="128"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="136"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="144"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="152"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="174"/>
          <source>Full Scan (Tuned)</source>
          <translation>Full Scan (Tuned)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="185"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="179"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="186"/>
          <source>VBox Channel Import</source>
          <translation>VBox Channel Import</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="189"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="183"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="190"/>
          <source>M3U Import with MPTS</source>
          <translation>M3U Import with MPTS</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="191"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="185"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="192"/>
          <source>M3U Import</source>
          <translation>M3U Import</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="195"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="189"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="196"/>
          <source>ASI Scan</source>
          <translation>ASI Scan</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="199"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="193"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="200"/>
          <source>MPTS Scan</source>
          <translation>MPTS Scan</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="203"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="197"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="202"/>
++        <source>Import from ExternalRecorder</source>
++        <translation></translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="206"/>
          <source>Failed to probe the card</source>
 -        <translation>Failed to probe the card</translation>
 +        <translation>Failed to Probe the Card</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="207"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="201"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="210"/>
          <source>Failed to open the card</source>
 -        <translation>Failed to open the card</translation>
 +        <translation>Failed to Open the Card</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="212"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="206"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="215"/>
          <source>Scan of all existing transports</source>
 -        <translation>Scan of all existing transports</translation>
 +        <translation>Scan of All Existing Transports</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="214"/>
-+        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="208"/>
++        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="217"/>
          <source>Scan of single existing transport</source>
 -        <translation>Scan of single existing transport</translation>
 +        <translation>Scan of Single Existing Transport</translation>
@@ -20109,41 +23952,37 @@
      <message>
 -        <location filename="../libs/libmythtv/scanwizard.cpp" line="165"/>
 -        <location filename="../libs/libmythtv/scanwizard.cpp" line="184"/>
-         <source>ScanWizard</source>
+-        <source>ScanWizard</source>
 -        <translation>ScanWizard</translation>
-+        <translation type="vanished">ScanWizard</translation>
-+    </message>
-+    <message>
 +        <location filename="../libs/libmythtv/scanwizard.cpp" line="52"/>
 +        <source>Scan</source>
 +        <translation>Scan</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/scanwizard.cpp" line="166"/>
-+        <location filename="../libs/libmythtv/scanwizard.cpp" line="146"/>
++        <location filename="../libs/libmythtv/scanwizard.cpp" line="151"/>
          <source>Programmer Error, see console</source>
 -        <translation>Programmer Error, see console</translation>
 +        <translation>Programmer Error, See Console</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/scanwizard.cpp" line="185"/>
-+        <location filename="../libs/libmythtv/scanwizard.cpp" line="163"/>
++        <location filename="../libs/libmythtv/scanwizard.cpp" line="168"/>
          <source>Error parsing parameters</source>
 -        <translation>Error parsing parameters</translation>
-+        <translation>Error Parsing Parameters</translation>
-     </message>
- </context>
- <context>
-     <name>ScanWizardConfig</name>
-     <message>
+-    </message>
+-</context>
+-<context>
+-    <name>ScanWizardConfig</name>
+-    <message>
 -        <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="37"/>
-         <source>Scan Configuration</source>
+-        <source>Scan Configuration</source>
 -        <translation>Scan Configuration</translation>
-+        <translation type="vanished">Scan Configuration</translation>
++        <translation>Error Parsing Parameters</translation>
      </message>
  </context>
  <context>
-@@ -20951,168 +21641,173 @@
+@@ -20951,168 +21237,178 @@
      <message>
          <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="52"/>
          <source>New episode</source>
@@ -20221,23 +24060,28 @@
      <name>ScheduleCommon</name>
      <message>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="288"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="296"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="196"/>
++        <source>Recording rule does not exist.</source>
++        <translation>Recording rule does not exist.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="300"/>
          <source>The following programs will be recorded instead:</source>
 -        <translation>The following programs will be recorded instead:</translation>
 +        <translation>The Following Programs Will Be Recorded Instead:</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="335"/>
-+        <source>Watch This Channel</source>
-+        <translation>Watch This Channel</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="329"/>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="381"/>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="471"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="340"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="394"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="484"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="339"/>
++        <source>Watch This Channel</source>
++        <translation>Watch This Channel</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="344"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="398"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="488"/>
          <source>Record this showing</source>
 -        <translation>Record this showing</translation>
 +        <translation>Record This Showing</translation>
@@ -20245,8 +24089,8 @@
      <message>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="331"/>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="482"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="342"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="495"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="346"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="499"/>
          <source>Record all showings</source>
 -        <translation>Record all showings</translation>
 +        <translation>Record All Showings</translation>
@@ -20254,8 +24098,8 @@
      <message>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="336"/>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="485"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="347"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="498"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="351"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="502"/>
          <source>Record one showing</source>
 -        <translation>Record one showing</translation>
 +        <translation>Record One Showing</translation>
@@ -20263,8 +24107,8 @@
      <message>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="339"/>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="484"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="350"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="497"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="354"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="501"/>
          <source>Record one showing (this episode)</source>
 -        <translation>Record one showing (this episode)</translation>
 +        <translation>Record One Showing (this episode)</translation>
@@ -20272,8 +24116,8 @@
      <message>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="343"/>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="491"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="354"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="504"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="358"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="508"/>
          <source>Record all showings (this channel)</source>
 -        <translation>Record all showings (this channel)</translation>
 +        <translation>Record All Showings (this channel)</translation>
@@ -20282,9 +24126,9 @@
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="345"/>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="445"/>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="521"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="356"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="458"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="534"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="360"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="462"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="538"/>
          <source>Edit recording rule</source>
 -        <translation>Edit recording rule</translation>
 +        <translation>Edit Recording Rule</translation>
@@ -20292,8 +24136,8 @@
      <message>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="352"/>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="497"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="365"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="510"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="369"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="514"/>
          <source>Stop this recording</source>
 -        <translation>Stop this recording</translation>
 +        <translation>Stop This Recording</translation>
@@ -20301,8 +24145,8 @@
      <message>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="354"/>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="501"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="367"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="514"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="371"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="518"/>
          <source>Modify recording options</source>
 -        <translation>Modify recording options</translation>
 +        <translation>Modify Recording Options</translation>
@@ -20310,8 +24154,8 @@
      <message>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="364"/>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="511"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="377"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="524"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="381"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="528"/>
          <source>Restart this recording</source>
 -        <translation>Restart this recording</translation>
 +        <translation>Restart This Recording</translation>
@@ -20319,8 +24163,8 @@
      <message>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="387"/>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="513"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="400"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="526"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="404"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="530"/>
          <source>Forget previous recording</source>
 -        <translation>Forget previous recording</translation>
 +        <translation>Forget Previous Recording</translation>
@@ -20328,8 +24172,8 @@
      <message>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="404"/>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="515"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="417"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="528"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="421"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="532"/>
          <source>Don&apos;t record this showing</source>
 -        <translation>Don&apos;t record this showing</translation>
 +        <translation>Don&apos;t Record This Showing</translation>
@@ -20337,8 +24181,8 @@
      <message>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="426"/>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="517"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="439"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="530"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="443"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="534"/>
          <source>Never record this episode</source>
 -        <translation>Never record this episode</translation>
 +        <translation>Never Record This Episode</translation>
@@ -20346,8 +24190,8 @@
      <message>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="434"/>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="522"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="447"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="535"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="451"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="539"/>
          <source>Edit override rule</source>
 -        <translation>Edit override rule</translation>
 +        <translation>Edit Override Rule</translation>
@@ -20355,8 +24199,8 @@
      <message>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="436"/>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="525"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="449"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="538"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="453"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="542"/>
          <source>Delete override rule</source>
 -        <translation>Delete override rule</translation>
 +        <translation>Delete Override Rule</translation>
@@ -20364,8 +24208,8 @@
      <message>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="443"/>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="502"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="456"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="515"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="460"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="519"/>
          <source>Add override rule</source>
 -        <translation>Add override rule</translation>
 +        <translation>Add Override Rule</translation>
@@ -20373,123 +24217,211 @@
      <message>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="447"/>
 -        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="524"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="460"/>
-+        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="537"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="464"/>
++        <location filename="../programs/mythfrontend/schedulecommon.cpp" line="541"/>
          <source>Delete recording rule</source>
 -        <translation>Delete recording rule</translation>
 +        <translation>Delete Recording Rule</translation>
      </message>
  </context>
  <context>
-@@ -21147,75 +21842,75 @@
+@@ -21129,72 +21425,72 @@
+     </message>
+     <message>
+         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="517"/>
+-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="603"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="602"/>
+         <source>Upcoming Episodes</source>
+         <translation>Upcoming Episodes</translation>
+     </message>
+     <message>
+         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="518"/>
+-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="605"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="604"/>
+         <source>Upcoming Recordings</source>
+         <translation>Upcoming Recordings</translation>
+     </message>
+     <message>
+         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="520"/>
+-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="607"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="606"/>
+         <source>Previously Recorded</source>
+         <translation>Previously Recorded</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="576"/>
--        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="818"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="819"/>
+-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="576"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="575"/>
+         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="818"/>
          <source>Main Options</source>
          <translation>Main Options</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="578"/>
--        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="820"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="821"/>
+-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="578"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="577"/>
+         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="820"/>
          <source>Schedule Options</source>
          <translation>Schedule Options</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="580"/>
--        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="822"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="823"/>
+-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="580"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="579"/>
+         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="822"/>
          <source>Filter Options</source>
          <translation>Filter Options</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="582"/>
--        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="824"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="825"/>
+-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="582"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="581"/>
+         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="824"/>
          <source>Storage Options</source>
          <translation>Storage Options</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="584"/>
--        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="826"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="827"/>
+-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="584"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="583"/>
+         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="826"/>
          <source>Post Processing</source>
          <translation>Post Processing</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="586"/>
--        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="829"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="830"/>
+-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="586"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="585"/>
+         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="829"/>
          <source>Metadata Options</source>
          <translation>Metadata Options</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="588"/>
--        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="834"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="835"/>
+-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="588"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="587"/>
+         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="834"/>
          <source>Use Template</source>
          <translation>Use Template</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="590"/>
--        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="831"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="832"/>
+-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="590"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="589"/>
+         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="831"/>
          <source>Schedule Info</source>
          <translation>Schedule Info</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="592"/>
--        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="833"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="834"/>
+-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="592"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="591"/>
+         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="833"/>
          <source>Preview Changes</source>
          <translation>Preview Changes</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="805"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="806"/>
-         <source>Options</source>
-         <translation>Options</translation>
-     </message>
+@@ -21207,7 +21503,7 @@
      <message>
--        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="848"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="849"/>
+         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="848"/>
          <source>No templates available</source>
 -        <translation>No templates available</translation>
 +        <translation>No Templates Available</translation>
      </message>
      <message>
--        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="852"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="853"/>
-         <source>Template Options</source>
-         <translation>Template Options</translation>
+         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="852"/>
+@@ -21226,7 +21522,7 @@
      </message>
      <message>
--        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="864"/>
-+        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="865"/>
-         <source>Default</source>
-         <translation>Default</translation>
+         <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="516"/>
+-        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="601"/>
++        <location filename="../programs/mythfrontend/scheduleeditor.cpp" line="600"/>
+         <source>Program Details</source>
+         <translation>Program Details</translation>
+     </message>
+@@ -21244,17 +21540,17 @@
+         <translation>Upgrade</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/schemawizard.cpp" line="246"/>
++        <location filename="../libs/libmyth/schemawizard.cpp" line="249"/>
+         <source>There are also other clients using this database. They should be shut down first.</source>
+         <translation>There are also other clients using this database. They should be shut down first.</translation>
      </message>
-@@ -21251,7 +21946,7 @@
      <message>
-         <location filename="../libs/libmyth/schemawizard.cpp" line="249"/>
+-        <location filename="../libs/libmyth/schemawizard.cpp" line="249"/>
++        <location filename="../libs/libmyth/schemawizard.cpp" line="252"/>
          <source>Error: This version of Myth%1 requires MySQL %2.%3.%4 or later.  You seem to be running MySQL version %5.</source>
 -        <translation>Error: This version of Myth%1 requires MySQL %2.%3.%4 or later.  You seem to be running MySQL version %5.</translation>
 +        <translation>Error: This version of Myth%1 requires MySQL %2.%3.%4 or later. You seem to be running MySQL version %5.</translation>
      </message>
      <message>
-         <location filename="../libs/libmyth/schemawizard.cpp" line="317"/>
-@@ -21316,7 +22011,7 @@
+-        <location filename="../libs/libmyth/schemawizard.cpp" line="317"/>
++        <location filename="../libs/libmyth/schemawizard.cpp" line="320"/>
+         <source>Error: MythTV cannot upgrade the schema of this datatase because other clients are using it.
+ 
+ Please shut them down before upgrading.</source>
+@@ -21263,49 +21559,49 @@
+ Please shut them down before upgrading.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/schemawizard.cpp" line="324"/>
++        <location filename="../libs/libmyth/schemawizard.cpp" line="327"/>
+         <source>Warning: MythTV wants to upgrade your database,</source>
+         <translation>Warning: MythTV wants to upgrade your database,</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/schemawizard.cpp" line="325"/>
++        <location filename="../libs/libmyth/schemawizard.cpp" line="328"/>
+         <source>for the %1 schema, from %2 to %3.</source>
+         <translation>for the %1 schema, from %2 to %3.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/schemawizard.cpp" line="339"/>
++        <location filename="../libs/libmyth/schemawizard.cpp" line="342"/>
+         <source>This version of MythTV requires an updated database. </source>
+         <translation>This version of MythTV requires an updated database. </translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/schemawizard.cpp" line="340"/>
++        <location filename="../libs/libmyth/schemawizard.cpp" line="343"/>
+         <source>(schema is %1 versions behind)</source>
+         <translation>(schema is %1 versions behind)</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/schemawizard.cpp" line="341"/>
++        <location filename="../libs/libmyth/schemawizard.cpp" line="344"/>
+         <source>Please run mythtv-setup or mythbackend to update your database.</source>
+         <translation>Please run mythtv-setup or mythbackend to update your database.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/schemawizard.cpp" line="353"/>
++        <location filename="../libs/libmyth/schemawizard.cpp" line="356"/>
+         <source>Error: MythTV database has newer %1 schema (%2) than expected (%3).</source>
+         <translation>Error: MythTV database has newer %1 schema (%2) than expected (%3).</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/schemawizard.cpp" line="360"/>
++        <location filename="../libs/libmyth/schemawizard.cpp" line="363"/>
+         <source>MythTV was unable to backup your database.</source>
+         <translation>MythTV was unable to backup your database.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/schemawizard.cpp" line="367"/>
++        <location filename="../libs/libmyth/schemawizard.cpp" line="370"/>
+         <source>Database Host: %1
+ Database Name: %2</source>
+         <translation>Database Host: %1
+ Database Name: %2</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmyth/schemawizard.cpp" line="397"/>
++        <location filename="../libs/libmyth/schemawizard.cpp" line="400"/>
+         <source>If your system becomes unstable, a database backup file called
+ %1
+ is located in %2</source>
+@@ -21314,9 +21610,9 @@
+ is located in %2</translation>
+     </message>
      <message>
-         <location filename="../libs/libmyth/schemawizard.cpp" line="402"/>
+-        <location filename="../libs/libmyth/schemawizard.cpp" line="402"/>
++        <location filename="../libs/libmyth/schemawizard.cpp" line="405"/>
          <source>This cannot be un-done, so having a database backup would be a good idea.</source>
 -        <translation>This cannot be un-done, so having a database backup would be a good idea.</translation>
 +        <translation>This cannot be undone, so having a database backup would be a good idea.</translation>
      </message>
  </context>
  <context>
-@@ -21324,68 +22019,116 @@
+@@ -21324,60 +21620,50 @@
      <message>
          <location filename="../libs/libmythtv/signalmonitorvalue.cpp" line="24"/>
          <source>Could not open tuner device</source>
@@ -20504,114 +24436,77 @@
      </message>
  </context>
  <context>
-     <name>SlideSettings</name>
+-    <name>SlideSettings</name>
++    <name>StandardSettingDialog</name>
      <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="68"/>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="73"/>
-         <source>Slideshow</source>
-         <translation>Slideshow</translation>
-     </message>
-     <message>
+-        <source>Slideshow</source>
+-        <translation>Slideshow</translation>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="71"/>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="76"/>
-         <source>Transition</source>
-         <translation>Transition</translation>
+-        <source>Transition</source>
+-        <translation>Transition</translation>
++        <location filename="../libs/libmyth/standardsettings.cpp" line="1003"/>
++        <source>Exit ?</source>
++        <translation>Exit Settings?</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="72"/>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="77"/>
-         <source>Effect to use between slides</source>
+-        <source>Effect to use between slides</source>
 -        <translation>Effect to use between slides</translation>
-+        <translation>Effect to Use Between Slides</translation>
++        <location filename="../libs/libmyth/standardsettings.cpp" line="1017"/>
++        <source>Save then Exit</source>
++        <translation>Save and Exit</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="86"/>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="91"/>
-         <source>Slide Duration (ms)</source>
-         <translation>Slide Duration (ms)</translation>
-     </message>
-     <message>
+-        <source>Slide Duration (ms)</source>
+-        <translation>Slide Duration (ms)</translation>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="87"/>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="92"/>
-         <source>The time that a slide is displayed (between transitions), in milliseconds.</source>
-         <translation>The time that a slide is displayed (between transitions), in milliseconds.</translation>
+-        <source>The time that a slide is displayed (between transitions), in milliseconds.</source>
+-        <translation>The time that a slide is displayed (between transitions), in milliseconds.</translation>
++        <location filename="../libs/libmyth/standardsettings.cpp" line="1018"/>
++        <source>Exit without saving changes</source>
++        <translation>Exit Without Saving</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="92"/>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="97"/>
-         <source>Transition Duration (ms)</source>
-         <translation>Transition Duration (ms)</translation>
+-        <source>Transition Duration (ms)</source>
+-        <translation>Transition Duration (ms)</translation>
++        <location filename="../libs/libmyth/standardsettings.cpp" line="1019"/>
++        <source>Cancel</source>
++        <translation>Cancel</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="93"/>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="98"/>
-         <source>The time that each transition lasts, in milliseconds.</source>
-         <translation>The time that each transition lasts, in milliseconds.</translation>
+-        <source>The time that each transition lasts, in milliseconds.</source>
+-        <translation>The time that each transition lasts, in milliseconds.</translation>
++        <location filename="../libs/libmyth/standardsettings.cpp" line="1093"/>
++        <source>Edit</source>
++        <translation>Edit</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="97"/>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="102"/>
-+        <source>Status Delay (ms)</source>
-+        <translation>Status Delay (ms)</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="103"/>
-+        <source>The delay before showing the Loading/Playing status, in milliseconds.</source>
-+        <translation>The delay before showing the loading/playing status, in milliseconds.</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="108"/>
-         <source>Use transitions when browsing</source>
+-        <source>Use transitions when browsing</source>
 -        <translation>Use transitions when browsing</translation>
-+        <translation>Use Transitions When Browsing</translation>
++        <location filename="../libs/libmyth/standardsettings.cpp" line="1095"/>
++        <source>Delete</source>
++        <translation>Delete</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="98"/>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="109"/>
-         <source>When cleared, transitions will only be used during a slideshow.</source>
-         <translation>When cleared, transitions will only be used during a slideshow.</translation>
+-        <source>When cleared, transitions will only be used during a slideshow.</source>
+-        <translation>When cleared, transitions will only be used during a slideshow.</translation>
++        <location filename="../libs/libmyth/standardsettings.cpp" line="1131"/>
++        <source>Do you want to delete the &apos;%1&apos; entry?</source>
++        <translation>Do you want to delete the &apos;%1&apos; entry?</translation>
      </message>
  </context>
  <context>
-+    <name>StandardSettingDialog</name>
-+    <message>
-+        <location filename="../libs/libmyth/standardsettings.cpp" line="1002"/>
-+        <source>Exit ?</source>
-+        <translation>Exit Settings?</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmyth/standardsettings.cpp" line="1016"/>
-+        <source>Save then Exit</source>
-+        <translation>Save and Exit</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmyth/standardsettings.cpp" line="1017"/>
-+        <source>Exit without saving changes</source>
-+        <translation>Exit Without Saving</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmyth/standardsettings.cpp" line="1018"/>
-+        <source>Cancel</source>
-+        <translation>Cancel</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmyth/standardsettings.cpp" line="1092"/>
-+        <source>Edit</source>
-+        <translation>Edit</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmyth/standardsettings.cpp" line="1094"/>
-+        <source>Delete</source>
-+        <translation>Delete</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmyth/standardsettings.cpp" line="1130"/>
-+        <source>Do you want to delete the &apos;%1&apos; entry?</source>
-+        <translation>Do you want to delete the &apos;%1&apos; entry?</translation>
-+    </message>
-+</context>
-+<context>
-     <name>StartPrompter</name>
+@@ -21385,7 +21671,7 @@
      <message>
          <location filename="../programs/mythtv-setup/startprompt.cpp" line="72"/>
          <source>WARNING: The backend is currently running.</source>
@@ -20619,331 +24514,583 @@
 +        <translation>Warning: The backend is currently running.</translation>
      </message>
      <message>
-         <location filename="../programs/mythtv-setup/startprompt.cpp" line="73"/>
-@@ -21395,7 +22138,7 @@
+         <location filename="../programs/mythtv-setup/startprompt.cpp" line="73"/>
+@@ -21395,7 +21681,7 @@
+     <message>
+         <location filename="../programs/mythtv-setup/startprompt.cpp" line="77"/>
+         <source>Recording Status: RECORDING.</source>
+-        <translation>Recording Status: RECORDING.</translation>
++        <translation>Recording Status: Recording</translation>
+     </message>
+     <message>
+         <location filename="../programs/mythtv-setup/startprompt.cpp" line="78"/>
+@@ -21405,7 +21691,7 @@
+     <message>
+         <location filename="../programs/mythtv-setup/startprompt.cpp" line="82"/>
+         <source>Recording Status: None.</source>
+-        <translation>Recording Status: None.</translation>
++        <translation>Recording Status: None</translation>
+     </message>
+     <message>
+         <location filename="../programs/mythtv-setup/startprompt.cpp" line="103"/>
+@@ -21426,15 +21712,15 @@
+ <context>
+     <name>StartingChannel</name>
+     <message>
+-        <location filename="../libs/libmythtv/videosource.cpp" line="3318"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3013"/>
+         <source>Please add channels to this source</source>
+-        <translation>Please add channels to this source</translation>
++        <translation>Please Add Channels to This Source</translation>
+     </message>
+ </context>
+ <context>
+     <name>StatusBox</name>
+     <message numerus="yes">
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="1435"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1508"/>
+         <source>%n (is) LiveTV and consume(s) %1
+ </source>
+         <translation>
+@@ -21445,7 +21731,7 @@
+         </translation>
+     </message>
+     <message numerus="yes">
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="1439"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1512"/>
+         <source>%n (is) Deleted and consume(s) %1
+ </source>
+         <translation>
+@@ -21456,8 +21742,8 @@
+         </translation>
+     </message>
+     <message numerus="yes">
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="592"/>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="1123"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="591"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1193"/>
+         <source>%n day(s)</source>
+         <translation>
+             <numerusform>%n day</numerusform>
+@@ -21475,178 +21761,178 @@
+         <translation>Schedule Status</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="122"/>
+-        <source>Tuner Status</source>
+-        <translation>Tuner Status</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="205"/>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="219"/>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="280"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="204"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="218"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="279"/>
+         <source>Log Entries</source>
+         <translation>Log Entries</translation>
+     </message>
+     <message>
+         <location filename="../programs/mythfrontend/statusbox.cpp" line="126"/>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="293"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="292"/>
+         <source>Job Queue</source>
+         <translation>Job Queue</translation>
+     </message>
+     <message>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="122"/>
++        <source>Input Status</source>
++        <translation></translation>
++    </message>
++    <message>
+         <location filename="../programs/mythfrontend/statusbox.cpp" line="130"/>
+         <source>Machine Status</source>
+         <translation>Machine Status</translation>
+     </message>
+     <message>
+         <location filename="../programs/mythfrontend/statusbox.cpp" line="134"/>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="351"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="350"/>
+         <source>AutoExpire List</source>
+         <translation>AutoExpire List</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="207"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="206"/>
+         <source>Acknowledge all log entries at this priority level or lower?</source>
+         <translation>Acknowledge all log entries at this priority level or lower?</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="224"/>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="227"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="223"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="226"/>
+         <source>Setting priority level to %1</source>
+         <translation>Setting priority level to %1</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="282"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="281"/>
+         <source>Acknowledge this log entry?</source>
+         <translation>Acknowledge this log entry?</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="302"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="301"/>
+         <source>Delete Job?</source>
+         <translation>Delete Job?</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="318"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="317"/>
+         <source>Job Queue Actions:</source>
+         <translation>Job Queue Actions:</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="331"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="330"/>
+         <source>Resume</source>
+         <translation>Resume</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="333"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="332"/>
+         <source>Pause</source>
+         <translation>Pause</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="334"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="333"/>
+         <source>Stop</source>
+         <translation>Stop</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="335"/>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="378"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="334"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="377"/>
+         <source>No Change</source>
+         <translation>No Change</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="339"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="338"/>
+         <source>Requeue Job?</source>
+         <translation>Requeue Job?</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="357"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="356"/>
+         <source>AutoExpire Actions:</source>
+         <translation>AutoExpire Actions:</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="367"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="366"/>
+         <source>Delete Now</source>
+         <translation>Delete Now</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="370"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="369"/>
+         <source>Move to Default group</source>
+-        <translation>Move to Default group</translation>
++        <translation>Move to Default Group</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="374"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="373"/>
+         <source>Undelete</source>
+         <translation>Undelete</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="376"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="375"/>
+         <source>Disable AutoExpire</source>
+         <translation>Disable AutoExpire</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="514"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="513"/>
+         <source>Listings Status shows the latest status information from mythfilldatabase</source>
+         <translation>Listings Status shows the latest status information from mythfilldatabase</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="546"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="545"/>
+         <source>Mythfrontend version: %1 (%2)</source>
+-        <translation>Mythfrontend version: %1 (%2)</translation>
++        <translation>MythFrontend version: %1 (%2)</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="548"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="547"/>
+         <source>Last mythfilldatabase guide update:</source>
+         <translation>Last mythfilldatabase guide update:</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="549"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="548"/>
+         <source>Started:   %1</source>
+         <translation>Started:   %1</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="556"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="555"/>
+         <source>Finished: %1</source>
+         <translation>Finished: %1</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="563"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="562"/>
+         <source>Result: %1</source>
+         <translation>Result: %1</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="568"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="567"/>
+         <source>Suggested Next: %1</source>
+         <translation>Suggested Next: %1</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="579"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="578"/>
+         <source>There&apos;s no guide data available!</source>
+         <translation>There&apos;s no guide data available!</translation>
+     </message>
      <message>
-         <location filename="../programs/mythtv-setup/startprompt.cpp" line="77"/>
-         <source>Recording Status: RECORDING.</source>
--        <translation>Recording Status: RECORDING.</translation>
-+        <translation>Recording Status: Recording</translation>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="581"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="580"/>
+         <source>Have you run mythfilldatabase?</source>
+         <translation>Have you run mythfilldatabase?</translation>
      </message>
      <message>
-         <location filename="../programs/mythtv-setup/startprompt.cpp" line="78"/>
-@@ -21405,7 +22148,7 @@
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="587"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="586"/>
+         <source>There is guide data until %1</source>
+         <translation>There is guide data until %1</translation>
+     </message>
      <message>
-         <location filename="../programs/mythtv-setup/startprompt.cpp" line="82"/>
-         <source>Recording Status: None.</source>
--        <translation>Recording Status: None.</translation>
-+        <translation>Recording Status: None</translation>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="597"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="596"/>
+         <source>WARNING: is mythfilldatabase running?</source>
+-        <translation>WARNING: is mythfilldatabase running?</translation>
++        <translation>Warning: is mythfilldatabase running?</translation>
      </message>
      <message>
-         <location filename="../programs/mythtv-setup/startprompt.cpp" line="103"/>
-@@ -21426,15 +22169,15 @@
- <context>
-     <name>StartingChannel</name>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="602"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="601"/>
+         <source>DataDirect Status: </source>
+         <translation>DataDirect Status: </translation>
+     </message>
      <message>
--        <location filename="../libs/libmythtv/videosource.cpp" line="3318"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3257"/>
-         <source>Please add channels to this source</source>
--        <translation>Please add channels to this source</translation>
-+        <translation>Please Add Channels to This Source</translation>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="614"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="613"/>
+         <source>Schedule Status shows current statistics from the scheduler.</source>
+         <translation>Schedule Status shows current statistics from the scheduler.</translation>
      </message>
- </context>
- <context>
-     <name>StatusBox</name>
      <message numerus="yes">
--        <location filename="../programs/mythfrontend/statusbox.cpp" line="1435"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1442"/>
-         <source>%n (is) LiveTV and consume(s) %1
- </source>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="627"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="626"/>
+         <source>%n template rule(s) (is) defined</source>
          <translation>
-@@ -21445,7 +22188,7 @@
+             <numerusform>%n template rule is defined</numerusform>
+@@ -21654,7 +21940,7 @@
          </translation>
      </message>
      <message numerus="yes">
--        <location filename="../programs/mythfrontend/statusbox.cpp" line="1439"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1446"/>
-         <source>%n (is) Deleted and consume(s) %1
- </source>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="643"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="642"/>
+         <source>%n standard rule(s) (is) defined</source>
          <translation>
-@@ -21457,7 +22200,7 @@
+             <numerusform>%n standard rule is defined</numerusform>
+@@ -21662,7 +21948,7 @@
+         </translation>
      </message>
      <message numerus="yes">
-         <location filename="../programs/mythfrontend/statusbox.cpp" line="592"/>
--        <location filename="../programs/mythfrontend/statusbox.cpp" line="1123"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1130"/>
-         <source>%n day(s)</source>
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="657"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="656"/>
+         <source>%n search rule(s) are defined</source>
          <translation>
-             <numerusform>%n day</numerusform>
-@@ -21568,7 +22311,7 @@
-     <message>
-         <location filename="../programs/mythfrontend/statusbox.cpp" line="370"/>
-         <source>Move to Default group</source>
--        <translation>Move to Default group</translation>
-+        <translation>Move to Default Group</translation>
-     </message>
-     <message>
-         <location filename="../programs/mythfrontend/statusbox.cpp" line="374"/>
-@@ -21588,7 +22331,7 @@
-     <message>
-         <location filename="../programs/mythfrontend/statusbox.cpp" line="546"/>
-         <source>Mythfrontend version: %1 (%2)</source>
--        <translation>Mythfrontend version: %1 (%2)</translation>
-+        <translation>mythfrontend version: %1 (%2)</translation>
-     </message>
-     <message>
-         <location filename="../programs/mythfrontend/statusbox.cpp" line="548"/>
-@@ -21633,7 +22376,7 @@
-     <message>
-         <location filename="../programs/mythfrontend/statusbox.cpp" line="597"/>
-         <source>WARNING: is mythfilldatabase running?</source>
--        <translation>WARNING: is mythfilldatabase running?</translation>
-+        <translation>Warning: is mythfilldatabase running?</translation>
+             <numerusform>%n search rule is defined</numerusform>
+@@ -21670,7 +21956,7 @@
+         </translation>
      </message>
-     <message>
-         <location filename="../programs/mythfrontend/statusbox.cpp" line="602"/>
-@@ -21678,47 +22421,47 @@
+     <message numerus="yes">
+-        <location filename="../programs/mythfrontend/statusbox.cpp" line="716"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="720"/>
+         <source>%n matching showing(s)</source>
+         <translation>
+             <numerusform>%n matching showing</numerusform>
+@@ -21678,47 +21964,72 @@
          </translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="766"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="773"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="782"/>
          <source>with lower priority</source>
          <translation>with lower priority</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="772"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="779"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="788"/>
          <source>marked as HDTV</source>
          <translation>marked as HDTV</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="782"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="789"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="798"/>
          <source>from source</source>
          <translation>from source</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="804"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="811"/>
-         <source>Tuner Status shows the current information about the state of backend tuner cards</source>
-         <translation>Tuner Status shows the current information about the state of backend tuner cards</translation>
+-        <source>Tuner Status shows the current information about the state of backend tuner cards</source>
+-        <translation>Tuner Status shows the current information about the state of backend tuner cards</translation>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="808"/>
++        <source>on input</source>
++        <translation>on input</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="836"/>
++        <source>Input Status shows the current information about the state of backend inputs</source>
++        <translation>Input Status shows the current information about the state of backend inputs.</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="930"/>
++        <source>%1 errored</source>
++        <translation>%1 Errored</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="932"/>
++        <source>%1 unavailable</source>
++        <translation>%1 Unavailable</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="934"/>
++        <source>%1 sleeping</source>
++        <translation>%1 Sleeping</translation>
++    </message>
++    <message>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="936"/>
++        <source>%1 recording</source>
++        <translation>%1 Recording</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="845"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="852"/>
-         <source>has an error</source>
-         <translation>has an error</translation>
+-        <source>has an error</source>
+-        <translation>has an error</translation>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="938"/>
++        <source>%1 live television</source>
++        <translation>%1 Live Television</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="847"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="854"/>
-         <source>is unavailable</source>
-         <translation>is unavailable</translation>
+-        <source>is unavailable</source>
+-        <translation>is unavailable</translation>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="940"/>
++        <source>%1 available</source>
++        <translation>%1 Available</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="849"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="856"/>
-         <source>is asleep</source>
-         <translation>is asleep</translation>
+-        <source>is asleep</source>
+-        <translation>is asleep</translation>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="948"/>
++        <source>Input %1 %2: %3</source>
++        <translation>Input %1 %2: %3</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="854"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="861"/>
-         <source>is watching Live TV</source>
-         <translation>is watching Live TV</translation>
+-        <source>is watching Live TV</source>
+-        <translation>is watching Live TV</translation>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="950"/>
++        <source>, </source>
++        <translation></translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="916"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="923"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="986"/>
          <source>On %1 from %2.%3
  %4
  </source>
-@@ -21726,27 +22469,27 @@
+@@ -21726,27 +22037,27 @@
  %4</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="928"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="935"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="998"/>
          <source>No further details</source>
          <translation>No further details</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="949"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="956"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1019"/>
          <source>Job Queue shows any jobs currently in MythTV&apos;s Job Queue such as a commercial detection job.</source>
          <translation>Job Queue shows any jobs currently in MythTV&apos;s Job Queue such as a commercial detection job.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1057"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1064"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1127"/>
          <source>%1 total, %2 used, %3 (or %4%) free.</source>
          <translation>%1 total, %2 used, %3 (or %4%) free.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1074"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1081"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1144"/>
          <source>, using your %1 rate of %2 kb/s</source>
          <translation>, using your %1 rate of %2 kb/s</translation>
      </message>
      <message numerus="yes">
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1090"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1097"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1160"/>
          <source>%n hour(s)</source>
          <translation>
              <numerusform>%n hour</numerusform>
-@@ -21754,7 +22497,7 @@
+@@ -21754,7 +22065,7 @@
          </translation>
      </message>
      <message numerus="yes">
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1091"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1098"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1161"/>
          <source>%n minute(s)</source>
          <translation>
              <numerusform>%n minute</numerusform>
-@@ -21762,178 +22505,182 @@
+@@ -21762,178 +22073,158 @@
          </translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1092"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1099"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1162"/>
          <source>%1 remaining</source>
          <comment>time</comment>
          <translation>%1 remaining</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1096"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1103"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1166"/>
          <source>%1 and %2 remaining</source>
          <comment>time</comment>
          <translation>%1 and %2 remaining</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1108"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1115"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1178"/>
          <source>Uptime</source>
          <translation>Uptime</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1111"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1118"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1181"/>
          <source>unknown</source>
          <comment>unknown uptime</comment>
          <translation>unknown</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1161"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1168"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1231"/>
          <source>average</source>
          <comment>average rate</comment>
          <translation>average</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1181"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1188"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1251"/>
          <source>maximum</source>
          <comment>maximum rate</comment>
          <translation>maximum</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="857"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="864"/>
-         <source>is recording</source>
-         <translation>is recording</translation>
-     </message>
-     <message>
+-        <source>is recording</source>
+-        <translation>is recording</translation>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="792"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="799"/>
-         <source>on card</source>
-         <translation>on card</translation>
-     </message>
-     <message>
+-        <source>on card</source>
+-        <translation>on card</translation>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="859"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="866"/>
-         <source>is not recording</source>
-         <translation>is not recording</translation>
-     </message>
-     <message>
+-        <source>is not recording</source>
+-        <translation>is not recording</translation>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="861"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="868"/>
-         <source>Tuner %1 %2 %3</source>
-         <translation>Tuner %1 %2 %3</translation>
-     </message>
-     <message>
+-        <source>Tuner %1 %2 %3</source>
+-        <translation>Tuner %1 %2 %3</translation>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="894"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="901"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="964"/>
          <source>Log Entries shows any unread log entries from the system if you have logging enabled</source>
          <translation>Log Entries shows any unread log entries from the system if you have logging enabled</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="936"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="943"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1006"/>
          <source>No items found at priority level %1 or lower.</source>
          <translation>No items found at priority level %1 or lower.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="938"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="945"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1008"/>
          <source>Use 1-8 to change priority level.</source>
          <translation>Use 1-8 to change priority level.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="983"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="990"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1053"/>
          <source>Job:</source>
          <translation>Job:</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="985"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="992"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1055"/>
          <source>Status: </source>
          <translation>Status: </translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="992"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="999"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1062"/>
          <source>Scheduled Run Time:</source>
          <translation>Scheduled Run Time:</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1015"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1022"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1085"/>
          <source>Job Queue is currently empty.</source>
          <translation>Job Queue is currently empty.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1203"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1210"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1273"/>
          <source>Machine Status shows some operating system statistics of this machine</source>
          <translation>Machine Status shows some operating system statistics of this machine</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1206"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1213"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1276"/>
          <source>and the MythTV server</source>
          <translation>and the MythTV server</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1219"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1226"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1289"/>
          <source>System:</source>
          <translation>System:</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1221"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1228"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1291"/>
          <source>This machine:</source>
          <translation>This machine:</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1230"/>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1278"/>
-+        <source>Hostname</source>
-+        <translation type="obsolete">Hostname</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1237"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1285"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1300"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1348"/>
          <source>Load</source>
          <translation>Load</translation>
      </message>
@@ -20951,80 +25098,80 @@
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1233"/>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1237"/>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1288"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1240"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1244"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1295"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1303"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1307"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1361"/>
          <source>unknown</source>
          <translation>unknown</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1233"/>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1237"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1240"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1244"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1303"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1307"/>
          <source>failed</source>
          <translation>failed</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1255"/>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1298"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1262"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1305"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1325"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1371"/>
          <source>RAM</source>
          <translation>RAM</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1261"/>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1306"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1268"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1313"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1331"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1379"/>
          <source>Swap</source>
          <translation>Swap</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1269"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1276"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1339"/>
          <source>MythTV server</source>
 -        <translation>MythTV server</translation>
 +        <translation>MythTV Server</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1339"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1346"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1412"/>
          <source>Total Disk Space:</source>
          <translation>Total Disk Space:</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1344"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1351"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1417"/>
          <source>MythTV Drive #%1:</source>
          <translation>MythTV Drive #%1:</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1351"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1358"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1424"/>
          <source>Directories:</source>
          <translation>Directories:</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1360"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1367"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1433"/>
          <source>Directory:</source>
          <translation>Directory:</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1384"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1391"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1457"/>
          <source>The AutoExpire List shows all recordings which may be expired and the order of their expiration. Recordings at the top of the list will be expired first.</source>
          <translation>The AutoExpire List shows all recordings which may be expired and the order of their expiration. Recordings at the top of the list will be expired first.</translation>
      </message>
      <message numerus="yes">
 -        <location filename="../programs/mythfrontend/statusbox.cpp" line="1431"/>
-+        <location filename="../programs/mythfrontend/statusbox.cpp" line="1438"/>
++        <location filename="../programs/mythfrontend/statusbox.cpp" line="1504"/>
          <source>%n recording(s) consuming %1 (is) allowed to expire
  </source>
          <translation>
-@@ -21945,58 +22692,81 @@
+@@ -21945,58 +22236,55 @@
      </message>
  </context>
  <context>
@@ -21061,61 +25208,49 @@
      </message>
      <message>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="96"/>
-+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="84"/>
-+        <source>Delete &apos;%1&apos; Storage Group?</source>
-+        <translation>Delete &apos;%1&apos; Storage Group?</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="89"/>
-+        <source>Delete &apos;%1&apos; Storage Group?
-+(from remote hosts)</source>
-+        <translation>Delete &apos;%1&apos; Storage Group?
-+(from remote hosts)</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="93"/>
-+        <source>Delete &apos;%1&apos; Storage Group?
-+(from all hosts)</source>
-+        <translation>Delete &apos;%1&apos; Storage Group?
-+(from all hosts)</translation>
-+    </message>
-+    <message>
-         <source>Add Storage Group Directory</source>
+-        <source>Add Storage Group Directory</source>
 -        <translation>Add Storage Group Directory</translation>
-+        <translation type="vanished">Add Storage Group Directory</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="97"/>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="122"/>
-         <source>Enter directory name or press SELECT to enter text via the On Screen Keyboard</source>
+-        <source>Enter directory name or press SELECT to enter text via the On Screen Keyboard</source>
 -        <translation>Enter directory name or press SELECT to enter text via the On Screen Keyboard</translation>
-+        <translation type="vanished">Enter directory name or press SELECT to enter text via the On Screen Keyboard</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="121"/>
-         <source>Edit Storage Group Directory</source>
+-        <source>Edit Storage Group Directory</source>
 -        <translation>Edit Storage Group Directory</translation>
-+        <translation type="vanished">Edit Storage Group Directory</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="161"/>
-         <source>Remove &apos;%1&apos;
- Directory From Storage Group?</source>
+-        <source>Remove &apos;%1&apos;
+-Directory From Storage Group?</source>
 -        <translation>Remove &apos;%1&apos;
-+        <translation type="vanished">Remove &apos;%1&apos;
- Directory From Storage Group?</translation>
+-Directory From Storage Group?</translation>
++        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="84"/>
++        <source>Delete &apos;%1&apos; Storage Group?</source>
++        <translation>Delete &apos;%1&apos; Storage Group?</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="165"/>
-         <source>Yes, remove directory</source>
+-        <source>Yes, remove directory</source>
 -        <translation>Yes, remove directory</translation>
-+        <translation type="vanished">Yes, Remove Directory</translation>
++        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="89"/>
++        <source>Delete &apos;%1&apos; Storage Group?
++(from remote hosts)</source>
++        <translation>Delete &apos;%1&apos; Storage Group?
++(from remote hosts)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="166"/>
-         <source>No, Don&apos;t remove directory</source>
+-        <source>No, Don&apos;t remove directory</source>
 -        <translation>No, Don&apos;t remove directory</translation>
-+        <translation type="vanished">No, Keep Directory</translation>
++        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="93"/>
++        <source>Delete &apos;%1&apos; Storage Group?
++(from all hosts)</source>
++        <translation>Delete &apos;%1&apos; Storage Group?
++(from all hosts)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="223"/>
@@ -21123,7 +25258,7 @@
          <source>(Add New Directory)</source>
          <translation>(Add New Directory)</translation>
      </message>
-@@ -22004,168 +22774,170 @@
+@@ -22004,168 +22292,139 @@
  <context>
      <name>StorageGroupListEditor</name>
      <message>
@@ -21140,17 +25275,15 @@
      </message>
      <message>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="277"/>
-         <source>Create New Storage Group</source>
+-        <source>Create New Storage Group</source>
 -        <translation>Create New Storage Group</translation>
-+        <translation type="vanished">Create New Storage Group</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="278"/>
-         <source>Enter group name or press SELECT to enter text via the On Screen Keyboard</source>
+-        <source>Enter group name or press SELECT to enter text via the On Screen Keyboard</source>
 -        <translation>Enter group name or press SELECT to enter text via the On Screen Keyboard</translation>
-+        <translation type="vanished">Enter group name or press SELECT to enter text via the On Screen Keyboard</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="302"/>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="401"/>
 +        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="395"/>
@@ -21160,67 +25293,61 @@
      </message>
      <message>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="307"/>
-         <source>Delete &apos;%1&apos; Storage Group?</source>
+-        <source>Delete &apos;%1&apos; Storage Group?</source>
 -        <translation>Delete &apos;%1&apos; Storage Group?</translation>
-+        <translation type="vanished">Delete &apos;%1&apos; Storage Group?</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="312"/>
-         <source>Delete &apos;%1&apos; Storage Group?
- (from remote hosts)</source>
+-        <source>Delete &apos;%1&apos; Storage Group?
+-(from remote hosts)</source>
 -        <translation>Delete &apos;%1&apos; Storage Group?
-+        <translation type="vanished">Delete &apos;%1&apos; Storage Group?
- (from remote hosts)</translation>
-     </message>
-     <message>
+-(from remote hosts)</translation>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="316"/>
-         <source>Delete &apos;%1&apos; Storage Group?
- (from all hosts)</source>
+-        <source>Delete &apos;%1&apos; Storage Group?
+-(from all hosts)</source>
 -        <translation>Delete &apos;%1&apos; Storage Group?
-+        <translation type="vanished">Delete &apos;%1&apos; Storage Group?
- (from all hosts)</translation>
-     </message>
-     <message>
+-(from all hosts)</translation>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="323"/>
-         <source>Yes, delete group</source>
+-        <source>Yes, delete group</source>
 -        <translation>Yes, delete group</translation>
-+        <translation type="vanished">Yes, Delete Group</translation>
++        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="427"/>
++        <source>(Create default group)</source>
++        <translation>(Create Default Group)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="324"/>
-         <source>No, Don&apos;t delete group</source>
+-        <source>No, Don&apos;t delete group</source>
 -        <translation>No, Don&apos;t delete group</translation>
-+        <translation type="vanished">No, Keep Group</translation>
++        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="435"/>
++        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="457"/>
++        <source>(Create %1 group)</source>
++        <translation>(Create %1 Group)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="437"/>
-+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="427"/>
-         <source>(Create default group)</source>
+-        <source>(Create default group)</source>
 -        <translation>(Create default group)</translation>
-+        <translation>(Create Default Group)</translation>
++        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="445"/>
++        <source>(Create new group)</source>
++        <translation>(Create New Group)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="446"/>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="464"/>
-+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="435"/>
-+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="457"/>
-         <source>(Create %1 group)</source>
+-        <source>(Create %1 group)</source>
 -        <translation>(Create %1 group)</translation>
-+        <translation>(Create %1 Group)</translation>
++        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="473"/>
++        <source>Enter the name of the new storage group</source>
++        <translation>Enter group name:</translation>
      </message>
      <message>
 -        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="454"/>
-+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="445"/>
-         <source>(Create new group)</source>
+-        <source>(Create new group)</source>
 -        <translation>(Create new group)</translation>
-+        <translation>(Create New Group)</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="473"/>
-+        <source>Enter the name of the new storage group</source>
-+        <translation>Enter group name:</translation>
-+    </message>
-+    <message>
 +        <location filename="../libs/libmyth/storagegroupeditor.cpp" line="490"/>
 +        <source> Storage Group Directories</source>
 +        <translation> Storage Group Directories</translation>
@@ -21230,74 +25357,74 @@
      <name>TV</name>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="1891"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="1893"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="1908"/>
          <source>MythTV wants to record &quot;%1&quot; on %2 in %d seconds. Do you want to:</source>
          <translation>MythTV wants to record &quot;%1&quot; on %2 in %d seconds. Do you want to:</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="1894"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="1896"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="1911"/>
          <source>Record and watch while it records</source>
 -        <translation>Record and watch while it records</translation>
 +        <translation>Record and Watch While It Records</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="1895"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="1897"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="1912"/>
          <source>Let it record and go back to the Main Menu</source>
 -        <translation>Let it record and go back to the Main Menu</translation>
 +        <translation>Let It Record and Go Back to the Main Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="1896"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="1898"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="1913"/>
          <source>Let them record and go back to the Main Menu</source>
 -        <translation>Let them record and go back to the Main Menu</translation>
 +        <translation>Let Them Record and Go Back to the Main Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="1897"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="1899"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="1914"/>
          <source>Record it later, I want to watch TV</source>
 -        <translation>Record it later, I want to watch TV</translation>
 +        <translation>Record It Later, I Want to Watch TV</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="1898"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="1900"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="1915"/>
          <source>Record them later, I want to watch TV</source>
 -        <translation>Record them later, I want to watch TV</translation>
 +        <translation>Record Them Later, I Want to Watch TV</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="1899"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="1901"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="1916"/>
          <source>Don&apos;t let it record, I want to watch TV</source>
 -        <translation>Don&apos;t let it record, I want to watch TV</translation>
 +        <translation>Don&apos;t Let It Record, I Want to Watch TV</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="1900"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="1902"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="1917"/>
          <source>Don&apos;t let them record, I want to watch TV</source>
 -        <translation>Don&apos;t let them record, I want to watch TV</translation>
 +        <translation>Don&apos;t Let Them Record, I Want to Watch TV</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="2556"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="2558"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="2573"/>
          <source>%1 Settings</source>
          <translation>%1 Settings</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="2948"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="2961"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="2980"/>
          <source>Last Program: %1 Doesn&apos;t Exist</source>
          <translation>Last Program: %1 Doesn&apos;t Exist</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="3520"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="3534"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="3554"/>
          <source>End Of Recording</source>
 -        <translation>End Of Recording</translation>
 +        <translation>End of Recording</translation>
@@ -21306,15 +25433,15 @@
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="4324"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="4353"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="4370"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="4338"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="4367"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="4384"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="4369"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="4398"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="4415"/>
          <source>Zoom Committed</source>
          <translation>Zoom Committed</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="4375"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="4389"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="4420"/>
          <source>Zoom Ignored</source>
          <translation>Zoom Ignored</translation>
      </message>
@@ -21323,48 +25450,49 @@
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12145"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13088"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13116"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6779"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12080"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13023"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13051"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6857"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12223"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13181"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13188"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13216"/>
          <source>Jump Back</source>
          <translation>Jump Back</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="5320"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6680"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="5334"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6694"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="5380"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6770"/>
          <source>Skip Back</source>
          <translation>Skip Back</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="4606"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="4620"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="4651"/>
          <source>Seek:</source>
          <translation>Seek:</translation>
      </message>
      <message numerus="yes">
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="5953"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="5967"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6019"/>
          <source>Sorry, PBP only supports %n video stream(s)</source>
          <translation>
              <numerusform>Sorry, PBP only supports %n video stream</numerusform>
-@@ -22173,7 +22945,7 @@
+@@ -22173,7 +22432,7 @@
          </translation>
      </message>
      <message numerus="yes">
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="5960"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="5974"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6026"/>
          <source>Sorry, PIP only supports %n video stream(s)</source>
          <translation>
              <numerusform>Sorry, PIP only supports %n video stream</numerusform>
-@@ -22181,266 +22953,266 @@
+@@ -22181,268 +22440,269 @@
          </translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6642"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6656"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6732"/>
          <source>Forward</source>
          <translation>Forward</translation>
      </message>
@@ -21372,15 +25500,16 @@
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="5316"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6687"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6691"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="5330"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6701"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6705"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="5376"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6777"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6781"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13169"/>
          <source>Skip Ahead</source>
          <translation>Skip Ahead</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6641"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6655"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6731"/>
          <source>Rewind</source>
          <translation>Rewind</translation>
      </message>
@@ -21389,104 +25518,104 @@
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12140"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13076"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13161"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6776"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12075"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13011"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13096"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6854"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12218"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13162"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13261"/>
          <source>Jump Ahead</source>
          <translation>Jump Ahead</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="4647"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="4661"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="4692"/>
          <source>Jump to Bookmark</source>
          <translation>Jump to Bookmark</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="4653"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="5312"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="4667"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="5326"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="4698"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="5372"/>
          <source>Jump to Beginning</source>
          <translation>Jump to Beginning</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6744"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6779"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6758"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6793"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6836"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6871"/>
          <source>Jump To</source>
          <translation>Jump To</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="5982"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="5996"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6048"/>
          <source>Creating PBP</source>
          <translation>Creating PBP</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="1638"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="1639"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="1640"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="1641"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="1654"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="1655"/>
          <source>External Subtitles</source>
          <translation>External Subtitles</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="5078"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13427"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="5092"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13362"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="5138"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13527"/>
          <source>Are you sure you want to delete:</source>
          <translation>Are you sure you want to delete:</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="5982"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="5996"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6048"/>
          <source>Creating PIP</source>
          <translation>Creating PIP</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="5983"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="5997"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6049"/>
          <source>Cannot create PBP</source>
          <translation>Cannot create PBP</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="5983"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="5997"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6049"/>
          <source>Cannot create PIP</source>
          <translation>Cannot create PIP</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6002"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6016"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6068"/>
          <source>Stopping PIP</source>
          <translation>Stopping PIP</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6002"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6016"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6068"/>
          <source>Stopping PBP</source>
          <translation>Stopping PBP</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6012"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6026"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6078"/>
          <source>Stopping all PIPs</source>
 -        <translation>Stopping all PIPs</translation>
 +        <translation>Stopping All PIPs</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6012"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6026"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6078"/>
          <source>Stopping all PBPs</source>
 -        <translation>Stopping all PBPs</translation>
 +        <translation>Stopping All PBPs</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6059"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6073"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6125"/>
          <source>Too many views to switch</source>
 -        <translation>Too many views to switch</translation>
 +        <translation>Too Many Views to Switch</translation>
@@ -21494,122 +25623,122 @@
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6474"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8040"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6488"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8042"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6544"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8121"/>
          <source>Paused</source>
          <translation>Paused</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6476"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6490"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6546"/>
          <source>Aux Paused</source>
          <translation>Aux Paused</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6815"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6829"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6907"/>
          <source>Speed 16X</source>
          <translation>Speed 16X</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6816"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6830"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6908"/>
          <source>Speed 8X</source>
          <translation>Speed 8X</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6817"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6831"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6909"/>
          <source>Speed 3X</source>
          <translation>Speed 3X</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6818"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6832"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6910"/>
          <source>Speed 2X</source>
          <translation>Speed 2X</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6820"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6834"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6912"/>
          <source>Speed 1/3X</source>
          <translation>Speed 1/3X</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6821"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6835"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6913"/>
          <source>Speed 1/8X</source>
          <translation>Speed 1/8X</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6822"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6836"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6914"/>
          <source>Speed 1/16X</source>
          <translation>Speed 1/16X</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6926"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6940"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="7018"/>
          <source>Forward %1X</source>
          <translation>Forward %1X</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6936"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6950"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="7028"/>
          <source>Rewind %1X</source>
          <translation>Rewind %1X</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6975"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="6989"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="7067"/>
          <source>Stopping Transcode</source>
          <translation>Stopping Transcode</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6993"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="7007"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="7085"/>
          <source>Transcoding</source>
          <translation>Transcoding</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="6986"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="7000"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="7078"/>
          <source>Try Again</source>
          <translation>Try Again</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="7036"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="7050"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="7128"/>
          <source>Jump Chapter</source>
          <translation>Jump Chapter</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="7139"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="7153"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="7231"/>
          <source>Switch Angle</source>
          <translation>Switch Angle</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="7160"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="7174"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="7252"/>
          <source>Skip</source>
          <translation>Skip</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="7500"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="7504"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="7584"/>
          <source>TXT:</source>
          <translation>TXT:</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="7500"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="7504"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="7584"/>
          <source>CC:</source>
          <translation>CC:</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="7504"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="7508"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="7588"/>
          <source>Seek:</source>
          <comment>seek to location</comment>
          <translation>Seek:</translation>
@@ -21617,57 +25746,57 @@
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="5011"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8040"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="5025"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8042"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="5062"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8121"/>
          <source>Position</source>
          <translation>Position</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8298"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8300"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8378"/>
          <source>Partial Lock</source>
          <translation>Partial Lock</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8298"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8300"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8378"/>
          <source>No Lock</source>
          <translation>No Lock</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8299"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8301"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8379"/>
          <source>Lock</source>
          <translation>Lock</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8301"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8303"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8381"/>
          <source>Signal %1%</source>
          <translation>Signal %1%</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8303"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8305"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8383"/>
          <source>S/N %1dB</source>
          <translation>S/N %1dB</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8305"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8307"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8385"/>
          <source>BE %1</source>
          <comment>Bit Errors</comment>
          <translation>BE %1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8307"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8309"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8387"/>
          <source>Rotor %1%</source>
          <translation>Rotor %1%</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8391"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8393"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8471"/>
          <source>You should have received a channel lock by now. You can continue to wait for a signal, or you can change the channel with %1 or %2, change video source (%3), inputs (%4), etc.</source>
          <translation>You should have received a channel lock by now. You can continue to wait for a signal, or you can change the channel with %1 or %2, change video source (%3), inputs (%4), etc.</translation>
      </message>
@@ -21675,9 +25804,9 @@
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8400"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12964"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13342"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8402"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12899"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13277"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8480"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13049"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13442"/>
          <source>OK</source>
          <translation>OK</translation>
      </message>
@@ -21687,46 +25816,49 @@
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11800"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11801"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11802"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8449"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11730"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11731"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11732"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11733"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8527"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11865"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11866"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11867"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11868"/>
          <location filename="../libs/libmythtv/tvbrowsehelper.cpp" line="26"/>
-         <location filename="../libs/libmythtv/tvbrowsehelper.cpp" line="310"/>
+-        <location filename="../libs/libmythtv/tvbrowsehelper.cpp" line="310"/>
++        <location filename="../libs/libmythtv/tvbrowsehelper.cpp" line="309"/>
          <source>%n minute(s)</source>
-@@ -22450,425 +23222,425 @@
+         <translation>
+             <numerusform>%n minute</numerusform>
+@@ -22450,425 +22710,430 @@
          </translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8467"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8964"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8469"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8891"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8547"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8952"/>
          <source>DVD</source>
          <translation>DVD</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8472"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8474"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8552"/>
          <source>Menu</source>
          <translation>Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8476"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8478"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8556"/>
          <source>Still Frame</source>
          <translation>Still Frame</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8487"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8489"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8567"/>
          <source>Title: %1 (%2)</source>
          <translation>Title: %1 (%2)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8488"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8490"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8568"/>
          <source>Chapter: %1/%2</source>
          <translation>Chapter: %1/%2</translation>
      </message>
@@ -21734,179 +25866,179 @@
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="5440"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8950"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="10181"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="5454"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8877"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="10112"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="5500"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8938"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="10206"/>
          <source>Adjust Volume</source>
          <translation>Adjust Volume</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="2434"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="2489"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="2436"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="2491"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="2451"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="2506"/>
          <source>TV Player</source>
          <translation>TV Player</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="1098"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="1100"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="1116"/>
          <source>Off</source>
          <comment>Sleep timer</comment>
          <translation>Off</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="1099"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="1101"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="1117"/>
          <source>30m</source>
          <comment>Sleep timer</comment>
          <translation>30m</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="1100"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="1102"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="1118"/>
          <source>1h</source>
          <comment>Sleep timer</comment>
          <translation>1h</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="1101"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="1103"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="1119"/>
          <source>1h30m</source>
          <comment>Sleep timer</comment>
          <translation>1h30m</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="1102"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="1104"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="1120"/>
          <source>2h</source>
          <comment>Sleep timer</comment>
          <translation>2h</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="2037"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="2039"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="2054"/>
          <source>MythTV wants to record these programs in %d seconds:</source>
          <translation>MythTV wants to record these programs in %d seconds:</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="2063"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="2065"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="2080"/>
          <source>&quot;%1&quot; on %2</source>
          <translation>&quot;%1&quot; on %2</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="2076"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="2078"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="2093"/>
          <source>Do you want to:</source>
          <translation>Do you want to:</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="2433"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="2435"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="2450"/>
          <source>Can&apos;t start playback</source>
 -        <translation>Can&apos;t start playback</translation>
 +        <translation>Can&apos;t Start Playback</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="4380"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="4394"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="4425"/>
          <source>%1 Committed</source>
          <translation>%1 Committed</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="5004"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="5018"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="5055"/>
          <source>Bookmark Cleared</source>
          <translation>Bookmark Cleared</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="5014"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="5028"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="5065"/>
          <source>Bookmark Saved</source>
          <translation>Bookmark Saved</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9031"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12515"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8958"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12450"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9019"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12603"/>
          <source>Adjust Time Stretch</source>
          <translation>Adjust Time Stretch</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9061"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8988"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9049"/>
          <source>Upmixer On</source>
          <translation>Upmixer On</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9061"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8988"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9049"/>
          <source>Upmixer Off</source>
          <translation>Upmixer Off</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9125"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12035"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9052"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11970"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9113"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12113"/>
          <source>Adjust Subtitle Delay</source>
          <translation>Adjust Subtitle Delay</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9125"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9052"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9113"/>
          <source>Subtitle Delay</source>
          <translation>Subtitle Delay</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9154"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9081"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9142"/>
          <source>Audio Sync</source>
          <translation>Audio Sync</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9154"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11931"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9081"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11866"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9142"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12001"/>
          <source>Adjust Audio Sync</source>
          <translation>Adjust Audio Sync</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9189"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9116"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9177"/>
          <source>Mute Off</source>
          <translation>Mute Off</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9190"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9117"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9178"/>
          <source>Mute On</source>
          <translation>Mute On</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9191"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9118"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9179"/>
          <source>Left Channel Muted</source>
          <translation>Left Channel Muted</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9192"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9119"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9180"/>
          <source>Right Channel Muted</source>
          <translation>Right Channel Muted</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9220"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9147"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9209"/>
          <source>Sleep </source>
          <translation>Sleep </translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9235"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9162"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9224"/>
          <source>MythTV was set to sleep after %1 minutes and will exit in %d seconds.
  Do you wish to continue watching?</source>
          <translation>MythTV was set to sleep after %1 minutes and will exit in %d seconds.
@@ -21915,28 +26047,28 @@
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9242"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9305"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9169"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9232"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9231"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9294"/>
          <source>Yes</source>
          <translation>Yes</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9243"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9306"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9170"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9233"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9232"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9295"/>
          <source>No</source>
          <translation>No</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9299"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9226"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9288"/>
          <source>MythTV has been idle for %1 minutes and will exit in %d seconds. Are you still watching?</source>
          <translation>MythTV has been idle for %1 minutes and will exit in %d seconds. Are you still watching?</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9672"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9599"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9694"/>
          <source>PiP</source>
          <comment>Picture-in-Picture</comment>
 -        <translation>PiP</translation>
@@ -21944,7 +26076,7 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9673"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9600"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9695"/>
          <source>PbP</source>
          <comment>Picture-by-Picture</comment>
 -        <translation>PbP</translation>
@@ -21952,7 +26084,7 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9675"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9602"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9697"/>
          <source>Disabling %1 for recording</source>
 -        <translation>Disabling %1 for recording</translation>
 +        <translation>Disabling %1 for Recording</translation>
@@ -21960,20 +26092,20 @@
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="10017"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="10040"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9948"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9971"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="10042"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="10065"/>
          <source>Record</source>
          <translation>Record</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="10052"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9983"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="10077"/>
          <source>Cancel Record</source>
          <translation>Cancel Record</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="10276"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="10207"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="10301"/>
          <source>Active Changed</source>
          <translation>Active Changed</translation>
      </message>
@@ -21981,374 +26113,394 @@
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="10289"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="10304"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12533"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="10220"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="10235"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12468"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="10314"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="10329"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12621"/>
          <source>Edit Cut Points</source>
          <translation>Edit Cut Points</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="10323"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="10254"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="10348"/>
          <source>Exit Recording Editor</source>
          <translation>Exit Recording Editor</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="10324"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11585"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="10255"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11516"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="10349"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11650"/>
          <source>Save Cuts and Exit</source>
          <translation>Save Cuts and Exit</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="10326"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11577"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="10257"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11508"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="10351"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11642"/>
          <source>Exit Without Saving</source>
          <translation>Exit Without Saving</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="10328"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11581"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="10259"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11512"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="10353"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11646"/>
          <source>Save Cuts</source>
          <translation>Save Cuts</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="10330"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11573"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="10261"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11504"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="10355"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11638"/>
          <source>Undo Changes</source>
          <translation>Undo Changes</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="10393"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="10324"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="10418"/>
          <source>This program is currently being edited</source>
          <translation>This program is currently being edited</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="10396"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="10327"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="10421"/>
          <source>Continue Editing</source>
          <translation>Continue Editing</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="10397"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="10328"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="10422"/>
          <source>Do not edit</source>
 -        <translation>Do not edit</translation>
 +        <translation>Do Not Edit</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="10577"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="10508"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="10616"/>
          <source>UNKNOWN%1</source>
          <comment>Synthesized callsign</comment>
          <translation>UNKNOWN%1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="10903"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="10834"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="10945"/>
          <source>Zoom Mode ON</source>
 -        <translation>Zoom Mode ON</translation>
 +        <translation>Zoom Mode On</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11500"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11431"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11565"/>
          <source>Move Previous Cut End Here</source>
          <translation>Move Previous Cut End Here</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11501"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11432"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11566"/>
          <source>Move Start of Cut Here</source>
          <translation>Move Start of Cut Here</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11512"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11443"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11577"/>
          <source>Move Next Cut Start Here</source>
          <translation>Move Next Cut Start Here</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11513"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11444"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11578"/>
          <source>Move End of Cut Here</source>
          <translation>Move End of Cut Here</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11521"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11452"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11586"/>
          <source>Cut to Beginning</source>
          <translation>Cut to Beginning</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11529"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11460"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11594"/>
          <source>Cut to End</source>
          <translation>Cut to End</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11535"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11466"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11600"/>
          <source>Delete This Cut</source>
          <translation>Delete This Cut</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11536"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11467"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11601"/>
          <source>Join Surrounding Cuts</source>
          <translation>Join Surrounding Cuts</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11541"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11472"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11606"/>
          <source>Add New Cut</source>
          <translation>Add New Cut</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11547"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11478"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11612"/>
          <source>Undo - %1</source>
          <extracomment>%1 is the undo message</extracomment>
          <translation>Undo - %1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11555"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11486"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11620"/>
          <source>Redo - %1</source>
          <extracomment>%1 is the redo message</extracomment>
          <translation>Redo - %1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11561"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11492"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11626"/>
          <source>Clear Cuts</source>
          <translation>Clear Cuts</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11565"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11496"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11630"/>
          <source>Reverse Cuts</source>
          <translation>Reverse Cuts</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11569"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11500"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11634"/>
          <source>Load Detected Commercials</source>
          <translation>Load Detected Commercials</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11778"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11709"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11844"/>
          <source>0.5x</source>
          <translation>0.5x</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11779"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11710"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11845"/>
          <source>0.9x</source>
          <translation>0.9x</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11780"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11711"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11846"/>
          <source>1.0x</source>
          <translation>1.0x</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11781"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11712"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11847"/>
          <source>1.1x</source>
          <translation>1.1x</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11782"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11713"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11848"/>
          <source>1.2x</source>
          <translation>1.2x</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11783"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11714"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11849"/>
          <source>1.3x</source>
          <translation>1.3x</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11784"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11715"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11850"/>
          <source>1.4x</source>
          <translation>1.4x</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11785"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11716"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11851"/>
          <source>1.5x</source>
          <translation>1.5x</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11981"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11916"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12021"/>
++        <source>Enable Audio Upmixer</source>
++        <translation>Enable Audio Upmixer</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12059"/>
          <source>Disable Subtitles</source>
          <translation>Disable Subtitles</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11987"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11922"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12065"/>
          <source>Enable Subtitles</source>
          <translation>Enable Subtitles</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11995"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11930"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12073"/>
          <source>Disable Forced Subtitles</source>
          <translation>Disable Forced Subtitles</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12004"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11939"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12082"/>
          <source>Enable Forced Subtitles</source>
          <translation>Enable Forced Subtitles</translation>
      </message>
      <message numerus="yes">
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12093"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12028"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12171"/>
          <source>Close PIP(s)</source>
          <translation>
              <numerusform>Close PIP</numerusform>
-@@ -22876,7 +23648,7 @@
+@@ -22876,7 +23141,7 @@
          </translation>
      </message>
      <message numerus="yes">
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12103"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12038"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12181"/>
          <source>Close PBP(s)</source>
          <translation>
              <numerusform>Close PBP</numerusform>
-@@ -22884,701 +23656,701 @@
+@@ -22884,701 +23149,715 @@
          </translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12135"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12070"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12213"/>
          <source>Playback Data</source>
          <translation>Playback Data</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12152"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12087"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12230"/>
          <source>DVD Root Menu</source>
          <translation>DVD Root Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12163"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12098"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12245"/>
          <source>DVD Title Menu</source>
          <translation>DVD Title Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12168"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12103"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12250"/>
          <source>DVD Chapter Menu</source>
          <translation>DVD Chapter Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12496"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12547"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12431"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12482"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12584"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12635"/>
          <source>Playback Compact Menu</source>
          <translation>Playback Compact Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12524"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12459"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12040"/>
++        <source>Move BottomLine off screen</source>
++        <translation>Move Bottom Line Off Screen</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12044"/>
++        <source>Save manual zoom for BottomLine</source>
++        <translation>Save Manual Zoom for Bottom Line</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12235"/>
++        <source>Jump to bookmark</source>
++        <translation>Jump to Bookmark</translation>
++    </message>
++    <message>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12612"/>
          <source>Schedule</source>
          <translation>Schedule</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12177"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12112"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12259"/>
          <source>Program Guide</source>
          <translation>Program Guide</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12217"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12152"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12299"/>
          <source>Edit Channel</source>
          <translation>Edit Channel</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12217"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12152"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12299"/>
          <source>Edit Recording</source>
          <translation>Edit Recording</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12526"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12461"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12614"/>
          <source>Jump to Program</source>
          <translation>Jump to Program</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12193"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12574"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12128"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12509"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12275"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12662"/>
          <source>Recorded Program</source>
          <translation>Recorded Program</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12173"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12108"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12255"/>
          <source>Previous Channel</source>
          <translation>Previous Channel</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12022"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11957"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12100"/>
          <source>Toggle Teletext Menu</source>
          <translation>Toggle Teletext Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11966"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11901"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12036"/>
          <source>Manual Zoom Mode</source>
          <translation>Manual Zoom Mode</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12518"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12453"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12606"/>
          <source>Channel Groups</source>
          <translation>Channel Groups</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11809"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11740"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11875"/>
          <source>All Channels</source>
          <translation>All Channels</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12234"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12169"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12316"/>
          <source>Stop Transcoding</source>
          <translation>Stop Transcoding</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12530"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12465"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12618"/>
          <source>Begin Transcoding</source>
          <translation>Begin Transcoding</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="7161"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="7175"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="7253"/>
          <source>Searching</source>
 -        <translation>Searching</translation>
 +        <translation>Searching...</translation>
@@ -22356,103 +26508,103 @@
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="5440"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8950"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="5454"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8877"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="5500"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8938"/>
          <source>Volume</source>
          <translation>Volume</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9031"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8958"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9019"/>
          <source>Time Stretch</source>
          <translation>Time Stretch</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="10334"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12485"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="10265"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12420"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="10359"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12573"/>
          <source>Edit</source>
          <translation>Edit</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12234"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12169"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12316"/>
          <source>Default</source>
          <translation>Default</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12242"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12177"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12324"/>
          <source>Autodetect</source>
          <translation>Autodetect</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12250"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12185"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12332"/>
          <source>High Quality</source>
          <translation>High Quality</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12258"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12193"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12340"/>
          <source>Medium Quality</source>
          <translation>Medium Quality</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12266"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12201"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12348"/>
          <source>Low Quality</source>
          <translation>Low Quality</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12520"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12455"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12608"/>
          <source>Commercial Auto-Skip</source>
 -        <translation>Commercial Auto-Skip</translation>
 +        <translation>Commercial Auto-skip</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12226"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12161"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12308"/>
          <source>Turn Auto-Expire OFF</source>
 -        <translation>Turn Auto-Expire OFF</translation>
 +        <translation>Turn Auto-expire Off</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12226"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12161"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12308"/>
          <source>Turn Auto-Expire ON</source>
 -        <translation>Turn Auto-Expire ON</translation>
 +        <translation>Turn Auto-expire On</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12185"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12120"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12267"/>
          <source>Upcoming Recordings</source>
          <translation>Upcoming Recordings</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12181"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12116"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12263"/>
          <source>Program Finder</source>
          <translation>Program Finder</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12189"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12124"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12271"/>
          <source>Edit Recording Schedule</source>
          <translation>Edit Recording Schedule</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12521"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12456"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12609"/>
          <source>Chapter</source>
          <translation>Chapter</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="5965"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="5979"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="6031"/>
          <source>Sorry, cannot mix PBP and PIP views</source>
 -        <translation>Sorry, cannot mix PBP and PIP views</translation>
 +        <translation>Cannot Mix PBP and PIP Views</translation>
@@ -22460,402 +26612,402 @@
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12495"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12543"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12430"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12478"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12583"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12631"/>
          <source>Playback Menu</source>
          <translation>Playback Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12497"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12432"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12585"/>
          <source>Audio</source>
          <translation>Audio</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8958"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12500"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8885"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12435"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8946"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12588"/>
          <source>Video</source>
          <translation>Video</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="4954"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="4968"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="5005"/>
          <source>Visualisation Off</source>
-         <translation>Visualisation Off</translation>
+-        <translation>Visualisation Off</translation>
++        <translation>Visualization Off</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="8961"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="8888"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="8949"/>
          <source>TV</source>
          <translation>TV</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9087"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12027"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9014"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11962"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9075"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12105"/>
          <source>Adjust Subtitle Zoom</source>
          <translation>Adjust Subtitle Zoom</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="9087"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="9014"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="9075"/>
          <source>Subtitle Zoom</source>
          <translation>Subtitle Zoom</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12505"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12440"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12593"/>
          <source>Advanced</source>
          <translation>Advanced</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12507"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12442"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12595"/>
          <source>Deinterlacer</source>
          <translation>Deinterlacer</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12508"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12443"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12596"/>
          <source>Subtitles</source>
          <translation>Subtitles</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12510"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12445"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12598"/>
          <source>Text Subtitles</source>
          <translation>Text Subtitles</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12513"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12448"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12601"/>
          <source>Select Teletext CC</source>
          <translation>Select Teletext CC</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12519"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12454"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12607"/>
          <source>Navigate</source>
          <translation>Navigate</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12152"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12087"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12230"/>
          <source>Top menu</source>
 -        <translation>Top menu</translation>
 +        <translation>Top Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12158"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12093"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12240"/>
          <source>Popup menu</source>
 -        <translation>Popup menu</translation>
 +        <translation>Popup Menu</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12522"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12457"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12610"/>
          <source>Angle</source>
          <translation>Angle</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12523"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12458"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12611"/>
          <source>Title</source>
          <translation>Title</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12525"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12460"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12613"/>
          <source>Source</source>
          <translation>Source</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12529"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12464"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12617"/>
          <source>Jobs</source>
          <translation>Jobs</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12514"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12449"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12602"/>
          <source>Playback</source>
          <translation>Playback</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12041"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11976"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12119"/>
          <source>Play</source>
          <translation>Play</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12041"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11976"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12119"/>
          <source>Pause</source>
          <translation>Pause</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12516"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12451"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12604"/>
          <source>Picture-in-Picture</source>
          <translation>Picture-in-Picture</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12126"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12061"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12204"/>
          <source>Toggle Browse Mode</source>
          <translation>Toggle Browse Mode</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12131"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12066"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12209"/>
          <source>Cancel Playlist</source>
          <translation>Cancel Playlist</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12053"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11988"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12131"/>
          <source>Open Live TV PIP</source>
          <translation>Open Live TV PIP</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12062"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11997"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12140"/>
          <source>Open Live TV PBP</source>
          <translation>Open Live TV PBP</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12070"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12005"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12148"/>
          <source>Open Recording PIP</source>
          <translation>Open Recording PIP</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12078"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12013"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12156"/>
          <source>Open Recording PBP</source>
          <translation>Open Recording PBP</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12084"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12019"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12162"/>
          <source>Change Active Window</source>
          <translation>Change Active Window</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12110"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12045"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12188"/>
          <source>Swap Windows</source>
          <translation>Swap Windows</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12120"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12055"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12198"/>
          <source>Switch to PIP</source>
          <translation>Switch to PIP</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12120"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12055"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12198"/>
          <source>Switch to PBP</source>
          <translation>Switch to PBP</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13386"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13321"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13486"/>
          <source>No, keep it</source>
 -        <translation>No, keep it</translation>
-+        <translation>No, Keep</translation>
++        <translation>Keep</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12527"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12462"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12615"/>
          <source>Switch Input</source>
          <translation>Switch Input</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12528"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12463"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12616"/>
          <source>Switch Source</source>
          <translation>Switch Source</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12501"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12436"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12589"/>
          <source>Change Aspect Ratio</source>
          <translation>Change Aspect Ratio</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12502"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12437"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12590"/>
          <source>Adjust Fill</source>
          <translation>Adjust Fill</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11951"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11961"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11886"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11896"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12031"/>
          <source>Auto Detect</source>
          <translation>Auto Detect</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12503"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12438"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12591"/>
          <source>Adjust Picture</source>
          <translation>Adjust Picture</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="7123"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="7137"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="7215"/>
          <source>Switch Title</source>
          <translation>Switch Title</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12499"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12434"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12587"/>
          <source>Visualisation</source>
          <translatorcomment>Original string is in British English</translatorcomment>
          <translation>Visualization</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11943"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11878"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12013"/>
          <source>Disable Audio Upmixer</source>
          <translation>Disable Audio Upmixer</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11696"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11936"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11627"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11871"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11761"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12006"/>
          <source>None</source>
          <translation>None</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12504"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12439"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12592"/>
          <source>3D</source>
          <translation>3D</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11974"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11909"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12052"/>
          <source>Disable Night Mode</source>
          <translation>Disable Night Mode</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11974"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11909"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12052"/>
          <source>Enable Night Mode</source>
          <translation>Enable Night Mode</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11698"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11629"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11763"/>
          <source>Side by Side</source>
          <translation>Side by Side</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11700"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11631"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11765"/>
          <source>Discard Side by Side</source>
          <translation>Discard Side by Side</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11702"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11633"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11767"/>
          <source>Top and Bottom</source>
          <translation>Top and Bottom</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11704"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11635"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11769"/>
          <source>Discard Top and Bottom</source>
          <translation>Discard Top and Bottom</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12011"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11946"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12089"/>
          <source>Disable External Subtitles</source>
          <translation>Disable External Subtitles</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12017"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11952"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12095"/>
          <source>Enable External Subtitles</source>
          <translation>Enable External Subtitles</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12045"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11980"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12123"/>
          <source>Toggle</source>
          <translation>Toggle</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11777"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11708"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11843"/>
          <source>Adjust</source>
          <translation>Adjust</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12429"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12364"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12517"/>
          <source>(I)</source>
          <comment>Interlaced (Normal)</comment>
          <translation>(I)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12431"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12366"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12519"/>
          <source>(i)</source>
          <comment>Interlaced (Reversed)</comment>
          <translation>(i)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12433"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12368"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12521"/>
          <source>(P)</source>
          <comment>Progressive</comment>
          <translation>(P)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12942"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12877"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13027"/>
          <source>MythTV is already using all available inputs for the channel you selected. If you want to watch an in-progress recording, select one from the playback menu.  If you want to watch Live TV, cancel one of the in-progress recordings from the delete menu.</source>
 -        <translation>MythTV is already using all available inputs for the channel you selected. If you want to watch an in-progress recording, select one from the playback menu.  If you want to watch Live TV, cancel one of the in-progress recordings from the delete menu.</translation>
 +        <translation>MythTV is already using all available inputs for the channel you selected. If you want to watch an in-progress recording, select one from the playback menu. If you want to watch Live TV, cancel one of the in-progress recordings from the delete menu.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12506"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12441"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12594"/>
          <source>Video Scan</source>
          <translation>Video Scan</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11710"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11641"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11775"/>
          <source>Detect</source>
          <translation>Detect</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11712"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11643"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11777"/>
          <source>Progressive</source>
          <translation>Progressive</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11714"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11645"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11779"/>
          <source>Interlaced (Normal)</source>
          <translation>Interlaced (Normal)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11716"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11647"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11781"/>
          <source>Interlaced (Reversed)</source>
          <translation>Interlaced (Reversed)</translation>
      </message>
@@ -22863,257 +27015,258 @@
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12517"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12929"/>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12931"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12452"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12864"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12866"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12605"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13014"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13016"/>
          <source>Sleep</source>
          <translation>Sleep</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="11798"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="11729"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="11864"/>
          <source>Sleep Off</source>
          <translation>Sleep Off</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12498"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12433"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12586"/>
          <source>Select Audio Track</source>
          <translation>Select Audio Track</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12509"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12444"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12597"/>
          <source>Select Subtitle</source>
          <translation>Select Subtitle</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12512"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12447"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12600"/>
          <source>Select VBI CC</source>
          <translation>Select VBI CC</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12511"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12446"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12599"/>
          <source>Select ATSC CC</source>
          <translation>Select ATSC CC</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12534"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12469"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12622"/>
          <source>Edit Cut Points (Compact)</source>
          <translation>Edit Cut Points (Compact)</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12535"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12470"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12623"/>
          <source>Cut List Options</source>
          <translation>Cut List Options</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12703"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12638"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12789"/>
          <source>Auto-Expire OFF</source>
 -        <translation>Auto-Expire OFF</translation>
 +        <translation>Auto-expire Off</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12708"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12643"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="12794"/>
          <source>Auto-Expire ON</source>
 -        <translation>Auto-Expire ON</translation>
 +        <translation>Auto-expire On</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12951"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12886"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13036"/>
          <source>Error: MythTV is using all inputs, but there are no active recordings?</source>
 -        <translation>Error: MythTV is using all inputs, but there are no active recordings?</translation>
 +        <translation>ERROR: MythTV is using all inputs, but there are no active recordings?</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="12955"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="12890"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13040"/>
          <source>MythTV has no capture cards defined. Please run the mythtv-setup program.</source>
          <translation>MythTV has no capture cards defined. Please run the mythtv-setup program.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13104"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13039"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13204"/>
          <source>Skip Back Not Allowed</source>
          <translation>Skip Back Not Allowed</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13127"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13062"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13227"/>
          <source>Previous Title</source>
          <translation>Previous Title</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13146"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13081"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13246"/>
          <source>Skip Still Frame</source>
          <translation>Skip Still Frame</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13172"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13107"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13272"/>
          <source>Next Title</source>
          <translation>Next Title</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13235"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13170"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13335"/>
          <source>Live TV</source>
          <translation>Live TV</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13237"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13172"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13337"/>
          <source>this DVD</source>
          <translation>this DVD</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13241"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13176"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13341"/>
          <source>this Video</source>
          <translation>this Video</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13245"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13180"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13345"/>
          <source>this recording</source>
 -        <translation>this recording</translation>
 +        <translation>this Recording</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13251"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13186"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13351"/>
          <source>You are exiting %1</source>
 -        <translation>You are exiting %1</translation>
 +        <translation>You Are Exiting %1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13255"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13190"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13355"/>
          <source>Save this position and go to the menu</source>
 -        <translation>Save this position and go to the menu</translation>
 +        <translation>Save and Exit</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13257"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13192"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13357"/>
          <source>Do not save, just exit to the menu</source>
 -        <translation>Do not save, just exit to the menu</translation>
 +        <translation>Exit Without Saving</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13261"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13196"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13361"/>
          <source>Exit %1</source>
          <translation>Exit %1</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13265"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13200"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13365"/>
          <source>Delete this recording</source>
          <translation>Delete this recording</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13268"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13203"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13368"/>
          <source>Keep watching</source>
          <translation>Keep watching</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13314"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13249"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13414"/>
          <source>Cannot delete program </source>
 -        <translation>Cannot delete program </translation>
 +        <translation>Cannot delete </translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13323"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13258"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13423"/>
          <source>because it is not a recording.</source>
          <translation>because it is not a recording.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13327"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13262"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13427"/>
          <source>because it is in use by</source>
          <translation>because it is in use by</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13373"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13308"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13473"/>
          <source>Delete it, but allow it to re-record</source>
 -        <translation>Delete it, but allow it to re-record</translation>
 +        <translation>Delete Recording, and Allow Re-record</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13375"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13310"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13475"/>
          <source>Delete it</source>
 -        <translation>Delete it</translation>
 +        <translation>Delete Recording</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13377"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13312"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13477"/>
          <source>Save it so I can watch it again</source>
 -        <translation>Save it so I can watch it again</translation>
 +        <translation>Keep Recording</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13382"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13317"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13482"/>
          <source>Yes, and allow re-record</source>
 -        <translation>Yes, and allow re-record</translation>
-+        <translation>Yes, Delete and Allow Re-record</translation>
++        <translation>Delete and Allow Re-record</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_play.cpp" line="13384"/>
-+        <location filename="../libs/libmythtv/tv_play.cpp" line="13319"/>
++        <location filename="../libs/libmythtv/tv_play.cpp" line="13484"/>
          <source>Yes, delete it</source>
 -        <translation>Yes, delete it</translation>
-+        <translation>Yes, Delete</translation>
++        <translation>Delete</translation>
      </message>
  </context>
  <context>
      <name>TVRec</name>
      <message>
 -        <location filename="../libs/libmythtv/tv_rec.cpp" line="3934"/>
-+        <location filename="../libs/libmythtv/tv_rec.cpp" line="3912"/>
++        <location filename="../libs/libmythtv/tv_rec.cpp" line="3947"/>
          <source>Good signal seen after %1 ms</source>
          <translation>Good signal seen after %1 ms</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_rec.cpp" line="3943"/>
 -        <location filename="../libs/libmythtv/tv_rec.cpp" line="3995"/>
-+        <location filename="../libs/libmythtv/tv_rec.cpp" line="3921"/>
-+        <location filename="../libs/libmythtv/tv_rec.cpp" line="3976"/>
++        <location filename="../libs/libmythtv/tv_rec.cpp" line="3956"/>
++        <location filename="../libs/libmythtv/tv_rec.cpp" line="4011"/>
          <source>See &apos;Tuning timeout&apos; in mythtv-setup for this input.</source>
          <translation>See &apos;Tuning timeout&apos; in mythtv-setup for this input.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/tv_rec.cpp" line="3987"/>
-+        <location filename="../libs/libmythtv/tv_rec.cpp" line="3968"/>
++        <location filename="../libs/libmythtv/tv_rec.cpp" line="4003"/>
          <source>Taking more than %1 ms to get a lock.</source>
          <translation>Taking more than %1 ms to get a lock.</translation>
      </message>
-@@ -23586,133 +24358,133 @@
+@@ -23586,133 +23865,133 @@
  <context>
      <name>ThemeChooser</name>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="533"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="542"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="536"/>
          <source>Theme Chooser Menu</source>
          <translation>Theme Chooser Menu</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/themechooser.cpp" line="152"/>
+-        <location filename="../programs/mythfrontend/themechooser.cpp" line="152"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="148"/>
          <source>Loading Installed Themes</source>
 -        <translation>Loading Installed Themes</translation>
 +        <translation>Loading Installed Themes...</translation>
@@ -23121,159 +27274,159 @@
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="271"/>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="286"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="280"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="295"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="277"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="289"/>
          <source>Unable to create &apos;%1&apos;</source>
          <translation>Unable to create &apos;%1&apos;</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="275"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="284"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="281"/>
          <source>Refreshing Downloadable Themes Information</source>
 -        <translation>Refreshing Downloadable Themes Information</translation>
 +        <translation>Refreshing Downloadable Themes Information...</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="283"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="292"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="286"/>
          <source>Unable to remove &apos;%1&apos;</source>
          <translation>Unable to remove &apos;%1&apos;</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="292"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="301"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="295"/>
          <source>Extracting Downloadable Themes Information</source>
 -        <translation>Extracting Downloadable Themes Information</translation>
 +        <translation>Extracting Downloadable Themes Information...</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="307"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="316"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="310"/>
          <source>Failed to download &apos;%1&apos;</source>
 -        <translation>Failed to download &apos;%1&apos;</translation>
 +        <translation>Failed to Download &apos;%1&apos;</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="315"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="324"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="318"/>
          <source>Failed to unzip &apos;%1&apos; to &apos;%2&apos;</source>
 -        <translation>Failed to unzip &apos;%1&apos; to &apos;%2&apos;</translation>
 +        <translation>Failed to Unzip &apos;%1&apos; to &apos;%2&apos;</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="333"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="342"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="336"/>
          <source>Loading Downloadable Themes</source>
 -        <translation>Loading Downloadable Themes</translation>
 +        <translation>Loading Downloadable Themes...</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="496"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="505"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="499"/>
          <source>Error creating test file, %1 themes directory is not writable.</source>
          <translation>Error creating test file, %1 themes directory is not writable.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="554"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="563"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="557"/>
          <source>Hide Fullscreen Preview</source>
          <translation>Hide Fullscreen Preview</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="557"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="566"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="560"/>
          <source>Show Fullscreen Preview</source>
          <translation>Show Fullscreen Preview</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="561"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="570"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="564"/>
          <source>Refresh Downloadable Themes</source>
          <translation>Refresh Downloadable Themes</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="571"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="580"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="574"/>
          <source>Select Theme</source>
          <translation>Select Theme</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="575"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="584"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="578"/>
          <source>Delete Theme</source>
          <translation>Delete Theme</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="581"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="590"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="584"/>
          <source>Disable Theme Update Notifications</source>
          <translation>Disable Theme Update Notifications</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="584"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="593"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="587"/>
          <source>Enable Theme Update Notifications</source>
          <translation>Enable Theme Update Notifications</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="704"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="713"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="706"/>
          <source>Unable to install theme, %1 themes directory is not writable.</source>
          <translation>Unable to install theme, %1 themes directory is not writable.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="725"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="734"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="727"/>
          <source>Downloading %1 Theme</source>
          <translation>Downloading %1 Theme</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="866"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="875"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="868"/>
          <source>Copying %1 Theme Package</source>
          <translation>Copying %1 Theme Package</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="875"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="884"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="877"/>
          <source>ERROR downloading theme package on master backend.</source>
 -        <translation>ERROR downloading theme package on master backend.</translation>
 +        <translation>ERROR: Downloading theme package on master backend.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="896"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="905"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="898"/>
          <source>Installing %1 Theme</source>
          <translation>Installing %1 Theme</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="902"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="911"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="904"/>
          <source>ERROR downloading theme package from master backend.</source>
 -        <translation>ERROR downloading theme package from master backend.</translation>
 +        <translation>ERROR: Downloading theme package from master backend.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="940"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="949"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="942"/>
          <source>Error, no theme selected.</source>
 -        <translation>Error, no theme selected.</translation>
 +        <translation>ERROR: No theme selected.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="947"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="956"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="949"/>
          <source>Error, unable to find current theme.</source>
 -        <translation>Error, unable to find current theme.</translation>
 +        <translation>ERROR: Unable to find current theme.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="953"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="962"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="955"/>
          <source>%1 is not a user-installed theme and can not be deleted.</source>
          <translation>%1 is not a user-installed theme and can not be deleted.</translation>
      </message>
-@@ -23976,7 +24748,7 @@
+@@ -23976,7 +24255,7 @@
      <message>
          <location filename="../themes/themestrings.h" line="718"/>
          <source>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.</source>
@@ -23282,7 +27435,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="851"/>
-@@ -24130,7 +24902,7 @@
+@@ -24130,7 +24409,7 @@
      <message>
          <location filename="../themes/themestrings.h" line="729"/>
          <source>Below you will find the program details of the selected item.  There are two available screens.  You can toggle between them by pressing INFO.</source>
@@ -23291,7 +27444,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="866"/>
-@@ -24317,7 +25089,7 @@
+@@ -24317,7 +24596,7 @@
      <message>
          <location filename="../themes/themestrings.h" line="890"/>
          <source>Allow Recordings to Auto-Expire</source>
@@ -23300,7 +27453,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="891"/>
-@@ -24397,7 +25169,7 @@
+@@ -24397,7 +24676,7 @@
      <message>
          <location filename="../themes/themestrings.h" line="908"/>
          <source>Type your tweet below.  Select &quot;Send&quot; to submit it.</source>
@@ -23309,7 +27462,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="909"/>
-@@ -24452,7 +25224,7 @@
+@@ -24452,7 +24731,7 @@
      <message>
          <location filename="../themes/themestrings.h" line="390"/>
          <source>WARNING: There are conflicting scheduled recordings!</source>
@@ -23318,7 +27471,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="954"/>
-@@ -24604,7 +25376,7 @@
+@@ -24604,7 +24883,7 @@
      <message>
          <location filename="../themes/themestrings.h" line="994"/>
          <source>Graphite is a theme emphasizing MythUI interface improvements such as alpha, animation, unique layouts, and user-supplied backdrop content.  It is extremely memory-hungry.</source>
@@ -23327,7 +27480,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1011"/>
-@@ -25307,7 +26079,7 @@
+@@ -25307,7 +25586,7 @@
      <message>
          <location filename="../themes/themestrings.h" line="1080"/>
          <source>Press Up/Down from letter list, to navigate to another list.  Press Left/Right from Show or Episode list to navigate to another list.</source>
@@ -23336,7 +27489,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1083"/>
-@@ -25332,7 +26104,7 @@
+@@ -25332,7 +25611,7 @@
      <message>
          <location filename="../themes/themestrings.h" line="1106"/>
          <source>No videos in library, or no files found.  If you have configured a video directory, press MENU and select &quot;Scan for Changes.&quot;</source>
@@ -23345,7 +27498,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="745"/>
-@@ -25376,7 +26148,7 @@
+@@ -25376,7 +25655,7 @@
      <message>
          <location filename="../themes/themestrings.h" line="1122"/>
          <source>Designed to show off some different element arrangements.  Reminder: On Watch Recordings screen [Rew] and [FF] can be used to change the Rec. Group.</source>
@@ -23354,7 +27507,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1123"/>
-@@ -25627,7 +26399,7 @@
+@@ -25627,7 +25906,7 @@
      <message>
          <location filename="../themes/themestrings.h" line="1172"/>
          <source>Protocol-Version: %1</source>
@@ -23363,7 +27516,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1173"/>
-@@ -25860,7 +26632,7 @@
+@@ -25860,7 +26139,7 @@
      <message>
          <location filename="../themes/themestrings.h" line="360"/>
          <source>Move the selected corner of the preview image to the corner of the TV screen.  Press SELECT to edit the other corner.  Press MENU for options and ESC to quit.</source>
@@ -23372,7 +27525,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="417"/>
-@@ -26303,7 +27075,7 @@
+@@ -26303,7 +26582,7 @@
      <message>
          <location filename="../themes/themestrings.h" line="638"/>
          <source>Ok</source>
@@ -23381,7 +27534,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="639"/>
-@@ -26423,7 +27195,7 @@
+@@ -26423,7 +26702,7 @@
      <message>
          <location filename="../themes/themestrings.h" line="665"/>
          <source>PCM-BluRay</source>
@@ -23390,7 +27543,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="666"/>
-@@ -26618,7 +27390,7 @@
+@@ -26618,7 +26897,7 @@
      <message>
          <location filename="../themes/themestrings.h" line="706"/>
          <source>To create a custom recording rule, either select an existing rule, or create a new rule by typing in a name.  Then select a rule type and hit enter.  The SQL code will be transferred below, and you can edit it and insert your own program information. Finally, you can test, immediately activate, store, or cancel your rule.</source>
@@ -23399,7 +27552,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="708"/>
-@@ -26902,7 +27674,7 @@
+@@ -26902,7 +27181,7 @@
      <message>
          <location filename="../themes/themestrings.h" line="802"/>
          <source>Let&apos;s set up your DVR! On the next few screens, we will configure your system to play back audio and video, optimize your color and contrast, and make sure we are taking advantage of all of your hardware.  Press next to begin!</source>
@@ -23408,7 +27561,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="803"/>
-@@ -27454,7 +28226,7 @@
+@@ -27454,7 +27733,7 @@
      <message>
          <location filename="../themes/themestrings.h" line="1103"/>
          <source>Designed to show off some different element arrangements.  Tested at 1280x720 and with Français. Reminder: On Watch Recordings screen [Rew] and [FF] can be used to change the Rec. Group.</source>
@@ -23417,7 +27570,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1107"/>
-@@ -28434,7 +29206,7 @@
+@@ -28434,7 +28713,7 @@
      <message>
          <location filename="../themes/themestrings.h" line="300"/>
          <source>No videos in library, or no files found.  If you have configured a video directory, press &quot;M&quot; (or the MENU key) and select &quot;Scan for Changes.&quot;</source>
@@ -23426,7 +27579,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="303"/>
-@@ -28564,7 +29336,7 @@
+@@ -28564,7 +28843,7 @@
      <message>
          <location filename="../themes/themestrings.h" line="478"/>
          <source>Post-Processing Options</source>
@@ -23435,7 +27588,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="279"/>
-@@ -28851,9 +29623,9 @@
+@@ -28851,9 +29130,9 @@
          <source>On this screen, you can add new extensions to be recognized by the Video Plugin.  If a scan does not add your files, create a new extension below by clicking the &quot;New&quot; button.
  
  If you select &quot;Use Default Player,&quot; the player command set for the extension will be ignored.  &quot;Ignore This File Type&quot; prevents the items from appearing in a scan.</source>
@@ -23447,7 +27600,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="922"/>
-@@ -29298,7 +30070,7 @@
+@@ -29298,7 +29577,7 @@
      <message>
          <location filename="../themes/themestrings.h" line="953"/>
          <source>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.</source>
@@ -23456,7 +27609,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="160"/>
-@@ -29674,12 +30446,12 @@
+@@ -29674,12 +29953,12 @@
      <message>
          <location filename="../themes/themestrings.h" line="907"/>
          <source>Arclight is a sleek theme meant for widescreen HD displays.  It is high contrast and uses shapes and an attractive layout to convey information simply and consistently.</source>
@@ -23471,7 +27624,7 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="20"/>
-@@ -29699,12 +30471,12 @@
+@@ -29699,12 +29978,12 @@
      <message>
          <location filename="../themes/themestrings.h" line="293"/>
          <source>A blue theme.  Originally designed before the MythUI rewrite, MythCenter has been updated to take advantage of the new UI library while still maintaining the look and feel that long-time MythTV users are used to.</source>
@@ -23486,66 +27639,124 @@
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="394"/>
-@@ -29954,7 +30726,7 @@
+@@ -29954,104 +30233,12 @@
  <context>
      <name>ThemeUpdateChecker</name>
      <message>
 -        <location filename="../programs/mythfrontend/themechooser.cpp" line="1150"/>
-+        <location filename="../programs/mythfrontend/themechooser.cpp" line="1159"/>
++        <location filename="../programs/mythfrontend/themechooser.cpp" line="1152"/>
          <source>Version %1 of the %2 theme is now available in the Theme Chooser. The currently installed version is %3.</source>
          <translation>Version %1 of the %2 theme is now available in the Theme Chooser. The currently installed version is %3.</translation>
      </message>
-@@ -29991,12 +30763,12 @@
-     <message>
-         <location filename="../programs/mythfrontend/galleryconfig.cpp" line="22"/>
-         <source>Exif Date (oldest first)</source>
--        <translation>Exif Date (oldest first)</translation>
-+        <translation>EXIF Date (oldest first)</translation>
-     </message>
-     <message>
-         <location filename="../programs/mythfrontend/galleryconfig.cpp" line="23"/>
-         <source>Reverse Exif Date (newest first)</source>
--        <translation>Reverse Exif Date (newest first)</translation>
-+        <translation>Reverse EXIF Date (newest first)</translation>
-     </message>
-     <message>
-         <location filename="../programs/mythfrontend/galleryconfig.cpp" line="24"/>
-@@ -30046,12 +30818,23 @@
-         <translation>Date Format</translation>
-     </message>
-     <message>
--        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="60"/>
-+        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="65"/>
-         <source>Date format of thumbnail captions. Other places use the system date format. Sample shows 3rd May 2002.</source>
-         <translation>Date format of thumbnail captions. Other places use the system date format. Sample shows 3rd May 2002.</translation>
-     </message>
  </context>
  <context>
-+    <name>Transcode</name>
-+    <message>
-+        <source>Autodetect from %1</source>
-+        <translation type="obsolete">Autodetect from %1</translation>
-+    </message>
-+    <message>
-+        <source>Completed</source>
-+        <translation type="obsolete">Completed</translation>
-+    </message>
-+</context>
-+<context>
+-    <name>ThumbSettings</name>
+-    <message>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="14"/>
+-        <source>Thumbnails</source>
+-        <translation>Thumbnails</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="17"/>
+-        <source>Image Order</source>
+-        <translation>Image Order</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="18"/>
+-        <source>The order that pictures/videos are shown in thumbnail view and ordered slideshows.</source>
+-        <translation>The order that pictures/videos are shown in thumbnail view and ordered slideshows.</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="20"/>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="36"/>
+-        <source>Filename (A-Z)</source>
+-        <translation>Filename (A-Z)</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="21"/>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="37"/>
+-        <source>Reverse Filename (Z-A)</source>
+-        <translation>Reverse Filename (Z-A)</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="22"/>
+-        <source>Exif Date (oldest first)</source>
+-        <translation>Exif Date (oldest first)</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="23"/>
+-        <source>Reverse Exif Date (newest first)</source>
+-        <translation>Reverse Exif Date (newest first)</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="24"/>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="38"/>
+-        <source>File Modified Time (oldest first)</source>
+-        <translation>File Modified Time (oldest first)</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="25"/>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="39"/>
+-        <source>Reverse File Modified Time (newest first)</source>
+-        <translation>Reverse File Modified Time (newest first)</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="26"/>
+-        <source>File Extension (A-Z)</source>
+-        <translation>File Extension (A-Z)</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="27"/>
+-        <source>Reverse File Extension (Z-A)</source>
+-        <translation>Reverse File Extension (Z-A)</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="28"/>
+-        <source>File Size (smallest first)</source>
+-        <translation>File Size (smallest first)</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="29"/>
+-        <source>Reverse File Size (largest first)</source>
+-        <translation>Reverse File Size (largest first)</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="33"/>
+-        <source>Directory Order</source>
+-        <translation>Directory Order</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="34"/>
+-        <source>The order that dirctories are shown and traversed in recursive slideshows.</source>
+-        <translation>The order that dirctories are shown and traversed in recursive slideshows.</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="43"/>
+-        <source>Date Format</source>
+-        <translation>Date Format</translation>
+-    </message>
+-    <message>
+-        <location filename="../programs/mythfrontend/galleryconfig.cpp" line="60"/>
+-        <source>Date format of thumbnail captions. Other places use the system date format. Sample shows 3rd May 2002.</source>
+-        <translation>Date format of thumbnail captions. Other places use the system date format. Sample shows 3rd May 2002.</translation>
+-    </message>
+-</context>
+-<context>
      <name>Transition</name>
      <message>
          <location filename="../programs/mythfrontend/gallerytransitions.h" line="103"/>
-@@ -30087,45 +30870,46 @@
- <context>
-     <name>TransportList</name>
-     <message>
--        <location filename="../libs/libmythtv/transporteditor.cpp" line="89"/>
-         <source>New Transport</source>
--        <translation>New Transport</translation>
-+        <translation type="vanished">New Transport</translation>
+@@ -30085,47 +30272,29 @@
      </message>
  </context>
  <context>
+-    <name>TransportList</name>
+-    <message>
+-        <location filename="../libs/libmythtv/transporteditor.cpp" line="89"/>
+-        <source>New Transport</source>
+-        <translation>New Transport</translation>
+-    </message>
+-</context>
+-<context>
      <name>TransportListEditor</name>
      <message>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="279"/>
@@ -23555,26 +27766,24 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="324"/>
+-        <source>Are you sure you would like to delete this transport?</source>
+-        <translation>Are you sure you would like to delete this transport?</translation>
+-    </message>
+-    <message>
+-        <location filename="../libs/libmythtv/transporteditor.cpp" line="325"/>
+-        <source>Yes, delete the transport</source>
+-        <translation>Yes, delete the transport</translation>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="192"/>
 +        <source>New Transport</source>
 +        <translation>New Transport</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/transporteditor.cpp" line="304"/>
-         <source>Are you sure you would like to delete this transport?</source>
-         <translation>Are you sure you would like to delete this transport?</translation>
-     </message>
-     <message>
--        <location filename="../libs/libmythtv/transporteditor.cpp" line="325"/>
-         <source>Yes, delete the transport</source>
--        <translation>Yes, delete the transport</translation>
-+        <translation type="vanished">Yes, Delete Transport</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="326"/>
-         <source>No, don&apos;t</source>
+-        <source>No, don&apos;t</source>
 -        <translation>No, don&apos;t</translation>
-+        <translation type="vanished">No, Keep Transport</translation>
++        <location filename="../libs/libmythtv/transporteditor.cpp" line="304"/>
++        <source>Are you sure you would like to delete this transport?</source>
++        <translation>Are you sure you would like to delete this transport?</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="360"/>
@@ -23584,47 +27793,151 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="361"/>
-         <source>Edit...</source>
+-        <source>Edit...</source>
 -        <translation>Edit...</translation>
-+        <translation type="vanished">Edit...</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/transporteditor.cpp" line="362"/>
 +        <location filename="../libs/libmythtv/transporteditor.cpp" line="347"/>
          <source>Delete...</source>
          <translation>Delete...</translation>
      </message>
-@@ -30133,8 +30917,8 @@
+@@ -30133,8 +30302,8 @@
  <context>
      <name>UPNPScanner</name>
      <message>
 -        <location filename="../programs/mythfrontend/upnpscanner.cpp" line="226"/>
 -        <location filename="../programs/mythfrontend/upnpscanner.cpp" line="273"/>
-+        <location filename="../programs/mythfrontend/upnpscanner.cpp" line="227"/>
-+        <location filename="../programs/mythfrontend/upnpscanner.cpp" line="274"/>
++        <location filename="../programs/mythfrontend/upnpscanner.cpp" line="225"/>
++        <location filename="../programs/mythfrontend/upnpscanner.cpp" line="271"/>
          <source>Media Servers</source>
          <translation>Media Servers</translation>
      </message>
-@@ -30230,89 +31014,89 @@
+@@ -30142,87 +30311,87 @@
+ <context>
+     <name>UnZip</name>
+     <message>
+-        <location filename="../libs/libmythbase/unzip.cpp" line="245"/>
++        <location filename="../libs/libmythbase/unzip.cpp" line="286"/>
+         <source>ZIP operation completed successfully.</source>
+         <translation>ZIP operation completed successfully.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythbase/unzip.cpp" line="246"/>
++        <location filename="../libs/libmythbase/unzip.cpp" line="287"/>
+         <source>Failed to initialize or load zlib library.</source>
+         <translation>Failed to initialize or load zlib library.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythbase/unzip.cpp" line="247"/>
++        <location filename="../libs/libmythbase/unzip.cpp" line="288"/>
+         <source>zlib library error.</source>
+         <translation>zlib library error.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythbase/unzip.cpp" line="248"/>
++        <location filename="../libs/libmythbase/unzip.cpp" line="289"/>
+         <source>Unable to create or open file.</source>
+         <translation>Unable to create or open file.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythbase/unzip.cpp" line="249"/>
++        <location filename="../libs/libmythbase/unzip.cpp" line="290"/>
+         <source>Partially corrupted archive. Some files might be extracted.</source>
+         <translation>Partially corrupted archive. Some files might be extracted.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythbase/unzip.cpp" line="250"/>
++        <location filename="../libs/libmythbase/unzip.cpp" line="291"/>
+         <source>Corrupted archive.</source>
+         <translation>Corrupted archive.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythbase/unzip.cpp" line="251"/>
++        <location filename="../libs/libmythbase/unzip.cpp" line="292"/>
+         <source>Wrong password.</source>
+         <translation>Wrong password.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythbase/unzip.cpp" line="252"/>
++        <location filename="../libs/libmythbase/unzip.cpp" line="293"/>
+         <source>No archive has been created yet.</source>
+         <translation>No archive has been created yet.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythbase/unzip.cpp" line="253"/>
++        <location filename="../libs/libmythbase/unzip.cpp" line="294"/>
+         <source>File or directory does not exist.</source>
+         <translation>File or directory does not exist.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythbase/unzip.cpp" line="254"/>
++        <location filename="../libs/libmythbase/unzip.cpp" line="295"/>
+         <source>File read error.</source>
+         <translation>File read error.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythbase/unzip.cpp" line="255"/>
++        <location filename="../libs/libmythbase/unzip.cpp" line="296"/>
+         <source>File write error.</source>
+         <translation>File write error.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythbase/unzip.cpp" line="256"/>
++        <location filename="../libs/libmythbase/unzip.cpp" line="297"/>
+         <source>File seek error.</source>
+         <translation>File seek error.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythbase/unzip.cpp" line="257"/>
++        <location filename="../libs/libmythbase/unzip.cpp" line="298"/>
+         <source>Unable to create a directory.</source>
+         <translation>Unable to create a directory.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythbase/unzip.cpp" line="258"/>
++        <location filename="../libs/libmythbase/unzip.cpp" line="299"/>
+         <source>Invalid device.</source>
+         <translation>Invalid device.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythbase/unzip.cpp" line="259"/>
++        <location filename="../libs/libmythbase/unzip.cpp" line="300"/>
+         <source>Invalid or incompatible zip archive.</source>
+         <translation>Invalid or incompatible zip archive.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythbase/unzip.cpp" line="260"/>
++        <location filename="../libs/libmythbase/unzip.cpp" line="301"/>
+         <source>Inconsistent headers. Archive might be corrupted.</source>
+         <translation>Inconsistent headers. Archive might be corrupted.</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythbase/unzip.cpp" line="264"/>
++        <location filename="../libs/libmythbase/unzip.cpp" line="305"/>
+         <source>Unknown error.</source>
+         <translation>Unknown error.</translation>
+     </message>
+@@ -30230,89 +30399,89 @@
  <context>
      <name>V4L2encGroup</name>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2705"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2660"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2412"/>
          <source>Probed info</source>
 -        <translation>Probed info</translation>
 +        <translation>Probed Info</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2729"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2674"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2426"/>
          <source>Failed to open</source>
 -        <translation>Failed to open</translation>
 +        <translation>Failed to Open</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2735"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2680"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2432"/>
          <source>Failed to probe</source>
 -        <translation>Failed to probe</translation>
 +        <translation>Failed to Probe</translation>
@@ -23634,21 +27947,21 @@
      <name>V4LConfigurationGroup</name>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2470"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2420"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2172"/>
          <source>Probed info</source>
 -        <translation>Probed info</translation>
 +        <translation>Probed Info</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2485"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2438"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2190"/>
          <source>Failed to open</source>
 -        <translation>Failed to open</translation>
 +        <translation>Failed to Open</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="2492"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2445"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="2197"/>
          <source>Failed to probe</source>
 -        <translation>Failed to probe</translation>
 +        <translation>Failed to Probe</translation>
@@ -23689,135 +28002,515 @@
      </message>
      <message>
 -        <location filename="../libs/libmythtv/channelscan/vboxchannelfetcher.cpp" line="195"/>
-+        <location filename="../libs/libmythtv/channelscan/vboxchannelfetcher.cpp" line="201"/>
++        <location filename="../libs/libmythtv/channelscan/vboxchannelfetcher.cpp" line="202"/>
          <source>Ignoring Radio %1</source>
          <translation>Ignoring Radio %1</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelscan/vboxchannelfetcher.cpp" line="203"/>
-+        <location filename="../libs/libmythtv/channelscan/vboxchannelfetcher.cpp" line="209"/>
-         <source>Ignoring Bad Transmission Type %1</source>
-         <translation>Ignoring Bad Transmission Type %1</translation>
+-        <location filename="../libs/libmythtv/channelscan/vboxchannelfetcher.cpp" line="203"/>
++        <location filename="../libs/libmythtv/channelscan/vboxchannelfetcher.cpp" line="211"/>
+         <source>Ignoring Bad Transmission Type %1</source>
+         <translation>Ignoring Bad Transmission Type %1</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelscan/vboxchannelfetcher.cpp" line="213"/>
++        <location filename="../libs/libmythtv/channelscan/vboxchannelfetcher.cpp" line="222"/>
+         <source>Adding %1</source>
+         <translation>Adding %1</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelscan/vboxchannelfetcher.cpp" line="227"/>
++        <location filename="../libs/libmythtv/channelscan/vboxchannelfetcher.cpp" line="244"/>
+         <source>Updating %1</source>
+         <translation>Updating %1</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/channelscan/vboxchannelfetcher.cpp" line="242"/>
++        <location filename="../libs/libmythtv/channelscan/vboxchannelfetcher.cpp" line="267"/>
+         <source>Done</source>
+         <translation>Done</translation>
+     </message>
+@@ -30320,35 +30489,30 @@
+ <context>
+     <name>VBoxConfigurationGroup</name>
+     <message>
+-        <location filename="../libs/libmythtv/videosource.cpp" line="2267"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1990"/>
+         <source>Description</source>
+         <translation>Description</translation>
+     </message>
+-    <message>
+-        <location filename="../libs/libmythtv/videosource.cpp" line="2282"/>
+-        <source>Recording Options</source>
+-        <translation>Recording Options</translation>
+-    </message>
+ </context>
+ <context>
+     <name>VBoxDeviceID</name>
+     <message>
+-        <location filename="../libs/libmythtv/videosource.cpp" line="1663"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1619"/>
+         <source>Device ID</source>
+         <translation>Device ID</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythtv/videosource.cpp" line="1664"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1620"/>
+         <source>Device ID of VBox device</source>
+-        <translation>Device ID of VBox device</translation>
++        <translation>Device ID of VBox Device</translation>
+     </message>
+ </context>
+ <context>
+     <name>VBoxDeviceIDList</name>
+     <message>
+-        <location filename="../libs/libmythtv/videosource.cpp" line="1735"/>
+-        <location filename="../libs/libmythtv/videosource.cpp" line="1779"/>
+-        <location filename="../libs/libmythtv/videosource.cpp" line="1786"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1694"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1740"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="1747"/>
+         <source>Manually Enter IP Address</source>
+         <translation>Manually Enter IP Address</translation>
+     </message>
+@@ -30356,23 +30520,23 @@
+ <context>
+     <name>VideoDialog</name>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="1265"/>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="1280"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="1268"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="1283"/>
+         <source>Season</source>
+         <translation>Season</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2287"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2288"/>
+         <source>Video Search</source>
+         <translation>Video Search</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2348"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2349"/>
+         <source>%1 of %2</source>
+         <translation>%1 of %2</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2432"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2433"/>
+         <source>Video Options
+ %1
+ %2</source>
+@@ -30381,350 +30545,350 @@
+ %2</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2435"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2436"/>
+         <source>Video Options
+ %1</source>
+         <translation>Video Options
+ %1</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2438"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2439"/>
+         <source>Video Options</source>
+         <translation>Video Options</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2449"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2450"/>
+         <source>Play...</source>
+         <translation>Play...</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2451"/>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2494"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2452"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2498"/>
+         <source>Play</source>
+         <translation>Play</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2453"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2454"/>
+         <source>Mark as Unwatched</source>
+         <translation>Mark as Unwatched</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2455"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2456"/>
+         <source>Mark as Watched</source>
+         <translation>Mark as Watched</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2456"/>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2685"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2457"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2706"/>
+         <source>Video Info</source>
+         <translation>Video Info</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2459"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2460"/>
+         <source>Change Video Details</source>
+         <translation>Change Video Details</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2461"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2462"/>
+         <source>Delete</source>
+         <translation>Delete</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2465"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2466"/>
+         <source>Play Folder</source>
+         <translation>Play Folder</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2488"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2492"/>
+         <source>Playback Options
+ %1</source>
+         <translation>Playback Options
+ %1</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2498"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2502"/>
+         <source>Play in Alternate Player</source>
+         <translation>Play in Alternate Player</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2503"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2507"/>
+         <source>Play With Trailers</source>
+-        <translation>Play With Trailers</translation>
++        <translation>Play with Trailers</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2510"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2514"/>
+         <source>Play Trailer</source>
+         <translation>Play Trailer</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2522"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2526"/>
+         <source>Video Display Menu</source>
+         <translation>Video Display Menu</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2526"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2530"/>
+         <source>Scan For Changes</source>
+-        <translation>Scan For Changes</translation>
++        <translation>Scan for Changes</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2527"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2531"/>
+         <source>Retrieve All Details</source>
+         <translation>Retrieve All Details</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2528"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2532"/>
+         <source>Filter Display</source>
+         <translation>Filter Display</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2529"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2533"/>
+         <source>Browse By...</source>
+         <translation>Browse By...</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2530"/>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2547"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2534"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2568"/>
+         <source>Change View</source>
+         <translation>Change View</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="3374"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="3395"/>
+         <source>Failed to retrieve image(s)</source>
+-        <translation>Failed to retrieve image(s)</translation>
++        <translation>Failed to Retrieve Image(s)</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="3376"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="3397"/>
+         <source>Check logs</source>
+-        <translation>Check logs</translation>
++        <translation>Check Logs</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="3836"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="3855"/>
+         <source>There are no videos in the database, would you like to scan your video directories now?</source>
+         <translation>There are no videos in the database, would you like to scan your video directories now?</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2531"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2535"/>
+         <source>Settings</source>
+         <translation>Settings</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="1113"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="1116"/>
+         <source>The video scan found no files, have you configured a video storage group?</source>
+         <translation>The video scan found no files, have you configured a video storage group?</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2157"/>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2186"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2158"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2187"/>
+         <source>Season %1, Episode %2</source>
+         <translation>Season %1, Episode %2</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2177"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2178"/>
+         <source>Retrieved details for %1</source>
+-        <translation>Retrieved details for %1</translation>
++        <translation>Retrieved Details for %1</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2181"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2182"/>
+         <source>Failed to retrieve details for %1</source>
+-        <translation>Failed to retrieve details for %1</translation>
++        <translation>Failed to Retrieve Details for %1</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2552"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2573"/>
+         <source>Switch to Browse View</source>
+         <translation>Switch to Browse View</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2555"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2576"/>
+         <source>Switch to Gallery View</source>
+         <translation>Switch to Gallery View</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2558"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2579"/>
+         <source>Switch to List View</source>
+         <translation>Switch to List View</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2561"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2582"/>
+         <source>Switch to Manage View</source>
+         <translation>Switch to Manage View</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2564"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2585"/>
+         <source>Show Directory Structure</source>
+         <translation>Show Directory Structure</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2566"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2587"/>
+         <source>Hide Directory Structure</source>
+         <translation>Hide Directory Structure</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2569"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2590"/>
+         <source>Browse Library (recommended)</source>
+         <translation>Browse Library (recommended)</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2571"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2592"/>
+         <source>Browse Filesystem (slow)</source>
+         <translation>Browse Filesystem (slow)</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2583"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2604"/>
+         <source>Video Settings</source>
+         <translation>Video Settings</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2587"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2608"/>
+         <source>Player Settings</source>
+         <translation>Player Settings</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2588"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2609"/>
+         <source>Metadata Settings</source>
+         <translation>Metadata Settings</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2589"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2610"/>
+         <source>File Type Settings</source>
+         <translation>File Type Settings</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2642"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2663"/>
+         <source>Browse By</source>
+         <translation>Browse By</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2647"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2668"/>
+         <source>Cast</source>
+         <translation>Cast</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2650"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2671"/>
+         <source>Category</source>
+         <translation>Category</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2653"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2674"/>
+         <source>Date Added</source>
+         <translation>Date Added</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2656"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2677"/>
+         <source>Director</source>
+         <translation>Director</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2659"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2680"/>
+         <source>Studio</source>
+         <translation>Studio</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelscan/vboxchannelfetcher.cpp" line="213"/>
-+        <location filename="../libs/libmythtv/channelscan/vboxchannelfetcher.cpp" line="220"/>
-         <source>Adding %1</source>
-         <translation>Adding %1</translation>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2662"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2683"/>
+         <source>Folder</source>
+         <translation>Folder</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelscan/vboxchannelfetcher.cpp" line="227"/>
-+        <location filename="../libs/libmythtv/channelscan/vboxchannelfetcher.cpp" line="242"/>
-         <source>Updating %1</source>
-         <translation>Updating %1</translation>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2665"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2686"/>
+         <source>Genre</source>
+         <translation>Genre</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/channelscan/vboxchannelfetcher.cpp" line="242"/>
-+        <location filename="../libs/libmythtv/channelscan/vboxchannelfetcher.cpp" line="265"/>
-         <source>Done</source>
-         <translation>Done</translation>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2668"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2689"/>
+         <source>TV/Movies</source>
+         <translation>TV/Movies</translation>
      </message>
-@@ -30320,35 +31104,34 @@
- <context>
-     <name>VBoxConfigurationGroup</name>
      <message>
--        <location filename="../libs/libmythtv/videosource.cpp" line="2267"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="2240"/>
-         <source>Description</source>
-         <translation>Description</translation>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2671"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2692"/>
+         <source>User Rating</source>
+         <translation>User Rating</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/videosource.cpp" line="2282"/>
-         <source>Recording Options</source>
--        <translation>Recording Options</translation>
-+        <translation type="vanished">Recording Options</translation>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2674"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2695"/>
+         <source>Year</source>
+         <translation>Year</translation>
      </message>
- </context>
- <context>
-     <name>VBoxDeviceID</name>
      <message>
--        <location filename="../libs/libmythtv/videosource.cpp" line="1663"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1696"/>
-         <source>Device ID</source>
-         <translation>Device ID</translation>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2690"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2711"/>
+         <source>View Details</source>
+         <translation>View Details</translation>
      </message>
      <message>
--        <location filename="../libs/libmythtv/videosource.cpp" line="1664"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1697"/>
-         <source>Device ID of VBox device</source>
--        <translation>Device ID of VBox device</translation>
-+        <translation>Device ID of VBox Device</translation>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2692"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2713"/>
+         <source>View Full Plot</source>
+         <translation>View Full Plot</translation>
      </message>
- </context>
- <context>
-     <name>VBoxDeviceIDList</name>
      <message>
--        <location filename="../libs/libmythtv/videosource.cpp" line="1735"/>
--        <location filename="../libs/libmythtv/videosource.cpp" line="1779"/>
--        <location filename="../libs/libmythtv/videosource.cpp" line="1786"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1771"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1817"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="1824"/>
-         <source>Manually Enter IP Address</source>
-         <translation>Manually Enter IP Address</translation>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2698"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2719"/>
+         <source>View Cast</source>
+         <translation>View Cast</translation>
      </message>
-@@ -30449,7 +31232,7 @@
      <message>
-         <location filename="../programs/mythfrontend/videodlg.cpp" line="2503"/>
-         <source>Play With Trailers</source>
--        <translation>Play With Trailers</translation>
-+        <translation>Play with Trailers</translation>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2700"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2721"/>
+         <source>View Homepage</source>
+         <translation>View Homepage</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/videodlg.cpp" line="2510"/>
-@@ -30464,7 +31247,7 @@
-     <message>
-         <location filename="../programs/mythfrontend/videodlg.cpp" line="2526"/>
-         <source>Scan For Changes</source>
--        <translation>Scan For Changes</translation>
-+        <translation>Scan for Changes</translation>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2712"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2733"/>
+         <source>Manage Video Details</source>
+         <translation>Manage Video Details</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/videodlg.cpp" line="2527"/>
-@@ -30490,12 +31273,12 @@
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2718"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2739"/>
+         <source>Edit Details</source>
+         <translation>Edit Details</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/videodlg.cpp" line="3374"/>
-         <source>Failed to retrieve image(s)</source>
--        <translation>Failed to retrieve image(s)</translation>
-+        <translation>Failed to Retrieve Image(s)</translation>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2719"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2740"/>
+         <source>Retrieve Details</source>
+         <translation>Retrieve Details</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/videodlg.cpp" line="3376"/>
-         <source>Check logs</source>
--        <translation>Check logs</translation>
-+        <translation>Check Logs</translation>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2721"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2742"/>
+         <source>Allow Updates</source>
+         <translation>Allow Updates</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/videodlg.cpp" line="3836"/>
-@@ -30521,12 +31304,12 @@
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2723"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2744"/>
+         <source>Disable Updates</source>
+         <translation>Disable Updates</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/videodlg.cpp" line="2177"/>
-         <source>Retrieved details for %1</source>
--        <translation>Retrieved details for %1</translation>
-+        <translation>Retrieved Details for %1</translation>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2724"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2745"/>
+         <source>Reset Details</source>
+         <translation>Reset Details</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/videodlg.cpp" line="2181"/>
-         <source>Failed to retrieve details for %1</source>
--        <translation>Failed to retrieve details for %1</translation>
-+        <translation>Failed to Retrieve Details for %1</translation>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2976"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2997"/>
+         <source>An error occurred when switching views.</source>
+         <translation>An error occurred when switching views.</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/videodlg.cpp" line="2552"/>
-@@ -30706,19 +31489,19 @@
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="3049"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="3070"/>
+         <source>No browser command set! MythVideo needs MythBrowser installed to display the homepage.</source>
+         <translation>No browser command set! MythVideo needs MythBrowser installed to display the homepage.</translation>
+     </message>
      <message>
-         <location filename="../programs/mythfrontend/videodlg.cpp" line="2152"/>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="2152"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="2153"/>
          <source>Fetching details for %1</source>
 -        <translation>Fetching details for %1</translation>
 +        <translation>Fetching Details for %1</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/videodlg.cpp" line="3557"/>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="3557"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="3576"/>
          <source>Are you sure you want to permanently delete:
  %1</source>
 -        <translation>Are you sure you want to permanently delete:
@@ -23825,14 +28518,142 @@
  %1</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/videodlg.cpp" line="3595"/>
+-        <location filename="../programs/mythfrontend/videodlg.cpp" line="3595"/>
++        <location filename="../programs/mythfrontend/videodlg.cpp" line="3614"/>
          <source>Failed to delete file</source>
 -        <translation>Failed to delete file</translation>
 +        <translation>Failed to delete file.</translation>
      </message>
  </context>
  <context>
-@@ -30901,7 +31684,7 @@
+     <name>VideoFilterDialog</name>
+     <message numerus="yes">
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="639"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="608"/>
+         <source>Result of this filter : %n video(s)</source>
+         <translation>
+             <numerusform>Result of this filter : %n video</numerusform>
+@@ -30732,101 +30896,101 @@
+         </translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="644"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="613"/>
+         <source>Result of this filter : No Videos</source>
+         <translation>Result of this filter : No Videos</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="679"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="648"/>
+         <source>All</source>
+         <comment>Category</comment>
+         <translation>All</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="695"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="664"/>
+         <source>All</source>
+         <comment>Genre</comment>
+         <translation>All</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="708"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="677"/>
+         <source>All</source>
+         <comment>Cast</comment>
+         <translation>All</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="721"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="690"/>
+         <source>All</source>
+         <comment>Country</comment>
+         <translation>All</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="735"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="704"/>
+         <source>All</source>
+         <comment>Year</comment>
+         <translation>All</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="750"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="719"/>
+         <source>All</source>
+         <comment>Runtime</comment>
+         <translation>All</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="759"/>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="760"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="728"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="729"/>
+         <source>minutes</source>
+         <translation>minutes</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="767"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="736"/>
+         <source>All</source>
+         <comment>User rating</comment>
+         <translation>All</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="781"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="750"/>
+         <source>All</source>
+         <comment>Browsable</comment>
+         <translation>All</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="790"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="759"/>
+         <source>All</source>
+         <comment>Watched</comment>
+         <translation>All</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="799"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="768"/>
+         <source>All</source>
+         <comment>Inet reference</comment>
+         <translation>All</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="801"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="770"/>
+         <source>Unknown</source>
+         <comment>Inet reference</comment>
+         <translation>Unknown</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="806"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="775"/>
+         <source>All</source>
+         <comment>Cover file</comment>
+         <translation>All</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="808"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="777"/>
+         <source>None</source>
+         <comment>Cover file</comment>
+         <translation>None</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="831"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="800"/>
+         <source>Video ID</source>
+         <translation>Video ID</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/videofilter.cpp" line="833"/>
++        <location filename="../programs/mythfrontend/videofilter.cpp" line="802"/>
+         <source>Date Added</source>
+         <translation>Date Added</translation>
+     </message>
+@@ -30901,7 +31065,7 @@
      <message>
          <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="106"/>
          <source>Directories that hold videos</source>
@@ -23841,7 +28662,7 @@
      </message>
      <message>
          <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="110"/>
-@@ -30911,7 +31694,7 @@
+@@ -30911,7 +31075,7 @@
      <message>
          <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="122"/>
          <source>Directory that holds movie posters</source>
@@ -23850,7 +28671,7 @@
      </message>
      <message>
          <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="127"/>
-@@ -30925,37 +31708,37 @@
+@@ -30925,37 +31089,37 @@
      <message>
          <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="138"/>
          <source>Directory that holds movie screenshots</source>
@@ -23895,7 +28716,7 @@
      </message>
      <message>
          <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="211"/>
-@@ -30970,7 +31753,7 @@
+@@ -30970,7 +31134,7 @@
      <message>
          <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="224"/>
          <source>Video Tree remembers last selected position</source>
@@ -23904,213 +28725,233 @@
      </message>
      <message>
          <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="229"/>
-@@ -30978,58 +31761,62 @@
+@@ -30978,197 +31142,187 @@
          <translation>If set, the current position in the Video Tree is persistent.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="284"/>
-+        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="281"/>
++        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="239"/>
          <source>Enable automatic Parental Level from rating</source>
 -        <translation>Enable automatic Parental Level from rating</translation>
 +        <translation>Enable Automatic Parental Level from Rating</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="288"/>
-+        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="285"/>
++        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="243"/>
          <source>If enabled, searches will automatically set the Parental Level to the one matching the rating below.</source>
          <translation>If enabled, searches will automatically set the Parental Level to the one matching the rating below.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="301"/>
-+        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="296"/>
++        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="254"/>
          <source>G</source>
          <comment>PL 1 default search string.</comment>
          <translation>G</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="303"/>
-+        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="298"/>
++        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="256"/>
          <source>PG</source>
          <comment>PL 2 default search string.</comment>
          <translation>PG</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="305"/>
-+        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="300"/>
++        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="258"/>
          <source>PG-13</source>
          <comment>PL3 default search string.</comment>
          <translation>PG-13</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="308"/>
-+        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="303"/>
++        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="261"/>
          <source>R:NC-17</source>
          <comment>PL4 default search string.</comment>
          <translation>R:NC-17</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="319"/>
-+        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="312"/>
++        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="270"/>
          <source>Level %1</source>
          <translation>Level %1</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="322"/>
-+        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="315"/>
++        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="273"/>
          <source>Ratings containing these strings (separated by :) will be assigned to Parental Level %1.</source>
          <translation>Ratings containing these strings (separated by :) will be assigned to Parental Level %1.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="366"/>
-+        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="341"/>
+-        <source>Parental Control Settings</source>
+-        <translation>Parental Control Settings</translation>
++        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="299"/>
 +        <source>General Settings</source>
 +        <translation>General Settings</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="354"/>
-         <source>Parental Control Settings</source>
-         <translation>Parental Control Settings</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="382"/>
-         <source>General Settings (%1/%2)</source>
+-        <source>General Settings (%1/%2)</source>
 -        <translation>General Settings (%1/%2)</translation>
-+        <translation type="vanished">General Settings (%1/%2)</translation>
++        <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="312"/>
++        <source>Parental Control Settings</source>
++        <translation>Parental Control Settings</translation>
      </message>
  </context>
  <context>
-@@ -31057,118 +31844,117 @@
+     <name>VideoMetadata</name>
+     <message>
+-        <location filename="../libs/libmythmetadata/videometadata.cpp" line="1100"/>
++        <location filename="../libs/libmythmetadata/videometadata.cpp" line="1085"/>
+         <source>Season</source>
+         <comment>Metadata file name parsing</comment>
+         <extracomment>Word(s) which should be recognized as &quot;season&quot; when parsing a video * file name. To list more than one word, separate them with a &apos;|&apos;.</extracomment>
+         <translation>Season</translation>
+     </message>
+     <message>
+-        <location filename="../libs/libmythmetadata/videometadata.cpp" line="1105"/>
++        <location filename="../libs/libmythmetadata/videometadata.cpp" line="1090"/>
+         <source>Episode</source>
+         <comment>Metadata file name parsing</comment>
+         <extracomment>Word(s) which should be recognized as &quot;episode&quot; when parsing a video * file name. To list more than one word, separate them with a &apos;|&apos;.</extracomment>
+         <translation>Episode</translation>
+     </message>
+-    <message>
+-        <location filename="../libs/libmythmetadata/videometadata.cpp" line="1179"/>
+-        <source>^(The |A |An )</source>
+-        <translation>^(The |A |An )</translation>
+-    </message>
+ </context>
  <context>
      <name>VideoModeSettings</name>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2184"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2177"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2200"/>
          <source>Separate video modes for GUI and TV playback</source>
 -        <translation>Separate video modes for GUI and TV playback</translation>
 +        <translation>Separate Video Modes for GUI and TV Playback</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2189"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2182"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2205"/>
          <source>Switch X Window video modes for TV. Requires &quot;xrandr&quot; support.</source>
          <translation>Switch X Window video modes for TV. Requires &quot;xrandr&quot; support.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2199"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2193"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2216"/>
          <source>In X</source>
          <comment>Video mode width</comment>
          <translation>In X</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2206"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2197"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2220"/>
          <source>Horizontal resolution of video which needs a special output resolution.</source>
          <translation>Horizontal resolution of video which needs a special output resolution.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2217"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2209"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2232"/>
          <source>In Y</source>
          <comment>Video mode height</comment>
          <translation>In Y</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2224"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2213"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2236"/>
          <source>Vertical resolution of video which needs a special output resolution.</source>
          <translation>Vertical resolution of video which needs a special output resolution.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2234"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2223"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2246"/>
          <source>GUI</source>
          <translation>GUI</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2238"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2225"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2248"/>
          <source>Resolution of screen when not watching a video.</source>
          <translation>Resolution of screen when not watching a video.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2268"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2255"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2278"/>
          <source>Default screen resolution when watching a video.</source>
          <translation>Default screen resolution when watching a video.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2270"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2257"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2280"/>
          <source>Screen resolution when watching a video at a specific resolution.</source>
          <translation>Screen resolution when watching a video at a specific resolution.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2276"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2263"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2286"/>
          <source>Video output</source>
 -        <translation>Video output</translation>
 +        <translation>Video Output</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2277"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2264"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2287"/>
          <source>Output</source>
          <translation>Output</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2298"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2338"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2361"/>
          <source>Default refresh rate when watching a video. Leave at &quot;Auto&quot; to automatically use the best available</source>
          <translation>Default refresh rate when watching a video. Leave at &quot;Auto&quot; to automatically use the best available</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2302"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2342"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2365"/>
          <source>Refresh rate when watching a video at a specific resolution. Leave at &quot;Auto&quot; to automatically use the best available</source>
          <translation>Refresh rate when watching a video at a specific resolution. Leave at &quot;Auto&quot; to automatically use the best available</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2310"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2351"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2374"/>
          <source>Rate</source>
          <translation>Rate</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2322"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2362"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2385"/>
          <source>Aspect ratio when watching a video. Leave at &quot;%1&quot; to use ratio reported by the monitor. Set to 16:9 or 4:3 to force a specific aspect ratio.</source>
          <translation>Aspect ratio when watching a video. Leave at &quot;%1&quot; to use ratio reported by the monitor. Set to 16:9 or 4:3 to force a specific aspect ratio.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2330"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2370"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2393"/>
          <source>Aspect ratio when watching a video at a specific resolution. Leave at &quot;%1&quot; to use ratio reported by the monitor. Set to 16:9 or 4:3 to force a specific aspect ratio.</source>
          <translation>Aspect ratio when watching a video at a specific resolution. Leave at &quot;%1&quot; to use ratio reported by the monitor. Set to 16:9 or 4:3 to force a specific aspect ratio.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2342"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2382"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2405"/>
          <source>Aspect</source>
          <translation>Aspect</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2348"/>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2350"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2386"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2388"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2409"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2411"/>
          <source>Default</source>
          <translation>Default</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2360"/>
-         <source>Video Mode Settings</source>
+-        <source>Video Mode Settings</source>
 -        <translation>Video Mode Settings</translation>
-+        <translation type="vanished">Video Mode Settings</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2383"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2415"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2438"/>
          <source>Overrides for specific video sizes</source>
 -        <translation>Overrides for specific video sizes</translation>
 +        <translation>Overrides for Specific Video Sizes</translation>
@@ -24120,11 +28961,20 @@
      <name>VideoOutWindow</name>
      <message>
 -        <location filename="../libs/libmythtv/videooutwindow.cpp" line="960"/>
-+        <location filename="../libs/libmythtv/videooutwindow.cpp" line="963"/>
++        <location filename="../libs/libmythtv/videooutwindow.cpp" line="1001"/>
          <source>Zoom %1x%2 @ (%3,%4)</source>
          <translation>Zoom %1x%2 @ (%3,%4)</translation>
      </message>
-@@ -31194,17 +31980,17 @@
+@@ -31176,7 +31330,7 @@
+ <context>
+     <name>VideoScanner</name>
+     <message>
+-        <location filename="../libs/libmythmetadata/videoscan.cpp" line="484"/>
++        <location filename="../libs/libmythmetadata/videoscan.cpp" line="482"/>
+         <source>Failed to Scan SG Video Hosts:
+ 
+ %1
+@@ -31194,80 +31348,80 @@
      <message>
          <location filename="../libs/libmythmetadata/videoscan.cpp" line="181"/>
          <source>Searching for video files</source>
@@ -24145,332 +28995,548 @@
      </message>
  </context>
  <context>
-@@ -31212,17 +31998,17 @@
+     <name>VideoSetupWizard</name>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="70"/>
+-        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="70"/>
++        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="67"/>
          <source>Select from one of the preconfigured playback profiles.  When satisfied, you can test Standard Definition and High Definition playback with the selected profile before moving on.</source>
 -        <translation>Select from one of the preconfigured playback profiles.  When satisfied, you can test Standard Definition and High Definition playback with the selected profile before moving on.</translation>
 +        <translation>Select from one of the preconfigured playback profiles. When satisfied, you can test Standard Definition and High Definition playback with the selected profile before moving on.</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="75"/>
+-        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="75"/>
++        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="72"/>
          <source>Test your playback settings with Standard Definition content. (480p)</source>
 -        <translation>Test your playback settings with Standard Definition content. (480p)</translation>
 +        <translation>Test your playback settings with Standard Definition (480p) content.</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="77"/>
+-        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="77"/>
++        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="74"/>
          <source>Test your playback settings with High Definition content (1080p).</source>
 -        <translation>Test your playback settings with High Definition content (1080p).</translation>
 +        <translation>Test your playback settings with High Definition (1080p) content.</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="79"/>
-@@ -31275,56 +32061,53 @@
+-        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="79"/>
++        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="76"/>
+         <source>Save these changes and move on to the next configuration step.</source>
+         <translation>Save these changes and move on to the next configuration step.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="81"/>
++        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="78"/>
+         <source>Return to the previous configuration step.</source>
+         <translation>Return to the previous configuration step.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="174"/>
++        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="171"/>
+         <source>A short test of your system&apos;s playback of Standard Definition content with the %1 profile.</source>
+         <translation>A short test of your system&apos;s playback of Standard Definition content with the %1 profile.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="177"/>
++        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="174"/>
+         <source>Standard Definition Playback Test</source>
+         <translation>Standard Definition Playback Test</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="195"/>
++        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="192"/>
+         <source>A short test of your system&apos;s playback of High Definition content with the %1 profile.</source>
+         <translation>A short test of your system&apos;s playback of High Definition content with the %1 profile.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="198"/>
++        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="195"/>
+         <source>High Definition Playback Test</source>
+         <translation>High Definition Playback Test</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="228"/>
++        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="225"/>
+         <source>Downloading Video Sample...</source>
+         <translation>Downloading Video Sample...</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="262"/>
++        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="259"/>
+         <source>Downloading Video Sample...
+ (%1 of %2 MB)</source>
+         <translation>Downloading Video Sample...
+ (%1 of %2 MB)</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="291"/>
++        <location filename="../programs/mythfrontend/setupwizard_video.cpp" line="288"/>
+         <source>Error downloading sample to backend.</source>
+         <translation>Error downloading sample to backend.</translation>
+     </message>
+@@ -31275,56 +31429,25 @@
  <context>
      <name>VideoSourceEditor</name>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3887"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3817"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3574"/>
          <source>Video sources</source>
 -        <translation>Video sources</translation>
-+        <translation>Video Sources</translation>
-+    </message>
-+    <message>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3860"/>
-+        <source>New video source</source>
-+        <translation>New Video Source</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3929"/>
-         <source>Video Source Menu</source>
+-        <source>Video Source Menu</source>
 -        <translation>Video Source Menu</translation>
-+        <translation type="vanished">Video Source Menu</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3930"/>
-         <source>Edit...</source>
+-        <source>Edit...</source>
 -        <translation>Edit...</translation>
-+        <translation type="vanished">Edit...</translation>
++        <translation>Video Sources</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3931"/>
-         <source>Delete...</source>
+-        <source>Delete...</source>
 -        <translation>Delete...</translation>
-+        <translation type="vanished">Delete...</translation>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3617"/>
++        <source>New video source</source>
++        <translation>New Video Source</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3948"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="3840"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="3597"/>
          <source>Are you sure you want to delete ALL video sources?</source>
          <translation>Are you sure you want to delete ALL video sources?</translation>
      </message>
-     <message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3950"/>
-         <source>Yes, delete video sources</source>
+-        <source>Yes, delete video sources</source>
 -        <translation>Yes, delete video sources</translation>
-+        <translation type="vanished">Yes, Delete Video Sources</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3951"/>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3975"/>
-         <source>No, don&apos;t</source>
+-        <source>No, don&apos;t</source>
 -        <translation>No, don&apos;t</translation>
-+        <translation type="vanished">No, Keep</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3972"/>
-         <source>Are you sure you want to delete this video source?</source>
+-        <source>Are you sure you want to delete this video source?</source>
 -        <translation>Are you sure you want to delete this video source?</translation>
-+        <translation type="vanished">Are you sure you want to delete this video source?</translation>
-     </message>
-     <message>
+-    </message>
+-    <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="3974"/>
-         <source>Yes, delete video source</source>
+-        <source>Yes, delete video source</source>
 -        <translation>Yes, delete video source</translation>
-+        <translation type="vanished">Yes, Delete Video Source</translation>
-     </message>
+-    </message>
  </context>
  <context>
      <name>VideoSourceSelector</name>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="71"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="76"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="79"/>
          <source>Video Source</source>
          <translation>Video Source</translation>
      </message>
-@@ -31348,93 +32131,93 @@
+@@ -31332,109 +31455,109 @@
+ <context>
+     <name>ViewScheduled</name>
+     <message>
+-        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="100"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="98"/>
+         <source>Scheduled Recordings</source>
+         <translation>Scheduled Recordings</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="110"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="108"/>
+         <source>Group List</source>
+         <translation>Group List</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="215"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="212"/>
+         <source>Options</source>
+         <translation>Options</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="226"/>
+-        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="226"/>
 -        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="644"/>
-+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="645"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="223"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="642"/>
          <source>Show Important</source>
          <translation>Show Important</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="228"/>
+-        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="228"/>
 -        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="648"/>
-+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="649"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="225"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="646"/>
          <source>Show All</source>
          <translation>Show All</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="229"/>
+-        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="229"/>
 -        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="652"/>
-+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="653"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="226"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="650"/>
          <source>Program Details</source>
          <translation>Program Details</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="230"/>
+-        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="230"/>
 -        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="656"/>
-+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="657"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="227"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="654"/>
          <source>Program Guide</source>
          <translation>Program Guide</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="231"/>
+-        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="231"/>
 -        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="660"/>
-+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="661"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="228"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="658"/>
          <source>Channel Search</source>
          <translation>Channel Search</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="232"/>
+-        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="232"/>
 -        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="664"/>
-+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="665"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="229"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="662"/>
          <source>Upcoming by title</source>
 -        <translation>Upcoming by title</translation>
 +        <translation>Upcoming by Title</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="233"/>
+-        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="233"/>
 -        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="668"/>
-+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="669"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="230"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="666"/>
          <source>Upcoming scheduled</source>
 -        <translation>Upcoming scheduled</translation>
 +        <translation>Upcoming Scheduled</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="234"/>
+-        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="234"/>
 -        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="672"/>
-+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="673"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="231"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="670"/>
          <source>Previously Recorded</source>
          <translation>Previously Recorded</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="235"/>
+-        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="235"/>
 -        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="676"/>
-+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="677"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="232"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="674"/>
          <source>Custom Edit</source>
          <translation>Custom Edit</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="236"/>
+-        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="236"/>
 -        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="680"/>
-+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="681"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="233"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="678"/>
          <source>Delete Rule</source>
          <translation>Delete Rule</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="237"/>
+-        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="237"/>
 -        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="684"/>
-+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="685"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="234"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="682"/>
          <source>Show Inputs</source>
          <translation>Show Inputs</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/viewscheduled.cpp" line="334"/>
+-        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="334"/>
 -        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="507"/>
-+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="508"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="331"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="505"/>
          <source>All</source>
          <translation>All</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="493"/>
-+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="494"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="491"/>
          <source>Conflict %1</source>
          <translation>Conflict %1</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="500"/>
-+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="501"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="498"/>
          <source>No Conflicts</source>
          <translation>No Conflicts</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="509"/>
-+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="510"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="507"/>
          <source>Important</source>
          <translation>Important</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="553"/>
-+        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="554"/>
++        <location filename="../programs/mythfrontend/viewscheduled.cpp" line="551"/>
          <source>Delete &apos;%1&apos; %2 rule?</source>
          <translation>Delete &apos;%1&apos; %2 rule?</translation>
      </message>
-@@ -31442,52 +32225,52 @@
+@@ -31442,52 +31565,52 @@
  <context>
      <name>WatchListSettings</name>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3232"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3240"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3400"/>
          <source>Include the &apos;Watch List&apos; group</source>
 -        <translation>Include the &apos;Watch List&apos; group</translation>
 +        <translation>Include the &apos;Watch List&apos; Group</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3236"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3244"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3404"/>
          <source>The &apos;Watch List&apos; is an abbreviated list of recordings sorted to highlight series and shows that need attention in order to keep up to date.</source>
          <translation>The &apos;Watch List&apos; is an abbreviated list of recordings sorted to highlight series and shows that need attention in order to keep up to date.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3248"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3256"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3416"/>
          <source>Start from the Watch List view</source>
 -        <translation>Start from the Watch List view</translation>
 +        <translation>Start from the Watch List View</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3252"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3260"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3420"/>
          <source>If enabled, the &apos;Watch List&apos; will be the initial view each time you enter the Watch Recordings screen</source>
 -        <translation>If enabled, the &apos;Watch List&apos; will be the initial view each time you enter the Watch Recordings screen</translation>
 +        <translation>If Enabled, the &apos;Watch List&apos; Will Be the Initial View Each Time You Enter the Watch Recordings Screen</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3262"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3270"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3430"/>
          <source>Exclude recordings not set for Auto-Expire</source>
 -        <translation>Exclude recordings not set for Auto-Expire</translation>
 +        <translation>Exclude Recordings Not Set for Auto-expire</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3267"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3275"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3435"/>
          <source>Set this if you turn off Auto-Expire only for recordings that you&apos;ve seen and intend to keep. This option will exclude these recordings from the &apos;Watch List&apos;.</source>
 -        <translation>Set this if you turn off Auto-Expire only for recordings that you&apos;ve seen and intend to keep. This option will exclude these recordings from the &apos;Watch List&apos;.</translation>
 +        <translation>Set this if you turn off Auto-expire only for recordings that you&apos;ve seen and intend to keep. This option will exclude these recordings from the &apos;Watch List&apos;.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3280"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3288"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3448"/>
          <source>Maximum days counted in the score</source>
 -        <translation>Maximum days counted in the score</translation>
 +        <translation>Maximum Days Counted in the Score</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3284"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3292"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3452"/>
          <source>The &apos;Watch List&apos; scores are based on 1 point equals one day since recording. This option limits the maximum score due to age and affects other weighting factors.</source>
          <translation>The &apos;Watch List&apos; scores are based on 1 point equals one day since recording. This option limits the maximum score due to age and affects other weighting factors.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3296"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3304"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3464"/>
          <source>Days to exclude weekly episodes after delete</source>
          <translation>Days to exclude weekly episodes after delete</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3301"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3309"/>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3469"/>
          <source>When an episode is deleted or marked as watched, other episodes of the series are excluded from the &apos;Watch List&apos; for this interval of time. Daily shows also have a smaller interval based on this setting.</source>
          <translation>When an episode is deleted or marked as watched, other episodes of the series are excluded from the &apos;Watch List&apos; for this interval of time. Daily shows also have a smaller interval based on this setting.</translation>
      </message>
-@@ -31508,7 +32291,7 @@
+@@ -31495,89 +31618,89 @@
+ <context>
+     <name>WelcomeDialog</name>
+     <message>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="91"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="84"/>
+         <source>Start Frontend</source>
+         <translation>Start Frontend</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="342"/>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="343"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="334"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="335"/>
+         <source>Cannot connect to server!</source>
+         <translation>Cannot connect to server!</translation>
+     </message>
      <message>
-         <location filename="../programs/mythwelcome/welcomedialog.cpp" line="363"/>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="363"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="355"/>
          <source>Tuner %1 is recording:</source>
 -        <translation>Tuner %1 is recording:</translation>
 +        <translation>Tuner %1 is Recording:</translation>
      </message>
      <message>
-         <location filename="../programs/mythwelcome/welcomedialog.cpp" line="371"/>
-@@ -31519,12 +32302,12 @@
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="371"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="363"/>
+         <source>%1 to %2</source>
+         <comment>Time period, &apos;starttime to endtime&apos;</comment>
+         <translation>%1 to %2</translation>
+     </message>
      <message>
-         <location filename="../programs/mythwelcome/welcomedialog.cpp" line="376"/>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="376"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="368"/>
          <source>There are no recordings currently taking place</source>
 -        <translation>There are no recordings currently taking place</translation>
 +        <translation>There Are No Recordings Currently Taking Place</translation>
      </message>
      <message>
-         <location filename="../programs/mythwelcome/welcomedialog.cpp" line="408"/>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="408"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="398"/>
          <source>There are no scheduled recordings</source>
 -        <translation>There are no scheduled recordings</translation>
 +        <translation>There Are No Scheduled Recordings</translation>
      </message>
      <message>
-         <location filename="../programs/mythwelcome/welcomedialog.cpp" line="415"/>
-@@ -31622,12 +32405,12 @@
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="415"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="405"/>
+         <source>Please Wait...</source>
+         <translation>Please Wait...</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="521"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="511"/>
+         <source>MythTV is about to start recording.</source>
+         <translation>MythTV is about to start recording.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="526"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="516"/>
+         <source>MythTV is busy recording.</source>
+         <translation>MythTV is busy recording.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="535"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="525"/>
+         <source>MythTV is busy transcoding.</source>
+         <translation>MythTV is busy transcoding.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="537"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="527"/>
+         <source>MythTV is busy flagging commercials.</source>
+         <translation>MythTV is busy flagging commercials.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="539"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="529"/>
+         <source>MythTV is busy grabbing EPG data.</source>
+         <translation>MythTV is busy grabbing EPG data.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="541"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="531"/>
+         <source>MythTV is locked by a user.</source>
+         <translation>MythTV is locked by a user.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="543"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="533"/>
+         <source>MythTV has running or pending jobs.</source>
+         <translation>MythTV has running or pending jobs.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="545"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="535"/>
+         <source>MythTV is in a daily wakeup/shutdown period.</source>
+         <translation>MythTV is in a daily wakeup/shutdown period.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="547"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="537"/>
+         <source>MythTV is about to start a wakeup/shutdown period.</source>
+         <translation>MythTV is about to start a wakeup/shutdown period.</translation>
+     </message>
+     <message numerus="yes">
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="553"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="543"/>
+         <source>MythTV is idle and will shutdown in %n second(s).</source>
+         <translation>
+             <numerusform>MythTV is idle and will shutdown in %n second.</numerusform>
+@@ -31585,52 +31708,52 @@
+         </translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="556"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="546"/>
+         <source>MythTV is idle.</source>
+         <translation>MythTV is idle.</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="604"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="594"/>
+         <source>Unlock Shutdown</source>
+         <translation>Unlock Shutdown</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="606"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="596"/>
+         <source>Lock Shutdown</source>
+         <translation>Lock Shutdown</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="608"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="598"/>
+         <source>Run mythfilldatabase</source>
+         <translation>Run mythfilldatabase</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="609"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="599"/>
+         <source>Shutdown Now</source>
+         <translation>Shutdown Now</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="610"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="600"/>
+         <source>Exit</source>
+         <translation>Exit</translation>
+     </message>
+     <message>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="611"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="601"/>
+         <source>Cancel</source>
+         <translation>Cancel</translation>
+     </message>
      <message>
-         <location filename="../programs/mythwelcome/welcomedialog.cpp" line="656"/>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="656"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="646"/>
          <source>Cannot shutdown because MythTV is currently recording</source>
 -        <translation>Cannot shutdown because MythTV is currently recording</translation>
 +        <translation>Cannot Shutdown Because MythTV is Currently Recording</translation>
      </message>
      <message>
-         <location filename="../programs/mythwelcome/welcomedialog.cpp" line="667"/>
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="667"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="657"/>
          <source>Cannot shutdown because MythTV is about to start recording</source>
 -        <translation>Cannot shutdown because MythTV is about to start recording</translation>
 +        <translation>Cannot Shutdown Because MythTV is About to Start Recording</translation>
      </message>
      <message>
-         <location filename="../programs/mythwelcome/welcomedialog.cpp" line="678"/>
-@@ -31638,12 +32421,12 @@
+-        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="678"/>
++        <location filename="../programs/mythwelcome/welcomedialog.cpp" line="668"/>
+         <source>Cannot shutdown because MythTV is about to start a wakeup/shutdown period.</source>
+         <translation>Cannot shutdown because MythTV is about to start a wakeup/shutdown period.</translation>
+     </message>
+@@ -31638,12 +31761,12 @@
  <context>
      <name>XMLTV_generic_config</name>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="462"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="613"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="614"/>
          <source>Configure</source>
          <translation>Configure</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videosource.cpp" line="463"/>
-+        <location filename="../libs/libmythtv/videosource.cpp" line="614"/>
++        <location filename="../libs/libmythtv/videosource.cpp" line="615"/>
          <source>Run XMLTV configure command.</source>
          <translation>Run XMLTV configure command.</translation>
      </message>
-- 
cgit v0.12

