summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2019-02-27 21:48:56 (GMT)
committerBritney Fransen <brfransen@gmail.com>2019-02-27 21:48:56 (GMT)
commit56fcdaf90373a5fd4534e44773557b8b22ffa282 (patch)
treef722a29dac8f6544056c486bdbb2d63dd81d3f45
parente50356bec0aeaa6c643ed93e2f8791aabbc62e29 (diff)
downloadlinhes_pkgbuild-56fcdaf90373a5fd4534e44773557b8b22ffa282.zip
linhes_pkgbuild-56fcdaf90373a5fd4534e44773557b8b22ffa282.tar.gz
linhes_pkgbuild-56fcdaf90373a5fd4534e44773557b8b22ffa282.tar.bz2
mythtv & mythplugins: update to latest fixes
update en translation
-rw-r--r--abs/core/mythtv/stable-30/git_src/git_hash2
-rw-r--r--abs/core/mythtv/stable-30/mythplugins/PKGBUILD10
-rw-r--r--abs/core/mythtv/stable-30/mythplugins/mythmusic_en_us.ts_Title_Case.patch2895
-rw-r--r--abs/core/mythtv/stable-30/mythtv/PKGBUILD9
-rw-r--r--abs/core/mythtv/stable-30/mythtv/fixTranslations.patch39
-rw-r--r--abs/core/mythtv/stable-30/mythtv/mythfrontend_en_us.ts_Title_Case.patch15368
6 files changed, 13164 insertions, 5159 deletions
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,323 +1,1417 @@
---- 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/cc608decoder.cpp" line="1534"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1518"/>
+ <source>Other</source>
+ <translation>Other</translation>
+ </message>
+ <message>
+- <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/cc608decoder.cpp" line="1538"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1522"/>
+ <source>Advertisement</source>
+ <translation>Advertisement</translation>
+ </message>
+ <message>
+- <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/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/cc608decoder.cpp" line="1544"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1528"/>
+ <source>Automobile</source>
+ <translation>Automobile</translation>
+ </message>
+ <message>
+- <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/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/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/cc608decoder.cpp" line="1552"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1536"/>
+ <source>Bulletin</source>
+ <translation>Bulletin</translation>
+ </message>
+ <message>
+- <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/cc608decoder.cpp" line="1556"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1540"/>
+ <source>Classical</source>
+ <translation>Classical</translation>
+ </message>
+ <message>
+- <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/cc608decoder.cpp" line="1560"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1544"/>
+ <source>Combat</source>
+ <translation>Combat</translation>
+ </message>
+ <message>
+- <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/cc608decoder.cpp" line="1564"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1548"/>
+ <source>Commentary</source>
+ <translation>Commentary</translation>
+ </message>
+ <message>
+- <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/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/cc608decoder.cpp" line="1570"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1554"/>
+ <source>Contemporary</source>
+ <translation>Contemporary</translation>
+ </message>
+ <message>
+- <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/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/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/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/cc608decoder.cpp" line="1580"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1564"/>
+ <source>Elementary</source>
+ <translation>Elementary</translation>
+ </message>
+ <message>
+- <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/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/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/cc608decoder.cpp" line="1588"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1572"/>
+ <source>Farm</source>
+ <translation>Farm</translation>
+ </message>
+ <message>
+- <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/cc608decoder.cpp" line="1592"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1576"/>
+ <source>Fiction</source>
+ <translation>Fiction</translation>
+ </message>
+ <message>
+- <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/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/cc608decoder.cpp" line="1598"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1582"/>
+ <source>Foreign</source>
+ <translation>Foreign</translation>
+ </message>
+ <message>
+- <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/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/cc608decoder.cpp" line="1604"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1588"/>
+ <source>Garden</source>
+ <translation>Garden</translation>
+ </message>
+ <message>
+- <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/cc608decoder.cpp" line="1608"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1592"/>
+ <source>Government</source>
+ <translation>Government</translation>
+ </message>
+ <message>
+- <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/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/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/cc608decoder.cpp" line="1616"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1600"/>
+ <source>Hobby</source>
+ <translation>Hobby</translation>
+ </message>
+ <message>
+- <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/cc608decoder.cpp" line="1620"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1604"/>
+ <source>Home</source>
+ <translation>Home</translation>
+ </message>
+ <message>
+- <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/cc608decoder.cpp" line="1624"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1608"/>
+ <source>Information</source>
+ <translation>Information</translation>
+ </message>
+ <message>
+- <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/cc608decoder.cpp" line="1628"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1612"/>
+ <source>International</source>
+ <translation>International</translation>
+ </message>
+ <message>
+- <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/cc608decoder.cpp" line="1632"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1616"/>
+ <source>Language</source>
+ <translation>Language</translation>
+ </message>
+ <message>
+- <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/cc608decoder.cpp" line="1636"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1620"/>
+ <source>Live</source>
+ <translation>Live</translation>
+ </message>
+ <message>
+- <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/cc608decoder.cpp" line="1640"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1624"/>
+ <source>Math</source>
+ <translation>Math</translation>
+ </message>
+ <message>
+- <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/cc608decoder.cpp" line="1644"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1628"/>
+ <source>Meeting</source>
+ <translation>Meeting</translation>
+ </message>
+ <message>
+- <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/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/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/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/cc608decoder.cpp" line="1654"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1638"/>
+ <source>National</source>
+ <translation>National</translation>
+ </message>
+ <message>
+- <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/cc608decoder.cpp" line="1658"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1642"/>
+ <source>Police</source>
+ <translation>Police</translation>
+ </message>
+ <message>
+- <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="400"/>
+- <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/cc608decoder.cpp" line="1664"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1648"/>
+ <source>Prerecorded</source>
+ <translation>Prerecorded</translation>
+ </message>
+ <message>
+- <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/cc608decoder.cpp" line="1668"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1652"/>
+ <source>Professional</source>
+ <translation>Professional</translation>
+ </message>
+ <message>
+- <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/cc608decoder.cpp" line="1672"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1656"/>
+ <source>Racing</source>
+ <translation>Racing</translation>
+ </message>
+ <message>
+- <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/cc608decoder.cpp" line="1676"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1660"/>
+ <source>Repair</source>
+ <translation>Repair</translation>
+ </message>
+ <message>
+- <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/cc608decoder.cpp" line="1680"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1664"/>
+ <source>Review</source>
+ <translation>Review</translation>
+ </message>
+ <message>
+- <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/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/cc608decoder.cpp" line="1686"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1670"/>
+ <source>Series</source>
+ <translation>Series</translation>
+ </message>
+ <message>
+- <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/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/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/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/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/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/cc608decoder.cpp" line="1700"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1684"/>
+ <source>Technical</source>
+ <translation>Technical</translation>
+ </message>
+ <message>
+- <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/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/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/cc608decoder.cpp" line="1708"/>
++ <location filename="../libs/libmythtv/cc608decoder.cpp" line="1692"/>
+ <source>Video</source>
+ <translation>Video</translation>
+ </message>
+ <message>
+- <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/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/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/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/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/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/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"/>
-@@ -624,7 +624,7 @@
+- <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="430"/>
+- <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"/>
-@@ -634,17 +634,17 @@
+- <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="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="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="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"/>
-@@ -654,7 +654,7 @@
+- <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="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"/>
-@@ -670,7 +670,7 @@
+- <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="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"/>
-@@ -695,7 +695,7 @@
+- <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="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"/>
-@@ -705,7 +705,7 @@
+- <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="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"/>
-@@ -715,32 +715,32 @@
+- <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="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="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="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="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="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="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"/>
-@@ -765,12 +765,12 @@
+- <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="524"/>
+- <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="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"/>
-@@ -780,7 +780,7 @@
+- <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="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"/>
-@@ -795,7 +795,7 @@
+- <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="542"/>
+- <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"/>
-@@ -810,7 +810,7 @@
+- <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="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"/>
-@@ -825,12 +825,12 @@
+- <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="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="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"/>
-@@ -860,12 +860,12 @@
+- <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="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="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"/>
-@@ -875,7 +875,7 @@
+- <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="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"/>
-@@ -920,7 +920,7 @@
+- <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="616"/>
+- <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"/>
-@@ -930,12 +930,12 @@
+- <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="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="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"/>
-@@ -945,7 +945,7 @@
+- <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="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"/>
-@@ -965,12 +965,12 @@
+- <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="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="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"/>
-@@ -986,12 +986,12 @@
+- <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="646"/>
+- <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="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"/>
-@@ -1001,7 +1001,7 @@
+- <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="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"/>
-@@ -1011,7 +1011,7 @@
+- <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="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"/>
-@@ -1021,7 +1021,7 @@
+- <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="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"/>
-@@ -1047,7 +1047,7 @@
+- <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="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"/>
-@@ -1092,7 +1092,7 @@
+- <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="694"/>
+- <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"/>
-@@ -1107,12 +1107,12 @@
+- <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="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="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="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"/>
@@ -360,215 +1454,212 @@
</message>
<message>
<location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="475"/>
-@@ -1471,124 +1471,132 @@
+@@ -1471,152 +1471,152 @@
<context>
<name>(ChannelSettings)</name>
<message>
- <location filename="../libs/libmythtv/channelsettings.cpp" line="89"/>
-+ <location filename="../libs/libmythtv/channelsettings.cpp" line="91"/>
++ <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="134"/>
++ <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="135"/>
++ <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="175"/>
++ <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="178"/>
++ <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="193"/>
++ <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="195"/>
++ <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="209"/>
++ <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="211"/>
++ <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="223"/>
++ <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="226"/>
++ <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="240"/>
++ <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="243"/>
++ <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="258"/>
++ <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="314"/>
++ <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="316"/>
++ <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="344"/>
++ <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="347"/>
++ <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="369"/>
++ <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="371"/>
++ <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="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/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"/>
++ <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="131"/>
++ <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="584"/>
++ <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="587"/>
++ <location filename="../programs/mythfrontend/main.cpp" line="608"/>
<source>There are no configured tuners.</source>
<translation>There are no configured tuners.</translation>
</message>
-@@ -2061,7 +2064,7 @@
+ <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="../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="../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="../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>
+ <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="128"/>
+- <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="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>
++ <name>ChannelGroupsSetting</name>
<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>
+- <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="2692"/>
-+ <location filename="../programs/mythfrontend/globalsettings.cpp" line="2717"/>
- <source>Default channel group</source>
+- <source>Default channel group</source>
- <translation>Default channel group</translation>
-+ <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="2698"/>
-+ <location filename="../programs/mythfrontend/globalsettings.cpp" line="2723"/>
- <source>All Channels</source>
- <translation>All Channels</translation>
+- <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="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>
+- <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>
-+ <name>ChannelGroupsSetting</name>
-+ <message>
-+ <location filename="../programs/mythfrontend/globalsettings.cpp" line="4535"/>
-+ <source>Channel Groups</source>
-+ <translation>Channel Groups</translation>
-+ </message>
-+ <message>
-+ <location filename="../programs/mythfrontend/globalsettings.cpp" line="4542"/>
-+ <source>(Create New Channel Group)</source>
-+ <translation>(Create New Channel Group)</translation>
-+ </message>
-+ <message>
-+ <location filename="../programs/mythfrontend/globalsettings.cpp" line="4546"/>
-+ <source>Favorites</source>
-+ <translation>Favorites</translation>
-+ </message>
-+ <message>
-+ <location filename="../programs/mythfrontend/globalsettings.cpp" line="4579"/>
++ <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>
+- <source>DiSEqC Device Tree</source>
- <translation>DiSEqC Device Tree</translation>
-+ <translation type="vanished">DiSEqC Device Tree</translation>
- </message>
- <message>
+- </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="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="66"/>
+- <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="253"/>
+- <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="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/grabbersettings.cpp" line="62"/>
+- <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="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,31 +8001,31 @@
</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>
@@ -6413,49 +8033,49 @@
- <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="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"/>
<sou