From ee18ce7f418ef89e89d79fe804550be9a4918780 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 15 Mar 2023 17:30:14 -0400
Subject: mythtv: update and add some patches

---
 linhes/mythplugins/PKGBUILD                        |    4 +-
 ...ncy-by-moving-blocking-code-to-own-thread.patch |   71 +
 linhes/mythtv/0059-portchecker-speedup.patch       |   27 +
 ...Add-interlaced-status-to-OSD-debug-screen.patch |   20 +
 linhes/mythtv/PKGBUILD                             |   16 +-
 .../mythtv/autoskip_reduce_commskip_jumpback.patch |   15 +
 .../mythtv/mythfrontend_en_us.ts_Title_Case.patch  | 3348 ++++++++++++++++++--
 7 files changed, 3256 insertions(+), 245 deletions(-)
 create mode 100644 linhes/mythtv/0031-UPnP-Reduce-startup-latency-by-moving-blocking-code-to-own-thread.patch
 create mode 100644 linhes/mythtv/0059-portchecker-speedup.patch
 create mode 100644 linhes/mythtv/0227-OSD-Add-interlaced-status-to-OSD-debug-screen.patch
 create mode 100644 linhes/mythtv/autoskip_reduce_commskip_jumpback.patch

diff --git a/linhes/mythplugins/PKGBUILD b/linhes/mythplugins/PKGBUILD
index dca961f..0b4c53c 100644
--- a/linhes/mythplugins/PKGBUILD
+++ b/linhes/mythplugins/PKGBUILD
@@ -15,8 +15,8 @@ pkgname=('mythplugins-mytharchive'
          'mythplugins-mythzoneminder')
 br=fixes/33
 t="${br#*/}+${br%/[0-9][0-9]}"
-pkgver=33+fixes.20230219.c273ed0f
-pkgrel=2
+pkgver=33+fixes.20230313.7f288be6
+pkgrel=1
 epoch=0
 arch=('any')
 url="http://www.mythtv.org"
diff --git a/linhes/mythtv/0031-UPnP-Reduce-startup-latency-by-moving-blocking-code-to-own-thread.patch b/linhes/mythtv/0031-UPnP-Reduce-startup-latency-by-moving-blocking-code-to-own-thread.patch
new file mode 100644
index 0000000..288a243
--- /dev/null
+++ b/linhes/mythtv/0031-UPnP-Reduce-startup-latency-by-moving-blocking-code-to-own-thread.patch
@@ -0,0 +1,71 @@
+diff -Naur mythtv-master-20210518-gc8c226c9b4-old/mythtv/libs/libmythupnp/ssdp.cpp mythtv-master-20210518-gc8c226c9b4-new/mythtv/libs/libmythupnp/ssdp.cpp
+--- mythtv-master-20210518-gc8c226c9b4-old/mythtv/libs/libmythupnp/ssdp.cpp	2021-05-18 16:11:31.379999938 +0200
++++ mythtv-master-20210518-gc8c226c9b4-new/mythtv/libs/libmythupnp/ssdp.cpp	2021-05-18 16:11:34.569999938 +0200
+@@ -155,21 +155,21 @@
+         // ------------------------------------------------------------------
+ 
+         LOG(VB_UPNP, LOG_INFO,
+-            "SSDP::EnableNotifications() - sending NTS_byebye");
+-        m_pNotifyTask->SetNTS( NTS_byebye );
+-        m_pNotifyTask->Execute( nullptr );
+-
+-        m_bAnnouncementsEnabled = true;
++            "SSDP::EnableNotifications() - sending NTS_byebye2");
++        m_pNotifyTask->SetNTS( NTS_byebye2 );
++    }
++    else
++    {
++        LOG(VB_UPNP, LOG_INFO,
++            "SSDP::EnableNotifications() - sending NTS_alive");
++        m_pNotifyTask->SetNTS( NTS_alive );
+     }
+ 
++    m_bAnnouncementsEnabled = true;
++
+     // ------------------------------------------------------------------
+     // Add Announcement Task to the Queue
+     // ------------------------------------------------------------------
+-
+-    LOG(VB_UPNP, LOG_INFO, "SSDP::EnableNotifications() - sending NTS_alive");
+-
+-    m_pNotifyTask->SetNTS( NTS_alive );
+-
+     TaskQueue::Instance()->AddTask(m_pNotifyTask);
+ 
+     LOG(VB_UPNP, LOG_INFO,
+diff -Naur mythtv-master-20210518-gc8c226c9b4-old/mythtv/libs/libmythupnp/upnptasknotify.cpp mythtv-master-20210518-gc8c226c9b4-new/mythtv/libs/libmythupnp/upnptasknotify.cpp
+--- mythtv-master-20210518-gc8c226c9b4-old/mythtv/libs/libmythupnp/upnptasknotify.cpp	2021-05-18 16:11:31.379999938 +0200
++++ mythtv-master-20210518-gc8c226c9b4-new/mythtv/libs/libmythupnp/upnptasknotify.cpp	2021-05-18 16:11:34.586666605 +0200
+@@ -165,6 +167,11 @@
+ 
+     if (m_eNTS == NTS_alive) 
+         pQueue->AddTask( (m_nMaxAge / 2), (Task *)this  );
++    else if (m_eNTS == NTS_byebye2)
++    {
++        m_eNTS = NTS_alive;
++        pQueue->AddTask( this );
++    }
+ 
+     m_mutex.unlock();
+ 
+diff -Naur mythtv-master-20210518-gc8c226c9b4-old/mythtv/libs/libmythupnp/upnptasknotify.h mythtv-master-20210518-gc8c226c9b4-new/mythtv/libs/libmythupnp/upnptasknotify.h
+--- mythtv-master-20210518-gc8c226c9b4-old/mythtv/libs/libmythupnp/upnptasknotify.h	2021-05-18 16:11:31.379999938 +0200
++++ mythtv-master-20210518-gc8c226c9b4-new/mythtv/libs/libmythupnp/upnptasknotify.h	2021-05-18 16:11:34.586666605 +0200
+@@ -38,7 +38,8 @@
+ enum UPnpNotifyNTS
+ {
+     NTS_alive   = 0,
+-    NTS_byebye  = 1
++    NTS_byebye  = 1,
++    NTS_byebye2
+ };
+ 
+ /////////////////////////////////////////////////////////////////////////////
+@@ -89,6 +90,7 @@
+             {
+                 case NTS_alive : return( "ssdp:alive"  );
+                 case NTS_byebye: return( "ssdp:byebye" );
++                case NTS_byebye2: return( "ssdp:byebye" );
+             }
+             return( "unknown" );
+         }
diff --git a/linhes/mythtv/0059-portchecker-speedup.patch b/linhes/mythtv/0059-portchecker-speedup.patch
new file mode 100644
index 0000000..fba1abc
--- /dev/null
+++ b/linhes/mythtv/0059-portchecker-speedup.patch
@@ -0,0 +1,27 @@
+diff -Naur mythtv-master-20210518-gc8c226c9b4-old/mythtv/libs/libmythbase/portchecker.cpp mythtv-master-20210518-gc8c226c9b4-new/mythtv/libs/libmythbase/portchecker.cpp
+--- mythtv-master-20210518-gc8c226c9b4-old/mythtv/libs/libmythbase/portchecker.cpp	2021-05-18 16:11:42.736666605 +0200
++++ mythtv-master-20210518-gc8c226c9b4-new/mythtv/libs/libmythbase/portchecker.cpp	2021-05-18 16:11:45.799999938 +0200
+@@ -180,18 +180,18 @@
+         }
+         else
+             retryCount++;
+-        // This retry count of 6 means 3 seconds of waiting for
++        // This retry count of 30 means 3 seconds of waiting for
+         // connection before aborting and starting a new connection attempt.
+-        if (retryCount > 6)
++        if (retryCount > 30)
+             socket.abort();
+         processEvents();
+         // Check if user got impatient and canceled
+         if (m_cancelCheck)
+             break;
+-        std::this_thread::sleep_for(500ms);
++        std::this_thread::sleep_for(100ms);
+         state = socket.state();
+-        LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("socket state %1")
+-            .arg(state));
++        LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("host %1 port %2 socket state %3")
++            .arg(host).arg(port).arg(state));
+         if (linkLocalOnly
+           && state == QAbstractSocket::UnconnectedState
+           && testedAll)
diff --git a/linhes/mythtv/0227-OSD-Add-interlaced-status-to-OSD-debug-screen.patch b/linhes/mythtv/0227-OSD-Add-interlaced-status-to-OSD-debug-screen.patch
new file mode 100644
index 0000000..4705b71
--- /dev/null
+++ b/linhes/mythtv/0227-OSD-Add-interlaced-status-to-OSD-debug-screen.patch
@@ -0,0 +1,20 @@
+diff -Naur mythtv-master-20210518-gc8c226c9b4-old/mythtv/libs/libmythtv/mythplayerui.cpp mythtv-master-20210518-gc8c226c9b4-new/mythtv/libs/libmythtv/mythplayerui.cpp
+--- mythtv-master-20210518-gc8c226c9b4-old/mythtv/libs/libmythtv/mythplayerui.cpp	2021-05-18 16:13:11.066666603 +0200
++++ mythtv-master-20210518-gc8c226c9b4-new/mythtv/libs/libmythtv/mythplayerui.cpp	2021-05-18 16:13:14.299999937 +0200
+@@ -821,14 +821,14 @@
+     if (m_decoder)
+         Map["videocodecdesc"] = m_decoder->GetRawEncodingType();
+     Map["videowidth"]     = QString::number(width);
+-    Map["videoheight"]    = QString::number(height);
++    bool interlaced = is_interlaced(GetScanType());
++    Map["videoheight"]    = QString::number(height) + (interlaced ? "i" : "p");
+     Map["videoframerate"] = QString::number(m_videoFrameRate, 'f', 2);
+     Map["deinterlacer"]   = GetDeinterlacerName();
+ 
+     if (width < 640)
+         return;
+ 
+-    bool interlaced = is_interlaced(GetScanType());
+     if (height > 2100)
+         Map["videodescrip"] = interlaced ? "UHD_4K_I" : "UHD_4K_P";
+     else if (width == 1920 || height == 1080 || height == 1088)
diff --git a/linhes/mythtv/PKGBUILD b/linhes/mythtv/PKGBUILD
index a51a747..f3504ac 100644
--- a/linhes/mythtv/PKGBUILD
+++ b/linhes/mythtv/PKGBUILD
@@ -7,8 +7,8 @@
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=mythtv
-pkgver=33+fixes.20230219.c273ed0f
-pkgrel=3
+pkgver=33+fixes.20230313.7f288be6
+pkgrel=2
 pkgdesc="A Homebrew PVR project"
 arch=('x86_64')
 url="https://www.mythtv.org/"
@@ -81,7 +81,11 @@ makedepends=(
 conflicts=('myththemes' 'mythplugins-mythvideo' 'mythtv-git')
 replaces=('myththemes' 'mythplugins-mythvideo' 'mythtv-git')
 
-patches="defaultThemeLinHES.patch
+patches="0031-UPnP-Reduce-startup-latency-by-moving-blocking-code-to-own-thread.patch
+         0059-portchecker-speedup.patch
+         0227-OSD-Add-interlaced-status-to-OSD-debug-screen.patch
+         autoskip_reduce_commskip_jumpback.patch
+         defaultThemeLinHES.patch
          mythfrontend_en_us.ts_Title_Case.patch"
 
 source=(
@@ -101,8 +105,12 @@ sha256sums=('SKIP'
             '12cb52bf9b084a4f16419c9370fef0450ce6a11308b0c3f7240f4f83df7e2ab6'
             'ecfd02bbbef5de9773f4de2c52e9b2b382ce8137735f249d7900270d304fd333'
             '470de0a4050c16c7af11a0e5cfe2810b7daae42df4acf5456c7eae274dc7c5ae'
+            '276f87058edc6197ab3a53faf6b4c485ef0d2b8447b9caa02ca7234f09ab473f'
+            '1ed4be912cd1ebd73553306958b7a2bc98e466b947dfb5d90ad7c0590a5a3747'
+            '630c80c588a9b278c4421d356c5cbaa0debf149524bc896656b580b89d8fae88'
+            '8a81e724d902976056dc824e7304df343c230ce67ec6ce1d18e110c5ef818ef6'
             'ef1d0053d862a9c714093d375e20c96418d665fa504a5b8f30621a271d416dd8'
-            'eb26e0cbf3ca3554479d19c383666721fbb5fe45c9dd24f2d36cbe29bcc0056f')
+            '6c6047d676635375f44fd219b989ed99602ed3260a8a5757195831dcc8a7c1bc')
 
 prepare() {
   msg2 "PKGBUILD pkgver: $pkgver"
diff --git a/linhes/mythtv/autoskip_reduce_commskip_jumpback.patch b/linhes/mythtv/autoskip_reduce_commskip_jumpback.patch
new file mode 100644
index 0000000..2c05a87
--- /dev/null
+++ b/linhes/mythtv/autoskip_reduce_commskip_jumpback.patch
@@ -0,0 +1,15 @@
+diff --git a/mythtv/libs/libmythtv/commbreakmap.cpp b/mythtv/libs/libmythtv/commbreakmap.cpp
+index 66cacb1eb0..3afcea169c 100644
+--- a/mythtv/libs/libmythtv/commbreakmap.cpp
++++ b/mythtv/libs/libmythtv/commbreakmap.cpp
+@@ -257,8 +257,8 @@ bool CommBreakMap::DoSkipCommercials(uint64_t &jumpToFrame,
+     {
+         comm_msg = tr("Skipping Back.");
+ 
+-        if (m_lastCommSkipStart > (2.0 * video_frame_rate))
+-            m_lastCommSkipStart -= (long long) (2.0 * video_frame_rate);
++        if (m_lastCommSkipStart > (1.25 * video_frame_rate))
++            m_lastCommSkipStart -= (long long) (1.25 * video_frame_rate);
+         m_lastCommSkipDirection = 0;
+         m_lastCommSkipTime = time(nullptr);
+         jumpToFrame = m_lastCommSkipStart;
diff --git a/linhes/mythtv/mythfrontend_en_us.ts_Title_Case.patch b/linhes/mythtv/mythfrontend_en_us.ts_Title_Case.patch
index ea2a097..30b3e48 100644
--- a/linhes/mythtv/mythfrontend_en_us.ts_Title_Case.patch
+++ b/linhes/mythtv/mythfrontend_en_us.ts_Title_Case.patch
@@ -1,8 +1,372 @@
 diff --git a/mythtv/i18n/mythfrontend_en_us.ts b/mythtv/i18n/mythfrontend_en_us.ts
-index e4d869578b..a960c92743 100644
+index e4d869578b..bd5db011ef 100644
 --- a/mythtv/i18n/mythfrontend_en_us.ts
 +++ b/mythtv/i18n/mythfrontend_en_us.ts
-@@ -1071,17 +1071,17 @@
+@@ -46,19 +46,11 @@
+         <source>Sports</source>
+         <translation>Sports</translation>
+     </message>
+-    <message>
+-        <source>Other</source>
+-        <translation type="vanished">Other</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="398"/>
+         <source>Action</source>
+         <translation>Action</translation>
+     </message>
+-    <message>
+-        <source>Advertisement</source>
+-        <translation type="vanished">Advertisement</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="406"/>
+         <source>Animated</source>
+@@ -69,10 +61,6 @@
+         <source>Anthology</source>
+         <translation>Anthology</translation>
+     </message>
+-    <message>
+-        <source>Automobile</source>
+-        <translation type="vanished">Automobile</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="414"/>
+         <source>Awards</source>
+@@ -88,49 +76,17 @@
+         <source>Basketball</source>
+         <translation>Basketball</translation>
+     </message>
+-    <message>
+-        <source>Bulletin</source>
+-        <translation type="vanished">Bulletin</translation>
+-    </message>
+-    <message>
+-        <source>Business</source>
+-        <translation type="vanished">Business</translation>
+-    </message>
+-    <message>
+-        <source>Classical</source>
+-        <translation type="vanished">Classical</translation>
+-    </message>
+-    <message>
+-        <source>College</source>
+-        <translation type="vanished">College</translation>
+-    </message>
+-    <message>
+-        <source>Combat</source>
+-        <translation type="vanished">Combat</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="442"/>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="376"/>
+         <source>Comedy</source>
+         <translation>Comedy</translation>
+     </message>
+-    <message>
+-        <source>Commentary</source>
+-        <translation type="vanished">Commentary</translation>
+-    </message>
+-    <message>
+-        <source>Concert</source>
+-        <translation type="vanished">Concert</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="632"/>
+         <source>Consumer</source>
+         <translation>Consumer</translation>
+     </message>
+-    <message>
+-        <source>Contemporary</source>
+-        <translation type="vanished">Contemporary</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="450"/>
+         <source>Crime</source>
+@@ -153,14 +109,6 @@
+         <source>Drama</source>
+         <translation>Drama</translation>
+     </message>
+-    <message>
+-        <source>Elementary</source>
+-        <translation type="vanished">Elementary</translation>
+-    </message>
+-    <message>
+-        <source>Erotica</source>
+-        <translation type="vanished">Erotica</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="464"/>
+         <source>Exercise</source>
+@@ -171,134 +119,58 @@
+         <source>Fantasy</source>
+         <translation>Fantasy</translation>
+     </message>
+-    <message>
+-        <source>Farm</source>
+-        <translation type="vanished">Farm</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="468"/>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="487"/>
+         <source>Fashion</source>
+         <translation>Fashion</translation>
+     </message>
+-    <message>
+-        <source>Fiction</source>
+-        <translation type="vanished">Fiction</translation>
+-    </message>
+-    <message>
+-        <source>Food</source>
+-        <translation type="vanished">Food</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="472"/>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="648"/>
+         <source>Football</source>
+         <translation>Football</translation>
+     </message>
+-    <message>
+-        <source>Foreign</source>
+-        <translation type="vanished">Foreign</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="476"/>
+         <source>Fundraiser</source>
+         <translation>Fundraiser</translation>
+     </message>
+-    <message>
+-        <source>Game/Quiz</source>
+-        <translation type="vanished">Game/Quiz</translation>
+-    </message>
+-    <message>
+-        <source>Garden</source>
+-        <translation type="vanished">Garden</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="480"/>
+         <source>Golf</source>
+         <translation>Golf</translation>
+     </message>
+-    <message>
+-        <source>Government</source>
+-        <translation type="vanished">Government</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="484"/>
+         <source>Health</source>
+         <translation>Health</translation>
+     </message>
+-    <message>
+-        <source>High School</source>
+-        <translation type="vanished">High School</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="486"/>
+         <source>History</source>
+         <translation>History</translation>
+     </message>
+-    <message>
+-        <source>Hobby</source>
+-        <translation type="vanished">Hobby</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="490"/>
+         <source>Hockey</source>
+         <translation>Hockey</translation>
+     </message>
+-    <message>
+-        <source>Home</source>
+-        <translation type="vanished">Home</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="500"/>
+         <source>Horror</source>
+         <translation>Horror</translation>
+     </message>
+-    <message>
+-        <source>Information</source>
+-        <translation type="vanished">Information</translation>
+-    </message>
+-    <message>
+-        <source>Instruction</source>
+-        <translation type="vanished">Instruction</translation>
+-    </message>
+-    <message>
+-        <source>International</source>
+-        <translation type="vanished">International</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="508"/>
+         <source>Interview</source>
+         <translation>Interview</translation>
+     </message>
+-    <message>
+-        <source>Language</source>
+-        <translation type="vanished">Language</translation>
+-    </message>
+-    <message>
+-        <source>Legal</source>
+-        <translation type="vanished">Legal</translation>
+-    </message>
+-    <message>
+-        <source>Live</source>
+-        <translation type="vanished">Live</translation>
+-    </message>
+-    <message>
+-        <source>Local</source>
+-        <translation type="vanished">Local</translation>
+-    </message>
+-    <message>
+-        <source>Math</source>
+-        <translation type="vanished">Math</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="514"/>
+         <source>Medical</source>
+         <translation>Medical</translation>
+     </message>
+-    <message>
+-        <source>Meeting</source>
+-        <translation type="vanished">Meeting</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="698"/>
+         <source>Military</source>
+@@ -319,64 +191,16 @@
+         <source>Mystery</source>
+         <translation>Mystery</translation>
+     </message>
+-    <message>
+-        <source>National</source>
+-        <translation type="vanished">National</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="534"/>
+         <source>Nature</source>
+         <translation>Nature</translation>
+     </message>
+-    <message>
+-        <source>Police</source>
+-        <translation type="vanished">Police</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="672"/>
+         <source>Politics</source>
+         <translation>Politics</translation>
+     </message>
+-    <message>
+-        <source>Premiere</source>
+-        <translation type="vanished">Premiere</translation>
+-    </message>
+-    <message>
+-        <source>Prerecorded</source>
+-        <translation type="vanished">Prerecorded</translation>
+-    </message>
+-    <message>
+-        <source>Product</source>
+-        <translation type="vanished">Product</translation>
+-    </message>
+-    <message>
+-        <source>Professional</source>
+-        <translation type="vanished">Professional</translation>
+-    </message>
+-    <message>
+-        <source>Public</source>
+-        <translation type="vanished">Public</translation>
+-    </message>
+-    <message>
+-        <source>Racing</source>
+-        <translation type="vanished">Racing</translation>
+-    </message>
+-    <message>
+-        <source>Reading</source>
+-        <translation type="vanished">Reading</translation>
+-    </message>
+-    <message>
+-        <source>Repair</source>
+-        <translation type="vanished">Repair</translation>
+-    </message>
+-    <message>
+-        <source>Repeat</source>
+-        <translation type="vanished">Repeat</translation>
+-    </message>
+-    <message>
+-        <source>Review</source>
+-        <translation type="vanished">Review</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="550"/>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="383"/>
+@@ -388,23 +212,11 @@
+         <source>Science</source>
+         <translation>Science</translation>
+     </message>
+-    <message>
+-        <source>Series</source>
+-        <translation type="vanished">Series</translation>
+-    </message>
+-    <message>
+-        <source>Service</source>
+-        <translation type="vanished">Service</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="564"/>
+         <source>Shopping</source>
+         <translation>Shopping</translation>
+     </message>
+-    <message>
+-        <source>Soap Opera</source>
+-        <translation type="vanished">Soap Opera</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="576"/>
+         <source>Special</source>
+@@ -420,10 +232,6 @@
+         <source>Talk</source>
+         <translation>Talk</translation>
+     </message>
+-    <message>
+-        <source>Technical</source>
+-        <translation type="vanished">Technical</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="588"/>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="690"/>
+@@ -440,10 +248,6 @@
+         <source>Variety</source>
+         <translation>Variety</translation>
+     </message>
+-    <message>
+-        <source>Video</source>
+-        <translation type="vanished">Video</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="602"/>
+         <source>Weather</source>
+@@ -1045,10 +849,6 @@
+         <source>Science Fiction/Fantasy/Horror</source>
+         <translation>Science Fiction/Fantasy/Horror</translation>
+     </message>
+-    <message>
+-        <source>Soap/melodrama/folkloric</source>
+-        <translation type="vanished">Soap/Melodrama/Folkloric</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="386"/>
+         <source>Serious/Classical/Religious/Historical Movie/Drama</source>
+@@ -1060,28 +860,20 @@
+         <comment>Adult Movie</comment>
+         <translation>Adult</translation>
+     </message>
+-    <message>
+-        <source>News/weather report</source>
+-        <translation type="vanished">News/Weather Report</translation>
+-    </message>
+-    <message>
+-        <source>News magazine</source>
+-        <translation type="vanished">News Magazine</translation>
+-    </message>
      <message>
          <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="379"/>
          <source>Soap/Melodrama/Folkloric</source>
@@ -23,7 +387,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="400"/>
-@@ -1271,12 +1271,12 @@
+@@ -1271,16 +1063,12 @@
      <message>
          <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="489"/>
          <source>Social/Political/Economics</source>
@@ -34,20 +398,42 @@ index e4d869578b..a960c92743 100644
          <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="500"/>
          <source>Nature/Animals/Environment</source>
 -        <translation type="unfinished"></translation>
+-    </message>
+-    <message>
+-        <source>Social/Policical/Economics</source>
+-        <translation type="vanished">Social/Policical/Economics</translation>
 +        <translation>Nature/Animals/Environment</translation>
      </message>
      <message>
-         <source>Social/Policical/Economics</source>
-@@ -1421,7 +1421,7 @@
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="491"/>
+@@ -1302,10 +1090,6 @@
+         <source>Education/Science/Factual</source>
+         <translation>Education/Science/Factual</translation>
+     </message>
+-    <message>
+-        <source>Nature/animals/Environment</source>
+-        <translation type="vanished">Nature/Animals/Environment</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mpeg/dvbdescriptors.cpp" line="502"/>
+         <source>Technology/Natural Sciences</source>
+@@ -1414,14 +1198,10 @@
+         <source>DataDirect Time Offset</source>
+         <translation>DataDirect Time Offset</translation>
+     </message>
+-    <message>
+-        <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 type="vanished">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="185"/>
          <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.</source>
 -        <translation type="unfinished"></translation>
-+        <translation></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.</translation>
      </message>
      <message>
          <location filename="../libs/libmythtv/channelsettings.cpp" line="199"/>
-@@ -1471,17 +1471,17 @@
+@@ -1471,21 +1251,17 @@
      <message>
          <location filename="../libs/libmythtv/channelsettings.cpp" line="320"/>
          <source>Service ID</source>
@@ -58,17 +444,43 @@ index e4d869578b..a960c92743 100644
          <location filename="../libs/libmythtv/channelsettings.cpp" line="402"/>
          <source>If set to Always Visible or Visible, the channel will be visible in the EPG.  Set to Always Visible or Never Visible to prevent MythTV and other utilities from automatically managing the value for this channel.</source>
 -        <translation type="unfinished"></translation>
-+        <translation></translation>
++        <translation>If set to Always Visible or Visible, the channel will be visible in the EPG.  Set to Always Visible or Never Visible to prevent MythTV and other utilities from automatically managing the value for this channel.</translation>
      </message>
      <message>
          <location filename="../libs/libmythtv/channelsettings.cpp" line="446"/>
          <source>N.B. This setting is only used for analog channels. 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 type="unfinished"></translation>
-+        <translation></translation>
+-    </message>
+-    <message>
+-        <source>ServiceID</source>
+-        <translation type="vanished">Service ID</translation>
++        <translation>N.B. This setting is only used for analog channels. 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="322"/>
+@@ -1507,10 +1283,6 @@
+         <source>Visible</source>
+         <translation>Visible</translation>
+     </message>
+-    <message>
+-        <source>If enabled, the channel will be visible in the EPG.</source>
+-        <translation type="vanished">If enabled, the channel will be visible in the EPG.</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/channelsettings.cpp" line="425"/>
+         <source>Use on air guide</source>
+@@ -1526,10 +1298,6 @@
+         <source>Freq/Channel</source>
+         <translation>Frequency/Channel</translation>
      </message>
+-    <message>
+-        <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 type="vanished">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>ServiceID</source>
-@@ -1590,7 +1590,7 @@
+         <location filename="../libs/libmythtv/channelsettings.cpp" line="461"/>
+         <source>Finetune (kHz)</source>
+@@ -1590,7 +1358,7 @@
      <message>
          <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="2033"/>
          <source>OK All</source>
@@ -77,7 +489,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythbase/mythdate.cpp" line="168"/>
-@@ -1693,7 +1693,7 @@
+@@ -1693,7 +1461,7 @@
      <message>
          <location filename="../libs/libmythtv/channelsettings.cpp" line="77"/>
          <source>It is NOT a good idea to change this value as it only changes the sourceid in table channel but not in dtv_multiplex. The sourceid in dtv_multiplex cannot and should not be changed.</source>
@@ -86,7 +498,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/channelsettings.cpp" line="134"/>
-@@ -1715,22 +1715,22 @@
+@@ -1715,22 +1483,22 @@
      <message>
          <location filename="../libs/libmythtv/channelsettings.cpp" line="408"/>
          <source>Always Visible</source>
@@ -113,7 +525,30 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/channelsettings.cpp" line="479"/>
-@@ -2039,8 +2039,8 @@
+@@ -1820,22 +1588,6 @@
+         <source>Off</source>
+         <translation>Off</translation>
+     </message>
+-    <message>
+-        <source>Qt</source>
+-        <translation type="vanished">Qt</translation>
+-    </message>
+-    <message>
+-        <source>OpenGL 2</source>
+-        <translation type="vanished">OpenGL 2</translation>
+-    </message>
+-    <message>
+-        <source>OpenGL 1</source>
+-        <translation type="vanished">OpenGL 1</translation>
+-    </message>
+-    <message>
+-        <source>Direct3D</source>
+-        <translation type="vanished">Direct3D</translation>
+-    </message>
+     <message>
+         <location filename="../programs/mythfrontend/mythfrontend.cpp" line="147"/>
+         <source>MythFrontend</source>
+@@ -2039,8 +1791,8 @@
          <source>Failed to open 
   &apos;%1&apos; in %2 
  Check if the video exists</source>
@@ -124,7 +559,7 @@ index e4d869578b..a960c92743 100644
  Check if the video exists.</translation>
      </message>
      <message>
-@@ -2051,7 +2051,7 @@ Check if the video exists.</translation>
+@@ -2051,10 +1803,10 @@ Check if the video exists.</translation>
      <message>
          <location filename="../programs/mythfrontend/mythfrontend.cpp" line="1360"/>
          <source>BD Failure</source>
@@ -132,18 +567,43 @@ index e4d869578b..a960c92743 100644
 +        <translation>BD Failure</translation>
      </message>
      <message>
-         <location filename="../programs/mythfrontend/mythfrontend.cpp" line="2037"/>
-@@ -2334,7 +2334,7 @@ Check if the video exists.</translation>
+-        <location filename="../programs/mythfrontend/mythfrontend.cpp" line="2037"/>
++        <location filename="../programs/mythfrontend/mythfrontend.cpp" line="2043"/>
+         <source>MythTV Frontend</source>
+         <comment>Main window title</comment>
+         <translation>MythTV Frontend</translation>
+@@ -2334,51 +2086,27 @@ Check if the video exists.</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2137"/>
          <source>Screen aspect ratio</source>
 -        <translation type="unfinished"></translation>
+-    </message>
+-    <message>
+-        <source>Auto</source>
+-        <translation type="obsolete">Auto</translation>
+-    </message>
+-    <message>
+-        <source>21:9</source>
+-        <translation type="obsolete">0% {21:9?}</translation>
+-    </message>
+-    <message>
+-        <source>32:9</source>
+-        <translation type="obsolete">0% {32:9?}</translation>
+-    </message>
+-    <message>
+-        <source>256:135</source>
+-        <translation type="obsolete">0% {256:135?}</translation>
+-    </message>
+-    <message>
+-        <source>3:2</source>
+-        <translation type="obsolete">0% {3:2?}</translation>
+-    </message>
+-    <message>
+-        <source>5:4</source>
+-        <translation type="obsolete">0% {5:4?}</translation>
 +        <translation>Screen Aspect Ratio</translation>
      </message>
      <message>
-         <source>Auto</source>
-@@ -2363,22 +2363,22 @@ Check if the video exists.</translation>
-     <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2148"/>
          <source>16:18 (16:9 Above and below)</source>
 -        <translation type="unfinished"></translation>
@@ -169,7 +629,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="4657"/>
-@@ -2388,12 +2388,12 @@ Check if the video exists.</translation>
+@@ -2388,38 +2116,18 @@ Check if the video exists.</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2125"/>
          <source>Display on screen</source>
@@ -184,7 +644,67 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2127"/>
-@@ -2517,27 +2517,27 @@ Check if the video exists.</translation>
+         <source>Run on the specified screen or spanning all screens.</source>
+         <translation>Run on the specified screen or spanning all screens.</translation>
+     </message>
+-    <message>
+-        <source>Monitor aspect ratio</source>
+-        <translation type="vanished">Monitor Aspect Ratio</translation>
+-    </message>
+-    <message>
+-        <source>16:9</source>
+-        <translation type="vanished">16:9</translation>
+-    </message>
+-    <message>
+-        <source>16:10</source>
+-        <translation type="vanished">16:10</translation>
+-    </message>
+-    <message>
+-        <source>4:3</source>
+-        <translation type="vanished">4:3</translation>
+-    </message>
+-    <message>
+-        <source>The aspect ratio of a Xinerama display cannot be queried from the display, so it must be specified.</source>
+-        <translation type="vanished">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="2229"/>
+         <source>GUI width (pixels)</source>
+@@ -2460,22 +2168,6 @@ Check if the video exists.</translation>
+         <source>The vertical offset where the GUI will be displayed.</source>
+         <translation>The vertical offset where the GUI will be displayed.</translation>
+     </message>
+-    <message>
+-        <source>Display size - width</source>
+-        <translation type="vanished">Display Size - Width</translation>
+-    </message>
+-    <message>
+-        <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 type="vanished">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>
+-        <source>Display size - height</source>
+-        <translation type="vanished">Display Size - Height</translation>
+-    </message>
+-    <message>
+-        <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 type="vanished">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="2288"/>
+         <source>Use GUI size for TV playback</source>
+@@ -2506,38 +2198,30 @@ Check if the video exists.</translation>
+         <source>Toggles between windowed and borderless operation.</source>
+         <translation>Toggles between windowed and borderless operation.</translation>
+     </message>
+-    <message>
+-        <source>Use fixed window size</source>
+-        <translation type="vanished">Use Fixed Window Size</translation>
+-    </message>
+-    <message>
+-        <source>If disabled, the video playback window can be resized</source>
+-        <translation type="vanished">If disabled, the video playback window can be resized.</translation>
+-    </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2138"/>
          <source>Auto (Assume square pixels)</source>
@@ -217,7 +737,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2629"/>
-@@ -2606,12 +2606,12 @@ Check if the video exists.</translation>
+@@ -2606,22 +2290,18 @@ Check if the video exists.</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="4724"/>
          <source>Select from Channel Group</source>
@@ -232,7 +752,17 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1519"/>
-@@ -2766,7 +2766,7 @@ Check if the video exists.</translation>
+         <source>Paint engine</source>
+         <translation>Paint Engine</translation>
+     </message>
+-    <message>
+-        <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 type="vanished">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="3140"/>
+         <source>Language</source>
+@@ -2766,7 +2446,7 @@ Check if the video exists.</translation>
      <message>
          <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="479"/>
          <source>Set the audio surround-upconversion quality.</source>
@@ -241,7 +771,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="488"/>
-@@ -3046,12 +3046,12 @@ Device Supports Up to %1</translation>
+@@ -3046,24 +2726,12 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../libs/libmyth/audio/audiooutput.cpp" line="555"/>
          <source>OpenSLES default output. Stereo support only.</source>
@@ -252,11 +782,23 @@ index e4d869578b..a960c92743 100644
          <location filename="../libs/libmyth/audio/audiooutput.cpp" line="565"/>
          <source>Android AudioTrack output. Supports surround sound.</source>
 -        <translation type="unfinished"></translation>
+-    </message>
+-    <message>
+-        <source>OpenSLES default output.</source>
+-        <translation type="vanished">OpenSLES default output.</translation>
+-    </message>
+-    <message>
+-        <source>OpenMAX analog output.</source>
+-        <translation type="vanished">OpenMAX analog output.</translation>
+-    </message>
+-    <message>
+-        <source>OpenMAX HDMI output.</source>
+-        <translation type="vanished">OpenMAX HDMI output.</translation>
 +        <translation>Android AudioTrack output. Supports surround sound.</translation>
      </message>
-     <message>
-         <source>OpenSLES default output.</source>
-@@ -3254,7 +3254,7 @@ Device Supports Up to %1</translation>
+ </context>
+ <context>
+@@ -3254,7 +2922,7 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="787"/>
          <source>Start front left channel test</source>
@@ -265,7 +807,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="793"/>
-@@ -3264,7 +3264,7 @@ Device Supports Up to %1</translation>
+@@ -3264,7 +2932,7 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="794"/>
          <source>Start front right channel test</source>
@@ -274,7 +816,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="800"/>
-@@ -3274,7 +3274,7 @@ Device Supports Up to %1</translation>
+@@ -3274,7 +2942,7 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="801"/>
          <source>Start rear left channel test</source>
@@ -283,7 +825,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="807"/>
-@@ -3284,7 +3284,7 @@ Device Supports Up to %1</translation>
+@@ -3284,7 +2952,7 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="808"/>
          <source>Start rear right channel test</source>
@@ -292,7 +834,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="815"/>
-@@ -3294,7 +3294,7 @@ Device Supports Up to %1</translation>
+@@ -3294,7 +2962,7 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="816"/>
          <source>Start LFE channel test</source>
@@ -301,7 +843,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="823"/>
-@@ -3304,7 +3304,7 @@ Device Supports Up to %1</translation>
+@@ -3304,7 +2972,7 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="824"/>
          <source>Start surround left channel test</source>
@@ -310,7 +852,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="830"/>
-@@ -3314,7 +3314,7 @@ Device Supports Up to %1</translation>
+@@ -3314,7 +2982,7 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="831"/>
          <source>Start surround right channel test</source>
@@ -319,7 +861,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="837"/>
-@@ -3324,7 +3324,7 @@ Device Supports Up to %1</translation>
+@@ -3324,7 +2992,7 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="838"/>
          <source>Start center channel test</source>
@@ -328,7 +870,44 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/audiogeneralsettings.cpp" line="850"/>
-@@ -3416,32 +3416,32 @@ Device Supports Up to %1</translation>
+@@ -3350,36 +3018,6 @@ Device Supports Up to %1</translation>
+         <translation>Unable to create AudioOutput.</translation>
+     </message>
+ </context>
+-<context>
+-    <name>BDInfo</name>
+-    <message>
+-        <source>Could not open Blu-ray device: %1</source>
+-        <translation type="vanished">Could not open Blu-ray device: %1</translation>
+-    </message>
+-</context>
+-<context>
+-    <name>BDRingBuffer</name>
+-    <message>
+-        <source>Title %1 chapter %2</source>
+-        <translation type="vanished">Title %1 Chapter %2</translation>
+-    </message>
+-    <message>
+-        <source>Could not open Blu-ray device: %1</source>
+-        <translation type="vanished">Could not open Blu-ray device: %1</translation>
+-    </message>
+-    <message>
+-        <source>Could not open Blu-ray device %1, failed to decrypt</source>
+-        <translation type="vanished">Failed to decrypt, could not open Blu-ray device: %1</translation>
+-    </message>
+-    <message>
+-        <source>Unable to find any Blu-ray compatible titles</source>
+-        <translation type="vanished">Unable to find any Blu-ray compatible titles.</translation>
+-    </message>
+-    <message>
+-        <source>Unable to find any usable Blu-ray titles</source>
+-        <translation type="vanished">Unable to find any usable Blu-ray titles.</translation>
+-    </message>
+-</context>
+ <context>
+     <name>BackendSelection</name>
+     <message>
+@@ -3416,32 +3054,32 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../programs/mythfrontend/mythfrontend.cpp" line="237"/>
          <source>DVD/Video contains a bookmark</source>
@@ -367,7 +946,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -3502,7 +3502,7 @@ Device Supports Up to %1</translation>
+@@ -3502,7 +3140,7 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="3312"/>
          <source>Enter new group name</source>
@@ -376,7 +955,21 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="3328"/>
-@@ -3549,27 +3549,27 @@ Device Supports Up to %1</translation>
+@@ -3523,13 +3161,6 @@ Device Supports Up to %1</translation>
+         <translation>Input Connections</translation>
+     </message>
+ </context>
+-<context>
+-    <name>CetonConfigurationGroup</name>
+-    <message>
+-        <source>Description</source>
+-        <translation type="vanished">Description</translation>
+-    </message>
+-</context>
+ <context>
+     <name>CetonDeviceID</name>
+     <message>
+@@ -3549,27 +3180,27 @@ Device Supports Up to %1</translation>
          <location filename="../libs/libmythtv/videosource.cpp" line="2151"/>
          <source>CetonConfigurationGroup</source>
          <comment>Description</comment>
@@ -409,7 +1002,18 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -3595,31 +3595,31 @@ Device Supports Up to %1</translation>
+@@ -3581,10 +3212,6 @@ Device Supports Up to %1</translation>
+         <source>Channel Name</source>
+         <translation>Channel Name</translation>
+     </message>
+-    <message>
+-        <source>Delete all channels on currently selected source(s).</source>
+-        <translation type="vanished">Delete All Channels on Currently Selected Source(s).</translation>
+-    </message>
+     <message>
+         <location filename="../programs/mythtv-setup/channeleditor.cpp" line="113"/>
+         <location filename="../programs/mythtv-setup/channeleditor.cpp" line="319"/>
+@@ -3595,31 +3222,31 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../programs/mythtv-setup/channeleditor.cpp" line="110"/>
          <source>Delete all channels on currently selected video source.</source>
@@ -446,7 +1050,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythtv-setup/channeleditor.cpp" line="124"/>
-@@ -3639,7 +3639,7 @@ Device Supports Up to %1</translation>
+@@ -3639,7 +3266,7 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../programs/mythtv-setup/channeleditor.cpp" line="153"/>
          <source>Restore Data from deleted channels.</source>
@@ -455,7 +1059,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythtv-setup/channeleditor.cpp" line="163"/>
-@@ -3730,7 +3730,7 @@ Device Supports Up to %1</translation>
+@@ -3730,7 +3357,7 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="4764"/>
          <source>Favorites</source>
@@ -464,7 +1068,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="4944"/>
-@@ -3791,7 +3791,7 @@ Device Supports Up to %1</translation>
+@@ -3791,7 +3418,7 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="5014"/>
          <source>Enter the name of the new channel group</source>
@@ -473,7 +1077,22 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -3876,8 +3876,8 @@ Device Supports Up to %1</translation>
+@@ -3846,14 +3473,6 @@ Device Supports Up to %1</translation>
+             <numerusform>Found %n old %1 channels.</numerusform>
+         </translation>
+     </message>
+-    <message numerus="yes">
+-        <source>Found %n new non-conflicting %1 channel(s).</source>
+-        <extracomment>%n is the number of channels, %1 is the type of channel</extracomment>
+-        <translation type="vanished">
+-            <numerusform>Found %n new non-conflicting %1 channel.</numerusform>
+-            <numerusform>Found %n new non-conflicting %1 channels.</numerusform>
+-        </translation>
+-    </message>
+     <message numerus="yes">
+         <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="461"/>
+         <source>Found %n new conflicting %1 channel(s).</source>
+@@ -3876,22 +3495,11 @@ Device Supports Up to %1</translation>
          <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="424"/>
          <source>Found %n new %1 channel(s).</source>
          <extracomment>%n is the number of channels, %1 is the type of channel</extracomment>
@@ -484,7 +1103,112 @@ index e4d869578b..a960c92743 100644
              <numerusform></numerusform>
          </translation>
      </message>
-@@ -4022,75 +4022,75 @@ Device Supports Up to %1</translation>
+-    <message numerus="yes">
+-        <source>Found %n transport(s):
+-</source>
+-        <extracomment>%n is the number of transports</extracomment>
+-        <translation type="vanished">
+-            <numerusform>Found %n transport:
+-</numerusform>
+-            <numerusform>Found %n transports:
+-</numerusform>
+-        </translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1570"/>
+         <source>Channels: FTA Enc Dec
+@@ -3911,19 +3519,11 @@ Device Supports Up to %1</translation>
+         <source>Max atsc major count: %1</source>
+         <translation>Max atsc major count: %1</translation>
+     </message>
+-    <message>
+-        <source>Delete all</source>
+-        <translation type="vanished">Delete All</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1747"/>
+         <source>Set all invisible</source>
+         <translation>Set All Invisible</translation>
+     </message>
+-    <message>
+-        <source>Ignore all</source>
+-        <translation type="vanished">Ignore All</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1773"/>
+         <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1848"/>
+@@ -3931,70 +3531,22 @@ Device Supports Up to %1</translation>
+         <source>Do you want to:</source>
+         <translation>Do you want to:</translation>
+     </message>
+-    <message>
+-        <source>1. Delete all</source>
+-        <translation type="vanished">1. Delete All</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1777"/>
+         <source>2. Set all invisible</source>
+         <translation>2. Set All Invisible</translation>
+     </message>
+-    <message>
+-        <source>4. Ignore all</source>
+-        <translation type="vanished">4. Ignore All</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1798"/>
+         <source>Please enter either 1, 2 or 4:</source>
+         <translation>Please enter 1, 2 or 4:</translation>
+     </message>
+-    <message>
+-        <source>Insert all</source>
+-        <translation type="vanished">Insert All</translation>
+-    </message>
+-    <message>
+-        <source>Insert manually</source>
+-        <translation type="vanished">Insert Manually</translation>
+-    </message>
+-    <message>
+-        <source>1. Insert all</source>
+-        <translation type="vanished">1. Insert All</translation>
+-    </message>
+-    <message>
+-        <source>2. Insert manually</source>
+-        <translation type="vanished">2. Insert Manually</translation>
+-    </message>
+-    <message>
+-        <source>3. Ignore all</source>
+-        <translation type="vanished">3. Ignore All</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1870"/>
+         <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1942"/>
+         <source>Please enter either 1, 2, or 3:</source>
+         <translation>Please enter 1, 2, or 3:</translation>
+     </message>
+-    <message>
+-        <source>Update all</source>
+-        <translation type="vanished">Update All</translation>
+-    </message>
+-    <message>
+-        <source>Update manually</source>
+-        <translation type="vanished">Update Manually</translation>
+-    </message>
+-    <message>
+-        <source>1. Update all</source>
+-        <translation type="vanished">1. Update All</translation>
+-    </message>
+-    <message>
+-        <source>2. Update manually</source>
+-        <translation type="vanished">2. Update Manually</translation>
+-    </message>
+-    <message>
+-        <source>Channel %1 was found to be in conflict with other channels.</source>
+-        <translation type="vanished">Channel %1 was found to be in conflict with other channels.</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1986"/>
+         <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="2057"/>
+@@ -4022,75 +3574,75 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="1746"/>
          <source>Delete All</source>
@@ -574,7 +1298,18 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/channelscan/channelimporter.cpp" line="2174"/>
-@@ -4368,12 +4368,12 @@ Device Supports Up to %1</translation>
+@@ -4181,10 +3733,6 @@ Device Supports Up to %1</translation>
+         <source>Tuning</source>
+         <translation>Tuning</translation>
+     </message>
+-    <message>
+-        <source>%1%</source>
+-        <translation type="vanished">%1: {1%?}</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/channelscan/channelscanner_gui_scan_pane.cpp" line="140"/>
+         <source>Locked</source>
+@@ -4368,12 +3916,12 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../programs/mythfrontend/customedit.cpp" line="432"/>
          <source>All matches for a genre (Schedules Direct)</source>
@@ -589,7 +1324,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/customedit.cpp" line="452"/>
-@@ -4384,12 +4384,12 @@ Device Supports Up to %1</translation>
+@@ -4384,12 +3932,12 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../programs/mythfrontend/customedit.cpp" line="472"/>
          <source>Person named in the credits (Schedules Direct)</source>
@@ -604,16 +1339,94 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/customedit.cpp" line="745"/>
-@@ -4727,7 +4727,7 @@ Device Supports Up to %1</translation>
+@@ -4471,14 +4019,6 @@ Device Supports Up to %1</translation>
+         <source>Limit by category</source>
+         <translation>Limit by Category</translation>
+     </message>
+-    <message>
+-        <source>All matches for a genre (Data Direct)</source>
+-        <translation type="vanished">All Matches for a Genre (Data Direct)</translation>
+-    </message>
+-    <message>
+-        <source>Limit by MPAA or VCHIP rating (Data Direct)</source>
+-        <translation type="vanished">Limit by MPAA or VCHIP Rating (Data Direct)</translation>
+-    </message>
+     <message>
+         <location filename="../programs/mythfrontend/customedit.cpp" line="459"/>
+         <source>Limit movies by the year of release</source>
+@@ -4489,10 +4029,6 @@ Device Supports Up to %1</translation>
+         <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>
+     </message>
+-    <message>
+-        <source>Person named in the credits (Data Direct)</source>
+-        <translation type="vanished">Person Named in the Credits (Data Direct)</translation>
+-    </message>
+     <message>
+         <location filename="../programs/mythfrontend/customedit.cpp" line="493"/>
+         <source>Re-record SDTV in HDTV (disable duplicate matching)</source>
+@@ -4518,10 +4054,6 @@ Device Supports Up to %1</translation>
+         <source>Movie of the Week (complete example - use FindWeekly)</source>
+         <translation>Movie of the Week (complete example - use FindWeekly)</translation>
+     </message>
+-    <message>
+-        <source>First Episodes (complete example for Data Direct)</source>
+-        <translation type="vanished">First Episodes (complete example for Data Direct)</translation>
+-    </message>
+     <message>
+         <location filename="../programs/mythfrontend/customedit.cpp" line="726"/>
+         <source>Current Example</source>
+@@ -4727,11 +4259,7 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="4006"/>
          <source>DiSEqC (Switch, LNB and Rotor Configuration)</source>
 -        <translation type="unfinished"></translation>
+-    </message>
+-    <message>
+-        <source>DiSEqC (Switch, LNB, and Rotor Configuration)</source>
+-        <translation type="vanished">DiSEqC (Switch, LNB, and Rotor Configuration)</translation>
 +        <translation>DiSEqC (Switch, LNB and Rotor Configuration)</translation>
      </message>
      <message>
-         <source>DiSEqC (Switch, LNB, and Rotor Configuration)</source>
-@@ -5064,7 +5064,7 @@ Device Supports Up to %1</translation>
+         <location filename="../libs/libmythtv/videosource.cpp" line="4007"/>
+@@ -4770,36 +4298,6 @@ Device Supports Up to %1</translation>
+         <translation>Failed to Open Device %1</translation>
+     </message>
+ </context>
+-<context>
+-    <name>DVDRingBuffer</name>
+-    <message>
+-        <source>Title %1 chapter %2</source>
+-        <translation type="vanished">Title %1 Chapter %2</translation>
+-    </message>
+-    <message>
+-        <source>Failed to open DVD device at %1</source>
+-        <translation type="vanished">Failed to Open DVD Device at %1</translation>
+-    </message>
+-</context>
+-<context>
+-    <name>DataDirectLineupSelector</name>
+-    <message>
+-        <source>Fetching lineups from %1...</source>
+-        <translation type="vanished">Fetching Lineups from %1...</translation>
+-    </message>
+-    <message>
+-        <source>DataDirect</source>
+-        <translation type="vanished">DataDirect</translation>
+-    </message>
+-    <message>
+-        <source>Fetching of lineups failed</source>
+-        <translation type="vanished">Fetching Lineups Failed</translation>
+-    </message>
+-    <message>
+-        <source>Fetching of lineups complete</source>
+-        <translation type="vanished">Fetching Lineups Complete</translation>
+-    </message>
+-</context>
+ <context>
+     <name>DatabaseSettings</name>
+     <message>
+@@ -5064,7 +4562,7 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="446"/>
          <source>If enabled, move deleted recordings to the &apos;Deleted&apos; recgroup and turn on autoexpire instead of deleting immediately.</source>
@@ -622,7 +1435,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -5298,7 +5298,7 @@ Device Supports Up to %1</translation>
+@@ -5298,7 +4796,7 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../libs/libmythtv/diseqcsettings.cpp" line="590"/>
          <source>Unicable userband ID (0-7). The Unicable userband channels are often numbered starting at 1 but MythTV starts at 0.</source>
@@ -631,7 +1444,18 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/diseqcsettings.cpp" line="703"/>
-@@ -5670,27 +5670,27 @@ Device Supports Up to %1</translation>
+@@ -5335,10 +4833,6 @@ Device Supports Up to %1</translation>
+         <source>Userband</source>
+         <translation>Userband</translation>
+     </message>
+-    <message>
+-        <source>Unicable userband ID (0-7) or sometimes (1-8)</source>
+-        <translation type="vanished">Unicable userband ID (0-7) or sometimes (1-8)</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/diseqcsettings.cpp" line="617"/>
+         <source>Frequency (MHz)</source>
+@@ -5670,27 +5164,27 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../programs/mythfrontend/exitprompt.cpp" line="275"/>
          <source>Yes, Suspend</source>
@@ -664,7 +1488,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythtv-setup/exitprompt.cpp" line="41"/>
-@@ -5700,7 +5700,7 @@ Device Supports Up to %1</translation>
+@@ -5700,7 +5194,7 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../programs/mythtv-setup/exitprompt.cpp" line="79"/>
          <source>...and more...</source>
@@ -673,7 +1497,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message numerus="yes">
          <location filename="../programs/mythtv-setup/exitprompt.cpp" line="86"/>
-@@ -5713,7 +5713,7 @@ Device Supports Up to %1</translation>
+@@ -5713,7 +5207,7 @@ Device Supports Up to %1</translation>
      <message>
          <location filename="../programs/mythtv-setup/exitprompt.cpp" line="89"/>
          <source>Configuration Problems</source>
@@ -682,7 +1506,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythtv-setup/exitprompt.cpp" line="101"/>
-@@ -5798,27 +5798,28 @@ Device Supports Up to %1</translation>
+@@ -5798,53 +5292,34 @@ Device Supports Up to %1</translation>
          <location filename="../libs/libmythtv/videosource.cpp" line="2349"/>
          <source>A &apos;black box&apos; application controlled via stdin, status on stderr and TransportStream read from stdout.
  Use absolute path or path relative to the current directory.</source>
@@ -712,11 +1536,80 @@ index e4d869578b..a960c92743 100644
          <location filename="../libs/libmythtv/videosource.cpp" line="2386"/>
          <source>WARNING: File &apos;%1&apos; does not exist.</source>
 -        <translation type="unfinished"></translation>
+-    </message>
+-    <message>
+-        <source>A &apos;black box&apos; application controlled via stdin, status on stderr and TransportStream read from stdout</source>
+-        <translation type="vanished">A &apos;black box&apos; application controlled via stdin, status on stderr and TransportStream read from stdout.</translation>
 +        <translation>Warning: File &apos;%1&apos; does not exist.</translation>
      </message>
      <message>
-         <source>A &apos;black box&apos; application controlled via stdin, status on stderr and TransportStream read from stdout</source>
-@@ -6819,7 +6820,7 @@ Error: %1</translation>
+         <location filename="../libs/libmythtv/videosource.cpp" line="2354"/>
+         <source>File info</source>
+         <translation>File Info</translation>
+     </message>
+-    <message>
+-        <source>&apos;%1&apos; is valid.</source>
+-        <translation type="vanished">&apos;%1&apos; is valid.</translation>
+-    </message>
+-    <message>
+-        <source>WARNING: &apos;%1&apos; is not readable.</source>
+-        <translation type="vanished">WARNING: &apos;%1&apos; is not readable.</translation>
+-    </message>
+-    <message>
+-        <source>WARNING: &apos;%1&apos; is not executable.</source>
+-        <translation type="vanished">WARNING: &apos;%1&apos; is not executable.</translation>
+-    </message>
+-    <message>
+-        <source>WARNING: &apos;%1&apos; does not exist.</source>
+-        <translation type="vanished">WARNING: &apos;%1&apos; does not exist.</translation>
+-    </message>
+ </context>
+ <context>
+     <name>FileAssocDialog</name>
+@@ -5871,7 +5346,8 @@ Use absolute path or path relative to the current directory.</source>
+     <message>
+         <location filename="../programs/mythfrontend/videofileassoc.cpp" line="372"/>
+         <source>Save and exit this screen.</source>
+-        <translation>Save and Exit</translation>
++        <translation>
++Save and Exit</translation>
+     </message>
+     <message>
+         <location filename="../programs/mythfrontend/videofileassoc.cpp" line="373"/>
+@@ -5889,32 +5365,6 @@ Use absolute path or path relative to the current directory.</source>
+         <translation>Enter new extension:</translation>
+     </message>
+ </context>
+-<context>
+-    <name>FileRingBuffer</name>
+-    <message>
+-        <source>Could not open %1</source>
+-        <extracomment>%1 is the filename</extracomment>
+-        <translation type="vanished">Could Not Open %1</translation>
+-    </message>
+-    <message>
+-        <source>File too small (%1B)</source>
+-        <extracomment>%1 is the file size</extracomment>
+-        <translation type="vanished">File Too Small (%1B)</translation>
+-    </message>
+-    <message>
+-        <source>Improper permissions</source>
+-        <translation type="vanished">Improper Permissions</translation>
+-    </message>
+-    <message>
+-        <source>Cannot seek in file</source>
+-        <translation type="vanished">Cannot Seek in File</translation>
+-    </message>
+-    <message>
+-        <source>Failed to open remote file %1</source>
+-        <extracomment>%1 is the filename</extracomment>
+-        <translation type="vanished">Failed to Open Remote File %1</translation>
+-    </message>
+-</context>
+ <context>
+     <name>FileTransferWorker</name>
+     <message>
+@@ -6819,7 +6269,7 @@ Error: %1</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="540"/>
          <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>
@@ -725,7 +1618,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="554"/>
-@@ -6829,7 +6830,7 @@ Error: %1</translation>
+@@ -6829,7 +6279,7 @@ Error: %1</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="556"/>
          <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>
@@ -734,7 +1627,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="586"/>
-@@ -6839,7 +6840,7 @@ Error: %1</translation>
+@@ -6839,7 +6289,7 @@ Error: %1</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="590"/>
          <source>If enabled, programs that have been marked as watched and are Auto-Expired will be re-recorded if they are shown again.</source>
@@ -743,7 +1636,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="601"/>
-@@ -6866,32 +6867,32 @@ Error: %1</translation>
+@@ -6866,32 +6316,32 @@ Error: %1</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="636"/>
          <source>Maximum Start Gap (secs)</source>
@@ -782,7 +1675,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="681"/>
-@@ -7352,7 +7353,7 @@ Error: %1</translation>
+@@ -7352,7 +6802,7 @@ Error: %1</translation>
      <message>
          <location filename="../programs/mythfrontend/playbackbox.cpp" line="5409"/>
          <source>The program is able to auto-expire</source>
@@ -791,7 +1684,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/playbackbox.cpp" line="5410"/>
-@@ -7367,7 +7368,7 @@ Error: %1</translation>
+@@ -7367,7 +6817,7 @@ Error: %1</translation>
      <message>
          <location filename="../programs/mythfrontend/playbackbox.cpp" line="5413"/>
          <source>Recording is in use</source>
@@ -800,7 +1693,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/playbackbox.cpp" line="5414"/>
-@@ -7412,37 +7413,37 @@ Error: %1</translation>
+@@ -7412,46 +6862,42 @@ Error: %1</translation>
      <message>
          <location filename="../programs/mythfrontend/playbackbox.cpp" line="5430"/>
          <source>Recording is in 1080i High Definition</source>
@@ -841,12 +1734,13 @@ index e4d869578b..a960c92743 100644
          <location filename="../programs/mythfrontend/playbackbox.cpp" line="5436"/>
          <source>Recording is using HEVC/H.265 codec</source>
 -        <translation type="unfinished"></translation>
+-    </message>
+-    <message>
+-        <source>Recording is in 1080i/p High Definition</source>
+-        <translation type="vanished">Recording is in 1080i/p High Definition</translation>
 +        <translation>Recording is Using HEVC/H.265 Codec</translation>
      </message>
      <message>
-         <source>Recording is in 1080i/p High Definition</source>
-@@ -7451,7 +7452,7 @@ Error: %1</translation>
-     <message>
          <location filename="../programs/mythfrontend/playbackbox.cpp" line="5429"/>
          <source>Recording is in 720p High Definition</source>
 -        <translation>Recording is in 720p High Definition</translation>
@@ -854,7 +1748,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/playbackbox.cpp" line="5428"/>
-@@ -7461,7 +7462,7 @@ Error: %1</translation>
+@@ -7461,17 +6907,13 @@ Error: %1</translation>
      <message>
          <location filename="../programs/mythfrontend/playbackbox.cpp" line="5426"/>
          <source>Recording is in Standard Definition</source>
@@ -863,7 +1757,17 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/playbackbox.cpp" line="5427"/>
-@@ -8265,7 +8266,7 @@ Error: %1</translation>
+         <source>Recording is Widescreen</source>
+         <translation>Recording is Widescreen</translation>
+     </message>
+-    <message>
+-        <source>Recording is in HD using H.264 codec</source>
+-        <translation type="vanished">Recording is in HD Using H.264 Codec</translation>
+-    </message>
+     <message>
+         <location filename="../programs/mythfrontend/playbackbox.cpp" line="5406"/>
+         <source>Recording has been watched</source>
+@@ -8265,7 +7707,7 @@ Error: %1</translation>
      <message>
          <location filename="../html/htmlstrings.h" line="240"/>
          <source>Auto-Expire</source>
@@ -872,7 +1776,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../html/htmlstrings.h" line="241"/>
-@@ -8370,7 +8371,7 @@ Error: %1</translation>
+@@ -8370,7 +7812,7 @@ Error: %1</translation>
      <message>
          <location filename="../html/htmlstrings.h" line="272"/>
          <source>Allow Auto-Expire</source>
@@ -881,7 +1785,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../html/htmlstrings.h" line="275"/>
-@@ -9121,7 +9122,7 @@ Error: %1</translation>
+@@ -9121,7 +8563,7 @@ Error: %1</translation>
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="2858"/>
          <source>Input %1</source>
@@ -890,7 +1794,29 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -9739,7 +9740,7 @@ Error: %1</translation>
+@@ -9205,10 +8647,6 @@ Error: %1</translation>
+         <source>Could not open new database connection for metadata lookup.</source>
+         <translation>Could Not Open New Database Connection for Metadata Lookup</translation>
+     </message>
+-    <message>
+-        <source>Metadata Lookup Starting</source>
+-        <translation type="vanished">Metadata Lookup Starting</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/jobqueue.cpp" line="2208"/>
+         <source>Unable to find mythmetadatalookup</source>
+@@ -9230,10 +8668,6 @@ Error: %1</translation>
+         <source>Could not open new database connection for commercial detector.</source>
+         <translation>Could Not Open New Database Connection for Commercial Detector</translation>
+     </message>
+-    <message>
+-        <source>Commercial Detection Starting</source>
+-        <translation type="vanished">Commercial Detection Starting</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/jobqueue.cpp" line="2344"/>
+         <source>Unable to find mythcommflag</source>
+@@ -9739,7 +9173,7 @@ Error: %1</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1933"/>
          <source>Idle time before entering standby mode (minutes)</source>
@@ -899,7 +1825,14 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1938"/>
-@@ -9798,47 +9799,47 @@ Error: %1</translation>
+@@ -9791,54 +9225,50 @@ Error: %1</translation>
+         <source>Show standby</source>
+         <translation>Show Standby</translation>
+     </message>
+-    <message>
+-        <source>By default, only remote frontends are shown the shutdown option on the exit menu. Here you can force specific shutdown and reboot options to be displayed.</source>
+-        <translation type="vanished">By default, only remote frontends are shown the shutdown option on the exit menu. Here you can force specific shutdown and reboot options to be displayed.</translation>
+-    </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="111"/>
          <source>Decoder Device for VAAPI hardware decoding</source>
@@ -956,7 +1889,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2011"/>
-@@ -9853,22 +9854,22 @@ Error: %1</translation>
+@@ -9853,22 +9283,22 @@ Error: %1</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2019"/>
          <source> Note: This system appears to support reboot without using this setting.</source>
@@ -983,7 +1916,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2047"/>
-@@ -9883,7 +9884,7 @@ Error: %1</translation>
+@@ -9883,7 +9313,7 @@ Error: %1</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2057"/>
          <source> Note: This system appears to support shutdown without using this setting.</source>
@@ -992,7 +1925,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2070"/>
-@@ -10018,7 +10019,7 @@ Error: %1</translation>
+@@ -10018,7 +9448,7 @@ Error: %1</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="3335"/>
          <source>Only support AirTunes (no video)</source>
@@ -1001,7 +1934,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="3337"/>
-@@ -10058,7 +10059,7 @@ Error: %1</translation>
+@@ -10058,7 +9488,7 @@ Error: %1</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="3395"/>
          <source>During music playback, displays album cover and various media information in full screen mode</source>
@@ -1010,7 +1943,18 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="3451"/>
-@@ -10353,28 +10354,28 @@ Error: %1</translation>
+@@ -10095,10 +9525,6 @@ Error: %1</translation>
+         <source>Media Monitor</source>
+         <translation>Media Monitor</translation>
+     </message>
+-    <message>
+-        <source>Decoder Device for VAAPI2 hardware decoding</source>
+-        <translation type="vanished">Decoder Device for VAAPI2 Hardware Decoding</translation>
+-    </message>
+     <message>
+         <location filename="../programs/mythfrontend/globalsettings.cpp" line="115"/>
+         <source>Use this if your system does not detect the VAAPI device. Example: &apos;/dev/dri/renderD128&apos;.</source>
+@@ -10353,28 +9779,28 @@ Error: %1</translation>
      <message>
          <location filename="../libs/libmythtv/Bluray/mythbdbuffer.cpp" line="186"/>
          <source>Title %1 chapter %2</source>
@@ -1044,7 +1988,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -10382,7 +10383,7 @@ Error: %1</translation>
+@@ -10382,7 +9808,7 @@ Error: %1</translation>
      <message>
          <location filename="../libs/libmythtv/Bluray/mythbdinfo.cpp" line="93"/>
          <source>Could not open Blu-ray device: %1</source>
@@ -1053,7 +1997,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -10701,12 +10702,12 @@ Error: %1</translation>
+@@ -10701,40 +10127,12 @@ Error: %1</translation>
      <message>
          <location filename="../libs/libmythtv/tv_play.cpp" line="890"/>
          <source>Auto 3D</source>
@@ -1064,11 +2008,74 @@ index e4d869578b..a960c92743 100644
          <location filename="../libs/libmythtv/tv_play.cpp" line="892"/>
          <source>Ignore 3D</source>
 -        <translation type="unfinished"></translation>
+-    </message>
+-    <message>
+-        <source>Toggle Picture-in-Picture view</source>
+-        <translation type="vanished">Toggle Picture-in-Picture View</translation>
+-    </message>
+-    <message>
+-        <source>Toggle Picture-by-Picture view</source>
+-        <translation type="vanished">Toggle Picture-by-Picture View</translation>
+-    </message>
+-    <message>
+-        <source>Create Picture-in-Picture view</source>
+-        <translation type="vanished">Create Picture-in-Picture View</translation>
+-    </message>
+-    <message>
+-        <source>Create Picture-by-Picture view</source>
+-        <translation type="vanished">Create Picture-by-Picture View</translation>
+-    </message>
+-    <message>
+-        <source>Toggle active PIP/PBP window</source>
+-        <translation type="vanished">Toggle Active PIP/PBP Window</translation>
+-    </message>
+-    <message>
+-        <source>Swap PBP/PIP Windows</source>
+-        <translation type="vanished">Swap PBP/PIP Windows</translation>
+-    </message>
+-    <message>
+-        <source>Change PxP view</source>
+-        <translation type="vanished">Change PxP View</translation>
 +        <translation>Ignore 3D</translation>
      </message>
      <message>
-         <source>Toggle Picture-in-Picture view</source>
-@@ -12092,12 +12093,12 @@ Error: %1</translation>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="618"/>
+@@ -11001,10 +10399,6 @@ Error: %1</translation>
+         <source>Playback picture adjustments</source>
+         <translation>Playback Picture Adjustments</translation>
+     </message>
+-    <message>
+-        <source>Toggle night mode</source>
+-        <translation type="vanished">Toggle Night Mode</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="730"/>
+         <source>Set the picture brightness</source>
+@@ -11215,23 +10609,11 @@ Error: %1</translation>
+         <source>Toggle OSD playback information</source>
+         <translation>Toggle OSD Playback Information</translation>
+     </message>
+-    <message>
+-        <source>No 3D</source>
+-        <translation type="vanished">No 3D</translation>
+-    </message>
+-    <message>
+-        <source>3D Side by Side</source>
+-        <translation type="vanished">3D Side by Side</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="894"/>
+         <source>Discard 3D Side by Side</source>
+         <translation>Discard 3D Side by Side</translation>
+     </message>
+-    <message>
+-        <source>3D Top and Bottom</source>
+-        <translation type="vanished">3D Top and Bottom</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="896"/>
+         <source>Discard 3D Top and Bottom</source>
+@@ -12092,12 +11474,12 @@ Error: %1</translation>
      <message>
          <location filename="../libs/libmythtv/DVD/mythdvdbuffer.cpp" line="250"/>
          <source>Title %1 chapter %2</source>
@@ -1083,7 +2090,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -12118,102 +12119,102 @@ Error: %1</translation>
+@@ -12118,102 +11500,102 @@ Error: %1</translation>
      <message>
          <location filename="../libs/libmythui/mythdisplay.cpp" line="146"/>
          <source>Spanning %1 screens</source>
@@ -1136,7 +2143,7 @@ index e4d869578b..a960c92743 100644
          <location filename="../libs/libmythui/mythdisplay.cpp" line="181"/>
          <source>Current screen %1 %2:</source>
 -        <translation type="unfinished"></translation>
-+        <translation>Current Screen	:%1 %2</translation>
++        <translation>Current Screen	: %1 %2</translation>
      </message>
      <message>
          <location filename="../libs/libmythui/mythdisplay.cpp" line="183"/>
@@ -1206,7 +2213,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -12221,7 +12222,7 @@ Error: %1</translation>
+@@ -12221,7 +11603,7 @@ Error: %1</translation>
      <message>
          <location filename="../libs/libmythui/mythpainterwindow.cpp" line="129"/>
          <source>Warning: No GPU acceleration</source>
@@ -1215,7 +2222,169 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -12418,52 +12419,52 @@ Error: %1</translation>
+@@ -12256,214 +11638,63 @@ Error: %1</translation>
+         <source>Could not open decoder</source>
+         <translation>Could Not Open Decoder</translation>
+     </message>
+-    <message>
+-        <source>TXT CAP</source>
+-        <translation type="vanished">TXT CAP</translation>
+-    </message>
+-    <message>
+-        <source>Text subtitles</source>
+-        <translation type="vanished">Text Subtitles</translation>
+-    </message>
+-    <message>
+-        <source>Off</source>
+-        <translation type="vanished">Off</translation>
+-    </message>
+-    <message>
+-        <source>TXT %1</source>
+-        <translation type="vanished">TXT %1</translation>
+-    </message>
+-    <message>
+-        <source>On</source>
+-        <translation type="vanished">On</translation>
+-    </message>
+-    <message>
+-        <source>No captions</source>
+-        <comment>CC/Teletext/Subtitle text not available</comment>
+-        <translation type="vanished">No Captions</translation>
+-    </message>
+-    <message>
+-        <source>Forced Subtitles On</source>
+-        <translation type="vanished">Forced Subtitles On</translation>
+-    </message>
+-    <message>
+-        <source>Forced Subtitles Off</source>
+-        <translation type="vanished">Forced Subtitles Off</translation>
+-    </message>
+-    <message>
+-        <source>Failed to initialize A/V Sync</source>
+-        <translation type="vanished">Failed to Initialize A/V Sync</translation>
+-    </message>
+-    <message>
+-        <source>Serious error detected in Video Output</source>
+-        <translation type="vanished">Serious Error Detected in Video Output</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/mythplayer.cpp" line="826"/>
+         <source>Video frame buffering failed too many times.</source>
+         <translation>Video Frame Buffering Failed Too Many Times</translation>
+     </message>
+-    <message>
+-        <source>Error opening switch program buffer</source>
+-        <translation type="vanished">Error Opening Switch Program Buffer</translation>
+-    </message>
+-    <message>
+-        <source>Error opening switch program file</source>
+-        <translation type="vanished">Error Opening Switch Program File</translation>
+-    </message>
+-    <message>
+-        <source>Error opening jump program file buffer</source>
+-        <translation type="vanished">Error Opening Jump Program File Buffer</translation>
+-    </message>
+-    <message>
+-        <source>Error opening jump program file</source>
+-        <translation type="vanished">Error Opening Jump Program File</translation>
+-    </message>
+-    <message>
+-        <source>Error reopening video decoder</source>
+-        <translation type="vanished">Error Reopening Video Decoder</translation>
+-    </message>
+-    <message>
+-        <source>Irrecoverable recorder error</source>
+-        <translation type="vanished">Irrecoverable Recorder Error</translation>
+-    </message>
+-    <message>
+-        <source>Not Flagged</source>
+-        <extracomment>The commercials/adverts have not been flagged</extracomment>
+-        <translation type="vanished">Not Flagged</translation>
+-    </message>
+-    <message>
+-        <source>Searching</source>
+-        <translation type="vanished">Searching...</translation>
+-    </message>
+-    <message>
+-        <source>No Seektable</source>
+-        <translation type="vanished">No Seektable</translation>
+-    </message>
+-    <message>
+-        <source>Using previously auto-saved cuts</source>
+-        <translation type="vanished">Using Previously Auto-saved Cuts</translation>
+-    </message>
+-    <message>
+-        <source>Paused</source>
+-        <translation type="vanished">Paused</translation>
+-    </message>
+-    <message>
+-        <source>New cut added.</source>
+-        <translation type="vanished">New Cut Added</translation>
+-    </message>
+-    <message>
+-        <source>Delete</source>
+-        <translation type="vanished">Delete</translation>
+-    </message>
+-    <message>
+-        <source>Undo Changes</source>
+-        <translation type="vanished">Undo Changes</translation>
+-    </message>
+-    <message>
+-        <source>Undo - %1</source>
+-        <extracomment>%1 is the undo message</extracomment>
+-        <translation type="vanished">Undo - %1</translation>
+-    </message>
+-    <message>
+-        <source>Redo - %1</source>
+-        <extracomment>%1 is the redo message</extracomment>
+-        <translation type="vanished">Redo - %1</translation>
+-    </message>
+-    <message>
+-        <source>%1 ms</source>
+-        <translation type="vanished">%1 ms</translation>
+-    </message>
+-    <message numerus="yes">
+-        <source>%n second(s)</source>
+-        <translation type="vanished">
+-            <numerusform>%n second</numerusform>
+-            <numerusform>%n seconds</numerusform>
+-        </translation>
+-    </message>
+-    <message>
+-        <source>Still Frame</source>
+-        <translation type="vanished">Still Frame</translation>
+-    </message>
+-    <message>
+-        <source>%1 of %2</source>
+-        <translation type="vanished">%1 of %2</translation>
+-    </message>
+-    <message>
+-        <source>Error opening remote stream buffer</source>
+-        <translation type="vanished">Error Opening Remote Stream Buffer</translation>
+-    </message>
+-    <message>
+-        <source>Error opening remote stream</source>
+-        <translation type="vanished">Error Opening Remote Stream</translation>
+-    </message>
+-    <message>
+-        <source>Enabled Studio Levels</source>
+-        <translation type="vanished">Enabled Studio Levels</translation>
+-    </message>
+-    <message>
+-        <source>Disabled Studio Levels</source>
+-        <translation type="vanished">Disabled Studio Levels</translation>
+-    </message>
+-    <message>
+-        <source>Enabled Night Mode</source>
+-        <translation type="vanished">Enabled Night Mode</translation>
+-    </message>
+-    <message>
+-        <source>Disabled Night Mode</source>
+-        <translation type="vanished">Disabled Night Mode</translation>
+-    </message>
+ </context>
+ <context>
+     <name>MythPlayerAudioUI</name>
      <message>
          <location filename="../libs/libmythtv/mythplayeraudioui.cpp" line="117"/>
          <source>Adjust Volume</source>
@@ -1278,7 +2447,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -12471,64 +12472,64 @@ Error: %1</translation>
+@@ -12471,64 +11702,64 @@ Error: %1</translation>
      <message>
          <location filename="../libs/libmythtv/mythplayercaptionsui.cpp" line="92"/>
          <source>Adjust Subtitle Zoom</source>
@@ -1355,7 +2524,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -12536,43 +12537,43 @@ Error: %1</translation>
+@@ -12536,43 +11767,43 @@ Error: %1</translation>
      <message>
          <location filename="../libs/libmythtv/mythplayereditorui.cpp" line="57"/>
          <source>No Seektable</source>
@@ -1407,7 +2576,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -12580,7 +12581,7 @@ Error: %1</translation>
+@@ -12580,7 +11811,7 @@ Error: %1</translation>
      <message numerus="yes">
          <location filename="../libs/libmythtv/mythplayeroverlayui.cpp" line="228"/>
          <source>%n second(s)</source>
@@ -1416,7 +2585,7 @@ index e4d869578b..a960c92743 100644
              <numerusform>%n second</numerusform>
              <numerusform>%n seconds</numerusform>
          </translation>
-@@ -12588,12 +12589,12 @@ Error: %1</translation>
+@@ -12588,12 +11819,12 @@ Error: %1</translation>
      <message>
          <location filename="../libs/libmythtv/mythplayeroverlayui.cpp" line="231"/>
          <source>Still Frame</source>
@@ -1431,7 +2600,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -12601,58 +12602,58 @@ Error: %1</translation>
+@@ -12601,58 +11832,58 @@ Error: %1</translation>
      <message>
          <location filename="../libs/libmythtv/mythplayerui.cpp" line="31"/>
          <source>Searching</source>
@@ -1501,7 +2670,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -12660,7 +12661,7 @@ Error: %1</translation>
+@@ -12660,7 +11891,7 @@ Error: %1</translation>
      <message>
          <location filename="../libs/libmythtv/mythplayervideoui.cpp" line="48"/>
          <source>Failed to initialize video output</source>
@@ -1510,16 +2679,27 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -12668,7 +12669,7 @@ Error: %1</translation>
+@@ -12668,18 +11899,7 @@ Error: %1</translation>
      <message>
          <location filename="../libs/libmythtv/mythplayervisualiserui.cpp" line="106"/>
          <source>Visualisation Off</source>
 -        <translation type="unfinished">Visualization Off</translation>
+-    </message>
+-</context>
+-<context>
+-    <name>MythPopupBox</name>
+-    <message>
+-        <source>OK</source>
+-        <translation type="vanished">OK</translation>
+-    </message>
+-    <message>
+-        <source>Cancel</source>
+-        <translation type="vanished">Cancel</translation>
 +        <translation>Visualization Off</translation>
      </message>
  </context>
  <context>
-@@ -12687,27 +12688,27 @@ Error: %1</translation>
+@@ -12687,27 +11907,27 @@ Error: %1</translation>
      <message>
          <location filename="../libs/libmythbase/mythpower.cpp" line="248"/>
          <source>Restart</source>
@@ -1552,7 +2732,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -13122,287 +13123,287 @@ Error: %1</translation>
+@@ -13122,287 +12342,287 @@ Error: %1</translation>
      <message>
          <location filename="../libs/libmythtv/mythvideoprofile.cpp" line="724"/>
          <source>Default (Bilinear)</source>
@@ -1895,7 +3075,33 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -13539,7 +13540,7 @@ Error: %1</translation>
+@@ -13472,25 +12692,6 @@ Error: %1</translation>
+         <translation>MythWelcome Settings</translation>
+     </message>
+ </context>
+-<context>
+-    <name>MythWizard</name>
+-    <message>
+-        <source>&amp;Cancel</source>
+-        <translation type="vanished">&amp;Cancel</translation>
+-    </message>
+-    <message>
+-        <source>&lt; &amp;Back</source>
+-        <translation type="vanished">&lt; &amp;Back</translation>
+-    </message>
+-    <message>
+-        <source>&amp;Next &gt;</source>
+-        <translation type="vanished">&amp;Next &gt;</translation>
+-    </message>
+-    <message>
+-        <source>&amp;Finish</source>
+-        <translation type="vanished">&amp;Finish</translation>
+-    </message>
+-</context>
+ <context>
+     <name>NetworkControl</name>
+     <message>
+@@ -13539,7 +12740,7 @@ Error: %1</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1665"/>
          <source>If enabled, captions will be displayed when playing back recordings or watching Live TV. Closed Captioning can be turned on or off by pressing &quot;T&quot; duringplayback.</source>
@@ -1904,7 +3110,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1677"/>
-@@ -13564,12 +13565,12 @@ Error: %1</translation>
+@@ -13564,12 +12765,12 @@ Error: %1</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1703"/>
          <source>Visualiser for audio only playback</source>
@@ -1919,7 +3125,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1717"/>
-@@ -13655,32 +13656,32 @@ Error: %1</translation>
+@@ -13655,32 +12856,32 @@ Error: %1</translation>
      <message>
          <location filename="../libs/libmythtv/channelscan/paneatsc.h" line="34"/>
          <source>First Channel</source>
@@ -1958,7 +3164,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/channelscan/paneatsc.h" line="47"/>
-@@ -13848,7 +13849,7 @@ Error: %1</translation>
+@@ -13848,7 +13049,7 @@ Error: %1</translation>
      <message>
          <location filename="../libs/libmythtv/playgroup.cpp" line="282"/>
          <source>Enter new group name</source>
@@ -1967,7 +3173,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/playgroup.cpp" line="298"/>
-@@ -14255,7 +14256,7 @@ Are you sure you want to delete:</translation>
+@@ -14255,7 +13456,7 @@ Are you sure you want to delete:</translation>
      <message>
          <location filename="../programs/mythfrontend/playbackbox.cpp" line="2918"/>
          <source>Clear last played position</source>
@@ -1976,7 +3182,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/playbackbox.cpp" line="2921"/>
-@@ -14525,47 +14526,47 @@ Are you sure you want to delete:</translation>
+@@ -14525,47 +13726,47 @@ Are you sure you want to delete:</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="789"/>
          <source>Video scaler</source>
@@ -2033,7 +3239,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="840"/>
-@@ -14580,17 +14581,17 @@ Are you sure you want to delete:</translation>
+@@ -14580,29 +13781,17 @@ Are you sure you want to delete:</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="847"/>
          <source>When unchecked the deblocking loopfilter will be disabled. </source>
@@ -2050,11 +3256,23 @@ index e4d869578b..a960c92743 100644
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="851"/>
          <source>The default scaler provides good quality in the majority of situations. Higher quality scalers may offer some benefit when scaling very low resolution material but may not be as fast.</source>
 -        <translation type="unfinished"></translation>
+-    </message>
+-    <message>
+-        <source>Disabling will significantly reduce the load on the CPU when watching HD H.264 but may significantly reduce video quality.</source>
+-        <translation type="vanished">Disabling will significantly reduce the load on the CPU when watching HD H.264 but may significantly reduce video quality.</translation>
+-    </message>
+-    <message>
+-        <source>When unchecked the OSD will not fade away but instead will disappear abruptly.</source>
+-        <translation type="vanished">When unchecked the OSD will not fade away but instead will disappear abruptly.</translation>
+-    </message>
+-    <message>
+-        <source>Uncheck this if the video studders while the OSD is fading away.</source>
+-        <translation type="vanished">Uncheck this if the video studders while the OSD is fading away.</translation>
 +        <translation>The default scaler provides good quality in the majority of situations. Higher quality scalers may offer some benefit when scaling very low resolution material but may not be as fast.</translation>
      </message>
      <message>
-         <source>Disabling will significantly reduce the load on the CPU when watching HD H.264 but may significantly reduce video quality.</source>
-@@ -14657,7 +14658,7 @@ Are you sure you want to delete:</translation>
+         <location filename="../programs/mythfrontend/globalsettings.cpp" line="787"/>
+@@ -14657,7 +13846,7 @@ Are you sure you want to delete:</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="768"/>
          <source>All formats</source>
@@ -2063,7 +3281,57 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="783"/>
-@@ -14729,19 +14730,19 @@ Are you sure you want to delete:</translation>
+@@ -14669,34 +13858,6 @@ Are you sure you want to delete:</translation>
+         <source>Video renderer</source>
+         <translation>Video Renderer</translation>
+     </message>
+-    <message>
+-        <source>OSD renderer</source>
+-        <translation type="vanished">OSD Renderer</translation>
+-    </message>
+-    <message>
+-        <source>OSD fade</source>
+-        <translation type="vanished">OSD Fade</translation>
+-    </message>
+-    <message>
+-        <source>Primary deinterlacer</source>
+-        <translation type="vanished">Primary Deinterlacer</translation>
+-    </message>
+-    <message>
+-        <source>Fallback deinterlacer</source>
+-        <translation type="vanished">Fallback Deinterlacer</translation>
+-    </message>
+-    <message>
+-        <source>Custom filters</source>
+-        <translation type="vanished">Custom Filters</translation>
+-    </message>
+-    <message>
+-        <source>Example custom filter list: &apos;ivtc,denoise3d&apos;</source>
+-        <translation type="vanished">Example Custom Filter List: &apos;ivtc,denoise3d&apos;</translation>
+-    </message>
+-    <message>
+-        <source>When unchecked the deblocking loopfilter will be disabled </source>
+-        <translation type="vanished">When unchecked the deblocking loopfilter will be disabled.</translation>
+-    </message>
+     <message>
+         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1011"/>
+         <source>Invalid width specification(%1), discarded</source>
+@@ -14712,14 +13873,6 @@ Are you sure you want to delete:</translation>
+         <source>Invalid frame rate specification(%1), discarded</source>
+         <translation>Invalid Frame Rate Specification(%1), Discarded</translation>
+     </message>
+-    <message>
+-        <source>Main deinterlacing method. %1</source>
+-        <translation type="vanished">Main Deinterlacing Method. %1</translation>
+-    </message>
+-    <message>
+-        <source>Fallback deinterlacing method. %1</source>
+-        <translation type="vanished">Fallback Deinterlacing Method. %1</translation>
+-    </message>
+     <message>
+         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1167"/>
+         <source>Remove this profile item?</source>
+@@ -14729,19 +13882,19 @@ Are you sure you want to delete:</translation>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1213"/>
          <source>Width</source>
          <comment>video formats</comment>
@@ -2086,7 +3354,42 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1228"/>
-@@ -14795,22 +14796,22 @@ Are you sure you want to delete:</translation>
+@@ -14749,11 +13902,6 @@ Are you sure you want to delete:</translation>
+         <comment>and</comment>
+         <translation>&amp;</translation>
+     </message>
+-    <message>
+-        <source>formats</source>
+-        <comment>video formats</comment>
+-        <translation type="vanished">formats</translation>
+-    </message>
+     <message>
+         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1222"/>
+         <source>framerate</source>
+@@ -14772,67 +13920,35 @@ Are you sure you want to delete:</translation>
+         <source>Increase this value if audio cuts out frequently. This is more likely to occur when adjusting audio sync to a negative value. If using high negative audio sync values you may need to set a large value here. Default is 100.</source>
+         <translation>Increase this value if audio cuts out frequently. This is more likely to occur when adjusting audio sync to a negative value. If using high negative audio sync values you may need to set a large value here. Default is 100.</translation>
+     </message>
+-    <message>
+-        <source>Enable new timestamp based playback speed (AVSync2)</source>
+-        <translation type="vanished">Enable New Timestamp Based Playback Speed (AVSync2)</translation>
+-    </message>
+-    <message>
+-        <source>Simplified timing and synchronization method. This may offer smoother video playback. Note there is a setting that can be used for fine tuning playback (press right arrow).</source>
+-        <translation type="vanished">Simplified timing and synchronization method. This may offer smoother video playback. Note there is a setting that can be used for fine tuning playback (press right arrow).</translation>
+-    </message>
+-    <message>
+-        <source>AVSync2 audio correction (ms)</source>
+-        <translation type="vanished">AVSync2 Audio Correction (ms)</translation>
+-    </message>
+-    <message>
+-        <source>When using AVSync2, if video playback is speeding up and slowing down every few seconds, reduce this value. For quicker recovery of audio sync after jumps, increase this value. Values can be from 1 to 40. Default is 10.</source>
+-        <translation type="vanished">When using AVSync2, if video playback is speeding up and slowing down every few seconds, reduce this value. For quicker recovery of audio sync after jumps, increase this value. Values can be from 1 to 40. Default is 10.</translation>
+-    </message>
+-    <message>
+-        <source>Extra stage of OpenGL Shading</source>
+-        <translation type="vanished">Extra Stage of OpenGL Shading</translation>
+-    </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="79"/>
          <source>Primary colourspace conversion</source>
@@ -2113,7 +3416,21 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="138"/>
-@@ -14832,7 +14833,7 @@ Are you sure you want to delete:</translation>
+         <source>Use FFmpeg&apos;s original MPEG-TS demuxer</source>
+         <translation>Use FFmpeg&apos;s Original MPEG-TS Demuxer</translation>
+     </message>
+-    <message>
+-        <source>Experimental: Enable this setting to use FFmpeg&apos;s native demuxer. Things will be broken.</source>
+-        <translation type="vanished">Experimental: Enable this setting to use FFmpeg&apos;s native demuxer. Things will be broken.</translation>
+-    </message>
+-    <message>
+-        <source>PIP video location</source>
+-        <translation type="vanished">PIP Video Location</translation>
+-    </message>
+-    <message>
+-        <source>Location of PIP Video window.</source>
+-        <translation type="vanished">Location of PIP Video window.</translation>
+-    </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="142"/>
          <source>Experimental: Enable this setting to use FFmpeg&apos;s native demuxer. Try this when encountering playback issues.</source>
@@ -2122,7 +3439,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="152"/>
-@@ -14964,7 +14965,7 @@ Are you sure you want to delete:</translation>
+@@ -14964,7 +14080,7 @@ Are you sure you want to delete:</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1377"/>
          <source>Enter Playback Profile Name</source>
@@ -2131,7 +3448,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1402"/>
-@@ -15036,7 +15037,7 @@ name cannot be blank.</source>
+@@ -15036,7 +14152,7 @@ name cannot be blank.</source>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1461"/>
          <source>Selects how to sort a show&apos;s episodes</source>
@@ -2140,7 +3457,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1471"/>
-@@ -15066,7 +15067,7 @@ name cannot be blank.</source>
+@@ -15066,7 +14182,7 @@ name cannot be blank.</source>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1608"/>
          <source>Adjust this if the image does not fill your screen vertically. Range -100% to 100%</source>
@@ -2149,7 +3466,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1618"/>
-@@ -15076,7 +15077,7 @@ name cannot be blank.</source>
+@@ -15076,7 +14192,7 @@ name cannot be blank.</source>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1622"/>
          <source>Adjust this if the image does not fill your screen horizontally. Range -100% to 100%</source>
@@ -2158,7 +3475,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1632"/>
-@@ -15101,17 +15102,17 @@ name cannot be blank.</source>
+@@ -15101,25 +14217,17 @@ name cannot be blank.</source>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1767"/>
          <source>Clear last played position and exit</source>
@@ -2175,11 +3492,41 @@ index e4d869578b..a960c92743 100644
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2183"/>
          <source>If &apos;Side by Side&apos; or &apos;Top and Bottom&apos; 3D material is detected, enabling this setting will discard one field (enabled by default).</source>
 -        <translation type="unfinished"></translation>
+-    </message>
+-    <message>
+-        <source>Clear bookmark on playback</source>
+-        <translation type="vanished">Clear Bookmark on Playback</translation>
+-    </message>
+-    <message>
+-        <source>If enabled, automatically clear the bookmark on a recording when the recording is played back. If disabled, you can mark the beginning with rewind then save position.</source>
+-        <translation type="vanished">If enabled, automatically clear the bookmark on a recording when the recording is played back. If disabled, you can mark the beginning with rewind then save position.</translation>
 +        <translation>If &apos;Side by Side&apos; or &apos;Top and Bottom&apos; 3D material is detected, enabling this setting will discard one field (enabled by default).</translation>
      </message>
      <message>
-         <source>Clear bookmark on playback</source>
-@@ -15192,7 +15193,7 @@ name cannot be blank.</source>
+         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1747"/>
+@@ -15141,10 +14249,6 @@ name cannot be blank.</source>
+         <source>Just exit</source>
+         <translation>Exit Without Saving</translation>
+     </message>
+-    <message>
+-        <source>Save position and exit</source>
+-        <translation type="vanished">Save and Exit</translation>
+-    </message>
+     <message>
+         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1768"/>
+         <source>Always prompt (excluding Live TV)</source>
+@@ -15160,10 +14264,6 @@ name cannot be blank.</source>
+         <source>Prompt for Live TV only</source>
+         <translation>Prompt for Live TV Only</translation>
+     </message>
+-    <message>
+-        <source>If set to prompt, a menu will be displayed when you exit playback mode. The options available will allow you to save your position, delete the recording, or continue watching.</source>
+-        <translation type="vanished">If set to prompt, a menu will be displayed when you exit playback mode. The options available will allow you to save your position, delete the recording, or continue watching.</translation>
+-    </message>
+     <message>
+         <location filename="../programs/mythfrontend/globalsettings.cpp" line="1786"/>
+         <source>Prompt at end of recording</source>
+@@ -15192,7 +14292,7 @@ name cannot be blank.</source>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1821"/>
          <source>Set the choice between viewing the current recording group in the OSD, or showing the &apos;Watch Recording&apos; screen when &apos;Jump to Program&apos; is activated. If enabled, the recordings are shown in the OSD</source>
@@ -2188,7 +3535,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1834"/>
-@@ -15217,7 +15218,7 @@ name cannot be blank.</source>
+@@ -15217,7 +14317,7 @@ name cannot be blank.</source>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1870"/>
          <source>Live TV idle timeout (mins)</source>
@@ -2197,16 +3544,20 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="1874"/>
-@@ -15232,7 +15233,7 @@ name cannot be blank.</source>
+@@ -15232,11 +14332,7 @@ name cannot be blank.</source>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2170"/>
          <source>By default MythTV uses black letterboxing to match broadcaster letterboxing, but those with plasma screens may prefer gray to minimize burn-in.</source>
 -        <translation type="unfinished"></translation>
+-    </message>
+-    <message>
+-        <source>By default MythTV uses black letterboxing to match broadcaster letterboxing, but those with plasma screens may prefer gray to minimize burn-in. Currently only works with XVideo video renderer.</source>
+-        <translation type="vanished">By default MythTV uses black letterboxing to match broadcaster letterboxing, but those with plasma screens may prefer gray to minimize burn-in. Currently only works with XVideo video renderer.</translation>
 +        <translation>By default MythTV uses black letterboxing to match broadcaster letterboxing, but those with plasma screens may prefer gray to minimize burn-in.</translation>
      </message>
      <message>
-         <source>By default MythTV uses black letterboxing to match broadcaster letterboxing, but those with plasma screens may prefer gray to minimize burn-in. Currently only works with XVideo video renderer.</source>
-@@ -15281,7 +15282,7 @@ name cannot be blank.</source>
+         <location filename="../programs/mythfrontend/globalsettings.cpp" line="2193"/>
+@@ -15281,7 +14377,7 @@ name cannot be blank.</source>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="3471"/>
          <source>By recording priority</source>
@@ -2215,16 +3566,20 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="3474"/>
-@@ -15752,7 +15753,7 @@ name cannot be blank.</source>
+@@ -15752,11 +14848,7 @@ name cannot be blank.</source>
      <message>
          <location filename="../programs/mythfrontend/progdetails.cpp" line="448"/>
          <source>720p Resolution</source>
 -        <translation>720p Resolution</translation>
+-    </message>
+-    <message>
+-        <source>1080i/p Resolution</source>
+-        <translation type="vanished">1080i/p Resolution</translation>
 +        <translation>720p HD Resolution</translation>
      </message>
      <message>
-         <source>1080i/p Resolution</source>
-@@ -15908,12 +15909,12 @@ name cannot be blank.</source>
+         <location filename="../programs/mythfrontend/progdetails.cpp" line="466"/>
+@@ -15908,12 +15000,12 @@ name cannot be blank.</source>
      <message>
          <location filename="../programs/mythfrontend/progdetails.cpp" line="302"/>
          <source> not matched</source>
@@ -2239,7 +3594,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/progdetails.cpp" line="307"/>
-@@ -15928,27 +15929,27 @@ name cannot be blank.</source>
+@@ -15928,27 +15020,27 @@ name cannot be blank.</source>
      <message>
          <location filename="../programs/mythfrontend/progdetails.cpp" line="446"/>
          <source>HEVC/H.265</source>
@@ -2272,7 +3627,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/progdetails.cpp" line="776"/>
-@@ -15966,22 +15967,22 @@ name cannot be blank.</source>
+@@ -15966,22 +15058,22 @@ name cannot be blank.</source>
      <message>
          <location filename="../programs/mythfrontend/progdetails.cpp" line="827"/>
          <source>Auto-expire off</source>
@@ -2299,7 +3654,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/progdetails.cpp" line="845"/>
-@@ -16032,7 +16033,7 @@ name cannot be blank.</source>
+@@ -16032,7 +15124,7 @@ name cannot be blank.</source>
      <message>
          <location filename="../programs/mythfrontend/progdetails.cpp" line="904"/>
          <source>Unknown</source>
@@ -2308,7 +3663,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/progdetails.cpp" line="906"/>
-@@ -16047,12 +16048,12 @@ name cannot be blank.</source>
+@@ -16047,12 +15139,12 @@ name cannot be blank.</source>
      <message>
          <location filename="../programs/mythfrontend/progdetails.cpp" line="908"/>
          <source>Recorded ID</source>
@@ -2323,7 +3678,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/progdetails.cpp" line="910"/>
-@@ -16715,22 +16716,22 @@ name cannot be blank.</source>
+@@ -16715,22 +15807,22 @@ name cannot be blank.</source>
      <message>
          <location filename="../libs/libmythtv/channelinfo.cpp" line="510"/>
          <source>Always Visible</source>
@@ -2350,7 +3705,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythbase/programinfo.cpp" line="3206"/>
-@@ -16897,17 +16898,17 @@ name cannot be blank.</source>
+@@ -16897,17 +15989,17 @@ name cannot be blank.</source>
      <message>
          <location filename="../libs/libmythbase/recordingtypes.cpp" line="368"/>
          <source>Do not automatically extend recording</source>
@@ -2371,7 +3726,142 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythbase/recordingtypes.cpp" line="32"/>
-@@ -17954,7 +17955,7 @@ name cannot be blank.</source>
+@@ -17631,82 +16723,6 @@ name cannot be blank.</source>
+             <numerusform>(%n days)</numerusform>
+         </translation>
+     </message>
+-    <message>
+-        <source>Track</source>
+-        <translation type="vanished">Track</translation>
+-    </message>
+-    <message>
+-        <source>Audio track</source>
+-        <translation type="vanished">Audio Track</translation>
+-    </message>
+-    <message>
+-        <source>Video track</source>
+-        <translation type="vanished">Video Track</translation>
+-    </message>
+-    <message>
+-        <source>Subtitle track</source>
+-        <translation type="vanished">Subtitle Track</translation>
+-    </message>
+-    <message>
+-        <source>CC</source>
+-        <comment>EIA-608 closed captions</comment>
+-        <translation type="vanished">CC</translation>
+-    </message>
+-    <message>
+-        <source>ATSC CC</source>
+-        <comment>EIA-708 closed captions</comment>
+-        <translation type="vanished">ATSC CC</translation>
+-    </message>
+-    <message>
+-        <source>TT CC</source>
+-        <comment>Teletext closed captions</comment>
+-        <translation type="vanished">TT CC</translation>
+-    </message>
+-    <message>
+-        <source>TT Menu</source>
+-        <comment>Teletext Menu</comment>
+-        <translation type="vanished">TT Menu</translation>
+-    </message>
+-    <message>
+-        <source>Text</source>
+-        <comment>Text stream</comment>
+-        <translation type="vanished">Text</translation>
+-    </message>
+-    <message>
+-        <source>TXT File</source>
+-        <comment>Text File</comment>
+-        <translation type="vanished">TXT File</translation>
+-    </message>
+-    <message>
+-        <source>Audio Description</source>
+-        <comment>On-screen events described for the visually impaired</comment>
+-        <translation type="vanished">Audio Description</translation>
+-    </message>
+-    <message>
+-        <source>Clean Effects</source>
+-        <comment>No dialog, background audio only</comment>
+-        <translation type="vanished">Clean Effects</translation>
+-    </message>
+-    <message>
+-        <source>Hearing Impaired</source>
+-        <comment>Clear dialog for the hearing impaired</comment>
+-        <translation type="vanished">Hearing Impaired</translation>
+-    </message>
+-    <message>
+-        <source>Spoken Subtitles</source>
+-        <comment>Subtitles are read out for the visually impaired</comment>
+-        <translation type="vanished">Spoken Subtitles</translation>
+-    </message>
+-    <message>
+-        <source>Commentary</source>
+-        <comment>Director/Cast commentary track</comment>
+-        <translation type="vanished">Commentary</translation>
+-    </message>
+-    <message>
+-        <source>Normal</source>
+-        <comment>Ordinary audio track</comment>
+-        <translation type="vanished">Normal</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="360"/>
+         <location filename="../libs/libmythtv/transporteditor.cpp" line="609"/>
+@@ -17732,10 +16748,6 @@ name cannot be blank.</source>
+         <source>Port</source>
+         <translation>Port</translation>
+     </message>
+-    <message>
+-        <source>Password</source>
+-        <translation type="vanished">Password</translation>
+-    </message>
+     <message>
+         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="430"/>
+         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="451"/>
+@@ -17831,10 +16843,6 @@ name cannot be blank.</source>
+         <source>OK</source>
+         <translation>OK</translation>
+     </message>
+-    <message>
+-        <source>Cancel</source>
+-        <translation type="vanished">Cancel</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythbase/programinfo.cpp" line="1752"/>
+         <location filename="../libs/libmythbase/programinfo.cpp" line="1756"/>
+@@ -17853,22 +16861,6 @@ name cannot be blank.</source>
+         <source>Subtitle</source>
+         <translation>Subtitle</translation>
+     </message>
+-    <message>
+-        <source>Video Decode Error</source>
+-        <translation type="vanished">Video Decode Error</translation>
+-    </message>
+-    <message>
+-        <source> (forced)</source>
+-        <translation type="vanished"> (forced)</translation>
+-    </message>
+-    <message>
+-        <source>Input %1:%2</source>
+-        <translation type="vanished">Input %1:%2</translation>
+-    </message>
+-    <message>
+-        <source>Could not query inputs.</source>
+-        <translation type="vanished">Could not query inputs.</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/cardutil.cpp" line="2433"/>
+         <source>ERROR, Compile with V4L support to query inputs</source>
+@@ -17947,14 +16939,10 @@ name cannot be blank.</source>
+         <source>Failed to add channel %1</source>
+         <translation>Failed to Add Channel %1</translation>
+     </message>
+-    <message>
+-        <source>%1 -- Testing decryption of program %2</source>
+-        <translation type="vanished">%1 -- Testing Decryption of Program %2</translation>
+-    </message>
      <message>
          <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="683"/>
          <source>Program %1 Testing Decryption</source>
@@ -2380,7 +3870,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="1012"/>
-@@ -18015,8 +18016,8 @@ name cannot be blank.</source>
+@@ -18015,18 +17003,11 @@ name cannot be blank.</source>
      <message numerus="yes">
          <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="2240"/>
          <source>Found %n</source>
@@ -2391,7 +3881,17 @@ index e4d869578b..a960c92743 100644
              <numerusform></numerusform>
          </translation>
      </message>
-@@ -18144,7 +18145,7 @@ name cannot be blank.</source>
+-    <message numerus="yes">
+-        <source>: Found %n</source>
+-        <translation type="vanished">
+-            <numerusform>: Found %n</numerusform>
+-            <numerusform>: Found %n</numerusform>
+-        </translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/channelscan/channelscan_sm.cpp" line="2511"/>
+         <source>Frequency %1</source>
+@@ -18144,7 +17125,7 @@ name cannot be blank.</source>
          <location filename="../libs/libmythtv/channelscan/frequencytablesetting.cpp" line="75"/>
          <location filename="../libs/libmythtv/channelscan/frequencytablesetting.cpp" line="90"/>
          <source>Netherlands</source>
@@ -2400,7 +3900,19 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/channelscan/frequencytablesetting.cpp" line="78"/>
-@@ -18247,12 +18248,12 @@ name cannot be blank.</source>
+@@ -18234,11 +17215,6 @@ name cannot be blank.</source>
+         <source>Analog</source>
+         <translation>Analog</translation>
+     </message>
+-    <message>
+-        <source>Page Not Available</source>
+-        <comment>Requested Teletext page not available</comment>
+-        <translation type="vanished">Page Not Available</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/playercontext.cpp" line="427"/>
+         <source>Play</source>
+@@ -18247,12 +17223,12 @@ name cannot be blank.</source>
      <message>
          <location filename="../libs/libmythtv/playercontext.cpp" line="430"/>
          <source>Rewind</source>
@@ -2415,7 +3927,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/profilegroup.h" line="63"/>
-@@ -18427,7 +18428,7 @@ name cannot be blank.</source>
+@@ -18427,7 +17403,7 @@ name cannot be blank.</source>
      <message>
          <location filename="../libs/libmythtv/recordingprofile.cpp" line="734"/>
          <source>If set, the MPEG4 encoder will use &apos;4MV&apos; motion-vector encoding.  This requires much more processing, but can result in better video. It is highly recommended that the HQ option is enabled if 4MV is enabled.</source>
@@ -2424,7 +3936,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/recordingprofile.cpp" line="750"/>
-@@ -18487,17 +18488,17 @@ name cannot be blank.</source>
+@@ -18487,17 +17463,17 @@ name cannot be blank.</source>
      <message>
          <location filename="../libs/libmythtv/recordingprofile.cpp" line="687"/>
          <source>If set, the MPEG4 encoder will use interlaced DCT encoding. You may want this when encoding interlaced video; however, this is experimental and may cause damaged video.</source>
@@ -2445,7 +3957,23 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/recordingprofile.cpp" line="772"/>
-@@ -18769,12 +18770,12 @@ name cannot be blank.</source>
+@@ -18753,28 +17729,20 @@ name cannot be blank.</source>
+         <source>Default (Template)</source>
+         <translation>Default (Template)</translation>
+     </message>
+-    <message>
+-        <source>Sorry, the Transport Editor can only be used to edit transports which are connected to a card input.</source>
+-        <translation type="vanished">Sorry, the Transport Editor can only be used to edit transports which are connected to a card input.</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/transporteditor.cpp" line="134"/>
+         <source>Failed to probe a capture card connected to this transport&apos;s video source. Please make sure the backend is not running.</source>
+         <translation>Failed to probe a capture card connected to this transport&apos;s video source. Please make sure the backend is not running.</translation>
+     </message>
+-    <message>
+-        <source>The Video Sources to which this Transport is connected are incompatible, please create separate video sources for these cards. </source>
+-        <translation type="vanished">The Video Sources to which this Transport is connected are incompatible, please create separate video sources for these cards. </translation>
+-    </message>
      <message>
          <location filename="../libs/libmythtv/transporteditor.cpp" line="97"/>
          <source>Sorry, the Transport Editor can only edit transports of a video source that is connected to a capture card.</source>
@@ -2460,7 +3988,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/transporteditor.cpp" line="448"/>
-@@ -18810,59 +18811,60 @@ name cannot be blank.</source>
+@@ -18810,65 +17778,60 @@ name cannot be blank.</source>
          <location filename="../libs/libmythtv/transporteditor.cpp" line="474"/>
          <source>Frequency (Option has no default).
  The frequency for this transport (multiplex) in</source>
@@ -2528,11 +4056,48 @@ index e4d869578b..a960c92743 100644
          <location filename="../libs/libmythtv/transporteditor.cpp" line="825"/>
          <source>Modulation System (Default: DVB-C/A)</source>
 -        <translation type="unfinished"></translation>
+-    </message>
+-    <message>
+-        <source>Frequency (Option has no default).
+-The frequency for this channel in</source>
+-        <translation type="vanished">Frequency (Option has no default).
+-The frequency for this channel in</translation>
 +        <translation>Modulation System (Default: DVB-C/A)</translation>
      </message>
      <message>
-         <source>Frequency (Option has no default).
-@@ -19049,32 +19051,32 @@ Most cards can autodetect this now, so leave it at Auto unless it won&apos;t wor
+         <location filename="../libs/libmythtv/transporteditor.cpp" line="488"/>
+@@ -18887,30 +17850,6 @@ Most DVB-S transponders transmit at 27.5 million symbols per second.</translatio
+         <source>Modulation System</source>
+         <translation>Modulation System</translation>
+     </message>
+-    <message>
+-        <source>Modulation System (Default: DVB-T)</source>
+-        <translation type="vanished">Modulation System (Default: DVB-T)</translation>
+-    </message>
+-    <message>
+-        <source>DVB-T</source>
+-        <translation type="vanished">DVB-T</translation>
+-    </message>
+-    <message>
+-        <source>DVB-T2</source>
+-        <translation type="vanished">DVB-T2</translation>
+-    </message>
+-    <message>
+-        <source>Modulation System (Default: DVB-S)</source>
+-        <translation type="vanished">Modulation System (Default: DVB-S)</translation>
+-    </message>
+-    <message>
+-        <source>DVB-S</source>
+-        <translation type="vanished">DVB-S</translation>
+-    </message>
+-    <message>
+-        <source>DVB-S2</source>
+-        <translation type="vanished">DVB-S2</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="295"/>
+         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="319"/>
+@@ -19049,42 +17988,38 @@ Most cards can autodetect this now, so leave it at Auto unless it won&apos;t wor
      <message>
          <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="128"/>
          <source>Logical Channel Numbers required</source>
@@ -2571,7 +4136,42 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="195"/>
-@@ -19163,51 +19165,55 @@ Most DVB-C transports transmit at 6.9 or 6.875 million symbols per second.</tran
+         <source>Add full Transport Stream channels</source>
+         <translation>Add Full Transport Stream Channels</translation>
+     </message>
+-    <message>
+-        <source>If set, Create MPTS channels, which allow recording of the full, unaltered, transport stream.</source>
+-        <translation type="vanished">If set, Create MPTS channels, which allow recording of the full, unaltered, transport stream.</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="209"/>
+         <source>Test Decryptability</source>
+@@ -19095,24 +18030,6 @@ Most cards can autodetect this now, so leave it at Auto unless it won&apos;t wor
+         <source>Test all channels to see if they can be decrypted with installed CAM/smartcard. Sometimes the encrypted flag is set spuriously. Attention: Enabling this option increases the scan time for each encrypted channel by a couple of seconds.</source>
+         <translation>Test all channels to see if they can be decrypted with installed CAM/smartcard. Sometimes the encrypted flag is set spuriously. Attention: Enabling this option increases the scan time for each encrypted channel by a couple of seconds.</translation>
+     </message>
+-    <message>
+-        <source>Frequency (Option has no default)
+-The frequency for this channel in kHz.</source>
+-        <translation type="vanished">Frequency (Option has no default)
+-The frequency for this channel in kHz.</translation>
+-    </message>
+-    <message>
+-        <source>Frequency (Option has no default)
+-The frequency for this channel in Hz.</source>
+-        <translation type="vanished">Frequency (Option has no default)
+-The frequency for this channel in Hz.</translation>
+-    </message>
+-    <message>
+-        <source>Symbol Rate (symbols/second).
+-Most DVB-S transponders transmit at 27.5 million symbols per second.</source>
+-        <translation type="vanished">Symbol Rate (symbols/second).
+-Most DVB-S transponders transmit at 27.5 million symbols per second.</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/transporteditor.cpp" line="513"/>
+         <source>Symbol Rate (symbols/second).
+@@ -19163,51 +18080,55 @@ Most DVB-C transports transmit at 6.9 or 6.875 million symbols per second.</tran
      <message>
          <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="179"/>
          <source>Remove duplicates</source>
@@ -2636,7 +4236,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="403"/>
-@@ -19282,12 +19288,12 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
+@@ -19282,24 +18203,12 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
      <message>
          <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="478"/>
          <source>Modulation system (Default: DVB-S2)</source>
@@ -2647,11 +4247,445 @@ index e4d869578b..a960c92743 100644
          <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="490"/>
          <source>Modulation system (Default: DVB-T2)</source>
 -        <translation type="unfinished"></translation>
+-    </message>
+-    <message>
+-        <source>Mod Sys</source>
+-        <translation type="vanished">Mod Sys</translation>
+-    </message>
+-    <message>
+-        <source>Modulation system (Default: DVB-S)</source>
+-        <translation type="vanished">Modulation System (Default: DVB-S)</translation>
+-    </message>
+-    <message>
+-        <source>Modulation system (Default: DVB-T)</source>
+-        <translation type="vanished">Modulation System (Default: DVB-T)</translation>
 +        <translation>Modulation System (Default: DVB-T2)</translation>
      </message>
      <message>
-         <source>Mod Sys</source>
-@@ -19800,27 +19806,27 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
+         <location filename="../libs/libmythtv/channelscan/channelscanmiscsettings.h" line="514"/>
+@@ -19359,410 +18268,11 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
+         <source>Error querying recorder state</source>
+         <translation>Error Querying Recorder State</translation>
+     </message>
+-    <message>
+-        <source>Standard</source>
+-        <translation type="vanished">Standard</translation>
+-    </message>
+-    <message>
+-        <source>Mac hardware acceleration</source>
+-        <translation type="vanished">Mac Hardware Acceleration</translation>
+-    </message>
+-    <message>
+-        <source>NVidia VDPAU acceleration</source>
+-        <translation type="vanished">NVidia VDPAU Acceleration</translation>
+-    </message>
+-    <message>
+-        <source>Standard will use ffmpeg library.</source>
+-        <translation type="vanished">Standard will use ffmpeg library.</translation>
+-    </message>
+-    <message>
+-        <source>Mac hardware will try to use the graphics processor - this may hang or crash your Mac!</source>
+-        <translation type="vanished">Mac hardware will try to use the graphics processor - this may hang or crash your Mac!</translation>
+-    </message>
+-    <message>
+-        <source>VDPAU will attempt to use the graphics hardware to accelerate video decoding and playback.</source>
+-        <translation type="vanished">VDPAU will attempt to use the graphics hardware to accelerate video decoding and playback.</translation>
+-    </message>
+-    <message>
+-        <source>VAAPI will attempt to use the graphics hardware to accelerate video decoding. REQUIRES OPENGL PAINTER.</source>
+-        <translation type="vanished">VAAPI will attempt to use the graphics hardware to accelerate video decoding. REQUIRES OPENGL PAINTER.</translation>
+-    </message>
+-    <message>
+-        <source>Linear blend</source>
+-        <translation type="vanished">Linear Blend</translation>
+-    </message>
+-    <message>
+-        <source>Kernel</source>
+-        <translation type="vanished">Kernel</translation>
+-    </message>
+-    <message>
+-        <source>Kernel (2x)</source>
+-        <translation type="vanished">Kernel (2x)</translation>
+-    </message>
+-    <message>
+-        <source>Greedy HighMotion</source>
+-        <translation type="vanished">Greedy HighMotion</translation>
+-    </message>
+-    <message>
+-        <source>Greedy HighMotion (2x)</source>
+-        <translation type="vanished">Greedy HighMotion (2x)</translation>
+-    </message>
+-    <message>
+-        <source>Yadif</source>
+-        <translation type="vanished">Yadif</translation>
+-    </message>
+-    <message>
+-        <source>Yadif (2x)</source>
+-        <translation type="vanished">Yadif (2x)</translation>
+-    </message>
+-    <message>
+-        <source>Bob (2x)</source>
+-        <translation type="vanished">Bob (2x)</translation>
+-    </message>
+-    <message>
+-        <source>One field</source>
+-        <translation type="vanished">One Field</translation>
+-    </message>
+-    <message>
+-        <source>Interlaced (2x)</source>
+-        <translation type="vanished">Interlaced (2x)</translation>
+-    </message>
+-    <message>
+-        <source>Bob (2x, HW)</source>
+-        <translation type="vanished">Bob (2x, HW)</translation>
+-    </message>
+-    <message>
+-        <source>This deinterlacer attempts to synchronize with interlaced displays whose size and refresh rate exactly match the video source. It has low CPU requirements.</source>
+-        <translation type="vanished">This deinterlacer attempts to synchronize with interlaced displays whose size and refresh rate exactly match the video source. It has low CPU requirements.</translation>
+-    </message>
+-    <message>
+-        <source>High Quality</source>
+-        <comment>Sample: high quality</comment>
+-        <translation type="vanished">High Quality</translation>
+-    </message>
+-    <message>
+-        <source>Normal</source>
+-        <comment>Sample: average quality</comment>
+-        <translation type="vanished">Normal</translation>
+-    </message>
+-    <message>
+-        <source>Slim</source>
+-        <comment>Sample: low CPU usage</comment>
+-        <translation type="vanished">Slim</translation>
+-    </message>
+-    <message>
+-        <source>VDPAU High Quality</source>
+-        <comment>Sample: VDPAU high quality</comment>
+-        <translation type="vanished">VDPAU High Quality</translation>
+-    </message>
+-    <message>
+-        <source>VDPAU Normal</source>
+-        <comment>Sample: VDPAU average quality</comment>
+-        <translation type="vanished">VDPAU Normal</translation>
+-    </message>
+-    <message>
+-        <source>VDPAU Slim</source>
+-        <comment>Sample: VDPAU low power GPU</comment>
+-        <translation type="vanished">VDPAU Slim</translation>
+-    </message>
+-    <message>
+-        <source>MediaCodec Normal</source>
+-        <comment>Sample: MediaCodec Normal</comment>
+-        <translation type="vanished">MediaCodec Normal</translation>
+-    </message>
+-    <message>
+-        <source>VAAPI2 Normal</source>
+-        <comment>Sample: VAAPI2 Normal</comment>
+-        <translation type="vanished">VAAPI2 Normal</translation>
+-    </message>
+-    <message>
+-        <source>Video rendering method</source>
+-        <translation type="vanished">Video Rendering Method</translation>
+-    </message>
+-    <message>
+-        <source>Render video offscreen. Used internally.</source>
+-        <translation type="vanished">Render video offscreen. Used internally.</translation>
+-    </message>
+-    <message>
+-        <source>Use X11 pixel copy to render video. This is not recommended if any other option is available. The video will not be scaled to fit the screen. This will work with all X11 servers, local and remote.</source>
+-        <translation type="vanished">Use X11 pixel copy to render video. This is not recommended if any other option is available. The video will not be scaled to fit the screen. This will work with all X11 servers, local and remote.</translation>
+-    </message>
+-    <message>
+-        <source>Use X11 shared memory pixel transfer to render video. This is only recommended over the X11 pixel copy renderer. The video will not be scaled to fit the screen. This works with most local X11 servers.</source>
+-        <translation type="vanished">Use X11 shared memory pixel transfer to render video. This is only recommended over the X11 pixel copy renderer. The video will not be scaled to fit the screen. This works with most local X11 servers.</translation>
+-    </message>
+-    <message>
+-        <source>This is the standard video renderer for X11 systems. It uses XVideo hardware assist for scaling, color conversion. If the hardware offers picture controls the renderer supports them.</source>
+-        <translation type="vanished">This is the standard video renderer for X11 systems. It uses XVideo hardware assist for scaling, color conversion. If the hardware offers picture controls the renderer supports them.</translation>
+-    </message>
+-    <message>
+-        <source>Windows video renderer based on Direct3D. Requires video card compatible with Direct3D 9. This is the preferred renderer for current Windows systems.</source>
+-        <translation type="vanished">Windows video renderer based on Direct3D. Requires video card compatible with Direct3D 9. This is the preferred renderer for current Windows systems.</translation>
+-    </message>
+-    <message>
+-        <source>VAAPI acceleration</source>
+-        <translation type="vanished">VAAPI Acceleration</translation>
+-    </message>
+-    <message>
+-        <source>Windows hardware acceleration</source>
+-        <translation type="vanished">Windows Hardware Acceleration</translation>
+-    </message>
+-    <message>
+-        <source>OpenGL Normal</source>
+-        <comment>Sample: OpenGL medium quality</comment>
+-        <translation type="obsolete">OpenGL Normal</translation>
+-    </message>
+-    <message>
+-        <source>VDPAU Normal</source>
+-        <comment>Sample: VDPAU medium quality</comment>
+-        <translation type="obsolete">VDPAU Normal</translation>
+-    </message>
+-    <message>
+-        <source>Mac VDA hardware acceleration</source>
+-        <translation type="vanished">Mac VDA Hardware Acceleration</translation>
+-    </message>
+-    <message>
+-        <source>Android MediaCodec decoder</source>
+-        <translation type="vanished">Android MediaCodec Decoder</translation>
+-    </message>
+-    <message>
+-        <source>VAAPI2 acceleration</source>
+-        <translation type="vanished">VAAPI2 Acceleration</translation>
+-    </message>
+-    <message>
+-        <source>Processing method used to decode video.</source>
+-        <translation type="vanished">Processing method used to decode video.</translation>
+-    </message>
+-    <message>
+-        <source>DXVA2 will use the graphics hardware to accelerate video decoding and playback (requires Windows Vista or later).</source>
+-        <translation type="vanished">DXVA2 will use the graphics hardware to accelerate video decoding and playback (requires Windows Vista or later).</translation>
+-    </message>
+-    <message>
+-        <source>VDA will attempt to use the graphics hardware to accelerate video decoding. (H264 only, requires Mac OS 10.6.3)</source>
+-        <translation type="vanished">VDA will attempt to use the graphics hardware to accelerate video decoding. (H264 only, requires Mac OS 10.6.3)</translation>
+-    </message>
+-    <message>
+-        <source>Openmax will use the graphics hardware to accelerate video decoding on Raspberry Pi. </source>
+-        <translation type="vanished">Openmax will use the graphics hardware to accelerate video decoding on Raspberry Pi. </translation>
+-    </message>
+-    <message>
+-        <source>Mediacodec will use the graphics hardware to accelerate video decoding on Android. </source>
+-        <translation type="vanished">Mediacodec will use the graphics hardware to accelerate video decoding on Android.</translation>
+-    </message>
+-    <message>
+-        <source>VAAPI2 is a new implementation of VAAPI to will use the graphics hardware to accelerate video decoding on Intel CPUs. </source>
+-        <translation type="vanished">VAAPI2 is a new implementation of VAAPI to will use the graphics hardware to accelerate video decoding on Intel CPUs.</translation>
+-    </message>
+-    <message>
+-        <source>Linear blend (HW-GL)</source>
+-        <translation type="vanished">Linear Blend (HW-GL)</translation>
+-    </message>
+-    <message>
+-        <source>One field (HW-GL)</source>
+-        <translation type="vanished">One Field (HW-GL)</translation>
+-    </message>
+-    <message>
+-        <source>Linear blend (2x, HW-GL)</source>
+-        <translation type="vanished">Linear Blend (2x, HW-GL)</translation>
+-    </message>
+-    <message>
+-        <source>One Field (1x, HW)</source>
+-        <translation type="vanished">One Field (1x, HW)</translation>
+-    </message>
+-    <message>
+-        <source>Temporal (1x, HW)</source>
+-        <translation type="vanished">Temporal (1x, HW)</translation>
+-    </message>
+-    <message>
+-        <source>Temporal (2x, HW)</source>
+-        <translation type="vanished">Temporal (2x, HW)</translation>
+-    </message>
+-    <message>
+-        <source>Advanced (1x, HW)</source>
+-        <translation type="vanished">Advanced (1x, HW)</translation>
+-    </message>
+-    <message>
+-        <source>Advanced (2x, HW)</source>
+-        <translation type="vanished">Advanced (2x, HW)</translation>
+-    </message>
+-    <message>
+-        <source>Advanced (HW)</source>
+-        <translation type="vanished">Advanced (HW)</translation>
+-    </message>
+-    <message>
+-        <source>Fast (HW)</source>
+-        <translation type="vanished">Fast (HW)</translation>
+-    </message>
+-    <message>
+-        <source>Line double (HW)</source>
+-        <translation type="vanished">Line Double (HW)</translation>
+-    </message>
+-    <message>
+-        <source>VDA High Quality</source>
+-        <comment>Sample: VDA high quality</comment>
+-        <translation type="vanished">VDA High Quality</translation>
+-    </message>
+-    <message>
+-        <source>VDA Normal</source>
+-        <comment>Sample: VDA average quality</comment>
+-        <translation type="vanished">VDA Normal</translation>
+-    </message>
+-    <message>
+-        <source>VDA Slim</source>
+-        <comment>Sample: VDA low power GPU</comment>
+-        <translation type="vanished">VDA Slim</translation>
+-    </message>
+-    <message>
+-        <source>OpenGL High Quality</source>
+-        <comment>Sample: OpenGL high quality</comment>
+-        <translation type="vanished">OpenGL High Quality</translation>
+-    </message>
+-    <message>
+-        <source>OpenGL Normal</source>
+-        <comment>Sample: OpenGL average quality</comment>
+-        <translation type="vanished">OpenGL Normal</translation>
+-    </message>
+-    <message>
+-        <source>OpenGL Slim</source>
+-        <comment>Sample: OpenGL low power GPU</comment>
+-        <translation type="vanished">OpenGL Slim</translation>
+-    </message>
+-    <message>
+-        <source>VAAPI Normal</source>
+-        <comment>Sample: VAAPI average quality</comment>
+-        <translation type="vanished">VAAPI Normal</translation>
+-    </message>
+-    <message>
+-        <source>OpenMAX High Quality</source>
+-        <comment>Sample: OpenMAX High Quality</comment>
+-        <translation type="vanished">OpenMAX High Quality</translation>
+-    </message>
+-    <message>
+-        <source>OpenMAX Normal</source>
+-        <comment>Sample: OpenMAX Normal</comment>
+-        <translation type="vanished">OpenMAX Normal</translation>
+-    </message>
+-    <message>
+-        <source>Video is converted to an intermediate format by the CPU (UYVY) before OpenGL is used for color conversion, scaling, picture controls and optionally deinterlacing. Processing is balanced between the CPUand GPU.</source>
+-        <translation type="vanished">Video is converted to an intermediate format by the CPU (UYVY) before OpenGL is used for color conversion, scaling, picture controls and optionally deinterlacing. Processing is balanced between the CPU and GPU.</translation>
+-    </message>
+-    <message>
+-        <source>This is the only video renderer for NVidia VDPAU decoding.</source>
+-        <translation type="vanished">This is the only video renderer for NVidia VDPAU decoding.</translation>
+-    </message>
+-    <message>
+-        <source>This video renderer uses VAAPI for video decoding and OpenGL for scaling and color conversion.</source>
+-        <translation type="vanished">This video renderer uses VAAPI for video decoding and OpenGL for scaling and color conversion.</translation>
+-    </message>
+-    <message>
+-        <source>This deinterlacer requires the display to be capable of twice the frame rate as the source video.</source>
+-        <translation type="vanished">This deinterlacer requires the display to be capable of twice the frame rate as the source video.</translation>
+-    </message>
+-    <message>
+-        <source>Perform no deinterlacing.</source>
+-        <translation type="vanished">Perform no deinterlacing.</translation>
+-    </message>
+-    <message>
+-        <source>Use this with an interlaced display whose resolution exactly matches the video size. This is incompatible with MythTV zoom modes.</source>
+-        <translation type="vanished">Use this with an interlaced display whose resolution exactly matches the video size. This is incompatible with MythTV zoom modes.</translation>
+-    </message>
+-    <message>
+-        <source>Shows only one of the two fields in the frame. This looks good when displaying a high motion 1080i video on a 720p display.</source>
+-        <translation type="vanished">Shows only one of the two fields in the frame. This looks good when displaying a high motion 1080i video on a 720p display.</translation>
+-    </message>
+-    <message>
+-        <source>Shows one field of the frame followed by the other field displaced vertically.</source>
+-        <translation type="vanished">Shows one field of the frame followed by the other field displaced vertically.</translation>
+-    </message>
+-    <message>
+-        <source>Blends the odd and even fields linearly into one frame.</source>
+-        <translation type="vanished">Blends the odd and even fields linearly into one frame.</translation>
+-    </message>
+-    <message>
+-        <source>This filter disables deinterlacing when the two fields are similar, and performs linear deinterlacing otherwise.</source>
+-        <translation type="vanished">This filter disables deinterlacing when the two fields are similar, and performs linear deinterlacing otherwise.</translation>
+-    </message>
+-    <message>
+-        <source>(Hardware Accelerated)</source>
+-        <translation type="vanished">(Hardware Accelerated)</translation>
+-    </message>
+-    <message>
+-        <source>This deinterlacer uses several fields to reduce motion blur. It has increased CPU requirements.</source>
+-        <translation type="vanished">This deinterlacer uses several fields to reduce motion blur. It has increased CPU requirements.</translation>
+-    </message>
+-    <message>
+-        <source>This deinterlacer uses several fields to reduce motion blur. </source>
+-        <translation type="vanished">This deinterlacer uses several fields to reduce motion blur. </translation>
+-    </message>
+-    <message>
+-        <source>This deinterlacer uses multiple fields to reduce motion blur and smooth edges. </source>
+-        <translation type="vanished">This deinterlacer uses multiple fields to reduce motion blur and smooth edges. </translation>
+-    </message>
+-    <message>
+-        <source>Use the most advanced hardware deinterlacing algorithm available. </source>
+-        <translation type="vanished">Use the most advanced hardware deinterlacing algorithm available.</translation>
+-    </message>
+-    <message>
+-        <source>Use the weave deinterlacing algorithm. </source>
+-        <translation type="vanished">Use the weave deinterlacing algorithm.</translation>
+-    </message>
+-    <message>
+-        <source>Use the motion adaptive deinterlacing algorithm. </source>
+-        <translation type="vanished">Use the motion adaptive deinterlacing algorithm.</translation>
+-    </message>
+-    <message>
+-        <source>Use the motion compensated deinterlacing algorithm. </source>
+-        <translation type="vanished">Use the motion compensated deinterlacing algorithm.</translation>
+-    </message>
+-    <message>
+-        <source>&apos;%1&apos; has not been documented yet.</source>
+-        <translation type="vanished">&apos;%1&apos; has not been documented yet.</translation>
+-    </message>
+-    <message>
+-        <source>OSD rendering method</source>
+-        <translation type="vanished">OSD Rendering Method</translation>
+-    </message>
+-    <message>
+-        <source>Render the OSD using the XVideo chromakey feature.This renderer does not alpha blend but is the fastest OSD renderer for XVideo.</source>
+-        <translation type="vanished">Render the OSD using the XVideo chromakey feature.This renderer does not alpha blend but is the fastest OSD renderer for XVideo.</translation>
+-    </message>
+-    <message>
+-        <source>Note: nVidia hardware after the 5xxx series does not have XVideo chromakey support.</source>
+-        <translation type="vanished">Note: nVidia hardware after the 5xxx series does not have XVideo chromakey support.</translation>
+-    </message>
+-    <message>
+-        <source>Software OSD rendering uses your CPU to alpha blend the OSD.</source>
+-        <translation type="vanished">Software OSD rendering uses your CPU to alpha blend the OSD.</translation>
+-    </message>
+-    <message>
+-        <source>Uses OpenGL to alpha blend the OSD onto the video.</source>
+-        <translation type="vanished">Uses OpenGL to alpha blend the OSD onto the video.</translation>
+-    </message>
+-    <message>
+-        <source>Uses OpenGL in a separate thread to overlay the OSD onto the video.</source>
+-        <translation type="vanished">Use OpenGL in a separate thread to overlay the OSD onto the video.</translation>
+-    </message>
+-    <message>
+-        <source>Uses OpenMAX to alpha blend the OSD onto the video.</source>
+-        <translation type="vanished">Uses OpenMAX to alpha blend the OSD onto the video.</translation>
+-    </message>
+-    <message>
+-        <source>No 3D</source>
+-        <translation type="vanished">No 3D</translation>
+-    </message>
+-    <message>
+-        <source>3D Side by Side</source>
+-        <translation type="vanished">3D Side by Side</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/videoouttypes.h" line="176"/>
+         <source>Discard 3D Side by Side</source>
+         <translation>Discard 3D Side by Side</translation>
+     </message>
+-    <message>
+-        <source>3D Top and Bottom</source>
+-        <translation type="vanished">3D Top and Bottom</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/videoouttypes.h" line="177"/>
+         <source>Discard 3D Top and Bottom</source>
+@@ -19783,10 +18293,6 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
+         <source>Interlaced</source>
+         <translation>Interlaced</translation>
+     </message>
+-    <message>
+-        <source>Interlaced (Normal)</source>
+-        <translation type="vanished">Interlaced (Normal)</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/videoouttypes.h" line="206"/>
+         <source>Interlaced (Reversed)</source>
+@@ -19800,43 +18306,27 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
      <message>
          <location filename="../libs/libmythtv/videoouttypes.h" line="151"/>
          <source>Disabled</source>
@@ -2680,11 +4714,27 @@ index e4d869578b..a960c92743 100644
          <location filename="../libs/libmythtv/videoouttypes.h" line="206"/>
          <source>Interlaced (Reversed, Forced)</source>
 -        <translation type="unfinished"></translation>
+-    </message>
+-    <message>
+-        <source>Top Left</source>
+-        <translation type="vanished">Top Left</translation>
+-    </message>
+-    <message>
+-        <source>Bottom Left</source>
+-        <translation type="vanished">Bottom Left</translation>
+-    </message>
+-    <message>
+-        <source>Top Right</source>
+-        <translation type="vanished">Top Right</translation>
+-    </message>
+-    <message>
+-        <source>Bottom Right</source>
+-        <translation type="vanished">Bottom Right</translation>
 +        <translation>Interlaced (Reversed, Forced)</translation>
      </message>
      <message>
-         <source>Top Left</source>
-@@ -19866,7 +19872,7 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
+         <location filename="../libs/libmythtv/videoouttypes.h" line="227"/>
+@@ -19866,7 +18356,7 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
      <message>
          <location filename="../libs/libmythtv/videoouttypes.h" line="292"/>
          <source>Range</source>
@@ -2693,7 +4743,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/videoouttypes.h" line="242"/>
-@@ -19876,12 +19882,12 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
+@@ -19876,12 +18366,12 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
      <message>
          <location filename="../libs/libmythtv/videoouttypes.h" line="174"/>
          <source>Auto 3D</source>
@@ -2708,7 +4758,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/videoouttypes.h" line="269"/>
-@@ -19896,22 +19902,22 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
+@@ -19896,22 +18386,22 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
      <message>
          <location filename="../libs/libmythtv/videoouttypes.h" line="271"/>
          <source>H.Stretch</source>
@@ -2735,16 +4785,62 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/videoouttypes.h" line="275"/>
-@@ -19926,7 +19932,7 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
+@@ -19926,11 +18416,7 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
      <message>
          <location filename="../libs/libmythtv/videoouttypes.h" line="361"/>
          <source>Zoom %1x%2 @ (%3,%4)</source>
 -        <translation type="unfinished">Zoom %1x%2 @ (%3,%4)</translation>
+-    </message>
+-    <message>
+-        <source>Studio Levels</source>
+-        <translation type="vanished">Studio Levels</translation>
 +        <translation>Zoom %1x%2 @ (%3,%4)</translation>
      </message>
      <message>
-         <source>Studio Levels</source>
-@@ -20149,7 +20155,7 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
+         <location filename="../libs/libmythtv/videoouttypes.h" line="293"/>
+@@ -19964,10 +18450,6 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
+         <source>Use default unless this source uses a different frequency table than the system wide table defined in the General settings.</source>
+         <translation>Use default unless this source uses a different frequency table than the system wide table defined in the General settings.</translation>
+     </message>
+-    <message>
+-        <source>User ID</source>
+-        <translation type="vanished">User ID</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/videosource.cpp" line="676"/>
+         <source>Use only the transmitted guide data.</source>
+@@ -19978,10 +18460,6 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
+         <source>Do not configure a grabber</source>
+         <translation>Do Not Configure a Grabber</translation>
+     </message>
+-    <message>
+-        <source>North America (SchedulesDirect.org) (Internal)</source>
+-        <translation type="vanished">North America (SchedulesDirect.org) (Internal)</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/videosource.cpp" line="181"/>
+         <source>Maximum number of simultaneous recordings MythTV will attempt using this device.  If set to a value other than 1, MythTV can sometimes record multiple programs on the same multiplex or overlapping copies of the same program on a single channel.</source>
+@@ -20058,19 +18536,11 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
+         <source>Warning: already in use</source>
+         <translation>Warning: Already in Use</translation>
+     </message>
+-    <message>
+-        <source>Subtype</source>
+-        <translation type="vanished">Subtype</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/videosource.cpp" line="1204"/>
+         <source>Frontend ID</source>
+         <translation>Frontend ID</translation>
+     </message>
+-    <message>
+-        <source>Wait for SEQ start header.</source>
+-        <translation type="vanished">Wait for SEQ Start Header</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/videosource.cpp" line="1234"/>
+         <source>Open DVB card on demand</source>
+@@ -20149,7 +18619,7 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="2849"/>
          <source>This name is displayed on screen when Live TV begins and in various other places.  Make sure the last two characters are unique for each input or use a slash (&apos;/&apos;) to designate the unique portion.</source>
@@ -2753,7 +4849,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="2946"/>
-@@ -20164,22 +20170,22 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
+@@ -20164,22 +18634,22 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="73"/>
          <source>Select a video source that is connected to one or more capture cards. Default is the video source selected in the Channel Editor page.</source>
@@ -2780,7 +4876,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="448"/>
-@@ -20190,32 +20196,32 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
+@@ -20190,32 +18660,32 @@ Most DVB-C transports transmit at 6900000 or 6875000 symbols per second.</source
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="462"/>
          <source>Bouquet ID</source>
@@ -2819,7 +4915,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="641"/>
-@@ -20235,27 +20241,27 @@ Your grabber does not provide channel numbers, so you have to set them manually.
+@@ -20235,27 +18705,27 @@ Your grabber does not provide channel numbers, so you have to set them manually.
          <location filename="../libs/libmythtv/videosource.cpp" line="1192"/>
          <location filename="../libs/libmythtv/videosource.cpp" line="2832"/>
          <source>Delivery system</source>
@@ -2852,7 +4948,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="1305"/>
-@@ -20305,12 +20311,12 @@ Your grabber does not provide channel numbers, so you have to set them manually.
+@@ -20305,12 +18775,12 @@ Your grabber does not provide channel numbers, so you have to set them manually.
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="1447"/>
          <source>Use HDHomeRun for active EIT scan</source>
@@ -2867,7 +4963,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="1588"/>
-@@ -20355,7 +20361,7 @@ Your grabber does not provide channel numbers, so you have to set them manually.
+@@ -20355,7 +18825,7 @@ Your grabber does not provide channel numbers, so you have to set them manually.
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="2747"/>
          <source>Sat&gt;IP networked tuner</source>
@@ -2876,7 +4972,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="2757"/>
-@@ -20370,22 +20376,22 @@ Your grabber does not provide channel numbers, so you have to set them manually.
+@@ -20370,22 +18840,22 @@ Your grabber does not provide channel numbers, so you have to set them manually.
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="2833"/>
          <source>This shows the delivery system (modulation), for instance DVB-T2, that you have selected when you configured the capture card. This must be the same as the modulation used by the video source. </source>
@@ -2903,16 +4999,100 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="2879"/>
-@@ -20723,7 +20729,7 @@ Your grabber does not provide channel numbers, so you have to set them manually.
+@@ -20582,10 +19052,6 @@ Your grabber does not provide channel numbers, so you have to set them manually.
+         <source>Use DVB card for active EIT scan</source>
+         <translation>Use DVB Card for Active EIT Scan</translation>
+     </message>
+-    <message>
+-        <source>If enabled, activate active scanning for program data (EIT). When this option is enabled the DVB card is constantly in-use.</source>
+-        <translation type="vanished">If enabled, activate active scanning for program data (EIT). When this option is enabled the DVB card is constantly in-use.</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/videosource.cpp" line="1264"/>
+         <source>DVB tuning delay (ms)</source>
+@@ -20616,19 +19082,11 @@ Your grabber does not provide channel numbers, so you have to set them manually.
+         <source>Device IP or ID, tuner number and tuner type of available VBox devices.</source>
+         <translation>Device IP or ID, tuner number and tuner type of available VBox devices.</translation>
+     </message>
+-    <message>
+-        <source>Use HD HomeRun for active EIT scan</source>
+-        <translation type="vanished">Use HD HomeRun for Active EIT Scan</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/videosource.cpp" line="200"/>
+         <source>Schedule all virtual inputs on this device as a group.  This is more efficient than scheduling each input individually.  Additional, virtual inputs will be automatically added as needed to fulfill the recording load.</source>
+         <translation>Schedule all virtual inputs on this device as a group. This is more efficient than scheduling each input individually. Additional, virtual inputs will be automatically added as needed to fulfill the recording load.</translation>
+     </message>
+-    <message>
+-        <source>If enabled, activate active scanning for program data (EIT). When this option is enabled the HD HomeRun is constantly in-use.</source>
+-        <translation type="vanished">If enabled, activate active scanning for program data (EIT). When this option is enabled the HD HomeRun is constantly in-use.</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/videosource.cpp" line="2452"/>
+         <source>V4L2 encoder devices (multirec capable)</source>
+@@ -20664,14 +19122,6 @@ Your grabber does not provide channel numbers, so you have to set them manually.
+         <source>Input name</source>
+         <translation>Input Name</translation>
+     </message>
+-    <message>
+-        <source>Display name (optional)</source>
+-        <translation type="vanished">Display Name (optional)</translation>
+-    </message>
+-    <message>
+-        <source>This name is displayed on screen when Live TV begins and when changing the selected input or card. If you use this, make sure the information is unique for each input.</source>
+-        <translation type="vanished">This name is displayed on screen when Live TV begins and when changing the selected input or card. If you use this, make sure the information is unique for each input.</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/videosource.cpp" line="2903"/>
+         <source>Input group</source>
+@@ -20702,14 +19152,6 @@ Your grabber does not provide channel numbers, so you have to set them manually.
+         <source>If there is more than one audio input, select which one to use.</source>
+         <translation>If there is more than one audio input, select which one to use.</translation>
+     </message>
+-    <message>
+-        <source>Data Direct lineup</source>
+-        <translation type="vanished">Data Direct Lineup</translation>
+-    </message>
+-    <message>
+-        <source>Retrieve Lineups</source>
+-        <translation type="vanished">Retrieve Lineups</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/videosource.h" line="221"/>
+         <source>Video source name</source>
+@@ -20723,19 +19165,7 @@ Your grabber does not provide channel numbers, so you have to set them manually.
      <message>
          <location filename="../libs/libmythtv/videosource.h" line="887"/>
          <source>This channel is shown when &apos;Watch TV&apos; is selected on the main menu. It is updated on every Live TV channel change. When the value is not valid a suitable default will be chosen.</source>
 -        <translation type="unfinished"></translation>
+-    </message>
+-    <message>
+-        <source>Starting Live TV channel.</source>
+-        <translation type="vanished">Starting Live TV Channel</translation>
+-    </message>
+-    <message>
+-        <source>This is updated on every successful channel change.</source>
+-        <translation type="vanished">This is updated on every successful channel change.</translation>
+-    </message>
+-    <message>
+-        <source>The following programs will be recorded instead:</source>
+-        <translation type="vanished">The following programs will be recorded instead:</translation>
 +        <translation>This channel is shown when &apos;Watch TV&apos; is selected on the main menu. It is updated on every Live TV channel change. When the value is not valid a suitable default will be chosen.</translation>
      </message>
      <message>
-         <source>Starting Live TV channel.</source>
-@@ -21529,7 +21535,7 @@ Your grabber does not provide channel numbers, so you have to set them manually.
+         <location filename="../programs/mythfrontend/viewschedulediff.cpp" line="130"/>
+@@ -21213,10 +19643,6 @@ Your grabber does not provide channel numbers, so you have to set them manually.
+         <source>Run guide data program at time suggested by the grabber.</source>
+         <translation>Run guide data program at time suggested by the grabber.</translation>
+     </message>
+-    <message>
+-        <source>If enabled, allow a DataDirect guide data provider to specify the next download time in order to distribute load on their servers. Guide data program execution start/end times are also ignored.</source>
+-        <translation type="vanished">If enabled, allow a DataDirect guide data provider to specify the next download time in order to distribute load on their servers. Guide data program execution start/end times are also ignored.</translation>
+-    </message>
+     <message>
+         <location filename="../programs/mythtv-setup/backendsettings.cpp" line="851"/>
+         <source>Guide data program</source>
+@@ -21529,7 +19955,7 @@ Your grabber does not provide channel numbers, so you have to set them manually.
      <message>
          <location filename="../programs/mythtv-setup/backendsettings.cpp" line="841"/>
          <source>If enabled, allow a guide data provider to specify the next download time in order to distribute load on their servers. Guide data program execution start/end times are also ignored.</source>
@@ -2921,7 +5101,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythtv-setup/backendsettings.cpp" line="934"/>
-@@ -21610,12 +21616,12 @@ Your grabber does not provide channel numbers, so you have to set them manually.
+@@ -21610,21 +20036,17 @@ Your grabber does not provide channel numbers, so you have to set them manually.
      <message>
          <location filename="../programs/mythtv-setup/checksetup.cpp" line="207"/>
          <source>Card %1 (%2) No video source connected</source>
@@ -2932,12 +5112,13 @@ index e4d869578b..a960c92743 100644
          <location filename="../programs/mythtv-setup/checksetup.cpp" line="237"/>
          <source>Card %1 (%2) No visible channels found</source>
 -        <translation type="unfinished"></translation>
+-    </message>
+-    <message>
+-        <source>Card %1 (type %2) is set to start on channel %3, which does not exist.</source>
+-        <translation type="vanished">Card %1 (type %2) is set to start on channel %3, which does not exist.</translation>
 +        <translation>Card %1 (%2) No Visible Channels Found</translation>
      </message>
      <message>
-         <source>Card %1 (type %2) is set to start on channel %3, which does not exist.</source>
-@@ -21624,7 +21630,7 @@ Your grabber does not provide channel numbers, so you have to set them manually.
-     <message>
          <location filename="../programs/mythtv-setup/checksetup.cpp" line="271"/>
          <source>The display names for one or more inputs are not sufficiently unique.  They must be set and the last two characters must be unique because some themes use them to identify the input.</source>
 -        <translation type="unfinished"></translation>
@@ -2945,7 +5126,53 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythtv-setup/importicons.cpp" line="654"/>
-@@ -22389,7 +22395,7 @@ Your grabber does not provide channel numbers, so you have to set them manually.
+@@ -21773,34 +20195,6 @@ Your grabber does not provide channel numbers, so you have to set them manually.
+         <source>videos</source>
+         <translation>videos</translation>
+     </message>
+-    <message>
+-        <source>&gt;1Gbps</source>
+-        <translation type="vanished">&gt;1Gbps</translation>
+-    </message>
+-    <message>
+-        <source>%1Mbps</source>
+-        <translation type="vanished">%1Mbps</translation>
+-    </message>
+-    <message>
+-        <source>%1MHz</source>
+-        <translation type="vanished">%1MHz</translation>
+-    </message>
+-    <message>
+-        <source>%1kHz</source>
+-        <translation type="vanished">%1kHz</translation>
+-    </message>
+-    <message>
+-        <source>%1kbps</source>
+-        <translation type="vanished">%1kbps</translation>
+-    </message>
+-    <message>
+-        <source>%1bps</source>
+-        <translation type="vanished">%1bps</translation>
+-    </message>
+-    <message>
+-        <source>%1Hz</source>
+-        <translation type="vanished">%1Hz</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythbase/stringutil.cpp" line="362"/>
+         <source>%1 TB</source>
+@@ -22066,10 +20460,6 @@ Your grabber does not provide channel numbers, so you have to set them manually.
+         <source>Error opening audio device (%1)</source>
+         <translation>Error Opening Audio Device (%1)</translation>
+     </message>
+-    <message>
+-        <source>Failed to open stream (%1)</source>
+-        <translation type="vanished">Failed to Open Stream (%1)</translation>
+-    </message>
+     <message>
+         <location filename="../programs/mythfilldatabase/channeldata.cpp" line="88"/>
+         <source>Choose a channel name (any string, long version) </source>
+@@ -22389,7 +20779,7 @@ Your grabber does not provide channel numbers, so you have to set them manually.
      <message>
          <location filename="../programs/mythbackend/upnpcdsmusic.cpp" line="64"/>
          <source>Music</source>
@@ -2954,7 +5181,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythbackend/upnpcdsmusic.cpp" line="109"/>
-@@ -22421,123 +22427,124 @@ Your grabber does not provide channel numbers, so you have to set them manually.
+@@ -22421,123 +20811,124 @@ Your grabber does not provide channel numbers, so you have to set them manually.
      <message>
          <location filename="../libs/libmythtv/channelscan/inputselectorsetting.cpp" line="46"/>
          <source>Select a capture card from the capture cards that are connected to the currently selected video source.</source>
@@ -3103,7 +5330,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -22647,12 +22654,12 @@ Connect video source &apos;%1&apos; to a capture card in the &apos;Input Connect
+@@ -22647,12 +21038,12 @@ Connect video source &apos;%1&apos; to a capture card in the &apos;Input Connect
      <message>
          <location filename="../libs/libmythtv/restoredata.cpp" line="105"/>
          <source>Restore Data</source>
@@ -3118,7 +5345,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -22660,32 +22667,32 @@ Connect video source &apos;%1&apos; to a capture card in the &apos;Input Connect
+@@ -22660,32 +21051,32 @@ Connect video source &apos;%1&apos; to a capture card in the &apos;Input Connect
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="4079"/>
          <source>Friendly name</source>
@@ -3157,7 +5384,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -22693,12 +22700,12 @@ Connect video source &apos;%1&apos; to a capture card in the &apos;Input Connect
+@@ -22693,12 +21084,12 @@ Connect video source &apos;%1&apos; to a capture card in the &apos;Input Connect
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="4232"/>
          <source>Device ID</source>
@@ -3172,7 +5399,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -22706,17 +22713,17 @@ Connect video source &apos;%1&apos; to a capture card in the &apos;Input Connect
+@@ -22706,17 +21097,17 @@ Connect video source &apos;%1&apos; to a capture card in the &apos;Input Connect
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="4162"/>
          <source>Available devices</source>
@@ -3193,7 +5420,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -22724,7 +22731,7 @@ Connect video source &apos;%1&apos; to a capture card in the &apos;Input Connect
+@@ -22724,7 +21115,7 @@ Connect video source &apos;%1&apos; to a capture card in the &apos;Input Connect
      <message>
          <location filename="../libs/libmythtv/recorders/satipsignalmonitor.cpp" line="83"/>
          <source>Error: stream handler died</source>
@@ -3202,7 +5429,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -22856,7 +22863,7 @@ Connect video source &apos;%1&apos; to a capture card in the &apos;Input Connect
+@@ -22856,7 +21247,7 @@ Connect video source &apos;%1&apos; to a capture card in the &apos;Input Connect
      <message>
          <location filename="../libs/libmythtv/channelscan/scanwizardconfig.cpp" line="61"/>
          <source>Channel Scan</source>
@@ -3211,7 +5438,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -23362,9 +23369,9 @@ is located in %2</translation>
+@@ -23362,9 +21753,9 @@ is located in %2</translation>
          <source>%n (is) Deleted and consume(s) %1
  </source>
          <translation>
@@ -3223,7 +5450,18 @@ index e4d869578b..a960c92743 100644
  </numerusform>
          </translation>
      </message>
-@@ -23405,12 +23412,12 @@ is located in %2</translation>
+@@ -23387,10 +21778,6 @@ is located in %2</translation>
+         <source>Schedule Status</source>
+         <translation>Schedule Status</translation>
+     </message>
+-    <message>
+-        <source>Log Entries</source>
+-        <translation type="vanished">Log Entries</translation>
+-    </message>
+     <message>
+         <location filename="../programs/mythfrontend/statusbox.cpp" line="123"/>
+         <location filename="../programs/mythfrontend/statusbox.cpp" line="264"/>
+@@ -23405,12 +21792,12 @@ is located in %2</translation>
      <message>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="127"/>
          <source>Video decoders</source>
@@ -3238,16 +5476,28 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="139"/>
-@@ -23421,7 +23428,7 @@ is located in %2</translation>
+@@ -23421,19 +21808,7 @@ is located in %2</translation>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="143"/>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="319"/>
          <source>AutoExpire List</source>
 -        <translation>AutoExpire List</translation>
+-    </message>
+-    <message>
+-        <source>Acknowledge all log entries at this priority level or lower?</source>
+-        <translation type="vanished">Acknowledge all log entries at this priority level or lower?</translation>
+-    </message>
+-    <message>
+-        <source>Setting priority level to %1</source>
+-        <translation type="vanished">Setting priority level to %1</translation>
+-    </message>
+-    <message>
+-        <source>Acknowledge this log entry?</source>
+-        <translation type="vanished">Acknowledge this log entry?</translation>
 +        <translation>Auto-Expire List</translation>
      </message>
      <message>
-         <source>Acknowledge all log entries at this priority level or lower?</source>
-@@ -23474,7 +23481,7 @@ is located in %2</translation>
+         <location filename="../programs/mythfrontend/statusbox.cpp" line="270"/>
+@@ -23474,7 +21849,7 @@ is located in %2</translation>
      <message>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="325"/>
          <source>AutoExpire Actions:</source>
@@ -3256,7 +5506,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="335"/>
-@@ -23494,7 +23501,7 @@ is located in %2</translation>
+@@ -23494,7 +21869,7 @@ is located in %2</translation>
      <message>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="344"/>
          <source>Disable AutoExpire</source>
@@ -3265,7 +5515,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="454"/>
-@@ -23514,27 +23521,27 @@ is located in %2</translation>
+@@ -23514,27 +21889,27 @@ is located in %2</translation>
      <message>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="490"/>
          <source>Started:   %1</source>
@@ -3298,7 +5548,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="522"/>
-@@ -23549,12 +23556,12 @@ is located in %2</translation>
+@@ -23549,16 +21924,12 @@ is located in %2</translation>
      <message>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="538"/>
          <source>WARNING: is mythfilldatabase running?</source>
@@ -3309,11 +5559,15 @@ index e4d869578b..a960c92743 100644
          <location filename="../programs/mythfrontend/statusbox.cpp" line="1170"/>
          <source>Machine Status shows some operating system statistics of this machine and the MythTV server.</source>
 -        <translation type="unfinished"></translation>
+-    </message>
+-    <message>
+-        <source>DataDirect Status: </source>
+-        <translation type="vanished">DataDirect Status: </translation>
 +        <translation>Machine Status shows some operating system statistics of this machine and the MythTV server.</translation>
      </message>
      <message>
-         <source>DataDirect Status: </source>
-@@ -23744,37 +23751,37 @@ is located in %2</translation>
+         <location filename="../programs/mythfrontend/statusbox.cpp" line="548"/>
+@@ -23744,37 +22115,37 @@ is located in %2</translation>
      <message>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="1457"/>
          <source>Display information.</source>
@@ -3358,7 +5612,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="892"/>
-@@ -23784,7 +23791,7 @@ is located in %2</translation>
+@@ -23784,7 +22155,7 @@ is located in %2</translation>
      <message>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="135"/>
          <source>Rendering</source>
@@ -3367,7 +5621,22 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="934"/>
-@@ -23837,43 +23844,43 @@ is located in %2</translation>
+@@ -23816,14 +22187,6 @@ is located in %2</translation>
+         <source>Job Queue is currently empty.</source>
+         <translation>Job Queue is currently empty.</translation>
+     </message>
+-    <message>
+-        <source>Machine Status shows some operating system statistics of this machine</source>
+-        <translation type="vanished">Machine Status shows some operating system statistics of this machine.</translation>
+-    </message>
+-    <message>
+-        <source>and the MythTV server</source>
+-        <translation type="vanished">and the MythTV server</translation>
+-    </message>
+     <message>
+         <location filename="../programs/mythfrontend/statusbox.cpp" line="1181"/>
+         <source>System:</source>
+@@ -23837,43 +22200,43 @@ is located in %2</translation>
      <message>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="1190"/>
          <source>System time</source>
@@ -3419,7 +5688,22 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="1249"/>
-@@ -23909,7 +23916,7 @@ is located in %2</translation>
+@@ -23881,14 +22244,6 @@ is located in %2</translation>
+         <source>Load</source>
+         <translation>Load</translation>
+     </message>
+-    <message>
+-        <source>unknown</source>
+-        <translation type="vanished">unknown</translation>
+-    </message>
+-    <message>
+-        <source>failed</source>
+-        <translation type="vanished">failed</translation>
+-    </message>
+     <message>
+         <location filename="../programs/mythfrontend/statusbox.cpp" line="1272"/>
+         <location filename="../programs/mythfrontend/statusbox.cpp" line="1345"/>
+@@ -23909,7 +22264,7 @@ is located in %2</translation>
      <message>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="1301"/>
          <source>IP</source>
@@ -3428,7 +5712,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="1394"/>
-@@ -23934,26 +23941,26 @@ is located in %2</translation>
+@@ -23934,26 +22289,26 @@ is located in %2</translation>
      <message>
          <location filename="../programs/mythfrontend/statusbox.cpp" line="1434"/>
          <source>Available hardware decoders for video playback.</source>
@@ -3460,7 +5744,7 @@ index e4d869578b..a960c92743 100644
  </numerusform>
          </translation>
      </message>
-@@ -24049,7 +24056,7 @@ Directory from Storage Group?</translation>
+@@ -24049,7 +22404,7 @@ Directory from Storage Group?</translation>
      <message>
          <location filename="../libs/libmyth/storagegroupeditor.cpp" line="478"/>
          <source>Enter the name of the new storage group</source>
@@ -3469,7 +5753,197 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmyth/storagegroupeditor.cpp" line="495"/>
-@@ -24757,12 +24764,12 @@ Do you wish to continue watching?</translation>
+@@ -24145,20 +22500,6 @@ Directory from Storage Group?</translation>
+         <source>Seek:</source>
+         <translation>Seek:</translation>
+     </message>
+-    <message numerus="yes">
+-        <source>Sorry, PBP only supports %n video stream(s)</source>
+-        <translation type="vanished">
+-            <numerusform>Sorry, PBP only supports %n video stream</numerusform>
+-            <numerusform>Sorry, PBP only supports %n video streams</numerusform>
+-        </translation>
+-    </message>
+-    <message numerus="yes">
+-        <source>Sorry, PIP only supports %n video stream(s)</source>
+-        <translation type="vanished">
+-            <numerusform>Sorry, PIP only supports %n video stream</numerusform>
+-            <numerusform>Sorry, PIP only supports %n video streams</numerusform>
+-        </translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="4916"/>
+         <source>Forward</source>
+@@ -24202,10 +22543,6 @@ Directory from Storage Group?</translation>
+         <source>Jump To</source>
+         <translation>Jump To</translation>
+     </message>
+-    <message>
+-        <source>Creating PBP</source>
+-        <translation type="vanished">Creating PBP</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="1420"/>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="1421"/>
+@@ -24218,76 +22555,12 @@ Directory from Storage Group?</translation>
+         <source>Are you sure you want to delete:</source>
+         <translation>Are you sure you want to delete:</translation>
+     </message>
+-    <message>
+-        <source>Creating PIP</source>
+-        <translation type="vanished">Creating PIP</translation>
+-    </message>
+-    <message>
+-        <source>Cannot create PBP</source>
+-        <translation type="vanished">Cannot create PBP</translation>
+-    </message>
+-    <message>
+-        <source>Cannot create PIP</source>
+-        <translation type="vanished">Cannot create PIP</translation>
+-    </message>
+-    <message>
+-        <source>Stopping PIP</source>
+-        <translation type="vanished">Stopping PIP</translation>
+-    </message>
+-    <message>
+-        <source>Stopping PBP</source>
+-        <translation type="vanished">Stopping PBP</translation>
+-    </message>
+-    <message>
+-        <source>Stopping all PIPs</source>
+-        <translation type="vanished">Stopping All PIPs</translation>
+-    </message>
+-    <message>
+-        <source>Stopping all PBPs</source>
+-        <translation type="vanished">Stopping All PBPs</translation>
+-    </message>
+-    <message>
+-        <source>Too many views to switch</source>
+-        <translation type="vanished">Too Many Views to Switch</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="4750"/>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="6238"/>
+         <source>Paused</source>
+         <translation>Paused</translation>
+     </message>
+-    <message>
+-        <source>Aux Paused</source>
+-        <translation type="vanished">Aux Paused</translation>
+-    </message>
+-    <message>
+-        <source>Speed 16X</source>
+-        <translation type="vanished">Speed 16X</translation>
+-    </message>
+-    <message>
+-        <source>Speed 8X</source>
+-        <translation type="vanished">Speed 8X</translation>
+-    </message>
+-    <message>
+-        <source>Speed 3X</source>
+-        <translation type="vanished">Speed 3X</translation>
+-    </message>
+-    <message>
+-        <source>Speed 2X</source>
+-        <translation type="vanished">Speed 2X</translation>
+-    </message>
+-    <message>
+-        <source>Speed 1/3X</source>
+-        <translation type="vanished">Speed 1/3X</translation>
+-    </message>
+-    <message>
+-        <source>Speed 1/8X</source>
+-        <translation type="vanished">Speed 1/8X</translation>
+-    </message>
+-    <message>
+-        <source>Speed 1/16X</source>
+-        <translation type="vanished">Speed 1/16X</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="5192"/>
+         <source>Forward %1X</source>
+@@ -24519,48 +22792,16 @@ Directory from Storage Group?</translation>
+         <source>Adjust Time Stretch</source>
+         <translation>Adjust Time Stretch</translation>
+     </message>
+-    <message>
+-        <source>Upmixer On</source>
+-        <translation type="vanished">Upmixer On</translation>
+-    </message>
+-    <message>
+-        <source>Upmixer Off</source>
+-        <translation type="vanished">Upmixer Off</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="8866"/>
+         <source>Adjust Subtitle Delay</source>
+         <translation>Adjust Subtitle Delay</translation>
+     </message>
+-    <message>
+-        <source>Subtitle Delay</source>
+-        <translation type="vanished">Subtitle Delay</translation>
+-    </message>
+-    <message>
+-        <source>Audio Sync</source>
+-        <translation type="vanished">Audio Sync</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="8772"/>
+         <source>Adjust Audio Sync</source>
+         <translation>Adjust Audio Sync</translation>
+     </message>
+-    <message>
+-        <source>Mute Off</source>
+-        <translation type="vanished">Mute Off</translation>
+-    </message>
+-    <message>
+-        <source>Mute On</source>
+-        <translation type="vanished">Mute On</translation>
+-    </message>
+-    <message>
+-        <source>Left Channel Muted</source>
+-        <translation type="vanished">Left Channel Muted</translation>
+-    </message>
+-    <message>
+-        <source>Right Channel Muted</source>
+-        <translation type="vanished">Right Channel Muted</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="7004"/>
+         <source>Sleep </source>
+@@ -24590,20 +22831,6 @@ Do you wish to continue watching?</translation>
+         <source>MythTV has been idle for %1 minutes and will exit in %d seconds. Are you still watching?</source>
+         <translation>MythTV has been idle for %1 minutes and will exit in %d seconds. Are you still watching?</translation>
+     </message>
+-    <message>
+-        <source>PiP</source>
+-        <comment>Picture-in-Picture</comment>
+-        <translation type="vanished">PIP</translation>
+-    </message>
+-    <message>
+-        <source>PbP</source>
+-        <comment>Picture-by-Picture</comment>
+-        <translation type="vanished">PBP</translation>
+-    </message>
+-    <message>
+-        <source>Disabling %1 for recording</source>
+-        <translation type="vanished">Disabling %1 for Recording</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="7580"/>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="7601"/>
+@@ -24615,10 +22842,6 @@ Do you wish to continue watching?</translation>
+         <source>Cancel Record</source>
+         <translation>Cancel Record</translation>
+     </message>
+-    <message>
+-        <source>Active Changed</source>
+-        <translation type="vanished">Active Changed</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="7721"/>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="7734"/>
+@@ -24757,12 +22980,12 @@ Do you wish to continue watching?</translation>
      <message>
          <location filename="../libs/libmythtv/tv_play.cpp" line="8557"/>
          <source>Auto</source>
@@ -3484,7 +5958,69 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/tv_play.cpp" line="8621"/>
-@@ -24999,12 +25006,12 @@ Do you wish to continue watching?</translation>
+@@ -24804,10 +23027,6 @@ Do you wish to continue watching?</translation>
+         <source>1.5x</source>
+         <translation>1.5x</translation>
+     </message>
+-    <message>
+-        <source>Enable Audio Upmixer</source>
+-        <translation type="vanished">Enable Audio Upmixer</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="8812"/>
+         <source>Disable Subtitles</source>
+@@ -24828,20 +23047,6 @@ Do you wish to continue watching?</translation>
+         <source>Enable Forced Subtitles</source>
+         <translation>Enable Forced Subtitles</translation>
+     </message>
+-    <message numerus="yes">
+-        <source>Close PIP(s)</source>
+-        <translation type="vanished">
+-            <numerusform>Close PIP</numerusform>
+-            <numerusform>Close PIPs</numerusform>
+-        </translation>
+-    </message>
+-    <message numerus="yes">
+-        <source>Close PBP(s)</source>
+-        <translation type="vanished">
+-            <numerusform>Close PBP</numerusform>
+-            <numerusform>Close PBPs</numerusform>
+-        </translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="8890"/>
+         <source>Playback Data</source>
+@@ -24868,18 +23073,6 @@ Do you wish to continue watching?</translation>
+         <source>Playback Compact Menu</source>
+         <translation>Playback Compact Menu</translation>
+     </message>
+-    <message>
+-        <source>Move BottomLine off screen</source>
+-        <translation type="vanished">Move Bottom Line Off Screen</translation>
+-    </message>
+-    <message>
+-        <source>Save manual zoom for BottomLine</source>
+-        <translation type="vanished">Save Manual Zoom for Bottom Line</translation>
+-    </message>
+-    <message>
+-        <source>Jump to bookmark</source>
+-        <translation type="vanished">Jump to Bookmark</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="9207"/>
+         <source>Schedule</source>
+@@ -24951,10 +23144,6 @@ Do you wish to continue watching?</translation>
+         <source>Searching</source>
+         <translation>Searching...</translation>
+     </message>
+-    <message>
+-        <source>Volume</source>
+-        <translation type="vanished">Volume</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="6970"/>
+         <source>Time Stretch</source>
+@@ -24999,12 +23188,12 @@ Do you wish to continue watching?</translation>
      <message>
          <location filename="../libs/libmythtv/tv_play.cpp" line="8984"/>
          <source>Turn Auto-Expire OFF</source>
@@ -3499,7 +6035,152 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/tv_play.cpp" line="8940"/>
-@@ -25381,12 +25388,12 @@ Do you wish to continue watching?</translation>
+@@ -25026,10 +23215,6 @@ Do you wish to continue watching?</translation>
+         <source>Chapter</source>
+         <translation>Chapter</translation>
+     </message>
+-    <message>
+-        <source>Sorry, cannot mix PBP and PIP views</source>
+-        <translation type="vanished">Cannot Mix PBP and PIP Views</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="9178"/>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="9226"/>
+@@ -25047,10 +23232,6 @@ Do you wish to continue watching?</translation>
+         <source>Video</source>
+         <translation>Video</translation>
+     </message>
+-    <message>
+-        <source>Visualisation Off</source>
+-        <translation type="vanished">Visualization Off</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="6901"/>
+         <source>TV</source>
+@@ -25061,10 +23242,6 @@ Do you wish to continue watching?</translation>
+         <source>Adjust Subtitle Zoom</source>
+         <translation>Adjust Subtitle Zoom</translation>
+     </message>
+-    <message>
+-        <source>Subtitle Zoom</source>
+-        <translation type="vanished">Subtitle Zoom</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="9188"/>
+         <source>Advanced</source>
+@@ -25155,38 +23332,6 @@ Do you wish to continue watching?</translation>
+         <source>Cancel Playlist</source>
+         <translation>Cancel Playlist</translation>
+     </message>
+-    <message>
+-        <source>Open Live TV PIP</source>
+-        <translation type="vanished">Open Live TV PIP</translation>
+-    </message>
+-    <message>
+-        <source>Open Live TV PBP</source>
+-        <translation type="vanished">Open Live TV PBP</translation>
+-    </message>
+-    <message>
+-        <source>Open Recording PIP</source>
+-        <translation type="vanished">Open Recording PIP</translation>
+-    </message>
+-    <message>
+-        <source>Open Recording PBP</source>
+-        <translation type="vanished">Open Recording PBP</translation>
+-    </message>
+-    <message>
+-        <source>Change Active Window</source>
+-        <translation type="vanished">Change Active Window</translation>
+-    </message>
+-    <message>
+-        <source>Swap Windows</source>
+-        <translation type="vanished">Swap Windows</translation>
+-    </message>
+-    <message>
+-        <source>Switch to PIP</source>
+-        <translation type="vanished">Switch to PIP</translation>
+-    </message>
+-    <message>
+-        <source>Switch to PBP</source>
+-        <translation type="vanished">Switch to PBP</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="9933"/>
+         <source>No, keep it</source>
+@@ -25249,27 +23394,11 @@ Do you wish to continue watching?</translation>
+         <source>3D</source>
+         <translation>3D</translation>
+     </message>
+-    <message>
+-        <source>Disable Night Mode</source>
+-        <translation type="vanished">Disable Night Mode</translation>
+-    </message>
+-    <message>
+-        <source>Enable Night Mode</source>
+-        <translation type="vanished">Enable Night Mode</translation>
+-    </message>
+-    <message>
+-        <source>Side by Side</source>
+-        <translation type="vanished">Side by Side</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="8561"/>
+         <source>Discard Side by Side</source>
+         <translation>Discard Side by Side</translation>
+     </message>
+-    <message>
+-        <source>Top and Bottom</source>
+-        <translation type="vanished">Top and Bottom</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="8563"/>
+         <source>Discard Top and Bottom</source>
+@@ -25295,21 +23424,6 @@ Do you wish to continue watching?</translation>
+         <source>Adjust</source>
+         <translation>Adjust</translation>
+     </message>
+-    <message>
+-        <source>(I)</source>
+-        <comment>Interlaced (Normal)</comment>
+-        <translation type="vanished">(I)</translation>
+-    </message>
+-    <message>
+-        <source>(i)</source>
+-        <comment>Interlaced (Reversed)</comment>
+-        <translation type="vanished">(i)</translation>
+-    </message>
+-    <message>
+-        <source>(P)</source>
+-        <comment>Progressive</comment>
+-        <translation type="vanished">(P)</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="9553"/>
+         <source>MythTV is already using all available inputs for the channel you selected. If you want to watch an in-progress recording, select one from the playback menu.  If you want to watch Live TV, cancel one of the in-progress recordings from the delete menu.</source>
+@@ -25320,22 +23434,6 @@ Do you wish to continue watching?</translation>
+         <source>Video Scan</source>
+         <translation>Video Scan</translation>
+     </message>
+-    <message>
+-        <source>Detect</source>
+-        <translation type="vanished">Detect</translation>
+-    </message>
+-    <message>
+-        <source>Progressive</source>
+-        <translation type="vanished">Progressive</translation>
+-    </message>
+-    <message>
+-        <source>Interlaced (Normal)</source>
+-        <translation type="vanished">Interlaced (Normal)</translation>
+-    </message>
+-    <message>
+-        <source>Interlaced (Reversed)</source>
+-        <translation type="vanished">Interlaced (Reversed)</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="9200"/>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="9540"/>
+@@ -25381,12 +23479,12 @@ Do you wish to continue watching?</translation>
      <message>
          <location filename="../libs/libmythtv/tv_play.cpp" line="9371"/>
          <source>Auto-Expire OFF</source>
@@ -3514,7 +6195,22 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/tv_play.cpp" line="9562"/>
-@@ -25518,7 +25525,7 @@ Do you wish to continue watching?</translation>
+@@ -25443,14 +23541,6 @@ Do you wish to continue watching?</translation>
+         <source>You are exiting %1</source>
+         <translation>You Are Exiting %1</translation>
+     </message>
+-    <message>
+-        <source>Save this position and go to the menu</source>
+-        <translation type="vanished">Save and Exit</translation>
+-    </message>
+-    <message>
+-        <source>Do not save, just exit to the menu</source>
+-        <translation type="vanished">Exit Without Saving</translation>
+-    </message>
+     <message>
+         <location filename="../libs/libmythtv/tv_play.cpp" line="9830"/>
+         <source>Exit %1</source>
+@@ -25518,7 +23608,7 @@ Do you wish to continue watching?</translation>
          <location filename="../libs/libmythtv/tv_rec.cpp" line="3885"/>
          <location filename="../libs/libmythtv/tv_rec.cpp" line="3940"/>
          <source>See &apos;Tuning timeout&apos; in mythtv-setup for this input.</source>
@@ -3523,7 +6219,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/tv_rec.cpp" line="3932"/>
-@@ -26260,7 +26267,7 @@ When you have completed your configuration, press &quot;OK&quot; to search.</tra
+@@ -26260,7 +24350,7 @@ When you have completed your configuration, press &quot;OK&quot; to search.</tra
      <message>
          <location filename="../themes/themestrings.h" line="385"/>
          <source>Allow Recordings to Auto-Expire</source>
@@ -3532,7 +6228,22 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1437"/>
-@@ -26590,7 +26597,7 @@ When you have completed your configuration, press &quot;OK&quot; to search.</tra
+@@ -26432,14 +24522,6 @@ When you have completed your configuration, press &quot;OK&quot; to search.</tra
+         <source>Rating:</source>
+         <translation>Rating:</translation>
+     </message>
+-    <message>
+-        <source>Running Time:</source>
+-        <translation type="vanished">Running Time:</translation>
+-    </message>
+-    <message>
+-        <source>Show Times:</source>
+-        <translation type="vanished">Show Times:</translation>
+-    </message>
+     <message>
+         <location filename="../themes/themestrings.h" line="585"/>
+         <source>Channel Priorities</source>
+@@ -26590,7 +24672,7 @@ When you have completed your configuration, press &quot;OK&quot; to search.</tra
      <message>
          <location filename="../themes/themestrings.h" line="276"/>
          <source>(1) Time (2) Title</source>
@@ -3541,16 +6252,26 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1851"/>
-@@ -27083,7 +27090,7 @@ When you have completed your configuration, press &quot;OK&quot; to search.</tra
+@@ -27083,17 +25165,7 @@ When you have completed your configuration, press &quot;OK&quot; to search.</tra
      <message>
          <location filename="../themes/themestrings.h" line="1963"/>
          <source>This is a Christmas version of the popular MythCenter-wide theme with animated snow backgrounds and festive colour scheme.</source>
 -        <translation>This is a Christmas version of the popular MythCenter-wide theme with animated snow backgrounds and festive colour scheme.</translation>
+-    </message>
+-    <message>
+-        <source>No videos in library, or no files found.
+- If you have configured a video directory, press &quot;M&quot; (or the MENU key) and select &quot;Scan for Changes.&quot;</source>
+-        <translation type="vanished">No videos in library, or no files found.
+- If you have configured a video directory, press &quot;M&quot; (or the MENU key) and select &quot;Scan for Changes.&quot;</translation>
+-    </message>
+-    <message>
+-        <source>Filters Video List</source>
+-        <translation type="vanished">Filters Video List</translation>
 +        <translation>This is a Christmas version of the popular MythCenter-wide theme with animated snow backgrounds and festive color scheme.</translation>
      </message>
      <message>
-         <source>No videos in library, or no files found.
-@@ -27144,34 +27151,34 @@ When you have completed your configuration, press &quot;OK&quot; to search.</tra
+         <location filename="../themes/themestrings.h" line="167"/>
+@@ -27144,34 +25216,34 @@ When you have completed your configuration, press &quot;OK&quot; to search.</tra
      <message>
          <location filename="../themes/themestrings.h" line="2188"/>
          <source>Wizard</source>
@@ -3591,7 +6312,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="2210"/>
-@@ -27179,58 +27186,59 @@ To schedule a recording, exit this screen and select &apos;Program Guide&apos; o
+@@ -27179,58 +25251,59 @@ To schedule a recording, exit this screen and select &apos;Program Guide&apos; o
  
  To schedule a recording, exit this screen and
  Select &apos;Program Guide&apos; or &apos;Program Finder&apos;</source>
@@ -3662,7 +6383,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="2230"/>
-@@ -27239,58 +27247,63 @@ Select &apos;Program Guide&apos; or &apos;Program Finder&apos;</source>
+@@ -27239,58 +25312,63 @@ Select &apos;Program Guide&apos; or &apos;Program Finder&apos;</source>
  [font]myverysmallsub[/font]Part |PARTNUMBER| of %%PARTTOTAL%%
  [font]myverysmallsub[/font]|CAST| %%[font]myverysmallsub[/font]  
  [font]myverysmalllabel[/font]Director: |DIRECTOR| %</source>
@@ -3737,7 +6458,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="2245"/>
-@@ -27310,53 +27323,53 @@ Select &apos;Program Guide&apos; or &apos;Program Finder&apos;</source>
+@@ -27310,53 +25388,53 @@ Select &apos;Program Guide&apos; or &apos;Program Finder&apos;</source>
      <message>
          <location filename="../themes/themestrings.h" line="2253"/>
          <source>no info available</source>
@@ -3801,7 +6522,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="2266"/>
-@@ -27398,7 +27411,7 @@ Select &apos;Program Guide&apos; or &apos;Program Finder&apos;</source>
+@@ -27398,7 +25476,7 @@ Select &apos;Program Guide&apos; or &apos;Program Finder&apos;</source>
      <message>
          <location filename="../themes/themestrings.h" line="273"/>
          <source>(1) All (2) Important</source>
@@ -3810,7 +6531,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="55"/>
-@@ -27512,540 +27525,548 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
+@@ -27512,540 +25590,548 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
      <message>
          <location filename="../themes/themestrings.h" line="7"/>
          <source>% - |year%% - |length%</source>
@@ -4465,7 +7186,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="187"/>
-@@ -28055,76 +28076,76 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
+@@ -28055,76 +26141,76 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
      <message>
          <location filename="../themes/themestrings.h" line="188"/>
          <source>%channum% - %callsign%  |  %STARTTIME%-%ENDTIME% (%LENMINS%)</source>
@@ -4558,7 +7279,7 @@ index e4d869578b..a960c92743 100644
              <numerusform></numerusform>
              <numerusform></numerusform>
          </translation>
-@@ -28132,203 +28153,204 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
+@@ -28132,203 +26218,204 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
      <message>
          <location filename="../themes/themestrings.h" line="206"/>
          <source>%playlistplayedtime% of %playlisttotaltime%</source>
@@ -4803,7 +7524,7 @@ index e4d869578b..a960c92743 100644
              <numerusform></numerusform>
              <numerusform></numerusform>
          </translation>
-@@ -28336,1182 +28358,1182 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
+@@ -28336,1182 +26423,1182 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
      <message>
          <location filename="../themes/themestrings.h" line="270"/>
          <source>(%statusbefore%) -&gt; (%statusafter%)</source>
@@ -6222,7 +8943,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="771"/>
-@@ -29521,487 +29543,487 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
+@@ -29521,487 +27608,487 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
      <message>
          <location filename="../themes/themestrings.h" line="773"/>
          <source>Detailed information about your video</source>
@@ -6807,7 +9528,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1035"/>
-@@ -30011,12 +30033,12 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
+@@ -30011,12 +28098,12 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
      <message>
          <location filename="../themes/themestrings.h" line="1037"/>
          <source>Import and Export</source>
@@ -6822,7 +9543,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1040"/>
-@@ -30026,918 +30048,918 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
+@@ -30026,918 +28113,918 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
      <message>
          <location filename="../themes/themestrings.h" line="1041"/>
          <source>Import your music from CD</source>
@@ -7632,13 +10353,13 @@ index e4d869578b..a960c92743 100644
          <location filename="../themes/themestrings.h" line="1377"/>
          <source>Play Back Group:</source>
 -        <translation type="unfinished"></translation>
-+        <translation></translation>
++        <translation>Playback Group:</translation>
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1378"/>
          <source>Play Back Group: %1</source>
 -        <translation type="unfinished"></translation>
-+        <translation></translation>
++        <translation>Playback Group: %1</translation>
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1379"/>
@@ -7692,7 +10413,7 @@ index e4d869578b..a960c92743 100644
          <location filename="../themes/themestrings.h" line="1411"/>
          <source>Playback starting ...</source>
 -        <translation type="unfinished"></translation>
-+        <translation></translation>
++        <translation>Playback starting...</translation>
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1413"/>
@@ -7924,7 +10645,7 @@ index e4d869578b..a960c92743 100644
              <numerusform></numerusform>
              <numerusform></numerusform>
          </translation>
-@@ -30945,22 +30967,22 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
+@@ -30945,22 +29032,22 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
      <message>
          <location filename="../themes/themestrings.h" line="1496"/>
          <source>Rated: %1</source>
@@ -7951,7 +10672,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1502"/>
-@@ -30970,167 +30992,167 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
+@@ -30970,167 +29057,167 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
      <message>
          <location filename="../themes/themestrings.h" line="1503"/>
          <source>Read the</source>
@@ -8152,7 +10873,7 @@ index e4d869578b..a960c92743 100644
              <numerusform></numerusform>
              <numerusform></numerusform>
          </translation>
-@@ -31138,1488 +31160,1488 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
+@@ -31138,1488 +29225,1488 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
      <message>
          <location filename="../themes/themestrings.h" line="1555"/>
          <source>Remote</source>
@@ -9938,7 +12659,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="2184"/>
-@@ -32629,22 +32651,22 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
+@@ -32629,22 +30716,22 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
      <message>
          <location filename="../themes/themestrings.h" line="2268"/>
          <source>upcoming recordings</source>
@@ -9965,7 +12686,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1863"/>
-@@ -32901,7 +32923,7 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
+@@ -32901,7 +30988,7 @@ Once you have completed your modifications, click the &quot;Save&quot; button.</
          <location filename="../themes/themestrings.h" line="507"/>
          <source>Browse the internet or your video library</source>
          <translatorcomment>Temporary fix</translatorcomment>
@@ -9974,7 +12695,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1115"/>
-@@ -33058,7 +33080,7 @@ Errata: %ERRATA%</translation>
+@@ -33058,7 +31145,7 @@ Errata: %ERRATA%</translation>
      <message>
          <location filename="../themes/themestrings.h" line="1358"/>
          <source>Perform metadata update after video scan:</source>
@@ -9983,7 +12704,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="844"/>
-@@ -33068,12 +33090,12 @@ Errata: %ERRATA%</translation>
+@@ -33068,12 +31155,12 @@ Errata: %ERRATA%</translation>
      <message>
          <location filename="../themes/themestrings.h" line="847"/>
          <source>Enable metadata in file browse mode:</source>
@@ -9998,7 +12719,18 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="341"/>
-@@ -33132,7 +33154,7 @@ Errata: %ERRATA%</translation>
+@@ -33085,10 +31172,6 @@ Errata: %ERRATA%</translation>
+         <source>Select Time &amp; Date</source>
+         <translation>Select Time &amp; Date</translation>
+     </message>
+-    <message>
+-        <source>%startdate%%| startyear%, %starttime%</source>
+-        <translation type="vanished">%startdate%%| startyear%, %starttime%</translation>
+-    </message>
+     <message>
+         <location filename="../themes/themestrings.h" line="2212"/>
+         <source>You haven&apos;t defined any channels</source>
+@@ -33132,7 +31215,7 @@ Errata: %ERRATA%</translation>
      <message>
          <location filename="../themes/themestrings.h" line="1354"/>
          <source>Perform daily updates of recording artwork</source>
@@ -10007,7 +12739,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1227"/>
-@@ -33142,17 +33164,17 @@ Errata: %ERRATA%</translation>
+@@ -33142,17 +31225,17 @@ Errata: %ERRATA%</translation>
      <message>
          <location filename="../themes/themestrings.h" line="1898"/>
          <source>Submit your hardware profile</source>
@@ -10028,7 +12760,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="423"/>
-@@ -33575,7 +33597,7 @@ Errata: %ERRATA%</translation>
+@@ -33575,7 +31658,7 @@ Errata: %ERRATA%</translation>
      <message>
          <location filename="../themes/themestrings.h" line="294"/>
          <source>1</source>
@@ -10037,7 +12769,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="305"/>
-@@ -33585,12 +33607,12 @@ Errata: %ERRATA%</translation>
+@@ -33585,12 +31668,12 @@ Errata: %ERRATA%</translation>
      <message>
          <location filename="../themes/themestrings.h" line="310"/>
          <source>3</source>
@@ -10052,7 +12784,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1084"/>
-@@ -33705,7 +33727,7 @@ Errata: %ERRATA%</translation>
+@@ -33705,7 +31788,7 @@ Errata: %ERRATA%</translation>
      <message>
          <location filename="../themes/themestrings.h" line="1147"/>
          <source>MPEG2</source>
@@ -10061,7 +12793,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1144"/>
-@@ -33790,7 +33812,7 @@ Errata: %ERRATA%</translation>
+@@ -33790,7 +31873,7 @@ Errata: %ERRATA%</translation>
      <message>
          <location filename="../themes/themestrings.h" line="328"/>
          <source>720P</source>
@@ -10070,7 +12802,28 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="301"/>
-@@ -34503,24 +34525,24 @@ Errata: %ERRATA%</translation>
+@@ -34149,7 +32232,8 @@ Errata: %ERRATA%</translation>
+     <message>
+         <location filename="../themes/themestrings.h" line="1101"/>
+         <source>Let&apos;s set up your DVR! On the next few screens, we will configure your system to play back audio and video, optimize your color and contrast, and make sure we are taking advantage of all of your hardware.  Press next to begin!</source>
+-        <translation>Let&apos;s set up your DVR! On the next few screens, we will configure your system to play back audio and video, optimize your color and contrast, and make sure we are taking advantage of all of your hardware. Press next to begin!</translation>
++        <translation>
++Let&apos;s set up your DVR! On the next few screens, we will configure your system to play back audio and video, optimize your color and contrast, and make sure we are taking advantage of all of your hardware. Press next to begin!</translation>
+     </message>
+     <message>
+         <location filename="../themes/themestrings.h" line="1896"/>
+@@ -34336,10 +32420,6 @@ Errata: %ERRATA%</translation>
+         <source>Airdate:</source>
+         <translation>Airdate:</translation>
+     </message>
+-    <message>
+-        <source>Theater name</source>
+-        <translation type="vanished">Theater name</translation>
+-    </message>
+     <message>
+         <location filename="../themes/themestrings.h" line="378"/>
+         <source>Age:</source>
+@@ -34503,24 +32583,24 @@ Errata: %ERRATA%</translation>
      <message>
          <location filename="../themes/themestrings.h" line="2246"/>
          <source>h.264</source>
@@ -10099,7 +12852,18 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="2252"/>
-@@ -35037,7 +35059,7 @@ Finally, you can test, immediately activate, store, or cancel your rule.</transl
+@@ -35020,10 +33100,6 @@ Finally, you can test, immediately activate, store, or cancel your rule.</source
+ 
+ Finally, you can test, immediately activate, store, or cancel your rule.</translation>
+     </message>
+-    <message>
+-        <source>Movie Times</source>
+-        <translation type="vanished">Movie Times</translation>
+-    </message>
+     <message>
+         <location filename="../themes/themestrings.h" line="816"/>
+         <source>Edit Keys</source>
+@@ -35037,7 +33113,7 @@ Finally, you can test, immediately activate, store, or cancel your rule.</transl
      <message>
          <location filename="../themes/themestrings.h" line="272"/>
          <source>(1) All  (2) Important</source>
@@ -10108,7 +12872,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1814"/>
-@@ -35077,7 +35099,7 @@ Finally, you can test, immediately activate, store, or cancel your rule.</transl
+@@ -35077,7 +33153,7 @@ Finally, you can test, immediately activate, store, or cancel your rule.</transl
      <message>
          <location filename="../themes/themestrings.h" line="279"/>
          <source>(1)Time (2)Title</source>
@@ -10117,7 +12881,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1270"/>
-@@ -35429,7 +35451,7 @@ Finally, you can test, immediately activate, store, or cancel your rule.</transl
+@@ -35429,7 +33505,7 @@ Finally, you can test, immediately activate, store, or cancel your rule.</transl
      <message>
          <location filename="../themes/themestrings.h" line="275"/>
          <source>(1) Channel (2) Priority</source>
@@ -10126,7 +12890,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1630"/>
-@@ -35454,7 +35476,7 @@ Finally, you can test, immediately activate, store, or cancel your rule.</transl
+@@ -35454,7 +33530,7 @@ Finally, you can test, immediately activate, store, or cancel your rule.</transl
      <message>
          <location filename="../themes/themestrings.h" line="278"/>
          <source>(1) Title (2) Priority (4) Type</source>
@@ -10135,7 +12899,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="730"/>
-@@ -36425,7 +36447,7 @@ If you select &quot;Use Default Player,&quot; the player command set for the ext
+@@ -36425,7 +34501,7 @@ If you select &quot;Use Default Player,&quot; the player command set for the ext
      <message>
          <location filename="../themes/themestrings.h" line="501"/>
          <source>Browse Videos</source>
@@ -10144,7 +12908,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="682"/>
-@@ -36771,7 +36793,7 @@ If you select &quot;Use Default Player,&quot; the player command set for the ext
+@@ -36771,7 +34847,7 @@ If you select &quot;Use Default Player,&quot; the player command set for the ext
      <message>
          <location filename="../themes/themestrings.h" line="1004"/>
          <source>Hardware profile</source>
@@ -10153,7 +12917,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1937"/>
-@@ -36966,7 +36988,7 @@ If you select &quot;Use Default Player,&quot; the player command set for the ext
+@@ -36966,7 +35042,7 @@ If you select &quot;Use Default Player,&quot; the player command set for the ext
      <message>
          <location filename="../themes/themestrings.h" line="343"/>
          <source>A blue theme.  Originally designed before the MythUI rewrite, MythCenter has been updated to take advantage of the new UI library while still maintaining the look and feel that long-time MythTV users are used to.</source>
@@ -10162,7 +12926,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1969"/>
-@@ -37021,7 +37043,7 @@ If you select &quot;Use Default Player,&quot; the player command set for the ext
+@@ -37021,7 +35097,7 @@ If you select &quot;Use Default Player,&quot; the player command set for the ext
      <message>
          <location filename="../themes/themestrings.h" line="1357"/>
          <source>Perform metadata update after video scan</source>
@@ -10171,7 +12935,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="843"/>
-@@ -37031,12 +37053,12 @@ If you select &quot;Use Default Player,&quot; the player command set for the ext
+@@ -37031,12 +35107,12 @@ If you select &quot;Use Default Player,&quot; the player command set for the ext
      <message>
          <location filename="../themes/themestrings.h" line="791"/>
          <source>Display unknown file types</source>
@@ -10186,7 +12950,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="1995"/>
-@@ -37145,7 +37167,7 @@ dd MMM yyyy</translation>
+@@ -37145,7 +35221,7 @@ dd MMM yyyy</translation>
      <message>
          <location filename="../themes/themestrings.h" line="499"/>
          <source>Browse Internet Video</source>
@@ -10195,7 +12959,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../themes/themestrings.h" line="503"/>
-@@ -37215,7 +37237,7 @@ dd MMM yyyy</translation>
+@@ -37215,7 +35291,7 @@ dd MMM yyyy</translation>
      <message>
          <location filename="../themes/themestrings.h" line="342"/>
          <source>A &quot;Media Center&quot; menu theme. This menu theme is basically meant to bring the common &quot;media player/DVR&quot; functionality to the forefront, organize the plugins, and to make some of myth&apos;s more daunting options a little more subtle. Places the common media items on the top level (Recordings, Videos, TV, DVD, Music), places all informational plugins in &quot;Plugins.&quot; Puts all setup and scheduling in &quot;Advanced.&quot; The top two menu levels will seem new, the ones beneath Advanced-&gt;Setup are as in the default menu.</source>
@@ -10204,7 +12968,14 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -37268,7 +37290,7 @@ dd MMM yyyy</translation>
+@@ -37261,14 +35337,10 @@ dd MMM yyyy</translation>
+ </context>
+ <context>
+     <name>TransportListEditor</name>
+-    <message>
+-        <source>Multiplex Editor</source>
+-        <translation type="vanished">Multiplex Editor</translation>
+-    </message>
      <message>
          <location filename="../libs/libmythtv/transporteditor.cpp" line="218"/>
          <source>Transport Editor</source>
@@ -10213,7 +12984,85 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../libs/libmythtv/transporteditor.cpp" line="223"/>
-@@ -38035,7 +38057,7 @@ dd MMM yyyy</translation>
+@@ -37300,77 +35372,6 @@ dd MMM yyyy</translation>
+         <translation>Media Servers</translation>
+     </message>
+ </context>
+-<context>
+-    <name>UnZip</name>
+-    <message>
+-        <source>ZIP operation completed successfully.</source>
+-        <translation type="vanished">ZIP operation completed successfully.</translation>
+-    </message>
+-    <message>
+-        <source>Failed to initialize or load zlib library.</source>
+-        <translation type="vanished">Failed to initialize or load zlib library.</translation>
+-    </message>
+-    <message>
+-        <source>zlib library error.</source>
+-        <translation type="vanished">zlib library error.</translation>
+-    </message>
+-    <message>
+-        <source>Unable to create or open file.</source>
+-        <translation type="vanished">Unable to create or open file.</translation>
+-    </message>
+-    <message>
+-        <source>Partially corrupted archive. Some files might be extracted.</source>
+-        <translation type="vanished">Partially corrupted archive. Some files might be extracted.</translation>
+-    </message>
+-    <message>
+-        <source>Corrupted archive.</source>
+-        <translation type="vanished">Corrupted archive.</translation>
+-    </message>
+-    <message>
+-        <source>Wrong password.</source>
+-        <translation type="vanished">Wrong password.</translation>
+-    </message>
+-    <message>
+-        <source>No archive has been created yet.</source>
+-        <translation type="vanished">No archive has been created yet.</translation>
+-    </message>
+-    <message>
+-        <source>File or directory does not exist.</source>
+-        <translation type="vanished">File or directory does not exist.</translation>
+-    </message>
+-    <message>
+-        <source>File read error.</source>
+-        <translation type="vanished">File read error.</translation>
+-    </message>
+-    <message>
+-        <source>File write error.</source>
+-        <translation type="vanished">File write error.</translation>
+-    </message>
+-    <message>
+-        <source>File seek error.</source>
+-        <translation type="vanished">File seek error.</translation>
+-    </message>
+-    <message>
+-        <source>Unable to create a directory.</source>
+-        <translation type="vanished">Unable to create a directory.</translation>
+-    </message>
+-    <message>
+-        <source>Invalid device.</source>
+-        <translation type="vanished">Invalid device.</translation>
+-    </message>
+-    <message>
+-        <source>Invalid or incompatible zip archive.</source>
+-        <translation type="vanished">Invalid or incompatible zip archive.</translation>
+-    </message>
+-    <message>
+-        <source>Inconsistent headers. Archive might be corrupted.</source>
+-        <translation type="vanished">Inconsistent headers. Archive might be corrupted.</translation>
+-    </message>
+-    <message>
+-        <source>Unknown error.</source>
+-        <translation type="vanished">Unknown error.</translation>
+-    </message>
+-</context>
+ <context>
+     <name>V4L2encGroup</name>
+     <message>
+@@ -38035,7 +36036,7 @@ dd MMM yyyy</translation>
      <message>
          <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="98"/>
          <source>If set, you will not be able to return to this screen and reset the Parental PIN without first entering the current PIN. You have been warned.</source>
@@ -10222,7 +13071,14 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/videoglobalsettings.cpp" line="110"/>
-@@ -38202,7 +38224,7 @@ dd MMM yyyy</translation>
+@@ -38195,14 +36196,10 @@ dd MMM yyyy</translation>
+         <source>Separate video modes for GUI and TV playback</source>
+         <translation>Separate Video Modes for GUI and TV Playback</translation>
+     </message>
+-    <message>
+-        <source>Switch X Window video modes for TV. Requires &quot;xrandr&quot; support.</source>
+-        <translation type="vanished">Switch X Window video modes for TV. Requires &quot;xrandr&quot; support.</translation>
+-    </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2306"/>
          <source>Switch video modes for playback depending on the source resolution and frame rate.</source>
@@ -10231,7 +13087,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2317"/>
-@@ -38259,7 +38281,7 @@ dd MMM yyyy</translation>
+@@ -38259,7 +36256,7 @@ dd MMM yyyy</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2471"/>
          <source>Default refresh rate when watching a video. Leave at &quot;Auto&quot; to automatically use the best available</source>
@@ -10240,7 +13096,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2475"/>
-@@ -38274,12 +38296,12 @@ dd MMM yyyy</translation>
+@@ -38274,12 +36271,12 @@ dd MMM yyyy</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2494"/>
          <source>Aspect ratio when watching a video. Leave at &quot;%1&quot; to use ratio reported by the monitor. Set to 16:9 or 4:3 to force a specific aspect ratio.</source>
@@ -10255,7 +13111,7 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2514"/>
-@@ -38295,12 +38317,12 @@ dd MMM yyyy</translation>
+@@ -38295,12 +36292,12 @@ dd MMM yyyy</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2536"/>
          <source>Pause while switching video modes (ms)</source>
@@ -10270,7 +13126,21 @@ index e4d869578b..a960c92743 100644
      </message>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="2561"/>
-@@ -38445,7 +38467,7 @@ If they no longer exist please remove them</translation>
+@@ -38308,13 +36305,6 @@ dd MMM yyyy</translation>
+         <translation>Overrides for Specific Video Sizes</translation>
+     </message>
+ </context>
+-<context>
+-    <name>VideoOutWindow</name>
+-    <message>
+-        <source>Zoom %1x%2 @ (%3,%4)</source>
+-        <translation type="vanished">Zoom %1x%2 @ (%3,%4)</translation>
+-    </message>
+-</context>
+ <context>
+     <name>VideoScanner</name>
+     <message>
+@@ -38445,7 +36435,7 @@ If they no longer exist please remove them</translation>
      <message>
          <location filename="../libs/libmythtv/videosource.cpp" line="136"/>
          <source>Video Source</source>
@@ -10279,7 +13149,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -38453,7 +38475,7 @@ If they no longer exist please remove them</translation>
+@@ -38453,7 +36443,7 @@ If they no longer exist please remove them</translation>
      <message>
          <location filename="../programs/mythfrontend/viewschedulediff.cpp" line="124"/>
          <source>The following programs will be recorded instead:</source>
@@ -10288,7 +13158,7 @@ index e4d869578b..a960c92743 100644
      </message>
  </context>
  <context>
-@@ -38591,12 +38613,12 @@ If they no longer exist please remove them</translation>
+@@ -38591,12 +36581,12 @@ If they no longer exist please remove them</translation>
      <message>
          <location filename="../programs/mythfrontend/globalsettings.cpp" line="3513"/>
          <source>Exclude recordings not set for Auto-Expire</source>
-- 
cgit v0.12

